Small perf items (#12)

* Optimize generator creation in provider module

- Refactored the `from_label` function in pasta.rs removing redundant collect, flatten operations and Vec<usize> creation,

* fix: rename VanillaRO -> NativeRO

* refactor: Optimize circuit methods and enhance trait compatibility

- Replaced the `.map()` function with the `.map_or()` function in `r1cs.rs` for efficiency.
- Added `Eq` trait derivation to `NovaAugmentedCircuitParams` in `circuit.rs` to enable comparisons.
- Introduced `Eq` trait to `TrivialTestCircuit` struct in `traits/circuit.rs` without altering its input or output.
- Optimized performance by refactoring the use of iterator `into_iter()` to the iterator itself in `gadgets/r1cs.rs`.

src/circuit.rs

@@ -31,7 +31,7 @@ use bellpepper_core::{
 use ff::Field;
 use serde::{Deserialize, Serialize};
 
-#[derive(Debug, Clone, PartialEq, Serialize, Deserialize, Abomonation)]
+#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize, Abomonation)]
 pub struct NovaAugmentedCircuitParams {
   limb_width: usize,
   n_limbs: usize,

src/gadgets/r1cs.rs

@@ -208,7 +208,7 @@ impl<G: Group> AllocatedRelaxedR1CSInstance<G> {
       .collect::<Result<Vec<AllocatedNum<G::Base>>, _>>()?;
 
     // absorb each of the limbs of X[0]
-    for limb in X0_bn.into_iter() {
+    for limb in X0_bn {
       ro.absorb(&limb);
     }
 
@@ -224,7 +224,7 @@ impl<G: Group> AllocatedRelaxedR1CSInstance<G> {
       .collect::<Result<Vec<AllocatedNum<G::Base>>, _>>()?;
 
     // absorb each of the limbs of X[1]
-    for limb in X1_bn.into_iter() {
+    for limb in X1_bn {
       ro.absorb(&limb);
     }
 

src/provider/mod.rs

@@ -190,7 +190,6 @@ macro_rules! impl_traits {
           uniform_bytes_vec.push(uniform_bytes);
         }
         let gens_proj: Vec<$name_curve> = (0..n)
-          .collect::<Vec<usize>>()
           .into_par_iter()
           .map(|i| {
             let hash = $name_curve::hash_to_curve("from_uniform_bytes");
@@ -202,9 +201,8 @@ macro_rules! impl_traits {
         if gens_proj.len() > num_threads {
           let chunk = (gens_proj.len() as f64 / num_threads as f64).ceil() as usize;
           (0..num_threads)
-            .collect::<Vec<usize>>()
             .into_par_iter()
-            .map(|i| {
+            .flat_map(|i| {
               let start = i * chunk;
               let end = if i == num_threads - 1 {
                 gens_proj.len()
@@ -219,9 +217,6 @@ macro_rules! impl_traits {
                 vec![]
               }
             })
-            .collect::<Vec<Vec<$name_curve_affine>>>()
-            .into_par_iter()
-            .flatten()
             .collect()
         } else {
           let mut gens = vec![$name_curve_affine::identity(); n];

src/provider/pasta.rs

@@ -106,7 +106,6 @@ macro_rules! impl_traits {
           uniform_bytes_vec.push(uniform_bytes);
         }
         let ck_proj: Vec<$name_curve> = (0..n)
-          .collect::<Vec<usize>>()
           .into_par_iter()
           .map(|i| {
             let hash = $name_curve::hash_to_curve("from_uniform_bytes");
@@ -118,9 +117,8 @@ macro_rules! impl_traits {
         if ck_proj.len() > num_threads {
           let chunk = (ck_proj.len() as f64 / num_threads as f64).ceil() as usize;
           (0..num_threads)
-            .collect::<Vec<usize>>()
             .into_par_iter()
-            .map(|i| {
+            .flat_map(|i| {
               let start = i * chunk;
               let end = if i == num_threads - 1 {
                 ck_proj.len()
@@ -135,9 +133,6 @@ macro_rules! impl_traits {
                 vec![]
               }
             })
-            .collect::<Vec<Vec<$name_curve_affine>>>()
-            .into_par_iter()
-            .flatten()
             .collect()
         } else {
           let mut ck = vec![$name_curve_affine::identity(); n];

src/provider/poseidon.rs

@@ -132,7 +132,7 @@ where
   Scalar: PrimeField + PrimeFieldBits + Serialize + for<'de> Deserialize<'de>,
   Scalar::Repr: Abomonation,
 {
-  type VanillaRO<T: PrimeField> = PoseidonRO<Scalar, T>;
+  type NativeRO<T: PrimeField> = PoseidonRO<Scalar, T>;
   type Constants = PoseidonConstantsCircuit<Scalar>;
 
   /// Initialize the internal state and set the poseidon constants

src/r1cs.rs

@@ -96,7 +96,7 @@ pub fn commitment_key_size<G: Group>(
 ) -> usize {
   let num_cons = S.num_cons;
   let num_vars = S.num_vars;
-  let generators_hint = commitment_key_floor.map(|f| f(S)).unwrap_or(0);
+  let generators_hint = commitment_key_floor.map_or(0, |f| f(S));
   max(max(num_cons, num_vars), generators_hint)
 }
 

src/spartan/ppsnark.rs

@@ -1839,7 +1839,7 @@ where
     // finish the final step of the sum-check
     let (claim_init_expected_row, claim_audit_expected_row) = {
       let addr = IdentityPolynomial::new(r_prod.len()).evaluate(&r_prod);
-      let val = EqPolynomial::new(tau.to_vec()).evaluate(&r_prod);
+      let val = EqPolynomial::new(tau).evaluate(&r_prod);
       (
         hash_func(&addr, &val, &G::Scalar::ZERO),
         hash_func(&addr, &val, &self.eval_row_audit_ts),

src/traits/circuit.rs

@@ -21,7 +21,7 @@ pub trait StepCircuit<F: PrimeField>: Send + Sync + Clone {
 }
 
 /// A trivial step circuit that simply returns the input
-#[derive(Clone, Debug, Default, PartialEq)]
+#[derive(Clone, Debug, Default, PartialEq, Eq)]
 pub struct TrivialTestCircuit<F: PrimeField> {
   _p: PhantomData<F>,
 }

src/traits/mod.rs

@@ -149,7 +149,7 @@ pub trait ROTrait<Base: PrimeField, Scalar> {
 /// A helper trait that defines the behavior of a hash function that we use as an RO in the circuit model
 pub trait ROCircuitTrait<Base: PrimeField> {
   /// the vanilla alter ego of this trait - this constrains it to use the same constants
-  type VanillaRO<T: PrimeField>: ROTrait<Base, T, Constants = Self::Constants>;
+  type NativeRO<T: PrimeField>: ROTrait<Base, T, Constants = Self::Constants>;
 
   /// A type representing constants/parameters associated with the hash function on this Base field
   type Constants: Default