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

Reduce memory consumption #9

Merged
merged 2 commits into from
Nov 26, 2020
Merged

Reduce memory consumption #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
daf1db1
Reduce memory consumption
Pratyush Nov 26, 2020
d5a58f9
Merge branch 'master' into reduce-memory-consumption
Pratyush Nov 26, 2020
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
11 changes: 8 additions & 3 deletions src/generator.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,8 +68,9 @@ where
///////////////////////////////////////////////////////////////////////////

let reduction_time = start_timer!(|| "R1CS to QAP Instance Map with Evaluation");
let num_instance_variables = cs.num_instance_variables();
let (a, b, c, zt, qap_num_variables, m_raw) =
R1CStoQAP::instance_map_with_evaluation::<E::Fr, D<E::Fr>>(cs.clone(), &t)?;
R1CStoQAP::instance_map_with_evaluation::<E::Fr, D<E::Fr>>(cs, &t)?;
end_timer!(reduction_time);

// Compute query densities
Expand All @@ -85,7 +86,6 @@ where

let gamma_inverse = gamma.inverse().ok_or(SynthesisError::UnexpectedIdentity)?;
let delta_inverse = delta.inverse().ok_or(SynthesisError::UnexpectedIdentity)?;
let num_instance_variables = cs.num_instance_variables();

let gamma_abc = cfg_iter!(a[..num_instance_variables])
.zip(&b[..num_instance_variables])
Expand All @@ -99,6 +99,8 @@ where
.map(|((a, b), c)| (beta * a + &(alpha * b) + c) * &delta_inverse)
.collect::<Vec<_>>();

drop(c);

let g1_generator = E::G1Projective::rand(rng);
let g2_generator = E::G2Projective::rand(rng);

Expand Down Expand Up @@ -137,12 +139,14 @@ where
let a_time = start_timer!(|| "Calculate A");
let a_query =
FixedBaseMSM::multi_scalar_mul::<E::G1Projective>(scalar_bits, g1_window, &g1_table, &a);
drop(a);
end_timer!(a_time);

// Compute the B-query in G1
let b_g1_time = start_timer!(|| "Calculate B G1");
let b_g1_query =
FixedBaseMSM::multi_scalar_mul::<E::G1Projective>(scalar_bits, g1_window, &g1_table, &b);
drop(b);
end_timer!(b_g1_time);

// Compute the H-query
Expand All @@ -164,8 +168,9 @@ where
scalar_bits,
g1_window,
&g1_table,
&l[cs.num_instance_variables()..],
&l[num_instance_variables..],
);
drop(l);
end_timer!(l_time);

end_timer!(proving_key_time);
Expand Down
41 changes: 23 additions & 18 deletions src/prover.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,32 +68,45 @@ where
let witness_map_time = start_timer!(|| "R1CS to QAP witness map");
let h = R1CStoQAP::witness_map::<E::Fr, D<E::Fr>>(cs.clone())?;
end_timer!(witness_map_time);
let h_assignment = cfg_into_iter!(h).map(|s| s.into_repr()).collect::<Vec<_>>();
let c_acc_time = start_timer!(|| "Compute C");

let h_acc = VariableBaseMSM::multi_scalar_mul(&pk.h_query, &h_assignment);
drop(h_assignment);
// Compute C
let prover = cs.borrow().unwrap();
let aux_assignment = cfg_iter!(prover.witness_assignment)
.map(|s| s.into_repr())
.collect::<Vec<_>>();

let l_aux_acc = VariableBaseMSM::multi_scalar_mul(&pk.l_query, &aux_assignment);

let r_s_delta_g1 = pk.delta_g1.into_projective().mul(r).mul(s);

end_timer!(c_acc_time);

let input_assignment = prover.instance_assignment[1..]
.iter()
.map(|s| s.into_repr())
.collect::<Vec<_>>();

let aux_assignment = cfg_iter!(prover.witness_assignment)
.map(|s| s.into_repr())
.collect::<Vec<_>>();
drop(prover);
drop(cs);

let assignment = [&input_assignment[..], &aux_assignment[..]].concat();

let h_assignment = cfg_into_iter!(h).map(|s| s.into_repr()).collect::<Vec<_>>();
drop(aux_assignment);

// Compute A
let a_acc_time = start_timer!(|| "Compute A");
let r_g1 = pk.delta_g1.mul(r);

let g_a = calculate_coeff(r_g1, &pk.a_query, pk.vk.alpha_g1, &assignment);

let s_g_a = g_a.mul(s);
end_timer!(a_acc_time);

// Compute B in G1 if needed
let g1_b = if r != E::Fr::zero() {
let g1_b = if !r.is_zero() {
let b_g1_acc_time = start_timer!(|| "Compute B in G1");
let s_g1 = pk.delta_g1.mul(s);
let g1_b = calculate_coeff(s_g1, &pk.b_g1_query, pk.beta_g1, &assignment);
Expand All @@ -109,26 +122,18 @@ where
let b_g2_acc_time = start_timer!(|| "Compute B in G2");
let s_g2 = pk.vk.delta_g2.mul(s);
let g2_b = calculate_coeff(s_g2, &pk.b_g2_query, pk.vk.beta_g2, &assignment);
let r_g1_b = g1_b.mul(r);
drop(assignment);

end_timer!(b_g2_acc_time);

// Compute C
let c_acc_time = start_timer!(|| "Compute C");

let h_acc = VariableBaseMSM::multi_scalar_mul(&pk.h_query, &h_assignment);

let l_aux_acc = VariableBaseMSM::multi_scalar_mul(&pk.l_query, &aux_assignment);

let s_g_a = g_a.mul(s);
let r_g1_b = g1_b.mul(r);
let r_s_delta_g1 = pk.delta_g1.into_projective().mul(r).mul(s);

let c_time = start_timer!(|| "Finish C");
let mut g_c = s_g_a;
g_c += &r_g1_b;
g_c -= &r_s_delta_g1;
g_c += &l_aux_acc;
g_c += &h_acc;
end_timer!(c_acc_time);
end_timer!(c_time);

end_timer!(prover_time);

Expand Down