grassrootseconomics/openethereum
7
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

remove randomness from bigint benches, fix warnings (#1945)

Browse Source
This commit is contained in:
Robert Habermeier 2016-08-17 22:36:55 +02:00 committed by Gav Wood
parent ccdf80f4dc
commit eed3ef403a
2 changed files with 26 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
util/benches/bigint.rs
View File

@ -25,7 +25,6 @@
extern crate test; extern crate test;
extern crate bigint; extern crate bigint;
extern crate rand;
use test::{Bencher, black_box}; use test::{Bencher, black_box};
use bigint::uint::{U256, U512, Uint, U128}; use bigint::uint::{U256, U512, Uint, U128};
@ -34,7 +33,8 @@ use bigint::uint::{U256, U512, Uint, U128};
fn u256_add(b: &mut Bencher) { fn u256_add(b: &mut Bencher) {
b.iter(|| { b.iter(|| {
let n = black_box(10000); let n = black_box(10000);
(0..n).fold(U256([rand::random::<u64>(), rand::random::<u64>(), rand::random::<u64>(), rand::random::<u64>()]), |old, new| { old.overflowing_add(U256::from(new)).0 }) let zero = black_box(U256::zero());
(0..n).fold(zero, |old, new| { old.overflowing_add(U256::from(black_box(new))).0 })
}); });
} }
@ -42,7 +42,8 @@ fn u256_add(b: &mut Bencher) {
fn u256_sub(b: &mut Bencher) { fn u256_sub(b: &mut Bencher) {
b.iter(|| { b.iter(|| {
let n = black_box(10000); let n = black_box(10000);
(0..n).fold(U256([rand::random::<u64>(), rand::random::<u64>(), rand::random::<u64>(), rand::random::<u64>()]), |old, new| { old.overflowing_sub(U256::from(new)).0 }) let max = black_box(U256::max_value());
(0..n).fold(max, |old, new| { old.overflowing_sub(U256::from(black_box(new))).0 })
}); });
} }
@ -50,12 +51,11 @@ fn u256_sub(b: &mut Bencher) {
fn u512_sub(b: &mut Bencher) { fn u512_sub(b: &mut Bencher) {
b.iter(|| { b.iter(|| {
let n = black_box(10000); let n = black_box(10000);
let max = black_box(U512::max_value());
(0..n).fold( (0..n).fold(
U512([ max,
rand::random::<u64>(), rand::random::<u64>(), rand::random::<u64>(), rand::random::<u64>(),
rand::random::<u64>(), rand::random::<u64>(), rand::random::<u64>(), rand::random::<u64>()
]),
|old, new| { |old, new| {
let new = black_box(new);
let p = new % 2; let p = new % 2;
old.overflowing_sub(U512([p, p, p, p, p, p, p, new])).0 old.overflowing_sub(U512([p, p, p, p, p, p, p, new])).0
} }
@ -67,8 +67,12 @@ fn u512_sub(b: &mut Bencher) {
fn u512_add(b: &mut Bencher) { fn u512_add(b: &mut Bencher) {
b.iter(|| { b.iter(|| {
let n = black_box(10000); let n = black_box(10000);
(0..n).fold(U512([0, 0, 0, 0, 0, 0, 0, 0]), let zero = black_box(U512::zero());
|old, new| { old.overflowing_add(U512([new, new, new, new, new, new, new, new])).0 }) (0..n).fold(zero,
|old, new| {
let new = black_box(new);
old.overflowing_add(U512([new, new, new, new, new, new, new, new])).0
})
}); });
} }
@ -76,7 +80,8 @@ fn u512_add(b: &mut Bencher) {
fn u256_mul(b: &mut Bencher) { fn u256_mul(b: &mut Bencher) {
b.iter(|| { b.iter(|| {
let n = black_box(10000); let n = black_box(10000);
(0..n).fold(U256([rand::random::<u64>(), rand::random::<u64>(), rand::random::<u64>(), rand::random::<u64>()]), |old, new| { old.overflowing_mul(U256::from(new)).0 }) let one = black_box(U256::one());
(0..n).fold(one, |old, new| { old.overflowing_mul(U256::from(black_box(new))).0 })
}); });
} }
@ -85,9 +90,11 @@ fn u256_mul(b: &mut Bencher) {
fn u256_full_mul(b: &mut Bencher) { fn u256_full_mul(b: &mut Bencher) {
b.iter(|| { b.iter(|| {
let n = black_box(10000); let n = black_box(10000);
(0..n).fold(U256([rand::random::<u64>(), rand::random::<u64>(), rand::random::<u64>(), rand::random::<u64>()]), let one = black_box(U256::one());
|old, _new| { (0..n).fold(one,
let U512(ref u512words) = old.full_mul(U256([rand::random::<u64>(), rand::random::<u64>(), rand::random::<u64>(), rand::random::<u64>()])); |old, new| {
let new = black_box(new);
let U512(ref u512words) = old.full_mul(U256([new, new, new, new]));
U256([u512words[0], u512words[2], u512words[2], u512words[3]]) U256([u512words[0], u512words[2], u512words[2], u512words[3]])
}) })
}); });

12
util/benches/trie.rs
View File

@ -72,7 +72,7 @@ fn trie_insertions_32_mir_1k(b: &mut Bencher) {
let mut root = H256::new(); let mut root = H256::new();
let mut t = TrieDBMut::new(&mut memdb, &mut root); let mut t = TrieDBMut::new(&mut memdb, &mut root);
for i in d.iter() { for i in d.iter() {
t.insert(&i.0, &i.1); t.insert(&i.0, &i.1).unwrap();
} }
hash_count = t.hash_count; hash_count = t.hash_count;
}); });
@ -111,7 +111,7 @@ fn trie_insertions_32_ran_1k(b: &mut Bencher) {
let mut root = H256::new(); let mut root = H256::new();
let mut t = TrieDBMut::new(&mut memdb, &mut root); let mut t = TrieDBMut::new(&mut memdb, &mut root);
for i in d.iter() { for i in d.iter() {
t.insert(&i.0, &i.1); t.insert(&i.0, &i.1).unwrap();
} }
hash_count = t.hash_count; hash_count = t.hash_count;
r = t.root().clone(); r = t.root().clone();
@ -149,7 +149,7 @@ fn trie_insertions_six_high(b: &mut Bencher) {
let mut root = H256::new(); let mut root = H256::new();
let mut t = TrieDBMut::new(&mut memdb, &mut root); let mut t = TrieDBMut::new(&mut memdb, &mut root);
for i in d.iter() { for i in d.iter() {
t.insert(&i.0, &i.1); t.insert(&i.0, &i.1).unwrap();
} }
}) })
} }
@ -184,7 +184,7 @@ fn trie_insertions_six_mid(b: &mut Bencher) {
let mut root = H256::new(); let mut root = H256::new();
let mut t = TrieDBMut::new(&mut memdb, &mut root); let mut t = TrieDBMut::new(&mut memdb, &mut root);
for i in d.iter() { for i in d.iter() {
t.insert(&i.0, &i.1); t.insert(&i.0, &i.1).unwrap();
} }
debug!("hash_count={:?}", t.hash_count); debug!("hash_count={:?}", t.hash_count);
}) })
@ -221,7 +221,7 @@ fn trie_insertions_random_mid(b: &mut Bencher) {
let mut root = H256::new(); let mut root = H256::new();
let mut t = TrieDBMut::new(&mut memdb, &mut root); let mut t = TrieDBMut::new(&mut memdb, &mut root);
for i in d.iter() { for i in d.iter() {
t.insert(&i.0, &i.1); t.insert(&i.0, &i.1).unwrap();
} }
}) })
} }
@ -258,7 +258,7 @@ fn trie_insertions_six_low(b: &mut Bencher) {
let mut root = H256::new(); let mut root = H256::new();
let mut t = TrieDBMut::new(&mut memdb, &mut root); let mut t = TrieDBMut::new(&mut memdb, &mut root);
for i in d.iter() { for i in d.iter() {
t.insert(&i.0, &i.1); t.insert(&i.0, &i.1).unwrap();
} }
}) })
} }