From 268f8614d622df780b8c3bbda8799a2cda76df27 Mon Sep 17 00:00:00 2001 From: Martin Erhart Date: Thu, 9 Jan 2025 13:39:47 +0100 Subject: [PATCH] Fix greedy rewriter deprecation warnings --- .../LoopScheduleToCalyx/LoopScheduleToCalyx.cpp | 9 ++++----- lib/Conversion/SCFToCalyx/SCFToCalyx.cpp | 9 ++++----- lib/Dialect/AIG/Transforms/LowerVariadic.cpp | 2 +- lib/Dialect/AIG/Transforms/LowerWordToBits.cpp | 4 ++-- lib/Dialect/Arc/Transforms/ArcCanonicalizer.cpp | 8 ++++---- lib/Dialect/Arc/Transforms/LatencyRetiming.cpp | 2 +- lib/Dialect/ESI/Passes/ESILowerBundles.cpp | 3 +-- lib/Dialect/FIRRTL/Transforms/Vectorization.cpp | 2 +- lib/Dialect/Handshake/Transforms/SplitMerges.cpp | 3 +-- lib/Dialect/Verif/Transforms/LowerFormalToHW.cpp | 2 +- lib/Transforms/MemoryBanking.cpp | 4 ++-- 11 files changed, 22 insertions(+), 26 deletions(-) diff --git a/lib/Conversion/LoopScheduleToCalyx/LoopScheduleToCalyx.cpp b/lib/Conversion/LoopScheduleToCalyx/LoopScheduleToCalyx.cpp index 06d3357a3903..c7ea6889bff3 100644 --- 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(&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 index cb35aa8984fa..d9779eff8aa2 100644 --- a/lib/Conversion/SCFToCalyx/SCFToCalyx.cpp +++ b/lib/Conversion/SCFToCalyx/SCFToCalyx.cpp @@ -2491,11 +2491,10 @@ class SCFToCalyxPass : public circt::impl::SCFToCalyxBase { 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(&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 index a5983a89b81b..8590fd06df12 100644 --- 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 index 27cee5ebe7be..20ea3f96d948 100644 --- 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 index d5dbde51af1c..c97826be7e2c 100644 --- a/lib/Dialect/Arc/Transforms/ArcCanonicalizer.cpp +++ b/lib/Dialect/Arc/Transforms/ArcCanonicalizer.cpp @@ -802,8 +802,8 @@ void ArcCanonicalizerPass::runOnOperation() { symbolPatterns.add( &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 arc::createArcCanonicalizerPass() { diff --git a/lib/Dialect/Arc/Transforms/LatencyRetiming.cpp b/lib/Dialect/Arc/Transforms/LatencyRetiming.cpp index 6c4fa04f948f..bbae40ce50e0 100644 --- 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(&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 index 15df675103c0..b5b71b248061 100644 --- 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 index 068968270863..e3c938fda7b5 100644 --- a/lib/Dialect/FIRRTL/Transforms/Vectorization.cpp +++ b/lib/Dialect/FIRRTL/Transforms/Vectorization.cpp @@ -96,7 +96,7 @@ void VectorizationPass::runOnOperation() { VectorCreateToLogicElementwise>( &getContext()); mlir::FrozenRewritePatternSet frozenPatterns(std::move(patterns)); - (void)applyPatternsAndFoldGreedily(getOperation(), frozenPatterns); + (void)applyPatternsGreedily(getOperation(), frozenPatterns); } std::unique_ptr circt::firrtl::createVectorizationPass() { diff --git a/lib/Dialect/Handshake/Transforms/SplitMerges.cpp b/lib/Dialect/Handshake/Transforms/SplitMerges.cpp index f6689cca2591..fe14184a594c 100644 --- a/lib/Dialect/Handshake/Transforms/SplitMerges.cpp +++ b/lib/Dialect/Handshake/Transforms/SplitMerges.cpp @@ -132,8 +132,7 @@ struct HandshakeSplitMerges patterns.insert( &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 index f86e8b88f60a..6096bfd64bfc 100644 --- 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(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 index 2337d2ae6874..5ddd03c5d664 100644 --- 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(); }