mirror of
https://github.com/logos-storage/plonky2.git
synced 2026-01-11 02:03:07 +00:00
More cleaning
This commit is contained in:
wborgeaud
parent
ceae6b9588
commit
bb548fe148
@ -496,9 +496,6 @@ impl<F: Extendable<D>, const D: usize> CircuitBuilder<F, D> {
|
|||||||
)
|
)
|
||||||
};
|
};
|
||||||
let first_out = ExtensionTarget::from_range(gate, range);
|
let first_out = ExtensionTarget::from_range(gate, range);
|
||||||
// let gate = self.num_gates();
|
|
||||||
// let first_out =
|
|
||||||
// ExtensionTarget::from_range(gate, ArithmeticExtensionGate::<D>::wires_first_output());
|
|
||||||
self.double_arithmetic_extension(F::ONE, F::ONE, a, b, zero, c, first_out, zero)
|
self.double_arithmetic_extension(F::ONE, F::ONE, a, b, zero, c, first_out, zero)
|
||||||
.1
|
.1
|
||||||
}
|
}
|
||||||
|
|||||||
@ -14,7 +14,6 @@ pub(crate) mod noop;
|
|||||||
pub(crate) mod public_input;
|
pub(crate) mod public_input;
|
||||||
pub mod random_access;
|
pub mod random_access;
|
||||||
pub mod reducing;
|
pub mod reducing;
|
||||||
pub mod reducing_ext;
|
|
||||||
|
|
||||||
#[cfg(test)]
|
#[cfg(test)]
|
||||||
mod gate_testing;
|
mod gate_testing;
|
||||||
|
|||||||
@ -1,217 +0,0 @@
|
|||||||
use std::ops::Range;
|
|
||||||
|
|
||||||
use crate::field::extension_field::target::ExtensionTarget;
|
|
||||||
use crate::field::extension_field::Extendable;
|
|
||||||
use crate::field::extension_field::FieldExtension;
|
|
||||||
use crate::gates::gate::Gate;
|
|
||||||
use crate::iop::generator::{GeneratedValues, SimpleGenerator, WitnessGenerator};
|
|
||||||
use crate::iop::target::Target;
|
|
||||||
use crate::iop::witness::PartialWitness;
|
|
||||||
use crate::plonk::circuit_builder::CircuitBuilder;
|
|
||||||
use crate::plonk::vars::{EvaluationTargets, EvaluationVars, EvaluationVarsBase};
|
|
||||||
|
|
||||||
/// Computes `sum alpha^i c_i` for a vector `c_i` of `num_coeffs` elements of the extension field.
|
|
||||||
#[derive(Debug, Clone)]
|
|
||||||
pub struct ReducingExtGate<const D: usize> {
|
|
||||||
pub num_coeffs: usize,
|
|
||||||
}
|
|
||||||
|
|
||||||
impl<const D: usize> ReducingExtGate<D> {
|
|
||||||
pub fn new(num_coeffs: usize) -> Self {
|
|
||||||
Self { num_coeffs }
|
|
||||||
}
|
|
||||||
|
|
||||||
pub fn max_coeffs_len(num_wires: usize, num_routed_wires: usize) -> usize {
|
|
||||||
((num_routed_wires - 3 * D) / D).min((num_wires - 2 * D) / (D * 2))
|
|
||||||
}
|
|
||||||
|
|
||||||
pub fn wires_output() -> Range<usize> {
|
|
||||||
0..D
|
|
||||||
}
|
|
||||||
pub fn wires_alpha() -> Range<usize> {
|
|
||||||
D..2 * D
|
|
||||||
}
|
|
||||||
pub fn wires_old_acc() -> Range<usize> {
|
|
||||||
2 * D..3 * D
|
|
||||||
}
|
|
||||||
const START_COEFFS: usize = 3 * D;
|
|
||||||
pub fn wires_coeff(i: usize) -> Range<usize> {
|
|
||||||
Self::START_COEFFS + i * D..Self::START_COEFFS + (i + 1) * D
|
|
||||||
}
|
|
||||||
fn start_accs(&self) -> usize {
|
|
||||||
Self::START_COEFFS + self.num_coeffs * D
|
|
||||||
}
|
|
||||||
fn wires_accs(&self, i: usize) -> Range<usize> {
|
|
||||||
if i == self.num_coeffs - 1 {
|
|
||||||
// The last accumulator is the output.
|
|
||||||
return Self::wires_output();
|
|
||||||
}
|
|
||||||
self.start_accs() + D * i..self.start_accs() + D * (i + 1)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
impl<F: Extendable<D>, const D: usize> Gate<F, D> for ReducingExtGate<D> {
|
|
||||||
fn id(&self) -> String {
|
|
||||||
format!("{:?}", self)
|
|
||||||
}
|
|
||||||
|
|
||||||
fn eval_unfiltered(&self, vars: EvaluationVars<F, D>) -> Vec<F::Extension> {
|
|
||||||
let alpha = vars.get_local_ext_algebra(Self::wires_alpha());
|
|
||||||
let old_acc = vars.get_local_ext_algebra(Self::wires_old_acc());
|
|
||||||
let coeffs = (0..self.num_coeffs)
|
|
||||||
.map(|i| vars.get_local_ext_algebra(Self::wires_coeff(i)))
|
|
||||||
.collect::<Vec<_>>();
|
|
||||||
let accs = (0..self.num_coeffs)
|
|
||||||
.map(|i| vars.get_local_ext_algebra(self.wires_accs(i)))
|
|
||||||
.collect::<Vec<_>>();
|
|
||||||
|
|
||||||
let mut constraints = Vec::with_capacity(<Self as Gate<F, D>>::num_constraints(self));
|
|
||||||
let mut acc = old_acc;
|
|
||||||
for i in 0..self.num_coeffs {
|
|
||||||
constraints.push(acc * alpha + coeffs[i] - accs[i]);
|
|
||||||
acc = accs[i];
|
|
||||||
}
|
|
||||||
|
|
||||||
constraints
|
|
||||||
.into_iter()
|
|
||||||
.flat_map(|alg| alg.to_basefield_array())
|
|
||||||
.collect()
|
|
||||||
}
|
|
||||||
|
|
||||||
fn eval_unfiltered_base(&self, vars: EvaluationVarsBase<F>) -> Vec<F> {
|
|
||||||
let alpha = vars.get_local_ext(Self::wires_alpha());
|
|
||||||
let old_acc = vars.get_local_ext(Self::wires_old_acc());
|
|
||||||
let coeffs = (0..self.num_coeffs)
|
|
||||||
.map(|i| vars.get_local_ext(Self::wires_coeff(i)))
|
|
||||||
.collect::<Vec<_>>();
|
|
||||||
let accs = (0..self.num_coeffs)
|
|
||||||
.map(|i| vars.get_local_ext(self.wires_accs(i)))
|
|
||||||
.collect::<Vec<_>>();
|
|
||||||
|
|
||||||
let mut constraints = Vec::with_capacity(<Self as Gate<F, D>>::num_constraints(self));
|
|
||||||
let mut acc = old_acc;
|
|
||||||
for i in 0..self.num_coeffs {
|
|
||||||
constraints.extend((acc * alpha + coeffs[i] - accs[i]).to_basefield_array());
|
|
||||||
acc = accs[i];
|
|
||||||
}
|
|
||||||
|
|
||||||
constraints
|
|
||||||
}
|
|
||||||
|
|
||||||
fn eval_unfiltered_recursively(
|
|
||||||
&self,
|
|
||||||
builder: &mut CircuitBuilder<F, D>,
|
|
||||||
vars: EvaluationTargets<D>,
|
|
||||||
) -> Vec<ExtensionTarget<D>> {
|
|
||||||
let alpha = vars.get_local_ext_algebra(Self::wires_alpha());
|
|
||||||
let old_acc = vars.get_local_ext_algebra(Self::wires_old_acc());
|
|
||||||
let coeffs = (0..self.num_coeffs)
|
|
||||||
.map(|i| vars.get_local_ext_algebra(Self::wires_coeff(i)))
|
|
||||||
.collect::<Vec<_>>();
|
|
||||||
let accs = (0..self.num_coeffs)
|
|
||||||
.map(|i| vars.get_local_ext_algebra(self.wires_accs(i)))
|
|
||||||
.collect::<Vec<_>>();
|
|
||||||
|
|
||||||
let mut constraints = Vec::with_capacity(<Self as Gate<F, D>>::num_constraints(self));
|
|
||||||
let mut acc = old_acc;
|
|
||||||
for i in 0..self.num_coeffs {
|
|
||||||
let coeff = coeffs[i];
|
|
||||||
let mut tmp = builder.mul_add_ext_algebra(acc, alpha, coeff);
|
|
||||||
tmp = builder.sub_ext_algebra(tmp, accs[i]);
|
|
||||||
constraints.push(tmp);
|
|
||||||
acc = accs[i];
|
|
||||||
}
|
|
||||||
|
|
||||||
constraints
|
|
||||||
.into_iter()
|
|
||||||
.flat_map(|alg| alg.to_ext_target_array())
|
|
||||||
.collect()
|
|
||||||
}
|
|
||||||
|
|
||||||
fn generators(
|
|
||||||
&self,
|
|
||||||
gate_index: usize,
|
|
||||||
_local_constants: &[F],
|
|
||||||
) -> Vec<Box<dyn WitnessGenerator<F>>> {
|
|
||||||
vec![Box::new(ReducingGenerator {
|
|
||||||
gate_index,
|
|
||||||
gate: self.clone(),
|
|
||||||
})]
|
|
||||||
}
|
|
||||||
|
|
||||||
fn num_wires(&self) -> usize {
|
|
||||||
2 * D + 2 * D * self.num_coeffs
|
|
||||||
}
|
|
||||||
|
|
||||||
fn num_constants(&self) -> usize {
|
|
||||||
0
|
|
||||||
}
|
|
||||||
|
|
||||||
fn degree(&self) -> usize {
|
|
||||||
2
|
|
||||||
}
|
|
||||||
|
|
||||||
fn num_constraints(&self) -> usize {
|
|
||||||
D * self.num_coeffs
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
struct ReducingGenerator<const D: usize> {
|
|
||||||
gate_index: usize,
|
|
||||||
gate: ReducingExtGate<D>,
|
|
||||||
}
|
|
||||||
|
|
||||||
impl<F: Extendable<D>, const D: usize> SimpleGenerator<F> for ReducingGenerator<D> {
|
|
||||||
fn dependencies(&self) -> Vec<Target> {
|
|
||||||
ReducingExtGate::<D>::wires_alpha()
|
|
||||||
.chain(ReducingExtGate::<D>::wires_old_acc())
|
|
||||||
.chain((0..self.gate.num_coeffs).flat_map(|i| ReducingExtGate::<D>::wires_coeff(i)))
|
|
||||||
.map(|i| Target::wire(self.gate_index, i))
|
|
||||||
.collect()
|
|
||||||
}
|
|
||||||
|
|
||||||
fn run_once(&self, witness: &PartialWitness<F>, out_buffer: &mut GeneratedValues<F>) {
|
|
||||||
let extract_extension = |range: Range<usize>| -> F::Extension {
|
|
||||||
let t = ExtensionTarget::from_range(self.gate_index, range);
|
|
||||||
witness.get_extension_target(t)
|
|
||||||
};
|
|
||||||
|
|
||||||
let alpha = extract_extension(ReducingExtGate::<D>::wires_alpha());
|
|
||||||
let old_acc = extract_extension(ReducingExtGate::<D>::wires_old_acc());
|
|
||||||
let coeffs = (0..self.gate.num_coeffs)
|
|
||||||
.map(|i| extract_extension(ReducingExtGate::<D>::wires_coeff(i)))
|
|
||||||
.collect::<Vec<_>>();
|
|
||||||
let accs = (0..self.gate.num_coeffs)
|
|
||||||
.map(|i| ExtensionTarget::from_range(self.gate_index, self.gate.wires_accs(i)))
|
|
||||||
.collect::<Vec<_>>();
|
|
||||||
let output =
|
|
||||||
ExtensionTarget::from_range(self.gate_index, ReducingExtGate::<D>::wires_output());
|
|
||||||
|
|
||||||
let mut acc = old_acc;
|
|
||||||
for i in 0..self.gate.num_coeffs {
|
|
||||||
let computed_acc = acc * alpha + coeffs[i];
|
|
||||||
out_buffer.set_extension_target(accs[i], computed_acc);
|
|
||||||
acc = computed_acc;
|
|
||||||
}
|
|
||||||
out_buffer.set_extension_target(output, acc);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
#[cfg(test)]
|
|
||||||
mod tests {
|
|
||||||
use anyhow::Result;
|
|
||||||
|
|
||||||
use crate::field::crandall_field::CrandallField;
|
|
||||||
use crate::gates::gate_testing::{test_eval_fns, test_low_degree};
|
|
||||||
use crate::gates::reducing_ext::ReducingExtGate;
|
|
||||||
|
|
||||||
#[test]
|
|
||||||
fn low_degree() {
|
|
||||||
test_low_degree::<CrandallField, _, 4>(ReducingExtGate::new(22));
|
|
||||||
}
|
|
||||||
|
|
||||||
#[test]
|
|
||||||
fn eval_fns() -> Result<()> {
|
|
||||||
test_eval_fns::<CrandallField, _, 4>(ReducingExtGate::new(22))
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -7,7 +7,6 @@ use crate::field::extension_field::{Extendable, Frobenius};
|
|||||||
use crate::field::field_types::Field;
|
use crate::field::field_types::Field;
|
||||||
use crate::gates::arithmetic::ArithmeticExtensionGate;
|
use crate::gates::arithmetic::ArithmeticExtensionGate;
|
||||||
use crate::gates::reducing::ReducingGate;
|
use crate::gates::reducing::ReducingGate;
|
||||||
use crate::gates::reducing_ext::ReducingExtGate;
|
|
||||||
use crate::iop::target::Target;
|
use crate::iop::target::Target;
|
||||||
use crate::plonk::circuit_builder::CircuitBuilder;
|
use crate::plonk::circuit_builder::CircuitBuilder;
|
||||||
use crate::polynomial::polynomial::PolynomialCoeffs;
|
use crate::polynomial::polynomial::PolynomialCoeffs;
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user