format

ocaml-flambda · TheNumbat · Apr 26, 2024 · Mar 14, 2024 · Mar 14, 2024 · Mar 14, 2024
commit a2af96d788b668276c54060bf0781b70ceb83e0b
diff --git a/backend/cfg/cfg.ml b/backend/cfg/cfg.ml
@@ -284,8 +284,8 @@ let dump_op ppf = function
   | Scalarcast (Float_to_int Pfloat64) -> Format.fprintf ppf "intoffloat"
   | Scalarcast (Float_of_int Pfloat32) -> Format.fprintf ppf "float32toint"
   | Scalarcast (Float_to_int Pfloat32) -> Format.fprintf ppf "intoffloat32"
-  | Scalarcast (Float_of_float32) -> Format.fprintf ppf "floatoffloat32"
-  | Scalarcast (Float_to_float32) -> Format.fprintf ppf "float32offloat"
+  | Scalarcast Float_of_float32 -> Format.fprintf ppf "floatoffloat32"
+  | Scalarcast Float_to_float32 -> Format.fprintf ppf "float32offloat"
   | Vectorcast Bits128 -> Format.fprintf ppf "vec128->vec128"
   | Scalarcast (V128_to_scalar ty) ->
     Format.fprintf ppf "%s->scalar" (Primitive.vec128_name ty)
@@ -550,9 +550,9 @@ let is_noop_move instr =
       ( Const_int _ | Const_float _ | Const_symbol _ | Const_vec128 _
       | Stackoffset _ | Load _ | Store _ | Intop _ | Intop_imm _
       | Intop_atomic _ | Negf | Absf | Addf | Subf | Mulf | Divf | Compf _
-      | Opaque | Valueofint | Intofvalue
-      | Scalarcast _ | Probe_is_enabled _ | Specific _ | Name_for_debugger _
-      | Begin_region | End_region | Dls_get | Poll | Alloc _ )
+      | Opaque | Valueofint | Intofvalue | Scalarcast _ | Probe_is_enabled _
+      | Specific _ | Name_for_debugger _ | Begin_region | End_region | Dls_get
+      | Poll | Alloc _ )
   | Reloadretaddr | Pushtrap _ | Poptrap | Prologue ->
     false
 

diff --git a/backend/cfg/cfg_comballoc.ml b/backend/cfg/cfg_comballoc.ml
@@ -47,10 +47,9 @@ let rec find_next_allocation : cell option -> allocation option =
         ( Move | Spill | Reload | Const_int _ | Const_float _ | Const_symbol _
         | Const_vec128 _ | Stackoffset _ | Load _ | Store _ | Intop _
         | Intop_imm _ | Intop_atomic _ | Negf | Absf | Addf | Subf | Mulf | Divf
-        | Compf _ | Csel _ | Valueofint | Intofvalue
-        | Vectorcast _ | Scalarcast _ | Probe_is_enabled _ | Opaque
-        | Begin_region | End_region | Specific _ | Name_for_debugger _ | Dls_get
-        | Poll )
+        | Compf _ | Csel _ | Valueofint | Intofvalue | Vectorcast _
+        | Scalarcast _ | Probe_is_enabled _ | Opaque | Begin_region | End_region
+        | Specific _ | Name_for_debugger _ | Dls_get | Poll )
     | Reloadretaddr | Pushtrap _ | Poptrap | Prologue ->
       find_next_allocation (DLL.next cell))
 
