fix bugs and use opt config

Author: Fidget-Spinner

Include/internal/pycore_backoff.h

@@ -142,10 +142,11 @@ initial_jump_backoff_counter(_PyOptimizationConfig *opt_config)
 #define RESUME_INITIAL_VALUE 8190
 #define RESUME_INITIAL_BACKOFF 6
 static inline _Py_BackoffCounter
-initial_resume_backoff_counter(void)
+initial_resume_backoff_counter(_PyOptimizationConfig *opt_config)
 {
-    return make_backoff_counter(RESUME_INITIAL_VALUE,
-                                RESUME_INITIAL_BACKOFF);
+    return make_backoff_counter(
+        opt_config->resume_initial_value,
+        opt_config->resume_initial_backoff);
 }
 
 /* Initial exit temperature.

Include/internal/pycore_interp_structs.h

@@ -413,6 +413,9 @@ typedef struct _PyOptimizationConfig {
     uint16_t jump_backward_initial_value;
     uint16_t jump_backward_initial_backoff;
 
+    uint16_t resume_initial_value;
+    uint16_t resume_initial_backoff;
+
     // JIT optimization thresholds
     uint16_t side_exit_initial_value;
     uint16_t side_exit_initial_backoff;

Include/internal/pycore_magic_number.h

@@ -294,6 +294,7 @@ Known values:
     Python 3.15a4 3661 (Lazy imports IMPORT_NAME opcode changes)
     Python 3.15a6 3662 (Add counter to RESUME)
 
+
     Python 3.16 will start with 3700
 
     Please don't copy-paste the same pre-release tag for new entries above!!!
@@ -305,7 +306,7 @@ PC/launcher.c must also be updated.
 
 */
 
-#define PYC_MAGIC_NUMBER 3663
+#define PYC_MAGIC_NUMBER 3662
 /* This is equivalent to converting PYC_MAGIC_NUMBER to 2 bytes
    (little-endian) and then appending b'\r\n'. */
 #define PYC_MAGIC_NUMBER_TOKEN \

Modules/_testinternalcapi/test_cases.c.h

