bench: disable sandbox bench (ocaml#10552)

Signed-off-by: Antonio Nuno Monteiro <[email protected]>

Author: anmonteiro

bench/bench.ml

@@ -142,13 +142,6 @@ let dune_build ~name ~sandbox =
   |> Metrics.make times
 ;;
 
-let dune_clean () =
-  let stdin_from = Process.(Io.null In) in
-  let stdout_to = make_stdout () in
-  let stderr_to = make_stderr () in
-  Process.run Strict ~display:Quiet ~stdout_to ~stderr_to ~stdin_from dune [ "clean" ]
-;;
-
 let run_bench ~sandbox =
   let open Fiber.O in
   let* clean = dune_build ~name:"clean" ~sandbox in
@@ -169,18 +162,16 @@ type ('float, 'int) bench_results =
   { size : int
   ; clean : ('float, 'int) Metrics.t
   ; zero : ('float, 'int) Metrics.t list
-  ; clean_sandbox : ('float, 'int) Metrics.t
-  ; zero_sandbox : ('float, 'int) Metrics.t list
   }
 
-let tag_results { size; clean; zero; clean_sandbox; zero_sandbox } =
+let tag_results { size; clean; zero } =
   let tag data = Metrics.map ~f:(fun t -> `Float t) ~g:(fun t -> `Int t) data in
   let list_tag data =
     List.map data ~f:tag
     |> Metrics.unzip
     |> Metrics.map ~f:(fun x -> `List x) ~g:(fun x -> `List x)
   in
-  `Int size, tag clean, list_tag zero, tag clean_sandbox, list_tag zero_sandbox
+  `Int size, tag clean, list_tag zero
 ;;
 
 (** Display all clean and null builds with a few exceptions:
@@ -211,147 +202,38 @@ let display_clean_and_zero_with_sandboxing
    } :
     _ Metrics.t)
   (zero : _ Metrics.t)
-  (clean_sandbox : _ Metrics.t)
-  (zero_sandbox : _ Metrics.t)
   =
-  let display what units clean zero clean_sandbox zero_sandbox =
+  let display what units clean zero =
     { Output.name = what
-    ; metrics =
-        [ "[Clean] " ^ what, clean, units
-        ; "[Null] " ^ what, zero, units
-        ; "[Clean Sandbox] " ^ what, clean_sandbox, units
-        ; "[Null Sandbox] " ^ what, zero_sandbox, units
-        ]
+    ; metrics = [ "[Clean] " ^ what, clean, units; "[Null] " ^ what, zero, units ]
     }
   in
