Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

gh-109039: Branch prediction for Tier 2 interpreter #109038

Merged
merged 17 commits into from
Sep 11, 2023
Merged

gh-109039: Branch prediction for Tier 2 interpreter #109038

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
44db701
inst() and macro() may need cache size metadata
gvanrossum Sep 6, 2023
ff29ab3
Add cache entry to *POP_JUMP_IF_* instructions
gvanrossum Sep 6, 2023
ebc91a2
Fix test_dis (also fixes test_peepholer)
gvanrossum Sep 7, 2023
072bb38
Fix test_monitoring
gvanrossum Sep 7, 2023
896ae53
Include pycore_bitutils.h in instrumentation.c
gvanrossum Sep 7, 2023
0eb5b90
Follow likely jumps in trace
gvanrossum Sep 7, 2023
25bfb3d
Merge remote-tracking branch 'upstream/main' into count-branches
gvanrossum Sep 7, 2023
a9c0805
Require 16 iterations before optimizing
gvanrossum Sep 7, 2023
7dfb94c
Fix existing uops tests
gvanrossum Sep 7, 2023
73eb60f
Add test for branch prediction
gvanrossum Sep 7, 2023
fbd322a
Initialize POP_JUMP_IF* counters to 0x5555
gvanrossum Sep 7, 2023
ed045d7
Update counter in INSTRUMENTED_POP_JUMP_IF_FALSE
gvanrossum Sep 8, 2023
1850988
Simplify writing of _PyOpcode_Caches
gvanrossum Sep 8, 2023
4f1684c
Fix test_huntrleaks under -Xuops
gvanrossum Sep 8, 2023
cb2cf12
Fix test_dis under -Xuops
gvanrossum Sep 8, 2023
d74670c
Merge branch 'main' into count-branches
gvanrossum Sep 11, 2023
41463a5
Update magic number
gvanrossum Sep 11, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion Include/internal/pycore_instruments.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
# error "this header requires Py_BUILD_CORE define"
#endif

#include "pycore_bitutils.h" // _Py_popcount32
#include "pycore_frame.h" // _PyInterpreterFrame

#ifdef __cplusplus
Expand Down
22 changes: 13 additions & 9 deletions Include/internal/pycore_opcode_metadata.h
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion Lib/importlib/_bootstrap_external.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -456,6 +456,7 @@ def _write_atomic(path, data, mode=0o666):
# Python 3.13a1 3558 (Reorder the stack items for CALL)
# Python 3.13a1 3559 (Generate opcode IDs from bytecodes.c)
# Python 3.13a1 3560 (Add RESUME_CHECK instruction)
# Python 3.13a1 3561 (Add cache entry to branch instructions)

# Python 3.14 will start with 3600

Expand All @@ -472,7 +473,7 @@ def _write_atomic(path, data, mode=0o666):
# Whenever MAGIC_NUMBER is changed, the ranges in the magic_values array
# in PC/launcher.c must also be updated.

MAGIC_NUMBER = (3560).to_bytes(2, 'little') + b'\r\n'
MAGIC_NUMBER = (3561).to_bytes(2, 'little') + b'\r\n'

_RAW_MAGIC_NUMBER = int.from_bytes(MAGIC_NUMBER, 'little') # For import.c

Expand Down
12 changes: 12 additions & 0 deletions Lib/opcode.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,18 @@
"counter": 1,
"version": 2,
},
"POP_JUMP_IF_TRUE": {
"counter": 1,
},
"POP_JUMP_IF_FALSE": {
"counter": 1,
},
"POP_JUMP_IF_NONE": {
"counter": 1,
},
"POP_JUMP_IF_NOT_NONE": {
"counter": 1,
},
}

_inline_cache_entries = {
Expand Down
17 changes: 17 additions & 0 deletions Lib/test/support/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@
"LOOPBACK_TIMEOUT", "INTERNET_TIMEOUT", "SHORT_TIMEOUT", "LONG_TIMEOUT",
"Py_DEBUG", "EXCEEDS_RECURSION_LIMIT", "Py_C_RECURSION_LIMIT",
"skip_on_s390x",
"without_optimizer",
]


Expand Down Expand Up @@ -2533,3 +2534,19 @@ def adjust_int_max_str_digits(max_digits):
'skipped on s390x')

Py_TRACE_REFS = hasattr(sys, 'getobjects')

