Skip to content

gh-104584: Clean up and fix uops tests and fix crash #106492

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
gvanrossum merged 2 commits into from
Jul 6, 2023
Merged

gh-104584: Clean up and fix uops tests and fix crash #106492

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
39a61e0
Fix and clean up uops and executor API
gvanrossum Jul 6, 2023
de8508b
Hopeful crash fix -- add missing tp_dealloc
gvanrossum Jul 6, 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
Next Next commit
Fix and clean up uops and executor API 
The uops test wasn't testing anything by default,
and was failing when run with -Xuops.

Made the two executor-related context managers global,
so TestUops can use them (notably `with temporary_optimizer(opt)`).

Made clear_executor() a little more thorough.
  • Loading branch information
@gvanrossum
gvanrossum committed Jul 6, 2023
commit 39a61e0ff0bd6a8dbb859092e6c8e700b3c3e41a
54 changes: 30 additions & 24 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 @@ -2343,23 +2343,26 @@ def func():
names = ["func", "outer", "outer", "inner", "inner", "outer", "inner"]
self.do_test(func, names)

class TestOptimizerAPI(unittest.TestCase):

@contextlib.contextmanager
def temporary_optimizer(self, opt):
_testinternalcapi.set_optimizer(opt)
try:
yield
finally:
_testinternalcapi.set_optimizer(None)
@contextlib.contextmanager
def temporary_optimizer(opt):
_testinternalcapi.set_optimizer(opt)
try:
yield
finally:
_testinternalcapi.set_optimizer(None)

@contextlib.contextmanager
def clear_executors(self, func):
try:
yield
finally:
#Clear executors
func.__code__ = func.__code__.replace()
@contextlib.contextmanager
def clear_executors(func):
# Clear executors in func before and after running a block
func.__code__ = func.__code__.replace()
try:
yield
finally:
func.__code__ = func.__code__.replace()


class TestOptimizerAPI(unittest.TestCase):

def test_get_set_optimizer(self):
self.assertEqual(_testinternalcapi.get_optimizer(), None)
Expand All @@ -2381,9 +2384,9 @@ def loop():

for repeat in range(5):
opt = _testinternalcapi.get_counter_optimizer()
with self.temporary_optimizer(opt):
with temporary_optimizer(opt):
self.assertEqual(opt.get_count(), 0)
with self.clear_executors(loop):
with clear_executors(loop):
loop()
self.assertEqual(opt.get_count(), 1000)

Expand All @@ -2409,7 +2412,7 @@ def long_loop():
long_loop = ns['long_loop']

opt = _testinternalcapi.get_counter_optimizer()
with self.temporary_optimizer(opt):
with temporary_optimizer(opt):
self.assertEqual(opt.get_count(), 0)
long_loop()
self.assertEqual(opt.get_count(), 10)
Expand All @@ -2418,24 +2421,27 @@ def long_loop():
class TestUops(unittest.TestCase):

def test_basic_loop(self):

def testfunc(x):
i = 0
while i < x:
i += 1

testfunc(1000)
opt = _testinternalcapi.get_uop_optimizer()

with temporary_optimizer(opt):
testfunc(1000)

ex = None
for offset in range(0, 100, 2):
for offset in range(0, len(testfunc.__code__.co_code), 2):
try:
ex = _testinternalcapi.get_executor(testfunc.__code__, offset)
break
except ValueError:
pass
if ex is None:
return
self.assertIn("SAVE_IP", str(ex))
self.assertIsNotNone(ex)
uops = {opname for opname, _ in ex}
self.assertIn("SAVE_IP", uops)
self.assertIn("LOAD_FAST", uops)


if __name__ == "__main__":
Expand Down