Skip to content

gh-114058: Fix flaky globals to constant test #115423

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

Merged
merged 4 commits into from
Feb 14, 2024
Merged

gh-114058: Fix flaky globals to constant test #115423

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7927a1e
Fix flaky globals to constant test
Fidget-Spinner Feb 13, 2024
bc52c0e
fix whitespace
Fidget-Spinner Feb 13, 2024
efc5c78
Merge remote-tracking branch 'upstream/main' into fix-globals-constan…
Fidget-Spinner Feb 13, 2024
9eb7868
Display stdout and stderr on error
Fidget-Spinner Feb 14, 2024
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
43 changes: 32 additions & 11 deletions Lib/test/test_capi/test_opt.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@

import _testinternalcapi

from test.support import script_helper


@contextlib.contextmanager
def temporary_optimizer(opt):
Expand Down Expand Up @@ -659,7 +661,7 @@ def dummy(x):

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

ex = get_first_executor(testfunc)
self.assertIsNotNone(ex)
Expand All @@ -677,10 +679,10 @@ def testfunc(n):

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

ex = get_first_executor(testfunc)
self.assertEqual(res, 19 * 2)
self.assertEqual(res, 62)
self.assertIsNotNone(ex)
uops = {opname for opname, _, _ in ex}
self.assertNotIn("_GUARD_BOTH_INT", uops)
Expand All @@ -699,7 +701,7 @@ def testfunc(n):

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

ex = get_first_executor(testfunc)
self.assertEqual(res, 4)
Expand All @@ -716,7 +718,7 @@ def testfunc(n):

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

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

def dummy(x):
return x + 2
testfunc(10)
testfunc(32)

ex = get_first_executor(testfunc)
# Honestly as long as it doesn't crash it's fine.
Expand All @@ -749,20 +751,39 @@ def dummy(x):
# This test is a little implementation specific.

def test_promote_globals_to_constants(self):

result = script_helper.run_python_until_end('-c', textwrap.dedent("""
import _testinternalcapi
import opcode

def get_first_executor(func):
code = func.__code__
co_code = code.co_code
JUMP_BACKWARD = opcode.opmap["JUMP_BACKWARD"]
for i in range(0, len(co_code), 2):
if co_code[i] == JUMP_BACKWARD:
try:
return _testinternalcapi.get_executor(code, i)
except ValueError:
pass
return None

def testfunc(n):
for i in range(n):
x = range(i)
return x

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

ex = get_first_executor(testfunc)
self.assertIsNotNone(ex)
assert ex is not None
uops = {opname for opname, _, _ in ex}
self.assertNotIn("_LOAD_GLOBAL_BUILTIN", uops)
self.assertIn("_LOAD_CONST_INLINE_BORROW_WITH_NULL", uops)
assert "_LOAD_GLOBAL_BUILTINS" not in uops
assert "_LOAD_CONST_INLINE_BORROW_WITH_NULL" in uops
"""))
self.assertEqual(result[0].rc, 0, result)



Expand Down