Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add sub_mul to GateInstructions #102

Merged
merged 2 commits into from
Aug 8, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 22 additions & 0 deletions halo2-base/src/gates/flex_gate.rs
Original file line number Diff line number Diff line change
Expand Up @@ -202,6 +202,28 @@ pub trait GateInstructions<F: ScalarField> {
ctx.get(-4)
}

/// Constrains and returns `a - b * c = out`.
///
/// Defines a vertical gate of form | a - b * c | b | c | a |, where (a - b * c) = out.
/// * `ctx`: [Context] to add the constraints to
/// * `a`: [QuantumCell] value to subtract 'b * c' from
/// * `b`: [QuantumCell] value
/// * `c`: [QuantumCell] value
fn sub_mul(
&self,
ctx: &mut Context<F>,
a: impl Into<QuantumCell<F>>,
b: impl Into<QuantumCell<F>>,
c: impl Into<QuantumCell<F>>,
) -> AssignedValue<F> {
let a = a.into();
let b = b.into();
let c = c.into();
let out_val = *a.value() - *b.value() * c.value();
ctx.assign_region_last([Witness(out_val), b, c, a], [0]);
ctx.get(-4)
}

/// Constrains and returns `a * (-1) = out`.
///
/// Defines a vertical gate of form | a | -a | 1 | 0 |, where (-a) = out.
Expand Down
9 changes: 9 additions & 0 deletions halo2-base/src/gates/tests/flex_gate.rs
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,15 @@ pub fn test_sub<F: ScalarField>(inputs: &[QuantumCell<F>]) -> F {
*a.value()
}

#[test_case(&[1, 1, 1].map(Fr::from).map(Witness) => Fr::from(0) ; "sub_mul(): 1 - 1 * 1 == 0")]
pub fn test_sub_mul<F: ScalarField>(inputs: &[QuantumCell<F>]) -> F {
let mut builder = GateThreadBuilder::mock();
let ctx = builder.main(0);
let chip = GateChip::default();
let a = chip.sub_mul(ctx, inputs[0], inputs[1], inputs[2]);
*a.value()
}

#[test_case(Witness(Fr::from(1)) => -Fr::from(1) ; "neg(): 1 -> -1")]
pub fn test_neg<F: ScalarField>(a: QuantumCell<F>) -> F {
let mut builder = GateThreadBuilder::mock();
Expand Down
7 changes: 7 additions & 0 deletions halo2-base/src/gates/tests/pos_prop.rs
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,13 @@ proptest! {
prop_assert_eq!(result, ground_truth);
}

#[test]
fn prop_test_sub_mul(input in vec(rand_witness(), 3)) {
let ground_truth = sub_mul_ground_truth(input.as_slice());
let result = flex_gate::test_sub_mul(input.as_slice());
prop_assert_eq!(result, ground_truth);
}

#[test]
fn prop_test_neg(input in rand_witness()) {
let ground_truth = neg_ground_truth(input);
Expand Down
4 changes: 4 additions & 0 deletions halo2-base/src/gates/tests/utils.rs
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,10 @@ pub fn sub_ground_truth<F: ScalarField>(inputs: &[QuantumCell<F>]) -> F {
*inputs[0].value() - *inputs[1].value()
}

pub fn sub_mul_ground_truth<F: ScalarField>(inputs: &[QuantumCell<F>]) -> F {
*inputs[0].value() - *inputs[1].value() * *inputs[2].value()
}

pub fn neg_ground_truth<F: ScalarField>(input: QuantumCell<F>) -> F {
-(*input.value())
}
Expand Down