Move bench framework to multicore-bench project

ocaml-multicore · Jan 19, 2024 · a6b6c7a · a6b6c7a
1 parent 0228553
commit a6b6c7a
Show file tree

Hide file tree

Showing 24 changed files with 146 additions and 599 deletions.
diff --git a/.dockerignore b/.dockerignore
@@ -0,0 +1 @@
+_build
diff --git a/bench.Dockerfile b/bench.Dockerfile
@@ -0,0 +1,10 @@
+FROM ocaml/opam:debian-ocaml-5.1
+RUN sudo ln -sf /usr/bin/opam-2.1 /usr/bin/opam
+WORKDIR bench-dir
+RUN opam remote add origin https://opam.ocaml.org && \
+    opam update
+COPY *.opam ./
+RUN opam pin -yn --with-version=dev .
+RUN opam install -y --deps-only --with-test .
+COPY . ./
+RUN opam exec -- dune build --release bench/main.exe
diff --git a/bench/barrier.ml b/bench/barrier.ml
diff --git a/bench/barrier.mli b/bench/barrier.mli
diff --git a/bench/bench.ml b/bench/bench.ml
diff --git a/bench/bench.mli b/bench/bench.mli
diff --git a/bench/bench_accumulator.ml b/bench/bench_accumulator.ml
@@ -1,5 +1,5 @@
 open Kcas_data
-open Bench
+open Multicore_bench
 
 let run_one ~budgetf ~n_domains ?(n_ops = 180 * Util.iter_factor) () =
   let n_ops = n_ops * n_domains in
@@ -29,28 +29,13 @@ let run_one ~budgetf ~n_domains ?(n_ops = 180 * Util.iter_factor) () =
 
   let after () = Atomic.set n_ops_todo n_ops in
 
-  let times = Times.record ~n_domains ~budgetf ~init ~work ~after () in
-
-  let name metric =
-    Printf.sprintf "%s/%d worker%s, 0%% reads" metric n_domains
+  let config =
+    Printf.sprintf "%d worker%s, 0%% reads" n_domains
       (if n_domains = 1 then "" else "s")
   in
 
-  List.concat
-    [
-      Stats.of_times times
-      |> Stats.scale (1_000_000_000.0 /. Float.of_int n_ops)
-      |> Stats.to_json
-           ~name:(name "time per operation")
-           ~description:"Average time to increment accumulator" ~units:"ns";
-      Times.invert times |> Stats.of_times
-      |> Stats.scale (Float.of_int (n_ops * n_domains) /. 1_000_000.0)
-      |> Stats.to_json
-           ~name:(name "operations over time")
-           ~description:
-             "Number of operations performed over time using all domains"
-           ~units:"M/s";
-    ]
+  Times.record ~n_domains ~budgetf ~init ~work ~after ()
+  |> Util.thruput_metrics ~n:n_ops ~config ~singular:"operation"
 
 let run_suite ~budgetf =
   [ 1; 2; 4 ]

diff --git a/bench/bench_atomic.ml b/bench/bench_atomic.ml
@@ -1,4 +1,4 @@
-open Bench
+open Multicore_bench
 
 module Atomic = struct
   include Stdlib.Atomic
@@ -31,21 +31,8 @@ let run_one ~budgetf ?(n_iter = 500 * Util.iter_factor)
     loop n_iter
   in
 
-  let times = Times.record ~n_domains:1 ~budgetf ~init ~work () in
-
-  List.concat
-    [
-      Stats.of_times times
-      |> Stats.scale (1_000_000_000.0 /. Float.of_int n_iter)
-      |> Stats.to_json
-           ~name:(Printf.sprintf "time per op/%s" name)
-           ~description:"Time to perform a single op" ~units:"ns";
-      Times.invert times |> Stats.of_times
-      |> Stats.scale (Float.of_int n_iter /. 1_000_000.0)
-      |> Stats.to_json
-           ~name:(Printf.sprintf "ops over time/%s" name)
-           ~description:"Number of operations performed over time" ~units:"M/s";
-    ]
+  Times.record ~budgetf ~n_domains:1 ~extra_domain:true ~init ~work ()
+  |> Util.thruput_metrics ~n:n_iter ~singular:"op" ~config:name
 
 let run_suite ~budgetf =
   [