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.

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

Jump to bottom

core: Rename _OpT to IRDLOperationInvT (NFC) #1310

Merged
merged 3 commits into from
Jul 21, 2023
Merged

core: Rename _OpT to IRDLOperationInvT (NFC) #1310

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7a72850
core: Rename _OpT to IRDLOperationInvT
math-fehr Jul 20, 2023
a2b1502
Add covariant and contravariant versions
math-fehr Jul 20, 2023
3a279c9
Merge branch 'main' into fehr/irdlop-inv
math-fehr Jul 21, 2023
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
26 changes: 15 additions & 11 deletions xdsl/irdl.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -434,7 +434,11 @@ def irdl_to_attr_constraint(
# \___/| .__/ \___|_| \__,_|\__|_|\___/|_| |_|
# |_|

_OpT = TypeVar("_OpT", bound="IRDLOperation")
IRDLOperationInvT = TypeVar("IRDLOperationInvT", bound="IRDLOperation")
IRDLOperationCovT = TypeVar("IRDLOperationCovT", bound="IRDLOperation", covariant=True)
IRDLOperationContrT = TypeVar(
"IRDLOperationContrT", bound="IRDLOperation", contravariant=True
)
math-fehr marked this conversation as resolved.
Show resolved Hide resolved


class IRDLOperation(Operation):
Expand Down Expand Up @@ -476,7 +480,7 @@ def __init__(

@classmethod
def build(
cls: type[_OpT],
cls: type[IRDLOperationInvT],
operands: Sequence[SSAValue | Operation | Sequence[SSAValue | Operation] | None]
| None = None,
result_types: Sequence[Attribute | Sequence[Attribute] | None] | None = None,
Expand All @@ -490,7 +494,7 @@ def build(
| Sequence[Region | Sequence[Operation] | Sequence[Block]]
]
| None = None,
) -> _OpT:
) -> IRDLOperationInvT:
"""Create a new operation using builders."""
op = cls.__new__(cls)
IRDLOperation.__init__(
Expand Down Expand Up @@ -995,7 +999,7 @@ class OpDef:
"""

@staticmethod
def from_pyrdl(pyrdl_def: type[_OpT]) -> OpDef:
def from_pyrdl(pyrdl_def: type[IRDLOperationInvT]) -> OpDef:
"""Decorator used on classes to define a new operation definition."""

type_var_mapping: dict[TypeVar, AttrConstraint] | None = None
Expand Down Expand Up @@ -1718,7 +1722,7 @@ def fun(self: Any, idx: int = arg_idx, previous_vars: int = previous_variadics):
)


def irdl_op_definition(cls: type[_OpT]) -> type[_OpT]:
def irdl_op_definition(cls: type[IRDLOperationInvT]) -> type[IRDLOperationInvT]:
"""Decorator used on classes to define a new operation definition."""

assert issubclass(
Expand All @@ -1741,10 +1745,10 @@ def irdl_op_definition(cls: type[_OpT]) -> type[_OpT]:
irdl_op_arg_definition(new_attrs, VarIRConstruct.SUCCESSOR, op_def)

def optional_attribute_field(attribute_name: str):
def field_getter(self: _OpT):
def field_getter(self: IRDLOperationInvT):
return self.attributes.get(attribute_name, None)

def field_setter(self: _OpT, value: Attribute | None):
def field_setter(self: IRDLOperationInvT, value: Attribute | None):
if value is None:
self.attributes.pop(attribute_name, None)
else:
Expand All @@ -1753,10 +1757,10 @@ def field_setter(self: _OpT, value: Attribute | None):
return property(field_getter, field_setter)

def attribute_field(attribute_name: str):
def field_getter(self: _OpT):
def field_getter(self: IRDLOperationInvT):
return self.attributes[attribute_name]

def field_setter(self: _OpT, value: Attribute):
def field_setter(self: IRDLOperationInvT, value: Attribute):
self.attributes[attribute_name] = value

return property(field_getter, field_setter)
Expand All @@ -1772,14 +1776,14 @@ def field_setter(self: _OpT, value: Attribute):

@classmethod
@property
def irdl_definition(cls: type[_OpT]):
def irdl_definition(cls: type[IRDLOperationInvT]):
return op_def

new_attrs["irdl_definition"] = irdl_definition

custom_verify = getattr(cls, "verify_")

def verify_(self: _OpT):
def verify_(self: IRDLOperationInvT):
op_def.verify(self)
custom_verify(self)

Expand Down