mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

auto merge of #6640 : dotdash/rust/hash_perf, r=bstrie

Browse Source 
The function was a workaround for bootstrapping that isn't required
anymore and just degrades hashmap performance, as it doesn't get inlined
cross-crate and turns a no-op into a call.
This commit is contained in:
bors 2013-05-20 05:19:40 -07:00
commit f323b0c8ba
1 changed files with 15 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/libcore/hash.rs
View File

@ -76,16 +76,12 @@ pub trait Streaming {
fn reset(&mut self);
}
fn transmute_for_stage0<'a>(bytes: &'a [u8]) -> &'a [u8] {
bytes
}
impl<A:IterBytes> Hash for A {
#[inline(always)]
fn hash_keyed(&self, k0: u64, k1: u64) -> u64 {
let mut s = State::new(k0, k1);
for self.iter_bytes(true) |bytes| {
s.input(transmute_for_stage0(bytes));
s.input(bytes);
}
s.result_u64()
}
@ -95,10 +91,10 @@ fn hash_keyed_2<A: IterBytes,
B: IterBytes>(a: &A, b: &B, k0: u64, k1: u64) -> u64 {
let mut s = State::new(k0, k1);
for a.iter_bytes(true) |bytes| {
s.input(transmute_for_stage0(bytes));
s.input(bytes);
}
for b.iter_bytes(true) |bytes| {
s.input(transmute_for_stage0(bytes));
s.input(bytes);
}
s.result_u64()
}
@ -108,13 +104,13 @@ fn hash_keyed_3<A: IterBytes,
C: IterBytes>(a: &A, b: &B, c: &C, k0: u64, k1: u64) -> u64 {
let mut s = State::new(k0, k1);
for a.iter_bytes(true) |bytes| {
s.input(transmute_for_stage0(bytes));
s.input(bytes);
}
for b.iter_bytes(true) |bytes| {
s.input(transmute_for_stage0(bytes));
s.input(bytes);
}
for c.iter_bytes(true) |bytes| {
s.input(transmute_for_stage0(bytes));
s.input(bytes);
}
s.result_u64()
}
@ -132,16 +128,16 @@ fn hash_keyed_4<A: IterBytes,
-> u64 {
let mut s = State::new(k0, k1);
for a.iter_bytes(true) |bytes| {
s.input(transmute_for_stage0(bytes));
s.input(bytes);
}
for b.iter_bytes(true) |bytes| {
s.input(transmute_for_stage0(bytes));
s.input(bytes);
}
for c.iter_bytes(true) |bytes| {
s.input(transmute_for_stage0(bytes));
s.input(bytes);
}
for d.iter_bytes(true) |bytes| {
s.input(transmute_for_stage0(bytes));
s.input(bytes);
}
s.result_u64()
}
@ -161,19 +157,19 @@ fn hash_keyed_5<A: IterBytes,
-> u64 {
let mut s = State::new(k0, k1);
for a.iter_bytes(true) |bytes| {
s.input(transmute_for_stage0(bytes));
s.input(bytes);
}
for b.iter_bytes(true) |bytes| {
s.input(transmute_for_stage0(bytes));
s.input(bytes);
}
for c.iter_bytes(true) |bytes| {
s.input(transmute_for_stage0(bytes));
s.input(bytes);
}
for d.iter_bytes(true) |bytes| {
s.input(transmute_for_stage0(bytes));
s.input(bytes);
}
for e.iter_bytes(true) |bytes| {
s.input(transmute_for_stage0(bytes));
s.input(bytes);
}
s.result_u64()
}