@@ -99,9 +98,9 @@ let find_compatible_allocations :
         { allocations = List.rev allocations; next_cell = Some cell }
       | Op
           ( Move | Spill | Reload | Negf | Absf | Addf | Subf | Mulf | Divf
-          | Valueofint | Intofvalue | Vectorcast _
-          | Opaque | Const_int _ | Const_float _ | Const_vec128 _
-          | Const_symbol _ | Stackoffset _ | Load _
+          | Valueofint | Intofvalue | Vectorcast _ | Opaque | Const_int _
+          | Const_float _ | Const_vec128 _ | Const_symbol _ | Stackoffset _
+          | Load _
           | Store (_, _, _)
           | Compf _ | Csel _ | Specific _ | Name_for_debugger _
           | Probe_is_enabled _ | Scalarcast _ | Dls_get

diff --git a/backend/cfg/cfg_cse.ml b/backend/cfg/cfg_cse.ml
@@ -85,8 +85,7 @@ class cse_generic =
       | Intop_imm (_, _) -> Op_pure
       | Intop_atomic _ -> Op_store true
       | Compf _ | Csel _ | Negf | Absf | Addf | Subf | Mulf | Divf
-      | Scalarcast _ | Valueofint | Intofvalue
-      | Vectorcast _ ->
+      | Scalarcast _ | Valueofint | Intofvalue | Vectorcast _ ->
         Op_pure
       | Specific _ -> Op_other
       | Name_for_debugger _ -> Op_other

diff --git a/backend/cfg/cfg_equivalence.ml b/backend/cfg/cfg_equivalence.ml
@@ -249,7 +249,8 @@ let check_operation : location -> Cfg.operation -> Cfg.operation -> unit =
     when Cmm.equal_float_comparison left_comp right_comp ->
     ()
   | Scalarcast left_scalar, Scalarcast right_scalar
-    when Cmm.equal_scalar_cast left_scalar right_scalar -> ()
+    when Cmm.equal_scalar_cast left_scalar right_scalar ->
+    ()
   | Valueofint, Valueofint -> ()
   | Intofvalue, Intofvalue -> ()
   | ( Probe_is_enabled { name = expected_name },

diff --git a/backend/cfg/cfgize.ml b/backend/cfg/cfgize.ml
@@ -629,10 +629,9 @@ module Stack_offset_and_exn = struct
         ( Move | Spill | Reload | Const_int _ | Const_float _ | Const_symbol _
         | Const_vec128 _ | Load _ | Store _ | Intop _ | Intop_imm _
         | Intop_atomic _ | Negf | Absf | Addf | Subf | Mulf | Divf | Compf _
-        | Valueofint | Csel _ | Intofvalue
-        | Scalarcast _ | Vectorcast _ | Probe_is_enabled _ | Opaque
-        | Begin_region | End_region | Specific _ | Name_for_debugger _ | Dls_get
-        | Poll | Alloc _ )
+        | Valueofint | Csel _ | Intofvalue | Scalarcast _ | Vectorcast _
+        | Probe_is_enabled _ | Opaque | Begin_region | End_region | Specific _
+        | Name_for_debugger _ | Dls_get | Poll | Alloc _ )
     | Reloadretaddr | Prologue ->
       stack_offset, traps
 

diff --git a/backend/cmm_helpers.ml b/backend/cmm_helpers.ml
@@ -705,11 +705,11 @@ let test_bool dbg cmm =
 
 let box_float32 dbg mode exp =
   Cop
-  ( Calloc mode,
-    [ alloc_boxedfloat32_header mode dbg;
-      Cconst_symbol (global_symbol caml_float32_ops, dbg);
-      exp ],
-    dbg )
+    ( Calloc mode,
+      [ alloc_boxedfloat32_header mode dbg;
+        Cconst_symbol (global_symbol caml_float32_ops, dbg);
+        exp ],
+      dbg )
 
 let unbox_float32 dbg =
   map_tail ~kind:Any (function
@@ -3392,9 +3392,9 @@ let int_of_float32 = unary (Cscalarcast (Float_to_int Pfloat32))
 
 let float32_of_int = unary (Cscalarcast (Float_of_int Pfloat32))
 
-let float32_of_float = unary (Cscalarcast (Float_to_float32))
+let float32_of_float = unary (Cscalarcast Float_to_float32)
 
-let float_of_float32 = unary (Cscalarcast (Float_of_float32))
+let float_of_float32 = unary (Cscalarcast Float_of_float32)
 
 let lsl_int_caml_raw ~dbg arg1 arg2 =
   incr_int (lsl_int (decr_int arg1 dbg) arg2 dbg) dbg

diff --git a/backend/debug/available_regs.ml b/backend/debug/available_regs.ml
@@ -225,10 +225,10 @@ let rec available_regs (instr : M.instruction) ~all_regs_that_might_be_named
            | Iconst_int _ | Iconst_float _ | Iconst_vec128 _ | Iconst_symbol _
            | Iextcall _ | Istackoffset _ | Iload _ | Istore _ | Iintop _
            | Iintop_imm _ | Iintop_atomic _ | Icompf _ | Inegf | Iabsf | Iaddf
-           | Isubf | Imulf | Idivf | Icsel _
-           | Ivalueofint | Iintofvalue | Iopaque | Ispecific _ | Iscalarcast _
-           | Ivectorcast _ | Iprobe_is_enabled _ | Ibeginregion | Iendregion
-           | Idls_get ) as op) ->
+           | Isubf | Imulf | Idivf | Icsel _ | Ivalueofint | Iintofvalue
+           | Iopaque | Ispecific _ | Iscalarcast _ | Ivectorcast _
+           | Iprobe_is_enabled _ | Ibeginregion | Iendregion | Idls_get ) as op)
+        ->
         (* We split the calculation of registers that become unavailable after a
            call into two parts. First: anything that the target marks as
            destroyed by the operation, combined with any registers that will be
@@ -288,10 +288,10 @@ let rec available_regs (instr : M.instruction) ~all_regs_that_might_be_named
           | Iconst_vec128 _ | Iconst_symbol _ | Itailcall_ind | Itailcall_imm _
           | Iextcall _ | Istackoffset _ | Iload _ | Istore _ | Iintop _
           | Iintop_imm _ | Iintop_atomic _ | Icompf _ | Inegf | Iabsf | Iaddf
-          | Isubf | Imulf | Idivf | Icsel _
-          | Ivalueofint | Iintofvalue | Iopaque | Ispecific _ | Iscalarcast _
-          | Ivectorcast _ | Iname_for_debugger _ | Iprobe_is_enabled _
-          | Ibeginregion | Idls_get ->
+          | Isubf | Imulf | Idivf | Icsel _ | Ivalueofint | Iintofvalue
+          | Iopaque | Ispecific _ | Iscalarcast _ | Ivectorcast _
+          | Iname_for_debugger _ | Iprobe_is_enabled _ | Ibeginregion | Idls_get
+            ->
             RD.Set.empty
         in
         let made_unavailable =