Skip to content

Commit 370a6f0

Browse files
committed
[MLIR] Make the ConversionTarget const ref in the DialectConversion (NFC)
It isn't mutated during the conversion already, communicate this through the API. Differential Revision: https://reviews.llvm.org/D157199
1 parent 3e2e10b commit 370a6f0

File tree

2 files changed

+14
-14
lines changed

2 files changed

+14
-14
lines changed

mlir/include/mlir/Transforms/DialectConversion.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1068,11 +1068,11 @@ void registerConversionPDLFunctions(RewritePatternSet &patterns);
10681068
/// there is an op explicitly marked as illegal, the conversion terminates and
10691069
/// the `unconvertedOps` set will not necessarily be complete.)
10701070
LogicalResult
1071-
applyPartialConversion(ArrayRef<Operation *> ops, ConversionTarget &target,
1071+
applyPartialConversion(ArrayRef<Operation *> ops, const ConversionTarget &target,
10721072
const FrozenRewritePatternSet &patterns,
10731073
DenseSet<Operation *> *unconvertedOps = nullptr);
10741074
LogicalResult
1075-
applyPartialConversion(Operation *op, ConversionTarget &target,
1075+
applyPartialConversion(Operation *op, const ConversionTarget &target,
10761076
const FrozenRewritePatternSet &patterns,
10771077
DenseSet<Operation *> *unconvertedOps = nullptr);
10781078

@@ -1081,9 +1081,9 @@ applyPartialConversion(Operation *op, ConversionTarget &target,
10811081
/// fails, or if there are unreachable blocks in any of the regions nested
10821082
/// within 'ops'.
10831083
LogicalResult applyFullConversion(ArrayRef<Operation *> ops,
1084-
ConversionTarget &target,
1084+
const ConversionTarget &target,
10851085
const FrozenRewritePatternSet &patterns);
1086-
LogicalResult applyFullConversion(Operation *op, ConversionTarget &target,
1086+
LogicalResult applyFullConversion(Operation *op, const ConversionTarget &target,
10871087
const FrozenRewritePatternSet &patterns);
10881088

10891089
/// Apply an analysis conversion on the given operations, and all nested

mlir/lib/Transforms/Utils/DialectConversion.cpp

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1677,7 +1677,7 @@ class OperationLegalizer {
16771677
public:
16781678
using LegalizationAction = ConversionTarget::LegalizationAction;
16791679

1680-
OperationLegalizer(ConversionTarget &targetInfo,
1680+
OperationLegalizer(const ConversionTarget &targetInfo,
16811681
const FrozenRewritePatternSet &patterns);
16821682

16831683
/// Returns true if the given operation is known to be illegal on the target.
@@ -1688,7 +1688,7 @@ class OperationLegalizer {
16881688
LogicalResult legalize(Operation *op, ConversionPatternRewriter &rewriter);
16891689

16901690
/// Returns the conversion target in use by the legalizer.
1691-
ConversionTarget &getTarget() { return target; }
1691+
const ConversionTarget &getTarget() { return target; }
16921692

16931693
private:
16941694
/// Attempt to legalize the given operation by folding it.
@@ -1766,14 +1766,14 @@ class OperationLegalizer {
17661766
SmallPtrSet<const Pattern *, 8> appliedPatterns;
17671767

17681768
/// The legalization information provided by the target.
1769-
ConversionTarget &target;
1769+
const ConversionTarget &target;
17701770

17711771
/// The pattern applicator to use for conversions.
17721772
PatternApplicator applicator;
17731773
};
17741774
} // namespace
17751775

1776-
OperationLegalizer::OperationLegalizer(ConversionTarget &targetInfo,
1776+
OperationLegalizer::OperationLegalizer(const ConversionTarget &targetInfo,
17771777
const FrozenRewritePatternSet &patterns)
17781778
: target(targetInfo), applicator(patterns) {
17791779
// The set of patterns that can be applied to illegal operations to transform
@@ -2302,7 +2302,7 @@ enum OpConversionMode {
23022302
// rewrite patterns. The conversion behaves differently depending on the
23032303
// conversion mode.
23042304
struct OperationConverter {
2305-
explicit OperationConverter(ConversionTarget &target,
2305+
explicit OperationConverter(const ConversionTarget &target,
23062306
const FrozenRewritePatternSet &patterns,
23072307
OpConversionMode mode,
23082308
DenseSet<Operation *> *trackedOps = nullptr)
@@ -2393,7 +2393,7 @@ LogicalResult OperationConverter::convertOperations(
23932393
function_ref<void(Diagnostic &)> notifyCallback) {
23942394
if (ops.empty())
23952395
return success();
2396-
ConversionTarget &target = opLegalizer.getTarget();
2396+
const ConversionTarget &target = opLegalizer.getTarget();
23972397

23982398
// Compute the set of operations and blocks to convert.
23992399
SmallVector<Operation *> toConvert;
@@ -3366,15 +3366,15 @@ void mlir::registerConversionPDLFunctions(RewritePatternSet &patterns) {
33663366

33673367
LogicalResult
33683368
mlir::applyPartialConversion(ArrayRef<Operation *> ops,
3369-
ConversionTarget &target,
3369+
const ConversionTarget &target,
33703370
const FrozenRewritePatternSet &patterns,
33713371
DenseSet<Operation *> *unconvertedOps) {
33723372
OperationConverter opConverter(target, patterns, OpConversionMode::Partial,
33733373
unconvertedOps);
33743374
return opConverter.convertOperations(ops);
33753375
}
33763376
LogicalResult
3377-
mlir::applyPartialConversion(Operation *op, ConversionTarget &target,
3377+
mlir::applyPartialConversion(Operation *op, const ConversionTarget &target,
33783378
const FrozenRewritePatternSet &patterns,
33793379
DenseSet<Operation *> *unconvertedOps) {
33803380
return applyPartialConversion(llvm::ArrayRef(op), target, patterns,
@@ -3385,13 +3385,13 @@ mlir::applyPartialConversion(Operation *op, ConversionTarget &target,
33853385
// Full Conversion
33863386

33873387
LogicalResult
3388-
mlir::applyFullConversion(ArrayRef<Operation *> ops, ConversionTarget &target,
3388+
mlir::applyFullConversion(ArrayRef<Operation *> ops, const ConversionTarget &target,
33893389
const FrozenRewritePatternSet &patterns) {
33903390
OperationConverter opConverter(target, patterns, OpConversionMode::Full);
33913391
return opConverter.convertOperations(ops);
33923392
}
33933393
LogicalResult
3394-
mlir::applyFullConversion(Operation *op, ConversionTarget &target,
3394+
mlir::applyFullConversion(Operation *op, const ConversionTarget &target,
33953395
const FrozenRewritePatternSet &patterns) {
33963396
return applyFullConversion(llvm::ArrayRef(op), target, patterns);
33973397
}

0 commit comments

Comments
 (0)