Move bench framework to multicore-bench project

ocaml-multicore · Jan 16, 2024 · 596c396 · 596c396
1 parent 0228553
commit 596c396
Show file tree

Hide file tree

Showing 22 changed files with 65 additions and 561 deletions.
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 ~n_domains:1 ~budgetf ~init ~work ()
+  |> Util.thruput_metrics ~n:n_iter ~singular:"op" ~config:name
 
 let run_suite ~budgetf =
   [

diff --git a/bench/bench_dllist.ml b/bench/bench_dllist.ml
@@ -1,5 +1,5 @@
 open Kcas_data
-open Bench
+open Multicore_bench
 
 let run_single ~budgetf ?(n_msgs = 15 * Util.iter_factor) () =
   let t = Dllist.create () in
@@ -12,26 +12,8 @@ let run_single ~budgetf ?(n_msgs = 15 * Util.iter_factor) () =
     done
   in
 
-  let times = Times.record ~n_domains:1 ~budgetf ~init ~work () in
-
-  let name metric = Printf.sprintf "%s/one domain" metric in
-
-  List.concat
-    [
-      Stats.of_times times
-      |> Stats.scale (1_000_000_000.0 /. Float.of_int n_msgs)
-      |> Stats.to_json ~name:(name "time per message")
-           ~description:
-             "Time to transmit one message from one domain to another"
-           ~units:"ns";
-      Times.invert times |> Stats.of_times
-      |> Stats.scale (Float.of_int n_msgs /. 1_000_000.0)
-      |> Stats.to_json
-           ~name:(name "messages over time")
-           ~description:
-             "Number of messages transmitted over time using all domains"
-           ~units:"M/s";
-    ]
+  Times.record ~n_domains:1 ~budgetf ~init ~work ()
+  |> Util.thruput_metrics ~n:n_msgs ~singular:"message" ~config:"one domain"
 
 let run_one ~budgetf ?(n_adders = 2) ?(n_takers = 2) ?(factor = 1)
     ?(n_msgs = 20 * factor * Util.iter_factor) () =
@@ -74,36 +56,20 @@ let run_one ~budgetf ?(n_adders = 2) ?(n_takers = 2) ?(factor = 1)
     Atomic.set n_msgs_to_add n_msgs
   in
 
-  let times = Times.record ~n_domains ~budgetf ~init ~work ~after () in
-
-  let name metric =
+  let config =
     let format role blocking n =
       Printf.sprintf "%d %s%s%s" n
         (if blocking then "" else "nb ")
         role
         (if n = 1 then "" else "s")
     in
-    Printf.sprintf "%s/%s, %s" metric
+    Printf.sprintf "%s, %s"
       (format "adder" false n_adders)
       (format "taker" false n_takers)
   in
 
-  List.concat
-    [
-      Stats.of_times times
-      |> Stats.scale (1_000_000_000.0 /. Float.of_int n_msgs)
-      |> Stats.to_json ~name:(name "time per message")
-           ~description:
-             "Time to transmit one message from one domain to another"
-           ~units:"ns";
-      Times.invert times |> Stats.of_times
-      |> Stats.scale (Float.of_int (n_msgs * n_domains) /. 1_000_000.0)
-      |> Stats.to_json
-           ~name:(name "messages over time")
-           ~description:
-             "Number of messages transmitted over time using all domains"
-           ~units:"M/s";
-    ]
+  Times.record ~n_domains ~budgetf ~init ~work ~after ()
+  |> Util.thruput_metrics ~n:n_msgs ~singular:"message" ~config
 
 let run_suite ~budgetf =
   run_single ~budgetf ()