Skip to content

gh-106529: Split FOR_ITER_{LIST,TUPLE} into uops #106696

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 13 commits into from
Jul 14, 2023
Merged

gh-106529: Split FOR_ITER_{LIST,TUPLE} into uops #106696

Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
1f29466
Attack FOR_ITER_LIST, part 1 (Tier 1)
gvanrossum Jul 12, 2023
020c4c7
FOR_ITER_LIST Tier 2; fix a reservation bug
gvanrossum Jul 12, 2023
a94e583
Make reserving space less error-prone
gvanrossum Jul 12, 2023
3f3a9e8
Add test for FOR_ITER_LIST in Tier 2
gvanrossum Jul 12, 2023
ff08319
FOR_ITER_TUPLE Tier 1
gvanrossum Jul 12, 2023
c427351
FOR_ITER_TUPLE Tier 2
gvanrossum Jul 12, 2023
173cc7c
Test for FOR_ITER_TUPLE Tier 2
gvanrossum Jul 12, 2023
6681cd2
Tweak dummy definitions/includes
gvanrossum Jul 12, 2023
354c892
Merge remote-tracking branch 'origin/main' into for-iter-list-tuple
gvanrossum Jul 13, 2023
13708da
Rename _ITER_EXHAUSTED_XXX to _IS_ITER_EXHAUSTED_XXX
gvanrossum Jul 13, 2023
93355ea
Fix tests
gvanrossum Jul 13, 2023
52dc7f5
Improve formatting of FOR_ITER_XXX macros
gvanrossum Jul 13, 2023
63f101d
Use Py_UNREACHABLE() instead of assert(0)
gvanrossum Jul 13, 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
Prev Previous commit
Next Next commit
FOR_ITER_LIST Tier 2; fix a reservation bug
  • Loading branch information
@gvanrossum
gvanrossum committed Jul 12, 2023
commit 020c4c77a4f03450a5eb7daf52db03077cb52901
31 changes: 26 additions & 5 deletions Python/optimizer.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -474,26 +474,47 @@ translate_bytecode_to_trace(

case JUMP_FORWARD:
{
// Reserve 2 entries (SAVE_IP + EXIT_TRACE)
if (trace_length + 2 > max_length) {
DPRINTF(1, "Ran out of space for JUMP_FORWARD\n");
goto done;
}
// This will emit two SAVE_IP instructions; leave it to the optimizer
instr += oparg;
break;
}

case FOR_ITER_LIST:
case FOR_ITER_RANGE:
{
int check_op, exhausted_op, next_op;
switch (opcode) {
case FOR_ITER_LIST:
check_op = _ITER_CHECK_LIST;
exhausted_op = _ITER_EXHAUSTED_LIST;
next_op = _ITER_NEXT_LIST;
break;
case FOR_ITER_RANGE:
check_op = _ITER_CHECK_RANGE;
exhausted_op = _ITER_EXHAUSTED_RANGE;
next_op = _ITER_NEXT_RANGE;
break;
default:
assert(0);
Comment thread
gvanrossum marked this conversation as resolved.
Outdated
}
// Assume jump unlikely (can a for-loop exit be likely?)
// Reserve 9 entries (4 here, 3 stub, plus SAVE_IP + EXIT_TRACE)
if (trace_length + 9 > max_length) {
DPRINTF(1, "Ran out of space for FOR_ITER_RANGE\n");
goto done;
DPRINTF(1, "Ran out of space for %s\n", uop_name(opcode));
goto done;
}
_Py_CODEUNIT *target_instr = // +1 at the end skips over END_FOR
instr + 1 + _PyOpcode_Caches[_PyOpcode_Deopt[opcode]] + oparg + 1;
max_length -= 3; // Really the start of the stubs
ADD_TO_TRACE(_ITER_CHECK_RANGE, 0);
ADD_TO_TRACE(_ITER_EXHAUSTED_RANGE, 0);
ADD_TO_TRACE(check_op, 0);
ADD_TO_TRACE(exhausted_op, 0);
ADD_TO_TRACE(_POP_JUMP_IF_TRUE, max_length);
ADD_TO_TRACE(_ITER_NEXT_RANGE, 0);
ADD_TO_TRACE(next_op, 0);

ADD_TO_STUB(max_length + 0, POP_TOP, 0);
ADD_TO_STUB(max_length + 1, SAVE_IP, INSTR_IP(target_instr, code));
Expand Down