mirror of
https://github.com/logos-storage/plonky2.git
synced 2026-01-08 08:43:06 +00:00
* Use U256s in `generate(...)` interfaces; fix reduction bug modular. * Refactor `Operation` trait. * Rename file. * Rename `add_cc` things to `addcy`. * Clippy. * Simplify generation of less-than and greater-than. * Add some comparison tests. * Use `PrimeField64` instead of `RichField` where possible. * Connect `SUBMOD` operation to witness generator. * Add clippy exception. * Add missing verification of range counter column. * Fix generation of RANGE_COUNTER column. * Address William's PR comments.
226 lines
6.4 KiB
Rust
226 lines
6.4 KiB
Rust
use ethereum_types::U256;
|
|
use plonky2::field::types::PrimeField64;
|
|
|
|
use crate::util::{addmod, mulmod, submod};
|
|
|
|
mod addcy;
|
|
mod modular;
|
|
mod mul;
|
|
mod utils;
|
|
|
|
pub mod arithmetic_stark;
|
|
pub(crate) mod columns;
|
|
|
|
#[derive(Clone, Copy, Debug, Eq, PartialEq)]
|
|
pub(crate) enum BinaryOperator {
|
|
Add,
|
|
Mul,
|
|
Sub,
|
|
Div,
|
|
Mod,
|
|
Lt,
|
|
Gt,
|
|
AddFp254,
|
|
MulFp254,
|
|
SubFp254,
|
|
}
|
|
|
|
impl BinaryOperator {
|
|
pub(crate) fn result(&self, input0: U256, input1: U256) -> U256 {
|
|
match self {
|
|
BinaryOperator::Add => input0.overflowing_add(input1).0,
|
|
BinaryOperator::Mul => input0.overflowing_mul(input1).0,
|
|
BinaryOperator::Sub => input0.overflowing_sub(input1).0,
|
|
BinaryOperator::Div => {
|
|
if input1.is_zero() {
|
|
U256::zero()
|
|
} else {
|
|
input0 / input1
|
|
}
|
|
}
|
|
BinaryOperator::Mod => {
|
|
if input1.is_zero() {
|
|
U256::zero()
|
|
} else {
|
|
input0 % input1
|
|
}
|
|
}
|
|
BinaryOperator::Lt => U256::from((input0 < input1) as u8),
|
|
BinaryOperator::Gt => U256::from((input0 > input1) as u8),
|
|
BinaryOperator::AddFp254 => addmod(input0, input1, BN_BASE_ORDER),
|
|
BinaryOperator::MulFp254 => mulmod(input0, input1, BN_BASE_ORDER),
|
|
BinaryOperator::SubFp254 => submod(input0, input1, BN_BASE_ORDER),
|
|
}
|
|
}
|
|
|
|
pub(crate) fn row_filter(&self) -> usize {
|
|
match self {
|
|
BinaryOperator::Add => columns::IS_ADD,
|
|
BinaryOperator::Mul => columns::IS_MUL,
|
|
BinaryOperator::Sub => columns::IS_SUB,
|
|
BinaryOperator::Div => columns::IS_DIV,
|
|
BinaryOperator::Mod => columns::IS_MOD,
|
|
BinaryOperator::Lt => columns::IS_LT,
|
|
BinaryOperator::Gt => columns::IS_GT,
|
|
BinaryOperator::AddFp254 => columns::IS_ADDMOD,
|
|
BinaryOperator::MulFp254 => columns::IS_MULMOD,
|
|
BinaryOperator::SubFp254 => columns::IS_SUBMOD,
|
|
}
|
|
}
|
|
}
|
|
|
|
#[allow(clippy::enum_variant_names)]
|
|
#[derive(Clone, Copy, Debug, Eq, PartialEq)]
|
|
pub(crate) enum TernaryOperator {
|
|
AddMod,
|
|
MulMod,
|
|
SubMod,
|
|
}
|
|
|
|
impl TernaryOperator {
|
|
pub(crate) fn result(&self, input0: U256, input1: U256, input2: U256) -> U256 {
|
|
match self {
|
|
TernaryOperator::AddMod => addmod(input0, input1, input2),
|
|
TernaryOperator::MulMod => mulmod(input0, input1, input2),
|
|
TernaryOperator::SubMod => submod(input0, input1, input2),
|
|
}
|
|
}
|
|
|
|
pub(crate) fn row_filter(&self) -> usize {
|
|
match self {
|
|
TernaryOperator::AddMod => columns::IS_ADDMOD,
|
|
TernaryOperator::MulMod => columns::IS_MULMOD,
|
|
TernaryOperator::SubMod => columns::IS_SUBMOD,
|
|
}
|
|
}
|
|
}
|
|
|
|
#[derive(Debug)]
|
|
#[allow(unused)] // TODO: Should be used soon.
|
|
pub(crate) enum Operation {
|
|
BinaryOperation {
|
|
operator: BinaryOperator,
|
|
input0: U256,
|
|
input1: U256,
|
|
result: U256,
|
|
},
|
|
TernaryOperation {
|
|
operator: TernaryOperator,
|
|
input0: U256,
|
|
input1: U256,
|
|
input2: U256,
|
|
result: U256,
|
|
},
|
|
}
|
|
|
|
impl Operation {
|
|
pub(crate) fn binary(operator: BinaryOperator, input0: U256, input1: U256) -> Self {
|
|
let result = operator.result(input0, input1);
|
|
Self::BinaryOperation {
|
|
operator,
|
|
input0,
|
|
input1,
|
|
result,
|
|
}
|
|
}
|
|
|
|
pub(crate) fn ternary(
|
|
operator: TernaryOperator,
|
|
input0: U256,
|
|
input1: U256,
|
|
input2: U256,
|
|
) -> Self {
|
|
let result = operator.result(input0, input1, input2);
|
|
Self::TernaryOperation {
|
|
operator,
|
|
input0,
|
|
input1,
|
|
input2,
|
|
result,
|
|
}
|
|
}
|
|
|
|
pub(crate) fn result(&self) -> U256 {
|
|
match self {
|
|
Operation::BinaryOperation { result, .. } => *result,
|
|
Operation::TernaryOperation { result, .. } => *result,
|
|
}
|
|
}
|
|
|
|
/// Convert operation into one or two rows of the trace.
|
|
///
|
|
/// Morally these types should be [F; NUM_ARITH_COLUMNS], but we
|
|
/// use vectors because that's what utils::transpose (who consumes
|
|
/// the result of this function as part of the range check code)
|
|
/// expects.
|
|
fn to_rows<F: PrimeField64>(&self) -> (Vec<F>, Option<Vec<F>>) {
|
|
match *self {
|
|
Operation::BinaryOperation {
|
|
operator,
|
|
input0,
|
|
input1,
|
|
result,
|
|
} => binary_op_to_rows(operator, input0, input1, result),
|
|
Operation::TernaryOperation {
|
|
operator,
|
|
input0,
|
|
input1,
|
|
input2,
|
|
result,
|
|
} => ternary_op_to_rows(operator.row_filter(), input0, input1, input2, result),
|
|
}
|
|
}
|
|
}
|
|
|
|
fn ternary_op_to_rows<F: PrimeField64>(
|
|
row_filter: usize,
|
|
input0: U256,
|
|
input1: U256,
|
|
input2: U256,
|
|
_result: U256,
|
|
) -> (Vec<F>, Option<Vec<F>>) {
|
|
let mut row1 = vec![F::ZERO; columns::NUM_ARITH_COLUMNS];
|
|
let mut row2 = vec![F::ZERO; columns::NUM_ARITH_COLUMNS];
|
|
|
|
row1[row_filter] = F::ONE;
|
|
|
|
modular::generate(&mut row1, &mut row2, row_filter, input0, input1, input2);
|
|
|
|
(row1, Some(row2))
|
|
}
|
|
|
|
fn binary_op_to_rows<F: PrimeField64>(
|
|
op: BinaryOperator,
|
|
input0: U256,
|
|
input1: U256,
|
|
result: U256,
|
|
) -> (Vec<F>, Option<Vec<F>>) {
|
|
let mut row = vec![F::ZERO; columns::NUM_ARITH_COLUMNS];
|
|
row[op.row_filter()] = F::ONE;
|
|
|
|
match op {
|
|
BinaryOperator::Add | BinaryOperator::Sub | BinaryOperator::Lt | BinaryOperator::Gt => {
|
|
addcy::generate(&mut row, op.row_filter(), input0, input1);
|
|
(row, None)
|
|
}
|
|
BinaryOperator::Mul => {
|
|
mul::generate(&mut row, input0, input1);
|
|
(row, None)
|
|
}
|
|
BinaryOperator::Div | BinaryOperator::Mod => {
|
|
ternary_op_to_rows::<F>(op.row_filter(), input0, U256::zero(), input1, result)
|
|
}
|
|
BinaryOperator::AddFp254 | BinaryOperator::MulFp254 | BinaryOperator::SubFp254 => {
|
|
ternary_op_to_rows::<F>(op.row_filter(), input0, input1, BN_BASE_ORDER, result)
|
|
}
|
|
}
|
|
}
|
|
|
|
/// Order of the BN254 base field.
|
|
const BN_BASE_ORDER: U256 = U256([
|
|
4332616871279656263,
|
|
10917124144477883021,
|
|
13281191951274694749,
|
|
3486998266802970665,
|
|
]);
|