Magic-Mirror/llvm-capstone
1
0
Fork 0
mirror of https://github.com/capstone-engine/llvm-capstone.git synced 2025-02-18 16:58:23 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

add prop-dict support for custom directive for mlir-tblgen (#77061)

Browse Source 
According to
https://mlir.llvm.org/docs/DefiningDialects/Operations/#custom-directives,
custom directive supports attr-dict

> attr-dict Directive: NamedAttrList &

But it doesn't support prop-dict which is introduced into MLIR recently.
It's useful to have tblgen support prop-dict like attr-dict. This PR
enable tblgen to support prop-dict

```bash
error: only variables and types may be used as parameters to a custom directive
   ... custom<Print>(prop-dict)
```

Co-authored-by: Fung Xie <ftse@nvidia.com>
This commit is contained in:
drazi 2024-01-05 19:37:24 +08:00 committed by GitHub
parent 567941bcc3
commit 44b3cf46e9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
mlir/test/mlir-tblgen/op-format-spec.td
View File

@ -44,6 +44,9 @@ def DirectiveCustomValidC : TestFormat_Op<[{
def DirectiveCustomValidD : TestFormat_Op<[{
(`(` custom<MyDirective>($operand)^ `)`)? attr-dict
}]>, Arguments<(ins Optional<I64>:$operand)>;
def DirectiveCustomValidE : TestFormat_Op<[{
custom<MyDirective>(prop-dict) attr-dict
}]>, Arguments<(ins UnitAttr:$flag)>;
//===----------------------------------------------------------------------===//
// functional-type

8
mlir/test/mlir-tblgen/op-format.td
View File

@ -42,6 +42,14 @@ def CustomStringLiteralC : TestFormat_Op<[{
custom<Foo>("$_builder.getStringAttr(\"foo\")") attr-dict
}]>;
// CHECK-LABEL: CustomStringLiteralD::parse
// CHECK: parseFoo({{.*}}, result)
// CHECK-LABEL: CustomStringLiteralD::print
// CHECK: printFoo({{.*}}, getProperties())
def CustomStringLiteralD : TestFormat_Op<[{
custom<Foo>(prop-dict) attr-dict
}]>;
//===----------------------------------------------------------------------===//
// Optional Groups
//===----------------------------------------------------------------------===//

11
mlir/tools/mlir-tblgen/OpFormatGen.cpp
View File

@ -895,6 +895,8 @@ static void genCustomParameterParser(FormatElement *param, MethodBody &body) {
body << attr->getVar()->name << "Attr";
} else if (isa<AttrDictDirective>(param)) {
body << "result.attributes";
} else if (isa<PropDictDirective>(param)) {
body << "result";
} else if (auto *operand = dyn_cast<OperandVariable>(param)) {
StringRef name = operand->getVar()->name;
ArgumentLengthKind lengthKind = getArgumentLengthKind(operand->getVar());
@ -1854,6 +1856,9 @@ static void genCustomDirectiveParameterPrinter(FormatElement *element,
} else if (isa<AttrDictDirective>(element)) {
body << "getOperation()->getAttrDictionary()";
} else if (isa<PropDictDirective>(element)) {
body << "getProperties()";
} else if (auto *operand = dyn_cast<OperandVariable>(element)) {
body << op.getGetterName(operand->getVar()->name) << "()";
@ -3138,9 +3143,9 @@ OpFormatParser::parsePropDictDirective(SMLoc loc, Context context) {
LogicalResult OpFormatParser::verifyCustomDirectiveArguments(
SMLoc loc, ArrayRef<FormatElement *> arguments) {
for (FormatElement *argument : arguments) {
if (!isa<AttrDictDirective, AttributeVariable, OperandVariable,
PropertyVariable, RefDirective, RegionVariable, SuccessorVariable,
StringElement, TypeDirective>(argument)) {
if (!isa<AttrDictDirective, PropDictDirective, AttributeVariable,
OperandVariable, PropertyVariable, RefDirective, RegionVariable,
SuccessorVariable, StringElement, TypeDirective>(argument)) {
// TODO: FormatElement should have location info attached.
return emitError(loc, "only variables and types may be used as "
"parameters to a custom directive");