bpo-40602: Add _Py_HashPointerRaw() function (GH-20056)

vstinner · web-flow · commit f453221c8b80 · 2020-05-12T18:46:20.000+02:00
Add a new _Py_HashPointerRaw() function which avoids replacing -1
with -2 to micro-optimize hash table using pointer keys: using
_Py_hashtable_hash_ptr() hash function.
diff --git a/Include/pyhash.h b/Include/pyhash.h
@@ -9,6 +9,8 @@ extern "C" {
 #ifndef Py_LIMITED_API
 PyAPI_FUNC(Py_hash_t) _Py_HashDouble(double);
 PyAPI_FUNC(Py_hash_t) _Py_HashPointer(const void*);
+// Similar to _Py_HashPointer(), but don't replace -1 with -2
+PyAPI_FUNC(Py_hash_t) _Py_HashPointerRaw(const void*);
 PyAPI_FUNC(Py_hash_t) _Py_HashBytes(const void*, Py_ssize_t);
 #endif
 
diff --git a/Python/hashtable.c b/Python/hashtable.c
@@ -109,7 +109,7 @@ _Py_hashtable_hash_ptr(struct _Py_hashtable_t *ht, const void *pkey)
 {
     void *key;
     _Py_HASHTABLE_READ_KEY(ht, pkey, key);
-    return (Py_uhash_t)_Py_HashPointer(key);
+    return (Py_uhash_t)_Py_HashPointerRaw(key);
 }
 
 
diff --git a/Python/pyhash.c b/Python/pyhash.c
@@ -129,16 +129,22 @@ _Py_HashDouble(double v)
 }
 
 Py_hash_t
-_Py_HashPointer(const void *p)
+_Py_HashPointerRaw(const void *p)
 {
-    Py_hash_t x;
     size_t y = (size_t)p;
     /* bottom 3 or 4 bits are likely to be 0; rotate y by 4 to avoid
        excessive hash collisions for dicts and sets */
     y = (y >> 4) | (y << (8 * SIZEOF_VOID_P - 4));
-    x = (Py_hash_t)y;
-    if (x == -1)
+    return (Py_hash_t)y;
+}
+
+Py_hash_t
+_Py_HashPointer(const void *p)
+{
+    Py_hash_t x = _Py_HashPointerRaw(p);
+    if (x == -1) {
         x = -2;
+    }
     return x;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -109,7 +109,7 @@ _Py_hashtable_hash_ptr(struct _Py_hashtable_t ht, const void pkey)`
`109`	`109`	`{`
`110`	`110`	`void *key;`
`111`	`111`	`_Py_HASHTABLE_READ_KEY(ht, pkey, key);`
`112`		`- return (Py_uhash_t)_Py_HashPointer(key);`
	`112`	`+ return (Py_uhash_t)_Py_HashPointerRaw(key);`
`113`	`113`	`}`
`114`	`114`
`115`	`115`