ocaml-flambda · TheNumbat · Apr 29, 2025 · Apr 29, 2025 · Apr 29, 2025 · Apr 29, 2025
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -20,6 +20,18 @@ jobs:
             config: --enable-middle-end=flambda2 --enable-runtime5
             os: ubuntu-latest
 
+          - name: flambda2_stack_checks
+            config: --enable-middle-end=flambda2 --enable-runtime5 --enable-stack-checks
+            os: ubuntu-latest
+
+          - name: flambda2_poll_insertion
+            config: --enable-middle-end=flambda2 --enable-runtime5 --enable-poll-insertion
+            os: ubuntu-latest
+
+          - name: flambda2_multidomain
+            config: --enable-middle-end=flambda2 --enable-runtime5 --enable-stack-checks --enable-poll-insertion --enable-multidomain
+            os: ubuntu-latest
+
           - name: flambda2_dev
             config: --enable-middle-end=flambda2 --enable-dev
             os: ubuntu-latest

diff --git a/configure.ac b/configure.ac
@@ -189,7 +189,7 @@ AS_IF([test x"$enable_runtime5" = xyes],
       [runtime_suffix=4])
 
 AC_ARG_ENABLE([stack_checks],
-  [AS_HELP_STRING([--enable-stack_checks],
+  [AS_HELP_STRING([--enable-stack-checks],
     [Enable stack checks])])
 
 ## Output variables
@@ -361,6 +361,7 @@ AC_SUBST([compute_deps])
 AC_SUBST([intel_jcc_bug_cflags])
 AC_SUBST([stack_allocation])
 AC_SUBST([poll_insertion])
+AC_SUBST([enable_multidomain])
 AC_SUBST([dune])
 AC_SUBST([ocaml_bindir])
 AC_SUBST([ocaml_libdir])
@@ -701,6 +702,10 @@ AC_ARG_ENABLE([poll-insertion],
   [AS_HELP_STRING([--enable-poll-insertion],
     [enable insertion of poll points])])
 
+AC_ARG_ENABLE([multidomain],
+  [AS_HELP_STRING([--enable-multidomain],
+    [allow the creation of multiple domains])])
+
 AC_ARG_WITH([flexdll],
   [AS_HELP_STRING([--with-flexdll],
     [bootstrap FlexDLL from the given sources])],
@@ -2835,6 +2840,14 @@ AS_IF([test x"$enable_poll_insertion" = "xyes"],
    poll_insertion=true],
   [poll_insertion=false])
 
+AS_IF([test x"$enable_multidomain" = "xyes"],
+  [AS_IF([test x"$enable_runtime5" = "xyes" &&
+          test x"$enable_stack_checks" = "xyes" &&
+          test x"$enable_poll_insertion" = "xyes"],
+    [AC_DEFINE([MULTIDOMAIN]), enable_multidomain=true],
+    [AC_MSG_ERROR([Creating multiple domains is only supported on runtime5 with \
+stack checks and poll insertion enabled.])])], [])
+
 oc_cflags="$common_cflags $internal_cflags"
 oc_cppflags="$common_cppflags $internal_cppflags"
 ocamlc_cflags="$ocamlc_cflags $common_cflags $sharedlib_cflags $CFLAGS"

diff --git a/ocamltest/ocaml_actions.ml b/ocamltest/ocaml_actions.ml
@@ -1360,6 +1360,14 @@ let no_poll_insertion = Actions.make
     "Poll insertion disabled"
     "Poll insertion enabled")
 
+let multidomain = Actions.make
+  ~name:"multidomain"
+  ~description:"Passes if multiple domains is enabled"
+  ~does_something:false
+  (Actions_helpers.predicate Config.multidomain
+    "Multidomain disabled"
+    "Multidomain enabled")
+
 let runtime4 = Actions.make
   ~name:"runtime4"
   ~description:"Passes if the OCaml 4.x runtime is being used"
@@ -1591,6 +1599,7 @@ let init () =
     codegen;
     cc;
     ocamlobjinfo;
+    multidomain;
     runtime4;
     runtime5
   ]
