flambda-backend: Revert "Revert "Move immutable array modules to `Sta…

…ble_stdlib` (ocaml-flambda#2570)" (ocaml-flambda#2594)" (ocaml-flambda#2597) * Rely on Dune for otherlibs installation rules * Fix a few references to `Float32` * Fix `Float32` flambda tests * Revert "Revert "Move immutable array modules to `Stable_stdlib` (ocaml-flambda#2570)" (ocaml-flambda#2594)" This reverts commit 8a1a5d0. --------- Co-authored-by: Diana Kalinichenko <dkalinichenko@janestreet.com>
lukemaurer · May 22, 2024 · 3d71567 · 3d71567
1 parent 3ab10b8
commit 3d71567
Show file tree

Hide file tree

Showing 19 changed files with 27 additions and 56 deletions.
diff --git a/otherlibs/stable/dune b/otherlibs/stable/dune
@@ -46,6 +46,10 @@
  (targets
   float_u.ml
   float_u.mli
+  iarray.ml
+  iarray.mli
+  iarrayLabels.ml
+  iarrayLabels.mli
   int32_u.ml
   int32_u.mli
   int64_u.ml

diff --git a/stdlib/iarray.ml → otherlibs/stdlib_stable/iarray.ml b/stdlib/iarray.ml → otherlibs/stdlib_stable/iarray.ml
diff --git a/stdlib/iarray.mli → otherlibs/stdlib_stable/iarray.mli b/stdlib/iarray.mli → otherlibs/stdlib_stable/iarray.mli
diff --git a/stdlib/iarrayLabels.ml → otherlibs/stdlib_stable/iarrayLabels.ml b/stdlib/iarrayLabels.ml → otherlibs/stdlib_stable/iarrayLabels.ml
diff --git a/stdlib/iarrayLabels.mli → otherlibs/stdlib_stable/iarrayLabels.mli b/stdlib/iarrayLabels.mli → otherlibs/stdlib_stable/iarrayLabels.mli
diff --git a/otherlibs/stdlib_stable/stdlib_stable.ml b/otherlibs/stdlib_stable/stdlib_stable.ml
@@ -2,5 +2,5 @@ module Float_u = Float_u
 module Int32_u = Int32_u
 module Int64_u = Int64_u
 module Nativeint_u = Nativeint_u
-module Iarray = Stdlib__Iarray
-module IarrayLabels = Stdlib__IarrayLabels
+module Iarray = Iarray
+module IarrayLabels = IarrayLabels
diff --git a/otherlibs/stdlib_stable/stdlib_stable.mli b/otherlibs/stdlib_stable/stdlib_stable.mli
@@ -2,5 +2,5 @@ module Float_u = Float_u
 module Int32_u = Int32_u
 module Int64_u = Int64_u
 module Nativeint_u = Nativeint_u
-module Iarray = Stdlib__Iarray
-module IarrayLabels = Stdlib__IarrayLabels
+module Iarray = Iarray
+module IarrayLabels = IarrayLabels
diff --git a/stdlib/.depend b/stdlib/.depend
@@ -454,32 +454,6 @@ stdlib__Hashtbl.cmx : hashtbl.ml \
 stdlib__Hashtbl.cmi : hashtbl.mli \
     stdlib.cmi \
     stdlib__Seq.cmi
-stdlib__Iarray.cmo : iarray.ml \
-    stdlib.cmi \
-    stdlib__Seq.cmi \
-    stdlib__Array.cmi \
-    stdlib__Iarray.cmi
-stdlib__Iarray.cmx : iarray.ml \
-    stdlib.cmx \
-    stdlib__Seq.cmx \
-    stdlib__Array.cmx \
-    stdlib__Iarray.cmi
-stdlib__Iarray.cmi : iarray.mli \
-    stdlib.cmi \
-    stdlib__Seq.cmi
-stdlib__IarrayLabels.cmo : iarrayLabels.ml \
-    stdlib.cmi \
-    stdlib__Seq.cmi \
-    stdlib__Array.cmi \
-    stdlib__IarrayLabels.cmi
-stdlib__IarrayLabels.cmx : iarrayLabels.ml \
-    stdlib.cmx \
-    stdlib__Seq.cmx \
-    stdlib__Array.cmx \
-    stdlib__IarrayLabels.cmi
-stdlib__IarrayLabels.cmi : iarrayLabels.mli \
-    stdlib.cmi \
-    stdlib__Seq.cmi
 stdlib__In_channel.cmo : in_channel.ml \
     stdlib__Sys.cmi \
     stdlib.cmi \

diff --git a/stdlib/StdlibModules b/stdlib/StdlibModules
@@ -57,7 +57,6 @@ STDLIB_MODULE_BASENAMES = \
   unit \
   marshal \
   array \
-  iarray \
   float \
   int32 \
   nativeint \
@@ -94,7 +93,6 @@ STDLIB_MODULE_BASENAMES = \
   filename \
   complex \
   arrayLabels \
-  iarrayLabels \
   listLabels \
   bytesLabels \
   stringLabels \

diff --git a/stdlib/dune b/stdlib/dune
@@ -129,10 +129,6 @@
   gc.mli
   hashtbl.ml
   hashtbl.mli
-  iarray.ml
-  iarray.mli
-  iarrayLabels.ml
-  iarrayLabels.mli
   in_channel.ml
   in_channel.mli
   int.ml
@@ -280,12 +276,6 @@
   .stdlib.objs/byte/stdlib__Hashtbl.cmi
   .stdlib.objs/byte/stdlib__Hashtbl.cmt
   .stdlib.objs/byte/stdlib__Hashtbl.cmti
-  .stdlib.objs/byte/stdlib__Iarray.cmi
-  .stdlib.objs/byte/stdlib__Iarray.cmt
-  .stdlib.objs/byte/stdlib__Iarray.cmti
-  .stdlib.objs/byte/stdlib__IarrayLabels.cmi
-  .stdlib.objs/byte/stdlib__IarrayLabels.cmt
-  .stdlib.objs/byte/stdlib__IarrayLabels.cmti
   .stdlib.objs/byte/stdlib__In_channel.cmi
   .stdlib.objs/byte/stdlib__In_channel.cmt
   .stdlib.objs/byte/stdlib__In_channel.cmti
@@ -488,8 +478,6 @@
   .stdlib.objs/native/stdlib__Either.cmx
   .stdlib.objs/native/stdlib__In_channel.cmx
   .stdlib.objs/native/stdlib__Out_channel.cmx
-  .stdlib.objs/native/stdlib__Iarray.cmx
-  .stdlib.objs/native/stdlib__IarrayLabels.cmx
   (META as stdlib/META))
  (section lib)
  (package ocaml_runtime_stdlib))
