Skip to content

Commit 6c6eb09

Browse files
authored
[Codegen][nfc] Drop redundant public from struct inheritance. 3/5 (#23771)
Signed-off-by: hanhanW <[email protected]>
1 parent daf7bc5 commit 6c6eb09

File tree

93 files changed

+270
-306
lines changed

Some content is hidden

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

93 files changed

+270
-306
lines changed

compiler/src/iree/compiler/Codegen/Common/BubbleUpOrdinalOps.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ namespace {
4343
/// `iree_tensor_ext.dispatch.workload.ordinal` ops.
4444
template <typename CastOpTy>
4545
struct BubbleUpAcrossCastOp
46-
: public OpRewritePattern<IREE::TensorExt::DispatchWorkloadOrdinalOp> {
46+
: OpRewritePattern<IREE::TensorExt::DispatchWorkloadOrdinalOp> {
4747
using Base::Base;
4848
LogicalResult
4949
matchAndRewrite(IREE::TensorExt::DispatchWorkloadOrdinalOp ordinalOp,

compiler/src/iree/compiler/Codegen/Common/CPU/CPUPrepareUkernels.cpp

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ dropBatchTileSize(IREE::CPU::LoweringConfigAttr config) {
173173

174174
/// Pattern to convert linalg.batch_mmt4d with batch dim = 1 into mmt4d.
175175
struct ConvertBatchMmt4DtoMmt4DPattern
176-
: public OpRewritePattern<linalg::BatchMmt4DOp> {
176+
: OpRewritePattern<linalg::BatchMmt4DOp> {
177177
using Base::Base;
178178

179179
LogicalResult matchAndRewrite(linalg::BatchMmt4DOp op,
@@ -252,7 +252,7 @@ struct ConvertBatchMmt4DtoMmt4DPattern
252252
}
253253
};
254254

255-
struct Convert3DPackto2DPackPattern : public OpRewritePattern<linalg::PackOp> {
255+
struct Convert3DPackto2DPackPattern : OpRewritePattern<linalg::PackOp> {
256256
using Base::Base;
257257

258258
LogicalResult matchAndRewrite(linalg::PackOp packOp,
@@ -326,8 +326,7 @@ struct Convert3DPackto2DPackPattern : public OpRewritePattern<linalg::PackOp> {
326326
}
327327
};
328328

329-
struct Convert5DUnPackto4DUnPackPattern
330-
: public OpRewritePattern<linalg::UnPackOp> {
329+
struct Convert5DUnPackto4DUnPackPattern : OpRewritePattern<linalg::UnPackOp> {
331330
using Base::Base;
332331

333332
LogicalResult matchAndRewrite(linalg::UnPackOp unpackOp,
@@ -409,7 +408,7 @@ struct Convert5DUnPackto4DUnPackPattern
409408
};
410409

411410
struct CPUPrepareUkernelsPass
412-
: public impl::CPUPrepareUkernelsPassBase<CPUPrepareUkernelsPass> {
411+
: impl::CPUPrepareUkernelsPassBase<CPUPrepareUkernelsPass> {
413412
void getDependentDialects(DialectRegistry &registry) const override {
414413
registry.insert<linalg::LinalgDialect, arith::ArithDialect,
415414
tensor::TensorDialect, scf::SCFDialect>();

compiler/src/iree/compiler/Codegen/Common/CPU/CPUPropagateDataLayout.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ namespace {
3333
/// introducing tensor.expand_shape op on the destination tensor. However, it is
3434
/// not common in practice, so it is not supported now.
3535
struct SinkDownCollapsingUnitDimsAcrossUnpack final
36-
: public OpRewritePattern<linalg::UnPackOp> {
36+
: OpRewritePattern<linalg::UnPackOp> {
3737
using Base::Base;
3838
LogicalResult matchAndRewrite(linalg::UnPackOp op,
3939
PatternRewriter &rewriter) const override {
@@ -147,7 +147,7 @@ struct SinkDownCollapsingUnitDimsAcrossUnpack final
147147
};
148148

149149
struct CPUPropagateDataLayoutPass final
150-
: public impl::CPUPropagateDataLayoutPassBase<CPUPropagateDataLayoutPass> {
150+
: impl::CPUPropagateDataLayoutPassBase<CPUPropagateDataLayoutPass> {
151151
void getDependentDialects(DialectRegistry &registry) const override {
152152
registry.insert<linalg::LinalgDialect, tensor::TensorDialect>();
153153
}

compiler/src/iree/compiler/Codegen/Common/CombineLayoutTransformation.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -656,7 +656,7 @@ shouldDoReshapesByExpansion(IREE::Codegen::RelayoutCombinationScope scope) {
656656
/// the leaves of the chain. The leaves are simply relayout ops that have non
657657
/// relayout op users. The `controlFn` is a callback on the leaf OpResult that
658658
/// provides control over whether or not to insert a map_store op.
659-
struct InsertMapStoreOpPattern : public RewritePattern {
659+
struct InsertMapStoreOpPattern : RewritePattern {
660660
InsertMapStoreOpPattern(MLIRContext *context,
661661
CombineRelayoutOpsControlFnRef controlFn = nullptr,
662662
PatternBenefit benefit = 1)
@@ -1193,7 +1193,7 @@ FailureOr<MapLoadOp> foldIntoMapLoad(RewriterBase &rewriter, Operation *op,
11931193

11941194
/// Pattern to fold consumer relayout ops into a producer map_load.
11951195
struct FoldConsumerRelayoutIntoMapLoadPattern
1196-
: public OpRewritePattern<IREE::LinalgExt::MapLoadOp> {
1196+
: OpRewritePattern<IREE::LinalgExt::MapLoadOp> {
11971197
using OpRewritePattern::OpRewritePattern;
11981198

11991199
LogicalResult matchAndRewrite(IREE::LinalgExt::MapLoadOp mapLoadOp,
@@ -1249,7 +1249,7 @@ insertIdentityMapLoad(RewriterBase &rewriter, OpResult root,
12491249
/// op consumers. The identity map_load can then be used to fold consumer
12501250
/// relayout ops into it iteratively.
12511251
struct InsertMapLoadOpPattern
1252-
: public OpRewritePattern<IREE::Codegen::LoadFromBufferOp> {
1252+
: OpRewritePattern<IREE::Codegen::LoadFromBufferOp> {
12531253
InsertMapLoadOpPattern(MLIRContext *context, bool combineNonComplexChains)
12541254
: OpRewritePattern(context),
12551255
combineNonComplexChains(combineNonComplexChains) {}

compiler/src/iree/compiler/Codegen/Common/ConcretizePadResultShape.cpp

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

4848
/// Concretizes tensor.pad op's result shape if its source op implements
4949
/// OffsetSizeAndStrideOpInterface. For example, pad(extract_slice).
50-
struct ConcretizePadResultShape final : public OpRewritePattern<tensor::PadOp> {
50+
struct ConcretizePadResultShape final : OpRewritePattern<tensor::PadOp> {
5151
using Base::Base;
5252

5353
LogicalResult matchAndRewrite(tensor::PadOp padOp,

compiler/src/iree/compiler/Codegen/Common/ConvertBf16ArithToF32.cpp

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ Value convertRankedFloat(OpBuilder &builder, Type type, ValueRange inputs,
6363

6464
// Converts from |SourceType| to |TargetType|.
6565
template <typename SourceType, typename TargetType>
66-
struct PrimitiveTypeConverter : public TypeConverter {
66+
struct PrimitiveTypeConverter : TypeConverter {
6767
explicit PrimitiveTypeConverter() {
6868
addConversion([](Type type) { return type; });
6969
addConversion([&](SourceType type) -> Type {
@@ -102,8 +102,7 @@ struct PrimitiveTypeConverter : public TypeConverter {
102102
};
103103

104104
template <typename SourceType, typename TargetType>
105-
struct FloatTypeConverter
106-
: public PrimitiveTypeConverter<SourceType, TargetType> {
105+
struct FloatTypeConverter : PrimitiveTypeConverter<SourceType, TargetType> {
107106
explicit FloatTypeConverter() {
108107
this->addSourceMaterialization(convertRankedFloat);
109108
this->addTargetMaterialization(convertRankedFloat);
@@ -112,7 +111,7 @@ struct FloatTypeConverter
112111

113112
// Tries to completely convert a generic Operation.
114113
// This will process attributes, result types, and nested regions.
115-
struct GenericTypeConversionPattern : public ConversionPattern {
114+
struct GenericTypeConversionPattern : ConversionPattern {
116115
GenericTypeConversionPattern(MLIRContext *context,
117116
TypeConverter &typeConverter)
118117
: ConversionPattern(typeConverter, MatchAnyOpTypeTag(), 0, context) {}
@@ -163,7 +162,7 @@ struct GenericTypeConversionPattern : public ConversionPattern {
163162
// unsigned integer values.
164163
template <typename OpTy, typename TypeTy,
165164
typename OperandToResultWidthLegalityRelation>
166-
struct ConvertTypeSensitiveArithCastOp : public OpConversionPattern<OpTy> {
165+
struct ConvertTypeSensitiveArithCastOp : OpConversionPattern<OpTy> {
167166
using OpConversionPattern<OpTy>::OpConversionPattern;
168167
LogicalResult
169168
matchAndRewrite(OpTy op, typename OpTy::Adaptor adaptor,
@@ -231,7 +230,7 @@ class PropagateCastF : public OpRewritePattern<SrcOp> {
231230

232231
// Converts BF16s to F32s.
233232
struct PromoteBF16ToF32Converter
234-
: public FloatTypeConverter<BFloat16Type, Float32Type> {
233+
: FloatTypeConverter<BFloat16Type, Float32Type> {
235234
Type getTargetType(BFloat16Type type) override {
236235
return Float32Type::get(type.getContext());
237236
}

compiler/src/iree/compiler/Codegen/Common/ConvertToDestinationPassingStylePass.cpp

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -512,8 +512,7 @@ replaceUnpackEmptyWithAllocTensor(OpBuilder &b,
512512
}
513513

514514
namespace {
515-
struct RemoveCstOutsDependency
516-
: public OpInterfaceRewritePattern<linalg::LinalgOp> {
515+
struct RemoveCstOutsDependency : OpInterfaceRewritePattern<linalg::LinalgOp> {
517516
using OpInterfaceRewritePattern<linalg::LinalgOp>::OpInterfaceRewritePattern;
518517

519518
LogicalResult matchAndRewrite(linalg::LinalgOp op,
@@ -577,7 +576,7 @@ struct RemoveCstOutsDependency
577576
/// ```
578577
/// This is a workaround for #11273 while a proper fix lands.
579578
struct SwitchStoreOfIfResultValue
580-
: public OpRewritePattern<IREE::TensorExt::DispatchTensorStoreOp> {
579+
: OpRewritePattern<IREE::TensorExt::DispatchTensorStoreOp> {
581580
using Base::Base;
582581

583582
LogicalResult matchAndRewrite(IREE::TensorExt::DispatchTensorStoreOp storeOp,

compiler/src/iree/compiler/Codegen/Common/ConvertUnsupportedFloatArithPass.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -756,7 +756,7 @@ struct ExtFFromSmallFloat final : OpRewritePattern<arith::ExtFOp> {
756756
};
757757

758758
struct ConvertUnsupportedFloatArithPass final
759-
: public impl::ConvertUnsupportedFloatArithPassBase<
759+
: impl::ConvertUnsupportedFloatArithPassBase<
760760
ConvertUnsupportedFloatArithPass> {
761761
void runOnOperation() override;
762762
using Base::Base;

compiler/src/iree/compiler/Codegen/Common/ConvertUnsupportedFloatToIntBuffers.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ struct ConvertMemRefAlloc final : OpConversionPattern<memref::AllocOp> {
160160

161161
// Tries to completely convert a generic Operation.
162162
// This will process attributes, result types, and nested regions.
163-
struct GenericTypeConversionPattern : public ConversionPattern {
163+
struct GenericTypeConversionPattern : ConversionPattern {
164164
GenericTypeConversionPattern(TypeConverter &typeConverter,
165165
MLIRContext *context)
166166
: ConversionPattern(typeConverter, MatchAnyOpTypeTag(), 0, context) {}

compiler/src/iree/compiler/Codegen/Common/ConvertWorkgroupForallToPCF.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ struct ConvertWorkgroupForall : OpRewritePattern<scf::ForallOp> {
2626
};
2727

2828
struct ConvertWorkgroupForallToPCFPass final
29-
: public impl::ConvertWorkgroupForallToPCFPassBase<
29+
: impl::ConvertWorkgroupForallToPCFPassBase<
3030
ConvertWorkgroupForallToPCFPass> {
3131
void runOnOperation() override;
3232
using Base::Base;

0 commit comments

Comments
 (0)