dialects: (arith) split generic binary op definition into specific ones

tests/dialects/test_arith.py

@@ -7,7 +7,6 @@
     Addi,
     AddUIExtended,
     AndI,
-    BinaryOperation,
     CeilDivSI,
     CeilDivUI,
     Cmpf,
@@ -20,7 +19,7 @@
     ExtSIOp,
     ExtUIOp,
     FastMathFlagsAttr,
-    FloatingPointLikeBinaryOp,
+    FloatingPointLikeBinaryOperation,
     FloorDivSI,
     FPToSIOp,
     IndexCastOp,
@@ -41,6 +40,7 @@
     ShLI,
     ShRSI,
     ShRUI,
+    SignlessIntegerBinaryOperation,
     SIToFPOp,
     Subf,
     Subi,
@@ -103,7 +103,7 @@ class Test_integer_arith_construction:
     @pytest.mark.parametrize("return_type", [None, operand_type])
     def test_arith_ops_init(
         self,
-        OpClass: type[BinaryOperation[_BinOpArgT]],
+        OpClass: type[SignlessIntegerBinaryOperation],
         return_type: Attribute,
     ):
         op = OpClass(self.a, self.b)
@@ -210,7 +210,9 @@ class Test_float_arith_construction:
         "flags", [FastMathFlagsAttr("none"), FastMathFlagsAttr("fast"), None]
     )
     def test_arith_ops(
-        self, func: type[FloatingPointLikeBinaryOp], flags: FastMathFlagsAttr | None
+        self,
+        func: type[FloatingPointLikeBinaryOperation],
+        flags: FastMathFlagsAttr | None,
     ):
         op = func(self.a, self.b, flags)
         assert op.operands[0].owner is self.a

tests/dialects/test_math.py

@@ -2,7 +2,7 @@
 
 import pytest
 
