[flang-commits] [flang] 02540b2 - [mlir][nfc] Remove `TrivialPatternRewriter`s (#155248)
via flang-commits
flang-commits at lists.llvm.org
Mon Aug 25 08:50:20 PDT 2025
Author: Ivan Butygin
Date: 2025-08-25T18:50:17+03:00
New Revision: 02540b2ccf94a541848094fcb97b2207668d0f87
URL: https://github.com/llvm/llvm-project/commit/02540b2ccf94a541848094fcb97b2207668d0f87
DIFF: https://github.com/llvm/llvm-project/commit/02540b2ccf94a541848094fcb97b2207668d0f87.diff
LOG: [mlir][nfc] Remove `TrivialPatternRewriter`s (#155248)
These are relics from the times when `PatternRewriter` was not
instantiable directly, I suppose.
Added:
Modified:
flang/lib/Optimizer/Transforms/SimplifyRegionLite.cpp
mlir/lib/Dialect/Linalg/TransformOps/LinalgTransformOps.cpp
mlir/lib/Dialect/Transform/PDLExtension/PDLExtensionOps.cpp
mlir/unittests/Rewrite/PatternBenefit.cpp
Removed:
################################################################################
diff --git a/flang/lib/Optimizer/Transforms/SimplifyRegionLite.cpp b/flang/lib/Optimizer/Transforms/SimplifyRegionLite.cpp
index 7d1f86f8cee94..0cd2858ab5e75 100644
--- a/flang/lib/Optimizer/Transforms/SimplifyRegionLite.cpp
+++ b/flang/lib/Optimizer/Transforms/SimplifyRegionLite.cpp
@@ -26,22 +26,16 @@ class SimplifyRegionLitePass
public:
void runOnOperation() override;
};
-
-class DummyRewriter : public mlir::PatternRewriter {
-public:
- DummyRewriter(mlir::MLIRContext *ctx) : mlir::PatternRewriter(ctx) {}
-};
-
} // namespace
void SimplifyRegionLitePass::runOnOperation() {
auto op = getOperation();
auto regions = op->getRegions();
mlir::RewritePatternSet patterns(op.getContext());
- DummyRewriter rewriter(op.getContext());
if (regions.empty())
return;
+ mlir::PatternRewriter rewriter(op.getContext());
(void)mlir::eraseUnreachableBlocks(rewriter, regions);
(void)mlir::runRegionDCE(rewriter, regions);
}
diff --git a/mlir/lib/Dialect/Linalg/TransformOps/LinalgTransformOps.cpp b/mlir/lib/Dialect/Linalg/TransformOps/LinalgTransformOps.cpp
index 639e0feabc9bd..f0c1f4485b054 100644
--- a/mlir/lib/Dialect/Linalg/TransformOps/LinalgTransformOps.cpp
+++ b/mlir/lib/Dialect/Linalg/TransformOps/LinalgTransformOps.cpp
@@ -70,12 +70,7 @@ static FailureOr<LinalgOp> tryApply(Operation *operation, Args &&...args) {
PatternTy pattern(operation->getContext(), std::forward<Args>(args)...);
// We want to discourage direct use of PatternRewriter in APIs but In this
// very specific case, an IRRewriter is not enough.
- struct TrivialPatternRewriter : public PatternRewriter {
- public:
- explicit TrivialPatternRewriter(MLIRContext *context)
- : PatternRewriter(context) {}
- };
- TrivialPatternRewriter rewriter(operation->getContext());
+ PatternRewriter rewriter(operation->getContext());
rewriter.setInsertionPoint(operation);
auto result = pattern.returningMatchAndRewrite(op, rewriter);
if (failed(result))
diff --git a/mlir/lib/Dialect/Transform/PDLExtension/PDLExtensionOps.cpp b/mlir/lib/Dialect/Transform/PDLExtension/PDLExtensionOps.cpp
index 41955c8a278f2..3ced1a6582ce3 100644
--- a/mlir/lib/Dialect/Transform/PDLExtension/PDLExtensionOps.cpp
+++ b/mlir/lib/Dialect/Transform/PDLExtension/PDLExtensionOps.cpp
@@ -100,12 +100,7 @@ LogicalResult PatternApplicatorExtension::findAllMatches(
PatternApplicator applicator(it->second);
// We want to discourage direct use of PatternRewriter in APIs but In this
// very specific case, an IRRewriter is not enough.
- struct TrivialPatternRewriter : public PatternRewriter {
- public:
- explicit TrivialPatternRewriter(MLIRContext *context)
- : PatternRewriter(context) {}
- };
- TrivialPatternRewriter rewriter(root->getContext());
+ PatternRewriter rewriter(root->getContext());
applicator.applyDefaultCostModel();
root->walk([&](Operation *op) {
if (succeeded(applicator.matchAndRewrite(op, rewriter)))
diff --git a/mlir/unittests/Rewrite/PatternBenefit.cpp b/mlir/unittests/Rewrite/PatternBenefit.cpp
index 65ea4ee6683db..e4363f9f4b8bb 100644
--- a/mlir/unittests/Rewrite/PatternBenefit.cpp
+++ b/mlir/unittests/Rewrite/PatternBenefit.cpp
@@ -66,12 +66,7 @@ TEST(PatternBenefitTest, BenefitOrder) {
PatternApplicator pa(frozenPatterns);
pa.applyDefaultCostModel();
- class MyPatternRewriter : public PatternRewriter {
- public:
- MyPatternRewriter(MLIRContext *ctx) : PatternRewriter(ctx) {}
- };
-
- MyPatternRewriter rewriter(&context);
+ PatternRewriter rewriter(&context);
(void)pa.matchAndRewrite(*module, rewriter);
EXPECT_TRUE(called1);
More information about the flang-commits
mailing list