flambda-backend: To upstream: use flambda_o3 attribute in stdlib

mshinwell · poechsel · commit 7d08e0e17015 · 2021-06-25T16:18:47.000+01:00
diff --git a/stdlib/Makefile b/stdlib/Makefile
@@ -24,9 +24,6 @@ CAMLC=$(CAMLRUN) $(COMPILER)
 COMPFLAGS=-strict-sequence -absname -w +a-4-9-41-42-44-45-48-66 \
           -g -warn-error A -bin-annot -nostdlib -principal \
           -safe-string -strict-formats -nopervasives -no-alias-deps
-ifeq "$(FLAMBDA)" "true"
-OPTCOMPFLAGS += -O3
-endif
 OPTCOMPILER=$(ROOTDIR)/ocamlopt$(EXE)
 CAMLOPT=$(CAMLRUN) $(OPTCOMPILER)
 CAMLDEP=$(BOOT_OCAMLC) -depend
diff --git a/stdlib/arg.ml b/stdlib/arg.ml
@@ -15,6 +15,8 @@
 
 open! Stdlib
 
+[@@@ocaml.flambda_o3]
+
 type key = string
 type doc = string
 type usage_msg = string
diff --git a/stdlib/array.ml b/stdlib/array.ml
@@ -15,6 +15,8 @@
 
 open! Stdlib
 
+[@@@ocaml.flambda_o3]
+
 (* An alias for the type of arrays. *)
 type 'a t = 'a array
 
diff --git a/stdlib/arrayLabels.ml b/stdlib/arrayLabels.ml
@@ -15,6 +15,8 @@
 
 open! Stdlib
 
+[@@@ocaml.flambda_o3]
+
 (* Module [ArrayLabels]: labelled Array module *)
 
 [@@@ocaml.nolabels]
diff --git a/stdlib/bigarray.ml b/stdlib/bigarray.ml
@@ -15,6 +15,8 @@
 
 open! Stdlib
 
