specialize sum from for helper

Author: BobTheBuidler

mypyc/irbuild/specialize.py

@@ -57,6 +57,7 @@
     bytes_rprimitive,
     c_int_rprimitive,
     dict_rprimitive,
+    float_rprimitive,
     int16_rprimitive,
     int32_rprimitive,
     int64_rprimitive,
@@ -70,6 +71,7 @@
     is_int64_rprimitive,
     is_int_rprimitive,
     is_list_rprimitive,
+    is_object_rprimitive,
     is_uint8_rprimitive,
     list_rprimitive,
     object_rprimitive,
@@ -515,11 +517,11 @@ def translate_sum_call(builder: IRBuilder, expr: CallExpr, callee: RefExpr) -> V
     # - only one or two arguments given (if not, sum() has been given invalid arguments)
     # - first argument is a Generator (there is no benefit to optimizing the performance of eg.
     #   sum([1, 2, 3]), so non-Generator Iterables are not handled)
-    if not (
-        len(expr.args) in (1, 2)
-        and expr.arg_kinds[0] == ARG_POS
-        and isinstance(expr.args[0], GeneratorExpr)
-    ):
+    if not (len(expr.args) in (1, 2) and expr.arg_kinds[0] == ARG_POS):
+        return None
+
+    arg = expr.args[0]
+    if not isinstance(arg, GeneratorExpr) and not _is_supported_forloop_iter(builder, arg):
         return None
 
     # handle 'start' argument, if given
@@ -531,21 +533,60 @@ def translate_sum_call(builder: IRBuilder, expr: CallExpr, callee: RefExpr) -> V
     else:
         start_expr = IntExpr(0)
 
-    gen_expr = expr.args[0]
-    target_type = builder.node_type(expr)
-    retval = Register(target_type)
-    builder.assign(retval, builder.coerce(builder.accept(start_expr), target_type, -1), -1)
+    item_type = builder._analyze_iterable_item_type(arg)
+    item_rtype = builder.type_to_rtype(item_type)
+    start_rtype = builder.node_type(start_expr)
+
+    if item_rtype is start_rtype:
+        acc_rtype = item_rtype
+    elif is_float_rprimitive(item_rtype) and is_int_rprimitive(start_rtype):
+        acc_rtype = float_rprimitive
+    elif is_bool_rprimitive(item_rtype) and is_int_rprimitive(start_rtype):
+        acc_rtype = int_rprimitive
+    elif is_object_rprimitive(item_rtype) and is_int_rprimitive(start_rtype):
+        acc_rtype = object_rprimitive
+    
+    else:
+        # escape hatch, maybe figure out a better way to handle this whole block
+        # seeking ideas in review
+        return None
 
-    def gen_inner_stmts() -> None:
-        call_expr = builder.accept(gen_expr.left_expr)
-        builder.assign(retval, builder.binary_op(retval, call_expr, "+", -1), -1)
+    retval = Register(acc_rtype)
+    builder.assign(retval, builder.coerce(builder.accept(start_expr), acc_rtype, -1), -1)
 
-    loop_params = list(
-        zip(gen_expr.indices, gen_expr.sequences, gen_expr.condlists, gen_expr.is_async)
-    )
-    comprehension_helper(builder, loop_params, gen_inner_stmts, gen_expr.line)
+    if isinstance(arg, GeneratorExpr):
+        def gen_inner_stmts() -> None:
+            call_expr = builder.accept(arg.left_expr)
+            builder.assign(retval, builder.binary_op(retval, call_expr, "+", -1), -1)
 
-    return retval
+        loop_params = list(
+            zip(arg.indices, arg.sequences, arg.condlists, arg.is_async)
+        )
+        comprehension_helper(builder, loop_params, gen_inner_stmts, arg.line)
+
+        return retval
+    
+    else:
+        index_name = "__mypyc_sum_item__"
+
+        def body_insts() -> None:
+            total = builder.binary_op(retval, builder.read(index_reg), "+", expr.line)
+            builder.assign(retval, total, expr.line)
+
+        index_type = builder._analyze_iterable_item_type(arg)
+        index = _create_iterable_lexpr(index_name, index_type)
+        index_reg = builder.add_local_reg(index.node, builder.type_to_rtype(index_type))
+
+        for_loop_helper(
+            builder,
+            index,
+            arg,
+            body_insts,
+            None,
+            is_async=False,
+            line=expr.line,
+        )
+        return retval
 
 
 @specialize_function("dataclasses.field")

