user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

std::trie: make lower_bound and upper_bound about 15% faster.

Browse source 
I believe this is mainly due to code-size reduction.

Before:

    test [...]::bench_lower_bound ... bench:       818 ns/iter (+/- 100)
    test [...]::bench_upper_bound ... bench:       939 ns/iter (+/- 34)

After:

    test [...]::bench_lower_bound ... bench:       698 ns/iter (+/- 60)
    test [...]::bench_upper_bound ... bench:       817 ns/iter (+/- 20)
This commit is contained in:
Huon Wilson 2014-01-07 01:45:10 +11:00
parent 3395f9d6a1
commit 7e446af759
1 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/libstd/trie.rs
View file

@ -198,24 +198,24 @@ macro_rules! bound {
addr!(loop {
let children = unsafe {addr!(& $($mut_)* (*node).children)};
let child_id = chunk(key, idx);
match children[child_id] {
let (slice_idx, ret) = match children[child_id] {
Internal(ref $($mut_)* n) => {
node = addr!(& $($mut_)* **n as * $($mut_)* TrieNode<T>);
(child_id + 1, false)
}
External(stored, _) => {
if stored < key || ($upper && stored == key) {
it.stack.push(children.$slice_from(child_id + 1).$iter());
(if stored < key || ($upper && stored == key) {
child_id + 1
} else {
it.stack.push(children.$slice_from(child_id).$iter());
}
return it;
child_id
}, true)
}
Nothing => {
it.stack.push(children.$slice_from(child_id + 1).$iter());
return it
(child_id + 1, true)
}
}
it.stack.push(children.$slice_from(child_id + 1).$iter());
};
it.stack.push(children.$slice_from(slice_idx).$iter());
if ret { return it }
idx += 1;
})
}