Skip to content

[mlir][spirv] Simplify inheriting constructor declarations. NFC. #159681

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 19, 2025
Merged

[mlir][spirv] Simplify inheriting constructor declarations. NFC. #159681

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 22 additions & 22 deletions mlir/lib/Conversion/ArithToSPIRV/ArithToSPIRV.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -232,7 +232,7 @@ struct ElementwiseArithOpPattern final : OpConversionPattern<Op> {
/// Converts composite arith.constant operation to spirv.Constant.
struct ConstantCompositeOpPattern final
: public OpConversionPattern<arith::ConstantOp> {
using OpConversionPattern::OpConversionPattern;
using Base::Base;

LogicalResult
matchAndRewrite(arith::ConstantOp constOp, OpAdaptor adaptor,
Expand Down Expand Up @@ -357,7 +357,7 @@ struct ConstantCompositeOpPattern final
/// Converts scalar arith.constant operation to spirv.Constant.
struct ConstantScalarOpPattern final
: public OpConversionPattern<arith::ConstantOp> {
using OpConversionPattern::OpConversionPattern;
using Base::Base;

LogicalResult
matchAndRewrite(arith::ConstantOp constOp, OpAdaptor adaptor,
Expand Down Expand Up @@ -467,7 +467,7 @@ static Value emulateSignedRemainder(Location loc, Value lhs, Value rhs,
/// This cannot be merged into the template unary/binary pattern due to Vulkan
/// restrictions over spirv.SRem and spirv.SMod.
struct RemSIOpGLPattern final : public OpConversionPattern<arith::RemSIOp> {
using OpConversionPattern::OpConversionPattern;
using Base::Base;

LogicalResult
matchAndRewrite(arith::RemSIOp op, OpAdaptor adaptor,
Expand All @@ -483,7 +483,7 @@ struct RemSIOpGLPattern final : public OpConversionPattern<arith::RemSIOp> {

/// Converts arith.remsi to OpenCL SPIR-V ops.
struct RemSIOpCLPattern final : public OpConversionPattern<arith::RemSIOp> {
using OpConversionPattern::OpConversionPattern;
using Base::Base;

LogicalResult
matchAndRewrite(arith::RemSIOp op, OpAdaptor adaptor,
Expand Down Expand Up @@ -534,7 +534,7 @@ struct BitwiseOpPattern final : public OpConversionPattern<Op> {

/// Converts arith.xori to SPIR-V operations.
struct XOrIOpLogicalPattern final : public OpConversionPattern<arith::XOrIOp> {
using OpConversionPattern::OpConversionPattern;
using Base::Base;

LogicalResult
matchAndRewrite(arith::XOrIOp op, OpAdaptor adaptor,
Expand All @@ -558,7 +558,7 @@ struct XOrIOpLogicalPattern final : public OpConversionPattern<arith::XOrIOp> {
/// Converts arith.xori to SPIR-V operations if the type of source is i1 or
/// vector of i1.
struct XOrIOpBooleanPattern final : public OpConversionPattern<arith::XOrIOp> {
using OpConversionPattern::OpConversionPattern;
using Base::Base;

LogicalResult
matchAndRewrite(arith::XOrIOp op, OpAdaptor adaptor,
Expand All @@ -585,7 +585,7 @@ struct XOrIOpBooleanPattern final : public OpConversionPattern<arith::XOrIOp> {
/// Converts arith.uitofp to spirv.Select if the type of source is i1 or vector
/// of i1.
struct UIToFPI1Pattern final : public OpConversionPattern<arith::UIToFPOp> {
using OpConversionPattern::OpConversionPattern;
using Base::Base;

LogicalResult
matchAndRewrite(arith::UIToFPOp op, OpAdaptor adaptor,
Expand Down Expand Up @@ -614,7 +614,7 @@ struct UIToFPI1Pattern final : public OpConversionPattern<arith::UIToFPOp> {
/// Converts arith.index_cast to spirv.INotEqual if the target type is i1.
struct IndexCastIndexI1Pattern final
: public OpConversionPattern<arith::IndexCastOp> {
using OpConversionPattern::OpConversionPattern;
using Base::Base;

LogicalResult
matchAndRewrite(arith::IndexCastOp op, OpAdaptor adaptor,
Expand All @@ -638,7 +638,7 @@ struct IndexCastIndexI1Pattern final
/// Converts arith.index_cast to spirv.Select if the source type is i1.
struct IndexCastI1IndexPattern final
: public OpConversionPattern<arith::IndexCastOp> {
using OpConversionPattern::OpConversionPattern;
using Base::Base;

LogicalResult
matchAndRewrite(arith::IndexCastOp op, OpAdaptor adaptor,
Expand Down Expand Up @@ -666,7 +666,7 @@ struct IndexCastI1IndexPattern final
/// Converts arith.extsi to spirv.Select if the type of source is i1 or vector
/// of i1.
struct ExtSII1Pattern final : public OpConversionPattern<arith::ExtSIOp> {
using OpConversionPattern::OpConversionPattern;
using Base::Base;

LogicalResult
matchAndRewrite(arith::ExtSIOp op, OpAdaptor adaptor,
Expand Down Expand Up @@ -707,7 +707,7 @@ struct ExtSII1Pattern final : public OpConversionPattern<arith::ExtSIOp> {
/// Converts arith.extsi to spirv.Select if the type of source is neither i1 nor
/// vector of i1.
struct ExtSIPattern final : public OpConversionPattern<arith::ExtSIOp> {
using OpConversionPattern::OpConversionPattern;
using Base::Base;

LogicalResult
matchAndRewrite(arith::ExtSIOp op, OpAdaptor adaptor,
Expand Down Expand Up @@ -758,7 +758,7 @@ struct ExtSIPattern final : public OpConversionPattern<arith::ExtSIOp> {
/// Converts arith.extui to spirv.Select if the type of source is i1 or vector
/// of i1.
struct ExtUII1Pattern final : public OpConversionPattern<arith::ExtUIOp> {
using OpConversionPattern::OpConversionPattern;
using Base::Base;

LogicalResult
matchAndRewrite(arith::ExtUIOp op, OpAdaptor adaptor,
Expand All @@ -783,7 +783,7 @@ struct ExtUII1Pattern final : public OpConversionPattern<arith::ExtUIOp> {
/// Converts arith.extui for cases where the type of source is neither i1 nor
/// vector of i1.
struct ExtUIPattern final : public OpConversionPattern<arith::ExtUIOp> {
using OpConversionPattern::OpConversionPattern;
using Base::Base;

LogicalResult
matchAndRewrite(arith::ExtUIOp op, OpAdaptor adaptor,
Expand Down Expand Up @@ -823,7 +823,7 @@ struct ExtUIPattern final : public OpConversionPattern<arith::ExtUIOp> {
/// Converts arith.trunci to spirv.Select if the type of result is i1 or vector
/// of i1.
struct TruncII1Pattern final : public OpConversionPattern<arith::TruncIOp> {
using OpConversionPattern::OpConversionPattern;
using Base::Base;

LogicalResult
matchAndRewrite(arith::TruncIOp op, OpAdaptor adaptor,
Expand Down Expand Up @@ -853,7 +853,7 @@ struct TruncII1Pattern final : public OpConversionPattern<arith::TruncIOp> {
/// Converts arith.trunci for cases where the type of result is neither i1
/// nor vector of i1.
struct TruncIPattern final : public OpConversionPattern<arith::TruncIOp> {
using OpConversionPattern::OpConversionPattern;
using Base::Base;

LogicalResult
matchAndRewrite(arith::TruncIOp op, OpAdaptor adaptor,
Expand Down Expand Up @@ -963,7 +963,7 @@ struct TypeCastingOpPattern final : public OpConversionPattern<Op> {
/// Converts integer compare operation on i1 type operands to SPIR-V ops.
class CmpIOpBooleanPattern final : public OpConversionPattern<arith::CmpIOp> {
public:
using OpConversionPattern::OpConversionPattern;
using Base::Base;

LogicalResult
matchAndRewrite(arith::CmpIOp op, OpAdaptor adaptor,
Expand Down Expand Up @@ -1014,7 +1014,7 @@ class CmpIOpBooleanPattern final : public OpConversionPattern<arith::CmpIOp> {
/// Converts integer compare operation to SPIR-V ops.
class CmpIOpPattern final : public OpConversionPattern<arith::CmpIOp> {
public:
using OpConversionPattern::OpConversionPattern;
using Base::Base;

LogicalResult
matchAndRewrite(arith::CmpIOp op, OpAdaptor adaptor,
Expand Down Expand Up @@ -1063,7 +1063,7 @@ class CmpIOpPattern final : public OpConversionPattern<arith::CmpIOp> {
/// Converts floating-point comparison operations to SPIR-V ops.
class CmpFOpPattern final : public OpConversionPattern<arith::CmpFOp> {
public:
using OpConversionPattern::OpConversionPattern;
using Base::Base;

LogicalResult
matchAndRewrite(arith::CmpFOp op, OpAdaptor adaptor,
Expand Down Expand Up @@ -1103,7 +1103,7 @@ class CmpFOpPattern final : public OpConversionPattern<arith::CmpFOp> {
/// Kernel capability.
class CmpFOpNanKernelPattern final : public OpConversionPattern<arith::CmpFOp> {
public:
using OpConversionPattern::OpConversionPattern;
using Base::Base;

LogicalResult
matchAndRewrite(arith::CmpFOp op, OpAdaptor adaptor,
Expand All @@ -1128,7 +1128,7 @@ class CmpFOpNanKernelPattern final : public OpConversionPattern<arith::CmpFOp> {
/// require additional capability.
class CmpFOpNanNonePattern final : public OpConversionPattern<arith::CmpFOp> {
public:
using OpConversionPattern<arith::CmpFOp>::OpConversionPattern;
using Base::Base;

LogicalResult
matchAndRewrite(arith::CmpFOp op, OpAdaptor adaptor,
Expand Down Expand Up @@ -1170,7 +1170,7 @@ class CmpFOpNanNonePattern final : public OpConversionPattern<arith::CmpFOp> {
class AddUIExtendedOpPattern final
: public OpConversionPattern<arith::AddUIExtendedOp> {
public:
using OpConversionPattern::OpConversionPattern;
using Base::Base;
LogicalResult
matchAndRewrite(arith::AddUIExtendedOp op, OpAdaptor adaptor,
ConversionPatternRewriter &rewriter) const override {
Expand Down Expand Up @@ -1226,7 +1226,7 @@ class MulIExtendedOpPattern final : public OpConversionPattern<ArithMulOp> {
/// Converts arith.select to spirv.Select.
class SelectOpPattern final : public OpConversionPattern<arith::SelectOp> {
public:
using OpConversionPattern::OpConversionPattern;
using Base::Base;
LogicalResult
matchAndRewrite(arith::SelectOp op, OpAdaptor adaptor,
ConversionPatternRewriter &rewriter) const override {
Expand Down
8 changes: 4 additions & 4 deletions mlir/lib/Conversion/ComplexToSPIRV/ComplexToSPIRV.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ using namespace mlir;
namespace {

struct ConstantOpPattern final : OpConversionPattern<complex::ConstantOp> {
using OpConversionPattern::OpConversionPattern;
using Base::Base;

LogicalResult
matchAndRewrite(complex::ConstantOp constOp, OpAdaptor adaptor,
Expand All @@ -46,7 +46,7 @@ struct ConstantOpPattern final : OpConversionPattern<complex::ConstantOp> {
};

struct CreateOpPattern final : OpConversionPattern<complex::CreateOp> {
using OpConversionPattern::OpConversionPattern;
using Base::Base;

LogicalResult
matchAndRewrite(complex::CreateOp createOp, OpAdaptor adaptor,
Expand All @@ -63,7 +63,7 @@ struct CreateOpPattern final : OpConversionPattern<complex::CreateOp> {
};

struct ReOpPattern final : OpConversionPattern<complex::ReOp> {
using OpConversionPattern::OpConversionPattern;
using Base::Base;

LogicalResult
matchAndRewrite(complex::ReOp reOp, OpAdaptor adaptor,
Expand All @@ -79,7 +79,7 @@ struct ReOpPattern final : OpConversionPattern<complex::ReOp> {
};

struct ImOpPattern final : OpConversionPattern<complex::ImOp> {
using OpConversionPattern::OpConversionPattern;
using Base::Base;

LogicalResult
matchAndRewrite(complex::ImOp imOp, OpAdaptor adaptor,
Expand Down
4 changes: 2 additions & 2 deletions mlir/lib/Conversion/ControlFlowToSPIRV/ControlFlowToSPIRV.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ static LogicalResult legalizeBlockArguments(Block &block, Operation *op,
namespace {
/// Converts cf.br to spirv.Branch.
struct BranchOpPattern final : OpConversionPattern<cf::BranchOp> {
using OpConversionPattern::OpConversionPattern;
using Base::Base;

LogicalResult
matchAndRewrite(cf::BranchOp op, OpAdaptor adaptor,
Expand All @@ -79,7 +79,7 @@ struct BranchOpPattern final : OpConversionPattern<cf::BranchOp> {

/// Converts cf.cond_br to spirv.BranchConditional.
struct CondBranchOpPattern final : OpConversionPattern<cf::CondBranchOp> {
using OpConversionPattern::OpConversionPattern;
using Base::Base;

LogicalResult
matchAndRewrite(cf::CondBranchOp op, OpAdaptor adaptor,
Expand Down
4 changes: 2 additions & 2 deletions mlir/lib/Conversion/FuncToSPIRV/FuncToSPIRV.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ namespace {
/// Converts func.return to spirv.Return.
class ReturnOpPattern final : public OpConversionPattern<func::ReturnOp> {
public:
using OpConversionPattern<func::ReturnOp>::OpConversionPattern;
using Base::Base;

LogicalResult
matchAndRewrite(func::ReturnOp returnOp, OpAdaptor adaptor,
Expand All @@ -55,7 +55,7 @@ class ReturnOpPattern final : public OpConversionPattern<func::ReturnOp> {
/// Converts func.call to spirv.FunctionCall.
class CallOpPattern final : public OpConversionPattern<func::CallOp> {
public:
using OpConversionPattern<func::CallOp>::OpConversionPattern;
using Base::Base;

LogicalResult
matchAndRewrite(func::CallOp callOp, OpAdaptor adaptor,
Expand Down
18 changes: 9 additions & 9 deletions mlir/lib/Conversion/GPUToSPIRV/GPUToSPIRV.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ class WorkGroupSizeConversion : public OpConversionPattern<gpu::BlockDimOp> {
/// Pattern to convert a kernel function in GPU dialect within a spirv.module.
class GPUFuncOpConversion final : public OpConversionPattern<gpu::GPUFuncOp> {
public:
using OpConversionPattern<gpu::GPUFuncOp>::OpConversionPattern;
using Base::Base;

LogicalResult
matchAndRewrite(gpu::GPUFuncOp funcOp, OpAdaptor adaptor,
Expand All @@ -82,7 +82,7 @@ class GPUFuncOpConversion final : public OpConversionPattern<gpu::GPUFuncOp> {
/// Pattern to convert a gpu.module to a spirv.module.
class GPUModuleConversion final : public OpConversionPattern<gpu::GPUModuleOp> {
public:
using OpConversionPattern<gpu::GPUModuleOp>::OpConversionPattern;
using Base::Base;

LogicalResult
matchAndRewrite(gpu::GPUModuleOp moduleOp, OpAdaptor adaptor,
Expand All @@ -93,7 +93,7 @@ class GPUModuleConversion final : public OpConversionPattern<gpu::GPUModuleOp> {
// TODO: This can go to DRR when GPU return has operands.
class GPUReturnOpConversion final : public OpConversionPattern<gpu::ReturnOp> {
public:
using OpConversionPattern<gpu::ReturnOp>::OpConversionPattern;
using Base::Base;

LogicalResult
matchAndRewrite(gpu::ReturnOp returnOp, OpAdaptor adaptor,
Expand All @@ -103,7 +103,7 @@ class GPUReturnOpConversion final : public OpConversionPattern<gpu::ReturnOp> {
/// Pattern to convert a gpu.barrier op into a spirv.ControlBarrier op.
class GPUBarrierConversion final : public OpConversionPattern<gpu::BarrierOp> {
public:
using OpConversionPattern::OpConversionPattern;
using Base::Base;

LogicalResult
matchAndRewrite(gpu::BarrierOp barrierOp, OpAdaptor adaptor,
Expand All @@ -113,7 +113,7 @@ class GPUBarrierConversion final : public OpConversionPattern<gpu::BarrierOp> {
/// Pattern to convert a gpu.shuffle op into a spirv.GroupNonUniformShuffle op.
class GPUShuffleConversion final : public OpConversionPattern<gpu::ShuffleOp> {
public:
using OpConversionPattern::OpConversionPattern;
using Base::Base;

LogicalResult
matchAndRewrite(gpu::ShuffleOp shuffleOp, OpAdaptor adaptor,
Expand All @@ -123,7 +123,7 @@ class GPUShuffleConversion final : public OpConversionPattern<gpu::ShuffleOp> {
/// Pattern to convert a gpu.rotate op into a spirv.GroupNonUniformRotateKHROp.
class GPURotateConversion final : public OpConversionPattern<gpu::RotateOp> {
public:
using OpConversionPattern::OpConversionPattern;
using Base::Base;

LogicalResult
matchAndRewrite(gpu::RotateOp rotateOp, OpAdaptor adaptor,
Expand All @@ -132,7 +132,7 @@ class GPURotateConversion final : public OpConversionPattern<gpu::RotateOp> {

class GPUPrintfConversion final : public OpConversionPattern<gpu::PrintfOp> {
public:
using OpConversionPattern::OpConversionPattern;
using Base::Base;

LogicalResult
matchAndRewrite(gpu::PrintfOp gpuPrintfOp, OpAdaptor adaptor,
Expand Down Expand Up @@ -653,7 +653,7 @@ createGroupReduceOp(OpBuilder &builder, Location loc, Value arg,
class GPUAllReduceConversion final
: public OpConversionPattern<gpu::AllReduceOp> {
public:
using OpConversionPattern::OpConversionPattern;
using Base::Base;

LogicalResult
matchAndRewrite(gpu::AllReduceOp op, OpAdaptor adaptor,
Expand All @@ -680,7 +680,7 @@ class GPUAllReduceConversion final
class GPUSubgroupReduceConversion final
: public OpConversionPattern<gpu::SubgroupReduceOp> {
public:
using OpConversionPattern::OpConversionPattern;
using Base::Base;

LogicalResult
matchAndRewrite(gpu::SubgroupReduceOp op, OpAdaptor adaptor,
Expand Down
Loading
Loading