refactor(core): cleanup import blocks bench code (#2631)

**Description**
- Moved import blocks benchmark from the top folder to /cmd/ethrex
- Updated evm in benchmark to use the default one
- Renamed generic `criterion_benchmark` to `import_block_benchmark`
- Renamed confusing `genesis-l2-ci.json` to `genesis-perf-ci.json` since
it's not really related to l2.
- Removed deprecated flamegraph script

---------

Co-authored-by: Javier Chatruc <jrchatruc@gmail.com>

Author: 2 people

.github/workflows/main_flamegraph_report.yaml

@@ -237,7 +237,7 @@ jobs:
           cargo build --release --bin ethrex --features dev
           CARGO_PROFILE_RELEASE_DEBUG=true cargo flamegraph -c "record -o perf.data -F997 --call-graph dwarf,16384 -g" \
           --bin ethrex --release --features dev -- \
-          --dev --network /home/runner/work/ethrex/ethrex/test_data/genesis-l2-ci.json --http.port 1729 >/dev/null &
+          --dev --network /home/runner/work/ethrex/ethrex/test_data/genesis-perf-ci.json --http.port 1729 >/dev/null &
           sleep 10
           echo "Executing load test..."
           bash /home/runner/work/ethrex/ethrex/.github/scripts/flamegraph_watcher.sh &&
@@ -352,7 +352,7 @@ jobs:
           rm -rf target/profiling/reth
           cargo build --bin reth --profile profiling
           CARGO_PROFILE_RELEASE_DEBUG=true cargo flamegraph -c "record -o perf.data -F997 --call-graph dwarf,16384 -g" --bin reth --profile profiling -- \
-          node --chain /home/runner/work/ethrex/ethrex/test_data/genesis-l2-ci.json --dev \
+          node --chain /home/runner/work/ethrex/ethrex/test_data/genesis-perf-ci.json --dev \
           --dev.block-time 1000ms --http.port 1729  --txpool.max-pending-txns 100000000 --txpool.max-new-txns 1000000000 \
           --txpool.pending-max-count 100000000 --txpool.pending-max-size 10000000000 --txpool.basefee-max-count 100000000000 \
           --txpool.basefee-max-size 1000000000000 --txpool.queued-max-count 1000000000 >/dev/null &

.github/workflows/main_perf_benchmark.yml renamed to .github/workflows/main_perf_blocks_exec.yml

@@ -25,7 +25,7 @@ jobs:
       - name: Install gnuplot
         run: sudo apt-get install -y gnuplot
       - name: Run benchmark
-        run: cd cmd/ethrex && cargo bench --bench criterion_benchmark -- --output-format bencher |sed 2d | tee output.txt
+        run: cd cmd/ethrex && cargo bench --bench import_blocks_benchmark -- --output-format bencher |sed 2d | tee output.txt
       - name: Store benchmark result
         uses: benchmark-action/github-action-benchmark@v1
         with:

.github/workflows/pr_perf_blocks_exec.yaml

@@ -83,7 +83,7 @@ jobs:
           BINS="base,head"
           hyperfine --setup "./bin/ethrex-base removedb" -w 5 -N -r 10 --show-output --export-markdown "bench_pr_comparison.md" \
           -L bin "$BINS" -n "{bin}" \
-          "./bin/ethrex-{bin} --network test_data/genesis-l2-ci.json --force import ./test_data/l2-1k-erc20.rlp --removedb"
+          "./bin/ethrex-{bin} --network test_data/genesis-perf-ci.json --force import ./test_data/l2-1k-erc20.rlp --removedb"
           echo -e "## Benchmark Block Execution Results Comparison Against Main\n\n$(cat bench_pr_comparison.md)" > bench_pr_comparison.md
       - name: Upload PR results
         uses: actions/upload-artifact@v4

Makefile

@@ -176,8 +176,5 @@ load-test-io:
 rm-test-db:  ## 🛑 Removes the DB used by the ethrex client used for testing
 	sudo cargo run --release --bin ethrex -- removedb --force --datadir test_ethrex
 
-flamegraph: ## 🚧 Runs a load-test. Run make start-node-with-flamegraph and in a new terminal make flamegraph
-	sudo bash bench/scripts/flamegraph.sh
-
 test_data/ERC20/ERC20.bin: ## 🔨 Build the ERC20 contract for the load test
 	solc ./test_data/ERC20.sol -o $@

bench/scripts/flamegraph.sh

@@ -55,10 +55,10 @@ path = "./lib.rs"
 default = ["libmdbx", "c-kzg", "blst"]
 dev = ["dep:ethrex-dev"]
 c-kzg = [
-  "ethrex-vm/c-kzg",
-  "ethrex-common/c-kzg",
-  "ethrex-blockchain/c-kzg",
-  "ethrex-p2p/c-kzg",
+    "ethrex-vm/c-kzg",
+    "ethrex-common/c-kzg",
+    "ethrex-blockchain/c-kzg",
+    "ethrex-p2p/c-kzg",
 ]
 metrics = ["ethrex-blockchain/metrics"]
 libmdbx = ["ethrex-storage/libmdbx"]
@@ -81,8 +81,8 @@ based = ["l2", "ethrex-rpc/based"]
 criterion = { version = "0.5.1", features = ["html_reports"] }
 
 [[bench]]
-path = "../../bench/criterion_benchmark.rs"
-name = "criterion_benchmark"
+path = "./bench/import_blocks_benchmark.rs"
+name = "import_blocks_benchmark"
 harness = false
 
 [build-dependencies]

cmd/ethrex/Cargo.toml

@@ -1,25 +1,20 @@
-#![allow(unused)]
-
-use criterion::{black_box, criterion_group, criterion_main, Criterion};
+use criterion::{criterion_group, criterion_main, Criterion};
 use ethrex::{
     cli::{import_blocks, remove_db},
-    initializers::{init_blockchain, init_store},
     utils::set_datadir,
     DEFAULT_DATADIR,
 };
-use ethrex_p2p::network;
-use std::{env::set_current_dir, str::FromStr, thread, time::Duration};
-use tracing_subscriber::{filter::Directive, EnvFilter, FmtSubscriber};
+use ethrex_vm::EvmEngine;
 
 #[inline]
 fn block_import() {
     let data_dir = DEFAULT_DATADIR;
     set_datadir(data_dir);
     remove_db(data_dir, true);
 
-    let evm_engine = "revm".to_owned().try_into().unwrap();
+    let evm_engine = EvmEngine::default();
 
-    let network = "../../test_data/genesis-l2-ci.json";
+    let network = "../../test_data/genesis-perf-ci.json";
 
     let rt = tokio::runtime::Runtime::new().unwrap();
     rt.block_on(import_blocks(
@@ -30,12 +25,12 @@ fn block_import() {
     ));
 }
 
-pub fn criterion_benchmark(c: &mut Criterion) {
+pub fn import_blocks_benchmark(c: &mut Criterion) {
     let mut group = c.benchmark_group("Block import");
     group.sample_size(10);
     group.bench_function("Block import ERC20 transfers", |b| b.iter(block_import));
     group.finish();
 }
 
-criterion_group!(runner, criterion_benchmark);
+criterion_group!(runner, import_blocks_benchmark);
 criterion_main!(runner);

bench/criterion_benchmark.rs renamed to cmd/ethrex/bench/import_blocks_benchmark.rs

@@ -31,7 +31,7 @@ On some machines, this fixes the `ERROR axum::serve::listener: accept error: Too
 To run a load test, first run the node using a command like the following in the root folder:
 
 ```bash
-cargo run --bin ethrex --release --features dev -- --network test_data/genesis-l2-ci.json --dev
+cargo run --bin ethrex --release --features dev -- --network test_data/genesis-perf-ci.json --dev
 ```
 
 Genesis-l2-ci has many rich accounts and does not include the prague fork, which is important for dev mode until it's fixed.
@@ -73,39 +73,39 @@ Load tests are usually used to get performance metrics. We usually want to gener
 To produce a flamegraph, run the node in the following way.
 
 ```bash
-cargo flamegraph --root --bin ethrex --release --features dev -- --network test_data/genesis-l2-ci.json --dev
+cargo flamegraph --root --bin ethrex --release --features dev -- --network test_data/genesis-perf-ci.json --dev
 ```
 
 The "root" command is only needed for mac. It can be removed if running on linux.
 
 For a samply report, run the following:
 
 ```bash
-samply record cargo run --bin ethrex --release --features dev -- --network test_data/genesis-l2-ci.json --dev
+samply record cargo run --bin ethrex --release --features dev -- --network test_data/genesis-perf-ci.json --dev
 ```
 
 ## Interacting with reth
 
 The same load test can be run, the only difference is how you run the node:
 
 ```bash
-cargo run --release -- node --chain <path_to_ethrex>/test_data/genesis-l2-ci.json --dev --dev.block-time 5000ms --http.port 8545 --txpool.max-pending-txns 100000000 --txpool.max-new-txns 1000000000 --txpool.pending-max-count 100000000 --txpool.pending-max-size 10000000000 --txpool.basefee-max-count 100000000000 --txpool.basefee-max-size 1000000000000 --txpool.queued-max-count 1000000000
+cargo run --release -- node --chain <path_to_ethrex>/test_data/genesis-perf-ci.json --dev --dev.block-time 5000ms --http.port 8545 --txpool.max-pending-txns 100000000 --txpool.max-new-txns 1000000000 --txpool.pending-max-count 100000000 --txpool.pending-max-size 10000000000 --txpool.basefee-max-count 100000000000 --txpool.basefee-max-size 1000000000000 --txpool.queued-max-count 1000000000
 ```
 
 All of the txpool parameters are to make sure that it doesn't discard transactions sent by the load test. Trhoughput measurements in the logs are typically near 1Gigagas/second. To remove the database before getting measurements again:
 
 ```bash
-cargo run --release -- db --chain <path_to_ethrex>/test_data/genesis-l2-ci.json drop -f
+cargo run --release -- db --chain <path_to_ethrex>/test_data/genesis-perf-ci.json drop -f
 ```
 
 To get a flamegraph of its execution, run with the same parameters, just replace `cargo run --release` with `cargo flamegraph --bin reth --profiling`:
 
 ```bash
-cargo flamegraph --bin reth --root --profiling -- node --chain ~/workspace/ethrex/test_data/genesis-l2-ci.json --dev --dev.block-time 5000ms --http.port 8545 --txpool.max-pending-txns 100000000 --txpool.max-new-txns 1000000000 --txpool.pending-max-count 100000000 --txpool.pending-max-size 10000000000 --txpool.basefee-max-count 100000000000 --txpool.basefee-max-size 1000000000000 --txpool.queued-max-count 1000000000
+cargo flamegraph --bin reth --root --profiling -- node --chain ~/workspace/ethrex/test_data/genesis-perf-ci.json --dev --dev.block-time 5000ms --http.port 8545 --txpool.max-pending-txns 100000000 --txpool.max-new-txns 1000000000 --txpool.pending-max-count 100000000 --txpool.pending-max-size 10000000000 --txpool.basefee-max-count 100000000000 --txpool.basefee-max-size 1000000000000 --txpool.queued-max-count 1000000000
 ```
 
 For samply we want to directly execute the binary, so that it records the binary and not cargo itself:
 
 ```bash
-samply record ./target/profiling/reth node --chain ~/workspace/ethrex/test_data/genesis-l2-ci.json --dev --dev.block-time 5000ms --http.port 8545 --txpool.max-pending-txns 100000000 --txpool.max-new-txns 1000000000 --txpool.pending-max-count 100000000 --txpool.pending-max-size 10000000000 --txpool.basefee-max-count 100000000000 --txpool.basefee-max-size 1000000000000 --txpool.queued-max-count 1000000000
-```
+samply record ./target/profiling/reth node --chain ~/workspace/ethrex/test_data/genesis-perf-ci.json --dev --dev.block-time 5000ms --http.port 8545 --txpool.max-pending-txns 100000000 --txpool.max-new-txns 1000000000 --txpool.pending-max-count 100000000 --txpool.pending-max-size 10000000000 --txpool.basefee-max-count 100000000000 --txpool.basefee-max-size 1000000000000 --txpool.queued-max-count 1000000000
+```

cmd/load_test/README.md

@@ -36,7 +36,7 @@ async fn test_performance_zkvm() {
 async fn setup() -> (ProgramInput, Block) {
     let path = Path::new(concat!(env!("CARGO_MANIFEST_DIR"), "/../../../test_data"));
 
-    let genesis_file_path = path.join("genesis-l2-ci.json");
+    let genesis_file_path = path.join("genesis-perf-ci.json");
     // l2-loadtest.rlp has blocks with many txs.
     let chain_file_path = path.join("l2-loadtest.rlp");
 

crates/l2/prover/tests/perf_zkvm.rs

@@ -416,7 +416,7 @@ mod tests {
         let path = Path::new(concat!(env!("CARGO_MANIFEST_DIR"), "/../../test_data"));
 
         let chain_file_path = path.join("l2-loadtest.rlp");
-        let genesis_file_path = path.join("genesis-l2-ci.json");
+        let genesis_file_path = path.join("genesis-perf-ci.json");
 
         // Create an InMemory Store to later perform an execute_block so we can have the Vec<AccountUpdate>.
         let in_memory_db =