Fix naming of things

Author: Fidget-Spinner

Include/internal/pycore_interp_structs.h

@@ -758,20 +758,20 @@ struct _Py_unique_id_pool {
 typedef _Py_CODEUNIT *(*_PyJitEntryFuncPtr)(struct _PyExecutorObject *exec, _PyInterpreterFrame *frame, _PyStackRef *stack_pointer, PyThreadState *tstate);
 
 typedef struct _PyJitTracerState {
-    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_insert_exec_instr;
-    _Py_CODEUNIT *jit_tracer_close_loop_instr;
+    bool dependencies_still_valid;
+    int code_max_size;
+    int code_curr_size;
+    int initial_stack_depth;
+    int initial_chain_depth;
+    _PyUOpInstruction *code_buffer;
+    _Py_CODEUNIT *insert_exec_instr;
+    _Py_CODEUNIT *close_loop_instr;
     _Py_CODEUNIT *last_specialized_instr;
-    int jit_tracer_initial_stack_depth;
-    int jit_tracer_initial_chain_depth;
-    PyCodeObject *jit_tracer_initial_code; // Strong
-    PyFunctionObject *jit_tracer_initial_func; // Strong
-    struct _PyExitData *jit_tracer_previous_exit;
-    _PyInterpreterFrame *jit_tracer_current_frame;
+    PyCodeObject *initial_code; // Strong
+    PyFunctionObject *initial_func; // Strong
+    struct _PyExitData *previous_exit;
+    _PyInterpreterFrame *current_frame;
+    _PyBloomFilter dependencies;
 } _PyJitTracerState;
 
 /* PyInterpreterState holds the global state for one of the runtime's

Include/internal/pycore_optimizer.h

@@ -359,7 +359,7 @@ extern void _Py_ClearExecutorDeletionList(PyInterpreterState *interp);
 #endif
 
 int
-_PyJIT_translate_single_bytecode_to_trace(
+_PyJit_translate_single_bytecode_to_trace(
     PyThreadState *tstate,
     _PyInterpreterFrame *frame,
     _Py_CODEUNIT *this_instr,
@@ -372,11 +372,12 @@ _PyJIT_translate_single_bytecode_to_trace(
     int jump_taken);
 
 void
-_PyJIT_InitializeTracing(PyThreadState *tstate, _PyInterpreterFrame *frame, _Py_CODEUNIT *insert_exec_instr, _Py_CODEUNIT *close_loop_instr, int curr_stackdepth, int chain_depth, _PyExitData *exit);
+_PyJit_InitializeTracing(PyThreadState *tstate, _PyInterpreterFrame *frame, _Py_CODEUNIT *insert_exec_instr
+    _Py_CODEUNIT *close_loop_instr, int curr_stackdepth, int chain_depth, _PyExitData *exit);
 
-void _PyJIT_FinalizeTracing(PyThreadState *tstate);
+void _PyJit_FinalizeTracing(PyThreadState *tstate);
 
-void _Py_JITTracer_InvalidateDependency(PyThreadState *old_tstate, void *obj);
+void _PyJit_Tracer_InvalidateDependency(PyThreadState *old_tstate, void *obj);
 
 #ifdef __cplusplus
 }

Objects/codeobject.c

@@ -2415,7 +2415,7 @@ code_dealloc(PyObject *self)
         PyMem_Free(co_extra);
     }
 #ifdef _Py_TIER2
-    _Py_JITTracer_InvalidateDependency(tstate, self);
+    _PyJit_Tracer_InvalidateDependency(tstate, self);
     if (co->co_executors != NULL) {
         clear_executors(co);
     }

Objects/frameobject.c

@@ -264,7 +264,7 @@ framelocalsproxy_setitem(PyObject *self, PyObject *key, PyObject *value)
 
 #if _Py_TIER2
         _Py_Executors_InvalidateDependency(PyInterpreterState_Get(), co, 1);
-        _Py_JITTracer_InvalidateDependency(PyThreadState_GET(), co);
+        _PyJit_Tracer_InvalidateDependency(PyThreadState_GET(), co);
 #endif
 
         _PyLocals_Kind kind = _PyLocals_GetKind(co->co_localspluskinds, i);

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
+#include "pycore_optimizer.h"     // _PyJit_Tracer_InvalidateDependency
 
 static const char *
 func_event_name(PyFunction_WatchEvent event) {
@@ -1152,7 +1152,7 @@ func_dealloc(PyObject *self)
         return;
     }
 #if _Py_TIER2
-    _Py_JITTracer_InvalidateDependency(PyThreadState_GET(), self);
+    _PyJit_Tracer_InvalidateDependency(PyThreadState_GET(), self);
 #endif
     _PyObject_GC_UNTRACK(op);
     FT_CLEAR_WEAKREFS(self, op->func_weakreflist);

Python/bytecodes.c

@@ -2970,9 +2970,9 @@ dummy_func(
             if (!IS_JIT_TRACING() && backoff_counter_triggers(counter) &&
                 this_instr->op.code == JUMP_BACKWARD_JIT &&
                 next_instr->op.code != ENTER_EXECUTOR) {
-                if (tstate->interp->jit_state.jit_tracer_code_buffer == NULL) {
-                    tstate->interp->jit_state.jit_tracer_code_buffer = (_PyUOpInstruction *)_PyObject_VirtualAlloc(UOP_BUFFER_SIZE);
-                    if (tstate->interp->jit_state.jit_tracer_code_buffer == NULL) {
+                if (tstate->interp->jit_state.code_buffer == NULL) {
+                    tstate->interp->jit_state.code_buffer = (_PyUOpInstruction *)_PyObject_VirtualAlloc(UOP_BUFFER_SIZE);
+                    if (tstate->interp->jit_state.code_buffer == NULL) {
                         // Don't error, just go to next instruction.
                         DISPATCH();
                     }
@@ -2985,7 +2985,7 @@ dummy_func(
                         oparg >>= 8;
                         insert_exec_at--;
                     }
-                    _PyJIT_InitializeTracing(tstate, frame, insert_exec_at, next_instr, STACK_LEVEL(), 0, NULL);
+                    _PyJit_InitializeTracing(tstate, frame, insert_exec_at, next_instr, STACK_LEVEL(), 0, NULL);
                     ENTER_TRACING();
                 }
                 int _jump_taken = false;
@@ -5456,7 +5456,7 @@ dummy_func(
                 _PyExecutorObject *previous_executor = _PyExecutor_FromExit(exit);
                 assert(tstate->current_executor == (PyObject *)previous_executor);
                 int chain_depth = previous_executor->vm_data.chain_depth + 1;
-                _PyJIT_InitializeTracing(tstate, frame, target, target, STACK_LEVEL(), chain_depth, exit);
+                _PyJit_InitializeTracing(tstate, frame, target, target, STACK_LEVEL(), chain_depth, exit);
                 exit->temperature = initial_temperature_backoff_counter();
                 GOTO_TIER_ONE(target, 1);
             }

Python/ceval.c

@@ -990,8 +990,8 @@ static inline int
 add_to_code_trace(PyThreadState *tstate, _PyInterpreterFrame *frame, PyCodeObject *old_code, PyFunctionObject *old_func, int old_stack_level, _Py_CODEUNIT *this_instr, _Py_CODEUNIT *next_instr, int opcode, int oparg, int jump_taken)
 {
     assert(frame != NULL);
-    assert(tstate->interp->jit_state.jit_tracer_code_curr_size < UOP_MAX_TRACE_LENGTH);
-    return !_PyJIT_translate_single_bytecode_to_trace(tstate, frame, this_instr, next_instr, old_code, old_func, old_stack_level, opcode, oparg, jump_taken);
+    assert(tstate->interp->jit_state.code_curr_size < UOP_MAX_TRACE_LENGTH);
+    return !_PyJit_translate_single_bytecode_to_trace(tstate, frame, this_instr, next_instr, old_code, old_func, old_stack_level, opcode, oparg, jump_taken);
 }
 #endif
 

Python/ceval_macros.h

@@ -150,15 +150,15 @@
         if (!_PyErr_Occurred(tstate) && !_is_sys_tracing) { \
             _PyFrame_SetStackPointer(frame, stack_pointer); \
             int _err = _PyOptimizer_Optimize(frame, tstate); \
-            _PyJIT_FinalizeTracing(tstate); \
+            _PyJit_FinalizeTracing(tstate); \
             stack_pointer = _PyFrame_GetStackPointer(frame); \
             if (_err < 0) { \
                 JUMP_TO_LABEL(error); \
             } \
         } \
         else { \
             _PyFrame_SetStackPointer(frame, stack_pointer); \
-            _PyJIT_FinalizeTracing(tstate); \
+            _PyJit_FinalizeTracing(tstate); \
             stack_pointer = _PyFrame_GetStackPointer(frame); \
         } \
     } while (0);
@@ -451,7 +451,7 @@ do {                                                   \
     }                                                  \
     if (keep_tracing_bit) { \
         assert(next_instr->op.code != ENTER_EXECUTOR); \
-        assert(tstate->interp->jit_state.jit_tracer_code_curr_size == 2); \
+        assert(tstate->interp->jit_state.code_curr_size == 2); \
         ENTER_TRACING(); \
     } \
     DISPATCH();                                        \