Support unary op via CallC

mypyc/irbuild/ll_builder.py

@@ -35,7 +35,7 @@
 from mypyc.primitives.registry import (
     binary_ops, unary_ops, method_ops, func_ops,
     c_method_call_ops, CFunctionDescription, c_function_ops,
-    c_binary_ops
+    c_binary_ops, c_unary_ops
 )
 from mypyc.primitives.list_ops import (
     list_extend_op, list_len_op, new_list_op
@@ -555,6 +555,10 @@ def unary_op(self,
                  lreg: Value,
                  expr_op: str,
                  line: int) -> Value:
+        call_c_ops_candidates = c_unary_ops.get(expr_op, [])
+        target = self.matching_call_c(call_c_ops_candidates, [lreg], line)
+        if target:
+            return target
         ops = unary_ops.get(expr_op, [])
         target = self.matching_primitive_op(ops, [lreg], line)
         assert target, 'Unsupported unary operation: %s' % expr_op

mypyc/primitives/int_ops.py

@@ -6,14 +6,14 @@
 See also the documentation for mypyc.rtypes.int_rprimitive.
 """
 
-from mypyc.ir.ops import OpDescription, ERR_NEVER, ERR_MAGIC
+from mypyc.ir.ops import ERR_NEVER, ERR_MAGIC
 from mypyc.ir.rtypes import (
     int_rprimitive, bool_rprimitive, float_rprimitive, object_rprimitive, short_int_rprimitive,
     str_rprimitive, RType
 )
 from mypyc.primitives.registry import (
-    name_ref_op, binary_op, unary_op, func_op, custom_op,
-    simple_emit, call_emit, name_emit,
+    name_ref_op, binary_op, func_op, custom_op,
+    simple_emit, call_emit, name_emit, c_unary_op, CFunctionDescription
 )
 
 # These int constructors produce object_rprimitives that then need to be unboxed
@@ -131,13 +131,12 @@ def int_compare_op(op: str, c_func_name: str) -> None:
     emit=simple_emit('{dest} = {args[0]} + {args[1]};'))
 
 
-def int_unary_op(op: str, c_func_name: str) -> OpDescription:
-    return unary_op(op=op,
-                    arg_type=int_rprimitive,
-                    result_type=int_rprimitive,
-                    error_kind=ERR_NEVER,
-                    format_str='{dest} = %s{args[0]} :: int' % op,
-                    emit=call_emit(c_func_name))
+def int_unary_op(name: str, c_function_name: str) -> CFunctionDescription:
+    return c_unary_op(name=name,
+                      arg_type=int_rprimitive,
+                      return_type=int_rprimitive,
+                      c_function_name=c_function_name,
+                      error_kind=ERR_NEVER)
 
 
 int_neg_op = int_unary_op('-', 'CPyTagged_Negate')

mypyc/primitives/registry.py

@@ -75,6 +75,9 @@
 # CallC op for binary ops
 c_binary_ops = {}  # type: Dict[str, List[CFunctionDescription]]
 
+# CallC op for unary ops
+c_unary_ops = {}  # type: Dict[str, List[CFunctionDescription]]
+
 
 def simple_emit(template: str) -> EmitCallback:
     """Construct a simple PrimitiveOp emit callback function.
@@ -371,6 +374,19 @@ def c_binary_op(name: str,
     return desc
 
 
+def c_unary_op(name: str,
+               arg_type: RType,
+               return_type: RType,
+               c_function_name: str,
+               error_kind: int,
+               steals: StealsDescription = False,
+               priority: int = 1) -> CFunctionDescription:
+    ops = c_unary_ops.setdefault(name, [])
+    desc = CFunctionDescription(name, [arg_type], return_type,
+                            c_function_name, error_kind, steals, priority)
+    ops.append(desc)
+    return desc
+
 # Import various modules that set up global state.
 import mypyc.primitives.int_ops  # noqa
 import mypyc.primitives.str_ops  # noqa

mypyc/test-data/analysis.test

@@ -539,7 +539,7 @@ L3:
     if r5 goto L4 else goto L5 :: bool
 L4:
     r6 = 1
-    r7 = -r6 :: int
+    r7 = CPyTagged_Negate(r6)
     restore_exc_info r1
     return r7
 L5:

mypyc/test-data/irbuild-basic.test

@@ -463,7 +463,7 @@ def f(n):
     r1 :: int
 L0:
     r0 = 1
-    r1 = -r0 :: int
+    r1 = CPyTagged_Negate(r0)
     return r1
 
 [case testConditionalExpr]
@@ -1027,7 +1027,7 @@ L1:
     r2 = x
     goto L3
 L2:
-    r3 = -x :: int
+    r3 = CPyTagged_Negate(x)
     r2 = r3
 L3:
     return r2

mypyc/test/test_emitfunc.py

@@ -8,7 +8,7 @@
 from mypyc.ir.ops import (
     Environment, BasicBlock, Goto, Return, LoadInt, Assign, IncRef, DecRef, Branch,
     Call, Unbox, Box, TupleGet, GetAttr, PrimitiveOp, RegisterOp,
-    SetAttr, Op, Value
+    SetAttr, Op, Value, CallC
 )
 from mypyc.ir.rtypes import (
     RTuple, RInstance, int_rprimitive, bool_rprimitive, list_rprimitive,
@@ -98,7 +98,8 @@ def test_int_sub(self) -> None:
             "cpy_r_r0 = CPyTagged_Subtract(cpy_r_m, cpy_r_k);")
 
     def test_int_neg(self) -> None:
-        self.assert_emit(PrimitiveOp([self.m], int_neg_op, 55),
+        self.assert_emit(CallC(int_neg_op.c_function_name, [self.m], int_neg_op.return_type,
+                               int_neg_op.steals, int_neg_op.error_kind, 55),
                          "cpy_r_r0 = CPyTagged_Negate(cpy_r_m);")
 
     def test_list_len(self) -> None: