Merge branch 'main' into dev/zephyr_file_socket

.github/workflows/release_process.yml

@@ -11,6 +11,26 @@ on:
         type: boolean
         required: false
         default: false
+      release_wamr_sdk:
+        description: "If the WAMR SDK in the release"
+        type: boolean
+        required: false
+        default: false
+      release_wamr_lldb:
+        description: "If the WAMR LLDB in the release"
+        type: boolean
+        required: false
+        default: false
+      release_wamr_ide_vscode_ext:
+        description: "If the WAMR VSCode extension in the release"
+        type: boolean
+        required: false
+        default: false
+      release_wamr_wasi_ext:
+        description: "If the WAMR WASI extensions in the release"
+        type: boolean
+        required: false
+        default: true
 
 # Cancel any in-flight jobs for the same PR/branch so there's only one active
 # at a time
@@ -93,7 +113,7 @@ jobs:
   release_wamrc_on_ubuntu_2204:
     permissions:
       contents: write # upload release artifact
-    needs: [create_tag, create_release, build_llvm_libraries_on_ubuntu_2204 ]
+    needs: [create_tag, create_release, build_llvm_libraries_on_ubuntu_2204]
     uses: ./.github/workflows/build_wamrc.yml
     with:
       llvm_cache_key: ${{ needs.build_llvm_libraries_on_ubuntu_2204.outputs.cache_key }}
@@ -170,6 +190,7 @@ jobs:
     permissions:
       contents: write # upload release artifact
     needs: [create_tag, create_release]
+    if: ${{ inputs.release_wamr_sdk }}
     uses: ./.github/workflows/build_wamr_sdk.yml
     with:
       config_file: wamr_config_ubuntu_release.cmake
@@ -183,6 +204,7 @@ jobs:
     permissions:
       contents: write # upload release artifact
     needs: [create_tag, create_release]
+    if: ${{ inputs.release_wamr_sdk }}
     uses: ./.github/workflows/build_wamr_sdk.yml
     with:
       config_file: wamr_config_macos_release.cmake
@@ -192,30 +214,30 @@ jobs:
       wasi_sdk_url: https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-19/wasi-sdk-19.0-macos.tar.gz
       wamr_app_framework_url: https://github.com/bytecodealliance/wamr-app-framework.git
 
-  # Let's disable it for now and reopen it when the actual requirement arises.
-  # Please ensure all dependencies have been updated before reopening.
   #
-  # # vscode extension cross-platform
+  # vscode extension cross-platform
-  # release_wamr_ide_vscode_ext:
+  release_wamr_ide_vscode_ext:
-  #   permissions:
+    permissions:
-  #     contents: write # upload release artifact
+      contents: write # upload release artifact
-  #   needs: [create_tag, create_release]
+    needs: [create_tag, create_release]
-  #   uses: ./.github/workflows/build_wamr_vscode_ext.yml
+    if: ${{ inputs.release_wamr_ide_vscode_ext}}
-  #   secrets: inherit
+    uses: ./.github/workflows/build_wamr_vscode_ext.yml
-  #   with:
+    secrets: inherit
-  #     upload_url: ${{ needs.create_release.outputs.upload_url }}
+    with:
-  #     ver_num: ${{ needs.create_tag.outputs.new_ver }}
+      upload_url: ${{ needs.create_release.outputs.upload_url }}
+      ver_num: ${{ needs.create_tag.outputs.new_ver }}
 
-  # #
+  #
-  # # vscode extension docker images package
+  # vscode extension docker images package
-  # release_wamr_ide_docker_images_package:
+  release_wamr_ide_docker_images_package:
-  #   permissions:
+    permissions:
-  #     contents: write # upload release artifact
+      contents: write # upload release artifact
-  #   needs: [create_tag, create_release]
+    needs: [create_tag, create_release]
-  #   uses: ./.github/workflows/build_docker_images.yml
+    if: ${{ inputs.release_wamr_ide_vscode_ext}}
-  #   with:
+    uses: ./.github/workflows/build_docker_images.yml
-  #     upload_url: ${{ needs.create_release.outputs.upload_url }}
+    with:
-  #     ver_num: ${{ needs.create_tag.outputs.new_ver }}
+      upload_url: ${{ needs.create_release.outputs.upload_url }}
+      ver_num: ${{ needs.create_tag.outputs.new_ver }}
 
   #
   # WAMR_LLDB
