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

progress

Browse Source
This commit is contained in:
Nicholas Ward 2021-10-04 16:23:21 -07:00
parent f71adac40b
commit 34eacdada6
2 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/gadgets/arithmetic_u32.rs
View File

@ -3,7 +3,7 @@ use std::marker::PhantomData;
use crate::field::field_types::RichField;
use crate::field::{extension_field::Extendable, field_types::Field};
use crate::gates::arithmetic_u32::U32ArithmeticGate;
use crate::gates::arithmetic_u32::{NUM_U32_ARITHMETIC_OPS, U32ArithmeticGate};
use crate::gates::switch::SwitchGate;
use crate::iop::generator::{GeneratedValues, SimpleGenerator};
use crate::iop::target::Target;
@ -34,7 +34,8 @@ impl<F: RichField + Extendable<D>, const D: usize> CircuitBuilder<F, D> {
U32Target(self.one())
}
pub fn add_mul_u32(
// Returns x * y + z.
pub fn mul_add_u32(
&mut self,
x: U32Target,
y: U32Target,
@ -45,7 +46,7 @@ impl<F: RichField + Extendable<D>, const D: usize> CircuitBuilder<F, D> {
let gate = U32ArithmeticGate {
_phantom: PhantomData,
};
let gate_index = self.add_gate(gate.clone(), vec![]);
let gate_index = self.add_gate(gate, vec![]);
(gate_index, 0)
}
Some((gate_index, copy)) => (gate_index, copy),
@ -87,13 +88,21 @@ impl<F: RichField + Extendable<D>, const D: usize> CircuitBuilder<F, D> {
output_high.0,
);
self.current_u32_arithmetic_gate = Some((gate_index, 0));
if copy == NUM_U32_ARITHMETIC_OPS - 1 {
let gate = U32ArithmeticGate {
_phantom: PhantomData,
};
let gate_index = self.add_gate(gate, vec![]);
self.current_u32_arithmetic_gate = Some((gate_index, 0));
} else {
self.current_u32_arithmetic_gate = Some((gate_index, copy + 1));
}
(output_low, output_high)
}
pub fn add_u32(&mut self, a: U32Target, b: U32Target) -> (U32Target, U32Target) {
self.add_mul_u32(a, self.one_u32(), b)
self.mul_add_u32(a, self.one_u32(), b)
}
pub fn add_three_u32(
@ -109,6 +118,6 @@ impl<F: RichField + Extendable<D>, const D: usize> CircuitBuilder<F, D> {
}
pub fn mul_u32(&mut self, a: U32Target, b: U32Target) -> (U32Target, U32Target) {
self.add_mul_u32(a, b, self.zero_u32())
self.mul_add_u32(a, b, self.zero_u32())
}
}

6
src/gadgets/nonnative.rs
View File

@ -43,7 +43,7 @@ impl<F: RichField + Extendable<D>, const D: usize> CircuitBuilder<F, D> {
}
}
pub fn reduce_add_result(&mut self, limbs: Vec<Target>, modulus: BigUint) -> Vec<Target> {
pub fn reduce_add_result(&mut self, limbs: Vec<U32Target>, modulus: BigUint) -> Vec<U32Target> {
todo!()
}
@ -56,7 +56,7 @@ impl<F: RichField + Extendable<D>, const D: usize> CircuitBuilder<F, D> {
let mut combined_limbs = self.add_virtual_targets(2 * num_limbs - 1);
for i in 0..num_limbs {
for j in 0..num_limbs {
let sum = self.add(a.limbs[i], b.limbs[j]);
let sum = self.add_u32(a.limbs[i], b.limbs[j]);
combined_limbs[i + j] = self.add(combined_limbs[i + j], sum);
}
}
@ -69,7 +69,7 @@ impl<F: RichField + Extendable<D>, const D: usize> CircuitBuilder<F, D> {
}
}
pub fn reduce_mul_result(&mut self, limbs: Vec<Target>, modulus: BigUint) -> Vec<Target> {
pub fn reduce_mul_result(&mut self, limbs: Vec<U32Target>, modulus: BigUint) -> Vec<U32Target> {
todo!()
}
}