+[@@@ocaml.flambda_o3]
+
 (* Module [Bigarray]: large, multi-dimensional, numerical arrays *)
 
 (* These types in must be kept in sync with the tables in
diff --git a/stdlib/bool.ml b/stdlib/bool.ml
@@ -15,6 +15,8 @@
 
 open! Stdlib
 
+[@@@ocaml.flambda_o3]
+
 type t = bool = false | true
 
 external not : bool -> bool = "%boolnot"
diff --git a/stdlib/buffer.ml b/stdlib/buffer.ml
@@ -15,6 +15,8 @@
 
 open! Stdlib
 
+[@@@ocaml.flambda_o3]
+
 (* Extensible buffers *)
 
 [@@@ocaml.inline 3]
diff --git a/stdlib/bytes.ml b/stdlib/bytes.ml
@@ -15,6 +15,8 @@
 
 open! Stdlib
 
+[@@@ocaml.flambda_o3]
+
 (* Byte sequence operations *)
 
 (* WARNING: Some functions in this file are duplicated in string.ml for
diff --git a/stdlib/bytesLabels.ml b/stdlib/bytesLabels.ml
@@ -15,6 +15,8 @@
 
 open! Stdlib
 
+[@@@ocaml.flambda_o3]
+
 (* Module [BytesLabels]: labelled Bytes module *)
 
 [@@@ocaml.nolabels]
diff --git a/stdlib/callback.ml b/stdlib/callback.ml
@@ -15,6 +15,8 @@
 
 open! Stdlib
 
+[@@@ocaml.flambda_o3]
+
 (* Registering OCaml values with the C runtime for later callbacks *)
 
 external register_named_value : string -> Obj.t -> unit
diff --git a/stdlib/camlinternalFormat.ml b/stdlib/camlinternalFormat.ml
@@ -15,6 +15,8 @@
 
 open! Stdlib
 
+[@@@ocaml.flambda_o3]
+
 [@@@ocaml.warning "Ae"]
 
 open CamlinternalFormatBasics
diff --git a/stdlib/camlinternalLazy.ml b/stdlib/camlinternalLazy.ml
@@ -15,6 +15,8 @@
 
 open! Stdlib
 
+[@@@ocaml.flambda_o3]
+
 (* Internals of forcing lazy values. *)
 
 [@@@ocaml.afl_inst_ratio 0]
diff --git a/stdlib/camlinternalMod.ml b/stdlib/camlinternalMod.ml
@@ -15,6 +15,8 @@
 
 open! Stdlib
 
+[@@@ocaml.flambda_o3]
+
 external make_forward : Obj.t -> Obj.t -> unit = "caml_obj_make_forward"
 
 type shape =
diff --git a/stdlib/camlinternalOO.ml b/stdlib/camlinternalOO.ml
@@ -15,6 +15,8 @@
 
 open! Stdlib
 
+[@@@ocaml.flambda_o3]
+
 [@@@ocaml.inline 0]
 [@@@ocaml.afl_inst_ratio 0]
 
diff --git a/stdlib/char.ml b/stdlib/char.ml
@@ -15,6 +15,8 @@
 
 open! Stdlib
 
+[@@@ocaml.flambda_o3]
+
 (* Character operations *)
 
 external code: char -> int = "%identity"
diff --git a/stdlib/complex.ml b/stdlib/complex.ml
@@ -15,6 +15,8 @@
 
 open! Stdlib
 
+[@@@ocaml.flambda_o3]
+
 (* Complex numbers *)
 
 type t = { re: float; im: float }
diff --git a/stdlib/digest.ml b/stdlib/digest.ml
@@ -15,6 +15,8 @@
 
 open! Stdlib
 
+[@@@ocaml.flambda_o3]
+
 (* Message digest (MD5) *)
 
 type t = string
diff --git a/stdlib/ephemeron.ml b/stdlib/ephemeron.ml
@@ -15,6 +15,8 @@
 
 open! Stdlib
 
+[@@@ocaml.flambda_o3]
+
 module type SeededS = sig
   include Hashtbl.SeededS
   val clean: 'a t -> unit
diff --git a/stdlib/filename.ml b/stdlib/filename.ml
@@ -15,6 +15,8 @@
 
 open! Stdlib
 
+[@@@ocaml.flambda_o3]
+
 let generic_quote quotequote s =
   let l = String.length s in
   let b = Buffer.create (l + 20) in
diff --git a/stdlib/float.ml b/stdlib/float.ml
@@ -16,6 +16,8 @@
 
 open! Stdlib
 
+[@@@ocaml.flambda_o3]
+
 [@@@ocaml.nolabels]
 
 external neg : float -> float = "%negfloat"
diff --git a/stdlib/format.ml b/stdlib/format.ml
@@ -15,6 +15,8 @@
 
 open! Stdlib
 
+[@@@ocaml.flambda_o3]
+
 (* A pretty-printing facility and definition of formatters for 'parallel'
    (i.e. unrelated or independent) pretty-printing on multiple out channels. *)
 
diff --git a/stdlib/fun.ml b/stdlib/fun.ml
@@ -15,6 +15,8 @@
 
 open! Stdlib
 
+[@@@ocaml.flambda_o3]
+
 external id : 'a -> 'a = "%identity"
 let const c _ = c
 let flip f x y = f y x
diff --git a/stdlib/gc.ml b/stdlib/gc.ml
@@ -16,6 +16,8 @@
 
 open! Stdlib
 
+[@@@ocaml.flambda_o3]
+
 type stat = {
   minor_words : float;
   promoted_words : float;
diff --git a/stdlib/genlex.ml b/stdlib/genlex.ml
@@ -15,6 +15,8 @@
 
 open! Stdlib
 
+[@@@ocaml.flambda_o3]
+
 type token =
     Kwd of string
   | Ident of string
diff --git a/stdlib/hashtbl.ml b/stdlib/hashtbl.ml
@@ -15,6 +15,8 @@
 
 open! Stdlib
 
+[@@@ocaml.flambda_o3]
+
 (* Hash tables *)
 
 (* We do dynamic hashing, and resize the table and rehash the elements
diff --git a/stdlib/int.ml b/stdlib/int.ml
@@ -15,6 +15,8 @@
 
 open! Stdlib
 
+[@@@ocaml.flambda_o3]
+
 type t = int
 
 let zero = 0
diff --git a/stdlib/int32.ml b/stdlib/int32.ml
@@ -15,6 +15,8 @@
 
 open! Stdlib
 
+[@@@ocaml.flambda_o3]
+
 (* Module [Int32]: 32-bit integers *)
 
 external neg : int32 -> int32 = "%int32_neg"
diff --git a/stdlib/int64.ml b/stdlib/int64.ml
@@ -15,6 +15,8 @@
 
 open! Stdlib
 
+[@@@ocaml.flambda_o3]
+
 (* Module [Int64]: 64-bit integers *)
 
 external neg : int64 -> int64 = "%int64_neg"
diff --git a/stdlib/lazy.ml b/stdlib/lazy.ml
@@ -15,6 +15,8 @@
 
 open! Stdlib
 
+[@@@ocaml.flambda_o3]
+
 (* Module [Lazy]: deferred computations *)
 
 
diff --git a/stdlib/lexing.ml b/stdlib/lexing.ml
@@ -15,6 +15,8 @@
 
 open! Stdlib
 
+[@@@ocaml.flambda_o3]
+
 (* The run-time library for lexers generated by camllex *)
 
 type position = {
diff --git a/stdlib/list.ml b/stdlib/list.ml
@@ -15,6 +15,8 @@
 
 open! Stdlib
 
+[@@@ocaml.flambda_o3]
+
 (* An alias for the type of lists. *)
 type 'a t = 'a list = [] | (::) of 'a * 'a list
 
diff --git a/stdlib/listLabels.ml b/stdlib/listLabels.ml
@@ -15,6 +15,8 @@
 
 open! Stdlib
 
+[@@@ocaml.flambda_o3]
+
 (* Module [ListLabels]: labelled List module *)
 
 [@@@ocaml.nolabels]
diff --git a/stdlib/map.ml b/stdlib/map.ml
@@ -15,6 +15,8 @@
 
 open! Stdlib
 
+[@@@ocaml.flambda_o3]
+
 module type OrderedType =
   sig
     type t
diff --git a/stdlib/marshal.ml b/stdlib/marshal.ml
@@ -15,6 +15,8 @@
 
 open! Stdlib
 
+[@@@ocaml.flambda_o3]
+
 type extern_flags =
     No_sharing
   | Closures
diff --git a/stdlib/moreLabels.ml b/stdlib/moreLabels.ml
@@ -15,6 +15,8 @@
 
 open! Stdlib
 
+[@@@ocaml.flambda_o3]
+
 (* Module [MoreLabels]: meta-module for compatibility labelled libraries *)
 
 [@@@ocaml.nolabels]
diff --git a/stdlib/nativeint.ml b/stdlib/nativeint.ml
@@ -15,6 +15,8 @@
 
 open! Stdlib
 
+[@@@ocaml.flambda_o3]
+
 (* Module [Nativeint]: processor-native integers *)
 
 external neg: nativeint -> nativeint = "%nativeint_neg"
diff --git a/stdlib/obj.ml b/stdlib/obj.ml
@@ -15,6 +15,8 @@
 
 open! Stdlib
 
+[@@@ocaml.flambda_o3]
+
 (* Operations on internal representations of values *)
 
 type t
diff --git a/stdlib/oo.ml b/stdlib/oo.ml
@@ -15,6 +15,8 @@
 
 open! Stdlib
 
+[@@@ocaml.flambda_o3]
+
 let copy = CamlinternalOO.copy
 external id : < .. > -> int = "%field1"
 let new_method = CamlinternalOO.public_method_label
diff --git a/stdlib/option.ml b/stdlib/option.ml
@@ -15,6 +15,8 @@
 
 open! Stdlib
 
+[@@@ocaml.flambda_o3]
+
 type 'a t = 'a option = None | Some of 'a
 
 let none = None
diff --git a/stdlib/parsing.ml b/stdlib/parsing.ml
@@ -15,6 +15,8 @@
 
 open! Stdlib
 
+[@@@ocaml.flambda_o3]
+
 (* The parsing engine *)
 
 open Lexing
diff --git a/stdlib/pervasives.ml b/stdlib/pervasives.ml
@@ -14,6 +14,8 @@
 
 open! Stdlib
 
+[@@@ocaml.flambda_o3]
+
 (** @deprecated Use {!Stdlib} *)
 
 external raise : exn -> 'a = "%raise"
diff --git a/stdlib/printexc.ml b/stdlib/printexc.ml
@@ -15,6 +15,8 @@
 
 open! Stdlib
 
+[@@@ocaml.flambda_o3]
+
 open Printf
 
 type t = exn = ..
diff --git a/stdlib/printf.ml b/stdlib/printf.ml
@@ -15,6 +15,8 @@
 
 open! Stdlib
 
+[@@@ocaml.flambda_o3]
+
 [@@@ocaml.warning "Ae"]
 
 open CamlinternalFormatBasics
diff --git a/stdlib/queue.ml b/stdlib/queue.ml
@@ -16,6 +16,8 @@
 
 open! Stdlib
 
+[@@@ocaml.flambda_o3]
+
 exception Empty
 
 type 'a cell =
diff --git a/stdlib/random.ml b/stdlib/random.ml
diff --git a/stdlib/result.ml b/stdlib/result.ml
diff --git a/stdlib/scanf.ml b/stdlib/scanf.ml
diff --git a/stdlib/seq.ml b/stdlib/seq.ml
diff --git a/stdlib/set.ml b/stdlib/set.ml
diff --git a/stdlib/stack.ml b/stdlib/stack.ml
diff --git a/stdlib/stdLabels.ml b/stdlib/stdLabels.ml
diff --git a/stdlib/std_exit.ml b/stdlib/std_exit.ml
diff --git a/stdlib/stream.ml b/stdlib/stream.ml
diff --git a/stdlib/string.ml b/stdlib/string.ml
diff --git a/stdlib/stringLabels.ml b/stdlib/stringLabels.ml
diff --git a/stdlib/uchar.ml b/stdlib/uchar.ml
diff --git a/stdlib/unit.ml b/stdlib/unit.ml
diff --git a/stdlib/weak.ml b/stdlib/weak.ml
diff --git a/testsuite/tests/backtrace/backtrace2.reference b/testsuite/tests/backtrace/backtrace2.reference
diff --git a/testsuite/tests/backtrace/lazy.reference b/testsuite/tests/backtrace/lazy.reference
diff --git a/testsuite/tests/lib-dynlink-initializers/test10_main.byte.reference b/testsuite/tests/lib-dynlink-initializers/test10_main.byte.reference
diff --git a/testsuite/tests/lib-dynlink-initializers/test10_main.native.reference b/testsuite/tests/lib-dynlink-initializers/test10_main.native.reference
diff --git a/testsuite/tests/statmemprof/callstacks.flat-float-array.reference b/testsuite/tests/statmemprof/callstacks.flat-float-array.reference
diff --git a/testsuite/tests/statmemprof/comballoc.byte.reference b/testsuite/tests/statmemprof/comballoc.byte.reference
diff --git a/testsuite/tests/statmemprof/comballoc.opt.reference b/testsuite/tests/statmemprof/comballoc.opt.reference
diff --git a/testsuite/tests/tool-toplevel/pr6468.compilers.reference b/testsuite/tests/tool-toplevel/pr6468.compilers.reference
