8000 GH-100240: Generic freelist, applied to ints by iritkatriel · Pull Request #101453 · python/cpython · GitHub
[go: up one dir, main page]
Skip to content

GH-100240: Generic freelist, applied to ints #101453

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
wants to merge 19 commits into from
Closed

GH-100240: Generic freelist, applied to ints #101453

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
e953c57
freelist for ints
iritkatriel Jan 30, 2023
cf99ee4
moved things around a little
iritkatriel Jan 31, 2023
8a6e6a3
remove WITH_FREELISTS in longobject.c
iritkatriel Jan 31, 2023
fe65f49
FreeToFull leaves the list empty
iritkatriel Jan 31, 2023
a33061f
reuse _PyFreeList_Clear
iritkatriel Feb 3, 2023
6b312e0
fix free bug and remove ifdef in a few places
iritkatriel Feb 3, 2023
1d81198
use _PyLong_Free in specialized bytecodes
iritkatriel Feb 3, 2023
5609e30
use _PyLong_Free in _Py_DECREF_INT
iritkatriel Feb 3, 2023
b8b1879
stats for generic freelist
iritkatriel Feb 5, 2023
460d12c
print new stats
iritkatriel Feb 6, 2023
2e2a861
fix index mapping
iritkatriel Feb 6, 2023
42ee27f
tweak the stats
iritkatriel Feb 7, 2023
a9e76ad
shift instead of div
iritkatriel Feb 8, 2023
1134727
Merge remote-tracking branch 'upstream/main' into int-freelist
iritkatriel Feb 8, 2023
78592b9
int --> Py_ssize_t
iritkatriel Feb 8, 2023
044743e
disable the freelist after clearing it in interpreter_clear
iritkatriel Feb 8, 2023
827b81b
add _PyFreeList_Disable
iritkatriel Feb 9, 2023
51c6c3c
rename INDEX --> SIZE_CLASS
iritkatriel Feb 10, 2023
cfb886d
stats per size class
iritkatriel Feb 10, 2023
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
use _PyLong_Free in specialized bytecodes
  • Loading branch information
@iritkatriel
iritkatriel committed Feb 3, 2023
commit 1d811986848b84e3ce191fc283acd59638d563ce
2 changes: 2 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 @@ -129,6 +129,8 @@ _PyLong_IsPositiveSingleDigit(PyObject* sub) {
return ((size_t)signed_size) <= 1;
}

void _PyLong_Free(PyLongObject *op);

#ifdef __cplusplus
}
#endif
Expand Down
6 changes: 3 additions & 3 deletions Objects/longobject.c
View file
Open in desktop
8000
Original file line number Diff line number Diff line change
Expand Up @@ -272,8 +272,8 @@ _PyLong_FromSTwoDigits(stwodigits x)
return _PyLong_FromLarge(x);
}

