Skip to content

GH-98831: Elaborate some cases_generator tests #101299

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 2 commits into from
Jan 25, 2023
Merged

GH-98831: Elaborate some cases_generator tests #101299

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8d6f4e1
Make macro test more elaborate
gvanrossum Jan 24, 2023
81b0508
Add test for 'register inst()'
gvanrossum Jan 24, 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
54 changes: 41 additions & 13 deletions Tools/cases_generator/test_generator.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -319,20 +319,21 @@ def test_super_instruction():

def test_macro_instruction():
input = """
inst(OP1, (counter/1, arg --)) {
op1();
inst(OP1, (counter/1, arg1 -- interim)) {
interim = op1(arg1);
}
op(OP2, (extra/2, arg --)) {
op2();
op(OP2, (extra/2, arg2, interim -- res)) {
res = op2(arg2, interim);
}
macro(OP) = OP1 + cache/2 + OP2;
"""
output = """
TARGET(OP1) {
PyObject *arg = PEEK(1);
PyObject *arg1 = PEEK(1);
PyObject *interim;
uint16_t counter = read_u16(&next_instr[0].cache);
op1();
STACK_SHRINK(1);
interim = op1(arg1);
POKE(1, interim);
JUMPBY(1);
DISPATCH();
}
Expand All @@ -341,17 +342,24 @@ def test_macro_instruction():
PyObject *_tmp_1 = PEEK(1);
PyObject *_tmp_2 = PEEK(2);
{
PyObject *arg = _tmp_1;
uint16_t counter = read_u16(&next_instr[0].cache);
op1();
PyObject *arg1 = _tmp_1;
PyObject *interim;
uint16_t counter = re
ad_u16(&next_instr[0].cache);
interim = op1(arg1);
_tmp_1 = interim;
}
{
PyObject *arg = _tmp_2;
PyObject *interim = _tmp_1;
PyObject *arg2 = _tmp_2;
PyObject *res;
uint32_t extra = read_u32(&next_instr[3].cache);
op2();
res = op2(arg2, interim);
_tmp_2 = res;
}
JUMPBY(5);
STACK_SHRINK(2);
STACK_SHRINK(1);
POKE(1, _tmp_2);
DISPATCH();
}
"""
Expand Down Expand Up @@ -434,3 +442,23 @@ def test_array_error_if():
}
"""
run_cases_test(input, output)

def test_register():
input = """
register inst(OP, (counter/1, left, right -- result)) {
result = op(left, right);
}
"""
output = """
TARGET(OP) {
PyObject *left = REG(oparg1);
PyObject *right = REG(oparg2);
PyObject *result;
uint16_t counter = read_u16(&next_instr[0].cache);
result = op(left, right);
Py_XSETREF(REG(oparg3), result);
JUMPBY(1);
DISPATCH();
}
"""
run_cases_test(input, output)