flambda-backend: Prefix otherlibs build artifacts (#2595)

* Rely on Dune for otherlibs installation rules

* Fix a few references to `Float32`

* Fix `Float32` flambda tests

---------

Co-authored-by: Diana Kalinichenko <[email protected]>

Author: dkalinichenko-js

otherlibs/alpha/dune

@@ -17,7 +17,7 @@
 
 (library
  (name alpha)
- (wrapped false)
+ (public_name ocaml.alpha)
  (modes byte native)
  (flags
   (-strict-sequence
@@ -56,9 +56,3 @@
   (with-stdout-to
    to_install.sexp
    (run "%{first-dep}" "alpha"))))
-
-(install
- (files
-  (include to_install.sexp))
- (section lib)
- (package ocaml))

otherlibs/beta/dune

@@ -17,7 +17,7 @@
 
 (library
  (name beta)
- (wrapped false)
+ (public_name ocaml.beta)
  (modes byte native)
  (enabled_if
   (= %{architecture} "amd64"))
@@ -58,11 +58,3 @@
   (with-stdout-to
    to_install.sexp
    (run "%{first-dep}" "beta"))))
-
-(install
- (enabled_if
-  (= %{architecture} "amd64"))
- (files
-  (include to_install.sexp))
- (section lib)
- (package ocaml))

otherlibs/stable/dune

@@ -17,7 +17,7 @@
 
 (library
  (name stable)
- (wrapped false)
+ (public_name ocaml.stable)
  (modes byte native)
  (flags
   (-strict-sequence
@@ -66,9 +66,3 @@
   (with-stdout-to
    to_install.sexp
    (run "%{first-dep}" "stable"))))
-
-(install
- (files
-  (include to_install.sexp))
- (section lib)
- (package ocaml))

otherlibs/stdlib_alpha/dune

@@ -14,7 +14,7 @@
 
 (library
  (name stdlib_alpha)
- (wrapped false)
+ (public_name ocaml.stdlib_alpha)
  (modes byte native)
  (flags
   (-strict-sequence
@@ -42,9 +42,3 @@
   (with-stdout-to
    to_install.sexp
    (run "%{first-dep}" "stdlib_alpha"))))
-
-(install
- (files
-  (include to_install.sexp))
- (section lib)
- (package ocaml))

otherlibs/stdlib_beta/dune

@@ -14,7 +14,7 @@
 
 (library
  (name stdlib_beta)
- (wrapped false)
+ (public_name ocaml.stdlib_beta)
  (modes byte native)
  (enabled_if
   (= %{architecture} "amd64"))
@@ -44,11 +44,3 @@
   (with-stdout-to
    to_install.sexp
    (run "%{first-dep}" "stdlib_beta"))))
-
-(install
- (enabled_if
-  (= %{architecture} "amd64"))
- (files
-  (include to_install.sexp))
- (section lib)
- (package ocaml))

otherlibs/stdlib_stable/dune

@@ -14,7 +14,7 @@
 
 (library
  (name stdlib_stable)
- (wrapped false)
+ (public_name ocaml.stdlib_stable)
  (modes byte native)
  (flags
   (-strict-sequence
@@ -42,9 +42,3 @@
   (with-stdout-to
    to_install.sexp
    (run "%{first-dep}" "stdlib_stable"))))
-
-(install
- (files
-  (include to_install.sexp))
- (section lib)
- (package ocaml))

otherlibs/stdlib_upstream_compatible/dune

@@ -14,7 +14,7 @@
 
 (library
  (name stdlib_upstream_compatible)
- (wrapped false)
+ (public_name ocaml.stdlib_upstream_compatible)
  (modes byte native)
  (flags
   (-strict-sequence
@@ -42,9 +42,3 @@
   (with-stdout-to
    to_install.sexp
    (run "%{first-dep}" "stdlib_upstream_compatible"))))
-
-(install
- (files
-  (include to_install.sexp))
- (section lib)
- (package ocaml))

otherlibs/to_install.sh

@@ -18,7 +18,7 @@
 
 (library
  (name upstream_compatible)
- (wrapped false)
+ (public_name ocaml.upstream_compatible)
  (modes byte native)
  (flags
   (-strict-sequence
@@ -57,9 +57,3 @@
   (with-stdout-to
    to_install.sexp
    (run "%{first-dep}" "upstream_compatible"))))
-
-(install
- (files
-  (include to_install.sexp))
- (section lib)
- (package ocaml))

otherlibs/upstream_compatible/dune

@@ -14,6 +14,7 @@
 (* Prelude: Functions on unboxed numbers *)
 
 module Float32_u = Beta.Float32_u
+module Float32 = Beta.Float32
 module Float_u = Stable.Float_u
 module Int32_u = Stable.Int32_u
 module Int64_u = Stable.Int64_u

testsuite/tests/mixed-blocks/constructor_args.ml

@@ -65,7 +65,7 @@ module Float32_u_array0 : Gen_u_array.S0
     "caml_array_blit" "caml_unboxed_float32_vect_blit"
   let empty () = [||]
   external to_boxed : ('a : float32) -> (float32[@local_opt]) = "%box_float32"
-  let compare_element x y = Float32.compare (to_boxed (x ())) (to_boxed (y ()))
+  let compare_element x y = Beta.Float32.compare (to_boxed (x ())) (to_boxed (y ()))
 end
 
 module Float32_u_array = Gen_u_array.Make (Float32_u_array0)

testsuite/tests/typing-layouts-arrays/test_float32_u_array.ml

@@ -82,12 +82,12 @@ struct
       measure_alloc (fun () -> go #0.s #0.s)
     in
     Printf.printf "Unboxed:\n  estimate: %f\n  allocations: %s\n"
-      (Float32.to_float (to_float32 est) *. 4.) (get_allocations ())
+      (Beta.Float32.to_float (to_float32 est) *. 4.) (get_allocations ())
 end
 
 module Pi_boxed =
 struct
-  open Float32
+  open Beta.Float32
   open Operators
 
   let[@inline never] step n estimate =
@@ -125,8 +125,8 @@ let print_record_and_allocs s r =
   Printf.printf
     "%s:\n  allocated bytes: %.2f\n  a: %.2f\n  b: %.2f\n  c: %.2f\n  d: %.2f\n"
     s allocs
-    (Float32.to_float (Float32_u.to_float32 r.a)) (Float32.to_float (Float32_u.to_float32 r.b))
-    (Float32.to_float (Float32_u.to_float32 r.c)) (Float32.to_float (Float32_u.to_float32 r.d))
+    (Beta.Float32.to_float (Float32_u.to_float32 r.a)) (Beta.Float32.to_float (Float32_u.to_float32 r.b))
+    (Beta.Float32.to_float (Float32_u.to_float32 r.c)) (Beta.Float32.to_float (Float32_u.to_float32 r.d))
 
 (* Building a record should only allocate the box *)
 let[@inline never] build x =