From bc5a5a8d215125ac2308561f6fd04a041e67d9e7 Mon Sep 17 00:00:00 2001 From: Niels Huylebroeck Date: Wed, 17 Nov 2021 13:57:15 +0100 Subject: [PATCH 1/2] Fixed test-support/trie-bench test warning --- test-support/trie-bench/src/lib.rs | 63 +++++++++++++++--------------- 1 file changed, 31 insertions(+), 32 deletions(-) diff --git a/test-support/trie-bench/src/lib.rs b/test-support/trie-bench/src/lib.rs index 1c8f5f16..ffdf8823 100644 --- a/test-support/trie-bench/src/lib.rs +++ b/test-support/trie-bench/src/lib.rs @@ -14,7 +14,7 @@ //! Standard trie benchmarking tool. -use criterion::{black_box, Criterion, Fun}; +use criterion::{black_box, Criterion, BenchmarkId}; use hash_db::Hasher; use keccak_hasher::KeccakHasher; use memory_db::{HashKey, MemoryDB}; @@ -44,39 +44,38 @@ fn benchmark( ) where ::Out: 'static, { - let funs = vec![ - Fun::new("Closed", |b, d: &TrieInsertionList| { - b.iter(&mut || trie_root::(d.0.clone(), Default::default())) - }), - Fun::new("Fill", |b, d: &TrieInsertionList| { - b.iter(&mut || { - let mut memdb = MemoryDB::<_, HashKey, _>::new(L::Codec::empty_node()); - let mut root = >::default(); - let mut t = TrieDBMut::::new(&mut memdb, &mut root); - for i in d.0.iter() { - t.insert(&i.0, &i.1).unwrap(); - } - }) - }), - Fun::new("Iter", |b, d: &TrieInsertionList| { - let mut memdb = MemoryDB::<_, HashKey<_>, _>::new(L::Codec::empty_node()); + let bench_size = content.len(); + let bench_list = &TrieInsertionList(content); + let mut g = b.benchmark_group(name); + g.bench_with_input(BenchmarkId::new("Closed", bench_size), bench_list, |b, d: &TrieInsertionList| { + b.iter(&mut || trie_root::(d.0.clone(), Default::default())) + }); + g.bench_with_input(BenchmarkId::new("Fill", bench_size), bench_list, |b, d: &TrieInsertionList| { + b.iter(&mut || { + let mut memdb = MemoryDB::<_, HashKey, _>::new(L::Codec::empty_node()); let mut root = >::default(); - { - let mut t = TrieDBMut::::new(&mut memdb, &mut root); - for i in d.0.iter() { - t.insert(&i.0, &i.1).unwrap(); - } + let mut t = TrieDBMut::::new(&mut memdb, &mut root); + for i in d.0.iter() { + t.insert(&i.0, &i.1).unwrap(); } - b.iter(&mut || { - let t = TrieDB::::new(&memdb, &root).unwrap(); - for n in t.iter().unwrap() { - black_box(n).unwrap(); - } - }) - }), - ]; - - b.bench_functions(name, funs, TrieInsertionList(content)); + }) + }); + g.bench_with_input(BenchmarkId::new("Iter", bench_size), bench_list, |b, d: &TrieInsertionList| { + let mut memdb = MemoryDB::<_, HashKey<_>, _>::new(L::Codec::empty_node()); + let mut root = >::default(); + { + let mut t = TrieDBMut::::new(&mut memdb, &mut root); + for i in d.0.iter() { + t.insert(&i.0, &i.1).unwrap(); + } + } + b.iter(&mut || { + let t = TrieDB::::new(&memdb, &root).unwrap(); + for n in t.iter().unwrap() { + black_box(n).unwrap(); + } + }) + }); } fn random_word( From 079279e3dcfa57760daf19fb4b84175873981630 Mon Sep 17 00:00:00 2001 From: Niels Huylebroeck Date: Wed, 17 Nov 2021 16:52:20 +0100 Subject: [PATCH 2/2] rustfmt diff applied --- test-support/trie-bench/src/lib.rs | 68 ++++++++++++++++++------------ 1 file changed, 40 insertions(+), 28 deletions(-) diff --git a/test-support/trie-bench/src/lib.rs b/test-support/trie-bench/src/lib.rs index ffdf8823..65e0dd15 100644 --- a/test-support/trie-bench/src/lib.rs +++ b/test-support/trie-bench/src/lib.rs @@ -14,7 +14,7 @@ //! Standard trie benchmarking tool. -use criterion::{black_box, Criterion, BenchmarkId}; +use criterion::{black_box, BenchmarkId, Criterion}; use hash_db::Hasher; use keccak_hasher::KeccakHasher; use memory_db::{HashKey, MemoryDB}; @@ -47,35 +47,47 @@ fn benchmark( let bench_size = content.len(); let bench_list = &TrieInsertionList(content); let mut g = b.benchmark_group(name); - g.bench_with_input(BenchmarkId::new("Closed", bench_size), bench_list, |b, d: &TrieInsertionList| { - b.iter(&mut || trie_root::(d.0.clone(), Default::default())) - }); - g.bench_with_input(BenchmarkId::new("Fill", bench_size), bench_list, |b, d: &TrieInsertionList| { - b.iter(&mut || { - let mut memdb = MemoryDB::<_, HashKey, _>::new(L::Codec::empty_node()); + g.bench_with_input( + BenchmarkId::new("Closed", bench_size), + bench_list, + |b, d: &TrieInsertionList| { + b.iter(&mut || trie_root::(d.0.clone(), Default::default())) + }, + ); + g.bench_with_input( + BenchmarkId::new("Fill", bench_size), + bench_list, + |b, d: &TrieInsertionList| { + b.iter(&mut || { + let mut memdb = MemoryDB::<_, HashKey, _>::new(L::Codec::empty_node()); + let mut root = >::default(); + let mut t = TrieDBMut::::new(&mut memdb, &mut root); + for i in d.0.iter() { + t.insert(&i.0, &i.1).unwrap(); + } + }) + }, + ); + g.bench_with_input( + BenchmarkId::new("Iter", bench_size), + bench_list, + |b, d: &TrieInsertionList| { + let mut memdb = MemoryDB::<_, HashKey<_>, _>::new(L::Codec::empty_node()); let mut root = >::default(); - let mut t = TrieDBMut::::new(&mut memdb, &mut root); - for i in d.0.iter() { - t.insert(&i.0, &i.1).unwrap(); + { + let mut t = TrieDBMut::::new(&mut memdb, &mut root); + for i in d.0.iter() { + t.insert(&i.0, &i.1).unwrap(); + } } - }) - }); - g.bench_with_input(BenchmarkId::new("Iter", bench_size), bench_list, |b, d: &TrieInsertionList| { - let mut memdb = MemoryDB::<_, HashKey<_>, _>::new(L::Codec::empty_node()); - let mut root = >::default(); - { - let mut t = TrieDBMut::::new(&mut memdb, &mut root); - for i in d.0.iter() { - t.insert(&i.0, &i.1).unwrap(); - } - } - b.iter(&mut || { - let t = TrieDB::::new(&memdb, &root).unwrap(); - for n in t.iter().unwrap() { - black_box(n).unwrap(); - } - }) - }); + b.iter(&mut || { + let t = TrieDB::::new(&memdb, &root).unwrap(); + for n in t.iter().unwrap() { + black_box(n).unwrap(); + } + }) + }, + ); } fn random_word(