From 7d9c91cb2ffec0f5469f1dd0bfdb1f5bab106f0c Mon Sep 17 00:00:00 2001 From: default Date: Tue, 11 Aug 2026 04:38:24 +0000 Subject: [PATCH 1/4] gh-155486: Allow non-compact integers in TO_BOOL_INT --- Include/internal/pycore_opcode_metadata.h | 2 +- Include/internal/pycore_uop_ids.h | 9 ++- Include/internal/pycore_uop_metadata.h | 21 ++++++ Lib/test/test_capi/test_opt.py | 17 +++++ Modules/_testinternalcapi/test_cases.c.h | 4 +- Python/bytecodes.c | 7 +- Python/executor_cases.c.h | 85 +++++++++++++++++++++++ Python/generated_cases.c.h | 4 +- Python/optimizer_cases.c.h | 4 ++ 9 files changed, 145 insertions(+), 8 deletions(-) diff --git a/Include/internal/pycore_opcode_metadata.h b/Include/internal/pycore_opcode_metadata.h index 457e5c5bf20d2b9..38bccdd48c0f862 100644 --- a/Include/internal/pycore_opcode_metadata.h +++ b/Include/internal/pycore_opcode_metadata.h @@ -1531,7 +1531,7 @@ _PyOpcode_macro_expansion[256] = { [TO_BOOL] = { .nuops = 1, .uops = { { _TO_BOOL, OPARG_SIMPLE, 2 } } }, [TO_BOOL_ALWAYS_TRUE] = { .nuops = 4, .uops = { { _RECORD_TOS_TYPE, OPARG_SIMPLE, 1 }, { _GUARD_TYPE_VERSION, 2, 1 }, { _REPLACE_WITH_TRUE, OPARG_SIMPLE, 3 }, { _POP_TOP, OPARG_SIMPLE, 3 } } }, [TO_BOOL_BOOL] = { .nuops = 1, .uops = { { _TO_BOOL_BOOL, OPARG_SIMPLE, 3 } } }, - [TO_BOOL_INT] = { .nuops = 3, .uops = { { _GUARD_TOS_INT, OPARG_SIMPLE, 0 }, { _TO_BOOL_INT, OPARG_SIMPLE, 3 }, { _POP_TOP_INT, OPARG_SIMPLE, 3 } } }, + [TO_BOOL_INT] = { .nuops = 3, .uops = { { _GUARD_TOS_EXACT_INT, OPARG_SIMPLE, 0 }, { _TO_BOOL_INT, OPARG_SIMPLE, 3 }, { _POP_TOP_INT, OPARG_SIMPLE, 3 } } }, [TO_BOOL_LIST] = { .nuops = 3, .uops = { { _GUARD_TOS_LIST, OPARG_SIMPLE, 0 }, { _TO_BOOL_LIST, OPARG_SIMPLE, 3 }, { _POP_TOP, OPARG_SIMPLE, 3 } } }, [TO_BOOL_NONE] = { .nuops = 1, .uops = { { _TO_BOOL_NONE, OPARG_SIMPLE, 3 } } }, [TO_BOOL_STR] = { .nuops = 3, .uops = { { _GUARD_TOS_UNICODE, OPARG_SIMPLE, 0 }, { _TO_BOOL_STR, OPARG_SIMPLE, 3 }, { _POP_TOP_UNICODE, OPARG_SIMPLE, 3 } } }, diff --git a/Include/internal/pycore_uop_ids.h b/Include/internal/pycore_uop_ids.h index 97f934727a85a36..625c33a6640b853 100644 --- a/Include/internal/pycore_uop_ids.h +++ b/Include/internal/pycore_uop_ids.h @@ -193,6 +193,7 @@ enum { _GUARD_TOS_ANY_DICT, _GUARD_TOS_ANY_SET, _GUARD_TOS_DICT, + _GUARD_TOS_EXACT_INT, _GUARD_TOS_FLOAT, _GUARD_TOS_FROZENDICT, _GUARD_TOS_FROZENSET, @@ -364,7 +365,7 @@ enum { _UNPACK_SEQUENCE_UNIQUE_TWO_TUPLE, _YIELD_VALUE, }; -#define MAX_UOP_ID 652 +#define MAX_UOP_ID 653 #define _BUILD_INTERPOLATION BUILD_INTERPOLATION #define _BUILD_LIST BUILD_LIST @@ -926,6 +927,10 @@ enum { _GUARD_TOS_DICT_r11, _GUARD_TOS_DICT_r22, _GUARD_TOS_DICT_r33, + _GUARD_TOS_EXACT_INT_r01, + _GUARD_TOS_EXACT_INT_r11, + _GUARD_TOS_EXACT_INT_r22, + _GUARD_TOS_EXACT_INT_r33, _GUARD_TOS_FLOAT_r01, _GUARD_TOS_FLOAT_r11, _GUARD_TOS_FLOAT_r22, @@ -1434,7 +1439,7 @@ enum { _WITH_EXCEPT_START_r33, _YIELD_VALUE_r11, }; -#define MAX_UOP_REGS_ID 1645 +#define MAX_UOP_REGS_ID 1650 #ifdef __cplusplus } diff --git a/Include/internal/pycore_uop_metadata.h b/Include/internal/pycore_uop_metadata.h index e52233b21277591..981c6992701630b 100644 --- a/Include/internal/pycore_uop_metadata.h +++ b/Include/internal/pycore_uop_metadata.h @@ -103,6 +103,7 @@ const uint32_t _PyUop_Flags[MAX_UOP_ID+1] = { [_UNARY_INVERT] = HAS_ERROR_FLAG | HAS_ERROR_NO_POP_FLAG | HAS_ESCAPES_FLAG, [_GUARD_NOS_INT] = HAS_EXIT_FLAG, [_GUARD_TOS_INT] = HAS_EXIT_FLAG, + [_GUARD_TOS_EXACT_INT] = HAS_EXIT_FLAG, [_GUARD_NOS_OVERFLOWED] = HAS_EXIT_FLAG, [_GUARD_TOS_OVERFLOWED] = HAS_EXIT_FLAG, [_BINARY_OP_MULTIPLY_INT] = HAS_EXIT_FLAG | HAS_PURE_FLAG, @@ -1056,6 +1057,15 @@ const _PyUopCachingInfo _PyUop_Caching[MAX_UOP_ID+1] = { { 3, 3, _GUARD_TOS_INT_r33 }, }, }, + [_GUARD_TOS_EXACT_INT] = { + .best = { 0, 1, 2, 3 }, + .entries = { + { 1, 0, _GUARD_TOS_EXACT_INT_r01 }, + { 1, 1, _GUARD_TOS_EXACT_INT_r11 }, + { 2, 2, _GUARD_TOS_EXACT_INT_r22 }, + { 3, 3, _GUARD_TOS_EXACT_INT_r33 }, + }, + }, [_GUARD_NOS_OVERFLOWED] = { .best = { 0, 1, 2, 3 }, .entries = { @@ -4095,6 +4105,10 @@ const uint16_t _PyUop_Uncached[MAX_UOP_REGS_ID+1] = { [_GUARD_TOS_INT_r11] = _GUARD_TOS_INT, [_GUARD_TOS_INT_r22] = _GUARD_TOS_INT, [_GUARD_TOS_INT_r33] = _GUARD_TOS_INT, + [_GUARD_TOS_EXACT_INT_r01] = _GUARD_TOS_EXACT_INT, + [_GUARD_TOS_EXACT_INT_r11] = _GUARD_TOS_EXACT_INT, + [_GUARD_TOS_EXACT_INT_r22] = _GUARD_TOS_EXACT_INT, + [_GUARD_TOS_EXACT_INT_r33] = _GUARD_TOS_EXACT_INT, [_GUARD_NOS_OVERFLOWED_r02] = _GUARD_NOS_OVERFLOWED, [_GUARD_NOS_OVERFLOWED_r12] = _GUARD_NOS_OVERFLOWED, [_GUARD_NOS_OVERFLOWED_r22] = _GUARD_NOS_OVERFLOWED, @@ -5506,6 +5520,11 @@ const char *const _PyOpcode_uop_name[MAX_UOP_REGS_ID+1] = { [_GUARD_TOS_DICT_r11] = "_GUARD_TOS_DICT_r11", [_GUARD_TOS_DICT_r22] = "_GUARD_TOS_DICT_r22", [_GUARD_TOS_DICT_r33] = "_GUARD_TOS_DICT_r33", + [_GUARD_TOS_EXACT_INT] = "_GUARD_TOS_EXACT_INT", + [_GUARD_TOS_EXACT_INT_r01] = "_GUARD_TOS_EXACT_INT_r01", + [_GUARD_TOS_EXACT_INT_r11] = "_GUARD_TOS_EXACT_INT_r11", + [_GUARD_TOS_EXACT_INT_r22] = "_GUARD_TOS_EXACT_INT_r22", + [_GUARD_TOS_EXACT_INT_r33] = "_GUARD_TOS_EXACT_INT_r33", [_GUARD_TOS_FLOAT] = "_GUARD_TOS_FLOAT", [_GUARD_TOS_FLOAT_r01] = "_GUARD_TOS_FLOAT_r01", [_GUARD_TOS_FLOAT_r11] = "_GUARD_TOS_FLOAT_r11", @@ -6283,6 +6302,8 @@ int _PyUop_num_popped(int opcode, int oparg) return 0; case _GUARD_TOS_INT: return 0; + case _GUARD_TOS_EXACT_INT: + return 0; case _GUARD_NOS_OVERFLOWED: return 0; case _GUARD_TOS_OVERFLOWED: diff --git a/Lib/test/test_capi/test_opt.py b/Lib/test/test_capi/test_opt.py index 5806216d46e7eb6..61309bb1e3f57d4 100644 --- a/Lib/test/test_capi/test_opt.py +++ b/Lib/test/test_capi/test_opt.py @@ -4875,6 +4875,23 @@ 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 + 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, "_POP_TOP"), 3) + self.assertIn("_POP_TOP_NOP", uops) + def test_to_bool_list(self): def f(n): for i in range(n): diff --git a/Modules/_testinternalcapi/test_cases.c.h b/Modules/_testinternalcapi/test_cases.c.h index a17648a33d4fe4a..7a75e80298fcd82 100644 --- a/Modules/_testinternalcapi/test_cases.c.h +++ b/Modules/_testinternalcapi/test_cases.c.h @@ -12996,11 +12996,11 @@ _PyStackRef value; _PyStackRef res; _PyStackRef v; - // _GUARD_TOS_INT + // _GUARD_TOS_EXACT_INT { value = stack_pointer[-1]; PyObject *value_o = PyStackRef_AsPyObjectBorrow(value); - if (!_PyLong_CheckExactAndCompact(value_o)) { + if (!PyLong_CheckExact(value_o)) { UPDATE_MISS_STATS(TO_BOOL); assert(_PyOpcode_Deopt[opcode] == (TO_BOOL)); JUMP_TO_PREDICTED(TO_BOOL); diff --git a/Python/bytecodes.c b/Python/bytecodes.c index 4d7b338e2dbd4c3..5c7b9c94d7e7ee7 100644 --- a/Python/bytecodes.c +++ b/Python/bytecodes.c @@ -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; op(_GUARD_NOS_LIST, (nos, unused -- nos, unused)) { PyObject *o = PyStackRef_AsPyObjectBorrow(nos); @@ -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); diff --git a/Python/executor_cases.c.h b/Python/executor_cases.c.h index e45bbd7cceb295f..7e73e9366e7240c 100644 --- a/Python/executor_cases.c.h +++ b/Python/executor_cases.c.h @@ -4009,6 +4009,91 @@ break; } + case _GUARD_TOS_EXACT_INT_r01: { + CHECK_CURRENT_CACHED_VALUES(0); + ASSERT_WITHIN_STACK_BOUNDS_IGNORING_CACHE(__FILE__, __LINE__); + _PyStackRef value; + value = stack_pointer[-1]; + PyObject *value_o = PyStackRef_AsPyObjectBorrow(value); + if (!PyLong_CheckExact(value_o)) { + UOP_STAT_INC(uopcode, miss); + SET_CURRENT_CACHED_VALUES(0); + JUMP_TO_JUMP_TARGET(); + } + _tos_cache0 = value; + SET_CURRENT_CACHED_VALUES(1); + stack_pointer += -1; + ASSERT_WITHIN_STACK_BOUNDS(__FILE__, __LINE__); + ASSERT_WITHIN_STACK_BOUNDS_IGNORING_CACHE(__FILE__, __LINE__); + break; + } + + case _GUARD_TOS_EXACT_INT_r11: { + CHECK_CURRENT_CACHED_VALUES(1); + ASSERT_WITHIN_STACK_BOUNDS_IGNORING_CACHE(__FILE__, __LINE__); + _PyStackRef value; + _PyStackRef _stack_item_0 = _tos_cache0; + value = _stack_item_0; + PyObject *value_o = PyStackRef_AsPyObjectBorrow(value); + if (!PyLong_CheckExact(value_o)) { + UOP_STAT_INC(uopcode, miss); + _tos_cache0 = value; + SET_CURRENT_CACHED_VALUES(1); + JUMP_TO_JUMP_TARGET(); + } + _tos_cache0 = value; + SET_CURRENT_CACHED_VALUES(1); + ASSERT_WITHIN_STACK_BOUNDS_IGNORING_CACHE(__FILE__, __LINE__); + break; + } + + case _GUARD_TOS_EXACT_INT_r22: { + CHECK_CURRENT_CACHED_VALUES(2); + ASSERT_WITHIN_STACK_BOUNDS_IGNORING_CACHE(__FILE__, __LINE__); + _PyStackRef value; + _PyStackRef _stack_item_0 = _tos_cache0; + _PyStackRef _stack_item_1 = _tos_cache1; + value = _stack_item_1; + PyObject *value_o = PyStackRef_AsPyObjectBorrow(value); + if (!PyLong_CheckExact(value_o)) { + UOP_STAT_INC(uopcode, miss); + _tos_cache1 = value; + _tos_cache0 = _stack_item_0; + SET_CURRENT_CACHED_VALUES(2); + JUMP_TO_JUMP_TARGET(); + } + _tos_cache1 = value; + _tos_cache0 = _stack_item_0; + SET_CURRENT_CACHED_VALUES(2); + ASSERT_WITHIN_STACK_BOUNDS_IGNORING_CACHE(__FILE__, __LINE__); + break; + } + + case _GUARD_TOS_EXACT_INT_r33: { + CHECK_CURRENT_CACHED_VALUES(3); + ASSERT_WITHIN_STACK_BOUNDS_IGNORING_CACHE(__FILE__, __LINE__); + _PyStackRef value; + _PyStackRef _stack_item_0 = _tos_cache0; + _PyStackRef _stack_item_1 = _tos_cache1; + _PyStackRef _stack_item_2 = _tos_cache2; + value = _stack_item_2; + PyObject *value_o = PyStackRef_AsPyObjectBorrow(value); + if (!PyLong_CheckExact(value_o)) { + UOP_STAT_INC(uopcode, miss); + _tos_cache2 = value; + _tos_cache1 = _stack_item_1; + _tos_cache0 = _stack_item_0; + SET_CURRENT_CACHED_VALUES(3); + JUMP_TO_JUMP_TARGET(); + } + _tos_cache2 = value; + _tos_cache1 = _stack_item_1; + _tos_cache0 = _stack_item_0; + SET_CURRENT_CACHED_VALUES(3); + ASSERT_WITHIN_STACK_BOUNDS_IGNORING_CACHE(__FILE__, __LINE__); + break; + } + case _GUARD_NOS_OVERFLOWED_r02: { CHECK_CURRENT_CACHED_VALUES(0); ASSERT_WITHIN_STACK_BOUNDS_IGNORING_CACHE(__FILE__, __LINE__); diff --git a/Python/generated_cases.c.h b/Python/generated_cases.c.h index 6178dc70c1b80e7..77c18b3d61fefc7 100644 --- a/Python/generated_cases.c.h +++ b/Python/generated_cases.c.h @@ -12993,11 +12993,11 @@ _PyStackRef value; _PyStackRef res; _PyStackRef v; - // _GUARD_TOS_INT + // _GUARD_TOS_EXACT_INT { value = stack_pointer[-1]; PyObject *value_o = PyStackRef_AsPyObjectBorrow(value); - if (!_PyLong_CheckExactAndCompact(value_o)) { + if (!PyLong_CheckExact(value_o)) { UPDATE_MISS_STATS(TO_BOOL); assert(_PyOpcode_Deopt[opcode] == (TO_BOOL)); JUMP_TO_PREDICTED(TO_BOOL); diff --git a/Python/optimizer_cases.c.h b/Python/optimizer_cases.c.h index 5e110360b81b445..32a98c7eff0a0e9 100644 --- a/Python/optimizer_cases.c.h +++ b/Python/optimizer_cases.c.h @@ -581,6 +581,10 @@ break; } + case _GUARD_TOS_EXACT_INT: { + break; + } + case _GUARD_NOS_OVERFLOWED: { break; } From 5e5024acc21ea2567c8adafd081685305642ff1c Mon Sep 17 00:00:00 2001 From: default Date: Wed, 12 Aug 2026 06:32:05 +0000 Subject: [PATCH 2/4] gh-155486: optimize exact integer guard in JIT --- Python/optimizer_bytecodes.c | 7 +++++++ Python/optimizer_cases.c.h | 6 ++++++ 2 files changed, 13 insertions(+) diff --git a/Python/optimizer_bytecodes.c b/Python/optimizer_bytecodes.c index edb4c644bccbf6f..5246e50633461bd 100644 --- a/Python/optimizer_bytecodes.c +++ b/Python/optimizer_bytecodes.c @@ -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); diff --git a/Python/optimizer_cases.c.h b/Python/optimizer_cases.c.h index 32a98c7eff0a0e9..21f275f27cafe04 100644 --- a/Python/optimizer_cases.c.h +++ b/Python/optimizer_cases.c.h @@ -582,6 +582,12 @@ } case _GUARD_TOS_EXACT_INT: { + JitOptRef value; + value = stack_pointer[-1]; + if (sym_matches_type(value, &PyLong_Type)) { + ADD_OP(_NOP, 0, 0); + } + sym_set_type(value, &PyLong_Type); break; } From 88c88717d868dd2f8ebed9c886d64459acb7ccba Mon Sep 17 00:00:00 2001 From: default Date: Wed, 12 Aug 2026 07:59:48 +0000 Subject: [PATCH 3/4] gh-155486: Add test for TO_BOOL_INT guard elimination --- Lib/test/test_capi/test_opt.py | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/Lib/test/test_capi/test_opt.py b/Lib/test/test_capi/test_opt.py index 61309bb1e3f57d4..45fb04f2a46a68c 100644 --- a/Lib/test/test_capi/test_opt.py +++ b/Lib/test/test_capi/test_opt.py @@ -4892,6 +4892,22 @@ def f(n, value=1 << 100): self.assertLessEqual(count_ops(ex, "_POP_TOP"), 3) self.assertIn("_POP_TOP_NOP", uops) + def test_to_bool_int_guard_elimination(self): + def testfunc(loops): + num = 0 + for _ in range(loops): + _ = not num + a = not num + return a + + res, ex = self._run_with_optimizer(testfunc, TIER2_THRESHOLD) + self.assertTrue(res) + self.assertIsNotNone(ex) + to_bool_int_count = [opname for opname in iter_opnames(ex) if opname == "_TO_BOOL_INT"] + guard_tos_exact_int_count = [opname for opname in iter_opnames(ex) if opname == "_GUARD_TOS_EXACT_INT"] + self.assertGreaterEqual(len(to_bool_int_count), 2) + self.assertLessEqual(len(guard_tos_exact_int_count), 1) + def test_to_bool_list(self): def f(n): for i in range(n): From 3a15dddb3ca007a35195272771d0c53304c9b783 Mon Sep 17 00:00:00 2001 From: default Date: Wed, 12 Aug 2026 14:36:11 +0000 Subject: [PATCH 4/4] gh-155486: merge test cases for TO_BOOL_INT --- Lib/test/test_capi/test_opt.py | 20 ++++---------------- 1 file changed, 4 insertions(+), 16 deletions(-) diff --git a/Lib/test/test_capi/test_opt.py b/Lib/test/test_capi/test_opt.py index 45fb04f2a46a68c..88411da9e739854 100644 --- a/Lib/test/test_capi/test_opt.py +++ b/Lib/test/test_capi/test_opt.py @@ -4882,6 +4882,9 @@ 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) @@ -4889,25 +4892,10 @@ def f(n, value=1 << 100): 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) self.assertIn("_POP_TOP_NOP", uops) - def test_to_bool_int_guard_elimination(self): - def testfunc(loops): - num = 0 - for _ in range(loops): - _ = not num - a = not num - return a - - res, ex = self._run_with_optimizer(testfunc, TIER2_THRESHOLD) - self.assertTrue(res) - self.assertIsNotNone(ex) - to_bool_int_count = [opname for opname in iter_opnames(ex) if opname == "_TO_BOOL_INT"] - guard_tos_exact_int_count = [opname for opname in iter_opnames(ex) if opname == "_GUARD_TOS_EXACT_INT"] - self.assertGreaterEqual(len(to_bool_int_count), 2) - self.assertLessEqual(len(guard_tos_exact_int_count), 1) - def test_to_bool_list(self): def f(n): for i in range(n):