Disable region simplification (#197)

Region simplification is used in many places where it will not yield a
tangible improvement in the IR and comes with a performance cost.

Author: taalexander

lib/Dialect/Pulse/Transforms/MergeDelays.cpp

@@ -99,7 +99,12 @@ void MergeDelayPass::runOnOperation() {
   RewritePatternSet patterns(&getContext());
   patterns.add<DelayAndDelayPattern>(&getContext());
 
-  if (failed(applyPatternsAndFoldGreedily(operation, std::move(patterns))))
+  mlir::GreedyRewriteConfig config;
+  // Disable to improve performance
+  config.enableRegionSimplification = false;
+
+  if (failed(
+          applyPatternsAndFoldGreedily(operation, std::move(patterns), config)))
     signalPassFailure();
 
 } // runOnOperation

lib/Dialect/Pulse/Transforms/RemoveUnusedArguments.cpp

@@ -109,7 +109,12 @@ void RemoveUnusedArgumentsPass::runOnOperation() {
 
   patterns.add<RemoveUnusedArgumentsPattern>(&getContext());
 
-  if (failed(applyPatternsAndFoldGreedily(getOperation(), std::move(patterns))))
+  mlir::GreedyRewriteConfig config;
+  // Disable to improve performance
+  config.enableRegionSimplification = false;
+
+  if (failed(applyPatternsAndFoldGreedily(getOperation(), std::move(patterns),
+                                          config)))
     signalPassFailure();
 }
 

lib/Dialect/QUIR/Transforms/AngleConversion.cpp

@@ -84,8 +84,12 @@ void QUIRAngleConversionPass::runOnOperation() {
   RewritePatternSet patterns(&getContext());
   patterns.add<AngleConversion>(&getContext(), functionOps);
 
-  if (failed(
-          applyPatternsAndFoldGreedily(getOperation(), std::move(patterns)))) {
+  mlir::GreedyRewriteConfig config;
+  // Disable to improve performance
+  config.enableRegionSimplification = false;
+
+  if (failed(applyPatternsAndFoldGreedily(getOperation(), std::move(patterns),
+                                          config))) {
     ; // TODO why would this call to applyPatternsAndFoldGreedily fail?
       // signalPassFailure();
   }

lib/Dialect/QUIR/Transforms/BreakReset.cpp

@@ -115,6 +115,8 @@ void BreakResetPass::runOnOperation() {
   // use cheaper top-down traversal (in this case, bottom-up would not behave
   // any differently)
   config.useTopDownTraversal = true;
+  // Disable to improve performance
+  config.enableRegionSimplification = false;
 
   patterns.add<BreakResetsPattern>(&getContext(), numIterations, delayCycles);
 

lib/Dialect/QUIR/Transforms/MergeCircuits.cpp

@@ -394,8 +394,12 @@ void MergeCircuitsPass::runOnOperation() {
   patterns.add<BarrierAndCircuitPattern>(&getContext());
   patterns.add<CircuitAndBarrierPattern>(&getContext());
 
-  if (failed(
-          applyPatternsAndFoldGreedily(moduleOperation, std::move(patterns))))
+  mlir::GreedyRewriteConfig config;
+  // Disable to improve performance
+  config.enableRegionSimplification = false;
+
+  if (failed(applyPatternsAndFoldGreedily(moduleOperation, std::move(patterns),
+                                          config)))
     signalPassFailure();
 } // runOnOperation
 

lib/Dialect/QUIR/Transforms/MergeMeasures.cpp

@@ -109,8 +109,12 @@ void MergeMeasuresLexographicalPass::runOnOperation() {
   RewritePatternSet patterns(&getContext());
   patterns.add<MeasureAndMeasureLexographicalPattern>(&getContext());
 
-  if (failed(
-          applyPatternsAndFoldGreedily(moduleOperation, std::move(patterns))))
+  mlir::GreedyRewriteConfig config;
+  // Disable to improve performance
+  config.enableRegionSimplification = false;
+
+  if (failed(applyPatternsAndFoldGreedily(moduleOperation, std::move(patterns),
+                                          config)))
     signalPassFailure();
 } // runOnOperation
 
@@ -175,8 +179,12 @@ void MergeMeasuresTopologicalPass::runOnOperation() {
   RewritePatternSet patterns(&getContext());
   patterns.add<MeasureAndMeasureTopologicalPattern>(&getContext());
 
-  if (failed(
-          applyPatternsAndFoldGreedily(moduleOperation, std::move(patterns))))
+  mlir::GreedyRewriteConfig config;
+  // Disable to improve performance
+  config.enableRegionSimplification = false;
+
+  if (failed(applyPatternsAndFoldGreedily(moduleOperation, std::move(patterns),
+                                          config)))
     signalPassFailure();
 } // runOnOperation
 

lib/Dialect/QUIR/Transforms/MergeParallelResets.cpp

@@ -95,6 +95,8 @@ void MergeResetsLexicographicPass::runOnOperation() {
   // use cheaper top-down traversal (in this case, bottom-up would not behave
   // any differently)
   config.useTopDownTraversal = true;
+  // Disable to improve performance
+  config.enableRegionSimplification = false;
 
   patterns.add<MergeResetsLexicographicPattern>(&getContext());
 
@@ -203,6 +205,8 @@ void MergeResetsTopologicalPass::runOnOperation() {
   // use cheaper top-down traversal (in this case, bottom-up would not behave
   // any differently)
   config.useTopDownTraversal = true;
+  // Disable to improve performance
+  config.enableRegionSimplification = false;
 
   patterns.add<MergeResetsTopologicalPattern>(&getContext());
 

lib/Dialect/QUIR/Transforms/ReorderCircuits.cpp

@@ -89,8 +89,12 @@ void ReorderCircuitsPass::runOnOperation() {
   // only run this pass on call_circuits within the main body of the program
   // there may be call_circuits within circuits that have not been properly
   // labeled with their qubit arguments
+  mlir::GreedyRewriteConfig config;
+  // Disable to improve performance
+  config.enableRegionSimplification = false;
 
-  if (failed(applyPatternsAndFoldGreedily(mainFunc, std::move(patterns))))
+  if (failed(
+          applyPatternsAndFoldGreedily(mainFunc, std::move(patterns), config)))
     signalPassFailure();
 } // runOnOperation
 

lib/Dialect/QUIR/Transforms/ReorderMeasurements.cpp

@@ -213,8 +213,12 @@ void ReorderMeasurementsPass::runOnOperation() {
   RewritePatternSet patterns(&getContext());
   patterns.add<ReorderMeasureAndNonMeasurePat>(&getContext());
 
-  if (failed(
-          applyPatternsAndFoldGreedily(moduleOperation, std::move(patterns))))
+  mlir::GreedyRewriteConfig config;
+  // Disable to improve performance
+  config.enableRegionSimplification = false;
+
+  if (failed(applyPatternsAndFoldGreedily(moduleOperation, std::move(patterns),
+                                          config)))
     signalPassFailure();
 } // runOnOperation
 

lib/Dialect/QUIR/Transforms/UnusedVariable.cpp

@@ -81,6 +81,9 @@ void UnusedVariablePass::runOnOperation() {
   // use cheaper top-down traversal (in this case, bottom-up would not behave
   // any differently)
   config.useTopDownTraversal = true;
+  // Disable to improve performance
+  config.enableRegionSimplification = false;
+
   patterns.add<UnusedVariablePat>(&getContext(), symbolUsers);
 
   if (failed(applyPatternsAndFoldGreedily(getOperation(), std::move(patterns),