Skip to content

gh-133342: Remove sym_is_const and sym_has_type #133884

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.

Sign up for GitHub

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

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

gh-133342: Remove sym_is_const and sym_has_type #133884

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ff97d94
Remove sym_has_type
tomasr8 May 8, 2025
3a09234
Remove sym_is_const
tomasr8 May 8, 2025
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
2 changes: 0 additions & 2 deletions Include/internal/pycore_optimizer.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -258,15 +258,13 @@ typedef struct _JitOptContext {

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_unknown(JitOptContext *ctx);
extern JitOptSymbol *_Py_uop_sym_new_not_null(JitOptContext *ctx);
extern JitOptSymbol *_Py_uop_sym_new_type(
JitOptContext *ctx, PyTypeObject *typ);
extern JitOptSymbol *_Py_uop_sym_new_const(JitOptContext *ctx, PyObject *const_val);
extern JitOptSymbol *_Py_uop_sym_new_null(JitOptContext *ctx);
extern bool _Py_uop_sym_has_type(JitOptSymbol *sym);
extern bool _Py_uop_sym_matches_type(JitOptSymbol *sym, PyTypeObject *typ);
extern bool _Py_uop_sym_matches_type_version(JitOptSymbol *sym, unsigned int version);
extern void _Py_uop_sym_set_null(JitOptContext *ctx, JitOptSymbol *sym);
Expand Down
2 changes: 0 additions & 2 deletions Python/optimizer_analysis.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -316,15 +316,13 @@ remove_globals(_PyInterpreterFrame *frame, _PyUOpInstruction *buffer,

/* Shortened forms for convenience, used in optimizer_bytecodes.c */
#define sym_is_not_null _Py_uop_sym_is_not_null
#define sym_is_const _Py_uop_sym_is_const
#define sym_get_const _Py_uop_sym_get_const
#define sym_new_unknown _Py_uop_sym_new_unknown
#define sym_new_not_null _Py_uop_sym_new_not_null
#define sym_new_type _Py_uop_sym_new_type
#define sym_is_null _Py_uop_sym_is_null
#define sym_new_const _Py_uop_sym_new_const
#define sym_new_null _Py_uop_sym_new_null
#define sym_has_type _Py_uop_sym_has_type
#define sym_get_type _Py_uop_sym_get_type
#define sym_matches_type _Py_uop_sym_matches_type
#define sym_matches_type_version _Py_uop_sym_matches_type_version
Expand Down
153 changes: 84 additions & 69 deletions Python/optimizer_bytecodes.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ typedef struct _Py_UOpsAbstractFrame _Py_UOpsAbstractFrame;

/* Shortened forms for convenience */
#define sym_is_not_null _Py_uop_sym_is_not_null
#define sym_is_const _Py_uop_sym_is_const
#define sym_get_const _Py_uop_sym_get_const
#define sym_new_unknown _Py_uop_sym_new_unknown
#define sym_new_not_null _Py_uop_sym_new_not_null
Expand All @@ -21,7 +20,6 @@ typedef struct _Py_UOpsAbstractFrame _Py_UOpsAbstractFrame;
#define sym_matches_type _Py_uop_sym_matches_type
#define sym_matches_type_version _Py_uop_sym_matches_type_version
#define sym_get_type _Py_uop_sym_get_type
#define sym_has_type _Py_uop_sym_has_type
#define sym_set_null(SYM) _Py_uop_sym_set_null(ctx, SYM)
#define sym_set_non_null(SYM) _Py_uop_sym_set_non_null(ctx, SYM)
#define sym_set_type(SYM, TYPE) _Py_uop_sym_set_type(ctx, SYM, TYPE)
Expand Down Expand Up @@ -185,7 +183,7 @@ dummy_func(void) {
// Case C:
res = sym_new_type(ctx, &PyFloat_Type);
}
else if (!sym_is_const(ctx, rhs)) {
else if (!sym_get_const(ctx, rhs)) {
// Case A or B... can't know without the sign of the RHS:
res = sym_new_unknown(ctx);
}
Expand All @@ -210,11 +208,12 @@ dummy_func(void) {
}

op(_BINARY_OP_ADD_INT, (left, right -- res)) {
if (sym_is_const(ctx, left) && sym_is_const(ctx, right)) {
assert(PyLong_CheckExact(sym_get_const(ctx, left)));
assert(PyLong_CheckExact(sym_get_const(ctx, right)));
PyObject *temp = _PyLong_Add((PyLongObject *)sym_get_const(ctx, left),
(PyLongObject *)sym_get_const(ctx, right));
PyLongObject *lhs = (PyLongObject *)sym_get_const(ctx, left);
PyLongObject *rhs = (PyLongObject *)sym_get_const(ctx, right);
if (lhs && rhs) {
assert(PyLong_CheckExact(lhs));
assert(PyLong_CheckExact(rhs));
PyObject *temp = _PyLong_Add(lhs, rhs);
if (temp == NULL) {
goto error;
}
Expand All @@ -229,11 +228,12 @@ dummy_func(void) {
}

op(_BINARY_OP_SUBTRACT_INT, (left, right -- res)) {
if (sym_is_const(ctx, left) && sym_is_const(ctx, right)) {
assert(PyLong_CheckExact(sym_get_const(ctx, left)));
assert(PyLong_CheckExact(sym_get_const(ctx, right)));
PyObject *temp = _PyLong_Subtract((PyLongObject *)sym_get_const(ctx, left),
(PyLongObject *)sym_get_const(ctx, right));
PyLongObject *lhs = (PyLongObject *)sym_get_const(ctx, left);
PyLongObject *rhs = (PyLongObject *)sym_get_const(ctx, right);
if (lhs && rhs) {
assert(PyLong_CheckExact(lhs));
assert(PyLong_CheckExact(rhs));
PyObject *temp = _PyLong_Subtract(lhs, rhs);
if (temp == NULL) {
goto error;
}
Expand All @@ -248,11 +248,12 @@ dummy_func(void) {
}

op(_BINARY_OP_MULTIPLY_INT, (left, right -- res)) {
if (sym_is_const(ctx, left) && sym_is_const(ctx, right)) {
assert(PyLong_CheckExact(sym_get_const(ctx, left)));
assert(PyLong_CheckExact(sym_get_const(ctx, right)));
PyObject *temp = _PyLong_Multiply((PyLongObject *)sym_get_const(ctx, left),
(PyLongObject *)sym_get_const(ctx, right));
PyLongObject *lhs = (PyLongObject *)sym_get_const(ctx, left);
PyLongObject *rhs = (PyLongObject *)sym_get_const(ctx, right);
if (lhs && rhs) {
assert(PyLong_CheckExact(lhs));
assert(PyLong_CheckExact(rhs));
PyObject *temp = _PyLong_Multiply(lhs, rhs);
if (temp == NULL) {
goto error;
}
Expand All @@ -267,12 +268,14 @@ dummy_func(void) {
}

op(_BINARY_OP_ADD_FLOAT, (left, right -- res)) {
if (sym_is_const(ctx, left) && sym_is_const(ctx, right)) {
assert(PyFloat_CheckExact(sym_get_const(ctx, left)));
assert(PyFloat_CheckExact(sym_get_const(ctx, right)));
PyObject *lhs = sym_get_const(ctx, left);
PyObject *rhs = sym_get_const(ctx, right);
if (lhs && rhs) {
assert(PyFloat_CheckExact(lhs));
assert(PyFloat_CheckExact(rhs));
PyObject *temp = PyFloat_FromDouble(
PyFloat_AS_DOUBLE(sym_get_const(ctx, left)) +
PyFloat_AS_DOUBLE(sym_get_const(ctx, right)));
PyFloat_AS_DOUBLE(lhs) +
PyFloat_AS_DOUBLE(rhs));
if (temp == NULL) {
goto error;
}
Expand All @@ -287,12 +290,14 @@ dummy_func(void) {
}

op(_BINARY_OP_SUBTRACT_FLOAT, (left, right -- res)) {
if (sym_is_const(ctx, left) && sym_is_const(ctx, right)) {
assert(PyFloat_CheckExact(sym_get_const(ctx, left)));
assert(PyFloat_CheckExact(sym_get_const(ctx, right)));
PyObject *lhs = sym_get_const(ctx, left);
PyObject *rhs = sym_get_const(ctx, right);
if (lhs && rhs) {
assert(PyFloat_CheckExact(lhs));
assert(PyFloat_CheckExact(rhs));
PyObject *temp = PyFloat_FromDouble(
PyFloat_AS_DOUBLE(sym_get_const(ctx, left)) -
PyFloat_AS_DOUBLE(sym_get_const(ctx, right)));
PyFloat_AS_DOUBLE(lhs) -
PyFloat_AS_DOUBLE(rhs));
if (temp == NULL) {
goto error;
}
Expand All @@ -307,12 +312,14 @@ dummy_func(void) {
}

op(_BINARY_OP_MULTIPLY_FLOAT, (left, right -- res)) {
if (sym_is_const(ctx, left) && sym_is_const(ctx, right)) {
assert(PyFloat_CheckExact(sym_get_const(ctx, left)));
assert(PyFloat_CheckExact(sym_get_const(ctx, right)));
PyObject *lhs = sym_get_const(ctx, left);
PyObject *rhs = sym_get_const(ctx, right);
if (lhs && rhs) {
assert(PyFloat_CheckExact(lhs));
assert(PyFloat_CheckExact(rhs));
PyObject *temp = PyFloat_FromDouble(
PyFloat_AS_DOUBLE(sym_get_const(ctx, left)) *
PyFloat_AS_DOUBLE(sym_get_const(ctx, right)));
PyFloat_AS_DOUBLE(lhs) *
PyFloat_AS_DOUBLE(rhs));
if (temp == NULL) {
goto error;
}
Expand All @@ -327,10 +334,12 @@ dummy_func(void) {
}

op(_BINARY_OP_ADD_UNICODE, (left, right -- res)) {
if (sym_is_const(ctx, left) && sym_is_const(ctx, right)) {
assert(PyUnicode_CheckExact(sym_get_const(ctx, left)));
assert(PyUnicode_CheckExact(sym_get_const(ctx, right)));
PyObject *temp = PyUnicode_Concat(sym_get_const(ctx, left), sym_get_const(ctx, right));
PyObject *lhs = sym_get_const(ctx, left);
PyObject *rhs = sym_get_const(ctx, right);
if (lhs && rhs) {
assert(PyUnicode_CheckExact(lhs));
assert(PyUnicode_CheckExact(rhs));
PyObject *temp = PyUnicode_Concat(lhs, rhs);
if (temp == NULL) {
goto error;
}
Expand All @@ -344,10 +353,12 @@ dummy_func(void) {

op(_BINARY_OP_INPLACE_ADD_UNICODE, (left, right -- )) {
JitOptSymbol *res;
if (sym_is_const(ctx, left) && sym_is_const(ctx, right)) {
assert(PyUnicode_CheckExact(sym_get_const(ctx, left)));
assert(PyUnicode_CheckExact(sym_get_const(ctx, right)));
PyObject *temp = PyUnicode_Concat(sym_get_const(ctx, left), sym_get_const(ctx, right));
PyObject *lhs = sym_get_const(ctx, left);
PyObject *rhs = sym_get_const(ctx, right);
if (lhs && rhs) {
assert(PyUnicode_CheckExact(lhs));
assert(PyUnicode_CheckExact(rhs));
PyObject *temp = PyUnicode_Concat(lhs, rhs);
if (temp == NULL) {
goto error;
}
Expand All @@ -371,10 +382,11 @@ dummy_func(void) {
}

op(_BINARY_OP_SUBSCR_TUPLE_INT, (tuple_st, sub_st -- res)) {
PyObject *sub_st_o = sym_get_const(ctx, sub_st);
assert(sym_matches_type(tuple_st, &PyTuple_Type));
if (sym_is_const(ctx, sub_st)) {
assert(PyLong_CheckExact(sym_get_const(ctx, sub_st)));
long index = PyLong_AsLong(sym_get_const(ctx, sub_st));
if (sub_st_o) {
assert(PyLong_CheckExact(sub_st_o));
long index = PyLong_AsLong(sub_st_o);
assert(index >= 0);
int tuple_length = sym_tuple_length(tuple_st);
if (tuple_length == -1) {
Expand Down Expand Up @@ -465,12 +477,12 @@ dummy_func(void) {
}

op(_COMPARE_OP_INT, (left, right -- res)) {
if (sym_is_const(ctx, left) && sym_is_const(ctx, right)) {
assert(PyLong_CheckExact(sym_get_const(ctx, left)));
assert(PyLong_CheckExact(sym_get_const(ctx, right)));
PyObject *tmp = PyObject_RichCompare(sym_get_const(ctx, left),
sym_get_const(ctx, right),
oparg >> 5);
PyObject *lhs = sym_get_const(ctx, left);
PyObject *rhs = sym_get_const(ctx, right);
if (lhs && rhs) {
assert(PyLong_CheckExact(lhs));
assert(PyLong_CheckExact(rhs));
PyObject *tmp = PyObject_RichCompare(lhs, rhs, oparg >> 5);
if (tmp == NULL) {
goto error;
}
Expand Down Expand Up @@ -571,8 +583,8 @@ dummy_func(void) {
(void)dict_version;
(void)index;
attr = NULL;
if (sym_is_const(ctx, owner)) {
PyModuleObject *mod = (PyModuleObject *)sym_get_const(ctx, owner);
PyModuleObject *mod = (PyModuleObject *)sym_get_const(ctx, owner);
if (mod) {
if (PyModule_CheckExact(mod)) {
PyObject *dict = mod->md_dict;
uint64_t watched_mutations = get_mutations(dict);
Expand Down Expand Up @@ -653,19 +665,21 @@ dummy_func(void) {
}

op(_CHECK_FUNCTION_VERSION, (func_version/2, callable, self_or_null, unused[oparg] -- callable, self_or_null, unused[oparg])) {
if (sym_is_const(ctx, callable) && sym_matches_type(callable, &PyFunction_Type)) {
assert(PyFunction_Check(sym_get_const(ctx, callable)));
PyObject *callable_o = sym_get_const(ctx, callable);
if (callable_o && sym_matches_type(callable, &PyFunction_Type)) {
assert(PyFunction_Check(callable_o));
REPLACE_OP(this_instr, _CHECK_FUNCTION_VERSION_INLINE, 0, func_version);
this_instr->operand1 = (uintptr_t)sym_get_const(ctx, callable);
this_instr->operand1 = (uintptr_t)callable_o;
}
sym_set_type(callable, &PyFunction_Type);
}

op(_CHECK_FUNCTION_EXACT_ARGS, (callable, self_or_null, unused[oparg] -- callable, self_or_null, unused[oparg])) {
assert(sym_matches_type(callable, &PyFunction_Type));
if (sym_is_const(ctx, callable)) {
PyObject *callable_o = sym_get_const(ctx, callable);
if (callable_o) {
if (sym_is_null(self_or_null) || sym_is_not_null(self_or_null)) {
PyFunctionObject *func = (PyFunctionObject *)sym_get_const(ctx, callable);
PyFunctionObject *func = (PyFunctionObject *)callable_o;
PyCodeObject *co = (PyCodeObject *)func->func_code;
if (co->co_argcount == oparg + !sym_is_null(self_or_null)) {
REPLACE_OP(this_instr, _NOP, 0 ,0);
Expand Down Expand Up @@ -872,8 +886,9 @@ dummy_func(void) {
}

op(_CALL_TYPE_1, (unused, unused, arg -- res)) {
if (sym_has_type(arg)) {
res = sym_new_const(ctx, (PyObject *)sym_get_type(arg));
PyObject *type = (PyObject *)sym_get_type(arg);
if (type) {
res = sym_new_const(ctx, type);
}
else {
res = sym_new_not_null(ctx);
Expand All @@ -891,43 +906,43 @@ dummy_func(void) {
}

op(_GUARD_IS_TRUE_POP, (flag -- )) {
if (sym_is_const(ctx, flag)) {
PyObject *value = sym_get_const(ctx, flag);
PyObject *value = sym_get_const(ctx, flag);
if (value) {
assert(value != NULL);
eliminate_pop_guard(this_instr, value != Py_True);
}
sym_set_const(flag, Py_True);
}

op(_GUARD_IS_FALSE_POP, (flag -- )) {
if (sym_is_const(ctx, flag)) {
PyObject *value = sym_get_const(ctx, flag);
PyObject *value = sym_get_const(ctx, flag);
if (value) {
assert(value != NULL);
eliminate_pop_guard(this_instr, value != Py_False);
}
sym_set_const(flag, Py_False);
}

op(_GUARD_IS_NONE_POP, (val -- )) {
if (sym_is_const(ctx, val)) {
PyObject *value = sym_get_const(ctx, val);
PyObject *value = sym_get_const(ctx, val);
if (value) {
assert(value != NULL);
eliminate_pop_guard(this_instr, !Py_IsNone(value));
}
else if (sym_has_type(val)) {
else if (sym_get_type(val)) {
assert(!sym_matches_type(val, &_PyNone_Type));
eliminate_pop_guard(this_instr, true);
}
sym_set_const(val, Py_None);
}

op(_GUARD_IS_NOT_NONE_POP, (val -- )) {
if (sym_is_const(ctx, val)) {
PyObject *value = sym_get_const(ctx, val);
PyObject *value = sym_get_const(ctx, val);
if (value) {
assert(value != NULL);
eliminate_pop_guard(this_instr, Py_IsNone(value));
}
else if (sym_has_type(val)) {
else if (sym_get_type(val)) {
assert(!sym_matches_type(val, &_PyNone_Type));
eliminate_pop_guard(this_instr, false);
}
Expand Down
Loading
Loading