[mlir][llvm] Op interface LLVM converter #143922
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Adds a utility pattern which decreases amount of required boilerplate in LLVM export legalization patterns targeting op interface instances.
adam-smnk
requested review from
aartbik,
dcaballe and
nicolasvasilache
as code owners
|
@llvm/pr-subscribers-mlir-vector @llvm/pr-subscribers-mlir-amx Author: Adam Siemieniuk (adam-smnk) ChangesAdds a utility conversion class for rewriting op interface instances targeting LLVM dialect. Full diff: https://github.com/llvm/llvm-project/pull/143922.diff 3 Files Affected:
diff --git a/mlir/include/mlir/Conversion/LLVMCommon/Pattern.h b/mlir/include/mlir/Conversion/LLVMCommon/Pattern.h
index 7e946495e3e7f..503a2a7e6f0cd 100644
--- a/mlir/include/mlir/Conversion/LLVMCommon/Pattern.h
+++ b/mlir/include/mlir/Conversion/LLVMCommon/Pattern.h
@@ -92,6 +92,10 @@ class ConvertToLLVMPattern : public ConversionPattern {
PatternBenefit benefit = 1);
protected:
+ /// See `ConversionPattern::ConversionPattern` for information on the other
+ /// available constructors.
+ using ConversionPattern::ConversionPattern;
+
/// Returns the LLVM dialect.
LLVM::LLVMDialect &getDialect() const;
@@ -234,6 +238,47 @@ class ConvertOpToLLVMPattern : public ConvertToLLVMPattern {
using ConvertToLLVMPattern::matchAndRewrite;
};
+/// Utility class for operation conversions targeting the LLVM dialect that
+/// allows for matching and rewriting against an instance of an OpInterface
+/// class.
+template <typename SourceOp>
+class ConvertOpInterfaceToLLVMPattern : public ConvertToLLVMPattern {
+public:
+ explicit ConvertOpInterfaceToLLVMPattern(
+ const LLVMTypeConverter &typeConverter, PatternBenefit benefit = 1)
+ : ConvertToLLVMPattern(typeConverter, Pattern::MatchInterfaceOpTypeTag(),
+ SourceOp::getInterfaceID(), benefit,
+ &typeConverter.getContext()) {}
+
+ /// Wrappers around the RewritePattern methods that pass the derived op type.
+ LogicalResult
+ matchAndRewrite(Operation *op, ArrayRef<Value> operands,
+ ConversionPatternRewriter &rewriter) const final {
+ return matchAndRewrite(cast<SourceOp>(op), operands, rewriter);
+ }
+ LogicalResult
+ matchAndRewrite(Operation *op, ArrayRef<ValueRange> operands,
+ ConversionPatternRewriter &rewriter) const final {
+ return matchAndRewrite(cast<SourceOp>(op), operands, rewriter);
+ }
+
+ /// Methods that operate on the SourceOp type. One of these must be
+ /// overridden by the derived pattern class.
+ virtual LogicalResult
+ matchAndRewrite(SourceOp op, ArrayRef<Value> operands,
+ ConversionPatternRewriter &rewriter) const {
+ llvm_unreachable("matchAndRewrite is not implemented");
+ }
+ virtual LogicalResult
+ matchAndRewrite(SourceOp op, ArrayRef<ValueRange> operands,
+ ConversionPatternRewriter &rewriter) const {
+ return matchAndRewrite(op, getOneToOneAdaptorOperands(operands), rewriter);
+ }
+
+private:
+ using ConvertToLLVMPattern::matchAndRewrite;
+};
+
/// Generic implementation of one-to-one conversion from "SourceOp" to
/// "TargetOp" where the latter belongs to the LLVM dialect or an equivalent.
/// Upholds a convention that multi-result operations get converted into an
diff --git a/mlir/lib/Dialect/AMX/Transforms/LegalizeForLLVMExport.cpp b/mlir/lib/Dialect/AMX/Transforms/LegalizeForLLVMExport.cpp
index 37aebc9fab3eb..06e5f7c2196d2 100644
--- a/mlir/lib/Dialect/AMX/Transforms/LegalizeForLLVMExport.cpp
+++ b/mlir/lib/Dialect/AMX/Transforms/LegalizeForLLVMExport.cpp
@@ -24,27 +24,18 @@ namespace {
/// Generic one-to-one conversion of simply mappable operations into calls
/// to their respective LLVM intrinsics.
struct AMXIntrinsicOpConversion
- : public OpInterfaceConversionPattern<amx::AMXIntrinsicOp> {
- using OpInterfaceConversionPattern<
- amx::AMXIntrinsicOp>::OpInterfaceConversionPattern;
-
- AMXIntrinsicOpConversion(const LLVMTypeConverter &typeConverter,
- PatternBenefit benefit = 1)
- : OpInterfaceConversionPattern(typeConverter, &typeConverter.getContext(),
- benefit),
- typeConverter(typeConverter) {}
+ : public ConvertOpInterfaceToLLVMPattern<amx::AMXIntrinsicOp> {
+ using ConvertOpInterfaceToLLVMPattern::ConvertOpInterfaceToLLVMPattern;
LogicalResult
matchAndRewrite(amx::AMXIntrinsicOp op, ArrayRef<Value> operands,
ConversionPatternRewriter &rewriter) const override {
+ const LLVMTypeConverter &typeConverter = *getTypeConverter();
return LLVM::detail::intrinsicRewrite(
op, rewriter.getStringAttr(op.getIntrinsicName()),
op.getIntrinsicOperands(operands, typeConverter, rewriter),
typeConverter, rewriter);
}
-
-private:
- const LLVMTypeConverter &typeConverter;
};
} // namespace
diff --git a/mlir/lib/Dialect/X86Vector/Transforms/LegalizeForLLVMExport.cpp b/mlir/lib/Dialect/X86Vector/Transforms/LegalizeForLLVMExport.cpp
index b2fc2f3f40e8c..8e062488f58c8 100644
--- a/mlir/lib/Dialect/X86Vector/Transforms/LegalizeForLLVMExport.cpp
+++ b/mlir/lib/Dialect/X86Vector/Transforms/LegalizeForLLVMExport.cpp
@@ -23,27 +23,18 @@ namespace {
/// Generic one-to-one conversion of simply mappable operations into calls
/// to their respective LLVM intrinsics.
struct X86IntrinsicOpConversion
- : public OpInterfaceConversionPattern<x86vector::X86IntrinsicOp> {
- using OpInterfaceConversionPattern<
- x86vector::X86IntrinsicOp>::OpInterfaceConversionPattern;
-
- X86IntrinsicOpConversion(const LLVMTypeConverter &typeConverter,
- PatternBenefit benefit = 1)
- : OpInterfaceConversionPattern(typeConverter, &typeConverter.getContext(),
- benefit),
- typeConverter(typeConverter) {}
+ : public ConvertOpInterfaceToLLVMPattern<x86vector::X86IntrinsicOp> {
+ using ConvertOpInterfaceToLLVMPattern::ConvertOpInterfaceToLLVMPattern;
LogicalResult
matchAndRewrite(x86vector::X86IntrinsicOp op, ArrayRef<Value> operands,
ConversionPatternRewriter &rewriter) const override {
+ const LLVMTypeConverter &typeConverter = *getTypeConverter();
return LLVM::detail::intrinsicRewrite(
op, rewriter.getStringAttr(op.getIntrinsicName()),
op.getIntrinsicOperands(operands, typeConverter, rewriter),
typeConverter, rewriter);
}
-
-private:
- const LLVMTypeConverter &typeConverter;
};
} // namespace
|
|
@llvm/pr-subscribers-mlir Author: Adam Siemieniuk (adam-smnk) ChangesAdds a utility conversion class for rewriting op interface instances targeting LLVM dialect. Full diff: https://github.com/llvm/llvm-project/pull/143922.diff 3 Files Affected:
diff --git a/mlir/include/mlir/Conversion/LLVMCommon/Pattern.h b/mlir/include/mlir/Conversion/LLVMCommon/Pattern.h
index 7e946495e3e7f..503a2a7e6f0cd 100644
--- a/mlir/include/mlir/Conversion/LLVMCommon/Pattern.h
+++ b/mlir/include/mlir/Conversion/LLVMCommon/Pattern.h
@@ -92,6 +92,10 @@ class ConvertToLLVMPattern : public ConversionPattern {
PatternBenefit benefit = 1);
protected:
+ /// See `ConversionPattern::ConversionPattern` for information on the other
+ /// available constructors.
+ using ConversionPattern::ConversionPattern;
+
/// Returns the LLVM dialect.
LLVM::LLVMDialect &getDialect() const;
@@ -234,6 +238,47 @@ class ConvertOpToLLVMPattern : public ConvertToLLVMPattern {
using ConvertToLLVMPattern::matchAndRewrite;
};
+/// Utility class for operation conversions targeting the LLVM dialect that
+/// allows for matching and rewriting against an instance of an OpInterface
+/// class.
+template <typename SourceOp>
+class ConvertOpInterfaceToLLVMPattern : public ConvertToLLVMPattern {
+public:
+ explicit ConvertOpInterfaceToLLVMPattern(
+ const LLVMTypeConverter &typeConverter, PatternBenefit benefit = 1)
+ : ConvertToLLVMPattern(typeConverter, Pattern::MatchInterfaceOpTypeTag(),
+ SourceOp::getInterfaceID(), benefit,
+ &typeConverter.getContext()) {}
+
+ /// Wrappers around the RewritePattern methods that pass the derived op type.
+ LogicalResult
+ matchAndRewrite(Operation *op, ArrayRef<Value> operands,
+ ConversionPatternRewriter &rewriter) const final {
+ return matchAndRewrite(cast<SourceOp>(op), operands, rewriter);
+ }
+ LogicalResult
+ matchAndRewrite(Operation *op, ArrayRef<ValueRange> operands,
+ ConversionPatternRewriter &rewriter) const final {
+ return matchAndRewrite(cast<SourceOp>(op), operands, rewriter);
+ }
+
+ /// Methods that operate on the SourceOp type. One of these must be
+ /// overridden by the derived pattern class.
+ virtual LogicalResult
+ matchAndRewrite(SourceOp op, ArrayRef<Value> operands,
+ ConversionPatternRewriter &rewriter) const {
+ llvm_unreachable("matchAndRewrite is not implemented");
+ }
+ virtual LogicalResult
+ matchAndRewrite(SourceOp op, ArrayRef<ValueRange> operands,
+ ConversionPatternRewriter &rewriter) const {
+ return matchAndRewrite(op, getOneToOneAdaptorOperands(operands), rewriter);
+ }
+
+private:
+ using ConvertToLLVMPattern::matchAndRewrite;
+};
+
/// Generic implementation of one-to-one conversion from "SourceOp" to
/// "TargetOp" where the latter belongs to the LLVM dialect or an equivalent.
/// Upholds a convention that multi-result operations get converted into an
diff --git a/mlir/lib/Dialect/AMX/Transforms/LegalizeForLLVMExport.cpp b/mlir/lib/Dialect/AMX/Transforms/LegalizeForLLVMExport.cpp
index 37aebc9fab3eb..06e5f7c2196d2 100644
--- a/mlir/lib/Dialect/AMX/Transforms/LegalizeForLLVMExport.cpp
+++ b/mlir/lib/Dialect/AMX/Transforms/LegalizeForLLVMExport.cpp
@@ -24,27 +24,18 @@ namespace {
/// Generic one-to-one conversion of simply mappable operations into calls
/// to their respective LLVM intrinsics.
struct AMXIntrinsicOpConversion
- : public OpInterfaceConversionPattern<amx::AMXIntrinsicOp> {
- using OpInterfaceConversionPattern<
- amx::AMXIntrinsicOp>::OpInterfaceConversionPattern;
-
- AMXIntrinsicOpConversion(const LLVMTypeConverter &typeConverter,
- PatternBenefit benefit = 1)
- : OpInterfaceConversionPattern(typeConverter, &typeConverter.getContext(),
- benefit),
- typeConverter(typeConverter) {}
+ : public ConvertOpInterfaceToLLVMPattern<amx::AMXIntrinsicOp> {
+ using ConvertOpInterfaceToLLVMPattern::ConvertOpInterfaceToLLVMPattern;
LogicalResult
matchAndRewrite(amx::AMXIntrinsicOp op, ArrayRef<Value> operands,
ConversionPatternRewriter &rewriter) const override {
+ const LLVMTypeConverter &typeConverter = *getTypeConverter();
return LLVM::detail::intrinsicRewrite(
op, rewriter.getStringAttr(op.getIntrinsicName()),
op.getIntrinsicOperands(operands, typeConverter, rewriter),
typeConverter, rewriter);
}
-
-private:
- const LLVMTypeConverter &typeConverter;
};
} // namespace
diff --git a/mlir/lib/Dialect/X86Vector/Transforms/LegalizeForLLVMExport.cpp b/mlir/lib/Dialect/X86Vector/Transforms/LegalizeForLLVMExport.cpp
index b2fc2f3f40e8c..8e062488f58c8 100644
--- a/mlir/lib/Dialect/X86Vector/Transforms/LegalizeForLLVMExport.cpp
+++ b/mlir/lib/Dialect/X86Vector/Transforms/LegalizeForLLVMExport.cpp
@@ -23,27 +23,18 @@ namespace {
/// Generic one-to-one conversion of simply mappable operations into calls
/// to their respective LLVM intrinsics.
struct X86IntrinsicOpConversion
- : public OpInterfaceConversionPattern<x86vector::X86IntrinsicOp> {
- using OpInterfaceConversionPattern<
- x86vector::X86IntrinsicOp>::OpInterfaceConversionPattern;
-
- X86IntrinsicOpConversion(const LLVMTypeConverter &typeConverter,
- PatternBenefit benefit = 1)
- : OpInterfaceConversionPattern(typeConverter, &typeConverter.getContext(),
- benefit),
- typeConverter(typeConverter) {}
+ : public ConvertOpInterfaceToLLVMPattern<x86vector::X86IntrinsicOp> {
+ using ConvertOpInterfaceToLLVMPattern::ConvertOpInterfaceToLLVMPattern;
LogicalResult
matchAndRewrite(x86vector::X86IntrinsicOp op, ArrayRef<Value> operands,
ConversionPatternRewriter &rewriter) const override {
+ const LLVMTypeConverter &typeConverter = *getTypeConverter();
return LLVM::detail::intrinsicRewrite(
op, rewriter.getStringAttr(op.getIntrinsicName()),
op.getIntrinsicOperands(operands, typeConverter, rewriter),
typeConverter, rewriter);
}
-
-private:
- const LLVMTypeConverter &typeConverter;
};
} // namespace
|
ftynse
approved these changes
Jun 12, 2025
tomtor
pushed a commit
to tomtor/llvm-project
that referenced
this pull request
Jun 14, 2025
Adds a utility conversion class for rewriting op interface instances targeting LLVM dialect.
akuhlens
pushed a commit
to akuhlens/llvm-project
that referenced
this pull request
Jun 24, 2025
Adds a utility conversion class for rewriting op interface instances targeting LLVM dialect.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Adds a utility conversion class for rewriting op interface instances targeting LLVM dialect.