Separate the tracer out into its own file

Author: Fidget-Spinner

Makefile.pre.in

@@ -2139,7 +2139,7 @@ Objects/mimalloc/page.o: $(srcdir)/Objects/mimalloc/page-queue.c
 regen-cases: \
         regen-opcode-ids regen-opcode-targets regen-uop-ids regen-opcode-metadata-py \
 		regen-generated-cases regen-executor-cases regen-optimizer-cases \
-		regen-opcode-metadata regen-uop-metadata
+		regen-opcode-metadata regen-uop-metadata regen-tracer-cases
 
 .PHONY: regen-opcode-ids
 regen-opcode-ids:
@@ -2185,6 +2185,13 @@ regen-optimizer-cases:
 	    $(srcdir)/Python/bytecodes.c
 	$(UPDATE_FILE) $(srcdir)/Python/optimizer_cases.c.h $(srcdir)/Python/optimizer_cases.c.h.new
 
+.PHONY: regen-tracer-cases
+regen-tracer-cases:
+	$(PYTHON_FOR_REGEN) $(srcdir)/Tools/cases_generator/tracer_generator.py \
+	    -o $(srcdir)/Python/generated_tracer_cases.c.h.new $(srcdir)/Python/bytecodes.c
+	$(UPDATE_FILE) $(srcdir)/Python/generated_tracer_cases.c.h $(srcdir)/Python/generated_tracer_cases.c.h.new
+
+
 .PHONY: regen-opcode-metadata
 regen-opcode-metadata:
 	$(PYTHON_FOR_REGEN) $(srcdir)/Tools/cases_generator/opcode_metadata_generator.py \

Python/bytecodes.c

@@ -2964,13 +2964,6 @@ dummy_func(
             if (!IS_JIT_TRACING() && backoff_counter_triggers(counter) &&
                 this_instr->op.code == JUMP_BACKWARD_JIT &&
                 next_instr->op.code != ENTER_EXECUTOR) {
-                _Py_CODEUNIT *start = this_instr;
-                /* Back up over EXTENDED_ARGs so optimizer sees the whole instruction */
-                int curr_oparg = oparg;
-                while (curr_oparg > 255) {
-                    curr_oparg >>= 8;
-                    start--;
-                }
                 if (tstate->interp->jit_tracer_code_buffer == NULL) {
                     tstate->interp->jit_tracer_code_buffer = (_PyUOpInstruction *)_PyObject_VirtualAlloc(UOP_BUFFER_SIZE);
                     if (tstate->interp->jit_tracer_code_buffer == NULL) {
@@ -3046,9 +3039,9 @@ dummy_func(
             }
             assert(executor != tstate->interp->cold_executor);
             tstate->jit_exit = NULL;
-            if (IS_JIT_TRACING()) {
-                RECORD_TRACE_NO_DISPATCH();
-            }
+            #if TRACING_JIT
+            RECORD_TRACE_NO_DISPATCH();
+            #endif
             TIER1_TO_TIER2(executor);
             #else
             Py_FatalError("ENTER_EXECUTOR is not supported in this build");

Python/ceval.c

@@ -998,6 +998,7 @@ add_to_code_trace(PyThreadState *tstate, _PyInterpreterFrame *frame, PyCodeObjec
 #if _Py_TAIL_CALL_INTERP
 #include "opcode_targets.h"
 #include "generated_cases.c.h"
+#include "generated_tracer_cases.c.h"
 #endif
 
 #if (defined(__GNUC__) && __GNUC__ >= 10 && !defined(__clang__)) && defined(__x86_64__)
@@ -1126,6 +1127,7 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, _PyInterpreterFrame *frame, int
 #else
     goto start_frame;
 #   include "generated_cases.c.h"
+    #include "generated_tracer_cases.c.h"
 #endif