[cairo1] Fix system builtin as implicit (#2207)

* Auxiliary function

* Add cairo programs

* Add test case

* Update changelog

* Fix output segment offset

* Add test

* Add tests

* Remove unnecessary test

* Fix changelog typo

* Use common func

* Add comment

* Fix clippy

* Update comment

Author: DiegoCivi

CHANGELOG.md

@@ -2,6 +2,8 @@
 
 #### Upcoming Changes
 
+* Fix bug affecting cairo1 programs with input and System builtin [#2207](https://github.com/lambdaclass/cairo-vm/pull/2207)
+
 * chore: Pin generic-array version to 0.14.7 or lower. [#2227](https://github.com/lambdaclass/cairo-vm/pull/2227)
 
 * feat: Add support for WASM with Cairo 1 [#2216](https://github.com/lambdaclass/cairo-vm/pull/2216)

cairo1-run/src/cairo_run.rs

@@ -54,6 +54,11 @@ use itertools::{chain, Itertools};
 use num_bigint::{BigInt, Sign};
 use num_traits::{cast::ToPrimitive, Zero};
 
+// Necessary memory gaps for the values created on the entry code of each implicit builtin
+const SEGMENT_ARENA_GAPS: usize = 4;
+const GAS_BUILTIN_GAPS: usize = 1;
+const SYSTEM_BUILTIN_GAPS: usize = 1;
+
 /// Representation of a cairo argument
 /// Can consist of a single Felt or an array of Felts
 #[derive(Debug, Clone)]
@@ -469,20 +474,13 @@ fn load_arguments(
     cairo_run_config: &Cairo1RunConfig,
     main_func: &Function,
 ) -> Result<(), Error> {
-    let got_gas_builtin = main_func
-        .signature
-        .param_types
-        .iter()
-        .any(|ty| ty.debug_name.as_ref().is_some_and(|n| n == "GasBuiltin"));
+    let got_gas_builtin = got_implicit_builtin(&main_func.signature.param_types, "GasBuiltin");
     if cairo_run_config.args.is_empty() && !got_gas_builtin {
         // Nothing to be done
         return Ok(());
     }
-    let got_segment_arena = main_func
-        .signature
-        .param_types
-        .iter()
-        .any(|ty| ty.debug_name.as_ref().is_some_and(|n| n == "SegmentArena"));
+    let got_segment_arena = got_implicit_builtin(&main_func.signature.param_types, "SegmentArena");
+    let got_system_builtin = got_implicit_builtin(&main_func.signature.param_types, "System");
     // This AP correction represents the memory slots taken up by the values created by `create_entry_code`:
     // These include:
     // * The builtin bases (not including output)
@@ -497,10 +495,13 @@ fn load_arguments(
         ap_offset += runner.get_program().builtins_len() - 1;
     }
     if got_segment_arena {
-        ap_offset += 4;
+        ap_offset += SEGMENT_ARENA_GAPS;
     }
     if got_gas_builtin {
-        ap_offset += 1;
+        ap_offset += GAS_BUILTIN_GAPS;
+    }
+    if got_system_builtin {
+        ap_offset += SYSTEM_BUILTIN_GAPS;
     }
     for arg in cairo_run_config.args {
         match arg {
@@ -547,16 +548,9 @@ fn create_entry_code(
 ) -> Result<(CasmContext, Vec<BuiltinName>), Error> {
     let copy_to_output_builtin = config.copy_to_output();
     let signature = &func.signature;
-    let got_segment_arena = signature.param_types.iter().any(|ty| {
-        get_info(sierra_program_registry, ty)
-            .map(|x| x.long_id.generic_id == SegmentArenaType::ID)
-            .unwrap_or_default()
-    });
-    let got_gas_builtin = signature.param_types.iter().any(|ty| {
-        get_info(sierra_program_registry, ty)
-            .map(|x| x.long_id.generic_id == GasBuiltinType::ID)
-            .unwrap_or_default()
-    });
+    let got_segment_arena = got_implicit_builtin(&signature.param_types, "SegmentArena");
+    let got_gas_builtin = got_implicit_builtin(&signature.param_types, "GasBuiltin");
+    let got_system_builtin = got_implicit_builtin(&signature.param_types, "System");
     // The builtins in the formatting expected by the runner.
     let (builtins, builtin_offset) =
         get_function_builtins(&signature.param_types, copy_to_output_builtin);
@@ -738,10 +732,12 @@ fn create_entry_code(
             // We lost the output_ptr var after re-scoping, so we need to create it again
             // The last instruction will write the last output ptr so we can find it in [ap - 1]
             let output_ptr = ctx.add_var(CellExpression::Deref(deref!([ap - 1])));
-            // len(builtins - output) + len(builtins) + if segment_arena: segment_arena_ptr + info_ptr + 0 + (segment_arena_ptr + 3) + (gas_builtin)
+            // len(builtins - output) + len(builtins) + if segment_arena: segment_arena_ptr +
+            // info_ptr + 0 + (segment_arena_ptr + 3) + (gas_builtin) + (system_builtin)
             let offset = (2 * builtins.len() - 1
                 + 4 * got_segment_arena as usize
-                + got_gas_builtin as usize) as i16;
+                + got_gas_builtin as usize
+                + got_system_builtin as usize) as i16;
             let array_start_ptr = ctx.add_var(CellExpression::Deref(deref!([fp + offset])));
             let array_end_ptr = ctx.add_var(CellExpression::Deref(deref!([fp + offset + 1])));
             casm_build_extend! {ctx,
@@ -1008,6 +1004,11 @@ fn check_only_array_felt_return_type(
         _ => false,
     }
 }
+fn got_implicit_builtin(param_types: &[ConcreteTypeId], builtin_name: &str) -> bool {
+    param_types
+        .iter()
+        .any(|ty| ty.debug_name.as_ref().is_some_and(|n| n == builtin_name))
+}
 
 fn is_panic_result(return_type_id: Option<&ConcreteTypeId>) -> bool {
     return_type_id

cairo1-run/src/main.rs

@@ -454,6 +454,27 @@ mod tests {
         None,
         None
     )]
+    #[case(
+        "with_input/implicit_system_builtin.cairo",
+        "[1 2]",
+        "[1 2]",
+        Some("[1 2]"),
+        Some("[1 2]")
+    )]
+    #[case(
+        "with_input/implicit_gas_builtin.cairo",
+        "[1 2]",
+        "[1 2]",
+        Some("[1 2]"),
+        Some("[1 2]")
+    )]
+    #[case(
+        "with_input/system_segment_gas.cairo",
+        "[1 2]",
+        "[1 2]",
+        Some("[1 2]"),
+        Some("[1 2]")
+    )]
     fn test_run_program(
         #[case] program: &str,
         #[case] expected_output: &str,

cairo_programs/cairo-1-programs/serialized_output/with_input/implicit_gas_builtin.cairo

@@ -0,0 +1,4 @@
+fn main(input: Array<felt252>) -> Array<felt252> {
+    core::internal::require_implicit::<GasBuiltin>();
+    input
+}

cairo_programs/cairo-1-programs/serialized_output/with_input/implicit_system_builtin.cairo

@@ -0,0 +1,4 @@
+fn main(input: Array<felt252>) -> Array<felt252> {
+    core::internal::require_implicit::<System>();
+    input
+}

cairo_programs/cairo-1-programs/serialized_output/with_input/system_segment_gas.cairo

@@ -0,0 +1,5 @@
+fn main(input:Array<felt252>) -> Array<felt252> {
+    core::internal::require_implicit::<System>();
+    let _elements: Felt252Dict<Nullable<Span<u8>>> = Default::default();
+    input
+}

cairo_programs/cairo-1-programs/with_input/implicit_gas_builtin.cairo

@@ -0,0 +1,4 @@
+fn main(input: Array<felt252>) -> Array<felt252> {
+    core::internal::require_implicit::<GasBuiltin>();
+    input
+}

cairo_programs/cairo-1-programs/with_input/implicit_system_builtin.cairo

@@ -0,0 +1,4 @@
+fn main(input: Array<felt252>) -> Array<felt252> {
+    core::internal::require_implicit::<System>();
+    input
+}

cairo_programs/cairo-1-programs/with_input/system_segment_gas.cairo

@@ -0,0 +1,5 @@
+fn main(input:Array<felt252>) -> Array<felt252> {
+    core::internal::require_implicit::<System>();
+    let _elements: Felt252Dict<Nullable<Span<u8>>> = Default::default();
+    input
+}