Remove feature mod_builtin

Author: OmriEshhar1

CHANGELOG.md

@@ -11,13 +11,16 @@ Both branches support Stwo prover opcodes (Blake2s, QM31) since v2.0.0.
 ---
 
 #### Upcoming Changes
+* fix: remove feature mod_builtin [#2387](https://github.com/starkware-libs/cairo-vm/pull/2387)
+
 * fix: decrease spamming logs level to trace [#2385](https://github.com/starkware-libs/cairo-vm/pull/2385)
 
 * feat: add `test_helpers` module (`error_utils`, `test_utils`) with `assert_mr_eq`, `load_cairo_program!` macro and `expect_*` error checkers, behind `test_utils` feature flag [#2381](https://github.com/starkware-libs/cairo-vm/pull/2381)
 
 * feat(makefile,ci): add `cairo_test_suite_programs` Makefile target and CI integration to compile Cairo test suite programs before running tests [#2380](https://github.com/starkware-libs/cairo-vm/pull/2380)
 
 * Add Stwo cairo runner API [#2351](https://github.com/starkware-libs/cairo-vm/pull/2351)
+
 * feat: make max traceback entries configurable [#2370](https://github.com/starkware-libs/cairo-vm/pull/2370)
 
 * feat: create and use VirtualMachineConfig [#2369](https://github.com/starkware-libs/cairo-vm/pull/2369)

cairo1-run/src/main.rs

@@ -408,13 +408,13 @@ mod tests {
         Some("[17 18]"),
         Some("[17 18]")
     )]
-    #[cfg_attr(feature = "mod_builtin", case(
+    #[case(
         "circuit.cairo",
         "36699840570117848377038274035 72042528776886984408017100026 54251667697617050795983757117 7",
         "[36699840570117848377038274035 72042528776886984408017100026 54251667697617050795983757117 7]",
         None,
         None
-    ))]
+    )]
     #[case(
         "gas_builtin_loading.cairo",
         "939340725154356279478212603733403581890242362232206720294887278547043341575",

vm/src/cairo_run.rs

@@ -758,19 +758,17 @@ mod tests {
     }
 
     fn stwo_allowed_builtins() -> Vec<BuiltinName> {
-        let mut allowed = vec![
+        let allowed = vec![
             BuiltinName::output,
             BuiltinName::pedersen,
             BuiltinName::range_check,
             BuiltinName::bitwise,
             BuiltinName::ec_op,
             BuiltinName::poseidon,
             BuiltinName::range_check96,
+            BuiltinName::add_mod,
+            BuiltinName::mul_mod,
         ];
-        if cfg!(feature = "mod_builtin") {
-            allowed.push(BuiltinName::add_mod);
-            allowed.push(BuiltinName::mul_mod);
-        }
         allowed
     }
 

vm/src/hint_processor/builtin_hint_processor/mod_circuit.rs

@@ -1,5 +1,3 @@
-#[cfg(not(feature = "mod_builtin"))]
-use crate::types::errors::math_errors::MathError;
 use crate::{
     hint_processor::hint_processor_definition::HintReference,
     serde::deserialize_program::ApTracking,
@@ -51,18 +49,6 @@ pub fn run_p_mod_circuit_with_large_batch_size(
     ap_tracking: &ApTracking,
     constants: &HashMap<String, Felt252>,
 ) -> Result<(), HintError> {
-    #[cfg(not(feature = "mod_builtin"))]
-    const LARGE_BATCH_SIZE_PATH: &str =
-        "starkware.cairo.common.modulo.run_mod_p_circuit_with_large_batch_size.BATCH_SIZE";
-    #[cfg(not(feature = "mod_builtin"))]
-    let batch_size = constants
-        .get(LARGE_BATCH_SIZE_PATH)
-        .ok_or_else(|| HintError::MissingConstant(Box::new(LARGE_BATCH_SIZE_PATH)))?;
-    #[cfg(not(feature = "mod_builtin"))]
-    let batch_size = batch_size
-        .to_usize()
-        .ok_or_else(|| MathError::Felt252ToUsizeConversion(Box::new(*batch_size)))?;
-    #[cfg(feature = "mod_builtin")]
     let batch_size = 8; // Hardcoded here as we are not importing from the common lib yet
     run_p_mod_circuit_inner(vm, ids_data, ap_tracking, batch_size)
 }

vm/src/tests/cairo_run_test.rs

@@ -1,6 +1,5 @@
 use crate::{tests::*, types::layout_name::LayoutName};
 
-#[cfg(feature = "mod_builtin")]
 use crate::{
     utils::test_utils::Program,
     vm::{
@@ -993,15 +992,13 @@ fn run_program_allow_missing_builtins_proof() {
 }
 
 #[test]
-#[cfg(feature = "mod_builtin")]
 fn cairo_run_mod_builtin() {
     let program_data =
         include_bytes!("../../../cairo_programs/mod_builtin_feature/mod_builtin.json");
     run_program_with_custom_mod_builtin_params(program_data, false, 1, 3, None);
 }
 
 #[test]
-#[cfg(feature = "mod_builtin")]
 fn cairo_run_mod_builtin_failure() {
     let program_data =
         include_bytes!("../../../cairo_programs/mod_builtin_feature/mod_builtin_failure.json");
@@ -1010,15 +1007,13 @@ fn cairo_run_mod_builtin_failure() {
 }
 
 #[test]
-#[cfg(feature = "mod_builtin")]
 fn cairo_run_mod_builtin_no_solution() {
     let program_data =
         include_bytes!("../../../cairo_programs/mod_builtin_feature/mod_builtin_no_solution.json");
     run_program_with_error(program_data, "Could not fill the values table");
 }
 
 #[test]
-#[cfg(feature = "mod_builtin")]
 fn cairo_run_mod_builtin_large_batch_size() {
     let program_data = include_bytes!(
         "../../../cairo_programs/mod_builtin_feature/mod_builtin_large_batch_size.json"
@@ -1027,7 +1022,6 @@ fn cairo_run_mod_builtin_large_batch_size() {
 }
 
 #[test]
-#[cfg(feature = "mod_builtin")]
 fn cairo_run_mod_builtin_large_batch_size_failure() {
     let program_data = include_bytes!(
         "../../../cairo_programs/mod_builtin_feature/mod_builtin_large_batch_size_failure.json"
@@ -1037,23 +1031,20 @@ fn cairo_run_mod_builtin_large_batch_size_failure() {
 }
 
 #[test]
-#[cfg(feature = "mod_builtin")]
 fn cairo_run_mod_builtin_proof() {
     let program_data =
         include_bytes!("../../../cairo_programs/mod_builtin_feature/proof/mod_builtin.json");
     run_program_with_custom_mod_builtin_params(program_data, true, 1, 3, None);
 }
 
 #[test]
-#[cfg(feature = "mod_builtin")]
 fn cairo_run_mod_builtin_large_batch_size_proof() {
     let program_data = include_bytes!(
         "../../../cairo_programs/mod_builtin_feature/proof/mod_builtin_large_batch_size.json"
     );
     run_program_with_custom_mod_builtin_params(program_data, true, 8, 3, None);
 }
 
-#[cfg(feature = "mod_builtin")]
 fn run_program_with_custom_mod_builtin_params(
     data: &[u8],
     proof_mode: bool,
@@ -1110,15 +1101,13 @@ fn run_program_with_custom_mod_builtin_params(
 }
 
 #[test]
-#[cfg(feature = "mod_builtin")]
 fn cairo_run_apply_poly() {
     let program_data =
         include_bytes!("../../../cairo_programs/mod_builtin_feature/apply_poly.json");
     run_program(program_data, false, None, None, None);
 }
 
 #[test]
-#[cfg(feature = "mod_builtin")]
 fn cairo_run_apply_poly_proof() {
     let program_data =
         include_bytes!("../../../cairo_programs/mod_builtin_feature/proof/apply_poly.json");

vm/src/types/instance_definitions/builtins_instance_def.rs

@@ -168,14 +168,8 @@ impl BuiltinsInstanceDef {
             keccak: Some(KeccakInstanceDef::new(Some(2048))),
             poseidon: Some(PoseidonInstanceDef::new(Some(256))),
             range_check96: Some(RangeCheckInstanceDef::new(Some(8))),
-            #[cfg(feature = "mod_builtin")]
             add_mod: Some(ModInstanceDef::new(Some(128), 1, 96)),
-            #[cfg(feature = "mod_builtin")]
             mul_mod: Some(ModInstanceDef::new(Some(256), 1, 96)),
-            #[cfg(not(feature = "mod_builtin"))]
-            add_mod: None,
-            #[cfg(not(feature = "mod_builtin"))]
-            mul_mod: None,
         }
     }
 
@@ -190,14 +184,8 @@ impl BuiltinsInstanceDef {
             keccak: None,
             poseidon: Some(PoseidonInstanceDef::new(Some(256))),
             range_check96: Some(RangeCheckInstanceDef::new(Some(8))),
-            #[cfg(feature = "mod_builtin")]
             add_mod: Some(ModInstanceDef::new(Some(128), 1, 96)),
-            #[cfg(feature = "mod_builtin")]
             mul_mod: Some(ModInstanceDef::new(Some(256), 1, 96)),
-            #[cfg(not(feature = "mod_builtin"))]
-            add_mod: None,
-            #[cfg(not(feature = "mod_builtin"))]
-            mul_mod: None,
         }
     }
 
@@ -212,14 +200,8 @@ impl BuiltinsInstanceDef {
             keccak: None,
             poseidon: Some(PoseidonInstanceDef::new(Some(256))),
             range_check96: Some(RangeCheckInstanceDef::new(Some(8))),
-            #[cfg(feature = "mod_builtin")]
             add_mod: Some(ModInstanceDef::new(Some(128), 1, 96)),
-            #[cfg(feature = "mod_builtin")]
             mul_mod: Some(ModInstanceDef::new(Some(256), 1, 96)),
-            #[cfg(not(feature = "mod_builtin"))]
-            add_mod: None,
-            #[cfg(not(feature = "mod_builtin"))]
-            mul_mod: None,
         }
     }
 
@@ -267,7 +249,6 @@ impl BuiltinsInstanceDef {
                 params.range_check96_ratio_den,
             )),
         });
-        #[cfg(feature = "mod_builtin")]
         let add_mod = Some(ModInstanceDef {
             ratio: Some(LowRatio::new(
                 params.add_mod_ratio,
@@ -276,7 +257,6 @@ impl BuiltinsInstanceDef {
             word_bit_len: 96,
             batch_size: 1,
         });
-        #[cfg(feature = "mod_builtin")]
         let mul_mod = Some(ModInstanceDef {
             ratio: Some(LowRatio::new(
                 params.mul_mod_ratio,
@@ -285,10 +265,6 @@ impl BuiltinsInstanceDef {
             word_bit_len: 96,
             batch_size: 1,
         });
-        #[cfg(not(feature = "mod_builtin"))]
-        let add_mod = None;
-        #[cfg(not(feature = "mod_builtin"))]
-        let mul_mod = None;
 
         BuiltinsInstanceDef {
             output: true,
@@ -444,14 +420,8 @@ mod tests {
         assert!(builtins.ec_op.is_some());
         assert!(builtins.keccak.is_some());
         assert!(builtins.poseidon.is_some());
-        #[cfg(feature = "mod_builtin")]
         assert!(builtins.add_mod.is_some());
-        #[cfg(feature = "mod_builtin")]
         assert!(builtins.mul_mod.is_some());
-        #[cfg(not(feature = "mod_builtin"))]
-        assert!(builtins.add_mod.is_none());
-        #[cfg(not(feature = "mod_builtin"))]
-        assert!(builtins.mul_mod.is_none());
     }
 
     #[test]
@@ -465,14 +435,8 @@ mod tests {
         assert!(builtins.ec_op.is_some());
         assert!(builtins.keccak.is_none());
         assert!(builtins.poseidon.is_some());
-        #[cfg(feature = "mod_builtin")]
         assert!(builtins.add_mod.is_some());
-        #[cfg(feature = "mod_builtin")]
         assert!(builtins.mul_mod.is_some());
-        #[cfg(not(feature = "mod_builtin"))]
-        assert!(builtins.add_mod.is_none());
-        #[cfg(not(feature = "mod_builtin"))]
-        assert!(builtins.mul_mod.is_none());
     }
 
     #[test]
@@ -486,14 +450,8 @@ mod tests {
         assert!(builtins.ec_op.is_none());
         assert!(builtins.keccak.is_none());
         assert!(builtins.poseidon.is_some());
-        #[cfg(feature = "mod_builtin")]
         assert!(builtins.add_mod.is_some());
-        #[cfg(feature = "mod_builtin")]
         assert!(builtins.mul_mod.is_some());
-        #[cfg(not(feature = "mod_builtin"))]
-        assert!(builtins.add_mod.is_none());
-        #[cfg(not(feature = "mod_builtin"))]
-        assert!(builtins.mul_mod.is_none());
     }
 
     #[test]

vm/src/types/layout.rs

@@ -430,7 +430,6 @@ where
 #[cfg(test)]
 mod tests {
     use super::*;
-    #[cfg(feature = "mod_builtin")]
     use crate::types::instance_definitions::mod_instance_def::ModInstanceDef;
 
     use crate::types::instance_definitions::{
@@ -701,36 +700,30 @@ mod tests {
                 ratio: Some(LowRatio::new(8, 16))
             })
         );
-        #[cfg(feature = "mod_builtin")]
-        {
-            assert_eq!(
-                layout.builtins.mul_mod,
-                Some(ModInstanceDef {
-                    ratio: Some(LowRatio {
-                        numerator: 32,
-                        denominator: 16
-                    }),
-                    word_bit_len: 96, // hardcoded
-                    batch_size: 1     // hardcoded
+        assert_eq!(
+            layout.builtins.mul_mod,
+            Some(ModInstanceDef {
+                ratio: Some(LowRatio {
+                    numerator: 32,
+                    denominator: 16
                 }),
-            );
-            assert_eq!(
-                layout.builtins.add_mod,
-                Some(ModInstanceDef {
-                    ratio: Some(LowRatio {
-                        numerator: 8,
-                        denominator: 16
-                    }),
-                    word_bit_len: 96, // hardcoded
-                    batch_size: 1     // hardcoded
-                })
-            );
-        }
-        #[cfg(not(feature = "mod_builtin"))]
-        {
-            assert_eq!(layout.builtins.mul_mod, None,);
-            assert_eq!(layout.builtins.add_mod, None,);
-        }
+                word_bit_len: 96, // hardcoded
+                batch_size: 1     // hardcoded
+            }),
+        );
+        assert_eq!(
+            layout.builtins.add_mod,
+            Some(ModInstanceDef {
+                ratio: Some(LowRatio {
+                    numerator: 8,
+                    denominator: 16
+                }),
+                word_bit_len: 96, // hardcoded
+                batch_size: 1     // hardcoded
+            })
+        );
+        assert_eq!(layout.builtins.mul_mod, None,);
+        assert_eq!(layout.builtins.add_mod, None,);
     }
 
     #[test]

vm/src/vm/runners/builtin_runner/modulo.rs

@@ -658,7 +658,6 @@ impl ModBuiltinRunner {
     }
 
     #[cfg(test)]
-    #[cfg(feature = "mod_builtin")]
     // Testing method used to test programs that use parameters which are not included in any layout
     // For example, programs with large batch size
     pub(crate) fn override_layout_params(&mut self, batch_size: usize, word_bit_len: u32) {
@@ -806,7 +805,6 @@ mod tests {
     }
 
     #[test]
-    #[cfg(feature = "mod_builtin")]
     fn test_air_private_input_all_cairo() {
         use crate::{
             air_private_input::{ModInput, ModInputInstance, ModInputMemoryVars, PrivateInput},

vm/src/vm/runners/cairo_runner.rs

@@ -5882,19 +5882,17 @@ mod tests {
         ];
         // Match the all_cairo_stwo layout builtins (mod builtins excluded
         // unless the mod_builtin feature is enabled).
-        let mut allowed = vec![
+        let allowed = vec![
             BuiltinName::output,
             BuiltinName::pedersen,
             BuiltinName::range_check,
             BuiltinName::bitwise,
             BuiltinName::ec_op,
             BuiltinName::poseidon,
             BuiltinName::range_check96,
+            BuiltinName::add_mod,
+            BuiltinName::mul_mod,
         ];
-        if cfg!(feature = "mod_builtin") {
-            allowed.push(BuiltinName::add_mod);
-            allowed.push(BuiltinName::mul_mod);
-        }
         for program_bytes in programs {
             let program = Program::from_bytes(program_bytes, Some("main")).unwrap();