Skip to content

GH-93897: Store frame size in code object and de-opt if insufficient space on thread frame stack. #93908

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 6 commits into from
Jun 20, 2022
Merged

GH-93897: Store frame size in code object and de-opt if insufficient space on thread frame stack. #93908

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
f1235fe
Streamline pushing frames, by deopting if insufficient space.
markshannon Jun 16, 2022
6f7b085
Move NULL check and incref off the fast path.
markshannon Jun 16, 2022
5fdd7f8
Use size in frame space check. Allows multiple frames to be checked a…
markshannon Jun 16, 2022
38e04b5
DRY stats call.
markshannon Jun 16, 2022
13d480a
Merge branch 'main' into store-code-size
markshannon Jun 16, 2022
80ebbfc
Merge branch 'main' into store-code-size
markshannon Jun 17, 2022
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 size in frame space check. Allows multiple frames to be checked a… 
…t once.
  • Loading branch information
@markshannon
markshannon committed Jun 16, 2022
commit 5fdd7f8dc5a1f9f8cffcd4f6bee86766f56963d2
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 @@ -174,9 +174,9 @@ _PyFrame_LocalsToFast(_PyInterpreterFrame *frame, int clear);


static inline bool
_PyThreadState_HasStackSpace(PyThreadState *tstate, PyCodeObject *code)
_PyThreadState_HasStackSpace(PyThreadState *tstate, int size)
{
return tstate->datastack_top + code->co_framesize < tstate->datastack_limit;
return tstate->datastack_top + size < tstate->datastack_limit;
}

extern _PyInterpreterFrame *
Expand Down
6 changes: 3 additions & 3 deletions Python/ceval.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2241,7 +2241,7 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, _PyInterpreterFrame *frame, int
DEOPT_IF(getitem->func_version != cache->func_version, BINARY_SUBSCR);
PyCodeObject *code = (PyCodeObject *)getitem->func_code;
assert(code->co_argcount == 2);
DEOPT_IF(!_PyThreadState_HasStackSpace(tstate, code), BINARY_SUBSCR);
DEOPT_IF(!_PyThreadState_HasStackSpace(tstate, code->co_framesize), BINARY_SUBSCR);
Py_INCREF(getitem);
_PyInterpreterFrame *new_frame = _PyFrame_PushUnchecked(tstate, getitem);
CALL_STAT_INC(frames_pushed);
Expand Down Expand Up @@ -4770,7 +4770,7 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, _PyInterpreterFrame *frame, int
DEOPT_IF(func->func_version != read_u32(cache->func_version), CALL);
PyCodeObject *code = (PyCodeObject *)func->func_code;
DEOPT_IF(code->co_argcount != argcount, CALL);
DEOPT_IF(!_PyThreadState_HasStackSpace(tstate, code), call);
DEOPT_IF(!_PyThreadState_HasStackSpace(tstate, code->co_framesize), CALL);
STAT_INC(CALL, hit);
_PyInterpreterFrame *new_frame = _PyFrame_PushUnchecked(tstate, func);
CALL_STAT_INC(frames_pushed);
Expand Down Expand Up @@ -4805,7 +4805,7 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, _PyInterpreterFrame *frame, int
DEOPT_IF(argcount > code->co_argcount, CALL);
int minargs = cache->min_args;
DEOPT_IF(argcount < minargs, CALL);
DEOPT_IF(!_PyThreadState_HasStackSpace(tstate, code), call);
DEOPT_IF(!_PyThreadState_HasStackSpace(tstate, code->co_framesize), CALL);
STAT_INC(CALL, hit);
_PyInterpreterFrame *new_frame = _PyFrame_PushUnchecked(tstate, func);
CALL_STAT_INC(frames_pushed);
Expand Down