[flang-commits] [flang] [flang][NFCI]Use config structure for MLIR to LLVM pass creation (PR #67792)
via flang-commits
flang-commits at lists.llvm.org
Fri Sep 29 04:50:52 PDT 2023
llvmbot wrote:
<!--LLVM PR SUMMARY COMMENT-->
@llvm/pr-subscribers-flang-driver
<details>
<summary>Changes</summary>
The CreateMLIRToLLVMPassPipeline function has quite a few arguments, all of which has default values. Create a struct, with a constructor for the default values, and pass that struct instead.
Re-arrange a few include files to make everything available.
No functional change intended.
---
Full diff: https://github.com/llvm/llvm-project/pull/67792.diff
4 Files Affected:
- (modified) flang/include/flang/Tools/CLOptions.inc (+16-25)
- (modified) flang/include/flang/Tools/CrossToolHelpers.h (+18)
- (modified) flang/lib/Frontend/FrontendActions.cpp (+11-3)
- (modified) flang/tools/tco/tco.cpp (+4-2)
``````````diff
diff --git a/flang/include/flang/Tools/CLOptions.inc b/flang/include/flang/Tools/CLOptions.inc
index 616d9ddc066a75d..0b210bec9f785c8 100644
--- a/flang/include/flang/Tools/CLOptions.inc
+++ b/flang/include/flang/Tools/CLOptions.inc
@@ -16,7 +16,6 @@
#include "flang/Optimizer/CodeGen/CodeGen.h"
#include "flang/Optimizer/HLFIR/Passes.h"
#include "flang/Optimizer/Transforms/Passes.h"
-#include "llvm/Frontend/Debug/Options.h"
#include "llvm/Passes/OptimizationLevel.h"
#include "llvm/Support/CommandLine.h"
@@ -184,29 +183,28 @@ inline void addExternalNameConversionPass(
/// incremental conversion of FIR.
///
/// \param pm - MLIR pass manager that will hold the pipeline definition
-inline void createDefaultFIROptimizerPassPipeline(mlir::PassManager &pm,
- llvm::OptimizationLevel optLevel = defaultOptLevel,
- bool stackArrays = false, bool loopVersioning = false) {
+inline void createDefaultFIROptimizerPassPipeline(
+ mlir::PassManager &pm, const MLIRToLLVMPassPipelineConfig &pc) {
// simplify the IR
mlir::GreedyRewriteConfig config;
config.enableRegionSimplification = false;
pm.addPass(mlir::createCSEPass());
- fir::addAVC(pm, optLevel);
+ fir::addAVC(pm, pc.OptLevel);
pm.addNestedPass<mlir::func::FuncOp>(fir::createCharacterConversionPass());
pm.addPass(mlir::createCanonicalizerPass(config));
pm.addPass(fir::createSimplifyRegionLitePass());
- if (optLevel.isOptimizingForSpeed()) {
+ if (pc.OptLevel.isOptimizingForSpeed()) {
// These passes may increase code size.
pm.addPass(fir::createSimplifyIntrinsicsPass());
pm.addPass(fir::createAlgebraicSimplificationPass(config));
}
- if (loopVersioning)
+ if (pc.LoopVersioning)
pm.addPass(fir::createLoopVersioningPass());
pm.addPass(mlir::createCSEPass());
- if (stackArrays)
+ if (pc.StackArrays)
pm.addPass(fir::createStackArraysPass());
else
fir::addMemoryAllocationOpt(pm);
@@ -291,19 +289,17 @@ inline void createDebugPasses(
}
}
-inline void createDefaultFIRCodeGenPassPipeline(mlir::PassManager &pm,
- llvm::OptimizationLevel optLevel = defaultOptLevel,
- bool underscoring = true,
- llvm::codegenoptions::DebugInfoKind debugInfo = NoDebugInfo) {
+inline void createDefaultFIRCodeGenPassPipeline(
+ mlir::PassManager &pm, MLIRToLLVMPassPipelineConfig config) {
fir::addBoxedProcedurePass(pm);
pm.addNestedPass<mlir::func::FuncOp>(
fir::createAbstractResultOnFuncOptPass());
pm.addNestedPass<fir::GlobalOp>(fir::createAbstractResultOnGlobalOptPass());
fir::addCodeGenRewritePass(pm);
fir::addTargetRewritePass(pm);
- fir::addExternalNameConversionPass(pm, underscoring);
- fir::createDebugPasses(pm, debugInfo);
- fir::addFIRToLLVMPass(pm, optLevel);
+ fir::addExternalNameConversionPass(pm, config.Underscoring);
+ fir::createDebugPasses(pm, config.DebugInfo);
+ fir::addFIRToLLVMPass(pm, config.OptLevel);
}
/// Create a pass pipeline for lowering from MLIR to LLVM IR
@@ -311,20 +307,15 @@ inline void createDefaultFIRCodeGenPassPipeline(mlir::PassManager &pm,
/// \param pm - MLIR pass manager that will hold the pipeline definition
/// \param optLevel - optimization level used for creating FIR optimization
/// passes pipeline
-inline void createMLIRToLLVMPassPipeline(mlir::PassManager &pm,
- llvm::OptimizationLevel optLevel = defaultOptLevel,
- bool stackArrays = false, bool underscoring = true,
- bool loopVersioning = false,
- llvm::codegenoptions::DebugInfoKind debugInfo = NoDebugInfo) {
- fir::createHLFIRToFIRPassPipeline(pm, optLevel);
+inline void createMLIRToLLVMPassPipeline(
+ mlir::PassManager &pm, const MLIRToLLVMPassPipelineConfig &config) {
+ fir::createHLFIRToFIRPassPipeline(pm, config.OptLevel);
// Add default optimizer pass pipeline.
- fir::createDefaultFIROptimizerPassPipeline(
- pm, optLevel, stackArrays, loopVersioning);
+ fir::createDefaultFIROptimizerPassPipeline(pm, config);
// Add codegen pass pipeline.
- fir::createDefaultFIRCodeGenPassPipeline(
- pm, optLevel, underscoring, debugInfo);
+ fir::createDefaultFIRCodeGenPassPipeline(pm, config);
}
#undef FLANG_EXCLUDE_CODEGEN
#endif
diff --git a/flang/include/flang/Tools/CrossToolHelpers.h b/flang/include/flang/Tools/CrossToolHelpers.h
index d43a1fccccb62fd..b16fd14d1d7f34d 100644
--- a/flang/include/flang/Tools/CrossToolHelpers.h
+++ b/flang/include/flang/Tools/CrossToolHelpers.h
@@ -18,6 +18,24 @@
#include "mlir/Dialect/OpenMP/OpenMPDialect.h"
#include "mlir/IR/BuiltinOps.h"
+#include "llvm/Frontend/Debug/Options.h"
+#include "llvm/Passes/OptimizationLevel.h"
+
+/// Configuriation for the MLIR to LLVM pass pipeline.
+struct MLIRToLLVMPassPipelineConfig {
+ MLIRToLLVMPassPipelineConfig(llvm::OptimizationLevel level) {
+ OptLevel = level;
+ StackArrays = false;
+ Underscoring = true;
+ LoopVersioning = false;
+ DebugInfo = llvm::codegenoptions::NoDebugInfo;
+ }
+ llvm::OptimizationLevel OptLevel; ///< optimisation level
+ bool StackArrays; ///< convert memory allocations to alloca.
+ bool Underscoring; ///< add underscores to function names.
+ bool LoopVersioning; ///< Run the version loop pass.
+ llvm::codegenoptions::DebugInfoKind DebugInfo; ///< Debug info generation.
+};
struct OffloadModuleOpts {
OffloadModuleOpts() {}
diff --git a/flang/lib/Frontend/FrontendActions.cpp b/flang/lib/Frontend/FrontendActions.cpp
index 6cc7808a30d8a0f..5069e429a42d3b5 100644
--- a/flang/lib/Frontend/FrontendActions.cpp
+++ b/flang/lib/Frontend/FrontendActions.cpp
@@ -713,10 +713,18 @@ void CodeGenAction::generateLLVMIR() {
pm.addPass(std::make_unique<Fortran::lower::VerifierPass>());
pm.enableVerifier(/*verifyPasses=*/true);
+ const auto targetOpts = ci.getInvocation().getTargetOpts();
+ const llvm::Triple triple(targetOpts.triple);
+
+ MLIRToLLVMPassPipelineConfig config(level);
+
+ config.StackArrays = opts.StackArrays;
+ config.Underscoring = opts.Underscoring;
+ config.LoopVersioning = opts.LoopVersioning;
+ config.DebugInfo = opts.getDebugInfo();
+
// Create the pass pipeline
- fir::createMLIRToLLVMPassPipeline(pm, level, opts.StackArrays,
- opts.Underscoring, opts.LoopVersioning,
- opts.getDebugInfo());
+ fir::createMLIRToLLVMPassPipeline(pm, config);
(void)mlir::applyPassManagerCLOptions(pm);
// run the pass manager
diff --git a/flang/tools/tco/tco.cpp b/flang/tools/tco/tco.cpp
index 9552d5c9af9e30b..31d6bac142dc421 100644
--- a/flang/tools/tco/tco.cpp
+++ b/flang/tools/tco/tco.cpp
@@ -17,6 +17,7 @@
#include "flang/Optimizer/Support/InitFIR.h"
#include "flang/Optimizer/Support/InternalNames.h"
#include "flang/Optimizer/Transforms/Passes.h"
+#include "flang/Tools/CrossToolHelpers.h"
#include "mlir/IR/AsmState.h"
#include "mlir/IR/BuiltinOps.h"
#include "mlir/IR/MLIRContext.h"
@@ -118,12 +119,13 @@ compileFIR(const mlir::PassPipelineCLParser &passPipeline) {
if (mlir::failed(passPipeline.addToPipeline(pm, errorHandler)))
return mlir::failure();
} else {
+ MLIRToLLVMPassPipelineConfig config(llvm::OptimizationLevel::O2);
if (codeGenLLVM) {
// Run only CodeGen passes.
- fir::createDefaultFIRCodeGenPassPipeline(pm);
+ fir::createDefaultFIRCodeGenPassPipeline(pm, config);
} else {
// Run tco with O2 by default.
- fir::createMLIRToLLVMPassPipeline(pm, llvm::OptimizationLevel::O2);
+ fir::createMLIRToLLVMPassPipeline(pm, config);
}
fir::addLLVMDialectToLLVMPass(pm, out.os());
}
``````````
</details>
https://github.com/llvm/llvm-project/pull/67792
More information about the flang-commits
mailing list