Skip to content

Commit 2a2dd19

Browse files
authored
Implicitly disable the SIMD flag for classic-interp and fast-jit (#4768)
1 parent d980fe8 commit 2a2dd19

File tree

3 files changed

+18
-15
lines changed

3 files changed

+18
-15
lines changed

.github/scripts/codeql_buildscript.sh

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -78,26 +78,30 @@ iwasm_options_list=(
7878
#default
7979
""
8080
# +classic interp
81-
"-DWAMR_BUILD_FAST_INTERP=0"
82-
# +llvm jit + fast jit
83-
"-DWAMR_BUILD_JIT=1 -DWAMR_BUILD_FAST_JIT=1 -DWAMR_BUILD_FAST_JIT_DUMP=1"
81+
"-DWAMR_BUILD_FAST_INTERP=0 -DWAMR_BUILD_SIMD=0"
82+
# fast jit
83+
"-DWAMR_BUILD_FAST_JIT=1 -DWAMR_BUILD_FAST_JIT_DUMP=1 -DWAMR_BUILD_SIMD=0"
84+
# +llvm jit
85+
"-DWAMR_BUILD_JIT=1"
8486
#
8587
"-DWAMR_BUILD_TARGET=X86_32"
8688
#
8789
# libraries
8890
"-DWAMR_BUILD_LIBC_BUILTIN=0 -DWAMR_BUILD_LIBC_UVWASI=1 -DWAMR_BUILD_LIBC_EMCC=1"
89-
"-DWAMR_BUILD_THREAD_MGR=1 -DWAMR_BUILD_LIB_PTHREAD=1 -DWAMR_BUILD_SHARED_MEMORY=1 -DWAMR_BUILD_LIB_PTHREAD_SEMAPHORE=1"
90-
"-DWAMR_BUILD_THREAD_MGR=1 -DWAMR_BUILD_LIB_WASI_THREADS=1 -DWAMR_BUILD_SHARED_MEMORY=1 -DWAMR_BUILD_LIB_PTHREAD_SEMAPHORE=1"
91+
"-DWAMR_BUILD_THREAD_MGR=1 -DWAMR_BUILD_LIB_PTHREAD=1 -DWAMR_BUILD_LIB_PTHREAD_SEMAPHORE=1"
92+
"-DWAMR_BUILD_THREAD_MGR=1 -DWAMR_BUILD_LIB_WASI_THREADS=1 -DWAMR_BUILD_LIB_PTHREAD_SEMAPHORE=1"
9193
"-DWAMR_BUILD_WASI_NN=1 -DWAMR_BUILD_WASI_NN_LLAMACPP=1"
9294
#
9395
# Wasm specs
94-
"-DWAMR_BUILD_GC=1 -DWAMR_BUILD_EXCE_HANDLING=1 -DWAMR_BUILD_STRINGREF=1 -DWAMR_STRINGREF_IMPL_SOURCE=STUB"
95-
"-DWAMR_BUILD_MEMORY64=1 -DWAMR_BUILD_MULTI_MEMORY=1"
96+
"-DWAMR_BUILD_GC=1 -DWAMR_BUILD_STRINGREF=1 -DWAMR_STRINGREF_IMPL_SOURCE=STUB"
97+
"-DWAMR_BUILD_EXCE_HANDLING=1 -DWAMR_BUILD_AOT=0 -DWAMR_BUILD_FAST_INTERP=0 -DWAMR_BUILD_SIMD=0"
98+
"-DWAMR_BUILD_MEMORY64=1 -DWAMR_BUILD_MULTI_MEMORY=1 -DWAMR_BUILD_SHARED_MEMORY=1 -DWAMR_BUILD_FAST_INTERP=0 -DWAMR_BUILD_SIMD=0 -DWAMR_BUILD_AOT=0"
9699
#
97100
# WARM features
98101
"-DWAMR_BUILD_MULTI_MODULE=1 -DWAMR_BUILD_MINI_LOADER=1 -DWAMR_BUILD_SHARED_HEAP=1"
99102
"-DWAMR_DISABLE_HW_BOUND_CHECK=1"
100103
"-DWAMR_CONFIGURABLE_BOUNDS_CHECKS=1"
104+
"-DWAMR_BUILD_EXTENDED_CONST_EXPR=1"
101105
# - Debug
102106
"-DWAMR_BUILD_DEBUG_INTERP=1 -DWAMR_BUILD_DEBUG_AOT=1 -DWAMR_BUILD_DYNAMIC_AOT_DEBUG=1"
103107
# - developer options

.github/workflows/codeql.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ jobs:
5858
config-file: ./.github/codeql/codeql_config.yml
5959

6060
- run: |
61-
./.github/scripts/codeql_buildscript.sh
61+
./.github/scripts/codeql_buildscript.sh || exit 1
6262
6363
- name: Perform CodeQL Analysis
6464
uses: github/codeql-action/analyze@v4.31.9
@@ -102,7 +102,7 @@ jobs:
102102
-**:cpp/unused-local-variable
103103
-**:cpp/unused-static-function
104104
-**:cpp/unused-static-variable
105-
-**:cpp/use-of-goto
105+
-**:cpp/use-of-goto
106106
## Exclude rules 2. Related to special usage of APIs
107107
-**:cpp/alloca-in-loop
108108
-**:cpp/command-line-injection
@@ -120,7 +120,6 @@ jobs:
120120
category: "/language:${{matrix.language}}"
121121

122122
- name: Upload CodeQL results as an artifact
123-
if: success() || failure()
124123
uses: actions/upload-artifact@v6.0.0
125124
with:
126125
name: codeql-results

build-scripts/unsupported_combination.cmake

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ endfunction()
6161
# Below are the unsupported combinations checks
6262
# Please keep this list in sync with tests/unit/unsupported-features/CMakeLists.txt
6363
# and tests/wamr-test-suites/test_wamr.sh
64-
#cmake_print_variables(WAMR_BUILD_INTERP WAMR_BUILD_FAST_INTERP WAMR_BUILD_JIT)
64+
cmake_print_variables(WAMR_BUILD_INTERP WAMR_BUILD_FAST_INTERP WAMR_BUILD_JIT WAMR_BUILD_EXCE_HANDLING)
6565

6666
if(WAMR_BUILD_EXCE_HANDLING EQUAL 1)
6767
check_aot_mode_error("Unsupported build configuration: EXCE_HANDLING + AOT")
@@ -81,10 +81,10 @@ if(WAMR_BUILD_MEMORY64 EQUAL 1)
8181
endif()
8282

8383
if(WAMR_BUILD_MULTI_MEMORY EQUAL 1)
84-
check_aot_mode_error("Unsupported build configuration: EXCE_HANDLING + AOT")
85-
check_fast_interp_error("Unsupported build configuration: EXCE_HANDLING + FAST_INTERP")
86-
check_fast_jit_error("Unsupported build configuration: EXCE_HANDLING + FAST_JIT")
87-
check_llvm_jit_error("Unsupported build configuration: EXCE_HANDLING + JIT")
84+
check_aot_mode_error("Unsupported build configuration: MULTI_MEMORY + AOT")
85+
check_fast_interp_error("Unsupported build configuration: MULTI_MEMORY + FAST_INTERP")
86+
check_fast_jit_error("Unsupported build configuration: MULTI_MEMORY + FAST_JIT")
87+
check_llvm_jit_error("Unsupported build configuration: MULTI_MEMORY + JIT")
8888
endif()
8989

9090
if(WAMR_BUILD_MULTI_MODULE EQUAL 1)

0 commit comments

Comments
 (0)