From b6c7b1faae22eb5c32954e7ce800b9e56af3562c Mon Sep 17 00:00:00 2001 From: Dong-hee Na Date: Sun, 15 Mar 2020 23:14:40 +0900 Subject: [PATCH 1/2] bpo-37207: Use PEP 590 vectorcall to speed up set() --- .../2020-03-15-23-16-00.bpo-37207.6XbnQA.rst | 2 ++ Objects/setobject.c | 24 +++++++++++++++++++ 2 files changed, 26 insertions(+) create mode 100644 Misc/NEWS.d/next/Core and Builtins/2020-03-15-23-16-00.bpo-37207.6XbnQA.rst diff --git a/Misc/NEWS.d/next/Core and Builtins/2020-03-15-23-16-00.bpo-37207.6XbnQA.rst b/Misc/NEWS.d/next/Core and Builtins/2020-03-15-23-16-00.bpo-37207.6XbnQA.rst new file mode 100644 index 00000000000000..28237ccfc651f2 --- /dev/null +++ b/Misc/NEWS.d/next/Core and Builtins/2020-03-15-23-16-00.bpo-37207.6XbnQA.rst @@ -0,0 +1,2 @@ +Speed up calls to ``set()`` by using the :pep:`590` ``vectorcall`` calling +convention. Patch by Dong-hee Na. diff --git a/Objects/setobject.c b/Objects/setobject.c index 43fa5d17fd2e79..afe836b84c5dfe 100644 --- a/Objects/setobject.c +++ b/Objects/setobject.c @@ -2014,6 +2014,29 @@ set_init(PySetObject *self, PyObject *args, PyObject *kwds) return set_update_internal(self, iterable); } +static PyObject* +set_vectorcall(PyObject *type, PyObject * const*args, + size_t nargsf, PyObject *kwnames) +{ + if (kwnames && PyTuple_GET_SIZE(kwnames) != 0) { + PyErr_Format(PyExc_TypeError, "set() takes no keyword arguments"); + return NULL; + } + + Py_ssize_t nargs = PyVectorcall_NARGS(nargsf); + if (!_PyArg_CheckPositional("set", nargs, 0, 1)) { + return NULL; + } + + assert(PyType_Check(type)); + + if (nargs) { + return make_new_set((PyTypeObject *)type, args[0]); + } + + return make_new_set((PyTypeObject *)type, NULL); +} + static PySequenceMethods set_as_sequence = { set_len, /* sq_length */ 0, /* sq_concat */ @@ -2162,6 +2185,7 @@ PyTypeObject PySet_Type = { PyType_GenericAlloc, /* tp_alloc */ set_new, /* tp_new */ PyObject_GC_Del, /* tp_free */ + .tp_vectorcall = set_vectorcall, }; /* frozenset object ********************************************************/ From 162128574d126c12724f785ff81823eb3b42ef87 Mon Sep 17 00:00:00 2001 From: Dong-hee Na Date: Mon, 16 Mar 2020 23:53:10 +0900 Subject: [PATCH 2/2] bpo-37207: Apply code review --- Objects/setobject.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/Objects/setobject.c b/Objects/setobject.c index afe836b84c5dfe..9f424b36461409 100644 --- a/Objects/setobject.c +++ b/Objects/setobject.c @@ -2018,8 +2018,9 @@ static PyObject* set_vectorcall(PyObject *type, PyObject * const*args, size_t nargsf, PyObject *kwnames) { - if (kwnames && PyTuple_GET_SIZE(kwnames) != 0) { - PyErr_Format(PyExc_TypeError, "set() takes no keyword arguments"); + assert(PyType_Check(type)); + + if (!_PyArg_NoKwnames("set", kwnames)) { return NULL; } @@ -2028,8 +2029,6 @@ set_vectorcall(PyObject *type, PyObject * const*args, return NULL; } - assert(PyType_Check(type)); - if (nargs) { return make_new_set((PyTypeObject *)type, args[0]); }