Merge pull request #71 from talex5/nonotty

Remove use of notty for formatting benchmark results

Author: talex5

bench/bechamel_csv/bechamel_csv.ml

@@ -0,0 +1,44 @@
+open Bechamel
+
+let pad width v =
+  let padding = String.make (width - String.length v) ' ' in
+  padding ^ v
+
+let pp_row ~width f data =
+  data |> List.iteri (fun i v ->
+      if i > 0 then Fmt.comma f ();
+      Fmt.pf f "%s" (pad width.(i) v)
+    )
+
+let pp f results =
+  let results = Hashtbl.to_seq results |> Array.of_seq in
+  Array.sort (fun (n1, _) (n2, _) -> String.compare n1 n2) results;     (* Sort columns *)
+  let rows = snd results.(0) |> Hashtbl.to_seq |> Seq.map fst |> Array.of_seq in
+  let width = Array.make (Array.length results + 1) 0 in
+  width.(0) <- String.length "name, ";
+  results |> Array.iteri (fun i (name, _) -> width.(i + 1) <- String.length name + 2);
+  Array.sort String.compare rows;
+  let rows =
+    rows |> Array.map (fun name ->
+        width.(0) <- max width.(0) (String.length name + 2);
+        let values =
+          results |> Array.mapi (fun i (_, col) ->
+              let v =
+                match Hashtbl.find col name |> Analyze.OLS.estimates with
+                | Some [v] -> Printf.sprintf "%f" v
+                | _ -> assert false
+              in
+              width.(i + 1) <- max width.(i + 1) (String.length v + 2);
+              v
+            )
+        in
+        name, values
+      )
+  in
+  let metrics = Array.to_list results |> List.map fst in
+  let headings = List.mapi (fun i v -> pad width.(i) v) ("name" :: metrics) in
+  Fmt.pf f "@[<v>@[<h>%a@]" Fmt.(list ~sep:comma string) headings;
+  rows |> Array.iter (fun (name, data) ->
+      Fmt.pf f "@,@[<h>%a@]" (pp_row ~width) (name :: Array.to_list data);
+    );
+  Fmt.pf f "@]"

bench/bechamel_csv/bechamel_csv.mli

@@ -0,0 +1,2 @@
+val pp : (string, (string, Bechamel.Analyze.OLS.t) Stdlib.Hashtbl.t) Stdlib.Hashtbl.t Fmt.t
+(** [pp] formats the results of {!Bechamel.Analyze.merge} as a CSV table. *)

bench/bechamel_csv/dune

@@ -0,0 +1,3 @@
+(library
+  (name bechamel_csv)
+  (libraries bechamel fmt))

tests/cptest.ml bench/cptest.ml

@@ -73,20 +73,5 @@ let benchmark () =
       (results, raw_results)
 
 let () =
-  List.iter
-    (fun v -> Bechamel_notty.Unit.add v (Measure.unit v))
-    Instance.[ minor_allocated; major_allocated; monotonic_clock ]
-
-let img (window, results) =
-  Bechamel_notty.Multiple.image_of_ols_results ~rect:window
-    ~predictor:Measure.run results
-
-open Notty_unix
-    
-let () =
-  let window =
-    match winsize Unix.stdout with
-    | Some (w, h) -> { Bechamel_notty.w; h }
-    | None -> { Bechamel_notty.w = 80; h = 1 } in
   let results, _ = benchmark () in
-  img (window, results) |> eol |> output_image
+  Fmt.pr "%a@." Bechamel_csv.pp results

bench/dune

@@ -1,9 +1,20 @@
 (executable
  (name main)
  (modules main)
- (libraries uring bechamel bechamel-notty notty.unix))
+ (libraries uring bechamel bechamel_csv))
 
 (executable
  (name readv)
  (modules readv)
  (libraries uring))
+
+(executable
+ (name cptest)
+ (modules cptest)
+ (libraries urcp_fixed_lib urcp_lib lwtcp_lib uring bechamel bechamel_csv))
+
+(rule
+ (alias runbenchmark)
+ (package uring)
+ (action
+  (run ./cptest.exe)))

bench/main.ml

@@ -31,14 +31,6 @@ let benchmark () =
   List.map (fun i -> Analyze.all ols i raw_results) metrics
   |> Analyze.merge ols metrics
 
-let rect =
-  match Notty_unix.winsize Unix.stdout with
-  | Some (w, h) -> { Bechamel_notty.w; h }
-  | None -> { Bechamel_notty.w = 80; h = 1 }
-
 let () =
-  List.iter (fun v -> Bechamel_notty.Unit.add v (Measure.unit v)) metrics;
-  benchmark ()
-  |> Bechamel_notty.Multiple.image_of_ols_results ~rect ~predictor:Measure.run
-  |> Notty_unix.eol
-  |> Notty_unix.output_image
+  let results = benchmark () in
+  Fmt.pr "@[<v>%a@]@." Bechamel_csv.pp results

dune-project

@@ -17,8 +17,6 @@
   (ocaml (>= 4.12.0))
   dune-configurator
   (lwt (and :with-test (>= 5.0.0)))
-  (notty (and (>= 0.2.2) :with-test))
-  (bechamel-notty (and (>= 0.1.0) :with-test))
   (bechamel (and (>= 0.1.0) :with-test))
   (logs (and :with-test (>= 0.5.0)))
   (cmdliner (and :with-test (>= 1.1.0)))

tests/dune

@@ -34,12 +34,6 @@
  (modules poll_add)
  (libraries unix uring logs logs.fmt))
 
-(executable
- (name cptest)
- (modules cptest)
- (libraries urcp_fixed_lib urcp_lib lwtcp_lib uring bechamel notty.unix
-   bechamel-notty))
-
 (rule
  (alias runtest)
  (package uring)
@@ -50,7 +44,7 @@
  (package uring)
  (deps urcp.exe)
  (action
-  (run ./cptest.exe ./urcp.exe)))
+  (run ./urcp.exe)))
 
 (mdx
   (deps (package uring)))

uring.opam

@@ -15,8 +15,6 @@ depends: [
   "ocaml" {>= "4.12.0"}
   "dune-configurator"
   "lwt" {with-test & >= "5.0.0"}
-  "notty" {>= "0.2.2" & with-test}
-  "bechamel-notty" {>= "0.1.0" & with-test}
   "bechamel" {>= "0.1.0" & with-test}
   "logs" {with-test & >= "0.5.0"}
   "cmdliner" {with-test & >= "1.1.0"}