bench-utils added to bw6

Author: swasilyev

bw6/Cargo.toml

@@ -17,6 +17,8 @@ ark-std = { git = "https://github.com/arkworks-rs/utils", default-features = fal
 ark-poly = { git = "https://github.com/arkworks-rs/algebra", default-features = false }
 ark-poly-commit = { git = "https://github.com/swasilyev/poly-commit", branch = "kzg-fix", default-features = false }
 
+bench-utils = { git = "https://github.com/arkworks-rs/utils" }
+
 bitvec = { version = "0.19", default-features = false, features = [ "alloc" ] }
 rand = "0.7"
 
@@ -26,3 +28,6 @@ criterion = "0.3"
 [[bench]]
 name = "bench"
 harness = false
+
+[features]
+print-trace = [ "bench-utils/print-trace" ]

bw6/src/lib.rs

@@ -202,18 +202,21 @@ mod tests {
     use super::*;
     use std::time::Instant;
     use ark_ff::{test_rng, UniformRand};
+    use bench_utils::{end_timer, start_timer};
 
     #[test]
-    fn test_apk_proof() {
-        let num_pks = 1000;
+    fn apk_proof() {
+        let num_pks = 1023;
 
         let rng = &mut test_rng();
 
         let signer_set = SignerSet::random(num_pks, rng);
 
-        let parameter_generation = Instant::now();
+        // let parameter_generation = Instant::now();
+        let setup = start_timer!(|| "BW6 setup");
         let params = Params::new(signer_set.size(), rng);
-        println!("{}μs = parameter generation", parameter_generation.elapsed().as_micros());
+        end_timer!(setup);
+        // println!("{}μs = parameter generation", parameter_generation.elapsed().as_micros());
 
         let pks_domain_size = GeneralEvaluationDomain::<F>::compute_size_of_domain(num_pks).unwrap();
 
@@ -224,13 +227,17 @@ mod tests {
         let b: BitVec = (0..num_pks).map(|_| rng.gen_bool(2.0 / 3.0)).collect();
         let apk = bls::PublicKey::aggregate(signer_set.get_by_mask(&b));
 
-        let proving = Instant::now();
+        // let proving = Instant::now();
+        let prove_ = start_timer!(|| "BW6 prove");
         let proof = prove(&b, signer_set.get_all(), &params.to_pk());
-        println!("{}μs = proving\n", proving.elapsed().as_micros());
+        end_timer!(prove_);
+        // println!("{}μs = proving\n", proving.elapsed().as_micros());
 
-        let verification = Instant::now();
+        // let verification = Instant::now();
+        let verify_ = start_timer!(|| "BW6 verify");
         let valid = verify(&pks_x_comm, &pks_y_comm, &apk, &b, &proof, &params.to_vk());
-        println!("{}μs = verification", verification.elapsed().as_micros());
+        end_timer!(verify_);
+        // println!("{}μs = verification", verification.elapsed().as_micros());
 
         assert!(valid);
     }

bw6/src/verifier.rs

@@ -5,6 +5,7 @@ use ark_ec::{AffineCurve, PairingEngine, ProjectiveCurve};
 use ark_ff::{One, PrimeField, test_rng, UniformRand};
 
 use bitvec::vec::BitVec;
+use bench_utils::{end_timer, start_timer};
 
 use crate::{endo, Proof, PublicKey, utils, VerifierKey};
 
@@ -20,10 +21,13 @@ pub fn verify(
 
     let nu= proof.nu;
 
-    let timer = Instant::now();
+    // let timer = Instant::now();
+    let accountability = start_timer!(|| "accountability check");
     let b_at_zeta = utils::barycentric_eval_binary_at(proof.zeta, &bitmask, vk.domain);
-    // println!("  {}μs = accountability", timer.elapsed().as_micros());
     assert_eq!(b_at_zeta, proof.b_zeta); // accountability
+    end_timer!(accountability);
+    // println!("  {}μs = accountability", timer.elapsed().as_micros());
+
 
     let timer = Instant::now();
     let nu_repr = nu.into_repr();