Address code review

Author: corona10

Include/internal/pycore_backoff.h

@@ -12,6 +12,7 @@ extern "C" {
 #include <assert.h>
 #include <stdbool.h>
 #include "pycore_structs.h"       // _Py_BackoffCounter
+#include "pycore_tstate.h"        // _PyThreadStateImpl
 
 /* 16-bit countdown counters using exponential backoff.
 
@@ -127,9 +128,11 @@ trigger_backoff_counter(void)
 #define JUMP_BACKWARD_INITIAL_VALUE 4000
 #define JUMP_BACKWARD_INITIAL_BACKOFF 6
 static inline _Py_BackoffCounter
-initial_jump_backoff_counter(uint16_t initial_value, uint16_t initial_backoff)
+initial_jump_backoff_counter(_PyPolicy *policy)
 {
-    return make_backoff_counter(initial_value, initial_backoff);
+    return make_backoff_counter(
+        policy->interp.jump_backward_initial_value,
+        policy->interp.jump_backward_initial_backoff);
 }
 
 /* Initial exit temperature.
@@ -139,11 +142,15 @@ initial_jump_backoff_counter(uint16_t initial_value, uint16_t initial_backoff)
 #define SIDE_EXIT_INITIAL_VALUE 4000
 #define SIDE_EXIT_INITIAL_BACKOFF 6
 
+#ifdef _TIER2
 static inline _Py_BackoffCounter
-initial_temperature_backoff_counter(uint16_t initial_value, uint16_t initial_backoff)
+initial_temperature_backoff_counter(_PyPolicy *policy)
 {
-    return make_backoff_counter(initial_value, initial_backoff);
+    return make_backoff_counter(
+        policy->jit.side_exit_initial_value,
+        policy->jit.side_exit_initial_backoff);
 }
+#endif
 
 /* Unreachable backoff counter. */
 static inline _Py_BackoffCounter

Python/ceval.c

@@ -1474,8 +1474,7 @@ 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.interp.jump_backward_initial_value,
-                _tstate->policy.interp.jump_backward_initial_backoff);
+                &_tstate->policy);
         }
     }
     else {
@@ -1485,9 +1484,7 @@ stop_tracing_and_jit(PyThreadState *tstate, _PyInterpreterFrame *frame)
             exit->temperature = restart_backoff_counter(exit->temperature);
         }
         else {
-            exit->temperature = initial_temperature_backoff_counter(
-                _tstate->policy.jit.side_exit_initial_value,
-                _tstate->policy.jit.side_exit_initial_backoff);
+            exit->temperature = initial_temperature_backoff_counter(&_tstate->policy);
         }
     }
     _PyJit_FinalizeTracing(tstate);

Python/optimizer.c

@@ -1343,9 +1343,7 @@ make_executor_from_uops(_PyThreadStateImpl *tstate, _PyUOpInstruction *buffer, i
     cold->vm_data.chain_depth = chain_depth;
     for (int i = 0; i < exit_count; i++) {
         executor->exits[i].index = i;
-        executor->exits[i].temperature = initial_temperature_backoff_counter(
-            tstate->policy.jit.side_exit_initial_value,
-            tstate->policy.jit.side_exit_initial_backoff);
+        executor->exits[i].temperature = initial_temperature_backoff_counter(&tstate->policy);
     }
     int next_exit = exit_count-1;
     _PyUOpInstruction *dest = (_PyUOpInstruction *)&executor->trace[length];

Python/pystate.c

@@ -1440,7 +1440,7 @@ decref_threadstate(_PyThreadStateImpl *tstate)
 }
 
 static inline void
-init_jit_metric(uint16_t *target, const char *env_name, uint16_t default_value,
+init_policy(uint16_t *target, const char *env_name, uint16_t default_value,
                 long min_value, long max_value)
 {
     *target = default_value;
@@ -1539,20 +1539,20 @@ init_threadstate(_PyThreadStateImpl *_tstate,
     _tstate->asyncio_running_loop = NULL;
     _tstate->asyncio_running_task = NULL;
     // 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.interp.jump_backward_initial_backoff,
-                    "PYTHON_JIT_JUMP_BACKWARD_INITIAL_BACKOFF",
-                    JUMP_BACKWARD_INITIAL_BACKOFF, 0, MAX_BACKOFF);
+    init_policy(&_tstate->policy.interp.jump_backward_initial_value,
+                "PYTHON_JIT_JUMP_BACKWARD_INITIAL_VALUE",
+                JUMP_BACKWARD_INITIAL_VALUE, 1, MAX_VALUE);
+    init_policy(&_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);
-    init_jit_metric(&_tstate->policy.jit.side_exit_initial_backoff,
-                    "PYTHON_JIT_SIDE_EXIT_INITIAL_BACKOFF",
-                    SIDE_EXIT_INITIAL_BACKOFF, 0, MAX_BACKOFF);
+    init_policy(&_tstate->policy.jit.side_exit_initial_value,
+                "PYTHON_JIT_SIDE_EXIT_INITIAL_VALUE",
+                SIDE_EXIT_INITIAL_VALUE, 1, MAX_VALUE);
+    init_policy(&_tstate->policy.jit.side_exit_initial_backoff,
+                "PYTHON_JIT_SIDE_EXIT_INITIAL_BACKOFF",
+                SIDE_EXIT_INITIAL_BACKOFF, 0, MAX_BACKOFF);
     _tstate->jit_tracer_state.code_buffer = NULL;
 #endif
     tstate->delete_later = NULL;

Python/specialize.c

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