GH-104580: Don't cache eval breaker in interpreter (GH-104581)

markshannon · web-flow · commit 68b5f08b72e0 · 2023-05-18T10:08:33.000+01:00
Move eval-breaker to the front of the interpreter state.
diff --git a/Include/internal/pycore_ceval_state.h b/Include/internal/pycore_ceval_state.h
@@ -81,14 +81,14 @@ struct _pending_calls {
 };
 
 struct _ceval_state {
-    int recursion_limit;
-    struct _gil_runtime_state *gil;
-    int own_gil;
     /* This single variable consolidates all requests to break out of
        the fast path in the eval loop. */
     _Py_atomic_int eval_breaker;
     /* Request for dropping the GIL */
     _Py_atomic_int gil_drop_request;
+    int recursion_limit;
+    struct _gil_runtime_state *gil;
+    int own_gil;
     /* The GC is ready to be executed */
     _Py_atomic_int gc_scheduled;
     struct _pending_calls pending;
diff --git a/Include/internal/pycore_interp.h b/Include/internal/pycore_interp.h
@@ -48,6 +48,7 @@ struct _Py_long_state {
    */
 struct _is {
 
+    struct _ceval_state ceval;
     PyInterpreterState *next;
 
     uint64_t monitoring_version;
@@ -92,7 +93,6 @@ struct _is {
 
     struct _obmalloc_state obmalloc;
 
-    struct _ceval_state ceval;
     struct _gc_runtime_state gc;
 
     struct _import_state imports;
diff --git a/Python/bytecodes.c b/Python/bytecodes.c
@@ -70,7 +70,6 @@ dummy_func(
     _PyInterpreterFrame *frame,
     unsigned char opcode,
     unsigned int oparg,
-    _Py_atomic_int * const eval_breaker,
     _PyCFrame cframe,
     _Py_CODEUNIT *next_instr,
     PyObject **stack_pointer,
@@ -143,7 +142,7 @@ dummy_func(
                 ERROR_IF(err, error);
                 next_instr--;
             }
-            else if (_Py_atomic_load_relaxed_int32(eval_breaker) && oparg < 2) {
+            else if (_Py_atomic_load_relaxed_int32(&tstate->interp->ceval.eval_breaker) && oparg < 2) {
                 goto handle_eval_breaker;
             }
         }
@@ -170,7 +169,7 @@ dummy_func(
                     next_instr = frame->prev_instr;
                     DISPATCH();
                 }
-                if (_Py_atomic_load_relaxed_int32(eval_breaker) && oparg < 2) {
+                if (_Py_atomic_load_relaxed_int32(&tstate->interp->ceval.eval_breaker) && oparg < 2) {
                     goto handle_eval_breaker;
                 }
             }
diff --git a/Python/ceval.c b/Python/ceval.c
@@ -652,7 +652,6 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, _PyInterpreterFrame *frame, int
     // for the big switch below (in combination with the EXTRA_CASES macro).
     uint8_t opcode;        /* Current opcode */
     int oparg;         /* Current opcode argument, if any */
-    _Py_atomic_int * const eval_breaker = &tstate->interp->ceval.eval_breaker;
 #ifdef LLTRACE
     int lltrace = 0;
 #endif
diff --git a/Python/ceval_macros.h b/Python/ceval_macros.h
@@ -116,7 +116,7 @@
 
 #define CHECK_EVAL_BREAKER() \
     _Py_CHECK_EMSCRIPTEN_SIGNALS_PERIODICALLY(); \
-    if (_Py_atomic_load_relaxed_int32(eval_breaker)) { \
+    if (_Py_atomic_load_relaxed_int32(&tstate->interp->ceval.eval_breaker)) { \
         goto handle_eval_breaker; \
     }
 
diff --git a/Python/generated_cases.c.h b/Python/generated_cases.c.h

Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,6 @@ dummy_func(`
`70`	`70`	`_PyInterpreterFrame *frame,`
`71`	`71`	`unsigned char opcode,`
`72`	`72`	`unsigned int oparg,`
`73`		`- _Py_atomic_int * const eval_breaker,`
`74`	`73`	`_PyCFrame cframe,`
`75`	`74`	`_Py_CODEUNIT *next_instr,`
`76`	`75`	`PyObject **stack_pointer,`
`@@ -143,7 +142,7 @@ dummy_func(`
`143`	`142`	`ERROR_IF(err, error);`
`144`	`143`	`next_instr--;`
`145`	`144`	`}`
`146`		`- else if (_Py_atomic_load_relaxed_int32(eval_breaker) && oparg < 2) {`
	`145`	`+ else if (_Py_atomic_load_relaxed_int32(&tstate->interp->ceval.eval_breaker) && oparg < 2) {`
`147`	`146`	`goto handle_eval_breaker;`
`148`	`147`	`}`
`149`	`148`	`}`
`@@ -170,7 +169,7 @@ dummy_func(`
`170`	`169`	`next_instr = frame->prev_instr;`
`171`	`170`	`DISPATCH();`
`172`	`171`	`}`
`173`		`- if (_Py_atomic_load_relaxed_int32(eval_breaker) && oparg < 2) {`
	`172`	`+ if (_Py_atomic_load_relaxed_int32(&tstate->interp->ceval.eval_breaker) && oparg < 2) {`
`174`	`173`	`goto handle_eval_breaker;`
`175`	`174`	`}`
`176`	`175`	`}`
Original file line number	Diff line number	Diff line change
`@@ -116,7 +116,7 @@`
`116`	`116`
`117`	`117`	`#define CHECK_EVAL_BREAKER() \`
`118`	`118`	`_Py_CHECK_EMSCRIPTEN_SIGNALS_PERIODICALLY(); \`
`119`		`- if (_Py_atomic_load_relaxed_int32(eval_breaker)) { \`
	`119`	`+ if (_Py_atomic_load_relaxed_int32(&tstate->interp->ceval.eval_breaker)) { \`
`120`	`120`	`goto handle_eval_breaker; \`
`121`	`121`	`}`
`122`	`122`