Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

✨ EVM Diff tests #14

Merged
merged 4 commits into from
Sep 23, 2023
Merged

✨ EVM Diff tests #14

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
fb732b0
✨ EVM Diff tests
clabby Sep 23, 2023
84ba1ee
♻️ Make `Address` 32 bits
clabby Sep 23, 2023
40ddd86
🛠️ Add oracle tests to EVM diff tests
clabby Sep 23, 2023
7a4b933
🛠️ Add rest of EVM tests
clabby Sep 23, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions crates/mipsevm/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,20 +7,20 @@ version.workspace = true
authors.workspace = true

[dependencies]
preimage-oracle = { path = "../preimage" }
alloy-primitives = "0.3.3"
alloy-sol-types = "0.3.2"
once_cell = "1.18.0"
serde = { version = "1.0.188", features = ["derive"] }
serde_json = "1.0.106"
fnv = "1.0.7"
revm = { version = "3.3.0", features = ["no_gas_measuring"] }
preimage-oracle = { path = "../preimage" }

# misc
anyhow = "1.0.75"
tracing = { version = "0.1.37", optional = true }

[dev-dependencies]
revm = { version = "3.3.0", features = ["no_gas_measuring"] }
rand = "0.8.5"
criterion = { version = "0.5.1", features = ["html_reports"] }

Expand Down
2 changes: 0 additions & 2 deletions crates/mipsevm/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,5 @@ pub use types::{Address, Fd, Gindex, Page, PageIndex, StateWitness, VMStatus};
mod mips;
pub use mips::InstrumentedState;

mod evm;

#[cfg(test)]
mod test_utils;
30 changes: 15 additions & 15 deletions crates/mipsevm/src/memory.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,13 +61,13 @@ impl Memory {
}

