Skip to content
Merged
Changes from all commits
Commits
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
37 changes: 16 additions & 21 deletions ceno_zkvm/src/structs.rs
Original file line number Diff line number Diff line change
Expand Up @@ -474,8 +474,8 @@ impl<E: ExtensionField> ZKVMWitnesses<E> {
let non_first_shard_records = if shard_ctx.is_first_shard() {
final_mem
.par_iter()
.flat_map_iter(|(mem_name, _, final_mem)| {
final_mem.iter().filter_map(|mem_record| {
.flat_map(|(mem_name, _, final_mem)| {
final_mem.par_iter().filter_map(|mem_record| {
// prepare cross shard writes record for those record which not accessed in first record
// but access in future shard
let (waddr, addr): (WordAddr, u32) = match mem_record.ram_type {
Expand Down Expand Up @@ -521,9 +521,9 @@ impl<E: ExtensionField> ZKVMWitnesses<E> {
let global_input = shard_ctx
.write_records()
.par_iter()
.flat_map_iter(|records| {
.flat_map(|records| {
// global write -> local reads
records.iter().map(|(vma, record)| {
records.par_iter().map(|(vma, record)| {
let global_write: ShardRamRecord = (vma, record, true).into();
let ec_point: ECPoint<E> = global_write.to_ec_point(&perm);
ShardRamInput {
Expand All @@ -534,23 +534,18 @@ impl<E: ExtensionField> ZKVMWitnesses<E> {
})
})
.chain(non_first_shard_records.into_par_iter())
.chain(
shard_ctx
.read_records()
.par_iter()
.flat_map_iter(|records| {
// global read -> local write
records.iter().map(|(vma, record)| {
let global_read: ShardRamRecord = (vma, record, false).into();
let ec_point: ECPoint<E> = global_read.to_ec_point(&perm);
ShardRamInput {
name: "current_shard_external_read",
record: global_read,
ec_point,
}
})
}),
)
.chain(shard_ctx.read_records().par_iter().flat_map(|records| {
// global read -> local write
records.par_iter().map(|(vma, record)| {
let global_read: ShardRamRecord = (vma, record, false).into();
let ec_point: ECPoint<E> = global_read.to_ec_point(&perm);
ShardRamInput {
name: "current_shard_external_read",
record: global_read,
ec_point,
}
})
}))
.collect::<Vec<_>>();

if tracing::enabled!(Level::DEBUG) {
Expand Down