Merge pull request #3361 from ProvableHQ/fix/benchmark-libclang

Install libclang deps for RocksDB benchmark CI

Author: vicsn

.github/workflows/benchmarks.yml

@@ -26,8 +26,12 @@ jobs:
       - name: Install Rust
         uses: dtolnay/rust-toolchain@stable
 
-      - name: Install required Debian pacakges
-        run: sudo apt install -y lld
+      # RocksDB benches need libclang (via bindgen); match CircleCI rocks deps.
+      - name: Install required Debian packages
+        run: |
+          DEBIAN_FRONTEND=noninteractive sudo apt-get update
+          DEBIAN_FRONTEND=noninteractive sudo apt-get install -y --no-install-recommends \
+            clang libclang-dev llvm-dev llvm lld pkg-config xz-utils make libssl-dev
 
       - uses: actions/cache@v4
         with:
@@ -73,7 +77,7 @@ jobs:
         run: |
           set -o pipefail
           cd console/collections
-          cargo bench --locked --bench merkle_tree -- --output-format bencher | tee -a ../../output.txt
+          cargo bench --locked --bench merkle_tree -- --output-format bencher --sample-size 10 --measurement-time 2 | tee -a ../../output.txt
           cd ../..
 
       - name: Benchmark console/types
@@ -93,7 +97,7 @@ jobs:
       - name: Benchmark ledger (block)
         run: |
           set -o pipefail
-          cargo bench --package=snarkvm-ledger --bench block --features=rocks,test-helpers,test -- --output-format bencher | tee -a output.txt
+          cargo bench --package=snarkvm-ledger --bench block --features=rocks,test-helpers,test -- --output-format bencher --sample-size 10 --measurement-time 2 | tee -a output.txt
 
       - name: Benchmark ledger (dag)
         run: |
@@ -105,10 +109,8 @@ jobs:
           set -o pipefail
           cargo bench --package=snarkvm-ledger --bench transaction -- --output-format bencher | tee -a output.txt
 
-      - name: Benchmark ledger (store)
-        run: |
-          set -o pipefail
-          cargo bench --package=snarkvm-ledger --bench store --features=rocks,test-helpers -- --output-format bencher | tee -a output.txt
+      # Skip store/advance: require a pre-generated `test-ledger/` fixture
+      # (see `snarkvm-testchain-generator --no-ledger`).
 
       - name: Benchmark ledger/puzzle
         run: |
@@ -134,7 +136,7 @@ jobs:
           tool: 'cargo'
           output-file-path: output.txt
           github-token: ${{ secrets.GITHUB_TOKEN }}
-          alert-threshold: '150%'
+          alert-threshold: '200%'
           comment-on-alert: true
           fail-on-alert: true
           alert-comment-cc-users: '@vicsn'

console/collections/benches/merkle_tree.rs

@@ -34,9 +34,9 @@ use std::{collections::BTreeMap, time::Duration};
 const DEPTH: u8 = 32;
 const MAX_INSTANTIATED_DEPTH: u8 = 8;
 
-const NUM_LEAVES: &[usize] = &[1, 100, 10_000];
-const APPEND_SIZES: &[usize] = &[1, 100, 10_000];
-const UPDATE_SIZES: &[usize] = &[1, 100, 1_000];
+const NUM_LEAVES: &[usize] = &[1, 100];
+const APPEND_SIZES: &[usize] = &[1, 100];
+const UPDATE_SIZES: &[usize] = &[1, 100];
 
 /// The tree sizes used by the `MerkleTreeState` benchmarks; these reach further
 /// than `NUM_LEAVES`, as caching a tree is most interesting for large trees.
@@ -290,4 +290,8 @@ criterion_group! {
     config = Criterion::default().sample_size(10).warm_up_time(Duration::from_secs(1));
     targets = legacy_state
 }
-criterion_main!(merkle_tree, merkle_tree_state, legacy_merkle_tree_cache);
+// MerkleTreeState and LegacyMerkleTreeCache are opt-in: they include multi-million-leaf
+// trees and legacy hasher deserialization that each take minutes per sample.
+// Run with: cargo bench --bench merkle_tree -- MerkleTreeState
+// Run with: cargo bench --bench merkle_tree -- LegacyMerkleTreeCache
+criterion_main!(merkle_tree);

ledger/benches/block.rs

@@ -19,7 +19,8 @@ extern crate criterion;
 use snarkvm_console::{account::PrivateKey, network::MainnetV0, prelude::*};
 use snarkvm_ledger::test_helpers::sample_genesis_block;
 
-use criterion::Criterion;
+use criterion::{Criterion, measurement::WallTime};
+use std::time::Duration;
 
 type CurrentNetwork = MainnetV0;
 
@@ -39,11 +40,6 @@ fn bench_serialization<T: Serialize + DeserializeOwned + ToBytes + FromBytes + C
     // bincode::serialize
     c.bench_function(&format!("{name}::serialize (bincode)"), |b| b.iter(|| bincode::serialize(&object).unwrap()));
 
-    // serde_json::to_string
-    c.bench_function(&format!("{name}::to_string (serde_json)"), |b| {
-        b.iter(|| serde_json::to_string(&object).unwrap())
-    });
-
     /////////////////
     // Deserialize //
     /////////////////
@@ -65,13 +61,6 @@ fn bench_serialization<T: Serialize + DeserializeOwned + ToBytes + FromBytes + C
             b.iter(|| bincode::deserialize::<T>(&buffer).unwrap())
         });
     }
-    // serde_json::from_str
-    {
-        let object = serde_json::to_string(&object).unwrap();
-        c.bench_function(&format!("{name}::from_str (serde_json)"), move |b| {
-            b.iter(|| serde_json::from_str::<T>(&object).unwrap())
-        });
-    }
 }
 
 /// Serialization benches for one sampled genesis block and derived header, transactions, transaction, and transition.
@@ -103,7 +92,7 @@ fn signature_serialization(c: &mut Criterion) {
 
 criterion_group! {
     name = block;
-    config = Criterion::default().sample_size(10);
+    config = Criterion::<WallTime>::default().sample_size(10).measurement_time(Duration::from_secs(2));
     targets = block_and_nested_serialization, signature_serialization,
 }
 

ledger/puzzle/Cargo.toml

@@ -98,3 +98,4 @@ workspace = true
 
 [dev-dependencies.snarkvm-ledger-puzzle-epoch]
 path = "epoch"
+features = [ "merkle" ]