-
-
Notifications
You must be signed in to change notification settings - Fork 33.1k
gh-136599: Improve long_hash #136600
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.
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
Merged
gh-136599: Improve long_hash #136600
Changes from 6 commits
Commits
Show all changes
20 commits
Select commit
Hold shift + click to select a range
146f5aa
Add test for long_hash
eendebakpt a162da2
Unroll first digit calculation in long_hash
eendebakpt 4f9fc76
Unroll second digit calculation in long_hash
eendebakpt 07bce4b
whitespace
eendebakpt 32341de
add gh number
eendebakpt 194fb7a
Merge branch 'long_hash' of github.com:eendebakpt/cpython into long_hash
eendebakpt a48860f
review comments
eendebakpt 6d3754b
fix test on wasi
eendebakpt fec9fbe
add news entry
eendebakpt 08d7ba9
review comments
eendebakpt 14a90f1
Merge branch 'main' into long_hash
eendebakpt 76c4f6a
Apply suggestions from code review
eendebakpt f720557
Update Objects/longobject.c
eendebakpt 55e5bd9
Merge branch 'main' into long_hash
eendebakpt 0aa56f0
Merge branch 'long_hash' of github.com:eendebakpt/cpython into long_hash
eendebakpt c1a3184
review comment
eendebakpt b9a487d
fix assert
eendebakpt b0fd0d8
Update Objects/longobject.c
eendebakpt c6e060d
Apply suggestions from code review
eendebakpt 9b6e628
Update Objects/longobject.c
vstinner File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -3676,7 +3676,17 @@ long_hash(PyObject *obj) | |
} | ||
i = _PyLong_DigitCount(v); | ||
sign = _PyLong_NonCompactSign(v); | ||
x = 0; | ||
|
||
// unroll first two digits | ||
assert(i>=2); | ||
|
||
--i; | ||
x = v->long_value.ob_digit[i]; | ||
assert(x < _PyHASH_MODULUS); | ||
eendebakpt marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
--i; | ||
x = ((x << PyLong_SHIFT)); | ||
eendebakpt marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
x += v->long_value.ob_digit[i]; | ||
assert(x < _PyHASH_MODULUS); | ||
skirpichev marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
eendebakpt marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
|
||
while (--i >= 0) { | ||
/* Here x is a quantity in the range [0, _PyHASH_MODULUS); we | ||
want to compute x * 2**PyLong_SHIFT + v->long_value.ob_digit[i] modulo | ||
|
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
+1 on introducing hash tests in
test_long.py
even though there arecpython/Lib/test/test_builtin.py
Line 1165 in 3dbe02c
and
Lib/test/test_hash.py
There are special tests with respect to hashing in many other test modules, e.g.
cpython/Lib/test/test_float.py
Line 635 in 9e5cebd
so IMHO this is a good fit 👍