static void
int_dealloc(PyLongObject *op)
void
_PyLong_Free(PyLongObject *op)
{
if (PyLong_CheckExact(op) && IS_MEDIUM_VALUE(op)) {
PyInterpreterState *interp = _PyInterpreterState_GET();
Expand Down Expand Up @@ -6307,7 +6307,7 @@ PyTypeObject PyLong_Type = {
"int", /* tp_name */
offsetof(PyLongObject, long_value.ob_digit), /* tp_basicsize */
sizeof(digit), /* tp_itemsize */
(destructor)int_dealloc, /* tp_dealloc */
(destructor)_PyLong_Free, /* tp_dealloc */
0, /* tp_vectorcall_offset */
0, /* tp_getattr */
0, /* tp_setattr */
Expand Down
22 changes: 11 additions & 11 deletions Python/bytecodes.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,8 +183,8 @@ dummy_func(
DEOPT_IF(!PyLong_CheckExact(right), BINARY_OP);
STAT_INC(BINARY_OP, hit);
prod = _PyLong_Multiply((PyLongObject *)left, (PyLongObject *)right);
_Py_DECREF_SPECIALIZED(right, (destructor)PyObject_Free);
8000 _Py_DECREF_SPECIALIZED(left, (destructor)PyObject_Free);
_Py_DECREF_SPECIALIZED(right, (destructor)_PyLong_Free);
_Py_DECREF_SPECIALIZED(left, (destructor)_PyLong_Free);
ERROR_IF(prod == NULL, error);
}

Expand All @@ -207,8 +207,8 @@ dummy_func(
DEOPT_IF(!PyLong_CheckExact(right), BINARY_OP);
STAT_INC(BINARY_OP, hit);
sub = _PyLong_Subtract((PyLongObject *)left, (PyLongObject *)right);
_Py_DECREF_SPECIALIZED(right, (destructor)PyObject_Free);
_Py_DECREF_SPECIALIZED(left, (destructor)PyObject_Free);
_Py_DECREF_SPECIALIZED(right, (destructor)_PyLong_Free);
_Py_DECREF_SPECIALIZED(left, (destructor)_PyLong_Free);
ERROR_IF(sub == NULL, error);
}

Expand Down Expand Up @@ -290,8 +290,8 @@ dummy_func(
DEOPT_IF(Py_TYPE(right) != Py_TYPE(left), BINARY_OP);
STAT_INC(BINARY_OP, hit);
sum = _PyLong_Add((PyLongObject *)left, (PyLongObject *)right);
_Py_DECREF_SPECIALIZED(right, (destructor)PyObject_Free);
_Py_DECREF_SPECIALIZED(left, (destructor)PyObject_Free);
_Py_DECREF_SPECIALIZED(right, (destructor)_PyLong_Free);
_Py_DECREF_SPECIALIZED(left, (destructor)_PyLong_Free);
ERROR_IF(sum == NULL, error);
}

Expand Down Expand Up @@ -364,7 +364,7 @@ dummy_func(
res = PyList_GET_ITEM(list, index);
assert(res != NULL);
Py_INCREF(res);
_Py_DECREF_SPECIALIZED(sub, (destructor)PyObject_Free);
_Py_DECREF_SPECIALIZED(sub, (destructor)_PyLong_Free);
Py_DECREF(list);
}

Expand All @@ -382,7 +382,7 @@ dummy_func(
res = PyTuple_GET_ITEM(tuple, index);
assert(res != NULL);
Py_INCREF(res);
_Py_DECREF_SPECIALIZED(sub, (destructor)PyObject_Free);
_Py_DECREF_SPECIALIZED(sub, (destructor)_PyLong_Free);
Py_DECREF(tuple);
}

Expand Down Expand Up @@ -478,7 +478,7 @@ dummy_func(
PyList_SET_ITEM(list, index, value);
assert(old_value != NULL);
Py_DECREF(old_value);
_Py_DECREF_SPECIALIZED(sub, (destructor)PyObject_Free);
_Py_DECREF_SPECIALIZED(sub, (destructor)_PyLong_Free);
Py_DECREF(list);
}

Expand Down Expand Up @@ -1838,8 +1838,8 @@ dummy_func(
Py_ssize_t iright = Py_SIZE(right) * ((PyLongObject *)right)->long_value.ob_digit[0];
// 2 if <, 4 if >, 8 if ==; this matches the low 4 bits of the oparg
int sign_ish = COMPARISON_BIT(ileft, iright);
_Py_DECREF_SPECIALIZED(left, (destructor)PyObject_Free);
_Py_DECREF_SPECIALIZED(right, (destructor)PyObject_Free);
_Py_DECREF_SPECIALIZED(left, (destructor)_PyLong_Free);
_Py_DECREF_SPECIALIZED(right, (destructor)_PyLong_Free);
if (sign_ish & oparg) {
int offset = _Py_OPARG(next_instr[1]);
JUMPBY(offset);
Expand Down
22 changes: 11 additions & 11 deletions Python/generated_cases.c.h
View file 4CAC
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0