Strip out instrumentation

Author: markshannon

Include/cpython/pystate.h

@@ -192,8 +192,6 @@ struct _ts {
 
     uint64_t dict_global_version;
 
-    int sp_cached;
-    int in_gc;
 };
 
 #ifdef Py_DEBUG

Include/internal/pycore_frame.h

@@ -164,7 +164,6 @@ static inline PyObject**
 _PyFrame_GetStackPointer(_PyInterpreterFrame *frame)
 {
     assert(frame->stacktop >= 0);
-    PyThreadState_GET()->sp_cached++;
     PyObject **sp = frame->localsplus + frame->stacktop;
     frame->stacktop = -1;
     return sp;
@@ -174,7 +173,6 @@ static inline void
 _PyFrame_SetStackPointer(_PyInterpreterFrame *frame, PyObject **stack_pointer)
 {
     assert(frame->stacktop == -1);
-    PyThreadState_GET()->sp_cached--;
     frame->stacktop = (int)(stack_pointer - frame->localsplus);
 }
 

Include/object.h

@@ -789,8 +789,6 @@ PyAPI_FUNC(void) Py_DecRef(PyObject *);
 PyAPI_FUNC(void) _Py_IncRef(PyObject *);
 PyAPI_FUNC(void) _Py_DecRef(PyObject *);
 
-PyAPI_FUNC(int) PyThreadState_GetSpCached(void);
-
 static inline Py_ALWAYS_INLINE void Py_INCREF(PyObject *op)
 {
 #if defined(Py_LIMITED_API) && (Py_LIMITED_API+0 >= 0x030c0000 || defined(Py_REF_DEBUG))
@@ -925,9 +923,6 @@ static inline void Py_DECREF(const char *filename, int lineno, PyObject *op)
     if (op->ob_refcnt <= 0) {
         _Py_NegativeRefcount(filename, lineno, op);
     }
-    if (PyThreadState_GetSpCached() == 0) {
-        UPDATE_DEFERRED_STATS();
-    }
     if (_Py_IsImmortal(op)) {
         return;
     }
@@ -944,9 +939,6 @@ static inline Py_ALWAYS_INLINE void Py_DECREF(PyObject *op)
 {
     // Non-limited C API and limited C API for Python 3.9 and older access
     // directly PyObject.ob_refcnt.
-    if (PyThreadState_GetSpCached() == 0) {
-        UPDATE_DEFERRED_STATS();
-    }
     if (_Py_IsImmortal(op)) {
         return;
     }

Objects/object.c

@@ -2822,31 +2822,13 @@ _PyObject_AssertFailed(PyObject *obj, const char *expr, const char *msg,
 
     Py_FatalError("_PyObject_AssertFailed");
 }
-
-size_t size_guess(PyObject *op)
-{
-    size_t res = Py_TYPE(op)->tp_basicsize;
-    size_t isize = Py_TYPE(op)->tp_itemsize;
-
-    if (isize > 0) {
-        size_t count = _PyVarObject_CAST(op)->ob_size;
-        if (Py_TYPE(op) == &PyLong_Type) {
-            count >>= 3;
-        }
-        if (count < 100000000) {
-            res += count * isize;
-        }
-    }
-    return res;
-}
-
 void
 _Py_Dealloc(PyObject *op)
 {
     PyTypeObject *type = Py_TYPE(op);
     destructor dealloc = type->tp_dealloc;
-    PyThreadState *tstate = _PyThreadState_GET();
 #ifdef Py_DEBUG
+    PyThreadState *tstate = _PyThreadState_GET();
     PyObject *old_exc = tstate != NULL ? tstate->current_exception : NULL;
     // Keep the old exception type alive to prevent undefined behavior
     // on (tstate->curexc_type != old_exc_type) below
@@ -2865,13 +2847,7 @@ _Py_Dealloc(PyObject *op)
     _Py_ForgetReference(op);
 #endif
 
-    if (tstate->sp_cached && tstate->in_gc == 0) {
-        OBJECT_STAT_ADD(deferred_space, size_guess(op));
-        OBJECT_STAT_INC(deferred_objects);
-    }
-    tstate->in_gc++;
     (*dealloc)(op);
-    tstate->in_gc--;
 
 #ifdef Py_DEBUG
     // gh-89373: The tp_dealloc function must leave the current exception

Python/ceval.c

@@ -765,7 +765,6 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, _PyInterpreterFrame *frame, int
 
     next_instr = frame->instr_ptr;
 resume_frame:
-    // assert(tstate->sp_cached == 0 || tstate->in_gc);
     stack_pointer = _PyFrame_GetStackPointer(frame);
 
 #ifdef LLTRACE

Python/pystate.c

@@ -1508,8 +1508,6 @@ init_threadstate(_PyThreadStateImpl *_tstate,
         tstate->state = _Py_THREAD_SUSPENDED;
     }
 
-    tstate->sp_cached = 0;
-    tstate->in_gc = 0;
     tstate->_status.initialized = 1;
 }
 
@@ -3091,7 +3089,3 @@ _PyThreadState_ClearMimallocHeaps(PyThreadState *tstate)
     }
 #endif
 }
-
-int PyThreadState_GetSpCached(void) {
-    return _PyThreadState_GET()->sp_cached;
-}

Python/specialize.c

@@ -315,7 +315,6 @@ print_stats(FILE *out, PyStats *stats)
     print_optimization_stats(out, &stats->optimization_stats);
 #endif
     print_rare_event_stats(out, &stats->rare_event_stats);
-    fprintf(out, "sp cached: %d", PyThreadState_GET()->sp_cached);
 }
 
 void