Enable shrunk memory by default and add related configurations

build-scripts/config_common.cmake

@@ -162,6 +162,11 @@ if (WAMR_BUILD_LINUX_PERF EQUAL 1)
   endif ()
 endif ()
 
+if (NOT DEFINED WAMR_BUILD_SHRUNK_MEMORY)
+  # Enable shrunk memory by default
+  set (WAMR_BUILD_SHRUNK_MEMORY 1)
+endif ()
+
 ########################################
 
 message ("-- Build Configurations:")
@@ -599,3 +604,10 @@ endif()
 if (NOT WAMR_BUILD_SANITIZER STREQUAL "")
   message ("     Sanitizer ${WAMR_BUILD_SANITIZER} enabled")
 endif ()
+if (WAMR_BUILD_SHRUNK_MEMORY EQUAL 1)
+  add_definitions (-DWASM_ENABLE_SHRUNK_MEMORY=1)
+  message ("     Shrunk memory enabled")
+else ()
+  add_definitions (-DWASM_ENABLE_SHRUNK_MEMORY=0)
+  message ("     Shrunk memory disable")
+endif ()

core/config.h

@@ -698,4 +698,8 @@
 #define WASM_ENABLE_SHARED_HEAP 0
 #endif
 
+#ifndef WASM_ENABLE_SHRUNK_MEMORY
+#define WASM_ENABLE_SHRUNK_MEMORY 1
+#endif
+
 #endif /* end of _CONFIG_H_ */

core/iwasm/interpreter/wasm_loader.c

@@ -6159,6 +6159,7 @@ load_from_sections(WASMModule *module, WASMSection *sections,
         WASMMemoryImport *memory_import;
         WASMMemory *memory;
 
+#if WASM_ENABLE_SHRUNK_MEMORY != 0
         if (aux_data_end_global && aux_heap_base_global
             && aux_stack_top_global) {
             uint64 init_memory_size;
@@ -6196,6 +6197,7 @@ load_from_sections(WASMModule *module, WASMSection *sections,
                 }
             }
         }
+#endif
 
 #if WASM_ENABLE_MULTI_MODULE == 0
         if (module->import_memory_count) {
@@ -10021,7 +10023,8 @@ check_memory_access_align(uint8 opcode, uint32 align, char *error_buf,
     bh_assert(opcode >= WASM_OP_I32_LOAD && opcode <= WASM_OP_I64_STORE32);
     if (align > mem_access_aligns[opcode - WASM_OP_I32_LOAD]) {
         set_error_buf(error_buf, error_buf_size,
-                      "alignment must not be larger than natural");
+                      "invalid memop flags: alignment must not be larger "
+                      "than natural");
         return false;
     }
     return true;
@@ -10060,7 +10063,8 @@ check_simd_memory_access_align(uint8 opcode, uint32 align, char *error_buf,
             && align > mem_access_aligns_load_lane[opcode
                                                    - SIMD_v128_load8_lane])) {
         set_error_buf(error_buf, error_buf_size,
-                      "alignment must not be larger than natural");
+                      "invalid memop flags: alignment must not be larger "
+                      "than natural");
         return false;
     }
 

doc/memory_tune.md

@@ -32,3 +32,4 @@ Normally there are some methods to tune the memory usage:
 - use XIP mode, refer to [WAMR XIP (Execution In Place) feature introduction](./xip.md) for more details
 - when using the Wasm C API in fast interpreter or AOT mode, set `clone_wasm_binary=false` in `LoadArgs` and free the wasm binary buffer (with `wasm_byte_vec_delete`) after module loading; `wasm_module_is_underlying_binary_freeable` can be queried to check if the wasm binary buffer can be safely freed (see [the example](../samples/basic/src/free_buffer_early.c)); after the buffer is freed, `wasm_runtime_get_custom_section` cannot be called anymore
 - when using the wasm/AOT loader in fast interpreter or AOT mode, set `wasm_binary_freeable=true` in `LoadArgs` and free the wasm binary buffer (with `wasm_byte_vec_delete`) after module loading; `wasm_runtime_is_underlying_binary_freeable` can be queried to check if the wasm binary buffer can be safely freed; after the buffer is freed, `wasm_runtime_get_custom_section` cannot be called anymore
+- `WAMR_BUILD_SHRUNK_MEMORY` can be used to reduce the memory usage of WAMR, but it might affect the standard expected behavior of WAMR.