Skip to content

[mlir] [attribute] Fix inconsistent nested attribute parser and printer #133872

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

Closed
wants to merge 12 commits into from
Closed

[mlir] [attribute] Fix inconsistent nested attribute parser and printer #133872

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
6782561
update(attribute,test): add nested attribute for test
rebel-jueonpark Apr 1, 2025
e781bec
Merge branch 'llvm:main' into users/jueonpark/nested-attribute-incons…
JueonPark Apr 10, 2025
eefed4c
Merge branch 'main' into users/jueonpark/nested-attribute-inconsistency
JueonPark May 18, 2025
9c72d85
Merge branch 'main' into users/jueonpark/nested-attribute-inconsistency
JueonPark May 18, 2025
c1ddee8
Merge branch 'main' into users/jueonpark/nested-attribute-inconsistency
JueonPark Sep 21, 2025
aec5551
Merge branch 'llvm:main' into users/jueonpark/nested-attribute-incons…
JueonPark Sep 23, 2025
2338a54
Merge branch 'llvm:main' into users/jueonpark/nested-attribute-incons…
JueonPark Oct 8, 2025
39f57c0
fix: add shouldBeQualifiedFlag and new printing utils for correspondi…
rebel-jueonpark Oct 8, 2025
fb2bc05
fix: do not necessitate the internal attribute's mnemonic
rebel-jueonpark Oct 9, 2025
e35a16d
fix: rename params to args to remove diff
JueonPark Oct 9, 2025
8ee2f6f
fix: remove unnecessary exception logic
JueonPark Oct 9, 2025
4a25ae2
fix: remove unnecessary `printQualifiedAttrOrType` function
JueonPark Oct 9, 2025
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
30 changes: 30 additions & 0 deletions mlir/test/lib/Dialect/Test/TestAttrDefs.td
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,36 @@ def CompoundAttrNested : Test_Attr<"CompoundAttrNested"> {
let assemblyFormat = "`<` `nested` `=` $nested `>`";
}

// Nested attributes for reproducing.
def InternalAttr : Test_Attr<"Internal"> {
let mnemonic = "internal";

let parameters = (ins
"int64_t":$key,
"int64_t":$value
);

let assemblyFormat = "`<` struct(params) `>`";
}

def ExternalAttr : Test_Attr<"External"> {
let mnemonic = "external";

let parameters = (ins InternalAttr:$internal);

let assemblyFormat = "`<` struct(params) `>`";
}

def ExternalArrayAttr : Test_Attr<"ExternalArray"> {
let mnemonic = "external_array";

let parameters = (ins
ArrayRefParameter<"InternalAttr">:$internals
);

let assemblyFormat = "`<` `[` struct(params) `]` `>`";
}

// An attribute testing AttributeSelfTypeParameter.
def AttrWithSelfTypeParam
: Test_Attr<"AttrWithSelfTypeParam", [TypedAttrInterface]> {
Expand Down
21 changes: 21 additions & 0 deletions mlir/test/mlir-tblgen/op-format.mlir
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -345,6 +345,27 @@ module attributes {test.someAttr = #test.cmpnd_nested_outer<i <42 <1, !test.smpl

//-----

// CHECK: module attributes {test.internal = #test.internal<key = 8, value = 9>} {
// CHECK-NEXT: }
module attributes {test.internal = #test.internal<key = 8, value = 9>} {
}

//-----

// CHECK: module attributes {test.external = #test.external<internal = <key = 1, value = 2>>} {
// CHECK-NEXT: }
module attributes {test.external = #test.external<internal = <key = 1, value = 2>>} {
}

//-----

// CHECK: module attributes {test.external_array = #test.external_array<[internals = <key = 1, value = 2>, <key = 8, value = 9>]>} {
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Where is the nested qualified print here?

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The nested qualified only prints the first qualified mnemonic.

Before:

module attributes {test.external_array = #test.external_array<[internals = #test.internal<key = 1, value = 2>, #test.internal<key = 8, value = 9>]>} {
}

After:

module attributes {test.external_array = #test.external_array<[internals = <key = 1, value = 2>, <key = 8, value = 9>]>} {
}

// CHECK-NEXT: }
module attributes {test.external_array = #test.external_array<[internals = <key = 1, value = 2>, <key = 8, value = 9>]>} {
}

//-----

// CHECK: test.format_cpmd_nested_attr nested <i <42 <1, !test.smpla, [5, 6]>>>
test.format_cpmd_nested_attr nested <i <42 <1, !test.smpla, [5, 6]>>>

Expand Down
21 changes: 21 additions & 0 deletions mlir/tools/mlir-tblgen/AttrOrTypeFormatGen.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,6 +141,25 @@ class StructDirective

} // namespace

/// Return true if the provided parameter should always be printed in qualified
/// form (i.e., with dialect/type prefixes). Attribute and type parameters fall
/// into this category to avoid ambiguity when nested within structured
/// properties.
static bool shouldPrintQualified(ParameterElement *param) {
const AttrOrTypeParameter &parameter = param->getParam();
StringRef cppType = parameter.getCppType();
if (!cppType.contains("Attr") && !cppType.contains("Type"))
return false;

if (parameter.getPrinter())
return false;

if (cppType.contains("mlir::Attribute") || cppType.contains("mlir::Type"))
return true;

return false;
}

//===----------------------------------------------------------------------===//
// Format Strings
//===----------------------------------------------------------------------===//
Expand Down Expand Up @@ -872,6 +891,8 @@ void DefFormat::genCommaSeparatedPrinter(
}
os << tgfmt("if (!_firstPrinted) $_printer << \", \";\n", &ctx);
os << "_firstPrinted = false;\n";
if (param && shouldPrintQualified(param))
param->setShouldBeQualified();
extra(arg);
shouldEmitSpace = false;
lastWasPunctuation = true;
Expand Down