Thanks to visit codestin.com
Credit goes to github.com

Skip to content

gh-131525: Cache the result of tuple_hash #131529

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
mdboom merged 18 commits into from
Mar 27, 2025
Merged

gh-131525: Cache the result of tuple_hash #131529

Changes from 1 commit
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
b3c3977
gh-131525: Cache the result of tuple_hash
mdboom Mar 20, 2025
8a1f93e
Fix debug builds
mdboom Mar 20, 2025
1442437
Add blurb
mdboom Mar 20, 2025
9d1c089
Fix formatting
mdboom Mar 20, 2025
40ad9fc
Pre-compute empty tuple singleton
mdboom Mar 21, 2025
9a392ed
Mostly set the cache within tuple_alloc
mdboom Mar 21, 2025
c4fb543
Fixes for TSAN
mdboom Mar 21, 2025
814db9a
Merge remote-tracking branch 'upstream/main' into tuple_hash_cache2
mdboom Mar 21, 2025
c24b33d
Pre-compute empty tuple singleton
mdboom Mar 21, 2025
edcc03d
Merge remote-tracking branch 'origin/tuple_hash_cache2' into tuple_ha…
mdboom Mar 21, 2025
224bef2
Fix for 32-bit platforms
mdboom Mar 21, 2025
23f9f66
Assert that op != NULL in _PyTuple_RESET_HASH_CACHE
mdboom Mar 24, 2025
9ee12f9
Use FT_ATOMIC_STORE_SSIZE_RELAXED macro
mdboom Mar 24, 2025
d2c521a
Merge remote-tracking branch 'upstream/main' into tuple_hash_cache2
mdboom Mar 24, 2025
2c8f077
Update Include/internal/pycore_tuple.h
mdboom Mar 24, 2025
a6edcea
Fix alignment
mdboom Mar 24, 2025
5faa68d
atomic load
mdboom Mar 25, 2025
da6fa30
Update Objects/tupleobject.c
mdboom Mar 26, 2025
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
Mostly set the cache within tuple_alloc
  • Loading branch information
@mdboom
mdboom committed Mar 21, 2025
commit 9a392edde260df435047156f9a8d83dd3213fa9a
17 changes: 6 additions & 11 deletions Objects/tupleobject.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ tuple_alloc(Py_ssize_t size)
if (index < PyTuple_MAXSAVESIZE) {
PyTupleObject *op = _Py_FREELIST_POP(PyTupleObject, tuples[index]);
if (op != NULL) {
_PyTuple_RESET_HASH_CACHE(op);
return op;
}
}
Expand All @@ -53,7 +54,11 @@ tuple_alloc(Py_ssize_t size)
sizeof(PyObject *))) / sizeof(PyObject *)) {
return (PyTupleObject *)PyErr_NoMemory();
}
return PyObject_GC_NewVar(PyTupleObject, &PyTuple_Type, size);
PyTupleObject *result = PyObject_GC_NewVar(PyTupleObject, &PyTuple_Type, size);
if (result != NULL) {
_PyTuple_RESET_HASH_CACHE(result);
Comment thread
picnixz marked this conversation as resolved.
}
return result;
}

// The empty tuple singleton is not tracked by the GC.
Expand All @@ -77,7 +82,6 @@ PyTuple_New(Py_ssize_t size)
if (op == NULL) {
return NULL;
}
_PyTuple_RESET_HASH_CACHE(op);
for (Py_ssize_t i = 0; i < size; i++) {
op->ob_item[i] = NULL;
}
Expand Down Expand Up @@ -170,7 +174,6 @@ PyTuple_Pack(Py_ssize_t n, ...)
va_end(vargs);
return NULL;
}
_PyTuple_RESET_HASH_CACHE(result);
items = result->ob_item;
for (i = 0; i < n; i++) {
o = va_arg(vargs, PyObject *);
Expand Down Expand Up @@ -390,7 +393,6 @@ _PyTuple_FromArray(PyObject *const *src, Py_ssize_t n)
if (tuple == NULL) {
return NULL;
}
_PyTuple_RESET_HASH_CACHE(tuple);
PyObject **dst = tuple->ob_item;
for (Py_ssize_t i = 0; i < n; i++) {
PyObject *item = src[i];
Expand All @@ -410,7 +412,6 @@ _PyTuple_FromStackRefStealOnSuccess(const _PyStackRef *src, Py_ssize_t n)
if (tuple == NULL) {
return NULL;
}
_PyTuple_RESET_HASH_CACHE(tuple);
PyObject **dst = tuple->ob_item;
for (Py_ssize_t i = 0; i < n; i++) {
dst[i] = PyStackRef_AsPyObjectSteal(src[i]);
Expand All @@ -432,7 +433,6 @@ _PyTuple_FromArraySteal(PyObject *const *src, Py_ssize_t n)
}
return NULL;
}
_PyTuple_RESET_HASH_CACHE(tuple);
PyObject **dst = tuple->ob_item;
for (Py_ssize_t i = 0; i < n; i++) {
PyObject *item = src[i];
Expand Down Expand Up @@ -497,8 +497,6 @@ tuple_concat(PyObject *aa, PyObject *bb)
return NULL;
}

_PyTuple_RESET_HASH_CACHE(np);

PyObject **src = a->ob_item;
PyObject **dest = np->ob_item;
for (Py_ssize_t i = 0; i < Py_SIZE(a); i++) {
Expand Down Expand Up @@ -542,8 +540,6 @@ tuple_repeat(PyObject *self, Py_ssize_t n)
if (np == NULL)
return NULL;

_PyTuple_RESET_HASH_CACHE(np);

PyObject **dest = np->ob_item;
if (input_size == 1) {
PyObject *elem = a->ob_item[0];
Expand Down Expand Up @@ -834,7 +830,6 @@ tuple_subscript(PyObject *op, PyObject* item)
PyTupleObject* result = tuple_alloc(slicelength);
if (!result) return NULL;

_PyTuple_RESET_HASH_CACHE(result);
src = self->ob_item;
dest = result->ob_item;
for (cur = start, i = 0; i < slicelength;
Expand Down