Add multicore for vec mult

Author: Kunming Jiang

circ_blocks/Cargo.toml

@@ -51,10 +51,7 @@ from-pest = { version = "0.3", optional = true }
 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",
-] }
+spartan_parallel = { path = "../spartan_parallel", default-features = false, features = ["profile"] }
 merlin = { version = "3.0.0" }
 curve25519-dalek = { version = "4", features = ["serde"], optional = true }
 # TODO: kill

circ_blocks/examples/zxc.rs

@@ -357,7 +357,7 @@ impl CompileTimeKnowledge {
 }
 
 #[derive(Serialize, Deserialize)]
-struct RunTimeKnowledge<S: SpartanExtensionField> {
+struct RunTimeKnowledge<S: SpartanExtensionField + Send + Sync> {
     block_max_num_proofs: usize,
     block_num_proofs: Vec<usize>,
     consis_num_proofs: usize,
@@ -382,7 +382,7 @@ struct RunTimeKnowledge<S: SpartanExtensionField> {
     output_exec_num: usize,
 }
 
-impl<S: SpartanExtensionField> RunTimeKnowledge<S> {
+impl<S: SpartanExtensionField + Send + Sync> RunTimeKnowledge<S> {
     fn serialize_to_file(&self, benchmark_name: String, max_file_size: usize) -> std::io::Result<()> {
         let content = bincode::serialize(&self).unwrap();
         println!("RTK SIZE: {}", content.len());
@@ -842,7 +842,7 @@ fn get_compile_time_knowledge<const VERBOSE: bool>(
 // --
 // Generate witnesses and others
 // --
-fn get_run_time_knowledge<const VERBOSE: bool, S: SpartanExtensionField>(
+fn get_run_time_knowledge<const VERBOSE: bool, S: SpartanExtensionField + Send + Sync>(
     path: PathBuf,
     options: &Options,
     entry_regs: Vec<Integer>,
@@ -1277,7 +1277,7 @@ fn get_run_time_knowledge<const VERBOSE: bool, S: SpartanExtensionField>(
     }
 }
 
-fn run_spartan_proof<S: SpartanExtensionField>(
+fn run_spartan_proof<S: SpartanExtensionField + Send + Sync>(
     ctk: CompileTimeKnowledge,
     rtk: RunTimeKnowledge<S>,
 ) {

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/instance.rs

@@ -26,7 +26,7 @@ pub struct Instance<S: SpartanExtensionField> {
   pub digest: Vec<u8>,
 }
 
-impl<S: SpartanExtensionField> Instance<S> {
+impl<S: SpartanExtensionField + Send + Sync> Instance<S> {
   /// Constructs a new `Instance` and an associated satisfying assignment
   pub fn new(
     num_instances: usize,

spartan_parallel/src/lib.rs

@@ -643,7 +643,7 @@ impl PartialEq for InstanceSortHelper {
 }
 impl Eq for InstanceSortHelper {}
 
-impl<S: SpartanExtensionField> SNARK<S> {
+impl<S: SpartanExtensionField + Send + Sync> SNARK<S> {
   fn protocol_name() -> &'static [u8] {
     b"Spartan SNARK proof"
   }

spartan_parallel/src/r1csinstance.rs

@@ -1,3 +1,5 @@
+use rayon::prelude::*;
+
 use std::cmp::{max, min};
 use std::collections::HashMap;
 
@@ -65,7 +67,7 @@ impl<S: SpartanExtensionField> R1CSCommitment<S> {
   }
 }
 
-impl<S: SpartanExtensionField> R1CSInstance<S> {
+impl<S: SpartanExtensionField + Send + Sync> R1CSInstance<S> {
   pub fn new(
     num_instances: usize,
     max_num_cons: usize,
@@ -243,6 +245,31 @@ impl<S: SpartanExtensionField> R1CSInstance<S> {
       Az.push(Vec::new());
       Bz.push(Vec::new());
       Cz.push(Vec::new());
+      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_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_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_list[q],
+        )]
+      ).collect();
+      /*
       for q in 0..num_proofs[p] {
         let z = &z_list[q];
 
@@ -265,6 +292,7 @@ impl<S: SpartanExtensionField> R1CSInstance<S> {
           z,
         )]);
       }
+      */
     }
 
     (

spartan_parallel/src/r1csproof.rs

@@ -26,7 +26,7 @@ pub struct R1CSProof<S: SpartanExtensionField> {
   // proof_eval_vars_at_ry_list: Vec<PolyEvalProof<S>>,
 }
 
-impl<S: SpartanExtensionField> R1CSProof<S> {
+impl<S: SpartanExtensionField + Send + Sync> R1CSProof<S> {
   fn prove_phase_one(
     num_rounds: usize,
     num_rounds_x_max: usize,

spartan_parallel/src/scalar/fp.rs

@@ -15,6 +15,9 @@ use zeroize::Zeroize;
 #[derive(Clone, Copy, Eq, Serialize, Deserialize, Hash, Debug)]
 pub struct Scalar(Goldilocks);
 
+unsafe impl Send for Scalar {}
+unsafe impl Sync for Scalar {}
+
 impl SpartanExtensionField for Scalar {
   type InnerType = Goldilocks;
   type BaseField = Goldilocks;

spartan_parallel/src/scalar/fp2.rs

@@ -14,6 +14,9 @@ use zeroize::Zeroize;
 #[derive(Clone, Copy, Eq, Serialize, Deserialize, Hash, Debug)]
 pub struct ScalarExt2(GoldilocksExt2);
 
+unsafe impl Send for ScalarExt2 {}
+unsafe impl Sync for ScalarExt2 {}
+
 impl From<GoldilocksExt2> for ScalarExt2 {
   fn from(g: GoldilocksExt2) -> Self {
     Self(g)

zok_tests/benchmarks/poseidon_test/poseidon_const.zok

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