Merge branch 'main' into morgan/51

Author: morganthomas

Cargo.lock

@@ -8,7 +8,6 @@
 - one can "move out" the variable of the eq(.) polynomials out of the sumcheck computation in WHIR (as done in the PIOP)
 - Structured AIR: often no all the columns use both up/down -> only handle the used ones to speed up the PIOP zerocheck
 - use RowMAjorMatrix instead of Vec<Vec> for witness, and avoid any transpositions as suggested by Thomas
-- Fill Precompile tables during bytecode execution
 - Use Univariate Skip to commit to tables with k.2^n rows (k small)
 - avoid field embedding in the initial sumcheck of logup*, when table / values are in base field
 - opti logup* GKR: 
@@ -104,4 +103,4 @@ fn doesnt_work(x) inline -> 1 {
     } // the bug: we do not JUMP here, when inlined
     return 1; // will be compiled to `res = 1`; -> invalid (res = 0 and = 1 at the same time)
 }
-```
+```

TODO.md

@@ -5,8 +5,8 @@ use p3_field::{ExtensionField, Field, cyclic_subgroup_known_order};
 use p3_util::{log2_ceil_usize, log2_strict_usize};
 use sumcheck::{MleGroup, MleGroupOwned, MleGroupRef, ProductComputation};
 use tracing::{info_span, instrument};
-use utils::PF;
-use utils::{FSProver, add_multilinears, multilinears_linear_combination};
+use utils::{FSProver, multilinears_linear_combination};
+use utils::{PF, add_multilinears_inplace};
 use whir_p3::fiat_shamir::FSChallenger;
 use whir_p3::poly::evals::{eval_eq, fold_multilinear, scale_poly};
 use whir_p3::poly::{evals::EvaluationsList, multilinear::MultilinearPoint};
@@ -195,8 +195,9 @@ fn open_structured_columns<EF: ExtensionField<PF<EF>> + ExtensionField<IF>, IF:
 
     let batched_column =
         multilinears_linear_combination(witness, &poly_eq_batching_scalars[..n_columns]);
-    let batched_column_mixed = add_multilinears(
-        &column_up(&batched_column),
+    let mut batched_column_mixed = column_up(&batched_column);
+    add_multilinears_inplace(
+        &mut batched_column_mixed,
         &scale_poly(&column_down(&batched_column), alpha),
     );
     // TODO do not recompute this (we can deduce it from already computed values)
@@ -217,13 +218,9 @@ fn open_structured_columns<EF: ExtensionField<PF<EF>> + ExtensionField<IF>, IF:
     // TODO do not recompute this (we can deduce it from already computed values)
     let inner_sum = batched_column_mixed.evaluate(&MultilinearPoint(point.clone()));
 
-    let inner_mle = MleGroupOwned::Extension(vec![
-        add_multilinears(
-            &matrix_up_folded(&point),
-            &scale_poly(&matrix_down_folded(&point), alpha),
-        ),
-        batched_column,
-    ]);
+    let mut mat_up = matrix_up_folded(&point);
+    add_multilinears_inplace(&mut mat_up, &scale_poly(&matrix_down_folded(&point), alpha));
+    let inner_mle = MleGroupOwned::Extension(vec![mat_up, batched_column]);
 
     let (inner_challenges, _, _) = sumcheck::prove::<EF, _, _, _>(
         1,

crates/air/src/prove.rs

@@ -30,7 +30,7 @@ pub fn compile_program(program: &str) -> (Bytecode, BTreeMap<usize, String>) {
     for (loc, name) in function_locations.iter() {
         println!("{name}: {loc}");
     }
-    println!("\n\nCompiled Program:\n\n{}", compiled.to_string());
+    println!("\n\nCompiled Program:\n\n{compiled}");
     (compiled, function_locations)
 }
 

crates/lean_compiler/src/lib.rs

@@ -46,7 +46,7 @@ pub fn prove_execution(
         poseidons_16, // padded with empty poseidons
         poseidons_24, // padded with empty poseidons
         dot_products,
-        vm_multilinear_evals,
+        multilinear_evals: vm_multilinear_evals,
         public_memory_size,
         non_zero_memory_size,
         memory, // padded with zeros to next power of two
@@ -59,7 +59,7 @@ pub fn prove_execution(
             function_locations,
             vm_profiler,
         );
-        get_execution_trace(bytecode, &execution_result)
+        get_execution_trace(bytecode, execution_result)
     });
 
     let public_memory = &memory[..public_memory_size];

crates/lean_prover/src/prove_execution.rs

@@ -1,10 +1,9 @@
 use std::borrow::Borrow;
 
-use lean_vm::{DIMENSION, EF};
+use lean_vm::{DIMENSION, EF, WitnessDotProduct};
 use p3_air::{Air, AirBuilder, BaseAir};
 use p3_field::PrimeCharacteristicRing;
 use p3_matrix::Matrix;
-use witness_generation::WitnessDotProduct;
 
 /*
 (DIMENSION = 5)