@@ -173,7 +173,7 @@ dummy_func(
         }
 
         specializing op(_SPECIALIZE_RESUME, (counter/1 --)) {
-            _Py_Specialize_Resume(next_instr, tstate);
+            _Py_Specialize_Resume(this_instr, tstate);
         }
 
         tier1 op(_MAYBE_INSTRUMENT, (--)) {
@@ -3116,7 +3116,7 @@ dummy_func(
 
         tier1 op(_JIT, (--)) {
         #ifdef _Py_TIER2
-            bool is_resume = this_instr->op.code == RESUME_CHECK;
+            bool is_resume = this_instr->op.code == RESUME_CHECK_JIT;
             _Py_BackoffCounter counter = this_instr[1].counter;
             if (!IS_JIT_TRACING() &&
                 (backoff_counter_triggers(counter) &&

Python/bytecodes.c

@@ -1039,7 +1039,7 @@ _PyJit_TryInitializeTracing(
         _Py_RecordFuncPtr record_func = _PyOpcode_RecordFunctions[record_func_index];
         record_func(frame, stack_pointer, oparg, &tracer->prev_state.recorded_value);
     }
-    assert(curr_instr->op.code == JUMP_BACKWARD_JIT || (exit != NULL));
+    assert(curr_instr->op.code == JUMP_BACKWARD_JIT || curr_instr->op.code == RESUME_CHECK_JIT || (exit != NULL));
     tracer->initial_state.jump_backward_instr = curr_instr;
 
     if (_PyOpcode_Caches[_PyOpcode_Deopt[close_loop_instr->op.code]]) {
@@ -1064,7 +1064,12 @@ _PyJit_FinalizeTracing(PyThreadState *tstate, int err)
             tracer->initial_state.jump_backward_instr[1].counter = restart_backoff_counter(counter);
         }
         else {
-            tracer->initial_state.jump_backward_instr[1].counter = initial_jump_backoff_counter(&tstate->interp->opt_config);
+            if (tracer->initial_state.jump_backward_instr[0].op.code == JUMP_BACKWARD_JIT) {
+                tracer->initial_state.jump_backward_instr[1].counter = initial_jump_backoff_counter(&tstate->interp->opt_config);
+            }
+            else {
+                tracer->initial_state.jump_backward_instr[1].counter = initial_resume_backoff_counter(&tstate->interp->opt_config);
+            }
         }
     }
     else if (tracer->initial_state.executor->vm_data.valid) {

Python/generated_cases.c.h

@@ -1366,7 +1366,7 @@ init_interp_main(PyThreadState *tstate)
     // This is also needed when the JIT is enabled
 #ifdef _Py_TIER2
     if (is_main_interp) {
-        int enabled = 0;
+        int enabled = 1;
 #if _Py_TIER2 & 2
         enabled = 0;
 #endif

Python/optimizer.c

@@ -604,11 +604,13 @@ init_interpreter(PyInterpreterState *interp,
     // Initialize optimization configuration from environment variables
     // PYTHON_JIT_STRESS sets aggressive defaults for testing, but can be overridden
     uint16_t jump_default = JUMP_BACKWARD_INITIAL_VALUE;
+    uint16_t resume_default = RESUME_INITIAL_VALUE;
     uint16_t side_exit_default = SIDE_EXIT_INITIAL_VALUE;
 
     if (is_env_enabled("PYTHON_JIT_STRESS")) {
         jump_default = 63;
         side_exit_default = 63;
+        resume_default = 127;
     }
 
     init_policy(&interp->opt_config.jump_backward_initial_value,
@@ -617,6 +619,12 @@ init_interpreter(PyInterpreterState *interp,
     init_policy(&interp->opt_config.jump_backward_initial_backoff,
                 "PYTHON_JIT_JUMP_BACKWARD_INITIAL_BACKOFF",
                 JUMP_BACKWARD_INITIAL_BACKOFF, 0, MAX_BACKOFF);
+    init_policy(&interp->opt_config.resume_initial_value,
+                "PYTHON_JIT_RESUME_INITIAL_VALUE",
+                resume_default, 1, MAX_VALUE);
+    init_policy(&interp->opt_config.resume_initial_backoff,
+                "PYTHON_JIT_RESUME_INITIAL_BACKOFF",
+                RESUME_INITIAL_BACKOFF, 0, MAX_BACKOFF);
     init_policy(&interp->opt_config.side_exit_initial_value,
                 "PYTHON_JIT_SIDE_EXIT_INITIAL_VALUE",
                 side_exit_default, 1, MAX_VALUE);

Python/pylifecycle.c

@@ -52,7 +52,7 @@ _PyCode_Quicken(_Py_CODEUNIT *instructions, Py_ssize_t size, int enable_counters
         PyInterpreterState *interp = tstate->interp;
         jump_counter = initial_jump_backoff_counter(&interp->opt_config);
         adaptive_counter = adaptive_counter_warmup();
-        resume_counter = initial_resume_backoff_counter();
+        resume_counter = initial_resume_backoff_counter(&interp->opt_config);
     }
     else {
         jump_counter = initial_unreachable_backoff_counter();
@@ -2796,7 +2796,7 @@ _Py_Specialize_Resume(_Py_CODEUNIT *instr, PyThreadState *tstate)
     if (tstate->tracing == 0 && instr->op.code == RESUME) {
         if (tstate->interp->jit) {
             specialize(instr, RESUME_CHECK_JIT);
-            set_counter((_Py_BackoffCounter *)instr + 1, initial_resume_backoff_counter());
+            set_counter((_Py_BackoffCounter *)instr + 1, initial_resume_backoff_counter(&tstate->interp->opt_config));
             return;
         }
         specialize(instr, RESUME_CHECK);