Skip to content
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

Jump to bottom

gh-106581: Project through calls #108067

Merged
merged 18 commits into from
Aug 17, 2023
Merged

gh-106581: Project through calls #108067

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
138fc0e
Add function-by-version cache
gvanrossum Aug 8, 2023
6e31431
Trace into function calls
gvanrossum Aug 8, 2023
e2c8fa7
Make RESUME a viable uop
gvanrossum Aug 12, 2023
5aeb1ea
Clear func_version_cache in interpreter_clear()
gvanrossum Aug 12, 2023
129dd39
Add a small essay on function and code versions
gvanrossum Aug 12, 2023
7579ff7
Move function cache clearing earlier in finalization
gvanrossum Aug 12, 2023
6096790
Cache borrowed references, cleared in func_dealloc
gvanrossum Aug 13, 2023
36a3e86
Correctly set instr_fmt metadata for macros
gvanrossum Aug 13, 2023
d31197d
Split RETURN_{VALUE,CONST} into uops (mostly works)
gvanrossum Aug 13, 2023
01c1cdb
Change LLTRACE debug to trigger on PYTHONUOPSDEBUG >= 5, not 4
gvanrossum Aug 13, 2023
4133880
Handle _POP_FRAME in superblock properly
gvanrossum Aug 14, 2023
7892940
Handle trace stack underflow
gvanrossum Aug 14, 2023
7760028
Add _Py_LeaveRecursiveCallPy to _POP_FRAME
gvanrossum Aug 15, 2023
976f867
Ensure co_stacksize >= 1, else RETURN_CONST may crash
gvanrossum Aug 15, 2023
20786b2
Fix failing test_code (co_stacksize is never 0)
gvanrossum Aug 16, 2023
23e9895
Don't trace into functions if func_version != co_version
gvanrossum Aug 16, 2023
bde6547
Fix RETURN_VALUE/CONST with hacks
gvanrossum Aug 16, 2023
d1953ae
Merge branch 'main' into project-uops
gvanrossum Aug 17, 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
Split RETURN_{VALUE,CONST} into uops (mostly works)
  • Loading branch information
