Skip to content

Commit 35d55f2

Browse files
justinfargnolijustinfargnoli
authored
[NFC][mlir] Reorder declarePromisedInterface() operands (#86628)
Reorder the template operands of `declarePromisedInterface()` to match `declarePromisedInterfaces()`.
1 parent 5d3ef06 commit 35d55f2

File tree

18 files changed

+34
-34
lines changed

18 files changed

+34
-34
lines changed

‎mlir/include/mlir/IR/Dialect.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,7 @@ class Dialect {
210210
/// registration. The promised interface type can be an interface of any type
211211
/// not just a dialect interface, i.e. it may also be an
212212
/// AttributeInterface/OpInterface/TypeInterface/etc.
213-
template <typename ConcreteT, typename InterfaceT>
213+
template <typename InterfaceT, typename ConcreteT>
214214
void declarePromisedInterface() {
215215
unresolvedPromisedInterfaces.insert(
216216
{TypeID::get<ConcreteT>(), InterfaceT::getInterfaceID()});
@@ -221,7 +221,7 @@ class Dialect {
221221
// declarePromisedInterfaces<FunctionOpInterface, MyFuncType1, MyFuncType2>()
222222
template <typename InterfaceT, typename... ConcreteT>
223223
void declarePromisedInterfaces() {
224-
(declarePromisedInterface<ConcreteT, InterfaceT>(), ...);
224+
(declarePromisedInterface<InterfaceT, ConcreteT>(), ...);
225225
}
226226

227227
/// Checks if the given interface, which is attempting to be used, is a

‎mlir/lib/Dialect/Arith/IR/ArithDialect.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,9 @@ void arith::ArithDialect::initialize() {
4848
#include "mlir/Dialect/Arith/IR/ArithOpsAttributes.cpp.inc"
4949
>();
5050
addInterfaces<ArithInlinerInterface>();
51-
declarePromisedInterface<ArithDialect, ConvertToLLVMPatternInterface>();
52-
declarePromisedInterface<SelectOp,
53-
bufferization::BufferDeallocationOpInterface>();
51+
declarePromisedInterface<ConvertToLLVMPatternInterface, ArithDialect>();
52+
declarePromisedInterface<bufferization::BufferDeallocationOpInterface,
53+
SelectOp>();
5454
declarePromisedInterfaces<bufferization::BufferizableOpInterface, ConstantOp,
5555
IndexCastOp, SelectOp>();
5656
declarePromisedInterfaces<ValueBoundsOpInterface, AddIOp, ConstantOp, SubIOp,

‎mlir/lib/Dialect/Complex/IR/ComplexDialect.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ void complex::ComplexDialect::initialize() {
4040
#define GET_ATTRDEF_LIST
4141
#include "mlir/Dialect/Complex/IR/ComplexAttributes.cpp.inc"
4242
>();
43-
declarePromisedInterface<ComplexDialect, ConvertToLLVMPatternInterface>();
43+
declarePromisedInterface<ConvertToLLVMPatternInterface, ComplexDialect>();
4444
addInterfaces<ComplexInlinerInterface>();
4545
}
4646

‎mlir/lib/Dialect/ControlFlow/IR/ControlFlowOps.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -70,11 +70,11 @@ void ControlFlowDialect::initialize() {
7070
#include "mlir/Dialect/ControlFlow/IR/ControlFlowOps.cpp.inc"
7171
>();
7272
addInterfaces<ControlFlowInlinerInterface>();
73-
declarePromisedInterface<ControlFlowDialect, ConvertToLLVMPatternInterface>();
73+
declarePromisedInterface<ConvertToLLVMPatternInterface, ControlFlowDialect>();
7474
declarePromisedInterfaces<bufferization::BufferizableOpInterface, BranchOp,
7575
CondBranchOp>();
76-
declarePromisedInterface<CondBranchOp,
77-
bufferization::BufferDeallocationOpInterface>();
76+
declarePromisedInterface<bufferization::BufferDeallocationOpInterface,
77+
CondBranchOp>();
7878
}
7979

8080
//===----------------------------------------------------------------------===//

‎mlir/lib/Dialect/Func/IR/FuncOps.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,8 @@ void FuncDialect::initialize() {
4242
#define GET_OP_LIST
4343
#include "mlir/Dialect/Func/IR/FuncOps.cpp.inc"
4444
>();
45-
declarePromisedInterface<FuncDialect, DialectInlinerInterface>();
46-
declarePromisedInterface<FuncDialect, ConvertToLLVMPatternInterface>();
45+
declarePromisedInterface<DialectInlinerInterface, FuncDialect>();
46+
declarePromisedInterface<ConvertToLLVMPatternInterface, FuncDialect>();
4747
declarePromisedInterfaces<bufferization::BufferizableOpInterface, CallOp,
4848
FuncOp, ReturnOp>();
4949
}

‎mlir/lib/Dialect/GPU/IR/GPUDialect.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -216,8 +216,8 @@ void GPUDialect::initialize() {
216216
#include "mlir/Dialect/GPU/IR/GPUOpsAttributes.cpp.inc"
217217
>();
218218
addInterfaces<GPUInlinerInterface>();
219-
declarePromisedInterface<TerminatorOp,
220-
bufferization::BufferDeallocationOpInterface>();
219+
declarePromisedInterface<bufferization::BufferDeallocationOpInterface,
220+
TerminatorOp>();
221221
}
222222

223223
static std::string getSparseHandleKeyword(SparseHandleKind kind) {

‎mlir/lib/Dialect/Index/IR/IndexDialect.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ using namespace mlir::index;
1919
void IndexDialect::initialize() {
2020
registerAttributes();
2121
registerOperations();
22-
declarePromisedInterface<IndexDialect, ConvertToLLVMPatternInterface>();
22+
declarePromisedInterface<ConvertToLLVMPatternInterface, IndexDialect>();
2323
}
2424

2525
//===----------------------------------------------------------------------===//

‎mlir/lib/Dialect/LLVMIR/IR/NVVMDialect.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1044,8 +1044,8 @@ void NVVMDialect::initialize() {
10441044
// Support unknown operations because not all NVVM operations are
10451045
// registered.
10461046
allowUnknownOperations();
1047-
declarePromisedInterface<NVVMDialect, ConvertToLLVMPatternInterface>();
1048-
declarePromisedInterface<NVVMTargetAttr, gpu::TargetAttrInterface>();
1047+
declarePromisedInterface<ConvertToLLVMPatternInterface, NVVMDialect>();
1048+
declarePromisedInterface<gpu::TargetAttrInterface, NVVMTargetAttr>();
10491049
}
10501050

10511051
LogicalResult NVVMDialect::verifyOperationAttribute(Operation *op,

‎mlir/lib/Dialect/LLVMIR/IR/ROCDLDialect.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -247,7 +247,7 @@ void ROCDLDialect::initialize() {
247247

248248
// Support unknown operations because not all ROCDL operations are registered.
249249
allowUnknownOperations();
250-
declarePromisedInterface<ROCDLTargetAttr, gpu::TargetAttrInterface>();
250+
declarePromisedInterface<gpu::TargetAttrInterface, ROCDLTargetAttr>();
251251
}
252252

253253
LogicalResult ROCDLDialect::verifyOperationAttribute(Operation *op,

‎mlir/lib/Dialect/Linalg/IR/LinalgDialect.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -123,16 +123,16 @@ void mlir::linalg::LinalgDialect::initialize() {
123123

124124
addInterfaces<LinalgInlinerInterface>();
125125

126-
declarePromisedInterface<GenericOp, mesh::ShardingInterface>();
126+
declarePromisedInterface<mesh::ShardingInterface, GenericOp>();
127127
declarePromisedInterfaces<mesh::ShardingInterface,
128128
#define GET_OP_LIST
129129
#include "mlir/Dialect/Linalg/IR/LinalgStructuredOps.cpp.inc"
130130
>();
131-
declarePromisedInterface<CopyOp, SubsetOpInterface>();
132-
declarePromisedInterface<CopyOp, SubsetInsertionOpInterface>();
133-
declarePromisedInterface<IndexOp, ValueBoundsOpInterface>();
134-
declarePromisedInterface<linalg::GenericOp, TilingInterface>();
135-
declarePromisedInterface<linalg::GenericOp, PartialReductionOpInterface>();
131+
declarePromisedInterface<SubsetOpInterface, CopyOp>();
132+
declarePromisedInterface<SubsetInsertionOpInterface, CopyOp>();
133+
declarePromisedInterface<ValueBoundsOpInterface, IndexOp>();
134+
declarePromisedInterface<TilingInterface, linalg::GenericOp>();
135+
declarePromisedInterface<PartialReductionOpInterface, linalg::GenericOp>();
136136
declarePromisedInterfaces<TilingInterface,
137137
#define GET_OP_LIST
138138
#include "mlir/Dialect/Linalg/IR/LinalgStructuredOps.cpp.inc"

‎mlir/lib/Dialect/Math/IR/MathDialect.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,5 +35,5 @@ void mlir::math::MathDialect::initialize() {
3535
#include "mlir/Dialect/Math/IR/MathOps.cpp.inc"
3636
>();
3737
addInterfaces<MathInlinerInterface>();
38-
declarePromisedInterface<MathDialect, ConvertToLLVMPatternInterface>();
38+
declarePromisedInterface<ConvertToLLVMPatternInterface, MathDialect>();
3939
}

‎mlir/lib/Dialect/MemRef/IR/MemRefDialect.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,14 +47,14 @@ void mlir::memref::MemRefDialect::initialize() {
4747
#include "mlir/Dialect/MemRef/IR/MemRefOps.cpp.inc"
4848
>();
4949
addInterfaces<MemRefInlinerInterface>();
50-
declarePromisedInterface<MemRefDialect, ConvertToLLVMPatternInterface>();
50+
declarePromisedInterface<ConvertToLLVMPatternInterface, MemRefDialect>();
5151
declarePromisedInterfaces<bufferization::AllocationOpInterface, AllocOp,
5252
AllocaOp, ReallocOp>();
5353
declarePromisedInterfaces<RuntimeVerifiableOpInterface, CastOp, ExpandShapeOp,
5454
LoadOp, ReinterpretCastOp, StoreOp, SubViewOp>();
5555
declarePromisedInterfaces<ValueBoundsOpInterface, AllocOp, AllocaOp, CastOp,
5656
DimOp, GetGlobalOp, RankOp, SubViewOp>();
57-
declarePromisedInterface<MemRefType, DestructurableTypeInterface>();
57+
declarePromisedInterface<DestructurableTypeInterface, MemRefType>();
5858
}
5959

6060
/// Finds the unique dealloc operation (if one exists) for `allocValue`.

‎mlir/lib/Dialect/SCF/IR/SCF.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ void SCFDialect::initialize() {
7979
declarePromisedInterfaces<bufferization::BufferizableOpInterface, ConditionOp,
8080
ExecuteRegionOp, ForOp, IfOp, IndexSwitchOp,
8181
ForallOp, InParallelOp, WhileOp, YieldOp>();
82-
declarePromisedInterface<ForOp, ValueBoundsOpInterface>();
82+
declarePromisedInterface<ValueBoundsOpInterface, ForOp>();
8383
}
8484

8585
/// Default callback for IfOp builders. Inserts a yield without arguments.

‎mlir/lib/Dialect/SPIRV/IR/SPIRVDialect.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ void SPIRVDialect::initialize() {
135135

136136
// Allow unknown operations because SPIR-V is extensible.
137137
allowUnknownOperations();
138-
declarePromisedInterface<TargetEnvAttr, gpu::TargetAttrInterface>();
138+
declarePromisedInterface<gpu::TargetAttrInterface, TargetEnvAttr>();
139139
}
140140

141141
std::string SPIRVDialect::getAttributeName(Decoration decoration) {

‎mlir/lib/Dialect/Tensor/IR/TensorDialect.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ void TensorDialect::initialize() {
6262
ParallelInsertSliceOp>();
6363
declarePromisedInterfaces<SubsetInsertionOpInterface, InsertSliceOp,
6464
ParallelInsertSliceOp>();
65-
declarePromisedInterface<ExtractSliceOp, SubsetExtractionOpInterface>();
65+
declarePromisedInterface<SubsetExtractionOpInterface, ExtractSliceOp>();
6666
declarePromisedInterfaces<TilingInterface, PadOp, PackOp, UnPackOp>();
6767
declarePromisedInterfaces<ValueBoundsOpInterface, CastOp, DimOp, EmptyOp,
6868
ExtractSliceOp, PadOp, RankOp>();

‎mlir/lib/Dialect/UB/IR/UBOps.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ void UBDialect::initialize() {
4646
#include "mlir/Dialect/UB/IR/UBOpsAttributes.cpp.inc"
4747
>();
4848
addInterfaces<UBInlinerInterface>();
49-
declarePromisedInterface<UBDialect, ConvertToLLVMPatternInterface>();
49+
declarePromisedInterface<ConvertToLLVMPatternInterface, UBDialect>();
5050
}
5151

5252
Operation *UBDialect::materializeConstant(OpBuilder &builder, Attribute value,

‎mlir/lib/Dialect/Vector/IR/VectorOps.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -382,8 +382,8 @@ void VectorDialect::initialize() {
382382
YieldOp>();
383383
declarePromisedInterfaces<SubsetOpInterface, TransferReadOp,
384384
TransferWriteOp>();
385-
declarePromisedInterface<TransferReadOp, SubsetExtractionOpInterface>();
386-
declarePromisedInterface<TransferWriteOp, SubsetInsertionOpInterface>();
385+
declarePromisedInterface<SubsetExtractionOpInterface, TransferReadOp>();
386+
declarePromisedInterface<SubsetInsertionOpInterface, TransferWriteOp>();
387387
}
388388

389389
/// Materialize a single constant operation from a given attribute value with

‎mlir/unittests/IR/InterfaceAttachmentTest.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -431,8 +431,8 @@ TEST(InterfaceAttachmentTest, PromisedInterfaces) {
431431
attr.hasPromiseOrImplementsInterface<TestExternalAttrInterface>());
432432

433433
// Add a promise `TestExternalAttrInterface`.
434-
testDialect->declarePromisedInterface<test::SimpleAAttr,
435-
TestExternalAttrInterface>();
434+
testDialect->declarePromisedInterface<TestExternalAttrInterface,
435+
test::SimpleAAttr>();
436436
EXPECT_TRUE(
437437
attr.hasPromiseOrImplementsInterface<TestExternalAttrInterface>());
438438

0 commit comments

Comments
 (0)