# Decorator to disable optimizer while a function run
def without_optimizer(func):
try:
import _testinternalcapi
except ImportError:
return func
@functools.wraps(func)
def wrapper(*args, **kwargs):
save_opt = _testinternalcapi.get_optimizer()
try:
_testinternalcapi.set_optimizer(None)
return func(*args, **kwargs)
finally:
_testinternalcapi.set_optimizer(save_opt)
return wrapper
45 changes: 31 additions & 14 deletions Lib/test/test_capi/test_misc.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2455,7 +2455,7 @@ def testfunc(x):
opt = _testinternalcapi.get_uop_optimizer()

with temporary_optimizer(opt):
testfunc(10)
testfunc(20)

ex = get_first_executor(testfunc)
self.assertIsNotNone(ex)
Expand All @@ -2470,7 +2470,7 @@ def testfunc(n):

opt = _testinternalcapi.get_uop_optimizer()
with temporary_optimizer(opt):
testfunc(10)
testfunc(20)

ex = get_first_executor(testfunc)
self.assertIsNotNone(ex)
Expand All @@ -2485,7 +2485,7 @@ def testfunc(a):

opt = _testinternalcapi.get_uop_optimizer()
with temporary_optimizer(opt):
testfunc(range(10))
testfunc(range(20))

ex = get_first_executor(testfunc)
self.assertIsNotNone(ex)
Expand All @@ -2495,12 +2495,13 @@ def testfunc(a):
def test_pop_jump_if_not_none(self):
def testfunc(a):
for x in a:
x = None
if x is not None:
x = 0

opt = _testinternalcapi.get_uop_optimizer()
with temporary_optimizer(opt):
testfunc(range(10))
testfunc(range(20))

ex = get_first_executor(testfunc)
self.assertIsNotNone(ex)
Expand All @@ -2515,7 +2516,7 @@ def testfunc(n):

opt = _testinternalcapi.get_uop_optimizer()
with temporary_optimizer(opt):
testfunc(10)
testfunc(20)

ex = get_first_executor(testfunc)
self.assertIsNotNone(ex)
Expand All @@ -2530,7 +2531,7 @@ def testfunc(n):

opt = _testinternalcapi.get_uop_optimizer()
with temporary_optimizer(opt):
testfunc(10)
testfunc(20)

ex = get_first_executor(testfunc)
self.assertIsNotNone(ex)
Expand All @@ -2550,7 +2551,7 @@ def testfunc(n):

opt = _testinternalcapi.get_uop_optimizer()
with temporary_optimizer(opt):
testfunc(10)
testfunc(20)

ex = get_first_executor(testfunc)
self.assertIsNotNone(ex)
Expand All @@ -2568,8 +2569,8 @@ def testfunc(n):

opt = _testinternalcapi.get_uop_optimizer()
with temporary_optimizer(opt):
total = testfunc(10)
self.assertEqual(total, 45)
total = testfunc(20)
self.assertEqual(total, 190)

ex = get_first_executor(testfunc)
self.assertIsNotNone(ex)
Expand All @@ -2589,9 +2590,9 @@ def testfunc(a):

opt = _testinternalcapi.get_uop_optimizer()
with temporary_optimizer(opt):
a = list(range(10))
a = list(range(20))
total = testfunc(a)
self.assertEqual(total, 45)
self.assertEqual(total, 190)

ex = get_first_executor(testfunc)
self.assertIsNotNone(ex)
Expand All @@ -2611,9 +2612,9 @@ def testfunc(a):

opt = _testinternalcapi.get_uop_optimizer()
with temporary_optimizer(opt):
a = tuple(range(10))
a = tuple(range(20))
total = testfunc(a)
self.assertEqual(total, 45)
self.assertEqual(total, 190)

ex = get_first_executor(testfunc)
self.assertIsNotNone(ex)
Expand Down Expand Up @@ -2647,14 +2648,30 @@ def dummy(x):

opt = _testinternalcapi.get_uop_optimizer()
with temporary_optimizer(opt):
testfunc(10)
testfunc(20)

ex = get_first_executor(testfunc)
self.assertIsNotNone(ex)
uops = {opname for opname, _, _ in ex}
self.assertIn("_PUSH_FRAME", uops)
self.assertIn("_BINARY_OP_ADD_INT", uops)

def test_branch_taken(self):
def testfunc(n):
for i in range(n):
if i < 0:
i = 0
else:
i = 1

opt = _testinternalcapi.get_uop_optimizer()
with temporary_optimizer(opt):
testfunc(20)

ex = get_first_executor(testfunc)
self.assertIsNotNone(ex)
uops = {opname for opname, _, _ in ex}
self.assertIn("_POP_JUMP_IF_TRUE", uops)


if __name__ == "__main__":
Expand Down
Loading
Loading