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

PR feedback

Browse Source
This commit is contained in:
wborgeaud 2021-06-24 20:53:15 +02:00
parent c7753186b8
commit 2a38f8656f
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/circuit_builder.rs
View File

@ -245,7 +245,7 @@ impl<F: Extendable<D>, const D: usize> CircuitBuilder<F, D> {
.find(|g| g.gate.0.id() == gate.gate_type.0.id()) .find(|g| g.gate.0.id() == gate.gate_type.0.id())
.unwrap() .unwrap()
.prefix; .prefix;
let mut prefixed_constants = Vec::new(); let mut prefixed_constants = Vec::with_capacity(num_constants);
prefixed_constants.extend(prefix.iter().map(|&b| if b { F::ONE } else { F::ZERO })); prefixed_constants.extend(prefix.iter().map(|&b| if b { F::ONE } else { F::ZERO }));
prefixed_constants.extend_from_slice(&gate.constants); prefixed_constants.extend_from_slice(&gate.constants);
prefixed_constants.resize(num_constants, F::ZERO); prefixed_constants.resize(num_constants, F::ZERO);

14
src/gates/gate_tree.rs
View File

@ -66,8 +66,8 @@ impl<F: Extendable<D>, const D: usize> Tree<GateRef<F, D>> {
// The constraint polynomials are padded to the next power in `compute_vanishig_polys`. // The constraint polynomials are padded to the next power in `compute_vanishig_polys`.
// So we can restrict our search space by setting `max_degree` to a power of 2. // So we can restrict our search space by setting `max_degree` to a power of 2.
let max_degree = 1 << max_degree_bits; let max_degree = 1 << max_degree_bits;
for max_wires in 1..100 { for max_constants in 1..100 {
if let Some(mut tree) = Self::find_tree(&gates, max_degree, max_wires) { if let Some(mut tree) = Self::find_tree(&gates, max_degree, max_constants) {
tree.shorten(); tree.shorten();
info!( info!(
"Found tree with max degree {} in {}s.", "Found tree with max degree {} in {}s.",
@ -83,11 +83,11 @@ impl<F: Extendable<D>, const D: usize> Tree<GateRef<F, D>> {
} }
/// Greedily add gates wherever possible. Returns `None` if this fails. /// Greedily add gates wherever possible. Returns `None` if this fails.
fn find_tree(gates: &[GateRef<F, D>], max_degree: usize, max_wires: usize) -> Option<Self> { fn find_tree(gates: &[GateRef<F, D>], max_degree: usize, max_constants: usize) -> Option<Self> {
let mut tree = Tree::default(); let mut tree = Tree::default();
for g in gates { for g in gates {
tree.try_add_gate(g, max_degree, max_wires)?; tree.try_add_gate(g, max_degree, max_constants)?;
} }
Some(tree) Some(tree)
} }
@ -97,12 +97,12 @@ impl<F: Extendable<D>, const D: usize> Tree<GateRef<F, D>> {
&mut self, &mut self,
g: &GateRef<F, D>, g: &GateRef<F, D>,
max_degree: usize, max_degree: usize,
max_wires: usize, max_constants: usize,
) -> Option<()> { ) -> Option<()> {
// We want `gate.degree + depth <= max_degree` and `gate.num_constants + depth <= max_wires`. // We want `gate.degree + depth <= max_degree` and `gate.num_constants + depth <= max_wires`.
let depth = max_degree let depth = max_degree
.checked_sub(g.0.degree())? .checked_sub(g.0.degree())?
.min(max_wires.checked_sub(g.0.num_constants())?); .min(max_constants.checked_sub(g.0.num_constants())?);
self.try_add_gate_at_depth(g, depth) self.try_add_gate_at_depth(g, depth)
} }
@ -249,7 +249,7 @@ mod tests {
assert_ne!( assert_ne!(
&gates_with_prefix[i].1, &gates_with_prefix[i].1,
&gates_with_prefix[j].1[0..gates_with_prefix[i].1.len()], &gates_with_prefix[j].1[0..gates_with_prefix[i].1.len()],
"Some gates share the same prefix" "Some gates share an overlapping prefix"
); );
} }
} }