Skip to content

Commit 63b8f1c

Browse files
authored
[mlir] add a fluent API to GreedyRewriterConfig (llvm#132253)
This is similar to other configuration objects used across MLIR.
1 parent 860e884 commit 63b8f1c

30 files changed

+217
-162
lines changed

flang/lib/Optimizer/CodeGen/LowerRepackArrays.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -357,8 +357,8 @@ class LowerRepackArraysPass
357357
patterns.insert<PackArrayConversion>(context);
358358
patterns.insert<UnpackArrayConversion>(context);
359359
mlir::GreedyRewriteConfig config;
360-
config.enableRegionSimplification =
361-
mlir::GreedySimplifyRegionLevel::Disabled;
360+
config.setRegionSimplificationLevel(
361+
mlir::GreedySimplifyRegionLevel::Disabled);
362362
(void)applyPatternsGreedily(module, std::move(patterns), config);
363363
}
364364

flang/lib/Optimizer/HLFIR/Transforms/InlineElementals.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -119,8 +119,8 @@ class InlineElementalsPass
119119

120120
mlir::GreedyRewriteConfig config;
121121
// Prevent the pattern driver from merging blocks.
122-
config.enableRegionSimplification =
123-
mlir::GreedySimplifyRegionLevel::Disabled;
122+
config.setRegionSimplificationLevel(
123+
mlir::GreedySimplifyRegionLevel::Disabled);
124124

125125
mlir::RewritePatternSet patterns(context);
126126
patterns.insert<InlineElementalConversion>(context);

flang/lib/Optimizer/HLFIR/Transforms/InlineHLFIRAssign.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -135,8 +135,8 @@ class InlineHLFIRAssignPass
135135

136136
mlir::GreedyRewriteConfig config;
137137
// Prevent the pattern driver from merging blocks.
138-
config.enableRegionSimplification =
139-
mlir::GreedySimplifyRegionLevel::Disabled;
138+
config.setRegionSimplificationLevel(
139+
mlir::GreedySimplifyRegionLevel::Disabled);
140140

141141
mlir::RewritePatternSet patterns(context);
142142
patterns.insert<InlineHLFIRAssignConversion>(context);

flang/lib/Optimizer/HLFIR/Transforms/LowerHLFIRIntrinsics.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -557,8 +557,8 @@ class LowerHLFIRIntrinsics
557557
// Pattern rewriting only requires that the resulting IR is still valid
558558
mlir::GreedyRewriteConfig config;
559559
// Prevent the pattern driver from merging blocks
560-
config.enableRegionSimplification =
561-
mlir::GreedySimplifyRegionLevel::Disabled;
560+
config.setRegionSimplificationLevel(
561+
mlir::GreedySimplifyRegionLevel::Disabled);
562562

563563
if (mlir::failed(
564564
mlir::applyPatternsGreedily(module, std::move(patterns), config))) {

flang/lib/Optimizer/HLFIR/Transforms/OptimizedBufferization.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1327,8 +1327,8 @@ class OptimizedBufferizationPass
13271327

13281328
mlir::GreedyRewriteConfig config;
13291329
// Prevent the pattern driver from merging blocks
1330-
config.enableRegionSimplification =
1331-
mlir::GreedySimplifyRegionLevel::Disabled;
1330+
config.setRegionSimplificationLevel(
1331+
mlir::GreedySimplifyRegionLevel::Disabled);
13321332

13331333
mlir::RewritePatternSet patterns(context);
13341334
// TODO: right now the patterns are non-conflicting,

flang/lib/Optimizer/HLFIR/Transforms/SimplifyHLFIRIntrinsics.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1476,8 +1476,8 @@ class SimplifyHLFIRIntrinsics
14761476

14771477
mlir::GreedyRewriteConfig config;
14781478
// Prevent the pattern driver from merging blocks
1479-
config.enableRegionSimplification =
1480-
mlir::GreedySimplifyRegionLevel::Disabled;
1479+
config.setRegionSimplificationLevel(
1480+
mlir::GreedySimplifyRegionLevel::Disabled);
14811481

14821482
mlir::RewritePatternSet patterns(context);
14831483
patterns.insert<TransposeAsElementalConversion>(context);

flang/lib/Optimizer/Passes/Pipelines.cpp

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,8 @@ void addNestedPassToAllTopLevelOperationsConditionally(
3535

3636
void addCanonicalizerPassWithoutRegionSimplification(mlir::OpPassManager &pm) {
3737
mlir::GreedyRewriteConfig config;
38-
config.enableRegionSimplification = mlir::GreedySimplifyRegionLevel::Disabled;
38+
config.setRegionSimplificationLevel(
39+
mlir::GreedySimplifyRegionLevel::Disabled);
3940
pm.addPass(mlir::createCanonicalizerPass(config));
4041
}
4142

@@ -163,7 +164,8 @@ void createDefaultFIROptimizerPassPipeline(mlir::PassManager &pm,
163164

164165
// simplify the IR
165166
mlir::GreedyRewriteConfig config;
166-
config.enableRegionSimplification = mlir::GreedySimplifyRegionLevel::Disabled;
167+
config.setRegionSimplificationLevel(
168+
mlir::GreedySimplifyRegionLevel::Disabled);
167169
pm.addPass(mlir::createCSEPass());
168170
fir::addAVC(pm, pc.OptLevel);
169171
addNestedPassToAllTopLevelOperations<PassConstructor>(

flang/lib/Optimizer/Transforms/AssumedRankOpConversion.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -152,8 +152,8 @@ class AssumedRankOpConversion
152152
patterns.insert<ReboxAssumedRankConv>(context, &symbolTable, kindMap);
153153
patterns.insert<IsAssumedSizeConv>(context, &symbolTable, kindMap);
154154
mlir::GreedyRewriteConfig config;
155-
config.enableRegionSimplification =
156-
mlir::GreedySimplifyRegionLevel::Disabled;
155+
config.setRegionSimplificationLevel(
156+
mlir::GreedySimplifyRegionLevel::Disabled);
157157
(void)applyPatternsGreedily(mod, std::move(patterns), config);
158158
}
159159
};

flang/lib/Optimizer/Transforms/ConstantArgumentGlobalisation.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -168,9 +168,9 @@ class ConstantArgumentGlobalisationOpt
168168
auto *context = &getContext();
169169
mlir::RewritePatternSet patterns(context);
170170
mlir::GreedyRewriteConfig config;
171-
config.enableRegionSimplification =
172-
mlir::GreedySimplifyRegionLevel::Disabled;
173-
config.strictMode = mlir::GreedyRewriteStrictness::ExistingOps;
171+
config.setRegionSimplificationLevel(
172+
mlir::GreedySimplifyRegionLevel::Disabled);
173+
config.setStrictness(mlir::GreedyRewriteStrictness::ExistingOps);
174174

175175
patterns.insert<CallOpRewriter>(context, *di);
176176
if (mlir::failed(

flang/lib/Optimizer/Transforms/SimplifyFIROperations.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,8 @@ void SimplifyFIROperationsPass::runOnOperation() {
205205
fir::populateSimplifyFIROperationsPatterns(patterns,
206206
preferInlineImplementation);
207207
mlir::GreedyRewriteConfig config;
208-
config.enableRegionSimplification = mlir::GreedySimplifyRegionLevel::Disabled;
208+
config.setRegionSimplificationLevel(
209+
mlir::GreedySimplifyRegionLevel::Disabled);
209210

210211
if (mlir::failed(
211212
mlir::applyPatternsGreedily(module, std::move(patterns), config))) {

0 commit comments

Comments
 (0)