handle previous run file generation correctly for multi-domain runs

lukstafi · lukstafi · commit 9a3bdff26d16 · 2025-02-27T01:04:23.000+01:00
- Update `ocannl_config.example` to use `prev_run_prefix` instead of `prev_run_file`
- Modify `get_debug` function to handle previous run file generation more flexibly
- Improve file stem and previous run file path generation in debug configuration
diff --git a/arrayjit/lib/utils.ml b/arrayjit/lib/utils.ml
@@ -272,9 +272,14 @@ let get_debug name =
   let log_main_domain_to_stdout =
     Bool.of_string @@ get_global_arg ~default:"false" ~arg_name:"log_main_domain_to_stdout"
   in
-  let filename =
+  let file_stem =
     if log_main_domain_to_stdout && String.is_empty name then None
-    else Some (diagn_log_file @@ if String.is_empty name then "debug" else "debug-" ^ name)
+    else Some ((if String.is_empty name then "debug" else "debug-") ^ name)
+  in
+  let filename = Option.map file_stem ~f:(fun stem -> diagn_log_file @@ stem) in
+  let prev_run_file =
+    let prefix = get_global_arg ~default:"" ~arg_name:"prev_run_prefix" in
+    Option.map file_stem ~f:(fun stem -> diagn_log_file @@ prefix ^ stem ^ ".raw")
   in
   let log_level =
     let s = String.strip @@ get_global_arg ~default:"1" ~arg_name:"log_level" in
@@ -319,12 +324,6 @@ let get_debug name =
     if String.is_empty arg then [] else [ Re.Pcre.re arg ]
   in
   let highlight_terms = Re.(alt (highlight_re @ List.map debug_highlights ~f:str)) in
-  let prev_run_file =
-    let arg = get_global_arg ~default:"" ~arg_name:"prev_run_file" in
-    if String.is_empty arg then None
-    else if String.is_suffix arg ~suffix:".raw" then Some arg
-    else Some (arg ^ ".raw")
-  in
   let diff_ignore_pattern =
     let arg = get_global_arg ~default:"" ~arg_name:"diff_ignore_pattern_pcre" in
     if String.is_empty arg then None else Some (Re.Pcre.re arg)
@@ -348,8 +347,7 @@ let get_debug name =
              ~flame_graph_separation:50 ~toc_entry ~for_append:false ~max_inline_sexp_length:120
              ~hyperlink ~toc_specific_hyperlink:"" ~highlight_terms
              ~exclude_on_path:Re.(str "env")
-             ~backend ~log_level ?snapshot_every_sec ?prev_run_file ?diff_ignore_pattern
-             filename
+             ~backend ~log_level ?snapshot_every_sec ?prev_run_file ?diff_ignore_pattern filename
 
 let _get_local_debug_runtime =
   let open Stdlib.Domain in
diff --git a/ocannl_config.example b/ocannl_config.example
@@ -135,8 +135,8 @@ debug_highlights=
 debug_highlight_pcre=
 
 # For ppx_minidebug: if provided, enables highlighting differences between the current run
-# and a previous run loaded from this file. The ".raw" extension is added automatically if not present.
-prev_run_file=
+# and a previous run loaded from `.raw` files derived using the given prefix.
+prev_run_prefix=
 
 # For ppx_minidebug: a pcre syntax regular expression pattern that will be removed from messages
 # before comparison when highlighting differences between runs, allowing certain differences to be ignored.
