bpo-43706: Use PEP 590 vectorcall to speed up enumerate() (GH-25154)

This commit is contained in:
Dong-hee Na 2021-10-22 08:20:43 +09:00 committed by GitHub
parent 37fad7d3b7
commit 83f202a802
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 42 additions and 0 deletions

View File

@ -0,0 +1,2 @@
Speed up calls to ``enumerate()`` by using the :pep:`590` ``vectorcall``
calling convention. Patch by Dong-hee Na.

View File

@ -81,6 +81,45 @@ enum_new_impl(PyTypeObject *type, PyObject *iterable, PyObject *start)
return (PyObject *)en; return (PyObject *)en;
} }
// TODO: Use AC when bpo-43447 is supported
static PyObject *
enumerate_vectorcall(PyObject *type, PyObject *const *args,
size_t nargsf, PyObject *kwnames)
{
assert(PyType_Check(type));
PyTypeObject *tp = (PyTypeObject *)type;
Py_ssize_t nargs = PyVectorcall_NARGS(nargsf);
Py_ssize_t nkwargs = 0;
if (nargs == 0) {
PyErr_SetString(PyExc_TypeError,
"enumerate() missing required argument 'iterable'");
return NULL;
}
if (kwnames != NULL) {
nkwargs = PyTuple_GET_SIZE(kwnames);
}
if (nargs + nkwargs == 2) {
if (nkwargs == 1) {
PyObject *kw = PyTuple_GET_ITEM(kwnames, 0);
if (!_PyUnicode_EqualToASCIIString(kw, "start")) {
PyErr_Format(PyExc_TypeError,
"'%S' is an invalid keyword argument for enumerate()", kw);
return NULL;
}
}
return enum_new_impl(tp, args[0], args[1]);
}
if (nargs == 1 && nkwargs == 0) {
return enum_new_impl(tp, args[0], NULL);
}
PyErr_Format(PyExc_TypeError,
"enumerate() takes at most 2 arguments (%d given)", nargs + nkwargs);
return NULL;
}
static void static void
enum_dealloc(enumobject *en) enum_dealloc(enumobject *en)
{ {
@ -261,6 +300,7 @@ PyTypeObject PyEnum_Type = {
PyType_GenericAlloc, /* tp_alloc */ PyType_GenericAlloc, /* tp_alloc */
enum_new, /* tp_new */ enum_new, /* tp_new */
PyObject_GC_Del, /* tp_free */ PyObject_GC_Del, /* tp_free */
.tp_vectorcall = (vectorcallfunc)enumerate_vectorcall
}; };
/* Reversed Object ***************************************************************/ /* Reversed Object ***************************************************************/