Skip to content

[mlir] Expose optional PatternBenefit to function / SCF populate functions (NFC) #159752

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 19, 2025
+23 −17
Merged

[mlir] Expose optional PatternBenefit to function / SCF populate functions (NFC) #159752

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions mlir/include/mlir/Dialect/SCF/Transforms/Patterns.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,12 +51,13 @@ class ForLoopPipeliningPattern : public OpRewritePattern<ForOp> {
/// TypeConverter, but otherwise don't care what type conversions are happening.
void populateSCFStructuralTypeConversionsAndLegality(
const TypeConverter &typeConverter, RewritePatternSet &patterns,
ConversionTarget &target);
ConversionTarget &target, PatternBenefit benefit = 1);

/// Similar to `populateSCFStructuralTypeConversionsAndLegality` but does not
/// populate the conversion target.
void populateSCFStructuralTypeConversions(const TypeConverter &typeConverter,
RewritePatternSet &patterns);
RewritePatternSet &patterns,
PatternBenefit benefit = 1);

/// Updates the ConversionTarget with dynamic legality of SCF operations based
/// on the provided type converter.
Expand Down
12 changes: 7 additions & 5 deletions mlir/include/mlir/Transforms/DialectConversion.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -811,17 +811,19 @@ convertOpResultTypes(Operation *op, ValueRange operands,
/// ops which use FunctionType to represent their type.
void populateFunctionOpInterfaceTypeConversionPattern(
StringRef functionLikeOpName, RewritePatternSet &patterns,
const TypeConverter &converter);
const TypeConverter &converter, PatternBenefit benefit = 1);

template <typename FuncOpT>
void populateFunctionOpInterfaceTypeConversionPattern(
RewritePatternSet &patterns, const TypeConverter &converter) {
populateFunctionOpInterfaceTypeConversionPattern(FuncOpT::getOperationName(),
patterns, converter);
RewritePatternSet &patterns, const TypeConverter &converter,
PatternBenefit benefit = 1) {
populateFunctionOpInterfaceTypeConversionPattern(
FuncOpT::getOperationName(), patterns, converter, benefit);
}

void populateAnyFunctionOpInterfaceTypeConversionPattern(
RewritePatternSet &patterns, const TypeConverter &converter);
RewritePatternSet &patterns, const TypeConverter &converter,
PatternBenefit benefit = 1);

//===----------------------------------------------------------------------===//
// Conversion PatternRewriter
Expand Down
9 changes: 5 additions & 4 deletions mlir/lib/Dialect/SCF/Transforms/StructuralTypeConversions.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,10 +217,11 @@ class ConvertConditionOpTypes : public OpConversionPattern<ConditionOp> {
} // namespace

void mlir::scf::populateSCFStructuralTypeConversions(
const TypeConverter &typeConverter, RewritePatternSet &patterns) {
const TypeConverter &typeConverter, RewritePatternSet &patterns,
PatternBenefit benefit) {
patterns.add<ConvertForOpTypes, ConvertIfOpTypes, ConvertYieldOpTypes,
ConvertWhileOpTypes, ConvertConditionOpTypes>(
typeConverter, patterns.getContext());
typeConverter, patterns.getContext(), benefit);
}

void mlir::scf::populateSCFStructuralTypeConversionTarget(
Expand All @@ -240,7 +241,7 @@ void mlir::scf::populateSCFStructuralTypeConversionTarget(

void mlir::scf::populateSCFStructuralTypeConversionsAndLegality(
const TypeConverter &typeConverter, RewritePatternSet &patterns,
ConversionTarget &target) {
populateSCFStructuralTypeConversions(typeConverter, patterns);
ConversionTarget &target, PatternBenefit benefit) {
populateSCFStructuralTypeConversions(typeConverter, patterns, benefit);
populateSCFStructuralTypeConversionTarget(typeConverter, target);
}
14 changes: 8 additions & 6 deletions mlir/lib/Transforms/Utils/DialectConversion.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3802,8 +3802,9 @@ namespace {
struct FunctionOpInterfaceSignatureConversion : public ConversionPattern {
FunctionOpInterfaceSignatureConversion(StringRef functionLikeOpName,
MLIRContext *ctx,
const TypeConverter &converter)
: ConversionPattern(converter, functionLikeOpName, /*benefit=*/1, ctx) {}
const TypeConverter &converter,
PatternBenefit benefit)
: ConversionPattern(converter, functionLikeOpName, benefit, ctx) {}

LogicalResult
matchAndRewrite(Operation *op, ArrayRef<Value> /*operands*/,
Expand Down Expand Up @@ -3848,15 +3849,16 @@ mlir::convertOpResultTypes(Operation *op, ValueRange operands,

void mlir::populateFunctionOpInterfaceTypeConversionPattern(
StringRef functionLikeOpName, RewritePatternSet &patterns,
const TypeConverter &converter) {
const TypeConverter &converter, PatternBenefit benefit) {
patterns.add<FunctionOpInterfaceSignatureConversion>(
functionLikeOpName, patterns.getContext(), converter);
functionLikeOpName, patterns.getContext(), converter, benefit);
}

void mlir::populateAnyFunctionOpInterfaceTypeConversionPattern(
RewritePatternSet &patterns, const TypeConverter &converter) {
RewritePatternSet &patterns, const TypeConverter &converter,
PatternBenefit benefit) {
patterns.add<AnyFunctionOpInterfaceSignatureConversion>(
converter, patterns.getContext());
converter, patterns.getContext(), benefit);
}

//===----------------------------------------------------------------------===//
Expand Down