From 6e0960b0b74b62a42d842d329dfd82d04e6931e5 Mon Sep 17 00:00:00 2001
From: Mihai <mihai.calancea@gmail.com>
Date: Tue, 10 Dec 2024 09:42:07 +0200
Subject: [PATCH] slight clean-up

---
 ceno_zkvm/src/instructions.rs            | 1 -
 ceno_zkvm/src/tables/ops/ops_impl.rs     | 2 --
 ceno_zkvm/src/tables/program.rs          | 4 ----
 ceno_zkvm/src/tables/ram/ram_impl.rs     | 2 --
 ceno_zkvm/src/tables/range/range_impl.rs | 2 --
 ceno_zkvm/src/witness.rs                 | 8 +++-----
 6 files changed, 3 insertions(+), 16 deletions(-)

diff --git a/ceno_zkvm/src/instructions.rs b/ceno_zkvm/src/instructions.rs
index 7174318ea..bb3109d82 100644
--- a/ceno_zkvm/src/instructions.rs
+++ b/ceno_zkvm/src/instructions.rs
@@ -53,7 +53,6 @@ pub trait Instruction<E: ExtensionField> {
         }
         .max(1);
         let lk_multiplicity = LkMultiplicity::default();
-        // dbg!(steps.len(), num_witin);
         let mut raw_witin =
             RowMajorMatrix::<E::BaseField>::new(steps.len(), num_witin, Self::padding_strategy());
         let raw_witin_iter = raw_witin.par_batch_iter_mut(num_instance_per_batch);
diff --git a/ceno_zkvm/src/tables/ops/ops_impl.rs b/ceno_zkvm/src/tables/ops/ops_impl.rs
index 54bc3f4f7..4c34c5fec 100644
--- a/ceno_zkvm/src/tables/ops/ops_impl.rs
+++ b/ceno_zkvm/src/tables/ops/ops_impl.rs
@@ -48,7 +48,6 @@ impl OpTableConfig {
         num_fixed: usize,
         content: Vec<[u64; 3]>,
     ) -> RowMajorMatrix<F> {
-        //dbg!(content.len(), num_fixed);
         let mut fixed =
             RowMajorMatrix::<F>::new(content.len(), num_fixed, InstancePaddingStrategy::Zero);
 
@@ -71,7 +70,6 @@ impl OpTableConfig {
         multiplicity: &HashMap<u64, usize>,
         length: usize,
     ) -> Result<RowMajorMatrix<F>, ZKVMError> {
-        //dbg!(length, num_witin);
         let mut witness =
             RowMajorMatrix::<F>::new(length, num_witin, InstancePaddingStrategy::Zero);
 
diff --git a/ceno_zkvm/src/tables/program.rs b/ceno_zkvm/src/tables/program.rs
index 288f27548..2ff4dd5d5 100644
--- a/ceno_zkvm/src/tables/program.rs
+++ b/ceno_zkvm/src/tables/program.rs
@@ -159,7 +159,6 @@ impl<E: ExtensionField> TableCircuit<E> for ProgramTableCircuit<E> {
         let pc_base = program.base_address;
         assert!(num_instructions <= config.program_size);
 
-        // dbg!(config.program_size, num_fixed);
         let mut fixed = RowMajorMatrix::<E::BaseField>::new(
             config.program_size,
             num_fixed,
@@ -181,7 +180,6 @@ impl<E: ExtensionField> TableCircuit<E> for ProgramTableCircuit<E> {
                 }
             });
 
-        // Self::padding_zero(&mut fixed, num_fixed).expect("padding error");
         fixed
     }
 
@@ -199,7 +197,6 @@ impl<E: ExtensionField> TableCircuit<E> for ProgramTableCircuit<E> {
             prog_mlt[i] = *mlt;
         }
 
-        // dbg!(config.program_size, num_witin);
         let mut witness = RowMajorMatrix::<E::BaseField>::new(
             config.program_size,
             num_witin,
@@ -213,7 +210,6 @@ impl<E: ExtensionField> TableCircuit<E> for ProgramTableCircuit<E> {
                 set_val!(row, config.mlt, E::BaseField::from(mlt as u64));
             });
 
-        // Self::padding_zero(&mut witness, num_witin).expect("padding error");
         Ok(witness)
     }
 }
