Stowage/cpython
2
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2026-05-29 22:01:05 +00:00
Code Issues Projects Releases Packages Wiki Activity

gh-134584: Eliminate redundant refcounting from _STORE_ATTR_INSTANCE_VALUE (GH-142759)

Browse source 
Signed-off-by: Manjusaka <me@manjusaka.me>
This commit is contained in:
Nadeshiko Manju 2025-12-16 04:17:12 +08:00 • committed by GitHub
parent 0ac4e6c6cd
commit 059316ade6
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
10 changed files with 67 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Include/internal/pycore_opcode_metadata.h generated
View file

@ -1482,7 +1482,7 @@ _PyOpcode_macro_expansion[256] = {
[SET_FUNCTION_ATTRIBUTE] = { .nuops = 1, .uops = { { _SET_FUNCTION_ATTRIBUTE, OPARG_SIMPLE, 0 } } },
[SET_UPDATE] = { .nuops = 1, .uops = { { _SET_UPDATE, OPARG_SIMPLE, 0 } } },
[STORE_ATTR] = { .nuops = 1, .uops = { { _STORE_ATTR, OPARG_SIMPLE, 3 } } },
[STORE_ATTR_INSTANCE_VALUE] = { .nuops = 3, .uops = { { _GUARD_TYPE_VERSION_AND_LOCK, 2, 1 }, { _GUARD_DORV_NO_DICT, OPARG_SIMPLE, 3 }, { _STORE_ATTR_INSTANCE_VALUE, 1, 3 } } },
[STORE_ATTR_INSTANCE_VALUE] = { .nuops = 4, .uops = { { _GUARD_TYPE_VERSION_AND_LOCK, 2, 1 }, { _GUARD_DORV_NO_DICT, OPARG_SIMPLE, 3 }, { _STORE_ATTR_INSTANCE_VALUE, 1, 3 }, { _POP_TOP, OPARG_SIMPLE, 4 } } },
[STORE_ATTR_SLOT] = { .nuops = 2, .uops = { { _GUARD_TYPE_VERSION, 2, 1 }, { _STORE_ATTR_SLOT, 1, 3 } } },
[STORE_ATTR_WITH_HINT] = { .nuops = 2, .uops = { { _GUARD_TYPE_VERSION, 2, 1 }, { _STORE_ATTR_WITH_HINT, 1, 3 } } },
[STORE_DEREF] = { .nuops = 1, .uops = { { _STORE_DEREF, OPARG_SIMPLE, 0 } } },

2
Include/internal/pycore_uop_ids.h generated
View file

@ -1037,7 +1037,7 @@ extern "C" {
#define _SPILL_OR_RELOAD_r32 1230
#define _START_EXECUTOR_r00 1231
#define _STORE_ATTR_r20 1232
#define _STORE_ATTR_INSTANCE_VALUE_r20 1233
#define _STORE_ATTR_INSTANCE_VALUE_r21 1233
#define _STORE_ATTR_SLOT_r20 1234
#define _STORE_ATTR_WITH_HINT_r20 1235
#define _STORE_DEREF_r10 1236

6
Include/internal/pycore_uop_metadata.h generated
View file

@ -1828,7 +1828,7 @@ const _PyUopCachingInfo _PyUop_Caching[MAX_UOP_ID+1] = {
.entries = {
{ -1, -1, -1 },
{ -1, -1, -1 },
{ 0, 2, _STORE_ATTR_INSTANCE_VALUE_r20 },
{ 1, 2, _STORE_ATTR_INSTANCE_VALUE_r21 },
{ -1, -1, -1 },
},
},
@ -3546,7 +3546,7 @@ const uint16_t _PyUop_Uncached[MAX_UOP_REGS_ID+1] = {
[_GUARD_DORV_NO_DICT_r11] = _GUARD_DORV_NO_DICT,
[_GUARD_DORV_NO_DICT_r22] = _GUARD_DORV_NO_DICT,
[_GUARD_DORV_NO_DICT_r33] = _GUARD_DORV_NO_DICT,
[_STORE_ATTR_INSTANCE_VALUE_r20] = _STORE_ATTR_INSTANCE_VALUE,
[_STORE_ATTR_INSTANCE_VALUE_r21] = _STORE_ATTR_INSTANCE_VALUE,
[_STORE_ATTR_WITH_HINT_r20] = _STORE_ATTR_WITH_HINT,
[_STORE_ATTR_SLOT_r20] = _STORE_ATTR_SLOT,
[_COMPARE_OP_r21] = _COMPARE_OP,
@ -4784,7 +4784,7 @@ const char *const _PyOpcode_uop_name[MAX_UOP_REGS_ID+1] = {
[_STORE_ATTR] = "_STORE_ATTR",
[_STORE_ATTR_r20] = "_STORE_ATTR_r20",
[_STORE_ATTR_INSTANCE_VALUE] = "_STORE_ATTR_INSTANCE_VALUE",
[_STORE_ATTR_INSTANCE_VALUE_r20] = "_STORE_ATTR_INSTANCE_VALUE_r20",
[_STORE_ATTR_INSTANCE_VALUE_r21] = "_STORE_ATTR_INSTANCE_VALUE_r21",
[_STORE_ATTR_SLOT] = "_STORE_ATTR_SLOT",
[_STORE_ATTR_SLOT_r20] = "_STORE_ATTR_SLOT_r20",
[_STORE_ATTR_WITH_HINT] = "_STORE_ATTR_WITH_HINT",

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

@ -2511,6 +2511,23 @@ def testfunc(n):
self.assertNotIn("_GUARD_TOS_INT", uops)
self.assertNotIn("_GUARD_NOS_INT", uops)
def test_store_attr_instance_value(self):
def testfunc(n):
class C:
pass
c = C()
for i in range(n):
c.a = i
return c.a
res, ex = self._run_with_optimizer(testfunc, TIER2_THRESHOLD)
self.assertEqual(res, TIER2_THRESHOLD - 1)
self.assertIsNotNone(ex)
uops = get_opnames(ex)
self.assertIn("_STORE_ATTR_INSTANCE_VALUE", uops)
self.assertNotIn("_POP_TOP", uops)
self.assertIn("_POP_TOP_NOP", uops)
def test_store_subscr_int(self):
def testfunc(n):
l = [0, 0, 0, 0]

1
Misc/NEWS.d/next/Core_and_Builtins/2025-12-16-01-17-21.gh-issue-134584.tsxYYw.rst Normal file
View file

@ -0,0 +1 @@
Eliminate redundant refcounting from ``_STORE_ATTR_INSTANCE_VALUE``.

8
Python/bytecodes.c
View file

@ -2575,7 +2575,7 @@ dummy_func(
}
}
op(_STORE_ATTR_INSTANCE_VALUE, (offset/1, value, owner --)) {
op(_STORE_ATTR_INSTANCE_VALUE, (offset/1, value, owner -- o)) {
PyObject *owner_o = PyStackRef_AsPyObjectBorrow(owner);
STAT_INC(STORE_ATTR, hit);
@ -2589,7 +2589,8 @@ dummy_func(
_PyDictValues_AddToInsertionOrder(values, index);
}
UNLOCK_OBJECT(owner_o);
PyStackRef_CLOSE(owner);
o = owner;
DEAD(owner);
Py_XDECREF(old_value);
}
@ -2597,7 +2598,8 @@ dummy_func(
unused/1 +
_GUARD_TYPE_VERSION_AND_LOCK +
_GUARD_DORV_NO_DICT +
_STORE_ATTR_INSTANCE_VALUE;
_STORE_ATTR_INSTANCE_VALUE +
POP_TOP;
op(_STORE_ATTR_WITH_HINT, (hint/1, value, owner --)) {
PyObject *owner_o = PyStackRef_AsPyObjectBorrow(owner);

14
Python/executor_cases.c.h generated
View file

@ -8728,11 +8728,12 @@
break;
}
case _STORE_ATTR_INSTANCE_VALUE_r20: {
case _STORE_ATTR_INSTANCE_VALUE_r21: {
CHECK_CURRENT_CACHED_VALUES(2);
assert(WITHIN_STACK_BOUNDS_IGNORING_CACHE());
_PyStackRef owner;
_PyStackRef value;
_PyStackRef o;
_PyStackRef _stack_item_0 = _tos_cache0;
_PyStackRef _stack_item_1 = _tos_cache1;
owner = _stack_item_1;
@ -8750,14 +8751,19 @@
_PyDictValues_AddToInsertionOrder(values, index);
}
UNLOCK_OBJECT(owner_o);
o = owner;
stack_pointer[0] = o;
stack_pointer += 1;
ASSERT_WITHIN_STACK_BOUNDS(__FILE__, __LINE__);
_PyFrame_SetStackPointer(frame, stack_pointer);
PyStackRef_CLOSE(owner);
Py_XDECREF(old_value);
stack_pointer = _PyFrame_GetStackPointer(frame);
_tos_cache0 = PyStackRef_ZERO_BITS;
_tos_cache0 = o;
_tos_cache1 = PyStackRef_ZERO_BITS;
_tos_cache2 = PyStackRef_ZERO_BITS;
SET_CURRENT_CACHED_VALUES(0);
SET_CURRENT_CACHED_VALUES(1);
stack_pointer += -1;
ASSERT_WITHIN_STACK_BOUNDS(__FILE__, __LINE__);
assert(WITHIN_STACK_BOUNDS_IGNORING_CACHE());
break;
}

15
Python/generated_cases.c.h generated
View file

@ -10535,6 +10535,7 @@
static_assert(INLINE_CACHE_ENTRIES_STORE_ATTR == 4, "incorrect cache size");
_PyStackRef owner;
_PyStackRef value;
_PyStackRef o;
/* Skip 1 cache entry */
// _GUARD_TYPE_VERSION_AND_LOCK
{
@ -10588,13 +10589,23 @@
_PyDictValues_AddToInsertionOrder(values, index);
}
UNLOCK_OBJECT(owner_o);
stack_pointer += -2;
o = owner;
stack_pointer[-2] = o;
stack_pointer += -1;
ASSERT_WITHIN_STACK_BOUNDS(__FILE__, __LINE__);
_PyFrame_SetStackPointer(frame, stack_pointer);
PyStackRef_CLOSE(owner);
Py_XDECREF(old_value);
stack_pointer = _PyFrame_GetStackPointer(frame);
}
// _POP_TOP
{
value = o;
stack_pointer += -1;
ASSERT_WITHIN_STACK_BOUNDS(__FILE__, __LINE__);
_PyFrame_SetStackPointer(frame, stack_pointer);
PyStackRef_XCLOSE(value);
stack_pointer = _PyFrame_GetStackPointer(frame);
}
DISPATCH();
}

5
Python/optimizer_bytecodes.c
View file

@ -99,6 +99,11 @@ dummy_func(void) {
GETLOCAL(oparg) = temp;
}
op(_STORE_ATTR_INSTANCE_VALUE, (offset/1, value, owner -- o)) {
(void)value;
o = owner;
}
op(_STORE_FAST, (value --)) {
GETLOCAL(oparg) = value;
}

13
Python/optimizer_cases.c.h generated
View file

@ -1885,8 +1885,17 @@
}
case _STORE_ATTR_INSTANCE_VALUE: {
CHECK_STACK_BOUNDS(-2);
stack_pointer += -2;
JitOptRef owner;
JitOptRef value;
JitOptRef o;
owner = stack_pointer[-1];
value = stack_pointer[-2];
uint16_t offset = (uint16_t)this_instr->operand0;
(void)value;
o = owner;
CHECK_STACK_BOUNDS(-1);
stack_pointer[-2] = o;
stack_pointer += -1;
ASSERT_WITHIN_STACK_BOUNDS(__FILE__, __LINE__);
break;
}