Simple batching implementation of WHIR

Cargo.toml

@@ -26,10 +26,12 @@ nimue = { git = "https://github.com/arkworks-rs/nimue", features = ["ark"] }
 nimue-pow = { git = "https://github.com/arkworks-rs/nimue" }
 lazy_static = "1.4"
 rayon = { version = "1.10.0", optional = true }
+transpose = "0.2.3"
 
 goldilocks = { git = "https://github.com/scroll-tech/ceno-Goldilocks" }
 thiserror = "1"
 derive_more = { version = "1.0.0", features = ["debug"] }
+itertools = "0.14.0"
 
 [profile.release]
 debug = true
@@ -44,3 +46,4 @@ parallel = [
 ]
 rayon = ["dep:rayon"]
 ceno = []
+print-trace = ["ark-std/print-trace"]

src/bin/benchmark.rs

@@ -19,7 +19,7 @@ use whir::{
     },
     parameters::*,
     poly_utils::coeffs::CoefficientList,
-    whir::{iopattern::WhirIOPattern, Statement},
+    whir::Statement,
 };
 
 use serde::Serialize;
@@ -49,6 +49,9 @@ struct Args {
     #[arg(long = "reps", default_value = "1000")]
     verifier_repetitions: usize,
 
+    #[arg(short = 'i', long = "initfold", default_value = "4")]
+    first_round_folding_factor: usize,
+
     #[arg(short = 'k', long = "fold", default_value = "4")]
     folding_factor: usize,
 
@@ -223,6 +226,7 @@ fn run_whir<F, MerkleConfig>(
     let starting_rate = args.rate;
     let reps = args.verifier_repetitions;
     let folding_factor = args.folding_factor;
+    let first_round_folding_factor = args.first_round_folding_factor;
     let soundness_type = args.soundness_type;
     let fold_optimisation = args.fold_optimisation;
 
@@ -236,7 +240,10 @@ fn run_whir<F, MerkleConfig>(
         initial_statement: true,
         security_level,
         pow_bits,
-        folding_factor,
+        folding_factor: FoldingFactor::ConstantFromSecondRound(
+            first_round_folding_factor,
+            folding_factor,
+        ),
         leaf_hash_params,
         two_to_one_params,
         soundness_type,

src/bin/main.rs

@@ -48,6 +48,9 @@ struct Args {
     #[arg(long = "reps", default_value = "1000")]
     verifier_repetitions: usize,
 
+    #[arg(short = 'i', long = "initfold", default_value = "4")]
+    first_round_folding_factor: usize,
+
     #[arg(short = 'k', long = "fold", default_value = "4")]
     folding_factor: usize,
 
@@ -219,6 +222,7 @@ fn run_whir_as_ldt<F, MerkleConfig>(
     let num_variables = args.num_variables;
     let starting_rate = args.rate;
     let reps = args.verifier_repetitions;
+    let first_round_folding_factor = args.first_round_folding_factor;
     let folding_factor = args.folding_factor;
     let fold_optimisation = args.fold_optimisation;
     let soundness_type = args.soundness_type;
@@ -235,7 +239,10 @@ fn run_whir_as_ldt<F, MerkleConfig>(
         initial_statement: false,
         security_level,
         pow_bits,
-        folding_factor,
+        folding_factor: FoldingFactor::ConstantFromSecondRound(
+            first_round_folding_factor,
+            folding_factor,
+        ),
         leaf_hash_params,
         two_to_one_params,
         soundness_type,
@@ -326,6 +333,7 @@ fn run_whir_pcs<F, MerkleConfig>(
     let num_variables = args.num_variables;
     let starting_rate = args.rate;
     let reps = args.verifier_repetitions;
+    let first_round_folding_factor = args.first_round_folding_factor;
     let folding_factor = args.folding_factor;
     let fold_optimisation = args.fold_optimisation;
     let soundness_type = args.soundness_type;
@@ -343,7 +351,10 @@ fn run_whir_pcs<F, MerkleConfig>(
         initial_statement: true,
         security_level,
         pow_bits,
-        folding_factor,
+        folding_factor: FoldingFactor::ConstantFromSecondRound(
+            first_round_folding_factor,
+            folding_factor,
+        ),
         leaf_hash_params,
         two_to_one_params,
         soundness_type,