diff --git a/Include/internal/pycore_opcode_metadata.h b/Include/internal/pycore_opcode_metadata.h index 830b49352e23a3..08e422c6931313 100644 --- a/Include/internal/pycore_opcode_metadata.h +++ b/Include/internal/pycore_opcode_metadata.h @@ -1510,7 +1510,7 @@ _PyOpcode_macro_expansion[256] = { [UNPACK_SEQUENCE] = { .nuops = 1, .uops = { { _UNPACK_SEQUENCE, OPARG_SIMPLE, 0 } } }, [UNPACK_SEQUENCE_LIST] = { .nuops = 2, .uops = { { _GUARD_TOS_LIST, OPARG_SIMPLE, 0 }, { _UNPACK_SEQUENCE_LIST, OPARG_SIMPLE, 1 } } }, [UNPACK_SEQUENCE_TUPLE] = { .nuops = 2, .uops = { { _GUARD_TOS_TUPLE, OPARG_SIMPLE, 0 }, { _UNPACK_SEQUENCE_TUPLE, OPARG_SIMPLE, 1 } } }, - [UNPACK_SEQUENCE_TWO_TUPLE] = { .nuops = 2, .uops = { { _GUARD_TOS_TUPLE, OPARG_SIMPLE, 0 }, { _UNPACK_SEQUENCE_TWO_TUPLE, OPARG_SIMPLE, 1 } } }, + [UNPACK_SEQUENCE_TWO_TUPLE] = { .nuops = 3, .uops = { { _GUARD_TOS_TUPLE, OPARG_SIMPLE, 0 }, { _UNPACK_SEQUENCE_TWO_TUPLE, OPARG_SIMPLE, 1 }, { _POP_TOP, OPARG_SIMPLE, 1 } } }, [WITH_EXCEPT_START] = { .nuops = 1, .uops = { { _WITH_EXCEPT_START, OPARG_SIMPLE, 0 } } }, [YIELD_VALUE] = { .nuops = 1, .uops = { { _YIELD_VALUE, OPARG_SIMPLE, 0 } } }, }; diff --git a/Include/internal/pycore_uop_ids.h b/Include/internal/pycore_uop_ids.h index e6e6c8266024aa..6d415fe346d31f 100644 --- a/Include/internal/pycore_uop_ids.h +++ b/Include/internal/pycore_uop_ids.h @@ -1117,10 +1117,11 @@ extern "C" { #define _UNPACK_SEQUENCE_r10 1311 #define _UNPACK_SEQUENCE_LIST_r10 1312 #define _UNPACK_SEQUENCE_TUPLE_r10 1313 -#define _UNPACK_SEQUENCE_TWO_TUPLE_r12 1314 -#define _WITH_EXCEPT_START_r33 1315 -#define _YIELD_VALUE_r11 1316 -#define MAX_UOP_REGS_ID 1316 +#define _UNPACK_SEQUENCE_TWO_TUPLE_r03 1314 +#define _UNPACK_SEQUENCE_TWO_TUPLE_r13 1315 +#define _WITH_EXCEPT_START_r33 1316 +#define _YIELD_VALUE_r11 1317 +#define MAX_UOP_REGS_ID 1317 #ifdef __cplusplus } diff --git a/Include/internal/pycore_uop_metadata.h b/Include/internal/pycore_uop_metadata.h index 214f58b22338e1..d1671b81e734c1 100644 --- a/Include/internal/pycore_uop_metadata.h +++ b/Include/internal/pycore_uop_metadata.h @@ -149,7 +149,7 @@ const uint32_t _PyUop_Flags[MAX_UOP_ID+1] = { [_STORE_NAME] = HAS_ARG_FLAG | HAS_NAME_FLAG | HAS_ERROR_FLAG | HAS_ESCAPES_FLAG, [_DELETE_NAME] = HAS_ARG_FLAG | HAS_NAME_FLAG | HAS_ERROR_FLAG | HAS_ERROR_NO_POP_FLAG | HAS_ESCAPES_FLAG, [_UNPACK_SEQUENCE] = HAS_ARG_FLAG | HAS_ERROR_FLAG | HAS_ESCAPES_FLAG, - [_UNPACK_SEQUENCE_TWO_TUPLE] = HAS_ARG_FLAG | HAS_DEOPT_FLAG | HAS_ESCAPES_FLAG, + [_UNPACK_SEQUENCE_TWO_TUPLE] = HAS_ARG_FLAG | HAS_DEOPT_FLAG, [_UNPACK_SEQUENCE_TUPLE] = HAS_ARG_FLAG | HAS_DEOPT_FLAG | HAS_ESCAPES_FLAG, [_UNPACK_SEQUENCE_LIST] = HAS_ARG_FLAG | HAS_DEOPT_FLAG | HAS_ESCAPES_FLAG, [_UNPACK_EX] = HAS_ARG_FLAG | HAS_ERROR_FLAG | HAS_ESCAPES_FLAG, @@ -1395,10 +1395,10 @@ const _PyUopCachingInfo _PyUop_Caching[MAX_UOP_ID+1] = { }, }, [_UNPACK_SEQUENCE_TWO_TUPLE] = { - .best = { 1, 1, 1, 1 }, + .best = { 0, 1, 1, 1 }, .entries = { - { -1, -1, -1 }, - { 2, 1, _UNPACK_SEQUENCE_TWO_TUPLE_r12 }, + { 3, 0, _UNPACK_SEQUENCE_TWO_TUPLE_r03 }, + { 3, 1, _UNPACK_SEQUENCE_TWO_TUPLE_r13 }, { -1, -1, -1 }, { -1, -1, -1 }, }, @@ -3506,7 +3506,8 @@ const uint16_t _PyUop_Uncached[MAX_UOP_REGS_ID+1] = { [_STORE_NAME_r10] = _STORE_NAME, [_DELETE_NAME_r00] = _DELETE_NAME, [_UNPACK_SEQUENCE_r10] = _UNPACK_SEQUENCE, - [_UNPACK_SEQUENCE_TWO_TUPLE_r12] = _UNPACK_SEQUENCE_TWO_TUPLE, + [_UNPACK_SEQUENCE_TWO_TUPLE_r03] = _UNPACK_SEQUENCE_TWO_TUPLE, + [_UNPACK_SEQUENCE_TWO_TUPLE_r13] = _UNPACK_SEQUENCE_TWO_TUPLE, [_UNPACK_SEQUENCE_TUPLE_r10] = _UNPACK_SEQUENCE_TUPLE, [_UNPACK_SEQUENCE_LIST_r10] = _UNPACK_SEQUENCE_LIST, [_UNPACK_EX_r10] = _UNPACK_EX, @@ -4947,7 +4948,8 @@ const char *const _PyOpcode_uop_name[MAX_UOP_REGS_ID+1] = { [_UNPACK_SEQUENCE_TUPLE] = "_UNPACK_SEQUENCE_TUPLE", [_UNPACK_SEQUENCE_TUPLE_r10] = "_UNPACK_SEQUENCE_TUPLE_r10", [_UNPACK_SEQUENCE_TWO_TUPLE] = "_UNPACK_SEQUENCE_TWO_TUPLE", - [_UNPACK_SEQUENCE_TWO_TUPLE_r12] = "_UNPACK_SEQUENCE_TWO_TUPLE_r12", + [_UNPACK_SEQUENCE_TWO_TUPLE_r03] = "_UNPACK_SEQUENCE_TWO_TUPLE_r03", + [_UNPACK_SEQUENCE_TWO_TUPLE_r13] = "_UNPACK_SEQUENCE_TWO_TUPLE_r13", [_WITH_EXCEPT_START] = "_WITH_EXCEPT_START", [_WITH_EXCEPT_START_r33] = "_WITH_EXCEPT_START_r33", [_YIELD_VALUE] = "_YIELD_VALUE", diff --git a/Lib/test/test_capi/test_opt.py b/Lib/test/test_capi/test_opt.py index bff97fe8320b22..67d255fd54bdae 100644 --- a/Lib/test/test_capi/test_opt.py +++ b/Lib/test/test_capi/test_opt.py @@ -440,6 +440,24 @@ def testfunc(n, m): uops = get_opnames(ex) self.assertIn("_FOR_ITER_TIER_TWO", uops) + def test_unpack_sequence_two_tuple(self): + def testfunc(x): + i = 0 + while i < x: + i += 1 + t = (i, i) + a, b = t + return a, b + + res = testfunc(TIER2_THRESHOLD) + self.assertEqual(res, (TIER2_THRESHOLD, TIER2_THRESHOLD)) + + ex = get_first_executor(testfunc) + self.assertIsNotNone(ex) + uops = get_opnames(ex) + self.assertIn("_UNPACK_SEQUENCE_TWO_TUPLE", uops) + self.assertNotIn("_POP_TOP", uops) + @requires_specialization @unittest.skipIf(Py_GIL_DISABLED, "optimizer not yet supported in free-threaded builds") diff --git a/Python/bytecodes.c b/Python/bytecodes.c index 829efafa67d6e1..969a4f7051b96c 100644 --- a/Python/bytecodes.c +++ b/Python/bytecodes.c @@ -1598,9 +1598,9 @@ dummy_func( macro(UNPACK_SEQUENCE) = _SPECIALIZE_UNPACK_SEQUENCE + _UNPACK_SEQUENCE; macro(UNPACK_SEQUENCE_TWO_TUPLE) = - _GUARD_TOS_TUPLE + unused/1 + _UNPACK_SEQUENCE_TWO_TUPLE; + _GUARD_TOS_TUPLE + unused/1 + _UNPACK_SEQUENCE_TWO_TUPLE + POP_TOP; - op(_UNPACK_SEQUENCE_TWO_TUPLE, (seq -- val1, val0)) { + op(_UNPACK_SEQUENCE_TWO_TUPLE, (seq -- val1, val0, s)) { assert(oparg == 2); PyObject *seq_o = PyStackRef_AsPyObjectBorrow(seq); assert(PyTuple_CheckExact(seq_o)); @@ -1608,7 +1608,8 @@ dummy_func( STAT_INC(UNPACK_SEQUENCE, hit); val0 = PyStackRef_FromPyObjectNew(PyTuple_GET_ITEM(seq_o, 0)); val1 = PyStackRef_FromPyObjectNew(PyTuple_GET_ITEM(seq_o, 1)); - PyStackRef_CLOSE(seq); + s = seq; + INPUTS_DEAD(); } macro(UNPACK_SEQUENCE_TUPLE) = diff --git a/Python/executor_cases.c.h b/Python/executor_cases.c.h index 0a2b794988c961..f4c1f72e832544 100644 --- a/Python/executor_cases.c.h +++ b/Python/executor_cases.c.h @@ -6295,12 +6295,44 @@ break; } - case _UNPACK_SEQUENCE_TWO_TUPLE_r12: { + case _UNPACK_SEQUENCE_TWO_TUPLE_r03: { + CHECK_CURRENT_CACHED_VALUES(0); + assert(WITHIN_STACK_BOUNDS_IGNORING_CACHE()); + _PyStackRef seq; + _PyStackRef val1; + _PyStackRef val0; + _PyStackRef s; + oparg = CURRENT_OPARG(); + seq = stack_pointer[-1]; + assert(oparg == 2); + PyObject *seq_o = PyStackRef_AsPyObjectBorrow(seq); + assert(PyTuple_CheckExact(seq_o)); + if (PyTuple_GET_SIZE(seq_o) != 2) { + UOP_STAT_INC(uopcode, miss); + SET_CURRENT_CACHED_VALUES(0); + JUMP_TO_JUMP_TARGET(); + } + STAT_INC(UNPACK_SEQUENCE, hit); + val0 = PyStackRef_FromPyObjectNew(PyTuple_GET_ITEM(seq_o, 0)); + val1 = PyStackRef_FromPyObjectNew(PyTuple_GET_ITEM(seq_o, 1)); + s = seq; + _tos_cache2 = s; + _tos_cache1 = val0; + _tos_cache0 = val1; + SET_CURRENT_CACHED_VALUES(3); + stack_pointer += -1; + ASSERT_WITHIN_STACK_BOUNDS(__FILE__, __LINE__); + assert(WITHIN_STACK_BOUNDS_IGNORING_CACHE()); + break; + } + + case _UNPACK_SEQUENCE_TWO_TUPLE_r13: { CHECK_CURRENT_CACHED_VALUES(1); assert(WITHIN_STACK_BOUNDS_IGNORING_CACHE()); _PyStackRef seq; _PyStackRef val1; _PyStackRef val0; + _PyStackRef s; _PyStackRef _stack_item_0 = _tos_cache0; oparg = CURRENT_OPARG(); seq = _stack_item_0; @@ -6316,19 +6348,11 @@ STAT_INC(UNPACK_SEQUENCE, hit); val0 = PyStackRef_FromPyObjectNew(PyTuple_GET_ITEM(seq_o, 0)); val1 = PyStackRef_FromPyObjectNew(PyTuple_GET_ITEM(seq_o, 1)); - stack_pointer[0] = val1; - stack_pointer[1] = val0; - stack_pointer += 2; - ASSERT_WITHIN_STACK_BOUNDS(__FILE__, __LINE__); - _PyFrame_SetStackPointer(frame, stack_pointer); - PyStackRef_CLOSE(seq); - stack_pointer = _PyFrame_GetStackPointer(frame); + s = seq; + _tos_cache2 = s; _tos_cache1 = val0; _tos_cache0 = val1; - _tos_cache2 = PyStackRef_ZERO_BITS; - SET_CURRENT_CACHED_VALUES(2); - stack_pointer += -2; - ASSERT_WITHIN_STACK_BOUNDS(__FILE__, __LINE__); + SET_CURRENT_CACHED_VALUES(3); assert(WITHIN_STACK_BOUNDS_IGNORING_CACHE()); break; } diff --git a/Python/generated_cases.c.h b/Python/generated_cases.c.h index 716d87fd97ac4a..e12343d4ec3c1f 100644 --- a/Python/generated_cases.c.h +++ b/Python/generated_cases.c.h @@ -11785,6 +11785,8 @@ _PyStackRef seq; _PyStackRef val1; _PyStackRef val0; + _PyStackRef s; + _PyStackRef value; // _GUARD_TOS_TUPLE { tos = stack_pointer[-1]; @@ -11810,12 +11812,17 @@ STAT_INC(UNPACK_SEQUENCE, hit); val0 = PyStackRef_FromPyObjectNew(PyTuple_GET_ITEM(seq_o, 0)); val1 = PyStackRef_FromPyObjectNew(PyTuple_GET_ITEM(seq_o, 1)); + s = seq; + } + // _POP_TOP + { + value = s; stack_pointer[-1] = val1; stack_pointer[0] = val0; stack_pointer += 1; ASSERT_WITHIN_STACK_BOUNDS(__FILE__, __LINE__); _PyFrame_SetStackPointer(frame, stack_pointer); - PyStackRef_CLOSE(seq); + PyStackRef_XCLOSE(value); stack_pointer = _PyFrame_GetStackPointer(frame); } DISPATCH(); diff --git a/Python/optimizer_bytecodes.c b/Python/optimizer_bytecodes.c index 53c7cb724e1b65..e2ef2dbe868dfc 100644 --- a/Python/optimizer_bytecodes.c +++ b/Python/optimizer_bytecodes.c @@ -1188,9 +1188,10 @@ dummy_func(void) { set = sym_new_type(ctx, &PySet_Type); } - op(_UNPACK_SEQUENCE_TWO_TUPLE, (seq -- val1, val0)) { + op(_UNPACK_SEQUENCE_TWO_TUPLE, (seq -- val1, val0, s)) { val0 = sym_tuple_getitem(ctx, seq, 0); val1 = sym_tuple_getitem(ctx, seq, 1); + s = seq; } op(_UNPACK_SEQUENCE_TUPLE, (seq -- values[oparg])) { diff --git a/Python/optimizer_cases.c.h b/Python/optimizer_cases.c.h index 49e6ac560306fe..df4af0f7912f2e 100644 --- a/Python/optimizer_cases.c.h +++ b/Python/optimizer_cases.c.h @@ -1137,13 +1137,16 @@ JitOptRef seq; JitOptRef val1; JitOptRef val0; + JitOptRef s; seq = stack_pointer[-1]; val0 = sym_tuple_getitem(ctx, seq, 0); val1 = sym_tuple_getitem(ctx, seq, 1); - CHECK_STACK_BOUNDS(1); + s = seq; + CHECK_STACK_BOUNDS(2); stack_pointer[-1] = val1; stack_pointer[0] = val0; - stack_pointer += 1; + stack_pointer[1] = s; + stack_pointer += 2; ASSERT_WITHIN_STACK_BOUNDS(__FILE__, __LINE__); break; }