Enable eventlog support in all ways by default

Here we deprecate the eventlogging RTS ways and instead enable eventlog
support in the remaining ways. This simplifies packaging and reduces GHC
compilation times (as we can eliminate two whole compilations of the RTS)
while simplifying the end-user story. The trade-off is a small increase
in binary sizes in the case that the user does not want eventlogging
support, but we think that this is a fine trade-off.

This also revealed a latent RTS bug: some files which included `Cmm.h`
also assumed that it defined various macros which were in fact defined
by `Config.h`, which `Cmm.h` did not include. Fixing this in turn
revealed that `StgMiscClosures.cmm` failed to import various spinlock
statistics counters, as evidenced by the failed unregisterised build.

Closes #18948.

3 files changed, 10 insertions, 10 deletions

diff --git a/testsuite/tests/rts/Makefile b/testsuite/tests/rts/Makefile
index fe35bd4d2c..d7bb87ae91 100644
--- a/testsuite/tests/rts/Makefile
+++ b/testsuite/tests/rts/Makefile
@@ -121,19 +121,19 @@ KeepCafs:
 
 .PHONY: EventlogOutput1
 EventlogOutput1:
-	"$(TEST_HC)" -eventlog -v0 EventlogOutput.hs
+	"$(TEST_HC)" -v0 EventlogOutput.hs
 	./EventlogOutput +RTS -l -olhello.eventlog
 	ls hello.eventlog >/dev/null
 
 .PHONY: EventlogOutput2
 EventlogOutput2:
-	"$(TEST_HC)" -eventlog -v0 EventlogOutput.hs
+	"$(TEST_HC)" -v0 EventlogOutput.hs
 	./EventlogOutput +RTS -l
 	ls EventlogOutput.eventlog >/dev/null
 
 .PHONY: EventlogOutputNull
 EventlogOutputNull:
-	"$(TEST_HC)" -eventlog -rtsopts -v0 EventlogOutput.hs
+	"$(TEST_HC)" -rtsopts -v0 EventlogOutput.hs
 	./EventlogOutput +RTS -l --null-eventlog-writer
 	test ! -e EventlogOutput.eventlog
 
diff --git a/testsuite/tests/rts/all.T b/testsuite/tests/rts/all.T
index 75dcf5ac58..d907ceff62 100644
--- a/testsuite/tests/rts/all.T
+++ b/testsuite/tests/rts/all.T
@@ -160,11 +160,11 @@ test('rtsflags002', [ only_ways(['normal']) ], compile_and_run, ['-with-rtsopts=
 # variants of the RTS by default
 test('traceEvent', [ omit_ways(['dyn', 'ghci'] + prof_ways),
                      extra_run_opts('+RTS -ls -RTS') ],
-                   compile_and_run, ['-eventlog'])
+                   compile_and_run, [''])
 
 test('traceBinaryEvent', [ omit_ways(['dyn', 'ghci'] + prof_ways),
                            extra_run_opts('+RTS -ls -RTS') ],
-                         compile_and_run, ['-eventlog'])
+                         compile_and_run, [''])
 
 # Test that -ol flag works as expected
 test('EventlogOutput1',
@@ -209,7 +209,7 @@ test('ipeEventLog',
        # In general this test should work on Darwin - Just not on our CI.
        when(opsys('darwin'), fragile(0))
      ],
-     compile_and_run, ['ipeEventLog_lib.c -eventlog'])
+     compile_and_run, ['ipeEventLog_lib.c'])
 
 # Manually create IPE entries, force the initialization of the underlying hash map
 # and dump them to event log (stderr).
@@ -225,7 +225,7 @@ test('ipeEventLog_fromMap',
        # In general this test should work on Darwin - Just not on our CI.
        when(opsys('darwin'), fragile(0))
      ],
-     compile_and_run, ['ipeEventLog_lib.c -eventlog'])
+     compile_and_run, ['ipeEventLog_lib.c'])
 
 test('T4059', [], makefile_test, ['T4059'])
 
@@ -486,10 +486,10 @@ test('T13676',
      ghci_script, ['T13676.script'])
 test('InitEventLogging',
      [only_ways(['normal']), extra_run_opts('+RTS -RTS')],
-     compile_and_run, ['-eventlog InitEventLogging_c.c'])
+     compile_and_run, ['InitEventLogging_c.c'])
 test('RestartEventLogging',
      [only_ways(['threaded1','threaded2']), extra_run_opts('+RTS -la -RTS')],
-     compile_and_run, ['-eventlog RestartEventLogging_c.c'])
+     compile_and_run, ['RestartEventLogging_c.c'])
 
 test('T17088',
      [only_ways(['normal']), extra_run_opts('+RTS -c -A256k -RTS')],
diff --git a/testsuite/tests/rts/flags/all.T b/testsuite/tests/rts/flags/all.T
index 04c2907fce..e60e58f0c1 100644
--- a/testsuite/tests/rts/flags/all.T
+++ b/testsuite/tests/rts/flags/all.T
@@ -54,4 +54,4 @@ test('T12870h',
 
 test('T20006', [extra_run_opts('+RTS --eventlog-flush-interval=1')],
     compile_and_run,
-    ['-eventlog'])
+    [''])