refactor: Cairo trace

provers/cairo/benches/criterion_prover.rs

@@ -2,7 +2,8 @@ use criterion::{
     black_box, criterion_group, criterion_main, measurement::WallTime, BenchmarkGroup, Criterion,
 };
 use platinum_prover::{
-    air::generate_cairo_proof, cairo_layout::CairoLayout, runner::run::generate_prover_args,
+    cairo_layout::CairoLayout, layouts::plain::air::generate_cairo_proof,
+    runner::run::generate_prover_args,
 };
 use stark_platinum_prover::proof::options::{ProofOptions, SecurityLevel};
 
@@ -53,12 +54,12 @@ fn run_cairo_bench(
 ) {
     let program_content = std::fs::read(program_path).unwrap();
     let proof_options = ProofOptions::new_secure(SecurityLevel::Provable80Bits, 3);
-    let (main_trace, pub_inputs) = generate_prover_args(&program_content, layout).unwrap();
-    println!("Generated main trace with {} rows", main_trace.n_rows());
+    let (mut main_trace, pub_inputs) = generate_prover_args(&program_content, layout).unwrap();
+    println!("Generated main trace with {} rows", main_trace.num_rows());
 
     group.bench_function(benchname, |bench| {
         bench.iter(|| {
-            black_box(generate_cairo_proof(&main_trace, &pub_inputs, &proof_options).unwrap())
+            black_box(generate_cairo_proof(&mut main_trace, &pub_inputs, &proof_options).unwrap())
         });
     });
 }

provers/cairo/benches/criterion_prover_70k.rs

@@ -2,8 +2,8 @@ use criterion::{
     black_box, criterion_group, criterion_main, measurement::WallTime, BenchmarkGroup, Criterion,
     SamplingMode,
 };
-use platinum_prover::cairo_layout::CairoLayout;
-use platinum_prover::{air::generate_cairo_proof, runner::run::generate_prover_args};
+use platinum_prover::runner::run::generate_prover_args;
+use platinum_prover::{cairo_layout::CairoLayout, layouts::plain::air::generate_cairo_proof};
 use stark_platinum_prover::proof::options::{ProofOptions, SecurityLevel};
 
 pub mod functions;
@@ -48,11 +48,11 @@ fn run_cairo_bench(
 ) {
     let program_content = std::fs::read(program_path).unwrap();
     let proof_options = ProofOptions::new_secure(SecurityLevel::Provable80Bits, 3);
-    let (main_trace, pub_inputs) = generate_prover_args(&program_content, layout).unwrap();
+    let (mut main_trace, pub_inputs) = generate_prover_args(&program_content, layout).unwrap();
 
     group.bench_function(benchname, |bench| {
         bench.iter(|| {
-            black_box(generate_cairo_proof(&main_trace, &pub_inputs, &proof_options).unwrap())
+            black_box(generate_cairo_proof(&mut main_trace, &pub_inputs, &proof_options).unwrap())
         });
     });
 }

provers/cairo/benches/criterion_verifier.rs

@@ -4,12 +4,11 @@ use criterion::{
 use lambdaworks_math::{
     field::fields::fft_friendly::stark_252_prime_field::Stark252PrimeField, traits::Deserializable,
 };
-use platinum_prover::air::{verify_cairo_proof, PublicInputs};
+use platinum_prover::layouts::plain::air::{verify_cairo_proof, PublicInputs};
 use stark_platinum_prover::proof::{
     options::{ProofOptions, SecurityLevel},
     stark::StarkProof,
 };
-
 pub mod functions;
 
 fn load_proof_and_pub_inputs(

provers/cairo/benches/criterion_verifier_70k.rs

@@ -5,7 +5,7 @@ use criterion::{
 use lambdaworks_math::{
     field::fields::fft_friendly::stark_252_prime_field::Stark252PrimeField, traits::Deserializable,
 };
-use platinum_prover::air::{verify_cairo_proof, PublicInputs};
+use platinum_prover::layouts::plain::air::{verify_cairo_proof, PublicInputs};
 use stark_platinum_prover::proof::{
     options::{ProofOptions, SecurityLevel},
     stark::StarkProof,

provers/cairo/cairo_programs/cairo0/fibonacci_stone.cairo

@@ -0,0 +1,33 @@
+// Copyright 2023 StarkWare Industries Ltd.
+//
+// Licensed under the Apache License, Version 2.0 (the "License").
+// You may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// https://www.starkware.co/open-source-license/
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions
+// and limitations under the License.
+
+func main() {
+    alloc_locals;
+
+    let res = fib(1, 1, 10);
+
+    assert res = 144;
+    // Return the updated output_ptr.
+    return ();
+}
+
+func fib(first_element: felt, second_element: felt, n: felt) -> felt {
+    if (n == 0) {
+        return second_element;
+    }
+
+    return fib(
+        first_element=second_element, second_element=first_element + second_element, n=n - 1
+    );
+}

provers/cairo/src/decode/instruction_offsets.rs

@@ -34,12 +34,12 @@ impl InstructionOffsets {
         i32::from(i16::from_le_bytes(aux))
     }
 
-    pub fn to_trace_representation<F: IsField>(&self) -> [FieldElement<F>; 3] {
-        [
+    pub fn to_trace_representation(&self) -> (Felt252, Felt252, Felt252) {
+        (
             to_unbiased_representation(self.off_dst),
             to_unbiased_representation(self.off_op0),
             to_unbiased_representation(self.off_op1),
-        ]
+        )
     }
 }