Skip to content

Commit 53da420

Browse files
lum1n0uslum1n0us
authored
Enable shrunk memory by default and add related configurations (#4008)
- Enable shrunk memory by default and add related configurations - Improve error messages for memory access alignment checks - Add documentation for WAMR shrunk memory build option - Update NuttX workflow to disable shrunk memory build option
1 parent 902f7d2 commit 53da420

12 files changed

Lines changed: 217 additions & 274 deletions

File tree

‎.github/workflows/spec_test_on_nuttx.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,7 @@ jobs:
208208
if: contains(matrix.wamr_test_option.mode, 'aot')
209209
working-directory: apps/interpreters/wamr/wamr/wamr-compiler
210210
run: |
211-
cmake -Bbuild .
211+
cmake -B build -DWAMR_BUILD_SHRUNK_MEMORY=0 -S .
212212
cmake --build build
213213
214214
# the nuttx version we use for xtensa requires esptool.py newer than

‎build-scripts/config_common.cmake‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -162,6 +162,11 @@ if (WAMR_BUILD_LINUX_PERF EQUAL 1)
162162
endif ()
163163
endif ()
164164

165+
if (NOT DEFINED WAMR_BUILD_SHRUNK_MEMORY)
166+
# Enable shrunk memory by default
167+
set (WAMR_BUILD_SHRUNK_MEMORY 1)
168+
endif ()
169+
165170
########################################
166171

167172
message ("-- Build Configurations:")
@@ -599,3 +604,10 @@ endif()
599604
if (NOT WAMR_BUILD_SANITIZER STREQUAL "")
600605
message (" Sanitizer ${WAMR_BUILD_SANITIZER} enabled")
601606
endif ()
607+
if (WAMR_BUILD_SHRUNK_MEMORY EQUAL 1)
608+
add_definitions (-DWASM_ENABLE_SHRUNK_MEMORY=1)
609+
message (" Shrunk memory enabled")
610+
else ()
611+
add_definitions (-DWASM_ENABLE_SHRUNK_MEMORY=0)
612+
message (" Shrunk memory disabled")
613+
endif ()

‎core/config.h‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -698,4 +698,8 @@
698698
#define WASM_ENABLE_SHARED_HEAP 0
699699
#endif
700700

701+
#ifndef WASM_ENABLE_SHRUNK_MEMORY
702+
#define WASM_ENABLE_SHRUNK_MEMORY 1
703+
#endif
704+
701705
#endif /* end of _CONFIG_H_ */

‎core/iwasm/interpreter/wasm_loader.c‎

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6156,9 +6156,7 @@ load_from_sections(WASMModule *module, WASMSection *sections,
61566156
}
61576157

61586158
if (!module->possible_memory_grow) {
6159-
WASMMemoryImport *memory_import;
6160-
WASMMemory *memory;
6161-
6159+
#if WASM_ENABLE_SHRUNK_MEMORY != 0
61626160
if (aux_data_end_global && aux_heap_base_global
61636161
&& aux_stack_top_global) {
61646162
uint64 init_memory_size;
@@ -6168,7 +6166,8 @@ load_from_sections(WASMModule *module, WASMSection *sections,
61686166
* valid range of uint32 */
61696167
if (shrunk_memory_size <= UINT32_MAX) {
61706168
if (module->import_memory_count) {
6171-
memory_import = &module->import_memories[0].u.memory;
6169+
WASMMemoryImport *memory_import =
6170+
&module->import_memories[0].u.memory;
61726171
init_memory_size =
61736172
(uint64)memory_import->mem_type.num_bytes_per_page
61746173
* memory_import->mem_type.init_page_count;
@@ -6183,7 +6182,7 @@ load_from_sections(WASMModule *module, WASMSection *sections,
61836182
}
61846183

61856184
if (module->memory_count) {
6186-
memory = &module->memories[0];
6185+
WASMMemory *memory = &module->memories[0];
61876186
init_memory_size = (uint64)memory->num_bytes_per_page
61886187
* memory->init_page_count;
61896188
if (shrunk_memory_size <= init_memory_size) {
@@ -6196,10 +6195,12 @@ load_from_sections(WASMModule *module, WASMSection *sections,
61966195
}
61976196
}
61986197
}
6198+
#endif /* WASM_ENABLE_SHRUNK_MEMORY != 0 */
61996199

62006200
#if WASM_ENABLE_MULTI_MODULE == 0
62016201
if (module->import_memory_count) {
6202-
memory_import = &module->import_memories[0].u.memory;
6202+
WASMMemoryImport *memory_import =
6203+
&module->import_memories[0].u.memory;
62036204
/* Only resize the memory to one big page if num_bytes_per_page is
62046205
* in valid range of uint32 */
62056206
if (memory_import->mem_type.init_page_count < DEFAULT_MAX_PAGES) {
@@ -6215,7 +6216,7 @@ load_from_sections(WASMModule *module, WASMSection *sections,
62156216
}
62166217
}
62176218
if (module->memory_count) {
6218-
memory = &module->memories[0];
6219+
WASMMemory *memory = &module->memories[0];
62196220
/* Only resize(shrunk) the memory size if num_bytes_per_page is in
62206221
* valid range of uint32 */
62216222
if (memory->init_page_count < DEFAULT_MAX_PAGES) {
@@ -10021,7 +10022,8 @@ check_memory_access_align(uint8 opcode, uint32 align, char *error_buf,
1002110022
bh_assert(opcode >= WASM_OP_I32_LOAD && opcode <= WASM_OP_I64_STORE32);
1002210023
if (align > mem_access_aligns[opcode - WASM_OP_I32_LOAD]) {
1002310024
set_error_buf(error_buf, error_buf_size,
10024-
"alignment must not be larger than natural");
10025+
"invalid memop flags: alignment must not be larger "
10026+
"than natural");
1002510027
return false;
1002610028
}
1002710029
return true;
@@ -10060,7 +10062,8 @@ check_simd_memory_access_align(uint8 opcode, uint32 align, char *error_buf,
1006010062
&& align > mem_access_aligns_load_lane[opcode
1006110063
- SIMD_v128_load8_lane])) {
1006210064
set_error_buf(error_buf, error_buf_size,
10063-
"alignment must not be larger than natural");
10065+
"invalid memop flags: alignment must not be larger "
10066+
"than natural");
1006410067
return false;
1006510068
}
1006610069

‎core/iwasm/interpreter/wasm_mini_loader.c‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2958,9 +2958,7 @@ load_from_sections(WASMModule *module, WASMSection *sections,
29582958
}
29592959

29602960
if (!module->possible_memory_grow) {
2961-
WASMMemoryImport *memory_import;
2962-
WASMMemory *memory;
2963-
2961+
#if WASM_ENABLE_SHRUNK_MEMORY != 0
29642962
if (aux_data_end_global && aux_heap_base_global
29652963
&& aux_stack_top_global) {
29662964
uint64 init_memory_size;
@@ -2970,7 +2968,8 @@ load_from_sections(WASMModule *module, WASMSection *sections,
29702968
* valid range of uint32 */
29712969
if (shrunk_memory_size <= UINT32_MAX) {
29722970
if (module->import_memory_count) {
2973-
memory_import = &module->import_memories[0].u.memory;
2971+
WASMMemoryImport *memory_import =
2972+
&module->import_memories[0].u.memory;
29742973
init_memory_size =
29752974
(uint64)memory_import->mem_type.num_bytes_per_page
29762975
* memory_import->mem_type.init_page_count;
@@ -2985,7 +2984,7 @@ load_from_sections(WASMModule *module, WASMSection *sections,
29852984
}
29862985

29872986
if (module->memory_count) {
2988-
memory = &module->memories[0];
2987+
WASMMemory *memory = &module->memories[0];
29892988
init_memory_size = (uint64)memory->num_bytes_per_page
29902989
* memory->init_page_count;
29912990
if (shrunk_memory_size <= init_memory_size) {
@@ -2998,9 +2997,11 @@ load_from_sections(WASMModule *module, WASMSection *sections,
29982997
}
29992998
}
30002999
}
3000+
#endif /* WASM_ENABLE_SHRUNK_MEMORY != 0 */
30013001

30023002
if (module->import_memory_count) {
3003-
memory_import = &module->import_memories[0].u.memory;
3003+
WASMMemoryImport *memory_import =
3004+
&module->import_memories[0].u.memory;
30043005
if (memory_import->mem_type.init_page_count < DEFAULT_MAX_PAGES) {
30053006
memory_import->mem_type.num_bytes_per_page *=
30063007
memory_import->mem_type.init_page_count;
@@ -3014,7 +3015,7 @@ load_from_sections(WASMModule *module, WASMSection *sections,
30143015
}
30153016

30163017
if (module->memory_count) {
3017-
memory = &module->memories[0];
3018+
WASMMemory *memory = &module->memories[0];
30183019
if (memory->init_page_count < DEFAULT_MAX_PAGES) {
30193020
memory->num_bytes_per_page *= memory->init_page_count;
30203021
if (memory->init_page_count > 0)

0 commit comments

Comments
 (0)