summaryrefslogtreecommitdiffstats
path: root/Python/ceval.c
diff options
context:
space:
mode:
authorKen Jin <28750310+Fidget-Spinner@users.noreply.github.com>2021-10-19 23:16:36 (GMT)
committerGitHub <noreply@github.com>2021-10-19 23:16:36 (GMT)
commit3163e68c342434db37c69669017f96a4bb2d5f13 (patch)
treec3a42ae0839c533db3fac33d6005b7a1d7bf5e78 /Python/ceval.c
parent3592980f9122ab0d9ed93711347742d110b749c2 (diff)
downloadcpython-3163e68c342434db37c69669017f96a4bb2d5f13.zip
cpython-3163e68c342434db37c69669017f96a4bb2d5f13.tar.gz
cpython-3163e68c342434db37c69669017f96a4bb2d5f13.tar.bz2
bpo-44525: Specialize ``CALL_FUNCTION`` for C function calls (GH-26934)
Diffstat (limited to 'Python/ceval.c')
-rw-r--r--Python/ceval.c147
1 files changed, 147 insertions, 0 deletions
diff --git a/Python/ceval.c b/Python/ceval.c
index 2fb60a8..7632590 100644
--- a/Python/ceval.c
+++ b/Python/ceval.c
@@ -4660,6 +4660,7 @@ check_eval_breaker:
TARGET(CALL_FUNCTION) {
PREDICTED(CALL_FUNCTION);
+ STAT_INC(CALL_FUNCTION, unquickened);
PyObject *function;
nargs = oparg;
kwnames = NULL;
@@ -4717,6 +4718,151 @@ check_eval_breaker:
DISPATCH();
}
+ TARGET(CALL_FUNCTION_ADAPTIVE) {
+ SpecializedCacheEntry *cache = GET_CACHE();
+ if (cache->adaptive.counter == 0) {
+ next_instr--;
+ int nargs = cache->adaptive.original_oparg;
+ if (_Py_Specialize_CallFunction(
+ PEEK(nargs + 1), next_instr, nargs, cache, BUILTINS()) < 0) {
+ goto error;
+ }
+ DISPATCH();
+ }
+ else {
+ STAT_INC(CALL_FUNCTION, deferred);
+ cache->adaptive.counter--;
+ oparg = cache->adaptive.original_oparg;
+ JUMP_TO_INSTRUCTION(CALL_FUNCTION);
+ }
+ }
+
+ TARGET(CALL_FUNCTION_BUILTIN_O) {
+ assert(cframe.use_tracing == 0);
+ /* Builtin METH_O functions */
+
+ PyObject *callable = SECOND();
+ DEOPT_IF(!PyCFunction_CheckExact(callable), CALL_FUNCTION);
+ DEOPT_IF(PyCFunction_GET_FLAGS(callable) != METH_O, CALL_FUNCTION);
+ _PyAdaptiveEntry *cache0 = &GET_CACHE()[0].adaptive;
+ record_cache_hit(cache0);
+ STAT_INC(CALL_FUNCTION, hit);
+
+ PyCFunction cfunc = PyCFunction_GET_FUNCTION(callable);
+ PyObject *arg = POP();
+ PyObject *res = cfunc(PyCFunction_GET_SELF(callable), arg);
+ assert((res != NULL) ^ (_PyErr_Occurred(tstate) != NULL));
+
+ /* Clear the stack of the function object. */
+ Py_DECREF(arg);
+ Py_DECREF(callable);
+ SET_TOP(res);
+ if (res == NULL) {
+ goto error;
+ }
+ DISPATCH();
+ }
+
+ TARGET(CALL_FUNCTION_BUILTIN_FAST) {
+ assert(cframe.use_tracing == 0);
+ /* Builtin METH_FASTCALL functions, without keywords */
+ SpecializedCacheEntry *caches = GET_CACHE();
+ _PyAdaptiveEntry *cache0 = &caches[0].adaptive;
+ int nargs = cache0->original_oparg;
+ PyObject **pfunc = &PEEK(nargs + 1);
+ PyObject *callable = *pfunc;
+ DEOPT_IF(!PyCFunction_CheckExact(callable), CALL_FUNCTION);
+ DEOPT_IF(PyCFunction_GET_FLAGS(callable) != METH_FASTCALL,
+ CALL_FUNCTION);
+ record_cache_hit(cache0);
+ STAT_INC(CALL_FUNCTION, hit);
+
+ PyCFunction cfunc = PyCFunction_GET_FUNCTION(callable);
+ /* res = func(self, args, nargs) */
+ PyObject *res = ((_PyCFunctionFast)(void(*)(void))cfunc)(
+ PyCFunction_GET_SELF(callable),
+ &PEEK(nargs),
+ nargs);
+ assert((res != NULL) ^ (_PyErr_Occurred(tstate) != NULL));
+
+ /* Clear the stack of the function object. */
+ while (stack_pointer > pfunc) {
+ PyObject *x = POP();
+ Py_DECREF(x);
+ }
+ PUSH(res);
+ if (res == NULL) {
+ /* Not deopting because this doesn't mean our optimization was
+ wrong. `res` can be NULL for valid reasons. Eg. getattr(x,
+ 'invalid'). In those cases an exception is set, so we must
+ handle it.
+ */
+ goto error;
+ }
+ DISPATCH();
+ }
+
+ TARGET(CALL_FUNCTION_LEN) {
+ assert(cframe.use_tracing == 0);
+ /* len(o) */
+ SpecializedCacheEntry *caches = GET_CACHE();
+ _PyAdaptiveEntry *cache0 = &caches[0].adaptive;
+ _PyObjectCache *cache1 = &caches[-1].obj;
+ assert(cache0->original_oparg == 1);
+
+ PyObject *callable = SECOND();
+ DEOPT_IF(callable != cache1->obj, CALL_FUNCTION);
+ record_cache_hit(cache0);
+ STAT_INC(CALL_FUNCTION, hit);
+
+ Py_ssize_t len_i = PyObject_Length(TOP());
+ if (len_i < 0) {
+ goto error;
+ }
+ PyObject *res = PyLong_FromSsize_t(len_i);
+ assert((res != NULL) ^ (_PyErr_Occurred(tstate) != NULL));
+
+ /* Clear the stack of the function object. */
+ Py_DECREF(POP());
+ Py_DECREF(callable);
+ SET_TOP(res);
+ if (res == NULL) {
+ goto error;
+ }
+ DISPATCH();
+ }
+
+ TARGET(CALL_FUNCTION_ISINSTANCE) {
+ assert(cframe.use_tracing == 0);
+ /* isinstance(o, o2) */
+ SpecializedCacheEntry *caches = GET_CACHE();
+ _PyAdaptiveEntry *cache0 = &caches[0].adaptive;
+ _PyObjectCache *cache1 = &caches[-1].obj;
+ assert(cache0->original_oparg == 2);
+
+ PyObject *callable = THIRD();
+ DEOPT_IF(callable != cache1->obj, CALL_FUNCTION);
+ record_cache_hit(cache0);
+ STAT_INC(CALL_FUNCTION, hit);
+
+ int retval = PyObject_IsInstance(SECOND(), TOP());
+ if (retval < 0) {
+ goto error;
+ }
+ PyObject *res = PyBool_FromLong(retval);
+ assert((res != NULL) ^ (_PyErr_Occurred(tstate) != NULL));
+
+ /* Clear the stack of the function object. */
+ Py_DECREF(POP());
+ Py_DECREF(POP());
+ Py_DECREF(callable);
+ SET_TOP(res);
+ if (res == NULL) {
+ goto error;
+ }
+ DISPATCH();
+ }
+
TARGET(CALL_FUNCTION_EX) {
PREDICTED(CALL_FUNCTION_EX);
PyObject *func, *callargs, *kwargs = NULL, *result;
@@ -4985,6 +5131,7 @@ MISS_WITH_CACHE(LOAD_ATTR)
MISS_WITH_CACHE(STORE_ATTR)
MISS_WITH_CACHE(LOAD_GLOBAL)
MISS_WITH_CACHE(LOAD_METHOD)
+MISS_WITH_CACHE(CALL_FUNCTION)
MISS_WITH_OPARG_COUNTER(BINARY_SUBSCR)
MISS_WITH_OPARG_COUNTER(BINARY_ADD)
MISS_WITH_OPARG_COUNTER(BINARY_MULTIPLY)