@@ -223,6 +245,7 @@ jobs:
     permissions:
       contents: write # upload release artifact
     needs: [create_tag, create_release]
+    if: ${{ inputs.release_wamr_lldb }}
     uses: ./.github/workflows/build_wamr_lldb.yml
     with:
       runner: ubuntu-22.04
@@ -233,6 +256,7 @@ jobs:
     permissions:
       contents: write # upload release artifact
     needs: [create_tag, create_release]
+    if: ${{ inputs.release_wamr_lldb }}
     uses: ./.github/workflows/build_wamr_lldb.yml
     with:
       runner: macos-13
@@ -240,10 +264,13 @@ jobs:
       upload_url: ${{ needs.create_release.outputs.upload_url }}
       ver_num: ${{ needs.create_tag.outputs.new_ver}}
 
+  #
+  #
   release_wamr_wasi_extensions:
     permissions:
       contents: write # upload release artifact
     needs: [create_tag, create_release]
+    if: ${{ inputs.release_wamr_wasi_ext }}
     uses: ./.github/workflows/build_wamr_wasi_extensions.yml
     with:
       upload_url: ${{ needs.create_release.outputs.upload_url }}

build-scripts/config_common.cmake

@@ -99,6 +99,12 @@ if (WAMR_BUILD_JIT EQUAL 1)
     # Enable Lazy JIT by default
     set (WAMR_BUILD_LAZY_JIT 1)
   endif ()
+
+  # In Debug mode, always use release builds of pre-built dependency libraries
+  if (WAMR_BUILD_PLATFORM STREQUAL "windows" AND MSVC)
+    add_compile_options($<$<CONFIG:Debug>:/MD>)
+  endif()
+
   if (NOT DEFINED LLVM_DIR)
     set (LLVM_SRC_ROOT "${WAMR_ROOT_DIR}/core/deps/llvm")
     set (LLVM_BUILD_ROOT "${LLVM_SRC_ROOT}/build")
@@ -141,29 +147,59 @@ include (${WAMR_ROOT_DIR}/build-scripts/package.cmake)
 
 if (NOT DEFINED WAMR_BUILD_SANITIZER)
   set(WAMR_BUILD_SANITIZER $ENV{WAMR_BUILD_SANITIZER})
-endif ()
-
-if (NOT DEFINED WAMR_BUILD_SANITIZER)
-  set(WAMR_BUILD_SANITIZER "")
-elseif (WAMR_BUILD_SANITIZER STREQUAL "ubsan")
-  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g -O0 -fno-omit-frame-pointer -fsanitize=undefined -fno-sanitize-recover=all -fno-sanitize=alignment" )
-  set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fsanitize=undefined")
-elseif (WAMR_BUILD_SANITIZER STREQUAL "asan")
-  if (NOT WAMR_BUILD_JIT EQUAL 1)
-    set (ASAN_OPTIONS "verbosity=2 debug=true ")
-    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g -O0 -fno-omit-frame-pointer -fsanitize=address -fno-sanitize-recover=all" )
-    set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fsanitize=address")
-  endif()
-elseif (WAMR_BUILD_SANITIZER STREQUAL "tsan")
-  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g -O0 -fno-omit-frame-pointer -fsanitize=thread -fno-sanitize-recover=all" )
-  set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fsanitize=thread")
-elseif (WAMR_BUILD_SANITIZER STREQUAL "posan")
-  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g -O0 -fno-omit-frame-pointer -fsanitize=pointer-overflow -fno-sanitize-recover=all" )
-  set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fsanitize=pointer-overflow")
-elseif (NOT (WAMR_BUILD_SANITIZER STREQUAL "") )
-  message(SEND_ERROR "Unsupported sanitizer: ${WAMR_BUILD_SANITIZER}")
 endif()
 
