diff --git a/plonky2/Cargo.toml b/plonky2/Cargo.toml index eba775e27f..8b45db282b 100644 --- a/plonky2/Cargo.toml +++ b/plonky2/Cargo.toml @@ -65,7 +65,7 @@ name = "field_arithmetic" harness = false [[bench]] -name = "field_merkle_tree" +name = "batch_merkle_tree" harness = false [[bench]] diff --git a/plonky2/benches/field_merkle_tree.rs b/plonky2/benches/batch_merkle_tree.rs similarity index 79% rename from plonky2/benches/field_merkle_tree.rs rename to plonky2/benches/batch_merkle_tree.rs index dfaa301321..babe8e7247 100644 --- a/plonky2/benches/field_merkle_tree.rs +++ b/plonky2/benches/batch_merkle_tree.rs @@ -2,7 +2,7 @@ mod allocator; use criterion::{black_box, criterion_group, criterion_main, BenchmarkId, Criterion}; use plonky2::field::goldilocks_field::GoldilocksField; -use plonky2::hash::field_merkle_tree::FieldMerkleTree; +use plonky2::hash::batch_merkle_tree::BatchMerkleTree; use plonky2::hash::hash_types::RichField; use plonky2::hash::keccak::KeccakHash; use plonky2::hash::poseidon::PoseidonHash; @@ -13,7 +13,7 @@ const ELEMS_PER_LEAF_1: usize = 70; const ELEMS_PER_LEAF_2: usize = 5; const ELEMS_PER_LEAF_3: usize = 100; -pub(crate) fn bench_field_merkle_tree>(c: &mut Criterion) { +pub(crate) fn bench_batch_merkle_tree>(c: &mut Criterion) { let mut group = c.benchmark_group(&format!( "field-merkle-tree<{}, {}>", type_name::(), @@ -29,14 +29,14 @@ pub(crate) fn bench_field_merkle_tree>(c: &mut Criter vec![F::rand_vec(ELEMS_PER_LEAF_2); size >> 1], vec![F::rand_vec(ELEMS_PER_LEAF_3); size >> 2], ]; - b.iter(|| FieldMerkleTree::::new(black_box(leaves.clone()), black_box(5))); + b.iter(|| BatchMerkleTree::::new(black_box(leaves.clone()), black_box(5))); }); } } fn criterion_benchmark(c: &mut Criterion) { - bench_field_merkle_tree::(c); - bench_field_merkle_tree::>(c); + bench_batch_merkle_tree::(c); + bench_batch_merkle_tree::>(c); } criterion_group!(benches, criterion_benchmark);