refactor: enable LLVM support across various CMake configurations

lum1n0us · lum1n0us · commit a7f7a329ad42 · 2025-09-09T01:06:21.000Z
diff --git a/tests/unit/CMakeLists.txt b/tests/unit/CMakeLists.txt
@@ -30,13 +30,8 @@ if(WAMR_BUILD_TARGET STREQUAL "X86_32")
   set(CMAKE_LIBRARY_ARCHITECTURE "i386-linux-gnu" CACHE STRING "" FORCE)
 endif()
 
-# Prevent overriding the parent project's compiler/linker
-# settings on Windows
-set(gtest_force_shared_crt ON CACHE BOOL "" FORCE)
-
 # Fetch Google test
 include (FetchContent)
-
 if(${CMAKE_VERSION} VERSION_GREATER_EQUAL "3.24")
   FetchContent_Declare (
     googletest
@@ -50,10 +45,11 @@ else()
   )
 endif()
 
+# Prevent overriding the parent project's compiler/linker
+# settings on Windows
+set(gtest_force_shared_crt ON CACHE BOOL "" FORCE)
 FetchContent_MakeAvailable(googletest)
 
-SET(GOOGLETEST_INCLUDED 1)
-
 include(GoogleTest)
 enable_testing()
 
@@ -76,7 +72,7 @@ if (NOT WAMR_BUILD_TARGET STREQUAL "X86_32")
   add_subdirectory (compilation)
 
   # Fast-JIT or mem64 is not supported on X86_32
-  # add_subdirectory (running-modes)
+  add_subdirectory (running-modes)
   add_subdirectory (memory64)
   # add_subdirectory (shared-heap)
 
diff --git a/tests/unit/aot-stack-frame/CMakeLists.txt b/tests/unit/aot-stack-frame/CMakeLists.txt
@@ -9,7 +9,8 @@ add_definitions (-DRUN_ON_LINUX)
 
 set (WAMR_BUILD_AOT 1)
 set (WAMR_BUILD_INTERP 0)
-set (WAMR_BUILD_JIT 0)
+# to involve LLVM
+set (WAMR_BUILD_JIT 1)
 set (WAMR_BUILD_SIMD 1)
 set (WAMR_BUILD_REF_TYPES 1)
 set (WAMR_BUILD_LIBC_WASI 0)
diff --git a/tests/unit/aot/CMakeLists.txt b/tests/unit/aot/CMakeLists.txt
@@ -13,6 +13,11 @@ add_definitions (-DWASM_ENABLE_WAMR_COMPILER=1)
 add_definitions (-DWASM_ENABLE_DUMP_CALL_STACK=1)
 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)
 
diff --git a/tests/unit/compilation/CMakeLists.txt b/tests/unit/compilation/CMakeLists.txt
@@ -17,6 +17,10 @@ set (WAMR_BUILD_LIBC_WASI 0)
 set (WAMR_BUILD_APP_FRAMEWORK 0)
 set (WAMR_BUILD_THREAD_MGR 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)
 
 include (../unit_common.cmake)
 
diff --git a/tests/unit/custom-section/CMakeLists.txt b/tests/unit/custom-section/CMakeLists.txt
@@ -9,7 +9,8 @@ add_definitions (-DRUN_ON_LINUX)
 
 set (WAMR_BUILD_LIBC_WASI 0)
 set (WAMR_BUILD_LIBC_BUILTIN 0)
-set (WAMR_BUILD_JIT 0)
+# to involve LLVM
+set (WAMR_BUILD_JIT 1)
 set (WAMR_BUILD_LAZY_JIT 0)
 set (WAMR_BUILD_AOT 1)
 
diff --git a/tests/unit/interpreter/CMakeLists.txt b/tests/unit/interpreter/CMakeLists.txt
@@ -11,9 +11,12 @@ add_definitions (-Dattr_container_malloc=malloc)
 add_definitions (-Dattr_container_free=free)
 # add_definitions (-DWASM_ENABLE_WAMR_COMPILER=1)
 
+set(WAMR_BUILD_AOT 0)
+set(WAMR_BUILD_FAST_INTERP 0)
+set(WAMR_BUILD_INTERP 1)
+set(WAMR_BUILD_JIT 0)
 set (WAMR_BUILD_LIBC_WASI 0)
 set (WAMR_BUILD_APP_FRAMEWORK 1)
-set (WAMR_BUILD_AOT 0)
 
 include (../unit_common.cmake)
 
