update layout all

README.md

@@ -133,7 +133,7 @@ let program =
 ```rust
 let mut vm = VirtualMachine::new(false);
 
-let mut cairo_runner = CairoRunner::new(&program, "all", false);
+let mut cairo_runner = CairoRunner::new(&program, "all_cairo", false);
 
 let mut hint_processor = BuiltinHintProcessor::new_empty();
 

bench/criterion_benchmark.rs

@@ -28,7 +28,7 @@ const BENCH_PATH: &str = "cairo_programs/benchmarks/";
 pub fn criterion_benchmarks(c: &mut Criterion) {
     let mut hint_executor = BuiltinHintProcessor::new_empty();
     let cairo_run_config = cairo_vm::cairo_run::CairoRunConfig {
-        layout: "all",
+        layout: "all_cairo",
         ..cairo_vm::cairo_run::CairoRunConfig::default()
     };
     for benchmark_name in build_bench_strings() {

bench/iai_benchmark.rs

@@ -11,7 +11,7 @@ macro_rules! iai_bench_expand_prog {
     ($val: ident) => {
         fn $val() -> Result<CairoRunner, CairoRunError> {
             let cairo_run_config = cairo_vm::cairo_run::CairoRunConfig {
-                layout: "all",
+                layout: "all_cairo",
                 ..cairo_vm::cairo_run::CairoRunConfig::default()
             };
             let mut hint_executor = BuiltinHintProcessor::new_empty();

bench/run_benchmarks.sh

@@ -1,15 +1,37 @@
 #!/usr/bin/env sh
-tests_path="../cairo_programs/benchmarks"
+tests_path="cairo_programs/benchmarks"
+trace_enabled=${1:-false}
 
 set -e
 
+source ../cairo-rs-py/scripts/cairo-rs-py/bin/activate
+
+for input_file in "$tests_path"/*.cairo; do
+    if [ -f "$input_file" ]; then
+        output_file="${input_file%.cairo}.json"
+        cairo-compile --cairo_path="cairo_programs" "$input_file" --output "$output_file"
+        echo "Compiled $input_file to $output_file"
+    fi
+done
+
+deactivate
+
 for file in $(ls $tests_path | grep .cairo | sed -E 's/\.cairo//'); do
     echo "Running $file benchmark"
 
     export PATH="$(pyenv root)/shims:$PATH"
 
-    hyperfine \
-	    -n "Cairo VM (CPython)" "PYENV_VERSION=3.7.12 cairo-run --layout all --program $tests_path/$file.json" \
-	    -n "Cairo VM (PyPy)" "PYENV_VERSION=pypy3.7-7.3.9 cairo-run --layout all --program $tests_path/$file.json" \
-	    -n "cairo-rs (Rust)" "../target/release/cairo-rs-run $tests_path/$file.json --layout all"
+    if [ "$trace_enabled" = true ]; then
+        hyperfine -w 0 -r 2 -i --show-output \
+            -n "Cairo VM (CPython)" "source ../cairo-rs-py/scripts/cairo-lang/bin/activate && cairo-run --layout all --program $tests_path/$file.json --trace_file $tests_path/$file.trace" \
+            -n "Cairo VM (PyPy)" "source ../cairo-rs-py/scripts/cairo-rs-pypy/bin/activate && cairo-run --layout all --program $tests_path/$file.json --trace_file $tests_path/$file.trace" \
+            -n "cairo-rs (Rust)" "target/release/cairo-rs-run $tests_path/$file.json --layout all --trace_file $tests_path/$file.trace"
+    else
+        hyperfine -w 0 -r 2 -i --show-output \
+            -n "Cairo VM (CPython)" "source ../cairo-rs-py/scripts/cairo-lang/bin/activate && cairo-run --layout all --program $tests_path/$file.json" \
+            -n "Cairo VM (PyPy)" "source ../cairo-rs-py/scripts/cairo-rs-pypy/bin/activate && cairo-run --layout all --program $tests_path/$file.json" \
+            -n "cairo-rs (Rust)" "target/release/cairo-rs-run $tests_path/$file.json --layout all"
+    fi
 done
+
+