fix several reviewing comments

Author: lum1n0us

tests/unit/CMakeLists.txt

@@ -60,12 +60,13 @@ add_subdirectory(libc-builtin)
 add_subdirectory(shared-utils)
 add_subdirectory(linear-memory-wasm)
 add_subdirectory(linear-memory-aot)
-add_subdirectory(aot-stack-frame)
 add_subdirectory(linux-perf)
 add_subdirectory(gc)
 add_subdirectory(tid-allocator)
 
 if (NOT WAMR_BUILD_TARGET STREQUAL "X86_32")
+  add_subdirectory(aot-stack-frame)
+
   # should enable 32-bit llvm when X86_32
   add_subdirectory (aot)
   add_subdirectory (custom-section)
@@ -74,7 +75,7 @@ if (NOT WAMR_BUILD_TARGET STREQUAL "X86_32")
   # Fast-JIT or mem64 is not supported on X86_32
   add_subdirectory (running-modes)
   add_subdirectory (memory64)
-  # add_subdirectory (shared-heap)
+  add_subdirectory (shared-heap)
 
   # HW_BOUND_CHECK is not supported on X86_32
   add_subdirectory (runtime-common)

tests/unit/aot/CMakeLists.txt

@@ -16,10 +16,9 @@ add_definitions (-DWASM_ENABLE_AOT_STACK_FRAME=1)
 set (WAMR_BUILD_AOT 1)
 set (WAMR_BUILD_FAST_INTERP 0)
 set (WAMR_BUILD_INTERP 0)
-# to involve LLVM
 set (WAMR_BUILD_JIT 1)
 set (WAMR_BUILD_LIBC_WASI 0)
-set (WAMR_BUILD_APP_FRAMEWORK 1)
+set (WAMR_BUILD_APP_FRAMEWORK 0)
 
 include (../unit_common.cmake)
 

tests/unit/linear-memory-aot/CMakeLists.txt

@@ -13,8 +13,6 @@ set (WAMR_BUILD_MEMORY_PROFILING 1)
 set (WAMR_BUILD_INTERP 0)
 set (WAMR_BUILD_AOT 1)
 set (WAMR_BUILD_FAST_INTERP 0)
-# to involve LLVM
-set (WAMR_BUILD_JIT 1)
 
 include (../unit_common.cmake)
 
