Skip to content

GH-136410: Faster side exits #136411

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

Open
wants to merge 13 commits into
base: main
Choose a base branch
from
+350 −266
Open

GH-136410: Faster side exits #136411

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
a281775
Faster side exits.
markshannon Jul 7, 2025
ec7f0e2
Fix copy-and-paste error
markshannon Jul 7, 2025
911520a
Check validity at start of trace
markshannon Jul 7, 2025
73832b2
Tidy up
markshannon Jul 8, 2025
a9297a0
Null test before use
markshannon Jul 8, 2025
47b53d1
Update asserts
markshannon Jul 8, 2025
2564d41
Properly fix assert
markshannon Jul 8, 2025
779bd7d
Don't make object immortal until it is fully initialized
markshannon Jul 8, 2025
db336ce
Merge branch 'main' into fast-side-exits
markshannon Jul 21, 2025
0b05acf
Free cold executor when closing of interpreter
markshannon Jul 21, 2025
142bab6
Add NULL check
markshannon Jul 21, 2025
af696ea
Free cold executor after final GC
markshannon Jul 22, 2025
264559a
Add empty _PyExecutor_Free for non-jit builds
markshannon Jul 22, 2025
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
3 changes: 3 additions & 0 deletions Include/cpython/pystate.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,6 +198,9 @@ struct _ts {

PyObject *current_executor;

/* Internal to the JIT */
struct _PyExitData *jit_exit;

uint64_t dict_global_version;

/* Used to store/retrieve `threading.local` keys/values for this thread */
Expand Down
1 change: 1 addition & 0 deletions Include/internal/pycore_interp_structs.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -943,6 +943,7 @@ struct _is {
bool jit;
struct _PyExecutorObject *executor_list_head;
struct _PyExecutorObject *executor_deletion_list_head;
struct _PyExecutorObject *cold_executor;
int executor_deletion_list_remaining_capacity;
size_t trace_run_counter;
_rare_events rare_events;
Expand Down
13 changes: 12 additions & 1 deletion Include/internal/pycore_optimizer.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,8 +67,9 @@ typedef struct {
#endif
} _PyUOpInstruction;

typedef struct {
typedef struct _PyExitData {
uint32_t target;
uint16_t index;
_Py_BackoffCounter temperature;
struct _PyExecutorObject *executor;
} _PyExitData;
Expand Down Expand Up @@ -354,6 +355,14 @@ PyAPI_FUNC(PyObject *) _Py_uop_symbols_test(PyObject *self, PyObject *ignored);

PyAPI_FUNC(int) _PyOptimizer_Optimize(_PyInterpreterFrame *frame, _Py_CODEUNIT *start, _PyExecutorObject **exec_ptr, int chain_depth);

static inline _PyExecutorObject *_PyExecutor_FromExit(_PyExitData *exit)
{
_PyExitData *exit0 = exit - exit->index;
return (_PyExecutorObject *)(((char *)exit0) - offsetof(_PyExecutorObject, exits));
}

extern _PyExecutorObject *_PyExecutor_GetColdExecutor(void);

static inline int is_terminator(const _PyUOpInstruction *uop)
{
int opcode = uop->opcode;
Expand All @@ -363,6 +372,8 @@ static inline int is_terminator(const _PyUOpInstruction *uop)
);
}

extern void _PyExecutor_Free(_PyExecutorObject *self);

PyAPI_FUNC(int) _PyDumpExecutors(FILE *out);
#ifdef _Py_TIER2
extern void _Py_ClearExecutorDeletionList(PyInterpreterState *interp);
Expand Down
Loading
Loading