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

fix(test): add setup instruction to fp2 tests #1204

Merged
merged 2 commits into from
Jan 11, 2025
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
4 changes: 2 additions & 2 deletions .github/workflows/extension-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ on:
pull_request:
branches: ["**"]
paths:
- "crates/circuits/primitives/**"
- "crates/circuits/**"
- "crates/vm/**"
- "extensions/**"
- ".github/workflows/extension-tests.yml"
Expand Down Expand Up @@ -48,7 +48,7 @@ jobs:
id: filter
with:
filters: |
- "crates/circuits/primitives/**"
- "crates/circuits/**"
- "crates/vm/**"
- "extensions/${{ matrix.extensions.path }}/**"
- ".github/workflows/extension-tests.yml"
Expand Down
13 changes: 12 additions & 1 deletion extensions/algebra/circuit/src/fp2_chip/addsub.rs
Original file line number Diff line number Diff line change
Expand Up @@ -114,8 +114,9 @@ mod tests {
#[test]
fn test_fp2_addsub() {
let mut tester: VmChipTestBuilder<F> = VmChipTestBuilder::default();
let modulus = BN254_MODULUS.clone();
let config = ExprBuilderConfig {
modulus: BN254_MODULUS.clone(),
modulus: modulus.clone(),
num_limbs: NUM_LIMBS,
limb_bits: LIMB_BITS,
};
Expand Down Expand Up @@ -177,6 +178,15 @@ mod tests {
.map(BabyBear::from_canonical_u32)
})
.collect_vec();
let modulus =
biguint_to_limbs::<NUM_LIMBS>(modulus, LIMB_BITS).map(BabyBear::from_canonical_u32);
let zero = [BabyBear::ZERO; NUM_LIMBS];
let setup_instruction = rv32_write_heap_default(
&mut tester,
vec![modulus, zero],
vec![zero; 2],
chip.0.core.air.offset + Fp2Opcode::SETUP_ADDSUB as usize,
);
let instruction1 = rv32_write_heap_default(
&mut tester,
x_limbs.clone(),
Expand All @@ -189,6 +199,7 @@ mod tests {
y_limbs,
chip.0.core.air.offset + Fp2Opcode::SUB as usize,
);
tester.execute(&mut chip, &setup_instruction);
tester.execute(&mut chip, &instruction1);
tester.execute(&mut chip, &instruction2);
let tester = tester.build().load(chip).load(bitwise_chip).finalize();
Expand Down
13 changes: 12 additions & 1 deletion extensions/algebra/circuit/src/fp2_chip/muldiv.rs
Original file line number Diff line number Diff line change
Expand Up @@ -153,8 +153,9 @@ mod tests {
#[test]
fn test_fp2_muldiv() {
let mut tester: VmChipTestBuilder<F> = VmChipTestBuilder::default();
let modulus = BN254_MODULUS.clone();
let config = ExprBuilderConfig {
modulus: BN254_MODULUS.clone(),
modulus: modulus.clone(),
num_limbs: NUM_LIMBS,
limb_bits: LIMB_BITS,
};
Expand Down Expand Up @@ -221,6 +222,15 @@ mod tests {
.map(BabyBear::from_canonical_u32)
})
.collect_vec();
let modulus =
biguint_to_limbs::<NUM_LIMBS>(modulus, LIMB_BITS).map(BabyBear::from_canonical_u32);
let zero = [BabyBear::ZERO; NUM_LIMBS];
let setup_instruction = rv32_write_heap_default(
&mut tester,
vec![modulus, zero],
vec![zero; 2],
chip.0.core.air.offset + Fp2Opcode::SETUP_MULDIV as usize,
);
let instruction1 = rv32_write_heap_default(
&mut tester,
x_limbs.clone(),
Expand All @@ -233,6 +243,7 @@ mod tests {
y_limbs,
chip.0.core.air.offset + Fp2Opcode::DIV as usize,
);
tester.execute(&mut chip, &setup_instruction);
tester.execute(&mut chip, &instruction1);
tester.execute(&mut chip, &instruction2);
let tester = tester.build().load(chip).load(bitwise_chip).finalize();
Expand Down
2 changes: 1 addition & 1 deletion extensions/algebra/moduli-setup/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -877,7 +877,7 @@ pub fn moduli_init(input: TokenStream) -> TokenStream {
mod openvm_intrinsics_ffi {
#(#externs)*
}
#[allow(non_snake_case)]
#[allow(non_snake_case, non_upper_case_globals)]
pub mod openvm_intrinsics_meta_do_not_type_this_by_yourself {
pub const two_modular_limbs_list: [u8; #total_limbs_cnt] = [#(#two_modular_limbs_flattened_list),*];
pub const limb_list_borders: [usize; #cnt_limbs_list_len] = [#(#limb_list_borders),*];
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ openvm_algebra_complex_macros::complex_init! {
}

pub fn main() {
setup_all_moduli();
setup_all_complex_extensions();
let mut a = Complex::new(
Secp256k1Coord::from_repr(core::array::from_fn(|_| 10)),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ openvm_algebra_complex_macros::complex_init! {
}

pub fn main() {
setup_all_moduli();
setup_all_complex_extensions();
let a = Complex1::new(Mod1::ZERO, Mod1::from_u32(998244352));
let b = Complex2::new(Mod2::ZERO, Mod2::from_u32(1000000006));
Expand Down