Stowage/cpython
2
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-12-31 04:23:37 +00:00
Code Issues Projects Releases Packages Wiki Activity

gh-134584: Eliminate redundant refcounting from IS_OP (GH-143171)

Browse source 
Eliminate redundant refcounting from IS_OP
This commit is contained in:
Hai Zhu 2025-12-27 04:30:02 +08:00 • committed by GitHub
parent b3f2d80569
commit a1c6308346
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
9 changed files with 1061 additions and 919 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Include/internal/pycore_opcode_metadata.h generated
View file

@ -1416,7 +1416,7 @@ _PyOpcode_macro_expansion[256] = {
[GET_YIELD_FROM_ITER] = { .nuops = 1, .uops = { { _GET_YIELD_FROM_ITER, OPARG_SIMPLE, 0 } } },
[IMPORT_FROM] = { .nuops = 1, .uops = { { _IMPORT_FROM, OPARG_SIMPLE, 0 } } },
[IMPORT_NAME] = { .nuops = 1, .uops = { { _IMPORT_NAME, OPARG_SIMPLE, 0 } } },
[IS_OP] = { .nuops = 1, .uops = { { _IS_OP, OPARG_SIMPLE, 0 } } },
[IS_OP] = { .nuops = 3, .uops = { { _IS_OP, OPARG_SIMPLE, 0 }, { _POP_TOP, OPARG_SIMPLE, 0 }, { _POP_TOP, OPARG_SIMPLE, 0 } } },
[JUMP_BACKWARD] = { .nuops = 2, .uops = { { _CHECK_PERIODIC, OPARG_SIMPLE, 1 }, { _JUMP_BACKWARD_NO_INTERRUPT, OPARG_REPLACED, 1 } } },
[JUMP_BACKWARD_NO_INTERRUPT] = { .nuops = 1, .uops = { { _JUMP_BACKWARD_NO_INTERRUPT, OPARG_REPLACED, 0 } } },
[JUMP_BACKWARD_NO_JIT] = { .nuops = 2, .uops = { { _CHECK_PERIODIC, OPARG_SIMPLE, 1 }, { _JUMP_BACKWARD_NO_INTERRUPT, OPARG_REPLACED, 1 } } },

1746
Include/internal/pycore_uop_ids.h generated
View file

File diff suppressed because it is too large Load diff

18
Include/internal/pycore_uop_metadata.h generated
View file

@ -204,7 +204,7 @@ const uint32_t _PyUop_Flags[MAX_UOP_ID+1] = {
[_COMPARE_OP_FLOAT] = HAS_ARG_FLAG,
[_COMPARE_OP_INT] = HAS_ARG_FLAG,
[_COMPARE_OP_STR] = HAS_ARG_FLAG,
[_IS_OP] = HAS_ARG_FLAG | HAS_ESCAPES_FLAG,
[_IS_OP] = HAS_ARG_FLAG,
[_CONTAINS_OP] = HAS_ARG_FLAG | HAS_ERROR_FLAG | HAS_ESCAPES_FLAG,
[_GUARD_TOS_ANY_SET] = HAS_DEOPT_FLAG,
[_CONTAINS_OP_SET] = HAS_ARG_FLAG | HAS_ERROR_FLAG | HAS_ESCAPES_FLAG,
@ -1889,11 +1889,11 @@ const _PyUopCachingInfo _PyUop_Caching[MAX_UOP_ID+1] = {
},
},
[_IS_OP] = {
.best = { 2, 2, 2, 2 },
.best = { 0, 1, 2, 2 },
.entries = {
{ -1, -1, -1 },
{ -1, -1, -1 },
{ 1, 2, _IS_OP_r21 },
{ 3, 0, _IS_OP_r03 },
{ 3, 1, _IS_OP_r13 },
{ 3, 2, _IS_OP_r23 },
{ -1, -1, -1 },
},
},
@ -3573,7 +3573,9 @@ const uint16_t _PyUop_Uncached[MAX_UOP_REGS_ID+1] = {
[_COMPARE_OP_FLOAT_r23] = _COMPARE_OP_FLOAT,
[_COMPARE_OP_INT_r23] = _COMPARE_OP_INT,
[_COMPARE_OP_STR_r23] = _COMPARE_OP_STR,
[_IS_OP_r21] = _IS_OP,
[_IS_OP_r03] = _IS_OP,
[_IS_OP_r13] = _IS_OP,
[_IS_OP_r23] = _IS_OP,
[_CONTAINS_OP_r21] = _CONTAINS_OP,
[_GUARD_TOS_ANY_SET_r01] = _GUARD_TOS_ANY_SET,
[_GUARD_TOS_ANY_SET_r11] = _GUARD_TOS_ANY_SET,
@ -4456,7 +4458,9 @@ const char *const _PyOpcode_uop_name[MAX_UOP_REGS_ID+1] = {
[_IS_NONE] = "_IS_NONE",
[_IS_NONE_r11] = "_IS_NONE_r11",
[_IS_OP] = "_IS_OP",
[_IS_OP_r21] = "_IS_OP_r21",
[_IS_OP_r03] = "_IS_OP_r03",
[_IS_OP_r13] = "_IS_OP_r13",
[_IS_OP_r23] = "_IS_OP_r23",
[_ITER_CHECK_LIST] = "_ITER_CHECK_LIST",
[_ITER_CHECK_LIST_r02] = "_ITER_CHECK_LIST_r02",
[_ITER_CHECK_LIST_r12] = "_ITER_CHECK_LIST_r12",

65
Lib/test/test_capi/test_opt.py
View file

@ -3165,6 +3165,71 @@ def testfunc(n):
self.assertNotIn("_POP_TOP_INT", uops)
self.assertIn("_POP_TOP_NOP", uops)
def test_is_op(self):
def test_is_false(n):
a = object()
b = object()
for _ in range(n):
res = a is b
return res
res, ex = self._run_with_optimizer(test_is_false, TIER2_THRESHOLD)
self.assertEqual(res, False)
self.assertIsNotNone(ex)
uops = get_opnames(ex)
self.assertIn("_IS_OP", uops)
self.assertIn("_POP_TOP_NOP", uops)
self.assertNotIn("_POP_TOP", uops)
def test_is_true(n):
a = object()
for _ in range(n):
res = a is a
return res
res, ex = self._run_with_optimizer(test_is_true, TIER2_THRESHOLD)
self.assertEqual(res, True)
self.assertIsNotNone(ex)
uops = get_opnames(ex)
self.assertIn("_IS_OP", uops)
self.assertIn("_POP_TOP_NOP", uops)
self.assertNotIn("_POP_TOP", uops)
def test_is_not(n):
a = object()
b = object()
for _ in range(n):
res = a is not b
return res
res, ex = self._run_with_optimizer(test_is_not, TIER2_THRESHOLD)
self.assertEqual(res, True)
self.assertIsNotNone(ex)
uops = get_opnames(ex)
self.assertIn("_IS_OP", uops)
self.assertIn("_POP_TOP_NOP", uops)
self.assertNotIn("_POP_TOP", uops)
def test_is_none(n):
a = None
for _ in range(n):
res = a is None
return res
res, ex = self._run_with_optimizer(test_is_none, TIER2_THRESHOLD)
self.assertEqual(res, True)
self.assertIsNotNone(ex)
self.assertIn("_IS_OP", uops)
self.assertIn("_POP_TOP_NOP", uops)
self.assertNotIn("_POP_TOP", uops)
def test_143026(self):
# https://github.com/python/cpython/issues/143026

8
Python/bytecodes.c
View file

@ -2779,10 +2779,14 @@ dummy_func(
// It's always a bool, so we don't care about oparg & 16.
}
inst(IS_OP, (left, right -- b)) {
macro(IS_OP) = _IS_OP + POP_TOP + POP_TOP;
op(_IS_OP, (left, right -- b, l, r)) {
int res = Py_Is(PyStackRef_AsPyObjectBorrow(left), PyStackRef_AsPyObjectBorrow(right)) ^ oparg;
DECREF_INPUTS();
b = res ? PyStackRef_True : PyStackRef_False;
l = left;
r = right;
INPUTS_DEAD();
}
family(CONTAINS_OP, INLINE_CACHE_ENTRIES_CONTAINS_OP) = {

74
Python/executor_cases.c.h generated
View file

@ -9087,34 +9087,78 @@
break;
}
case _IS_OP_r21: {
case _IS_OP_r03: {
CHECK_CURRENT_CACHED_VALUES(0);
assert(WITHIN_STACK_BOUNDS_IGNORING_CACHE());
_PyStackRef right;
_PyStackRef left;
_PyStackRef b;
_PyStackRef l;
_PyStackRef r;
oparg = CURRENT_OPARG();
right = stack_pointer[-1];
left = stack_pointer[-2];
int res = Py_Is(PyStackRef_AsPyObjectBorrow(left), PyStackRef_AsPyObjectBorrow(right)) ^ oparg;
b = res ? PyStackRef_True : PyStackRef_False;
l = left;
r = right;
_tos_cache2 = r;
_tos_cache1 = l;
_tos_cache0 = b;
SET_CURRENT_CACHED_VALUES(3);
stack_pointer += -2;
ASSERT_WITHIN_STACK_BOUNDS(__FILE__, __LINE__);
assert(WITHIN_STACK_BOUNDS_IGNORING_CACHE());
break;
}
case _IS_OP_r13: {
CHECK_CURRENT_CACHED_VALUES(1);
assert(WITHIN_STACK_BOUNDS_IGNORING_CACHE());
_PyStackRef right;
_PyStackRef left;
_PyStackRef b;
_PyStackRef l;
_PyStackRef r;
_PyStackRef _stack_item_0 = _tos_cache0;
oparg = CURRENT_OPARG();
right = _stack_item_0;
left = stack_pointer[-1];
int res = Py_Is(PyStackRef_AsPyObjectBorrow(left), PyStackRef_AsPyObjectBorrow(right)) ^ oparg;
b = res ? PyStackRef_True : PyStackRef_False;
l = left;
r = right;
_tos_cache2 = r;
_tos_cache1 = l;
_tos_cache0 = b;
SET_CURRENT_CACHED_VALUES(3);
stack_pointer += -1;
ASSERT_WITHIN_STACK_BOUNDS(__FILE__, __LINE__);
assert(WITHIN_STACK_BOUNDS_IGNORING_CACHE());
break;
}
case _IS_OP_r23: {
CHECK_CURRENT_CACHED_VALUES(2);
assert(WITHIN_STACK_BOUNDS_IGNORING_CACHE());
_PyStackRef right;
_PyStackRef left;
_PyStackRef b;
_PyStackRef l;
_PyStackRef r;
_PyStackRef _stack_item_0 = _tos_cache0;
_PyStackRef _stack_item_1 = _tos_cache1;
oparg = CURRENT_OPARG();
right = _stack_item_1;
left = _stack_item_0;
int res = Py_Is(PyStackRef_AsPyObjectBorrow(left), PyStackRef_AsPyObjectBorrow(right)) ^ oparg;
_PyFrame_SetStackPointer(frame, stack_pointer);
_PyStackRef tmp = right;
right = PyStackRef_NULL;
stack_pointer[0] = left;
stack_pointer[1] = right;
PyStackRef_CLOSE(tmp);
tmp = left;
left = PyStackRef_NULL;
stack_pointer[0] = left;
PyStackRef_CLOSE(tmp);
stack_pointer = _PyFrame_GetStackPointer(frame);
b = res ? PyStackRef_True : PyStackRef_False;
l = left;
r = right;
_tos_cache2 = r;
_tos_cache1 = l;
_tos_cache0 = b;
_tos_cache1 = PyStackRef_ZERO_BITS;
_tos_cache2 = PyStackRef_ZERO_BITS;
SET_CURRENT_CACHED_VALUES(1);
SET_CURRENT_CACHED_VALUES(3);
assert(WITHIN_STACK_BOUNDS_IGNORING_CACHE());
break;
}

49
Python/generated_cases.c.h generated
View file

@ -7192,25 +7192,36 @@
_PyStackRef left;
_PyStackRef right;
_PyStackRef b;
right = stack_pointer[-1];
left = stack_pointer[-2];
int res = Py_Is(PyStackRef_AsPyObjectBorrow(left), PyStackRef_AsPyObjectBorrow(right)) ^ oparg;
_PyFrame_SetStackPointer(frame, stack_pointer);
_PyStackRef tmp = right;
right = PyStackRef_NULL;
stack_pointer[-1] = right;
PyStackRef_CLOSE(tmp);
tmp = left;
left = PyStackRef_NULL;
stack_pointer[-2] = left;
PyStackRef_CLOSE(tmp);
stack_pointer = _PyFrame_GetStackPointer(frame);
stack_pointer += -2;
ASSERT_WITHIN_STACK_BOUNDS(__FILE__, __LINE__);
b = res ? PyStackRef_True : PyStackRef_False;
stack_pointer[0] = b;
stack_pointer += 1;
ASSERT_WITHIN_STACK_BOUNDS(__FILE__, __LINE__);
_PyStackRef l;
_PyStackRef r;
_PyStackRef value;
// _IS_OP
{
right = stack_pointer[-1];
left = stack_pointer[-2];
int res = Py_Is(PyStackRef_AsPyObjectBorrow(left), PyStackRef_AsPyObjectBorrow(right)) ^ oparg;
b = res ? PyStackRef_True : PyStackRef_False;
l = left;
r = right;
}
// _POP_TOP
{
value = r;
stack_pointer[-2] = b;
stack_pointer[-1] = l;
_PyFrame_SetStackPointer(frame, stack_pointer);
PyStackRef_XCLOSE(value);
stack_pointer = _PyFrame_GetStackPointer(frame);
}
// _POP_TOP
{
value = l;
stack_pointer += -1;
ASSERT_WITHIN_STACK_BOUNDS(__FILE__, __LINE__);
_PyFrame_SetStackPointer(frame, stack_pointer);
PyStackRef_XCLOSE(value);
stack_pointer = _PyFrame_GetStackPointer(frame);
}
DISPATCH();
}

4
Python/optimizer_bytecodes.c
View file

@ -478,8 +478,10 @@ dummy_func(void) {
r = right;
}
op(_IS_OP, (left, right -- b)) {
op(_IS_OP, (left, right -- b, l, r)) {
b = sym_new_type(ctx, &PyBool_Type);
l = left;
r = right;
}
op(_CONTAINS_OP, (left, right -- b)) {

14
Python/optimizer_cases.c.h generated
View file

@ -1875,11 +1875,21 @@
}
case _IS_OP: {
JitOptRef right;
JitOptRef left;
JitOptRef b;
JitOptRef l;
JitOptRef r;
right = stack_pointer[-1];
left = stack_pointer[-2];
b = sym_new_type(ctx, &PyBool_Type);
CHECK_STACK_BOUNDS(-1);
l = left;
r = right;
CHECK_STACK_BOUNDS(1);
stack_pointer[-2] = b;
stack_pointer += -1;
stack_pointer[-1] = l;
stack_pointer[0] = r;
stack_pointer += 1;
ASSERT_WITHIN_STACK_BOUNDS(__FILE__, __LINE__);
break;
}