mirror of
https://github.com/logos-storage/plonky2.git
synced 2026-05-27 20:29:29 +00:00
removed duplicate functions
This commit is contained in:
parent
77d942f0e9
commit
80758da0f4
@ -109,173 +109,6 @@ impl<F: Extendable<D>, const D: usize> CircuitBuilder<F, D> {
|
|||||||
self.constant_ext_algebra(ExtensionAlgebra::ZERO)
|
self.constant_ext_algebra(ExtensionAlgebra::ZERO)
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn add_extension(
|
|
||||||
&mut self,
|
|
||||||
mut a: ExtensionTarget<D>,
|
|
||||||
b: ExtensionTarget<D>,
|
|
||||||
) -> ExtensionTarget<D> {
|
|
||||||
for i in 0..D {
|
|
||||||
a.0[i] = self.add(a.0[i], b.0[i]);
|
|
||||||
}
|
|
||||||
a
|
|
||||||
}
|
|
||||||
|
|
||||||
pub fn add_ext_algebra(
|
|
||||||
&mut self,
|
|
||||||
mut a: ExtensionAlgebraTarget<D>,
|
|
||||||
b: ExtensionAlgebraTarget<D>,
|
|
||||||
) -> ExtensionAlgebraTarget<D> {
|
|
||||||
for i in 0..D {
|
|
||||||
a.0[i] = self.add_extension(a.0[i], b.0[i]);
|
|
||||||
}
|
|
||||||
a
|
|
||||||
}
|
|
||||||
|
|
||||||
pub fn add_many_extension(&mut self, terms: &[ExtensionTarget<D>]) -> ExtensionTarget<D> {
|
|
||||||
let mut sum = self.zero_extension();
|
|
||||||
for term in terms {
|
|
||||||
sum = self.add_extension(sum, *term);
|
|
||||||
}
|
|
||||||
sum
|
|
||||||
}
|
|
||||||
|
|
||||||
/// TODO: Change this to using an `arithmetic_extension` function once `MulExtensionGate` supports addend.
|
|
||||||
pub fn sub_extension(
|
|
||||||
&mut self,
|
|
||||||
mut a: ExtensionTarget<D>,
|
|
||||||
b: ExtensionTarget<D>,
|
|
||||||
) -> ExtensionTarget<D> {
|
|
||||||
for i in 0..D {
|
|
||||||
a.0[i] = self.sub(a.0[i], b.0[i]);
|
|
||||||
}
|
|
||||||
a
|
|
||||||
}
|
|
||||||
|
|
||||||
pub fn sub_ext_algebra(
|
|
||||||
&mut self,
|
|
||||||
mut a: ExtensionAlgebraTarget<D>,
|
|
||||||
b: ExtensionAlgebraTarget<D>,
|
|
||||||
) -> ExtensionAlgebraTarget<D> {
|
|
||||||
for i in 0..D {
|
|
||||||
a.0[i] = self.sub_extension(a.0[i], b.0[i]);
|
|
||||||
}
|
|
||||||
a
|
|
||||||
}
|
|
||||||
|
|
||||||
pub fn mul_extension_with_const(
|
|
||||||
&mut self,
|
|
||||||
const_0: F,
|
|
||||||
multiplicand_0: ExtensionTarget<D>,
|
|
||||||
multiplicand_1: ExtensionTarget<D>,
|
|
||||||
) -> ExtensionTarget<D> {
|
|
||||||
let gate = self.add_gate(MulExtensionGate::new(), vec![const_0]);
|
|
||||||
|
|
||||||
let wire_multiplicand_0 =
|
|
||||||
ExtensionTarget::from_range(gate, MulExtensionGate::<D>::wires_multiplicand_0());
|
|
||||||
let wire_multiplicand_1 =
|
|
||||||
ExtensionTarget::from_range(gate, MulExtensionGate::<D>::wires_multiplicand_1());
|
|
||||||
let wire_output = ExtensionTarget::from_range(gate, MulExtensionGate::<D>::wires_output());
|
|
||||||
|
|
||||||
self.route_extension(multiplicand_0, wire_multiplicand_0);
|
|
||||||
self.route_extension(multiplicand_1, wire_multiplicand_1);
|
|
||||||
wire_output
|
|
||||||
}
|
|
||||||
|
|
||||||
pub fn mul_extension(
|
|
||||||
&mut self,
|
|
||||||
multiplicand_0: ExtensionTarget<D>,
|
|
||||||
multiplicand_1: ExtensionTarget<D>,
|
|
||||||
) -> ExtensionTarget<D> {
|
|
||||||
self.mul_extension_with_const(F::ONE, multiplicand_0, multiplicand_1)
|
|
||||||
}
|
|
||||||
|
|
||||||
pub fn mul_ext_algebra(
|
|
||||||
&mut self,
|
|
||||||
a: ExtensionAlgebraTarget<D>,
|
|
||||||
b: ExtensionAlgebraTarget<D>,
|
|
||||||
) -> ExtensionAlgebraTarget<D> {
|
|
||||||
let mut res = [self.zero_extension(); D];
|
|
||||||
let w = self.constant(F::Extension::W);
|
|
||||||
for i in 0..D {
|
|
||||||
for j in 0..D {
|
|
||||||
let ai_bi = self.mul_extension(a.0[i], b.0[j]);
|
|
||||||
res[(i + j) % D] = if i + j < D {
|
|
||||||
self.add_extension(ai_bi, res[(i + j) % D])
|
|
||||||
} else {
|
|
||||||
let w_ai_bi = self.scalar_mul_ext(w, ai_bi);
|
|
||||||
self.add_extension(w_ai_bi, res[(i + j) % D])
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
ExtensionAlgebraTarget(res)
|
|
||||||
}
|
|
||||||
|
|
||||||
pub fn mul_many_extension(&mut self, terms: &[ExtensionTarget<D>]) -> ExtensionTarget<D> {
|
|
||||||
let mut product = self.one_extension();
|
|
||||||
for term in terms {
|
|
||||||
product = self.mul_extension(product, *term);
|
|
||||||
}
|
|
||||||
product
|
|
||||||
}
|
|
||||||
|
|
||||||
/// Like `mul_add`, but for `ExtensionTarget`s. Note that, unlike `mul_add`, this has no
|
|
||||||
/// performance benefit over separate muls and adds.
|
|
||||||
/// TODO: Change this to using an `arithmetic_extension` function once `MulExtensionGate` supports addend.
|
|
||||||
pub fn mul_add_extension(
|
|
||||||
&mut self,
|
|
||||||
a: ExtensionTarget<D>,
|
|
||||||
b: ExtensionTarget<D>,
|
|
||||||
c: ExtensionTarget<D>,
|
|
||||||
) -> ExtensionTarget<D> {
|
|
||||||
let product = self.mul_extension(a, b);
|
|
||||||
self.add_extension(product, c)
|
|
||||||
}
|
|
||||||
|
|
||||||
/// Like `mul_add`, but for `ExtensionTarget`s. Note that, unlike `mul_add`, this has no
|
|
||||||
/// performance benefit over separate muls and subs.
|
|
||||||
/// TODO: Change this to using an `arithmetic_extension` function once `MulExtensionGate` supports addend.
|
|
||||||
pub fn scalar_mul_add_extension(
|
|
||||||
&mut self,
|
|
||||||
a: Target,
|
|
||||||
b: ExtensionTarget<D>,
|
|
||||||
c: ExtensionTarget<D>,
|
|
||||||
) -> ExtensionTarget<D> {
|
|
||||||
let product = self.scalar_mul_ext(a, b);
|
|
||||||
self.add_extension(product, c)
|
|
||||||
}
|
|
||||||
|
|
||||||
/// Like `mul_sub`, but for `ExtensionTarget`s. Note that, unlike `mul_sub`, this has no
|
|
||||||
/// performance benefit over separate muls and subs.
|
|
||||||
/// TODO: Change this to using an `arithmetic_extension` function once `MulExtensionGate` supports addend.
|
|
||||||
pub fn scalar_mul_sub_extension(
|
|
||||||
&mut self,
|
|
||||||
a: Target,
|
|
||||||
b: ExtensionTarget<D>,
|
|
||||||
c: ExtensionTarget<D>,
|
|
||||||
) -> ExtensionTarget<D> {
|
|
||||||
let product = self.scalar_mul_ext(a, b);
|
|
||||||
self.sub_extension(product, c)
|
|
||||||
}
|
|
||||||
|
|
||||||
/// Returns `a * b`, where `b` is in the extension field and `a` is in the base field.
|
|
||||||
pub fn scalar_mul_ext(&mut self, a: Target, b: ExtensionTarget<D>) -> ExtensionTarget<D> {
|
|
||||||
let a_ext = self.convert_to_ext(a);
|
|
||||||
self.mul_extension(a_ext, b)
|
|
||||||
}
|
|
||||||
|
|
||||||
/// Returns `a * b`, where `b` is in the extension of the extension field, and `a` is in the
|
|
||||||
/// extension field.
|
|
||||||
pub fn scalar_mul_ext_algebra(
|
|
||||||
&mut self,
|
|
||||||
a: ExtensionTarget<D>,
|
|
||||||
mut b: ExtensionAlgebraTarget<D>,
|
|
||||||
) -> ExtensionAlgebraTarget<D> {
|
|
||||||
for i in 0..D {
|
|
||||||
b.0[i] = self.mul_extension(a, b.0[i]);
|
|
||||||
}
|
|
||||||
b
|
|
||||||
}
|
|
||||||
|
|
||||||
pub fn convert_to_ext(&mut self, t: Target) -> ExtensionTarget<D> {
|
pub fn convert_to_ext(&mut self, t: Target) -> ExtensionTarget<D> {
|
||||||
let zero = self.zero();
|
let zero = self.zero();
|
||||||
let mut arr = [zero; D];
|
let mut arr = [zero; D];
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user