Address code review

Author: corona10

Include/internal/pycore_tstate.h

@@ -54,17 +54,25 @@ typedef struct _PyJitTracerState {
 } _PyJitTracerState;
 
 typedef struct _PyJitPolicy {
-    uint16_t jump_backward_initial_value;
-    uint16_t jump_backward_initial_backoff;
     uint16_t side_exit_initial_value;
     uint16_t side_exit_initial_backoff;
 } _PyJitPolicy;
 
+#endif
+
+typedef struct _PyInterpreterPolicy {
+    uint16_t jump_backward_initial_value;
+    uint16_t jump_backward_initial_backoff;
+} _PyInterpreterPolicy;
+
+
 typedef struct _PyPolicy {
-    _PyJitPolicy jit;
-} _PyPolicy;
 
+#ifdef _Py_TIER2
+    _PyJitPolicy jit;
 #endif
+    _PyInterpreterPolicy interp;
+} _PyPolicy;
 
 // Every PyThreadState is actually allocated as a _PyThreadStateImpl. The
 // PyThreadState fields are exposed as part of the C API, although most fields

Python/ceval.c

@@ -1474,8 +1474,8 @@ stop_tracing_and_jit(PyThreadState *tstate, _PyInterpreterFrame *frame)
         }
         else {
             _tstate->jit_tracer_state.initial_state.jump_backward_instr[1].counter = initial_jump_backoff_counter(
-                _tstate->policy.jit.jump_backward_initial_value,
-                _tstate->policy.jit.jump_backward_initial_backoff);
+                _tstate->policy.interp.jump_backward_initial_value,
+                _tstate->policy.interp.jump_backward_initial_backoff);
         }
     }
     else {

Python/pystate.c

@@ -1439,7 +1439,6 @@ decref_threadstate(_PyThreadStateImpl *tstate)
     }
 }
 
-#ifdef _Py_TIER2
 static inline void
 init_jit_metric(uint16_t *target, const char *env_name, uint16_t default_value,
                 long min_value, long max_value)
@@ -1453,7 +1452,6 @@ init_jit_metric(uint16_t *target, const char *env_name, uint16_t default_value,
         }
     }
 }
-#endif
 
 /* Get the thread state to a minimal consistent state.
    Further init happens in pylifecycle.c before it can be used.
@@ -1540,14 +1538,15 @@ init_threadstate(_PyThreadStateImpl *_tstate,
 
     _tstate->asyncio_running_loop = NULL;
     _tstate->asyncio_running_task = NULL;
-#ifdef _Py_TIER2
-    // Initialize JIT policy from environment variables
-    init_jit_metric(&_tstate->policy.jit.jump_backward_initial_value,
+    // Initialize interpreter policy from environment variables
+    init_jit_metric(&_tstate->policy.interp.jump_backward_initial_value,
                     "PYTHON_JIT_JUMP_BACKWARD_INITIAL_VALUE",
                     JUMP_BACKWARD_INITIAL_VALUE, 1, MAX_VALUE);
-    init_jit_metric(&_tstate->policy.jit.jump_backward_initial_backoff,
+    init_jit_metric(&_tstate->policy.interp.jump_backward_initial_backoff,
                     "PYTHON_JIT_JUMP_BACKWARD_INITIAL_BACKOFF",
                     JUMP_BACKWARD_INITIAL_BACKOFF, 0, MAX_BACKOFF);
+#ifdef _Py_TIER2
+    // Initialize JIT policy from environment variables
     init_jit_metric(&_tstate->policy.jit.side_exit_initial_value,
                     "PYTHON_JIT_SIDE_EXIT_INITIAL_VALUE",
                     SIDE_EXIT_INITIAL_VALUE, 1, MAX_VALUE);

Python/specialize.c

@@ -50,8 +50,8 @@ _PyCode_Quicken(_Py_CODEUNIT *instructions, Py_ssize_t size, int enable_counters
         PyThreadState *tstate = _PyThreadState_GET();
         _PyThreadStateImpl *tstate_impl = (_PyThreadStateImpl *)tstate;
         jump_counter = initial_jump_backoff_counter(
-            tstate_impl->policy.jit.jump_backward_initial_value,
-            tstate_impl->policy.jit.jump_backward_initial_backoff);
+            tstate_impl->policy.interp.jump_backward_initial_value,
+            tstate_impl->policy.interp.jump_backward_initial_backoff);
         adaptive_counter = adaptive_counter_warmup();
     }
     else {