Remove deferred RC stats

Author: markshannon

Include/cpython/pystate.h

@@ -191,6 +191,7 @@ struct _ts {
     PyObject *previous_executor;
 
     uint64_t dict_global_version;
+    int sp_cached; /* Only used in debug builds */
 
 };
 

Include/cpython/pystats.h

@@ -87,12 +87,8 @@ typedef struct _object_stats {
     uint64_t type_cache_dunder_hits;
     uint64_t type_cache_dunder_misses;
     uint64_t type_cache_collisions;
-    uint64_t max_deferred_space;
-    uint64_t max_deferred_objects;
     /* Temporary value used during GC */
     uint64_t object_visits;
-    uint64_t deferred_space;
-    uint64_t deferred_objects;
 } ObjectStats;
 
 typedef struct _gc_stats {
@@ -171,18 +167,3 @@ PyAPI_DATA(PyStats*) _Py_stats;
 #  define _Py_INCREF_STAT_INC() do { if (_Py_stats) _Py_stats->object_stats.increfs++; } while (0)
 #  define _Py_DECREF_STAT_INC() do { if (_Py_stats) _Py_stats->object_stats.decrefs++; } while (0)
 #endif
-
-
-#define UPDATE_DEFERRED_STATS() \
-do { \
-   if (_Py_stats) { \
-       if (_Py_stats->object_stats.deferred_space > _Py_stats->object_stats.max_deferred_space) { \
-           _Py_stats->object_stats.max_deferred_space = _Py_stats->object_stats.deferred_space; \
-       } \
-       if (_Py_stats->object_stats.deferred_objects > _Py_stats->object_stats.max_deferred_objects) { \
-           _Py_stats->object_stats.max_deferred_objects = _Py_stats->object_stats.deferred_objects; \
-       } \
-       _Py_stats->object_stats.deferred_space = 0; \
-       _Py_stats->object_stats.deferred_objects = 0; \
-   } \
-} while (0)

Include/internal/pycore_code.h

@@ -356,7 +356,6 @@ PyAPI_FUNC(PyObject*) _Py_GetSpecializationStats(void);
 #define OPT_ERROR_IN_OPCODE(opname) ((void)0)
 #define OPT_HIST(length, name) ((void)0)
 #define RARE_EVENT_STAT_INC(name) ((void)0)
-#define UPDATE_DEFERRED_STATS() ((void)0)
 #endif  // !Py_STATS
 
 // Utility functions for reading/writing 32/64-bit values in the inline caches.

Include/internal/pycore_frame.h

@@ -165,6 +165,9 @@ _PyFrame_GetLocalsArray(_PyInterpreterFrame *frame)
 static inline PyObject**
 _PyFrame_GetStackPointer(_PyInterpreterFrame *frame)
 {
+#ifndef Py_DEBUG
+    PyThreadState_GET()->sp_cached++;
+#endif
     assert(frame->stackpointer != NULL);
     PyObject **sp = frame->stackpointer;
     frame->stackpointer = NULL;
@@ -174,6 +177,9 @@ _PyFrame_GetStackPointer(_PyInterpreterFrame *frame)
 static inline void
 _PyFrame_SetStackPointer(_PyInterpreterFrame *frame, PyObject **stack_pointer)
 {
+#ifndef Py_DEBUG
+    PyThreadState_GET()->sp_cached--;
+#endif
     assert(frame->stackpointer == NULL);
     frame->stackpointer = stack_pointer;
 }

Include/pystats.h

@@ -18,7 +18,6 @@ extern "C" {
 #else
 #  define _Py_INCREF_STAT_INC() ((void)0)
 #  define _Py_DECREF_STAT_INC() ((void)0)
-#  define UPDATE_DEFERRED_STATS() ((void)0)
 #endif  // !Py_STATS
 
 #ifdef __cplusplus

Lib/test/test_sys.py

@@ -1561,7 +1561,7 @@ class C(object): pass
         def func():
             return sys._getframe()
         x = func()
-        check(x, size('3Pi2cP7P2ic??2P'))
+        check(x, size('3Pi2cP9Phc2P'))
         # function
         def func(): pass
         check(func, size('16Pi'))
@@ -1578,7 +1578,7 @@ def bar(cls):
             check(bar, size('PP'))
         # generator
         def get_gen(): yield 1
-        check(get_gen(), size('PP4P4c7P2ic??2P'))
+        check(get_gen(), size('PP4P4cP9PhcP'))
         # iterator
         check(iter('abc'), size('lP'))
         # callable-iterator

Objects/object.c

@@ -2829,6 +2829,7 @@ _Py_Dealloc(PyObject *op)
     destructor dealloc = type->tp_dealloc;
 #ifdef Py_DEBUG
     PyThreadState *tstate = _PyThreadState_GET();
+    assert(tstate->sp_cached <= 1);
     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

Python/bytecodes.c

@@ -184,7 +184,6 @@ dummy_func(
             uintptr_t eval_breaker = _Py_atomic_load_uintptr_relaxed(&tstate->eval_breaker);
             uintptr_t version = FT_ATOMIC_LOAD_UINTPTR_ACQUIRE(_PyFrame_GetCode(frame)->_co_instrumentation_version);
             assert((version & _PY_EVAL_EVENTS_MASK) == 0);
-            UPDATE_DEFERRED_STATS();
             DEOPT_IF(eval_breaker != version);
         }
 

Python/ceval_macros.h

@@ -143,8 +143,7 @@ do { \
         if (err != 0) { \
             GOTO_ERROR(error); \
         } \
-    } \
-    UPDATE_DEFERRED_STATS();
+    }
 
 
 /* Tuple access macros */

Python/executor_cases.c.h

@@ -1498,6 +1498,7 @@ init_threadstate(_PyThreadStateImpl *_tstate,
     tstate->what_event = -1;
     tstate->previous_executor = NULL;
     tstate->dict_global_version = 0;
+    tstate->sp_cached = 0;
 
     tstate->delete_later = NULL;
 

Python/generated_cases.c.h

@@ -203,8 +203,6 @@ print_object_stats(FILE *out, ObjectStats *stats)
     fprintf(out, "Object method cache collisions: %" PRIu64 "\n", stats->type_cache_collisions);
     fprintf(out, "Object method cache dunder hits: %" PRIu64 "\n", stats->type_cache_dunder_hits);
     fprintf(out, "Object method cache dunder misses: %" PRIu64 "\n", stats->type_cache_dunder_misses);
-    fprintf(out, "Object max deferred objects: %" PRIu64 "\n", stats->max_deferred_objects);
-    fprintf(out, "Object max deferred space: %" PRIu64 "\n", stats->max_deferred_space);
 }
 
 static void
@@ -321,8 +319,6 @@ void
 _Py_StatsOn(void)
 {
     _Py_stats = &_Py_stats_struct;
-    _Py_stats->object_stats.deferred_objects = 0;
-    _Py_stats->object_stats.deferred_space = 0;
 }
 
 void