[mypyc] Support swapping operands and negating result and merge int NEQ (#9149)

TH3CHARLie · web-flow · commit 53ec9f351a84 · 2020-07-15T14:20:06.000+01:00
This PR implements support for swapping operands and negating result when building logical ops mentioned in #9148 (comment). To demonstrate, NEQ is merged. Since it has no IR test, I built one in irbuild-int.test.
diff --git a/mypyc/irbuild/ll_builder.py b/mypyc/irbuild/ll_builder.py
@@ -573,7 +573,7 @@ def check_tagged_short_int(self, val: Value, line: int) -> Value:
 
     def compare_tagged(self, lhs: Value, rhs: Value, op: str, line: int) -> Value:
         """Compare two tagged integers using given op"""
-        op_type, c_func_desc = int_logical_op_mapping[op]
+        op_type, c_func_desc, negate_result, swap_op = int_logical_op_mapping[op]
         result = self.alloc_temp(bool_rprimitive)
         short_int_block, int_block, out = BasicBlock(), BasicBlock(), BasicBlock()
         check_lhs = self.check_tagged_short_int(lhs, line)
@@ -592,8 +592,17 @@ def compare_tagged(self, lhs: Value, rhs: Value, op: str, line: int) -> Value:
         self.add(Assign(result, eq, line))
         self.goto(out)
         self.activate_block(int_block)
-        call = self.call_c(c_func_desc, [lhs, rhs], line)
-        self.add(Assign(result, call, line))
+        if swap_op:
+            args = [rhs, lhs]
+        else:
+            args = [lhs, rhs]
+        call = self.call_c(c_func_desc, args, line)
+        if negate_result:
+            # TODO: introduce UnaryIntOp?
+            call_result = self.unary_op(call, "not", line)
+        else:
+            call_result = call
+        self.add(Assign(result, call_result, line))
         self.goto_and_activate(out)
         return result
 
diff --git a/mypyc/primitives/int_ops.py b/mypyc/primitives/int_ops.py
@@ -6,7 +6,7 @@
 See also the documentation for mypyc.rtypes.int_rprimitive.
 """
 
-from typing import Dict, Tuple
+from typing import Dict, NamedTuple
 from mypyc.ir.ops import ERR_NEVER, ERR_MAGIC, BinaryIntOp
 from mypyc.ir.rtypes import (
     int_rprimitive, bool_rprimitive, float_rprimitive, object_rprimitive, short_int_rprimitive,
@@ -143,6 +143,18 @@ def int_unary_op(name: str, c_function_name: str) -> CFunctionDescription:
 
 # integer comparsion operation implementation related:
 
+# Description for building int logical ops
+# For each field:
+# binary_op_variant: identify which BinaryIntOp to use when operands are short integers
+# c_func_description: the C function to call when operands are tagged integers
+# c_func_negated: whether to negate the C function call's result
+# c_func_swap_operands: whether to swap lhs and rhs when call the function
+IntLogicalOpDescrption = NamedTuple(
+    'IntLogicalOpDescrption',  [('binary_op_variant', int),
+                                ('c_func_description', CFunctionDescription),
+                                ('c_func_negated', bool),
+                                ('c_func_swap_operands', bool)])
+
 # description for equal operation on two boxed tagged integers
 int_equal_ = c_custom_op(
     arg_types=[int_rprimitive, int_rprimitive],
@@ -159,6 +171,7 @@ def int_unary_op(name: str, c_function_name: str) -> CFunctionDescription:
 # provide mapping from textual op to short int's op variant and boxed int's description
 # note these are not complete implementations
 int_logical_op_mapping = {
-    '==': (BinaryIntOp.EQ, int_equal_),
-    '<': (BinaryIntOp.LT, int_less_than_)
-}  # type: Dict[str, Tuple[int, CFunctionDescription]]
+    '==': IntLogicalOpDescrption(BinaryIntOp.EQ, int_equal_, False, False),
+    '!=': IntLogicalOpDescrption(BinaryIntOp.NEQ, int_equal_, True, False),
+    '<': IntLogicalOpDescrption(BinaryIntOp.LT, int_less_than_, False, False)
+}  # type: Dict[str, IntLogicalOpDescrption]
diff --git a/mypyc/test-data/irbuild-basic.test b/mypyc/test-data/irbuild-basic.test
@@ -1358,7 +1358,7 @@ def lst(x):
 L0:
     r0 = len x :: list
     r1 = 0
-    r2 = CPyTagged_IsNe(r0, r1)
+    r2 = r0 != r1
     if r2 goto L1 else goto L2 :: bool
 L1:
     r3 = 1
diff --git a/mypyc/test-data/irbuild-int.test b/mypyc/test-data/irbuild-int.test
@@ -0,0 +1,25 @@
+[case testIntNeq]
+def f(x: int, y: int) -> bool:
+    return x != y
+[out]
+def f(x, y):
+    x, y :: int
+    r0 :: bool
+    r1, r2, r3 :: native_int
+    r4, r5, r6, r7 :: bool
+L0:
+    r1 = 1
+    r2 = x & r1
+    r3 = 0
+    r4 = r2 == r3
+    if r4 goto L1 else goto L2 :: bool
+L1:
+    r5 = x != y
+    r0 = r5
+    goto L3
+L2:
+    r6 = CPyTagged_IsEq_(x, y)
+    r7 = !r6
+    r0 = r7
+L3:
+    return r0
diff --git a/mypyc/test/test_irbuild.py b/mypyc/test/test_irbuild.py
@@ -28,6 +28,7 @@
     'irbuild-try.test',
     'irbuild-set.test',
     'irbuild-strip-asserts.test',
+    'irbuild-int.test',
 ]
 
 

Original file line number	Diff line number	Diff line change
`@@ -28,6 +28,7 @@`
`28`	`28`	`'irbuild-try.test',`
`29`	`29`	`'irbuild-set.test',`
`30`	`30`	`'irbuild-strip-asserts.test',`
	`31`	`+ 'irbuild-int.test',`
`31`	`32`	`]`
`32`	`33`
`33`	`34`