From c7e50c56a92a688ea5097ac654cbb4aee4133dae Mon Sep 17 00:00:00 2001
From: STEVAN Antoine <antoine.stevan@isae-supaero.fr>
Date: Tue, 23 Apr 2024 08:10:17 +0000
Subject: [PATCH] allow multiple measures for one shot commit benchmark and add
clap (dragoon/komodo!80)
as per title
---
Cargo.toml | 1 +
benches/README.md | 9 +--
examples/benches/commit.rs | 140 ++++++++++++++++++++++++++-----------
3 files changed, 104 insertions(+), 46 deletions(-)
diff --git a/Cargo.toml b/Cargo.toml
index ec343156..8ac0f15e 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -13,6 +13,7 @@ ark-ff = "0.4.2"
ark-poly = "0.4.2"
ark-serialize = "0.4.2"
ark-std = "0.4.0"
+clap = { version = "4.5.4", features = ["derive"] }
rand = "0.8.5"
rs_merkle = "1.4.1"
thiserror = "1.0.50"
diff --git a/benches/README.md b/benches/README.md
index 5f777d91..e8a4a665 100644
--- a/benches/README.md
+++ b/benches/README.md
@@ -95,11 +95,12 @@ these are benchmarks that run a single measurement, implemented as _examples_ in
### commit
```nushell
-let res = cargo run --example bench_commit
+let degrees = seq 0 15 | each { 2 ** $in }
+let res = cargo run --example bench_commit -- --nb-measurements 1 ...$degrees
| lines
- | parse "{curve}: {degree} -> {t}"
- | into int degree
- | update t { into int | into duration }
+ | each { from nuon }
+ | update times { into duration }
+ | insert t {|it| $it.times | math avg}
python scripts/plot/bench_commit.py (
$res | group-by curve --to-table | update items { reject curve } | to json
diff --git a/examples/benches/commit.rs b/examples/benches/commit.rs
index 551222de..f0dccf0b 100644
--- a/examples/benches/commit.rs
+++ b/examples/benches/commit.rs
@@ -7,9 +7,10 @@ use ark_poly::{univariate::DensePolynomial, DenseUVPolynomial};
use ark_poly_commit::kzg10::{self, KZG10};
use ark_std::ops::Div;
+use clap::{arg, command, Parser};
use komodo::zk;
-fn run<F, G, P>(degrees: &Vec<usize>, curve: &str)
+fn run<F, G, P>(degrees: &Vec<usize>, curve: &str, nb_measurements: usize)
where
F: PrimeField,
G: CurveGroup<ScalarField = F>,
@@ -26,24 +27,34 @@ where
eprintln!("done");
for (i, degree) in degrees.iter().enumerate() {
- eprint!(" d: {} [{}/{}]\r", degree, i + 1, degrees.len());
- let polynomial = P::rand(*degree, rng);
-
- let start_time = Instant::now();
- let _ = zk::commit(&setup, &polynomial);
- let end_time = Instant::now();
+ let mut times = vec![];
+ for j in 0..nb_measurements {
+ eprint!(
+ " d: {} [{}/{}:{:>5}/{}] \r",
+ degree,
+ i + 1,
+ degrees.len(),
+ j + 1,
+ nb_measurements
+ );
+ let polynomial = P::rand(*degree, rng);
+
+ let start_time = Instant::now();
+ let _ = zk::commit(&setup, &polynomial);
+ let end_time = Instant::now();
+
+ times.push(end_time.duration_since(start_time).as_nanos());
+ }
println!(
- "{}: {} -> {}",
- curve,
- degree,
- end_time.duration_since(start_time).as_nanos()
+ "{{curve: {}, degree: {}, times: {:?}}}",
+ curve, degree, times,
);
}
eprintln!();
}
-fn ark_run<E, P>(degrees: &Vec<usize>, curve: &str)
+fn ark_run<E, P>(degrees: &Vec<usize>, curve: &str, nb_measurements: usize)
where
E: Pairing,
P: DenseUVPolynomial<E::ScalarField>,
@@ -69,18 +80,28 @@ where
eprintln!("done");
for (i, degree) in degrees.iter().enumerate() {
- eprint!(" d: {} [{}/{}]\r", degree, i + 1, degrees.len());
- let polynomial = P::rand(*degree, rng);
-
- let start_time = Instant::now();
- let _ = KZG10::commit(&setup, &polynomial, None, None);
- let end_time = Instant::now();
+ let mut times = vec![];
+ for j in 0..nb_measurements {
+ eprint!(
+ " d: {} [{}/{}:{:>5}/{}] \r",
+ degree,
+ i + 1,
+ degrees.len(),
+ j + 1,
+ nb_measurements
+ );
+ let polynomial = P::rand(*degree, rng);
+
+ let start_time = Instant::now();
+ let _ = KZG10::commit(&setup, &polynomial, None, None);
+ let end_time = Instant::now();
+
+ times.push(end_time.duration_since(start_time).as_nanos());
+ }
println!(
- "{}: {} -> {}",
- curve,
- degree,
- end_time.duration_since(start_time).as_nanos()
+ "{{curve: {}, degree: {}, times: {:?}}}",
+ curve, degree, times,
);
}
eprintln!();
@@ -89,11 +110,11 @@ where
/// ## example
/// ### non-pairing curves
/// ```rust
-/// measure!(ark_pallas, degrees, G1=Projective, name="PALLAS");
+/// measure!(ark_pallas, degrees, 10, G1=Projective, name="PALLAS");
/// ```
/// will produce
/// ```rust
-/// run::<ark_pallas::Fr, ark_pallas::Projective, DensePolynomial<ark_pallas::Fr>>(°rees, "PALLAS");
+/// run::<ark_pallas::Fr, ark_pallas::Projective, DensePolynomial<ark_pallas::Fr>>(°rees, "PALLAS", 10);
/// ```
///
/// ### pairing-friendly curves
@@ -101,6 +122,7 @@ where
/// measure!(
/// ark_bls12_381,
/// degrees,
+/// 10,
/// G1 = G1Projective,
/// E = Bls12_381,
/// name = "BLS12-381"
@@ -108,36 +130,51 @@ where
/// ```
/// will produce
/// ```rust
-/// run::<ark_bls12_381::Fr, ark_bls12_381::G1Projective, DensePolynomial<ark_bls12_381::Fr> >(°rees, "BLS12-381");
-/// ark_run::<ark_bls12_381::Bls12_381, DensePolynomial<<ark_bls12_381::Bls12_381 as Pairing>::ScalarField>>(°rees, "BLS12-381");
+/// run::<ark_bls12_381::Fr, ark_bls12_381::G1Projective, DensePolynomial<ark_bls12_381::Fr> >(°rees, "BLS12-381", 10);
+/// ark_run::<ark_bls12_381::Bls12_381, DensePolynomial<<ark_bls12_381::Bls12_381 as Pairing>::ScalarField>>(°rees, "BLS12-381", 10);
/// ```
macro_rules! measure {
- ($c:ident, $d:ident, G1=$g:ident, name=$n:expr) => {
- run::<$c::Fr, $c::$g, DensePolynomial<$c::Fr>>(&$d, $n);
+ ($c:ident, $d:ident, $m:expr, G1=$g:ident, name=$n:expr) => {
+ run::<$c::Fr, $c::$g, DensePolynomial<$c::Fr>>(&$d, $n, $m);
};
- ($c:ident, $d:ident, G1=$g:ident, E=$e:ident, name=$n:expr) => {
- measure!($c, $d, G1 = $g, name = $n);
+ ($c:ident, $d:ident, $m:expr, G1=$g:ident, E=$e:ident, name=$n:expr) => {
+ measure!($c, $d, $m, G1 = $g, name = $n);
ark_run::<$c::$e, DensePolynomial<<$c::$e as Pairing>::ScalarField>>(
&$d,
concat!($n, "-ark"),
+ $m,
);
};
}
-fn main() {
- let n = 20;
+#[derive(Parser)]
+#[command(version, about, long_about = None)]
+struct Cli {
+ /// the polynomial degrees to measure the commit time on
+ #[arg(num_args = 1.., value_delimiter = ' ')]
+ degrees: Vec<usize>,
+
+ /// the number of measurements to repeat each case, larger values will reduce the variance of
+ /// the measurements
+ #[arg(short, long)]
+ nb_measurements: usize,
+}
- let mut degrees = Vec::with_capacity(n);
- let mut cur = 1;
- for _ in 1..n {
- degrees.push(cur);
- cur *= 2;
- }
+fn main() {
+ let cli = Cli::parse();
+ let degrees = cli.degrees;
- measure!(ark_pallas, degrees, G1 = Projective, name = "PALLAS");
+ measure!(
+ ark_pallas,
+ degrees,
+ cli.nb_measurements,
+ G1 = Projective,
+ name = "PALLAS"
+ );
measure!(
ark_bls12_381,
degrees,
+ cli.nb_measurements,
G1 = G1Projective,
E = Bls12_381,
name = "BLS12-381"
@@ -145,11 +182,30 @@ fn main() {
measure!(
ark_bn254,
degrees,
+ cli.nb_measurements,
G1 = G1Projective,
E = Bn254,
name = "BN-254"
);
- measure!(ark_secp256k1, degrees, G1 = Projective, name = "SECP256-K1");
- measure!(ark_secp256r1, degrees, G1 = Projective, name = "SECP256-R1");
- measure!(ark_vesta, degrees, G1 = Projective, name = "VESTA");
+ measure!(
+ ark_secp256k1,
+ degrees,
+ cli.nb_measurements,
+ G1 = Projective,
+ name = "SECP256-K1"
+ );
+ measure!(
+ ark_secp256r1,
+ degrees,
+ cli.nb_measurements,
+ G1 = Projective,
+ name = "SECP256-R1"
+ );
+ measure!(
+ ark_vesta,
+ degrees,
+ cli.nb_measurements,
+ G1 = Projective,
+ name = "VESTA"
+ );
}
--
GitLab