migrate mod-builder

Author: arayikhalatyan

Cargo.lock

@@ -251,6 +251,9 @@ num-traits = { version = "0.2.19", default-features = false }
 ff = { version = "0.13.1", default-features = false }
 sha2 = { version = "0.10", default-features = false }
 
+# specific to CUDA and GPU
+cuda-runtime-sys = "0.3.0-alpha.1"
+
 # For local development. Add to your `.cargo/config.toml`
 # [patch."https://github.com/Plonky3/Plonky3.git"]
 # p3-field = { path = "../Plonky3/field" }

Cargo.toml

@@ -21,17 +21,25 @@ rand.workspace = true
 num-bigint.workspace = true
 num-traits.workspace = true
 tracing.workspace = true
-
 itertools.workspace = true
 
+# CUDA dependencies (only included when cuda feature is enabled)
+stark-backend-gpu = { workspace = true, optional = true }
+cuda-runtime-sys = { workspace = true, optional = true }
+
 [dev-dependencies]
 openvm-circuit-primitives = { workspace = true }
 openvm-pairing-guest = { workspace = true, features = ["halo2curves"] }
 halo2curves-axiom = { workspace = true }
 openvm-circuit = { workspace = true, features = ["test-utils"] }
 
 [features]
-default = []
+default = ["cuda"]
+cuda = [
+    "dep:stark-backend-gpu",
+    "dep:cuda-runtime-sys",
+    "openvm-circuit-primitives/cuda",
+]
 parallel = ["openvm-stark-backend/parallel"]
 test-utils = [
     "dep:halo2curves-axiom",

crates/circuits/mod-builder/Cargo.toml

@@ -1,11 +1,11 @@
 #include "fp.h"
 #include "launcher.cuh"
-#include "mod_builder/bigint_ops.cuh"
-#include "mod_builder/expr_codec.cuh"
-#include "mod_builder/meta.cuh"
-#include "mod_builder/overflow_ops.cuh"
-#include "mod_builder/records.cuh"
-#include "mod_builder/rv32_vec_heap_router.cuh"
+#include "../include/bigint_ops.cuh"
+#include "../include/expr_codec.cuh"
+#include "../include/meta.cuh"
+#include "../include/overflow_ops.cuh"
+#include "../include/records.cuh"
+#include "../include/rv32_vec_heap_router.cuh"
 #include "trace_access.h"
 #include <cstdint>
 

…cuda/src/mod_builder/field_expression.cu …mod-builder/cuda/src/field_expression.cutracegen-gpu/cuda/src/mod_builder/field_expression.cu renamed to crates/circuits/mod-builder/cuda/src/field_expression.cu tracegen-gpu/cuda/src/mod_builder/field_expression.cu renamed to crates/circuits/mod-builder/cuda/src/field_expression.cu

@@ -7,8 +7,9 @@ use cuda_runtime_sys::{cudaDeviceSetLimit, cudaLimit};
 use num_bigint::BigUint;
 use num_traits::{FromBytes, One};
 use openvm_circuit::utils::next_power_of_two_or_zero;
-use openvm_mod_circuit_builder::{
-    utils::biguint_to_limbs_vec, FieldExpressionCoreAir, SymbolicExpr,
+use openvm_circuit_primitives::{
+    bitwise_op_lookup::cuda::BitwiseOperationLookupChipGPU,
+    var_range::cuda::VariableRangeCheckerChipGPU,
 };
 use openvm_stark_backend::p3_air::BaseAir;
 use stark_backend_gpu::{
@@ -20,16 +21,15 @@ use stark_backend_gpu::{
     prelude::F,
 };
 
-use super::{
-    constants::*,
-    cuda::field_expression::tracegen,
-    types::{ExprMeta, ExprNode, FieldExprMeta, FieldExpressionChipGPU},
-};
 use crate::{
-    mod_builder::expr_op::ExprOp,
-    primitives::{
-        bitwise_op_lookup::BitwiseOperationLookupChipGPU, var_range::VariableRangeCheckerChipGPU,
+    cuda_abi::field_expression::tracegen,
+    cuda_field_expression::{
+        constants::{ExprType, LIMB_BITS, MAX_LIMBS},
+        expr_op::ExprOp,
     },
+    utils::biguint_to_limbs_vec,
+    ExprMeta, ExprNode, FieldExprMeta, FieldExpressionChipGPU, FieldExpressionCoreAir,
+    SymbolicExpr,
 };
 
 impl FieldExpressionChipGPU {
@@ -336,7 +336,6 @@ impl FieldExpressionChipGPU {
     }
 
     fn calculate_ast_depth(expr: &SymbolicExpr) -> u32 {
-        use openvm_mod_circuit_builder::SymbolicExpr;
         match expr {
             SymbolicExpr::Input(_) | SymbolicExpr::Var(_) | SymbolicExpr::Const(_, _, _) => 1,
             SymbolicExpr::Add(left, right)

…src/mod_builder/field_expression/cuda.rs …tes/circuits/mod-builder/src/cuda_abi.rstracegen-gpu/src/mod_builder/field_expression/cuda.rs renamed to crates/circuits/mod-builder/src/cuda_abi.rs tracegen-gpu/src/mod_builder/field_expression/cuda.rs renamed to crates/circuits/mod-builder/src/cuda_abi.rs

@@ -1,4 +1,4 @@
-use crate::mod_builder::field_expression::ExprNode;
+use crate::ExprNode;
 
 #[repr(C)]
 #[derive(Debug, Clone, Copy)]

…src/mod_builder/field_expression/chip.rs …uilder/src/cuda_field_expression/chip.rstracegen-gpu/src/mod_builder/field_expression/chip.rs renamed to crates/circuits/mod-builder/src/cuda_field_expression/chip.rs tracegen-gpu/src/mod_builder/field_expression/chip.rs renamed to crates/circuits/mod-builder/src/cuda_field_expression/chip.rs

@@ -0,0 +1,6 @@
+mod chip;
+mod constants;
+mod expr_op;
+mod types;
+
+pub use types::*;

…od_builder/field_expression/constants.rs …r/src/cuda_field_expression/constants.rstracegen-gpu/src/mod_builder/field_expression/constants.rs renamed to crates/circuits/mod-builder/src/cuda_field_expression/constants.rs tracegen-gpu/src/mod_builder/field_expression/constants.rs renamed to crates/circuits/mod-builder/src/cuda_field_expression/constants.rs

@@ -1,12 +1,14 @@
 use std::sync::Arc;
 
+use openvm_circuit_primitives::{
+    bitwise_op_lookup::cuda::BitwiseOperationLookupChipGPU,
+    var_range::cuda::VariableRangeCheckerChipGPU,
+};
 use stark_backend_gpu::cuda::d_buffer::DeviceBuffer;
 
 use crate::{
-    mod_builder::{expr_op::ExprOp, field_expression::constants::LIMB_BITS},
-    primitives::{
-        bitwise_op_lookup::BitwiseOperationLookupChipGPU, var_range::VariableRangeCheckerChipGPU,
-    },
+    cuda_field_expression::{constants::LIMB_BITS, expr_op::ExprOp},
+    FieldExpressionCoreAir,
 };
 
 #[repr(C)]
@@ -75,7 +77,7 @@ unsafe impl Send for FieldExprMeta {}
 unsafe impl Sync for FieldExprMeta {}
 
 pub struct FieldExpressionChipGPU {
-    pub air: openvm_mod_circuit_builder::FieldExpressionCoreAir,
+    pub air: FieldExpressionCoreAir,
     pub records: Arc<DeviceBuffer<u8>>,
     pub num_records: usize,
     pub record_stride: usize,