Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 1 addition & 1 deletion Include/internal/pycore_opcode_metadata.h

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

9 changes: 7 additions & 2 deletions Include/internal/pycore_uop_ids.h

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

21 changes: 21 additions & 0 deletions Include/internal/pycore_uop_metadata.h

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

21 changes: 21 additions & 0 deletions Lib/test/test_capi/test_opt.py
Original file line number Diff line number Diff line change
Expand Up @@ -4875,6 +4875,27 @@ def f(n):
self.assertLessEqual(count_ops(ex, "_POP_TOP"), 3)
self.assertIn("_POP_TOP_NOP", uops)

def test_to_bool_noncompact_int(self):
# gh-155486: non-compact exact integer should remain specialized
# as _TO_BOOL_INT in Tier 2.
def f(n, value=1 << 100):
for _ in range(n):
if not value:
return 0
# The second check should reuse the exact-int type established by the first guard.
if not value:
return 0
return 1

res, ex = self._run_with_optimizer(f, TIER2_THRESHOLD)
self.assertEqual(res, 1)
self.assertIsNotNone(ex)
uops = get_opnames(ex)
self.assertIn("_TO_BOOL_INT", uops)
self.assertLessEqual(count_ops(ex, "_GUARD_TOS_EXACT_INT"), 1)
self.assertLessEqual(count_ops(ex, "_POP_TOP"), 3)
Comment thread
cocolato marked this conversation as resolved.
self.assertIn("_POP_TOP_NOP", uops)

def test_to_bool_list(self):
def f(n):
for i in range(n):
Expand Down
4 changes: 2 additions & 2 deletions Modules/_testinternalcapi/test_cases.c.h

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

7 changes: 6 additions & 1 deletion Python/bytecodes.c
Original file line number Diff line number Diff line change
Expand Up @@ -526,7 +526,7 @@ dummy_func(
}

macro(TO_BOOL_INT) =
_GUARD_TOS_INT + unused/1 + unused/2 + _TO_BOOL_INT + _POP_TOP_INT;
_GUARD_TOS_EXACT_INT + unused/1 + unused/2 + _TO_BOOL_INT + _POP_TOP_INT;
Comment thread
marinelay marked this conversation as resolved.

op(_GUARD_NOS_LIST, (nos, unused -- nos, unused)) {
PyObject *o = PyStackRef_AsPyObjectBorrow(nos);
Expand Down Expand Up @@ -643,6 +643,11 @@ dummy_func(
EXIT_IF(!_PyLong_CheckExactAndCompact(value_o));
}

op(_GUARD_TOS_EXACT_INT, (value -- value)) {
PyObject *value_o = PyStackRef_AsPyObjectBorrow(value);
EXIT_IF(!PyLong_CheckExact(value_o));
}

op(_GUARD_NOS_OVERFLOWED, (left, unused -- left, unused)) {
PyObject *left_o = PyStackRef_AsPyObjectBorrow(left);
assert(Py_TYPE(left_o) == &PyLong_Type);
Expand Down
85 changes: 85 additions & 0 deletions Python/executor_cases.c.h

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

4 changes: 2 additions & 2 deletions Python/generated_cases.c.h

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

7 changes: 7 additions & 0 deletions Python/optimizer_bytecodes.c
Original file line number Diff line number Diff line change
Expand Up @@ -217,6 +217,13 @@ dummy_func(void) {
}
}

op(_GUARD_TOS_EXACT_INT, (value -- value)) {
if (sym_matches_type(value, &PyLong_Type)) {
ADD_OP(_NOP, 0, 0);
}
sym_set_type(value, &PyLong_Type);
}

op(_GUARD_NOS_INT, (left, unused -- left, unused)) {
if (sym_is_compact_int(left)) {
ADD_OP(_NOP, 0, 0);
Expand Down
10 changes: 10 additions & 0 deletions Python/optimizer_cases.c.h

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

Loading