fix(new-execution): fix some rv32im loadstore tests (#1611)

- fix some loadstore tests
- remove records
- wrap unsafe memory read/writes into safe wrappers

---------

Co-authored-by: Jonathan Wang <[email protected]>

Author: shuklaayush

benchmarks/execute/src/main.rs

@@ -18,10 +18,10 @@ enum BuildProfile {
 // const DEFAULT_APP_CONFIG_PATH: &str = "./openvm.toml";
 
 static AVAILABLE_PROGRAMS: &[&str] = &[
-    // "fibonacci_recursive",
-    // "fibonacci_iterative",
+    "fibonacci_recursive",
+    "fibonacci_iterative",
     "quicksort",
-    // "bubblesort",
+    "bubblesort",
     // "pairing",
     // "keccak256",
     // "keccak256_iter",

crates/toolchain/tests/Cargo.toml

@@ -8,11 +8,15 @@ homepage.workspace = true
 repository.workspace = true
 
 [dependencies]
+openvm-build.workspace = true
+openvm-transpiler.workspace = true
+eyre.workspace = true
+tempfile.workspace = true
+
+[dev-dependencies]
 openvm-stark-backend.workspace = true
 openvm-stark-sdk.workspace = true
 openvm-circuit = { workspace = true, features = ["test-utils"] }
-openvm-transpiler.workspace = true
-openvm-build.workspace = true
 openvm-algebra-transpiler.workspace = true
 openvm-bigint-circuit.workspace = true
 openvm-rv32im-circuit.workspace = true
@@ -21,10 +25,7 @@ openvm-algebra-circuit.workspace = true
 openvm-ecc-guest = { workspace = true, features = ["halo2curves", "k256"] }
 openvm-instructions = { workspace = true }
 openvm-platform = { workspace = true }
-
-eyre.workspace = true
 test-case.workspace = true
-tempfile.workspace = true
 serde = { workspace = true, features = ["alloc"] }
 derive_more = { workspace = true, features = ["from"] }
 

crates/toolchain/tests/src/utils.rs

@@ -144,7 +144,7 @@ pub fn ins_executor_e1_executor_derive(input: TokenStream) -> TokenStream {
                 impl #impl_generics ::openvm_circuit::arch::InsExecutorE1<F> for #name #ty_generics #where_clause {
                     fn execute_e1<Mem, Ctx>(
                         &mut self,
-                        state: ::openvm_circuit::arch::execution::VmStateMut<Mem, Ctx>,
+                        state: ::openvm_circuit::arch::VmStateMut<Mem, Ctx>,
                         instruction: &::openvm_circuit::arch::instructions::instruction::Instruction<F>,
                     ) -> ::openvm_circuit::arch::Result<()>
                     where
@@ -192,7 +192,7 @@ pub fn ins_executor_e1_executor_derive(input: TokenStream) -> TokenStream {
                 impl #impl_generics ::openvm_circuit::arch::InsExecutorE1<#first_ty_generic> for #name #ty_generics {
                     fn execute_e1<Mem, Ctx>(
                         &mut self,
-                        state: ::openvm_circuit::arch::execution::VmStateMut<Mem, Ctx>,
+                        state: ::openvm_circuit::arch::VmStateMut<Mem, Ctx>,
                         instruction: &::openvm_circuit::arch::instructions::instruction::Instruction<#first_ty_generic>,
                     ) -> ::openvm_circuit::arch::Result<()>
                     where

crates/vm/derive/src/lib.rs

@@ -1,7 +1,7 @@
 mod config;
 /// Instruction execution traits and types.
 /// Execution bus and interface.
-pub mod execution;
+mod execution;
 /// Module for controlling VM execution flow, including segmentation and instruction execution
 pub mod execution_control;
 /// Traits and builders to compose collections of chips into a virtual machine.

crates/vm/src/arch/mod.rs

@@ -40,7 +40,7 @@ impl<F: PrimeField32> MemoryTester<F> {
         let controller = &mut self.controller;
         let t = controller.memory.timestamp();
         // TODO: hack
-        let (t_prev, data) = if addr_space <= 2 {
+        let (t_prev, data) = if addr_space <= 3 {
             let (t_prev, data) = unsafe {
                 controller
                     .memory
@@ -73,7 +73,7 @@ impl<F: PrimeField32> MemoryTester<F> {
         let controller = &mut self.controller;
         let t = controller.memory.timestamp();
         // TODO: hack
-        let (t_prev, data_prev) = if addr_space <= 2 {
+        let (t_prev, data_prev) = if addr_space <= 3 {
             let (t_prev, data_prev) = unsafe {
                 controller.memory.write::<u8, N, 4>(
                     addr_space as u32,

crates/vm/src/arch/testing/memory/mod.rs

@@ -330,6 +330,7 @@ where
 
             let mut segment = E1VmSegmentExecutor::new(
                 &self.config,
+                // TODO(ayush): avoid clones
                 exe.program.clone(),
                 state.input,
                 Some(state.memory),

crates/vm/src/arch/vm.rs

@@ -145,7 +145,7 @@ impl TracingMemory {
             let num_cells = paged_vec.bytes_capacity() / cell_size;
 
             // TMP: hardcoding for now
-            if i <= 3 {
+            if i < 3 {
                 min_block_size.push(4);
             } else {
                 min_block_size.push(1);

crates/vm/src/system/memory/online.rs

@@ -303,7 +303,7 @@ impl<const PAGE_SIZE: usize> AddressMap<PAGE_SIZE> {
         debug_assert_ne!(addr_space, 0);
         // TODO: fix this
         unsafe {
-            if addr_space <= 2 {
+            if addr_space <= 3 {
                 F::from_canonical_u8(self.get::<u8>((addr_space, ptr)))
             } else {
                 self.get::<F>((addr_space, ptr))

crates/vm/src/system/memory/paged_vec.rs

@@ -11,6 +11,7 @@ use crate::{
     },
 };
 
+pub const PUBLIC_VALUES_AS: u32 = 3;
 pub const PUBLIC_VALUES_ADDRESS_SPACE_OFFSET: u32 = 2;
 
 /// Merkle proof for user public values in the memory state.