Skip to content

gh-107674: Improve performance of sys.settrace#117133

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
May 3, 2024
Merged

gh-107674: Improve performance of sys.settrace#117133

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
ce40742
gh-107674: Improve performance of `sys.settrace` (GH-114986)
gaogaotiantian Feb 28, 2024
104fb6c
Check tracing in RESUME_CHECK
gaogaotiantian Mar 21, 2024
a65be06
Merge branch 'main' into optimize-sys-settrace
gaogaotiantian Mar 27, 2024
5157da6
Merge branch 'main' into optimize-sys-settrace
gaogaotiantian Apr 13, 2024
5583b96
Merge branch 'main' into optimize-sys-settrace
gaogaotiantian Apr 20, 2024
49545b7
Remove the optimization in RESUME_CHECK
gaogaotiantian Apr 29, 2024
83e3934
Merge branch 'main' into optimize-sys-settrace
gaogaotiantian May 2, 2024
ee16257
Merge branch 'main' into optimize-sys-settrace
gaogaotiantian May 2, 2024
0307e48
Fix merge errors
gaogaotiantian May 2, 2024
d3fbd29
Only change to RESUME_CHECK if not tracing
gaogaotiantian May 2, 2024
968a5f3
Fix assert
markshannon May 3, 2024
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
1 change: 1 addition & 0 deletions Misc/NEWS.d/next/Core and Builtins/2024-02-04-07-45-29.gh-issue-107674.q8mCmi.rst
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
Improved the performance of :func:`sys.settrace` significantly
33 changes: 17 additions & 16 deletions Python/bytecodes.c
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -148,20 +148,18 @@ dummy_func(

tier1 inst(RESUME, (--)){
assert(frame == tstate->current_frame);
uintptr_t global_version =
_Py_atomic_load_uintptr_relaxed(&tstate->eval_breaker) &
~_PY_EVAL_EVENTS_MASK;
PyCodeObject *code = _PyFrame_GetCode(frame);
uintptr_t code_version = FT_ATOMIC_LOAD_UINTPTR_ACQUIRE(code->_co_instrumentation_version);
assert((code_version & 255) == 0);
if (code_version != global_version){
int err = _Py_Instrument(code, tstate->interp);
ERROR_IF(err, error);
next_instr = this_instr;
}
else{
if ((oparg & RESUME_OPARG_LOCATION_MASK) < RESUME_AFTER_YIELD_FROM){
CHECK_EVAL_BREAKER();
if (tstate->tracing == 0){
uintptr_t global_version =
_Py_atomic_load_uintptr_relaxed(&tstate->eval_breaker) &
~_PY_EVAL_EVENTS_MASK;
PyCodeObject* code = _PyFrame_GetCode(frame);
uintptr_t code_version = FT_ATOMIC_LOAD_UINTPTR_ACQUIRE(code->_co_instrumentation_version);
assert((code_version & 255) == 0);
if (code_version != global_version){
int err = _Py_Instrument(_PyFrame_GetCode(frame), tstate->interp);
ERROR_IF(err, error);
next_instr = this_instr;
DISPATCH();
}
assert(this_instr->op.code == RESUME ||
this_instr->op.code == RESUME_CHECK ||
Expand All@@ -173,6 +171,9 @@ dummy_func(
#endif /* ENABLE_SPECIALIZATION */
}
}
if ((oparg & RESUME_OPARG_LOCATION_MASK) < RESUME_AFTER_YIELD_FROM){
CHECK_EVAL_BREAKER();
}
}

inst(RESUME_CHECK, (--)){
Expand All@@ -189,7 +190,7 @@ dummy_func(
inst(INSTRUMENTED_RESUME, (--)){
uintptr_t global_version = _Py_atomic_load_uintptr_relaxed(&tstate->eval_breaker) & ~_PY_EVAL_EVENTS_MASK;
uintptr_t code_version = FT_ATOMIC_LOAD_UINTPTR_ACQUIRE(_PyFrame_GetCode(frame)->_co_instrumentation_version);
if (code_version != global_version){
if (code_version != global_version && tstate->tracing == 0){
if (_Py_Instrument(_PyFrame_GetCode(frame), tstate->interp)){
ERROR_NO_POP();
}
Expand DownExpand Up@@ -4284,7 +4285,7 @@ dummy_func(
#endif
uintptr_t eval_breaker = _Py_atomic_load_uintptr_relaxed(&tstate->eval_breaker);
DEOPT_IF(eval_breaker & _PY_EVAL_EVENTS_MASK);
assert(eval_breaker == FT_ATOMIC_LOAD_UINTPTR_ACQUIRE(_PyFrame_GetCode(frame)->_co_instrumentation_version));
assert(tstate->tracing || eval_breaker == FT_ATOMIC_LOAD_UINTPTR_ACQUIRE(_PyFrame_GetCode(frame)->_co_instrumentation_version));
}

// END BYTECODES //
Expand Down
28 changes: 17 additions & 11 deletions Python/ceval.c
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -808,17 +808,23 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, _PyInterpreterFrame *frame, int
{
_Py_CODEUNIT *prev = frame->instr_ptr;
_Py_CODEUNIT *here = frame->instr_ptr = next_instr;
_PyFrame_SetStackPointer(frame, stack_pointer);
int original_opcode = _Py_call_instrumentation_line(
tstate, frame, here, prev);
stack_pointer = _PyFrame_GetStackPointer(frame);
if (original_opcode < 0){
next_instr = here+1;
goto error;
}
next_instr = frame->instr_ptr;
if (next_instr != here){
DISPATCH();
int original_opcode = 0;
if (tstate->tracing){
PyCodeObject *code = _PyFrame_GetCode(frame);
original_opcode = code->_co_monitoring->lines[(int)(here - _PyCode_CODE(code))].original_opcode;
} else{
_PyFrame_SetStackPointer(frame, stack_pointer);
original_opcode = _Py_call_instrumentation_line(
tstate, frame, here, prev);
stack_pointer = _PyFrame_GetStackPointer(frame);
if (original_opcode < 0){
next_instr = here+1;
goto error;
}
next_instr = frame->instr_ptr;
if (next_instr != here){
DISPATCH();
}
}
if (_PyOpcode_Caches[original_opcode]){
_PyBinaryOpCache *cache = (_PyBinaryOpCache *)(next_instr+1);
Expand Down
16 changes: 10 additions & 6 deletions Python/ceval_macros.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -358,12 +358,16 @@ do{\
// for an exception handler, displaying the traceback, and so on
#define INSTRUMENTED_JUMP(src, dest, event) \
do{\
_PyFrame_SetStackPointer(frame, stack_pointer); \
next_instr = _Py_call_instrumentation_jump(tstate, event, frame, src, dest); \
stack_pointer = _PyFrame_GetStackPointer(frame); \
if (next_instr == NULL){\
next_instr = (dest)+1; \
goto error; \
if (tstate->tracing){\
next_instr = dest; \
} else{\
_PyFrame_SetStackPointer(frame, stack_pointer); \
next_instr = _Py_call_instrumentation_jump(tstate, event, frame, src, dest); \
stack_pointer = _PyFrame_GetStackPointer(frame); \
if (next_instr == NULL){\
next_instr = (dest)+1; \
goto error; \
} \
} \
} while (0);

Expand Down
2 changes: 1 addition & 1 deletion 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.

31 changes: 16 additions & 15 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.

4 changes: 1 addition & 3 deletions Python/instrumentation.c
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -1217,15 +1217,13 @@ int
_Py_call_instrumentation_line(PyThreadState *tstate, _PyInterpreterFrame* frame, _Py_CODEUNIT *instr, _Py_CODEUNIT *prev)
{
PyCodeObject *code = _PyFrame_GetCode(frame);
assert(tstate->tracing == 0);
assert(is_version_up_to_date(code, tstate->interp));
assert(instrumentation_cross_checks(tstate->interp, code));
int i = (int)(instr - _PyCode_CODE(code));

_PyCoMonitoringData *monitoring = code->_co_monitoring;
_PyCoLineInstrumentationData *line_data = &monitoring->lines[i];
if (tstate->tracing){
goto done;
}
PyInterpreterState *interp = tstate->interp;
int8_t line_delta = line_data->line_delta;
int line = 0;
Expand Down