diff --git a/tests/unit/libc-builtin/CMakeLists.txt b/tests/unit/libc-builtin/CMakeLists.txt
@@ -7,6 +7,11 @@ project (test-libc-builtin)
 
 add_definitions (-DRUN_ON_LINUX)
 
+set (WAMR_BUILD_AOT 0)
+set (WAMR_BUILD_FAST_INTERP 0)
+set (WAMR_BUILD_INTERP 1)
+set (WAMR_BUILD_JIT 0)
+set (WAMR_BUILD_LIBC_BUILTIN 1)
 set (WAMR_BUILD_LIBC_WASI 0)
 set (WAMR_BUILD_APP_FRAMEWORK 0)
 
diff --git a/tests/unit/linear-memory-aot/CMakeLists.txt b/tests/unit/linear-memory-aot/CMakeLists.txt
@@ -12,6 +12,9 @@ set (WAMR_BUILD_APP_FRAMEWORK 0)
 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)
 
@@ -26,12 +29,11 @@ set (unit_test_sources
   ${WAMR_RUNTIME_LIB_SOURCE}
   ${UNCOMMON_SHARED_SOURCE}
   ${IWASM_COMPL_SOURCE}
-  ${WASM_APP_LIB_SOURCE_ALL}
 )
 
 # Test case: .aot file with hardware bound check.
 add_executable (linear_memory_test_aot ${unit_test_sources})
-target_link_libraries (linear_memory_test_aot gtest_main)
+target_link_libraries (linear_memory_test_aot ${LLVM_AVAILABLE_LIBS} gtest_main)
 gtest_discover_tests(linear_memory_test_aot)
 target_compile_definitions(linear_memory_test_aot PRIVATE WAMR_DISABLE_HW_BOUND_CHECK=0)
 
@@ -63,6 +65,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 gtest_main)
+target_link_libraries (linear_memory_test_aot_no_hw_bound ${LLVM_AVAILABLE_LIBS} 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)
diff --git a/tests/unit/linux-perf/CMakeLists.txt b/tests/unit/linux-perf/CMakeLists.txt
@@ -9,7 +9,8 @@ add_definitions (-DRUN_ON_LINUX)
 
 set (WAMR_BUILD_LIBC_WASI 0)
 set (WAMR_BUILD_LIBC_BUILTIN 0)
-set (WAMR_BUILD_JIT 0)
+# to involve LLVM
+set (WAMR_BUILD_JIT 1)
 set (WAMR_BUILD_LAZY_JIT 0)
 set (WAMR_BUILD_AOT 1)
 set (WAMR_BUILD_MULTI_MODULE 0)
@@ -26,7 +27,7 @@ include (${IWASM_DIR}/compilation/iwasm_compl.cmake)
 
 add_executable (linux_perf_test test_sort_func_ptrs.cc)
 target_compile_options(linux_perf_test PUBLIC -fpermissive)