// Find the page and invalidate the address within it.
match self.page_lookup(address >> page::PAGE_ADDRESS_SIZE) {
match self.page_lookup(address as u64 >> page::PAGE_ADDRESS_SIZE) {
Some(page) => {
let mut page = page.borrow_mut();
let prev_valid = !page.is_valid(1);

// Invalidate the address within the page.
page.invalidate(address & page::PAGE_ADDRESS_MASK as u64)?;
page.invalidate(address & page::PAGE_ADDRESS_MASK as u32)?;

// If the page was already invalid before, then nodes to the memory
// root will also still be invalid.
Expand All @@ -82,7 +82,7 @@ impl Memory {
}

// Find the generalized index of the first page covering the address
let mut g_index = ((1u64 << 32) | address) >> page::PAGE_ADDRESS_SIZE as u64;
let mut g_index = ((1u64 << 32) | address as u64) >> page::PAGE_ADDRESS_SIZE;
// Invalidate all nodes in the branch
while g_index > 0 {
self.nodes.insert(g_index, None);
Expand Down Expand Up @@ -236,7 +236,7 @@ impl Memory {
anyhow::bail!("Unaligned memory access: {:x}", address);
}

let page_index = address >> page::PAGE_ADDRESS_SIZE as u64;
let page_index = address as PageIndex >> page::PAGE_ADDRESS_SIZE as u64;
let page_address = address as usize & page::PAGE_ADDRESS_MASK;

// Attempt to look up the page.
Expand Down Expand Up @@ -271,7 +271,7 @@ impl Memory {
anyhow::bail!("Unaligned memory access: {:x}", address);
}

match self.page_lookup(address >> page::PAGE_ADDRESS_SIZE as u64) {
match self.page_lookup(address as u64 >> page::PAGE_ADDRESS_SIZE as u64) {
Some(page) => {
let page_address = address as usize & page::PAGE_ADDRESS_MASK;
Ok(u32::from_be_bytes(
Expand Down Expand Up @@ -313,7 +313,7 @@ impl Memory {
let mut address = address;
let mut data = data;
loop {
let page_index = address >> page::PAGE_ADDRESS_SIZE as u64;
let page_index = address as PageIndex >> page::PAGE_ADDRESS_SIZE as u64;
let page_address = address as usize & page::PAGE_ADDRESS_MASK;

let page = self
Expand All @@ -327,7 +327,7 @@ impl Memory {
if n == 0 {
return Ok(());
}
address += n as u64;
address += n as u32;
}
Err(e) => return Err(e.into()),
};
Expand All @@ -338,11 +338,11 @@ impl Memory {
pub struct MemoryReader {
memory: Rc<RefCell<Memory>>,
address: Address,
count: u64,
count: u32,
}

impl MemoryReader {
pub fn new(memory: Rc<RefCell<Memory>>, address: Address, count: u64) -> Self {
pub fn new(memory: Rc<RefCell<Memory>>, address: Address, count: u32) -> Self {
Self {
memory,
address,
Expand All @@ -357,13 +357,13 @@ impl Read for MemoryReader {
return Ok(0);
}

let end_address = self.address + self.count;
let end_address = self.address + self.count as Address;

let page_index = self.address >> page::PAGE_ADDRESS_SIZE as u64;
let page_index = self.address as PageIndex >> page::PAGE_ADDRESS_SIZE as u64;
let start = self.address as usize & page::PAGE_ADDRESS_MASK;
let mut end = page::PAGE_SIZE;

if page_index == (end_address >> page::PAGE_ADDRESS_SIZE as u64) {
if page_index == (end_address as u64 >> page::PAGE_ADDRESS_SIZE as u64) {
end = end_address as usize & page::PAGE_ADDRESS_MASK;
}
let n = end - start;
Expand All @@ -377,8 +377,8 @@ impl Read for MemoryReader {
std::io::copy(&mut vec![0; n].as_slice(), &mut buf)?;
}
};
self.address += n as u64;
self.count -= n as u64;
self.address += n as u32;
self.count -= n as u32;
Ok(n)
}
}
Expand Down Expand Up @@ -578,7 +578,7 @@ mod test {
.expect("Should not error");

let mut reader =
MemoryReader::new(Rc::clone(&memory), 0x1337 - 10, data.len() as u64 + 20);
MemoryReader::new(Rc::clone(&memory), 0x1337 - 10, data.len() as u32 + 20);
let mut buf = Vec::with_capacity(1260);
reader.read_to_end(&mut buf).unwrap();

Expand Down
10 changes: 2 additions & 8 deletions crates/mipsevm/src/mips/instrumented.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ where
/// - Err(_): An error occurred while processing the instruction step in the MIPS emulator.
pub fn step(&mut self, proof: bool) -> Result<Option<StepWitness>> {
self.mem_proof_enabled = proof;
self.last_mem_access = !0u32 as u64;
self.last_mem_access = !0u32 as Address;
self.last_preimage_offset = !0u32;

let mut witness = None;
Expand Down Expand Up @@ -107,14 +107,9 @@ where
mod test {
use crate::test_utils::StaticOracle;

/// Used in tests to write the results to
const BASE_ADDR_END: u32 = 0xBF_FF_FF_F0;

/// Used as the return-address for tests
const END_ADDR: u32 = 0xA7_EF_00_D0;

mod open_mips {
use super::*;
use crate::test_utils::{BASE_ADDR_END, END_ADDR};
use crate::{Address, InstrumentedState, Memory, State};
use std::{
cell::RefCell,
Expand All @@ -125,7 +120,6 @@ mod test {
};

#[test]
// #[ignore]
fn open_mips_tests() {
let tests_path = PathBuf::from(std::env::current_dir().unwrap())
.join("open_mips_tests")
Expand Down
21 changes: 7 additions & 14 deletions crates/mipsevm/src/mips/mips_vm.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@ where
/// - `Err(_)`: An error occurred while fetching the preimage.
pub(crate) fn read_preimage(&mut self, key: B256, offset: u32) -> Result<(B256, usize)> {
if key != self.last_preimage_key {
self.last_preimage_key = key;
let data = self.preimage_oracle.get(key)?;
self.last_preimage_key = key;

// Add the length prefix to the preimage
// Resizes the `last_preimage` vec in-place to reduce reallocations.
Expand Down Expand Up @@ -214,7 +214,7 @@ where
let mut v0 = 0;
let mut v1 = 0;

let (a0, a1, a2) = (
let (a0, a1, mut a2) = (
self.state.registers[4],
self.state.registers[5],
self.state.registers[6],
Expand Down Expand Up @@ -298,11 +298,8 @@ where
},
Syscall::Write => match (a0 as u8).try_into() {
Ok(fd @ (Fd::Stdout | Fd::StdErr)) => {
let mut reader = MemoryReader::new(
Rc::clone(&self.state.memory),
a1 as Address,
a2 as u64,
);
let mut reader =
MemoryReader::new(Rc::clone(&self.state.memory), a1 as Address, a2);
let writer: &mut dyn Write = if matches!(fd, Fd::Stdout) {
&mut self.std_out
} else {
Expand All @@ -312,14 +309,11 @@ where
v0 = a2;
}
Ok(Fd::HintWrite) => {
let mut reader = MemoryReader::new(
Rc::clone(&self.state.memory),
a1 as Address,
a2 as u64,
);
let mut reader =
MemoryReader::new(Rc::clone(&self.state.memory), a1 as Address, a2);
let mut hint_data = Vec::with_capacity(a2 as usize);
reader.read_to_end(&mut hint_data)?;
self.state.last_hint.extend_from_slice(hint_data.as_slice());
self.state.last_hint.extend(hint_data);

// Continue processing while there is enough data to check if there are any
// hints.
Expand Down Expand Up @@ -351,7 +345,6 @@ where
let alignment = a1 & 0x3;
let space = 4 - alignment;

let mut a2 = a2;
if space < a2 {
a2 = space;
}
Expand Down
2 changes: 1 addition & 1 deletion crates/mipsevm/src/page.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ impl CachedPage {
/// ### Returns
/// - A [Result] indicating if the operation was successful.
pub fn invalidate(&mut self, page_addr: Address) -> Result<()> {
if page_addr >= PAGE_SIZE as u64 {
if page_addr >= PAGE_SIZE as Address {
anyhow::bail!("Invalid page address: {}", page_addr);
}

Expand Down
2 changes: 1 addition & 1 deletion crates/mipsevm/src/state.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ use anyhow::Result;
///
/// The [State] by itself does not contain functionality for performing instruction steps
/// or executing the MIPS emulator. For this, use the [crate::InstrumentedState] struct.
#[derive(Debug, Default)]
#[derive(Clone, Debug, Default)]
pub struct State {
/// The [Memory] of the emulated MIPS thread context.
pub memory: Rc<RefCell<Memory>>,
Expand Down
Loading
Loading