Skip to content

bpo-44525: Specialize simple Python calls. #29033

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
markshannon merged 14 commits into from
Oct 20, 2021
Merged

bpo-44525: Specialize simple Python calls. #29033

Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
78b869e
Avoid making C calls for most calls to Python functions.
markshannon Oct 11, 2021
73041b5
Refactor a bit to help parsing of instructions.
markshannon Oct 13, 2021
5cc5442
Update gdb test to account for fewer C calls.
markshannon Oct 13, 2021
7c0f498
Change initialize_locals(steal=true) and _PyTuple_FromArraySteal to c…
markshannon Oct 14, 2021
03e7ad9
Fix compiler warnings on Windows.
markshannon Oct 14, 2021
82f5093
Rename labels and variable for clarity.
markshannon Oct 14, 2021
e4160c9
Add capability for specializing CALL_FUNCTION.
markshannon Oct 15, 2021
d5add72
Specialize for calls to simple Python functions with perfectly matchi…
markshannon Oct 15, 2021
1ef7132
Add CALL_FUNCTION to stats.
markshannon Oct 15, 2021
5dbedd8
Handle default arguments in CALL_FUNCTION_PY_SIMPLE.
markshannon Oct 18, 2021
265727f
Merge branch 'main' into specialize-call-py-simple
markshannon Oct 18, 2021
3195d70
Merge branch 'main' into specialize-call-py-simple
markshannon Oct 20, 2021
b844d55
Add NEWS.
markshannon Oct 20, 2021
6f1bfab
Tidy up news item.
markshannon Oct 20, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Avoid making C calls for most calls to Python functions.
  • Loading branch information
@markshannon
markshannon committed Oct 13, 2021
commit 78b869edb8f372112eb11f429c553ef8641792b2
162 changes: 53 additions & 109 deletions Python/ceval.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,9 +50,9 @@
_Py_IDENTIFIER(__name__);

/* Forward declarations */
Py_LOCAL_INLINE(PyObject *) call_function(
PyThreadState *tstate, PyObject ***pp_stack,
Py_ssize_t oparg, PyObject *kwnames, int use_tracing);
static PyObject *trace_call_function(
PyThreadState *tstate, PyObject *callable, PyObject **stack,
Py_ssize_t oparg, PyObject *kwnames);
static PyObject * do_call_core(
PyThreadState *tstate, PyObject *func,
PyObject *callargs, PyObject *kwdict, int use_tracing);
Expand Down Expand Up @@ -4538,12 +4538,13 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, InterpreterFrame *frame, int thr
DISPATCH();
}

/* Declare variables used for making calls */
PyObject *kwnames;
int nargs;
int stackadj;

TARGET(CALL_METHOD) {
/* Designed to work in tamdem with LOAD_METHOD. */
PyObject **sp, *res;
int meth_found;

sp = stack_pointer;
/* `meth` is NULL when LOAD_METHOD thinks that it's not
a method call.

Expand All @@ -4569,58 +4570,53 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, InterpreterFrame *frame, int thr
We'll be passing `oparg + 1` to call_function, to
make it accept the `self` as a first argument.
*/
meth_found = (PEEK(oparg + 2) != NULL);
res = call_function(tstate, &sp, oparg + meth_found, NULL, cframe.use_tracing);
stack_pointer = sp;

STACK_SHRINK(1 - meth_found);
PUSH(res);
if (res == NULL) {
goto error;
}
CHECK_EVAL_BREAKER();
DISPATCH();
int is_method = (PEEK(oparg + 2) != NULL);
oparg += is_method;
nargs = oparg;
kwnames = NULL;
stackadj = 2-is_method;
goto call_function;
}

TARGET(CALL_METHOD_KW) {
/* Designed to work in tandem with LOAD_METHOD. Same as CALL_METHOD
but pops TOS to get a tuple of keyword names. */
PyObject **sp, *res;
PyObject *names = NULL;
int meth_found;

names = POP();

sp = stack_pointer;
meth_found = (PEEK(oparg + 2) != NULL);
res = call_function(tstate, &sp, oparg + meth_found, names, cframe.use_tracing);
stack_pointer = sp;

STACK_SHRINK(1 - meth_found);
PUSH(res);
Py_DECREF(names);
if (res == NULL) {
goto error;
}
CHECK_EVAL_BREAKER();
DISPATCH();
kwnames = POP();
int is_method = (PEEK(oparg + 2) != NULL);
oparg += is_method;
nargs = oparg - PyTuple_GET_SIZE(kwnames);
stackadj = 2-is_method;
goto call_function;
}

TARGET(CALL_FUNCTION) {
PREDICTED(CALL_FUNCTION);
PyObject *res;
nargs = oparg;
kwnames = NULL;
stackadj = 1;
goto call_function;
}

TARGET(CALL_FUNCTION_KW) {
kwnames = POP();
nargs = oparg - PyTuple_GET_SIZE(kwnames);
stackadj = 1;
goto call_function;
}

