Skip to content

gh-89013: Improve the performance of methodcaller (lazy version) #107201

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
corona10 merged 21 commits into from
Aug 1, 2023
Merged

gh-89013: Improve the performance of methodcaller (lazy version) #107201

Changes from 1 commit
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
12a80bd
bpo-44850: Speedup methodcaller via vectorcall.
anntzer Aug 16, 2021
3d19683
Merge branch 'main' into fastmethodcaller
eendebakpt Jul 18, 2023
035456c
Merge branch 'main' into fastmethodcaller
eendebakpt Jul 21, 2023
8be0aed
optimize methodcaller construction
eendebakpt Jul 21, 2023
83c76bb
fix bug in methodcaller_reduce
eendebakpt Jul 21, 2023
09e3ee3
restore methodcaller_call
eendebakpt Jul 21, 2023
5d715c5
avoid looping over the dict twice
eendebakpt Jul 23, 2023
a6c465b
Merge branch 'main' into fastmethodcaller
eendebakpt Jul 23, 2023
486c498
lazy allocation of vectorcall arguments
eendebakpt Jul 24, 2023
f174256
fix double free
eendebakpt Jul 24, 2023
d70a8ad
Merge branch 'main' into fastmethodcaller_lazy_vectorcall
eendebakpt Jul 24, 2023
1ceea51
Apply suggestions from code review
eendebakpt Jul 30, 2023
608828a
Update Modules/_operator.c
eendebakpt Jul 30, 2023
ad7d6bd
inline methodcaller_clear
eendebakpt Jul 30, 2023
3c3d73f
Merge branch 'fastmethodcaller_lazy_vectorcall' of githubeendebakpt:e…
eendebakpt Jul 30, 2023
9335d6d
fix vectorcall initialization check
eendebakpt Jul 30, 2023
0c050fc
review comments
eendebakpt Jul 31, 2023
626169f
Merge branch 'main' into fastmethodcaller_lazy_vectorcall
eendebakpt Jul 31, 2023
0634f66
fix merge conflicts
eendebakpt Jul 31, 2023
5c56b64
Merge branch 'main' into fastmethodcaller_lazy_vectorcall
eendebakpt Jul 31, 2023
812856b
fix bug in clear
eendebakpt Jul 31, 2023
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
Prev Previous commit
Next Next commit
inline methodcaller_clear
  • Loading branch information
@eendebakpt
eendebakpt committed Jul 30, 2023
commit ad7d6bd090a8434422b8e0218fd5b51a0f8371f4
17 changes: 7 additions & 10 deletions Modules/_operator.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1556,12 +1556,13 @@ typedef struct {
vectorcallfunc vectorcall;
} methodcallerobject;

static int _methodcaller_initialize_vectorcall(methodcallerobject* mc)
static void* _methodcaller_initialize_vectorcall(methodcallerobject* mc)
{
PyObject* args = mc->xargs;
PyObject* kwds = mc->kwds;

Py_ssize_t nargs = PyTuple_GET_SIZE(args);
assert(nargs > 0);
mc->vectorcall_args = PyMem_Calloc(
Comment thread
corona10 marked this conversation as resolved.
nargs + (kwds ? PyDict_Size(kwds) : 0),
sizeof(PyObject*));
Expand Down Expand Up @@ -1594,14 +1595,6 @@ static int _methodcaller_initialize_vectorcall(methodcallerobject* mc)
return (void *)1;
}

static void _methodcaller_clear_vectorcall(methodcallerobject* mc)
{
if (mc->vectorcall_args != NULL) {
PyMem_Free(mc->vectorcall_args);
mc->vectorcall_args = 0;
}
Py_CLEAR(mc->vectorcall_kwnames);
}

static PyObject *
methodcaller_vectorcall(
Expand Down Expand Up @@ -1675,7 +1668,11 @@ methodcaller_clear(methodcallerobject *mc)
Py_CLEAR(mc->name);
Py_CLEAR(mc->xargs);
Py_CLEAR(mc->kwds);
_methodcaller_clear_vectorcall(mc);
if (mc->vectorcall_args != NULL) {
PyMem_Free(mc->vectorcall_args);
mc->vectorcall_args = 0;
}
Py_CLEAR(mc->vectorcall_kwnames);
}

static void
Expand Down