rts: Better AutoApply logic

Author: angerman

rts/AutoApply.cmm

@@ -0,0 +1 @@
+#include <rts/AutoApply.cmm.h>

rts/AutoApply_V16.cmm

@@ -0,0 +1 @@
+#include <rts/AutoApply_V16.cmm.h>

rts/AutoApply_V32.cmm

@@ -0,0 +1 @@
+#include <rts/AutoApply_V32.cmm.h>

rts/AutoApply_V64.cmm

@@ -0,0 +1 @@
+#include <rts/AutoApply_V64.cmm.h>

rts/configure.ac

@@ -583,36 +583,36 @@ else
   AC_MSG_ERROR([Failed to run $DERIVE_CONSTANTS --gen-header ...])
 fi
 
-AC_MSG_CHECKING([for AutoApply.cmm])
-if $GENAPPLY include/DerivedConstants.h > AutoApply.cmm; then
+AC_MSG_CHECKING([for include/rts/AutoApply.cmm.h])
+if mkdir -p include/rts && $GENAPPLY include/DerivedConstants.h > include/rts/AutoApply.cmm.h; then
   AC_MSG_RESULT([created])
 else
   AC_MSG_RESULT([failed to create])
-  AC_MSG_ERROR([Failed to run $GENAPPLY include/DerivedConstants.h > AutoApply.cmm])
+  AC_MSG_ERROR([Failed to run $GENAPPLY include/DerivedConstants.h > include/rts/AutoApply.cmm.h])
 fi
 
-AC_MSG_CHECKING([for AutoApply_V16.cmm])
-if $GENAPPLY include/DerivedConstants.h -V16 > AutoApply_V16.cmm; then
+AC_MSG_CHECKING([for include/rts/AutoApply_V16.cmm.h])
+if mkdir -p include/rts && $GENAPPLY include/DerivedConstants.h -V16 > include/rts/AutoApply_V16.cmm.h; then
   AC_MSG_RESULT([created])
 else
   AC_MSG_RESULT([failed to create])
-  AC_MSG_ERROR([Failed to run $GENAPPLY include/DerivedConstants.h -V16 > AutoApply_V16.cmm])
+  AC_MSG_ERROR([Failed to run $GENAPPLY include/DerivedConstants.h -V16 > include/rts/AutoApply_V16.cmm.h])
 fi
 
-AC_MSG_CHECKING([for AutoApply_V32.cmm])
-if $GENAPPLY include/DerivedConstants.h -V32 > AutoApply_V32.cmm; then
+AC_MSG_CHECKING([for include/rts/AutoApply_V32.cmm.h])
+if mkdir -p include/rts && $GENAPPLY include/DerivedConstants.h -V32 > include/rts/AutoApply_V32.cmm.h; then
   AC_MSG_RESULT([created])
 else
   AC_MSG_RESULT([failed to create])
-  AC_MSG_ERROR([Failed to run $GENAPPLY include/DerivedConstants.h -V32 > AutoApply_V32.cmm])
+  AC_MSG_ERROR([Failed to run $GENAPPLY include/DerivedConstants.h -V32 > include/rts/AutoApply_V32.cmm.h])
 fi
 
-AC_MSG_CHECKING([for AutoApply_V64.cmm])
-if $GENAPPLY include/DerivedConstants.h -V64 > AutoApply_V64.cmm; then
+AC_MSG_CHECKING([for include/rts/AutoApply_V64.cmm.h])
+if mkdir -p include/rts && $GENAPPLY include/DerivedConstants.h -V64 > include/rts/AutoApply_V64.cmm.h; then
   AC_MSG_RESULT([created])
 else
   AC_MSG_RESULT([failed to create])
-  AC_MSG_ERROR([Failed to run $GENAPPLY include/DerivedConstants.h -V64 > AutoApply_V64.cmm])
+  AC_MSG_ERROR([Failed to run $GENAPPLY include/DerivedConstants.h -V64 > include/rts/AutoApply_V64.cmm.h])
 fi
 
 AC_MSG_CHECKING([for include/rts/EventLogConstants.h])

rts/rts.cabal

@@ -340,25 +340,28 @@ common rts-cmm-sources-base
       -- then have the `AutoApply.cmm` in `rts-c-sources-base` include them.  This
       -- would mean they are included in the sublibraries which will in turn apply
       -- the sublibrary specific (c)flags.
-      autogen-cmm-sources:
+      cmm-sources:
         AutoApply.cmm
         AutoApply_V16.cmm
 
       if arch(x86_64)
         cmm-sources:
           Jumps_V32.cmm (-mavx2)
           Jumps_V64.cmm (-mavx512f)
-        autogen-cmm-sources:
           AutoApply_V32.cmm (-mavx2)
           AutoApply_V64.cmm (-mavx512f)
       else
         cmm-sources:
           Jumps_V32.cmm
           Jumps_V64.cmm
-        autogen-cmm-sources:
           AutoApply_V32.cmm
           AutoApply_V64.cmm
 
+    -- this is required so we don't have ghc inject ghc-internal (which depends on the rts)
+    -- during the build phase of this library.
+    ghc-options: -no-ghc-internal
+
+
 common rts-c-sources-base
     if !arch(javascript)
       cmm-sources:
@@ -637,19 +640,42 @@ library
     ghc-options: -this-unit-id rts -ghcversion-file=include/ghcversion.h -optc-DFS_NAMESPACE=rts
     cmm-options: -this-unit-id rts
 
+    -- [The AutoApply story]
+    --
+    -- We use GenApply to generate the AutoApply[_V{16,32,64}].cmm files.
+    -- However cabal will run the ./configure script only for the main library.
+    -- To work around this shortcoming, we'll generate .cmm.h files (same
+    -- content as .cmm), and create AutoApply*.cmm files that just
+    --
+    --   #include <rts/AutoApply_...cmm.h>
+    --
+    -- This way each sublib has it's own properly parameterized .cmm file, while
+    -- we only generate them once and stick them into the rts library.
+    --
+    -- This is a hack, and it would be great if sublibs had access to their
+    -- parent libraries auto-gen folders, however as sublibs are supposed to be
+    -- separate components, this is a non-trivial (impossible?) task to resolve.
     autogen-includes:
       ghcautoconf.h
       ghcplatform.h
       DerivedConstants.h
       rts/EventLogConstants.h
       rts/EventTypes.h
+      AutoApply.cmm.h
+      AutoApply_V16.cmm.h
+      AutoApply_V32.cmm.h
+      AutoApply_V64.cmm.h
 
     install-includes:
       ghcautoconf.h
       ghcplatform.h
       DerivedConstants.h
       rts/EventLogConstants.h
       rts/EventTypes.h
+      AutoApply.cmm.h
+      AutoApply_V16.cmm.h
+      AutoApply_V32.cmm.h
+      AutoApply_V64.cmm.h
 
     install-includes:
       -- Common headers for non-JS builds
@@ -771,10 +797,8 @@ library nonthreaded-nodebug
       import: rts-base-config, rts-cmm-sources-base, rts-c-sources-base, rts-link-options, rts-global-build-flags
 
     visibility: public
-
     ghc-options: -optc-DRtsWay="v"
 
-
 library threaded-nodebug
     import: rts-base-config, rts-cmm-sources-base, rts-c-sources-base, rts-link-options, rts-global-build-flags, rts-threaded-flags
     visibility: public