Cargo.toml

@@ -55,10 +55,6 @@ criterion = "0.3"
 name = "recoding"
 harness = false
 
-[[bench]]
-name = "linalg"
-harness = false
-
 [[example]]
 name = "bench_commit"
 path = "examples/benches/commit.rs"
@@ -70,14 +66,15 @@ path = "examples/benches/setup_size.rs"
 [[example]]
 name = "bench_field_operations"
 path = "examples/benches/operations/field.rs"
-harness = false
 
 [[example]]
 name = "bench_curve_group_operations"
 path = "examples/benches/operations/curve_group.rs"
-harness = false
 
 [[example]]
 name = "bench_setup"
 path = "examples/benches/setup.rs"
-harness = false
+
+[[example]]
+name = "bench_linalg"
+path = "examples/benches/linalg.rs"

benches/linalg.rs

-// see `benches/README.md`
-use std::time::Duration;
-
-use ark_ff::PrimeField;
-
-use criterion::{black_box, criterion_group, criterion_main, Criterion};
-
-use komodo::linalg::Matrix;
-
-fn inverse_template<F: PrimeField>(c: &mut Criterion, n: usize, curve: &str) {
-    let mut rng = rand::thread_rng();
-    let matrix = Matrix::<F>::random(n, n, &mut rng);
-
-    c.bench_function(&format!("inverse {}x{} on {}", n, n, curve), |b| {
-        b.iter(|| matrix.invert().unwrap())
-    });
-}
-
-fn inverse(c: &mut Criterion) {
-    for n in [10, 15, 20, 30, 40, 60, 80, 120, 160, 240, 320] {
-        inverse_template::<ark_bls12_381::Fr>(c, black_box(n), "BLS12-381");
-        inverse_template::<ark_bn254::Fr>(c, black_box(n), "BN-254");
-        inverse_template::<ark_pallas::Fr>(c, black_box(n), "PALLAS");
-    }
-}
-
-fn transpose_template<F: PrimeField>(c: &mut Criterion, n: usize, curve: &str) {
-    let mut rng = rand::thread_rng();
-    let matrix = Matrix::<F>::random(n, n, &mut rng);
-
-    c.bench_function(&format!("transpose {}x{} on {}", n, n, curve), |b| {
-        b.iter(|| matrix.transpose())
-    });
-}
-
-fn transpose(c: &mut Criterion) {
-    for n in [10, 15, 20, 30, 40, 60, 80, 120, 160, 240, 320] {
-        transpose_template::<ark_bls12_381::Fr>(c, black_box(n), "BLS-12-381");
-        transpose_template::<ark_bn254::Fr>(c, black_box(n), "BN-254");
-        transpose_template::<ark_pallas::Fr>(c, black_box(n), "PALLAS");
-    }
-}
-
-fn mul_template<F: PrimeField>(c: &mut Criterion, n: usize, curve: &str) {
-    let mut rng = rand::thread_rng();
-    let mat_a = Matrix::<F>::random(n, n, &mut rng);
-    let mat_b = Matrix::<F>::random(n, n, &mut rng);
-
-    c.bench_function(&format!("mul {}x{} on {}", n, n, curve), |b| {
-        b.iter(|| mat_a.mul(&mat_b))
-    });
-}
-
-fn mul(c: &mut Criterion) {
-    for n in [10, 15, 20, 30, 40, 60, 80, 120] {
-        mul_template::<ark_bls12_381::Fr>(c, black_box(n), "BLS-12-381");
-        mul_template::<ark_bn254::Fr>(c, black_box(n), "BN-254");
-        mul_template::<ark_pallas::Fr>(c, black_box(n), "PALLAS");
-    }
-}
-
-criterion_group!(
-    name = benches;
-    config = Criterion::default()
-        .warm_up_time(Duration::from_secs_f32(0.5))
-        .sample_size(10);
-    targets = inverse, transpose, mul
-);
-criterion_main!(benches);

examples/benches/linalg.rs

+// see `benches/README.md`
+use ark_ff::PrimeField;
+
+use clap::{arg, command, Parser};
+use komodo::linalg::Matrix;
+use plnk::Bencher;
+
+fn inverse_template<F: PrimeField>(b: &Bencher, n: usize) {
+    let mut rng = rand::thread_rng();
+    let matrix = Matrix::<F>::random(n, n, &mut rng);
+
+    plnk::bench(b, &format!("inverse {}", n), || {
+        plnk::timeit(|| matrix.invert().unwrap())
+    });
+}
+
+fn transpose_template<F: PrimeField>(b: &Bencher, n: usize) {
+    let mut rng = rand::thread_rng();
+    let matrix = Matrix::<F>::random(n, n, &mut rng);
+
+    plnk::bench(b, &format!("transpose {}", n), || {
+        plnk::timeit(|| matrix.transpose())
+    });
+}
+
+fn mul_template<F: PrimeField>(b: &Bencher, n: usize) {
+    let mut rng = rand::thread_rng();
+    let mat_a = Matrix::<F>::random(n, n, &mut rng);
+    let mat_b = Matrix::<F>::random(n, n, &mut rng);
+
+    plnk::bench(b, &format!("mul {}", n), || {
+        plnk::timeit(|| mat_a.mul(&mat_b))
+    });
+}
+
+#[derive(Parser)]
+#[command(version, about, long_about = None)]
+struct Cli {
+    /// the sizes of the matrices to consider
+    #[arg(num_args = 1.., value_delimiter = ' ')]
+    sizes: 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,
+}
+
+fn main() {
+    let cli = Cli::parse();
+
+    let b = plnk::Bencher::new(cli.nb_measurements);
+
+    for n in cli.sizes {
+        inverse_template::<ark_bls12_381::Fr>(&b.with_name("BLS12-381"), n);
+        inverse_template::<ark_bn254::Fr>(&b.with_name("BN-254"), n);
+        inverse_template::<ark_pallas::Fr>(&b.with_name("PALLAS"), n);
+
+        transpose_template::<ark_bls12_381::Fr>(&b.with_name("BLS12-381"), n);
+        transpose_template::<ark_bn254::Fr>(&b.with_name("BN-254"), n);
+        transpose_template::<ark_pallas::Fr>(&b.with_name("PALLAS"), n);
+
+        mul_template::<ark_bls12_381::Fr>(&b.with_name("BLS12-381"), n);
+        mul_template::<ark_bn254::Fr>(&b.with_name("BN-254"), n);
+        mul_template::<ark_pallas::Fr>(&b.with_name("PALLAS"), n);
+    }
+}