call_function:
{
// Check if the call can be inlined or not
PyObject *function = PEEK(oparg + 1);
if (Py_TYPE(function) == &PyFunction_Type && tstate->interp->eval_frame == NULL) {
int code_flags = ((PyCodeObject*)PyFunction_GET_CODE(function))->co_flags;
PyObject *locals = code_flags & CO_OPTIMIZED ? NULL : PyFunction_GET_GLOBALS(function);
int is_generator = code_flags & (CO_GENERATOR | CO_COROUTINE | CO_ASYNC_GENERATOR);
if (!is_generator) {
PyObject *locals = code_flags & CO_OPTIMIZED ? NULL : PyFunction_GET_GLOBALS(function);
InterpreterFrame *new_frame = _PyEvalFramePushAndInit(
tstate, PyFunction_AS_FRAME_CONSTRUCTOR(function), locals,
stack_pointer-oparg,
oparg, NULL, 1);
nargs, kwnames, 1);
if (new_frame == NULL) {
// When we exit here, we own all variables in the stack
// (the frame creation has not stolen any variable) so
Expand All @@ -4629,54 +4625,36 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, InterpreterFrame *frame, int thr
goto error;
}

STACK_SHRINK(oparg + 1);
STACK_SHRINK(oparg + stackadj);
// The frame has stolen all the arguments from the stack,
// so there is no need to clean them up.
Py_XDECREF(kwnames);
Py_DECREF(function);
_PyFrame_SetStackPointer(frame, stack_pointer);
new_frame->depth = frame->depth + 1;
tstate->frame = frame = new_frame;
goto start_frame;
}
else {
/* Callable is a generator or coroutine function: create
* coroutine or generator. */
res = make_coro(tstate, PyFunction_AS_FRAME_CONSTRUCTOR(function),
locals, stack_pointer-oparg, oparg, NULL);
STACK_SHRINK(oparg + 1);
for (int i = 0; i < oparg + 1; i++) {
Py_DECREF(stack_pointer[i]);
}
}
}
PyObject *res;
/* Callable is not a normal Python function */
if (cframe.use_tracing) {
res = trace_call_function(tstate, function, stack_pointer-oparg, nargs, kwnames);
}
else {
/* Callable is not a Python function */
PyObject **sp = stack_pointer;
res = call_function(tstate, &sp, oparg, NULL, cframe.use_tracing);
stack_pointer = sp;
res = PyObject_Vectorcall(function, stack_pointer-oparg,
nargs | PY_VECTORCALL_ARGUMENTS_OFFSET, kwnames);
}

PUSH(res);
if (res == NULL) {
goto error;
assert((res != NULL) ^ (_PyErr_Occurred(tstate) != NULL));
Py_DECREF(function);
Py_XDECREF(kwnames);
/* Clear the stack */
STACK_SHRINK(oparg);
for (int i = 0; i < oparg; i++) {
Py_DECREF(stack_pointer[i]);
}
CHECK_EVAL_BREAKER();
DISPATCH();
}

TARGET(CALL_FUNCTION_KW) {
PyObject **sp, *res, *names;

names = POP();
assert(PyTuple_Check(names));
assert(PyTuple_GET_SIZE(names) <= oparg);
/* We assume without checking that names contains only strings */
sp = stack_pointer;
res = call_function(tstate, &sp, oparg, names, cframe.use_tracing);
stack_pointer = sp;
STACK_SHRINK(stackadj);
PUSH(res);
Py_DECREF(names);

if (res == NULL) {
goto error;
}
Expand Down Expand Up @@ -6536,40 +6514,6 @@ trace_call_function(PyThreadState *tstate,
return PyObject_Vectorcall(func, args, nargs | PY_VECTORCALL_ARGUMENTS_OFFSET, kwnames);
}

/* Issue #29227: Inline call_function() into _PyEval_EvalFrameDefault()
to reduce the stack consumption. */
Py_LOCAL_INLINE(PyObject *) _Py_HOT_FUNCTION
call_function(PyThreadState *tstate,
PyObject ***pp_stack,
Py_ssize_t oparg,
PyObject *kwnames,
int use_tracing)
{
PyObject **pfunc = (*pp_stack) - oparg - 1;
PyObject *func = *pfunc;
PyObject *x, *w;
Py_ssize_t nkwargs = (kwnames == NULL) ? 0 : PyTuple_GET_SIZE(kwnames);
Py_ssize_t nargs = oparg - nkwargs;
PyObject **stack = (*pp_stack) - nargs - nkwargs;

if (use_tracing) {
x = trace_call_function(tstate, func, stack, nargs, kwnames);
}
else {
x = PyObject_Vectorcall(func, stack, nargs | PY_VECTORCALL_ARGUMENTS_OFFSET, kwnames);
}

assert((x != NULL) ^ (_PyErr_Occurred(tstate) != NULL));

/* Clear the stack of the function object. */
while ((*pp_stack) > pfunc) {
w = EXT_POP(*pp_stack);
Py_DECREF(w);
}

return x;
}

static PyObject *
do_call_core(PyThreadState *tstate,
PyObject *func,
Expand Down