Skip to content

GH-118093: Handle some polymorphism before requiring progress in tier two #122843

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
brandtbucher merged 11 commits into from
Aug 12, 2024
Merged

GH-118093: Handle some polymorphism before requiring progress in tier two #122843

Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
1e6df25
Don't require progress on side exits
brandtbucher Jul 13, 2024
c88b70d
Add an upper bound on side exit chaining before progress is required …
brandtbucher Jul 13, 2024
5165880
Clean things up
brandtbucher Jul 18, 2024
63b5207
We still need to translate an instruction, even if progress isn't needed
brandtbucher Jul 30, 2024
17a27d0
Stitch to ENTER_EXECUTOR during projection
brandtbucher Aug 8, 2024
133aa69
Clean up the diff
brandtbucher Aug 8, 2024
a5bdc9f
blurb add
brandtbucher Aug 8, 2024
94c9308
fixup
brandtbucher Aug 8, 2024
037b3fe
Clean up the diff
brandtbucher Aug 8, 2024
45c34a3
Pack some small _PyVMData members into a bitfield
brandtbucher Aug 12, 2024
167df29
Add clarifying comments and fix style
brandtbucher Aug 12, 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
Prev Previous commit
Next Next commit
fixup
  • Loading branch information
@brandtbucher
brandtbucher committed Aug 8, 2024
commit 94c930856a4790af96408bd169d61c18b60d3cb7
4 changes: 2 additions & 2 deletions Python/optimizer.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -588,8 +588,6 @@ translate_bytecode_to_trace(
uint32_t opcode = instr->op.code;
uint32_t oparg = instr->op.arg;

/* Special case the first instruction,
* so that we can guarantee forward progress */
if (!first && instr == initial_instr) {
// We have looped around to the start:
RESERVE(1);
Expand All @@ -615,6 +613,8 @@ translate_bytecode_to_trace(
RESERVE_RAW(2, "_CHECK_VALIDITY_AND_SET_IP");
ADD_TO_TRACE(_CHECK_VALIDITY_AND_SET_IP, 0, (uintptr_t)instr, target);

/* Special case the first instruction,
* so that we can guarantee forward progress */
if (first && progress_needed) {
assert(first);
if (OPCODE_HAS_EXIT(opcode) || OPCODE_HAS_DEOPT(opcode)) {
Expand Down