diff --git a/testsuite/tests/array-functions/test_iarray.ml b/testsuite/tests/array-functions/test_iarray.ml
@@ -1,6 +1,8 @@
-(* TEST *)
+(* TEST
+ include stdlib_stable;
+*)
 
-module Iarray = Stdlib__Iarray
+module Iarray = Stdlib_stable.Iarray
 external ( .:() ) : 'a iarray -> int -> 'a = "%array_safe_get"
 
 (* Copied from [test.ml], but with all the [Array.fill] tests deleted *)

diff --git a/testsuite/tests/comprehensions/iarray_comprehensions_pure.ml b/testsuite/tests/comprehensions/iarray_comprehensions_pure.ml
@@ -1,11 +1,12 @@
 (* TEST
  flags = "-extension comprehensions";
+ include stdlib_stable;
  expect;
 *)
 
-module Iarray = Stdlib__Iarray;;
+module Iarray = Stdlib_stable.Iarray;;
 [%%expect{|
-module Iarray = Stdlib__Iarray
+module Iarray = Stdlib_stable.Iarray
 |}];;
 
 (******************************************************************************

diff --git a/testsuite/tests/comprehensions/iarray_comprehensions_side_effects.ml b/testsuite/tests/comprehensions/iarray_comprehensions_side_effects.ml
@@ -1,8 +1,9 @@
 (* TEST
  flags = "-extension comprehensions";
+ include stdlib_stable;
 *)
 
-module Iarray = Stdlib__Iarray
+module Iarray = Stdlib_stable.Iarray
 
 (******************************************************************************
  *                        ******** ATTENTION! ********                        *

diff --git a/testsuite/tests/lib-array/test_iarray.ml b/testsuite/tests/lib-array/test_iarray.ml
@@ -1,8 +1,9 @@
 (* TEST
+ include stdlib_stable;
  expect;
 *)
 
-module Iarray = Stdlib__Iarray;;
+module Iarray = Stdlib_stable.Iarray;;
 
 external ( .:() ) : 'a iarray -> int -> 'a = "%array_safe_get";;
 
@@ -15,7 +16,7 @@ let marray  : int   array = [|1;2;3;4;5|];;
 let mfarray : float array = [|1.5;2.5;3.5;4.5;5.5|];;
 
 [%%expect{|
-module Iarray = Stdlib__Iarray
+module Iarray = Stdlib_stable.Iarray
 external ( .:() ) : 'a iarray -> int -> 'a = "%array_safe_get"
 val iarray : int iarray = [:1; 2; 3; 4; 5:]
 val ifarray : float iarray = [:1.5; 2.5; 3.5; 4.5; 5.5:]

diff --git a/testsuite/tests/typing-local/float_iarray.ml b/testsuite/tests/typing-local/float_iarray.ml
@@ -1,4 +1,5 @@
 (* TEST
+ include stdlib_stable;
  {
    reference = "${test_source_directory}/float_iarray.heap.reference";
    bytecode;
@@ -16,7 +17,7 @@
 (* Testing that local [float iarray]s don't allocate on access.  This is a
    question because for flat float arrays, accesses have to box the float. *)
 
-module Iarray = Stdlib__Iarray
+module Iarray = Stdlib_stable.Iarray
 
 let ( .:() ) = Iarray.( .:() )
 

diff --git a/.../tests/typing-local/iarray.byte.reference → ...s/typing-local/test_iarray.byte.reference b/.../tests/typing-local/iarray.byte.reference → ...s/typing-local/test_iarray.byte.reference
diff --git a/.../tests/typing-local/iarray.heap.reference → ...s/typing-local/test_iarray.heap.reference b/.../tests/typing-local/iarray.heap.reference → ...s/typing-local/test_iarray.heap.reference
diff --git a/testsuite/tests/typing-local/iarray.ml → testsuite/tests/typing-local/test_iarray.ml b/testsuite/tests/typing-local/iarray.ml → testsuite/tests/typing-local/test_iarray.ml
@@ -1,14 +1,15 @@
 (* TEST
+ include stdlib_stable;
  {
-   reference = "${test_source_directory}/iarray.byte.reference";
+   reference = "${test_source_directory}/test_iarray.byte.reference";
    bytecode;
  }{
    stack-allocation;
-   reference = "${test_source_directory}/iarray.stack.reference";
+   reference = "${test_source_directory}/test_iarray.stack.reference";
    native;
  }{
    no-stack-allocation;
-   reference = "${test_source_directory}/iarray.heap.reference";
+   reference = "${test_source_directory}/test_iarray.heap.reference";
    native;
  }
 *)
@@ -21,7 +22,7 @@
    2. Correctness: They actually create arrays on the stack (by testing that no
       GCed allocation happens). *)
 
-module Iarray = Stdlib__Iarray
+module Iarray = Stdlib_stable.Iarray
 
 external opaque_local : local_ 'a -> local_ 'a = "%opaque"
 

diff --git a/...tests/typing-local/iarray.stack.reference → .../typing-local/test_iarray.stack.reference b/...tests/typing-local/iarray.stack.reference → .../typing-local/test_iarray.stack.reference