some refactor

Author: TianlongLiang

core/iwasm/common/wasm_runtime_common.c

@@ -7918,4 +7918,4 @@ wasm_runtime_update_last_used_shared_heap(WASMModuleInstanceCommon *module_inst,
 
     return false;
 }
-#endif
+#endif

core/iwasm/common/wasm_runtime_common.h

@@ -1342,7 +1342,8 @@ wasm_runtime_update_last_used_shared_heap(WASMModuleInstanceCommon *module_inst,
                                           uintptr_t app_offset, size_t bytes,
                                           uintptr_t *shared_heap_start_off_p,
                                           uintptr_t *shared_heap_end_off_p,
-                                          uint8 **shared_heap_base_addr_adj_p, bool is_memory64);
+                                          uint8 **shared_heap_base_addr_adj_p,
+                                          bool is_memory64);
 #endif
 
 #ifdef __cplusplus

core/iwasm/compilation/aot_emit_memory.c

@@ -167,32 +167,6 @@ get_module_inst_extra_offset(AOTCompContext *comp_ctx);
         }                                                             \
     } while (0)
 
-#define BUILD_STORE_PTR(ptr, value)                                   \
-    do {                                                              \
-        LLVMValueRef res;                                             \
-        if (!(res = LLVMBuildStore(comp_ctx->builder, value, ptr))) { \
-            aot_set_last_error("llvm build store failed.");           \
-            goto fail;                                                \
-        }                                                             \
-    } while (0)
-
-#define BUILD_GET_SHARED_HEAP_FIELD(shared_heap_p, field, data_type, res)     \
-    do {                                                                      \
-        offset_u32 = offsetof(WASMSharedHeap, field);                         \
-        field_offset = I32_CONST(offset_u32);                                 \
-        CHECK_LLVM_CONST(field_offset);                                       \
-                                                                              \
-        BUILD_FIELD_PTR(shared_heap_p, field_offset, field_p,                 \
-                        "shared_heap" #field);                                \
-        if (!(field_p = LLVMBuildBitCast(comp_ctx->builder, field_p,          \
-                                         LLVMPointerType(data_type, 0),       \
-                                         "shared_heap_" #field "_cast_p"))) { \
-            aot_set_last_error("llvm build bit cast failed.");                \
-            goto fail;                                                        \
-        }                                                                     \
-        BUILD_LOAD_PTR(field_p, data_type, res);                              \
-    } while (0)
-
 /* Update last used shared heap info(alloc ptr) in function ctx:
  * 1. shared_heap_start_off 2. shared_heap_end_off 3. shared_heap_base_addr_adj
  */

core/iwasm/compilation/aot_llvm.c

@@ -1648,9 +1648,9 @@ create_shared_heap_info(AOTCompContext *comp_ctx, AOTFuncContext *func_ctx)
     return true;
 fail:
     return false;
-#else
+#else /* else of WASM_ENABLE_SHARED_HEAP != 0 */ 
     return true;
-#endif
+#endif /* end of WASM_ENABLE_SHARED_HEAP != 0 */ 
 }
 
 static bool

tests/unit/shared-heap/CMakeLists.txt

@@ -64,4 +64,4 @@ add_executable(shared_heap_test ${unit_test_sources})
 
 target_link_libraries(shared_heap_test ${LLVM_AVAILABLE_LIBS} gtest_main)
 
-gtest_discover_tests(shared_heap_test)
+gtest_discover_tests(shared_heap_test)

tests/unit/shared-heap/wasm-apps/CMakeLists.txt

@@ -30,11 +30,11 @@ set(CMAKE_EXE_LINKER_FLAGS
         )
 
 if (WAMR_BUILD_TARGET STREQUAL "X86_32")
-  set (WAMR_COMPILER_FLAGS --opt-level=0 --bounds-checks=1 --enable-shared-heap --target=i386)
-  set (WAMR_COMPILER_CHAIN_FLAGS --opt-level=0 --bounds-checks=1 --enable-shared-chain --target=i386)
+  set (WAMR_COMPILER_FLAGS --opt-level=3 --bounds-checks=1 --enable-shared-heap --target=i386)
+  set (WAMR_COMPILER_CHAIN_FLAGS --opt-level=3 --bounds-checks=1 --enable-shared-chain --target=i386)
 else ()
-  set (WAMR_COMPILER_FLAGS --opt-level=0 --bounds-checks=1 --enable-shared-heap)
-  set (WAMR_COMPILER_CHAIN_FLAGS --opt-level=0 --bounds-checks=1 --enable-shared-chain)
+  set (WAMR_COMPILER_FLAGS --opt-level=3 --bounds-checks=1 --enable-shared-heap)
+  set (WAMR_COMPILER_CHAIN_FLAGS --opt-level=3 --bounds-checks=1 --enable-shared-chain)
 endif ()
 
 function(copy_wasm TARGET_NAME)
@@ -106,4 +106,4 @@ add_custom_command(
 
 add_custom_target(compile_bulk_memory_aot ALL
     DEPENDS ${OUTPUT_AOT}
-)
+)