mirrors/cpython
0
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2024-12-12 19:33:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

gh-106529: Generate uops for POP_JUMP_IF_[NOT_]NONE (#106796)

Browse Source 
These aren't automatically translated because (ironically)
they are macros deferring to POP_JUMP_IF_{TRUE,FALSE},
which are not viable uops (being manually translated).

The hack is that we emit IS_NONE and then set opcode and
jump to the POP_JUMP_IF_{TRUE,FALSE} translation code.
This commit is contained in:
Guido van Rossum 2023-07-17 10:06:05 -07:00 committed by GitHub
parent ad95c7253a
commit b2b261ab2a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 47 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
Lib/test/test_capi/test_misc.py
View File

@ -2532,6 +2532,36 @@ class TestUops(unittest.TestCase):
uops = {opname for opname, _ in ex}
self.assertIn("_POP_JUMP_IF_FALSE", uops)
def test_pop_jump_if_none(self):
def testfunc(a):
for x in a:
if x is None:
x = 0
opt = _testinternalcapi.get_uop_optimizer()
with temporary_optimizer(opt):
testfunc([1, 2, 3])
ex = get_first_executor(testfunc)
self.assertIsNotNone(ex)
uops = {opname for opname, _ in ex}
self.assertIn("_POP_JUMP_IF_TRUE", uops)
def test_pop_jump_if_not_none(self):
def testfunc(a):
for x in a:
if x is not None:
x = 0
opt = _testinternalcapi.get_uop_optimizer()
with temporary_optimizer(opt):
testfunc([1, 2, 3])
ex = get_first_executor(testfunc)
self.assertIsNotNone(ex)
uops = {opname for opname, _ in ex}
self.assertIn("_POP_JUMP_IF_FALSE", uops)
def test_pop_jump_if_true(self):
def testfunc(n):
i = 0

17
Python/optimizer.c
View File

@ -464,9 +464,26 @@ translate_bytecode_to_trace(
switch (opcode) {
case POP_JUMP_IF_NONE:
{
RESERVE(2, 2);
ADD_TO_TRACE(IS_NONE, 0);
opcode = POP_JUMP_IF_TRUE;
goto pop_jump_if_bool;
}
case POP_JUMP_IF_NOT_NONE:
{
RESERVE(2, 2);
ADD_TO_TRACE(IS_NONE, 0);
opcode = POP_JUMP_IF_FALSE;
goto pop_jump_if_bool;
}
case POP_JUMP_IF_FALSE:
case POP_JUMP_IF_TRUE:
{
pop_jump_if_bool:
// Assume jump unlikely (TODO: handle jump likely case)
RESERVE(1, 2);
_Py_CODEUNIT *target_instr =