+if (NOT WAMR_BUILD_SANITIZER STREQUAL "")
+  set(SUPPORTED_SANITIZERS "ubsan;asan;tsan;posan")
+  string(REPLACE "," ";" SANITIZER_LIST "${WAMR_BUILD_SANITIZER}")
+
+  # Check uncompabile sanitizers
+  if("tsan" IN_LIST SANITIZER_LIST AND "asan" IN_LIST SANITIZER_LIST)
+    message(FATAL_ERROR "ThreadSanitizer (tsan) and AddressSanitizer (asan) cannot be used together!")
+  endif()
+
+  # Check every sanitizer in the list
+  set(INVALID_SANITIZERS "")
+  list(REMOVE_DUPLICATES SANITIZER_LIST)
+  set(SANITIZER_FLAGS)
+  set(NO_SANITIZER_FLAGS)
+  foreach(sanitizer ${SANITIZER_LIST})
+    string(STRIP "${sanitizer}" sanitizer)
+    if(NOT sanitizer IN_LIST SUPPORTED_SANITIZERS)
+      list(APPEND INVALID_SANITIZERS "${sanitizer}")
+    elseif(sanitizer STREQUAL "ubsan")
+      list(APPEND SANITIZER_FLAGS "undefined")
+      list(APPEND NO_SANITIZER_FLAGS "alignment")
+    elseif(sanitizer STREQUAL "asan")
+      if (NOT WAMR_BUILD_JIT EQUAL 1)
+        set(ENV{ASAN_OPTIONS} "verbosity=2 debug=true")
+        list(APPEND SANITIZER_FLAGS "address")
+      else()
+        message(WARNING "AddressSanitizer is not supported in LLVM JIT mode, skip it")
+      endif()
+    elseif(sanitizer STREQUAL "tsan")
+      list(APPEND SANITIZER_FLAGS "thread")
+    elseif(sanitizer STREQUAL "posan")
+      list(APPEND SANITIZER_FLAGS "pointer-overflow")
+    endif()
+  endforeach()
+
+  if(INVALID_SANITIZERS)
+    message(FATAL_ERROR "Unsupported sanitizers: ${INVALID_SANITIZERS}")
+  endif()
+  # common flags for all sanitizers
+  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g -O0 -fno-omit-frame-pointer -fno-sanitize-recover=all")
+  if(SANITIZER_FLAGS)
+    string(REPLACE ";" "," SANITIZER_FLAGS_STR "${SANITIZER_FLAGS}")
+    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fsanitize=${SANITIZER_FLAGS_STR}")
+    set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fsanitize=${SANITIZER_FLAGS_STR}")
+  endif()
+  if(NO_SANITIZER_FLAGS)
+    string(REPLACE ";" "," NO_SANITIZER_FLAGS_STR "${NO_SANITIZER_FLAGS}")
+    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fno-sanitize=${NO_SANITIZER_FLAGS_STR}")
+  endif()
+endif ()
+
 if (WAMR_BUILD_LINUX_PERF EQUAL 1)
   if (NOT WAMR_BUILD_JIT AND NOT WAMR_BUILD_AOT)
     message(WARNING "only support perf in aot and llvm-jit")

core/iwasm/libraries/lib-socket/test/nslookup.c

@@ -4,6 +4,7 @@
  */
 
 #include <assert.h>
+#include <errno.h>
 #include <string.h>
 #include <stdio.h>
 #include <pthread.h>
@@ -28,6 +29,15 @@ test_nslookup(int af)
     hints.ai_family = af;
     hints.ai_socktype = SOCK_STREAM;
     int ret = getaddrinfo(url, 0, &hints, &res);
+    if (ret != 0) {
+        if (ret == EAI_SYSTEM) {
+            fprintf(stderr, "getaddrinfo failed: %s (%s)\n", gai_strerror(ret),
+                    strerror(errno));
+        }
+        else {
+            fprintf(stderr, "getaddrinfo failed: %s\n", gai_strerror(ret));
+        }
+    }
     assert(ret == 0);
     struct addrinfo *address = res;
     while (address) {

core/iwasm/libraries/wasi-nn/src/utils/wasi_nn_app_native.c

@@ -108,9 +108,18 @@ tensor_data_app_native(wasm_module_inst_t instance, uint32_t total_elements,
 #define data_size total_elements
 #endif
 
+    uint64 data_size_in_bytes = data_size;
+#if WASM_ENABLE_WASI_EPHEMERAL_NN == 0
+    data_size_in_bytes *= sizeof(float);
+    if (data_size_in_bytes / sizeof(float) != data_size) {
+        /* overflow */
+        return invalid_argument;
+    }
+#endif
+
     if (!wasm_runtime_validate_app_addr(instance,
                                         (uint64)input_tensor_wasm->data_offset,
-                                        (uint64)data_size)) {
+                                        data_size_in_bytes)) {
         NN_ERR_PRINTF("input_tensor_wasm->data_offset is invalid");
         return invalid_argument;
     }

core/iwasm/libraries/wasi-nn/src/wasi_nn_tensorflowlite.cpp

@@ -297,11 +297,6 @@ set_input(void *tflite_ctx, graph_execution_context ctx, uint32_t index,
             return runtime_error;
     }
 
-    if (input_tensor->type != fp32) {
-        NN_ERR_PRINTF("unsupported input tensor type %u", input_tensor->type);
-        return runtime_error;
-    }
-
     wasi_nn_error res;
     if (success != (res = is_valid_graph_execution_context(tfl_ctx, ctx)))
         return res;

core/shared/platform/common/posix/posix_file.c

@@ -1067,3 +1067,4 @@ os_compare_file_handle(os_file_handle handle1, os_file_handle handle2)
 {
     return handle1 == handle2;
 }
+

core/shared/platform/windows/win_file.c

@@ -1852,3 +1852,4 @@ os_poll(os_poll_file_handle *fds, os_nfds_t nfs, int timeout)
 {
     return BHT_ERROR;
 }
+

product-mini/platforms/common/libc_wasi.c

@@ -141,7 +141,7 @@ libc_wasi_parse(char *arg, libc_wasi_parse_context_t *ctx)
             }
 
             ctx->addr_pool[ctx->addr_pool_size++] = token;
