Add parallelism

Author: darth-cy

circ_blocks/Cargo.toml

@@ -52,7 +52,6 @@ itertools = "0.10"
 petgraph = { version = "0.6", optional = true }
 spartan = { version = "0.8", default-features = false, optional = true }
 spartan_parallel = { path = "../spartan_parallel", default-features = false, features = [
-  "multicore",
   "profile",
 ] }
 merlin = { version = "3.0.0" }

spartan_parallel/Cargo.toml

@@ -20,7 +20,7 @@ rand = { version = "0.8", features = ["getrandom"], default-features = false }
 digest = { version = "0.10", default-features = false }
 sha3 = { version = "0.10", default-features = false }
 byteorder = { version = "1", default-features = false }
-rayon = { version = "1", optional = true }
+rayon = { version = "1" }
 serde = { version = "1", features = ["derive"], default-features = false }
 bincode = { version = "1", default-features = false }
 subtle = { version = "2", features = ["i128"], default-features = false }
@@ -52,9 +52,8 @@ std = [
   "itertools/use_std",
   "flate2/rust_backend",
 ]
-multicore = ["rayon"]
 profile = ["colored"]
 
 [[example]]
 name = "interface"
-required-features = ["multicore", "profile"]
+required-features = ["profile"]

spartan_parallel/src/r1csinstance.rs

@@ -18,6 +18,7 @@ use flate2::{write::ZlibEncoder, Compression};
 use std::iter::zip;
 use merlin::Transcript;
 use serde::{Deserialize, Serialize};
+use rayon::prelude::*;
 
 #[derive(Debug, Serialize, Deserialize, Clone)]
 pub struct R1CSInstance<S: SpartanExtensionField> {
@@ -243,28 +244,31 @@ impl<S: SpartanExtensionField> R1CSInstance<S> {
       Az.push(Vec::new());
       Bz.push(Vec::new());
       Cz.push(Vec::new());
-      for q in 0..num_proofs[p] {
-        let z = &z_list[q];
 
-        Az[p].push(vec![self.A_list[p_inst].multiply_vec_disjoint_rounds(
+      Az[p] = (0..num_proofs[p]).into_par_iter().map(|q|
+        vec![self.A_list[p_inst].multiply_vec_disjoint_rounds(
           num_cons[p_inst].clone(),
           max_num_inputs,
           num_inputs[p],
-          z,
-        )]);
-        Bz[p].push(vec![self.B_list[p_inst].multiply_vec_disjoint_rounds(
+          &z_list[q],
+        )]
+      ).collect();
+      Bz[p] = (0..num_proofs[p]).into_par_iter().map(|q|
+        vec![self.B_list[p_inst].multiply_vec_disjoint_rounds(
           num_cons[p_inst].clone(),
           max_num_inputs,
           num_inputs[p],
-          z,
-        )]);
-        Cz[p].push(vec![self.C_list[p_inst].multiply_vec_disjoint_rounds(
+          &z_list[q],
+        )]
+      ).collect();
+      Cz[p] = (0..num_proofs[p]).into_par_iter().map(|q|
+        vec![self.C_list[p_inst].multiply_vec_disjoint_rounds(
           num_cons[p_inst].clone(),
           max_num_inputs,
           num_inputs[p],
-          z,
-        )]);
-      }
+          &z_list[q],
+        )]
+      ).collect();
     }
 
     (

spartan_parallel/src/scalar/mod.rs

@@ -47,12 +47,14 @@ pub trait SpartanExtensionField:
   + fmt::Debug
   + Mul<Self::BaseField, Output = Self>
   + MulAssign<Self::BaseField>
+  + Send
+  + Sync
 {
   /// Inner Goldilocks extension field
-  type InnerType: ExtensionField + Field;
+  type InnerType: ExtensionField + Field + Send + Sync;
 
   /// Basefield for conserving computational resources
-  type BaseField: Field;
+  type BaseField: Field + Send + Sync;
 
   /// Return inner Goldilocks field element
   fn inner(&self) -> &Self::InnerType;

zok_tests/benchmarks/poseidon_test/poseidon_const.zok

@@ -1 +1 @@
-const u32 REPETITION = 10000
+const u32 REPETITION = 1000