Skip to content

Commit

Permalink
chore: Remove duplicate store in benches (#788)
Browse files Browse the repository at this point in the history
  • Loading branch information
@samuelburnham
samuelburnham authored Oct 24, 2023
1 parent 1ad6470 commit ee66fe0
Showing 1 changed file with 16 additions and 54 deletions.
70 changes: 16 additions & 54 deletions benches/end2end.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ use camino::Utf8Path;
use criterion::{
black_box, criterion_group, criterion_main, BatchSize, BenchmarkId, Criterion, SamplingMode,
};
use pasta_curves::pallas::Scalar as Fr;
use pasta_curves::pallas::Scalar as Fq;

use lurk::{
circuit::circuit_frame::MultiFrame,
Expand All @@ -22,7 +22,6 @@ use lurk::{
state::State,
store::Store,
};
use pasta_curves::pallas;
use std::time::Duration;
use std::{cell::RefCell, rc::Rc, sync::Arc};

Expand Down Expand Up @@ -59,7 +58,7 @@ fn end2end_benchmark(c: &mut Criterion) {
.sample_size(10);

let limit = 1_000_000_000;
let lang_pallas = Lang::<pallas::Scalar, Coproc<pallas::Scalar>>::new();
let lang_pallas = Lang::<Fq, Coproc<Fq>>::new();
let lang_pallas_rc = Arc::new(lang_pallas.clone());
let reduction_count = DEFAULT_REDUCTION_COUNT;

Expand Down Expand Up @@ -88,7 +87,7 @@ fn end2end_benchmark(c: &mut Criterion) {

group.bench_with_input(benchmark_id, &size, |b, &s| {
b.iter(|| {
let ptr = go_base::<pallas::Scalar>(&store, state.clone(), s.0, s.1);
let ptr = go_base::<Fq>(&store, state.clone(), s.0, s.1);
let _result = prover
.evaluate_and_prove(&pp, ptr, env, &store, limit, &lang_pallas_rc)
.unwrap();
Expand All @@ -107,8 +106,7 @@ fn store_benchmark(c: &mut Criterion) {
.measurement_time(Duration::from_secs(5))
.sample_size(60);

let bls12_store = Store::<Fr>::default();
let pallas_store = Store::<pallas::Scalar>::default();
let pallas_store = Store::<Fq>::default();

let state = State::init_lurk_state().rccell();

Expand All @@ -117,18 +115,10 @@ fn store_benchmark(c: &mut Criterion) {
for size in sizes {
let parameter_string = format!("_{}_{}", size.0, size.1);

let bls12_id = BenchmarkId::new("store_go_base_bls12", &parameter_string);
group.bench_with_input(bls12_id, &size, |b, &s| {
b.iter(|| {
let result = go_base::<Fr>(&bls12_store, state.clone(), s.0, s.1);
black_box(result)
})
});

let pasta_id = BenchmarkId::new("store_go_base_pallas", &parameter_string);
group.bench_with_input(pasta_id, &size, |b, &s| {
b.iter(|| {
let result = go_base::<pallas::Scalar>(&pallas_store, state.clone(), s.0, s.1);
let result = go_base::<Fq>(&pallas_store, state.clone(), s.0, s.1);
black_box(result)
})
});
Expand All @@ -146,8 +136,7 @@ fn hydration_benchmark(c: &mut Criterion) {
.measurement_time(Duration::from_secs(5))
.sample_size(60);

let bls12_store = Store::<Fr>::default();
let pallas_store = Store::<pallas::Scalar>::default();
let pallas_store = Store::<Fq>::default();

let state = State::init_lurk_state().rccell();

Expand All @@ -156,18 +145,10 @@ fn hydration_benchmark(c: &mut Criterion) {
for size in sizes {
let parameter_string = format!("_{}_{}", size.0, size.1);

{
let benchmark_id = BenchmarkId::new("hydration_go_base_bls12", &parameter_string);
group.bench_with_input(benchmark_id, &size, |b, &s| {
let _ptr = go_base::<Fr>(&bls12_store, state.clone(), s.0, s.1);
b.iter(|| bls12_store.hydrate_scalar_cache())
});
}

{
let benchmark_id = BenchmarkId::new("hydration_go_base_pallas", &parameter_string);
group.bench_with_input(benchmark_id, &size, |b, &s| {
let _ptr = go_base::<pallas::Scalar>(&pallas_store, state.clone(), s.0, s.1);
let _ptr = go_base::<Fq>(&pallas_store, state.clone(), s.0, s.1);
b.iter(|| pallas_store.hydrate_scalar_cache())
});
}
Expand All @@ -186,10 +167,8 @@ fn eval_benchmark(c: &mut Criterion) {
.sample_size(60);

let limit = 1_000_000_000;
let lang_bls12 = Lang::<Fr, Coproc<Fr>>::new();
let lang_pallas = Lang::<pallas::Scalar, Coproc<pallas::Scalar>>::new();
let bls12_store = Store::<Fr>::default();
let pallas_store = Store::<pallas::Scalar>::default();
let lang_pallas = Lang::<Fq, Coproc<Fq>>::new();
let pallas_store = Store::<Fq>::default();

let state = State::init_lurk_state().rccell();

Expand All @@ -198,27 +177,10 @@ fn eval_benchmark(c: &mut Criterion) {
for size in sizes {
let parameter_string = format!("_{}_{}", size.0, size.1);

{
let benchmark_id = BenchmarkId::new("eval_go_base_bls12", &parameter_string);
group.bench_with_input(benchmark_id, &size, |b, &s| {
let ptr = go_base::<Fr>(&bls12_store, state.clone(), s.0, s.1);
b.iter(|| {
Evaluator::new(
ptr,
empty_sym_env(&bls12_store),
&bls12_store,
limit,
&lang_bls12,
)
.eval()
})
});
}

{
let benchmark_id = BenchmarkId::new("eval_go_base_pallas", &parameter_string);
group.bench_with_input(benchmark_id, &size, |b, &s| {
let ptr = go_base::<pallas::Scalar>(&pallas_store, state.clone(), s.0, s.1);
let ptr = go_base::<Fq>(&pallas_store, state.clone(), s.0, s.1);
b.iter(|| {
Evaluator::new(
ptr,
Expand Down Expand Up @@ -280,7 +242,7 @@ fn prove_benchmark(c: &mut Criterion) {
.sample_size(10);

let limit = 1_000_000_000;
let lang_pallas = Lang::<pallas::Scalar, Coproc<pallas::Scalar>>::new();
let lang_pallas = Lang::<Fq, Coproc<Fq>>::new();
let lang_pallas_rc = Arc::new(lang_pallas.clone());
let store = Store::default();
let reduction_count = DEFAULT_REDUCTION_COUNT;
Expand All @@ -302,7 +264,7 @@ fn prove_benchmark(c: &mut Criterion) {
.unwrap();

group.bench_with_input(benchmark_id, &size, |b, &s| {
let ptr = go_base::<pallas::Scalar>(&store, state.clone(), s.0, s.1);
let ptr = go_base::<Fq>(&store, state.clone(), s.0, s.1);
let prover = NovaProver::new(reduction_count, lang_pallas.clone());
let frames = MultiFrame::get_evaluation_frames(
|count| prover.needs_frame_padding(count),
Expand Down Expand Up @@ -332,7 +294,7 @@ fn prove_compressed_benchmark(c: &mut Criterion) {
.sample_size(10);

let limit = 1_000_000_000;
let lang_pallas = Lang::<pallas::Scalar, Coproc<pallas::Scalar>>::new();
let lang_pallas = Lang::<Fq, Coproc<Fq>>::new();
let lang_pallas_rc = Arc::new(lang_pallas.clone());
let store = Store::default();
let reduction_count = DEFAULT_REDUCTION_COUNT;
Expand All @@ -357,7 +319,7 @@ fn prove_compressed_benchmark(c: &mut Criterion) {
.unwrap();

group.bench_with_input(benchmark_id, &size, |b, &s| {
let ptr = go_base::<pallas::Scalar>(&store, state.clone(), s.0, s.1);
let ptr = go_base::<Fq>(&store, state.clone(), s.0, s.1);
let prover = NovaProver::new(reduction_count, lang_pallas.clone());
let frames = prover
.get_evaluation_frames(
Expand Down Expand Up @@ -388,7 +350,7 @@ fn verify_benchmark(c: &mut Criterion) {
.sample_size(10);

let limit = 1_000_000_000;
let lang_pallas = Lang::<pallas::Scalar, Coproc<pallas::Scalar>>::new();
let lang_pallas = Lang::<Fq, Coproc<Fq>>::new();
let lang_pallas_rc = Arc::new(lang_pallas.clone());
let store = Store::default();
let reduction_count = DEFAULT_REDUCTION_COUNT;
Expand Down Expand Up @@ -450,7 +412,7 @@ fn verify_compressed_benchmark(c: &mut Criterion) {
.sample_size(10);

let limit = 1_000_000_000;
let lang_pallas = Lang::<pallas::Scalar, Coproc<pallas::Scalar>>::new();
let lang_pallas = Lang::<Fq, Coproc<Fq>>::new();
let lang_pallas_rc = Arc::new(lang_pallas.clone());
let store = Store::default();
let reduction_count = DEFAULT_REDUCTION_COUNT;
Expand Down

0 comments on commit ee66fe0

Please sign in to comment.