Skip to content

Experimental variant of BINARY_ADD specialization. #29059

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

Closed
markshannon wants to merge 4 commits into from
Closed

Experimental variant of BINARY_ADD specialization. #29059

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
763c297
Experimental variant of BINARY_ADD specialization.
markshannon Oct 19, 2021
a90f27e
Merge branch 'main' into alternative-specialize-binary-add
markshannon Oct 27, 2021
a8128d1
Specialize BINARY_ADD for int+float and float+int.
markshannon Oct 27, 2021
bdb767f
Merge branch 'main' into alternative-specialize-binary-add
markshannon Oct 27, 2021
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
Specialize BINARY_ADD for int+float and float+int.
  • Loading branch information
@markshannon
markshannon committed Oct 27, 2021
commit a8128d155d3eb5581dfcb026bf00035b3c64830d
4 changes: 4 additions & 0 deletions Include/internal/pycore_long.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,10 @@ PyAPI_FUNC(char*) _PyLong_FormatBytesWriter(
int base,
int alternate);

PyObject *_PyAdd_Float_Long(PyFloatObject *a, PyLongObject *b);

PyObject *_PyAdd_Long_Float(PyLongObject *a, PyFloatObject *b);

#ifdef __cplusplus
}
#endif
Expand Down
20 changes: 20 additions & 0 deletions Objects/longobject.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3151,6 +3151,26 @@ _PyLong_Add(PyLongObject *a, PyLongObject *b)
return (PyObject *)z;
}

PyObject *
_PyAdd_Long_Float(PyLongObject *a, PyFloatObject *b)
{
if (IS_MEDIUM_VALUE(a)) {
double l = (double)medium_value(a);
return PyFloat_FromDouble(l + b->ob_fval);
}
return PyFloat_Type.tp_as_number->nb_add((PyObject *)a, (PyObject *)b);
}

PyObject *
_PyAdd_Float_Long(PyFloatObject *a, PyLongObject *b)
{
if (IS_MEDIUM_VALUE(b)) {
double r = (double)medium_value(b);
return PyFloat_FromDouble(a->ob_fval + r);
}
return PyFloat_Type.tp_as_number->nb_add((PyObject *)a, (PyObject *)b);
}

static PyObject *
long_add(PyLongObject *a, PyLongObject *b)
{
Expand Down
22 changes: 20 additions & 2 deletions Python/specialize.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1183,14 +1183,32 @@ _Py_Specialize_BinarySubscr(
return 0;
}

PyObject *_PyAdd_Float_Long(PyFloatObject *a, PyLongObject *b);

PyObject *_PyAdd_Long_Float(PyLongObject *a, PyFloatObject *b);


int
_Py_Specialize_BinaryAdd(PyObject *left, PyObject *right, _Py_CODEUNIT *instr, SpecializedCacheEntry *cache)
{
_PyAdaptiveEntry *cache0 = &cache->adaptive;
PyTypeObject *left_type = Py_TYPE(left);
if (left_type != Py_TYPE(right)) {
SPECIALIZATION_FAIL(BINARY_ADD, SPEC_FAIL_DIFFERENT_TYPES);
goto fail;
_PyFuncPtrCache *cache1 = &cache[-1].func_ptr;
if (left_type == &PyLong_Type && Py_TYPE(right) == &PyFloat_Type) {
cache1->function = (binaryfunc)_PyAdd_Long_Float;
}
else if (left_type == &PyFloat_Type && Py_TYPE(right) == &PyLong_Type) {
cache1->function = (binaryfunc)_PyAdd_Float_Long;
}
else {
SPECIALIZATION_FAIL(BINARY_ADD, SPEC_FAIL_DIFFERENT_TYPES);
goto fail;
}
cache0->left_version = left_type->tp_version_tag;
cache0->right_version = Py_TYPE(right)->tp_version_tag;
*instr = _Py_MAKECODEUNIT(BINARY_ADD_CACHED, _Py_OPARG(*instr));
goto success;
}
if (left_type == &PyUnicode_Type) {
int next_opcode = _Py_OPCODE(instr[1]);
Expand Down