fix(build): update WAMR_ROOT_DIR to use CURRENT_LIST_DIR for correct path resolution

Author: lum1n0us

build-scripts/version.cmake

@@ -3,7 +3,7 @@
 
 if(NOT WAMR_ROOT_DIR)
   # if from wamr-compiler
-  set(WAMR_ROOT_DIR ${CMAKE_CURRENT_SOURCE_DIR}/..)
+  set(WAMR_ROOT_DIR ${CMAKE_CURRENT_LIST_DIR}/..)
 endif()
 
 set(WAMR_VERSION_MAJOR 2)

core/iwasm/compilation/aot_llvm.c

@@ -2521,7 +2521,8 @@ aot_compiler_init(void)
     LLVMInitializeCore(LLVMGetGlobalPassRegistry());
 #endif
 
-#if WASM_ENABLE_WAMR_COMPILER != 0
+/* fuzzing only use host targets for simple */
+#if WASM_ENABLE_WAMR_COMPILER != 0 && WASM_ENABLE_FUZZ_TEST == 0
     /* Init environment of all targets for AOT compiler */
     LLVMInitializeAllTargetInfos();
     LLVMInitializeAllTargets();

tests/fuzz/wasm-mutator-fuzz/CMakeLists.txt

@@ -3,10 +3,13 @@
 
 cmake_minimum_required(VERSION 3.14)
 
-project(wasm_fuzzing LANGUAGES C CXX)
+project(wamr_fuzzing LANGUAGES ASM C CXX)
+
+include(CMakePrintHelpers)
 
 # Ensure Clang is used as the compiler
