mirror of
https://github.com/logos-storage/plonky2.git
synced 2026-01-03 22:33:06 +00:00
* Simplify loop and remove clippy.
* Offset auxiliary coefficients so they're always positive.
* Split mul aux input into lo/hi parts.
* Rename register.
* Combine `QUO_INPUT_{LO,HI}`; rearrange some columns.
* Split `MODULAR_AUX_INPUT` into high and low pieces.
* Remove range_check_error debug output.
* First draft of generating the range checks.
* Remove opcodes for operations that were defined elsewhere.
* Clean up interface to build arithmetic trace.
* Fix "degree too high" bug in DIV by zero.
* Fix constraint_transition usage in recursive compare.
* Fix variable name; use named constant.
* Fix comment values.
* Fix bug in recursive MUL circuit.
* Superficial improvements; remove unnecessary genericity.
* Fix bug in recursive MULMOD circuit.
* Remove debugging noise; expand test.
* Minor comment.
* Enforce assumption in assert.
* Make DIV its own operation.
* Make MOD it's own operation; rename structs; refactor.
* Expand basic test.
* Remove comment.
* Put Stark operations in their own file.
* Test long traces.
* Minor comment.
* Address William's comments.
* Use `const_assert!` instead of `debug_assert!` because Clippy.
128 lines
5.0 KiB
Rust
128 lines
5.0 KiB
Rust
use std::cmp::Ordering;
|
|
|
|
use itertools::Itertools;
|
|
use plonky2::field::extension::Extendable;
|
|
use plonky2::field::packed::PackedField;
|
|
use plonky2::field::types::{Field, PrimeField64};
|
|
use plonky2::hash::hash_types::RichField;
|
|
use plonky2::plonk::circuit_builder::CircuitBuilder;
|
|
|
|
use crate::constraint_consumer::{ConstraintConsumer, RecursiveConstraintConsumer};
|
|
use crate::vars::{StarkEvaluationTargets, StarkEvaluationVars};
|
|
|
|
pub(crate) fn eval_lookups<F: Field, P: PackedField<Scalar = F>, const COLS: usize>(
|
|
vars: StarkEvaluationVars<F, P, COLS>,
|
|
yield_constr: &mut ConstraintConsumer<P>,
|
|
col_permuted_input: usize,
|
|
col_permuted_table: usize,
|
|
) {
|
|
let local_perm_input = vars.local_values[col_permuted_input];
|
|
let next_perm_table = vars.next_values[col_permuted_table];
|
|
let next_perm_input = vars.next_values[col_permuted_input];
|
|
|
|
// A "vertical" diff between the local and next permuted inputs.
|
|
let diff_input_prev = next_perm_input - local_perm_input;
|
|
// A "horizontal" diff between the next permuted input and permuted table value.
|
|
let diff_input_table = next_perm_input - next_perm_table;
|
|
|
|
yield_constr.constraint(diff_input_prev * diff_input_table);
|
|
|
|
// This is actually constraining the first row, as per the spec, since `diff_input_table`
|
|
// is a diff of the next row's values. In the context of `constraint_last_row`, the next
|
|
// row is the first row.
|
|
yield_constr.constraint_last_row(diff_input_table);
|
|
}
|
|
|
|
pub(crate) fn eval_lookups_circuit<
|
|
F: RichField + Extendable<D>,
|
|
const D: usize,
|
|
const COLS: usize,
|
|
>(
|
|
builder: &mut CircuitBuilder<F, D>,
|
|
vars: StarkEvaluationTargets<D, COLS>,
|
|
yield_constr: &mut RecursiveConstraintConsumer<F, D>,
|
|
col_permuted_input: usize,
|
|
col_permuted_table: usize,
|
|
) {
|
|
let local_perm_input = vars.local_values[col_permuted_input];
|
|
let next_perm_table = vars.next_values[col_permuted_table];
|
|
let next_perm_input = vars.next_values[col_permuted_input];
|
|
|
|
// A "vertical" diff between the local and next permuted inputs.
|
|
let diff_input_prev = builder.sub_extension(next_perm_input, local_perm_input);
|
|
// A "horizontal" diff between the next permuted input and permuted table value.
|
|
let diff_input_table = builder.sub_extension(next_perm_input, next_perm_table);
|
|
|
|
let diff_product = builder.mul_extension(diff_input_prev, diff_input_table);
|
|
yield_constr.constraint(builder, diff_product);
|
|
|
|
// This is actually constraining the first row, as per the spec, since `diff_input_table`
|
|
// is a diff of the next row's values. In the context of `constraint_last_row`, the next
|
|
// row is the first row.
|
|
yield_constr.constraint_last_row(builder, diff_input_table);
|
|
}
|
|
|
|
/// Given an input column and a table column, generate the permuted input and permuted table columns
|
|
/// used in the Halo2 permutation argument.
|
|
pub fn permuted_cols<F: PrimeField64>(inputs: &[F], table: &[F]) -> (Vec<F>, Vec<F>) {
|
|
let n = inputs.len();
|
|
|
|
// The permuted inputs do not have to be ordered, but we found that sorting was faster than
|
|
// hash-based grouping. We also sort the table, as this helps us identify "unused" table
|
|
// elements efficiently.
|
|
|
|
// To compare elements, e.g. for sorting, we first need them in canonical form. It would be
|
|
// wasteful to canonicalize in each comparison, as a single element may be involved in many
|
|
// comparisons. So we will canonicalize once upfront, then use `to_noncanonical_u64` when
|
|
// comparing elements.
|
|
|
|
let sorted_inputs = inputs
|
|
.iter()
|
|
.map(|x| x.to_canonical())
|
|
.sorted_unstable_by_key(|x| x.to_noncanonical_u64())
|
|
.collect_vec();
|
|
let sorted_table = table
|
|
.iter()
|
|
.map(|x| x.to_canonical())
|
|
.sorted_unstable_by_key(|x| x.to_noncanonical_u64())
|
|
.collect_vec();
|
|
|
|
let mut unused_table_inds = Vec::with_capacity(n);
|
|
let mut unused_table_vals = Vec::with_capacity(n);
|
|
let mut permuted_table = vec![F::ZERO; n];
|
|
let mut i = 0;
|
|
let mut j = 0;
|
|
while (j < n) && (i < n) {
|
|
let input_val = sorted_inputs[i].to_noncanonical_u64();
|
|
let table_val = sorted_table[j].to_noncanonical_u64();
|
|
match input_val.cmp(&table_val) {
|
|
Ordering::Greater => {
|
|
unused_table_vals.push(sorted_table[j]);
|
|
j += 1;
|
|
}
|
|
Ordering::Less => {
|
|
if let Some(x) = unused_table_vals.pop() {
|
|
permuted_table[i] = x;
|
|
} else {
|
|
unused_table_inds.push(i);
|
|
}
|
|
i += 1;
|
|
}
|
|
Ordering::Equal => {
|
|
permuted_table[i] = sorted_table[j];
|
|
i += 1;
|
|
j += 1;
|
|
}
|
|
}
|
|
}
|
|
|
|
unused_table_vals.extend_from_slice(&sorted_table[j..n]);
|
|
unused_table_inds.extend(i..n);
|
|
|
|
for (ind, val) in unused_table_inds.into_iter().zip_eq(unused_table_vals) {
|
|
permuted_table[ind] = val;
|
|
}
|
|
|
|
(sorted_inputs, permuted_table)
|
|
}
|