-target_link_libraries(linux_perf_test gtest_main )
+target_link_libraries(linux_perf_test ${LLVM_AVAILABLE_LIBS} gtest_main )
 target_link_options(linux_perf_test
   PUBLIC
     LINKER:--unresolved-symbols=ignore-all
diff --git a/tests/unit/running-modes/CMakeLists.txt b/tests/unit/running-modes/CMakeLists.txt
@@ -5,8 +5,20 @@ cmake_minimum_required(VERSION 3.14)
 
 project(test-running-modes)
 
-# Compile wasm modules
-add_subdirectory(wasm-apps)
+set(WASI_SDK_DIR "/opt/wasi-sdk")
+set(WASISDK_TOOLCHAIN "${WASI_SDK_DIR}/share/cmake/wasi-sdk.cmake")
+
+include(ExternalProject)
+ExternalProject_Add(
+  test-running-modes-wasm-apps
+  SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/wasm-apps
+  BUILD_ALWAYS YES
+  CONFIGURE_COMMAND ${CMAKE_COMMAND} -S ${CMAKE_CURRENT_SOURCE_DIR}/wasm-apps -B build
+                      -DWASI_SDK_PREFIX=${WASI_SDK_DIR}
+                      -DCMAKE_TOOLCHAIN_FILE=${WASISDK_TOOLCHAIN}
+  BUILD_COMMAND     ${CMAKE_COMMAND} --build build
+  INSTALL_COMMAND   ${CMAKE_COMMAND} --install build --prefix ${CMAKE_CURRENT_BINARY_DIR}
+)
 
 add_definitions(-DRUN_ON_LINUX)
 
@@ -32,7 +44,7 @@ set(unit_test_sources
 
 # Now simply link against gtest or gtest_main as needed. Eg
 add_executable(wasm_running_modes_test ${unit_test_sources})
-
 target_link_libraries(wasm_running_modes_test ${LLVM_AVAILABLE_LIBS} gtest_main)
+add_dependencies(wasm_running_modes_test test-running-modes-wasm-apps)
 
 gtest_discover_tests(wasm_running_modes_test)
diff --git a/tests/unit/running-modes/wasm-apps/CMakeLists.txt b/tests/unit/running-modes/wasm-apps/CMakeLists.txt
@@ -4,32 +4,19 @@
 cmake_minimum_required(VERSION 3.14)
 project(wasm-apps)
 
-set(WAMR_ROOT_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../../../..)
-
-set(CMAKE_SYSTEM_PROCESSOR wasm32)
-set(CMAKE_SYSROOT ${WAMR_ROOT_DIR}/wamr-sdk/app/libc-builtin-sysroot)
-
-if (NOT DEFINED WASI_SDK_DIR)
-    set(WASI_SDK_DIR "/opt/wasi-sdk")
-endif ()
-
-set(CMAKE_C_FLAGS "-nostdlib -pthread -Qunused-arguments")
-set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -z stack-size=8192 -nostdlib")
-set(CMAKE_C_COMPILER_TARGET "wasm32")
-set(CMAKE_C_COMPILER "${WASI_SDK_DIR}/bin/clang")
-
-set(DEFINED_SYMBOLS
-        "${WAMR_ROOT_DIR}/wamr-sdk/app/libc-builtin-sysroot/share/defined-symbols.txt")
-
-set(CMAKE_EXE_LINKER_FLAGS
-        "-Wl,--no-entry           \
-      -Wl,--initial-memory=65536  \
-      -Wl,--export-all            \
-      -Wl,--allow-undefined"
-        )
+# set(CMAKE_C_FLAGS "-nostdlib -pthread -Qunused-arguments")
+# set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -z stack-size=8192 -nostdlib")
 
 add_executable(mytest.wasm mytest.c)
 target_link_libraries(mytest.wasm)
+target_compile_options(mytest.wasm PRIVATE
+  -pthread
+)
+target_link_options(mytest.wasm PRIVATE
+  LINKER:--allow-undefined
+  LINKER:--export-all
+  LINKER:--no-entry
+)
 
 add_executable(hello.wasm hello.c)
 target_link_libraries(hello.wasm)
diff --git a/tests/unit/runtime-common/CMakeLists.txt b/tests/unit/runtime-common/CMakeLists.txt
@@ -7,8 +7,14 @@ project(test-runtime-common)
 
 add_definitions(-DRUN_ON_LINUX)
 
-set(WAMR_BUILD_LIBC_WASI 0)
-set(WAMR_BUILD_APP_FRAMEWORK 0)
+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 0)
+set (WAMR_BUILD_MULTI_MODULE 1)
 
 include(../unit_common.cmake)
 
diff --git a/tests/unit/shared-heap/CMakeLists.txt b/tests/unit/shared-heap/CMakeLists.txt
@@ -11,7 +11,8 @@ set(WAMR_BUILD_APP_FRAMEWORK 0)
 set(WAMR_BUILD_AOT 1)
 set(WAMR_BUILD_INTERP 1)
 set(WAMR_BUILD_FAST_INTERP 1)
-set(WAMR_BUILD_JIT 0)
+# to involve LLVM
+set(WAMR_BUILD_JIT 1)
 if(WAMR_BUILD_TARGET STREQUAL "X86_32")
     set(WAMR_BUILD_MEMORY64 0)
 else()
diff --git a/tests/unit/shared-utils/CMakeLists.txt b/tests/unit/shared-utils/CMakeLists.txt
@@ -7,6 +7,10 @@ project (test-shared-utils)
 
 add_definitions (-DRUN_ON_LINUX)
 
+set (WAMR_BUILD_AOT 0)
+set (WAMR_BUILD_FAST_INTERP 0)
+set (WAMR_BUILD_INTERP 1)
+set (WAMR_BUILD_JIT 0)
 set (WAMR_BUILD_LIBC_WASI 0)
 set (WAMR_BUILD_APP_FRAMEWORK 0)
 
diff --git a/tests/unit/unit_common.cmake b/tests/unit/unit_common.cmake
@@ -5,12 +5,11 @@ if (NOT DEFINED WAMR_BUILD_PLATFORM)
   set (WAMR_BUILD_PLATFORM "linux")
 endif ()
 
-set (UNIT_ROOT_DIR ${CMAKE_CURRENT_LIST_DIR})
-
-include_directories(${UNIT_ROOT_DIR})
-
 enable_language (ASM)
 
+# Usually, test cases should identify their unique
+# complation flags to implement their test plan
+
 # Set WAMR_BUILD_TARGET, currently values supported:
 # "X86_64", "AMD_64", "X86_32", "ARM_32", "MIPS_32", "XTENSA_32"
 if (NOT DEFINED WAMR_BUILD_TARGET)
@@ -23,47 +22,6 @@ if (NOT DEFINED WAMR_BUILD_TARGET)
   endif ()
 endif ()
 
-if (NOT CMAKE_BUILD_TYPE)
-  set (CMAKE_BUILD_TYPE Debug)
-endif ()
-
-if (NOT DEFINED WAMR_BUILD_INTERP)
-  # Enable Interpreter by default
-  set (WAMR_BUILD_INTERP 1)
-endif ()
-
-if (NOT DEFINED WAMR_BUILD_AOT)
-  # Enable AOT by default.
-  set (WAMR_BUILD_AOT 1)
-endif ()
-
-if (NOT DEFINED WAMR_BUILD_JIT)
-  # Disable JIT by default.
-  set (WAMR_BUILD_JIT 0)
-endif ()
-
-if (NOT DEFINED WAMR_BUILD_LIBC_BUILTIN)
-  # Enable libc builtin support by default
-  set (WAMR_BUILD_LIBC_BUILTIN 1)
-endif ()
-
-if (NOT DEFINED WAMR_BUILD_LIBC_WASI)
-  # Enable libc wasi support by default
-  set (WAMR_BUILD_LIBC_WASI 1)
-endif ()
-
-if (NOT DEFINED WAMR_BUILD_MULTI_MODULE)
-  set (WAMR_BUILD_MULTI_MODULE 1)
-endif()
-
-if (NOT DEFINED WAMR_BUILD_APP_FRAMEWORK)
-  set (WAMR_BUILD_APP_FRAMEWORK 1)
-endif ()
-
-set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--gc-sections")
-set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu99 -ffunction-sections -fdata-sections \
-                                     -Wall -Wno-unused-parameter -Wno-pedantic")
-
 set (WAMR_ROOT_DIR ${CMAKE_CURRENT_LIST_DIR}/../..)
 
 # include the build config template file
@@ -77,17 +35,4 @@ include (${SHARED_DIR}/utils/uncommon/shared_uncommon.cmake)
 # Add helper classes
 include_directories(${CMAKE_CURRENT_LIST_DIR}/common)
 
-# Involve LLVM for AOT and JIT
-set(LLVM_SRC_ROOT "${WAMR_ROOT_DIR}/core/deps/llvm")
-if (NOT EXISTS "${LLVM_SRC_ROOT}/build")
-    message(FATAL_ERROR "Cannot find LLVM dir: ${LLVM_SRC_ROOT}/build")
-endif ()
-set (LLVM_DIR ${LLVM_SRC_ROOT}/build/lib/cmake/llvm)
-
-find_package(LLVM REQUIRED CONFIG)
-include_directories(${LLVM_INCLUDE_DIRS})
-add_definitions(${LLVM_DEFINITIONS})
-message(STATUS "Found LLVM ${LLVM_PACKAGE_VERSION}")
-message(STATUS "Using LLVMConfig.cmake in: ${LLVM_DIR}")
-
 message(STATUS "unit_common.cmake included")
diff --git a/tests/unit/wasm-vm/CMakeLists.txt b/tests/unit/wasm-vm/CMakeLists.txt
@@ -7,6 +7,11 @@ project (test-wasm-vm)
 
 add_definitions (-DRUN_ON_LINUX)
 
+set(WAMR_BUILD_AOT 0)
+set(WAMR_BUILD_FAST_INTERP 0)
+set(WAMR_BUILD_INTERP 1)
+set(WAMR_BUILD_JIT 0)
+
 add_definitions (-Dattr_container_malloc=malloc)
 add_definitions (-Dattr_container_free=free)
 