-            token = strtok(NULL, ";");
+            token = strtok(NULL, ",");
         }
     }
     else if (!strncmp(arg, "--allow-resolve=", 16)) {

tests/wamr-test-suites/test_wamr.sh

@@ -39,7 +39,9 @@ function help()
     echo "-F set the firmware path used by qemu"
     echo "-C enable code coverage collect"
     echo "-j set the platform to test"
-    echo "-T set sanitizer to use in tests(ubsan|tsan|asan|posan)"
+    echo "-T set the sanitizer(s) used during testing. It can be either a comma-separated list 
+                                            (e.g., ubsan, asan) or a single option 
+                                            (e.g., ubsan, tsan, asan, posan)."
     echo "-A use the specified wamrc command instead of building it"
     echo "-N enable extended const expression feature"
     echo "-r [requirement name] [N [N ...]] specify a requirement name followed by one or more"
@@ -1066,21 +1068,9 @@ function trigger()
         EXTRA_COMPILE_FLAGS+=" -DWAMR_BUILD_TAIL_CALL=1"
     fi
 
-    echo "SANITIZER IS" $WAMR_BUILD_SANITIZER
+    if [[ -n "$WAMR_BUILD_SANITIZER" ]]; then
-
+        echo "Setting run with sanitizer(s): $WAMR_BUILD_SANITIZER"
-    if [[ "$WAMR_BUILD_SANITIZER" == "ubsan" ]]; then
+        EXTRA_COMPILE_FLAGS+=" -DWAMR_BUILD_SANITIZER=$WAMR_BUILD_SANITIZER"
-        echo "Setting run with ubsan"
-        EXTRA_COMPILE_FLAGS+=" -DWAMR_BUILD_SANITIZER=ubsan"
-    fi
-
-    if [[ "$WAMR_BUILD_SANITIZER" == "asan" ]]; then
-        echo "Setting run with asan"
-        EXTRA_COMPILE_FLAGS+=" -DWAMR_BUILD_SANITIZER=asan"
-    fi
-
-    if [[ "$WAMR_BUILD_SANITIZER" == "tsan" ]]; then
-        echo "Setting run with tsan"
-        EXTRA_COMPILE_FLAGS+=" -DWAMR_BUILD_SANITIZER=tsan"
     fi
 
     if [[ "$WAMR_BUILD_SANITIZER" == "posan" ]]; then

wamr-compiler/CMakeLists.txt

@@ -159,6 +159,11 @@ if (WAMR_BUILD_DEBUG_AOT EQUAL 1)
 endif()
 
 # Enable LLVM
+# In Debug mode, always use release builds of pre-built dependency libraries
+if (WAMR_BUILD_PLATFORM STREQUAL "windows" AND MSVC)
+  add_compile_options($<$<CONFIG:Debug>:/MD>)
+endif()
+
 if (NOT WAMR_BUILD_WITH_CUSTOM_LLVM)
   set (LLVM_SRC_ROOT "${PROJECT_SOURCE_DIR}/../core/deps/llvm")
   if (NOT EXISTS "${LLVM_SRC_ROOT}/build")