Merge 91dd6f0a0e into cba9001749

.github/workflows/build_iwasm_release.yml

@@ -23,7 +23,7 @@ on:
         type: string
         required: true
       upload_url:
-        description: upload binary assets to the URL of release
+        description: a semantic version number. it is required when `release` is true.
         type: string
         required: false
       ver_num:

.github/workflows/build_wamr_wasi_extensions.yml

@@ -1,57 +0,0 @@
-# Copyright (C) 2019 Intel Corporation.  All rights reserved.
-# SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-
-name: build wamr_wasi_extensions release
-
-on:
-  workflow_call:
-    inputs:
-      upload_url:
-        description: upload binary assets to the URL of release
-        type: string
-        required: false
-      ver_num:
-        description: a semantic version number. it is required when `release` is true.
-        type: string
-        required: false
-
-permissions:
-  contents: read
-
-jobs:
-  build_wamr_wasi_extensions:
-    runs-on: ${{ matrix.os }}
-    permissions:
-      contents: write # for uploading release artifacts
-    strategy:
-      matrix:
-        os: [ubuntu-22.04]
-    steps:
-      - name: checkout
-        uses: actions/checkout@v4
-
-      - name: install-wasi-sdk-wabt
-        uses: ./.github/actions/install-wasi-sdk-wabt
-        with:
-          os: ${{ matrix.os }}
-
-      - name: Build wamr-wasi-extensions
-        run: |
-          mkdir dist
-          ./build_libs.sh $(pwd)/dist/wamr-wasi-extensions
-        working-directory: wamr-wasi-extensions
-
-      - name: Compress the binary
-        run: |
-          zip -r wamr-wasi-extensions-${{ inputs.ver_num }}.zip wamr-wasi-extensions
-        working-directory: wamr-wasi-extensions/dist
-
-      - name: Upload release zip
-        uses: actions/upload-release-asset@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          upload_url: ${{ inputs.upload_url }}
-          asset_path: wamr-wasi-extensions/dist/wamr-wasi-extensions-${{ inputs.ver_num }}.zip
-          asset_name: wamr-wasi-extensions-${{ inputs.ver_num }}.zip
-          asset_content_type: application/zip

.github/workflows/build_wamrc.yml

@@ -23,7 +23,7 @@ on:
         type: string
         required: true
       upload_url:
-        description: upload binary assets to the URL of release
+        description: a semantic version number. it is required when `release` is true.
         type: string
         required: false
       ver_num:

.github/workflows/codeql.yml

@@ -53,7 +53,7 @@ jobs:
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v3.29.1
+      uses: github/codeql-action/init@v3.29.0
       with:
         languages: ${{ matrix.language }}
 
@@ -70,7 +70,7 @@ jobs:
     - run: |
         ./.github/scripts/codeql_buildscript.sh
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v3.29.1
+      uses: github/codeql-action/analyze@v3.29.0
       with:
         category: "/language:${{matrix.language}}"
         upload: false
@@ -99,7 +99,7 @@ jobs:
         output: ${{ steps.step1.outputs.sarif-output }}/cpp.sarif
 
     - name: Upload CodeQL results to code scanning
-      uses: github/codeql-action/upload-sarif@v3.29.1
+      uses: github/codeql-action/upload-sarif@v3.29.0
       with:
         sarif_file: ${{ steps.step1.outputs.sarif-output }}
         category: "/language:${{matrix.language}}"

.github/workflows/compilation_on_sgx.yml

@@ -290,6 +290,28 @@ jobs:
 
       - name: run spec tests
         run: |
+          set +e
           source /opt/intel/sgxsdk/environment
-          ./test_wamr.sh ${{ matrix.test_option }} -t ${{ matrix.running_mode }}
+          attempts=0
+          max_attempts=3
+
+          while [ $attempts -lt $max_attempts ]; do
+            ./test_wamr.sh ${{ matrix.test_option }} -t ${{ matrix.running_mode }}
+            exitcode="$?"
+
+            if [ $exitcode -eq 0 ]; then
+              echo "Spec test passed"
+              exit 0
+            elif [ $exitcode -ne 143 ]; then
+              echo "Spec test failed with error code $exitcode"
+              exit 1
+            fi
+
+            echo "$exitcode is a known GitHub-hosted runner issue"
+            echo "::notice::Re-running the spec test due to error code 143"
+            attempts=$((attempts + 1))
+          done
+
+          echo "::notice::Report an error with code 143 in SGX CI after $max_attempts attempts"
+          exit 143
         working-directory: ./tests/wamr-test-suites

.github/workflows/nightly_run.yml

@@ -36,11 +36,12 @@ env:
   LLVM_EAGER_JIT_BUILD_OPTIONS: "-DWAMR_BUILD_AOT=1 -DWAMR_BUILD_FAST_INTERP=0 -DWAMR_BUILD_INTERP=0 -DWAMR_BUILD_FAST_JIT=0 -DWAMR_BUILD_JIT=1 -DWAMR_BUILD_LAZY_JIT=0"
   MULTI_TIER_JIT_BUILD_OPTIONS: "-DWAMR_BUILD_AOT=1 -DWAMR_BUILD_FAST_INTERP=0 -DWAMR_BUILD_INTERP=1 -DWAMR_BUILD_FAST_JIT=1 -DWAMR_BUILD_JIT=1 -DWAMR_BUILD_LAZY_JIT=1"
   # For Spec Test
-  DEFAULT_TEST_OPTIONS: "-s spec -b -P"
+  # FIXME: use binary release(adding -b) instead of building from source after upgrading to 22.04
-  MULTI_MODULES_TEST_OPTIONS: "-s spec -b -P -M"
+  DEFAULT_TEST_OPTIONS: "-s spec -P"
-  SIMD_TEST_OPTIONS: "-s spec -b -P -S"
+  MULTI_MODULES_TEST_OPTIONS: "-s spec -M -P"
-  THREADS_TEST_OPTIONS: "-s spec -b -P -p"
+  SIMD_TEST_OPTIONS: "-s spec -S -P"
-  X86_32_TARGET_TEST_OPTIONS: "-m x86_32"
+  THREADS_TEST_OPTIONS: "-s spec -p -P"
+  X86_32_TARGET_TEST_OPTIONS: "-m x86_32 -P"
   WASI_TEST_OPTIONS: "-s wasi_certification -w"
 
 permissions:

.github/workflows/release_process.yml

@@ -239,12 +239,3 @@ jobs:
       arch: universal
       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]
-    uses: ./.github/workflows/build_wamr_wasi_extensions.yml
-    with:
-      upload_url: ${{ needs.create_release.outputs.upload_url }}
-      ver_num: ${{ needs.create_tag.outputs.new_ver }}

.github/workflows/supply_chain.yml

@@ -60,6 +60,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@4c57370d0304fbff638216539f81d9163f77712a 
+        uses: github/codeql-action/upload-sarif@2847b7f7ab9f48fc49eca90a53fff6007285f399 
         with:
           sarif_file: results.sarif

.github/workflows/wamr_wasi_extensions.yml

@@ -1,57 +0,0 @@
-# Copyright (C) 2019 Intel Corporation.  All rights reserved.
-# SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-
-name: wamr_wasi_extensions
-
-on:
-  pull_request:
-    types:
-      - opened
-      - synchronize
-    paths:
-      - ".github/workflows/wamr_wasi_extensions.yml"
-      - "wamr_wasi_extensios/**"
-      - "core/iwasm/libraries/wasi-nn/include/**"
-      - "core/iwasm/libraries/lib-socket/**"
-  # allow to be triggered manually
-  workflow_dispatch:
-
-# Cancel any in-flight jobs for the same PR/branch so there's only one active
-# at a time
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
-
-jobs:
-  build_wamr_wasi_extensions:
-    runs-on: ${{ matrix.os }}
-    strategy:
-      matrix:
-        os: [ubuntu-22.04, macos-13, macos-14]
-    steps:
-      - name: checkout
-        uses: actions/checkout@v4
-
-      - name: install-wasi-sdk-wabt
-        uses: ./.github/actions/install-wasi-sdk-wabt
-        with:
-          os: ${{ matrix.os }}
-
-      - name: Build wamr-wasi-extensions
-        run: |
-          mkdir dist
-          ./build_libs.sh $(pwd)/dist/wamr-wasi-extensions
-        working-directory: wamr-wasi-extensions
-
-      - name: Build wamr-wasi-extensions samples
-        run: |
-          ./build_samples.sh $(pwd)/dist/wamr-wasi-extensions
-        working-directory: wamr-wasi-extensions
-
-      - name: Upload artifacts
-        if: matrix.os == 'macos-14'
-        uses: actions/upload-artifact@v4
-        with:
-          name: wamr-wasi-extensions
-          path: wamr-wasi-extensions/dist
-          retention-days: 10

CMakeLists.txt

@@ -99,9 +99,9 @@ if (NOT DEFINED WAMR_BUILD_LIB_WASI_THREADS)
   set (WAMR_BUILD_LIB_WASI_THREADS 0)
 endif ()
 
-if (NOT DEFINED WAMR_BUILD_COPY_CALL_STACK)
+if (NOT DEFINED WAMR_ENABLE_COPY_CALLSTACK)
   # Disable copy callstack by default
-  set (WAMR_BUILD_COPY_CALL_STACK 0)
+  set (WAMR_ENABLE_COPY_CALLSTACK 0)
 endif()
 
 if (NOT DEFINED WAMR_BUILD_MINI_LOADER)

build-scripts/config_common.cmake

@@ -334,10 +334,15 @@ if (WAMR_BUILD_SHARED_HEAP EQUAL 1)
   add_definitions (-DWASM_ENABLE_SHARED_HEAP=1)
   message ("     Shared heap enabled")
 endif()
-if (WAMR_BUILD_COPY_CALL_STACK EQUAL 1)
+
-  add_definitions (-DWASM_ENABLE_COPY_CALL_STACK=1)
+if (WAMR_ENABLE_COPY_CALLSTACK EQUAL 1)
+  add_definitions (-DWAMR_ENABLE_COPY_CALLSTACK=1)
   message("     Copy callstack enabled")
+else ()
+  add_definitions (-DWAMR_ENABLE_COPY_CALLSTACK=0)
+  message("     Copy callstack disabled")
 endif()
+
 if (WAMR_BUILD_MEMORY64 EQUAL 1)
   # if native is 32-bit or cross-compiled to 32-bit
   if (NOT WAMR_BUILD_TARGET MATCHES ".*64.*")
@@ -534,9 +539,6 @@ if (WAMR_BUILD_WASI_NN EQUAL 1)
   if (DEFINED WAMR_BUILD_WASI_NN_EXTERNAL_DELEGATE_PATH)
       add_definitions (-DWASM_WASI_NN_EXTERNAL_DELEGATE_PATH="${WAMR_BUILD_WASI_NN_EXTERNAL_DELEGATE_PATH}")
   endif ()
-  if (NOT DEFINED WAMR_BUILD_WASI_EPHEMERAL_NN)
-      set(WAMR_BUILD_WASI_EPHEMERAL_NN 1)
-  endif()
   if (WAMR_BUILD_WASI_EPHEMERAL_NN EQUAL 1)
       message ("     WASI-NN: use 'wasi_ephemeral_nn' instead of 'wasi-nn'")
       add_definitions (-DWASM_ENABLE_WASI_EPHEMERAL_NN=1)

build-scripts/runtime_lib.cmake

@@ -106,7 +106,6 @@ endif ()
 
 if (WAMR_BUILD_WASI_NN EQUAL 1)
     include (${IWASM_DIR}/libraries/wasi-nn/cmake/wasi_nn.cmake)
-    set (WAMR_BUILD_MODULE_INST_CONTEXT 1)
 endif ()
 
 if (WAMR_BUILD_LIB_PTHREAD EQUAL 1)

ci/coding_guidelines_check.py

@@ -4,6 +4,7 @@
 # SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 #
 import argparse
+import re
 from pathlib import Path
 import re
 import shlex
@@ -38,7 +39,7 @@ INVALID_FILE_NAME_SEGMENT = r"([a-zA-Z0-9]+\-[a-zA-Z0-9]+)"
 
 def locate_command(command: str) -> bool:
     if not shutil.which(command):
-        print(f"Command '{command}' not found")
+        print(f"Command '{command}'' not found")
         return False
 
     return True

core/config.h

@@ -193,8 +193,8 @@
 #error "Heap aux stack allocation must be enabled for WASI threads"
 #endif
 
-#ifndef WASM_ENABLE_COPY_CALL_STACK
+#ifndef WAMR_ENABLE_COPY_CALLSTACK
-#define WASM_ENABLE_COPY_CALL_STACK 0
+#define WAMR_ENABLE_COPY_CALLSTACK 0
 #endif
 
 #ifndef WASM_ENABLE_BASE_LIB

core/iwasm/aot/aot_loader.c

