dialects (riscv): make fastmath a property (and set it in all cases)

Author: knickish

xdsl/dialects/riscv.py

@@ -43,6 +43,7 @@
     irdl_op_definition,
     operand_def,
     opt_attr_def,
+    opt_prop_def,
     region_def,
     result_def,
     var_operand_def,
@@ -2491,7 +2492,7 @@ class LiOp(RISCVInstruction, ABC):
 
     rd = result_def(IntRegisterType)
     immediate = attr_def(base(Imm32Attr) | base(LabelAttr))
-    fastmath = opt_attr_def(FastMathFlagsAttr)
+    fastmath = opt_prop_def(FastMathFlagsAttr)
 
     traits = frozenset((Pure(), ConstantLike(), LiOpHasCanonicalizationPatternTrait()))
 
@@ -2500,7 +2501,7 @@ def __init__(
         immediate: int | Imm32Attr | str | LabelAttr,
         *,
         rd: IntRegisterType | str | None = None,
-        fastmath: FastMathFlagsAttr | None = None,
+        fastmath: FastMathFlagsAttr = FastMathFlagsAttr("none"),
         comment: str | StringAttr | None = None,
     ):
         if isinstance(immediate, int):
@@ -2516,10 +2517,12 @@ def __init__(
 
         super().__init__(
             result_types=[rd],
+            properties={
+                "fastmath": fastmath,
+            },
             attributes={
                 "immediate": immediate,
                 "comment": comment,
-                "fastmath": fastmath,
             },
         )
 
@@ -3037,15 +3040,15 @@ class RdRsRsFloatFloatIntegerOperationWithFastMath(RISCVInstruction, ABC):
     rd = result_def(IntRegisterType)
     rs1 = operand_def(FloatRegisterType)
     rs2 = operand_def(FloatRegisterType)
-    fastmath = opt_attr_def(FastMathFlagsAttr)
+    fastmath = opt_prop_def(FastMathFlagsAttr)
 
     def __init__(
         self,
         rs1: Operation | SSAValue,
         rs2: Operation | SSAValue,
         *,
         rd: IntRegisterType | str | None = None,
-        fastmath: FastMathFlagsAttr | None = None,
+        fastmath: FastMathFlagsAttr = FastMathFlagsAttr("none"),
         comment: str | StringAttr | None = None,
     ):
         if rd is None:
@@ -3057,8 +3060,10 @@ def __init__(
 
         super().__init__(
             operands=[rs1, rs2],
-            attributes={
+            properties={
                 "fastmath": fastmath,
+            },
+            attributes={
                 "comment": comment,
             },
             result_types=[rd],
@@ -3070,12 +3075,12 @@ def assembly_line_args(self) -> tuple[AssemblyInstructionArg, ...]:
     @classmethod
     def custom_parse_attributes(cls, parser: Parser) -> dict[str, Attribute]:
         attributes = dict[str, Attribute]()
-        flags = FastMathFlagsAttr("none")
+        fast = FastMathFlagsAttr("none")
         if parser.parse_optional_keyword("fastmath") is not None:
-            flags = FastMathFlagsAttr(FastMathFlagsAttr.parse_parameter(parser))
-            if flags != FastMathFlagsAttr("none"):
-                attributes["fastmath"] = flags
-            cls.fastmath = flags
+            fast = FastMathFlagsAttr(FastMathFlagsAttr.parse_parameter(parser))
+            if fast != FastMathFlagsAttr("none"):
+                attributes["fastmath"] = fast
+            cls.fastmath = fast
         return attributes
 
     def custom_print_attributes(self, printer: Printer) -> Set[str]: