change bechmarks to proof mode

keep-starknet-strange · Jun 27, 2024 · 22b71de · 22b71de
1 parent e424685
commit 22b71de
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 7 deletions.
diff --git a/scripts/benchmarks.sh b/scripts/benchmarks.sh
@@ -14,6 +14,6 @@ for file in $(ls ${BENCH_DIR} | grep .cairo | sed -E 's/\.cairo//'); do
     cairo-compile --cairo_path="${CAIRO_DIR}:../${CAIRO_DIR}" ${BENCH_DIR}/${file}.cairo --output ${BENCH_DIR}/${file}.json --proof_mode
     echo "Running ${file} benchmark"
     hyperfine --show-output --warmup 2 \
-        -n "cairo-vm (Rust)" "${CAIRO_VM_CLI} ${BENCH_DIR}/${file}.json --memory_file /dev/null --trace_file /dev/null --layout all_cairo" \
-        -n "cairo-vm (Zig)" "${ZIG_CLI} execute --filename ${BENCH_DIR}/${file}.json --enable-trace=true --output-memory=/dev/null --output-trace=/dev/null --layout all_cairo"
+        -n "cairo-vm (Rust)" "${CAIRO_VM_CLI} ${BENCH_DIR}/${file}.json --memory_file /dev/null --trace_file /dev/null --proof_mode --layout all_cairo" \
+        -n "cairo-vm (Zig)" "${ZIG_CLI} execute --filename ${BENCH_DIR}/${file}.json --enable-trace=true --output-memory=/dev/null --output-trace=/dev/null --proof-mode=true --layout all_cairo"
 done
diff --git a/scripts/test_compare_output.sh b/scripts/test_compare_output.sh
@@ -36,9 +36,9 @@ for file in $(ls ${CAIRO_PROGRAMS_DIR} | grep .cairo | sed -E 's/\.cairo//'); do
     cairo-compile --cairo_path="${CAIRO_DIR}:" ${CAIRO_PROGRAMS_DIR}/${file}.cairo --output ${CAIRO_PROGRAMS_DIR}/${file}.json --proof_mode
     echo "Running ${file}"
 
-    ${CAIRO_VM_CLI} ${CAIRO_PROGRAMS_DIR}/${file}.json --memory_file $RUST_MEMORY_OUTPUT --trace_file $RUST_TRACE_OUTPUT --layout all_cairo
+    ${CAIRO_VM_CLI} ${CAIRO_PROGRAMS_DIR}/${file}.json --memory_file $RUST_MEMORY_OUTPUT --trace_file $RUST_TRACE_OUTPUT --proof_mode --layout all_cairo
 
-    ${ZIG_CLI} execute --filename ${CAIRO_PROGRAMS_DIR}/${file}.json --enable-trace=true --output-memory=$ZIG_MEMORY_OUTPUT --output-trace=$ZIG_TRACE_OUTPUT --layout all_cairo
+    ${ZIG_CLI} execute --filename ${CAIRO_PROGRAMS_DIR}/${file}.json --enable-trace=true --output-memory=$ZIG_MEMORY_OUTPUT --output-trace=$ZIG_TRACE_OUTPUT --proof-mode=true --layout all_cairo
 
     if sameContents $RUST_TRACE_OUTPUT $ZIG_TRACE_OUTPUT; then 
         echo "Rust & Zig output trace is same"

diff --git a/src/vm/cairo_run.zig b/src/vm/cairo_run.zig
@@ -2,6 +2,7 @@ const std = @import("std");
 const json = std.json;
 const Allocator = std.mem.Allocator;
 
+const security = @import("security.zig");
 const CairoRunner = @import("./runners/cairo_runner.zig").CairoRunner;
 const CairoVM = @import("./core.zig").CairoVM;
 const Config = @import("./config.zig").Config;
@@ -88,20 +89,25 @@ pub fn runConfig(allocator: Allocator, config: Config) !void {
     // TODO: make flag for extensive_hints
     var hint_processor: HintProcessor = .{};
     try runner.runUntilPC(end, &hint_processor);
+
+    if (config.proof_mode) try runner.runForSteps(1, &hint_processor);
+
     try runner.endRun(
         allocator,
         false,
         false,
         &hint_processor,
     );
 
-    // TODO     cairo_runner.vm.verify_auto_deductions()?;
+    try runner.vm.verifyAutoDeductions(allocator);
+
     // cairo_runner.read_return_values(allow_missing_builtins)?;
 
     if (config.proof_mode)
-        runner.finalizeSegments();
+        try runner.finalizeSegments();
 
-    if (secure_run) {}
+    if (secure_run)
+        try security.verifySecureRunner(allocator, &runner, true, null);
 
     if (config.output_trace != null or config.output_memory != null) {
         try runner.relocate();