Skip to content

Commit 36250f4

Browse files
kuharkuhar
authored
Simplify op rewrite pattern inheriting constructor definitions. NFC. (#22142)
Use the `Base` type alias added in llvm/llvm-project#158433.
1 parent fdc5703 commit 36250f4

File tree

121 files changed

+404
-404
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

121 files changed

+404
-404
lines changed

‎compiler/plugins/input/StableHLO/Conversion/LegalizeShapeComputations.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ struct HloElementwiseConverter : OpRewritePattern<OpTy> {
8282

8383
struct ConcatenateConverter final
8484
: OpRewritePattern<mlir::stablehlo::ConcatenateOp> {
85-
using OpRewritePattern::OpRewritePattern;
85+
using Base::Base;
8686

8787
LogicalResult matchAndRewrite(mlir::stablehlo::ConcatenateOp op,
8888
PatternRewriter &rewriter) const override {
@@ -117,7 +117,7 @@ struct ConcatenateConverter final
117117

118118
struct GetDimSizeConverter final
119119
: OpRewritePattern<mlir::stablehlo::GetDimensionSizeOp> {
120-
using OpRewritePattern::OpRewritePattern;
120+
using Base::Base;
121121

122122
LogicalResult matchAndRewrite(mlir::stablehlo::GetDimensionSizeOp op,
123123
PatternRewriter &rewriter) const override {
@@ -138,7 +138,7 @@ struct GetDimSizeConverter final
138138
};
139139

140140
struct ReshapeConverter : OpRewritePattern<mlir::stablehlo::ReshapeOp> {
141-
using OpRewritePattern::OpRewritePattern;
141+
using Base::Base;
142142

143143
LogicalResult matchAndRewrite(mlir::stablehlo::ReshapeOp op,
144144
PatternRewriter &rewriter) const override {

‎compiler/plugins/input/StableHLO/Conversion/Preprocessing/Canonicalization.cpp‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ static TypedAttr foldBinaryOpIntOrFloat(TypedAttr lhs, TypedAttr rhs,
113113
}
114114

115115
struct AddOpCanon final : OpRewritePattern<mlir::stablehlo::AddOp> {
116-
using OpRewritePattern::OpRewritePattern;
116+
using Base::Base;
117117

118118
LogicalResult matchAndRewrite(mlir::stablehlo::AddOp op,
119119
PatternRewriter &rewriter) const override {
@@ -160,7 +160,7 @@ struct AddOpCanon final : OpRewritePattern<mlir::stablehlo::AddOp> {
160160
};
161161

162162
struct SubtractOpCanon final : OpRewritePattern<mlir::stablehlo::SubtractOp> {
163-
using OpRewritePattern::OpRewritePattern;
163+
using Base::Base;
164164

165165
LogicalResult matchAndRewrite(mlir::stablehlo::SubtractOp op,
166166
PatternRewriter &rewriter) const override {
@@ -202,7 +202,7 @@ struct SubtractOpCanon final : OpRewritePattern<mlir::stablehlo::SubtractOp> {
202202
};
203203

204204
struct MulOpCanon final : OpRewritePattern<mlir::stablehlo::MulOp> {
205-
using OpRewritePattern::OpRewritePattern;
205+
using Base::Base;
206206

207207
LogicalResult matchAndRewrite(mlir::stablehlo::MulOp op,
208208
PatternRewriter &rewriter) const override {
@@ -328,7 +328,7 @@ static APInt calculateComp(mlir::stablehlo::ComparisonType kind,
328328
}
329329

330330
struct CompareOpCanon final : OpRewritePattern<mlir::stablehlo::CompareOp> {
331-
using OpRewritePattern::OpRewritePattern;
331+
using Base::Base;
332332

333333
LogicalResult matchAndRewrite(mlir::stablehlo::CompareOp op,
334334
PatternRewriter &rewriter) const override {
@@ -404,7 +404,7 @@ struct CompareOpCanon final : OpRewritePattern<mlir::stablehlo::CompareOp> {
404404
};
405405

406406
struct SelectOpCanon final : OpRewritePattern<mlir::stablehlo::SelectOp> {
407-
using OpRewritePattern::OpRewritePattern;
407+
using Base::Base;
408408

409409
LogicalResult matchAndRewrite(mlir::stablehlo::SelectOp op,
410410
PatternRewriter &rewriter) const override {
@@ -463,7 +463,7 @@ struct SelectOpCanon final : OpRewritePattern<mlir::stablehlo::SelectOp> {
463463

464464
struct BroadcastInDimOpCanon final
465465
: OpRewritePattern<mlir::stablehlo::BroadcastInDimOp> {
466-
using OpRewritePattern::OpRewritePattern;
466+
using Base::Base;
467467

468468
LogicalResult matchAndRewrite(mlir::stablehlo::BroadcastInDimOp op,
469469
PatternRewriter &rewriter) const override {
@@ -528,7 +528,7 @@ struct BroadcastInDimOpCanon final
528528

529529
struct ConcatenateOpCanon final
530530
: OpRewritePattern<mlir::stablehlo::ConcatenateOp> {
531-
using OpRewritePattern::OpRewritePattern;
531+
using Base::Base;
532532

533533
LogicalResult matchAndRewrite(mlir::stablehlo::ConcatenateOp op,
534534
PatternRewriter &rewriter) const override {
@@ -573,7 +573,7 @@ struct ConcatenateOpCanon final
573573
};
574574

575575
struct ConvertOpCanon final : OpRewritePattern<mlir::stablehlo::ConvertOp> {
576-
using OpRewritePattern::OpRewritePattern;
576+
using Base::Base;
577577

578578
LogicalResult matchAndRewrite(mlir::stablehlo::ConvertOp op,
579579
PatternRewriter &rewriter) const override {
@@ -625,7 +625,7 @@ static OpTy refineOpWithNewOp(PatternRewriter &rewriter, Operation *op,
625625
/// BroadcastInDimOp.
626626
struct DynamicBroadcastInDimOpNotActuallyDynamic final
627627
: OpRewritePattern<mlir::stablehlo::DynamicBroadcastInDimOp> {
628-
using OpRewritePattern::OpRewritePattern;
628+
using Base::Base;
629629

630630
LogicalResult matchAndRewrite(mlir::stablehlo::DynamicBroadcastInDimOp op,
631631
PatternRewriter &rewriter) const override {
@@ -666,7 +666,7 @@ struct DynamicBroadcastInDimOpNotActuallyDynamic final
666666

667667
struct ChainedDynamicBroadcastInDimCanonicalization final
668668
: OpRewritePattern<mlir::stablehlo::DynamicBroadcastInDimOp> {
669-
using OpRewritePattern::OpRewritePattern;
669+
using Base::Base;
670670

671671
LogicalResult matchAndRewrite(mlir::stablehlo::DynamicBroadcastInDimOp bcast,
672672
PatternRewriter &rewriter) const override {
@@ -694,7 +694,7 @@ struct ChainedDynamicBroadcastInDimCanonicalization final
694694
// the dynamic broadcast with a cast.
695695
struct DynamicBroadcastInDimAllDimsNonExpanding final
696696
: OpRewritePattern<mlir::stablehlo::DynamicBroadcastInDimOp> {
697-
using OpRewritePattern::OpRewritePattern;
697+
using Base::Base;
698698

699699
LogicalResult matchAndRewrite(mlir::stablehlo::DynamicBroadcastInDimOp op,
700700
PatternRewriter &rewriter) const override {
@@ -717,7 +717,7 @@ struct DynamicBroadcastInDimAllDimsNonExpanding final
717717
};
718718

719719
struct NoopReduceOpCanon final : OpRewritePattern<mlir::stablehlo::ReduceOp> {
720-
using OpRewritePattern::OpRewritePattern;
720+
using Base::Base;
721721

722722
LogicalResult matchAndRewrite(mlir::stablehlo::ReduceOp op,
723723
PatternRewriter &rewriter) const override {
@@ -747,7 +747,7 @@ struct NoopReduceOpCanon final : OpRewritePattern<mlir::stablehlo::ReduceOp> {
747747
};
748748

749749
struct EmptyReduceOpCanon final : OpRewritePattern<mlir::stablehlo::ReduceOp> {
750-
using OpRewritePattern::OpRewritePattern;
750+
using Base::Base;
751751

752752
LogicalResult matchAndRewrite(mlir::stablehlo::ReduceOp op,
753753
PatternRewriter &rewriter) const override {
@@ -793,7 +793,7 @@ struct EmptyReduceOpCanon final : OpRewritePattern<mlir::stablehlo::ReduceOp> {
793793

794794
struct DynamicReshapeOpCanon final
795795
: OpRewritePattern<mlir::stablehlo::DynamicReshapeOp> {
796-
using OpRewritePattern::OpRewritePattern;
796+
using Base::Base;
797797

798798
LogicalResult matchAndRewrite(mlir::stablehlo::DynamicReshapeOp op,
799799
PatternRewriter &rewriter) const override {
@@ -810,7 +810,7 @@ struct DynamicReshapeOpCanon final
810810

811811
struct GetTupleElementOpCanon final
812812
: OpRewritePattern<mlir::stablehlo::GetTupleElementOp> {
813-
using OpRewritePattern::OpRewritePattern;
813+
using Base::Base;
814814

815815
LogicalResult matchAndRewrite(mlir::stablehlo::GetTupleElementOp op,
816816
PatternRewriter &rewriter) const override {
@@ -826,7 +826,7 @@ struct GetTupleElementOpCanon final
826826
};
827827

828828
struct RealOpCanon final : OpRewritePattern<mlir::stablehlo::RealOp> {
829-
using OpRewritePattern::OpRewritePattern;
829+
using Base::Base;
830830

831831
LogicalResult matchAndRewrite(mlir::stablehlo::RealOp op,
832832
PatternRewriter &rewriter) const override {
@@ -840,7 +840,7 @@ struct RealOpCanon final : OpRewritePattern<mlir::stablehlo::RealOp> {
840840
};
841841

842842
struct ImagOpCanon final : OpRewritePattern<mlir::stablehlo::ImagOp> {
843-
using OpRewritePattern::OpRewritePattern;
843+
using Base::Base;
844844

845845
LogicalResult matchAndRewrite(mlir::stablehlo::ImagOp op,
846846
PatternRewriter &rewriter) const override {
@@ -855,7 +855,7 @@ struct ImagOpCanon final : OpRewritePattern<mlir::stablehlo::ImagOp> {
855855

856856
struct GetDimensionSizeOpCanon final
857857
: OpRewritePattern<mlir::stablehlo::GetDimensionSizeOp> {
858-
using OpRewritePattern::OpRewritePattern;
858+
using Base::Base;
859859

860860
LogicalResult matchAndRewrite(mlir::stablehlo::GetDimensionSizeOp op,
861861
PatternRewriter &rewriter) const override {
@@ -879,7 +879,7 @@ struct GetDimensionSizeOpCanon final
879879
/// Converts gather ops to slice ops in case we have a single set of constant
880880
/// indices.
881881
struct GatherOpCanon final : OpRewritePattern<mlir::stablehlo::GatherOp> {
882-
using OpRewritePattern::OpRewritePattern;
882+
using Base::Base;
883883

884884
LogicalResult matchAndRewrite(mlir::stablehlo::GatherOp gather,
885885
PatternRewriter &rewriter) const override {
@@ -953,7 +953,7 @@ struct GatherOpCanon final : OpRewritePattern<mlir::stablehlo::GatherOp> {
953953
};
954954

955955
struct ReshapeOpCanon final : OpRewritePattern<mlir::stablehlo::ReshapeOp> {
956-
using OpRewritePattern::OpRewritePattern;
956+
using Base::Base;
957957

958958
LogicalResult matchAndRewrite(mlir::stablehlo::ReshapeOp op,
959959
PatternRewriter &rewriter) const override {
@@ -986,7 +986,7 @@ struct ReshapeOpCanon final : OpRewritePattern<mlir::stablehlo::ReshapeOp> {
986986

987987
struct MergeConsecutiveReshapes final
988988
: OpRewritePattern<mlir::stablehlo::ReshapeOp> {
989-
using OpRewritePattern::OpRewritePattern;
989+
using Base::Base;
990990

991991
LogicalResult matchAndRewrite(mlir::stablehlo::ReshapeOp op,
992992
PatternRewriter &rewriter) const override {
@@ -1011,7 +1011,7 @@ struct MergeConsecutiveReshapes final
10111011

10121012
struct TransposeIsReshape final
10131013
: OpRewritePattern<mlir::stablehlo::TransposeOp> {
1014-
using OpRewritePattern::OpRewritePattern;
1014+
using Base::Base;
10151015

10161016
LogicalResult matchAndRewrite(mlir::stablehlo::TransposeOp op,
10171017
PatternRewriter &rewriter) const override {

‎compiler/plugins/input/StableHLO/Conversion/Preprocessing/DotGeneralToDot.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ Value processDotArg(Value arg, Location loc, ArrayRef<int64_t> contractDimsAttr,
147147

148148
struct GeneralDotRemoveBatch final
149149
: OpRewritePattern<mlir::stablehlo::DotGeneralOp> {
150-
using OpRewritePattern::OpRewritePattern;
150+
using Base::Base;
151151

152152
LogicalResult matchAndRewrite(mlir::stablehlo::DotGeneralOp op,
153153
PatternRewriter &rewriter) const override {
@@ -211,7 +211,7 @@ struct GeneralDotRemoveBatch final
211211

212212
struct GeneralDotConvert final
213213
: OpRewritePattern<mlir::stablehlo::DotGeneralOp> {
214-
using OpRewritePattern::OpRewritePattern;
214+
using Base::Base;
215215
// Attempts to lower a General Dot operator to a standard Dot operator.
216216
// General dots include batching dimensions and can have collapsing
217217
// dimensions along any axis. Inserting correctly arrange transpose and
@@ -382,7 +382,7 @@ struct GeneralDotConvert final
382382
};
383383

384384
struct DotVectorOptimization final : OpRewritePattern<mlir::stablehlo::DotOp> {
385-
using OpRewritePattern::OpRewritePattern;
385+
using Base::Base;
386386
LogicalResult matchAndRewrite(mlir::stablehlo::DotOp op,
387387
PatternRewriter &rewriter) const override {
388388
ImplicitLocOpBuilder b(op.getLoc(), rewriter);

‎compiler/plugins/input/StableHLO/Conversion/Preprocessing/EinsumToDotGeneral.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ namespace {
2121

2222
struct EinsumToDotGeneralPattern final
2323
: OpRewritePattern<mlir::stablehlo::EinsumOp> {
24-
using OpRewritePattern::OpRewritePattern;
24+
using Base::Base;
2525

2626
LogicalResult matchAndRewrite(mlir::stablehlo::EinsumOp einsum,
2727
PatternRewriter &rewriter) const override {

‎compiler/plugins/input/StableHLO/Conversion/Preprocessing/FlattenTuplesInCFG.cpp‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ LogicalResult untupleAndLookupValues(T values,
123123
}
124124

125125
class DetupleReturnOp : public OpRewritePattern<func::ReturnOp> {
126-
using OpRewritePattern::OpRewritePattern;
126+
using Base::Base;
127127

128128
LogicalResult matchAndRewrite(func::ReturnOp op,
129129
PatternRewriter &builder) const override {
@@ -143,7 +143,7 @@ class DetupleReturnOp : public OpRewritePattern<func::ReturnOp> {
143143
};
144144

145145
class DetupleCallOp : public OpRewritePattern<func::CallOp> {
146-
using OpRewritePattern::OpRewritePattern;
146+
using Base::Base;
147147

148148
LogicalResult matchAndRewrite(func::CallOp oldOp,
149149
PatternRewriter &builder) const override {
@@ -176,7 +176,7 @@ class DetupleCallOp : public OpRewritePattern<func::CallOp> {
176176
};
177177

178178
class DetupleIndirectCallOp : public OpRewritePattern<func::CallIndirectOp> {
179-
using OpRewritePattern::OpRewritePattern;
179+
using Base::Base;
180180

181181
LogicalResult matchAndRewrite(func::CallIndirectOp oldOp,
182182
PatternRewriter &builder) const override {
@@ -198,7 +198,7 @@ class DetupleIndirectCallOp : public OpRewritePattern<func::CallIndirectOp> {
198198
};
199199

200200
class DetupleBranchOp : public OpRewritePattern<cf::BranchOp> {
201-
using OpRewritePattern::OpRewritePattern;
201+
using Base::Base;
202202

203203
LogicalResult matchAndRewrite(cf::BranchOp oldOp,
204204
PatternRewriter &builder) const override {
@@ -221,7 +221,7 @@ class DetupleBranchOp : public OpRewritePattern<cf::BranchOp> {
221221
};
222222

223223
class DetupleConditionOp : public OpRewritePattern<cf::CondBranchOp> {
224-
using OpRewritePattern::OpRewritePattern;
224+
using Base::Base;
225225

226226
LogicalResult matchAndRewrite(cf::CondBranchOp oldOp,
227227
PatternRewriter &builder) const override {

‎compiler/plugins/input/StableHLO/Conversion/Preprocessing/FlattenTuplesInSCF.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ void DetupleRegion(Region &srcRegion, Region &destRegion, ArrayRef<Type> types,
100100
}
101101

102102
class DetupleYieldOp : public OpRewritePattern<scf::YieldOp> {
103-
using OpRewritePattern::OpRewritePattern;
103+
using Base::Base;
104104

105105
LogicalResult matchAndRewrite(mlir::scf::YieldOp op,
106106
PatternRewriter &rewriter) const override {
@@ -123,7 +123,7 @@ class DetupleYieldOp : public OpRewritePattern<scf::YieldOp> {
123123
};
124124

125125
class DetupleConditionOp : public OpRewritePattern<scf::ConditionOp> {
126-
using OpRewritePattern::OpRewritePattern;
126+
using Base::Base;
127127

128128
LogicalResult matchAndRewrite(mlir::scf::ConditionOp op,
129129
PatternRewriter &rewriter) const override {
@@ -147,7 +147,7 @@ class DetupleConditionOp : public OpRewritePattern<scf::ConditionOp> {
147147
};
148148

149149
class DetupleIfOp : public OpRewritePattern<scf::IfOp> {
150-
using OpRewritePattern::OpRewritePattern;
150+
using Base::Base;
151151

152152
LogicalResult matchAndRewrite(mlir::scf::IfOp op,
153153
PatternRewriter &rewriter) const override {
@@ -190,7 +190,7 @@ class DetupleIfOp : public OpRewritePattern<scf::IfOp> {
190190
};
191191

192192
class DetupleWhileOp : public OpRewritePattern<scf::WhileOp> {
193-
using OpRewritePattern::OpRewritePattern;
193+
using Base::Base;
194194

195195
LogicalResult matchAndRewrite(mlir::scf::WhileOp op,
196196
PatternRewriter &rewriter) const override {

‎compiler/plugins/input/StableHLO/Conversion/Preprocessing/GatherToTorchIndexSelect.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ namespace mlir::iree_compiler::stablehlo {
2121
namespace {
2222
struct GatherIsTorchIndexSelectPattern final
2323
: OpRewritePattern<mlir::stablehlo::GatherOp> {
24-
using OpRewritePattern::OpRewritePattern;
24+
using Base::Base;
2525

2626
LogicalResult matchAndRewrite(mlir::stablehlo::GatherOp gather,
2727
PatternRewriter &rewriter) const override {

‎compiler/plugins/input/StableHLO/Conversion/Preprocessing/LowerComplex.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ namespace mlir::iree_compiler::stablehlo {
2222
namespace {
2323

2424
struct ConvertComplexDot final : OpRewritePattern<mlir::stablehlo::DotOp> {
25-
using OpRewritePattern::OpRewritePattern;
25+
using Base::Base;
2626

2727
// Will decompose stablehlo::DotOp with complex parameters down to
2828
// four Dot operations in the following fashion:

0 commit comments

Comments
 (0)