feat: enhance unsupported combination checks and update build configurations for JIT and SIMD

Author: lum1n0us

build-scripts/unsupported_combination.cmake

@@ -1,6 +1,8 @@
 # Copyright (C) 2019 Intel Corporation.  All rights reserved.
 # SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
+include(CMakePrintHelpers)
+
 # Define a function to check for unsupported combinations
 function(check_aot_mode_error error_message)
   if(WAMR_BUILD_AOT EQUAL 1)
@@ -10,13 +12,33 @@ endfunction()
 
 # Define a function to check for unsupported combinations with CLASSIC_INTERP
 function(check_classic_interp_error error_message)
-  if(WAMR_BUILD_INTERP EQUAL 1 AND WAMR_BUILD_FAST_INTERP EQUAL 0 AND WAMR_BUILD_JIT EQUAL 0)
+  # Usually, Enable INTERP to enable wasm loader for JIT
+  # WAMR_BUILD_JIT might be undefined, so check it first
+  if(WAMR_BUILD_JIT EQUAL 1)
+    return()
+  endif()
+
+  if(WAMR_BUILD_FAST_JIT EQUAL 1)
+    return()
+  endif()
+
+  if(WAMR_BUILD_INTERP EQUAL 1 AND WAMR_BUILD_FAST_INTERP EQUAL 0)
     message(FATAL_ERROR "${error_message}")
   endif()
 endfunction()
 
 # Define a function to check for unsupported combinations with FAST_INTERP
 function(check_fast_interp_error error_message)
+  # Usually, Enable INTERP to enable wasm loader for JIT
+  # WAMR_BUILD_JIT might be undefined, so check it first
+  if(WAMR_BUILD_JIT EQUAL 1)
+    return()
+  endif()
+
+  if(WAMR_BUILD_FAST_JIT EQUAL 1)
+    return()
+  endif()
+
   if(WAMR_BUILD_INTERP EQUAL 1 AND WAMR_BUILD_FAST_INTERP EQUAL 1)
     message(FATAL_ERROR "${error_message}")
   endif()
@@ -39,6 +61,8 @@ endfunction()
 # Below are the unsupported combinations checks
 # Please keep this list in sync with tests/unit/unsupported-features/CMakeLists.txt
 # and tests/wamr-test-suites/test_wamr.sh
+#cmake_print_variables(WAMR_BUILD_INTERP WAMR_BUILD_FAST_INTERP WAMR_BUILD_JIT)
+
 if(WAMR_BUILD_EXCE_HANDLING EQUAL 1)
   check_aot_mode_error("Unsupported build configuration: EXCE_HANDLING + AOT")
   check_fast_interp_error("Unsupported build configuration: EXCE_HANDLING + FAST_INTERP")

tests/regression/ba-issues/build_wamr.sh

@@ -49,7 +49,7 @@ build_iwasm "-DWAMR_BUILD_GC=1 -DWAMR_BUILD_AOT=1 -DWAMR_BUILD_FAST_INTERP=1 -DW
 build_iwasm "-DWAMR_BUILD_REF_TYPES=1 -DWAMR_BUILD_JIT=1" "llvm-jit"
 
 # build multi-tier-jit iwasm for testing classic-interp, fast-jit, llvm-jit and multi-tier-jit
-build_iwasm "-DWAMR_BUILD_REF_TYPES=1 -DWAMR_BUILD_FAST_JIT=1 -DWAMR_BUILD_JIT=1" "multi-tier-jit"
+build_iwasm "-DWAMR_BUILD_REF_TYPES=1 -DWAMR_BUILD_SIMD=0 -DWAMR_BUILD_FAST_JIT=1 -DWAMR_BUILD_JIT=1" "multi-tier-jit"
 
 # build default iwasm for testing fast-interp and AOT with libc-wasi disabled
 build_iwasm "-DWAMR_BUILD_REF_TYPES=1 -DWAMR_BUILD_AOT=1 -DWAMR_BUILD_FAST_INTERP=1 -DWAMR_BUILD_LIBC_WASI=0" "default-wasi-disabled"
@@ -58,6 +58,6 @@ build_iwasm "-DWAMR_BUILD_REF_TYPES=1 -DWAMR_BUILD_AOT=1 -DWAMR_BUILD_FAST_INTER
 build_iwasm "-DWAMR_BUILD_REF_TYPES=1 -DWAMR_BUILD_JIT=1 -DWAMR_BUILD_LIBC_WASI=0" "llvm-jit-wasi-disabled"
 
 # build multi-tier-jit iwasm for testing classic-interp, fast-jit, llvm-jit and multi-tier-jit with libc-wasi disabled
-build_iwasm "-DWAMR_BUILD_REF_TYPES=1 -DWAMR_BUILD_FAST_JIT=1 -DWAMR_BUILD_JIT=1 -DWAMR_BUILD_LIBC_WASI=0" "multi-tier-jit-wasi-disabled"
+build_iwasm "-DWAMR_BUILD_REF_TYPES=1 -DWAMR_BUILD_SIMD=0-DWAMR_BUILD_FAST_JIT=1 -DWAMR_BUILD_JIT=1 -DWAMR_BUILD_LIBC_WASI=0" "multi-tier-jit-wasi-disabled"
 
 # TODO: add more version of iwasm, for example, sgx version

tests/unit/shared-heap/CMakeLists.txt

@@ -10,13 +10,9 @@ add_definitions(-DRUN_ON_LINUX)
 set(WAMR_BUILD_APP_FRAMEWORK 0)
 set(WAMR_BUILD_AOT 1)
 set(WAMR_BUILD_INTERP 1)
-set(WAMR_BUILD_FAST_INTERP 0)
+set(WAMR_BUILD_FAST_INTERP 1)
 set(WAMR_BUILD_JIT 0)
-if(WAMR_BUILD_TARGET STREQUAL "X86_32")
-    set(WAMR_BUILD_MEMORY64 0)
-else()
-    set(WAMR_BUILD_MEMORY64 1)
-endif()
+set(WAMR_BUILD_MEMORY64 0)
 set(WAMR_BUILD_SHARED_HEAP 1)
 
 # Compile wasm modules

tests/unit/unsupported-features/CMakeLists.txt

@@ -8,21 +8,29 @@ project(unsupported_features_tests)
 include(CMakePrintHelpers)
 
 # fake target
+if(NOT DEFINED WAMR_BUILD_AOT)
+  set(WAMR_BUILD_AOT 0)
+endif()
 set(WAMR_BUILD_INTERP 1)
+if(NOT DEFINED WAMR_BUILD_JIT)
+  set(WAMR_BUILD_JIT 0)
+endif()
+if(NOT DEFINED WAMR_BUILD_FAST_JIT)
+  set(WAMR_BUILD_FAST_JIT 0)
+endif()
 include(../unit_common.cmake)
 add_library(unsupported_features_tests ${WAMR_RUNTIME_LIB_SOURCE})
 
 enable_testing()
 
 # Define a function to add tests with unsupported features
 function(add_unsupported_feature_test test_name flags)
-  cmake_print_variables(test_name flags)
   add_test(
-    NAME verify_${test_name}
+    NAME ${PROJECT_NAME}.verify_${test_name}
     COMMAND ${CMAKE_COMMAND} -S ${CMAKE_CURRENT_LIST_DIR} -B build_${test_name} ${flags} --fresh
     WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
   )
-  set_tests_properties(verify_${test_name} PROPERTIES WILL_FAIL TRUE)
+  set_tests_properties(${PROJECT_NAME}.verify_${test_name} PROPERTIES WILL_FAIL TRUE)
 endfunction()
 
 # List of unsupported feature tests