-  [ display
-      "Build Time"
-      "Seconds"
-      elapsed_time
-      zero.elapsed_time
-      clean_sandbox.elapsed_time
-      zero_sandbox.elapsed_time
-  ; display
-      "Minor Words"
-      "Approx. Words"
-      minor_words
-      zero.minor_words
-      clean_sandbox.minor_words
-      zero_sandbox.minor_words
-  ; display
-      "Promoted Words"
-      "Approx. Words"
-      promoted_words
-      zero.promoted_words
-      clean_sandbox.promoted_words
-      zero_sandbox.promoted_words
-  ; display
-      "Major Words"
-      "Approx. Words"
-      major_words
-      zero.major_words
-      clean_sandbox.major_words
-      zero_sandbox.major_words
-  ; display
-      "Minor Collections"
-      "Collections"
-      minor_collections
-      zero.minor_collections
-      clean_sandbox.minor_collections
-      zero_sandbox.minor_collections
-  ; display
-      "Major Collections"
-      "Collections"
-      major_collections
-      zero.major_collections
-      clean_sandbox.major_collections
-      zero_sandbox.major_collections
-  ; display
-      "Heap Words"
-      "Words"
-      heap_words
-      zero.heap_words
-      clean_sandbox.heap_words
-      zero_sandbox.heap_words
-  ; display
-      "Heap Chunks"
-      "Chunks"
-      heap_chunks
-      zero.heap_chunks
-      clean_sandbox.heap_chunks
-      zero_sandbox.heap_chunks
-  ; display
-      "Live Words"
-      "Words"
-      live_words
-      zero.live_words
-      clean_sandbox.live_words
-      zero_sandbox.live_words
-  ; display
-      "Live Blocks"
-      "Blocks"
-      live_blocks
-      zero.live_blocks
-      clean_sandbox.live_blocks
-      zero_sandbox.live_blocks
-  ; display
-      "Free Words"
-      "Words"
-      free_words
-      zero.free_words
-      clean_sandbox.free_words
-      zero_sandbox.free_words
-  ; display
-      "Free Blocks"
-      "Blocks"
-      free_blocks
-      zero.free_blocks
-      clean_sandbox.free_blocks
-      zero_sandbox.free_blocks
-  ; display
-      "Largest Free"
-      "Words"
-      largest_free
-      zero.largest_free
-      clean_sandbox.largest_free
-      zero_sandbox.largest_free
-  ; display
-      "Compactions"
-      "Compactions"
-      compactions
-      zero.compactions
-      clean_sandbox.compactions
-      zero_sandbox.compactions
-  ; display
-      "Top Heap Words"
-      "Words"
-      top_heap_words
-      zero.top_heap_words
-      clean_sandbox.top_heap_words
-      zero_sandbox.top_heap_words
-  ; display
-      "User CPU Time"
-      "Seconds"
-      user_cpu_time
-      zero.user_cpu_time
-      clean_sandbox.user_cpu_time
-      zero_sandbox.user_cpu_time
-  ; display
-      "System CPU Time"
-      "Seconds"
-      system_cpu_time
-      zero.system_cpu_time
-      clean_sandbox.system_cpu_time
-      zero_sandbox.system_cpu_time
+  [ display "Build Time" "Seconds" elapsed_time zero.elapsed_time
+  ; display "Minor Words" "Approx. Words" minor_words zero.minor_words
+  ; display "Promoted Words" "Approx. Words" promoted_words zero.promoted_words
+  ; display "Major Words" "Approx. Words" major_words zero.major_words
+  ; display "Minor Collections" "Collections" minor_collections zero.minor_collections
+  ; display "Major Collections" "Collections" major_collections zero.major_collections
+  ; display "Heap Words" "Words" heap_words zero.heap_words
+  ; display "Heap Chunks" "Chunks" heap_chunks zero.heap_chunks
+  ; display "Live Words" "Words" live_words zero.live_words
+  ; display "Live Blocks" "Blocks" live_blocks zero.live_blocks
+  ; display "Free Words" "Words" free_words zero.free_words
+  ; display "Free Blocks" "Blocks" free_blocks zero.free_blocks
+  ; display "Largest Free" "Words" largest_free zero.largest_free
+  ; display "Compactions" "Compactions" compactions zero.compactions
+  ; display "Top Heap Words" "Words" top_heap_words zero.top_heap_words
+  ; display "User CPU Time" "Seconds" user_cpu_time zero.user_cpu_time
+  ; display "System CPU Time" "Seconds" system_cpu_time zero.system_cpu_time
   ]
 ;;
 
 let format_results bench_results =
   (* tagging data for json conversion *)
-  let size, clean, zero, clean_sandbox, zero_sandbox = tag_results bench_results in
+  let size, clean, zero = tag_results bench_results in
   (* bench results *)
   [ { Output.name = "Misc"; metrics = [ "Size of _boot/dune.exe", size, "Bytes" ] } ]
-  @ display_clean_and_zero_with_sandboxing clean zero clean_sandbox zero_sandbox
+  @ display_clean_and_zero_with_sandboxing clean zero
 ;;
 
 let () =
@@ -381,16 +263,10 @@ let () =
     let* () = prepare_workspace () in
     (* Build the clean and null builds *)
     Console.printf "Building clean and null builds";
-    let* clean, zero = run_bench ~sandbox:`No in
+    let+ clean, zero = run_bench ~sandbox:`No in
     Console.printf "Finished building clean and null builds";
-    (* Clean the workspace *)
-    let* () = dune_clean () in
-    Console.printf "Building clean and null builds with sandbox";
-    (* Build the clean and null builds with sandbox *)
-    let+ clean_sandbox, zero_sandbox = run_bench ~sandbox:`Yes in
-    Console.printf "Finished building clean and null builds with sandbox";
     (* Return the bench results *)
-    format_results { size; clean; zero; clean_sandbox; zero_sandbox }
+    format_results { size; clean; zero }
   in
   let version = 4 in
   let output = { Output.config = []; version; results } in