Merge pull request #54 from claucece/criterion-0.5

bulletproofs: update to criterion 0.5

Author: claucece

bulletproofs/Cargo.toml

@@ -54,7 +54,7 @@ version =  '0.4.0'
 default-features = false
 
 [dev-dependencies]
-criterion = "0.3"
+criterion = "0.5.1"
 rand_chacha = "0.3"
 bincode = "1"
 

bulletproofs/benches/generators.rs

@@ -2,10 +2,8 @@
 
 use ark_bulletproofs::{BulletproofGens, PedersenGens};
 use ark_secq256k1::Affine;
-
-#[macro_use]
-extern crate criterion;
-use criterion::Criterion;
+use criterion::BenchmarkId;
+use criterion::{criterion_group, criterion_main, Criterion};
 
 fn pc_gens(c: &mut Criterion) {
     c.bench_function("PedersenGens::new", |b| {
@@ -14,17 +12,13 @@ fn pc_gens(c: &mut Criterion) {
 }
 
 fn bp_gens(c: &mut Criterion) {
-    c.bench_function_over_inputs(
-        "BulletproofGens::new",
-        |b, size| b.iter(|| BulletproofGens::<Affine>::new(*size, 1)),
-        (0..10).map(|i| 2 << i),
-    );
-}
-
-criterion_group! {
-    bp,
-    bp_gens,
-    pc_gens,
+    let mut group = c.benchmark_group("BulletproofGens::new");
+    for size in (0..10).map(|i| 2 << i) {
+        group.bench_with_input(BenchmarkId::from_parameter(size), &size, |b, &size| {
+            b.iter(|| BulletproofGens::<Affine>::new(size, 1))
+        });
+    }
 }
 
+criterion_group!(bp, bp_gens, pc_gens);
 criterion_main!(bp);

bulletproofs/benches/r1cs_secq256k1.rs

@@ -1,11 +1,7 @@
 #![allow(non_snake_case)]
-#![allow(deprecated)]
-
-#[macro_use]
-extern crate criterion;
-
 use ark_std::UniformRand;
-use criterion::Criterion;
+use criterion::BenchmarkId;
+use criterion::{criterion_group, criterion_main, Criterion};
 
 // Code below copied from ../tests/r1cs.rs
 //
@@ -16,10 +12,6 @@ use criterion::Criterion;
 // someone wants to figure a way to use #[path] attributes or
 // something to avoid the duplication.
 
-extern crate ark_bulletproofs;
-extern crate merlin;
-extern crate rand;
-
 use ark_bulletproofs::r1cs::*;
 use ark_bulletproofs::{BulletproofGens, PedersenGens};
 use ark_secq256k1::{Affine, Fr};
@@ -158,9 +150,9 @@ fn bench_kshuffle_prove(c: &mut Criterion) {
     let pc_gens = PedersenGens::default();
     let bp_gens = BulletproofGens::new(2 * MAX_SHUFFLE_SIZE, 1);
 
-    c.bench_function_over_inputs(
-        "k-shuffle proof creation",
-        move |b, k| {
+    let mut group = c.benchmark_group("k-shuffle proof creation");
+    for size in (1..=LG_MAX_SHUFFLE_SIZE).map(|i| 1 << i) {
+        group.bench_with_input(BenchmarkId::from_parameter(size), &size, |b, k| {
             // Generate inputs and outputs to kshuffle
             let mut rng = rand::thread_rng();
             let (min, max) = (0u64, u64::MAX);
@@ -181,12 +173,9 @@ fn bench_kshuffle_prove(c: &mut Criterion) {
                     &output,
                 )
                 .unwrap();
-            })
-        },
-        (1..=LG_MAX_SHUFFLE_SIZE)
-            .map(|i| 1 << i)
-            .collect::<Vec<_>>(),
-    );
+            });
+        });
+    }
 }
 
 criterion_group! {
@@ -203,9 +192,9 @@ fn bench_kshuffle_verify(c: &mut Criterion) {
     let pc_gens = PedersenGens::default();
     let bp_gens = BulletproofGens::new(2 * MAX_SHUFFLE_SIZE, 1);
 
-    c.bench_function_over_inputs(
-        "k-shuffle proof verification",
-        move |b, k| {
+    let mut group = c.benchmark_group("k-shuffle proof verification");
+    for size in (1..=LG_MAX_SHUFFLE_SIZE).map(|i| 1 << i) {
+        group.bench_with_input(BenchmarkId::from_parameter(size), &size, |b, k| {
             // Generate the proof in its own scope to prevent reuse of
             // prover variables by the verifier
             let (proof, input_commitments, output_commitments) = {
@@ -242,11 +231,8 @@ fn bench_kshuffle_verify(c: &mut Criterion) {
                     )
                     .unwrap();
             })
-        },
-        (1..=LG_MAX_SHUFFLE_SIZE)
-            .map(|i| 1 << i)
-            .collect::<Vec<_>>(),
-    );
+        });
+    }
 }
 
 criterion_group! {

t256/Cargo.toml

@@ -19,7 +19,6 @@ rand = { version = "0.8.5" }
 rand_core = { version = "0.6.4" }
 merlin = { version = "3.0.0" }
 ark-ff-macros =  { version = "0.4.2", default-features = false }
-criterion = "0.5.1"
 sha2 = "0.10.8"
 
 [dev-dependencies]