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

fixes

Browse Source
This commit is contained in:
Nicholas Ward 2021-08-31 10:14:27 -07:00
parent 4ea1df82ba
commit 485d4862ff
2 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/gadgets/permutation.rs
View File

@ -323,6 +323,7 @@ fn route<F: Field, const CHUNK_SIZE: usize>(
scan_index[side],
false,
);
scan_index[side] += 1;
}
}
}

20
src/gates/switch.rs
View File

@ -57,6 +57,7 @@ impl<F: Extendable<D>, const D: usize, const CHUNK_SIZE: usize> SwitchGate<F, D,
}
pub fn wire_switch_bool(num_copies: usize, copy: usize) -> usize {
debug_assert!(copy < num_copies);
num_copies * (4 * CHUNK_SIZE) + copy
}
}
@ -213,7 +214,7 @@ impl<F: Extendable<D>, const D: usize, const CHUNK_SIZE: usize> SimpleGenerator<
SwitchGate::<F, D, CHUNK_SIZE>::wire_second_input(self.copy, e),
));
deps.push(local_target(
SwitchGate::<F, D, CHUNK_SIZE>::wire_switch_bool(self.copy, e),
SwitchGate::<F, D, CHUNK_SIZE>::wire_switch_bool(self.gate.num_copies, self.copy),
));
}
@ -228,15 +229,13 @@ impl<F: Extendable<D>, const D: usize, const CHUNK_SIZE: usize> SimpleGenerator<
let get_local_wire = |input| witness.get_wire(local_wire(input));
let first_output_wire = local_wire(SwitchGate::<F, D, CHUNK_SIZE>::wire_first_output(
self.gate.num_copies,
self.copy,
));
let second_output_wire = local_wire(SwitchGate::<F, D, CHUNK_SIZE>::wire_second_output(
self.gate.num_copies,
self.copy,
));
for e in 0..CHUNK_SIZE {
let first_output_wire = local_wire(SwitchGate::<F, D, CHUNK_SIZE>::wire_first_output(
self.copy, e,
));
let second_output_wire = local_wire(SwitchGate::<F, D, CHUNK_SIZE>::wire_second_output(
self.copy, e,
));
let first_input = get_local_wire(SwitchGate::<F, D, CHUNK_SIZE>::wire_first_input(
self.copy, e,
));
@ -244,7 +243,8 @@ impl<F: Extendable<D>, const D: usize, const CHUNK_SIZE: usize> SimpleGenerator<
self.copy, e,
));
let switch_bool = get_local_wire(SwitchGate::<F, D, CHUNK_SIZE>::wire_switch_bool(
self.copy, e,
self.gate.num_copies,
self.copy,
));
let (first_output, second_output) = if switch_bool == F::ZERO {