@@ -1730,12 +1730,6 @@ load_types(const uint8 **p_buf, const uint8 *buf_end, AOTModule *module,
             (void)u8;
 
             read_uint32(buf, buf_end, j);
-#if WASM_ENABLE_AOT_VALIDATOR != 0
-            if (j >= module->type_count) {
-                set_error_buf(error_buf, error_buf_size, "invalid type index");
-                goto fail;
-            }
-#endif
             if (module->types[j]->ref_count == UINT16_MAX) {
                 set_error_buf(error_buf, error_buf_size,
                               "wasm type's ref count too large");
@@ -1999,13 +1993,6 @@ load_types(const uint8 **p_buf, const uint8 *buf_end, AOTModule *module,
                 AOTType *cur_type = module->types[j];
                 parent_type_idx = cur_type->parent_type_idx;
                 if (parent_type_idx != (uint32)-1) { /* has parent */
-#if WASM_ENABLE_AOT_VALIDATOR != 0
-                    if (parent_type_idx >= module->type_count) {
-                        set_error_buf(error_buf, error_buf_size,
-                                      "invalid parent type index");
-                        goto fail;
-                    }
-#endif
                     AOTType *parent_type = module->types[parent_type_idx];
 
                     module->types[j]->parent_type = parent_type;
@@ -2029,13 +2016,6 @@ load_types(const uint8 **p_buf, const uint8 *buf_end, AOTModule *module,
                 AOTType *cur_type = module->types[j];
                 parent_type_idx = cur_type->parent_type_idx;
                 if (parent_type_idx != (uint32)-1) { /* has parent */
-#if WASM_ENABLE_AOT_VALIDATOR != 0
-                    if (parent_type_idx >= module->type_count) {
-                        set_error_buf(error_buf, error_buf_size,
-                                      "invalid parent type index");
-                        goto fail;
-                    }
-#endif
                     AOTType *parent_type = module->types[parent_type_idx];
                     /* subtyping has been checked during compilation */
                     bh_assert(wasm_type_is_subtype_of(

core/iwasm/aot/aot_runtime.c

@@ -3639,7 +3639,7 @@ aot_get_module_inst_mem_consumption(const AOTModuleInstance *module_inst,
     for (i = 0; i < module_inst->memory_count; i++) {
         AOTMemoryInstance *mem_inst = module_inst->memories[i];
         mem_conspn->memories_size +=
-            (uint64)mem_inst->num_bytes_per_page * mem_inst->cur_page_count;
+            mem_inst->num_bytes_per_page * mem_inst->cur_page_count;
         mem_conspn->app_heap_size =
             mem_inst->heap_data_end - mem_inst->heap_data;
         /* size of app heap structure */
@@ -4137,9 +4137,9 @@ aot_frame_update_profile_info(WASMExecEnv *exec_env, bool alloc_frame)
 }
 #endif /* end of WASM_ENABLE_AOT_STACK_FRAME != 0 */
 
-#if WASM_ENABLE_COPY_CALL_STACK != 0
+#if WAMR_ENABLE_COPY_CALLSTACK != 0
 uint32
-aot_copy_callstack_tiny_frame(WASMExecEnv *exec_env, WASMCApiFrame *buffer,
+aot_copy_callstack_tiny_frame(WASMExecEnv *exec_env, wasm_frame_t *buffer,
                               const uint32 length, const uint32 skip_n,
                               char *error_buf, uint32 error_buf_size)
 {
@@ -4193,7 +4193,7 @@ aot_copy_callstack_tiny_frame(WASMExecEnv *exec_env, WASMCApiFrame *buffer,
 }
 
 uint32
-aot_copy_callstack_standard_frame(WASMExecEnv *exec_env, WASMCApiFrame *buffer,
+aot_copy_callstack_standard_frame(WASMExecEnv *exec_env, wasm_frame_t *buffer,
                                   const uint32 length, const uint32 skip_n,
                                   char *error_buf, uint32_t error_buf_size)
 {
@@ -4243,7 +4243,7 @@ aot_copy_callstack_standard_frame(WASMExecEnv *exec_env, WASMCApiFrame *buffer,
 }
 
 uint32
-aot_copy_callstack(WASMExecEnv *exec_env, WASMCApiFrame *buffer,
+aot_copy_callstack(WASMExecEnv *exec_env, wasm_frame_t *buffer,
                    const uint32 length, const uint32 skip_n, char *error_buf,
                    uint32_t error_buf_size)
 {
@@ -4265,7 +4265,7 @@ aot_copy_callstack(WASMExecEnv *exec_env, WASMCApiFrame *buffer,
                                              error_buf, error_buf_size);
     }
 }
-#endif // WASM_ENABLE_COPY_CALL_STACK
+#endif // WAMR_ENABLE_COPY_CALLSTACK
 
 #if WASM_ENABLE_DUMP_CALL_STACK != 0
 bool

core/iwasm/aot/aot_runtime.h

@@ -787,12 +787,12 @@ aot_frame_update_profile_info(WASMExecEnv *exec_env, bool alloc_frame);
 bool
 aot_create_call_stack(struct WASMExecEnv *exec_env);
 
-#if WASM_ENABLE_COPY_CALL_STACK != 0
+#if WAMR_ENABLE_COPY_CALLSTACK != 0
 uint32
-aot_copy_callstack(WASMExecEnv *exec_env, WASMCApiFrame *buffer,
+aot_copy_callstack(WASMExecEnv *exec_env, wasm_frame_t *buffer,
                    const uint32 length, const uint32 skip_n, char *error_buf,
                    uint32_t error_buf_size);
-#endif // WASM_ENABLE_COPY_CALL_STACK
+#endif // WAMR_ENABLE_COPY_CALLSTACK
 
 /**
  * @brief Dump wasm call stack or get the size

core/iwasm/common/wasm_runtime_common.c

@@ -1743,9 +1743,9 @@ wasm_runtime_destroy_exec_env(WASMExecEnv *exec_env)
     wasm_exec_env_destroy(exec_env);
 }
 
-#if WASM_ENABLE_COPY_CALL_STACK != 0
+#if WAMR_ENABLE_COPY_CALLSTACK != 0
 uint32
-wasm_copy_callstack(const wasm_exec_env_t exec_env, WASMCApiFrame *buffer,
+wasm_copy_callstack(const wasm_exec_env_t exec_env, wasm_frame_t *buffer,
                     const uint32 length, const uint32 skip_n, char *error_buf,
                     uint32_t error_buf_size)
 {
@@ -1780,7 +1780,7 @@ wasm_copy_callstack(const wasm_exec_env_t exec_env, WASMCApiFrame *buffer,
     strncpy(error_buf, err_msg, error_buf_size);
     return 0;
 }
-#endif // WASM_ENABLE_COPY_CALL_STACK
+#endif // WAMR_ENABLE_COPY_CALLSTACK
 
 bool
 wasm_runtime_init_thread_env(void)

core/iwasm/common/wasm_runtime_common.h

@@ -758,12 +758,12 @@ wasm_runtime_create_exec_env(WASMModuleInstanceCommon *module_inst,
 WASM_RUNTIME_API_EXTERN void
 wasm_runtime_destroy_exec_env(WASMExecEnv *exec_env);
 
-#if WASM_ENABLE_COPY_CALL_STACK != 0
+#if WAMR_ENABLE_COPY_CALLSTACK != 0
 WASM_RUNTIME_API_EXTERN uint32_t
-wasm_copy_callstack(const wasm_exec_env_t exec_env, WASMCApiFrame *buffer,
+wasm_copy_callstack(const wasm_exec_env_t exec_env, wasm_frame_t *buffer,
                     const uint32 length, const uint32 skip_n, char *error_buf,
                     uint32 error_buf_size);
-#endif // WASM_ENABLE_COPY_CALL_STACK
+#endif // WAMR_ENABLE_COPY_CALLSTACK
 
 /* See wasm_export.h for description */
 WASM_RUNTIME_API_EXTERN WASMModuleInstanceCommon *

core/iwasm/compilation/aot_emit_aot_file.c

@@ -48,7 +48,7 @@ typedef struct AOTSymbolList {
 } AOTSymbolList;
 
 /* AOT object data */
-struct AOTObjectData {
+typedef struct AOTObjectData {
     AOTCompContext *comp_ctx;
 
     LLVMMemoryBufferRef mem_buf;
@@ -82,7 +82,7 @@ struct AOTObjectData {
     const char *stack_sizes_section_name;
     uint32 stack_sizes_offset;
     uint32 *stack_sizes;
-};
+} AOTObjectData;
 
 #if 0
 static void dump_buf(uint8 *buf, uint32 size, char *title)
@@ -302,8 +302,8 @@ get_init_expr_size(const AOTCompContext *comp_ctx, const AOTCompData *comp_data,
 
             /* array_elem_type + type_index + len + elems */
             size += sizeof(uint32) * 3
-                    + (uint64)wasm_value_type_size_internal(
+                    + wasm_value_type_size_internal(array_type->elem_type,
-                          array_type->elem_type, comp_ctx->pointer_size)
+                                                    comp_ctx->pointer_size)
                           * value_count;
             break;
         }

core/iwasm/compilation/aot_emit_function.c

@@ -347,8 +347,7 @@ call_aot_invoke_c_api_native(AOTCompContext *comp_ctx, AOTFuncContext *func_ctx,
 
     /* Get &c_api_func_imports[func_idx], note size of CApiFuncImport
        is pointer_size * 3 */
-    offset = I32_CONST((unsigned long long)comp_ctx->pointer_size * 3
+    offset = I32_CONST((comp_ctx->pointer_size * 3) * import_func_idx);
-                       * import_func_idx);
     CHECK_LLVM_CONST(offset);
     c_api_func_import =
         LLVMBuildInBoundsGEP2(comp_ctx->builder, INT8_TYPE, c_api_func_imports,

core/iwasm/compilation/aot_llvm.c

@@ -3999,7 +3999,7 @@ aot_get_func_from_table(const AOTCompContext *comp_ctx, LLVMValueRef base,
 
     if (!(func =
               LLVMBuildBitCast(comp_ctx->builder, func, func_type, "func"))) {
-        aot_set_last_error("cast function failed.");
+        aot_set_last_error("cast function fialed.");
         goto fail;
     }
 
@@ -4068,7 +4068,7 @@ aot_load_const_from_table(AOTCompContext *comp_ctx, LLVMValueRef base,
 
     if (!(const_addr = LLVMBuildBitCast(comp_ctx->builder, const_addr,
                                         const_ptr_type, "const_addr"))) {
-        aot_set_last_error("cast const failed.");
+        aot_set_last_error("cast const fialed.");
         return NULL;
     }
 

core/iwasm/include/wasm_export.h

@@ -139,6 +139,8 @@ typedef struct wasm_frame_t {
     uint32_t *lp;
 } WASMCApiFrame;
 
+typedef WASMCApiFrame wasm_frame_t;
+
 /* WASM section */
 typedef struct wasm_section_t {
     struct wasm_section_t *next;
@@ -902,7 +904,7 @@ wasm_runtime_destroy_exec_env(wasm_exec_env_t exec_env);
  * @return number of copied frames
  */
 WASM_RUNTIME_API_EXTERN uint32_t
-wasm_copy_callstack(const wasm_exec_env_t exec_env, WASMCApiFrame *buffer,
+wasm_copy_callstack(const wasm_exec_env_t exec_env, wasm_frame_t *buffer,
                     const uint32_t length, const uint32_t skip_n,
                     char *error_buf, uint32_t error_buf_size);
 

core/iwasm/interpreter/wasm_interp_classic.c

@@ -4088,7 +4088,7 @@ wasm_interp_call_func_bytecode(WASMModuleInstance *module,
                     case WASM_OP_STRING_ENCODE_LOSSY_UTF8_ARRAY:
                     case WASM_OP_STRING_ENCODE_WTF8_ARRAY:
                     {
-                        uint32 start, array_len;
+                        uint32 start, array_len, count;
                         int32 bytes_written;
                         EncodingFlag flag = WTF8;
                         WASMArrayType *array_type;

core/iwasm/interpreter/wasm_loader.c

@@ -2042,9 +2042,9 @@ load_type_section(const uint8 *buf, const uint8 *buf_end, WASMModule *module,
                                       "recursive type count too large");
                         return false;
                     }
+                    module->type_count += rec_count - 1;
                     new_total_size =
-                        sizeof(WASMFuncType *)
+                        sizeof(WASMFuncType *) * (uint64)module->type_count;
-                        * (uint64)(module->type_count + rec_count - 1);
                     if (new_total_size > UINT32_MAX) {
                         set_error_buf(error_buf, error_buf_size,
                                       "allocate memory failed");
@@ -2052,7 +2052,6 @@ load_type_section(const uint8 *buf, const uint8 *buf_end, WASMModule *module,
                     }
                     MEM_REALLOC(module->types, (uint32)total_size,
                                 (uint32)new_total_size);
-                    module->type_count += rec_count - 1;
                     total_size = new_total_size;
                 }
 
@@ -3352,8 +3351,7 @@ load_import_section(const uint8 *buf, const uint8 *buf_end, WASMModule *module,
                     /* valtype */
                     CHECK_BUF(p, p_end, 1);
                     global_type = read_uint8(p);
-                    if (wasm_is_reftype_htref_nullable(global_type)
+                    if (wasm_is_reftype_htref_nullable(global_type)) {
-                        || wasm_is_reftype_htref_non_nullable(global_type)) {
                         int32 heap_type;
                         read_leb_int32(p, p_end, heap_type);
                         (void)heap_type;
@@ -15025,6 +15023,8 @@ re_scan:
                     case WASM_OP_STRING_NEW_LOSSY_UTF8:
                     case WASM_OP_STRING_NEW_WTF8:
                     {
+                        uint32 memidx;
+
 #if WASM_ENABLE_JIT != 0 || WASM_ENABLE_WAMR_COMPILER != 0
                         func->has_memory_operations = true;
 #endif
@@ -15036,6 +15036,7 @@ re_scan:
                         POP_I32();
                         POP_I32();
                         PUSH_REF(REF_TYPE_STRINGREF);
+                        (void)memidx;
                         break;
                     }
                     case WASM_OP_STRING_CONST:
@@ -15063,6 +15064,8 @@ re_scan:
                     case WASM_OP_STRING_ENCODE_LOSSY_UTF8:
                     case WASM_OP_STRING_ENCODE_WTF8:
                     {
+                        uint32 memidx;
+
 #if WASM_ENABLE_JIT != 0 || WASM_ENABLE_WAMR_COMPILER != 0
                         func->has_memory_operations = true;
 #endif
@@ -15074,6 +15077,7 @@ re_scan:
                         POP_I32();
                         POP_STRINGREF();
                         PUSH_I32();
+                        (void)memidx;
                         break;
                     }
                     case WASM_OP_STRING_CONCAT:
@@ -15114,6 +15118,8 @@ re_scan:
                     case WASM_OP_STRINGVIEW_WTF8_ENCODE_LOSSY_UTF8:
                     case WASM_OP_STRINGVIEW_WTF8_ENCODE_WTF8:
                     {
+                        uint32 memidx;
+
 #if WASM_ENABLE_JIT != 0 || WASM_ENABLE_WAMR_COMPILER != 0
                         func->has_memory_operations = true;
 #endif
@@ -15128,6 +15134,7 @@ re_scan:
                         POP_REF(REF_TYPE_STRINGVIEWWTF8);
                         PUSH_I32();
                         PUSH_I32();
+                        (void)memidx;
                         break;
                     }
                     case WASM_OP_STRINGVIEW_WTF8_SLICE:
@@ -15159,6 +15166,8 @@ re_scan:
                     }
                     case WASM_OP_STRINGVIEW_WTF16_ENCODE:
                     {
+                        uint32 memidx;
+
 #if WASM_ENABLE_JIT != 0 || WASM_ENABLE_WAMR_COMPILER != 0
                         func->has_memory_operations = true;
 #endif
@@ -15172,6 +15181,7 @@ re_scan:
                         POP_I32();
                         POP_REF(REF_TYPE_STRINGVIEWWTF16);
                         PUSH_I32();
+                        (void)memidx;
                         break;
                     }
                     case WASM_OP_STRINGVIEW_WTF16_SLICE:

core/iwasm/interpreter/wasm_runtime.c

@@ -2668,7 +2668,7 @@ wasm_instantiate(WASMModule *module, WASMModuleInstance *parent,
                         }
                         STORE_PTR((void **)global_data, func_obj);
                         global_data += sizeof(void *);
-                        /* Also update the initial_value since other globals may
+                        /* Also update the inital_value since other globals may
                          * refer to this */
                         global->initial_value.gc_obj = (wasm_obj_t)func_obj;
                         break;
@@ -4161,7 +4161,7 @@ wasm_get_module_inst_mem_consumption(const WASMModuleInstance *module_inst,
         sizeof(WASMMemoryInstance *) * module_inst->memory_count;
     for (i = 0; i < module_inst->memory_count; i++) {
         WASMMemoryInstance *memory = module_inst->memories[i];
-        size = (uint64)memory->num_bytes_per_page * memory->cur_page_count;
+        size = memory->num_bytes_per_page * memory->cur_page_count;
         mem_conspn->memories_size += size;
         mem_conspn->app_heap_size += memory->heap_data_end - memory->heap_data;
         /* size of app heap structure */
@@ -4195,9 +4195,9 @@ wasm_get_module_inst_mem_consumption(const WASMModuleInstance *module_inst,
 #endif /* end of (WASM_ENABLE_MEMORY_PROFILING != 0) \
                  || (WASM_ENABLE_MEMORY_TRACING != 0) */
 
-#if WASM_ENABLE_COPY_CALL_STACK != 0
+#if WAMR_ENABLE_COPY_CALLSTACK != 0
 uint32
-wasm_interp_copy_callstack(WASMExecEnv *exec_env, WASMCApiFrame *buffer,
+wasm_interp_copy_callstack(WASMExecEnv *exec_env, wasm_frame_t *buffer,
                            uint32 length, uint32 skip_n, char *error_buf,
                            uint32_t error_buf_size)
 {
@@ -4242,7 +4242,7 @@ wasm_interp_copy_callstack(WASMExecEnv *exec_env, WASMCApiFrame *buffer,
     }
     return count >= skip_n ? count - skip_n : 0;
 }
-#endif // WASM_ENABLE_COPY_CALL_STACK
+#endif // WAMR_ENABLE_COPY_CALLSTACK
 
 #if WASM_ENABLE_DUMP_CALL_STACK != 0
 bool

core/iwasm/interpreter/wasm_runtime.h

@@ -731,12 +731,12 @@ wasm_get_table_inst(const WASMModuleInstance *module_inst, uint32 tbl_idx)
 
 #if WASM_ENABLE_DUMP_CALL_STACK != 0
 
-#if WASM_ENABLE_COPY_CALL_STACK != 0
+#if WAMR_ENABLE_COPY_CALLSTACK != 0
 uint32
-wasm_interp_copy_callstack(WASMExecEnv *exec_env, WASMCApiFrame *buffer,
+wasm_interp_copy_callstack(WASMExecEnv *exec_env, wasm_frame_t *buffer,
                            uint32 length, uint32 skip_n, char *error_buf,
                            uint32_t error_buf_size);
-#endif // WASM_ENABLE_COPY_CALL_STACK
+#endif // WAMR_ENABLE_COPY_CALLSTACK
 
 bool
 wasm_interp_create_call_stack(struct WASMExecEnv *exec_env);

core/iwasm/libraries/thread-mgr/thread_manager.c

@@ -301,8 +301,7 @@ wasm_cluster_create(WASMExecEnv *exec_env)
         aux_stack_start -= cluster->stack_size;
 
         for (i = 0; i < cluster_max_thread_num; i++) {
-            cluster->stack_tops[i] =
+            cluster->stack_tops[i] = aux_stack_start - cluster->stack_size * i;
-                aux_stack_start - (uint64)cluster->stack_size * i;
         }
     }
 #endif

core/iwasm/libraries/wasi-nn/include/wasi_nn.h

@@ -21,7 +21,6 @@
 #else
 #define WASI_NN_IMPORT(name) \
     __attribute__((import_module("wasi_nn"), import_name(name)))
-#warning You are using "wasi_nn", which is a legacy WAMR-specific ABI. It's deperecated and will likely be removed in future versions of WAMR. Please use "wasi_ephemeral_nn" instead. (For a WASM module, use the wasi_ephemeral_nn.h header instead. For the runtime configurations, enable WASM_ENABLE_WASI_EPHEMERAL_NN/WAMR_BUILD_WASI_EPHEMERAL_NN.)
 #endif
 
 /**
@@ -109,13 +108,14 @@ WASI_NN_NAME(compute)
 WASI_NN_ERROR_TYPE
 WASI_NN_NAME(get_output)
 (WASI_NN_NAME(graph_execution_context) ctx, uint32_t index,
- uint8_t *output_tensor, uint32_t output_tensor_max_size,
+ WASI_NN_NAME(tensor_data) output_tensor, uint32_t output_tensor_max_size,
  uint32_t *output_tensor_size) WASI_NN_IMPORT("get_output");
 #else
 WASI_NN_ERROR_TYPE
 WASI_NN_NAME(get_output)
-(graph_execution_context ctx, uint32_t index, uint8_t *output_tensor,
+(graph_execution_context ctx, uint32_t index,
- uint32_t *output_tensor_size) WASI_NN_IMPORT("get_output");
+ WASI_NN_NAME(tensor_data) output_tensor, uint32_t *output_tensor_size)
+    WASI_NN_IMPORT("get_output");
 #endif
 
 #endif

core/iwasm/libraries/wasi-nn/include/wasi_nn_types.h

@@ -99,14 +99,7 @@ typedef enum {
 // 4-byte f32 elements would have a data array of length 16). Naturally, this
 // representation requires some knowledge of how to lay out data in
 // memory--e.g., using row-major ordering--and could perhaps be improved.
-#if !defined(__wasm__) || WASM_ENABLE_WASI_EPHEMERAL_NN != 0
-typedef struct {
-    uint8_t *buf;
-    uint32_t size;
-} WASI_NN_NAME(tensor_data);
-#else
 typedef uint8_t *WASI_NN_NAME(tensor_data);
-#endif
 
 // A tensor.
 typedef struct {

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

@@ -99,8 +99,7 @@ graph_builder_array_app_native(wasm_module_inst_t instance,
 
 static wasi_nn_error
 tensor_data_app_native(wasm_module_inst_t instance, uint32_t total_elements,
-                       tensor_wasm *input_tensor_wasm, void **data,
+                       tensor_wasm *input_tensor_wasm, tensor_data *data)
-                       uint32_t *size)
 {
 #if WASM_ENABLE_WASI_EPHEMERAL_NN != 0
 #define data_size input_tensor_wasm->data_size
@@ -114,9 +113,8 @@ tensor_data_app_native(wasm_module_inst_t instance, uint32_t total_elements,
         NN_ERR_PRINTF("input_tensor_wasm->data_offset is invalid");
         return invalid_argument;
     }
-    *data = wasm_runtime_addr_app_to_native(
+    *data = (tensor_data)wasm_runtime_addr_app_to_native(
         instance, (uint64)input_tensor_wasm->data_offset);
-    *size = data_size;
     return success;
 #undef data_size
 }
@@ -190,19 +188,16 @@ tensor_app_native(wasm_module_inst_t instance, tensor_wasm *input_tensor_wasm,
     NN_DBG_PRINTF("Tensor type: %d", input_tensor_wasm->type);
     NN_DBG_PRINTF("Total number of elements: %d", total_elements);
 
-    void *data = NULL;
+    tensor_data data = NULL;
-    uint32_t datasize;
     if (success
-        != (res =
+        != (res = tensor_data_app_native(instance, total_elements,
-                tensor_data_app_native(instance, total_elements,
+                                         input_tensor_wasm, &data))) {
-                                       input_tensor_wasm, &data, &datasize))) {
         wasm_runtime_free(dimensions);
         return res;
     }
 
     input_tensor->type = input_tensor_wasm->type;
     input_tensor->dimensions = dimensions;
-    input_tensor->data.buf = data;
+    input_tensor->data = data;
-    input_tensor->data.size = datasize;
     return success;
 }

core/iwasm/libraries/wasi-nn/src/wasi_nn.c

@@ -20,10 +20,6 @@
 #include "wasi_nn_types.h"
 #include "wasm_export.h"
 
-#if WASM_ENABLE_WASI_EPHEMERAL_NN == 0
-#warning You are using "wasi_nn", which is a legacy WAMR-specific ABI. It's deperecated and will likely be removed in future versions of WAMR. Please use "wasi_ephemeral_nn" instead. (For a WASM module, use the wasi_ephemeral_nn.h header instead. For the runtime configurations, enable WASM_ENABLE_WASI_EPHEMERAL_NN/WAMR_BUILD_WASI_EPHEMERAL_NN.)
-#endif
-
 #define HASHMAP_INITIAL_SIZE 20
 #if defined(__APPLE__)
 #define LIB_EXTENTION ".dylib"
@@ -55,21 +51,53 @@ struct backends_api_functions {
             NN_ERR_PRINTF("Error %s() -> %d", #func, wasi_error);          \
     } while (0)
 
-static void *wasi_nn_key;
+/* HashMap utils */
+static HashMap *hashmap;
+
+static uint32
+hash_func(const void *key)
+{
+    // fnv1a_hash
+    const uint32 FNV_PRIME = 16777619;
+    const uint32 FNV_OFFSET_BASIS = 2166136261U;
+
+    uint32 hash = FNV_OFFSET_BASIS;
+    const unsigned char *bytes = (const unsigned char *)key;
+
+    for (size_t i = 0; i < sizeof(uintptr_t); ++i) {
+        hash ^= bytes[i];
+        hash *= FNV_PRIME;
+    }
+
+    return hash;
+}
+
+static bool
+key_equal_func(void *key1, void *key2)
+{
+    return key1 == key2;
+}
+
+static void
+key_destroy_func(void *key1)
+{
+    /* key type is wasm_module_inst_t*. do nothing */
+}
 
 static void
 wasi_nn_ctx_destroy(WASINNContext *wasi_nn_ctx)
 {
+    NN_DBG_PRINTF("[WASI NN] DEINIT...");
+
     if (wasi_nn_ctx == NULL) {
+        NN_ERR_PRINTF(
+            "Error when deallocating memory. WASI-NN context is NULL");
         return;
     }
-    NN_DBG_PRINTF("[WASI NN] DEINIT...");
     NN_DBG_PRINTF("Freeing wasi-nn");
     NN_DBG_PRINTF("-> is_model_loaded: %d", wasi_nn_ctx->is_model_loaded);
     NN_DBG_PRINTF("-> current_encoding: %d", wasi_nn_ctx->backend);
 
-    bh_assert(!wasi_nn_ctx->busy);
-
     /* deinit() the backend */
     if (wasi_nn_ctx->is_backend_ctx_initialized) {
         wasi_nn_error res;
@@ -77,14 +105,13 @@ wasi_nn_ctx_destroy(WASINNContext *wasi_nn_ctx)
                           wasi_nn_ctx->backend_ctx);
     }
 
-    os_mutex_destroy(&wasi_nn_ctx->lock);
     wasm_runtime_free(wasi_nn_ctx);
 }
 
 static void
-dtor(wasm_module_inst_t inst, void *ctx)
+value_destroy_func(void *value)
 {
-    wasi_nn_ctx_destroy(ctx);
+    wasi_nn_ctx_destroy((WASINNContext *)value);
 }
 
 bool
@@ -97,9 +124,12 @@ wasi_nn_initialize()
         return false;
     }
 
-    wasi_nn_key = wasm_runtime_create_context_key(dtor);
+    // hashmap { instance: wasi_nn_ctx }
-    if (wasi_nn_key == NULL) {
+    hashmap = bh_hash_map_create(HASHMAP_INITIAL_SIZE, true, hash_func,
-        NN_ERR_PRINTF("Failed to create context key");
+                                 key_equal_func, key_destroy_func,
+                                 value_destroy_func);
+    if (hashmap == NULL) {
+        NN_ERR_PRINTF("Error while initializing hashmap");
         os_mutex_destroy(&wasi_nn_lock);
         return false;
     }
@@ -120,11 +150,6 @@ wasi_nn_initialize_context()
     }
 
     memset(wasi_nn_ctx, 0, sizeof(WASINNContext));
-    if (os_mutex_init(&wasi_nn_ctx->lock)) {
-        NN_ERR_PRINTF("Error when initializing a lock for WASI-NN context");
-        wasm_runtime_free(wasi_nn_ctx);
-        return NULL;
-    }
     return wasi_nn_ctx;
 }
 
@@ -133,59 +158,29 @@ static WASINNContext *
 wasm_runtime_get_wasi_nn_ctx(wasm_module_inst_t instance)
 {
     WASINNContext *wasi_nn_ctx =
-        wasm_runtime_get_context(instance, wasi_nn_key);
+        (WASINNContext *)bh_hash_map_find(hashmap, (void *)instance);
     if (wasi_nn_ctx == NULL) {
-        WASINNContext *newctx = wasi_nn_initialize_context();
+        wasi_nn_ctx = wasi_nn_initialize_context();
-        if (newctx == NULL)
+        if (wasi_nn_ctx == NULL)
+            return NULL;
+
+        bool ok =
+            bh_hash_map_insert(hashmap, (void *)instance, (void *)wasi_nn_ctx);
+        if (!ok) {
+            NN_ERR_PRINTF("Error while storing context");
+            wasi_nn_ctx_destroy(wasi_nn_ctx);
             return NULL;
-        os_mutex_lock(&wasi_nn_lock);
-        wasi_nn_ctx = wasm_runtime_get_context(instance, wasi_nn_key);
-        if (wasi_nn_ctx == NULL) {
-            wasm_runtime_set_context_spread(instance, wasi_nn_key, newctx);
-            wasi_nn_ctx = newctx;
-            newctx = NULL;
-        }
-        os_mutex_unlock(&wasi_nn_lock);
-        if (newctx != NULL) {
-            wasi_nn_ctx_destroy(newctx);
         }
     }
-    return wasi_nn_ctx;
-}
 
-static WASINNContext *
-lock_ctx(wasm_module_inst_t instance)
-{
-    WASINNContext *wasi_nn_ctx = wasm_runtime_get_wasi_nn_ctx(instance);
-    if (wasi_nn_ctx == NULL) {
-        return NULL;
-    }
-    os_mutex_lock(&wasi_nn_ctx->lock);
-    if (wasi_nn_ctx->busy) {
-        os_mutex_unlock(&wasi_nn_ctx->lock);
-        return NULL;
-    }
-    wasi_nn_ctx->busy = true;
-    os_mutex_unlock(&wasi_nn_ctx->lock);
     return wasi_nn_ctx;
 }
 
-static void
-unlock_ctx(WASINNContext *wasi_nn_ctx)
-{
-    if (wasi_nn_ctx == NULL) {
-        return;
-    }
-    os_mutex_lock(&wasi_nn_ctx->lock);
-    bh_assert(wasi_nn_ctx->busy);
-    wasi_nn_ctx->busy = false;
-    os_mutex_unlock(&wasi_nn_ctx->lock);
-}
-
 void
 wasi_nn_destroy()
 {
-    wasm_runtime_destroy_context_key(wasi_nn_key);
+    // destroy hashmap will destroy keys and values
+    bh_hash_map_destroy(hashmap);
 
     // close backends' libraries and registered functions
     for (unsigned i = 0; i < sizeof(lookup) / sizeof(lookup[0]); i++) {
@@ -406,7 +401,7 @@ detect_and_load_backend(graph_encoding backend_hint,
 
 static wasi_nn_error
 ensure_backend(wasm_module_inst_t instance, graph_encoding encoding,
-               WASINNContext *wasi_nn_ctx)
+               WASINNContext **wasi_nn_ctx_ptr)
 {
     wasi_nn_error res;
 
@@ -417,6 +412,7 @@ ensure_backend(wasm_module_inst_t instance, graph_encoding encoding,
         goto fail;
     }
 
+    WASINNContext *wasi_nn_ctx = wasm_runtime_get_wasi_nn_ctx(instance);
     if (wasi_nn_ctx->is_backend_ctx_initialized) {
         if (wasi_nn_ctx->backend != loaded_backend) {
             res = unsupported_operation;
@@ -434,6 +430,7 @@ ensure_backend(wasm_module_inst_t instance, graph_encoding encoding,
 
         wasi_nn_ctx->is_backend_ctx_initialized = true;
     }
+    *wasi_nn_ctx_ptr = wasi_nn_ctx;
     return success;
 fail:
     return res;
@@ -461,23 +458,17 @@ wasi_nn_load(wasm_exec_env_t exec_env, graph_builder_array_wasm *builder,
     if (!instance)
         return runtime_error;
 
-    WASINNContext *wasi_nn_ctx = lock_ctx(instance);
-    if (wasi_nn_ctx == NULL) {
-        res = busy;
-        goto fail;
-    }
-
     graph_builder_array builder_native = { 0 };
 #if WASM_ENABLE_WASI_EPHEMERAL_NN != 0
     if (success
         != (res = graph_builder_array_app_native(
                 instance, builder, builder_wasm_size, &builder_native)))
-        goto fail;
+        return res;
 #else  /* WASM_ENABLE_WASI_EPHEMERAL_NN == 0 */
     if (success
         != (res = graph_builder_array_app_native(instance, builder,
                                                  &builder_native)))
-        goto fail;
+        return res;
 #endif /* WASM_ENABLE_WASI_EPHEMERAL_NN != 0 */
 
     if (!wasm_runtime_validate_native_addr(instance, g,
@@ -487,7 +478,8 @@ wasi_nn_load(wasm_exec_env_t exec_env, graph_builder_array_wasm *builder,
         goto fail;
     }
 
-    res = ensure_backend(instance, encoding, wasi_nn_ctx);
+    WASINNContext *wasi_nn_ctx;
+    res = ensure_backend(instance, encoding, &wasi_nn_ctx);
     if (res != success)
         goto fail;
 
@@ -502,7 +494,6 @@ fail:
     // XXX: Free intermediate structure pointers
     if (builder_native.buf)
         wasm_runtime_free(builder_native.buf);
-    unlock_ctx(wasi_nn_ctx);
 
     return res;
 }
@@ -536,26 +527,18 @@ wasi_nn_load_by_name(wasm_exec_env_t exec_env, char *name, uint32_t name_len,
 
     NN_DBG_PRINTF("[WASI NN] LOAD_BY_NAME %s...", name);
 
-    WASINNContext *wasi_nn_ctx = lock_ctx(instance);
+    WASINNContext *wasi_nn_ctx;
-    if (wasi_nn_ctx == NULL) {
+    res = ensure_backend(instance, autodetect, &wasi_nn_ctx);
-        res = busy;
-        goto fail;
-    }
-
-    res = ensure_backend(instance, autodetect, wasi_nn_ctx);
     if (res != success)
-        goto fail;
+        return res;
 
     call_wasi_nn_func(wasi_nn_ctx->backend, load_by_name, res,
                       wasi_nn_ctx->backend_ctx, name, name_len, g);
     if (res != success)
-        goto fail;
+        return res;
 
     wasi_nn_ctx->is_model_loaded = true;
-    res = success;
+    return success;
-fail:
-    unlock_ctx(wasi_nn_ctx);
-    return res;
 }
 
 wasi_nn_error
@@ -593,28 +576,19 @@ wasi_nn_load_by_name_with_config(wasm_exec_env_t exec_env, char *name,
 
     NN_DBG_PRINTF("[WASI NN] LOAD_BY_NAME_WITH_CONFIG %s %s...", name, config);
 
-    WASINNContext *wasi_nn_ctx = lock_ctx(instance);
+    WASINNContext *wasi_nn_ctx;
-    if (wasi_nn_ctx == NULL) {
+    res = ensure_backend(instance, autodetect, &wasi_nn_ctx);
-        res = busy;
-        goto fail;
-    }
-
-    res = ensure_backend(instance, autodetect, wasi_nn_ctx);
     if (res != success)
-        goto fail;
+        return res;
-    ;
 
     call_wasi_nn_func(wasi_nn_ctx->backend, load_by_name_with_config, res,
                       wasi_nn_ctx->backend_ctx, name, name_len, config,
                       config_len, g);
     if (res != success)
-        goto fail;
+        return res;
 
     wasi_nn_ctx->is_model_loaded = true;
-    res = success;
+    return success;
-fail:
-    unlock_ctx(wasi_nn_ctx);
-    return res;
 }
 
 wasi_nn_error
@@ -628,27 +602,20 @@ wasi_nn_init_execution_context(wasm_exec_env_t exec_env, graph g,
         return runtime_error;
     }
 
-    wasi_nn_error res;
+    WASINNContext *wasi_nn_ctx = wasm_runtime_get_wasi_nn_ctx(instance);
-    WASINNContext *wasi_nn_ctx = lock_ctx(instance);
-    if (wasi_nn_ctx == NULL) {
-        res = busy;
-        goto fail;
-    }
 
+    wasi_nn_error res;
     if (success != (res = is_model_initialized(wasi_nn_ctx)))
-        goto fail;
+        return res;
 
     if (!wasm_runtime_validate_native_addr(
             instance, ctx, (uint64)sizeof(graph_execution_context))) {
         NN_ERR_PRINTF("ctx is invalid");
-        res = invalid_argument;
+        return invalid_argument;
-        goto fail;
     }
 
     call_wasi_nn_func(wasi_nn_ctx->backend, init_execution_context, res,
                       wasi_nn_ctx->backend_ctx, g, ctx);
-fail:
-    unlock_ctx(wasi_nn_ctx);
     return res;
 }
 
@@ -663,21 +630,17 @@ wasi_nn_set_input(wasm_exec_env_t exec_env, graph_execution_context ctx,
         return runtime_error;
     }
 
-    wasi_nn_error res;
+    WASINNContext *wasi_nn_ctx = wasm_runtime_get_wasi_nn_ctx(instance);
-    WASINNContext *wasi_nn_ctx = lock_ctx(instance);
-    if (wasi_nn_ctx == NULL) {
-        res = busy;
-        goto fail;
-    }
 
+    wasi_nn_error res;
     if (success != (res = is_model_initialized(wasi_nn_ctx)))
-        goto fail;
+        return res;
 
     tensor input_tensor_native = { 0 };
     if (success
         != (res = tensor_app_native(instance, input_tensor,
                                     &input_tensor_native)))
-        goto fail;
+        return res;
 
     call_wasi_nn_func(wasi_nn_ctx->backend, set_input, res,
                       wasi_nn_ctx->backend_ctx, ctx, index,
@@ -685,8 +648,7 @@ wasi_nn_set_input(wasm_exec_env_t exec_env, graph_execution_context ctx,
     // XXX: Free intermediate structure pointers
     if (input_tensor_native.dimensions)
         wasm_runtime_free(input_tensor_native.dimensions);
-fail:
+
-    unlock_ctx(wasi_nn_ctx);
     return res;
 }
 
@@ -700,32 +662,26 @@ wasi_nn_compute(wasm_exec_env_t exec_env, graph_execution_context ctx)
         return runtime_error;
     }
 
-    wasi_nn_error res;
+    WASINNContext *wasi_nn_ctx = wasm_runtime_get_wasi_nn_ctx(instance);
-    WASINNContext *wasi_nn_ctx = lock_ctx(instance);
-    if (wasi_nn_ctx == NULL) {
-        res = busy;
-        goto fail;
-    }
 
+    wasi_nn_error res;
     if (success != (res = is_model_initialized(wasi_nn_ctx)))
-        goto fail;
+        return res;
 
     call_wasi_nn_func(wasi_nn_ctx->backend, compute, res,
                       wasi_nn_ctx->backend_ctx, ctx);
-fail:
-    unlock_ctx(wasi_nn_ctx);
     return res;
 }
 
 #if WASM_ENABLE_WASI_EPHEMERAL_NN != 0
 wasi_nn_error
 wasi_nn_get_output(wasm_exec_env_t exec_env, graph_execution_context ctx,
-                   uint32_t index, void *output_tensor,
+                   uint32_t index, tensor_data output_tensor,
                    uint32_t output_tensor_len, uint32_t *output_tensor_size)
 #else  /* WASM_ENABLE_WASI_EPHEMERAL_NN == 0 */
 wasi_nn_error
 wasi_nn_get_output(wasm_exec_env_t exec_env, graph_execution_context ctx,
-                   uint32_t index, void *output_tensor,
+                   uint32_t index, tensor_data output_tensor,
                    uint32_t *output_tensor_size)
 #endif /* WASM_ENABLE_WASI_EPHEMERAL_NN != 0 */
 {
@@ -736,36 +692,28 @@ wasi_nn_get_output(wasm_exec_env_t exec_env, graph_execution_context ctx,
         return runtime_error;
     }
 
-    wasi_nn_error res;
+    WASINNContext *wasi_nn_ctx = wasm_runtime_get_wasi_nn_ctx(instance);
-    WASINNContext *wasi_nn_ctx = lock_ctx(instance);
-    if (wasi_nn_ctx == NULL) {
-        res = busy;
-        goto fail;
-    }
 
+    wasi_nn_error res;
     if (success != (res = is_model_initialized(wasi_nn_ctx)))
-        goto fail;
+        return res;
 
     if (!wasm_runtime_validate_native_addr(instance, output_tensor_size,
                                            (uint64)sizeof(uint32_t))) {
         NN_ERR_PRINTF("output_tensor_size is invalid");
-        res = invalid_argument;
+        return invalid_argument;
-        goto fail;
     }
 
-    tensor_data tensor = {
-        .buf = output_tensor,
 #if WASM_ENABLE_WASI_EPHEMERAL_NN != 0
-        .size = output_tensor_len,
-#else
-        .size = *output_tensor_size,
-#endif
-    };
     call_wasi_nn_func(wasi_nn_ctx->backend, get_output, res,
-                      wasi_nn_ctx->backend_ctx, ctx, index, &tensor,
+                      wasi_nn_ctx->backend_ctx, ctx, index, output_tensor,
+                      &output_tensor_len);
+    *output_tensor_size = output_tensor_len;
+#else  /* WASM_ENABLE_WASI_EPHEMERAL_NN == 0 */
+    call_wasi_nn_func(wasi_nn_ctx->backend, get_output, res,
+                      wasi_nn_ctx->backend_ctx, ctx, index, output_tensor,
                       output_tensor_size);
-fail:
+#endif /* WASM_ENABLE_WASI_EPHEMERAL_NN != 0 */
-    unlock_ctx(wasi_nn_ctx);
     return res;
 }
 

core/iwasm/libraries/wasi-nn/src/wasi_nn_llamacpp.c

@@ -2,10 +2,7 @@
  * Copyright (C) 2019 Intel Corporation.  All rights reserved.
  * SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
  */
-
+#include "wasi_nn_types.h"
-#include <stdlib.h>
-
-#include "wasi_nn_backend.h"
 #include "utils/logger.h"
 #include "llama.h"
 #include "ggml.h"
@@ -289,7 +286,7 @@ deinit_backend(void *ctx)
 
     llama_backend_free();
 
-    free(backend_ctx);
+    os_free(backend_ctx);
     return success;
 }
 
@@ -305,11 +302,6 @@ __load_by_name_with_configuration(void *ctx, const char *filename, graph *g)
 {
     struct LlamaContext *backend_ctx = (struct LlamaContext *)ctx;
 
-    if (backend_ctx->model != NULL) {
-        // we only implement a single graph
-        return unsupported_operation;
-    }
-
     // make sure backend_ctx->config is initialized
 
     struct llama_model_params model_params =
@@ -328,7 +320,6 @@ __load_by_name_with_configuration(void *ctx, const char *filename, graph *g)
 #endif
 
     backend_ctx->model = model;
-    *g = 0;
 
     return success;
 }
@@ -369,16 +360,6 @@ init_execution_context(void *ctx, graph g, graph_execution_context *exec_ctx)
 {
     struct LlamaContext *backend_ctx = (struct LlamaContext *)ctx;
 
-    if (g != 0 || backend_ctx->model == NULL) {
-        // we only implement a single graph
-        return runtime_error;
-    }
-
-    if (backend_ctx->ctx != NULL) {
-        // we only implement a single context
-        return unsupported_operation;
-    }
-
     struct llama_context_params ctx_params =
         llama_context_params_from_wasi_nn_llama_config(&backend_ctx->config);
     struct llama_context *llama_ctx =
@@ -389,7 +370,6 @@ init_execution_context(void *ctx, graph g, graph_execution_context *exec_ctx)
     }
 
     backend_ctx->ctx = llama_ctx;
-    *exec_ctx = 0;
 
     NN_INFO_PRINTF("n_predict = %d, n_ctx = %d", backend_ctx->config.n_predict,
                    llama_n_ctx(backend_ctx->ctx));
@@ -401,24 +381,18 @@ set_input(void *ctx, graph_execution_context exec_ctx, uint32_t index,
           tensor *wasi_nn_tensor)
 {
     struct LlamaContext *backend_ctx = (struct LlamaContext *)ctx;
-
+    // tensor->data is the prompt string. ends with \0
-    if (exec_ctx != 0 || backend_ctx->ctx == NULL) {
+    char *prompt_text = (char *)wasi_nn_tensor->data;
-        // we only implement a single context
-        return runtime_error;
-    }
-
-    // tensor->data is the prompt string.
-    char *prompt_text = (char *)wasi_nn_tensor->data.buf;
-    uint32_t prompt_text_len = wasi_nn_tensor->data.size;
 
 #ifndef NDEBUG
     NN_DBG_PRINTF("--------------------------------------------------");
-    NN_DBG_PRINTF("prompt_text: %.*s", (int)prompt_text_len, prompt_text);
+    NN_DBG_PRINTF("prompt_text: %s", prompt_text);
     NN_DBG_PRINTF("--------------------------------------------------");
 #endif
 
     // tokenize the prompt
     uint32_t n_token_max = llama_n_ctx(backend_ctx->ctx);
+    uint32_t prompt_text_len = strlen(prompt_text);
 
     if (backend_ctx->prompt == NULL) {
         backend_ctx->prompt = calloc(n_token_max, sizeof(llama_token));
@@ -456,11 +430,6 @@ compute(void *ctx, graph_execution_context exec_ctx)
     struct LlamaContext *backend_ctx = (struct LlamaContext *)ctx;
     wasi_nn_error ret = runtime_error;
 
-    if (exec_ctx != 0 || backend_ctx->ctx == NULL) {
-        // we only implement a single context
-        return runtime_error;
-    }
-
     // reset the generation buffer
     if (backend_ctx->generation == NULL) {
         backend_ctx->generation =
@@ -508,6 +477,7 @@ compute(void *ctx, graph_execution_context exec_ctx)
 
     // main loop
     int32_t n_cur = batch.n_tokens;
+    int n_decode = 0;
     int32_t n_vocab = llama_n_vocab(backend_ctx->model);
     llama_token_data *candidates = NULL;
 
@@ -558,6 +528,7 @@ compute(void *ctx, graph_execution_context exec_ctx)
         // push this new token for next evaluation
         llama_batch_add(&batch, new_token_id, n_cur, seq_ids,
                         sizeof(seq_ids) / sizeof(seq_ids[0]), true);
+        n_decode++;
         n_cur++;
 
         if (llama_decode(backend_ctx->ctx, batch) != 0) {
@@ -578,15 +549,10 @@ fail:
 
 __attribute__((visibility("default"))) wasi_nn_error
 get_output(void *ctx, graph_execution_context exec_ctx, uint32_t index,
-           tensor_data *output_tensor, uint32_t *output_tensor_size)
+           tensor_data output_tensor, uint32_t *output_tensor_size)
 {
     struct LlamaContext *backend_ctx = (struct LlamaContext *)ctx;
 
-    if (exec_ctx != 0 || backend_ctx->ctx == NULL) {
-        // we only implement a single context
-        return runtime_error;
-    }
-
     // Compatibility with WasmEdge
     if (index > 1) {
         NN_ERR_PRINTF("Invalid output index %d", index);
@@ -602,7 +568,7 @@ get_output(void *ctx, graph_execution_context exec_ctx, uint32_t index,
             printf("%s\n", output_metadata);
         }
 
-        memcpy(output_tensor->buf, output_metadata, strlen(output_metadata));
+        memcpy(output_tensor, output_metadata, strlen(output_metadata));
         *output_tensor_size = strlen(output_metadata);
         return success;
     }
@@ -622,7 +588,7 @@ get_output(void *ctx, graph_execution_context exec_ctx, uint32_t index,
             printf("%s", buf);
         }
 
-        memcpy(output_tensor->buf + end_pos, buf, strlen(buf));
+        memcpy(output_tensor + end_pos, buf, strlen(buf));
         end_pos += strlen(buf);
     }
 

core/iwasm/libraries/wasi-nn/src/wasi_nn_openvino.c

@@ -3,7 +3,8 @@
  * SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
  */
 
-#include "wasi_nn_backend.h"
+#include "wasi_nn_types.h"
+#include "wasi_nn_openvino.h"
 #include "utils/logger.h"
 #include "bh_platform.h"
 
@@ -25,25 +26,15 @@
  * from 4. to 6. is the Inference Loop
  */
 
-/* these limits are arbitrary. */
-#define MAX_GRAPHS 4
-#define MAX_EXECUTION_CONTEXTS 4
-
 typedef struct {
     ov_core_t *core;
     /* keep input model files */
-    struct OpenVINOGraph {
+    void *weight_data;
-        void *weight_data;
+    ov_tensor_t *weights_tensor;
-        ov_tensor_t *weights_tensor;
+    ov_model_t *model;
-        ov_model_t *model;
+    ov_compiled_model_t *compiled_model;
-        ov_compiled_model_t *compiled_model;
+    ov_infer_request_t *infer_request;
-    } graphs[MAX_GRAPHS];
+    ov_tensor_t *input_tensor;
-    struct OpenVINOExecutionContext {
-        struct OpenVINOGraph *graph;
-        ov_infer_request_t *infer_request;
-    } execution_contexts[MAX_EXECUTION_CONTEXTS];
-    unsigned int n_graphs;
-    unsigned int n_execution_contexts;
 } OpenVINOContext;
 
 /*
@@ -143,7 +134,7 @@ print_model_input_output_info(ov_model_t *model)
         output_port = NULL;
     }
 
-    (void)ov_error;
+    ov_error = ov_error;
 fail:
     if (friendly_name)
         ov_free(friendly_name);
@@ -188,29 +179,6 @@ wasi_nn_tensor_type_to_openvino_element_type(tensor_type wasi_nn_type)
     return UNDEFINED;
 }
 
-static void
-free_graph(struct OpenVINOGraph *graph)
-{
-    if (graph->weight_data)
-        os_free(graph->weight_data);
-
-    if (graph->weights_tensor)
-        ov_tensor_free(graph->weights_tensor);
-
-    if (graph->model)
-        ov_model_free(graph->model);
-
-    if (graph->compiled_model)
-        ov_compiled_model_free(graph->compiled_model);
-}
-
-static void
-free_execution_context(struct OpenVINOExecutionContext *c)
-{
-    if (c->infer_request)
-        ov_infer_request_free(c->infer_request);
-}
-
 static wasi_nn_error
 uint32_array_to_int64_array(uint32_t array_size, uint32_t *src, int64_t **dst)
 {
@@ -230,8 +198,6 @@ load(void *ctx, graph_builder_array *builder, graph_encoding encoding,
      execution_target target, graph *g)
 {
     OpenVINOContext *ov_ctx = (OpenVINOContext *)ctx;
-    struct OpenVINOGraph *graph;
-    unsigned int graph_idx;
     wasi_nn_error ret = unsupported_operation;
 
     if (encoding != openvino) {
@@ -257,47 +223,33 @@ load(void *ctx, graph_builder_array *builder, graph_encoding encoding,
     graph_builder xml = builder->buf[0];
     graph_builder weight = builder->buf[1];
 
-    graph_idx = ov_ctx->n_graphs;
-    if (graph_idx >= MAX_GRAPHS) {
-        return runtime_error;
-    }
-    graph = &ov_ctx->graphs[graph_idx];
-    memset(graph, 0, sizeof(*graph));
-
     /* transfer weight to an ov tensor */
     {
-        graph->weight_data = os_malloc(weight.size);
+        ov_ctx->weight_data = os_malloc(weight.size);
-        if (!graph->weight_data)
+        if (!ov_ctx->weight_data)
             goto fail;
-        memcpy(graph->weight_data, weight.buf, weight.size);
+        memcpy(ov_ctx->weight_data, weight.buf, weight.size);
 
         ov_element_type_e type = U8;
         int64_t dims[1] = { weight.size };
         ov_shape_t shape = { 1, dims };
         CHECK_OV_STATUS(ov_tensor_create_from_host_ptr(type, shape,
-                                                       graph->weight_data,
+                                                       ov_ctx->weight_data,
-                                                       &graph->weights_tensor),
+                                                       &ov_ctx->weights_tensor),
                         ret);
     }
 
     /* load model from buffer */
     CHECK_OV_STATUS(ov_core_read_model_from_memory_buffer(
                         ov_ctx->core, (char *)xml.buf, xml.size,
-                        graph->weights_tensor, &graph->model),
+                        ov_ctx->weights_tensor, &ov_ctx->model),
                     ret);
 #ifndef NDEBUG
-    print_model_input_output_info(graph->model);
+    print_model_input_output_info(ov_ctx->model);
 #endif
 
-    CHECK_OV_STATUS(ov_core_compile_model(ov_ctx->core, graph->model, "CPU", 0,
+    ret = success;
-                                          &graph->compiled_model),
-                    ret);
-
-    *g = graph_idx;
-    ov_ctx->n_graphs++;
-    return success;
 fail:
-    free_graph(graph);
     return ret;
 }
 
@@ -305,62 +257,20 @@ __attribute__((visibility("default"))) wasi_nn_error
 load_by_name(void *ctx, const char *filename, uint32_t filename_len, graph *g)
 {
     OpenVINOContext *ov_ctx = (OpenVINOContext *)ctx;
-    struct OpenVINOGraph *graph;
-    unsigned int graph_idx;
     wasi_nn_error ret = unsupported_operation;
 
-    graph_idx = ov_ctx->n_graphs;
-    if (graph_idx >= MAX_GRAPHS) {
-        return runtime_error;
-    }
-    graph = &ov_ctx->graphs[graph_idx];
-
-    memset(graph, 0, sizeof(*graph));
     CHECK_OV_STATUS(
-        ov_core_read_model(ov_ctx->core, filename, NULL, &graph->model), ret);
+        ov_core_read_model(ov_ctx->core, filename, NULL, &ov_ctx->model), ret);
 
-    CHECK_OV_STATUS(ov_core_compile_model(ov_ctx->core, graph->model, "CPU", 0,
+    ret = success;
-                                          &graph->compiled_model),
-                    ret);
-
-    *g = graph_idx;
-    ov_ctx->n_graphs++;
-    return success;
 fail:
-    free_graph(graph);
     return ret;
 }
 
 __attribute__((visibility("default"))) wasi_nn_error
 init_execution_context(void *ctx, graph g, graph_execution_context *exec_ctx)
 {
-    OpenVINOContext *ov_ctx = (OpenVINOContext *)ctx;
-    struct OpenVINOGraph *graph;
-    struct OpenVINOExecutionContext *exec;
-    unsigned int exec_idx;
-    wasi_nn_error ret;
-
-    if (g >= ov_ctx->n_graphs)
-        return runtime_error;
-    graph = &ov_ctx->graphs[g];
-
-    exec_idx = ov_ctx->n_execution_contexts;
-    if (exec_idx >= MAX_EXECUTION_CONTEXTS)
-        return runtime_error;
-    exec = &ov_ctx->execution_contexts[exec_idx];
-
-    memset(exec, 0, sizeof(*exec));
-    exec->graph = graph;
-
-    CHECK_OV_STATUS(ov_compiled_model_create_infer_request(
-                        graph->compiled_model, &exec->infer_request),
-                    ret);
-
-    *exec_ctx = exec_idx;
-    ov_ctx->n_execution_contexts++;
     return success;
-fail:
-    return ret;
 }
 
 __attribute__((visibility("default"))) wasi_nn_error
@@ -368,16 +278,10 @@ set_input(void *ctx, graph_execution_context exec_ctx, uint32_t index,
           tensor *wasi_nn_tensor)
 {
     OpenVINOContext *ov_ctx = (OpenVINOContext *)ctx;
-    struct OpenVINOExecutionContext *exec;
     wasi_nn_error ret = unsupported_operation;
     ov_shape_t input_shape = { 0 };
-    ov_tensor_t *input_tensor = NULL;
     int64_t *ov_dims = NULL;
 
-    if (exec_ctx >= ov_ctx->n_execution_contexts)
-        return runtime_error;
-    exec = &ov_ctx->execution_contexts[exec_ctx];
-
     /* wasi_nn_tensor -> ov_tensor */
     {
         ret = uint32_array_to_int64_array(wasi_nn_tensor->dimensions->size,
@@ -401,21 +305,28 @@ set_input(void *ctx, graph_execution_context exec_ctx, uint32_t index,
                       shape_info);
 
         CHECK_OV_STATUS(ov_tensor_create_from_host_ptr(input_type, input_shape,
-                                                       wasi_nn_tensor->data.buf,
+                                                       wasi_nn_tensor->data,
-                                                       &input_tensor),
+                                                       &ov_ctx->input_tensor),
                         ret);
     }
 
+    CHECK_OV_STATUS(ov_core_compile_model(ov_ctx->core, ov_ctx->model, "CPU", 0,
+                                          &ov_ctx->compiled_model),
+                    ret);
+
+    CHECK_OV_STATUS(ov_compiled_model_create_infer_request(
+                        ov_ctx->compiled_model, &ov_ctx->infer_request),
+                    ret);
+
     /* install ov_tensor -> infer_request */
     CHECK_OV_STATUS(ov_infer_request_set_input_tensor_by_index(
-                        exec->infer_request, index, input_tensor),
+                        ov_ctx->infer_request, index, ov_ctx->input_tensor),
                     ret);
     ret = success;
+
 fail:
     if (ov_dims)
         os_free(ov_dims);
-    if (input_tensor)
-        ov_tensor_free(input_tensor);
     ov_shape_free(&input_shape);
 
     return ret;
@@ -425,14 +336,9 @@ __attribute__((visibility("default"))) wasi_nn_error
 compute(void *ctx, graph_execution_context exec_ctx)
 {
     OpenVINOContext *ov_ctx = (OpenVINOContext *)ctx;
-    struct OpenVINOExecutionContext *exec;
     wasi_nn_error ret = unsupported_operation;
 
-    if (exec_ctx >= ov_ctx->n_execution_contexts)
+    CHECK_OV_STATUS(ov_infer_request_infer(ov_ctx->infer_request), ret);
-        return runtime_error;
-    exec = &ov_ctx->execution_contexts[exec_ctx];
-
-    CHECK_OV_STATUS(ov_infer_request_infer(exec->infer_request), ret);
     ret = success;
 fail:
     return ret;
@@ -440,33 +346,28 @@ fail:
 
 __attribute__((visibility("default"))) wasi_nn_error
 get_output(void *ctx, graph_execution_context exec_ctx, uint32_t index,
-           tensor_data *output_tensor, uint32_t *output_tensor_size)
+           tensor_data output_tensor, uint32_t *output_tensor_size)
 {
     OpenVINOContext *ov_ctx = (OpenVINOContext *)ctx;
-    struct OpenVINOExecutionContext *exec;
     wasi_nn_error ret = unsupported_operation;
     ov_tensor_t *ov_tensor = NULL;
     void *data = NULL;
     size_t byte_size = 0;
 
-    if (exec_ctx >= ov_ctx->n_execution_contexts)
-        return runtime_error;
-    exec = &ov_ctx->execution_contexts[exec_ctx];
-
     CHECK_OV_STATUS(ov_infer_request_get_output_tensor_by_index(
-                        exec->infer_request, index, &ov_tensor),
+                        ov_ctx->infer_request, index, &ov_tensor),
                     ret);
 
     CHECK_OV_STATUS(ov_tensor_get_byte_size(ov_tensor, &byte_size), ret);
 
-    if (byte_size > output_tensor->size) {
+    if (byte_size > *output_tensor_size) {
         ret = too_large;
         goto fail;
     }
 
     CHECK_OV_STATUS(ov_tensor_data(ov_tensor, &data), ret);
 
-    memcpy(output_tensor->buf, data, byte_size);
+    memcpy(output_tensor, data, byte_size);
 
     *output_tensor_size = (uint32_t)byte_size;
 
@@ -520,16 +421,27 @@ __attribute__((visibility("default"))) wasi_nn_error
 deinit_backend(void *ctx)
 {
     OpenVINOContext *ov_ctx = (OpenVINOContext *)ctx;
-    unsigned int i;
 
     if (!ov_ctx)
         return invalid_argument;
 
-    for (i = 0; i < ov_ctx->n_execution_contexts; i++)
+    if (ov_ctx->weight_data)
-        free_execution_context(&ov_ctx->execution_contexts[i]);
+        os_free(ov_ctx->weight_data);
 
-    for (i = 0; i < ov_ctx->n_graphs; i++)
+    if (ov_ctx->weights_tensor)
-        free_graph(&ov_ctx->graphs[i]);
+        ov_tensor_free(ov_ctx->weights_tensor);
+
+    if (ov_ctx->input_tensor)
+        ov_tensor_free(ov_ctx->input_tensor);
+
+    if (ov_ctx->infer_request)
+        ov_infer_request_free(ov_ctx->infer_request);
+
+    if (ov_ctx->compiled_model)
+        ov_compiled_model_free(ov_ctx->compiled_model);
+
+    if (ov_ctx->model)
+        ov_model_free(ov_ctx->model);
 
     if (ov_ctx->core)
         ov_core_free(ov_ctx->core);

core/iwasm/libraries/wasi-nn/src/wasi_nn_openvino.h

@@ -3,26 +3,15 @@
  * SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
  */
 
-#ifndef WASI_NN_BACKEND_H
+#ifndef WASI_NN_OPENVINO_HPP
-#define WASI_NN_BACKEND_H
+#define WASI_NN_OPENVINO_HPP
 
 #include "wasi_nn_types.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 __attribute__((visibility("default"))) wasi_nn_error
 load(void *ctx, graph_builder_array *builder, graph_encoding encoding,
      execution_target target, graph *g);
 
-__attribute__((visibility("default"))) wasi_nn_error
-load_by_name(void *tflite_ctx, const char *name, uint32_t namelen, graph *g);
-
-__attribute__((visibility("default"))) wasi_nn_error
-load_by_name_with_config(void *ctx, const char *name, uint32_t namelen,
-                         const char *config, uint32_t config_len, graph *g);
-
 __attribute__((visibility("default"))) wasi_nn_error
 init_execution_context(void *ctx, graph g, graph_execution_context *exec_ctx);
 
@@ -35,7 +24,7 @@ compute(void *ctx, graph_execution_context exec_ctx);
 
 __attribute__((visibility("default"))) wasi_nn_error
 get_output(void *ctx, graph_execution_context exec_ctx, uint32_t index,
-           tensor_data *output_tensor, uint32_t *output_tensor_size);
+           tensor_data output_tensor, uint32_t *output_tensor_size);
 
 __attribute__((visibility("default"))) wasi_nn_error
 init_backend(void **ctx);
@@ -43,8 +32,4 @@ init_backend(void **ctx);
 __attribute__((visibility("default"))) wasi_nn_error
 deinit_backend(void *ctx);
 
-#ifdef __cplusplus
+#endif /* WASI_NN_OPENVINO_HPP */
-}
-#endif
-
-#endif /* WASI_NN_BACKEND_H */

core/iwasm/libraries/wasi-nn/src/wasi_nn_private.h

@@ -9,11 +9,7 @@
 #include "wasi_nn_types.h"
 #include "wasm_export.h"
 
-#include "bh_platform.h"
-
 typedef struct {
-    korp_mutex lock;
-    bool busy;
     bool is_backend_ctx_initialized;
     bool is_model_loaded;
     graph_encoding backend;
@@ -32,7 +28,7 @@ typedef wasi_nn_error (*SET_INPUT)(void *, graph_execution_context, uint32_t,
                                    tensor *);
 typedef wasi_nn_error (*COMPUTE)(void *, graph_execution_context);
 typedef wasi_nn_error (*GET_OUTPUT)(void *, graph_execution_context, uint32_t,
-                                    tensor_data *, uint32_t *);
+                                    tensor_data, uint32_t *);
 /* wasi-nn general APIs */
 typedef wasi_nn_error (*BACKEND_INITIALIZE)(void **);
 typedef wasi_nn_error (*BACKEND_DEINITIALIZE)(void *);

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

@@ -3,10 +3,11 @@
  * SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
  */
 
+#include "wasi_nn_tensorflowlite.hpp"
 #include "utils/logger.h"
 
 #include "bh_platform.h"
-#include "wasi_nn_backend.h"
+#include "wasi_nn_types.h"
 #include "wasm_export.h"
 
 #include <tensorflow/lite/interpreter.h>
@@ -280,11 +281,6 @@ set_input(void *tflite_ctx, graph_execution_context ctx, uint32_t index,
 {
     TFLiteContext *tfl_ctx = (TFLiteContext *)tflite_ctx;
 
-    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;
@@ -323,7 +319,7 @@ set_input(void *tflite_ctx, graph_execution_context ctx, uint32_t index,
                 index);
 
         int size = model_tensor_size * sizeof(float);
-        bh_memcpy_s(it, size, input_tensor->data.buf, size);
+        bh_memcpy_s(it, size, input_tensor->data, size);
     }
     else { // TODO: Assuming uint8 quantized networks.
         TfLiteAffineQuantization *quant_info =
@@ -341,7 +337,7 @@ set_input(void *tflite_ctx, graph_execution_context ctx, uint32_t index,
         NN_DBG_PRINTF("input tensor: (scale, offset) = (%f, %f)", scale,
                       zero_point);
 
-        float *input_tensor_f = (float *)input_tensor->data.buf;
+        float *input_tensor_f = (float *)input_tensor->data;
         for (uint32_t i = 0; i < model_tensor_size; ++i) {
             it[i] = (uint8_t)(input_tensor_f[i] / scale + zero_point);
         }
@@ -365,7 +361,7 @@ compute(void *tflite_ctx, graph_execution_context ctx)
 
 __attribute__((visibility("default"))) wasi_nn_error
 get_output(void *tflite_ctx, graph_execution_context ctx, uint32_t index,
-           tensor_data *output_tensor, uint32_t *output_tensor_size)
+           tensor_data output_tensor, uint32_t *output_tensor_size)
 {
     TFLiteContext *tfl_ctx = (TFLiteContext *)tflite_ctx;
 
@@ -388,34 +384,23 @@ get_output(void *tflite_ctx, graph_execution_context ctx, uint32_t index,
         return too_large;
     }
 
+    uint32_t model_tensor_size = 1;
+    for (int i = 0; i < (int)tensor->dims->size; ++i)
+        model_tensor_size *= (uint32_t)tensor->dims->data[i];
+
+    if (*output_tensor_size < model_tensor_size) {
+        NN_ERR_PRINTF("Insufficient memory to copy tensor %d", index);
+        return too_large;
+    }
+
     if (tensor->quantization.type == kTfLiteNoQuantization) {
         NN_DBG_PRINTF("No quantization information");
-#if WASM_ENABLE_WASI_EPHEMERAL_NN != 0
+        float *ot =
-        if (output_tensor->size < tensor->bytes) {
+            tfl_ctx->interpreters[ctx].interpreter->typed_output_tensor<float>(
-            NN_ERR_PRINTF("Insufficient memory to copy tensor %d", index);
+                index);
-            return too_large;
+
-        }
+        int size = model_tensor_size * sizeof(float);
-#else
+        bh_memcpy_s(output_tensor, size, ot, size);
-        /*
-         * for now, maintain the bug-to-bug compatibility with the old abi,
-         * where the size here is the number of fp32, not bytes.
-         */
-        if (output_tensor->size < tensor->bytes / sizeof(float)) {
-            NN_ERR_PRINTF("Insufficient memory to copy tensor %d", index);
-            return too_large;
-        }
-#endif
-        bh_memcpy_s(output_tensor->buf, output_tensor->size, tensor->data.data,
-                    tensor->bytes);
-#if WASM_ENABLE_WASI_EPHEMERAL_NN != 0
-        *output_tensor_size = tensor->bytes;
-#else
-        /*
-         * for now, maintain the bug-to-bug compatibility with the old abi,
-         * where the size here is the number of fp32, not bytes.
-         */
-        *output_tensor_size = tensor->bytes / sizeof(float);
-#endif
     }
     else { // TODO: Assuming uint8 quantized networks.
         TfLiteAffineQuantization *quant_info =
@@ -424,27 +409,6 @@ get_output(void *tflite_ctx, graph_execution_context ctx, uint32_t index,
             NN_ERR_PRINTF("Quantization per channel is not supported");
             return runtime_error;
         }
-
-        uint32_t model_tensor_size = 1;
-        for (int i = 0; i < (int)tensor->dims->size; ++i)
-            model_tensor_size *= (uint32_t)tensor->dims->data[i];
-
-#if WASM_ENABLE_WASI_EPHEMERAL_NN != 0
-        if (output_tensor->size / sizeof(float) < model_tensor_size) {
-            NN_ERR_PRINTF("Insufficient memory to copy tensor %d", index);
-            return too_large;
-        }
-#else
-        /*
-         * for now, maintain the bug-to-bug compatibility with the old abi,
-         * where the size here is the number of fp32, not bytes.
-         */
-        if (output_tensor->size < model_tensor_size) {
-            NN_ERR_PRINTF("Insufficient memory to copy tensor %d", index);
-            return too_large;
-        }
-#endif
-
         uint8_t *ot = tfl_ctx->interpreters[ctx]
                           .interpreter->typed_output_tensor<uint8_t>(index);
 
@@ -453,22 +417,13 @@ get_output(void *tflite_ctx, graph_execution_context ctx, uint32_t index,
         NN_DBG_PRINTF("output tensor: (scale, offset) = (%f, %f)", scale,
                       zero_point);
 
-        float *output_tensor_f = (float *)output_tensor->buf;
+        float *output_tensor_f = (float *)output_tensor;
         for (uint32_t i = 0; i < model_tensor_size; ++i) {
             output_tensor_f[i] = (ot[i] - zero_point) * scale;
         }
-
-#if WASM_ENABLE_WASI_EPHEMERAL_NN != 0
-        *output_tensor_size = model_tensor_size * sizeof(float);
-#else
-        /*
-         * for now, maintain the bug-to-bug compatibility with the old abi,
-         * where the size here is the number of fp32, not bytes.
-         */
-        *output_tensor_size = model_tensor_size;
-#endif
     }
 
+    *output_tensor_size = model_tensor_size;
     return success;
 }
 

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

@@ -0,0 +1,47 @@
+/*
+ * Copyright (C) 2019 Intel Corporation.  All rights reserved.
+ * SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+ */
+
+#ifndef WASI_NN_TENSORFLOWLITE_HPP
+#define WASI_NN_TENSORFLOWLITE_HPP
+
+#include "wasi_nn_types.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+__attribute__((visibility("default"))) wasi_nn_error
+load(void *tflite_ctx, graph_builder_array *builder, graph_encoding encoding,
+     execution_target target, graph *g);
+
+__attribute__((visibility("default"))) wasi_nn_error
+load_by_name(void *tflite_ctx, const char *filename, uint32_t filename_len,
+             graph *g);
+
+__attribute__((visibility("default"))) wasi_nn_error
+init_execution_context(void *tflite_ctx, graph g, graph_execution_context *ctx);
+
+__attribute__((visibility("default"))) wasi_nn_error
+set_input(void *tflite_ctx, graph_execution_context ctx, uint32_t index,
+          tensor *input_tensor);
+
+__attribute__((visibility("default"))) wasi_nn_error
+compute(void *tflite_ctx, graph_execution_context ctx);
+
+__attribute__((visibility("default"))) wasi_nn_error
+get_output(void *tflite_ctx, graph_execution_context ctx, uint32_t index,
+           tensor_data output_tensor, uint32_t *output_tensor_size);
+
+__attribute__((visibility("default"))) wasi_nn_error
+init_backend(void **tflite_ctx);
+
+__attribute__((visibility("default"))) wasi_nn_error
+deinit_backend(void *tflite_ctx);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif

core/iwasm/libraries/wasi-nn/test/build.sh

@@ -3,17 +3,6 @@
 # Copyright (C) 2019 Intel Corporation.  All rights reserved.
 # SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-# on intel mac, this ends up with a lot of the following error.
-#
-#  AttributeError: 'Sequential' object has no attribute '_get_save_spec'.
-#
-# * "pip install tensorflow" installs tensorflow 2.16.2 on intel mac.
-#   (because it's the last version before tf deprecated the target.)
-# * keras 3 support in the version seems incomplete (thus the error)
-# * a workaround: use keras 2 as mentioned in:
-#   https://github.com/tensorflow/tensorflow/releases/tag/v2.16.1
-#   https://blog.tensorflow.org/2024/03/whats-new-in-tensorflow-216.html
-
 CURR_PATH=$(cd $(dirname $0) && pwd -P)
 
 # WASM application that uses WASI-NN

core/iwasm/libraries/wasi-nn/test/models/mult_outputs.py

@@ -3,7 +3,7 @@
 
 import tensorflow as tf
 import numpy as np
-from tensorflow.keras.layers import AveragePooling2D, Conv2D
+from keras.layers import AveragePooling2D, Conv2D
 
 from tensorflow.keras import Input, Model
 

core/shared/utils/bh_vector.c

@@ -35,8 +35,8 @@ extend_vector(Vector *vector, size_t length)
     if (length <= vector->max_elems)
         return true;
 
-    if (length < vector->max_elems * 3 / 2)
+    if (length < vector->size_elem * 3 / 2)
-        length = vector->max_elems * 3 / 2;
+        length = vector->size_elem * 3 / 2;
 
     if (!(data = alloc_vector_data(length, vector->size_elem))) {
         return false;
@@ -194,12 +194,12 @@ bh_vector_append(Vector *vector, const void *elem_buf)
         goto just_return;
     }
 
-    /* make sure one more slot is used by the thread who allocates it */
+    /* make sure one more slot is used by the thread who allocas it */
     if (vector->lock)
         os_mutex_lock(vector->lock);
 
     if (!extend_vector(vector, vector->num_elems + 1)) {
-        LOG_ERROR("Append vector elem failed: extend vector failed.\n");
+        LOG_ERROR("Append ector elem failed: extend vector failed.\n");
         goto unlock_return;
     }
 

doc/build_wamr.md

@@ -102,7 +102,6 @@ cmake -DWAMR_BUILD_PLATFORM=linux -DWAMR_BUILD_TARGET=ARM
 
 ### **Enable lib wasi-nn**
 - **WAMR_BUILD_WASI_NN**=1/0, default to disable if not set
-> Note: WAMR_BUILD_WASI_NN without WAMR_BUILD_WASI_EPHEMERAL_NN is deprecated and will likely be removed in future versions of WAMR. Please consider to enable WAMR_BUILD_WASI_EPHEMERAL_NN as well.
 > Note: See [WASI-NN](../core/iwasm/libraries/wasi-nn) for more details.
 
 ### **Enable lib wasi-nn GPU mode**
@@ -114,7 +113,7 @@ cmake -DWAMR_BUILD_PLATFORM=linux -DWAMR_BUILD_TARGET=ARM
 - **WAMR_BUILD_WASI_NN_EXTERNAL_DELEGATE_PATH**=Path to the external delegate shared library (e.g. `libedgetpu.so.1.0` for Coral USB)
 
 ### **Enable lib wasi-nn with `wasi_ephemeral_nn` module support**
-- **WAMR_BUILD_WASI_EPHEMERAL_NN**=1/0, default to enable if not set
+- **WAMR_BUILD_WASI_EPHEMERAL_NN**=1/0, default to disable if not set
 
 ### **Disable boundary check with hardware trap**
 - **WAMR_DISABLE_HW_BOUND_CHECK**=1/0, default to enable if not set and supported by platform
@@ -361,4 +360,4 @@ For Valgrind, begin with the following configurations and add additional ones as
   -DWAMR_DISABLE_HW_BOUND_CHECK=0 \
   -DWAMR_DISABLE_WRITE_GS_BASE=0
   #...
-```
+```

tests/fuzz/wasm-mutator-fuzz/server/app/main.py

@@ -72,7 +72,7 @@ def to_json(inst, cls):
 
 
 class Fuzzing(db.Model):
-    __tablename__ = 'fuzzing_task'
+    __tablename__ = 'fazzing_task'
     id = db.Column(db.Integer, autoincrement=True,
                    primary_key=True, nullable=False)
     repo = db.Column(db.String(200), nullable=False, default='')
@@ -96,7 +96,7 @@ class TaskError(db.Model):
     __tablename__ = 'task_error'
     id = db.Column(db.Integer, autoincrement=True,
                    primary_key=True, nullable=False)
-    fuzzing_id = db.Column(db.Integer, db.ForeignKey("fuzzing_task.id"))
+    fazzing_id = db.Column(db.Integer, db.ForeignKey("fazzing_task.id"))
     name = db.Column(db.String(200), nullable=False, default='')
     std_out = db.Column(db.Text, default='')
     data = db.Column(db.JSON)
@@ -119,9 +119,9 @@ def to_data(data):
 
 def error_count(data):
     error = len(TaskError.query.filter(
-        TaskError.fuzzing_id == data.get('id'), TaskError.status.in_([1, 2])).all())
+        TaskError.fazzing_id == data.get('id'), TaskError.status.in_([1, 2])).all())
     end_error = len(TaskError.query.filter(
-        TaskError.fuzzing_id == data.get('id'), TaskError.status == 0).all())
+        TaskError.fazzing_id == data.get('id'), TaskError.status == 0).all())
     data['error'] = error
     data['end_error'] = end_error
     return data
@@ -159,11 +159,11 @@ def show_fuzz_list():
     id = data.get('id')
     if id:
         all_error = TaskError.query.filter(
-            TaskError.fuzzing_id == id).with_entities(TaskError.id, TaskError.fuzzing_id,
+            TaskError.fazzing_id == id).with_entities(TaskError.id, TaskError.fazzing_id,
                                                       TaskError.create_time, TaskError.data,
                                                       TaskError.name, TaskError.status,
                                                       TaskError.update_time, TaskError.comment).order_by(TaskError.status.desc(), TaskError.update_time.desc(), TaskError.id.desc()).all()
-        data_message = [{'id': error['id'], "fuzzing_id": error['fuzzing_id'],
+        data_message = [{'id': error['id'], "fuzzing_id": error['fazzing_id'],
                          "name": error['name'], "data": error['data'],
                          'create_time': error['create_time'].strftime('%Y-%m-%d %H:%M:%S'),
                          'update_time': error['update_time'].strftime('%Y-%m-%d %H:%M:%S'),
@@ -204,7 +204,7 @@ def New_fuzzing():
         # curd.set_error_status_to(list(map(lambda x: x.id, error_list)), db)
         # Fuzzing.query.filter_by(id=fuzz.id).delete()
         fuzz.data = {'error': "Clone repo Error"}
-        db.session.commit()
+        db.commit()
         return jsonify({"status": 0, "result": "", "msg": "Clone repo Error"})
 
     wamr_path_parent = fuzz_dir.parent.parent
@@ -277,7 +277,7 @@ def scheduler_run_task():
 
     for fuzz in fuzz_query:
         all_error = TaskError.query.filter(
-            TaskError.fuzzing_id == fuzz.id).with_entities(TaskError.name).all()
+            TaskError.fazzing_id == fuzz.id).with_entities(TaskError.name).all()
         fuzz_cmd = wasm_mutator_dir / \
             'workspace' / f'build_{fuzz.id}'
         dir_list = filter(lambda x: x.startswith(
@@ -287,7 +287,7 @@ def scheduler_run_task():
         for dir in dir_list:
             cmd = f'cd {fuzz_cmd} && ./wasm_mutator_fuzz {dir}'
             status, resp = getstatusoutput(cmd)
-            task_error = TaskError(name=dir, std_out=resp, fuzzing_id=fuzz.id,
+            task_error = TaskError(name=dir, std_out=resp, fazzing_id=fuzz.id,
                                    create_time=datetime.utcnow() + timedelta(hours=8))
             db.session.add(task_error)
             db.session.commit()
@@ -312,7 +312,7 @@ def get_error_txt():
         return jsonify({"status": 0, "results": [], 'msg': "Error"})
     error = TaskError.query.get(id)
     fuzz_cmd = wasm_mutator_dir / \
-        'workspace' / f'build_{error.fuzzing_id}'
+        'workspace' / f'build_{error.fazzing_id}'
     file_cmd = fuzz_cmd / error.name
 
     response = send_file(file_cmd, as_attachment=True,
@@ -351,7 +351,7 @@ def get_cases_zip():
     with ZipFile(memory_file, "w", ZIP_DEFLATED) as zf:
         for task_error in task_query:
             fuzz_cmd = wasm_mutator_dir / \
-                'workspace' / f'build_{task_error.fuzzing_id}'
+                'workspace' / f'build_{task_error.fazzing_id}'
             file_cmd = fuzz_cmd / task_error.name
             zf.write(str(file_cmd), arcname=task_error.name)
     memory_file.seek(0)
@@ -399,7 +399,7 @@ def error_restart():
     if run_status:
         return jsonify({"status": 0, "results": [], 'msg': "There are already tasks in progress"})
     task_query = TaskError.query.filter(TaskError.id.in_(id_list)).all()
-    fuzzing_id = task_query[0].fuzzing_id
+    fuzzing_id = task_query[0].fazzing_id
     fuzz_cmd = wasm_mutator_dir / \
         'workspace' / f'build_{fuzzing_id}'
     restart_cmd = wasm_mutator_dir / \
@@ -412,7 +412,7 @@ def error_restart():
     if not Path(restart_cmd / 'wamr').exists():
         print('------ error: clone repo not folder exists ------')
         # fuzz.data = {'error': "Clone repo Error"}
-        db.session.commit()
+        db.commit()
         return jsonify({"status": 0, "result": "", "msg": "Clone repo Error"})
     wamr_path_parent = fuzz_dir.parent.parent
     wamr_path = wamr_path_parent / 'wamr'

tests/regression/ba-issues/README.md

@@ -218,57 +218,22 @@ simply run `run.py`
 ./run.py
 ```
 
-Specify a specific issue with option `--issues`/`-i`
-
-```shell
-./run.py --issues 2833         # test 1 issue #2833
-./run.py -i 2833,2834,2835     # test 3 issues #2833 #2834 #2835
-```
-
 If everything went well, you should see similarly output in your command line output
 
 ```shell
-==== Test results ====
+Finish testing, 22/22 of test cases passed, no more issues should further test
-   Total: 22
-  Passed: 22
-  Failed: 0
-  Left issues in folder: no more
-  Cases in JSON but not found in folder: no more
 ```
 
 If you add the test case under directory `issues` but forget to add the running config in json file, the output can be something like
 
 ```shell
-==== Test results ====
+Finish testing, 21/21 of test cases passed, {2945} issue(s) should further test
-   Total: 21
-  Passed: 21
-  Failed: 0
-  missed: 0
-  Left issues in folder: #3022
-  Cases in JSON but not found in folder: no more
-```
-
-If you add the test case in `running_config.json` but used the wrong id or forget to add the test case under directory `issues`, the output can be someting like
-
-```shell
-==== Test results ====
-   Total: 21
-  Passed: 21
-  Failed: 0
-  missed: 0
-  Left issues in folder: #2855
-  Cases in JSON but not found in folder: #12345
 ```
 
 If some test case are failing, then it will be something like
 
 ```shell
-==== Test results ====
+Finish testing, 21/22 of test cases passed, no more issue(s) should further test
-   Total: 22
-  Passed: 21
-  Failed: 1
-  Left issues in folder: no more
-  Cases in JSON but not found in folder: no more
 ```
 
 And a log file named `issues_tests.log` will be generated and inside it will display the details of the failing cases, for example:

tests/regression/ba-issues/run.py

@@ -10,9 +10,7 @@ import os
 import subprocess
 import glob
 import re
-import argparse
+from typing import Dict
-
-from typing import Dict, Optional, List
 
 WORK_DIR = os.getcwd()
 TEST_WASM_COMMAND = (
@@ -47,12 +45,7 @@ def dump_error_log(failing_issue_id, command_lists, exit_code_cmp, stdout_cmp):
         )
 
 
-def get_issue_ids_should_test(selected_ids: Optional[List[int]] = None):
+def get_issue_ids_should_test():
-    """Find all issue IDs that should be tested in folder issues."""
-    # If specific issue IDs are provided, return them as a set
-    if selected_ids:
-        return set(selected_ids)
-
     # Define the path pattern
     path_pattern = "issues/issue-*"
 
@@ -67,8 +60,8 @@ def get_issue_ids_should_test(selected_ids: Optional[List[int]] = None):
         # Extract the issue number using regular expression
         match = re.search(pattern, dir_path)
         if match:
-            issue_number = int(match.group(1))
+            issue_number = match.group(1)
-            issue_numbers.add(issue_number)
+            issue_numbers.add(int(issue_number))
 
     # Print the set of issue numbers
     return issue_numbers
@@ -84,10 +77,10 @@ def get_and_check(d, key, default=None, nullable=False):
 
 
 def run_and_compare_results(
-    issue_id, cmd, description, ret_code, stdout_content
+    passed_ids, failed_ids, issue_id, cmd, description, ret_code, stdout_content
-) -> bool:
+):
     print(f"####################################")
-    print(f"test BA issue #{issue_id} `{description}`...")
+    print(f"test BA issue #{issue_id} `{description}`: {cmd}")
     command_list = cmd.split()
     result = subprocess.run(
         command_list,
@@ -102,21 +95,19 @@ def run_and_compare_results(
 
     exit_code_cmp = f"exit code (actual, expected) : {actual_exit_code, ret_code}"
     stdout_cmp = f"stdout (actual, expected) : {actual_output, stdout_content}"
+    print(exit_code_cmp)
+    print(stdout_cmp)
 
     if actual_exit_code == ret_code and (
         actual_output == stdout_content
-        or (
+        or (stdout_content == "Compile success"
-            stdout_content == "Compile success"
+            and actual_output.find(stdout_content) != -1)
-            and actual_output.find(stdout_content) != -1
-        )
         or (len(stdout_content) > 30 and actual_output.find(stdout_content) != -1)
     ):
+        passed_ids.add(issue_id)
         print("== PASS ==")
-        return True
     else:
-        print(cmd)
+        failed_ids.add(issue_id)
-        print(exit_code_cmp)
-        print(stdout_cmp)
         print(f"== FAILED: {issue_id} ==")
         dump_error_log(
             issue_id,
@@ -124,11 +115,15 @@ def run_and_compare_results(
             exit_code_cmp,
             stdout_cmp,
         )
-        return False
+
+    print("")
 
 
-def run_issue_test_wamrc(issue_id, compile_options):
+def run_issue_test_wamrc(
+    passed_ids, failed_ids, issue_id, compile_options, stdout_only_cmp_last_line=False
+):
     compiler = get_and_check(compile_options, "compiler")
+    only_compile = get_and_check(compile_options, "only compile")
     in_file = get_and_check(compile_options, "in file")
     out_file = get_and_check(compile_options, "out file")
     options = get_and_check(compile_options, "options")
@@ -150,10 +145,14 @@ def run_issue_test_wamrc(issue_id, compile_options):
         compiler=compiler, options=options, out_file=out_file_path, in_file=in_file_path
     )
 
-    return run_and_compare_results(issue_id, cmd, description, ret_code, stdout_content)
+    run_and_compare_results(
+        passed_ids, failed_ids, issue_id, cmd, description, ret_code, stdout_content
+    )
+
+    return only_compile
 
 
-def run_issue_test_iwasm(issue_id, test_case) -> bool:
+def run_issue_test_iwasm(passed_ids, failed_ids, issue_id, test_case):
     runtime = get_and_check(test_case, "runtime")
     mode = get_and_check(test_case, "mode")
     file = get_and_check(test_case, "file")
@@ -195,19 +194,17 @@ def run_issue_test_iwasm(issue_id, test_case) -> bool:
             argument=argument,
         )
 
-    return run_and_compare_results(issue_id, cmd, description, ret_code, stdout_content)
+    run_and_compare_results(
+        passed_ids, failed_ids, issue_id, cmd, description, ret_code, stdout_content
+    )
 
 
-def process_and_run_test_cases(
+def process_and_run_test_cases(data: Dict[str, Dict]):
-    data: Dict[str, Dict], selected_ids: Optional[List[int]] = None
+    issue_ids_should_test = get_issue_ids_should_test()
-):
-    issue_ids_should_test = get_issue_ids_should_test(selected_ids)
 
     passed_ids = set()
     failed_ids = set()
-    json_only_ids = set()
 
-    # Iterate through each test case in the json data
     for test_case in data.get("test cases", []):
         is_deprecated = get_and_check(test_case, "deprecated")
         issue_ids = get_and_check(test_case, "ids", default=[])
@@ -217,79 +214,33 @@ def process_and_run_test_cases(
             continue
 
         compile_options = get_and_check(test_case, "compile_options", nullable=True)
-
         for issue_id in issue_ids:
-            if issue_id not in issue_ids_should_test:
+            only_compile = False
-                json_only_ids.add(issue_id)
+            # if this issue needs to test wamrc to compile the test case first
-                continue
+            if compile_options:
+                only_compile = compile_options["only compile"]
+                run_issue_test_wamrc(passed_ids, failed_ids, issue_id, compile_options)
+
+            # if this issue requires to test iwasm to run the test case
+            if not only_compile:
+                run_issue_test_iwasm(passed_ids, failed_ids, issue_id, test_case)
 
             # cross out the this issue_id in the should test set
             issue_ids_should_test.remove(issue_id)
 
-            only_compile = False
-
-            # if this issue needs to test wamrc to compile the test case first
-            if compile_options:
-                only_compile = compile_options["only compile"]
-                compile_res = run_issue_test_wamrc(issue_id, compile_options)
-                if only_compile:
-                    if compile_res:
-                        passed_ids.add(issue_id)
-                    else:
-                        failed_ids.add(issue_id)
-                    continue
-                else:
-                    # if compile success, then continue to test iwasm
-                    if not compile_res:
-                        failed_ids.add(issue_id)
-                        continue
-
-            # if this issue requires to test iwasm to run the test case
-            if not only_compile:
-                if run_issue_test_iwasm(issue_id, test_case):
-                    passed_ids.add(issue_id)
-                else:
-                    failed_ids.add(issue_id)
-
     total = len(passed_ids) + len(failed_ids)
     passed = len(passed_ids)
     failed = len(failed_ids)
-
+    issue_ids_should_test = (
-    format_issue_ids_should_test = (
+        issue_ids_should_test if issue_ids_should_test else "no more"
-        " ".join(f"#{x}" for x in issue_ids_should_test)
-        if issue_ids_should_test
-        else "no more"
     )
-    format_json_only_ids = (
-        " ".join(f"#{x}" for x in json_only_ids) if json_only_ids else "no more"
-    )
-
-    print(f"####################################")
     print(f"==== Test results ====")
-    print(f"   Total: {total}")
+    print(f"  Total: {total}")
     print(f"  Passed: {passed}")
     print(f"  Failed: {failed}")
-    if not selected_ids:
-        print(f"  Left issues in folder: {format_issue_ids_should_test}")
-        print(f"  Cases in JSON but not found in folder: {format_json_only_ids}")
-    else:
-        print(f"  Issues not found in folder: {format_issue_ids_should_test}")
 
 
 def main():
-    parser = argparse.ArgumentParser(description="Run BA issue tests.")
-    parser.add_argument(
-        "-i",
-        "--issues",
-        type=str,
-        help="Comma separated list of issue ids to run, e.g. 1,2,3. Default: all.",
-    )
-    args = parser.parse_args()
-
-    selected_ids = None
-    if args.issues:
-        selected_ids = [int(x) for x in args.issues.split(",") if x.strip().isdigit()]
-
     # Path to the JSON file
     file_path = "running_config.json"
 
@@ -305,7 +256,7 @@ def main():
         os.remove(LOG_FILE)
 
     # Process the data
-    process_and_run_test_cases(data, selected_ids)
+    process_and_run_test_cases(data)
 
 
 if __name__ == "__main__":

tests/requirement-engineering/gc-aot/build_spec_interpreter.sh

@@ -17,7 +17,7 @@ git apply ../../../wamr-test-suites/spec-test-script/gc_ignore_cases.patch
 # Set OCaml compiler environment
 eval $(opam config env)
 
-echo "compile the reference interpreter"
+echo "compile the reference intepreter"
 pushd interpreter
 make
-popd
+popd

tests/standalone/test-running-modes/test_c_embed_api_thoroughly.py

@@ -9,7 +9,7 @@ import os
 from collections import OrderedDict
 
 
-def CLI_ARGS_GENERATOR(running_modes_supported: list[str]) -> list[str]:
+def CLI_ARGS_GENREATOR(running_modes_supported: list[str]) -> list[str]:
     res = []
     list_2d = [["--default-running-mode={} --module-running-mode={}".format(i, j)
                 for i in running_modes_supported] for j in running_modes_supported]
@@ -35,16 +35,16 @@ def main():
     ]
 
     # Python 3.7+: Dictionary iteration order is guaranteed to be in order of insertion.
-    # just to be safe, using OrderedDict
+    # just to be safe, using orderreddict
     # key: value -> compile mode, {"compile_flag": CMake compile flag, "iwasm_cli_args": array of CLI args tested}
     test_options = OrderedDict({
-        "INTERP": {"compile_flag": COMPILE_FLAGS[0], "cli_args": CLI_ARGS_GENERATOR(RUNNING_MODES[:1])},
+        "INTERP": {"compile_flag": COMPILE_FLAGS[0], "cli_args": CLI_ARGS_GENREATOR(RUNNING_MODES[:1])},
-        "FAST_JIT": {"compile_flag": COMPILE_FLAGS[1], "cli_args": CLI_ARGS_GENERATOR(RUNNING_MODES[:2])},
+        "FAST_JIT": {"compile_flag": COMPILE_FLAGS[1], "cli_args": CLI_ARGS_GENREATOR(RUNNING_MODES[:2])},
         "LLVM_JIT": {"compile_flag": COMPILE_FLAGS[2],
-                     "cli_args": CLI_ARGS_GENERATOR([RUNNING_MODES[0], RUNNING_MODES[2]])},
+                     "cli_args": CLI_ARGS_GENREATOR([RUNNING_MODES[0], RUNNING_MODES[2]])},
-        "MULTI_TIER_JIT": {"compile_flag": COMPILE_FLAGS[3], "cli_args": CLI_ARGS_GENERATOR(RUNNING_MODES)},
+        "MULTI_TIER_JIT": {"compile_flag": COMPILE_FLAGS[3], "cli_args": CLI_ARGS_GENREATOR(RUNNING_MODES)},
         "EAGER_JIT_WITH_BOTH_JIT": {"compile_flag": COMPILE_FLAGS[4],
-                                    "cli_args": CLI_ARGS_GENERATOR(RUNNING_MODES[:3])}
+                                    "cli_args": CLI_ARGS_GENREATOR(RUNNING_MODES[:3])}
     })
 
     build_cmd = "./build_c_embed.sh \"{build_flag}\""

tests/standalone/test-running-modes/test_iwasm_thoroughly.py

@@ -29,7 +29,7 @@ def main():
     ]
 
     # Python 3.7+: Dictionary iteration order is guaranteed to be in order of insertion.
-    # just to be safe, using OrderedDict
+    # just to be safe, using orderreddict
     # key: value -> compile mode, {"compile_flag": CMake compile flag, "iwasm_cli_args": array of CLI args tested}
     test_options = OrderedDict({
         "INTERP": {"compile_flag": COMPILE_FLAGS[0], "iwasm_cli_args": IWASM_CLI_ARGS[:1]},

tests/unit/memory64/memory64_atomic_test.cc

@@ -31,7 +31,7 @@ class memory64_atomic_test_suite : public testing::TestWithParam<RunningMode>
         return true;
 
     fail:
-        if (module)
+        if (!module)
             wasm_runtime_unload(module);
 
         return false;
@@ -56,8 +56,6 @@ class memory64_atomic_test_suite : public testing::TestWithParam<RunningMode>
         if (exec_env)
             wasm_runtime_destroy_exec_env(exec_env);
         if (module_inst)
-            wasm_runtime_deinstantiate(module_inst);
-        if (module)
             wasm_runtime_unload(module);
         return false;
     }

tests/unit/memory64/memory64_test.cc

@@ -31,7 +31,7 @@ class memory64_test_suite : public testing::TestWithParam<RunningMode>
         return true;
 
     fail:
-        if (module)
+        if (!module)
             wasm_runtime_unload(module);
 
         return false;
@@ -56,13 +56,11 @@ class memory64_test_suite : public testing::TestWithParam<RunningMode>
         if (exec_env)
             wasm_runtime_destroy_exec_env(exec_env);
         if (module_inst)
-            wasm_runtime_deinstantiate(module_inst);
-        if (module)
             wasm_runtime_unload(module);
         return false;
     }
 
-    void destroy_exec_env()
+    void destory_exec_env()
     {
         wasm_runtime_destroy_exec_env(exec_env);
         wasm_runtime_deinstantiate(module_inst);
@@ -203,7 +201,7 @@ TEST_P(memory64_test_suite, memory_8GB)
     i64 = 0xbeefdead;
     ASSERT_EQ(i64, GET_U64_FROM_ADDR(wasm_argv));
 
-    destroy_exec_env();
+    destory_exec_env();
 }
 
 TEST_P(memory64_test_suite, mem64_from_clang)
@@ -230,7 +228,7 @@ TEST_P(memory64_test_suite, mem64_from_clang)
     i32 = 0x109;
     ASSERT_EQ(i32, wasm_argv[0]);
 
-    destroy_exec_env();
+    destory_exec_env();
 }
 
 INSTANTIATE_TEST_CASE_P(RunningMode, memory64_test_suite,

tests/unit/running-modes/wasm_running_modes_test.cc

@@ -21,7 +21,7 @@ std::string TEST_WASM1 = "/hello.wasm";
 std::string TEST_WASM2 = "/mytest.wasm";
 char *WASM_FILE_1;
 char *WASM_FILE_2;
-std::vector<RunningMode> running_mode_supported = { Mode_Interp,
+std::vector<RunningMode> running_mode_supportted = { Mode_Interp,
 #if WASM_ENABLE_FAST_JIT != 0
                                                      Mode_Fast_JIT,
 #endif
@@ -76,7 +76,7 @@ class wasm_running_modes_test_suite : public testing::TestWithParam<RunningMode>
         return true;
 
     fail:
-        if (module)
+        if (!module)
             wasm_runtime_unload(module);
 
         return false;
@@ -101,13 +101,11 @@ class wasm_running_modes_test_suite : public testing::TestWithParam<RunningMode>
         if (exec_env)
             wasm_runtime_destroy_exec_env(exec_env);
         if (module_inst)
-            wasm_runtime_deinstantiate(module_inst);
-        if (module)
             wasm_runtime_unload(module);
         return false;
     }
 
-    void destroy_exec_env()
+    void destory_exec_env()
     {
         wasm_runtime_destroy_exec_env(exec_env);
         wasm_runtime_deinstantiate(module_inst);
@@ -141,7 +139,7 @@ class wasm_running_modes_test_suite : public testing::TestWithParam<RunningMode>
         ASSERT_TRUE(ret);
         ASSERT_EQ(10, wasm_argv[0]);
 
-        destroy_exec_env();
+        destory_exec_env();
     }
 
     void run_wasm_complex(char *filename1, char *filename2,
@@ -170,7 +168,7 @@ class wasm_running_modes_test_suite : public testing::TestWithParam<RunningMode>
         ASSERT_TRUE(ret);
         ASSERT_EQ(10, wasm_argv[0]);
 
-        destroy_exec_env();
+        destory_exec_env();
 
         /* run wasm file 2 in running_mode */
         ret = load_wasm_file(filename2);
@@ -186,7 +184,7 @@ class wasm_running_modes_test_suite : public testing::TestWithParam<RunningMode>
         ret = wasm_runtime_call_wasm(exec_env, main, 2, wasm_argv);
         ASSERT_TRUE(ret);
 
-        destroy_exec_env();
+        destory_exec_env();
     }
 
   public:
@@ -248,7 +246,7 @@ TEST_F(wasm_running_modes_test_suite, wasm_runtime_is_running_mode_supported)
     // normal situation
     ASSERT_EQ(true, wasm_runtime_is_running_mode_supported(
                         static_cast<RunningMode>(Mode_Default)));
-    for (auto running_mode : running_mode_supported) {
+    for (auto running_mode : running_mode_supportted) {
         ASSERT_EQ(true, wasm_runtime_is_running_mode_supported(running_mode));
     }
 
@@ -266,7 +264,7 @@ TEST_F(wasm_running_modes_test_suite, wasm_runtime_set_default_running_mode)
     // normal situation: only set up
     ASSERT_EQ(true, wasm_runtime_set_default_running_mode(
                         static_cast<RunningMode>(Mode_Default)));
-    for (auto running_mode : running_mode_supported) {
+    for (auto running_mode : running_mode_supportted) {
         ASSERT_EQ(true, wasm_runtime_set_default_running_mode(running_mode));
     }
 
@@ -298,13 +296,13 @@ TEST_P(wasm_running_modes_test_suite,
        wasm_runtime_set_and_get_running_mode_complex)
 {
     RunningMode default_running_mode = GetParam();
-    for (auto running_mode : running_mode_supported) {
+    for (auto running_mode : running_mode_supportted) {
         run_wasm_complex(WASM_FILE_1, WASM_FILE_2, default_running_mode,
                          running_mode);
     }
 }
 
 INSTANTIATE_TEST_CASE_P(RunningMode, wasm_running_modes_test_suite,
-                        testing::ValuesIn(running_mode_supported));
+                        testing::ValuesIn(running_mode_supportted));
 
-}
+}

tests/wamr-test-suites/test_wamr.sh

@@ -362,31 +362,31 @@ function sightglass_test()
 function setup_wabt()
 {
     # please sync with .github/actions/install-wasi-sdk-wabt/action.yml
-    case ${PLATFORM} in
-        cosmopolitan)
-            ;;
-        linux)
-            WABT_URL=https://github.com/WebAssembly/wabt/releases/download/1.0.37/wabt-1.0.37-ubuntu-20.04.tar.gz
-            WABT_VERSION=1.0.37
-            ;;
-        darwin)
-            WABT_URL=https://github.com/WebAssembly/wabt/releases/download/1.0.36/wabt-1.0.36-macos-12.tar.gz
-            WABT_VERSION=1.0.36
-            ;;
-        windows)
-            WABT_URL=https://github.com/WebAssembly/wabt/releases/download/1.0.37/wabt-1.0.37-windows.tar.gz
-            WABT_VERSION=1.0.37
-            ;;
-        *)
-            echo "wabt platform for ${PLATFORM} in unknown"
-            exit 1
-            ;;
-    esac
-
     if [ ${WABT_BINARY_RELEASE} == "YES" ]; then
         echo "download a binary release and install"
         local WAT2WASM=${WORK_DIR}/wabt/out/gcc/Release/wat2wasm
         if [ ! -f ${WAT2WASM} ]; then
+            case ${PLATFORM} in
+                cosmopolitan)
+                    ;;
+                linux)
+                    WABT_URL=https://github.com/WebAssembly/wabt/releases/download/1.0.37/wabt-1.0.37-ubuntu-20.04.tar.gz
+                    WABT_VERSION=1.0.37
+                    ;;
+                darwin)
+                    WABT_URL=https://github.com/WebAssembly/wabt/releases/download/1.0.36/wabt-1.0.36-macos-12.tar.gz
+                    WABT_VERSION=1.0.36
+                    ;;
+                windows)
+                    WABT_URL=https://github.com/WebAssembly/wabt/releases/download/1.0.37/wabt-1.0.37-windows.tar.gz
+                    WABT_VERSION=1.0.37
+                    ;;
+                *)
+                    echo "wabt platform for ${PLATFORM} in unknown"
+                    exit 1
+                    ;;
+            esac
+
             pushd /tmp
             wget -O wabt-tar.gz --progress=dot:giga ${WABT_URL}
             tar xf wabt-tar.gz
@@ -414,7 +414,7 @@ function setup_wabt()
 
 function compile_reference_interpreter()
 {
-    echo "compile the reference interpreter"
+    echo "compile the reference intepreter"
     pushd interpreter
     make
     if [ $? -ne 0 ]

wamr-wasi-extensions/build_libs.sh

@@ -1,15 +0,0 @@
-#! /bin/sh
-
-# Copyright (C) 2025 Midokura Japan KK.  All rights reserved.
-# SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-
-set -e
-
-PREFIX=${1:-/tmp/wamr}
-WASI_SDK=${WASI_SDK:-/opt/wasi-sdk}
-
-cmake -B build-lib \
--DCMAKE_TOOLCHAIN_FILE=${WASI_SDK}/share/cmake/wasi-sdk.cmake \
--DCMAKE_INSTALL_PREFIX=${PREFIX} \
-.
-cmake --build build-lib -t install

wamr-wasi-extensions/build_samples.sh

@@ -1,33 +0,0 @@
-#! /bin/sh
-
-# Copyright (C) 2025 Midokura Japan KK.  All rights reserved.
-# SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-
-set -e
-
-PREFIX=${1:-/tmp/wamr}
-WASI_SDK=${WASI_SDK:-/opt/wasi-sdk}
-
-cmake -B build-app-nn \
--DCMAKE_TOOLCHAIN_FILE=${WASI_SDK}/share/cmake/wasi-sdk.cmake \
--DCMAKE_PREFIX_PATH=${PREFIX} \
-samples/nn
-cmake --build build-app-nn
-
-cmake -B build-app-nn-cli \
--DCMAKE_TOOLCHAIN_FILE=${WASI_SDK}/share/cmake/wasi-sdk.cmake \
--DCMAKE_PREFIX_PATH=${PREFIX} \
-samples/nn-cli
-cmake --build build-app-nn-cli
-
-cmake -B build-app-socket-nslookup \
--DCMAKE_TOOLCHAIN_FILE=${WASI_SDK}/share/cmake/wasi-sdk-pthread.cmake \
--DCMAKE_PREFIX_PATH=${PREFIX} \
-samples/socket-nslookup
-cmake --build build-app-socket-nslookup
-
-cmake -B build-app-socket-tcp-udp \
--DCMAKE_TOOLCHAIN_FILE=${WASI_SDK}/share/cmake/wasi-sdk-pthread.cmake \
--DCMAKE_PREFIX_PATH=${PREFIX} \
-samples/socket-tcp-udp
-cmake --build build-app-socket-tcp-udp

wamr-wasi-extensions/samples/nn-cli/main.c

@@ -266,8 +266,7 @@ set_input(char *options)
     wasi_ephemeral_nn_error nnret;
     wasi_ephemeral_nn_graph_execution_context c =
         map_get(&contexts, context_id);
-    tensor.data.buf = buf;
+    tensor.data = buf;
-    tensor.data.size = sz;
     nnret = wasi_ephemeral_nn_set_input(c, idx, &tensor);
     unmap_file(buf, sz);
     if (nnret != wasi_ephemeral_nn_error_success) {

wamr-wasi-extensions/samples/nn/app.c

@@ -147,8 +147,7 @@ main(int argc, char **argv)
     wasi_ephemeral_nn_tensor tensor = {
         .dimensions = { .buf = (uint32_t[]){1, 3, 224, 224,}, .size = 4, },
         .type = wasi_ephemeral_nn_type_fp32,
-        .data.buf = tensordata,
+        .data = tensordata,
-        .data.size = tensordatasz,
     };
     nnret = wasi_ephemeral_nn_set_input(ctx, 0, &tensor);
     unmap_file(tensordata, tensordatasz);

wamr-wasi-extensions/socket/CMakeLists.txt

@@ -13,12 +13,6 @@ target_include_directories(wamr-wasi-socket
                            $<BUILD_INTERFACE:${wasi_socket_header_dir}>
                            $<INSTALL_INTERFACE:include>)
 
-# as this is a library, be extra conservative about wasm features
-# to improve compatibilities. as this particular library is just a
-# simple static stub, extra wasm features won't benefit us much anyway.
-# note that LLVM-19 enables reference-types by default.
-target_compile_options(wamr-wasi-socket PRIVATE -mno-reference-types)
-
 install(TARGETS wamr-wasi-socket
         EXPORT wamr-wasi-socket-config
         PUBLIC_HEADER DESTINATION include)

wamr-wasi-extensions/test.sh

@@ -5,7 +5,35 @@
 
 set -e
 
-PREFIX=${1:-/tmp/wamr}
+PREFIX=/tmp/wamr
+WASI_SDK=${WASI_SDK:-/opt/wasi-sdk}
 
-./build_libs.sh ${PREFIX}
+cmake -B build-lib \
-./build_samples.sh ${PREFIX}
+-DCMAKE_TOOLCHAIN_FILE=${WASI_SDK}/share/cmake/wasi-sdk.cmake \
+-DCMAKE_INSTALL_PREFIX=${PREFIX} \
+.
+cmake --build build-lib -t install
+
+cmake -B build-app-nn \
+-DCMAKE_TOOLCHAIN_FILE=${WASI_SDK}/share/cmake/wasi-sdk.cmake \
+-DCMAKE_PREFIX_PATH=${PREFIX} \
+samples/nn
+cmake --build build-app-nn
+
+cmake -B build-app-nn-cli \
+-DCMAKE_TOOLCHAIN_FILE=${WASI_SDK}/share/cmake/wasi-sdk.cmake \
+-DCMAKE_PREFIX_PATH=${PREFIX} \
+samples/nn-cli
+cmake --build build-app-nn-cli
+
+cmake -B build-app-socket-nslookup \
+-DCMAKE_TOOLCHAIN_FILE=${WASI_SDK}/share/cmake/wasi-sdk-pthread.cmake \
+-DCMAKE_PREFIX_PATH=${PREFIX} \
+samples/socket-nslookup
+cmake --build build-app-socket-nslookup
+
+cmake -B build-app-socket-tcp-udp \
+-DCMAKE_TOOLCHAIN_FILE=${WASI_SDK}/share/cmake/wasi-sdk-pthread.cmake \
+-DCMAKE_PREFIX_PATH=${PREFIX} \
+samples/socket-tcp-udp
+cmake --build build-app-socket-tcp-udp