@@ -33,7 +31,7 @@ set (unit_test_sources
 
 # Test case: .aot file with hardware bound check.
 add_executable (linear_memory_test_aot ${unit_test_sources})
-target_link_libraries (linear_memory_test_aot ${LLVM_AVAILABLE_LIBS} gtest_main)
+target_link_libraries (linear_memory_test_aot gtest_main)
 gtest_discover_tests(linear_memory_test_aot)
 target_compile_definitions(linear_memory_test_aot PRIVATE WAMR_DISABLE_HW_BOUND_CHECK=0)
 
@@ -65,6 +63,6 @@ add_custom_command(TARGET linear_memory_test_aot POST_BUILD
 
 # Test case: .aot file with no hardware bound check.
 add_executable (linear_memory_test_aot_no_hw_bound ${unit_test_sources})
-target_link_libraries (linear_memory_test_aot_no_hw_bound ${LLVM_AVAILABLE_LIBS} gtest_main)
+target_link_libraries (linear_memory_test_aot_no_hw_bound gtest_main)
 gtest_discover_tests(linear_memory_test_aot_no_hw_bound)
 target_compile_definitions(linear_memory_test_aot_no_hw_bound PRIVATE WAMR_DISABLE_HW_BOUND_CHECK=1)

tests/unit/memory64/CMakeLists.txt

@@ -13,7 +13,8 @@ set(WAMR_BUILD_APP_FRAMEWORK 0)
 set(WAMR_BUILD_AOT 0)
 set(WAMR_BUILD_INTERP 1)
 set(WAMR_BUILD_FAST_INTERP 0)
-set(WAMR_BUILD_JIT 0)
+# to involve LLVM
+set(WAMR_BUILD_JIT 1)
 set(WAMR_BUILD_FAST_JIT 0)
 set(WAMR_BUILD_MEMORY64 1)
 set(WAMR_BUILD_SHARED_MEMORY 1)

tests/unit/running-modes/CMakeLists.txt

@@ -24,7 +24,7 @@ add_definitions(-DRUN_ON_LINUX)
 
 set(WAMR_BUILD_LIBC_BUILTIN 1)
 set(WAMR_BUILD_MULTI_MODULE 0)
-set(WAMR_BUILD_LIBC_WASI 0)
+set(WAMR_BUILD_LIBC_WASI 1)
 set(WAMR_BUILD_APP_FRAMEWORK 0)
 set(WAMR_BUILD_JIT 1)
 set(WAMR_BUILD_FAST_JIT 1)

tests/unit/runtime-common/CMakeLists.txt

@@ -36,11 +36,8 @@ add_executable(runtime_common_test ${unit_test_sources})
 target_link_libraries(runtime_common_test ${LLVM_AVAILABLE_LIBS} gtest_main)
 
 # Ensure that aot compiled is completed before linear_memory_test_aot is built
-set(dummy_output "${CMAKE_CURRENT_BINARY_DIR}/dummy_output")
-
-add_custom_command(OUTPUT ${dummy_output}
+add_custom_command(OUTPUT ${CMAKE_CURRENT_LIST_DIR}/wasm-apps/main.aot
   COMMAND ./build_aot.sh
-  COMMAND ${CMAKE_COMMAND} -E touch ${dummy_output}
   WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
   DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/build_aot.sh
   COMMENT "Executing script to compile aot files"
@@ -49,15 +46,15 @@ add_custom_command(OUTPUT ${dummy_output}
 
 add_custom_target(
   BuildAot ALL
-  DEPENDS ${dummy_output}
+  DEPENDS ${CMAKE_CURRENT_LIST_DIR}/wasm-apps/main.aot
 )
 
 add_dependencies(runtime_common_test BuildAot)
 
 add_custom_command(TARGET runtime_common_test POST_BUILD
   COMMAND ${CMAKE_COMMAND} -E copy
-  ${CMAKE_CURRENT_LIST_DIR}/wasm-apps/main.wasm ${CMAKE_CURRENT_LIST_DIR}/wasm-apps/main.aot
-  ${CMAKE_CURRENT_BINARY_DIR}
+    ${CMAKE_CURRENT_LIST_DIR}/wasm-apps/main.wasm ${CMAKE_CURRENT_LIST_DIR}/wasm-apps/main.aot
+    ${CMAKE_CURRENT_BINARY_DIR}
   COMMENT "Copy main.wasm and main.aot to the directory: build/runtime-common."
 )
 

tests/unit/shared-heap/CMakeLists.txt

@@ -11,8 +11,7 @@ set(WAMR_BUILD_APP_FRAMEWORK 0)
 set(WAMR_BUILD_AOT 1)
 set(WAMR_BUILD_INTERP 1)
 set(WAMR_BUILD_FAST_INTERP 1)
-# to involve LLVM
-set(WAMR_BUILD_JIT 1)
+set(WAMR_BUILD_JIT 0)
 if(WAMR_BUILD_TARGET STREQUAL "X86_32")
     set(WAMR_BUILD_MEMORY64 0)
 else()
@@ -47,6 +46,6 @@ set(unit_test_sources
 # Now simply link against gtest or gtest_main as needed. Eg
 add_executable(shared_heap_test ${unit_test_sources})
 
-target_link_libraries(shared_heap_test ${LLVM_AVAILABLE_LIBS} gtest_main)
+target_link_libraries(shared_heap_test gtest_main)
 
 gtest_discover_tests(shared_heap_test)