Skip to content

Commit

Permalink
Replace to mv-lookup in verifier.
Browse files Browse the repository at this point in the history
  • Loading branch information
@silathdiir
silathdiir committed Nov 6, 2023
1 parent 9e39d74 commit a7251c5
Show file tree
Hide file tree
Showing 3 changed files with 64 additions and 80 deletions.
134 changes: 56 additions & 78 deletions snark-verifier/src/system/halo2.rs
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
//! [`halo2_proofs`] proof system
//! Reference <https://hackmd.io/@dieGzUCgSGmRZFQ7SDxXCA/rk_0OgSla>
use crate::{
halo2_proofs::{
plonk::{
Expand All @@ -12,6 +13,7 @@ use crate::{
},
util::{
arithmetic::{root_of_unity, CurveAffine, Domain, FieldExt, Rotation},
izip,
protocol::{
CommonPolynomial, Expression, InstanceCommittingKey, Query, QuotientPolynomial,
},
Expand Down Expand Up @@ -116,7 +118,7 @@ pub fn compile<'a, C: CurveAffine, P: Params<'a, C>>(
.chain(polynomials.random_query())
.chain(polynomials.permutation_fixed_queries())
.chain((0..num_proof).flat_map(move |t| polynomials.permutation_z_queries::<true>(t)))
.chain((0..num_proof).flat_map(move |t| polynomials.lookup_queries::<true>(t)))
.chain((0..num_proof).flat_map(move |t| polynomials.lookup_queries(t)))
.collect();

let queries = (0..num_proof)
Expand All @@ -125,7 +127,7 @@ pub fn compile<'a, C: CurveAffine, P: Params<'a, C>>(
.chain(polynomials.instance_queries(t))
.chain(polynomials.advice_queries(t))
.chain(polynomials.permutation_z_queries::<false>(t))
.chain(polynomials.lookup_queries::<false>(t))
.chain(polynomials.lookup_queries(t))
})
.chain(polynomials.fixed_queries())
.chain(polynomials.permutation_fixed_queries())
Expand Down Expand Up @@ -180,10 +182,10 @@ struct Polynomials<'a, F: FieldExt> {
num_challenge: Vec<usize>,
advice_index: Vec<usize>,
challenge_index: Vec<usize>,
num_lookup_permuted: usize,
num_lookup_m: usize,
permutation_chunk_size: usize,
num_permutation_z: usize,
num_lookup_z: usize,
num_lookup_phi: usize,
}

impl<'a, F: FieldExt> Polynomials<'a, F> {
Expand Down Expand Up @@ -236,13 +238,13 @@ impl<'a, F: FieldExt> Polynomials<'a, F> {
num_challenge,
advice_index,
challenge_index,
num_lookup_permuted: 2 * cs.lookups().len(),
num_lookup_m: cs.lookups().len(),
permutation_chunk_size,
num_permutation_z: Integer::div_ceil(
&cs.permutation().get_columns().len(),
&permutation_chunk_size,
),
num_lookup_z: cs.lookups().len(),
num_lookup_phi: cs.lookups().len(),
}
}

Expand All @@ -258,8 +260,8 @@ impl<'a, F: FieldExt> Polynomials<'a, F> {
iter::empty()
.chain(self.num_advice.clone().iter().map(|num| self.num_proof * num))
.chain([
self.num_proof * self.num_lookup_permuted,
self.num_proof * (self.num_permutation_z + self.num_lookup_z) + self.zk as usize,
self.num_proof * self.num_lookup_m,
self.num_proof * (self.num_permutation_z + self.num_lookup_phi) + self.zk as usize,
])
.collect()
}
Expand Down Expand Up @@ -376,40 +378,17 @@ impl<'a, F: FieldExt> Polynomials<'a, F> {
}
}

fn lookup_poly(&'a self, t: usize, i: usize) -> (usize, usize, usize) {
let permuted_offset = self.cs_witness_offset();
let z_offset = permuted_offset
+ self.num_witness()[self.num_advice.len()]
+ self.num_proof * self.num_permutation_z;
let z = z_offset + t * self.num_lookup_z + i;
let permuted_input = permuted_offset + 2 * (t * self.num_lookup_z + i);
let permuted_table = permuted_input + 1;
(z, permuted_input, permuted_table)
fn lookup_poly(&'a self, t: usize, i: usize) -> (usize, usize) {
let m = self.cs_witness_offset() + t * self.num_lookup_m + i;
let phi =
m + self.num_witness()[self.num_advice.len()] + self.num_proof * self.num_permutation_z;
(m, phi)
}

fn lookup_queries<const EVAL: bool>(
&'a self,
t: usize,
) -> impl IntoIterator<Item = Query> + 'a {
(0..self.num_lookup_z).flat_map(move |i| {
let (z, permuted_input, permuted_table) = self.lookup_poly(t, i);
if EVAL {
[
Query::new(z, 0),
Query::new(z, 1),
Query::new(permuted_input, 0),
Query::new(permuted_input, -1),
Query::new(permuted_table, 0),
]
} else {
[
Query::new(z, 0),
Query::new(permuted_input, 0),
Query::new(permuted_table, 0),
Query::new(permuted_input, -1),
Query::new(z, 1),
]
}
fn lookup_queries(&'a self, t: usize) -> impl IntoIterator<Item = Query> + 'a {
(0..self.num_lookup_phi).flat_map(move |i| {
let (m, phi) = self.lookup_poly(t, i);
[Query::new(phi, 0), Query::new(phi, 1), Query::new(m, 0)]
})
}

Expand Down Expand Up @@ -598,22 +577,18 @@ impl<'a, F: FieldExt> Polynomials<'a, F> {
}

fn lookup_constraints(&'a self, t: usize) -> impl IntoIterator<Item = Expression<F>> + 'a {
let one = &Expression::Constant(F::one());
let l_0 = &Expression::<F>::CommonPolynomial(CommonPolynomial::Lagrange(0));
let l_last = &self.l_last();
let l_active = &self.l_active();
let beta = &self.beta();
let gamma = &self.gamma();

let polys = (0..self.num_lookup_z)
let polys = (0..self.num_lookup_phi)
.map(|i| {
let (z, permuted_input, permuted_table) = self.lookup_poly(t, i);
let (m, phi) = self.lookup_poly(t, i);
(
Expression::<F>::Polynomial(Query::new(z, 0)),
Expression::<F>::Polynomial(Query::new(z, 1)),
Expression::<F>::Polynomial(Query::new(permuted_input, 0)),
Expression::<F>::Polynomial(Query::new(permuted_input, -1)),
Expression::<F>::Polynomial(Query::new(permuted_table, 0)),
Expression::<F>::Polynomial(Query::new(phi, 0)),
Expression::<F>::Polynomial(Query::new(phi, 1)),
Expression::<F>::Polynomial(Query::new(m, 0)),
)
})
.collect_vec();
Expand All @@ -629,35 +604,38 @@ impl<'a, F: FieldExt> Polynomials<'a, F> {
.lookups()
.iter()
.zip(polys.iter())
.flat_map(
|(
lookup,
(z, z_omega, permuted_input, permuted_input_omega_inv, permuted_table),
)| {
let input = compress(lookup.input_expressions());
let table = compress(lookup.table_expressions());
iter::empty()
.chain(Some(l_0 * (one - z)))
.chain(self.zk.then(|| l_last * (z * z - z)))
.chain(Some(if self.zk {
l_active
* (z_omega * (permuted_input + beta) * (permuted_table + gamma)
- z * (input + beta) * (table + gamma))
} else {
z_omega * (permuted_input + beta) * (permuted_table + gamma)
- z * (input + beta) * (table + gamma)
}))
.chain(self.zk.then(|| l_0 * (permuted_input - permuted_table)))
.chain(Some(if self.zk {
l_active
* (permuted_input - permuted_table)
* (permuted_input - permuted_input_omega_inv)
} else {
(permuted_input - permuted_table)
* (permuted_input - permuted_input_omega_inv)
}))
},
)
.flat_map(|(lookup, (phi, phi_omega, m))| {
let inputs = lookup
.input_expressions()
.iter()
.map(|expressions| compress(expressions) + beta)
.collect_vec();
let table = &(compress(lookup.table_expressions()) + beta);
iter::empty().chain(Some(l_0 * phi)).chain(self.zk.then(|| l_last * phi)).chain(
Some(if self.zk {
let input_prod = &inputs.iter().cloned().product::<Expression<_>>();
let lhs = table * input_prod * (phi_omega - phi);
let rhs = (inputs.len() > 1)
.then(|| {
(0..inputs.len())
.map(|i| {
izip!(0.., &inputs)
.filter_map(|(j, input)| (i != j).then_some(input))
.cloned()
.product()
})
.sum::<Expression<_>>()
* table
})
.unwrap_or_else(|| table.clone())
- m * input_prod;

l_active * (lhs - rhs)
} else {
unimplemented!()
}),
)
})
.collect_vec()
}

Expand Down
2 changes: 1 addition & 1 deletion snark-verifier/src/util.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ pub mod poly;
pub mod protocol;
pub mod transcript;

pub(crate) use itertools::Itertools;
pub(crate) use itertools::{izip, Itertools};

#[cfg(feature = "parallel")]
pub(crate) use rayon::current_num_threads;
Expand Down
8 changes: 7 additions & 1 deletion snark-verifier/src/util/protocol.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ use std::{
collections::{BTreeMap, BTreeSet},
fmt::Debug,
iter::{
Sum, {self},
Product, Sum, {self},
},
ops::{Add, Mul, Neg, Sub},
};
Expand Down Expand Up @@ -346,6 +346,12 @@ impl<F: Clone + Default> Sum for Expression<F> {
}
}

impl<F: Field> Product for Expression<F> {
fn product<I: Iterator<Item = Self>>(iter: I) -> Self {
iter.reduce(|acc, item| acc * item).unwrap_or_else(|| Expression::Constant(F::one()))
}
}

impl<F: Field> One for Expression<F> {
fn one() -> Self {
Expression::Constant(F::one())
Expand Down

0 comments on commit a7251c5

Please sign in to comment.