diff --git a/runtime/caml/domain.h b/runtime/caml/domain.h
@@ -28,15 +28,19 @@ extern "C" {
 #include "mlvalues.h"
 #include "domain_state.h"
 
+#ifdef MULTIDOMAIN
 #ifdef ARCH_SIXTYFOUR
 #define Max_domains_def 128
 #else
 #define Max_domains_def 16
 #endif
-
 /* Upper limit for the number of domains. Chosen to be arbitrarily large. Used
  * for sanity checking [max_domains] value in OCAMLRUNPARAM. */
 #define Max_domains_max 4096
+#else
+#define Max_domains_def 1
+#define Max_domains_max 1
+#endif
 
 /* is the minor heap full or an external interrupt has been triggered */
 Caml_inline int caml_check_gc_interrupt(caml_domain_state * dom_st)

diff --git a/runtime/caml/m.h.in b/runtime/caml/m.h.in
@@ -105,3 +105,5 @@
 #undef STACK_ALLOCATION
 
 #undef STACK_CHECKS_ENABLED
+
+#undef MULTIDOMAIN
diff --git a/testsuite/tests/capsule-api/condition.ml b/testsuite/tests/capsule-api/condition.ml
@@ -2,6 +2,7 @@
  include stdlib_alpha;
  flags = "-extension-universe alpha -alert -unsafe_multidomain";
  runtime5;
+ multidomain;
  { bytecode; }
  { native; }
 *)

diff --git a/testsuite/tests/compaction/test_compact_manydomains.ml b/testsuite/tests/compaction/test_compact_manydomains.ml
@@ -1,6 +1,7 @@
 (* TEST
  flags += "-alert -unsafe_parallelism -alert -unsafe_multidomain";
  runtime5;
+ multidomain;
  { bytecode; }
  { native; }
 *)

diff --git a/testsuite/tests/compaction/test_compact_multi.ml b/testsuite/tests/compaction/test_compact_multi.ml
@@ -5,6 +5,7 @@
    skip;
  }{
    runtime5;
+   multidomain;
    { bytecode; }
    { native; }
  }

diff --git a/testsuite/tests/effects-api/portable.ml b/testsuite/tests/effects-api/portable.ml
@@ -1,6 +1,7 @@
 (* TEST
  include stdlib_alpha;
  runtime5;
+ multidomain;
  { bytecode; }
  { native; }
 *)

diff --git a/testsuite/tests/effects/test_lazy.ml b/testsuite/tests/effects/test_lazy.ml
@@ -1,5 +1,6 @@
 (* TEST
    runtime5;
+   multidomain;
    { bytecode; }
    { native; }
 *)

diff --git a/testsuite/tests/lazy/lazy2.ml b/testsuite/tests/lazy/lazy2.ml
@@ -2,6 +2,7 @@
  flags += "-alert -unsafe_parallelism -alert -unsafe_multidomain";
  ocamlopt_flags += " -O3 ";
  runtime5;
+ multidomain;
  { bytecode; }
  { native; }
 *)

diff --git a/testsuite/tests/lazy/lazy3.ml b/testsuite/tests/lazy/lazy3.ml
@@ -2,6 +2,7 @@
  flags += "-alert -unsafe_parallelism -alert -unsafe_multidomain";
  ocamlopt_flags += " -O3 ";
  runtime5;
+ multidomain;
  { bytecode; }
  { native; }
 *)

diff --git a/testsuite/tests/lazy/lazy5.ml b/testsuite/tests/lazy/lazy5.ml
@@ -2,6 +2,7 @@
  flags += "-alert -unsafe_parallelism -alert -unsafe_multidomain";
  ocamlopt_flags += " -O3 ";
  runtime5;
+ multidomain;
  { bytecode; }
  { native; }
 *)

diff --git a/testsuite/tests/lazy/lazy6.ml b/testsuite/tests/lazy/lazy6.ml
@@ -2,6 +2,7 @@
  flags += "-alert -unsafe_parallelism -alert -unsafe_multidomain";
  ocamlopt_flags += " -O3 ";
  runtime5;
+ multidomain;
  { bytecode; }
  { native; }
 *)

diff --git a/testsuite/tests/lazy/lazy7.ml b/testsuite/tests/lazy/lazy7.ml
@@ -2,6 +2,7 @@
  flags += "-alert -unsafe_parallelism -alert -unsafe_multidomain";
  ocamlopt_flags += " -O3 ";
  runtime5;
+ multidomain;
  { bytecode; }
  { native; }
 *)

diff --git a/testsuite/tests/lazy/lazy8.ml b/testsuite/tests/lazy/lazy8.ml
@@ -2,6 +2,7 @@
  flags += "-alert -unsafe_parallelism -alert -unsafe_multidomain";
  ocamlopt_flags += " -O3 ";
  runtime5;
+ multidomain;
  { bytecode; }
  { native; }
 *)

diff --git a/testsuite/tests/lf_skiplist/test_parallel.ml b/testsuite/tests/lf_skiplist/test_parallel.ml
@@ -3,6 +3,7 @@
  modules = "stubs.c";
  no-tsan;
  runtime5;
+ multidomain;
  { bytecode; }
  { native; }
 *)

