Fix greedy rewriter deprecation warnings

llvm · Jan 9, 2025 · 268f861 · 268f861
1 parent 54b7adb
commit 268f861
Show file tree

Hide file tree

Showing 11 changed files with 22 additions and 26 deletions.
diff --git a/lib/Conversion/LoopScheduleToCalyx/LoopScheduleToCalyx.cpp b/lib/Conversion/LoopScheduleToCalyx/LoopScheduleToCalyx.cpp
@@ -1510,11 +1510,10 @@ class LoopScheduleToCalyxPass
     if (runOnce)
       config.maxIterations = 1;
 
-    /// Can't return applyPatternsAndFoldGreedily. Root isn't
+    /// Can't return applyPatternsGreedily. Root isn't
     /// necessarily erased so it will always return failed(). Instead,
     /// forward the 'succeeded' value from PartialLoweringPatternBase.
-    (void)applyPatternsAndFoldGreedily(getOperation(), std::move(pattern),
-                                       config);
+    (void)applyPatternsGreedily(getOperation(), std::move(pattern), config);
     return partialPatternRes;
   }
 
@@ -1642,8 +1641,8 @@ void LoopScheduleToCalyxPass::runOnOperation() {
   RewritePatternSet cleanupPatterns(&getContext());
   cleanupPatterns.add<calyx::MultipleGroupDonePattern,
                       calyx::NonTerminatingGroupDonePattern>(&getContext());
-  if (failed(applyPatternsAndFoldGreedily(getOperation(),
-                                          std::move(cleanupPatterns)))) {
+  if (failed(
+          applyPatternsGreedily(getOperation(), std::move(cleanupPatterns)))) {
     signalPassFailure();
     return;
   }

diff --git a/lib/Conversion/SCFToCalyx/SCFToCalyx.cpp b/lib/Conversion/SCFToCalyx/SCFToCalyx.cpp
@@ -2491,11 +2491,10 @@ class SCFToCalyxPass : public circt::impl::SCFToCalyxBase<SCFToCalyxPass> {
     if (runOnce)
       config.maxIterations = 1;
 
-    /// Can't return applyPatternsAndFoldGreedily. Root isn't
+    /// Can't return applyPatternsGreedily. Root isn't
     /// necessarily erased so it will always return failed(). Instead,
     /// forward the 'succeeded' value from PartialLoweringPatternBase.
-    (void)applyPatternsAndFoldGreedily(getOperation(), std::move(pattern),
-                                       config);
+    (void)applyPatternsGreedily(getOperation(), std::move(pattern), config);
     return partialPatternRes;
   }
 
@@ -2818,8 +2817,8 @@ void SCFToCalyxPass::runOnOperation() {
   RewritePatternSet cleanupPatterns(&getContext());
   cleanupPatterns.add<calyx::MultipleGroupDonePattern,
                       calyx::NonTerminatingGroupDonePattern>(&getContext());
-  if (failed(applyPatternsAndFoldGreedily(getOperation(),
-                                          std::move(cleanupPatterns)))) {
+  if (failed(
+          applyPatternsGreedily(getOperation(), std::move(cleanupPatterns)))) {
     signalPassFailure();
     return;
   }

diff --git a/lib/Dialect/AIG/Transforms/LowerVariadic.cpp b/lib/Dialect/AIG/Transforms/LowerVariadic.cpp
@@ -100,6 +100,6 @@ void LowerVariadicPass::runOnOperation() {
   populateLowerVariadicPatterns(patterns);
   mlir::FrozenRewritePatternSet frozen(std::move(patterns));
 
-  if (failed(mlir::applyPatternsAndFoldGreedily(getOperation(), frozen)))
+  if (failed(mlir::applyPatternsGreedily(getOperation(), frozen)))
     return signalPassFailure();
 }
diff --git a/lib/Dialect/AIG/Transforms/LowerWordToBits.cpp b/lib/Dialect/AIG/Transforms/LowerWordToBits.cpp
@@ -97,7 +97,7 @@ void LowerWordToBitsPass::runOnOperation() {
   // Use top-down traversal to reuse bits from `comb.concat`.
   config.useTopDownTraversal = true;
 
-  if (failed(mlir::applyPatternsAndFoldGreedily(getOperation(), frozenPatterns,
-                                                config)))
+  if (failed(
+          mlir::applyPatternsGreedily(getOperation(), frozenPatterns, config)))
     return signalPassFailure();
 }
diff --git a/lib/Dialect/Arc/Transforms/ArcCanonicalizer.cpp b/lib/Dialect/Arc/Transforms/ArcCanonicalizer.cpp
@@ -802,8 +802,8 @@ void ArcCanonicalizerPass::runOnOperation() {
   symbolPatterns.add<MemWritePortEnableAndMaskCanonicalizer>(
       &getContext(), cache, names, statistics, arcMapping);
 
-  if (failed(mlir::applyPatternsAndFoldGreedily(
-          getOperation(), std::move(symbolPatterns), config)))
+  if (failed(mlir::applyPatternsGreedily(getOperation(),
+                                         std::move(symbolPatterns), config)))
     return signalPassFailure();
 
   numArcArgsRemoved = statistics.removeUnusedArcArgumentsPatternNumArgsRemoved;
@@ -817,8 +817,8 @@ void ArcCanonicalizerPass::runOnOperation() {
                KeepOneVecOp>(&getContext());
 
   // Don't test for convergence since it is often not reached.
-  (void)mlir::applyPatternsAndFoldGreedily(getOperation(), std::move(patterns),
-                                           config);
+  (void)mlir::applyPatternsGreedily(getOperation(), std::move(patterns),
+                                    config);
 }
 
 std::unique_ptr<mlir::Pass> arc::createArcCanonicalizerPass() {

diff --git a/lib/Dialect/Arc/Transforms/LatencyRetiming.cpp b/lib/Dialect/Arc/Transforms/LatencyRetiming.cpp
@@ -198,7 +198,7 @@ void LatencyRetimingPass::runOnOperation() {
   RewritePatternSet patterns(&getContext());
   patterns.add<LatencyRetimingPattern>(&getContext(), cache, statistics);
 
-  if (failed(applyPatternsAndFoldGreedily(getOperation(), std::move(patterns))))
+  if (failed(applyPatternsGreedily(getOperation(), std::move(patterns))))
     return signalPassFailure();
 
   numOpsRemoved = statistics.numOpsRemoved;

diff --git a/lib/Dialect/ESI/Passes/ESILowerBundles.cpp b/lib/Dialect/ESI/Passes/ESILowerBundles.cpp
@@ -220,8 +220,7 @@ void ESIBundlesPass::runOnOperation() {
   RewritePatternSet patterns(&ctxt);
   PackBundleOp::getCanonicalizationPatterns(patterns, &ctxt);
   UnpackBundleOp::getCanonicalizationPatterns(patterns, &ctxt);
-  if (failed(mlir::applyPatternsAndFoldGreedily(getOperation(),
-                                                std::move(patterns))))
+  if (failed(mlir::applyPatternsGreedily(getOperation(), std::move(patterns))))
     signalPassFailure();
 
   top.walk([&](PackBundleOp pack) {

diff --git a/lib/Dialect/FIRRTL/Transforms/Vectorization.cpp b/lib/Dialect/FIRRTL/Transforms/Vectorization.cpp
@@ -96,7 +96,7 @@ void VectorizationPass::runOnOperation() {
               VectorCreateToLogicElementwise<XorPrimOp, ElementwiseXorPrimOp>>(
           &getContext());
   mlir::FrozenRewritePatternSet frozenPatterns(std::move(patterns));
-  (void)applyPatternsAndFoldGreedily(getOperation(), frozenPatterns);
+  (void)applyPatternsGreedily(getOperation(), frozenPatterns);
 }
 
 std::unique_ptr<mlir::Pass> circt::firrtl::createVectorizationPass() {

diff --git a/lib/Dialect/Handshake/Transforms/SplitMerges.cpp b/lib/Dialect/Handshake/Transforms/SplitMerges.cpp
@@ -132,8 +132,7 @@ struct HandshakeSplitMerges
     patterns.insert<DeconstructCMergePattern, DeconstructMergePattern>(
         &getContext());
 
-    if (failed(
-            applyPatternsAndFoldGreedily(getOperation(), std::move(patterns))))
+    if (failed(applyPatternsGreedily(getOperation(), std::move(patterns))))
       signalPassFailure();
   };
 };

diff --git a/lib/Dialect/Verif/Transforms/LowerFormalToHW.cpp b/lib/Dialect/Verif/Transforms/LowerFormalToHW.cpp
@@ -71,6 +71,6 @@ void LowerFormalToHWPass::runOnOperation() {
   RewritePatternSet patterns(&getContext());
   patterns.add<FormalOpRewritePattern>(patterns.getContext());
 
-  if (failed(applyPatternsAndFoldGreedily(getOperation(), std::move(patterns))))
+  if (failed(applyPatternsGreedily(getOperation(), std::move(patterns))))
     signalPassFailure();
 }
diff --git a/lib/Transforms/MemoryBanking.cpp b/lib/Transforms/MemoryBanking.cpp
@@ -373,8 +373,8 @@ void MemoryBankingPass::runOnOperation() {
 
   GreedyRewriteConfig config;
   config.strictMode = GreedyRewriteStrictness::ExistingOps;
-  if (failed(applyPatternsAndFoldGreedily(getOperation(), std::move(patterns),
-                                          config))) {
+  if (failed(
+          applyPatternsGreedily(getOperation(), std::move(patterns), config))) {
     signalPassFailure();
   }