Skip to content

Commit 05b6e1f

Browse files
[mlir] Remove redundant typename (NFC) (#166108)
Identified with readability-redundant-typename.
1 parent 79bf8c0 commit 05b6e1f

File tree

7 files changed

+27
-33
lines changed

7 files changed

+27
-33
lines changed

mlir/include/mlir/Dialect/GPU/IR/GPUDialect.h

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -178,8 +178,8 @@ enum class SparseHandleKind { SpMat, DnTensor, SpGEMMOp };
178178
class SparseDnTensorHandleType
179179
: public Type::TypeBase<SparseDnTensorHandleType, Type, TypeStorage> {
180180
public:
181-
using Base = typename Type::TypeBase<SparseDnTensorHandleType, Type,
182-
TypeStorage>::Base;
181+
using Base =
182+
Type::TypeBase<SparseDnTensorHandleType, Type, TypeStorage>::Base;
183183
using Base::Base;
184184

185185
static constexpr StringLiteral name = "gpu.sparse.dntensor_handle";
@@ -188,8 +188,7 @@ class SparseDnTensorHandleType
188188
class SparseSpMatHandleType
189189
: public Type::TypeBase<SparseSpMatHandleType, Type, TypeStorage> {
190190
public:
191-
using Base =
192-
typename Type::TypeBase<SparseSpMatHandleType, Type, TypeStorage>::Base;
191+
using Base = Type::TypeBase<SparseSpMatHandleType, Type, TypeStorage>::Base;
193192
using Base::Base;
194193

195194
static constexpr StringLiteral name = "gpu.sparse.spmat_handle";
@@ -198,8 +197,8 @@ class SparseSpMatHandleType
198197
class SparseSpGEMMOpHandleType
199198
: public Type::TypeBase<SparseSpGEMMOpHandleType, Type, TypeStorage> {
200199
public:
201-
using Base = typename Type::TypeBase<SparseSpGEMMOpHandleType, Type,
202-
TypeStorage>::Base;
200+
using Base =
201+
Type::TypeBase<SparseSpGEMMOpHandleType, Type, TypeStorage>::Base;
203202
using Base::Base;
204203

205204
static constexpr StringLiteral name = "gpu.sparse.spgemmop_handle";

mlir/include/mlir/IR/BlockSupport.h

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -206,12 +206,12 @@ namespace ilist_detail {
206206
// operations to have trailing Regions without a circular include
207207
// dependence.
208208
template <>
209-
struct SpecificNodeAccess<
210-
typename compute_node_options<::mlir::Operation>::type> : NodeAccess {
209+
struct SpecificNodeAccess<compute_node_options<::mlir::Operation>::type>
210+
: NodeAccess {
211211
protected:
212-
using OptionsT = typename compute_node_options<mlir::Operation>::type;
213-
using pointer = typename OptionsT::pointer;
214-
using const_pointer = typename OptionsT::const_pointer;
212+
using OptionsT = compute_node_options<mlir::Operation>::type;
213+
using pointer = OptionsT::pointer;
214+
using const_pointer = OptionsT::const_pointer;
215215
using node_type = ilist_node_impl<OptionsT>;
216216

217217
static node_type *getNodePtr(pointer N);

mlir/lib/Conversion/ArithToLLVM/ArithToLLVM.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -240,8 +240,7 @@ struct CmpFOpLowering : public ConvertOpToLLVMPattern<arith::CmpFOp> {
240240

241241
struct SelectOpOneToNLowering : public ConvertOpToLLVMPattern<arith::SelectOp> {
242242
using ConvertOpToLLVMPattern::ConvertOpToLLVMPattern;
243-
using Adaptor =
244-
typename ConvertOpToLLVMPattern<arith::SelectOp>::OneToNOpAdaptor;
243+
using Adaptor = ConvertOpToLLVMPattern<arith::SelectOp>::OneToNOpAdaptor;
245244

246245
LogicalResult
247246
matchAndRewrite(arith::SelectOp op, Adaptor adaptor,

mlir/lib/Conversion/ControlFlowToLLVM/ControlFlowToLLVM.cpp

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -137,8 +137,7 @@ static SmallVector<Value> flattenValues(ArrayRef<ValueRange> values) {
137137
/// op to llvm.br.
138138
struct BranchOpLowering : public ConvertOpToLLVMPattern<cf::BranchOp> {
139139
using ConvertOpToLLVMPattern<cf::BranchOp>::ConvertOpToLLVMPattern;
140-
using Adaptor =
141-
typename ConvertOpToLLVMPattern<cf::BranchOp>::OneToNOpAdaptor;
140+
using Adaptor = ConvertOpToLLVMPattern<cf::BranchOp>::OneToNOpAdaptor;
142141

143142
LogicalResult
144143
matchAndRewrite(cf::BranchOp op, Adaptor adaptor,
@@ -163,8 +162,7 @@ struct BranchOpLowering : public ConvertOpToLLVMPattern<cf::BranchOp> {
163162
/// branch op to llvm.cond_br.
164163
struct CondBranchOpLowering : public ConvertOpToLLVMPattern<cf::CondBranchOp> {
165164
using ConvertOpToLLVMPattern<cf::CondBranchOp>::ConvertOpToLLVMPattern;
166-
using Adaptor =
167-
typename ConvertOpToLLVMPattern<cf::CondBranchOp>::OneToNOpAdaptor;
165+
using Adaptor = ConvertOpToLLVMPattern<cf::CondBranchOp>::OneToNOpAdaptor;
168166

169167
LogicalResult
170168
matchAndRewrite(cf::CondBranchOp op, Adaptor adaptor,
@@ -204,7 +202,7 @@ struct SwitchOpLowering : public ConvertOpToLLVMPattern<cf::SwitchOp> {
204202
using ConvertOpToLLVMPattern<cf::SwitchOp>::ConvertOpToLLVMPattern;
205203

206204
LogicalResult
207-
matchAndRewrite(cf::SwitchOp op, typename cf::SwitchOp::Adaptor adaptor,
205+
matchAndRewrite(cf::SwitchOp op, cf::SwitchOp::Adaptor adaptor,
208206
ConversionPatternRewriter &rewriter) const override {
209207
// Get or convert default block.
210208
FailureOr<Block *> convertedDefaultBlock = getConvertedBlock(

mlir/lib/Conversion/MathToROCDL/MathToROCDL.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ struct ClampFOpConversion final
6868
return LLVM::detail::handleMultidimensionalVectors(
6969
op.getOperation(), adaptor.getOperands(), *getTypeConverter(),
7070
[&](Type llvm1DVectorTy, ValueRange operands) -> Value {
71-
typename math::ClampFOp::Adaptor adaptor(operands);
71+
math::ClampFOp::Adaptor adaptor(operands);
7272
return ROCDL::FMed3Op::create(rewriter, op.getLoc(), llvm1DVectorTy,
7373
adaptor.getValue(), adaptor.getMin(),
7474
adaptor.getMax());

mlir/lib/Dialect/SparseTensor/Transforms/SparseTensorCodegen.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1050,7 +1050,7 @@ class SparseInsertConverter : public OpConversionPattern<tensor::InsertOp> {
10501050
/// Sparse codegen rule for position accesses.
10511051
class SparseToPositionsConverter : public OpConversionPattern<ToPositionsOp> {
10521052
public:
1053-
using OpAdaptor = typename ToPositionsOp::Adaptor;
1053+
using OpAdaptor = ToPositionsOp::Adaptor;
10541054
using OpConversionPattern<ToPositionsOp>::OpConversionPattern;
10551055
LogicalResult
10561056
matchAndRewrite(ToPositionsOp op, OneToNOpAdaptor adaptor,
@@ -1073,7 +1073,7 @@ class SparseToPositionsConverter : public OpConversionPattern<ToPositionsOp> {
10731073
class SparseToCoordinatesConverter
10741074
: public OpConversionPattern<ToCoordinatesOp> {
10751075
public:
1076-
using OpAdaptor = typename ToCoordinatesOp::Adaptor;
1076+
using OpAdaptor = ToCoordinatesOp::Adaptor;
10771077
using OpConversionPattern<ToCoordinatesOp>::OpConversionPattern;
10781078
LogicalResult
10791079
matchAndRewrite(ToCoordinatesOp op, OneToNOpAdaptor adaptor,
@@ -1099,7 +1099,7 @@ class SparseToCoordinatesConverter
10991099
class SparseToCoordinatesBufferConverter
11001100
: public OpConversionPattern<ToCoordinatesBufferOp> {
11011101
public:
1102-
using OpAdaptor = typename ToCoordinatesBufferOp::Adaptor;
1102+
using OpAdaptor = ToCoordinatesBufferOp::Adaptor;
11031103
using OpConversionPattern<ToCoordinatesBufferOp>::OpConversionPattern;
11041104
LogicalResult
11051105
matchAndRewrite(ToCoordinatesBufferOp op, OneToNOpAdaptor adaptor,
@@ -1121,7 +1121,7 @@ class SparseToCoordinatesBufferConverter
11211121
/// Sparse codegen rule for value accesses.
11221122
class SparseToValuesConverter : public OpConversionPattern<ToValuesOp> {
11231123
public:
1124-
using OpAdaptor = typename ToValuesOp::Adaptor;
1124+
using OpAdaptor = ToValuesOp::Adaptor;
11251125
using OpConversionPattern<ToValuesOp>::OpConversionPattern;
11261126
LogicalResult
11271127
matchAndRewrite(ToValuesOp op, OneToNOpAdaptor adaptor,

mlir/lib/IR/Operation.cpp

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -463,28 +463,26 @@ void Operation::updateOrderIfNecessary() {
463463
//===----------------------------------------------------------------------===//
464464

465465
auto llvm::ilist_detail::SpecificNodeAccess<
466-
typename llvm::ilist_detail::compute_node_options<
467-
::mlir::Operation>::type>::getNodePtr(pointer n) -> node_type * {
466+
llvm::ilist_detail::compute_node_options<::mlir::Operation>::type>::
467+
getNodePtr(pointer n) -> node_type * {
468468
return NodeAccess::getNodePtr<OptionsT>(n);
469469
}
470470

471471
auto llvm::ilist_detail::SpecificNodeAccess<
472-
typename llvm::ilist_detail::compute_node_options<
473-
::mlir::Operation>::type>::getNodePtr(const_pointer n)
474-
-> const node_type * {
472+
llvm::ilist_detail::compute_node_options<::mlir::Operation>::type>::
473+
getNodePtr(const_pointer n) -> const node_type * {
475474
return NodeAccess::getNodePtr<OptionsT>(n);
476475
}
477476

478477
auto llvm::ilist_detail::SpecificNodeAccess<
479-
typename llvm::ilist_detail::compute_node_options<
480-
::mlir::Operation>::type>::getValuePtr(node_type *n) -> pointer {
478+
llvm::ilist_detail::compute_node_options<::mlir::Operation>::type>::
479+
getValuePtr(node_type *n) -> pointer {
481480
return NodeAccess::getValuePtr<OptionsT>(n);
482481
}
483482

484483
auto llvm::ilist_detail::SpecificNodeAccess<
485-
typename llvm::ilist_detail::compute_node_options<
486-
::mlir::Operation>::type>::getValuePtr(const node_type *n)
487-
-> const_pointer {
484+
llvm::ilist_detail::compute_node_options<::mlir::Operation>::type>::
485+
getValuePtr(const node_type *n) -> const_pointer {
488486
return NodeAccess::getValuePtr<OptionsT>(n);
489487
}
490488

0 commit comments

Comments
 (0)