Merge pull request #233 from flang-compiler/ch-inlineprep

prep work so we can upstream a trivial inlining pass

Author: schweitzpgi

flang/include/flang/Optimizer/Transforms/Passes.h

@@ -42,12 +42,7 @@ std::unique_ptr<mlir::Pass> createFirToCfgPass();
 /// nodes as block arguments.
 std::unique_ptr<mlir::Pass> createMemToRegPass();
 
-/// This pass will preform inlining on FIR.
-std::unique_ptr<mlir::Pass> createInlinerPass();
-
-/// Is inlining enabled? Check this before instantiating the pass with
-/// createInlinerPass().
-bool inlinerIsEnabled();
+/// Support for inlining on FIR.
 bool canLegallyInline(mlir::Operation *op, mlir::Region *reg,
                       mlir::BlockAndValueMapping &map);
 

flang/lib/Optimizer/Transforms/Inliner.cpp

@@ -13,24 +13,12 @@
 #include "llvm/Support/CommandLine.h"
 
 static llvm::cl::opt<bool>
-    enableInliningPass("enable-inlining",
-                       llvm::cl::desc("enable FIR inlining pass"),
+    aggressivelyInline("inline-all",
+                       llvm::cl::desc("aggressively inline everything"),
                        llvm::cl::init(false));
 
 /// Should we inline the callable `op` into region `reg`?
 bool fir::canLegallyInline(mlir::Operation *op, mlir::Region *reg,
                            mlir::BlockAndValueMapping &map) {
-  // TODO: this should _not_ just return true.
-  return true;
-}
-
-/// Should an inlining pass be instantiated?
-bool fir::inlinerIsEnabled() { return enableInliningPass; }
-
-/// Instantiate an inlining pass. NB: If inlining is disabled, the compiler will
-/// abort if an inlining pass is instantiated.
-std::unique_ptr<mlir::Pass> fir::createInlinerPass() {
-  if (enableInliningPass)
-    return mlir::createInlinerPass();
-  llvm::report_fatal_error("inlining is disabled");
+  return aggressivelyInline;
 }

flang/test/Fir/inline.fir

@@ -1,4 +1,4 @@
-// RUN: tco --enable-inlining %s -o - | FileCheck %s
+// RUN: tco --inline-all %s -o - | FileCheck %s
 
 // CHECK-LABEL: @add
 func @add(%a : i32, %b : i32) -> i32 {

flang/tools/tco/tco.cpp

@@ -93,8 +93,7 @@ static int compileFIR(const mlir::PassPipelineCLParser &passPipeline) {
     // simplify the IR
     pm.addPass(mlir::createCanonicalizerPass());
     pm.addPass(fir::createCSEPass());
-    if (fir::inlinerIsEnabled())
-      pm.addPass(fir::createInlinerPass());
+    pm.addPass(mlir::createInlinerPass());
     pm.addPass(mlir::createCSEPass());
 
     // convert fir dialect to affine