Reduce diff to minmal

Author: Fidget-Spinner

Include/cpython/code.h

@@ -16,7 +16,6 @@ typedef struct {
 } _PyCoCached;
 
 typedef struct {
-    uint8_t is_finalizing;
     int size;
     int capacity;
     struct _PyExecutorObject *executors[1];

Include/internal/pycore_interp_structs.h

@@ -930,6 +930,14 @@ struct _is {
     struct types_state types;
     struct callable_cache callable_cache;
     PyObject *common_consts[NUM_COMMON_CONSTANTS];
+    uint8_t jit;
+    bool compiling;
+    struct _PyExecutorObject *executor_list_head;
+    struct _PyExecutorObject *executor_deletion_list_head;
+    struct _PyExecutorObject *cold_executor;
+    struct _PyExecutorObject *cold_dynamic_executor;
+    int executor_deletion_list_remaining_capacity;
+    size_t executor_creation_counter;
     _rare_events rare_events;
     PyDict_WatchCallback builtins_dict_watcher;
 

Include/internal/pycore_opcode_metadata.h

@@ -45,7 +45,6 @@ typedef struct _PyExitData {
 
 typedef struct _PyExecutorObject {
     PyObject_VAR_HEAD
-    PyThreadState *tstate;
     const _PyUOpInstruction *trace;
     _PyVMData vm_data; /* Used by the VM, but opaque to the optimizer */
     uint32_t exit_count;
@@ -74,16 +73,14 @@ PyAPI_FUNC(void) _Py_Executor_DependsOn(_PyExecutorObject *executor, void *obj);
 
 #ifdef _Py_TIER2
 PyAPI_FUNC(void) _Py_Executors_InvalidateDependency(PyInterpreterState *interp, void *obj, int is_invalidation);
-PyAPI_FUNC(void) _Py_Executors_InvalidateDependencyLockHeld(PyInterpreterState *interp, void *obj, int is_invalidation);
 PyAPI_FUNC(void) _Py_Executors_InvalidateAll(PyInterpreterState *interp, int is_invalidation);
-PyAPI_FUNC(void) _Py_Executors_InvalidateAllLockHeld(PyInterpreterState *interp, int is_invalidation);
-PyAPI_FUNC(void) _Py_Executors_InvalidateCold(PyThreadState *tstate);
-PyAPI_FUNC(void) _Py_Executors_InvalidateColdGC(PyInterpreterState *interp);
+PyAPI_FUNC(void) _Py_Executors_InvalidateCold(PyInterpreterState *interp);
+
 #else
 #  define _Py_Executors_InvalidateDependency(A, B, C) ((void)0)
 #  define _Py_Executors_InvalidateAll(A, B) ((void)0)
 #  define _Py_Executors_InvalidateCold(A) ((void)0)
-#  define _Py_Executors_InvalidateColdGC(A) ((void)0)
+
 #endif
 
 // Used as the threshold to trigger executor invalidation when
@@ -361,7 +358,9 @@ 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);
+#endif
 
 int _PyJit_translate_single_bytecode_to_trace(PyThreadState *tstate, _PyInterpreterFrame *frame, _Py_CODEUNIT *next_instr, int stop_tracing_opcode);
 
@@ -376,4 +375,4 @@ void _PyJit_FinalizeTracing(PyThreadState *tstate);
 #ifdef __cplusplus
 }
 #endif
-#endif /* !Py_INTERNAL_OPTIMIZER_H */
+#endif /* !Py_INTERNAL_OPTIMIZER_H */

Include/internal/pycore_optimizer.h

@@ -52,20 +52,7 @@ typedef struct _PyJitTracerState {
     _PyJitTracerInitialState initial_state;
     _PyJitTracerPreviousState prev_state;
 } _PyJitTracerState;
-
-#endif
-
-typedef struct _PyJitExecutorState {
-    char jit;
-#if _Py_TIER2
-    struct _PyExecutorObject *executor_list_head;
-    struct _PyExecutorObject *executor_deletion_list_head;
-    struct _PyExecutorObject *cold_executor;
-    struct _PyExecutorObject *cold_dynamic_executor;
-    int executor_deletion_list_remaining_capacity;
-    size_t executor_creation_counter;
 #endif
-} _PyJitExecutorState;
 
 // Every PyThreadState is actually allocated as a _PyThreadStateImpl. The
 // PyThreadState fields are exposed as part of the C API, although most fields
@@ -134,7 +121,6 @@ typedef struct _PyThreadStateImpl {
 #if _Py_TIER2
     _PyJitTracerState jit_tracer_state;
 #endif
-    _PyJitExecutorState jit_executor_state;
 } _PyThreadStateImpl;
 
 #ifdef __cplusplus

Include/internal/pycore_tstate.h

@@ -2185,13 +2185,6 @@ _PyCode_ReturnsOnlyNone(PyCodeObject *co)
 static void
 clear_executors(PyCodeObject *co)
 {
-#ifdef Py_GIL_DISABLED
-    uint8_t expected = 0;
-    if (!_Py_atomic_compare_exchange_uint8(&co->co_executors->is_finalizing, &expected, 1)) {
-        // Another thread is already finalizing this.
-        return;
-    }
-#endif
     assert(co->co_executors);
     for (int i = 0; i < co->co_executors->size; i++) {
         if (co->co_executors->executors[i]) {

Objects/codeobject.c

@@ -2941,7 +2941,7 @@ dummy_func(
         specializing tier1 op(_SPECIALIZE_JUMP_BACKWARD, (--)) {
         #if ENABLE_SPECIALIZATION_FT
             if (this_instr->op.code == JUMP_BACKWARD) {
-                uint8_t desired = FT_ATOMIC_LOAD_CHAR_RELAXED(((_PyThreadStateImpl*)tstate)->jit_executor_state.jit) ? JUMP_BACKWARD_JIT : JUMP_BACKWARD_NO_JIT;
+                uint8_t desired = FT_ATOMIC_LOAD_UINT8(tstate->interp->jit) ? JUMP_BACKWARD_JIT : JUMP_BACKWARD_NO_JIT;
                 FT_ATOMIC_STORE_UINT8_RELAXED(this_instr->op.code, desired);
                 // Need to re-dispatch so the warmup counter isn't off by one:
                 next_instr = this_instr;

Python/bytecodes.c

@@ -1398,8 +1398,8 @@ _Py_HandlePending(PyThreadState *tstate)
 #ifdef _Py_TIER2
     if ((breaker & _PY_EVAL_JIT_INVALIDATE_COLD_BIT) != 0) {
         _Py_unset_eval_breaker_bit(tstate, _PY_EVAL_JIT_INVALIDATE_COLD_BIT);
-        _Py_Executors_InvalidateCold(tstate);
-        ((_PyThreadStateImpl*)tstate)->jit_executor_state.executor_creation_counter = JIT_CLEANUP_THRESHOLD;
+        _Py_Executors_InvalidateCold(tstate->interp);
+        tstate->interp->executor_creation_counter = JIT_CLEANUP_THRESHOLD;
     }
 #endif
 

Python/ceval_gil.c

@@ -12,7 +12,6 @@
 #include "pycore_pystate.h"       // _PyThreadState_GET()
 #include "pycore_tuple.h"         // _PyTuple_MaybeUntrack()
 #include "pycore_weakref.h"       // _PyWeakref_ClearRef()
-#include "pycore_optimizer.h"     // _Py_Executors_InvalidateColdGC
 
 #include "pydtrace.h"
 
@@ -1736,7 +1735,6 @@ gc_collect_full(PyThreadState *tstate,
     gcstate->old[1].count = 0;
     completed_scavenge(gcstate);
     _PyGC_ClearAllFreeLists(tstate->interp);
-    _Py_Executors_InvalidateColdGC(tstate->interp);
     validate_spaces(gcstate);
     add_stats(gcstate, 2, stats);
 }

Python/gc.c

@@ -2311,8 +2311,6 @@ gc_collect_internal(PyInterpreterState *interp, struct collection_state *state,
     }
     _PyEval_StartTheWorld(interp);
 
-    _Py_Executors_InvalidateColdGC(interp);
-
     if (err < 0) {
         cleanup_worklist(&state->unreachable);
         cleanup_worklist(&state->legacy_finalizers);