Split off LW/SW

circuits/src/cpu/generation.rs

@@ -73,7 +73,7 @@ pub fn generate_cpu_trace<F: RichField>(record: &ExecutionRecord<F>) -> Vec<CpuS
         // Skip instruction handled by their own tables.
         // TODO: refactor, so we don't repeat logic.
         {
-            if let Op::ADD = inst.op {
+            if let Op::ADD | Op::SW | Op::LW = inst.op {
                 continue;
             }
 
@@ -150,6 +150,7 @@ pub fn generate_cpu_trace<F: RichField>(record: &ExecutionRecord<F>) -> Vec<CpuS
         trace.push(row);
     }
 
+    dbg!(trace.len());
     log::trace!("trace {:?}", trace);
 
     pad_trace(trace)

circuits/src/generation.rs

@@ -23,7 +23,6 @@ use crate::columns_view::HasNamedColumns;
 use crate::cpu::generation::{generate_cpu_trace, generate_program_mult_trace};
 use crate::cpu_skeleton::generation::generate_cpu_skeleton_trace;
 use crate::memory::generation::generate_memory_trace;
-use crate::memory_fullword::generation::generate_fullword_memory_trace;
 use crate::memory_halfword::generation::generate_halfword_memory_trace;
 use crate::memory_zeroinit::generation::generate_memory_zero_init_trace;
 use crate::memoryinit::generation::{generate_elf_memory_init_trace, generate_memory_init_trace};
@@ -55,6 +54,8 @@ pub const MIN_TRACE_LENGTH: usize = 8;
 /// ## Parameters
 /// `program`: A serialized ELF Program
 /// `record`: Non-constrained execution trace generated by the runner
+// TODO(Matthias): refactor this function into something sane.
+#[allow(clippy::too_many_lines)]
 #[must_use]
 #[allow(clippy::too_many_lines)]
 pub fn generate_traces<F: RichField + Extendable<D>, const D: usize>(
@@ -67,6 +68,8 @@ pub fn generate_traces<F: RichField + Extendable<D>, const D: usize>(
     let skeleton_rows = generate_cpu_skeleton_trace(record);
     let add_rows = ops::add::generate(record);
     let blt_taken_rows = ops::blt_taken::generate(record);
+    let store_word_rows = ops::sw::generate(&record.executed);
+    let load_word_rows = ops::lw::generate(&record.executed);
     let xor_rows = generate_xor_trace(&cpu_rows);
     let shift_amount_rows = generate_shift_amount_trace(&cpu_rows);
     let program_rows = generate_program_rom_trace(program);
@@ -78,7 +81,6 @@ pub fn generate_traces<F: RichField + Extendable<D>, const D: usize>(
     let memory_zeroinit_rows = generate_memory_zero_init_trace(&record.executed, program);
 
     let halfword_memory_rows = generate_halfword_memory_trace(&record.executed);
-    let fullword_memory_rows = generate_fullword_memory_trace(&record.executed);
     let private_tape_rows = generate_private_tape_trace(&record.executed);
     let public_tape_rows = generate_public_tape_trace(&record.executed);
     let call_tape_rows = generate_call_tape_trace(&record.executed);
@@ -95,7 +97,8 @@ pub fn generate_traces<F: RichField + Extendable<D>, const D: usize>(
         &memory_init,
         &memory_zeroinit_rows,
         &halfword_memory_rows,
-        &fullword_memory_rows,
+        &store_word_rows,
+        &load_word_rows,
         &private_tape_rows,
         &public_tape_rows,
         &call_tape_rows,
@@ -112,6 +115,8 @@ pub fn generate_traces<F: RichField + Extendable<D>, const D: usize>(
         generate_register_trace(
             &cpu_rows,
             &add_rows,
+            &store_word_rows,
+            &load_word_rows,
             &blt_taken_rows,
             &poseiden2_sponge_rows,
             &private_tape_rows,
@@ -128,6 +133,8 @@ pub fn generate_traces<F: RichField + Extendable<D>, const D: usize>(
         &cpu_rows,
         &add_rows,
         &blt_taken_rows,
+        &store_word_rows,
+        &load_word_rows,
         &memory_rows,
         &register_rows,
     );
@@ -136,6 +143,8 @@ pub fn generate_traces<F: RichField + Extendable<D>, const D: usize>(
     let rangecheck_u8_rows = generate_rangecheck_u8_trace(&rangecheck_rows, &memory_rows);
     let add_trace = ops::add::generate(record);
     let blt_trace = ops::blt_taken::generate(record);
+    let store_word_trace = ops::sw::generate(&record.executed);
+    let load_word_trace = ops::lw::generate(&record.executed);
     let tape_commitments_rows = generate_tape_commitments_trace(record);
 
     TableKindSetBuilder {
@@ -150,7 +159,6 @@ pub fn generate_traces<F: RichField + Extendable<D>, const D: usize>(
         memory_zeroinit_stark: trace_rows_to_poly_values(memory_zeroinit_rows),
         rangecheck_u8_stark: trace_rows_to_poly_values(rangecheck_u8_rows),
         halfword_memory_stark: trace_rows_to_poly_values(halfword_memory_rows),
-        fullword_memory_stark: trace_rows_to_poly_values(fullword_memory_rows),
         private_tape_stark: trace_rows_to_poly_values(private_tape_rows),
         public_tape_stark: trace_rows_to_poly_values(public_tape_rows),
         call_tape_stark: trace_rows_to_poly_values(call_tape_rows),
@@ -168,6 +176,8 @@ pub fn generate_traces<F: RichField + Extendable<D>, const D: usize>(
         cpu_skeleton_stark: trace_rows_to_poly_values(skeleton_rows),
         add_stark: trace_rows_to_poly_values(add_trace),
         blt_taken_stark: trace_rows_to_poly_values(blt_trace),
+        store_word_stark: trace_rows_to_poly_values(store_word_trace),
+        load_word_stark: trace_rows_to_poly_values(load_word_trace),
         tape_commitments_stark: trace_rows_to_poly_values(tape_commitments_rows),
     }
     .build()

circuits/src/lib.rs

@@ -16,7 +16,6 @@ pub mod generation;
 pub mod linear_combination;
 pub mod linear_combination_typed;
 pub mod memory;
-pub mod memory_fullword;
 pub mod memory_halfword;
 pub mod memory_zeroinit;
 pub mod memoryinit;

circuits/src/memory/columns.rs

@@ -7,10 +7,11 @@ use plonky2::hash::poseidon2::Poseidon2Permutation;
 
 use crate::columns_view::{columns_view_impl, make_col_map};
 use crate::cross_table_lookup::Column;
-use crate::memory_fullword::columns::FullWordMemory;
 use crate::memory_halfword::columns::HalfWordMemory;
 use crate::memory_zeroinit::columns::MemoryZeroInit;
 use crate::memoryinit::columns::{MemoryInit, MemoryInitCtl};
+use crate::ops::lw::columns::LoadWord;
+use crate::ops::sw::columns::StoreWord;
 use crate::poseidon2_output_bytes::columns::{Poseidon2OutputBytes, BYTES_COUNT};
 use crate::poseidon2_sponge::columns::Poseidon2Sponge;
 use crate::rangecheck::columns::RangeCheckCtl;
@@ -97,18 +98,35 @@ impl<F: RichField> From<&HalfWordMemory<F>> for Vec<Memory<F>> {
     }
 }
 
-impl<F: RichField> From<&FullWordMemory<F>> for Vec<Memory<F>> {
-    fn from(val: &FullWordMemory<F>) -> Self {
-        if (val.ops.is_load + val.ops.is_store).is_zero() {
+impl<F: RichField> From<&StoreWord<F>> for Vec<Memory<F>> {
+    fn from(val: &StoreWord<F>) -> Self {
+        if (val.is_running).is_zero() {
             vec![]
         } else {
-            izip!(val.addrs, val.limbs)
-                .map(|(addr, value)| Memory {
+            izip!(0.., val.op1_limbs)
+                .map(|(i, limb)| Memory {
                     clk: val.clk,
-                    addr,
+                    addr: val.address + F::from_canonical_u8(i),
+                    value: limb,
+                    is_store: F::ONE,
+                    ..Default::default()
+                })
+                .collect()
+        }
+    }
+}
+
+impl<F: RichField> From<&LoadWord<F>> for Vec<Memory<F>> {
+    fn from(val: &LoadWord<F>) -> Self {
+        if (val.is_running).is_zero() {
+            vec![]
+        } else {
+            izip!(0.., val.dst_limbs)
+                .map(|(i, value)| Memory {
+                    clk: val.clk,
+                    addr: val.address + F::from_canonical_u8(i),
                     value,
-                    is_store: val.ops.is_store,
-                    is_load: val.ops.is_load,
+                    is_load: F::ONE,
                     ..Default::default()
                 })
                 .collect()

circuits/src/memory/generation.rs

@@ -8,10 +8,11 @@ use plonky2::hash::hash_types::RichField;
 use crate::generation::MIN_TRACE_LENGTH;
 use crate::memory::columns::Memory;
 use crate::memory::trace::{get_memory_inst_addr, get_memory_inst_clk, get_memory_raw_value};
-use crate::memory_fullword::columns::FullWordMemory;
 use crate::memory_halfword::columns::HalfWordMemory;
 use crate::memory_zeroinit::columns::MemoryZeroInit;
 use crate::memoryinit::columns::MemoryInit;
+use crate::ops::lw::columns::LoadWord;
+use crate::ops::sw::columns::StoreWord;
 use crate::poseidon2_output_bytes::columns::Poseidon2OutputBytes;
 use crate::poseidon2_sponge::columns::Poseidon2Sponge;
 use crate::storage_device::columns::StorageDevice;
@@ -115,12 +116,16 @@ pub fn transform_poseidon2_output_bytes<F: RichField>(
 ///
 /// These need to be further interleaved with runtime memory trace generated
 /// from VM execution for final memory trace.
-pub fn transform_fullword<F: RichField>(
-    fullword_memory: &[FullWordMemory<F>],
+pub fn transform_sw<F: RichField>(
+    store_word: &[StoreWord<F>],
 ) -> impl Iterator<Item = Memory<F>> + '_ {
-    fullword_memory
-        .iter()
-        .flat_map(Into::<Vec<Memory<F>>>::into)
+    store_word.iter().flat_map(Into::<Vec<Memory<F>>>::into)
+}
+
+pub fn transform_lw<F: RichField>(
+    load_word: &[LoadWord<F>],
+) -> impl Iterator<Item = Memory<F>> + '_ {
+    load_word.iter().flat_map(Into::<Vec<Memory<F>>>::into)
 }
 
 /// Generates Memory trace from a storage device table.
@@ -153,7 +158,8 @@ pub fn generate_memory_trace<F: RichField>(
     memory_init_rows: &[MemoryInit<F>],
     memory_zeroinit_rows: &[MemoryZeroInit<F>],
     halfword_memory_rows: &[HalfWordMemory<F>],
-    fullword_memory_rows: &[FullWordMemory<F>],
+    store_word_rows: &[StoreWord<F>],
+    load_word_rows: &[LoadWord<F>],
     private_tape_rows: &[StorageDevice<F>],
     public_tape_rows: &[StorageDevice<F>],
     call_tape_rows: &[StorageDevice<F>],
@@ -172,7 +178,8 @@ pub fn generate_memory_trace<F: RichField>(
         transform_memory_zero_init(memory_zeroinit_rows),
         generate_memory_trace_from_execution(step_rows),
         transform_halfword(halfword_memory_rows),
-        transform_fullword(fullword_memory_rows),
+        transform_sw(store_word_rows),
+        transform_lw(load_word_rows),
         transform_storage(private_tape_rows),
         transform_storage(public_tape_rows),
         transform_storage(call_tape_rows),
@@ -218,10 +225,10 @@ mod tests {
     use crate::memory::columns::Memory;
     use crate::memory::stark::MemoryStark;
     use crate::memory::test_utils::memory_trace_test_case;
-    use crate::memory_fullword::generation::generate_fullword_memory_trace;
     use crate::memory_halfword::generation::generate_halfword_memory_trace;
     use crate::memory_zeroinit::generation::generate_memory_zero_init_trace;
     use crate::memoryinit::generation::generate_memory_init_trace;
+    use crate::ops;
     use crate::poseidon2_output_bytes::generation::generate_poseidon2_output_bytes_trace;
     use crate::poseidon2_sponge::generation::generate_poseidon2_sponge_trace;
     use crate::stark::utils::trace_rows_to_poly_values;
@@ -282,7 +289,9 @@ mod tests {
         let memory_zeroinit_rows = generate_memory_zero_init_trace(&record.executed, &program);
 
         let halfword_memory = generate_halfword_memory_trace(&record.executed);
-        let fullword_memory = generate_fullword_memory_trace(&record.executed);
+        let store_word_rows = ops::sw::generate(&record.executed);
+        let load_word_rows = ops::lw::generate(&record.executed
+        );
         let private_tape_rows = generate_private_tape_trace(&record.executed);
         let public_tape_rows = generate_public_tape_trace(&record.executed);
 
@@ -299,7 +308,8 @@ mod tests {
             &memory_init,
             &memory_zeroinit_rows,
             &halfword_memory,
-            &fullword_memory,
+            &store_word_rows,
+            &load_word_rows,
             &private_tape_rows,
             &public_tape_rows,
             &call_tape_rows,
@@ -374,7 +384,8 @@ mod tests {
         let memory_zeroinit_rows = generate_memory_zero_init_trace(&[], &program);
 
         let halfword_memory = generate_halfword_memory_trace(&[]);
-        let fullword_memory = generate_fullword_memory_trace(&[]);
+        let store_word_rows = ops::sw::generate(&[]);
+        let load_word_rows = ops::lw::generate(&[]);
         let private_tape_rows = generate_private_tape_trace(&[]);
         let public_tape_rows = generate_public_tape_trace(&[]);
         let call_tape_rows = generate_call_tape_trace(&[]);
@@ -390,7 +401,8 @@ mod tests {
             &memory_init,
             &memory_zeroinit_rows,
             &halfword_memory,
-            &fullword_memory,
+            &store_word_rows,
+            &load_word_rows,
             &private_tape_rows,
             &public_tape_rows,
             &call_tape_rows,