From 36085f63e9a6ed69e85266856f1944bd82162dfd Mon Sep 17 00:00:00 2001 From: Paul Hauner Date: Mon, 11 Mar 2019 14:52:21 +1100 Subject: [PATCH] Rename state trans benches --- .../benches/block_processing_benches.rs | 26 ++++++++-------- .../benches/epoch_processing_benches.rs | 30 +++++++++---------- 2 files changed, 28 insertions(+), 28 deletions(-) diff --git a/eth2/state_processing/benches/block_processing_benches.rs b/eth2/state_processing/benches/block_processing_benches.rs index 3c59e51e5..ea1ada193 100644 --- a/eth2/state_processing/benches/block_processing_benches.rs +++ b/eth2/state_processing/benches/block_processing_benches.rs @@ -197,7 +197,7 @@ fn bench_block_processing( let block = initial_block.clone(); let spec = initial_spec.clone(); c.bench( - &format!("block_processing_{}", desc), + &format!("{}/block_processing", desc), Benchmark::new("verify_block_signature", move |b| { b.iter_batched( || state.clone(), @@ -215,7 +215,7 @@ fn bench_block_processing( let block = initial_block.clone(); let spec = initial_spec.clone(); c.bench( - &format!("block_processing_{}", desc), + &format!("{}/block_processing", desc), Benchmark::new("process_randao", move |b| { b.iter_batched( || state.clone(), @@ -232,7 +232,7 @@ fn bench_block_processing( let state = initial_state.clone(); let block = initial_block.clone(); c.bench( - &format!("block_processing_{}", desc), + &format!("{}/block_processing", desc), Benchmark::new("process_eth1_data", move |b| { b.iter_batched( || state.clone(), @@ -250,7 +250,7 @@ fn bench_block_processing( let block = initial_block.clone(); let spec = initial_spec.clone(); c.bench( - &format!("block_processing_{}", desc), + &format!("{}/block_processing", desc), Benchmark::new("process_proposer_slashings", move |b| { b.iter_batched( || state.clone(), @@ -269,7 +269,7 @@ fn bench_block_processing( let block = initial_block.clone(); let spec = initial_spec.clone(); c.bench( - &format!("block_processing_{}", desc), + &format!("{}/block_processing", desc), Benchmark::new("process_attester_slashings", move |b| { b.iter_batched( || state.clone(), @@ -288,7 +288,7 @@ fn bench_block_processing( let block = initial_block.clone(); let spec = initial_spec.clone(); c.bench( - &format!("block_processing_{}", desc), + &format!("{}/block_processing", desc), Benchmark::new("process_attestations", move |b| { b.iter_batched( || state.clone(), @@ -306,7 +306,7 @@ fn bench_block_processing( let block = initial_block.clone(); let spec = initial_spec.clone(); c.bench( - &format!("block_processing_{}", desc), + &format!("{}/block_processing", desc), Benchmark::new("process_deposits", move |b| { b.iter_batched( || state.clone(), @@ -324,7 +324,7 @@ fn bench_block_processing( let block = initial_block.clone(); let spec = initial_spec.clone(); c.bench( - &format!("block_processing_{}", desc), + &format!("{}/block_processing", desc), Benchmark::new("process_exits", move |b| { b.iter_batched( || state.clone(), @@ -342,7 +342,7 @@ fn bench_block_processing( let block = initial_block.clone(); let spec = initial_spec.clone(); c.bench( - &format!("block_processing_{}", desc), + &format!("{}/block_processing", desc), Benchmark::new("process_transfers", move |b| { b.iter_batched( || state.clone(), @@ -360,7 +360,7 @@ fn bench_block_processing( let block = initial_block.clone(); let spec = initial_spec.clone(); c.bench( - &format!("block_processing_{}", desc), + &format!("{}/block_processing", desc), Benchmark::new("per_block_processing", move |b| { b.iter_batched( || state.clone(), @@ -378,7 +378,7 @@ fn bench_block_processing( state.drop_cache(RelativeEpoch::Previous); let spec = initial_spec.clone(); c.bench( - &format!("block_processing_{}", desc), + &format!("{}/block_processing", desc), Benchmark::new("build_previous_state_epoch_cache", move |b| { b.iter_batched( || state.clone(), @@ -398,7 +398,7 @@ fn bench_block_processing( state.drop_cache(RelativeEpoch::Current); let spec = initial_spec.clone(); c.bench( - &format!("block_processing_{}", desc), + &format!("{}/block_processing", desc), Benchmark::new("build_current_state_epoch_cache", move |b| { b.iter_batched( || state.clone(), @@ -416,7 +416,7 @@ fn bench_block_processing( let block = initial_block.clone(); c.bench( - &format!("block_processing_{}", desc), + &format!("{}/block_processing", desc), Benchmark::new("tree_hash_block", move |b| { b.iter(|| black_box(block.hash_tree_root())) }) diff --git a/eth2/state_processing/benches/epoch_processing_benches.rs b/eth2/state_processing/benches/epoch_processing_benches.rs index 85922fa07..342889b3f 100644 --- a/eth2/state_processing/benches/epoch_processing_benches.rs +++ b/eth2/state_processing/benches/epoch_processing_benches.rs @@ -77,7 +77,7 @@ fn bench_epoch_processing(c: &mut Criterion, state: &BeaconState, spec: &ChainSp let state_clone = state.clone(); let spec_clone = spec.clone(); c.bench( - &format!("epoch_process_with_caches_{}", desc), + &format!("{}/epoch_processing", desc), Benchmark::new("calculate_active_validator_indices", move |b| { b.iter_batched( || state_clone.clone(), @@ -95,7 +95,7 @@ fn bench_epoch_processing(c: &mut Criterion, state: &BeaconState, spec: &ChainSp let spec_clone = spec.clone(); let active_validator_indices = calculate_active_validator_indices(&state, &spec); c.bench( - &format!("epoch_process_with_caches_{}", desc), + &format!("{}/epoch_processing", desc), Benchmark::new("calculate_current_total_balance", move |b| { b.iter_batched( || state_clone.clone(), @@ -112,7 +112,7 @@ fn bench_epoch_processing(c: &mut Criterion, state: &BeaconState, spec: &ChainSp let state_clone = state.clone(); let spec_clone = spec.clone(); c.bench( - &format!("epoch_process_with_caches_{}", desc), + &format!("{}/epoch_processing", desc), Benchmark::new("calculate_previous_total_balance", move |b| { b.iter_batched( || state_clone.clone(), @@ -135,7 +135,7 @@ fn bench_epoch_processing(c: &mut Criterion, state: &BeaconState, spec: &ChainSp let state_clone = state.clone(); let spec_clone = spec.clone(); c.bench( - &format!("epoch_process_with_caches_{}", desc), + &format!("{}/epoch_processing", desc), Benchmark::new("process_eth1_data", move |b| { b.iter_batched( || state_clone.clone(), @@ -152,7 +152,7 @@ fn bench_epoch_processing(c: &mut Criterion, state: &BeaconState, spec: &ChainSp let state_clone = state.clone(); let spec_clone = spec.clone(); c.bench( - &format!("epoch_process_with_caches_{}", desc), + &format!("{}/epoch_processing", desc), Benchmark::new("calculate_attester_sets", move |b| { b.iter_batched( || state_clone.clone(), @@ -177,7 +177,7 @@ fn bench_epoch_processing(c: &mut Criterion, state: &BeaconState, spec: &ChainSp &spec, ); c.bench( - &format!("epoch_process_with_caches_{}", desc), + &format!("{}/epoch_processing", desc), Benchmark::new("process_justification", move |b| { b.iter_batched( || state_clone.clone(), @@ -201,7 +201,7 @@ fn bench_epoch_processing(c: &mut Criterion, state: &BeaconState, spec: &ChainSp let state_clone = state.clone(); let spec_clone = spec.clone(); c.bench( - &format!("epoch_process_with_caches_{}", desc), + &format!("{}/epoch_processing", desc), Benchmark::new("process_crosslinks", move |b| { b.iter_batched( || state_clone.clone(), @@ -223,7 +223,7 @@ fn bench_epoch_processing(c: &mut Criterion, state: &BeaconState, spec: &ChainSp ); let winning_root_for_shards = process_crosslinks(&mut state_clone, &spec).unwrap(); c.bench( - &format!("epoch_process_with_caches_{}", desc), + &format!("{}/epoch_processing", desc), Benchmark::new("process_rewards_and_penalties", move |b| { b.iter_batched( || state_clone.clone(), @@ -248,7 +248,7 @@ fn bench_epoch_processing(c: &mut Criterion, state: &BeaconState, spec: &ChainSp let state_clone = state.clone(); let spec_clone = spec.clone(); c.bench( - &format!("epoch_process_with_caches_{}", desc), + &format!("{}/epoch_processing", desc), Benchmark::new("process_ejections", move |b| { b.iter_batched( || state_clone.clone(), @@ -289,7 +289,7 @@ fn bench_epoch_processing(c: &mut Criterion, state: &BeaconState, spec: &ChainSp "The state should have been finalized." ); c.bench( - &format!("epoch_process_with_caches_{}", desc), + &format!("{}/epoch_processing", desc), Benchmark::new("process_validator_registry", move |b| { b.iter_batched( || state_clone.clone(), @@ -306,7 +306,7 @@ fn bench_epoch_processing(c: &mut Criterion, state: &BeaconState, spec: &ChainSp let state_clone = state.clone(); let spec_clone = spec.clone(); c.bench( - &format!("epoch_process_with_caches_{}", desc), + &format!("{}/epoch_processing", desc), Benchmark::new("update_active_tree_index_roots", move |b| { b.iter_batched( || state_clone.clone(), @@ -323,7 +323,7 @@ fn bench_epoch_processing(c: &mut Criterion, state: &BeaconState, spec: &ChainSp let state_clone = state.clone(); let spec_clone = spec.clone(); c.bench( - &format!("epoch_process_with_caches_{}", desc), + &format!("{}/epoch_processing", desc), Benchmark::new("update_latest_slashed_balances", move |b| { b.iter_batched( || state_clone.clone(), @@ -340,7 +340,7 @@ fn bench_epoch_processing(c: &mut Criterion, state: &BeaconState, spec: &ChainSp let state_clone = state.clone(); let spec_clone = spec.clone(); c.bench( - &format!("epoch_process_with_caches_{}", desc), + &format!("{}/epoch_processing", desc), Benchmark::new("clean_attestations", move |b| { b.iter_batched( || state_clone.clone(), @@ -357,7 +357,7 @@ fn bench_epoch_processing(c: &mut Criterion, state: &BeaconState, spec: &ChainSp let state_clone = state.clone(); let spec_clone = spec.clone(); c.bench( - &format!("epoch_process_with_caches_{}", desc), + &format!("{}/epoch_processing", desc), Benchmark::new("per_epoch_processing", move |b| { b.iter_batched( || state_clone.clone(), @@ -370,7 +370,7 @@ fn bench_epoch_processing(c: &mut Criterion, state: &BeaconState, spec: &ChainSp let state_clone = state.clone(); c.bench( - &format!("epoch_process_with_caches_{}", desc), + &format!("{}/epoch_processing", desc), Benchmark::new("tree_hash_state", move |b| { b.iter(|| black_box(state_clone.hash_tree_root())) })