8000 gh-132732: Automatically constant evaluate pure operations by Fidget-Spinner · Pull Request #132733 · python/cpython · GitHub
[go: up one dir, main page]

Skip to content

gh-132732: Automatically constant evaluate pure operations #132733

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 58 commits into from
Jun 27, 2025
Merged
Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
58 commits
Select commit Hold shift + click to select a range
1ffbb6b
Automatically constant evaluate pure operations
Fidget-Spinner Apr 19, 2025
691084d
📜🤖 Added by blurb_it.
blurb-it[bot] Apr 19, 2025
b89e4dc
Fix tests
Fidget-Spinner Apr 19, 2025
0959918
Merge branch 'pure' of github.com:Fidget-Spinner/cpython into pure
Fidget-Spinner Apr 19, 2025
2541683
Merge remote-tracking branch 'upstream/main' into pure
Fidget-Spinner Apr 24, 2025
d5b2208
Apply review suggestions
Fidget-Spinner Apr 25, 2025
71ced86
reduce diff
Fidget-Spinner Apr 25, 2025
a10d5a1
Merge remote-tracking branch 'upstream/main' into pure
Fidget-Spinner May 6, 2025
d22f165
Update pycore_opcode_metadata.h
Fidget-Spinner May 6, 2025
8ae38c7
Apply changes from code review
Fidget-Spinner May 10, 2025
712a810
Merge remote-tracking branch 'upstream/main' into pure
Fidget-Spinner May 10, 2025
dc2d922
Address review, add test
Fidget-Spinner May 10, 2025
f3f2a69
Add more tests
Fidget-Spinner May 12, 2025
53ce10f
Fix tests
Fidget-Spinner May 12, 2025
17634a8
Push fix noticed by Mark and Brandt
Fidget-Spinner May 19, 2025
4937c2f
Merge remote-tracking branch 'upstream/main' into pure
Fidget-Spinner May 19, 2025
ae08b79
Merge remote-tracking branch 'upstream/main' into pure
Fidget-Spinner May 21, 2025
c0c6600
remove pure from _POP_CALL_TWO_LOAD_CONST_INLINE_BORROW
Fidget-Spinner May 21, 2025
6bdd3f9
Merge remote-tracking branch 'upstream/main' into pure
Fidget-Spinner May 21, 2025
de8e170
use upstream changes for stackref
Fidget-Spinner May 21, 2025
c2f8e22
remove unused comment
Fidget-Spinner May 21, 2025
ac7e343
Address review
Fidget-Spinner May 22, 2025
05b822f
fix test
Fidget-Spinner May 22, 2025
b4c2e93
fix negative refcount
Fidget-Spinner May 23, 2025
d229f57
Merge remote-tracking branch 'upstream/main' into pure
Fidget-Spinner May 23, 2025
c4aae6c
Merge remote-tracking branch 'upstream/main' into pure
Fidget-Spinner May 27, 2025
8552182
Use `REPLACE_OPCODE_IF_EVALUTES_PURE`
Fidget-Spinner May 28, 2025
703dfc9
Fix test, move is_abstract to subclass attribute
Fidget-Spinner May 28, 2025
b278734
fix linter/mypy
Fidget-Spinner May 28, 2025
73a8b00
remove whitespace
Fidget-Spinner May 28, 2025
4116a31
Remove PyDict_Type
Fidget-Spinner May 28, 2025
548b67c
add bool type
Fidget-Spinner May 28, 2025
74a0208
reduce diff
Fidget-Spinner Jun 6, 2025
6a5dc12
Grab identifiers from REPLACE_OPCODE_IF_EVALUATES_PURE
Fidget-Spinner Jun 9, 2025
3896775
Merge remote-tracking branch 'upstream/main' into pure
Fidget-Spinner Jun 9, 2025
507c80a
Use replacer
Fidget-Spinner Jun 13, 2025
dc68b45
reduce diff
Fidget-Spinner Jun 13, 2025
41a271c
Merge remote-tracking branch 'upstream/main' into pure
Fidget-Spinner Jun 13, 2025
e88b71a
Update optimizer_generator.py
Fidget-Spinner Jun 13, 2025
866510f
Address review (add long functions to allowlist)
Fidget-Spinner Jun 13, 2025
01be0c6
fix mypy
Fidget-Spinner Jun 13, 2025
fce79a6
Merge remote-tracking branch 'upstream/main' into pure
Fidget-Spinner Jun 13, 2025
9bef4a4
revert changes for add,multiply,sub int
Fidget-Spinner Jun 13, 2025
1f76e2c
Fix tests
Fidget-Spinner Jun 13, 2025
efb9888
Merge remote-tracking branch 'upstream/main' into pure
Fidget-Spinner Jun 16, 2025
029c92b
Add deopt and error_if, and tests
Fidget-Spinner Jun 16, 2025
738d20e
remove is_abstract
Fidget-Spinner Jun 16, 2025
202af76
Merge remote-tracking branch 'upstream/main' into pure
Fidget-Spinner Jun 18, 2025
4c0c52c
fix tests
Fidget-Spinner Jun 18, 2025
e24e9a3
Fix test_opt
Fidget-Spinner Jun 18, 2025
f362866
Merge remote-tracking branch 'upstream/main' into pure
Fidget-Spinner Jun 20, 2025
d54a6f2
Update optimizer_bytecodes.c
Fidget-Spinner Jun 20, 2025
2644cb9
Address review
Fidget-Spinner Jun 20, 2025
634ed26
Add for _BINARY_OP
Fidget-Spinner Jun 20, 2025
0e9ce84
Address review
Fidget-Spinner Jun 27, 2025
f2fc3fc
reduce diff
Fidget-Spinner Jun 27, 2025
2408fb0
fix mypy
Fidget-Spinner Jun 27, 2025
e40cb06
fix wrong error message
Fidget-Spinner Jun 27, 2025
8000
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 16 additions & 16 deletions Include/internal/pycore_opcode_metadata.h

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions Include/internal/pycore_optimizer.h
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ extern "C" {

#include "pycore_typedefs.h" // _PyInterpreterFrame
#include "pycore_uop_ids.h"
#include "pycore_stackref.h" // _PyStackRef
#include <stdbool.h>


Expand Down Expand Up @@ -260,6 +261,8 @@ extern bool _Py_uop_sym_is_null(JitOptSymbol *sym);
extern bool _Py_uop_sym_is_not_null(JitOptSymbol *sym);
extern bool _Py_uop_sym_is_const(JitOptContext *ctx, JitOptSymbol *sym);
extern PyObject *_Py_uop_sym_get_const(JitOptContext *ctx, JitOptSymbol *sym);
extern JitOptSymbol *_Py_uop_sym_new_const_steal(JitOptContext *ctx, PyObject *const_val);
extern _PyStackRef _Py_uop_sym_get_const_as_stackref(JitOptContext *ctx, JitOptSymbol *sym);
extern JitOptSymbol *_Py_uop_sym_new_unknown(JitOptContext *ctx);
extern JitOptSymbol *_Py_uop_sym_new_not_null(JitOptContext *ctx);
extern JitOptSymbol *_Py_uop_sym_new_type(
Expand Down
24 changes: 24 additions & 0 deletions Include/internal/pycore_stackref.h
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,13 @@ _PyStackRef_FromPyObjectImmortal(PyObject *obj, const char *filename, int linenu
}
#define PyStackRef_FromPyObjectImmortal(obj) _PyStackRef_FromPyObjectImmortal(_PyObject_CAST(obj), __FILE__, __LINE__)

static inline _PyStackRef
_PyStackRef_FromPyObjectImmortalUnchecked(PyObject *obj, const char *filename, int linenumber)
{
return _Py_stackref_create(obj, filename, linenumber);
}
#define PyStackRef_FromPyObjectImmortalUnchecked(obj) _PyStackRef_FromPyObjectImmortalUnchecked(_PyObject_CAST(obj), __FILE__, __LINE__)

static inline bool
PyStackRef_IsTaggedInt(_PyStackRef ref)
{
Expand Down Expand Up @@ -375,6 +382,17 @@ PyStackRef_FromPyObjectImmortal(PyObject *obj)
}
#define PyStackRef_FromPyObjectImmortal(obj) PyStackRef_FromPyObjectImmortal(_PyObject_CAST(obj))

static inline _PyStackRef
PyStackRef_FromPyObjectImmortalUnchecked(PyObject *obj)
{
// Make sure we don't take an already tagged value.
assert(((uintptr_t)obj & Py_TAG_BITS) == 0);
assert(obj != NULL);
return (_PyStackRef){ .bits = (uintptr_t)obj | Py_TAG_DEFERRED };
}
#define PyStackRef_FromPyObjectImmortalUnchecked(obj) PyStackRef_FromPyObjectImmortalUnchecked(_PyObject_CAST(obj))


#define PyStackRef_CLOSE(REF) \
do { \
_PyStackRef _close_tmp = (REF); \
Expand Down Expand Up @@ -587,6 +605,12 @@ PyStackRef_FromPyObjectImmortal(PyObject *obj)
return (_PyStackRef){ .bits = (uintptr_t)obj | Py_TAG_REFCNT};
}

static inline _PyStackRef
PyStackRef_FromPyObjectImmortalUnchecked(PyObject *obj)
{
return (_PyStackRef){ .bits = (uintptr_t)obj | Py_TAG_REFCNT};
}

/* WARNING: This macro evaluates its argument more than once */
#ifdef _WIN32
#define PyStackRef_DUP(REF) \
Expand Down
72 changes: 36 additions & 36 deletions Include/internal/pycore_uop_metadata.h

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 6 additions & 6 deletions Lib/test/test_generated_cases.py
Original file line number Diff line number Diff line change
Expand Up @@ -1972,12 +1972,12 @@ def run_cases_test(self, input: str, input2: str, expected: str):

def test_overridden_abstract(self):
input = """
pure op(OP, (--)) {
op(OP, (--)) {
SPAM();
}
"""
input2 = """
pure op(OP, (--)) {
op(OP, (--)) {
eggs();
}
"""
Expand All @@ -1991,7 +1991,7 @@ def test_overridden_abstract(self):

def test_overridden_abstract_args(self):
input = """
pure op(OP, (arg1 -- out)) {
op(OP, (arg1 -- out)) {
out = SPAM(arg1);
}
op(OP2, (arg1 -- out)) {
Expand Down Expand Up @@ -2024,16 +2024,16 @@ def test_overridden_abstract_args(self):

def test_no_overridden_case(self):
input = """
pure op(OP, (arg1 -- out)) {
op(OP, (arg1 -- out)) {
out = SPAM(arg1);
}

pure op(OP2, (arg1 -- out)) {
op(OP2, (arg1 -- out)) {
}

"""
input2 = """
pure op(OP2, (arg1 -- out)) {
op(OP2, (arg1 -- out)) {
out = NULL;
}
"""
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Automatically constant evaluate bytecode operations marked as pure in the JIT optimizer.
Loading
Loading
0