diff --git a/ceno_zkvm/src/tables/ram/ram_impl.rs b/ceno_zkvm/src/tables/ram/ram_impl.rs
index 616b933ba..b824c2646 100644
--- a/ceno_zkvm/src/tables/ram/ram_impl.rs
+++ b/ceno_zkvm/src/tables/ram/ram_impl.rs
@@ -119,7 +119,6 @@ impl<NVRAM: NonVolatileTable + Send + Sync + Clone> NonVolatileTableConfig<NVRAM
             NVRAM::len(&self.params)
         );
 
-        //dbg!(NVRAM::len(&self.params), num_fixed);
         let mut init_table = RowMajorMatrix::<F>::new(
             NVRAM::len(&self.params),
             num_fixed,
@@ -389,7 +388,6 @@ impl<DVRAM: DynVolatileRamTable + Send + Sync + Clone> DynVolatileRamTableConfig
     ) -> Result<RowMajorMatrix<F>, ZKVMError> {
         assert!(final_mem.len() <= DVRAM::max_len(&self.params));
         assert!(DVRAM::max_len(&self.params).is_power_of_two());
-        //dbg!(final_mem.len(), num_witness);
         let mut final_table =
             RowMajorMatrix::<F>::new(final_mem.len(), num_witness, InstancePaddingStrategy::Zero);
 
diff --git a/ceno_zkvm/src/tables/range/range_impl.rs b/ceno_zkvm/src/tables/range/range_impl.rs
index e9637e4bc..11191e22f 100644
--- a/ceno_zkvm/src/tables/range/range_impl.rs
+++ b/ceno_zkvm/src/tables/range/range_impl.rs
@@ -43,7 +43,6 @@ impl RangeTableConfig {
         num_fixed: usize,
         content: Vec<u64>,
     ) -> RowMajorMatrix<F> {
-        //dbg!(content.len(), num_fixed);
         let mut fixed =
             RowMajorMatrix::<F>::new(content.len(), num_fixed, InstancePaddingStrategy::Zero);
 
@@ -64,7 +63,6 @@ impl RangeTableConfig {
         multiplicity: &HashMap<u64, usize>,
         length: usize,
     ) -> Result<RowMajorMatrix<F>, ZKVMError> {
-        //dbg!(length, num_witin);
         let mut witness =
             RowMajorMatrix::<F>::new(length, num_witin, InstancePaddingStrategy::Zero);
 
diff --git a/ceno_zkvm/src/witness.rs b/ceno_zkvm/src/witness.rs
index 94e9cda6b..8242f35e1 100644
--- a/ceno_zkvm/src/witness.rs
+++ b/ceno_zkvm/src/witness.rs
@@ -49,7 +49,6 @@ pub struct RowMajorMatrix<T: Sized + Sync + Clone + Send + Copy> {
 
 impl<T: Sized + Sync + Clone + Send + Copy + Default> RowMajorMatrix<T> {
     pub fn new(num_rows: usize, num_col: usize, padding_strategy: InstancePaddingStrategy) -> Self {
-        // assert!(false);
         RowMajorMatrix {
             values: (0..num_rows * num_col)
                 .into_par_iter()
@@ -90,17 +89,16 @@ impl<F: Field> RowMajorMatrix<F> {
         self,
     ) -> Vec<DenseMultilinearExtension<E>> {
         let padding_row = match self.padding_strategy {
-            // If asked to repeat and actually have content to repeat
+            // Repeat last row if it exists
             InstancePaddingStrategy::RepeatLast if !self.values.is_empty() => {
                 self.values[self.values.len() - self.num_col..].to_vec()
             }
-            // Otherwise zeros
+            // Otherwise use zeroes
             _ => vec![F::ZERO; self.num_col],
         };
         let num_padding = self.num_padding_instances();
         let result = (0..self.num_col)
-            .collect_vec()
-            .par_iter()
+            .into_par_iter()
             .map(|i| {
                 self.values
                     .iter()