logos-storage/plonky2
1
0
Fork 0
mirror of https://github.com/logos-storage/plonky2.git synced 2026-02-17 20:33:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Not working yet

Browse Source
This commit is contained in:
wborgeaud 2022-03-23 15:47:22 +01:00
parent 7cf3220439
commit c6ebd06907
7 changed files with 59 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
plonky2/src/gadgets/arithmetic_extension.rs
View File

@ -613,6 +613,7 @@ mod tests {
type FF = <C as GenericConfig<D>>::FE;
let config = CircuitConfig::standard_recursion_zk_config();
let config = CircuitConfig::standard_recursion_config();
let pw = PartialWitness::new();
let mut builder = CircuitBuilder::<F, D>::new(config);

18
plonky2/src/gates/gate.rs
View File

@ -86,13 +86,14 @@ pub trait Gate<F: RichField + Extendable<D>, const D: usize>: 'static + Send + S
gate_index: usize,
selector_index: usize,
combination_range: (usize, usize),
num_selectors: usize,
) -> Vec<F::Extension> {
let filter = compute_filter(
gate_index,
combination_range,
vars.local_constants[selector_index],
);
vars.remove_prefix(prefix);
vars.remove_prefix(num_selectors);
self.eval_unfiltered(vars)
.into_iter()
.map(|c| filter * c)
@ -107,6 +108,7 @@ pub trait Gate<F: RichField + Extendable<D>, const D: usize>: 'static + Send + S
gate_index: usize,
selector_index: usize,
combination_range: (usize, usize),
num_selectors: usize,
) -> Vec<F> {
let filters: Vec<_> = vars_batch
.iter()
@ -118,7 +120,7 @@ pub trait Gate<F: RichField + Extendable<D>, const D: usize>: 'static + Send + S
)
})
.collect();
vars_batch.remove_prefix(prefix);
vars_batch.remove_prefix(num_selectors);
let mut res_batch = self.eval_unfiltered_base_batch(vars_batch);
for res_chunk in res_batch.chunks_exact_mut(filters.len()) {
batch_multiply_inplace(res_chunk, &filters);
@ -131,17 +133,19 @@ pub trait Gate<F: RichField + Extendable<D>, const D: usize>: 'static + Send + S
&self,
builder: &mut CircuitBuilder<F, D>,
mut vars: EvaluationTargets<D>,
gate_index: usize,
selector_index: usize,
combination_range: (usize, usize),
combined_gate_constraints: &mut [ExtensionTarget<D>],
num_selectors: usize,
) {
let filter = compute_filter_recursively(
builder,
selector_index,
gate_index,
combination_range,
vars.local_constants[selector_index],
);
vars.remove_prefix(prefix);
vars.remove_prefix(num_selectors);
let my_constraints = self.eval_unfiltered_recursively(builder, vars);
for (acc, c) in combined_gate_constraints.iter_mut().zip(my_constraints) {
*acc = builder.mul_add_extension(filter, c, *acc);
@ -244,18 +248,20 @@ fn compute_filter<'a, K: Field>(
) -> K {
(combination_range.0..combination_range.1)
.filter(|&i| i != gate_index)
.chain(Some(u32::MAX as usize))
.map(|i| K::from_canonical_usize(i) - constant)
.product()
}
fn compute_filter_recursively<F: RichField + Extendable<D>, const D: usize>(
builder: &mut CircuitBuilder<F, D>,
selector_index: usize,
gate_index: usize,
combination_range: (usize, usize),
constant: ExtensionTarget<D>,
) -> ExtensionTarget<D> {
let v = (combination_range.0..combination_range.1)
.filter(|&i| i != selector_index)
.filter(|&i| i != gate_index)
.chain(Some(u32::MAX as usize))
.map(|i| builder.constant_extension(F::Extension::from_canonical_usize(i)))
.collect::<Vec<_>>();
let v = v

39
plonky2/src/gates/selectors.rs
View File

@ -8,7 +8,12 @@ pub(crate) fn compute_selectors<F: RichField + Extendable<D>, const D: usize>(
mut gates: Vec<GateRef<F, D>>,
instances: &[GateInstance<F, D>],
max_degree: usize,
) -> (Vec<PolynomialValues<F>>, Vec<usize>, Vec<(usize, usize)>) {
) -> (
Vec<PolynomialValues<F>>,
Vec<usize>,
Vec<(usize, usize)>,
usize,
) {
let n = instances.len();
let mut combinations = Vec::new();
@ -16,15 +21,16 @@ pub(crate) fn compute_selectors<F: RichField + Extendable<D>, const D: usize>(
while pos < gates.len() {
let mut i = 0;
while (pos + i < gates.len()) && (i + gates[pos + i].0.degree() <= max_degree + 1) {
while (pos + i < gates.len()) && (i + gates[pos + i].0.degree() <= max_degree) {
i += 1;
}
combinations.push((pos, pos + i));
pos += i;
}
dbg!(&combinations);
let bad = F::from_canonical_usize(u32::MAX as usize);
let num_constants_polynomials =
0.max(gates.iter().map(|g| g.0.num_constants()).max().unwrap() - combinations.len() + 1);
let num_constants_polynomials = gates.iter().map(|g| g.0.num_constants()).max().unwrap();
let mut polynomials =
vec![PolynomialValues::zero(n); combinations.len() + num_constants_polynomials];
@ -53,17 +59,20 @@ pub(crate) fn compute_selectors<F: RichField + Extendable<D>, const D: usize>(
let i = index(gate_ref.0.id());
let comb = combination(i);
polynomials[comb].values[j] = F::from_canonical_usize(i);
let mut k = 0;
let mut constant_ind = 0;
while k < constants.len() {
if constant_ind == comb {
constant_ind += 1;
} else {
polynomials[constant_ind].values[j] = constants[k];
constant_ind += 1;
k += 1;
}
for combis in (0..combinations.len()).filter(|&combis| combis != comb) {
polynomials[combis].values[j] = bad;
}
for k in 0..constants.len() {
polynomials[combinations.len() + k].values[j] = constants[k];
}
}
(polynomials, selector_indices, combination_ranges)
(
polynomials,
selector_indices,
combination_ranges,
combinations.len(),
)
}

14
plonky2/src/plonk/circuit_builder.rs
View File

@ -676,12 +676,13 @@ impl<F: RichField + Extendable<D>, const D: usize> CircuitBuilder<F, D> {
let mut gates = self.gates.iter().cloned().collect::<Vec<_>>();
gates.sort_unstable_by_key(|g| g.0.degree());
dbg!(&gates);
let (constant_vecs, selector_indices, combination_nums) = compute_selectors(
gates.clone(),
&self.gate_instances,
self.config.max_quotient_degree_factor + 1,
);
dbg!(&constant_vecs, &selector_indices, &combination_nums);
let (constant_vecs, selector_indices, combination_ranges, num_selectors) =
compute_selectors(
gates.clone(),
&self.gate_instances,
self.config.max_quotient_degree_factor + 1,
);
dbg!(&constant_vecs, &selector_indices, &combination_ranges);
let num_constants = constant_vecs.len();
// let (gate_tree, max_filtered_constraint_degree, num_constants) = Tree::from_gates(gates);
// let prefixed_gates = PrefixedGate::from_tree(gate_tree);
@ -805,6 +806,7 @@ impl<F: RichField + Extendable<D>, const D: usize> CircuitBuilder<F, D> {
gates,
selector_indices,
combination_ranges,
num_selectors,
quotient_degree_factor,
num_gate_constraints,
num_constants,

1
plonky2/src/plonk/circuit_data.rs
View File

@ -250,6 +250,7 @@ pub struct CommonCircuitData<
pub(crate) selector_indices: Vec<usize>,
pub(crate) combination_ranges: Vec<(usize, usize)>,
pub(crate) num_selectors: usize,
/// The degree of the PLONK quotient polynomial.
pub(crate) quotient_degree_factor: usize,

10
plonky2/src/plonk/vanishing_poly.rs
View File

@ -217,10 +217,11 @@ pub fn evaluate_gate_constraints<
let mut constraints = vec![F::Extension::ZERO; common_data.num_gate_constraints];
for (i, gate) in common_data.gates.iter().enumerate() {
let gate_constraints = gate.0.eval_filtered(
vars.clone(),
vars,
i,
common_data.selector_indices[i],
common_data.combination_ranges[i],
common_data.num_selectors,
);
for (i, c) in gate_constraints.into_iter().enumerate() {
debug_assert!(
@ -253,6 +254,7 @@ pub fn evaluate_gate_constraints_base_batch<
i,
common_data.selector_indices[i],
common_data.combination_ranges[i],
common_data.num_selectors,
);
debug_assert!(
gate_constraints_batch.len() <= constraints_batch.len(),
@ -283,10 +285,12 @@ pub fn evaluate_gate_constraints_recursively<
&format!("evaluate {} constraints", gate.0.id()),
gate.0.eval_filtered_recursively(
builder,
vars.clone(),
vars,
i,
common_data.selector_indices[i],
common_data.combination_ranges[i],
&mut all_gate_constraints
&mut all_gate_constraints,
common_data.num_selectors
)
);
}

12
plonky2/src/plonk/vars.rs
View File

@ -55,8 +55,8 @@ impl<'a, F: RichField + Extendable<D>, const D: usize> EvaluationVars<'a, F, D>
ExtensionAlgebra::from_basefield_array(arr)
}
pub fn remove_prefix(&mut self, prefix: &[bool]) {
self.local_constants = &self.local_constants[prefix.len()..];
pub fn remove_prefix(&mut self, num_selectors: usize) {
self.local_constants = &self.local_constants[num_selectors..];
}
}
@ -77,8 +77,8 @@ impl<'a, F: Field> EvaluationVarsBaseBatch<'a, F> {
}
}
pub fn remove_prefix(&mut self, prefix: &[bool]) {
self.local_constants = &self.local_constants[prefix.len() * self.len()..];
pub fn remove_prefix(&mut self, num_selectors: usize) {
self.local_constants = &self.local_constants[num_selectors * self.len()..];
}
pub fn len(&self) -> usize {
@ -209,8 +209,8 @@ impl<'a, P: PackedField> ExactSizeIterator for EvaluationVarsBaseBatchIterPacked
}
impl<'a, const D: usize> EvaluationTargets<'a, D> {
pub fn remove_prefix(&mut self, prefix: &[bool]) {
self.local_constants = &self.local_constants[prefix.len()..];
pub fn remove_prefix(&mut self, num_selectors: usize) {
self.local_constants = &self.local_constants[num_selectors..];
}
}