Skip to content

Commit

Permalink
MOD: accelerate generate_traces
Browse files Browse the repository at this point in the history
  • Loading branch information
@hongyuanyang-uu
hongyuanyang-uu committed Nov 20, 2023
1 parent a546f49 commit bf25d74
Show file tree
Hide file tree
Showing 21 changed files with 959 additions and 893 deletions.
464 changes: 241 additions & 223 deletions Cargo.lock
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion circuits/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ anyhow = "1.0.40"
itertools = "0.10.3"
maybe_rayon = { path = "../plonky2/maybe_rayon" }
plonky2_util = { path = "../plonky2/util" }
serde = { version = "1.0.144", features = ["derive"] }
serde = { version = "1", features = ["derive"] }
ethereum-types = "0.14.0"
log = "0.4.14"
eth_trie_utils = "0.6.0"
Expand Down
11 changes: 6 additions & 5 deletions circuits/benches/fibo_loop.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ use plonky2::plonk::config::{GenericConfig, PoseidonGoldilocksConfig, Blake3Gold
use plonky2::util::timing::TimingTree;
use std::collections::HashMap;
use std::path::PathBuf;
use std::sync::{Arc, Mutex};
use std::time::{Duration, Instant};

const D: usize = 2;
Expand Down Expand Up @@ -46,7 +47,7 @@ pub fn test_by_asm_json(path: String) {
let mut process = Process::new();
let now = Instant::now();

let calldata = [47u64, 300u64, 2u64, 4185064725u64]
let calldata = [47u64, 1000u64, 2u64, 4185064725u64]
.iter()
.map(|v| GoldilocksField::from_canonical_u64(*v))
.collect_vec();
Expand All @@ -69,8 +70,8 @@ pub fn test_by_asm_json(path: String) {
let mut ola_stark = OlaStark::default();
let now = Instant::now();
let (traces, public_values) =
generate_traces(&program, &mut ola_stark, GenerationInputs::default());
info!("generate_traces time:{}", now.elapsed().as_millis());
generate_traces(program, &mut ola_stark, GenerationInputs::default());
info!("generate_traces time:{}, len{}", now.elapsed().as_millis(), traces[0].get(0).unwrap().values.len());
let now = Instant::now();

let config = StarkConfig::standard_fast_config();
Expand All @@ -92,7 +93,7 @@ pub fn test_by_asm_json(path: String) {
}
}

fn sqrt_prophet_benchmark(c: &mut Criterion) {
fn fib_loop_benchmark(c: &mut Criterion) {
let _ = env_logger::builder()
.filter_level(LevelFilter::Info)
.try_init();
Expand All @@ -111,6 +112,6 @@ fn sqrt_prophet_benchmark(c: &mut Criterion) {
criterion_group![
name = benches;
config = Criterion::default().sample_size(10);
targets = sqrt_prophet_benchmark
targets = fib_loop_benchmark
];
criterion_main!(benches);
3 changes: 2 additions & 1 deletion circuits/benches/sqrt_prophet.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ use plonky2::plonk::config::{GenericConfig, PoseidonGoldilocksConfig, Blake3Gold
use plonky2::util::timing::TimingTree;
use std::collections::HashMap;
use std::path::PathBuf;
use std::sync::{Arc, Mutex};
use std::time::{Duration, Instant};

const D: usize = 2;
Expand Down Expand Up @@ -69,7 +70,7 @@ pub fn test_by_asm_json(path: String) {
let mut ola_stark = OlaStark::default();
let now = Instant::now();
let (traces, public_values) =
generate_traces(&program, &mut ola_stark, GenerationInputs::default());
generate_traces(program, &mut ola_stark, GenerationInputs::default());
info!("generate_traces time:{}", now.elapsed().as_millis());
let now = Instant::now();

Expand Down
2 changes: 1 addition & 1 deletion circuits/src/builtins/cmp/cmp_stark.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ mod tests {
let stark = S::default();

let get_trace_rows = |trace: Trace| trace.builtin_cmp;
let generate_trace = |rows: &[CmpRow]| generate_cmp_trace(rows);
let generate_trace = |rows: &Vec<CmpRow>| generate_cmp_trace(rows);
let eval_packed_generic =
|vars: StarkEvaluationVars<GoldilocksField, GoldilocksField, COL_NUM_CMP>,
constraint_consumer: &mut ConstraintConsumer<GoldilocksField>| {
Expand Down
168 changes: 84 additions & 84 deletions circuits/src/builtins/poseidon/poseidon_chunk_stark.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -284,87 +284,87 @@ impl<F: RichField + Extendable<D>, const D: usize> Stark<F, D> for PoseidonChunk
}
}

mod test {
use core::trace::trace::{PoseidonChunkRow, Trace};
use core::types::Field;
use std::path::PathBuf;

use crate::builtins::poseidon::columns::{
get_poseidon_chunk_col_name_map, NUM_POSEIDON_CHUNK_COLS,
};
use crate::builtins::poseidon::poseidon_chunk_stark::PoseidonChunkStark;
use crate::generation::poseidon_chunk::generate_poseidon_chunk_trace;
use crate::stark::stark::Stark;
use crate::{
stark::{constraint_consumer::ConstraintConsumer, vars::StarkEvaluationVars},
test_utils::test_stark_with_asm_path,
};
use plonky2::{
field::goldilocks_field::GoldilocksField,
plonk::config::{GenericConfig, PoseidonGoldilocksConfig},
};

#[test]
fn test_poseidon_chunk() {
let call_data = vec![
GoldilocksField::ZERO,
GoldilocksField::from_canonical_u64(1239976900),
];
let file_name = "poseidon_hash.json".to_string();
test_poseidon_chunk_with_asm_file_name(file_name, Some(call_data));
}

#[allow(unused)]
fn test_poseidon_chunk_with_asm_file_name(
file_name: String,
call_data: Option<Vec<GoldilocksField>>,
) {
let mut path = PathBuf::from(env!("CARGO_MANIFEST_DIR"));
path.push("../assembler/test_data/asm/");
path.push(file_name);
let program_path = path.display().to_string();

const D: usize = 2;
type C = PoseidonGoldilocksConfig;
type F = <C as GenericConfig<D>>::F;
type S = PoseidonChunkStark<F, D>;
let stark = S::default();

let get_trace_rows = |trace: Trace| trace.builtin_poseidon_chunk;
let generate_trace = |rows: &[PoseidonChunkRow]| generate_poseidon_chunk_trace(rows);
let eval_packed_generic =
|vars: StarkEvaluationVars<
GoldilocksField,
GoldilocksField,
NUM_POSEIDON_CHUNK_COLS,
>,
constraint_consumer: &mut ConstraintConsumer<GoldilocksField>| {
stark.eval_packed_generic(vars, constraint_consumer);
};
let error_hook = |i: usize,
vars: StarkEvaluationVars<
GoldilocksField,
GoldilocksField,
NUM_POSEIDON_CHUNK_COLS,
>| {
println!("constraint error in line {}", i);
let m = get_poseidon_chunk_col_name_map();
println!("{:>32}\t{:>22}\t{:>22}", "name", "lv", "nv");
for col in m.keys() {
let name = m.get(col).unwrap();
let lv = vars.local_values[*col].0;
let nv = vars.next_values[*col].0;
println!("{:>32}\t{:>22}\t{:>22}", name, lv, nv);
}
};
test_stark_with_asm_path(
program_path.to_string(),
get_trace_rows,
generate_trace,
eval_packed_generic,
Some(error_hook),
call_data,
None,
);
}
}
// mod test {
// use core::trace::trace::{PoseidonChunkRow, Trace};
// use core::types::Field;
// use std::path::PathBuf;
//
// use crate::builtins::poseidon::columns::{
// get_poseidon_chunk_col_name_map, NUM_POSEIDON_CHUNK_COLS,
// };
// use crate::builtins::poseidon::poseidon_chunk_stark::PoseidonChunkStark;
// use crate::generation::poseidon_chunk::generate_poseidon_chunk_trace;
// use crate::stark::stark::Stark;
// use crate::{
// stark::{constraint_consumer::ConstraintConsumer, vars::StarkEvaluationVars},
// test_utils::test_stark_with_asm_path,
// };
// use plonky2::{
// field::goldilocks_field::GoldilocksField,
// plonk::config::{GenericConfig, PoseidonGoldilocksConfig},
// };
//
// #[test]
// fn test_poseidon_chunk() {
// let call_data = vec![
// GoldilocksField::ZERO,
// GoldilocksField::from_canonical_u64(1239976900),
// ];
// let file_name = "poseidon_hash.json".to_string();
// test_poseidon_chunk_with_asm_file_name(file_name, Some(call_data));
// }
//
// #[allow(unused)]
// fn test_poseidon_chunk_with_asm_file_name(
// file_name: String,
// call_data: Option<Vec<GoldilocksField>>,
// ) {
// let mut path = PathBuf::from(env!("CARGO_MANIFEST_DIR"));
// path.push("../assembler/test_data/asm/");
// path.push(file_name);
// let program_path = path.display().to_string();
//
// const D: usize = 2;
// type C = PoseidonGoldilocksConfig;
// type F = <C as GenericConfig<D>>::F;
// type S = PoseidonChunkStark<F, D>;
// let stark = S::default();
//
// let get_trace_rows = |trace: Trace| trace.builtin_poseidon_chunk;
// let generate_trace = |rows: &[PoseidonChunkRow]| generate_poseidon_chunk_trace(rows);
// let eval_packed_generic =
// |vars: StarkEvaluationVars<
// GoldilocksField,
// GoldilocksField,
// NUM_POSEIDON_CHUNK_COLS,
// >,
// constraint_consumer: &mut ConstraintConsumer<GoldilocksField>| {
// stark.eval_packed_generic(vars, constraint_consumer);
// };
// let error_hook = |i: usize,
// vars: StarkEvaluationVars<
// GoldilocksField,
// GoldilocksField,
// NUM_POSEIDON_CHUNK_COLS,
// >| {
// println!("constraint error in line {}", i);
// let m = get_poseidon_chunk_col_name_map();
// println!("{:>32}\t{:>22}\t{:>22}", "name", "lv", "nv");
// for col in m.keys() {
// let name = m.get(col).unwrap();
// let lv = vars.local_values[*col].0;
// let nv = vars.next_values[*col].0;
// println!("{:>32}\t{:>22}\t{:>22}", name, lv, nv);
// }
// };
// test_stark_with_asm_path(
// program_path.to_string(),
// get_trace_rows,
// generate_trace,
// eval_packed_generic,
// Some(error_hook),
// call_data,
// None,
// );
// }
// }
Loading

0 comments on commit bf25d74

Please sign in to comment.