8000 bpo-37207: Use vectorcall for range() by encukou · Pull Request #18464 · python/cpython · GitHub
[go: up one dir, main page]
Skip to content

bpo-37207: Use vectorcall for range() #18464

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
merged 5 commits into from
Feb 18, 2020
Merged

bpo-37207: Use vectorcall for range() #18464

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b4f3271
Use vectorcall for range()
markshannon Apr 1, 2019
6d8063b
Add news entry.
encukou Feb 11, 2020
804e18c
Unify implementations of range_new and range_vectorcall
encukou Feb 11, 2020
663d8cc
Use Py_ssize_t for number of arguments
encukou Feb 18, 2020
b4559ce
Reset format argument for Py_ssize_t to %zd
encukou Feb 18, 2020
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
2 changes: 2 additions & 0 deletions Misc/NEWS.d/next/Core and Builtins/2019-06-09-10-54-31.bpo-37207.bLjgLR.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Speed up calls to ``range()`` by about 30%, by using the
PEP 590 ``vectorcall`` calling convention. Patch by Mark Shannon.
50 changes: 33 additions & 17 deletions Objects/rangeobject.c
View file
Open in desktop
B1B7
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

#include "Python.h"
#include "structmember.h"
#include "pycore_tupleobject.h"

/* Support objects whose length is > PY_SSIZE_T_MAX.

Expand Down Expand Up @@ -71,43 +72,35 @@ make_range_object(PyTypeObject *type, PyObject *start,
range(0, 5, -1)
*/
static PyObject *
range_new(PyTypeObject *type, PyObject *args, PyObject *kw)
range_from_array(PyTypeObject *type, PyObject *const *args, Py_ssize_t num_args)
{
rangeobject *obj;
PyObject *start = NULL, *stop = NULL, *step = NULL;

if (!_PyArg_NoKeywords("range", kw))
return NULL;

Py_ssize_t num_args = PyTuple_GET_SIZE(args);
switch (num_args) {
case 3:
step = PyTuple_GET_ITEM(args, 2);
step = args[2];
/* fallthrough */
case 2:
start = PyTuple_GET_ITEM(args, 0);
start = PyNumber_Index(start);
/* Convert borrowed refs to owned refs */
start = PyNumber_Index(args[0]);
if (!start) {
return NULL;
}

stop = PyTuple_GET_ITEM(args, 1);
stop = PyNumber_Index(stop);
stop = PyNumber_Index(args[1]);
if (!stop) {
Py_DECREF(start);
return NULL;
}

step = validate_step(step);
step = validate_step(step); /* Caution, this can clear exceptions */
if (!step) {
Py_DECREF(start);
Py_DECREF(stop);
return NULL;
}
break;
case 1:
stop = PyTuple_GET_ITEM(args, 0);
stop = PyNumber_Index(stop);
stop = PyNumber_Index(args[0]);
if (!stop) {
return NULL;
}
Expand All @@ -126,10 +119,10 @@ range_new(PyTypeObject *type, PyObject *args, PyObject *kw)
num_args);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It should be reset to %zd, since num_args is signed, no?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You're right.

return NULL;
}

obj = make_range_object(type, start, stop, step);
if (obj != NULL)
if (obj != NULL) {
return (PyObject *) obj;
}

/* Failed to create object, release attributes */
Py_DECREF(start);
Expand All @@ -138,6 +131,28 @@ range_new(PyTypeObject *type, PyObject *args, PyObject *kw)
return NULL;
}

static PyObject *
range_new(PyTypeObject *type, PyObject *args, PyObject *kw)
{
if (!_PyArg_NoKeywords("range", kw))
return NULL;

return range_from_array(type, _PyTuple_ITEMS(args), PyTuple_GET_SIZE(args));
}


static PyObject *
range_vectorcall(PyTypeObject *type, PyObject *const *args,
size_t nargsf, PyObject *kwnames)
{
Py_ssize_t nargs = PyVectorcall_NARGS(nargsf);
if (kwnames && PyTuple_GET_SIZE(kwnames) != 0) {
PyErr_Format(PyExc_TypeError, "range() takes no keyword arguments");
return NULL;
}
return range_from_array(type, args, nargs);
}

PyDoc_STRVAR(range_doc,
"range(stop) -> range object\n\
range(start, stop[, step]) -> range object\n\
Expand Down Expand Up @@ -719,6 +734,7 @@ PyTypeObject PyRange_Type = {
0, /* tp_init */
0, /* tp_alloc */
range_new, /* tp_new */
.tp_vectorcall = (vectorcallfunc)range_vectorcall
};

/*********************** range Iterator **************************/
Expand Down
0