10000 gh-109094: replace frame->prev_instr by frame->instr_ptr by iritkatriel · Pull Request #109095 · python/cpython · GitHub
[go: up one dir, main page]
Skip to content

gh-109094: replace frame->prev_instr by frame->instr_ptr #109095

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
merged 102 commits into from
Oct 26, 2023
Merged

gh-109094: replace frame->prev_instr by frame->instr_ptr #109095

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
102 commits
Select commit Hold shift + click to select a range
637b5da
add instr_ptr and assert it's 1 more than prev_instr in SET_LOCALS_FR…
iritkatriel Aug 29, 2023
ffb980c
fix YIELD_VALUE
iritkatriel Aug 30, 2023
82a5b92
fix test_sys
iritkatriel Aug 30, 2023
1fc0df1
update instr_ptr in _PyOptimizer_BackEdge
iritkatriel Sep 1, 2023
6bbb1c2
All tests pass except test_jump_from_yield (which is disabled)
iritkatriel Sep 4, 2023
be6d428
assert always
iritkatriel Sep 5, 2023
bbe8e2c
remove unnecessary stuff
iritkatriel Sep 5, 2023
50a1f3a
fix test_sys expected sizes
iritkatriel Sep 5, 2023
4beb50b
add assert
iritkatriel Sep 5, 2023
8e4a310
use instr_ptr instead of prev_instr in genobject.c
iritkatriel Sep 5, 2023
58d3bc5
update executor.c
iritkatriel Sep 6, 2023
909de93
remove unecessary setting of prev_instr in _Py_call_instrumentation_jump
iritkatriel Sep 7, 2023
0a06b75
replace assignment by assertion in _Py_call_instrumentation_line
iritkatriel Sep 7, 2023
da6c97b
revert change to signature of _PyFrame_PushTrampolineUnchecked
iritkatriel Sep 7, 2023
6488d69
prev_instr --> previous_instr to avoid confusion
iritkatriel Sep 7, 2023
6c684b0
revert change to JUMPBY
iritkatriel Sep 7, 2023
b6a8b0c
use instr_ptr in _PyFrame_OpAlreadyRan
iritkatriel Sep 8, 2023
1ceeba1
use instr_ptr in _PyFrame_IsIncomplete
iritkatriel Sep 8, 2023
371fa66
use instr_ptr in LOAD_IP
iritkatriel Sep 8, 2023
557f36f
use intr_ptr in INSTRUMENTED_RESUME
iritkatriel Sep 10, 2023
cb22365
Python/optimizer.c
iritkatriel Sep 11, 2023
9875704
Merge remote-tracking branch 'upstream/main' into instr_ptr
iritkatriel Sep 11, 2023
aea21a6
tweaks
iritkatriel Sep 14, 2023
b2221d1
Merge remote-tracking branch 'upstream/main' into instr_ptr
iritkatriel Sep 14, 2023
7078fe5
skip test_long_loop for now
iritkatriel Sep 14, 2023
3ac7cc6
added harness for LASTI migration, but no functional change yet
iritkatriel Sep 15, 2023
5a672a4
WIP
iritkatriel Sep 17, 2023
4fd470e
WIP
iritkatriel Sep 18, 2023
d676f9c
WIP
iritkatriel Sep 18, 2023
1afba52
WIP
iritkatriel Sep 19, 2023
8b1643a
WIP
iritkatriel Sep 19, 2023
a386dee
fix bug
iritkatriel Sep 20, 2023
32b2cfd
add dump_frame
iritkatriel Sep 26, 2023
add2321
add yield_offset
iritkatriel Sep 26, 2023
218228b
give the POP_TOP after a RETURN_GENERATOR the same line number
iritkatriel Sep 26, 2023
0d0c25d
fix getattr overridden
iritkatriel Sep 27, 2023
4418fc4
add more data to debug output
iritkatriel Sep 27, 2023
e07b415
disable Uops tests for now
iritkatriel Sep 27, 2023
cb96aa0
always assert
iritkatriel Sep 28, 2023
729944f
remove some debug prints
iritkatriel Sep 28, 2023
44e37ee
use new lasti macro
iritkatriel Sep 28, 2023
b3b55ee
rename local
iritkatriel Sep 28, 2023
6f0fe7b
use prev_traced_instr instead of prev_instr in line tracing
iritkatriel Sep 29, 2023
2cf7e94
Merge remote-tracking branch 'upstream/main' into instr_ptr
iritkatriel Sep 29, 2023
66005ce
remove some debug prints
iritkatriel Sep 29, 2023
c9a9601
don't use prev_instr in jump instrumentation
iritkatriel Sep 29, 2023
764bd37
remove prev_instr and return_offset from frame
iritkatriel Sep 30, 2023
30e74de
skip failing tests
iritkatriel Sep 30, 2023
b63c8da
fix test_sys_settrace tests
iritkatriel Sep 30, 2023
8bade18
re-enable some tests
iritkatriel Sep 30, 2023
8b14bde
remove prev_traced_instr
iritkatriel Oct 11, 2023
d1387ed
unskip tests which are now passing
iritkatriel Oct 11, 2023
9c10b8d
one more test
iritkatriel Oct 11, 2023
287c1a5
more tests
iritkatriel Oct 11, 2023
3639796
Merge remote-tracking branch 'upstream/main' into instr_ptr
iritkatriel Oct 11, 2023
41bba62
rename new_return_offset to next_instr_offset
iritkatriel Oct 11, 2023
d363fc3
remove debug prints
iritkatriel Oct 11, 2023
efa8eab
tidy up
iritkatriel Oct 11, 2023
86cf45f
use constants
iritkatriel Oct 11, 2023
19da0c0
Merge remote-tracking branch 'upstream/main' into instr_ptr
iritkatriel Oct 12, 2023
cbee4f8
add and use constant NEXT_INSTR_OFFSET_FOR_YIELD
iritkatriel Oct 13, 2023
3a9a029
remove yield_offset from the frame
iritkatriel Oct 13, 2023
a44f4db
re-enable test_sys
iritkatriel Oct 13, 2023
62ca8ce
adjust shim frame
iritkatriel Oct 13, 2023
3fa0423
tweak assertions
iritkatriel Oct 13, 2023
488e5e7
tweaks
iritkatriel Oct 13, 2023
85f08bc
cleanup
iritkatriel Oct 13, 2023
012f911
add news
iritkatriel Oct 13, 2023
3fcfc47
fix most uop tests
iritkatriel Oct 17, 2023
d796107
_PUSH_FRAME doesn't need to update next_instr_offset
iritkatriel Oct 17, 2023
76474e3
Apply suggestions from code review
iritkatriel Oct 18, 2023
3fcbc3a
fix ()
iritkatriel Oct 18, 2023
2043c83
assert YIELD has no caches
iritkatriel Oct 18, 2023
3511bef
apply review feedback
iritkatriel Oct 18, 2023
6a85588
remove obsolete comment
iritkatriel Oct 18, 2023
8ccbe6e
remove frame->instr_ptr--; in executor
iritkatriel Oct 20, 2023
d55f048
Merge remote-tracking branch 'upstream/main' into instr_ptr
iritkatriel Oct 21, 2023
b7f86a7
Add uops support to instr_ptr branch (#55)
gvanrossum Oct 22, 2023
c6d69da
address some of Mark's comments
iritkatriel Oct 23, 2023
0da356b
address some of Mark's comments
iritkatriel Oct 23, 2023
0089b30
apply next_instr_offset on return/yield
iritkatriel Oct 24, 2023
e1ab25d
remove debug stuff
iritkatriel Oct 24, 2023
3e0b86d
prev can't be NULL
iritkatriel Oct 24, 2023
d0b2469
yield doesn't need to use next_instr_offset
iritkatriel Oct 25, 2023
7d15260
apply next_instr_offset to next_instr instead of instr_ptr
iritkatriel Oct 25, 2023
2986b9c
rename next_instr_offset to return_offset
iritkatriel Oct 25, 2023
91eb2a4
Merge remote-tracking branch 'upstream/main' into instr_ptr
iritkatriel Oct 25, 2023
1bd0be3
disable a few tier2 tests
iritkatriel Oct 25, 2023
91dddc0
revert some unnecessary changes
iritkatriel Oct 25, 2023
f3c25b5
fix ENTER_EXECUTOR and re-enable the tests
iritkatriel Oct 25, 2023
6617d60
cleanup
iritkatriel Oct 25, 2023
661dad0
_SAVE_CURRENT_IP --> _SAVE_RETURN_OFFSET
iritkatriel Oct 25, 2023
5a5103b
assignment to assertion
iritkatriel Oct 25, 2023
0b68e54
address (most of) Guido's comments
iritkatriel Oct 25, 2023
96a996c
LOAD_IP takes the offset
iritkatriel Oct 25, 2023
8574469
no need to zero return_offset
iritkatriel Oct 25, 2023
855513a
remove OPARG_SET_IP
iritkatriel Oct 25, 2023
0cf9ec9
fix test_gdb?
iritkatriel Oct 26, 2023
82f9d9d
move explanations to frame_layout.md
iritkatriel Oct 26, 2023
95b63df
Mark's comments
iritkatriel Oct 26, 2023
f2d149b
same tweak to INSTRUMENTED_YIELD_VALUE as well
iritkatriel Oct 26, 2023
578e266
Merge branch 'main' into instr_ptr
iritkatriel Oct 26, 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
Merge remote-tracking branch 'upstream/main' into instr_ptr
  • Loading branch information
@iritkatriel
iritkatriel committed Oct 12, 2023
commit 19da0c0a260ac1d66744579c9cf3ea951855f9e3
4 changes: 2 additions & 2 deletions Include/internal/pycore_frame.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -283,7 +283,7 @@ _PyFrame_PushUnchecked(PyThreadState *tstate, PyFunctionObject *func, int null_l
/* Pushes a trampoline frame without checking for space.
* Must be guarded by _PyThreadState_HasStackSpace() */
static inline _PyInterpreterFrame *
_PyFrame_PushTrampolineUnchecked(PyThreadState *tstate, PyCodeObject *code, int stackdepth, int previous_instr)
_PyFrame_PushTrampolineUnchecked(PyThreadState *tstate, PyCodeObject *code, int stackdepth)
{
CALL_STAT_INC(frames_pushed);
_PyInterpreterFrame *frame = (_PyInterpreterFrame *)tstate->datastack_top;
Expand All @@ -298,7 +298,7 @@ _PyFrame_PushTrampolineUnchecked(PyThreadState *tstate, PyCodeObject *code, int
frame->f_locals = NULL;
frame->stacktop = code->co_nlocalsplus + stackdepth;
frame->frame_obj = NULL;
frame->instr_ptr = _PyCode_CODE(code) + previous_instr + 1;
frame->instr_ptr = _PyCode_CODE(code) + 1;
frame->owner = FRAME_OWNED_BY_THREAD;
frame->next_instr_offset = 0;
frame->yield_offset = 0;
Expand Down
11 changes: 2 additions & 9 deletions Python/bytecodes.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -805,7 +805,6 @@ dummy_func(
}

macro(RETURN_VALUE) =
_SET_IP + // Tier 2 only; special-cased oparg
_SAVE_CURRENT_IP + // Sets frame->next_instr_offset
_POP_FRAME;

Expand All @@ -830,7 +829,6 @@ dummy_func(

macro(RETURN_CONST) =
LOAD_CONST +
_SET_IP + // Tier 2 only; special-cased oparg
_SAVE_CURRENT_IP + // Sets frame->next_instr_offset
_POP_FRAME;

Expand Down Expand Up @@ -3117,7 +3115,6 @@ dummy_func(
_CHECK_FUNCTION_EXACT_ARGS +
_CHECK_STACK_SPACE +
_INIT_CALL_PY_EXACT_ARGS +
_SET_IP + // Tier 2 only; special-cased oparg
_SAVE_CURRENT_IP + // Sets frame->next_instr_offset
Copy link
Member

Choose a reason for hiding this comment

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

This seems wrong. _SAVE_CURRENT_IP should save the instruction pointer.
I think the name is wrong, rather than the effect.
Are we really setting the return address? In which case, we should name it accordingly.
So it should (semantically) set both instr_ptr and the return offset.
For tier 1, the instruction pointer is already up to date, so we just need to set next_instr_offset (although I prefer the old name of return_offset.
For tier 2, we also expect the instruction pointer to up to date, as we implicitly add a _SET_IP at the start of each instruction.

Maybe add a SET_RETURN_OFFSET uop with the actual offset as its operand?

_PUSH_FRAME;

Expand All @@ -3127,7 +3124,6 @@ dummy_func(
_CHECK_FUNCTION_EXACT_ARGS +
_CHECK_STACK_SPACE +
_INIT_CALL_PY_EXACT_ARGS +
_SET_IP + // Tier 2 only; special-cased oparg
_SAVE_CURRENT_IP + // Sets frame->next_instr_offset
_PUSH_FRAME;

Expand Down Expand Up @@ -3975,21 +3971,18 @@ dummy_func(
}

op(_SET_IP, (--)) {
TIER_TWO_ONLY
frame->instr_ptr = ip_offset + oparg;
}

op(_SAVE_CURRENT_IP, (--)) {
#if TIER_ONE
TIER_ONE_ONLY
if (frame->next_instr_offset == 0) {
frame->next_instr_offset = next_instr - frame->instr_ptr;
C375 }
else {
assert(next_instr == frame->instr_ptr);
}
#endif
#if TIER_TWO
// Relies on a preceding _SET_IP
#endif
}

op(_EXIT_TRACE, (--)) {
Expand Down
16 changes: 1 addition & 15 deletions Python/executor_cases.c.h
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

24 changes: 4 additions & 20 deletions Python/generated_cases.c.h
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

You are viewing a condensed version of this merge commit. You can view the full changes here.
0