-if(NOT CMAKE_C_COMPILER_ID STREQUAL "Clang" OR NOT CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
+if(NOT CMAKE_C_COMPILER_ID STREQUAL "Clang"
+    OR NOT CMAKE_ASM_COMPILER_ID STREQUAL "Clang")
   message(FATAL_ERROR "Please use Clang as the C compiler for libFuzzer compatibility.")
 endif()
 
@@ -46,15 +49,33 @@ set(WAMR_BUILD_AOT_VALIDATOR 1)
 set(REPO_ROOT_DIR ${CMAKE_CURRENT_LIST_DIR}/../../..)
 message(STATUS "REPO_ROOT_DIR: ${REPO_ROOT_DIR}")
 
-set(LLVM_SRC_ROOT ${REPO_ROOT_DIR}/core/deps/llvm)
-set(LLVM_BUILD_ROOT ${LLVM_SRC_ROOT}/build)
-set(LLVM_DIR ${LLVM_BUILD_ROOT}/lib/cmake/llvm)
+# Use LLVM_DIR from command line if defined
+# LLVM_DIR should be something like /path/to/llvm/build/lib/cmake/llvm
+if(DEFINED LLVM_DIR)
+  set(LLVM_DIR $ENV{LLVM_DIR})
+else()
+  set(LLVM_SRC_ROOT ${REPO_ROOT_DIR}/core/deps/llvm)
+  set(LLVM_BUILD_ROOT ${LLVM_SRC_ROOT}/build)
+  set(LLVM_DIR ${LLVM_BUILD_ROOT}/lib/cmake/llvm)
+endif()
+
+# if LLVM_DIR is an existing directory, use it
+if(NOT EXISTS ${LLVM_DIR})
+  message(FATAL_ERROR "LLVM_DIR not found: ${LLVM_DIR}")
+endif()
 
 find_package(LLVM REQUIRED CONFIG)
 
 message(STATUS "Found LLVM ${LLVM_PACKAGE_VERSION}")
 message(STATUS "Using LLVMConfig.cmake in: ${LLVM_DIR}")
 
+include_directories(${LLVM_INCLUDE_DIRS})
+separate_arguments(LLVM_DEFINITIONS_LIST NATIVE_COMMAND ${LLVM_DEFINITIONS})
+add_definitions(${LLVM_DEFINITIONS_LIST})
+
+set(SHARED_DIR ${REPO_ROOT_DIR}/core/shared)
+set(IWASM_DIR ${REPO_ROOT_DIR}/core/iwasm)
+
 # Enable fuzzer
 add_definitions(-DWASM_ENABLE_FUZZ_TEST=1)
 add_compile_options(-fsanitize=fuzzer)
@@ -75,5 +96,5 @@ if(IN_OSS_FUZZ EQUAL -1)
   add_link_options(-fsanitize=address -fprofile-instr-generate)
 endif()
 
-add_subdirectory(wasm_mutator)
-add_subdirectory(aot_compiler)
+add_subdirectory(aot-compiler)
+add_subdirectory(wasm-mutator)

tests/fuzz/wasm-mutator-fuzz/README.md

@@ -1,6 +1,6 @@
 # WAMR fuzz test framework
 
-## install wasm-tools
+## Install wasm-tools
 
 ```bash
 1.git clone https://github.com/bytecodealliance/wasm-tools
@@ -13,32 +13,44 @@ $ wasm-tools --version
 $ wasm-tools help
 ```
 
+## Install clang Toolchain
+
+Refer to: https://apt.llvm.org/ and Make sure you have clang installed.
+
+```bash
+$ which clang
+
+$ which clang++
+
+```
+
 ## Build
 
 ```bash
-mkdir build && cd build
 # Without custom mutator (libfuzzer modify the buffer randomly)
-cmake ..
-# TODO: TBC. `wasm-tools mutate` is not supported yet
-# With custom mutator (wasm-tools mutate)
-cmake .. -DCUSTOM_MUTATOR=1
-make -j$(nproc)
+$ cmake -S . -B build -DCMAKE_TOOLCHAIN_FILE=./clang_toolchain.cmake
+
+# TBC: if `wasm-tools mutate` is supported or not
+# Or With custom mutator (wasm-tools mutate)
+$ cmake -S . -B build -DCMAKE_TOOLCHAIN_FILE=./clang_toolchain.cmake -DCUSTOM_MUTATOR=1
+
+$ cmake --build build
 ```
 
 ## Manually generate wasm file in build
 
-```bash
+````bash
 # wasm-tools smith generate some valid wasm file
 # The generated wasm file is in corpus_dir under build
 # N - Number of files to be generated
-./smith_wasm.sh N 
+$ ./smith_wasm.sh N
 
 # running
 ``` bash
-cd build
-./wasm-mutate-fuzz CORPUS_DIR
- 
-```
+$ ./build/wasm-mutator/wasm_mutator_fuzz ./build/CORPUS_DIR
+
+$ ./build/aot-compiler/aot_compiler_fuzz ./build/CORPUS_DIR
+````
 
 ## Fuzzing Server
 
@@ -49,20 +61,20 @@ $ pip install -r requirements.txt
 
 2. Database Migration
 $ python3 app/manager.py db init
-$ python3 app/manager.py db migrate  
-$ python3 app/manager.py db upgrade  
+$ python3 app/manager.py db migrate
+$ python3 app/manager.py db upgrade
 
 3. Change localhost to your machine's IP address
-$ cd ../portal 
+$ cd ../portal
 $ vim .env   # Change localhost to your machine's IP address  # http://<ip>:16667
 
 4. Run Server and Portal
 $ cd ..   # Switch to the original directory
 If you want to customize the front-end deployment port:  # defaut 9999
-    $ vim .env # Please change the portal_port to the port you want to use 
+    $ vim .env # Please change the portal_port to the port you want to use
 
 The server is deployed on port 16667 by default, If you want to change the server deployment port:
-    $ vim .env # Please change the server_port to the port you want to use 
+    $ vim .env # Please change the server_port to the port you want to use
     $ vim portal/.env # Please change the VITE_SERVER_URL to the port you want to use  # http://ip:<port>
 
 

…mutator-fuzz/aot_compiler/CMakeLists.txt …mutator-fuzz/aot-compiler/CMakeLists.txttests/fuzz/wasm-mutator-fuzz/aot_compiler/CMakeLists.txt renamed to tests/fuzz/wasm-mutator-fuzz/aot-compiler/CMakeLists.txt tests/fuzz/wasm-mutator-fuzz/aot_compiler/CMakeLists.txt renamed to tests/fuzz/wasm-mutator-fuzz/aot-compiler/CMakeLists.txt

@@ -1,19 +1,15 @@
 # Copyright (C) 2019 Intel Corporation. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-project(aot_compiler_fuzzing LANGUAGES ASM C CXX)
-
-set(SHARED_DIR ${REPO_ROOT_DIR}/core/shared)
-set(IWASM_DIR ${REPO_ROOT_DIR}/core/iwasm)
-
 # Set default build options with the ability to override from the command line
 if(NOT WAMR_BUILD_INTERP)
   set(WAMR_BUILD_INTERP 1)
 endif()
 
 set(WAMR_BUILD_WAMR_COMPILER 1)
-set(WAMR_BUILD_INTERP 1)
 set(WAMR_BUILD_AOT 1)
+set(WAMR_BUILD_INTERP 1)
+set(WAMR_BUILD_JIT 0)
 
 include(${SHARED_DIR}/platform/${WAMR_BUILD_PLATFORM}/shared_platform.cmake)
 include(${SHARED_DIR}/mem-alloc/mem_alloc.cmake)
@@ -28,7 +24,7 @@ include(${IWASM_DIR}/aot/iwasm_aot.cmake)
 include(${IWASM_DIR}/compilation/iwasm_compl.cmake)
 include(${REPO_ROOT_DIR}/build-scripts/version.cmake)
 
-add_library(aotclib 
+add_library(aotclib
   ${PLATFORM_SHARED_SOURCE}
   ${MEM_ALLOC_SHARED_SOURCE}
   ${UTILS_SHARED_SOURCE}
@@ -41,9 +37,9 @@ add_library(aotclib
   ${IWASM_COMPL_SOURCE}
 )
 
-target_compile_definitions(aotclib 
-  PUBLIC 
-    -DWASM_ENABLE_WAMR_COMPILER=1 
+target_compile_definitions(aotclib
+  PUBLIC
+    -DWASM_ENABLE_WAMR_COMPILER=1
     -DWASM_ENABLE_FAST_INTERP=0
     -DWASM_ENABLE_INTERP=1
     -DWASM_ENABLE_BULK_MEMORY=1
@@ -62,12 +58,95 @@ target_compile_definitions(aotclib
     ${LLVM_DEFINITIONS}
 )
 
-target_include_directories(aotclib PUBLIC 
-  ${LLVM_INCLUDE_DIRS}
+target_include_directories(aotclib PUBLIC
   ${IWASM_DIR}/include
   ${SHARED_DIR}/include
 )
-target_link_libraries(aotclib PUBLIC ${LLVM_AVAILABLE_LIBS})
+
+target_link_directories(aotclib PUBLIC ${LLVM_LIBRARY_DIR})
+
+target_link_libraries(aotclib
+  PUBLIC
+    LLVMDemangle
+    LLVMSupport
+    LLVMTableGen
+    LLVMTableGenGlobalISel
+    LLVMCore
+    LLVMFuzzerCLI
+    LLVMFuzzMutate
+    LLVMFileCheck
+    LLVMInterfaceStub
+    LLVMIRReader
+    LLVMCodeGen
+    LLVMSelectionDAG
+    LLVMAsmPrinter
+    LLVMMIRParser
+    LLVMGlobalISel
+    LLVMBinaryFormat
+    LLVMBitReader
+    LLVMBitWriter
+    LLVMBitstreamReader
+    LLVMDWARFLinker
+    LLVMExtensions
+    LLVMFrontendOpenACC
+    LLVMFrontendOpenMP
+    LLVMTransformUtils
+    LLVMInstrumentation
+    LLVMAggressiveInstCombine
+    LLVMInstCombine
+    LLVMScalarOpts
+    LLVMipo
+    LLVMVectorize
+    LLVMObjCARCOpts
+    LLVMCoroutines
+    LLVMCFGuard
+    LLVMLinker
+    LLVMAnalysis
+    LLVMLTO
+    LLVMMC
+    LLVMMCParser
+    LLVMMCDisassembler
+    LLVMMCA
+    LLVMObjCopy
+    LLVMObject
+    LLVMObjectYAML
+    LLVMOption
+    LLVMRemarks
+    LLVMDebuginfod
+    LLVMDebugInfoDWARF
+    LLVMDebugInfoGSYM
+    LLVMDebugInfoMSF
+    LLVMDebugInfoCodeView
+    LLVMDebugInfoPDB
+    LLVMSymbolize
+    LLVMDWP
+    LLVMExecutionEngine
+    LLVMInterpreter
+    LLVMJITLink
+    LLVMMCJIT
+    LLVMOrcJIT
+    LLVMOrcShared
+    LLVMOrcTargetProcess
+    LLVMRuntimeDyld
+    LLVMTarget
+    LLVMX86CodeGen
+    LLVMX86AsmParser
+    LLVMX86Disassembler
+    LLVMX86TargetMCA
+    LLVMX86Desc
+    LLVMX86Info
+    LLVMAsmParser
+    LLVMLineEditor
+    LLVMProfileData
+    LLVMCoverage
+    LLVMPasses
+    LLVMTextAPI
+    LLVMDlltoolDriver
+    LLVMLibDriver
+    LLVMXRay
+    LLVMWindowsDriver
+    LLVMWindowsManifest
+)
 
 add_executable(aot_compiler_fuzz aot_compiler_fuzz.cc)
-target_link_libraries(aot_compiler_fuzz PRIVATE aotclib m)
+target_link_libraries(aot_compiler_fuzz PRIVATE stdc++ aotclib)

…r-fuzz/aot_compiler/aot_compiler_fuzz.cc …r-fuzz/aot-compiler/aot_compiler_fuzz.cctests/fuzz/wasm-mutator-fuzz/aot_compiler/aot_compiler_fuzz.cc renamed to tests/fuzz/wasm-mutator-fuzz/aot-compiler/aot_compiler_fuzz.cc tests/fuzz/wasm-mutator-fuzz/aot_compiler/aot_compiler_fuzz.cc renamed to tests/fuzz/wasm-mutator-fuzz/aot-compiler/aot_compiler_fuzz.cc

@@ -0,0 +1,29 @@
+# Copyright (C) 2019 Intel Corporation. All rights reserved.
+# SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+
+# Check for Clang C compiler
+find_program(CLANG_C_COMPILER NAMES clang)
+if(NOT CLANG_C_COMPILER)
+    message(FATAL_ERROR "Clang C compiler not found. Please install Clang.")
+else()
+    message(STATUS "Clang C compiler found: ${CLANG_C_COMPILER}")
+    set(CMAKE_C_COMPILER ${CLANG_C_COMPILER})
+endif()
+
+# Check for Clang C++ compiler
+find_program(CLANG_CXX_COMPILER NAMES clang++)
+if(NOT CLANG_CXX_COMPILER)
+    message(FATAL_ERROR "Clang C++ compiler not found. Please install Clang.")
+else()
+    message(STATUS "Clang C++ compiler found: ${CLANG_CXX_COMPILER}")
+    set(CMAKE_CXX_COMPILER ${CLANG_CXX_COMPILER})
+endif()
+
+# Check for Clang assembler
+find_program(CLANG_ASM_COMPILER NAMES clang)
+if(NOT CLANG_ASM_COMPILER)
+    message(FATAL_ERROR "Clang assembler not found. Please install Clang.")
+else()
+    message(STATUS "Clang assembler found: ${CLANG_ASM_COMPILER}")
+    set(CMAKE_ASM_COMPILER ${CLANG_ASM_COMPILER})
+endif()

tests/fuzz/wasm-mutator-fuzz/clang_toolchain.cmake

@@ -1,8 +1,6 @@
 # Copyright (C) 2019 Intel Corporation. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-project(wasm_mutator_fuzzing LANGUAGES ASM C CXX)
-
 if(CUSTOM_MUTATOR EQUAL 1)
   add_compile_definitions(CUSTOM_MUTATOR)
 endif()
@@ -57,12 +55,3 @@ target_link_directories(vmlib PUBLIC ${RUNTIME_LIB_LINK_LIST})
 
 add_executable(wasm_mutator_fuzz wasm_mutator_fuzz.cc)
 target_link_libraries(wasm_mutator_fuzz PRIVATE vmlib m)
-
-# Copyright (C) 2019 Intel Corporation. All rights reserved.
-# SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-
-project(wasm_mutator_fuzzing LANGUAGES ASM C CXX)
-
-if(CUSTOM_MUTATOR EQUAL 1)
-  add_compile_definitions(CUSTOM_MUTATOR)
-endif()