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

Jump to bottom

fix: memory not added to checkpoint in unconstrained mode #1436

Merged
merged 4 commits into from
Aug 29, 2024
Merged

fix: memory not added to checkpoint in unconstrained mode #1436

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7dbf00d
fix
ctian1 Aug 29, 2024
c895615
tweaks
ctian1 Aug 29, 2024
a7dbec8
fix: unconstrained memory checkpoint
ctian1 Aug 29, 2024
a9f8dc3
comment
ctian1 Aug 29, 2024
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
33 changes: 23 additions & 10 deletions crates/core/executor/src/executor.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,6 +144,10 @@ pub enum ExecutionError {
/// The execution failed with an unimplemented feature.
#[error("got unimplemented as opcode")]
Unimplemented(),

/// The program ended in unconstrained mode.
#[error("program ended in unconstrained mode")]
EndInUnconstrained(),
}

macro_rules! assert_valid_memory_access {
Expand Down Expand Up @@ -253,7 +257,10 @@ impl<'a> Executor<'a> {
let addr = Register::from_u32(i as u32) as u32;
let record = self.state.memory.get(&addr);

if self.executor_mode != ExecutorMode::Simple {
// Only add the previous memory state to checkpoint map if we're in checkpoint mode,
// or if we're in unconstrained mode. In unconstrained mode, the mode is always
// Simple.
if self.executor_mode == ExecutorMode::Checkpoint || self.unconstrained {
match record {
Some(record) => {
self.memory_checkpoint.entry(addr).or_insert_with(|| Some(*record));
Expand All @@ -278,7 +285,7 @@ impl<'a> Executor<'a> {
let addr = register as u32;
let record = self.state.memory.get(&addr);

if self.executor_mode != ExecutorMode::Simple {
if self.executor_mode == ExecutorMode::Checkpoint || self.unconstrained {
match record {
Some(record) => {
self.memory_checkpoint.entry(addr).or_insert_with(|| Some(*record));
Expand All @@ -301,7 +308,7 @@ impl<'a> Executor<'a> {
#[allow(clippy::single_match_else)]
let record = self.state.memory.get(&addr);

if self.executor_mode != ExecutorMode::Simple {
if self.executor_mode == ExecutorMode::Checkpoint || self.unconstrained {
match record {
Some(record) => {
self.memory_checkpoint.entry(addr).or_insert_with(|| Some(*record));
Expand Down Expand Up @@ -349,7 +356,7 @@ impl<'a> Executor<'a> {
pub fn mr(&mut self, addr: u32, shard: u32, timestamp: u32) -> MemoryReadRecord {
// Get the memory record entry.
let entry = self.state.memory.entry(addr);
if self.executor_mode != ExecutorMode::Simple {
if self.executor_mode == ExecutorMode::Checkpoint || self.unconstrained {
match entry {
Entry::Occupied(ref entry) => {
let record = entry.get();
Expand Down Expand Up @@ -394,7 +401,7 @@ impl<'a> Executor<'a> {
pub fn mw(&mut self, addr: u32, value: u32, shard: u32, timestamp: u32) -> MemoryWriteRecord {
// Get the memory record entry.
let entry = self.state.memory.entry(addr);
if self.executor_mode != ExecutorMode::Simple {
if self.executor_mode == ExecutorMode::Checkpoint || self.unconstrained {
match entry {
Entry::Occupied(ref entry) => {
let record = entry.get();
Expand Down Expand Up @@ -686,7 +693,7 @@ impl<'a> Executor<'a> {
let (addr, memory_read_value): (u32, u32);
let mut memory_store_value: Option<u32> = None;

if self.executor_mode != ExecutorMode::Simple {
if self.executor_mode == ExecutorMode::Trace {
self.memory_accesses = MemoryAccessRecord::default();
}
let lookup_id = if self.executor_mode == ExecutorMode::Simple {
Expand Down Expand Up @@ -1126,8 +1133,14 @@ impl<'a> Executor<'a> {
}
}

Ok(self.state.pc.wrapping_sub(self.program.pc_base)
>= (self.program.instructions.len() * 4) as u32)
let done = self.state.pc == 0
|| self.state.pc.wrapping_sub(self.program.pc_base)
>= (self.program.instructions.len() * 4) as u32;
if done && self.unconstrained {
log::error!("program ended in unconstrained mode at clk {}", self.state.global_clk);
return Err(ExecutionError::EndInUnconstrained());
}
Ok(done)
}

/// Bump the record.
Expand Down Expand Up @@ -1163,7 +1176,7 @@ impl<'a> Executor<'a> {
self.executor_mode = ExecutorMode::Checkpoint;
self.print_report = true;

// Take memory out and then clone so that memory is not cloned.
// Take memory out of state before cloning it so that memory is not cloned.
let memory = std::mem::take(&mut self.state.memory);
let mut checkpoint = tracing::info_span!("clone").in_scope(|| self.state.clone());
self.state.memory = memory;
Expand Down Expand Up @@ -1354,7 +1367,7 @@ impl<'a> Executor<'a> {

self.report.touched_memory_addresses = self.state.memory.len() as u64;
for addr in self.state.memory.keys() {
if addr == &0 {
if *addr == 0 {
// Handled above.
continue;
}
Expand Down
Loading