Skip to content
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

Use SipHash-1-3 instead of SipHash-2-4 for StableHasher #107925

Merged
merged 10 commits into from
Apr 5, 2023
Merged

Use SipHash-1-3 instead of SipHash-2-4 for StableHasher #107925

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
bb0969c
Use SipHash-1-3 instead of SipHash-2-4 for StableHasher
thomcc Feb 11, 2023
9d31462
Fix a couple missed hash constants
thomcc Feb 11, 2023
0db1f54
Bless tests
thomcc Feb 11, 2023
36ca32c
Fix a codegen test with some hard-coded hashes
thomcc Feb 11, 2023
476737e
Fix an assembly test with a hard-coded hash
thomcc Feb 11, 2023
46fad95
Fix a debuginfo test with a hard-coded hash
thomcc Mar 5, 2023
931fd85
Fix codegen tests with hard-coded hashes
lqd Apr 3, 2023
dc04b08
Bless rustdoc test with swapped ids
lqd Apr 3, 2023
4e235a7
Bless rustdoc-ui test with new errors order
lqd Apr 3, 2023
46a3d28
Fix function order in an msvc debuginfo test
lqd Apr 4, 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
20 changes: 9 additions & 11 deletions compiler/rustc_data_structures/src/sip128.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -247,7 +247,7 @@ impl SipHasher128 {
for i in 0..BUFFER_CAPACITY {
let elem = self.buf.get_unchecked(i).assume_init().to_le();
self.state.v3 ^= elem;
Sip24Rounds::c_rounds(&mut self.state);
Sip13Rounds::c_rounds(&mut self.state);
self.state.v0 ^= elem;
}

Expand Down Expand Up @@ -327,7 +327,7 @@ impl SipHasher128 {
for i in 0..last {
let elem = self.buf.get_unchecked(i).assume_init().to_le();
self.state.v3 ^= elem;
Sip24Rounds::c_rounds(&mut self.state);
Sip13Rounds::c_rounds(&mut self.state);
self.state.v0 ^= elem;
}

Expand All @@ -340,7 +340,7 @@ impl SipHasher128 {
for _ in 0..elems_left {
let elem = (msg.as_ptr().add(processed) as *const u64).read_unaligned().to_le();
self.state.v3 ^= elem;
Sip24Rounds::c_rounds(&mut self.state);
Sip13Rounds::c_rounds(&mut self.state);
self.state.v0 ^= elem;
processed += ELEM_SIZE;
}
Expand Down Expand Up @@ -368,7 +368,7 @@ impl SipHasher128 {
for i in 0..last {
let elem = unsafe { self.buf.get_unchecked(i).assume_init().to_le() };
state.v3 ^= elem;
Sip24Rounds::c_rounds(&mut state);
Sip13Rounds::c_rounds(&mut state);
state.v0 ^= elem;
}

Expand All @@ -392,15 +392,15 @@ impl SipHasher128 {
let b: u64 = ((length as u64 & 0xff) << 56) | elem;

state.v3 ^= b;
Sip24Rounds::c_rounds(&mut state);
Sip13Rounds::c_rounds(&mut state);
state.v0 ^= b;

state.v2 ^= 0xee;
Sip24Rounds::d_rounds(&mut state);
Sip13Rounds::d_rounds(&mut state);
let _0 = state.v0 ^ state.v1 ^ state.v2 ^ state.v3;

state.v1 ^= 0xdd;
Sip24Rounds::d_rounds(&mut state);
Sip13Rounds::d_rounds(&mut state);
let _1 = state.v0 ^ state.v1 ^ state.v2 ^ state.v3;

(_0, _1)
Expand Down Expand Up @@ -477,20 +477,18 @@ impl Hasher for SipHasher128 {
}

#[derive(Debug, Clone, Default)]
struct Sip24Rounds;
struct Sip13Rounds;

impl Sip24Rounds {
impl Sip13Rounds {
#[inline]
fn c_rounds(state: &mut State) {
compress!(state);
compress!(state);
}

#[inline]
fn d_rounds(state: &mut State) {
compress!(state);
compress!(state);
compress!(state);
compress!(state);
}
}
Loading