@gvanrossum
gvanrossum committed Aug 16, 2023
commit d31197dbdb76f38fec04b4ea0acf5c1f076040f5
1 change: 1 addition & 0 deletions Include/internal/pycore_ceval.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,6 +171,7 @@ void _PyEval_FormatKwargsError(PyThreadState *tstate, PyObject *func, PyObject *
PyObject *_PyEval_MatchClass(PyThreadState *tstate, PyObject *subject, PyObject *type, Py_ssize_t nargs, PyObject *kwargs);
PyObject *_PyEval_MatchKeys(PyThreadState *tstate, PyObject *map, PyObject *keys);
int _PyEval_UnpackIterable(PyThreadState *tstate, PyObject *v, int argcnt, int argcntafter, PyObject **sp);
void _PyEval_FrameClearAndPop(PyThreadState *tstate, _PyInterpreterFrame *frame);


#ifdef __cplusplus
Expand Down
66 changes: 37 additions & 29 deletions Include/internal/pycore_opcode_metadata.h
View file
Open in desktop

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

5 changes: 5 additions & 0 deletions Python/abstract_interp_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.

46 changes: 25 additions & 21 deletions Python/bytecodes.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -763,21 +763,39 @@ dummy_func(
return retval;
}

inst(RETURN_VALUE, (retval --)) {
STACK_SHRINK(1);
// The stack effect here is ambiguous.
// We definitely pop the return value off the stack on entry.
// We also push it onto the stack on exit, but that's a
// different frame, and it's accounted for by _PUSH_FRAME.
op(_POP_FRAME, (retval --)) {
assert(EMPTY());
_PyFrame_SetStackPointer(frame, stack_pointer);
SAVE_FRAME_STATE(); // Signals to the code generator
#if TIER_ONE
_Py_LeaveRecursiveCallPy(tstate);
assert(frame != &entry_frame);
#endif
// GH-99729: We need to unlink the frame *before* clearing it:
_PyInterpreterFrame *dying = frame;
#if TIER_ONE
frame = cframe.current_frame = dying->previous;
_PyEvalFrameClearAndPop(tstate, dying);
#endif
#if TIER_TWO
frame = tstate->cframe->current_frame = dying->previous;
#endif
_PyEval_FrameClearAndPop(tstate, dying);
frame->prev_instr += frame->return_offset;
_PyFrame_StackPush(frame, retval);
#if TIER_ONE
goto resume_frame;
#endif
#if TIER_TWO
stack_pointer = _PyFrame_GetStackPointer(frame);
ip_offset = (_Py_CODEUNIT *)_PyFrame_GetCode(frame)->co_code_adaptive;
#endif
}

macro(RETURN_VALUE) = _POP_FRAME;

inst(INSTRUMENTED_RETURN_VALUE, (retval --)) {
int err = _Py_call_instrumentation_arg(
tstate, PY_MONITORING_EVENT_PY_RETURN,
Expand All @@ -791,27 +809,13 @@ dummy_func(
// GH-99729: We need to unlink the frame *before* clearing it:
_PyInterpreterFrame *dying = frame;
frame = cframe.current_frame = dying->previous;
_PyEvalFrameClearAndPop(tstate, dying);
_PyEval_FrameClearAndPop(tstate, dying);
frame->prev_instr += frame->return_offset;
_PyFrame_StackPush(frame, retval);
goto resume_frame;
}

inst(RETURN_CONST, (--)) {
PyObject *retval = GETITEM(FRAME_CO_CONSTS, oparg);
Py_INCREF(retval);
assert(EMPTY());
_PyFrame_SetStackPointer(frame, stack_pointer);
_Py_LeaveRecursiveCallPy(tstate);
assert(frame != &entry_frame);
// GH-99729: We need to unlink the frame *before* clearing it:
_PyInterpreterFrame *dying = frame;
frame = cframe.current_frame = dying->previous;
_PyEvalFrameClearAndPop(tstate, dying);
frame->prev_instr += frame->return_offset;
_PyFrame_StackPush(frame, retval);
goto resume_frame;
}
macro(RETURN_CONST) = LOAD_CONST + _POP_FRAME;

inst(INSTRUMENTED_RETURN_CONST, (--)) {
PyObject *retval = GETITEM(FRAME_CO_CONSTS, oparg);
Expand All @@ -827,7 +831,7 @@ dummy_func(
// GH-99729: We need to unlink the frame *before* clearing it:
_PyInterpreterFrame *dying = frame;
frame = cframe.current_frame = dying->previous;
_PyEvalFrameClearAndPop(tstate, dying);
_PyEval_FrameClearAndPop(tstate, dying);
frame->prev_instr += frame->return_offset;
_PyFrame_StackPush(frame, retval);
goto resume_frame;
Expand Down
8 changes: 3 additions & 5 deletions Python/ceval.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,8 +222,6 @@ _PyEvalFramePushAndInit(PyThreadState *tstate, PyFunctionObject *func,
static _PyInterpreterFrame *
_PyEvalFramePushAndInit_Ex(PyThreadState *tstate, PyFunctionObject *func,
PyObject *locals, Py_ssize_t nargs, PyObject *callargs, PyObject *kwargs);
static void
_PyEvalFrameClearAndPop(PyThreadState *tstate, _PyInterpreterFrame *frame);

#ifdef HAVE_ERRNO_H
#include <errno.h>
Expand Down Expand Up @@ -925,7 +923,7 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, _PyInterpreterFrame *frame, int
// GH-99729: We need to unlink the frame *before* clearing it:
_PyInterpreterFrame *dying = frame;
frame = cframe.current_frame = dying->previous;
_PyEvalFrameClearAndPop(tstate, dying);
_PyEval_FrameClearAndPop(tstate, dying);
frame->return_offset = 0;
if (frame == &entry_frame) {
/* Restore previous cframe and exit */
Expand Down Expand Up @@ -1495,8 +1493,8 @@ clear_gen_frame(PyThreadState *tstate, _PyInterpreterFrame * frame)
frame->previous = NULL;
}

static void
_PyEvalFrameClearAndPop(PyThreadState *tstate, _PyInterpreterFrame * frame)
void
_PyEval_FrameClearAndPop(PyThreadState *tstate, _PyInterpreterFrame * frame)
{
if (frame->owner == FRAME_OWNED_BY_THREAD) {
clear_thread_frame(tstate, frame);
Expand Down
31 changes: 31 additions & 0 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.

72 changes: 54 additions & 18 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.

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 @@ -619,6 +619,12 @@ translate_bytecode_to_trace(
expansion->uops[i].offset);
Py_FatalError("garbled expansion");
}
if (expansion->uops[i].uop == _POP_FRAME) {
// TODO: Move this code *after* adding it to the trace
// TODO: Continue in the previous code object, if any
ADD_TO_TRACE(SAVE_IP, INSTR_IP(instr, code), 0);
goto done;
}
ADD_TO_TRACE(expansion->uops[i].uop, oparg, operand);
if (expansion->uops[i].uop == _PUSH_FRAME) {
assert(i + 1 == nuops);
Expand Down