Merge branch 'main' into Uint512DivModHint

Author: pefontana

.github/workflows/iai_main.yml

@@ -25,6 +25,7 @@ jobs:
         pip install -r requirements.txt
         sudo apt update
         sudo apt install -y valgrind
+        cargo install --version 0.3.1 iai-callgrind-runner
     # NB: this should never result in a hit, but rather just populate for PRs
     - name: Initialize IAI cache for ${{ github.sha }}
       uses: actions/cache@v3

.github/workflows/iai_pr.yml

@@ -27,6 +27,7 @@ jobs:
         pip install -r requirements.txt
         sudo apt update
         sudo apt install -y valgrind
+        cargo install --version 0.3.1 iai-callgrind-runner
     - name: Initialize IAI cache for ${{ github.event.pull_request.base.sha }}
       uses: actions/cache@v3
       id: cache-iai-results
@@ -61,6 +62,7 @@ jobs:
         pip install -r requirements.txt
         sudo apt update
         sudo apt install -y valgrind
+        cargo install --version 0.3.1 iai-callgrind-runner
     - name: Initialize IAI cache for ${{ github.event.pull_request.base.sha }}
       uses: actions/cache@v3
       id: cache-iai-results

Cargo.lock

@@ -98,7 +98,7 @@ rstest = { version = "0.17.0", default-features = false }
 wasm-bindgen-test = "0.3.34"
 
 [target.'cfg(not(target_arch = "wasm32"))'.dev-dependencies]
-iai = "0.1"
+iai-callgrind = "0.3.1"
 rusty-hook = "0.11"
 criterion = { version = "0.3", features = ["html_reports"] }
 proptest = "1.0.0"

Cargo.toml

@@ -115,6 +115,7 @@ $(cairo-repo-dir):
 	cd cairo; cargo b --release --bin starknet-compile --bin starknet-sierra-compile
 
 cargo-deps:
+	cargo install --version 0.3.1 iai-callgrind-runner
 	cargo install --version 1.1.0 cargo-criterion
 	cargo install --version 0.6.1 flamegraph
 	cargo install --version 1.14.0 hyperfine

Makefile

@@ -1,4 +1,4 @@
-use iai::{black_box, main};
+use iai_callgrind::{black_box, main};
 
 use cairo_vm::{
     types::program::Program,
@@ -12,6 +12,7 @@ use mimalloc::MiMalloc;
 #[global_allocator]
 static ALLOC: MiMalloc = MiMalloc;
 
+#[inline(never)]
 fn parse_program() {
     //Picked the biggest one at the time of writing
     let program = include_bytes!("../cairo_programs/benchmarks/keccak_integration_benchmark.json");
@@ -20,25 +21,39 @@ fn parse_program() {
     let _ = black_box(program);
 }
 
-fn build_many_runners() {
+#[export_name = "helper::parse_program"]
+#[inline(never)]
+fn parse_program_helper() -> Program {
     //Picked the biggest one at the time of writing
     let program = include_bytes!("../cairo_programs/benchmarks/keccak_integration_benchmark.json");
-    let program = Program::from_bytes(program.as_slice(), Some("main")).unwrap();
-    for _ in 0..100 {
-        let runner = CairoRunner::new(black_box(&program), "starknet_with_keccak", false).unwrap();
-        let _ = black_box(runner);
-    }
+    Program::from_bytes(program.as_slice(), Some("main")).unwrap()
 }
 
-fn load_program_data() {
+#[inline(never)]
+fn build_runner() {
+    let program = parse_program_helper();
+    let runner = CairoRunner::new(black_box(&program), "starknet_with_keccak", false).unwrap();
+    let _ = black_box(runner);
+}
+
+#[export_name = "helper::build_runner"]
+#[inline(never)]
+fn build_runner_helper() -> (CairoRunner, VirtualMachine) {
     //Picked the biggest one at the time of writing
     let program = include_bytes!("../cairo_programs/benchmarks/keccak_integration_benchmark.json");
     let program = Program::from_bytes(program.as_slice(), Some("main")).unwrap();
-    for _ in 0..100 {
-        let mut runner = CairoRunner::new(&program, "starknet_with_keccak", false).unwrap();
-        let mut vm = VirtualMachine::new(false);
-        _ = black_box(runner.initialize(black_box(&mut vm)).unwrap());
-    }
+    let runner = CairoRunner::new(&program, "starknet_with_keccak", false).unwrap();
+    let vm = VirtualMachine::new(false);
+    (runner, vm)
+}
+
+#[inline(never)]
+fn load_program_data() {
+    let (mut runner, mut vm) = build_runner_helper();
+    _ = black_box(runner.initialize(black_box(&mut vm)).unwrap());
 }
 
-main!(parse_program, build_many_runners, load_program_data);
+main!(
+    callgrind_args = "toggle-collect=helper::*";
+    functions = parse_program, build_runner, load_program_data
+);