Skip to content

gh-104584: Support most jumping instructions #106393

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

Closed
gvanrossum wants to merge 9 commits into from
Closed

gh-104584: Support most jumping instructions #106393

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
d31d003
Hacky way to implement jump ops
gvanrossum Jul 2, 2023
b886ca6
Make JUMP_BACKWARD[_NO_INTERRUPT] viable
gvanrossum Jul 3, 2023
28b3951
Replace ENTER_EXECUTOR with the original in trace projection
gvanrossum Jul 3, 2023
0825696
Make POP_JUMP_IF_FALSE/TRUE conditionally jump
gvanrossum Jul 3, 2023
1df7b84
Implement JUMP_TO_TOP special uop
gvanrossum Jul 3, 2023
d6235ee
Cleanup some commented-out lines
gvanrossum Jul 4, 2023
6cd5719
Tweak FOR_ITER so it's viable
gvanrossum Jul 4, 2023
b33a1a2
Check room available for JUMP_TO_TOP
gvanrossum Jul 4, 2023
f5e18d8
A stray JUMP_BACKWARD also ends the trace
gvanrossum Jul 4, 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
Replace ENTER_EXECUTOR with the original in trace projection
  • Loading branch information
@gvanrossum
gvanrossum committed Jul 7, 2023
commit 28b3951b4b4a8039ca4f0ee01b76b4772182903b
6 changes: 6 additions & 0 deletions Python/optimizer.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -419,6 +419,12 @@ translate_bytecode_to_trace(
opcode = instr->op.code;
operand = (operand << 8) | instr->op.arg;
}
if (opcode == ENTER_EXECUTOR) {
_PyExecutorObject *executor = (_PyExecutorObject *)code->co_executors->executors[operand&255];
opcode = executor->vm_data.opcode;
DPRINTF(2, " * ENTER_EXECUTOR -> %s\n", _PyOpcode_OpName[opcode]);
operand = (operand & 0xffffff00) | executor->vm_data.oparg;
}
switch (opcode) {
case LOAD_FAST_LOAD_FAST:
Copy link
Copy Markdown
Member

@markshannon markshannon Jul 4, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Rather than special case individual instructions, can we test on flags?
That way, this will continue to work if we add LOAD_FAST_LOAD_CONST.
Something like if (_Py_OpcodeMetadata[opcode].is_super_instruction)

Copy link
Copy Markdown
Member Author

@gvanrossum gvanrossum Jul 4, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We could do something where the code generator encodes this in the size field of the expansions, in the switch (currently) at line 405 below. E.g. -1 means operand >> 4 and -2 means operand & 0xF. Should probably switch to an enum. The generator would have to work a little harder but that seems doable (e.g. it could detect the use of oparg1 and oparg2 and then parse the instruction name into two pieces).

Copy link
Copy Markdown
Member

@markshannon markshannon Jul 5, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That should work, although I was thinking of the dumber approach of just annotating LOAD_FAST_LOAD_FAST, etc as a superinstruction in bytecodes.c. Something like adding /* superinstruction */

case STORE_FAST_LOAD_FAST:
Expand Down