[mlir][LLVMIR][NFC] Migrate to OpAsmAttrInterface for ASM alias generation (#130479)
After the introduction of `OpAsmAttrInterface`, it is favorable to
migrate code using `OpAsmDialectInterface` for ASM alias generation,
which lives in `Dialect.cpp`, to use `OpAsmAttrInterface`, which lives
in `Attrs.td`. In this way, attribute behavior is placed near its
tablegen definition and people won't need to go through other files to
know what other (unexpected) hooks comes into play.
See #124721 for the interface itself and #128191 for prior migration for
Builtin Attributes.
See #131504 for the `genMnemonicAlias` tablegen field.
diff --git a/mlir/include/mlir/Dialect/LLVMIR/LLVMAttrDefs.td b/mlir/include/mlir/Dialect/LLVMIR/LLVMAttrDefs.td
index ade2b64..790d2e7 100644
--- a/mlir/include/mlir/Dialect/LLVMIR/LLVMAttrDefs.td
+++ b/mlir/include/mlir/Dialect/LLVMIR/LLVMAttrDefs.td
@@ -79,6 +79,9 @@
);
let assemblyFormat = "`<` struct(params) `>`";
+
+ // Generate mnemonic alias for the attribute.
+ let genMnemonicAlias = 1;
}
def LoopInterleaveAttr : LLVM_Attr<"LoopInterleave", "loop_interleave"> {
@@ -92,6 +95,9 @@
);
let assemblyFormat = "`<` struct(params) `>`";
+
+ // Generate mnemonic alias for the attribute.
+ let genMnemonicAlias = 1;
}
def LoopUnrollAttr : LLVM_Attr<"LoopUnroll", "loop_unroll"> {
@@ -111,6 +117,9 @@
);
let assemblyFormat = "`<` struct(params) `>`";
+
+ // Generate mnemonic alias for the attribute.
+ let genMnemonicAlias = 1;
}
def LoopUnrollAndJamAttr : LLVM_Attr<"LoopUnrollAndJam", "loop_unroll_and_jam"> {
@@ -130,6 +139,9 @@
);
let assemblyFormat = "`<` struct(params) `>`";
+
+ // Generate mnemonic alias for the attribute.
+ let genMnemonicAlias = 1;
}
def LoopLICMAttr : LLVM_Attr<"LoopLICM", "loop_licm"> {
@@ -145,6 +157,9 @@
);
let assemblyFormat = "`<` struct(params) `>`";
+
+ // Generate mnemonic alias for the attribute.
+ let genMnemonicAlias = 1;
}
def LoopDistributeAttr : LLVM_Attr<"LoopDistribute", "loop_distribute"> {
@@ -162,6 +177,9 @@
);
let assemblyFormat = "`<` struct(params) `>`";
+
+ // Generate mnemonic alias for the attribute.
+ let genMnemonicAlias = 1;
}
def LoopPipelineAttr : LLVM_Attr<"LoopPipeline", "loop_pipeline"> {
@@ -176,6 +194,9 @@
);
let assemblyFormat = "`<` struct(params) `>`";
+
+ // Generate mnemonic alias for the attribute.
+ let genMnemonicAlias = 1;
}
def LoopPeeledAttr : LLVM_Attr<"LoopPeeled", "loop_peeled"> {
@@ -189,6 +210,9 @@
);
let assemblyFormat = "`<` struct(params) `>`";
+
+ // Generate mnemonic alias for the attribute.
+ let genMnemonicAlias = 1;
}
def LoopUnswitchAttr : LLVM_Attr<"LoopUnswitch", "loop_unswitch"> {
@@ -202,6 +226,9 @@
);
let assemblyFormat = "`<` struct(params) `>`";
+
+ // Generate mnemonic alias for the attribute.
+ let genMnemonicAlias = 1;
}
def LoopAnnotationAttr : LLVM_Attr<"LoopAnnotation", "loop_annotation"> {
@@ -232,6 +259,9 @@
);
let assemblyFormat = "`<` struct(params) `>`";
+
+ // Generate mnemonic alias for the attribute.
+ let genMnemonicAlias = 1;
}
//===----------------------------------------------------------------------===//
@@ -311,6 +341,9 @@
def LLVM_DINullTypeAttr : LLVM_Attr<"DINullType", "di_null_type",
/*traits=*/[], "DITypeAttr"> {
let parameters = (ins);
+
+ // Generate mnemonic alias for the attribute.
+ let genMnemonicAlias = 1;
}
//===----------------------------------------------------------------------===//
@@ -336,6 +369,9 @@
}]>
];
let assemblyFormat = "`<` struct(params) `>`";
+
+ // Generate mnemonic alias for the attribute.
+ let genMnemonicAlias = 1;
}
//===----------------------------------------------------------------------===//
@@ -365,6 +401,9 @@
}]>
];
let assemblyFormat = "`<` struct(params) `>`";
+
+ // Generate mnemonic alias for the attribute.
+ let genMnemonicAlias = 1;
}
//===----------------------------------------------------------------------===//
@@ -422,6 +461,9 @@
/// @}
}];
+
+ // Generate mnemonic alias for the attribute.
+ let genMnemonicAlias = 1;
}
//===----------------------------------------------------------------------===//
@@ -441,6 +483,9 @@
OptionalParameter<"DINodeAttr">:$extraData
);
let assemblyFormat = "`<` struct(params) `>`";
+
+ // Generate mnemonic alias for the attribute.
+ let genMnemonicAlias = 1;
}
//===----------------------------------------------------------------------===//
@@ -455,6 +500,9 @@
}]>
];
let assemblyFormat = "`<` $name `in` $directory `>`";
+
+ // Generate mnemonic alias for the attribute.
+ let genMnemonicAlias = 1;
}
//===----------------------------------------------------------------------===//
@@ -469,6 +517,9 @@
);
let assemblyFormat = "`<` struct(params) `>`";
let constBuilderCall = "$0";
+
+ // Generate mnemonic alias for the attribute.
+ let genMnemonicAlias = 1;
}
def DIGlobalVariableExpressionArrayAttr :
@@ -492,6 +543,9 @@
OptionalParameter<"bool">:$isDefined,
OptionalParameter<"unsigned">:$alignInBits);
let assemblyFormat = "`<` struct(params) `>`";
+
+ // Generate mnemonic alias for the attribute.
+ let genMnemonicAlias = 1;
}
//===----------------------------------------------------------------------===//
@@ -515,6 +569,9 @@
}]>
];
let assemblyFormat = "`<` struct(params) `>`";
+
+ // Generate mnemonic alias for the attribute.
+ let genMnemonicAlias = 1;
}
//===----------------------------------------------------------------------===//
@@ -536,6 +593,9 @@
}]>
];
let assemblyFormat = "`<` struct(params) `>`";
+
+ // Generate mnemonic alias for the attribute.
+ let genMnemonicAlias = 1;
}
//===----------------------------------------------------------------------===//
@@ -566,6 +626,9 @@
}]>
];
let assemblyFormat = "`<` struct(params) `>`";
+
+ // Generate mnemonic alias for the attribute.
+ let genMnemonicAlias = 1;
}
//===----------------------------------------------------------------------===//
@@ -619,6 +682,9 @@
/// @}
}];
+
+ // Generate mnemonic alias for the attribute.
+ let genMnemonicAlias = 1;
}
//===----------------------------------------------------------------------===//
@@ -639,6 +705,9 @@
);
let assemblyFormat = "`<` struct(params) `>`";
+
+ // Generate mnemonic alias for the attribute.
+ let genMnemonicAlias = 1;
}
//===----------------------------------------------------------------------===//
@@ -654,6 +723,9 @@
);
let assemblyFormat = "`<` struct(params) `>`";
+
+ // Generate mnemonic alias for the attribute.
+ let genMnemonicAlias = 1;
}
//===----------------------------------------------------------------------===//
@@ -673,6 +745,9 @@
);
let assemblyFormat = "`<` struct(params) `>`";
+
+ // Generate mnemonic alias for the attribute.
+ let genMnemonicAlias = 1;
}
//===----------------------------------------------------------------------===//
@@ -719,6 +794,9 @@
OptionalParameter<"unsigned">:$line
);
let assemblyFormat = "`<` struct(params) `>`";
+
+ // Generate mnemonic alias for the attribute.
+ let genMnemonicAlias = 1;
}
//===----------------------------------------------------------------------===//
@@ -753,6 +831,9 @@
}]>
];
let assemblyFormat = "`<` struct(params) `>`";
+
+ // Generate mnemonic alias for the attribute.
+ let genMnemonicAlias = 1;
}
//===----------------------------------------------------------------------===//
@@ -778,6 +859,9 @@
];
let assemblyFormat = "`<` struct(params) `>`";
+
+ // Generate mnemonic alias for the attribute.
+ let genMnemonicAlias = 1;
}
//===----------------------------------------------------------------------===//
@@ -797,6 +881,9 @@
LLVM_DIEncodingParameter:$encoding
);
let assemblyFormat = "`<` struct(params) `>`";
+
+ // Generate mnemonic alias for the attribute.
+ let genMnemonicAlias = 1;
}
//===----------------------------------------------------------------------===//
@@ -845,6 +932,9 @@
}];
let assemblyFormat = "`<` struct(params) `>`";
+
+ // Generate mnemonic alias for the attribute.
+ let genMnemonicAlias = 1;
}
//===----------------------------------------------------------------------===//
@@ -902,6 +992,9 @@
let assemblyFormat = "`<` struct(params) `>`";
let genVerifyDecl = 1;
+
+ // Generate mnemonic alias for the attribute.
+ let genMnemonicAlias = 1;
}
def LLVM_AliasScopeArrayAttr
@@ -937,6 +1030,9 @@
}];
let assemblyFormat = "`<` struct(params) `>`";
+
+ // Generate mnemonic alias for the attribute.
+ let genMnemonicAlias = 1;
}
def LLVM_AccessGroupArrayAttr
@@ -967,6 +1063,9 @@
}];
let assemblyFormat = "(`<` struct(params)^ `>`)?";
+
+ // Generate mnemonic alias for the attribute.
+ let genMnemonicAlias = 1;
}
//===----------------------------------------------------------------------===//
@@ -1040,6 +1139,9 @@
}];
let assemblyFormat = "`<` struct(params) `>`";
+
+ // Generate mnemonic alias for the attribute.
+ let genMnemonicAlias = 1;
}
//===----------------------------------------------------------------------===//
@@ -1082,6 +1184,9 @@
}];
let assemblyFormat = "`<` struct(params) `>`";
+
+ // Generate mnemonic alias for the attribute.
+ let genMnemonicAlias = 1;
}
def LLVM_TBAATagArrayAttr
diff --git a/mlir/lib/Dialect/LLVMIR/IR/LLVMDialect.cpp b/mlir/lib/Dialect/LLVMIR/IR/LLVMDialect.cpp
index fc74e3d..c757f3c 100644
--- a/mlir/lib/Dialect/LLVMIR/IR/LLVMDialect.cpp
+++ b/mlir/lib/Dialect/LLVMIR/IR/LLVMDialect.cpp
@@ -3727,36 +3727,6 @@
}
//===----------------------------------------------------------------------===//
-// OpAsmDialectInterface
-//===----------------------------------------------------------------------===//
-
-namespace {
-struct LLVMOpAsmDialectInterface : public OpAsmDialectInterface {
- using OpAsmDialectInterface::OpAsmDialectInterface;
-
- AliasResult getAlias(Attribute attr, raw_ostream &os) const override {
- return TypeSwitch<Attribute, AliasResult>(attr)
- .Case<AccessGroupAttr, AliasScopeAttr, AliasScopeDomainAttr,
- DIBasicTypeAttr, DICommonBlockAttr, DICompileUnitAttr,
- DICompositeTypeAttr, DIDerivedTypeAttr, DIFileAttr,
- DIGlobalVariableAttr, DIGlobalVariableExpressionAttr,
- DIImportedEntityAttr, DILabelAttr, DILexicalBlockAttr,
- DILexicalBlockFileAttr, DILocalVariableAttr, DIModuleAttr,
- DINamespaceAttr, DINullTypeAttr, DIStringTypeAttr,
- DISubprogramAttr, DISubroutineTypeAttr, LoopAnnotationAttr,
- LoopVectorizeAttr, LoopInterleaveAttr, LoopUnrollAttr,
- LoopUnrollAndJamAttr, LoopLICMAttr, LoopDistributeAttr,
- LoopPipelineAttr, LoopPeeledAttr, LoopUnswitchAttr, TBAARootAttr,
- TBAATagAttr, TBAATypeDescriptorAttr>([&](auto attr) {
- os << decltype(attr)::getMnemonic();
- return AliasResult::OverridableAlias;
- })
- .Default([](Attribute) { return AliasResult::NoAlias; });
- }
-};
-} // namespace
-
-//===----------------------------------------------------------------------===//
// LinkerOptionsOp
//===----------------------------------------------------------------------===//
@@ -4024,9 +3994,6 @@
// Support unknown operations because not all LLVM operations are registered.
allowUnknownOperations();
- // clang-format off
- addInterfaces<LLVMOpAsmDialectInterface>();
- // clang-format on
declarePromisedInterface<DialectInlinerInterface, LLVMDialect>();
}
