Skip to content

GH-109369: Exit tier 2 if executor is invalid #111657

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
markshannon merged 11 commits into from
Nov 9, 2023
Merged

GH-109369: Exit tier 2 if executor is invalid #111657

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
8fb3c7d
Exit uop trace if trace is invalid
markshannon Nov 1, 2023
62d5e68
Merge branch 'main' into exit-if-invalid
markshannon Nov 1, 2023
3dc1695
Remove debug code
markshannon Nov 1, 2023
285600c
Merge branch 'main' into exit-if-invalid
markshannon Nov 3, 2023
1630127
Remove most surplus _CHECK_VALIDITY uops
markshannon Nov 3, 2023
1a86439
Add news
markshannon Nov 3, 2023
cccba8c
Merge branch 'main' into exit-if-invalid
markshannon Nov 4, 2023
65b6e36
Make sure IP is up to date when checing validity.
markshannon Nov 4, 2023
f04bf61
Minor fixes
markshannon Nov 4, 2023
d624231
Update Python/optimizer.c
markshannon Nov 8, 2023
ce36706
Merge branch 'main' into exit-if-invalid
markshannon Nov 5, 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
Make sure IP is up to date when checing validity.
  • Loading branch information
@markshannon
markshannon committed Nov 4, 2023
commit 65b6e36a2cb210963552e5d45c8a7c7d12e3d3d0
9 changes: 2 additions & 7 deletions Lib/test/test_monitoring.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1798,17 +1798,12 @@ def test_func(recorder):
set_events = sys.monitoring.set_events
line = E.LINE
i = 0
for i in range(601):
for i in range(551):
# Turn on events without branching once i reaches 500.
set_events(TEST_TOOL, line * int(i >= 500))
pass
pass
pass
pass
pass
pass
pass
pass

self.assertEqual(sys.monitoring._all_events(), {})
events = []
Expand All @@ -1819,4 +1814,4 @@ def test_func(recorder):
finally:
sys.monitoring.register_callback(TEST_TOOL, E.LINE, None)
sys.monitoring.set_events(TEST_TOOL, 0)
self.assertGreater(len(events), 1000)
self.assertGreater(len(events), 250)
2 changes: 1 addition & 1 deletion Python/ceval.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1057,7 +1057,7 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, _PyInterpreterFrame *frame, int
deoptimize:
// On DEOPT_IF we just repeat the last instruction.
// This presumes nothing was popped from the stack (nor pushed).
DPRINTF(2, "DEOPT: [Opcode %d, operand %" PRIu64 "]\n", opcode, operand);
DPRINTF(2, "DEOPT: [Opcode %d, operand %" PRIu64 " @ %ld]\n", opcode, operand, next_uop-current_executor->trace-1);
OPT_HIST(trace_uop_execution_counter, trace_run_length_hist);
UOP_STAT_INC(opcode, miss);
frame->return_offset = 0; // Dispatch to frame->instr_ptr
Expand Down
2 changes: 2 additions & 0 deletions Python/optimizer_analysis.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,8 @@ remove_unneeded_uops(_PyUOpInstruction *buffer, int buffer_size)
}
else if (opcode == _CHECK_VALIDITY) {
if (maybe_invalid) {
/* Exiting the trace requires that IP is correct */
need_ip = true;
maybe_invalid = false;
}
else {
Expand Down