Remove the fixed point iteration in the global opt pipeline. (#17049)
This will make it easier to move the const eval out of the pipeline and
lower down in the compilation stack so that we can do it once we have
placed globals on devices. This didn't seem to change any benchmark
numbers and produced largely the same IR for several test models.
diff --git a/compiler/src/iree/compiler/GlobalOptimization/Passes.cpp b/compiler/src/iree/compiler/GlobalOptimization/Passes.cpp
index 7349145..6ddc739 100644
--- a/compiler/src/iree/compiler/GlobalOptimization/Passes.cpp
+++ b/compiler/src/iree/compiler/GlobalOptimization/Passes.cpp
@@ -168,28 +168,46 @@
.addPass(mlir::createCanonicalizerPass)
.addPass(mlir::createCSEPass);
- OpPassManager pipeline(ModuleOp::getOperationName());
- FunctionLikeNest(pipeline)
- // Simplify util.global accesses early on; this can help with dispatch
- // region formation as redundant store-loads are removed.
+ // Simplify util.global accesses early on; this can help with dispatch
+ // region formation as redundant store-loads are removed.
+ FunctionLikeNest(mainPassManager)
.addPass(IREE::Util::createSimplifyGlobalAccessesPass);
// Module level cleanup and canonicalization of util.global (and other
// util ops).
- pipeline.addPass(IREE::Util::createApplyPatternsPass());
- pipeline.addPass(IREE::Util::createFoldGlobalsPass());
- pipeline.addPass(IREE::Util::createIPOPass());
- pipeline.addPass(createCanonicalizerPass());
- pipeline.addPass(createCSEPass());
+ mainPassManager.addPass(IREE::Util::createApplyPatternsPass());
+ mainPassManager.addPass(IREE::Util::createFoldGlobalsPass());
+ mainPassManager.addPass(IREE::Util::createIPOPass());
+ mainPassManager.addPass(createCanonicalizerPass());
+ mainPassManager.addPass(createCSEPass());
if (transformOptions.options.constExprHoisting) {
- buildGlobalOptExprHoistingPassPipeline(pipeline, transformOptions);
+ buildGlobalOptExprHoistingPassPipeline(mainPassManager, transformOptions);
}
if (transformOptions.buildConstEvalPassPipeline) {
- transformOptions.buildConstEvalPassPipeline(pipeline);
+ transformOptions.buildConstEvalPassPipeline(mainPassManager);
}
+ if (transformOptions.options.numericPrecisionReduction) {
+ mainPassManager.addPass(createInferNumericNarrowingPass());
+ mainPassManager.addPass(createOptimizeNumericsPass());
+ mainPassManager.addPass(createCleanupNumericNarrowingPass());
+ }
+
+ FunctionLikeNest(mainPassManager)
+ .addPass(mlir::createCanonicalizerPass)
+ .addPass(mlir::createCSEPass);
+
+ FunctionLikeNest(mainPassManager)
+ // After running const-eval to a fixed point and folding unit extent dims,
+ // try any new raising opportunities.
+ .addPass(createRaiseSpecialOps)
+ // Strip std.assert & co after we perform optimizations; prior to this we
+ // may use the assertions to derive information during analysis.
+ .addPredicatedPass(transformOptions.options.stripAssertions,
+ IREE::Util::createStripDebugOpsPass);
+
// Export after const-eval. If the user wants to keep the input constants
// as is in the final parameter archive, they will probably want to disable
// const-eval, or could run this pass as preprocessing. There might be a
@@ -205,7 +223,7 @@
transformOptions.options.parameterExportScope;
exportParametersOptions.minimumSize =
transformOptions.options.minimumParameterExportSize;
- pipeline.addPass(IREE::IO::Parameters::createExportParametersPass(
+ mainPassManager.addPass(IREE::IO::Parameters::createExportParametersPass(
exportParametersOptions));
}
@@ -214,33 +232,10 @@
generateSplatOptions;
generateSplatOptions.archivePath =
transformOptions.options.splatParameterArchiveExportPath;
- pipeline.addPass(
+ mainPassManager.addPass(
IREE::IO::Parameters::createGenerateSplatParameterArchivePass(
generateSplatOptions));
}
-
- if (transformOptions.options.numericPrecisionReduction) {
- pipeline.addPass(createInferNumericNarrowingPass());
- pipeline.addPass(createOptimizeNumericsPass());
- pipeline.addPass(createCleanupNumericNarrowingPass());
- }
-
- FunctionLikeNest(pipeline)
- .addPass(mlir::createCanonicalizerPass)
- .addPass(mlir::createCSEPass);
-
- // Add the whole fixed point iterator.
- mainPassManager.addPass(
- IREE::Util::createFixedPointIteratorPass(std::move(pipeline)));
-
- FunctionLikeNest(mainPassManager)
- // After running const-eval to a fixed point and folding unit extent dims,
- // try any new raising opportunities.
- .addPass(createRaiseSpecialOps)
- // Strip std.assert & co after we perform optimizations; prior to this we
- // may use the assertions to derive information during analysis.
- .addPredicatedPass(transformOptions.options.stripAssertions,
- IREE::Util::createStripDebugOpsPass);
}
namespace {