-from xdsl.dialects.arith import BinaryOperation, Constant
+from xdsl.dialects.arith import Constant, FloatingPointLikeBinaryOperation
 from xdsl.dialects.builtin import (
     DenseIntOrFPElementsAttr,
     FloatAttr,
@@ -84,7 +84,7 @@ class Test_float_math_binary_construction:
     @pytest.mark.parametrize("return_type", [None, operand_type])
     def test_float_binary_ops_constant_math_init(
         self,
-        OpClass: type[BinaryOperation[_BinOpArgT]],
+        OpClass: type[FloatingPointLikeBinaryOperation],
         return_type: Attribute,
     ):
         op = OpClass(self.a, self.b)
@@ -104,7 +104,7 @@ def test_float_binary_ops_constant_math_init(
     )
     @pytest.mark.parametrize("return_type", [None, f32_vector_type])
     def test_flaot_binary_vector_ops_init(
-        self, OpClass: type[BinaryOperation[_BinOpArgT]], return_type: Attribute
+        self, OpClass: type[FloatingPointLikeBinaryOperation], return_type: Attribute
     ):
         op = OpClass(self.lhs_vector, self.rhs_vector)
         assert isinstance(op, OpClass)
@@ -123,7 +123,7 @@ def test_flaot_binary_vector_ops_init(
     )
     @pytest.mark.parametrize("return_type", [None, f32_tensor_type])
     def test_float_binary_ops_tensor_math_init(
-        self, OpClass: type[BinaryOperation[_BinOpArgT]], return_type: Attribute
+        self, OpClass: type[FloatingPointLikeBinaryOperation], return_type: Attribute
     ):
         op = OpClass(self.lhs_tensor, self.rhs_tensor)
         assert isinstance(op, OpClass)

tests/irdl/test_declarative_assembly_format.py

@@ -22,9 +22,12 @@
     AttrSizedOperandSegments,
     AttrSizedRegionSegments,
     AttrSizedResultSegments,
+    BaseAttr,
     ConstraintVar,
     EqAttrConstraint,
+    GenericAttrConstraint,
     IRDLOperation,
+    ParamAttrConstraint,
     ParameterDef,
     ParsePropInAttrDict,
     VarOperand,
@@ -1559,7 +1562,7 @@ class OptSuccessorOp(IRDLOperation):
 # Inference                                                                   #
 ################################################################################
 
-_T = TypeVar("_T", bound=Attribute)
+_T = TypeVar("_T", bound=Attribute, covariant=True)
 
 
 @pytest.mark.parametrize(
@@ -1661,6 +1664,18 @@ class ParamOne(ParametrizedAttribute, TypeAttribute, Generic[_T]):
         p: ParameterDef[_T]
         q: ParameterDef[Attribute]
 
+        @classmethod
+        def constr(
+            cls,
+            *,
+            n: GenericAttrConstraint[Attribute] | None = None,
+            p: GenericAttrConstraint[_T] | None = None,
+            q: GenericAttrConstraint[Attribute] | None = None,
+        ) -> BaseAttr[ParamOne[Attribute]] | ParamAttrConstraint[ParamOne[_T]]:
+            if n is None and p is None and q is None:
+                return BaseAttr(cls)
+            return ParamAttrConstraint(cls, (n, p, q))
+
     @irdl_op_definition
     class TwoOperandsNestedVarOp(IRDLOperation):
         T = Annotated[Attribute, ConstraintVar("T")]
@@ -1695,6 +1710,16 @@ class ParamOne(ParametrizedAttribute, TypeAttribute, Generic[_T]):
         name = "test.param_one"
         p: ParameterDef[_T]
 
+        @classmethod
+        def constr(
+            cls,
+            *,
+            p: GenericAttrConstraint[_T] | None = None,
+        ) -> BaseAttr[ParamOne[Attribute]] | ParamAttrConstraint[ParamOne[_T]]:
+            if p is None:
+                return BaseAttr(cls)
+            return ParamAttrConstraint(cls, (p,))
+
     @irdl_op_definition
     class OneOperandOneResultNestedOp(IRDLOperation):
         T = Annotated[Attribute, ConstraintVar("T")]

tests/tblgen_to_py/test.py

@@ -50,13 +50,7 @@ class Test_AttributesOp(IRDLOperation):
     name = "test.attributes"
 
     int_attr = prop_def(
-        ParamAttrConstraint(
-            IntegerAttr,
-            (
-                AnyAttr(),
-                EqAttrConstraint(IntegerType(16)),
-            ),
-        )
+        IntegerAttr[IntegerType].constr(type=EqAttrConstraint(IntegerType(16)))
     )
 
     in_ = prop_def(BaseAttr(Test_TestAttr), prop_name="in")

xdsl/backend/riscv/lowering/convert_arith_to_riscv.py

@@ -152,7 +152,7 @@ def match_and_rewrite(
 
 @dataclass
 class LowerBinaryIntegerOp(RewritePattern):
-    arith_op_cls: type[arith.SignlessIntegerBinaryOp]
+    arith_op_cls: type[arith.SignlessIntegerBinaryOperation]
     riscv_op_cls: type[RdRsRsIntegerOperation]
 
     def match_and_rewrite(self, op: Operation, rewriter: PatternRewriter) -> None:
@@ -169,7 +169,7 @@ def match_and_rewrite(self, op: Operation, rewriter: PatternRewriter) -> None:
 
 @dataclass
 class LowerBinaryFloatOp(RewritePattern):
-    arith_op_cls: type[arith.FloatingPointLikeBinaryOp]
+    arith_op_cls: type[arith.FloatingPointLikeBinaryOperation]
     riscv_f_op_cls: type[riscv.RdRsRsFloatOperationWithFastMath]
     riscv_d_op_cls: type[riscv.RdRsRsFloatOperationWithFastMath]
 

xdsl/backend/riscv/lowering/convert_arith_to_riscv_snitch.py

@@ -26,7 +26,7 @@
 
 @dataclass
 class LowerBinaryFloatVectorOp(RewritePattern):
-    arith_op_cls: type[arith.FloatingPointLikeBinaryOp]
+    arith_op_cls: type[arith.FloatingPointLikeBinaryOperation]
     riscv_d_op_cls: type[riscv.RdRsRsFloatOperationWithFastMath]
     riscv_snitch_v_f32_op_cls: type[riscv.RdRsRsFloatOperationWithFastMath]
     riscv_snitch_v_f16_op_cls: type[riscv.RdRsRsFloatOperationWithFastMath]