logos-storage/plonky2
1
0
Fork 0
mirror of https://github.com/logos-storage/plonky2.git synced 2026-01-07 08:13:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixes

Browse Source
This commit is contained in:
Nicholas Ward 2022-06-21 15:49:01 -07:00
parent 9434819829
commit 593d3eeffd
1 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
evm/src/all_stark.rs
View File

@ -217,17 +217,14 @@ mod tests {
cpu_trace_rows.push(row); cpu_trace_rows.push(row);
} }
for i in 0..num_memory_ops { for i in 0..num_memory_ops {
let mem_timestamp: usize = memory_trace[memory::registers::TIMESTAMP].values[i] let mem_timestamp = memory_trace[memory::registers::TIMESTAMP].values[i];
.to_canonical_u64()
.try_into()
.unwrap();
let clock = mem_timestamp; let clock = mem_timestamp;
let op = (0..4) let op = (0..4)
.filter(|&o| memory_trace[memory::registers::is_memop(o)].values[i] == F::ONE) .filter(|&o| memory_trace[memory::registers::is_memop(o)].values[i] == F::ONE)
.collect_vec()[0]; .collect_vec()[0];
cpu_trace_rows[i][cpu::columns::uses_memop(op)] = F::ONE; cpu_trace_rows[i][cpu::columns::uses_memop(op)] = F::ONE;
cpu_trace_rows[i][cpu::columns::CLOCK] = F::from_canonical_usize(clock); cpu_trace_rows[i][cpu::columns::CLOCK] = clock;
cpu_trace_rows[i][cpu::columns::memop_is_read(op)] = cpu_trace_rows[i][cpu::columns::memop_is_read(op)] =
memory_trace[memory::registers::IS_READ].values[i]; memory_trace[memory::registers::IS_READ].values[i];
cpu_trace_rows[i][cpu::columns::memop_addr_context(op)] = cpu_trace_rows[i][cpu::columns::memop_addr_context(op)] =
@ -313,16 +310,13 @@ mod tests {
let cpu_memory_cols: Vec<Vec<_>> = (0..NUM_MEMORY_OPS) let cpu_memory_cols: Vec<Vec<_>> = (0..NUM_MEMORY_OPS)
.map(|op| { .map(|op| {
let mut cols = vec![Column::linear_combination_with_constant( let mut cols = Column::singles([
[(cpu::columns::CLOCK, F::from_canonical_usize(NUM_MEMORY_OPS))], cpu::columns::CLOCK,
F::from_canonical_usize(op),
)];
cols.extend(Column::singles([
cpu::columns::memop_is_read(op), cpu::columns::memop_is_read(op),
cpu::columns::memop_addr_context(op), cpu::columns::memop_addr_context(op),
cpu::columns::memop_addr_segment(op), cpu::columns::memop_addr_segment(op),
cpu::columns::memop_addr_virtual(op), cpu::columns::memop_addr_virtual(op),
])); ]).collect_vec();
cols.extend(Column::singles( cols.extend(Column::singles(
(0..8).map(|j| cpu::columns::memop_value(op, j)), (0..8).map(|j| cpu::columns::memop_value(op, j)),
)); ));