Skip to content

Commit 091047f

Browse files
authored
Fix padding in LookupTableGate (#1656)
* Fix soundness in Lookups * FIx recursion
1 parent cc0834a commit 091047f

File tree

3 files changed

+28
-7
lines changed

3 files changed

+28
-7
lines changed

plonky2/src/gates/lookup.rs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -197,8 +197,10 @@ impl<F: RichField + Extendable<D>, const D: usize> SimpleGenerator<F, D> for Loo
197197
let get_wire = |wire: usize| -> F { witness.get_target(Target::wire(self.row, wire)) };
198198

199199
let input_val = get_wire(LookupGate::wire_ith_looking_inp(self.slot_nb));
200-
let (input, output) = self.lut[input_val.to_canonical_u64() as usize];
201-
if input_val == F::from_canonical_u16(input) {
200+
if (input_val.to_canonical_u64() as usize) < self.lut.len()
201+
&& input_val == F::from_canonical_u16(self.lut[input_val.to_canonical_u64() as usize].0)
202+
{
203+
let (_, output) = self.lut[input_val.to_canonical_u64() as usize];
202204
let output_val = F::from_canonical_u16(output);
203205

204206
let out_wire = Target::wire(self.row, LookupGate::wire_ith_looking_out(self.slot_nb));

plonky2/src/gates/lookup_table.rs

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -224,9 +224,11 @@ impl<F: RichField + Extendable<D>, const D: usize> SimpleGenerator<F, D> for Loo
224224
out_buffer.set_target(slot_input_target, F::from_canonical_usize(input as usize))?;
225225
out_buffer.set_target(slot_output_target, F::from_canonical_usize(output as usize))
226226
} else {
227-
// Pad with zeros.
228-
out_buffer.set_target(slot_input_target, F::ZERO)?;
229-
out_buffer.set_target(slot_output_target, F::ZERO)
227+
// Pad with first element in the LUT.
228+
assert!(!self.lut.is_empty(), "Empty LUTs are not supported.");
229+
let (input, output) = self.lut[0];
230+
out_buffer.set_target(slot_input_target, F::from_canonical_usize(input as usize))?;
231+
out_buffer.set_target(slot_output_target, F::from_canonical_usize(output as usize))
230232
}
231233
}
232234

plonky2/src/plonk/vanishing_poly.rs

Lines changed: 19 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,17 @@ pub(crate) fn get_lut_poly<F: RichField + Extendable<D>, const D: usize>(
3636
let b = deltas[LookupChallenges::ChallengeB as usize];
3737
let mut coeffs = Vec::with_capacity(common_data.luts[lut_index].len());
3838
let n = common_data.luts[lut_index].len();
39+
let nb_padded_elts = LookupTableGate::num_slots(&common_data.config)
40+
- n % LookupTableGate::num_slots(&common_data.config);
41+
let (padding_inp, padding_out) = common_data.luts[lut_index][0];
3942
for (input, output) in common_data.luts[lut_index].iter() {
4043
coeffs.push(F::from_canonical_u16(*input) + b * F::from_canonical_u16(*output));
4144
}
42-
coeffs.append(&mut vec![F::ZERO; degree - n]);
45+
// Padding with the first element of the LUT.
46+
for _ in 0..nb_padded_elts {
47+
coeffs.push(F::from_canonical_u16(padding_inp) + b * F::from_canonical_u16(padding_out));
48+
}
49+
coeffs.append(&mut vec![F::ZERO; degree - (n + nb_padded_elts)]);
4350
coeffs.reverse();
4451
PolynomialCoeffs::new(coeffs)
4552
}
@@ -756,14 +763,24 @@ pub(crate) fn get_lut_poly_circuit<F: RichField + Extendable<D>, const D: usize>
756763
let b = deltas[LookupChallenges::ChallengeB as usize];
757764
let delta = deltas[LookupChallenges::ChallengeDelta as usize];
758765
let n = common_data.luts[lut_index].len();
766+
let nb_padded_elts = LookupTableGate::num_slots(&common_data.config)
767+
- n % LookupTableGate::num_slots(&common_data.config);
768+
let (padding_inp, padding_out) = common_data.luts[lut_index][0];
759769
let mut coeffs: Vec<Target> = common_data.luts[lut_index]
760770
.iter()
761771
.map(|(input, output)| {
762772
let temp = builder.mul_const(F::from_canonical_u16(*output), b);
763773
builder.add_const(temp, F::from_canonical_u16(*input))
764774
})
765775
.collect();
766-
for _ in n..degree {
776+
777+
// Padding with the first element of the LUT.
778+
for _ in 0..nb_padded_elts {
779+
let temp = builder.mul_const(F::from_canonical_u16(padding_out), b);
780+
let temp = builder.add_const(temp, F::from_canonical_u16(padding_inp));
781+
coeffs.push(temp);
782+
}
783+
for _ in (n + nb_padded_elts)..degree {
767784
coeffs.push(builder.zero());
768785
}
769786
coeffs.reverse();

0 commit comments

Comments
 (0)