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

feat: Use zeroes instead of simulator states as unused part of RAM permutation witness #47

Merged
merged 3 commits into from
Oct 2, 2024
Merged

feat: Use zeroes instead of simulator states as unused part of RAM permutation witness #47

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c023ceb
Simplify ram permutation witgen
0xVolosnikov Sep 4, 2024
9051ddb
Cleanup
0xVolosnikov Sep 30, 2024
3cc3e50
Fix tests
0xVolosnikov Sep 30, 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
1 change: 0 additions & 1 deletion crates/circuit_encodings/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -592,7 +592,6 @@ impl<
) {
assert!(N % AW == 0);
let encoding = element.encoding_witness();
self.witness.push((encoding, element));

let old_tail = self.tail;
let mut state = old_tail;
Expand Down
31 changes: 0 additions & 31 deletions crates/zkevm_test_harness/src/tests/complex_tests/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -298,37 +298,6 @@ pub(crate) fn generate_base_layer(
artifacts_callback,
);

let mut unsorted_memory_queue_witnesses_it = unsorted_memory_queue_witnesses.into_iter();
let mut sorted_memory_queue_witnesses = sorted_memory_queue_witnesses.into_iter();
for el in basic_block_circuits.iter_mut() {
use circuit_definitions::boojum::field::Field;
match &el {
ZkSyncBaseLayerCircuit::RAMPermutation(inner) => {
let mut witness = inner.witness.take().unwrap();
let zero_state = [GoldilocksField::ZERO; FULL_SPONGE_QUEUE_STATE_WIDTH];
witness.sorted_queue_witness = FullStateCircuitQueueRawWitness {
elements: sorted_memory_queue_witnesses
.next()
.unwrap()
.into_iter()
.map(|x| (x, zero_state))
.collect(),
};
witness.unsorted_queue_witness = FullStateCircuitQueueRawWitness {
elements: unsorted_memory_queue_witnesses_it
.next()
.unwrap()
.into_iter()
.map(|x| (x, zero_state))
.collect(),
};

inner.witness.store(Some(witness));
}
_ => {}
}
}

(
basic_block_circuits,
recursion_queues,
Expand Down
28 changes: 0 additions & 28 deletions crates/zkevm_test_harness/src/tests/run_manually.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -319,36 +319,8 @@ pub(crate) fn run_with_options(entry_point_bytecode: Vec<[u8; 32]>, options: Opt

println!("Simulation and witness creation are completed");

let mut unsorted_memory_queue_witnesses_it = unsorted_memory_queue_witnesses.into_iter();
let mut sorted_memory_queue_witnesses = sorted_memory_queue_witnesses.into_iter();
for el in basic_block_circuits {
println!("Doing {} circuit", el.short_description());
use circuit_definitions::boojum::field::Field;
match &el {
ZkSyncBaseLayerCircuit::RAMPermutation(inner) => {
let mut witness = inner.witness.take().unwrap();
let zero_state = [GoldilocksField::ZERO; FULL_SPONGE_QUEUE_STATE_WIDTH];
witness.sorted_queue_witness = FullStateCircuitQueueRawWitness {
elements: sorted_memory_queue_witnesses
.next()
.unwrap()
.into_iter()
.map(|x| (x, zero_state))
.collect(),
};
witness.unsorted_queue_witness = FullStateCircuitQueueRawWitness {
elements: unsorted_memory_queue_witnesses_it
.next()
.unwrap()
.into_iter()
.map(|x| (x, zero_state))
.collect(),
};

inner.witness.store(Some(witness));
}
_ => {}
}
base_test_circuit(el);
}

Expand Down
76 changes: 60 additions & 16 deletions crates/zkevm_test_harness/src/witness/individual_circuits/memory_related/ram_permutation.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,8 @@ use zkevm_circuits::base_structures::vm_state::QUEUE_STATE_WIDTH;
use crate::zk_evm::zkevm_opcode_defs::BOOTLOADER_HEAP_PAGE;

pub(crate) fn compute_ram_circuit_snapshots<CB: FnMut(WitnessGenerationArtifact)>(
total_amount_of_queries: usize, // including additional queries from precompiles
memory_queries: &Vec<(u32, MemoryQuery)>,
implicit_memory_queries: &ImplicitMemoryQueries,
memory_queue_states_accumulator: LastPerCircuitAccumulator<
QueueStateWitness<Field, FULL_SPONGE_QUEUE_STATE_WIDTH>,
>,
Expand All @@ -43,9 +44,6 @@ pub(crate) fn compute_ram_circuit_snapshots<CB: FnMut(WitnessGenerationArtifact)
>,
memory_queue_simulator: MemoryQueuePerCircuitSimulator<Field>,
sorted_memory_queries_simulator: MemoryQueuePerCircuitSimulator<Field>,
sorted_queries_aux_data_for_chunks: Vec<(u32, MemoryQuery, usize)>,
sorted_encodings: Vec<[Field; MEMORY_QUERY_PACKED_WIDTH]>,
unsorted_encodings: Vec<[Field; MEMORY_QUERY_PACKED_WIDTH]>,
round_function: &RoundFunction,
num_non_deterministic_heap_queries: usize,
geometry: &GeometryConfig,
Expand All @@ -54,6 +52,9 @@ pub(crate) fn compute_ram_circuit_snapshots<CB: FnMut(WitnessGenerationArtifact)
FirstAndLastCircuitWitness<RamPermutationObservableWitness<Field>>,
Vec<ClosedFormInputCompactFormWitness<Field>>,
) {
let total_amount_of_queries =
memory_queries.len() + implicit_memory_queries.amount_of_queries();

assert_eq!(
total_amount_of_queries,
memory_queue_states_accumulator.len()
Expand Down Expand Up @@ -97,13 +98,27 @@ pub(crate) fn compute_ram_circuit_snapshots<CB: FnMut(WitnessGenerationArtifact)
// since encodings of the elements provide all the information necessary to perform sorting argument,
// we use them naively

let all_memory_queries: Vec<&MemoryQuery> = memory_queries
.iter()
.map(|(_, query)| query)
.chain(implicit_memory_queries.iter())
.collect();

use crate::witness::aux_data_structs::per_circuit_accumulator::PerCircuitAccumulator;
use rayon::prelude::*;
use std::cmp::Ordering;
let mut all_memory_queries_sorted = all_memory_queries.clone();
// sort by memory location, and then by timestamp
all_memory_queries_sorted.par_sort_by(|a, b| match a.location.cmp(&b.location) {
Ordering::Equal => a.timestamp.cmp(&b.timestamp),
a @ _ => a,
});

assert_eq!(
memory_queue_simulator.num_items as usize,
total_amount_of_queries
);

assert_eq!(unsorted_encodings.len(), sorted_encodings.len());

let mut lhs_grand_product_chains =
Vec::with_capacity(DEFAULT_NUM_PERMUTATION_ARGUMENT_REPETITIONS);
let mut rhs_grand_product_chains =
Expand All @@ -123,8 +138,14 @@ pub(crate) fn compute_ram_circuit_snapshots<CB: FnMut(WitnessGenerationArtifact)
round_function,
);

let lhs_contributions = unsorted_encodings;
let rhs_contributions = sorted_encodings;
let lhs_contributions: Vec<_> = all_memory_queries
.iter()
.map(|x| x.encoding_witness())
.collect();
let rhs_contributions: Vec<_> = all_memory_queries_sorted
.iter()
.map(|x| x.encoding_witness())
.collect();

for idx in 0..DEFAULT_NUM_PERMUTATION_ARGUMENT_REPETITIONS {
let (lhs_grand_product_chain, rhs_grand_product_chain) = compute_grand_product_chains(
Expand Down Expand Up @@ -183,7 +204,8 @@ pub(crate) fn compute_ram_circuit_snapshots<CB: FnMut(WitnessGenerationArtifact)
.zip(sorted_memory_queue_chunk_final_states.into_iter())
.zip(transposed_lhs_chains.into_iter())
.zip(transposed_rhs_chains.into_iter())
.zip(sorted_queries_aux_data_for_chunks);
.zip(all_memory_queries.chunks(per_circuit_capacity))
.zip(all_memory_queries_sorted.chunks(per_circuit_capacity));

// now trivial transformation into desired data structures,
// and we are all good
Expand Down Expand Up @@ -211,10 +233,13 @@ pub(crate) fn compute_ram_circuit_snapshots<CB: FnMut(WitnessGenerationArtifact)
idx,
(
(
((unsorted_sponge_final_state, sorted_sponge_final_state), lhs_grand_product),
rhs_grand_product,
(
((unsorted_sponge_final_state, sorted_sponge_final_state), lhs_grand_product),
rhs_grand_product,
),
unsorted_queries_in_chunk,
),
(num_nondet_writes_in_chunk, last_sorted_query, sorted_states_len),
sorted_queries_in_chunk,
),
) in it.enumerate()
{
Expand All @@ -232,6 +257,17 @@ pub(crate) fn compute_ram_circuit_snapshots<CB: FnMut(WitnessGenerationArtifact)
let if_first = idx == 0;
let is_last = idx == num_circuits - 1;

let sorted_states_len = sorted_queries_in_chunk.len();
let num_nondet_writes_in_chunk = sorted_queries_in_chunk
.iter()
.filter(|query| {
query.rw_flag == true
&& query.timestamp.0 == 0
&& query.location.page.0 == BOOTLOADER_HEAP_PAGE
})
.count();
let last_sorted_query = sorted_queries_in_chunk.last().unwrap();

let new_num_nondet_writes =
current_number_of_nondet_writes + (num_nondet_writes_in_chunk as u32);

Expand Down Expand Up @@ -319,10 +355,18 @@ pub(crate) fn compute_ram_circuit_snapshots<CB: FnMut(WitnessGenerationArtifact)
},
},
// we will need witnesses to pop elements from the front of the queue
// but this data should be saved to storage before, during queues simulation (RAM-heavy)
// so we use placeholders here
unsorted_queue_witness: Default::default(),
sorted_queue_witness: Default::default(),
unsorted_queue_witness: FullStateCircuitQueueRawWitness {
elements: unsorted_queries_in_chunk
.into_iter()
.map(|x| (x.reflect(), [Field::ZERO; FULL_SPONGE_QUEUE_STATE_WIDTH]))
.collect(),
},
sorted_queue_witness: FullStateCircuitQueueRawWitness {
elements: sorted_queries_in_chunk
.into_iter()
.map(|x| (x.reflect(), [Field::ZERO; FULL_SPONGE_QUEUE_STATE_WIDTH]))
.collect(),
},
};

if sorted_states_len % per_circuit_capacity != 0 {
Expand Down
Loading
Loading