rts: enable wasm32 register mapping

The wasm backend didn't properly make use of all Cmm global registers
due to #24347. Now that it is fixed, this patch re-enables full
register mapping for wasm32, and we can now generate smaller & faster
wasm modules that doesn't always spill arguments onto the stack. Fixes #22460 #24152.

compiler/GHC/Platform/Wasm32.hs

@@ -4,7 +4,6 @@ module GHC.Platform.Wasm32 where
 
 import GHC.Prelude
 
--- TODO
-#define MACHREGS_NO_REGS 1
--- #define MACHREGS_wasm32 1
+#define MACHREGS_NO_REGS 0
+#define MACHREGS_wasm32 1
 #include "CodeGen.Platform.h"

rts/Apply.cmm

@@ -43,6 +43,8 @@ import CLOSURE stg_AP_STACK_info;
 import CLOSURE stg_PAP_info;
 import CLOSURE stg_WHITEHOLE_info;
 import CLOSURE stg_ap_0_ret_str;
+import CLOSURE stg_ap_stack_entries;
+import CLOSURE stg_apply_interp_info;
 import CLOSURE stg_restore_cccs_eval_info;
 #endif
 

rts/HeapStackCheck.cmm

@@ -26,6 +26,8 @@ import CLOSURE large_alloc_lim;
 import CLOSURE stg_MSG_THROWTO_info;
 import CLOSURE stg_MVAR_DIRTY_info;
 import CLOSURE stg_WHITEHOLE_info;
+import CLOSURE stg_ap_stack_entries;
+import CLOSURE stg_apply_interp_info;
 import CLOSURE stg_arg_bitmaps;
 import CLOSURE stg_block_putmvar_info;
 import CLOSURE stg_block_readmvar_info;
@@ -40,6 +42,7 @@ import CLOSURE stg_ret_f_info;
 import CLOSURE stg_ret_l_info;
 import CLOSURE stg_ret_n_info;
 import CLOSURE stg_ret_p_info;
+import CLOSURE stg_stack_save_entries;
 #endif
 
 /* Stack/Heap Check Failure

rts/include/stg/MachRegs/wasm32.h

+#pragma once
+
+#define REG_Base           0
+
+#define REG_R1             1
+#define REG_R2             2
+#define REG_R3             3
+#define REG_R4             4
+#define REG_R5             5
+#define REG_R6             6
+#define REG_R7             7
+#define REG_R8             8
+#define REG_R9             9
+#define REG_R10            10
+
+#define REG_F1             11
+#define REG_F2             12
+#define REG_F3             13
+#define REG_F4             14
+#define REG_F5             15
+#define REG_F6             16
+
+#define REG_D1             17
+#define REG_D2             18
+#define REG_D3             19
+#define REG_D4             20
+#define REG_D5             21
+#define REG_D6             22
+
+#define REG_L1             23
+
+#define REG_Sp             24
+#define REG_SpLim          25
+#define REG_Hp             26
+#define REG_HpLim          27

rts/include/stg/MachRegsForHost.h

@@ -75,8 +75,7 @@
 #endif
 
 #if defined(wasm32_HOST_ARCH)
-#undef  MACHREGS_NO_REGS
-#define MACHREGS_NO_REGS 1
+#define MACHREGS_wasm32   1
 #endif
 
 #if defined(loongarch64_HOST_ARCH)

testsuite/tests/cmm/should_compile/all.T

@@ -4,7 +4,6 @@ setTestOpts(
 
 test('selfloop', [cmm_src], compile, ['-no-hs-main'])
 test('cmm_sink_sp', [ only_ways(['optasm']),
-                      when(arch('wasm32'), fragile(24152)),
                       grep_errmsg(r'(\[Sp.*\]).*(=).*(\[.*R1.*\]).*;',[1,2,3]),
                       cmm_src], compile, ['-no-hs-main -ddump-cmm -dsuppress-uniques -O'])