implement all/any/tuple optimization

Author: iritkatriel

Include/internal/pycore_global_objects_fini_generated.h

@@ -278,7 +278,9 @@ struct _Py_global_strings {
         STRUCT_FOR_ID(aggregate_class)
         STRUCT_FOR_ID(alias)
         STRUCT_FOR_ID(align)
+        STRUCT_FOR_ID(all)
         STRUCT_FOR_ID(allow_code)
+        STRUCT_FOR_ID(any)
         STRUCT_FOR_ID(append)
         STRUCT_FOR_ID(arg)
         STRUCT_FOR_ID(argdefs)

Include/internal/pycore_global_strings.h

@@ -284,7 +284,7 @@ PC/launcher.c must also be updated.
 
 */
 
-#define PYC_MAGIC_NUMBER 3619
+#define PYC_MAGIC_NUMBER 3620
 /* This is equivalent to converting PYC_MAGIC_NUMBER to 2 bytes
    (little-endian) and then appending b'\r\n'. */
 #define PYC_MAGIC_NUMBER_TOKEN \

Include/internal/pycore_magic_number.h

@@ -225,6 +225,8 @@ def test_all(self):
         self.assertEqual(all(x > 42 for x in S), True)
         S = [50, 40, 60]
         self.assertEqual(all(x > 42 for x in S), False)
+        S = [50, 40, 60, TestFailingBool()]
+        self.assertEqual(all(x > 42 for x in S), False)
 
     def test_any(self):
         self.assertEqual(any([None, None, None]), False)
@@ -238,9 +240,49 @@ def test_any(self):
         self.assertEqual(any([1, TestFailingBool()]), True) # Short-circuit
         S = [40, 60, 30]
         self.assertEqual(any(x > 42 for x in S), True)
+        S = [40, 60, 30, TestFailingBool()]
+        self.assertEqual(any(x > 42 for x in S), True)
         S = [10, 20, 30]
         self.assertEqual(any(x > 42 for x in S), False)
 
+    def test_all_any_tuple_optimization(self):
+        def f_all():
+            return all(x-2 for x in [1,2,3])
+
+        def f_any():
+            return any(x-1 for x in [1,2,3])
+
+        def f_tuple():
+            return tuple(2*x for x in [1,2,3])
+
+        funcs = [f_all, f_any, f_tuple]
+
+        for f in funcs:
+            # check that generator code object is not duplicated
+            code_objs = [c for c in f.__code__.co_consts if isinstance(c, type(f.__code__))]
+            self.assertEqual(len(code_objs), 1)
+
+
+        # check the overriding the builtins works
+        bltin_outputs = [f() for f in funcs]
+
+        global all, any, tuple
+        saved = all, any, tuple
+        try:
+            all = lambda x : "all"
+            any = lambda x : "any"
+            tuple = lambda x : "tuple"
+
+            return [f() for f in funcs]
+        finally:
+            all, any, tuple = saved
+
+        overridden_outputs = run_with_overrides()
+
+        for f, out1, out2 in zip(funcs, bltin_outputs, overridden_outputs):
+            with self.subTest(func = f.__name__):
+                self.assertNotEqual(out1, out2)
+
     def test_ascii(self):
         self.assertEqual(ascii(''), '\'\'')
         self.assertEqual(ascii(0), '0')

Include/internal/pycore_runtime_init_generated.h

@@ -1416,15 +1416,15 @@ dummy_func(
                 val = (PyObject*)&PyTuple_Type;
             }
             else if (oparg == CONSTANT_BUILTIN_ALL) {
-                val = PyDict_GetItemWithError(builtins_dict, &_Py_ID(all));
+                val = PyDict_GetItemWithError(BUILTINS(), &_Py_ID(all));
             }
             else if (oparg == CONSTANT_BUILTIN_ANY) {
-                val = PyDict_GetItemWithError(builtins_dict, &_Py_ID(any));
+                val = PyDict_GetItemWithError(BUILTINS(), &_Py_ID(any));
             }
             else {
                 Py_UNREACHABLE();
             }
-            value = PyStackRef_FromPyObjectImmortal(val);
+            value = PyStackRef_FromPyObjectNew(val);
         }
 
         inst(LOAD_BUILD_CLASS, ( -- bc)) {

Include/internal/pycore_unicodeobject_generated.h

@@ -3723,6 +3723,105 @@ update_start_location_to_match_attr(compiler *c, location loc,
     return loc;
 }
 
+static int push_inlined_comprehension_state(compiler *c, location loc,
+                                            PySTEntryObject *comp,
+                                            _PyCompile_InlinedComprehensionState *state);
+static int pop_inlined_comprehension_state(compiler *c, location loc,
+                                           _PyCompile_InlinedComprehensionState *state);
+
+PyObject *_PyCompile_Filename(compiler *c);
+
+static int
+maybe_optimize_function_call(compiler *c, expr_ty e, jump_target_label end)
+{
+    asdl_expr_seq *args = e->v.Call.args;
+    asdl_keyword_seq *kwds = e->v.Call.keywords;
+    expr_ty func = e->v.Call.func;
+
+    if (! (func->kind == Name_kind &&
+           asdl_seq_LEN(args) == 1 &&
+           asdl_seq_LEN(kwds) == 0 &&
+           asdl_seq_GET(args, 0)->kind == GeneratorExp_kind))
+    {
+        return 0;
+    }
+
+    expr_ty generator_exp = asdl_seq_GET(args, 0);
+
+    if (asdl_seq_LEN(generator_exp->v.GeneratorExp.generators) != 1) {
+        return 0;
+    }
+
+    location loc = LOC(func);
+
+    int optimized = 0;
+    NEW_JUMP_TARGET_LABEL(c, skip_optimization);
+
+    int const_oparg = -1;
+    PyObject *initial_res;
+    int continue_jump_opcode = -1;
+    if (_PyUnicode_EqualToASCIIString(func->v.Name.id, "all")) {
+        const_oparg = CONSTANT_BUILTIN_ALL;
+        initial_res = Py_True;
+        continue_jump_opcode = POP_JUMP_IF_TRUE;
+    }
+    else if (_PyUnicode_EqualToASCIIString(func->v.Name.id, "any")) {
+        const_oparg = CONSTANT_BUILTIN_ANY;
+        initial_res = Py_False;
+        continue_jump_opcode = POP_JUMP_IF_FALSE;
+    }
+    else if (_PyUnicode_EqualToASCIIString(func->v.Name.id, "tuple")) {
+        const_oparg = CONSTANT_BUILTIN_TUPLE;
+    }
+    if (const_oparg != -1) {
+        RETURN_IF_ERROR(codegen_nameop(c, loc, func->v.Name.id, Load));
+        ADDOP_I(c, loc, LOAD_COMMON_CONSTANT, const_oparg);
+        ADDOP_COMPARE(c, loc, Is);
+        ADDOP_JUMP(c, loc, POP_JUMP_IF_FALSE, skip_optimization);
+
+        if (const_oparg == CONSTANT_BUILTIN_TUPLE) {
+            ADDOP_I(c, loc, BUILD_LIST, 0);
+        }
+        else {
+            ADDOP_LOAD_CONST(c, loc, initial_res);
+        }
+        VISIT(c, expr, generator_exp);
+
+        NEW_JUMP_TARGET_LABEL(c, loop);
+        NEW_JUMP_TARGET_LABEL(c, cleanup);
+
+        USE_LABEL(c, loop);
+        ADDOP_JUMP(c, loc, FOR_ITER, cleanup);
+        if (const_oparg == CONSTANT_BUILTIN_TUPLE) {
+            ADDOP_I(c, loc, LIST_APPEND, 2);
+            ADDOP_JUMP(c, loc, JUMP, loop);
+        }
+        else {
+            ADDOP(c, loc, TO_BOOL);
+            ADDOP_JUMP(c, loc, continue_jump_opcode, loop);
+        }
+
+        ADDOP(c, NO_LOCATION, POP_ITER);
+        if (const_oparg != CONSTANT_BUILTIN_TUPLE) {
+            ADDOP(c, loc, POP_TOP);
+            ADDOP_LOAD_CONST(c, loc, initial_res == Py_True ? Py_False : Py_True);
+        }
+        ADDOP_JUMP(c, loc, JUMP, end);
+
+        USE_LABEL(c, cleanup);
+        ADDOP(c, NO_LOCATION, END_FOR);
+        ADDOP(c, NO_LOCATION, POP_ITER);
+        if (const_oparg == CONSTANT_BUILTIN_TUPLE) {
+            ADDOP_I(c, loc, CALL_INTRINSIC_1, INTRINSIC_LIST_TO_TUPLE);
+        }
+
+        optimized = 1;
+        ADDOP_JUMP(c, loc, JUMP, end);
+    }
+    USE_LABEL(c, skip_optimization);
+    return optimized;
+}
+
 // Return 1 if the method call was optimized, 0 if not, and -1 on error.
 static int
 maybe_optimize_method_call(compiler *c, expr_ty e)
@@ -3829,14 +3928,18 @@ codegen_call(compiler *c, expr_ty e)
     if (ret == 1) {
         return SUCCESS;
     }
+    NEW_JUMP_TARGET_LABEL(c, skip_normal_call);
+    RETURN_IF_ERROR(maybe_optimize_function_call(c, e, skip_normal_call));
     RETURN_IF_ERROR(check_caller(c, e->v.Call.func));
     VISIT(c, expr, e->v.Call.func);
     location loc = LOC(e->v.Call.func);
     ADDOP(c, loc, PUSH_NULL);
     loc = LOC(e);
-    return codegen_call_helper(c, loc, 0,
-                               e->v.Call.args,
-                               e->v.Call.keywords);
+    ret = codegen_call_helper(c, loc, 0,
+                              e->v.Call.args,
+                              e->v.Call.keywords);
+    USE_LABEL(c, skip_normal_call);
+    return ret;
 }
 
 static int
@@ -4547,6 +4650,7 @@ codegen_comprehension(compiler *c, expr_ty e, int type,
         }
 
         ADDOP_I(c, loc, op, 0);
+
         if (is_inlined) {
             ADDOP_I(c, loc, SWAP, 2);
         }

Lib/test/test_builtin.py

@@ -1231,6 +1231,12 @@ _PyCompile_Metadata(compiler *c)
     return &c->u->u_metadata;
 }
 
+PyObject *
+_PyCompile_Filename(compiler *c)
+{
+    return c->c_filename;
+}
+
 // Merge *obj* with constant cache, without recursion.
 int
 _PyCompile_ConstCacheMergeOne(PyObject *const_cache, PyObject **obj)