diff --git a/testsuite/tests/lib-atomic/test_atomic_domain.ml b/testsuite/tests/lib-atomic/test_atomic_domain.ml
@@ -1,6 +1,7 @@
 (* TEST
    flags = "-alert -unsafe_multidomain";
    runtime5;
+   multidomain;
    native;
    bytecode;
 *)

diff --git a/testsuite/tests/lib-channels/refcounting.ml b/testsuite/tests/lib-channels/refcounting.ml
@@ -1,6 +1,7 @@
 (* TEST
  flags += "-alert -unsafe_parallelism -alert -unsafe_multidomain";
  runtime5;
+ multidomain;
  expect;
 *)
 

diff --git a/testsuite/tests/lib-dynlink-domains/main.ml b/testsuite/tests/lib-dynlink-domains/main.ml
@@ -1,5 +1,6 @@
 (* TEST
  runtime5;
+ multidomain;
  include dynlink;
  libraries = "";
  readonly_files = "store.ml main.ml Plugin_0.ml Plugin_0_0.ml Plugin_0_0_0.ml Plugin_0_0_0_0.ml Plugin_0_0_0_1.ml Plugin_0_0_0_2.ml Plugin_1.ml Plugin_1_0.ml Plugin_1_0_0.ml Plugin_1_0_0_0.ml Plugin_1_1.ml Plugin_1_2.ml Plugin_1_2_0.ml Plugin_1_2_0_0.ml Plugin_1_2_1.ml Plugin_1_2_2.ml Plugin_1_2_2_0.ml Plugin_1_2_3.ml Plugin_1_2_3_0.ml";

diff --git a/testsuite/tests/lib-format/domains.ml b/testsuite/tests/lib-format/domains.ml
@@ -1,6 +1,7 @@
 (* TEST
  flags += "-alert -unsafe_parallelism -alert -unsafe_multidomain";
  runtime5;
+ multidomain;
  { bytecode; }
  { native; }
 *)

diff --git a/testsuite/tests/lib-format/mc_pr586_par.ml b/testsuite/tests/lib-format/mc_pr586_par.ml
@@ -1,6 +1,7 @@
 (* TEST
  flags += "-alert -unsafe_parallelism -alert -unsafe_multidomain";
  runtime5;
+ multidomain;
  { bytecode; }
  { native; }
 *)

diff --git a/testsuite/tests/lib-format/mc_pr586_par2.ml b/testsuite/tests/lib-format/mc_pr586_par2.ml
@@ -1,6 +1,7 @@
 (* TEST
  flags += "-alert -unsafe_parallelism -alert -unsafe_multidomain";
  runtime5;
+ multidomain;
  { bytecode; }
  { native; }
 *)

diff --git a/testsuite/tests/lib-marshal/intext_par.ml b/testsuite/tests/lib-marshal/intext_par.ml
@@ -3,6 +3,7 @@
  modules = "intextaux_par.c";
  no-tsan;
  runtime5;
+ multidomain;
  { bytecode; }
  { native; }
 *)

diff --git a/testsuite/tests/lib-random/parallel.ml b/testsuite/tests/lib-random/parallel.ml
@@ -2,6 +2,7 @@
  flags += "-alert -unsafe_parallelism -alert -unsafe_multidomain";
  include unix;
  runtime5;
