bpo-38310: Predict BUILD_MAP_UNPACK_WITH_CALL -> CALL_FUNCTION_EX. (GH-16467)

brandtbucher · rhettinger · commit f185a7324918 · 2019-09-28T17:12:49.000-07:00
diff --git a/Misc/NEWS.d/next/Core and Builtins/2019-09-28-22-54-25.bpo-38310.YDTbEo.rst b/Misc/NEWS.d/next/Core and Builtins/2019-09-28-22-54-25.bpo-38310.YDTbEo.rst
@@ -0,0 +1 @@
+Predict ``BUILD_MAP_UNPACK_WITH_CALL`` -> ``CALL_FUNCTION_EX`` opcode pairs in the main interpreter loop. Patch by Brandt Bucher.
diff --git a/Python/ceval.c b/Python/ceval.c
@@ -2943,6 +2943,7 @@ _PyEval_EvalFrameDefault(PyFrameObject *f, int throwflag)
             while (oparg--)
                 Py_DECREF(POP());
             PUSH(sum);
+            PREDICT(CALL_FUNCTION_EX);
             DISPATCH();
         }
 
@@ -3522,6 +3523,7 @@ _PyEval_EvalFrameDefault(PyFrameObject *f, int throwflag)
         }
 
         case TARGET(CALL_FUNCTION_EX): {
+            PREDICTED(CALL_FUNCTION_EX);
             PyObject *func, *callargs, *kwargs = NULL, *result;
             if (oparg & 0x01) {
                 kwargs = POP();

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	+Predict ``BUILD_MAP_UNPACK_WITH_CALL`` -> ``CALL_FUNCTION_EX`` opcode pairs in the main interpreter loop. Patch by Brandt Bucher.
Original file line number	Diff line number	Diff line change
`@@ -2943,6 +2943,7 @@ _PyEval_EvalFrameDefault(PyFrameObject *f, int throwflag)`
`2943`	`2943`	`while (oparg--)`
`2944`	`2944`	`Py_DECREF(POP());`
`2945`	`2945`	`PUSH(sum);`
	`2946`	`+ PREDICT(CALL_FUNCTION_EX);`
`2946`	`2947`	`DISPATCH();`
`2947`	`2948`	`}`
`2948`	`2949`
`@@ -3522,6 +3523,7 @@ _PyEval_EvalFrameDefault(PyFrameObject *f, int throwflag)`
`3522`	`3523`	`}`
`3523`	`3524`
`3524`	`3525`	`case TARGET(CALL_FUNCTION_EX): {`
	`3526`	`+ PREDICTED(CALL_FUNCTION_EX);`
`3525`	`3527`	`PyObject func, callargs, kwargs = NULL, result;`
`3526`	`3528`	`if (oparg & 0x01) {`
`3527`	`3529`	`kwargs = POP();`