Skip to content

Commit 2c8f329

Browse files
iritkatrieliritkatriel
authored
pythongh-131738: optimize builtin any/all/tuple calls with a generator expression arg (python#131737)
1 parent 674dbf3 commit 2c8f329

16 files changed

Lines changed: 199 additions & 38 deletions

‎Include/internal/pycore_global_objects_fini_generated.h‎

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Include/internal/pycore_global_strings.h‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -283,7 +283,9 @@ struct _Py_global_strings {
283283
STRUCT_FOR_ID(aggregate_class)
284284
STRUCT_FOR_ID(alias)
285285
STRUCT_FOR_ID(align)
286+
STRUCT_FOR_ID(all)
286287
STRUCT_FOR_ID(allow_code)
288+
STRUCT_FOR_ID(any)
287289
STRUCT_FOR_ID(append)
288290
STRUCT_FOR_ID(arg)
289291
STRUCT_FOR_ID(argdefs)

‎Include/internal/pycore_interp_structs.h‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ extern "C" {
99

1010
#include "pycore_ast_state.h" // struct ast_state
1111
#include "pycore_llist.h" // struct llist_node
12+
#include "pycore_opcode_utils.h" // NUM_COMMON_CONSTANTS
1213
#include "pycore_pymath.h" // _PY_SHORT_FLOAT_REPR
1314
#include "pycore_structs.h" // PyHamtObject
1415
#include "pycore_tstate.h" // _PyThreadStateImpl
@@ -912,6 +913,7 @@ struct _is {
912913
struct ast_state ast;
913914
struct types_state types;
914915
struct callable_cache callable_cache;
916+
PyObject *common_consts[NUM_COMMON_CONSTANTS];
915917
bool jit;
916918
struct _PyExecutorObject *executor_list_head;
917919
size_t trace_run_counter;

‎Include/internal/pycore_magic_number.h‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -272,6 +272,7 @@ Known values:
272272
Python 3.14a6 3617 (Branch monitoring for async for loops)
273273
Python 3.14a6 3618 (Add oparg to END_ASYNC_FOR)
274274
Python 3.14a6 3619 (Renumber RESUME opcode from 149 to 128)
275+
Python 3.14a6 3620 (Optimize bytecode for all/any/tuple called on a genexp)
275276
276277
Python 3.15 will start with 3650
277278
@@ -284,7 +285,7 @@ PC/launcher.c must also be updated.
284285
285286
*/
286287

287-
#define PYC_MAGIC_NUMBER 3619
288+
#define PYC_MAGIC_NUMBER 3620
288289
/* This is equivalent to converting PYC_MAGIC_NUMBER to 2 bytes
289290
(little-endian) and then appending b'\r\n'. */
290291
#define PYC_MAGIC_NUMBER_TOKEN \

‎Include/internal/pycore_opcode_utils.h‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,6 @@ extern "C" {
88
# error "this header requires Py_BUILD_CORE define"
99
#endif
1010

11-
#include "opcode_ids.h"
12-
1311
#define MAX_REAL_OPCODE 254
1412

1513
#define IS_WITHIN_OPCODE_RANGE(opcode) \
@@ -67,7 +65,10 @@ extern "C" {
6765
/* Values used as the oparg for LOAD_COMMON_CONSTANT */
6866
#define CONSTANT_ASSERTIONERROR 0
6967
#define CONSTANT_NOTIMPLEMENTEDERROR 1
70-
#define NUM_COMMON_CONSTANTS 2
68+
#define CONSTANT_BUILTIN_TUPLE 2
69+
#define CONSTANT_BUILTIN_ALL 3
70+
#define CONSTANT_BUILTIN_ANY 4
71+
#define NUM_COMMON_CONSTANTS 5
7172

7273
/* Values used in the oparg for RESUME */
7374
#define RESUME_AT_FUNC_START 0

‎Include/internal/pycore_runtime_init_generated.h‎

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Include/internal/pycore_unicodeobject_generated.h‎

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Lib/opcode.py‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
"HAVE_ARGUMENT", "EXTENDED_ARG", "hasarg", "hasconst", "hasname",
1010
"hasjump", "hasjrel", "hasjabs", "hasfree", "haslocal", "hasexc"]
1111

12+
import builtins
1213
import _opcode
1314
from _opcode import stack_effect
1415

@@ -38,7 +39,8 @@
3839
_intrinsic_1_descs = _opcode.get_intrinsic1_descs()
3940
_intrinsic_2_descs = _opcode.get_intrinsic2_descs()
4041
_special_method_names = _opcode.get_special_method_names()
41-
_common_constants = [AssertionError, NotImplementedError]
42+
_common_constants = [builtins.AssertionError, builtins.NotImplementedError,
43+
builtins.tuple, builtins.all, builtins.any]
4244
_nb_ops = _opcode.get_nb_ops()
4345

4446
hascompare = [opmap["COMPARE_OP"]]

‎Lib/test/test_builtin.py‎

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -225,6 +225,8 @@ def test_all(self):
225225
self.assertEqual(all(x > 42 for x in S), True)
226226
S = [50, 40, 60]
227227
self.assertEqual(all(x > 42 for x in S), False)
228+
S = [50, 40, 60, TestFailingBool()]
229+
self.assertEqual(all(x > 42 for x in S), False)
228230

229231
def test_any(self):
230232
self.assertEqual(any([None, None, None]), False)
@@ -238,9 +240,59 @@ def test_any(self):
238240
self.assertEqual(any([1, TestFailingBool()]), True) # Short-circuit
239241
S = [40, 60, 30]
240242
self.assertEqual(any(x > 42 for x in S), True)
243+
S = [40, 60, 30, TestFailingBool()]
244+
self.assertEqual(any(x > 42 for x in S), True)
241245
S = [10, 20, 30]
242246
self.assertEqual(any(x > 42 for x in S), False)
243247

248+
def test_all_any_tuple_optimization(self):
249+
def f_all():
250+
return all(x-2 for x in [1,2,3])
251+
252+
def f_any():
253+
return any(x-1 for x in [1,2,3])
254+
255+
def f_tuple():
256+
return tuple(2*x for x in [1,2,3])
257+
258+
funcs = [f_all, f_any, f_tuple]
259+
260+
for f in funcs:
261+
# check that generator code object is not duplicated
262+
code_objs = [c for c in f.__code__.co_consts if isinstance(c, type(f.__code__))]
263+
self.assertEqual(len(code_objs), 1)
264+
265+
266+
# check the overriding the builtins works
267+
268+
global all, any, tuple
269+
saved = all, any, tuple
270+
try:
271+
all = lambda x : "all"
272+
any = lambda x : "any"
273+
tuple = lambda x : "tuple"
274+
275+
overridden_outputs = [f() for f in funcs]
276+
finally:
277+
all, any, tuple = saved
278+
279+
self.assertEqual(overridden_outputs, ['all', 'any', 'tuple'])
280+
281+
# Now repeat, overriding the builtins module as well
282+
saved = all, any, tuple
283+
try:
284+
builtins.all = all = lambda x : "all"
285+
builtins.any = any = lambda x : "any"
286+
builtins.tuple = tuple = lambda x : "tuple"
287+
288+
overridden_outputs = [f() for f in funcs]
289+
finally:
290+
all, any, tuple = saved
291+
builtins.all, builtins.any, builtins.tuple = saved
292+
293+
self.assertEqual(overridden_outputs, ['all', 'any', 'tuple'])
294+
295+
244296
def test_ascii(self):
245297
self.assertEqual(ascii(''), '\'\'')
246298
self.assertEqual(ascii(0), '0')

‎Misc/NEWS.d/next/Core_and_Builtins/2025-03-25-20-38-06.gh-issue-131738.eCb0OQ.rst‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Compiler emits optimized code for builtin any/all/tuple calls over a generator expression.

0 commit comments

Comments
 (0)