Skip to content

Optimize mixed-mode arithmetics in nb_divmod() #390

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
skirpichev merged 1 commit into from
Nov 14, 2026
Merged

Optimize mixed-mode arithmetics in nb_divmod() #390

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
27 changes: 21 additions & 6 deletions gmp.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -914,20 +914,24 @@ BINOP(rem, PyNumber_Remainder)
goto end; \
} \
} \
} \
else if (ival == -1 && PyErr_Occurred()) { \
goto end; \
} \
}


Py_LOCAL(PyObject *)
nb_divmod(PyObject *self, PyObject *other)
{
PyObject *res = PyTuple_New(2);
MPZ_Object *u = NULL, *v = NULL;
int64_t ival = 0;

if (!res) {
return NULL; /* LCOV_EXCL_LINE */
}
CHECK_OP_INT(u, self);
CHECK_OP_INT(v, other);
CHECK_OP_INTv2(u, self);
CHECK_OP_INTv2(v, other);

MPZ_Object *q = MPZ_new();
MPZ_Object *r = MPZ_new();
Expand All @@ -940,8 +944,19 @@ nb_divmod(PyObject *self, PyObject *other)
/* LCOV_EXCL_STOP */
}

zz_err ret = zz_div(&u->z, &v->z, &q->z, &r->z);
zz_err ret = ZZ_OK;

if (u) {
if (v) {
ret = zz_div(&u->z, &v->z, &q->z, &r->z);
}
else {
ret = zz_div(&u->z, ival, &q->z, &r->z);
}
}
else {
ret = zz_div(ival, &v->z, &q->z, &r->z);
}
if (ret) {
Py_DECREF(q);
Py_DECREF(r);
Expand All @@ -953,8 +968,8 @@ nb_divmod(PyObject *self, PyObject *other)
}
goto end;
}
Py_DECREF(u);
Py_DECREF(v);
Py_XDECREF(u);
Py_XDECREF(v);
(void)PyTuple_SetItem(res, 0, (PyObject *)q);
(void)PyTuple_SetItem(res, 1, (PyObject *)r);
return res;
Expand Down
2 changes: 2 additions & 0 deletions tests/test_mpz.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -450,6 +450,8 @@ def test_divmod_bulk(x, y):
assert x % my == r
r = divmod(x, y)
assert divmod(mx, my) == r
assert divmod(mx, y) == r
assert divmod(x, my) == r


@given(bigints(), floats())
Expand Down