WIP: integration test

.github/workflows/integration.yml

@@ -57,3 +57,8 @@ jobs:
         env:
           RAYON_NUM_THREADS: 2
         run: cargo run --package ceno_zkvm --example riscv_opcodes --target ${{ matrix.target }} -- --start 10 --end 11
+
+      - name: Run fibonacci
+        env:
+          RAYON_NUM_THREADS: 2
+        run: cargo run --package ceno_zkvm --example fibonacci_elf --target ${{ matrix.target }} -- 

Cargo.toml

@@ -26,6 +26,8 @@ crossbeam-channel = "0.5"
 ff = "0.13"
 goldilocks = { git = "https://github.com/scroll-tech/ceno-Goldilocks" }
 itertools = "0.13"
+num-derive = "0.4"
+num-traits = "0.2"
 paste = "1"
 plonky2 = "0.2"
 poseidon = { path = "./poseidon" }

ceno_emul/Cargo.toml

@@ -7,6 +7,8 @@ version.workspace = true
 [dependencies]
 anyhow = { version = "1.0", default-features = false }
 elf = "0.7"
+num-derive.workspace = true
+num-traits.workspace = true
 strum.workspace = true
 strum_macros.workspace = true
 tracing.workspace = true

ceno_emul/src/elf.rs

@@ -89,13 +89,6 @@ impl Program {
             .filter(|x| x.p_type == elf::abi::PT_LOAD)
             .enumerate()
         {
-            tracing::debug!(
-                "loadable segement {}: PF_R={}, PF_W={}, PF_X={}",
-                idx,
-                segment.p_flags & PF_R != 0,
-                segment.p_flags & PF_W != 0,
-                segment.p_flags & PF_X != 0,
-            );
             let file_size: u32 = segment
                 .p_filesz
                 .try_into()
@@ -114,7 +107,8 @@ impl Program {
                 .p_vaddr
                 .try_into()
                 .map_err(|err| anyhow!("vaddr is larger than 32 bits. {err}"))?;
-            if (segment.p_flags & PF_X) != 0 {
+            let p_flags = segment.p_flags;
+            if (p_flags & PF_X) != 0 {
                 if base_address.is_none() {
                     base_address = Some(vaddr);
                 } else {
@@ -124,6 +118,12 @@ impl Program {
             if vaddr % WORD_SIZE as u32 != 0 {
                 bail!("vaddr {vaddr:08x} is unaligned");
             }
+            tracing::debug!(
+                "ELF segment {idx}: {}{}{} vaddr=0x{vaddr:08x} file_size={file_size} mem_size={mem_size}",
+                if p_flags & PF_R != 0 { "R" } else { "-" },
+                if p_flags & PF_W != 0 { "W" } else { "-" },
+                if p_flags & PF_X != 0 { "X" } else { "-" },
+            );
             let offset: u32 = segment
                 .p_offset
                 .try_into()

ceno_emul/src/platform.rs

@@ -40,11 +40,11 @@ impl Platform {
 
     // TODO figure out proper region for program_data
     pub const fn program_data_start(&self) -> Addr {
-        0x3000_0000
+        0x4000_0000
     }
 
     pub const fn program_data_end(&self) -> Addr {
-        0x3000_1000 - 1
+        0x5000_0000 - 1
     }
 
     // TODO figure out a proper region for public io

ceno_emul/src/rv32im.rs

@@ -15,6 +15,7 @@
 // limitations under the License.
 
 use anyhow::{Result, anyhow};
+use num_derive::ToPrimitive;
 use std::sync::OnceLock;
 use strum_macros::EnumIter;
 
@@ -132,7 +133,7 @@ pub enum InsnFormat {
 }
 use InsnFormat::*;
 
-#[derive(Clone, Copy, Debug, PartialEq, EnumIter)]
+#[derive(Clone, Copy, Debug, PartialEq, Eq, PartialOrd, Ord, EnumIter, ToPrimitive)]
 #[allow(clippy::upper_case_acronyms)]
 pub enum InsnKind {
     INVALID,

ceno_emul/src/vm_state.rs

@@ -53,16 +53,7 @@ impl VMState {
 
     pub fn new_from_elf(platform: Platform, elf: &[u8]) -> Result<Self> {
         let program = Program::load_elf(elf, u32::MAX)?;
-        let state = Self::new(platform, program);
-
-        if state.program.base_address != state.platform.rom_start() {
-            return Err(anyhow!(
-                "Invalid base_address {:x}",
-                state.program.base_address
-            ));
-        }
-
-        Ok(state)
+        Ok(Self::new(platform, program))
     }
 
     pub fn halted(&self) -> bool {
@@ -73,6 +64,10 @@ impl VMState {
         &self.tracer
     }
 
+    pub fn platform(&self) -> &Platform {
+        &self.platform
+    }
+
     pub fn program(&self) -> &Program {
         self.program.deref()
     }

ceno_zkvm/Cargo.toml

@@ -22,6 +22,7 @@ sumcheck = { version = "0", path = "../sumcheck" }
 transcript = { path = "../transcript" }
 
 itertools.workspace = true
+num-traits.workspace = true
 paste.workspace = true
 prettytable-rs.workspace = true
 strum.workspace = true