nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2024-11-27 09:14:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rollup merge of #69471 - nnethercote:rm-sip-Hasher-short_write, r=dtolnay

Browse Source 
Remove `sip::Hasher::short_write`.

`sip::Hasher::short_write` is currently unused. It is called by
`sip::Hasher::write_{u8,usize}`, but those methods are also unused,
because `DefaultHasher`, `SipHasher` and `SipHasher13` don't implement
any of the `write_xyz` methods, so all their write operations end up
calling `sip::Hasher::write`.

(I confirmed this by inserting a `panic!` in `sip::Hasher::short_write`
and running the tests -- they all passed.)

The alternative would be to add all the missing `write_xyz` methods.
This does give some significant speed-ups, but it hurts compile times a
little in some cases. See #69152 for details. This commit does the
conservative thing and doesn't change existing behaviour.

r? @rust-lang/libs
This commit is contained in:
Dylan DPC 2020-03-15 02:44:15 +01:00 committed by GitHub
commit 0619e4649d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
src/libcore/hash/sip.rs
View File

@ -220,37 +220,6 @@ impl<S: Sip> Hasher<S> {
self.state.v3 = self.k1 ^ 0x7465646279746573; self.state.v3 = self.k1 ^ 0x7465646279746573;
self.ntail = 0; self.ntail = 0;
} }
// Specialized write function that is only valid for buffers with len <= 8.
// It's used to force inlining of write_u8 and write_usize, those would normally be inlined
// except for composite types (that includes slices and str hashing because of delimiter).
// Without this extra push the compiler is very reluctant to inline delimiter writes,
// degrading performance substantially for the most common use cases.
#[inline]
fn short_write(&mut self, msg: &[u8]) {
debug_assert!(msg.len() <= 8);
let length = msg.len();
self.length += length;
let needed = 8 - self.ntail;
let fill = cmp::min(length, needed);
if fill == 8 {
self.tail = unsafe { load_int_le!(msg, 0, u64) };
} else {
self.tail |= unsafe { u8to64_le(msg, 0, fill) } << (8 * self.ntail);
if length < needed {
self.ntail += length;
return;
}
}
self.state.v3 ^= self.tail;
S::c_rounds(&mut self.state);
self.state.v0 ^= self.tail;
// Buffered tail is now flushed, process new input.
self.ntail = length - needed;
self.tail = unsafe { u8to64_le(msg, needed, self.ntail) };
}
} }
#[stable(feature = "rust1", since = "1.0.0")] #[stable(feature = "rust1", since = "1.0.0")]
@ -280,21 +249,13 @@ impl super::Hasher for SipHasher13 {
} }
impl<S: Sip> super::Hasher for Hasher<S> { impl<S: Sip> super::Hasher for Hasher<S> {
// see short_write comment for explanation // Note: no integer hashing methods (`write_u*`, `write_i*`) are defined
#[inline] // for this type. We could add them, copy the `short_write` implementation
fn write_usize(&mut self, i: usize) { // in librustc_data_structures/sip128.rs, and add `write_u*`/`write_i*`
let bytes = unsafe { // methods to `SipHasher`, `SipHasher13`, and `DefaultHasher`. This would
crate::slice::from_raw_parts(&i as *const usize as *const u8, mem::size_of::<usize>()) // greatly speed up integer hashing by those hashers, at the cost of
}; // slightly slowing down compile speeds on some benchmarks. See #69152 for
self.short_write(bytes); // details.
}
// see short_write comment for explanation
#[inline]
fn write_u8(&mut self, i: u8) {
self.short_write(&[i]);
}
#[inline] #[inline]
fn write(&mut self, msg: &[u8]) { fn write(&mut self, msg: &[u8]) {
let length = msg.len(); let length = msg.len();