Skip to content

[mlir] Remove redundant typename (NFC) #166108

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
Nov 2, 2025
Merged

[mlir] Remove redundant typename (NFC) #166108

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
11 changes: 5 additions & 6 deletions mlir/include/mlir/Dialect/GPU/IR/GPUDialect.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,8 +178,8 @@ enum class SparseHandleKind { SpMat, DnTensor, SpGEMMOp };
class SparseDnTensorHandleType
: public Type::TypeBase<SparseDnTensorHandleType, Type, TypeStorage> {
public:
using Base = typename Type::TypeBase<SparseDnTensorHandleType, Type,
TypeStorage>::Base;
using Base =
Type::TypeBase<SparseDnTensorHandleType, Type, TypeStorage>::Base;
using Base::Base;

static constexpr StringLiteral name = "gpu.sparse.dntensor_handle";
Expand All @@ -188,8 +188,7 @@ class SparseDnTensorHandleType
class SparseSpMatHandleType
: public Type::TypeBase<SparseSpMatHandleType, Type, TypeStorage> {
public:
using Base =
typename Type::TypeBase<SparseSpMatHandleType, Type, TypeStorage>::Base;
using Base = Type::TypeBase<SparseSpMatHandleType, Type, TypeStorage>::Base;
using Base::Base;

static constexpr StringLiteral name = "gpu.sparse.spmat_handle";
Expand All @@ -198,8 +197,8 @@ class SparseSpMatHandleType
class SparseSpGEMMOpHandleType
: public Type::TypeBase<SparseSpGEMMOpHandleType, Type, TypeStorage> {
public:
using Base = typename Type::TypeBase<SparseSpGEMMOpHandleType, Type,
TypeStorage>::Base;
using Base =
Type::TypeBase<SparseSpGEMMOpHandleType, Type, TypeStorage>::Base;
using Base::Base;

static constexpr StringLiteral name = "gpu.sparse.spgemmop_handle";
Expand Down
10 changes: 5 additions & 5 deletions mlir/include/mlir/IR/BlockSupport.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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<compute_node_options<::mlir::Operation>::type>
: NodeAccess {
protected:
using OptionsT = typename compute_node_options<mlir::Operation>::type;
using pointer = typename OptionsT::pointer;
using const_pointer = typename OptionsT::const_pointer;
using OptionsT = compute_node_options<mlir::Operation>::type;
using pointer = OptionsT::pointer;
using const_pointer = OptionsT::const_pointer;
using node_type = ilist_node_impl<OptionsT>;

static node_type *getNodePtr(pointer N);
Expand Down
3 changes: 1 addition & 2 deletions mlir/lib/Conversion/ArithToLLVM/ArithToLLVM.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -240,8 +240,7 @@ struct CmpFOpLowering : public ConvertOpToLLVMPattern<arith::CmpFOp> {

struct SelectOpOneToNLowering : public ConvertOpToLLVMPattern<arith::SelectOp> {
using ConvertOpToLLVMPattern::ConvertOpToLLVMPattern;
using Adaptor =
typename ConvertOpToLLVMPattern<arith::SelectOp>::OneToNOpAdaptor;
using Adaptor = ConvertOpToLLVMPattern<arith::SelectOp>::OneToNOpAdaptor;

LogicalResult
matchAndRewrite(arith::SelectOp op, Adaptor adaptor,
Expand Down
8 changes: 3 additions & 5 deletions mlir/lib/Conversion/ControlFlowToLLVM/ControlFlowToLLVM.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,8 +137,7 @@ static SmallVector<Value> flattenValues(ArrayRef<ValueRange> values) {
/// op to llvm.br.
struct BranchOpLowering : public ConvertOpToLLVMPattern<cf::BranchOp> {
using ConvertOpToLLVMPattern<cf::BranchOp>::ConvertOpToLLVMPattern;
using Adaptor =
typename ConvertOpToLLVMPattern<cf::BranchOp>::OneToNOpAdaptor;
using Adaptor = ConvertOpToLLVMPattern<cf::BranchOp>::OneToNOpAdaptor;

LogicalResult
matchAndRewrite(cf::BranchOp op, Adaptor adaptor,
Expand All @@ -163,8 +162,7 @@ struct BranchOpLowering : public ConvertOpToLLVMPattern<cf::BranchOp> {
/// branch op to llvm.cond_br.
struct CondBranchOpLowering : public ConvertOpToLLVMPattern<cf::CondBranchOp> {
using ConvertOpToLLVMPattern<cf::CondBranchOp>::ConvertOpToLLVMPattern;
using Adaptor =
typename ConvertOpToLLVMPattern<cf::CondBranchOp>::OneToNOpAdaptor;
using Adaptor = ConvertOpToLLVMPattern<cf::CondBranchOp>::OneToNOpAdaptor;

LogicalResult
matchAndRewrite(cf::CondBranchOp op, Adaptor adaptor,
Expand Down Expand Up @@ -204,7 +202,7 @@ struct SwitchOpLowering : public ConvertOpToLLVMPattern<cf::SwitchOp> {
using ConvertOpToLLVMPattern<cf::SwitchOp>::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<Block *> convertedDefaultBlock = getConvertedBlock(
Expand Down
2 changes: 1 addition & 1 deletion mlir/lib/Conversion/MathToROCDL/MathToROCDL.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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());
Expand Down
8 changes: 4 additions & 4 deletions mlir/lib/Dialect/SparseTensor/Transforms/SparseTensorCodegen.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1050,7 +1050,7 @@ class SparseInsertConverter : public OpConversionPattern<tensor::InsertOp> {
/// Sparse codegen rule for position accesses.
class SparseToPositionsConverter : public OpConversionPattern<ToPositionsOp> {
public:
using OpAdaptor = typename ToPositionsOp::Adaptor;
using OpAdaptor = ToPositionsOp::Adaptor;
using OpConversionPattern<ToPositionsOp>::OpConversionPattern;
LogicalResult
matchAndRewrite(ToPositionsOp op, OneToNOpAdaptor adaptor,
Expand All @@ -1073,7 +1073,7 @@ class SparseToPositionsConverter : public OpConversionPattern<ToPositionsOp> {
class SparseToCoordinatesConverter
: public OpConversionPattern<ToCoordinatesOp> {
public:
using OpAdaptor = typename ToCoordinatesOp::Adaptor;
using OpAdaptor = ToCoordinatesOp::Adaptor;
using OpConversionPattern<ToCoordinatesOp>::OpConversionPattern;
LogicalResult
matchAndRewrite(ToCoordinatesOp op, OneToNOpAdaptor adaptor,
Expand All @@ -1099,7 +1099,7 @@ class SparseToCoordinatesConverter
class SparseToCoordinatesBufferConverter
: public OpConversionPattern<ToCoordinatesBufferOp> {
public:
using OpAdaptor = typename ToCoordinatesBufferOp::Adaptor;
using OpAdaptor = ToCoordinatesBufferOp::Adaptor;
using OpConversionPattern<ToCoordinatesBufferOp>::OpConversionPattern;
LogicalResult
matchAndRewrite(ToCoordinatesBufferOp op, OneToNOpAdaptor adaptor,
Expand All @@ -1121,7 +1121,7 @@ class SparseToCoordinatesBufferConverter
/// Sparse codegen rule for value accesses.
class SparseToValuesConverter : public OpConversionPattern<ToValuesOp> {
public:
using OpAdaptor = typename ToValuesOp::Adaptor;
using OpAdaptor = ToValuesOp::Adaptor;
using OpConversionPattern<ToValuesOp>::OpConversionPattern;
LogicalResult
matchAndRewrite(ToValuesOp op, OneToNOpAdaptor adaptor,
Expand Down
18 changes: 8 additions & 10 deletions mlir/lib/IR/Operation.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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<OptionsT>(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<OptionsT>(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<OptionsT>(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<OptionsT>(n);
}

Expand Down