Lerking/micropython
1
0
Fork 0
mirror of https://github.com/micropython/micropython.git synced 2026-01-06 20:20:14 +01:00
Code Issues Actions 52 Packages Projects Releases Wiki Activity

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

Browse Source 
In certain circumstances depending on the code size, the
`deflate_decompress` test fails on both ARM and RV32 with a memory
allocation failure error.  The issue is mitigated by having a larger GC
heap, in this case around 20 KBytes more than the original 100 KBytes
default.

This commit makes the GC heap size configurable on a per-arch basis, with
both ARM and RV32 using the enlarged 120 KBytes heap.

Signed-off-by: Alessandro Gatti <a.gatti@frob.it>
This commit is contained in:
Alessandro Gatti
2024-09-06 12:43:54 +02:00
committed by Damien George
parent 268acb714d
commit 36aa7545b0
3 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ports/qemu/Makefile
View File

@@ -19,9 +19,11 @@ QSTR_DEFS = qstrdefsport.h
MICROPY_ROM_TEXT_COMPRESSION ?= 1 MICROPY_ROM_TEXT_COMPRESSION ?= 1
ifeq ($(QEMU_ARCH),arm) ifeq ($(QEMU_ARCH),arm)
MICROPY_HEAP_SIZE ?= 122880
FROZEN_MANIFEST ?= "require('unittest'); freeze('test-frzmpy', ('frozen_asm_thumb.py', 'frozen_const.py', 'frozen_viper.py', 'native_frozen_align.py'))" FROZEN_MANIFEST ?= "require('unittest'); freeze('test-frzmpy', ('frozen_asm_thumb.py', 'frozen_const.py', 'frozen_viper.py', 'native_frozen_align.py'))"
endif endif
ifeq ($(QEMU_ARCH),riscv32) ifeq ($(QEMU_ARCH),riscv32)
MICROPY_HEAP_SIZE ?= 122880
FROZEN_MANIFEST ?= "require('unittest'); freeze('test-frzmpy', ('frozen_asm_rv32.py', 'frozen_const.py', 'frozen_viper.py', 'native_frozen_align.py'))" FROZEN_MANIFEST ?= "require('unittest'); freeze('test-frzmpy', ('frozen_asm_rv32.py', 'frozen_const.py', 'frozen_viper.py', 'native_frozen_align.py'))"
endif endif
@@ -29,6 +31,8 @@ endif
include $(TOP)/py/py.mk include $(TOP)/py/py.mk
include $(TOP)/extmod/extmod.mk include $(TOP)/extmod/extmod.mk
CFLAGS += -DMICROPY_HEAP_SIZE=$(MICROPY_HEAP_SIZE)
################################################################################ ################################################################################
# ARM specific settings # ARM specific settings

2
ports/qemu/README.md
View File

@@ -122,3 +122,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 - `QEMU_DEBUG_ARGS`: defaults to `-s` (gdb on TCP port 1234), but can be overridden
with different qemu gdb arguments. with different qemu gdb arguments.
- `QEMU_DEBUG_EXTRA`: extra options to pass to qemu when `QEMU_DEBUG=1` is used. - `QEMU_DEBUG_EXTRA`: extra options to pass to qemu when `QEMU_DEBUG=1` is used.
- `MICROPY_HEAP_SIZE`: pass in an optional value (in bytes) for overriding the GC
heap size used by the port.

8
ports/qemu/main.c
View File

@@ -34,14 +34,16 @@
#include "shared/runtime/gchelper.h" #include "shared/runtime/gchelper.h"
#include "shared/runtime/pyexec.h" #include "shared/runtime/pyexec.h"
#define HEAP_SIZE (100 * 1024) #if MICROPY_HEAP_SIZE <= 0
#error MICROPY_HEAP_SIZE must be a positive integer.
#endif
static uint32_t gc_heap[HEAP_SIZE / sizeof(uint32_t)]; static uint32_t gc_heap[MICROPY_HEAP_SIZE / sizeof(uint32_t)];
int main(int argc, char **argv) { int main(int argc, char **argv) {
mp_stack_ctrl_init(); mp_stack_ctrl_init();
mp_stack_set_limit(10240); mp_stack_set_limit(10240);
gc_init(gc_heap, (char *)gc_heap + HEAP_SIZE); gc_init(gc_heap, (char *)gc_heap + MICROPY_HEAP_SIZE);
for (;;) { for (;;) {
mp_init(); mp_init();