+ multidomain;
  libunix;
  {
    bytecode;

diff --git a/testsuite/tests/lib-runtime-events/test_caml_parallel.ml b/testsuite/tests/lib-runtime-events/test_caml_parallel.ml
@@ -5,6 +5,7 @@
  }{
    include runtime_events;
    runtime5;
+   multidomain;
    flags += "-alert -unsafe_parallelism -alert -unsafe_multidomain";
    { bytecode; }
    { native; }

diff --git a/testsuite/tests/lib-runtime-events/test_caml_slot_reuse.ml b/testsuite/tests/lib-runtime-events/test_caml_slot_reuse.ml
@@ -5,6 +5,7 @@
  }{
    include runtime_events;
    runtime5;
+   multidomain;
    flags += "-alert -unsafe_parallelism -alert -unsafe_multidomain";
    { bytecode; }
    { native; }

diff --git a/testsuite/tests/lib-runtime-events/test_dropped_events.ml b/testsuite/tests/lib-runtime-events/test_dropped_events.ml
@@ -5,6 +5,7 @@
  }{
    include runtime_events;
    runtime5;
+   multidomain;
    flags += "-alert -unsafe_parallelism -alert -unsafe_multidomain";
    include unix;
    set OCAMLRUNPARAM = "e=6";

diff --git a/testsuite/tests/lib-str/parallel.ml b/testsuite/tests/lib-str/parallel.ml
@@ -1,6 +1,7 @@
 (* TEST
  flags += "-alert -unsafe_parallelism -alert -unsafe_multidomain";
  runtime5;
+ multidomain;
  include str;
  hasstr;
  {

diff --git a/testsuite/tests/lib-sync/prodcons.ml b/testsuite/tests/lib-sync/prodcons.ml
@@ -1,6 +1,7 @@
 (* TEST
  flags += "-alert -unsafe_parallelism -alert -unsafe_multidomain";
  runtime5;
+ multidomain;
  { bytecode; }
  { native; }
 *)

diff --git a/testsuite/tests/lib-systhreads/multicore_lifecycle.ml b/testsuite/tests/lib-systhreads/multicore_lifecycle.ml
@@ -3,6 +3,7 @@
  include systhreads;
  hassysthreads;
  runtime5;
+ multidomain;
  {
    bytecode;
  }{

diff --git a/testsuite/tests/lib-unix/common/multicore_fork_domain_alone.ml b/testsuite/tests/lib-unix/common/multicore_fork_domain_alone.ml
@@ -1,6 +1,7 @@
 (* TEST
  flags += "-alert -unsafe_parallelism -alert -unsafe_multidomain";
  runtime5;
+ multidomain;
  include unix;
  hasunix;
  not-windows;

diff --git a/testsuite/tests/lib-unix/common/multicore_fork_domain_alone2.ml b/testsuite/tests/lib-unix/common/multicore_fork_domain_alone2.ml
@@ -1,6 +1,7 @@
 (* TEST
  flags += "-alert -unsafe_parallelism -alert -unsafe_multidomain";
  runtime5;
+ multidomain;
  include unix;
  hasunix;
  not-windows;

diff --git a/testsuite/tests/memory-model/forbidden.ml b/testsuite/tests/memory-model/forbidden.ml
@@ -4,6 +4,7 @@
  not-bsd;
  no-tsan; (* tsan detects the intentional data races and fails *)
  runtime5;
+ multidomain;
  {
    bytecode;
  }{

diff --git a/testsuite/tests/memory-model/publish.ml b/testsuite/tests/memory-model/publish.ml
@@ -4,6 +4,7 @@
  not-bsd;
  no-tsan; (* tsan detects data races and fails *)
  runtime5;
+ multidomain;
  {
    not-windows;
    bytecode;

diff --git a/testsuite/tests/parallel/atomics.ml b/testsuite/tests/parallel/atomics.ml
@@ -1,6 +1,7 @@
 (* TEST
  flags += "-alert -unsafe_parallelism -alert -unsafe_multidomain";
  runtime5;
+ multidomain;
  { bytecode; }
  { native; }
 *)

diff --git a/testsuite/tests/parallel/backup_thread.ml b/testsuite/tests/parallel/backup_thread.ml
@@ -1,6 +1,7 @@
 (* TEST
  flags += "-alert -unsafe_parallelism -alert -unsafe_multidomain";
  runtime5;
+ multidomain;
  include unix;
  hasunix;
  {

diff --git a/testsuite/tests/parallel/backup_thread_pipe.ml b/testsuite/tests/parallel/backup_thread_pipe.ml
@@ -1,6 +1,7 @@
 (* TEST
  flags += "-alert -unsafe_parallelism -alert -unsafe_multidomain";
  runtime5;
+ multidomain;
  include unix;
  hasunix;
  {

diff --git a/testsuite/tests/parallel/catch_break.ml b/testsuite/tests/parallel/catch_break.ml
@@ -6,6 +6,7 @@ not-windows;
 poll-insertion;
 no-tsan;
 runtime5;
+multidomain;
 {
   bytecode;
 }{

diff --git a/testsuite/tests/parallel/churn.ml b/testsuite/tests/parallel/churn.ml
@@ -1,6 +1,7 @@
 (* TEST
  flags += "-alert -unsafe_parallelism -alert -unsafe_multidomain";
  runtime5;
+ multidomain;
  { bytecode; }
  { native; }
 *)

diff --git a/testsuite/tests/parallel/constpromote.ml b/testsuite/tests/parallel/constpromote.ml
@@ -1,6 +1,7 @@
 (* TEST
  flags += "-alert -unsafe_parallelism -alert -unsafe_multidomain";
  runtime5;
+ multidomain;
  { bytecode; }
  { native; }
 *)
Original file line number	Diff line number	Diff line change
Expand Up		@@ -105,3 +105,5 @@
		#undef STACK_ALLOCATION

		#undef STACK_CHECKS_ENABLED

		#undef MULTIDOMAIN