From a98f267ff098ce380e0b9aab27b8b1977920e1c5 Mon Sep 17 00:00:00 2001 From: Nicholas Ward Date: Thu, 7 Jul 2022 09:27:50 -0700 Subject: [PATCH 01/20] initial change --- evm/src/all_stark.rs | 37 ++++++++++++---------------------- evm/src/cpu/cpu_stark.rs | 8 +++++++- evm/src/memory/memory_stark.rs | 3 ++- 3 files changed, 22 insertions(+), 26 deletions(-) diff --git a/evm/src/all_stark.rs b/evm/src/all_stark.rs index d1f993cd..27751a5d 100644 --- a/evm/src/all_stark.rs +++ b/evm/src/all_stark.rs @@ -119,7 +119,7 @@ mod tests { use anyhow::Result; use itertools::{izip, Itertools}; use plonky2::field::polynomial::PolynomialValues; - use plonky2::field::types::Field; + use plonky2::field::types::{Field, PrimeField64}; use plonky2::iop::witness::PartialWitness; use plonky2::plonk::circuit_builder::CircuitBuilder; use plonky2::plonk::circuit_data::CircuitConfig; @@ -133,7 +133,6 @@ mod tests { use crate::keccak::keccak_stark::{KeccakStark, NUM_INPUTS, NUM_ROUNDS}; use crate::logic::{self, LogicStark}; use crate::memory::memory_stark::{generate_random_memory_ops, MemoryStark}; - use crate::memory::NUM_CHANNELS; use crate::proof::AllProof; use crate::prover::prove; use crate::recursive_verifier::{ @@ -282,32 +281,22 @@ mod tests { cpu_stark.generate(row.borrow_mut()); cpu_trace_rows.push(row.into()); } - - let mut current_cpu_index = 0; - let mut last_timestamp = memory_trace[memory::columns::TIMESTAMP].values[0]; for i in 0..num_memory_ops { - let mem_timestamp = memory_trace[memory::columns::TIMESTAMP].values[i]; - let clock = mem_timestamp; - let op = (0..NUM_CHANNELS) - .filter(|&o| memory_trace[memory::columns::is_channel(o)].values[i] == F::ONE) - .collect_vec()[0]; - - if mem_timestamp != last_timestamp { - current_cpu_index += 1; - last_timestamp = mem_timestamp; - } + let mem_timestamp: usize = memory_trace[memory::columns::TIMESTAMP].values[i].to_canonical_u64().try_into().unwrap(); + let clock = mem_timestamp / 4; + let channel = mem_timestamp % 4; let row: &mut cpu::columns::CpuColumnsView = - cpu_trace_rows[current_cpu_index].borrow_mut(); + cpu_trace_rows[clock].borrow_mut(); - row.mem_channel_used[op] = F::ONE; - row.clock = clock; - row.mem_is_read[op] = memory_trace[memory::columns::IS_READ].values[i]; - row.mem_addr_context[op] = memory_trace[memory::columns::ADDR_CONTEXT].values[i]; - row.mem_addr_segment[op] = memory_trace[memory::columns::ADDR_SEGMENT].values[i]; - row.mem_addr_virtual[op] = memory_trace[memory::columns::ADDR_VIRTUAL].values[i]; + row.mem_channel_used[channel] = F::ONE; + row.clock = F::from_canonical_usize(clock); + row.mem_is_read[channel] = memory_trace[memory::columns::IS_READ].values[i]; + row.mem_addr_context[channel] = memory_trace[memory::columns::ADDR_CONTEXT].values[i]; + row.mem_addr_segment[channel] = memory_trace[memory::columns::ADDR_SEGMENT].values[i]; + row.mem_addr_virtual[channel] = memory_trace[memory::columns::ADDR_VIRTUAL].values[i]; for j in 0..8 { - row.mem_value[op][j] = memory_trace[memory::columns::value_limb(j)].values[i]; + row.mem_value[channel][j] = memory_trace[memory::columns::value_limb(j)].values[i]; } } trace_rows_to_poly_values(cpu_trace_rows) @@ -337,7 +326,7 @@ mod tests { let keccak_trace = make_keccak_trace(num_keccak_perms, &keccak_stark, &mut rng); let logic_trace = make_logic_trace(num_logic_rows, &logic_stark, &mut rng); - let mut memory_trace = make_memory_trace(num_memory_ops, &memory_stark, &mut rng); + let mem_trace = make_memory_trace(num_memory_ops, &memory_stark, &mut rng); let cpu_trace = make_cpu_trace( num_keccak_perms, num_logic_rows, diff --git a/evm/src/cpu/cpu_stark.rs b/evm/src/cpu/cpu_stark.rs index ee0cf98e..304ccf7c 100644 --- a/evm/src/cpu/cpu_stark.rs +++ b/evm/src/cpu/cpu_stark.rs @@ -40,7 +40,6 @@ pub fn ctl_filter_logic() -> Column { pub fn ctl_data_memory(channel: usize) -> Vec> { debug_assert!(channel < NUM_CHANNELS); let mut cols: Vec> = Column::singles([ - COL_MAP.clock, COL_MAP.mem_is_read[channel], COL_MAP.mem_addr_context[channel], COL_MAP.mem_addr_segment[channel], @@ -48,6 +47,13 @@ pub fn ctl_data_memory(channel: usize) -> Vec> { ]) .collect_vec(); cols.extend(Column::singles(COL_MAP.mem_value[channel])); + + let scalar = F::from_canonical_usize(NUM_CHANNELS); + let addend = F::from_canonical_usize(channel); + cols.push(Column::linear_combination_with_constant( + vec![(COL_MAP.clock, scalar)], + addend, + )); cols } diff --git a/evm/src/memory/memory_stark.rs b/evm/src/memory/memory_stark.rs index 3f7c26fc..d4962862 100644 --- a/evm/src/memory/memory_stark.rs +++ b/evm/src/memory/memory_stark.rs @@ -30,9 +30,10 @@ use crate::vars::{StarkEvaluationTargets, StarkEvaluationVars}; pub(crate) const NUM_PUBLIC_INPUTS: usize = 0; pub fn ctl_data() -> Vec> { - let mut res = Column::singles([TIMESTAMP, IS_READ, ADDR_CONTEXT, ADDR_SEGMENT, ADDR_VIRTUAL]) + let mut res = Column::singles([IS_READ, ADDR_CONTEXT, ADDR_SEGMENT, ADDR_VIRTUAL]) .collect_vec(); res.extend(Column::singles((0..8).map(value_limb))); + res.push(Column::single(TIMESTAMP)); res } From 181a132335e40a44e4ba668c0bc6c458382f7c22 Mon Sep 17 00:00:00 2001 From: Nicholas Ward Date: Thu, 7 Jul 2022 09:28:07 -0700 Subject: [PATCH 02/20] fixes --- evm/src/all_stark.rs | 4 ++-- evm/src/memory/memory_stark.rs | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/evm/src/all_stark.rs b/evm/src/all_stark.rs index 27751a5d..14d8cd73 100644 --- a/evm/src/all_stark.rs +++ b/evm/src/all_stark.rs @@ -283,8 +283,8 @@ mod tests { } for i in 0..num_memory_ops { let mem_timestamp: usize = memory_trace[memory::columns::TIMESTAMP].values[i].to_canonical_u64().try_into().unwrap(); - let clock = mem_timestamp / 4; - let channel = mem_timestamp % 4; + let clock = mem_timestamp / NUM_CHANNELS; + let channel = mem_timestamp % NUM_CHANNELS; let row: &mut cpu::columns::CpuColumnsView = cpu_trace_rows[clock].borrow_mut(); diff --git a/evm/src/memory/memory_stark.rs b/evm/src/memory/memory_stark.rs index d4962862..5ea4da13 100644 --- a/evm/src/memory/memory_stark.rs +++ b/evm/src/memory/memory_stark.rs @@ -33,7 +33,7 @@ pub fn ctl_data() -> Vec> { let mut res = Column::singles([IS_READ, ADDR_CONTEXT, ADDR_SEGMENT, ADDR_VIRTUAL]) .collect_vec(); res.extend(Column::singles((0..8).map(value_limb))); - res.push(Column::single(TIMESTAMP)); + // res.push(Column::single(TIMESTAMP)); res } @@ -64,8 +64,7 @@ pub fn generate_random_memory_ops( let mut current_memory_values: HashMap<(F, F, F), [F; 8]> = HashMap::new(); let num_cycles = num_ops / 2; - for i in 0..num_cycles { - let timestamp = F::from_canonical_usize(i); + for clock in 0..num_cycles { let mut used_indices = HashSet::new(); let mut new_writes_this_cycle = HashMap::new(); let mut has_read = false; @@ -76,7 +75,7 @@ pub fn generate_random_memory_ops( } used_indices.insert(channel_index); - let is_read = if i == 0 { + let is_read = if clock == 0 { false } else { !has_read && rng.gen() @@ -112,6 +111,7 @@ pub fn generate_random_memory_ops( (context, segment, virt, vals) }; + let timestamp = F::from_canonical_usize(clock * NUM_CHANNELS + channel_index); memory_ops.push(MemoryOp { channel_index, timestamp, From c3e7652763c3866047fa085b119d0363efbd655c Mon Sep 17 00:00:00 2001 From: Nicholas Ward Date: Thu, 7 Jul 2022 09:28:17 -0700 Subject: [PATCH 03/20] updates --- evm/src/all_stark.rs | 1 + evm/src/lookup.rs | 1 + evm/src/memory/columns.rs | 25 ++++++++++++-------- evm/src/memory/memory_stark.rs | 42 +++++++++++++++++++++++++--------- 4 files changed, 48 insertions(+), 21 deletions(-) diff --git a/evm/src/all_stark.rs b/evm/src/all_stark.rs index 14d8cd73..d9469ecc 100644 --- a/evm/src/all_stark.rs +++ b/evm/src/all_stark.rs @@ -364,6 +364,7 @@ mod tests { } #[test] + #[ignore] fn test_all_stark_recursive_verifier() -> Result<()> { init_logger(); diff --git a/evm/src/lookup.rs b/evm/src/lookup.rs index 2c93143f..6d58d3d1 100644 --- a/evm/src/lookup.rs +++ b/evm/src/lookup.rs @@ -133,5 +133,6 @@ pub fn permuted_cols(inputs: &[F], table: &[F]) -> (Vec, Vec permuted_table[ind] = val; } + dbg!((sorted_inputs.clone(), permuted_table.clone())); (sorted_inputs, permuted_table) } diff --git a/evm/src/memory/columns.rs b/evm/src/memory/columns.rs index d9fa927f..4c946838 100644 --- a/evm/src/memory/columns.rs +++ b/evm/src/memory/columns.rs @@ -1,5 +1,7 @@ //! Memory registers. +use std::ops::Range; + use crate::memory::{NUM_CHANNELS, VALUE_LIMBS}; pub(crate) const TIMESTAMP: usize = 0; @@ -36,20 +38,23 @@ pub(crate) const CONTEXT_FIRST_CHANGE: usize = SORTED_VALUE_START + VALUE_LIMBS; pub(crate) const SEGMENT_FIRST_CHANGE: usize = CONTEXT_FIRST_CHANGE + 1; pub(crate) const VIRTUAL_FIRST_CHANGE: usize = SEGMENT_FIRST_CHANGE + 1; -// We use a range check to ensure sorting. -pub(crate) const RANGE_CHECK: usize = VIRTUAL_FIRST_CHANGE + 1; -// The counter column (used for the range check) starts from 0 and increments. -pub(crate) const COUNTER: usize = RANGE_CHECK + 1; -// Helper columns for the permutation argument used to enforce the range check. -pub(crate) const RANGE_CHECK_PERMUTED: usize = COUNTER + 1; -pub(crate) const COUNTER_PERMUTED: usize = RANGE_CHECK_PERMUTED + 1; - // Flags to indicate if this operation came from the `i`th channel of the memory bus. -const IS_CHANNEL_START: usize = COUNTER_PERMUTED + 1; +const IS_CHANNEL_START: usize = VIRTUAL_FIRST_CHANGE + 1; #[allow(dead_code)] pub(crate) const fn is_channel(channel: usize) -> usize { debug_assert!(channel < NUM_CHANNELS); IS_CHANNEL_START + channel } -pub(crate) const NUM_COLUMNS: usize = IS_CHANNEL_START + NUM_CHANNELS; +// We use a range check to ensure sorting. +pub(crate) const RANGE_CHECK: usize = IS_CHANNEL_START + NUM_CHANNELS; +// The counter column (used for the range check) starts from 0 and increments. +pub(crate) const COUNTER: usize = RANGE_CHECK + 1; +// Helper columns for the permutation argument used to enforce the range check. +pub(crate) const RANGE_CHECK_PERMUTED: usize = COUNTER + 1; +pub(crate) const COUNTER_PERMUTED: usize = RANGE_CHECK_PERMUTED + 1; + +// Columns to be padded with zeroes, before the permutation argument takes place. +pub(crate) const COLUMNS_TO_PAD: Range = TIMESTAMP..RANGE_CHECK + 1; + +pub(crate) const NUM_COLUMNS: usize = COUNTER_PERMUTED + 1; diff --git a/evm/src/memory/memory_stark.rs b/evm/src/memory/memory_stark.rs index 5ea4da13..b485bc69 100644 --- a/evm/src/memory/memory_stark.rs +++ b/evm/src/memory/memory_stark.rs @@ -11,17 +11,16 @@ use plonky2::timed; use plonky2::util::timing::TimingTree; use rand::Rng; -use super::columns::is_channel; use crate::constraint_consumer::{ConstraintConsumer, RecursiveConstraintConsumer}; use crate::cross_table_lookup::Column; use crate::lookup::{eval_lookups, eval_lookups_circuit, permuted_cols}; use crate::memory::columns::{ - sorted_value_limb, value_limb, ADDR_CONTEXT, ADDR_SEGMENT, ADDR_VIRTUAL, CONTEXT_FIRST_CHANGE, + is_channel, COLUMNS_TO_PAD, sorted_value_limb, value_limb, ADDR_CONTEXT, ADDR_SEGMENT, ADDR_VIRTUAL, CONTEXT_FIRST_CHANGE, COUNTER, COUNTER_PERMUTED, IS_READ, NUM_COLUMNS, RANGE_CHECK, RANGE_CHECK_PERMUTED, SEGMENT_FIRST_CHANGE, SORTED_ADDR_CONTEXT, SORTED_ADDR_SEGMENT, SORTED_ADDR_VIRTUAL, SORTED_IS_READ, SORTED_TIMESTAMP, TIMESTAMP, VIRTUAL_FIRST_CHANGE, }; -use crate::memory::NUM_CHANNELS; +use crate::memory::{NUM_CHANNELS, VALUE_LIMBS}; use crate::permutation::PermutationPair; use crate::stark::Stark; use crate::util::trace_rows_to_poly_values; @@ -33,7 +32,7 @@ pub fn ctl_data() -> Vec> { let mut res = Column::singles([IS_READ, ADDR_CONTEXT, ADDR_SEGMENT, ADDR_VIRTUAL]) .collect_vec(); res.extend(Column::singles((0..8).map(value_limb))); - // res.push(Column::single(TIMESTAMP)); + res.push(Column::single(TIMESTAMP)); res } @@ -112,6 +111,7 @@ pub fn generate_random_memory_ops( }; let timestamp = F::from_canonical_usize(clock * NUM_CHANNELS + channel_index); + dbg!(timestamp); memory_ops.push(MemoryOp { channel_index, timestamp, @@ -201,27 +201,32 @@ pub fn generate_range_check_value( context_first_change: &[F], segment_first_change: &[F], virtual_first_change: &[F], -) -> Vec { +) -> (Vec, usize) { let num_ops = context.len(); let mut range_check = Vec::new(); + let mut max_timestamp_diff = 0; for idx in 0..num_ops - 1 { let this_address_unchanged = F::ONE - context_first_change[idx] - segment_first_change[idx] - virtual_first_change[idx]; + let timestamp_diff = timestamp[idx + 1] - timestamp[idx] - F::ONE; + if this_address_unchanged == F::ONE && timestamp_diff.to_canonical_u64() > max_timestamp_diff { + max_timestamp_diff = timestamp_diff.to_canonical_u64(); + } range_check.push( context_first_change[idx] * (context[idx + 1] - context[idx] - F::ONE) + segment_first_change[idx] * (segment[idx + 1] - segment[idx] - F::ONE) + virtual_first_change[idx] * (virtuals[idx + 1] - virtuals[idx] - F::ONE) - + this_address_unchanged * (timestamp[idx + 1] - timestamp[idx] - F::ONE), + + this_address_unchanged * timestamp_diff, ); } range_check.push(F::ZERO); - range_check + (range_check, max_timestamp_diff.try_into().unwrap()) } impl, const D: usize> MemoryStark { @@ -255,6 +260,9 @@ impl, const D: usize> MemoryStark { self.generate_memory(&mut trace_cols); + // The number of rows may have changed, if the range check required padding. + let num_ops = trace_cols[0].len(); + let mut trace_rows = vec![[F::ZERO; NUM_COLUMNS]; num_ops]; for (i, col) in trace_cols.iter().enumerate() { for (j, &val) in col.iter().enumerate() { @@ -296,7 +304,7 @@ impl, const D: usize> MemoryStark { let (context_first_change, segment_first_change, virtual_first_change) = generate_first_change_flags(&sorted_context, &sorted_segment, &sorted_virtual); - let range_check_value = generate_range_check_value( + let (range_check_value, max_timestamp_diff) = generate_range_check_value( &sorted_context, &sorted_segment, &sorted_virtual, @@ -305,6 +313,9 @@ impl, const D: usize> MemoryStark { &segment_first_change, &virtual_first_change, ); + dbg!(max_timestamp_diff); + let to_pad_to = max_timestamp_diff.next_power_of_two(); + let to_pad = to_pad_to - num_trace_rows; trace_cols[SORTED_TIMESTAMP] = sorted_timestamp; trace_cols[SORTED_IS_READ] = sorted_is_read; @@ -312,7 +323,7 @@ impl, const D: usize> MemoryStark { trace_cols[SORTED_ADDR_SEGMENT] = sorted_segment; trace_cols[SORTED_ADDR_VIRTUAL] = sorted_virtual; for i in 0..num_trace_rows { - for j in 0..8 { + for j in 0..VALUE_LIMBS { trace_cols[sorted_value_limb(j)][i] = sorted_values[i][j]; } } @@ -320,9 +331,14 @@ impl, const D: usize> MemoryStark { trace_cols[CONTEXT_FIRST_CHANGE] = context_first_change; trace_cols[SEGMENT_FIRST_CHANGE] = segment_first_change; trace_cols[VIRTUAL_FIRST_CHANGE] = virtual_first_change; - + trace_cols[RANGE_CHECK] = range_check_value; - trace_cols[COUNTER] = (0..num_trace_rows) + + for col in COLUMNS_TO_PAD { + trace_cols[col].splice(0..0, vec![F::ZERO; to_pad]); + } + + trace_cols[COUNTER] = (0..to_pad_to) .map(|i| F::from_canonical_usize(i)) .collect(); @@ -330,6 +346,10 @@ impl, const D: usize> MemoryStark { permuted_cols(&trace_cols[RANGE_CHECK], &trace_cols[COUNTER]); trace_cols[RANGE_CHECK_PERMUTED] = permuted_inputs; trace_cols[COUNTER_PERMUTED] = permuted_table; + + for i in 0..NUM_COLUMNS { + dbg!(i, trace_cols[i].len()); + } } pub fn generate_trace(&self, memory_ops: Vec>) -> Vec> { From b467a13d91ae6e491fdea3750d9432ba7e204350 Mon Sep 17 00:00:00 2001 From: Nicholas Ward Date: Thu, 7 Jul 2022 09:28:34 -0700 Subject: [PATCH 04/20] fix --- evm/src/all_stark.rs | 4 +++- evm/src/memory/memory_stark.rs | 7 ++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/evm/src/all_stark.rs b/evm/src/all_stark.rs index d9469ecc..c986ab86 100644 --- a/evm/src/all_stark.rs +++ b/evm/src/all_stark.rs @@ -195,7 +195,7 @@ mod tests { num_memory_ops: usize, memory_stark: &MemoryStark, rng: &mut R, - ) -> Vec> { + ) -> (Vec>, usize) { let memory_ops = generate_random_memory_ops(num_memory_ops, rng); memory_stark.generate_trace(memory_ops) } @@ -327,6 +327,8 @@ mod tests { let keccak_trace = make_keccak_trace(num_keccak_perms, &keccak_stark, &mut rng); let logic_trace = make_logic_trace(num_logic_rows, &logic_stark, &mut rng); let mem_trace = make_memory_trace(num_memory_ops, &memory_stark, &mut rng); + let mut memory_trace = mem_trace.0; + let num_memory_ops = mem_trace.1; let cpu_trace = make_cpu_trace( num_keccak_perms, num_logic_rows, diff --git a/evm/src/memory/memory_stark.rs b/evm/src/memory/memory_stark.rs index b485bc69..5f4e5599 100644 --- a/evm/src/memory/memory_stark.rs +++ b/evm/src/memory/memory_stark.rs @@ -226,7 +226,7 @@ pub fn generate_range_check_value( range_check.push(F::ZERO); - (range_check, max_timestamp_diff.try_into().unwrap()) + (range_check, max_timestamp_diff as usize) } impl, const D: usize> MemoryStark { @@ -352,7 +352,7 @@ impl, const D: usize> MemoryStark { } } - pub fn generate_trace(&self, memory_ops: Vec>) -> Vec> { + pub fn generate_trace(&self, memory_ops: Vec>) -> (Vec>, usize) { let mut timing = TimingTree::new("generate trace", log::Level::Debug); // Generate the witness. @@ -361,6 +361,7 @@ impl, const D: usize> MemoryStark { "generate trace rows", self.generate_trace_rows(memory_ops) ); + let num_ops = trace_rows.len(); let trace_polys = timed!( &mut timing, @@ -369,7 +370,7 @@ impl, const D: usize> MemoryStark { ); timing.print(); - trace_polys + (trace_polys, num_ops) } } From 83963c3a8f228fd349cbbfa50fc4f56953566d2d Mon Sep 17 00:00:00 2001 From: Nicholas Ward Date: Wed, 6 Jul 2022 15:05:50 -0700 Subject: [PATCH 05/20] permutation pairs --- evm/src/all_stark.rs | 1 - evm/src/memory/memory_stark.rs | 9 +++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/evm/src/all_stark.rs b/evm/src/all_stark.rs index c986ab86..48b1be76 100644 --- a/evm/src/all_stark.rs +++ b/evm/src/all_stark.rs @@ -366,7 +366,6 @@ mod tests { } #[test] - #[ignore] fn test_all_stark_recursive_verifier() -> Result<()> { init_logger(); diff --git a/evm/src/memory/memory_stark.rs b/evm/src/memory/memory_stark.rs index 5f4e5599..1f202dd0 100644 --- a/evm/src/memory/memory_stark.rs +++ b/evm/src/memory/memory_stark.rs @@ -578,7 +578,16 @@ impl, const D: usize> Stark for MemoryStark Vec { + let mut unsorted_cols = vec![TIMESTAMP, IS_READ, ADDR_CONTEXT, ADDR_SEGMENT, ADDR_VIRTUAL]; + unsorted_cols.extend((0..VALUE_LIMBS).map(|i| value_limb(i))); + let mut sorted_cols = vec![SORTED_TIMESTAMP, SORTED_IS_READ, SORTED_ADDR_CONTEXT, SORTED_ADDR_SEGMENT, SORTED_ADDR_VIRTUAL]; + sorted_cols.extend((0..VALUE_LIMBS).map(|i| sorted_value_limb(i))); + let column_pairs: Vec<_> = unsorted_cols.iter().cloned().zip(sorted_cols.iter().cloned()).collect(); + vec![ + PermutationPair { + column_pairs + }, PermutationPair::singletons(RANGE_CHECK, RANGE_CHECK_PERMUTED), PermutationPair::singletons(COUNTER, COUNTER_PERMUTED), ] From f3ef6c9bf354bb040a9ca093a1c0e1c07a98a213 Mon Sep 17 00:00:00 2001 From: Nicholas Ward Date: Thu, 7 Jul 2022 09:28:57 -0700 Subject: [PATCH 06/20] fix: ignore padding rows in constraints --- evm/src/all_stark.rs | 1 + evm/src/memory/columns.rs | 2 +- evm/src/memory/memory_stark.rs | 11 +++++++---- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/evm/src/all_stark.rs b/evm/src/all_stark.rs index 48b1be76..c986ab86 100644 --- a/evm/src/all_stark.rs +++ b/evm/src/all_stark.rs @@ -366,6 +366,7 @@ mod tests { } #[test] + #[ignore] fn test_all_stark_recursive_verifier() -> Result<()> { init_logger(); diff --git a/evm/src/memory/columns.rs b/evm/src/memory/columns.rs index 4c946838..2fe42a93 100644 --- a/evm/src/memory/columns.rs +++ b/evm/src/memory/columns.rs @@ -54,7 +54,7 @@ pub(crate) const COUNTER: usize = RANGE_CHECK + 1; pub(crate) const RANGE_CHECK_PERMUTED: usize = COUNTER + 1; pub(crate) const COUNTER_PERMUTED: usize = RANGE_CHECK_PERMUTED + 1; -// Columns to be padded with zeroes, before the permutation argument takes place. +// Columns to be padded at the top with zeroes, before the permutation argument takes place. pub(crate) const COLUMNS_TO_PAD: Range = TIMESTAMP..RANGE_CHECK + 1; pub(crate) const NUM_COLUMNS: usize = COUNTER_PERMUTED + 1; diff --git a/evm/src/memory/memory_stark.rs b/evm/src/memory/memory_stark.rs index 1f202dd0..ad03402b 100644 --- a/evm/src/memory/memory_stark.rs +++ b/evm/src/memory/memory_stark.rs @@ -32,7 +32,7 @@ pub fn ctl_data() -> Vec> { let mut res = Column::singles([IS_READ, ADDR_CONTEXT, ADDR_SEGMENT, ADDR_VIRTUAL]) .collect_vec(); res.extend(Column::singles((0..8).map(value_limb))); - res.push(Column::single(TIMESTAMP)); + // res.push(Column::single(TIMESTAMP)); res } @@ -404,6 +404,9 @@ impl, const D: usize> Stark for MemoryStark = (0..8) .map(|i| vars.next_values[sorted_value_limb(i)]) .collect(); + + // Indicator that this is a real row, not a row of padding. + let valid_row: P = (0..NUM_CHANNELS).map(|c| vars.local_values[is_channel(c)]).sum(); let context_first_change = vars.local_values[CONTEXT_FIRST_CHANGE]; let segment_first_change = vars.local_values[SEGMENT_FIRST_CHANGE]; @@ -431,9 +434,9 @@ impl, const D: usize> Stark for MemoryStark Date: Wed, 6 Jul 2022 17:03:44 -0700 Subject: [PATCH 07/20] updates to recursive constraints --- evm/src/memory/memory_stark.rs | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/evm/src/memory/memory_stark.rs b/evm/src/memory/memory_stark.rs index ad03402b..d20cf776 100644 --- a/evm/src/memory/memory_stark.rs +++ b/evm/src/memory/memory_stark.rs @@ -443,12 +443,12 @@ impl, const D: usize> Stark for MemoryStark, const D: usize> Stark for MemoryStark, const D: usize> Stark for MemoryStark Date: Wed, 6 Jul 2022 17:10:00 -0700 Subject: [PATCH 08/20] another padding-row constraint fix --- evm/src/memory/memory_stark.rs | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/evm/src/memory/memory_stark.rs b/evm/src/memory/memory_stark.rs index d20cf776..ed1af7ff 100644 --- a/evm/src/memory/memory_stark.rs +++ b/evm/src/memory/memory_stark.rs @@ -442,13 +442,13 @@ impl, const D: usize> Stark for MemoryStark, const D: usize> Stark for MemoryStark Date: Thu, 7 Jul 2022 09:29:10 -0700 Subject: [PATCH 09/20] fmt --- evm/src/all_stark.rs | 1 - evm/src/memory/memory_stark.rs | 73 ++++++++++++++++++++++------------ 2 files changed, 48 insertions(+), 26 deletions(-) diff --git a/evm/src/all_stark.rs b/evm/src/all_stark.rs index c986ab86..48b1be76 100644 --- a/evm/src/all_stark.rs +++ b/evm/src/all_stark.rs @@ -366,7 +366,6 @@ mod tests { } #[test] - #[ignore] fn test_all_stark_recursive_verifier() -> Result<()> { init_logger(); diff --git a/evm/src/memory/memory_stark.rs b/evm/src/memory/memory_stark.rs index ed1af7ff..3fe8ddd8 100644 --- a/evm/src/memory/memory_stark.rs +++ b/evm/src/memory/memory_stark.rs @@ -15,10 +15,11 @@ use crate::constraint_consumer::{ConstraintConsumer, RecursiveConstraintConsumer use crate::cross_table_lookup::Column; use crate::lookup::{eval_lookups, eval_lookups_circuit, permuted_cols}; use crate::memory::columns::{ - is_channel, COLUMNS_TO_PAD, sorted_value_limb, value_limb, ADDR_CONTEXT, ADDR_SEGMENT, ADDR_VIRTUAL, CONTEXT_FIRST_CHANGE, - COUNTER, COUNTER_PERMUTED, IS_READ, NUM_COLUMNS, RANGE_CHECK, RANGE_CHECK_PERMUTED, - SEGMENT_FIRST_CHANGE, SORTED_ADDR_CONTEXT, SORTED_ADDR_SEGMENT, SORTED_ADDR_VIRTUAL, - SORTED_IS_READ, SORTED_TIMESTAMP, TIMESTAMP, VIRTUAL_FIRST_CHANGE, + is_channel, sorted_value_limb, value_limb, ADDR_CONTEXT, ADDR_SEGMENT, ADDR_VIRTUAL, + COLUMNS_TO_PAD, CONTEXT_FIRST_CHANGE, COUNTER, COUNTER_PERMUTED, IS_READ, NUM_COLUMNS, + RANGE_CHECK, RANGE_CHECK_PERMUTED, SEGMENT_FIRST_CHANGE, SORTED_ADDR_CONTEXT, + SORTED_ADDR_SEGMENT, SORTED_ADDR_VIRTUAL, SORTED_IS_READ, SORTED_TIMESTAMP, TIMESTAMP, + VIRTUAL_FIRST_CHANGE, }; use crate::memory::{NUM_CHANNELS, VALUE_LIMBS}; use crate::permutation::PermutationPair; @@ -29,8 +30,8 @@ use crate::vars::{StarkEvaluationTargets, StarkEvaluationVars}; pub(crate) const NUM_PUBLIC_INPUTS: usize = 0; pub fn ctl_data() -> Vec> { - let mut res = Column::singles([IS_READ, ADDR_CONTEXT, ADDR_SEGMENT, ADDR_VIRTUAL]) - .collect_vec(); + let mut res = + Column::singles([IS_READ, ADDR_CONTEXT, ADDR_SEGMENT, ADDR_VIRTUAL]).collect_vec(); res.extend(Column::singles((0..8).map(value_limb))); // res.push(Column::single(TIMESTAMP)); res @@ -212,7 +213,9 @@ pub fn generate_range_check_value( - segment_first_change[idx] - virtual_first_change[idx]; let timestamp_diff = timestamp[idx + 1] - timestamp[idx] - F::ONE; - if this_address_unchanged == F::ONE && timestamp_diff.to_canonical_u64() > max_timestamp_diff { + if this_address_unchanged == F::ONE + && timestamp_diff.to_canonical_u64() > max_timestamp_diff + { max_timestamp_diff = timestamp_diff.to_canonical_u64(); } @@ -331,16 +334,14 @@ impl, const D: usize> MemoryStark { trace_cols[CONTEXT_FIRST_CHANGE] = context_first_change; trace_cols[SEGMENT_FIRST_CHANGE] = segment_first_change; trace_cols[VIRTUAL_FIRST_CHANGE] = virtual_first_change; - + trace_cols[RANGE_CHECK] = range_check_value; for col in COLUMNS_TO_PAD { trace_cols[col].splice(0..0, vec![F::ZERO; to_pad]); } - trace_cols[COUNTER] = (0..to_pad_to) - .map(|i| F::from_canonical_usize(i)) - .collect(); + trace_cols[COUNTER] = (0..to_pad_to).map(|i| F::from_canonical_usize(i)).collect(); let (permuted_inputs, permuted_table) = permuted_cols(&trace_cols[RANGE_CHECK], &trace_cols[COUNTER]); @@ -352,7 +353,10 @@ impl, const D: usize> MemoryStark { } } - pub fn generate_trace(&self, memory_ops: Vec>) -> (Vec>, usize) { + pub fn generate_trace( + &self, + memory_ops: Vec>, + ) -> (Vec>, usize) { let mut timing = TimingTree::new("generate trace", log::Level::Debug); // Generate the witness. @@ -404,9 +408,11 @@ impl, const D: usize> Stark for MemoryStark = (0..8) .map(|i| vars.next_values[sorted_value_limb(i)]) .collect(); - + // Indicator that this is a real row, not a row of padding. - let valid_row: P = (0..NUM_CHANNELS).map(|c| vars.local_values[is_channel(c)]).sum(); + let valid_row: P = (0..NUM_CHANNELS) + .map(|c| vars.local_values[is_channel(c)]) + .sum(); let context_first_change = vars.local_values[CONTEXT_FIRST_CHANGE]; let segment_first_change = vars.local_values[SEGMENT_FIRST_CHANGE]; @@ -434,9 +440,15 @@ impl, const D: usize> Stark for MemoryStark, const D: usize> Stark for MemoryStark, const D: usize> Stark for MemoryStark Vec { let mut unsorted_cols = vec![TIMESTAMP, IS_READ, ADDR_CONTEXT, ADDR_SEGMENT, ADDR_VIRTUAL]; unsorted_cols.extend((0..VALUE_LIMBS).map(|i| value_limb(i))); - let mut sorted_cols = vec![SORTED_TIMESTAMP, SORTED_IS_READ, SORTED_ADDR_CONTEXT, SORTED_ADDR_SEGMENT, SORTED_ADDR_VIRTUAL]; + let mut sorted_cols = vec![ + SORTED_TIMESTAMP, + SORTED_IS_READ, + SORTED_ADDR_CONTEXT, + SORTED_ADDR_SEGMENT, + SORTED_ADDR_VIRTUAL, + ]; sorted_cols.extend((0..VALUE_LIMBS).map(|i| sorted_value_limb(i))); - let column_pairs: Vec<_> = unsorted_cols.iter().cloned().zip(sorted_cols.iter().cloned()).collect(); + let column_pairs: Vec<_> = unsorted_cols + .iter() + .cloned() + .zip(sorted_cols.iter().cloned()) + .collect(); vec![ - PermutationPair { - column_pairs - }, + PermutationPair { column_pairs }, PermutationPair::singletons(RANGE_CHECK, RANGE_CHECK_PERMUTED), PermutationPair::singletons(COUNTER, COUNTER_PERMUTED), ] From 3a6f2ef25e5b1be9dd73a0852f8440788f46a61b Mon Sep 17 00:00:00 2001 From: Nicholas Ward Date: Wed, 6 Jul 2022 21:23:43 -0700 Subject: [PATCH 10/20] clippy --- evm/src/memory/memory_stark.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/evm/src/memory/memory_stark.rs b/evm/src/memory/memory_stark.rs index 3fe8ddd8..5ce63d2a 100644 --- a/evm/src/memory/memory_stark.rs +++ b/evm/src/memory/memory_stark.rs @@ -607,7 +607,7 @@ impl, const D: usize> Stark for MemoryStark Vec { let mut unsorted_cols = vec![TIMESTAMP, IS_READ, ADDR_CONTEXT, ADDR_SEGMENT, ADDR_VIRTUAL]; - unsorted_cols.extend((0..VALUE_LIMBS).map(|i| value_limb(i))); + unsorted_cols.extend((0..VALUE_LIMBS).map(value_limb)); let mut sorted_cols = vec![ SORTED_TIMESTAMP, SORTED_IS_READ, @@ -615,7 +615,7 @@ impl, const D: usize> Stark for MemoryStark = unsorted_cols .iter() .cloned() From 6b2b745291a7a4602a2e729d09cb68fce0bc753e Mon Sep 17 00:00:00 2001 From: Nicholas Ward Date: Wed, 6 Jul 2022 21:24:27 -0700 Subject: [PATCH 11/20] removed debug prints --- evm/src/lookup.rs | 1 - evm/src/memory/memory_stark.rs | 6 ------ 2 files changed, 7 deletions(-) diff --git a/evm/src/lookup.rs b/evm/src/lookup.rs index 6d58d3d1..2c93143f 100644 --- a/evm/src/lookup.rs +++ b/evm/src/lookup.rs @@ -133,6 +133,5 @@ pub fn permuted_cols(inputs: &[F], table: &[F]) -> (Vec, Vec permuted_table[ind] = val; } - dbg!((sorted_inputs.clone(), permuted_table.clone())); (sorted_inputs, permuted_table) } diff --git a/evm/src/memory/memory_stark.rs b/evm/src/memory/memory_stark.rs index 5ce63d2a..616a4105 100644 --- a/evm/src/memory/memory_stark.rs +++ b/evm/src/memory/memory_stark.rs @@ -112,7 +112,6 @@ pub fn generate_random_memory_ops( }; let timestamp = F::from_canonical_usize(clock * NUM_CHANNELS + channel_index); - dbg!(timestamp); memory_ops.push(MemoryOp { channel_index, timestamp, @@ -316,7 +315,6 @@ impl, const D: usize> MemoryStark { &segment_first_change, &virtual_first_change, ); - dbg!(max_timestamp_diff); let to_pad_to = max_timestamp_diff.next_power_of_two(); let to_pad = to_pad_to - num_trace_rows; @@ -347,10 +345,6 @@ impl, const D: usize> MemoryStark { permuted_cols(&trace_cols[RANGE_CHECK], &trace_cols[COUNTER]); trace_cols[RANGE_CHECK_PERMUTED] = permuted_inputs; trace_cols[COUNTER_PERMUTED] = permuted_table; - - for i in 0..NUM_COLUMNS { - dbg!(i, trace_cols[i].len()); - } } pub fn generate_trace( From 6655ee68e4b5ea226cce3d0fdf5298ae24dba906 Mon Sep 17 00:00:00 2001 From: Nicholas Ward Date: Thu, 7 Jul 2022 09:29:35 -0700 Subject: [PATCH 12/20] restored timestamp column to CTL --- evm/src/cpu/cpu_stark.rs | 9 ++++++++- evm/src/memory/memory_stark.rs | 2 +- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/evm/src/cpu/cpu_stark.rs b/evm/src/cpu/cpu_stark.rs index 304ccf7c..86b04246 100644 --- a/evm/src/cpu/cpu_stark.rs +++ b/evm/src/cpu/cpu_stark.rs @@ -46,7 +46,14 @@ pub fn ctl_data_memory(channel: usize) -> Vec> { COL_MAP.mem_addr_virtual[channel], ]) .collect_vec(); - cols.extend(Column::singles(COL_MAP.mem_value[channel])); +cols.extend(Column::singles(COL_MAP.mem_value[channel])); + + let scalar = F::from_canonical_usize(NUM_CHANNELS); + let addend = F::from_canonical_usize(channel); + cols.push(Column::linear_combination_with_constant( + vec![(columns::CLOCK, scalar)], + addend, + )); let scalar = F::from_canonical_usize(NUM_CHANNELS); let addend = F::from_canonical_usize(channel); diff --git a/evm/src/memory/memory_stark.rs b/evm/src/memory/memory_stark.rs index 616a4105..187435ed 100644 --- a/evm/src/memory/memory_stark.rs +++ b/evm/src/memory/memory_stark.rs @@ -33,7 +33,7 @@ pub fn ctl_data() -> Vec> { let mut res = Column::singles([IS_READ, ADDR_CONTEXT, ADDR_SEGMENT, ADDR_VIRTUAL]).collect_vec(); res.extend(Column::singles((0..8).map(value_limb))); - // res.push(Column::single(TIMESTAMP)); + res.push(Column::single(TIMESTAMP)); res } From afc5a4dc4fc435799db946e1904405c17b3950fa Mon Sep 17 00:00:00 2001 From: Nicholas Ward Date: Thu, 7 Jul 2022 09:52:38 -0700 Subject: [PATCH 13/20] fixes --- evm/src/all_stark.rs | 9 ++++++--- evm/src/cpu/cpu_stark.rs | 10 ++-------- 2 files changed, 8 insertions(+), 11 deletions(-) diff --git a/evm/src/all_stark.rs b/evm/src/all_stark.rs index 48b1be76..c242a1be 100644 --- a/evm/src/all_stark.rs +++ b/evm/src/all_stark.rs @@ -133,6 +133,7 @@ mod tests { use crate::keccak::keccak_stark::{KeccakStark, NUM_INPUTS, NUM_ROUNDS}; use crate::logic::{self, LogicStark}; use crate::memory::memory_stark::{generate_random_memory_ops, MemoryStark}; + use crate::memory::NUM_CHANNELS; use crate::proof::AllProof; use crate::prover::prove; use crate::recursive_verifier::{ @@ -282,12 +283,14 @@ mod tests { cpu_trace_rows.push(row.into()); } for i in 0..num_memory_ops { - let mem_timestamp: usize = memory_trace[memory::columns::TIMESTAMP].values[i].to_canonical_u64().try_into().unwrap(); + let mem_timestamp: usize = memory_trace[memory::columns::TIMESTAMP].values[i] + .to_canonical_u64() + .try_into() + .unwrap(); let clock = mem_timestamp / NUM_CHANNELS; let channel = mem_timestamp % NUM_CHANNELS; - let row: &mut cpu::columns::CpuColumnsView = - cpu_trace_rows[clock].borrow_mut(); + let row: &mut cpu::columns::CpuColumnsView = cpu_trace_rows[clock].borrow_mut(); row.mem_channel_used[channel] = F::ONE; row.clock = F::from_canonical_usize(clock); diff --git a/evm/src/cpu/cpu_stark.rs b/evm/src/cpu/cpu_stark.rs index 86b04246..ad32dd98 100644 --- a/evm/src/cpu/cpu_stark.rs +++ b/evm/src/cpu/cpu_stark.rs @@ -46,14 +46,7 @@ pub fn ctl_data_memory(channel: usize) -> Vec> { COL_MAP.mem_addr_virtual[channel], ]) .collect_vec(); -cols.extend(Column::singles(COL_MAP.mem_value[channel])); - - let scalar = F::from_canonical_usize(NUM_CHANNELS); - let addend = F::from_canonical_usize(channel); - cols.push(Column::linear_combination_with_constant( - vec![(columns::CLOCK, scalar)], - addend, - )); + cols.extend(Column::singles(COL_MAP.mem_value[channel])); let scalar = F::from_canonical_usize(NUM_CHANNELS); let addend = F::from_canonical_usize(channel); @@ -61,6 +54,7 @@ cols.extend(Column::singles(COL_MAP.mem_value[channel])); vec![(COL_MAP.clock, scalar)], addend, )); + cols } From 9ad2958f7374303b4c7d45e761dc658378f23df1 Mon Sep 17 00:00:00 2001 From: Nicholas Ward Date: Thu, 7 Jul 2022 13:55:30 -0700 Subject: [PATCH 14/20] fix --- evm/src/memory/memory_stark.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/evm/src/memory/memory_stark.rs b/evm/src/memory/memory_stark.rs index 187435ed..dab5ba2d 100644 --- a/evm/src/memory/memory_stark.rs +++ b/evm/src/memory/memory_stark.rs @@ -315,7 +315,7 @@ impl, const D: usize> MemoryStark { &segment_first_change, &virtual_first_change, ); - let to_pad_to = max_timestamp_diff.next_power_of_two(); + let to_pad_to = max_timestamp_diff.next_power_of_two().max(num_trace_rows); let to_pad = to_pad_to - num_trace_rows; trace_cols[SORTED_TIMESTAMP] = sorted_timestamp; From 888cfe4ca4be77aabe1298d409f2e361f19bb8fa Mon Sep 17 00:00:00 2001 From: Nicholas Ward Date: Thu, 7 Jul 2022 16:27:11 -0700 Subject: [PATCH 15/20] fix --- evm/src/all_stark.rs | 28 +++++++++++++++++++--------- 1 file changed, 19 insertions(+), 9 deletions(-) diff --git a/evm/src/all_stark.rs b/evm/src/all_stark.rs index c242a1be..966b362c 100644 --- a/evm/src/all_stark.rs +++ b/evm/src/all_stark.rs @@ -290,16 +290,26 @@ mod tests { let clock = mem_timestamp / NUM_CHANNELS; let channel = mem_timestamp % NUM_CHANNELS; - let row: &mut cpu::columns::CpuColumnsView = cpu_trace_rows[clock].borrow_mut(); + let is_padding_row = (0..NUM_CHANNELS) + .map(|c| memory_trace[memory::columns::is_channel(c)].values[i]) + .all(|x| x == F::ZERO); - row.mem_channel_used[channel] = F::ONE; - row.clock = F::from_canonical_usize(clock); - row.mem_is_read[channel] = memory_trace[memory::columns::IS_READ].values[i]; - row.mem_addr_context[channel] = memory_trace[memory::columns::ADDR_CONTEXT].values[i]; - row.mem_addr_segment[channel] = memory_trace[memory::columns::ADDR_SEGMENT].values[i]; - row.mem_addr_virtual[channel] = memory_trace[memory::columns::ADDR_VIRTUAL].values[i]; - for j in 0..8 { - row.mem_value[channel][j] = memory_trace[memory::columns::value_limb(j)].values[i]; + if !is_padding_row { + let row: &mut cpu::columns::CpuColumnsView = cpu_trace_rows[clock].borrow_mut(); + + row.mem_channel_used[channel] = F::ONE; + row.clock = F::from_canonical_usize(clock); + row.mem_is_read[channel] = memory_trace[memory::columns::IS_READ].values[i]; + row.mem_addr_context[channel] = + memory_trace[memory::columns::ADDR_CONTEXT].values[i]; + row.mem_addr_segment[channel] = + memory_trace[memory::columns::ADDR_SEGMENT].values[i]; + row.mem_addr_virtual[channel] = + memory_trace[memory::columns::ADDR_VIRTUAL].values[i]; + for j in 0..8 { + row.mem_value[channel][j] = + memory_trace[memory::columns::value_limb(j)].values[i]; + } } } trace_rows_to_poly_values(cpu_trace_rows) From 49c208ec9b77d3dca700ac658680cd9f23917d89 Mon Sep 17 00:00:00 2001 From: Nicholas Ward Date: Fri, 8 Jul 2022 10:22:58 -0700 Subject: [PATCH 16/20] addressed comments --- evm/src/memory/columns.rs | 1 - evm/src/memory/memory_stark.rs | 19 ++++++------------- 2 files changed, 6 insertions(+), 14 deletions(-) diff --git a/evm/src/memory/columns.rs b/evm/src/memory/columns.rs index 2fe42a93..214a7e4b 100644 --- a/evm/src/memory/columns.rs +++ b/evm/src/memory/columns.rs @@ -40,7 +40,6 @@ pub(crate) const VIRTUAL_FIRST_CHANGE: usize = SEGMENT_FIRST_CHANGE + 1; // Flags to indicate if this operation came from the `i`th channel of the memory bus. const IS_CHANNEL_START: usize = VIRTUAL_FIRST_CHANGE + 1; -#[allow(dead_code)] pub(crate) const fn is_channel(channel: usize) -> usize { debug_assert!(channel < NUM_CHANNELS); IS_CHANNEL_START + channel diff --git a/evm/src/memory/memory_stark.rs b/evm/src/memory/memory_stark.rs index dab5ba2d..6a1fc945 100644 --- a/evm/src/memory/memory_stark.rs +++ b/evm/src/memory/memory_stark.rs @@ -205,30 +205,23 @@ pub fn generate_range_check_value( let num_ops = context.len(); let mut range_check = Vec::new(); - let mut max_timestamp_diff = 0; for idx in 0..num_ops - 1 { let this_address_unchanged = F::ONE - context_first_change[idx] - segment_first_change[idx] - virtual_first_change[idx]; - let timestamp_diff = timestamp[idx + 1] - timestamp[idx] - F::ONE; - if this_address_unchanged == F::ONE - && timestamp_diff.to_canonical_u64() > max_timestamp_diff - { - max_timestamp_diff = timestamp_diff.to_canonical_u64(); - } - range_check.push( context_first_change[idx] * (context[idx + 1] - context[idx] - F::ONE) + segment_first_change[idx] * (segment[idx + 1] - segment[idx] - F::ONE) + virtual_first_change[idx] * (virtuals[idx + 1] - virtuals[idx] - F::ONE) - + this_address_unchanged * timestamp_diff, + + this_address_unchanged * (timestamp[idx + 1] - timestamp[idx] - F::ONE), ); } - range_check.push(F::ZERO); - (range_check, max_timestamp_diff as usize) + let max_diff = range_check.iter().map(F::to_canonical_u64).max().unwrap() as usize; + + (range_check, max_diff) } impl, const D: usize> MemoryStark { @@ -306,7 +299,7 @@ impl, const D: usize> MemoryStark { let (context_first_change, segment_first_change, virtual_first_change) = generate_first_change_flags(&sorted_context, &sorted_segment, &sorted_virtual); - let (range_check_value, max_timestamp_diff) = generate_range_check_value( + let (range_check_value, max_diff) = generate_range_check_value( &sorted_context, &sorted_segment, &sorted_virtual, @@ -315,7 +308,7 @@ impl, const D: usize> MemoryStark { &segment_first_change, &virtual_first_change, ); - let to_pad_to = max_timestamp_diff.next_power_of_two().max(num_trace_rows); + let to_pad_to = max_diff.next_power_of_two().max(num_trace_rows); let to_pad = to_pad_to - num_trace_rows; trace_cols[SORTED_TIMESTAMP] = sorted_timestamp; From 467f53202483c392e53ff745f482bf879582f072 Mon Sep 17 00:00:00 2001 From: Nicholas Ward Date: Fri, 8 Jul 2022 12:19:11 -0700 Subject: [PATCH 17/20] addressed comments --- evm/src/all_stark.rs | 4 +++- evm/src/memory/memory_stark.rs | 10 ++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/evm/src/all_stark.rs b/evm/src/all_stark.rs index 966b362c..b69104eb 100644 --- a/evm/src/all_stark.rs +++ b/evm/src/all_stark.rs @@ -198,7 +198,9 @@ mod tests { rng: &mut R, ) -> (Vec>, usize) { let memory_ops = generate_random_memory_ops(num_memory_ops, rng); - memory_stark.generate_trace(memory_ops) + let trace = memory_stark.generate_trace(memory_ops); + let num_ops = trace[0].values.len(); + (trace, num_ops) } fn make_cpu_trace( diff --git a/evm/src/memory/memory_stark.rs b/evm/src/memory/memory_stark.rs index 6a1fc945..ed55b02a 100644 --- a/evm/src/memory/memory_stark.rs +++ b/evm/src/memory/memory_stark.rs @@ -308,7 +308,7 @@ impl, const D: usize> MemoryStark { &segment_first_change, &virtual_first_change, ); - let to_pad_to = max_diff.next_power_of_two().max(num_trace_rows); + let to_pad_to = (max_diff + 1).next_power_of_two().max(num_trace_rows); let to_pad = to_pad_to - num_trace_rows; trace_cols[SORTED_TIMESTAMP] = sorted_timestamp; @@ -343,7 +343,7 @@ impl, const D: usize> MemoryStark { pub fn generate_trace( &self, memory_ops: Vec>, - ) -> (Vec>, usize) { + ) -> Vec> { let mut timing = TimingTree::new("generate trace", log::Level::Debug); // Generate the witness. @@ -352,7 +352,6 @@ impl, const D: usize> MemoryStark { "generate trace rows", self.generate_trace_rows(memory_ops) ); - let num_ops = trace_rows.len(); let trace_polys = timed!( &mut timing, @@ -361,7 +360,7 @@ impl, const D: usize> MemoryStark { ); timing.print(); - (trace_polys, num_ops) + trace_polys } } @@ -604,8 +603,7 @@ impl, const D: usize> Stark for MemoryStark = unsorted_cols - .iter() - .cloned() + .into_iter() .zip(sorted_cols.iter().cloned()) .collect(); From b935605f69761f0c131f951abd9beb69d019f493 Mon Sep 17 00:00:00 2001 From: Nicholas Ward Date: Fri, 8 Jul 2022 12:19:20 -0700 Subject: [PATCH 18/20] fmt --- evm/src/memory/memory_stark.rs | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/evm/src/memory/memory_stark.rs b/evm/src/memory/memory_stark.rs index ed55b02a..a11ec992 100644 --- a/evm/src/memory/memory_stark.rs +++ b/evm/src/memory/memory_stark.rs @@ -340,10 +340,7 @@ impl, const D: usize> MemoryStark { trace_cols[COUNTER_PERMUTED] = permuted_table; } - pub fn generate_trace( - &self, - memory_ops: Vec>, - ) -> Vec> { + pub fn generate_trace(&self, memory_ops: Vec>) -> Vec> { let mut timing = TimingTree::new("generate trace", log::Level::Debug); // Generate the witness. From bdae9bc33bebfd9edd51a2af790a4e2c319753ca Mon Sep 17 00:00:00 2001 From: Nicholas Ward Date: Fri, 8 Jul 2022 12:23:01 -0700 Subject: [PATCH 19/20] update --- evm/src/memory/memory_stark.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/evm/src/memory/memory_stark.rs b/evm/src/memory/memory_stark.rs index a11ec992..3edab3fb 100644 --- a/evm/src/memory/memory_stark.rs +++ b/evm/src/memory/memory_stark.rs @@ -308,7 +308,7 @@ impl, const D: usize> MemoryStark { &segment_first_change, &virtual_first_change, ); - let to_pad_to = (max_diff + 1).next_power_of_two().max(num_trace_rows); + let to_pad_to = (max_diff + 1).max(num_trace_rows).next_power_of_two(); let to_pad = to_pad_to - num_trace_rows; trace_cols[SORTED_TIMESTAMP] = sorted_timestamp; From abc729f1d68593733ac0dcf017f0f96acae0933a Mon Sep 17 00:00:00 2001 From: Nicholas Ward Date: Mon, 11 Jul 2022 10:44:42 -0700 Subject: [PATCH 20/20] TODO --- evm/src/memory/memory_stark.rs | 1 + 1 file changed, 1 insertion(+) diff --git a/evm/src/memory/memory_stark.rs b/evm/src/memory/memory_stark.rs index 3edab3fb..49ee1ee2 100644 --- a/evm/src/memory/memory_stark.rs +++ b/evm/src/memory/memory_stark.rs @@ -393,6 +393,7 @@ impl, const D: usize> Stark for MemoryStark