logos-storage/plonky2
1
0
Fork 0
mirror of https://github.com/logos-storage/plonky2.git synced 2026-01-07 00:03:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Couple fixes to ReducingGate (#128)

Browse Source
This commit is contained in:
Daniel Lubarov 2021-07-25 09:34:51 -07:00 committed by GitHub
parent 1e5a503a14
commit 3fc02c76bc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/gates/gate_testing.rs
View File

@ -36,6 +36,12 @@ pub(crate) fn test_low_degree<F: Extendable<D>, G: Gate<F, D>, const D: usize>(g
.map(|p| p.degree()) .map(|p| p.degree())
.collect::<Vec<_>>(); .collect::<Vec<_>>();
assert_eq!(
constraint_eval_degrees.len(),
gate.num_constraints(),
"eval should return num_constraints() constraints"
);
let expected_eval_degree = WITNESS_DEGREE * gate.degree(); let expected_eval_degree = WITNESS_DEGREE * gate.degree();
assert!( assert!(

9
src/gates/reducing.rs
View File

@ -22,7 +22,7 @@ impl<const D: usize> ReducingGate<D> {
} }
pub fn max_coeffs_len(num_wires: usize, num_routed_wires: usize) -> usize { pub fn max_coeffs_len(num_wires: usize, num_routed_wires: usize) -> usize {
(num_routed_wires - 3 * D).min((num_wires - 3 * D) / (D + 1)) (num_routed_wires - 3 * D).min((num_wires - 2 * D) / (D + 1))
} }
pub fn wires_output() -> Range<usize> { pub fn wires_output() -> Range<usize> {
@ -56,7 +56,6 @@ impl<F: Extendable<D>, const D: usize> Gate<F, D> for ReducingGate<D> {
} }
fn eval_unfiltered(&self, vars: EvaluationVars<F, D>) -> Vec<F::Extension> { fn eval_unfiltered(&self, vars: EvaluationVars<F, D>) -> Vec<F::Extension> {
let output = vars.get_local_ext_algebra(Self::wires_output());
let alpha = vars.get_local_ext_algebra(Self::wires_alpha()); let alpha = vars.get_local_ext_algebra(Self::wires_alpha());
let old_acc = vars.get_local_ext_algebra(Self::wires_old_acc()); let old_acc = vars.get_local_ext_algebra(Self::wires_old_acc());
let coeffs = self let coeffs = self
@ -81,7 +80,6 @@ impl<F: Extendable<D>, const D: usize> Gate<F, D> for ReducingGate<D> {
} }
fn eval_unfiltered_base(&self, vars: EvaluationVarsBase<F>) -> Vec<F> { fn eval_unfiltered_base(&self, vars: EvaluationVarsBase<F>) -> Vec<F> {
let output = vars.get_local_ext(Self::wires_output());
let alpha = vars.get_local_ext(Self::wires_alpha()); let alpha = vars.get_local_ext(Self::wires_alpha());
let old_acc = vars.get_local_ext(Self::wires_old_acc()); let old_acc = vars.get_local_ext(Self::wires_old_acc());
let coeffs = self let coeffs = self
@ -110,7 +108,6 @@ impl<F: Extendable<D>, const D: usize> Gate<F, D> for ReducingGate<D> {
builder: &mut CircuitBuilder<F, D>, builder: &mut CircuitBuilder<F, D>,
vars: EvaluationTargets<D>, vars: EvaluationTargets<D>,
) -> Vec<ExtensionTarget<D>> { ) -> Vec<ExtensionTarget<D>> {
let output = vars.get_local_ext_algebra(Self::wires_output());
let alpha = vars.get_local_ext_algebra(Self::wires_alpha()); let alpha = vars.get_local_ext_algebra(Self::wires_alpha());
let old_acc = vars.get_local_ext_algebra(Self::wires_old_acc()); let old_acc = vars.get_local_ext_algebra(Self::wires_old_acc());
let coeffs = self let coeffs = self
@ -150,7 +147,7 @@ impl<F: Extendable<D>, const D: usize> Gate<F, D> for ReducingGate<D> {
} }
fn num_wires(&self) -> usize { fn num_wires(&self) -> usize {
3 * D + self.num_coeffs * (D + 1) 2 * D + self.num_coeffs * (D + 1)
} }
fn num_constants(&self) -> usize { fn num_constants(&self) -> usize {
@ -162,7 +159,7 @@ impl<F: Extendable<D>, const D: usize> Gate<F, D> for ReducingGate<D> {
} }
fn num_constraints(&self) -> usize { fn num_constraints(&self) -> usize {
D * (self.num_coeffs + 1) D * self.num_coeffs
} }
} }