From d55e999c32db262c3c6a3b14ec25adb311c4d030 Mon Sep 17 00:00:00 2001 From: Kazu Hirata Date: Sun, 2 Nov 2025 13:49:23 -0800 Subject: [PATCH] [mlir] Remove redundant typename (NFC) Identified with readability-redundant-typename. --- mlir/include/mlir/Dialect/GPU/IR/GPUDialect.h | 11 +++++------ mlir/include/mlir/IR/BlockSupport.h | 10 +++++----- .../lib/Conversion/ArithToLLVM/ArithToLLVM.cpp | 3 +-- .../ControlFlowToLLVM/ControlFlowToLLVM.cpp | 8 +++----- .../lib/Conversion/MathToROCDL/MathToROCDL.cpp | 2 +- .../Transforms/SparseTensorCodegen.cpp | 8 ++++---- mlir/lib/IR/Operation.cpp | 18 ++++++++---------- 7 files changed, 27 insertions(+), 33 deletions(-) diff --git a/mlir/include/mlir/Dialect/GPU/IR/GPUDialect.h b/mlir/include/mlir/Dialect/GPU/IR/GPUDialect.h index 7b53594a1c8e2..a9886d1f21ca0 100644 --- a/mlir/include/mlir/Dialect/GPU/IR/GPUDialect.h +++ b/mlir/include/mlir/Dialect/GPU/IR/GPUDialect.h @@ -178,8 +178,8 @@ enum class SparseHandleKind { SpMat, DnTensor, SpGEMMOp }; class SparseDnTensorHandleType : public Type::TypeBase { public: - using Base = typename Type::TypeBase::Base; + using Base = + Type::TypeBase::Base; using Base::Base; static constexpr StringLiteral name = "gpu.sparse.dntensor_handle"; @@ -188,8 +188,7 @@ class SparseDnTensorHandleType class SparseSpMatHandleType : public Type::TypeBase { public: - using Base = - typename Type::TypeBase::Base; + using Base = Type::TypeBase::Base; using Base::Base; static constexpr StringLiteral name = "gpu.sparse.spmat_handle"; @@ -198,8 +197,8 @@ class SparseSpMatHandleType class SparseSpGEMMOpHandleType : public Type::TypeBase { public: - using Base = typename Type::TypeBase::Base; + using Base = + Type::TypeBase::Base; using Base::Base; static constexpr StringLiteral name = "gpu.sparse.spgemmop_handle"; diff --git a/mlir/include/mlir/IR/BlockSupport.h b/mlir/include/mlir/IR/BlockSupport.h index f9fbef2f3753f..a2e080ef4f63f 100644 --- a/mlir/include/mlir/IR/BlockSupport.h +++ b/mlir/include/mlir/IR/BlockSupport.h @@ -206,12 +206,12 @@ namespace ilist_detail { // operations to have trailing Regions without a circular include // dependence. template <> -struct SpecificNodeAccess< - typename compute_node_options<::mlir::Operation>::type> : NodeAccess { +struct SpecificNodeAccess::type> + : NodeAccess { protected: - using OptionsT = typename compute_node_options::type; - using pointer = typename OptionsT::pointer; - using const_pointer = typename OptionsT::const_pointer; + using OptionsT = compute_node_options::type; + using pointer = OptionsT::pointer; + using const_pointer = OptionsT::const_pointer; using node_type = ilist_node_impl; static node_type *getNodePtr(pointer N); diff --git a/mlir/lib/Conversion/ArithToLLVM/ArithToLLVM.cpp b/mlir/lib/Conversion/ArithToLLVM/ArithToLLVM.cpp index ba57155ab9b45..03ed4d51cc744 100644 --- a/mlir/lib/Conversion/ArithToLLVM/ArithToLLVM.cpp +++ b/mlir/lib/Conversion/ArithToLLVM/ArithToLLVM.cpp @@ -240,8 +240,7 @@ struct CmpFOpLowering : public ConvertOpToLLVMPattern { struct SelectOpOneToNLowering : public ConvertOpToLLVMPattern { using ConvertOpToLLVMPattern::ConvertOpToLLVMPattern; - using Adaptor = - typename ConvertOpToLLVMPattern::OneToNOpAdaptor; + using Adaptor = ConvertOpToLLVMPattern::OneToNOpAdaptor; LogicalResult matchAndRewrite(arith::SelectOp op, Adaptor adaptor, diff --git a/mlir/lib/Conversion/ControlFlowToLLVM/ControlFlowToLLVM.cpp b/mlir/lib/Conversion/ControlFlowToLLVM/ControlFlowToLLVM.cpp index 798d8b04eed76..b75968eb31c58 100644 --- a/mlir/lib/Conversion/ControlFlowToLLVM/ControlFlowToLLVM.cpp +++ b/mlir/lib/Conversion/ControlFlowToLLVM/ControlFlowToLLVM.cpp @@ -137,8 +137,7 @@ static SmallVector flattenValues(ArrayRef values) { /// op to llvm.br. struct BranchOpLowering : public ConvertOpToLLVMPattern { using ConvertOpToLLVMPattern::ConvertOpToLLVMPattern; - using Adaptor = - typename ConvertOpToLLVMPattern::OneToNOpAdaptor; + using Adaptor = ConvertOpToLLVMPattern::OneToNOpAdaptor; LogicalResult matchAndRewrite(cf::BranchOp op, Adaptor adaptor, @@ -163,8 +162,7 @@ struct BranchOpLowering : public ConvertOpToLLVMPattern { /// branch op to llvm.cond_br. struct CondBranchOpLowering : public ConvertOpToLLVMPattern { using ConvertOpToLLVMPattern::ConvertOpToLLVMPattern; - using Adaptor = - typename ConvertOpToLLVMPattern::OneToNOpAdaptor; + using Adaptor = ConvertOpToLLVMPattern::OneToNOpAdaptor; LogicalResult matchAndRewrite(cf::CondBranchOp op, Adaptor adaptor, @@ -204,7 +202,7 @@ struct SwitchOpLowering : public ConvertOpToLLVMPattern { using ConvertOpToLLVMPattern::ConvertOpToLLVMPattern; LogicalResult - matchAndRewrite(cf::SwitchOp op, typename cf::SwitchOp::Adaptor adaptor, + matchAndRewrite(cf::SwitchOp op, cf::SwitchOp::Adaptor adaptor, ConversionPatternRewriter &rewriter) const override { // Get or convert default block. FailureOr convertedDefaultBlock = getConvertedBlock( diff --git a/mlir/lib/Conversion/MathToROCDL/MathToROCDL.cpp b/mlir/lib/Conversion/MathToROCDL/MathToROCDL.cpp index a2dfc12cc9d63..a922338176f11 100644 --- a/mlir/lib/Conversion/MathToROCDL/MathToROCDL.cpp +++ b/mlir/lib/Conversion/MathToROCDL/MathToROCDL.cpp @@ -68,7 +68,7 @@ struct ClampFOpConversion final return LLVM::detail::handleMultidimensionalVectors( op.getOperation(), adaptor.getOperands(), *getTypeConverter(), [&](Type llvm1DVectorTy, ValueRange operands) -> Value { - typename math::ClampFOp::Adaptor adaptor(operands); + math::ClampFOp::Adaptor adaptor(operands); return ROCDL::FMed3Op::create(rewriter, op.getLoc(), llvm1DVectorTy, adaptor.getValue(), adaptor.getMin(), adaptor.getMax()); diff --git a/mlir/lib/Dialect/SparseTensor/Transforms/SparseTensorCodegen.cpp b/mlir/lib/Dialect/SparseTensor/Transforms/SparseTensorCodegen.cpp index 7a26cd301eb99..1fbcf5fdc68db 100644 --- a/mlir/lib/Dialect/SparseTensor/Transforms/SparseTensorCodegen.cpp +++ b/mlir/lib/Dialect/SparseTensor/Transforms/SparseTensorCodegen.cpp @@ -1050,7 +1050,7 @@ class SparseInsertConverter : public OpConversionPattern { /// Sparse codegen rule for position accesses. class SparseToPositionsConverter : public OpConversionPattern { public: - using OpAdaptor = typename ToPositionsOp::Adaptor; + using OpAdaptor = ToPositionsOp::Adaptor; using OpConversionPattern::OpConversionPattern; LogicalResult matchAndRewrite(ToPositionsOp op, OneToNOpAdaptor adaptor, @@ -1073,7 +1073,7 @@ class SparseToPositionsConverter : public OpConversionPattern { class SparseToCoordinatesConverter : public OpConversionPattern { public: - using OpAdaptor = typename ToCoordinatesOp::Adaptor; + using OpAdaptor = ToCoordinatesOp::Adaptor; using OpConversionPattern::OpConversionPattern; LogicalResult matchAndRewrite(ToCoordinatesOp op, OneToNOpAdaptor adaptor, @@ -1099,7 +1099,7 @@ class SparseToCoordinatesConverter class SparseToCoordinatesBufferConverter : public OpConversionPattern { public: - using OpAdaptor = typename ToCoordinatesBufferOp::Adaptor; + using OpAdaptor = ToCoordinatesBufferOp::Adaptor; using OpConversionPattern::OpConversionPattern; LogicalResult matchAndRewrite(ToCoordinatesBufferOp op, OneToNOpAdaptor adaptor, @@ -1121,7 +1121,7 @@ class SparseToCoordinatesBufferConverter /// Sparse codegen rule for value accesses. class SparseToValuesConverter : public OpConversionPattern { public: - using OpAdaptor = typename ToValuesOp::Adaptor; + using OpAdaptor = ToValuesOp::Adaptor; using OpConversionPattern::OpConversionPattern; LogicalResult matchAndRewrite(ToValuesOp op, OneToNOpAdaptor adaptor, diff --git a/mlir/lib/IR/Operation.cpp b/mlir/lib/IR/Operation.cpp index ce421f4bf7e0e..8212d6d3d1eba 100644 --- a/mlir/lib/IR/Operation.cpp +++ b/mlir/lib/IR/Operation.cpp @@ -463,28 +463,26 @@ void Operation::updateOrderIfNecessary() { //===----------------------------------------------------------------------===// auto llvm::ilist_detail::SpecificNodeAccess< - typename llvm::ilist_detail::compute_node_options< - ::mlir::Operation>::type>::getNodePtr(pointer n) -> node_type * { + llvm::ilist_detail::compute_node_options<::mlir::Operation>::type>:: + getNodePtr(pointer n) -> node_type * { return NodeAccess::getNodePtr(n); } auto llvm::ilist_detail::SpecificNodeAccess< - typename llvm::ilist_detail::compute_node_options< - ::mlir::Operation>::type>::getNodePtr(const_pointer n) - -> const node_type * { + llvm::ilist_detail::compute_node_options<::mlir::Operation>::type>:: + getNodePtr(const_pointer n) -> const node_type * { return NodeAccess::getNodePtr(n); } auto llvm::ilist_detail::SpecificNodeAccess< - typename llvm::ilist_detail::compute_node_options< - ::mlir::Operation>::type>::getValuePtr(node_type *n) -> pointer { + llvm::ilist_detail::compute_node_options<::mlir::Operation>::type>:: + getValuePtr(node_type *n) -> pointer { return NodeAccess::getValuePtr(n); } auto llvm::ilist_detail::SpecificNodeAccess< - typename llvm::ilist_detail::compute_node_options< - ::mlir::Operation>::type>::getValuePtr(const node_type *n) - -> const_pointer { + llvm::ilist_detail::compute_node_options<::mlir::Operation>::type>:: + getValuePtr(const node_type *n) -> const_pointer { return NodeAccess::getValuePtr(n); }