mypyc/test-data/irbuild-basic.test

@@ -2995,6 +2995,12 @@ from typing import Callable, Iterable
 def call_sum(l: Iterable[int], comparison: Callable[[int], bool]) -> int:
     return sum(comparison(x) for x in l)
 
+def call_sum_helper(l: Iterable[int], comparison: Callable[[int], bool]):
+    return sum([comparison(x) for x in l])
+
+def call_sum_helper_start(l: Iterable[int]):
+    return sum([str(i) for i in l], "")
+
 [out]
 def call_sum(l, comparison):
     l, comparison :: object
@@ -3033,6 +3039,121 @@ L4:
     r12 = CPy_NoErrOccurred()
 L5:
     return r0
+def call_sum_helper(l, comparison):
+    l, comparison :: object
+    r0 :: int
+    r1 :: list
+    r2, r3 :: object
+    r4, x :: int
+    r5 :: object
+    r6 :: object[1]
+    r7 :: object_ptr
+    r8 :: object
+    r9 :: bool
+    r10 :: object
+    r11 :: i32
+    r12, r13 :: bit
+    r14, r15 :: native_int
+    r16 :: bit
+    r17 :: object
+    r18, __mypyc_sum_item__, r19 :: bool
+    r20, r21 :: int
+    r22 :: native_int
+    r23 :: object
+L0:
+    r0 = 0
+    r1 = PyList_New(0)
+    r2 = PyObject_GetIter(l)
+L1:
+    r3 = PyIter_Next(r2)
+    if is_error(r3) goto L4 else goto L2
+L2:
+    r4 = unbox(int, r3)
+    x = r4
+    r5 = box(int, x)
+    r6 = [r5]
+    r7 = load_address r6
+    r8 = PyObject_Vectorcall(comparison, r7, 1, 0)
+    keep_alive r5
+    r9 = unbox(bool, r8)
+    r10 = box(bool, r9)
+    r11 = PyList_Append(r1, r10)
+    r12 = r11 >= 0 :: signed
+L3:
+    goto L1
+L4:
+    r13 = CPy_NoErrOccurred()
+L5:
+    r14 = 0
+L6:
+    r15 = var_object_size r1
+    r16 = r14 < r15 :: signed
+    if r16 goto L7 else goto L9 :: bool
+L7:
+    r17 = list_get_item_unsafe r1, r14
+    r18 = unbox(bool, r17)
+    __mypyc_sum_item__ = r18
+    r19 = __mypyc_sum_item__ << 1
+    r20 = extend r19: builtins.bool to builtins.int
+    r21 = CPyTagged_Add(r0, r20)
+    r0 = r21
+L8:
+    r22 = r14 + 1
+    r14 = r22
+    goto L6
+L9:
+    r23 = box(int, r0)
+    return r23
+def call_sum_helper_start(l):
+    l :: object
+    r0, r1 :: str
+    r2 :: list
+    r3, r4 :: object
+    r5, i :: int
+    r6 :: str
+    r7 :: i32
+    r8, r9 :: bit
+    r10, r11 :: native_int
+    r12 :: bit
+    r13 :: object
+    r14, __mypyc_sum_item__, r15 :: str
+    r16 :: native_int
+L0:
+    r0 = ''
+    r1 = r0
+    r2 = PyList_New(0)
+    r3 = PyObject_GetIter(l)
+L1:
+    r4 = PyIter_Next(r3)
+    if is_error(r4) goto L4 else goto L2
+L2:
+    r5 = unbox(int, r4)
+    i = r5
+    r6 = CPyTagged_Str(i)
+    r7 = PyList_Append(r2, r6)
+    r8 = r7 >= 0 :: signed
+L3:
+    goto L1
+L4:
+    r9 = CPy_NoErrOccurred()
+L5:
+    r10 = 0
+L6:
+    r11 = var_object_size r2
+    r12 = r10 < r11 :: signed
+    if r12 goto L7 else goto L9 :: bool
+L7:
+    r13 = list_get_item_unsafe r2, r10
+    r14 = cast(str, r13)
+    __mypyc_sum_item__ = r14
+    r15 = PyUnicode_Concat(r1, __mypyc_sum_item__)
+    r1 = r15
+L8:
+    r16 = r10 + 1
+    r10 = r16
+    goto L6
+L9:
+    return r1
 
 [case testSetAttr1]
 from typing import Any, Dict, List