[Python-checkins] Move predispatch logic from DISPATCH macro to juts before switch. Reduces size of each opocde in interpreter. (GH-28475)

pablogsal webhook-mailer at python.org
Wed Sep 29 08:16:22 EDT 2021


https://github.com/python/cpython/commit/2be4c370c6bfe98a85aa01c5d9c333b804d26197
commit: 2be4c370c6bfe98a85aa01c5d9c333b804d26197
branch: 3.10
author: Mark Shannon <mark at hotpy.org>
committer: pablogsal <Pablogsal at gmail.com>
date: 2021-09-29T13:16:13+01:00
summary:

Move predispatch logic from DISPATCH macro to juts before switch. Reduces size of each opocde in interpreter. (GH-28475)

files:
M Python/ceval.c

diff --git a/Python/ceval.c b/Python/ceval.c
index 429ddb82bd66d..686250e1a8f94 100644
--- a/Python/ceval.c
+++ b/Python/ceval.c
@@ -1297,12 +1297,6 @@ eval_frame_handle_pending(PyThreadState *tstate)
 
 #if USE_COMPUTED_GOTOS
 #define TARGET(op) op: TARGET_##op
-#define DISPATCH_GOTO() goto *opcode_targets[opcode]
-#else
-#define TARGET(op) op
-#define DISPATCH_GOTO() goto dispatch_opcode
-#endif
-
 #define DISPATCH() \
     { \
         if (trace_info.cframe.use_tracing OR_DTRACE_LINE OR_LLTRACE) { \
@@ -1310,8 +1304,13 @@ eval_frame_handle_pending(PyThreadState *tstate)
         } \
         f->f_lasti = INSTR_OFFSET(); \
         NEXTOPARG(); \
-        DISPATCH_GOTO(); \
+        goto *opcode_targets[opcode]; \
     }
+#else
+#define TARGET(op) op
+#define DISPATCH() goto predispatch;
+#endif
+
 
 #define CHECK_EVAL_BREAKER() \
     if (_Py_atomic_load_relaxed(eval_breaker)) { \
@@ -1827,7 +1826,16 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, PyFrameObject *f, int throwflag)
             }
         }
 #endif
+#if USE_COMPUTED_GOTOS == 0
+    goto dispatch_opcode;
 
+    predispatch:
+        if (trace_info.cframe.use_tracing OR_DTRACE_LINE OR_LLTRACE) {
+            goto tracing_dispatch;
+        }
+        f->f_lasti = INSTR_OFFSET();
+        NEXTOPARG();
+#endif
     dispatch_opcode:
 #ifdef DYNAMIC_EXECUTION_PROFILE
 #ifdef DXPAIRS



More information about the Python-checkins mailing list