[mlir] Add base class type aliases for rewrites/conversions. NFC. #158433
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
This is to simplify writing rewrite/conversion patterns that usually
start with:
```c++
struct MyPattern : public OpRewritePattern<MyPattern> {
using OpRewritePattern::OpRewritePattern;
```
and allow for:
```c++
struct MyPattern : public OpRewritePattern<MyPattern> {
using Base::Base;
```
similar to pass classes.
kuhar
requested review from
rengolin,
matthias-springer,
banach-space,
joker-eph,
hanhanW,
dcaballe and
Groverkss
|
@llvm/pr-subscribers-mlir Author: Jakub Kuderski (kuhar) ChangesThis is to simplify writing rewrite/conversion patterns that usually start with: struct MyPattern : public OpRewritePattern<MyOp> {
using OpRewritePattern::OpRewritePattern;and allow for: struct MyPattern : public OpRewritePattern<MyOp> {
using Base::Base;similar to how we enable it for pass classes. Full diff: https://github.com/llvm/llvm-project/pull/158433.diff 3 Files Affected:
diff --git a/mlir/include/mlir/IR/PatternMatch.h b/mlir/include/mlir/IR/PatternMatch.h
index 7b0b9cef9c5bd..576481a6e7215 100644
--- a/mlir/include/mlir/IR/PatternMatch.h
+++ b/mlir/include/mlir/IR/PatternMatch.h
@@ -312,6 +312,9 @@ struct OpOrInterfaceRewritePatternBase : public RewritePattern {
template <typename SourceOp>
struct OpRewritePattern
: public mlir::detail::OpOrInterfaceRewritePatternBase<SourceOp> {
+ /// Type alias to allow derived classes to inherit constructors with
+ /// `using Base::Base;`.
+ using Base = OpRewritePattern;
/// Patterns must specify the root operation name they match against, and can
/// also specify the benefit of the pattern matching and a list of generated
@@ -328,6 +331,9 @@ struct OpRewritePattern
template <typename SourceOp>
struct OpInterfaceRewritePattern
: public mlir::detail::OpOrInterfaceRewritePatternBase<SourceOp> {
+ /// Type alias to allow derived classes to inherit constructors with
+ /// `using Base::Base;`.
+ using Base = OpInterfaceRewritePattern;
OpInterfaceRewritePattern(MLIRContext *context, PatternBenefit benefit = 1)
: mlir::detail::OpOrInterfaceRewritePatternBase<SourceOp>(
@@ -341,6 +347,10 @@ struct OpInterfaceRewritePattern
template <template <typename> class TraitType>
class OpTraitRewritePattern : public RewritePattern {
public:
+ /// Type alias to allow derived classes to inherit constructors with
+ /// `using Base::Base;`.
+ using Base = OpTraitRewritePattern;
+
OpTraitRewritePattern(MLIRContext *context, PatternBenefit benefit = 1)
: RewritePattern(Pattern::MatchTraitOpTypeTag(), TypeID::get<TraitType>(),
benefit, context) {}
diff --git a/mlir/include/mlir/Transforms/DialectConversion.h b/mlir/include/mlir/Transforms/DialectConversion.h
index bfbe12d2a5668..6ef649e8fc13a 100644
--- a/mlir/include/mlir/Transforms/DialectConversion.h
+++ b/mlir/include/mlir/Transforms/DialectConversion.h
@@ -40,6 +40,10 @@ class Value;
/// registered using addConversion and addMaterialization, respectively.
class TypeConverter {
public:
+ /// Type alias to allow derived classes to inherit constructors with
+ /// `using Base::Base;`.
+ using Base = TypeConverter;
+
virtual ~TypeConverter() = default;
TypeConverter() = default;
// Copy the registered conversions, but not the caches
@@ -679,6 +683,10 @@ class ConversionPattern : public RewritePattern {
template <typename SourceOp>
class OpConversionPattern : public ConversionPattern {
public:
+ /// Type alias to allow derived classes to inherit constructors with
+ /// `using Base::Base;`.
+ using Base = OpConversionPattern;
+
using OpAdaptor = typename SourceOp::Adaptor;
using OneToNOpAdaptor =
typename SourceOp::template GenericAdaptor<ArrayRef<ValueRange>>;
@@ -729,6 +737,10 @@ class OpConversionPattern : public ConversionPattern {
template <typename SourceOp>
class OpInterfaceConversionPattern : public ConversionPattern {
public:
+ /// Type alias to allow derived classes to inherit constructors with
+ /// `using Base::Base;`.
+ using Base = OpInterfaceConversionPattern;
+
OpInterfaceConversionPattern(MLIRContext *context, PatternBenefit benefit = 1)
: ConversionPattern(Pattern::MatchInterfaceOpTypeTag(),
SourceOp::getInterfaceID(), benefit, context) {}
@@ -773,6 +785,10 @@ class OpInterfaceConversionPattern : public ConversionPattern {
template <template <typename> class TraitType>
class OpTraitConversionPattern : public ConversionPattern {
public:
+ /// Type alias to allow derived classes to inherit constructors with
+ /// `using Base::Base;`.
+ using Base = OpTraitConversionPattern;
+
OpTraitConversionPattern(MLIRContext *context, PatternBenefit benefit = 1)
: ConversionPattern(Pattern::MatchTraitOpTypeTag(),
TypeID::get<TraitType>(), benefit, context) {}
diff --git a/mlir/test/lib/Dialect/Test/TestPatterns.cpp b/mlir/test/lib/Dialect/Test/TestPatterns.cpp
index 93b007c792ad9..f8b5144e3acb2 100644
--- a/mlir/test/lib/Dialect/Test/TestPatterns.cpp
+++ b/mlir/test/lib/Dialect/Test/TestPatterns.cpp
@@ -17,6 +17,7 @@
#include "mlir/Dialect/Tensor/IR/Tensor.h"
#include "mlir/IR/BuiltinAttributes.h"
#include "mlir/IR/Matchers.h"
+#include "mlir/IR/PatternMatch.h"
#include "mlir/IR/Visitors.h"
#include "mlir/Pass/Pass.h"
#include "mlir/Transforms/DialectConversion.h"
@@ -114,7 +115,8 @@ struct FoldingPattern : public RewritePattern {
struct FolderInsertBeforePreviouslyFoldedConstantPattern
: public OpRewritePattern<TestCastOp> {
public:
- using OpRewritePattern<TestCastOp>::OpRewritePattern;
+ static_assert(std::is_same_v<Base, OpRewritePattern<TestCastOp>>);
+ using Base::Base;
LogicalResult matchAndRewrite(TestCastOp op,
PatternRewriter &rewriter) const override {
@@ -1306,7 +1308,8 @@ class TestReplaceWithValidConsumer : public ConversionPattern {
/// b) or: drops all block arguments and replaces each with 2x the first
/// operand.
class TestConvertBlockArgs : public OpConversionPattern<ConvertBlockArgsOp> {
- using OpConversionPattern<ConvertBlockArgsOp>::OpConversionPattern;
+ static_assert(std::is_same_v<Base, OpConversionPattern<ConvertBlockArgsOp>>);
+ using Base::Base;
LogicalResult
matchAndRewrite(ConvertBlockArgsOp op, OpAdaptor adaptor,
@@ -1431,7 +1434,9 @@ class TestTypeConsumerOpPattern
namespace {
struct TestTypeConverter : public TypeConverter {
- using TypeConverter::TypeConverter;
+ static_assert(std::is_same_v<Base, TypeConverter>);
+ using Base::Base;
+
TestTypeConverter() {
addConversion(convertType);
addSourceMaterialization(materializeCast);
|
|
@llvm/pr-subscribers-mlir-core Author: Jakub Kuderski (kuhar) ChangesThis is to simplify writing rewrite/conversion patterns that usually start with: struct MyPattern : public OpRewritePattern<MyOp> {
using OpRewritePattern::OpRewritePattern;and allow for: struct MyPattern : public OpRewritePattern<MyOp> {
using Base::Base;similar to how we enable it for pass classes. Full diff: https://github.com/llvm/llvm-project/pull/158433.diff 3 Files Affected:
diff --git a/mlir/include/mlir/IR/PatternMatch.h b/mlir/include/mlir/IR/PatternMatch.h
index 7b0b9cef9c5bd..576481a6e7215 100644
--- a/mlir/include/mlir/IR/PatternMatch.h
+++ b/mlir/include/mlir/IR/PatternMatch.h
@@ -312,6 +312,9 @@ struct OpOrInterfaceRewritePatternBase : public RewritePattern {
template <typename SourceOp>
struct OpRewritePattern
: public mlir::detail::OpOrInterfaceRewritePatternBase<SourceOp> {
+ /// Type alias to allow derived classes to inherit constructors with
+ /// `using Base::Base;`.
+ using Base = OpRewritePattern;
/// Patterns must specify the root operation name they match against, and can
/// also specify the benefit of the pattern matching and a list of generated
@@ -328,6 +331,9 @@ struct OpRewritePattern
template <typename SourceOp>
struct OpInterfaceRewritePattern
: public mlir::detail::OpOrInterfaceRewritePatternBase<SourceOp> {
+ /// Type alias to allow derived classes to inherit constructors with
+ /// `using Base::Base;`.
+ using Base = OpInterfaceRewritePattern;
OpInterfaceRewritePattern(MLIRContext *context, PatternBenefit benefit = 1)
: mlir::detail::OpOrInterfaceRewritePatternBase<SourceOp>(
@@ -341,6 +347,10 @@ struct OpInterfaceRewritePattern
template <template <typename> class TraitType>
class OpTraitRewritePattern : public RewritePattern {
public:
+ /// Type alias to allow derived classes to inherit constructors with
+ /// `using Base::Base;`.
+ using Base = OpTraitRewritePattern;
+
OpTraitRewritePattern(MLIRContext *context, PatternBenefit benefit = 1)
: RewritePattern(Pattern::MatchTraitOpTypeTag(), TypeID::get<TraitType>(),
benefit, context) {}
diff --git a/mlir/include/mlir/Transforms/DialectConversion.h b/mlir/include/mlir/Transforms/DialectConversion.h
index bfbe12d2a5668..6ef649e8fc13a 100644
--- a/mlir/include/mlir/Transforms/DialectConversion.h
+++ b/mlir/include/mlir/Transforms/DialectConversion.h
@@ -40,6 +40,10 @@ class Value;
/// registered using addConversion and addMaterialization, respectively.
class TypeConverter {
public:
+ /// Type alias to allow derived classes to inherit constructors with
+ /// `using Base::Base;`.
+ using Base = TypeConverter;
+
virtual ~TypeConverter() = default;
TypeConverter() = default;
// Copy the registered conversions, but not the caches
@@ -679,6 +683,10 @@ class ConversionPattern : public RewritePattern {
template <typename SourceOp>
class OpConversionPattern : public ConversionPattern {
public:
+ /// Type alias to allow derived classes to inherit constructors with
+ /// `using Base::Base;`.
+ using Base = OpConversionPattern;
+
using OpAdaptor = typename SourceOp::Adaptor;
using OneToNOpAdaptor =
typename SourceOp::template GenericAdaptor<ArrayRef<ValueRange>>;
@@ -729,6 +737,10 @@ class OpConversionPattern : public ConversionPattern {
template <typename SourceOp>
class OpInterfaceConversionPattern : public ConversionPattern {
public:
+ /// Type alias to allow derived classes to inherit constructors with
+ /// `using Base::Base;`.
+ using Base = OpInterfaceConversionPattern;
+
OpInterfaceConversionPattern(MLIRContext *context, PatternBenefit benefit = 1)
: ConversionPattern(Pattern::MatchInterfaceOpTypeTag(),
SourceOp::getInterfaceID(), benefit, context) {}
@@ -773,6 +785,10 @@ class OpInterfaceConversionPattern : public ConversionPattern {
template <template <typename> class TraitType>
class OpTraitConversionPattern : public ConversionPattern {
public:
+ /// Type alias to allow derived classes to inherit constructors with
+ /// `using Base::Base;`.
+ using Base = OpTraitConversionPattern;
+
OpTraitConversionPattern(MLIRContext *context, PatternBenefit benefit = 1)
: ConversionPattern(Pattern::MatchTraitOpTypeTag(),
TypeID::get<TraitType>(), benefit, context) {}
diff --git a/mlir/test/lib/Dialect/Test/TestPatterns.cpp b/mlir/test/lib/Dialect/Test/TestPatterns.cpp
index 93b007c792ad9..f8b5144e3acb2 100644
--- a/mlir/test/lib/Dialect/Test/TestPatterns.cpp
+++ b/mlir/test/lib/Dialect/Test/TestPatterns.cpp
@@ -17,6 +17,7 @@
#include "mlir/Dialect/Tensor/IR/Tensor.h"
#include "mlir/IR/BuiltinAttributes.h"
#include "mlir/IR/Matchers.h"
+#include "mlir/IR/PatternMatch.h"
#include "mlir/IR/Visitors.h"
#include "mlir/Pass/Pass.h"
#include "mlir/Transforms/DialectConversion.h"
@@ -114,7 +115,8 @@ struct FoldingPattern : public RewritePattern {
struct FolderInsertBeforePreviouslyFoldedConstantPattern
: public OpRewritePattern<TestCastOp> {
public:
- using OpRewritePattern<TestCastOp>::OpRewritePattern;
+ static_assert(std::is_same_v<Base, OpRewritePattern<TestCastOp>>);
+ using Base::Base;
LogicalResult matchAndRewrite(TestCastOp op,
PatternRewriter &rewriter) const override {
@@ -1306,7 +1308,8 @@ class TestReplaceWithValidConsumer : public ConversionPattern {
/// b) or: drops all block arguments and replaces each with 2x the first
/// operand.
class TestConvertBlockArgs : public OpConversionPattern<ConvertBlockArgsOp> {
- using OpConversionPattern<ConvertBlockArgsOp>::OpConversionPattern;
+ static_assert(std::is_same_v<Base, OpConversionPattern<ConvertBlockArgsOp>>);
+ using Base::Base;
LogicalResult
matchAndRewrite(ConvertBlockArgsOp op, OpAdaptor adaptor,
@@ -1431,7 +1434,9 @@ class TestTypeConsumerOpPattern
namespace {
struct TestTypeConverter : public TypeConverter {
- using TypeConverter::TypeConverter;
+ static_assert(std::is_same_v<Base, TypeConverter>);
+ using Base::Base;
+
TestTypeConverter() {
addConversion(convertType);
addSourceMaterialization(materializeCast);
|
|
Looks good, but I'll let others have time to review. Thanks! |
matthias-springer
approved these changes
Sep 14, 2025
kuhar
added a commit
to kuhar/llvm-project
that referenced
this pull request
Sep 19, 2025
Use the `Base` type alias from llvm#158433.
llvm-sync bot
pushed a commit
to arm/arm-toolchain
that referenced
this pull request
Sep 19, 2025
…. NFC. (#159681) Use the `Base` type alias from llvm/llvm-project#158433.
kuhar
added a commit
to kuhar/llvm-project
that referenced
this pull request
Sep 19, 2025
Use the `Base` type alias from llvm#158433.
llvm-sync bot
pushed a commit
to arm/arm-toolchain
that referenced
this pull request
Sep 20, 2025
…s. NFC. (#159682) Use the `Base` type alias from llvm/llvm-project#158433.
SeongjaeP
pushed a commit
to SeongjaeP/llvm-project
that referenced
this pull request
Sep 23, 2025
…vm#158433) This is to simplify writing rewrite/conversion patterns that usually start with: ```c++ struct MyPattern : public OpRewritePattern<MyOp> { using OpRewritePattern::OpRewritePattern; ``` and allow for: ```c++ struct MyPattern : public OpRewritePattern<MyOp> { using Base::Base; ``` similar to how we enable it for pass classes.
SeongjaeP
pushed a commit
to SeongjaeP/llvm-project
that referenced
this pull request
Sep 23, 2025
…m#159681) Use the `Base` type alias from llvm#158433.
SeongjaeP
pushed a commit
to SeongjaeP/llvm-project
that referenced
this pull request
Sep 23, 2025
…vm#159682) Use the `Base` type alias from llvm#158433.
kuhar
added a commit
to kuhar/iree
that referenced
this pull request
Sep 28, 2025
Use the `Base` type alias added in llvm/llvm-project#158433.
kuhar
added a commit
to kuhar/iree
that referenced
this pull request
Sep 28, 2025
Use the `Base` type alias added in llvm/llvm-project#158433.
kuhar
added a commit
to iree-org/iree
that referenced
this pull request
Sep 29, 2025
…C. (#22143) Use the `Base` type alias added in llvm/llvm-project#158433.
kuhar
added a commit
to iree-org/iree
that referenced
this pull request
Sep 29, 2025
…22142) Use the `Base` type alias added in llvm/llvm-project#158433.
kuhar
added a commit
to kuhar/llvm-project
that referenced
this pull request
Oct 2, 2025
Use the `Base` type alias from llvm#158433.
llvm-sync bot
pushed a commit
to arm/arm-toolchain
that referenced
this pull request
Oct 2, 2025
…tructors. NFC. (#161670) Use the `Base` type alias from llvm/llvm-project#158433.
mahesh-attarde
pushed a commit
to mahesh-attarde/llvm-project
that referenced
this pull request
Oct 3, 2025
…FC. (llvm#161670) Use the `Base` type alias from llvm#158433.
MixedMatched
pushed a commit
to MixedMatched/llvm-project
that referenced
this pull request
Oct 3, 2025
…FC. (llvm#161670) Use the `Base` type alias from llvm#158433.
kuhar
added a commit
to kuhar/llvm-project
that referenced
this pull request
Oct 4, 2025
Use the `Base` type alias from llvm#158433.
llvm-sync bot
pushed a commit
to arm/arm-toolchain
that referenced
this pull request
Oct 4, 2025
…ctors. NFC. (#161966) Use the `Base` type alias from llvm/llvm-project#158433.
aokblast
pushed a commit
to aokblast/llvm-project
that referenced
this pull request
Oct 6, 2025
…llvm#161966) Use the `Base` type alias from llvm#158433.
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.
This is to simplify writing rewrite/conversion patterns that usually start with:
and allow for:
similar to how we enable it for pass classes.