Skip to content

Commit 94b6b53

Browse files
kuhargithub-actions[bot]
kuhar
authored and
github-actions[bot]
committed
Automerge: [mlir][arith] Simplify inheriting constructors declarations. NFC. (#159682)
Use the `Base` type alias from llvm/llvm-project#158433.
2 parents c327fba + 3baddef commit 94b6b53

File tree

8 files changed

+44
-44
lines changed

8 files changed

+44
-44
lines changed

‎mlir/lib/Conversion/ArithToAMDGPU/ArithToAMDGPU.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ struct ArithToAMDGPUConversionPass final
4646
};
4747

4848
struct ExtFOnFloat8RewritePattern final : OpRewritePattern<arith::ExtFOp> {
49-
using OpRewritePattern::OpRewritePattern;
49+
using Base::Base;
5050

5151
Chipset chipset;
5252
ExtFOnFloat8RewritePattern(MLIRContext *ctx, Chipset chipset,
@@ -72,23 +72,23 @@ struct TruncFToFloat8RewritePattern final : OpRewritePattern<arith::TruncFOp> {
7272
struct TruncfToFloat16RewritePattern final
7373
: public OpRewritePattern<arith::TruncFOp> {
7474

75-
using OpRewritePattern::OpRewritePattern;
75+
using Base::Base;
7676

7777
LogicalResult matchAndRewrite(arith::TruncFOp op,
7878
PatternRewriter &rewriter) const override;
7979
};
8080

8181
struct ScalingExtFRewritePattern final
8282
: OpRewritePattern<arith::ScalingExtFOp> {
83-
using OpRewritePattern::OpRewritePattern;
83+
using Base::Base;
8484

8585
LogicalResult matchAndRewrite(arith::ScalingExtFOp op,
8686
PatternRewriter &rewriter) const override;
8787
};
8888

8989
struct ScalingTruncFRewritePattern final
9090
: OpRewritePattern<arith::ScalingTruncFOp> {
91-
using OpRewritePattern::OpRewritePattern;
91+
using Base::Base;
9292

9393
LogicalResult matchAndRewrite(arith::ScalingTruncFOp op,
9494
PatternRewriter &rewriter) const override;

‎mlir/lib/Conversion/ArithToArmSME/ArithToArmSME.cpp‎

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

4545
/// Conversion pattern for dense arith.constant.
4646
struct ConstantOpToArmSMELowering : public OpRewritePattern<arith::ConstantOp> {
47-
using OpRewritePattern<arith::ConstantOp>::OpRewritePattern;
47+
using Base::Base;
4848

4949
LogicalResult matchAndRewrite(arith::ConstantOp constantOp,
5050
PatternRewriter &rewriter) const final {

‎mlir/lib/Conversion/ArithToEmitC/ArithToEmitC.cpp‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ namespace {
5252
class ArithConstantOpConversionPattern
5353
: public OpConversionPattern<arith::ConstantOp> {
5454
public:
55-
using OpConversionPattern::OpConversionPattern;
55+
using Base::Base;
5656

5757
LogicalResult
5858
matchAndRewrite(arith::ConstantOp arithConst,
@@ -94,7 +94,7 @@ Value adaptValueType(Value val, ConversionPatternRewriter &rewriter, Type ty) {
9494

9595
class CmpFOpConversion : public OpConversionPattern<arith::CmpFOp> {
9696
public:
97-
using OpConversionPattern::OpConversionPattern;
97+
using Base::Base;
9898

9999
LogicalResult
100100
matchAndRewrite(arith::CmpFOp op, OpAdaptor adaptor,
@@ -248,7 +248,7 @@ class CmpFOpConversion : public OpConversionPattern<arith::CmpFOp> {
248248

249249
class CmpIOpConversion : public OpConversionPattern<arith::CmpIOp> {
250250
public:
251-
using OpConversionPattern::OpConversionPattern;
251+
using Base::Base;
252252

253253
bool needsUnsignedCmp(arith::CmpIPredicate pred) const {
254254
switch (pred) {
@@ -314,7 +314,7 @@ class CmpIOpConversion : public OpConversionPattern<arith::CmpIOp> {
314314

315315
class NegFOpConversion : public OpConversionPattern<arith::NegFOp> {
316316
public:
317-
using OpConversionPattern::OpConversionPattern;
317+
using Base::Base;
318318

319319
LogicalResult
320320
matchAndRewrite(arith::NegFOp op, OpAdaptor adaptor,
@@ -647,7 +647,7 @@ class UnsignedShiftOpConversion final
647647

648648
class SelectOpConversion : public OpConversionPattern<arith::SelectOp> {
649649
public:
650-
using OpConversionPattern<arith::SelectOp>::OpConversionPattern;
650+
using Base::Base;
651651

652652
LogicalResult
653653
matchAndRewrite(arith::SelectOp selectOp, OpAdaptor adaptor,

‎mlir/lib/Conversion/ArithToLLVM/ArithToLLVM.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ struct ConstrainedVectorConvertToLLVMPattern
5757
/// are the same.
5858
struct IdentityBitcastLowering final
5959
: public OpConversionPattern<arith::BitcastOp> {
60-
using OpConversionPattern::OpConversionPattern;
60+
using Base::Base;
6161

6262
LogicalResult
6363
matchAndRewrite(arith::BitcastOp op, OpAdaptor adaptor,

‎mlir/lib/Conversion/TosaToArith/TosaToArith.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ namespace {
2323

2424
class ConstOpConverter : public OpRewritePattern<tosa::ConstOp> {
2525
public:
26-
using OpRewritePattern<tosa::ConstOp>::OpRewritePattern;
26+
using Base::Base;
2727

2828
LogicalResult matchAndRewrite(tosa::ConstOp op,
2929
PatternRewriter &rewriter) const final {
@@ -60,7 +60,7 @@ Value getConstantValue(Location loc, Type type, int64_t value,
6060
class ApplyScaleGenericOpConverter
6161
: public OpRewritePattern<tosa::ApplyScaleOp> {
6262
public:
63-
using OpRewritePattern<tosa::ApplyScaleOp>::OpRewritePattern;
63+
using Base::Base;
6464

6565
LogicalResult matchAndRewrite(tosa::ApplyScaleOp op,
6666
PatternRewriter &rewriter) const final {
@@ -126,7 +126,7 @@ class ApplyScaleGenericOpConverter
126126

127127
class ApplyScale32BitOpConverter : public OpRewritePattern<tosa::ApplyScaleOp> {
128128
public:
129-
using OpRewritePattern<tosa::ApplyScaleOp>::OpRewritePattern;
129+
using Base::Base;
130130

131131
LogicalResult matchAndRewrite(tosa::ApplyScaleOp op,
132132
PatternRewriter &rewriter) const final {

‎mlir/lib/Dialect/Arith/IR/ArithOps.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2137,7 +2137,7 @@ OpFoldResult arith::CmpFOp::fold(FoldAdaptor adaptor) {
21372137

21382138
class CmpFIntToFPConst final : public OpRewritePattern<CmpFOp> {
21392139
public:
2140-
using OpRewritePattern<CmpFOp>::OpRewritePattern;
2140+
using Base::Base;
21412141

21422142
static CmpIPredicate convertToIntegerPredicate(CmpFPredicate pred,
21432143
bool isUnsigned) {
@@ -2431,7 +2431,7 @@ void arith::CmpFOp::getCanonicalizationPatterns(RewritePatternSet &patterns,
24312431

24322432
// select %arg, %c1, %c0 => extui %arg
24332433
struct SelectToExtUI : public OpRewritePattern<arith::SelectOp> {
2434-
using OpRewritePattern<arith::SelectOp>::OpRewritePattern;
2434+
using Base::Base;
24352435

24362436
LogicalResult matchAndRewrite(arith::SelectOp op,
24372437
PatternRewriter &rewriter) const override {

‎mlir/lib/Dialect/Arith/Transforms/EmulateWideInt.cpp‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ namespace {
173173
//===----------------------------------------------------------------------===//
174174

175175
struct ConvertConstant final : OpConversionPattern<arith::ConstantOp> {
176-
using OpConversionPattern::OpConversionPattern;
176+
using Base::Base;
177177

178178
LogicalResult
179179
matchAndRewrite(arith::ConstantOp op, OpAdaptor,
@@ -235,7 +235,7 @@ struct ConvertConstant final : OpConversionPattern<arith::ConstantOp> {
235235
//===----------------------------------------------------------------------===//
236236

237237
struct ConvertAddI final : OpConversionPattern<arith::AddIOp> {
238-
using OpConversionPattern::OpConversionPattern;
238+
using Base::Base;
239239

240240
LogicalResult
241241
matchAndRewrite(arith::AddIOp op, OpAdaptor adaptor,
@@ -325,7 +325,7 @@ static arith::CmpIPredicate toUnsignedPredicate(arith::CmpIPredicate pred) {
325325
}
326326

327327
struct ConvertCmpI final : OpConversionPattern<arith::CmpIOp> {
328-
using OpConversionPattern::OpConversionPattern;
328+
using Base::Base;
329329

330330
LogicalResult
331331
matchAndRewrite(arith::CmpIOp op, OpAdaptor adaptor,
@@ -381,7 +381,7 @@ struct ConvertCmpI final : OpConversionPattern<arith::CmpIOp> {
381381
//===----------------------------------------------------------------------===//
382382

383383
struct ConvertMulI final : OpConversionPattern<arith::MulIOp> {
384-
using OpConversionPattern::OpConversionPattern;
384+
using Base::Base;
385385

386386
LogicalResult
387387
matchAndRewrite(arith::MulIOp op, OpAdaptor adaptor,
@@ -422,7 +422,7 @@ struct ConvertMulI final : OpConversionPattern<arith::MulIOp> {
422422
//===----------------------------------------------------------------------===//
423423

424424
struct ConvertExtSI final : OpConversionPattern<arith::ExtSIOp> {
425-
using OpConversionPattern::OpConversionPattern;
425+
using Base::Base;
426426

427427
LogicalResult
428428
matchAndRewrite(arith::ExtSIOp op, OpAdaptor adaptor,
@@ -460,7 +460,7 @@ struct ConvertExtSI final : OpConversionPattern<arith::ExtSIOp> {
460460
//===----------------------------------------------------------------------===//
461461

462462
struct ConvertExtUI final : OpConversionPattern<arith::ExtUIOp> {
463-
using OpConversionPattern::OpConversionPattern;
463+
using Base::Base;
464464

465465
LogicalResult
466466
matchAndRewrite(arith::ExtUIOp op, OpAdaptor adaptor,
@@ -598,7 +598,7 @@ struct ConvertIndexCastIndexToInt final : OpConversionPattern<CastOp> {
598598
//===----------------------------------------------------------------------===//
599599

600600
struct ConvertSelect final : OpConversionPattern<arith::SelectOp> {
601-
using OpConversionPattern::OpConversionPattern;
601+
using Base::Base;
602602

603603
LogicalResult
604604
matchAndRewrite(arith::SelectOp op, OpAdaptor adaptor,
@@ -631,7 +631,7 @@ struct ConvertSelect final : OpConversionPattern<arith::SelectOp> {
631631
//===----------------------------------------------------------------------===//
632632

633633
struct ConvertShLI final : OpConversionPattern<arith::ShLIOp> {
634-
using OpConversionPattern::OpConversionPattern;
634+
using Base::Base;
635635

636636
LogicalResult
637637
matchAndRewrite(arith::ShLIOp op, OpAdaptor adaptor,
@@ -720,7 +720,7 @@ struct ConvertShLI final : OpConversionPattern<arith::ShLIOp> {
720720
//===----------------------------------------------------------------------===//
721721

722722
struct ConvertShRUI final : OpConversionPattern<arith::ShRUIOp> {
723-
using OpConversionPattern::OpConversionPattern;
723+
using Base::Base;
724724

725725
LogicalResult
726726
matchAndRewrite(arith::ShRUIOp op, OpAdaptor adaptor,
@@ -809,7 +809,7 @@ struct ConvertShRUI final : OpConversionPattern<arith::ShRUIOp> {
809809
//===----------------------------------------------------------------------===//
810810

811811
struct ConvertShRSI final : OpConversionPattern<arith::ShRSIOp> {
812-
using OpConversionPattern::OpConversionPattern;
812+
using Base::Base;
813813

814814
LogicalResult
815815
matchAndRewrite(arith::ShRSIOp op, OpAdaptor adaptor,
@@ -872,7 +872,7 @@ struct ConvertShRSI final : OpConversionPattern<arith::ShRSIOp> {
872872
//===----------------------------------------------------------------------===//
873873

874874
struct ConvertSubI final : OpConversionPattern<arith::SubIOp> {
875-
using OpConversionPattern::OpConversionPattern;
875+
using Base::Base;
876876

877877
LogicalResult
878878
matchAndRewrite(arith::SubIOp op, OpAdaptor adaptor,
@@ -912,7 +912,7 @@ struct ConvertSubI final : OpConversionPattern<arith::SubIOp> {
912912
//===----------------------------------------------------------------------===//
913913

914914
struct ConvertSIToFP final : OpConversionPattern<arith::SIToFPOp> {
915-
using OpConversionPattern::OpConversionPattern;
915+
using Base::Base;
916916

917917
LogicalResult
918918
matchAndRewrite(arith::SIToFPOp op, OpAdaptor adaptor,
@@ -951,7 +951,7 @@ struct ConvertSIToFP final : OpConversionPattern<arith::SIToFPOp> {
951951
//===----------------------------------------------------------------------===//
952952

953953
struct ConvertUIToFP final : OpConversionPattern<arith::UIToFPOp> {
954-
using OpConversionPattern::OpConversionPattern;
954+
using Base::Base;
955955

956956
LogicalResult
957957
matchAndRewrite(arith::UIToFPOp op, OpAdaptor adaptor,
@@ -1015,7 +1015,7 @@ struct ConvertUIToFP final : OpConversionPattern<arith::UIToFPOp> {
10151015
//===----------------------------------------------------------------------===//
10161016

10171017
struct ConvertFPToSI final : OpConversionPattern<arith::FPToSIOp> {
1018-
using OpConversionPattern::OpConversionPattern;
1018+
using Base::Base;
10191019

10201020
LogicalResult
10211021
matchAndRewrite(arith::FPToSIOp op, OpAdaptor adaptor,
@@ -1065,7 +1065,7 @@ struct ConvertFPToSI final : OpConversionPattern<arith::FPToSIOp> {
10651065
//===----------------------------------------------------------------------===//
10661066

10671067
struct ConvertFPToUI final : OpConversionPattern<arith::FPToUIOp> {
1068-
using OpConversionPattern::OpConversionPattern;
1068+
using Base::Base;
10691069

10701070
LogicalResult
10711071
matchAndRewrite(arith::FPToUIOp op, OpAdaptor adaptor,
@@ -1137,7 +1137,7 @@ struct ConvertFPToUI final : OpConversionPattern<arith::FPToUIOp> {
11371137
//===----------------------------------------------------------------------===//
11381138

11391139
struct ConvertTruncI final : OpConversionPattern<arith::TruncIOp> {
1140-
using OpConversionPattern::OpConversionPattern;
1140+
using Base::Base;
11411141

11421142
LogicalResult
11431143
matchAndRewrite(arith::TruncIOp op, OpAdaptor adaptor,
@@ -1166,7 +1166,7 @@ struct ConvertTruncI final : OpConversionPattern<arith::TruncIOp> {
11661166
//===----------------------------------------------------------------------===//
11671167

11681168
struct ConvertVectorPrint final : OpConversionPattern<vector::PrintOp> {
1169-
using OpConversionPattern::OpConversionPattern;
1169+
using Base::Base;
11701170

11711171
LogicalResult
11721172
matchAndRewrite(vector::PrintOp op, OpAdaptor adaptor,

‎mlir/lib/Dialect/Arith/Transforms/ExpandOps.cpp‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ namespace {
5959
/// Expands CeilDivUIOp (n, m) into
6060
/// n == 0 ? 0 : ((n-1) / m) + 1
6161
struct CeilDivUIOpConverter : public OpRewritePattern<arith::CeilDivUIOp> {
62-
using OpRewritePattern::OpRewritePattern;
62+
using Base::Base;
6363
LogicalResult matchAndRewrite(arith::CeilDivUIOp op,
6464
PatternRewriter &rewriter) const final {
6565
Location loc = op.getLoc();
@@ -85,7 +85,7 @@ struct CeilDivUIOpConverter : public OpRewritePattern<arith::CeilDivUIOp> {
8585
/// return z;
8686
/// }
8787
struct CeilDivSIOpConverter : public OpRewritePattern<arith::CeilDivSIOp> {
88-
using OpRewritePattern::OpRewritePattern;
88+
using Base::Base;
8989
LogicalResult matchAndRewrite(arith::CeilDivSIOp op,
9090
PatternRewriter &rewriter) const final {
9191
Location loc = op.getLoc();
@@ -127,7 +127,7 @@ struct CeilDivSIOpConverter : public OpRewritePattern<arith::CeilDivSIOp> {
127127
/// return z;
128128
/// }
129129
struct FloorDivSIOpConverter : public OpRewritePattern<arith::FloorDivSIOp> {
130-
using OpRewritePattern::OpRewritePattern;
130+
using Base::Base;
131131
LogicalResult matchAndRewrite(arith::FloorDivSIOp op,
132132
PatternRewriter &rewriter) const final {
133133
Location loc = op.getLoc();
@@ -230,7 +230,7 @@ struct MaxNumMinNumFOpConverter : public OpRewritePattern<OpTy> {
230230
};
231231

232232
struct BFloat16ExtFOpConverter : public OpRewritePattern<arith::ExtFOp> {
233-
using OpRewritePattern::OpRewritePattern;
233+
using Base::Base;
234234
LogicalResult matchAndRewrite(arith::ExtFOp op,
235235
PatternRewriter &rewriter) const final {
236236
ImplicitLocOpBuilder b(op.getLoc(), rewriter);
@@ -260,7 +260,7 @@ struct BFloat16ExtFOpConverter : public OpRewritePattern<arith::ExtFOp> {
260260
};
261261

262262
struct BFloat16TruncFOpConverter : public OpRewritePattern<arith::TruncFOp> {
263-
using OpRewritePattern::OpRewritePattern;
263+
using Base::Base;
264264
LogicalResult matchAndRewrite(arith::TruncFOp op,
265265
PatternRewriter &rewriter) const final {
266266
ImplicitLocOpBuilder b(op.getLoc(), rewriter);
@@ -364,7 +364,7 @@ struct BFloat16TruncFOpConverter : public OpRewritePattern<arith::TruncFOp> {
364364
///
365365
/// 4) F32 bits[1:22] = 0
366366
struct F4E2M1ExtFOpConverter : public OpRewritePattern<arith::ExtFOp> {
367-
using OpRewritePattern::OpRewritePattern;
367+
using Base::Base;
368368
LogicalResult matchAndRewrite(arith::ExtFOp op,
369369
PatternRewriter &rewriter) const final {
370370
Location loc = op.getLoc();
@@ -430,7 +430,7 @@ struct F4E2M1ExtFOpConverter : public OpRewritePattern<arith::ExtFOp> {
430430
};
431431

432432
struct F8E8M0ExtFOpConverter : public OpRewritePattern<arith::ExtFOp> {
433-
using OpRewritePattern::OpRewritePattern;
433+
using Base::Base;
434434
LogicalResult matchAndRewrite(arith::ExtFOp op,
435435
PatternRewriter &rewriter) const final {
436436
ImplicitLocOpBuilder b(op.getLoc(), rewriter);
@@ -502,7 +502,7 @@ struct F8E8M0ExtFOpConverter : public OpRewritePattern<arith::ExtFOp> {
502502
/// Step 5: Round up if necessary, if mantissa[1:] greater than 1000000 or
503503
/// subnormal.
504504
struct F4E2M1TruncFOpConverter : public OpRewritePattern<arith::TruncFOp> {
505-
using OpRewritePattern::OpRewritePattern;
505+
using Base::Base;
506506
LogicalResult matchAndRewrite(arith::TruncFOp op,
507507
PatternRewriter &rewriter) const final {
508508
Location loc = op.getLoc();
@@ -603,7 +603,7 @@ Since All kinds of Infs and NaNs are mapped to same exponent bits in F32 type,
603603
they all map to NaN in F8E8M0 Type.
604604
*/
605605
struct F8E8M0TruncFOpConverter : public OpRewritePattern<arith::TruncFOp> {
606-
using OpRewritePattern::OpRewritePattern;
606+
using Base::Base;
607607
LogicalResult matchAndRewrite(arith::TruncFOp op,
608608
PatternRewriter &rewriter) const final {
609609
ImplicitLocOpBuilder b(op.getLoc(), rewriter);
@@ -642,7 +642,7 @@ struct F8E8M0TruncFOpConverter : public OpRewritePattern<arith::TruncFOp> {
642642
};
643643

644644
struct ScalingExtFOpConverter : public OpRewritePattern<arith::ScalingExtFOp> {
645-
using OpRewritePattern::OpRewritePattern;
645+
using Base::Base;
646646
LogicalResult matchAndRewrite(arith::ScalingExtFOp op,
647647
PatternRewriter &rewriter) const final {
648648
ImplicitLocOpBuilder b(op.getLoc(), rewriter);
@@ -684,7 +684,7 @@ Expands arith.ScalingTruncFOp(in, scale) into
684684
*/
685685
struct ScalingTruncFOpConverter
686686
: public OpRewritePattern<arith::ScalingTruncFOp> {
687-
using OpRewritePattern::OpRewritePattern;
687+
using Base::Base;
688688
LogicalResult matchAndRewrite(arith::ScalingTruncFOp op,
689689
PatternRewriter &rewriter) const final {
690690
ImplicitLocOpBuilder b(op.getLoc(), rewriter);

0 commit comments

Comments
 (0)