invalidate freed code/function objects used for global promotion

diff --git a/Include/internal/pycore_interp_structs.h b/Include/internal/pycore_interp_structs.h
index e3264035ed9b4e8330a44bb874701328e30d1e1e..42295de90478f9907b02894271c6c98077bab1c4 100644 (file)
--- a/Include/internal/pycore_interp_structs.h
+++ b/Include/internal/pycore_interp_structs.h
@@ -947,6 +947,7 @@ struct _is {
     int jit_tracer_code_max_size;
     int jit_tracer_code_curr_size;
     _PyBloomFilter jit_tracer_dependencies;
+    bool jit_tracer_dependencies_still_valid;
     _PyUOpInstruction *jit_tracer_code_buffer;
     _Py_CODEUNIT *jit_tracer_initial_instr;
     int jit_tracer_initial_stack_depth;

diff --git a/Include/internal/pycore_optimizer.h b/Include/internal/pycore_optimizer.h
index 748bf854768c0b24114ea7cf4840956267ac742c..ca9f9702df4cdf2e73edc29b852d0e6a677e17ea 100644 (file)
--- a/Include/internal/pycore_optimizer.h
+++ b/Include/internal/pycore_optimizer.h
@@ -375,6 +375,9 @@ void
 _PyJIT_InitializeTracing(PyThreadState *tstate, _PyInterpreterFrame *frame, _Py_CODEUNIT *next_instr, int curr_stackdepth, int chain_depth, _PyExitData *exit);
 
 void _PyJIT_FinalizeTracing(PyThreadState *tstate);
+
+void _Py_JITTracer_InvalidateDependency(PyThreadState *old_tstate, void *obj);
+
 #ifdef __cplusplus
 }
 #endif

diff --git a/Objects/codeobject.c b/Objects/codeobject.c
index 0d264a6e346f95a046bbedfc47fd371b8c0ea310..d0dd65300a1d8e319fa06e95e1a8dac64a010e5b 100644 (file)
--- a/Objects/codeobject.c
+++ b/Objects/codeobject.c
@@ -2415,6 +2415,7 @@ code_dealloc(PyObject *self)
         PyMem_Free(co_extra);
     }
 #ifdef _Py_TIER2
+    _Py_JITTracer_InvalidateDependency(tstate, self);
     if (co->co_executors != NULL) {
         clear_executors(co);
     }

diff --git a/Objects/funcobject.c b/Objects/funcobject.c
index d8a1007557808751e9c95d9a4080897b23baa855..24f7a2920fdb7887f3038d0ac4715d583f85dea8 100644 (file)
--- a/Objects/funcobject.c
+++ b/Objects/funcobject.c
@@ -11,7 +11,7 @@
 #include "pycore_setobject.h"     // _PySet_NextEntry()
 #include "pycore_stats.h"
 #include "pycore_weakref.h"       // FT_CLEAR_WEAKREFS()
-
+#include "pycore_optimizer.h"     // _Py_JITTracer_InvalidateDependency
 
 static const char *
 func_event_name(PyFunction_WatchEvent event) {
@@ -1149,6 +1149,9 @@ func_dealloc(PyObject *self)
     if (_PyObject_ResurrectEnd(self)) {
         return;
     }
+#if _Py_TIER2
+    _Py_JITTracer_InvalidateDependency(PyThreadState_GET(), self);
+#endif
     _PyObject_GC_UNTRACK(op);
     FT_CLEAR_WEAKREFS(self, op->func_weakreflist);
     (void)func_clear((PyObject*)op);

diff --git a/Python/optimizer.c b/Python/optimizer.c
index c9009528e2092156c693c4103234e1785fb3b844..f3166afd7d59a62d0c3ea8a63f391fa29d665291 100644 (file)
--- a/Python/optimizer.c
+++ b/Python/optimizer.c
@@ -147,6 +147,11 @@ _PyOptimizer_Optimize(
         interp->compiling = false;
         return 0;
     }
+    // One of our depencies while tracing was invalidated. Not worth compiling.
+    if (!tstate->interp->jit_tracer_dependencies_still_valid) {
+        interp->compiling = false;
+        return 0;
+    }
     _PyExecutorObject *executor;
     int err = uop_optimize(frame, tstate, &executor, progress_needed);
     if (err <= 0) {
@@ -560,9 +565,6 @@ _PyJIT_translate_single_bytecode_to_trace(
     int oparg,
     int jump_taken)
 {
-    if (PyStackRef_IsNull(frame->f_funcobj)) {
-        goto unsupported;
-    }
 
     int is_first_instr = tstate->interp->jit_tracer_initial_instr == this_instr;
     bool progress_needed = (tstate->interp->jit_tracer_initial_chain_depth % MAX_CHAIN_DEPTH) == 0 && is_first_instr;;
@@ -794,12 +796,16 @@ _PyJIT_translate_single_bytecode_to_trace(
                 }
                 if (uop == _PUSH_FRAME || uop == _RETURN_VALUE || uop == _RETURN_GENERATOR || uop == _YIELD_VALUE) {
                     PyCodeObject *new_code = (PyCodeObject *)PyStackRef_AsPyObjectBorrow(frame->f_executable);
-                    PyFunctionObject *new_func = (PyCodeObject *)PyStackRef_AsPyObjectBorrow(frame->f_funcobj);
+                    PyFunctionObject *new_func = (PyFunctionObject *)PyStackRef_AsPyObjectBorrow(frame->f_funcobj);
                     if (new_func != NULL) {
                         operand = (uintptr_t)new_func;
+                        DPRINTF(2, "Adding %p func to op\n", (void *)operand);
+                        _Py_BloomFilter_Add(dependencies, new_func);
                     }
                     else if (new_code != NULL) {
                         operand = (uintptr_t)new_code | 1;
+                        DPRINTF(2, "Adding %p code to op\n", (void *)operand);
+                        _Py_BloomFilter_Add(dependencies, new_code);
                     }
                     else {
                         operand = 0;
@@ -866,6 +872,7 @@ _PyJIT_InitializeTracing(PyThreadState *tstate, _PyInterpreterFrame *frame, _Py_
     tstate->interp->jit_tracer_initial_stack_depth = curr_stackdepth;
     tstate->interp->jit_tracer_initial_chain_depth = chain_depth;
     tstate->interp->jit_tracer_current_frame = frame;
+    tstate->interp->jit_tracer_dependencies_still_valid = true;
 }
 
 void
@@ -1530,6 +1537,25 @@ error:
     _Py_Executors_InvalidateAll(interp, is_invalidation);
 }
 
+void
+_Py_JITTracer_InvalidateDependency(PyThreadState *old_tstate, void *obj)
+{
+    _PyBloomFilter obj_filter;
+    _Py_BloomFilter_Init(&obj_filter);
+    _Py_BloomFilter_Add(&obj_filter, obj);
+    HEAD_LOCK(&_PyRuntime);
+
+    PyInterpreterState *interp = old_tstate->interp;
+
+    _Py_FOR_EACH_TSTATE_UNLOCKED(interp, tstate) {
+        if (bloom_filter_may_contain(&tstate->interp->jit_tracer_dependencies, &obj_filter))
+        {
+            tstate->interp->jit_tracer_dependencies_still_valid = false;
+        }
+
+    }
+    HEAD_UNLOCK(&_PyRuntime);
+}
 /* Invalidate all executors */
 void
 _Py_Executors_InvalidateAll(PyInterpreterState *interp, int is_invalidation)