diff --git a/Cargo.lock b/Cargo.lock index fc58a98ff17..8d64b1cbc05 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -7330,6 +7330,7 @@ dependencies = [ "alloy-primitives", "alloy-signer", "alloy-signer-local", + "codspeed-criterion-compat", "derive_more", "metrics", "parking_lot", diff --git a/crates/chain-state/Cargo.toml b/crates/chain-state/Cargo.toml index be3b5a981d1..cba12995015 100644 --- a/crates/chain-state/Cargo.toml +++ b/crates/chain-state/Cargo.toml @@ -54,6 +54,7 @@ reth-testing-utils.workspace = true alloy-signer.workspace = true alloy-signer-local.workspace = true rand.workspace = true +criterion.workspace = true [features] serde = [ @@ -82,3 +83,8 @@ test-utils = [ "reth-trie/test-utils", "reth-ethereum-primitives/test-utils", ] + +[[bench]] +name = "canonical_hashes_range" +harness = false +required-features = ["test-utils"] diff --git a/crates/chain-state/benches/canonical_hashes_range.rs b/crates/chain-state/benches/canonical_hashes_range.rs new file mode 100644 index 00000000000..58fdd73bf99 --- /dev/null +++ b/crates/chain-state/benches/canonical_hashes_range.rs @@ -0,0 +1,99 @@ +#![allow(missing_docs)] + +use criterion::{black_box, criterion_group, criterion_main, Criterion}; +use reth_chain_state::{ + test_utils::TestBlockBuilder, ExecutedBlockWithTrieUpdates, MemoryOverlayStateProviderRef, +}; +use reth_ethereum_primitives::EthPrimitives; +use reth_storage_api::{noop::NoopProvider, BlockHashReader}; + +criterion_group!(benches, bench_canonical_hashes_range); +criterion_main!(benches); + +fn bench_canonical_hashes_range(c: &mut Criterion) { + let mut group = c.benchmark_group("canonical_hashes_range"); + + let scenarios = [("small", 10), ("medium", 100), ("large", 1000)]; + + for (name, num_blocks) in scenarios { + group.bench_function(format!("{}_blocks_{}", name, num_blocks), |b| { + let (provider, blocks) = setup_provider_with_blocks(num_blocks); + let start_block = blocks[0].recovered_block().number; + let end_block = blocks[num_blocks / 2].recovered_block().number; + + b.iter(|| { + black_box( + provider + .canonical_hashes_range(black_box(start_block), black_box(end_block)) + .unwrap(), + ) + }) + }); + } + + let (provider, blocks) = setup_provider_with_blocks(500); + let base_block = blocks[100].recovered_block().number; + + let range_sizes = [1, 10, 50, 100, 250]; + for range_size in range_sizes { + group.bench_function(format!("range_size_{}", range_size), |b| { + let end_block = base_block + range_size; + + b.iter(|| { + black_box( + provider + .canonical_hashes_range(black_box(base_block), black_box(end_block)) + .unwrap(), + ) + }) + }); + } + + // Benchmark edge cases + group.bench_function("no_in_memory_matches", |b| { + let (provider, blocks) = setup_provider_with_blocks(100); + let first_block = blocks[0].recovered_block().number; + let start_block = first_block - 50; + let end_block = first_block - 10; + + b.iter(|| { + black_box( + provider + .canonical_hashes_range(black_box(start_block), black_box(end_block)) + .unwrap(), + ) + }) + }); + + group.bench_function("all_in_memory_matches", |b| { + let (provider, blocks) = setup_provider_with_blocks(100); + let first_block = blocks[0].recovered_block().number; + let last_block = blocks[blocks.len() - 1].recovered_block().number; + + b.iter(|| { + black_box( + provider + .canonical_hashes_range(black_box(first_block), black_box(last_block + 1)) + .unwrap(), + ) + }) + }); + + group.finish(); +} + +fn setup_provider_with_blocks( + num_blocks: usize, +) -> ( + MemoryOverlayStateProviderRef<'static, EthPrimitives>, + Vec>, +) { + let mut builder = TestBlockBuilder::::default(); + + let blocks: Vec<_> = builder.get_executed_blocks(1000..1000 + num_blocks as u64).collect(); + + let historical = Box::new(NoopProvider::default()); + let provider = MemoryOverlayStateProviderRef::new(historical, blocks.clone()); + + (provider, blocks) +} diff --git a/crates/chain-state/src/memory_overlay.rs b/crates/chain-state/src/memory_overlay.rs index d9e80710e3d..a035d833a46 100644 --- a/crates/chain-state/src/memory_overlay.rs +++ b/crates/chain-state/src/memory_overlay.rs @@ -84,12 +84,14 @@ impl BlockHashReader for MemoryOverlayStateProviderRef<'_, N> ) -> ProviderResult> { let range = start..end; let mut earliest_block_number = None; - let mut in_memory_hashes = Vec::new(); + let mut in_memory_hashes = Vec::with_capacity(range.size_hint().0); + // iterate in ascending order (oldest to newest = low to high) for block in &self.in_memory { - if range.contains(&block.recovered_block().number()) { + let block_num = block.recovered_block().number(); + if range.contains(&block_num) { in_memory_hashes.push(block.recovered_block().hash()); - earliest_block_number = Some(block.recovered_block().number()); + earliest_block_number = Some(block_num); } }