Skip to content

Commit fdc5703

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

File tree

38 files changed

+214
-214
lines changed

38 files changed

+214
-214
lines changed

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -437,7 +437,7 @@ struct PartitionIdOpConversion
437437
/// Converts stablehlo.replica_id to floor_div(flow.channel.rank, numPartitions)
438438
struct ReplicaIdOpConversion
439439
: public OpConversionPattern<mlir::stablehlo::ReplicaIdOp> {
440-
using OpConversionPattern<mlir::stablehlo::ReplicaIdOp>::OpConversionPattern;
440+
using Base::Base;
441441

442442
LogicalResult
443443
matchAndRewrite(mlir::stablehlo::ReplicaIdOp op, OpAdaptor adaptor,
@@ -471,7 +471,7 @@ struct ReplicaIdOpConversion
471471

472472
struct AllGatherOpConversion final
473473
: OpConversionPattern<mlir::stablehlo::AllGatherOp> {
474-
using OpConversionPattern::OpConversionPattern;
474+
using Base::Base;
475475

476476
LogicalResult
477477
matchAndRewrite(mlir::stablehlo::AllGatherOp op, OpAdaptor adaptor,
@@ -530,7 +530,7 @@ struct AllGatherOpConversion final
530530

531531
struct AllReduceOpConversion final
532532
: OpConversionPattern<mlir::stablehlo::AllReduceOp> {
533-
using OpConversionPattern::OpConversionPattern;
533+
using Base::Base;
534534

535535
LogicalResult
536536
matchAndRewrite(mlir::stablehlo::AllReduceOp op, OpAdaptor adaptor,
@@ -662,7 +662,7 @@ Value splitAndConcatForAllToAll(ConversionPatternRewriter &rewriter,
662662

663663
struct AllToAllOpConversion final
664664
: OpConversionPattern<mlir::stablehlo::AllToAllOp> {
665-
using OpConversionPattern::OpConversionPattern;
665+
using Base::Base;
666666

667667
LogicalResult
668668
matchAndRewrite(mlir::stablehlo::AllToAllOp op, OpAdaptor adaptor,
@@ -727,7 +727,7 @@ struct AllToAllOpConversion final
727727

728728
struct ReduceScatterOpConversion final
729729
: OpConversionPattern<mlir::stablehlo::ReduceScatterOp> {
730-
using OpConversionPattern::OpConversionPattern;
730+
using Base::Base;
731731

732732
LogicalResult
733733
matchAndRewrite(mlir::stablehlo::ReduceScatterOp op, OpAdaptor adaptor,

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ std::optional<ScfForBounds> extractForBounds(mlir::stablehlo::WhileOp op) {
107107

108108
// Rewrites `stablehlo.while` to `scf.while` or `scf.for`.
109109
struct WhileOpPattern final : OpConversionPattern<mlir::stablehlo::WhileOp> {
110-
using OpConversionPattern::OpConversionPattern;
110+
using Base::Base;
111111

112112
LogicalResult
113113
matchAndRewrite(mlir::stablehlo::WhileOp op, OpAdaptor adaptor,
@@ -164,7 +164,7 @@ struct WhileOpPattern final : OpConversionPattern<mlir::stablehlo::WhileOp> {
164164

165165
// Rewrites `stablehlo.if` to `scf.if`.
166166
struct IfOpPattern final : OpConversionPattern<mlir::stablehlo::IfOp> {
167-
using OpConversionPattern::OpConversionPattern;
167+
using Base::Base;
168168

169169
LogicalResult
170170
matchAndRewrite(mlir::stablehlo::IfOp op, OpAdaptor adaptor,
@@ -184,7 +184,7 @@ struct IfOpPattern final : OpConversionPattern<mlir::stablehlo::IfOp> {
184184

185185
// Rewrites `stablehlo.case` to a nested `scf.if`.
186186
struct CaseOpPattern : public OpConversionPattern<mlir::stablehlo::CaseOp> {
187-
using OpConversionPattern::OpConversionPattern;
187+
using Base::Base;
188188

189189
// Recursively create if/else ops to handle each possible value in a case op.
190190
scf::IfOp createNestedCases(int currentIdx, mlir::stablehlo::CaseOp op,

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ namespace {
5252
/// so we use this lowering instead with a higher pattern benefit.
5353
struct ConcatenateOpConversion final
5454
: OpConversionPattern<mlir::stablehlo::ConcatenateOp> {
55-
using OpConversionPattern::OpConversionPattern;
55+
using Base::Base;
5656

5757
LogicalResult
5858
matchAndRewrite(mlir::stablehlo::ConcatenateOp op, OpAdaptor adaptor,
@@ -166,7 +166,7 @@ Value createLinalgMatmulOnTensors(OpBuilder b, Location loc,
166166

167167
/// Converts stablehlo.fft operation to Linalg ops.
168168
struct FftOpConversion final : OpConversionPattern<mlir::stablehlo::FftOp> {
169-
using OpConversionPattern::OpConversionPattern;
169+
using Base::Base;
170170

171171
LogicalResult
172172
matchAndRewrite(mlir::stablehlo::FftOp op, OpAdaptor adaptor,
@@ -211,7 +211,7 @@ struct FftOpConversion final : OpConversionPattern<mlir::stablehlo::FftOp> {
211211

212212
struct OptimizationBarrierOpConversion final
213213
: OpConversionPattern<mlir::stablehlo::OptimizationBarrierOp> {
214-
using OpConversionPattern::OpConversionPattern;
214+
using Base::Base;
215215

216216
LogicalResult
217217
matchAndRewrite(mlir::stablehlo::OptimizationBarrierOp op, OpAdaptor adaptor,
@@ -291,7 +291,7 @@ static void rewriteFuncAttrs(func::FuncOp funcOp) {
291291

292292
// We need to convert func ops in order to convert types.
293293
struct BuiltinFuncOpPattern final : OpConversionPattern<func::FuncOp> {
294-
using OpConversionPattern::OpConversionPattern;
294+
using Base::Base;
295295

296296
LogicalResult
297297
matchAndRewrite(func::FuncOp srcOp, OpAdaptor adaptor,
@@ -340,7 +340,7 @@ struct BuiltinFuncOpPattern final : OpConversionPattern<func::FuncOp> {
340340
};
341341

342342
struct TensorEmptyPattern final : OpConversionPattern<tensor::EmptyOp> {
343-
using OpConversionPattern<tensor::EmptyOp>::OpConversionPattern;
343+
using Base::Base;
344344

345345
LogicalResult
346346
matchAndRewrite(tensor::EmptyOp op, OpAdaptor adaptor,
@@ -362,7 +362,7 @@ struct TensorEmptyPattern final : OpConversionPattern<tensor::EmptyOp> {
362362
};
363363

364364
struct GlobalOpPattern final : OpConversionPattern<ml_program::GlobalOp> {
365-
using OpConversionPattern<ml_program::GlobalOp>::OpConversionPattern;
365+
using Base::Base;
366366

367367
LogicalResult
368368
matchAndRewrite(ml_program::GlobalOp globalOp, OpAdaptor adaptor,

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ struct LinalgExtRegionHLOOpConversion final : OpConversionPattern<OpTy> {
148148

149149
struct LinalgExtRegionReturnOpConversion final
150150
: OpConversionPattern<mlir::stablehlo::ReturnOp> {
151-
using OpConversionPattern::OpConversionPattern;
151+
using Base::Base;
152152
LogicalResult
153153
matchAndRewrite(mlir::stablehlo::ReturnOp op, OpAdaptor adaptor,
154154
ConversionPatternRewriter &rewriter) const override {
@@ -165,7 +165,7 @@ struct LinalgExtRegionReturnOpConversion final
165165
//===----------------------------------------------------------------------===//
166166

167167
struct SortOpConversion final : OpConversionPattern<mlir::stablehlo::SortOp> {
168-
using OpConversionPattern::OpConversionPattern;
168+
using Base::Base;
169169

170170
LogicalResult
171171
matchAndRewrite(mlir::stablehlo::SortOp op, OpAdaptor adaptor,
@@ -204,7 +204,7 @@ struct SortOpConversion final : OpConversionPattern<mlir::stablehlo::SortOp> {
204204

205205
struct ScatterOpConversion final
206206
: OpConversionPattern<mlir::stablehlo::ScatterOp> {
207-
using OpConversionPattern::OpConversionPattern;
207+
using Base::Base;
208208

209209
/// Returns true if the `dimensionNumbers` from the stablehlo.scatter op
210210
/// follows a canonical form:
@@ -295,7 +295,7 @@ struct ScatterOpConversion final
295295
//===----------------------------------------------------------------------===//
296296

297297
struct FftOpConversion final : OpConversionPattern<mlir::stablehlo::FftOp> {
298-
using OpConversionPattern::OpConversionPattern;
298+
using Base::Base;
299299

300300
LogicalResult
301301
matchAndRewrite(mlir::stablehlo::FftOp op, OpAdaptor adaptor,
@@ -330,7 +330,7 @@ struct FftOpConversion final : OpConversionPattern<mlir::stablehlo::FftOp> {
330330

331331
struct ReverseOpConversion final
332332
: OpConversionPattern<mlir::stablehlo::ReverseOp> {
333-
using OpConversionPattern::OpConversionPattern;
333+
using Base::Base;
334334
LogicalResult
335335
matchAndRewrite(mlir::stablehlo::ReverseOp op, OpAdaptor adaptor,
336336
ConversionPatternRewriter &rewriter) const override {
@@ -397,7 +397,7 @@ static bool checkUnary(const ArrayRef<int64_t> &values) {
397397

398398
struct ScanOpConversion final
399399
: OpConversionPattern<mlir::stablehlo::ReduceWindowOp> {
400-
using OpConversionPattern::OpConversionPattern;
400+
using Base::Base;
401401
LogicalResult
402402
matchAndRewrite(mlir::stablehlo::ReduceWindowOp op, OpAdaptor adaptor,
403403
ConversionPatternRewriter &rewriter) const override {
@@ -546,7 +546,7 @@ struct ScanOpConversion final
546546
//===----------------------------------------------------------------------===//
547547

548548
struct TopkOpConversion final : OpConversionPattern<chlo::TopKOp> {
549-
using OpConversionPattern::OpConversionPattern;
549+
using Base::Base;
550550
LogicalResult
551551
matchAndRewrite(chlo::TopKOp op, OpAdaptor adaptor,
552552
ConversionPatternRewriter &rewriter) const override {

‎compiler/src/iree/compiler/Codegen/Common/ConvertBf16ToUInt16Buffers.cpp‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ class Bf16EmulationConverter : public TypeConverter {
7676
//===----------------------------------------------------------------------===//
7777
struct ConvertHalInterfaceBindingSubspan final
7878
: OpConversionPattern<IREE::HAL::InterfaceBindingSubspanOp> {
79-
using OpConversionPattern::OpConversionPattern;
79+
using Base::Base;
8080

8181
LogicalResult
8282
matchAndRewrite(IREE::HAL::InterfaceBindingSubspanOp op, OpAdaptor adaptor,
@@ -99,7 +99,7 @@ struct ConvertHalInterfaceBindingSubspan final
9999
};
100100

101101
struct ConvertMemRefAlloc final : OpConversionPattern<memref::AllocOp> {
102-
using OpConversionPattern::OpConversionPattern;
102+
using Base::Base;
103103

104104
LogicalResult
105105
matchAndRewrite(memref::AllocOp op, OpAdaptor adaptor,
@@ -185,7 +185,7 @@ struct GenericTypeConversionPattern : public ConversionPattern {
185185
};
186186

187187
struct ConvertMemRefLoad final : OpConversionPattern<memref::LoadOp> {
188-
using OpConversionPattern::OpConversionPattern;
188+
using Base::Base;
189189

190190
LogicalResult
191191
matchAndRewrite(memref::LoadOp op, OpAdaptor adaptor,
@@ -204,7 +204,7 @@ struct ConvertMemRefLoad final : OpConversionPattern<memref::LoadOp> {
204204
};
205205

206206
struct ConvertMemRefStore final : OpConversionPattern<memref::StoreOp> {
207-
using OpConversionPattern::OpConversionPattern;
207+
using Base::Base;
208208

209209
LogicalResult
210210
matchAndRewrite(memref::StoreOp op, OpAdaptor adaptor,
@@ -224,7 +224,7 @@ struct ConvertMemRefStore final : OpConversionPattern<memref::StoreOp> {
224224

225225
struct ConvertAmdgpuFatRawBufferCast final
226226
: OpConversionPattern<amdgpu::FatRawBufferCastOp> {
227-
using OpConversionPattern::OpConversionPattern;
227+
using Base::Base;
228228

229229
LogicalResult
230230
matchAndRewrite(amdgpu::FatRawBufferCastOp op, OpAdaptor adaptor,

‎compiler/src/iree/compiler/Codegen/Common/EmulateNarrowType.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ namespace {
3636

3737
struct ConvertHalInterfaceBindingSubspan final
3838
: OpConversionPattern<IREE::HAL::InterfaceBindingSubspanOp> {
39-
using OpConversionPattern::OpConversionPattern;
39+
using Base::Base;
4040

4141
LogicalResult
4242
matchAndRewrite(IREE::HAL::InterfaceBindingSubspanOp op, OpAdaptor adaptor,
@@ -331,7 +331,7 @@ static void nonAtomicRMW(OpBuilder &builder, Location loc,
331331
// NOTE: By default, all RMW sequences are atomic. Set `disableAtomicRMW` to
332332
// `false` to generate non-atomic RMW sequences.
333333
struct IREEConvertVectorStore final : OpConversionPattern<vector::StoreOp> {
334-
using OpConversionPattern::OpConversionPattern;
334+
using Base::Base;
335335

336336
IREEConvertVectorStore(MLIRContext *context, bool disableAtomicRMW,
337337
PatternBenefit benefit)

‎compiler/src/iree/compiler/Codegen/Common/FlattenMemRefSubspanPass.cpp‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ struct FlattenAlloc final : public OpConversionPattern<AllocOpTy> {
173173

174174
/// Flattens memref global ops with more than 1 dimensions to 1 dimension.
175175
struct FlattenGlobal final : public OpConversionPattern<memref::GlobalOp> {
176-
using OpConversionPattern::OpConversionPattern;
176+
using Base::Base;
177177

178178
static Attribute flattenAttribute(Attribute value, ShapedType newType) {
179179
if (!value)
@@ -215,7 +215,7 @@ struct FlattenGlobal final : public OpConversionPattern<memref::GlobalOp> {
215215
/// Flattens memref global load ops with more than 1 dimensions to 1 dimension.
216216
struct FlattenGetGlobal final
217217
: public OpConversionPattern<memref::GetGlobalOp> {
218-
using OpConversionPattern::OpConversionPattern;
218+
using Base::Base;
219219

220220
LogicalResult
221221
matchAndRewrite(memref::GetGlobalOp getOp, OpAdaptor adaptor,
@@ -242,7 +242,7 @@ struct FlattenGetGlobal final
242242
/// Flattens memref subspan ops with more than 1 dimensions to 1 dimension.
243243
struct FlattenBindingSubspan final
244244
: public OpConversionPattern<IREE::HAL::InterfaceBindingSubspanOp> {
245-
using OpConversionPattern::OpConversionPattern;
245+
using Base::Base;
246246

247247
LogicalResult
248248
matchAndRewrite(IREE::HAL::InterfaceBindingSubspanOp subspanOp,
@@ -320,7 +320,7 @@ struct FlattenBindingSubspan final
320320
// necessary.
321321
struct FlattenReinterpretCast
322322
: public OpConversionPattern<memref::ReinterpretCastOp> {
323-
using OpConversionPattern::OpConversionPattern;
323+
using Base::Base;
324324

325325
LogicalResult
326326
matchAndRewrite(memref::ReinterpretCastOp op, OpAdaptor adaptor,
@@ -432,7 +432,7 @@ static Value linearizeIndices(Value sourceValue, ValueRange indices,
432432

433433
/// Flattens memref subspan ops with more than 1 dimensions to 1 dimension.
434434
struct FlattenSubView final : public OpConversionPattern<memref::SubViewOp> {
435-
using OpConversionPattern::OpConversionPattern;
435+
using Base::Base;
436436

437437
LogicalResult
438438
matchAndRewrite(memref::SubViewOp op, OpAdaptor adaptor,
@@ -463,7 +463,7 @@ struct FlattenSubView final : public OpConversionPattern<memref::SubViewOp> {
463463

464464
/// Linearizes indices in memref.load ops.
465465
struct LinearizeLoadIndices final : public OpConversionPattern<memref::LoadOp> {
466-
using OpConversionPattern<memref::LoadOp>::OpConversionPattern;
466+
using Base::Base;
467467

468468
LogicalResult
469469
matchAndRewrite(memref::LoadOp loadOp, OpAdaptor adaptor,
@@ -488,7 +488,7 @@ struct LinearizeLoadIndices final : public OpConversionPattern<memref::LoadOp> {
488488
/// Linearizes indices in gpu.subgroup_mma_load_matrix ops.
489489
struct LinearizeMMALoadIndices final
490490
: public OpConversionPattern<gpu::SubgroupMmaLoadMatrixOp> {
491-
using OpConversionPattern::OpConversionPattern;
491+
using Base::Base;
492492

493493
LogicalResult
494494
matchAndRewrite(gpu::SubgroupMmaLoadMatrixOp loadOp, OpAdaptor adaptor,
@@ -514,7 +514,7 @@ struct LinearizeMMALoadIndices final
514514
/// Linearizes indices in memref.store ops.
515515
struct LinearizeStoreIndices final
516516
: public OpConversionPattern<memref::StoreOp> {
517-
using OpConversionPattern<memref::StoreOp>::OpConversionPattern;
517+
using Base::Base;
518518

519519
LogicalResult
520520
matchAndRewrite(memref::StoreOp storeOp, OpAdaptor adaptor,
@@ -539,7 +539,7 @@ struct LinearizeStoreIndices final
539539
/// Linearizes indices in gpu.subgroup_mma_store_matrix ops.
540540
struct LinearizeMMAStoreIndices final
541541
: public OpConversionPattern<gpu::SubgroupMmaStoreMatrixOp> {
542-
using OpConversionPattern::OpConversionPattern;
542+
using Base::Base;
543543

544544
LogicalResult
545545
matchAndRewrite(gpu::SubgroupMmaStoreMatrixOp storeOp, OpAdaptor adaptor,
@@ -566,7 +566,7 @@ struct LinearizeMMAStoreIndices final
566566
/// Linearizes indices in vector.transfer_read ops.
567567
struct LinearizeTransferReadIndices final
568568
: public OpConversionPattern<vector::TransferReadOp> {
569-
using OpConversionPattern<vector::TransferReadOp>::OpConversionPattern;
569+
using Base::Base;
570570

571571
LogicalResult
572572
matchAndRewrite(vector::TransferReadOp transferReadOp, OpAdaptor adaptor,
@@ -599,7 +599,7 @@ struct LinearizeTransferReadIndices final
599599
/// Linearizes indices in vector.transfer_write ops.
600600
struct LinearizeTransferWriteIndices final
601601
: public OpConversionPattern<vector::TransferWriteOp> {
602-
using OpConversionPattern<vector::TransferWriteOp>::OpConversionPattern;
602+
using Base::Base;
603603

604604
LogicalResult
605605
matchAndRewrite(vector::TransferWriteOp transferWriteOp, OpAdaptor adaptor,
@@ -630,7 +630,7 @@ struct LinearizeTransferWriteIndices final
630630

631631
/// Updates deallocations to the flattened allocation.
632632
struct FlattenDealloc final : public OpConversionPattern<memref::DeallocOp> {
633-
using OpConversionPattern::OpConversionPattern;
633+
using Base::Base;
634634

635635
LogicalResult
636636
matchAndRewrite(memref::DeallocOp deallocOp, OpAdaptor adaptor,
@@ -648,7 +648,7 @@ struct FlattenDealloc final : public OpConversionPattern<memref::DeallocOp> {
648648
/// Adjusts unrealized_conversion_cast ops' inputs to flattened memref values.
649649
struct AdjustConversionCast final
650650
: public OpConversionPattern<UnrealizedConversionCastOp> {
651-
using OpConversionPattern::OpConversionPattern;
651+
using Base::Base;
652652

653653
LogicalResult
654654
matchAndRewrite(UnrealizedConversionCastOp castOp, OpAdaptor adaptor,
@@ -717,7 +717,7 @@ struct FoldMemRefReshape final : public OpConversionPattern<ReshapeOpTy> {
717717
/// Fold alignment hints.
718718
struct FoldAssumeAlignOp
719719
: public OpConversionPattern<memref::AssumeAlignmentOp> {
720-
using OpConversionPattern::OpConversionPattern;
720+
using Base::Base;
721721
LogicalResult
722722
matchAndRewrite(memref::AssumeAlignmentOp op, OpAdaptor adaptor,
723723
ConversionPatternRewriter &rewriter) const override {

0 commit comments

Comments
 (0)