Rename optimize_proc -> optimize, lower_proc -> lower

lukstafi · lukstafi · commit 3cb9936ccdae · 2024-10-20T10:18:12.000+02:00
diff --git a/CHANGES.md b/CHANGES.md
@@ -3,8 +3,8 @@
 ### Added
 
 - Interface files for `Backends` and `Low_level`.
-- TODO: stream-to-stream synchronization functionality, with lazy per-tensor-node synchronization.
 - Fixed #245: tracking of used memory.
+- TODO: stream-to-stream synchronization functionality, with lazy per-tensor-node synchronization.
 
 ### Changed
 
diff --git a/arrayjit/lib/assignments.ml b/arrayjit/lib/assignments.ml
@@ -378,7 +378,7 @@ let fprint_hum ?name ?static_indices () ppf c =
   loop c;
   fprintf ppf "@]"
 
-let lower_proc ~unoptim_ll_source ~ll_source ~cd_source ~name static_indices (proc : t) :
+let lower ~unoptim_ll_source ~ll_source ~cd_source ~name static_indices (proc : t) :
     Low_level.optimized =
   let llc = to_low_level proc in
   (* Generate the low-level code before outputting the assignments, to force projections. *)
@@ -387,4 +387,4 @@ let lower_proc ~unoptim_ll_source ~ll_source ~cd_source ~name static_indices (pr
   | Some ppf ->
       fprint_hum ~name ~static_indices () ppf proc;
       Stdlib.Format.pp_print_flush ppf ());
-  Low_level.optimize_proc ~unoptim_ll_source ~ll_source ~name static_indices llc
+  Low_level.optimize ~unoptim_ll_source ~ll_source ~name static_indices llc
diff --git a/arrayjit/lib/backends.ml b/arrayjit/lib/backends.ml
@@ -507,7 +507,7 @@ let lower_assignments ?name bindings asgns =
   let ll_source = Utils.get_debug_formatter ~fname:(name ^ ".ll") in
   let cd_source = Utils.get_debug_formatter ~fname:(name ^ ".cd") in
   ( name,
-    Assignments.lower_proc ~unoptim_ll_source ~ll_source ~cd_source ~name
+    Assignments.lower ~unoptim_ll_source ~ll_source ~cd_source ~name
       (Indexing.bound_symbols bindings) asgns )
 
 let lower_batch_assignments ?names ?occupancy bindings asgns_l =
@@ -526,9 +526,7 @@ let lower_batch_assignments ?names ?occupancy bindings asgns_l =
          let asgns = asgns_l.(src_n) in
          if occupancy ~name ~src_n then
            ( Some name,
-             Some
-               (Assignments.lower_proc ~unoptim_ll_source ~ll_source ~cd_source ~name bound asgns)
-           )
+             Some (Assignments.lower ~unoptim_ll_source ~ll_source ~cd_source ~name bound asgns) )
          else (None, None))
 
 let verify_prior_context ~get_array ~ctx_arrays ~is_in_context ~prior_context ~from_prior_context
diff --git a/arrayjit/lib/low_level.ml b/arrayjit/lib/low_level.ml
@@ -886,7 +886,7 @@ let fprint_hum ?name ?static_indices () ppf llc =
   pp_ll ppf llc;
   fprintf ppf "@]"
 
-let%diagn2_sexp optimize_proc ~unoptim_ll_source ~ll_source ~(name : string)
+let%diagn2_sexp optimize ~unoptim_ll_source ~ll_source ~(name : string)
     (static_indices : Indexing.static_symbol list) (llc : t) : optimized =
   Option.iter unoptim_ll_source ~f:(fun ppf ->
       Stdlib.Format.fprintf ppf "%a%!" (fprint_hum ~name ~static_indices ()) llc);
diff --git a/arrayjit/lib/low_level.mli b/arrayjit/lib/low_level.mli
@@ -91,7 +91,7 @@ type traced_store = (Tnode.t, traced_array) Base.Hashtbl.t [@@deriving sexp_of]
 type optimized = { traced_store : traced_store; llc : t; merge_node : Tnode.t option }
 [@@deriving sexp_of]
 
-val optimize_proc :
+val optimize :
   unoptim_ll_source:Stdlib.Format.formatter option ->
   ll_source:Stdlib.Format.formatter option ->
   name:string ->
diff --git a/arrayjit/lib/writing_a_backend.md b/arrayjit/lib/writing_a_backend.md
@@ -17,7 +17,7 @@
 
 ## Design around compiling and running code, backend interfaces
 
-Currently, OCANNL integrates new backends via code in [Backends](backends.ml), so it's the "sink" of backend module dependencies; [Backend_types](backend_types.ml) is the "source". `Backend_types.Types` introduces the context-specific `routine` type, for code executable on a backend. The interface `Backends.No_device_backend` has `compile` functions that take `Assignments.comp` as input, to allow full flexibility in backend implementations. There is a helper `Backends.lower_assignments` that wraps `Assignments.lower` and `Low_level.optimize_proc`, since currently all backends use the optimized C-like representation `Low_level.t`. `Backends.Backend` is the user-facing interface.
+Currently, OCANNL integrates new backends via code in [Backends](backends.ml), so it's the "sink" of backend module dependencies; [Backend_types](backend_types.ml) is the "source". `Backend_types.Types` introduces the context-specific `routine` type, for code executable on a backend. The interface `Backends.No_device_backend` has `compile` functions that take `Assignments.comp` as input, to allow full flexibility in backend implementations. There is a helper `Backends.lower_assignments` that wraps `Assignments.lower` and `Low_level.optimize`, since currently all backends use the optimized C-like representation `Low_level.t`. `Backends.Backend` is the user-facing interface.
 
 The functor `Multicore_backend` converts a `No_device_backend` typically targetting the CPU into a `Backend` whose devices are parallel threads (and ultimately the CPU cores).
 
