fix fp2 chip adapter blocks (#775)

openvm-org · Nov 6, 2024 · eb46470 · eb46470
1 parent 58d2f5a
commit eb46470
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 12 deletions.
diff --git a/vm/src/arch/chip_set.rs b/vm/src/arch/chip_set.rs
@@ -31,7 +31,7 @@ use parking_lot::Mutex;
 use program::DEFAULT_PC_STEP;
 use strum::EnumCount;
 
-use super::{vm_poseidon2_config, EcCurve, Streams};
+use super::{vm_poseidon2_config, EcCurve, PairingCurve, Streams};
 use crate::{
     arch::{AxVmChip, AxVmExecutor, ExecutionBus, ExecutorName, VmConfig},
     intrinsics::{
@@ -1019,7 +1019,7 @@ impl VmConfig {
                 }
                 ExecutorName::Fp2AddSubRv32_32 => {
                     let chip = Rc::new(RefCell::new(Fp2AddSubChip::new(
-                        Rv32VecHeapAdapterChip::<F, 2, 1, 1, 32, 32>::new(
+                        Rv32VecHeapAdapterChip::<F, 2, 2, 2, 32, 32>::new(
                             execution_bus,
                             program_bus,
                             memory_controller.clone(),
@@ -1034,7 +1034,7 @@ impl VmConfig {
                 }
                 ExecutorName::Fp2MulDivRv32_32 => {
                     let chip = Rc::new(RefCell::new(Fp2MulDivChip::new(
-                        Rv32VecHeapAdapterChip::<F, 2, 1, 1, 32, 32>::new(
+                        Rv32VecHeapAdapterChip::<F, 2, 2, 2, 32, 32>::new(
                             execution_bus,
                             program_bus,
                             memory_controller.clone(),
@@ -1049,7 +1049,7 @@ impl VmConfig {
                 }
                 ExecutorName::Fp2AddSubRv32_48 => {
                     let chip = Rc::new(RefCell::new(Fp2AddSubChip::new(
-                        Rv32VecHeapAdapterChip::<F, 2, 3, 3, 16, 16>::new(
+                        Rv32VecHeapAdapterChip::<F, 2, 6, 6, 16, 16>::new(
                             execution_bus,
                             program_bus,
                             memory_controller.clone(),
@@ -1064,7 +1064,7 @@ impl VmConfig {
                 }
                 ExecutorName::Fp2MulDivRv32_48 => {
                     let chip = Rc::new(RefCell::new(Fp2MulDivChip::new(
-                        Rv32VecHeapAdapterChip::<F, 2, 3, 3, 16, 16>::new(
+                        Rv32VecHeapAdapterChip::<F, 2, 6, 6, 16, 16>::new(
                             execution_bus,
                             program_bus,
                             memory_controller.clone(),
@@ -1325,7 +1325,7 @@ fn gen_ec_executor_tuple(
 
 // Returns (local_opcode_idx, global offset, executor name, modulus)
 fn gen_pairing_executor_tuple(
-    supported_ec_curves: &[EcCurve],
+    supported_ec_curves: &[PairingCurve],
 ) -> Vec<(usize, usize, ExecutorName, BigUint)> {
     supported_ec_curves
         .iter()

diff --git a/vm/src/arch/chips.rs b/vm/src/arch/chips.rs
@@ -125,10 +125,10 @@ pub enum AxVmExecutor<F: PrimeField32> {
     EcDoubleRv32_6x16(Rc<RefCell<EcDoubleChip<F, 6, 16>>>),
     // Pairing:
     // Fp2 for 32-bytes or 48-bytes prime.
-    Fp2AddSubRv32_32(Rc<RefCell<Fp2AddSubChip<F, 1, 32>>>),
-    Fp2AddSubRv32_48(Rc<RefCell<Fp2AddSubChip<F, 3, 16>>>),
-    Fp2MulDivRv32_32(Rc<RefCell<Fp2MulDivChip<F, 1, 32>>>),
-    Fp2MulDivRv32_48(Rc<RefCell<Fp2MulDivChip<F, 3, 16>>>),
+    Fp2AddSubRv32_32(Rc<RefCell<Fp2AddSubChip<F, 2, 32>>>),
+    Fp2AddSubRv32_48(Rc<RefCell<Fp2AddSubChip<F, 6, 16>>>),
+    Fp2MulDivRv32_32(Rc<RefCell<Fp2MulDivChip<F, 2, 32>>>),
+    Fp2MulDivRv32_48(Rc<RefCell<Fp2MulDivChip<F, 6, 16>>>),
     /// Only for BN254 for now
     EcLineMul013By013(Rc<RefCell<EcLineMul013By013Chip<F, 4, 10, 32>>>),
     /// Only for BN254 for now

diff --git a/vm/src/arch/config.rs b/vm/src/arch/config.rs
@@ -50,7 +50,7 @@ pub struct VmConfig {
     /// List of all supported EC curves
     pub supported_ec_curves: Vec<EcCurve>,
     /// List of all supported pairing curves
-    pub supported_pairing_curves: Vec<EcCurve>,
+    pub supported_pairing_curves: Vec<PairingCurve>,
 
     pub poseidon2_max_constraint_degree: usize,
     /// True if the VM is in continuation mode. In this mode, an execution could be segmented and
@@ -86,7 +86,7 @@ impl VmConfig {
         // Come from CompilerOptions. We can also pass in the whole compiler option if we need more fields from it.
         supported_modulus: Vec<BigUint>,
         supported_ec_curves: Vec<EcCurve>,
-        supported_pairing_curves: Vec<EcCurve>,
+        supported_pairing_curves: Vec<PairingCurve>,
     ) -> Self {
         VmConfig {
             executors: Vec::new(),
@@ -263,3 +263,18 @@ impl EcCurve {
         }
     }
 }
+
+#[derive(Serialize, Deserialize, Debug, Clone)]
+pub enum PairingCurve {
+    Bn254,
+    Bls12_381,
+}
+
+impl PairingCurve {
+    pub fn prime(&self) -> BigUint {
+        match self {
+            PairingCurve::Bn254 => BN254.MODULUS.clone(),
+            PairingCurve::Bls12_381 => BLS12381.MODULUS.clone(),
+        }
+    }
+}