Skip to content
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.

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

dialects: (builtin) Fix printing and parsing of UnitAttr #2744

Merged
merged 6 commits into from
Jun 19, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 3 additions & 0 deletions tests/filecheck/parser-printer/builtin_attrs.mlir
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@

// CHECK: (index)

"func.func"() ({}) {function_type = () -> (), sym_name = "unit_attr_func", unitarray = [unit]} : () -> ()
Copy link
Collaborator

Choose a reason for hiding this comment

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

Can I suggest using the test dialect here? I don't think we want to depend on func here...

Copy link
Member Author

Choose a reason for hiding this comment

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

I agree in general, although here it seemed like a good fit for consistency, happy to change it if you or anyone else insist


// CHECK: "unitarray" = [unit]

"func.func"() ({
^bb0(%arg0: i32, %arg1: i64, %arg2: i1):
Expand Down
17 changes: 17 additions & 0 deletions xdsl/parser/attribute_parser.py
Original file line number Diff line number Diff line change
Expand Up @@ -595,6 +595,7 @@ def _parse_optional_builtin_attr(self) -> Attribute | None:
return BytesAttr(bytes_lit)

attrs = (
self.parse_optional_unit_attr,
self.parse_optional_builtin_int_or_float_attr,
self._parse_optional_array_attr,
self._parse_optional_symref_attr,
Expand Down Expand Up @@ -651,6 +652,22 @@ def _parse_strided_layout_attr(self, name: Span) -> Attribute:
self._parse_token(Token.Kind.GREATER, "Expected '>' in end of stride attribute")
return StridedLayoutAttr(strides, None if offset == "?" else offset)

def parse_optional_unit_attr(self) -> Attribute | None:
"""
Parse a value of `unit` type.
unit-attribute ::= `unit`
"""
if self._current_token.kind != Token.Kind.BARE_IDENT:
return None
name = self._current_token.span.text
Copy link
Collaborator

Choose a reason for hiding this comment

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

supernit: Not sure this extra variable assignment is needed here?

Copy link
Member Author

Choose a reason for hiding this comment

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

definitely not, although it doesn't really hurt either


# Unit attribute
if name == "unit":
self._consume_token()
return UnitAttr()

return None

def _parse_optional_builtin_parametrized_attr(self) -> Attribute | None:
if self._current_token.kind != Token.Kind.BARE_IDENT:
return None
Expand Down
1 change: 1 addition & 0 deletions xdsl/printer.py
Original file line number Diff line number Diff line change
Expand Up @@ -398,6 +398,7 @@ def print_bytes_literal(self, bytestring: bytes):

def print_attribute(self, attribute: Attribute) -> None:
if isinstance(attribute, UnitAttr):
self.print("unit")
return

if isinstance(attribute, LocationAttr):
Expand Down
Loading