Skip to content

[mlir][IR] Fix enum attribute handling by using parseKeywordOrString instead of parseKeyword #156662

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
Sep 3, 2025
Merged

[mlir][IR] Fix enum attribute handling by using parseKeywordOrString instead of parseKeyword #156662

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
8 changes: 4 additions & 4 deletions mlir/include/mlir/IR/EnumAttr.td
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -314,8 +314,8 @@ class IntEnumAttr<I intType, string name, string summary,
// symbol is not valid.
let parameterParser = [{[&]() -> ::mlir::FailureOr<}] # cppType # [{> {
auto loc = $_parser.getCurrentLocation();
::llvm::StringRef enumKeyword;
if (::mlir::failed($_parser.parseKeyword(&enumKeyword)))
std::string enumKeyword;
if (::mlir::failed($_parser.parseKeywordOrString(&enumKeyword)))
return ::mlir::failure();
auto maybeEnum = }] # cppNamespace # "::" #
stringToSymbolFnName # [{(enumKeyword);
Expand Down Expand Up @@ -436,9 +436,9 @@ class BitEnumAttr<I intType, string name, string summary,
let parameterParser = [{[&]() -> ::mlir::FailureOr<}] # cppType # [{> {
}] # cppType # [{ flags = {};
auto loc = $_parser.getCurrentLocation();
::llvm::StringRef enumKeyword;
std::string enumKeyword;
do {
if (::mlir::failed($_parser.parseKeyword(&enumKeyword)))
if (::mlir::failed($_parser.parseKeywordOrString(&enumKeyword)))
return ::mlir::failure();
auto maybeEnum = }] # cppNamespace # "::" #
stringToSymbolFnName # [{(enumKeyword);
Expand Down
4 changes: 2 additions & 2 deletions mlir/test/IR/array-of-attr.mlir
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ test.array_of_attr_op
a = [begin 0 : index end, begin 2 : index end],
// CHECK-SAME: [0, 1, -42, 42]
b = [0, 1, -42, 42],
// CHECK-SAME: [a, b, b, a]
c = [a, b, b, a]
// CHECK-SAME: [a, b, b, a, "+"]
c = [a, b, b, a, "+"]

// CHECK: test.array_of_attr_op
// CHECK-SAME: a = [], b = [], c = []
Expand Down
4 changes: 3 additions & 1 deletion mlir/test/lib/Dialect/Test/TestEnumDefs.td
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,9 @@ def TestEnum

def TestSimpleEnum : I32Enum<"SimpleEnum", "", [
I32EnumCase<"a", 0>,
I32EnumCase<"b", 1>
I32EnumCase<"b", 1>,
I32EnumCase<"Plus", 2, "+">,
I32EnumCase<"LongString", 3, "dash-separated-sentence">,
]> {
let cppNamespace = "::test";
}
Expand Down
6 changes: 5 additions & 1 deletion mlir/test/mlir-tblgen/attr-or-type-format-roundtrip.mlir
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,11 @@ attributes {
// CHECK: #test.attr_with_optional_enum<a>
attr_12 = #test.attr_with_optional_enum<a>,
// CHECK: #test.attr_with_optional_enum<b>
attr_13 = #test.attr_with_optional_enum<b>
attr_13 = #test.attr_with_optional_enum<b>,
// CHECK: #test<simple_enum"+">
attr_14 = #test<simple_enum "+">,
// CHECK: #test<simple_enum"dash-separated-sentence">
attr_15 = #test<simple_enum "dash-separated-sentence">
}

// CHECK-LABEL: @test_roundtrip_default_parsers_struct
Expand Down
16 changes: 15 additions & 1 deletion mlir/test/mlir-tblgen/attr-or-type-format.td
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,7 @@ def AttrE : TestAttr<"TestH"> {

def TestEnum : I32EnumAttr<"TestEnum", "TestEnumType", [
I32EnumAttrCase<"first", 0>,
I32EnumAttrCase<"second", 1>
I32EnumAttrCase<"second", 1>,
]> {
let genSpecializedAttr = 0;
}
Expand All @@ -215,6 +215,20 @@ def EnumAttrA : EnumAttr<Test_Dialect, TestEnum, "EnumAttrA"> {
let assemblyFormat = "custom<Foo>($value)";
}

def TestEnumB : I32EnumAttr<"TestEnumB", "TestEnumType", [
I32EnumAttrCase<"Plus", 0, "+">,
I32EnumAttrCase<"LongString", 1, "dash-separated-sentence">,
I32EnumAttrCase<"Other", 2>
]> {
let genSpecializedAttr = 0;
}

// ATTR-LABEL: TestEnumBAttr::parse
// ATTR: parseKeywordOrString(
def EnumAttrB : EnumAttr<Test_Dialect, TestEnumB, "EnumAttrB"> {
let assemblyFormat = "$value";
}

/// Test type parser and printer that mix variables and struct are generated
/// correctly.

Expand Down
Loading