From 8c9d7016b88e896478157a615fbf18d26cb84944 Mon Sep 17 00:00:00 2001
From: Simon Cruanes <simon.cruanes.2007@m4x.org>
Date: Thu, 3 Feb 2022 18:54:59 -0500
Subject: [PATCH] perf: uniformize ocamlopt_flags

we don't need codegen which depends on >= 4.03, it's assumed. Also
include a reasonable value for `-inline` when flambda isn't available.
---
 src/core/dune        |  1 -
 src/data/dune        |  1 -
 src/dune             | 15 +++++----------
 src/mkflags.ml       | 19 -------------------
 src/monomorphic/dune |  3 +--
 src/threads/dune     |  1 -
 src/top/dune         |  1 -
 src/unix/dune        |  4 +---
 8 files changed, 7 insertions(+), 38 deletions(-)
 delete mode 100644 src/mkflags.ml

diff --git a/src/core/dune b/src/core/dune
index d65c7d3f..ca13aa78 100644
--- a/src/core/dune
+++ b/src/core/dune
@@ -19,7 +19,6 @@
  (modules :standard \ mkshims)
  (flags :standard -warn-error -a+8 -w -32 -safe-string -strict-sequence -nolabels -open
    CCMonomorphic)
- (ocamlopt_flags (:include ../flambda.flags))
  (libraries seq either containers.monomorphic))
 
 (ocamllex (modules CCSexp_lex))
diff --git a/src/data/dune b/src/data/dune
index 9e9ace90..7c5c1868 100644
--- a/src/data/dune
+++ b/src/data/dune
@@ -4,5 +4,4 @@
   (public_name containers-data)
   (wrapped false)
   (flags :standard -w +a-4-42-44-48-50-58-32-60@8 -safe-string -open CCShims_)
-  (ocamlopt_flags :standard (:include ../flambda.flags))
   (libraries containers))
diff --git a/src/dune b/src/dune
index e7a035b6..21bb22a5 100644
--- a/src/dune
+++ b/src/dune
@@ -1,15 +1,10 @@
-(executable
-  (name mkflags)
-  (modules mkflags)
-  (libraries dune.configurator))
 
 (env
-  (_ (flags :standard -warn-error -3)))
-
-(rule
-  (targets flambda.flags)
-  (mode fallback)
-  (action (run ./mkflags.exe)))
+  (_
+    (flags :standard -warn-error -3 -color always)
+    (ocamlopt_flags :standard -O3 -unbox-closures -unbox-closures-factor 20
+                    -inline 100)
+     ))
 
 (executable
   (name mdx_runner)
diff --git a/src/mkflags.ml b/src/mkflags.ml
deleted file mode 100644
index d23ae951..00000000
--- a/src/mkflags.ml
+++ /dev/null
@@ -1,19 +0,0 @@
-
-module C = Configurator.V1
-
-let () =
-  C.main ~name:"mkflags" (fun c ->
-    let version = C.ocaml_config_var_exn c "version" in
-    let major, minor =
-      Scanf.sscanf version "%u.%u"
-        (fun major minor -> major, minor)
-    in
-    let after_4_3 = (major, minor) >= (4, 3) in
-    let sexp =
-      if after_4_3 then (
-        ["-O3"; "-unbox-closures"; "-unbox-closures-factor"; "20"; "-color"; "always"]
-      ) else (
-        ["-inline"; "100"]
-      ) in
-    C.Flags.write_sexp "flambda.flags" sexp
-  )
diff --git a/src/monomorphic/dune b/src/monomorphic/dune
index 06b39722..c3a3bdbd 100644
--- a/src/monomorphic/dune
+++ b/src/monomorphic/dune
@@ -14,5 +14,4 @@
   (public_name containers.monomorphic)
   (modules CCMonomorphic CCMonomorphicShims_)
   (wrapped false)
-  (flags :standard -w +a-4-42-44-48-50-58-32-60@8 -safe-string)
-  (ocamlopt_flags :standard (:include ../flambda.flags)))
+  (flags :standard -w +a-4-42-44-48-50-58-32-60@8 -safe-string))
diff --git a/src/threads/dune b/src/threads/dune
index 55ce29ea..f27b5e65 100644
--- a/src/threads/dune
+++ b/src/threads/dune
@@ -5,6 +5,5 @@
   (wrapped false)
   (optional)
   (flags :standard -warn-error -a+8 -w -32 -safe-string -open CCShims_)
-  (ocamlopt_flags :standard (:include ../flambda.flags))
   (libraries containers threads))
 
diff --git a/src/top/dune b/src/top/dune
index a23a99e7..29a6a6b4 100644
--- a/src/top/dune
+++ b/src/top/dune
@@ -5,5 +5,4 @@
   (public_name containers.top)
   (wrapped false)
   (flags :standard -w +a-4-42-44-48-50-58-32-60@8 -safe-string)
-  (ocamlopt_flags :standard (:include ../flambda.flags))
   (libraries compiler-libs.common containers containers.unix))
diff --git a/src/unix/dune b/src/unix/dune
index bebb4ead..aa387981 100644
--- a/src/unix/dune
+++ b/src/unix/dune
@@ -5,6 +5,4 @@
   (wrapped false)
   (optional)
   (flags :standard -w +a-4-42-44-48-50-58-32-60@8 -safe-string)
-  (ocamlopt_flags :standard (:include ../flambda.flags))
-  (libraries unix)
-  )
+  (libraries unix))