Address code review

Author: corona10

Include/internal/pycore_tstate.h

@@ -53,12 +53,16 @@ typedef struct _PyJitTracerState {
     _PyJitTracerPreviousState prev_state;
 } _PyJitTracerState;
 
-typedef struct _PyJitMetrics {
+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;
-} _PyJitMetrics;
+} _PyJitPolicy;
+
+typedef struct _PyPolicy {
+    _PyJitPolicy jit;
+} _PyPolicy;
 
 #endif
 
@@ -139,7 +143,7 @@ typedef struct _PyThreadStateImpl {
 #endif
 #if _Py_TIER2
     _PyJitTracerState jit_tracer_state;
-    _PyJitMetrics jit_metrics;
+    _PyPolicy policy;
 #endif
 } _PyThreadStateImpl;
 

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

Python/optimizer.c

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

Python/pystate.c

@@ -1541,17 +1541,17 @@ init_threadstate(_PyThreadStateImpl *_tstate,
     _tstate->asyncio_running_loop = NULL;
     _tstate->asyncio_running_task = NULL;
 #ifdef _Py_TIER2
-    // Initialize JIT metrics from environment variables
-    init_jit_metric(&_tstate->jit_metrics.jump_backward_initial_value,
+    // Initialize JIT policy from environment variables
+    init_jit_metric(&_tstate->policy.jit.jump_backward_initial_value,
                     "PYTHON_JIT_JUMP_BACKWARD_INITIAL_VALUE",
                     JUMP_BACKWARD_INITIAL_VALUE, 1, MAX_VALUE);
-    init_jit_metric(&_tstate->jit_metrics.jump_backward_initial_backoff,
+    init_jit_metric(&_tstate->policy.jit.jump_backward_initial_backoff,
                     "PYTHON_JIT_JUMP_BACKWARD_INITIAL_BACKOFF",
                     JUMP_BACKWARD_INITIAL_BACKOFF, 0, MAX_BACKOFF);
-    init_jit_metric(&_tstate->jit_metrics.side_exit_initial_value,
+    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->jit_metrics.side_exit_initial_backoff,
+    init_jit_metric(&_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;