PublicArchive/cpython
2
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2026-05-06 04:37:33 -04:00
Code Issues Packages Projects Releases Wiki Activity

gh-148515: make optimizer_generator respect multiple caches (#148524)

Browse Source
This commit is contained in:
Neko Asakura
2026-04-14 00:51:05 -04:00
committed by GitHub
parent c40e8b016a
commit e02ac1d907
4 changed files with 33 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Lib/test/test_generated_cases.py
+25
View File
@@ -2696,5 +2696,30 @@ class TestGeneratedAbstractCases(unittest.TestCase):
"Pure evaluation cannot take array-like inputs"):
self.run_cases_test(input, input2, output)
def test_overridden_abstract_with_multiple_caches(self):
input = """
op(OP, (version/1, unused/1, index/1, value -- res)) {
res = SPAM(version, index, value);
}
"""
input2 = """
op(OP, (value -- res)) {
res = eggs(version, index, value);
}
"""
output = """
case OP: {
JitOptRef value;
JitOptRef res;
value = stack_pointer[-1];
uint16_t version = (uint16_t)this_instr->operand0;
uint16_t index = (uint16_t)this_instr->operand1;
res = eggs(version, index, value);
stack_pointer[-1] = res;
break;
}
"""
self.run_cases_test(input, input2, output)
if __name__ == "__main__":
unittest.main()
Misc/NEWS.d/next/Core_and_Builtins/2026-04-13-16-52-33.gh-issue-148515.09xulC.rst
+2
View File
@@ -0,0 +1,2 @@
Fix a bug in the JIT optimizer reading operands for uops with multiple
caches.
Python/optimizer_cases.c.h
Generated
+3 -3
View File
@@ -2072,7 +2072,7 @@
case _LOAD_GLOBAL_MODULE: {
JitOptRef res;
uint16_t version = (uint16_t)this_instr->operand0;
uint16_t index = (uint16_t)this_instr->operand0;
uint16_t index = (uint16_t)this_instr->operand1;
(void)index;
PyObject *cnst = NULL;
if (ctx->frame->func != NULL) {
@@ -2119,7 +2119,7 @@
case _LOAD_GLOBAL_BUILTINS: {
JitOptRef res;
uint16_t version = (uint16_t)this_instr->operand0;
uint16_t index = (uint16_t)this_instr->operand0;
uint16_t index = (uint16_t)this_instr->operand1;
(void)version;
(void)index;
PyObject *cnst = NULL;
@@ -2487,7 +2487,7 @@
JitOptRef o;
owner = stack_pointer[-1];
uint32_t dict_version = (uint32_t)this_instr->operand0;
uint16_t index = (uint16_t)this_instr->operand0;
uint16_t index = (uint16_t)this_instr->operand1;
(void)dict_version;
(void)index;
attr = PyJitRef_NULL;
Tools/cases_generator/optimizer_generator.py
+3 -1
View File
@@ -412,6 +412,7 @@ def write_uop(
args.append(input.name)
out.emit(f'DEBUG_PRINTF({", ".join(args)});\n')
if override:
idx = 0
for cache in uop.caches:
if cache.name != "unused":
if cache.size == 4:
@@ -419,7 +420,8 @@ def write_uop(
else:
type = f"uint{cache.size*16}_t "
cast = f"uint{cache.size*16}_t"
out.emit(f"{type}{cache.name} = ({cast})this_instr->operand0;\n")
out.emit(f"{type}{cache.name} = ({cast})this_instr->operand{idx};\n")
idx += 1
if override:
emitter = OptimizerEmitter(out, {}, uop, stack.copy())
# No reference management of inputs needed.