qemu/main: Make GC heap size configurable on a per-arch basis.

agatti · agatti · commit afb0102524a9 · 2024-09-06T13:04:37.000+02:00
On certain circumstances depending on the code size, the
`deflate_decompress` test fails on RV32 with a memory allocation failure
error.  The issue is mitigated by having a larger GC heap, in this case
around 20KBytes more than the 100KBytes default.

This commit makes the GC heap size configurable on a per-arch basis,
with Arm using the default 100KBytes heap, and RV32 using a 120KBytes
heap.

Signed-off-by: Alessandro Gatti &lt;a.gatti@frob.it&gt;
diff --git a/ports/qemu/Makefile b/ports/qemu/Makefile
@@ -19,16 +19,20 @@ QSTR_DEFS = qstrdefsport.h
 MICROPY_ROM_TEXT_COMPRESSION ?= 1
 
 ifeq ($(QEMU_ARCH),arm)
+QEMU_GC_HEAP_SIZE ?= 100
 FROZEN_MANIFEST ?= "freeze('test-frzmpy', ('frozen_asm_thumb.py', 'frozen_const.py', 'frozen_viper.py', 'native_frozen_align.py'))"
 endif
 ifeq ($(QEMU_ARCH),riscv32)
+QEMU_GC_HEAP_SIZE ?= 120
 FROZEN_MANIFEST ?= "freeze('test-frzmpy', ('frozen_asm_rv32imc.py', 'frozen_const.py', 'frozen_viper.py', 'native_frozen_align.py'))"
 endif
 
 # include py core make definitions
 include $(TOP)/py/py.mk
 include $(TOP)/extmod/extmod.mk
 
+CFLAGS += -DGC_HEAP_SIZE=$(QEMU_GC_HEAP_SIZE)
+
 ################################################################################
 # ARM specific settings
 
diff --git a/ports/qemu/README.md b/ports/qemu/README.md
@@ -110,3 +110,5 @@ The following options can be specified on the `make` command line:
 - `QEMU_DEBUG_ARGS`: defaults to `-s` (gdb on TCP port 1234), but can be overridden
   with different qemu gdb arguments.
 - `QEMU_DEBUG_EXTRA`: extra options to pass to qemu when `QEMU_DEBUG=1` is used.
+- `QEMU_GC_HEAP_SIZE`: pass in an optional value (in KBytes) for overriding the GC
+  heap size used by the port.
diff --git a/ports/qemu/main.c b/ports/qemu/main.c
@@ -34,7 +34,7 @@
 #include "shared/runtime/gchelper.h"
 #include "shared/runtime/pyexec.h"
 
-#define HEAP_SIZE (100 * 1024)
+#define HEAP_SIZE (GC_HEAP_SIZE * 1024)
 
 static uint32_t gc_heap[HEAP_SIZE / sizeof(uint32_t)];
 
