Skip to content

gh-107557: Remove unnecessary SAVE_IP instructions #108583

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 12 commits into from
Aug 29, 2023
Merged

gh-107557: Remove unnecessary SAVE_IP instructions #108583

Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
f289749
Add HAS_ERROR_FLAG and HAS_DEOPT_FLAG
gvanrossum Aug 26, 2023
290f955
Write metadata for all ops and all instrs
gvanrossum Aug 28, 2023
d9258d8
Squeeze out unneeded SAVE_IP from traces
gvanrossum Aug 28, 2023
51eaa2f
Factor squeeze_stubs() out of translate_bytecode_to_trace()
gvanrossum Aug 28, 2023
4c5c38d
Use squeeze_stubs() instead of inserting NOPs into gap created by rem…
gvanrossum Aug 28, 2023
869ae8d
When there's no gap we can set trace_length = buffer_size
gvanrossum Aug 28, 2023
bf9fefd
Always remove NOPs, even if no new ones were added
gvanrossum Aug 28, 2023
8d31dc0
Change meaning of last_instr to be base-0
gvanrossum Aug 28, 2023
afb7cc1
Tweaks to debug output
gvanrossum Aug 28, 2023
67b9e6b
Rename squeeze_stubs() to move_stubs()
gvanrossum Aug 29, 2023
ad5c50f
Shorten comment
gvanrossum Aug 29, 2023
ebce668
Initialize last_instr to 0, not -1
gvanrossum Aug 29, 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
Use squeeze_stubs() instead of inserting NOPs into gap created by rem… 
…ove_unneeded_uops()
  • Loading branch information
@gvanrossum
gvanrossum committed Aug 28, 2023
commit 4c5c38d5804361b01a3319111d2a200f43a44306
10 changes: 2 additions & 8 deletions Python/optimizer.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -843,14 +843,8 @@ remove_unneeded_uops(_PyUOpInstruction *trace, int trace_length)
dest++;
}
}
// Stage 3: insert new NOPs to pad out the trace until the stubs.
// TODO: We could move the stubs, but that would require patching
// jump targets (code that exists in translate_bytecode_to_trace).
for (int pc = dest; pc <= last_instr; pc++) {
trace[pc].opcode = NOP; // TODO: Some other, fatal, opcode?
trace[pc].oparg = 0;
trace[pc].operand = 0;
}
// Stage 3: Move the stubs back.
trace_length = squeeze_stubs(trace, dest, last_instr + 1, trace_length);
#ifdef Py_DEBUG
char *uop_debug = Py_GETENV("PYTHONUOPSDEBUG");
int lltrace = 0;
Expand Down