Merge pull request #1592 from bytecodealliance/main

Merge main into dev/refactor_llvm_jit

Author: wenyongh

.gitignore

@@ -1,6 +1,7 @@
 .cache
 .vs
 .vscode
+.venv
 /.idea
 **/cmake-build-*/
 **/*build/

assembly-script/wamr_app_lib/request.ts

@@ -137,7 +137,7 @@ function not_expire(trans: wamr_transaction, index: i32, array: Array<wamr_trans
     var elapsed_ms = (now < trans.time) ?
         (now + (0xFFFFFFFF - trans.time) + 1) : (now - trans.time);
 
-    return elapsed_ms >= TRANSACTION_TIMEOUT_MS;
+    return elapsed_ms < TRANSACTION_TIMEOUT_MS;
 }
 
 function transaction_timeout_handler(): void {

build-scripts/config_common.cmake

@@ -303,3 +303,6 @@ if (WAMR_BUILD_SGX_IPFS EQUAL 1)
     add_definitions (-DWASM_ENABLE_SGX_IPFS=1)
     message ("     SGX IPFS enabled")
 endif ()
+if (WAMR_BUILD_WASI_NN EQUAL 1)
+  message ("     WASI-NN enabled")
+endif ()

build-scripts/runtime_lib.cmake

@@ -91,6 +91,19 @@ if (WAMR_BUILD_LIB_PTHREAD_SEMAPHORE EQUAL 1)
     set (WAMR_BUILD_LIB_PTHREAD 1)
 endif ()
 
+if (WAMR_BUILD_WASI_NN EQUAL 1)
+    execute_process(COMMAND ${WAMR_ROOT_DIR}/core/deps/install_tensorflow.sh
+                    RESULT_VARIABLE TENSORFLOW_RESULT
+    )
+    set(TENSORFLOW_SOURCE_DIR "${WAMR_ROOT_DIR}/core/deps/tensorflow-src")
+    include_directories (${CMAKE_CURRENT_BINARY_DIR}/flatbuffers/include)
+    include_directories (${TENSORFLOW_SOURCE_DIR})
+    add_subdirectory(
+        "${TENSORFLOW_SOURCE_DIR}/tensorflow/lite"
+        "${CMAKE_CURRENT_BINARY_DIR}/tensorflow-lite" EXCLUDE_FROM_ALL)
+    include (${IWASM_DIR}/libraries/wasi-nn/wasi_nn.cmake)
+endif ()
+
 if (WAMR_BUILD_LIB_PTHREAD EQUAL 1)
     include (${IWASM_DIR}/libraries/lib-pthread/lib_pthread.cmake)
     # Enable the dependent feature if lib pthread is enabled
@@ -152,6 +165,7 @@ set (source_all
     ${UTILS_SHARED_SOURCE}
     ${LIBC_BUILTIN_SOURCE}
     ${LIBC_WASI_SOURCE}
+    ${LIBC_WASI_NN_SOURCE}
     ${IWASM_COMMON_SOURCE}
     ${IWASM_INTERP_SOURCE}
     ${IWASM_AOT_SOURCE}

core/deps/install_tensorflow.sh

@@ -0,0 +1,11 @@
+#!/bin/sh
+
+DEPS_ROOT=$(cd "$(dirname "$0")/" && pwd)
+cd ${DEPS_ROOT}
+
+echo "Downloading tensorflow in ${PWD}..."
+
+git clone https://github.com/tensorflow/tensorflow.git tensorflow-src \
+    --branch v2.9.2
+
+exit 0

core/iwasm/common/wasm_native.c

@@ -33,6 +33,9 @@ get_spectest_export_apis(NativeSymbol **p_libc_builtin_apis);
 uint32
 get_libc_wasi_export_apis(NativeSymbol **p_libc_wasi_apis);
 
+uint32_t
+get_wasi_nn_export_apis(NativeSymbol **p_libc_wasi_apis);
+
 uint32
 get_base_lib_export_apis(NativeSymbol **p_base_lib_apis);
 
@@ -425,6 +428,13 @@ wasm_native_init()
         goto fail;
 #endif /* WASM_ENABLE_LIB_RATS */
 
+#if WASM_ENABLE_WASI_NN != 0
+    n_native_symbols = get_wasi_nn_export_apis(&native_symbols);
+    if (!wasm_native_register_natives("wasi_nn", native_symbols,
+                                      n_native_symbols))
+        return false;
+#endif
+
     return true;
 fail:
     wasm_native_destroy();

core/iwasm/common/wasm_shared_memory.c

@@ -323,7 +323,13 @@ wasm_runtime_atomic_wait(WASMModuleInstanceCommon *module, void *address,
         WASMModuleInstance *module_inst = (WASMModuleInstance *)module;
         /* Currently we have only one memory instance */
         if (!module_inst->memories[0]->is_shared) {
-            wasm_runtime_set_exception(module, "wait on unshared memory");
+            wasm_runtime_set_exception(module, "expected shared memory");
+            return -1;
+        }
+        if ((uint8 *)address < module_inst->memories[0]->memory_data
+            || (uint8 *)address + (wait64 ? 8 : 4)
+                   > module_inst->memories[0]->memory_data_end) {
+            wasm_runtime_set_exception(module, "out of bounds memory access");
             return -1;
         }
     }
@@ -335,7 +341,13 @@ wasm_runtime_atomic_wait(WASMModuleInstanceCommon *module, void *address,
             ((AOTMemoryInstance **)aot_inst->memories.ptr)[0];
         /* Currently we have only one memory instance */
         if (!aot_memory->is_shared) {
-            wasm_runtime_set_exception(module, "wait on unshared memory");
+            wasm_runtime_set_exception(module, "expected shared memory");
+            return -1;
+        }
+        if ((uint8 *)address < (uint8 *)aot_memory->memory_data.ptr
+            || (uint8 *)address + (wait64 ? 8 : 4)
+                   > (uint8 *)aot_memory->memory_data_end.ptr) {
+            wasm_runtime_set_exception(module, "out of bounds memory access");
             return -1;
         }
     }
@@ -424,6 +436,31 @@ wasm_runtime_atomic_notify(WASMModuleInstanceCommon *module, void *address,
     uint32 notify_result;
     AtomicWaitInfo *wait_info;
 
+#if WASM_ENABLE_INTERP != 0
+    if (module->module_type == Wasm_Module_Bytecode) {
+        WASMModuleInstance *module_inst = (WASMModuleInstance *)module;
+        if ((uint8 *)address < module_inst->memories[0]->memory_data
+            || (uint8 *)address + 4
+                   > module_inst->memories[0]->memory_data_end) {
+            wasm_runtime_set_exception(module, "out of bounds memory access");
+            return -1;
+        }
+    }
+#endif
+#if WASM_ENABLE_AOT != 0
+    if (module->module_type == Wasm_Module_AoT) {
+        AOTModuleInstance *aot_inst = (AOTModuleInstance *)module;
+        AOTMemoryInstance *aot_memory =
+            ((AOTMemoryInstance **)aot_inst->memories.ptr)[0];
+        if ((uint8 *)address < (uint8 *)aot_memory->memory_data.ptr
+            || (uint8 *)address + 4
+                   > (uint8 *)aot_memory->memory_data_end.ptr) {
+            wasm_runtime_set_exception(module, "out of bounds memory access");
+            return -1;
+        }
+    }
+#endif
+
     wait_info = acquire_wait_info(address, false);
 
     /* Nobody wait on this address */

core/iwasm/compilation/aot_compiler.c

@@ -1217,6 +1217,10 @@ aot_compile_func(AOTCompContext *comp_ctx, uint32 func_index)
                                 comp_ctx, func_ctx, align, offset, bytes))
                             return false;
                         break;
+                    case WASM_OP_ATOMIC_FENCE:
+                        /* Skip memory index */
+                        frame_ip++;
+                        break;
                     case WASM_OP_ATOMIC_I32_LOAD:
                         bytes = 4;
                         goto op_atomic_i32_load;

core/iwasm/fast-jit/jit_frontend.c

@@ -2052,6 +2052,10 @@ jit_compile_func(JitCompContext *cc)
                                                            bytes))
                             return false;
                         break;
+                    case WASM_OP_ATOMIC_FENCE:
+                        /* Skip memory index */
+                        frame_ip++;
+                        break;
                     case WASM_OP_ATOMIC_I32_LOAD:
                         bytes = 4;
                         goto op_atomic_i32_load;

core/iwasm/include/wasm_export.h

@@ -922,6 +922,12 @@ wasm_runtime_get_native_addr_range(wasm_module_inst_t module_inst,
 /**
  * Register native functions with same module name
  *
+ * Note: The array `native_symbols` should not be read-only because the
+ * library can modify it in-place.
+ *
+ * Note: After successful call of this function, the array `native_symbols`
+ * is owned by the library.
+ *
  * @param module_name the module name of the native functions
  * @param native_symbols specifies an array of NativeSymbol structures which
  *        contain the names, function pointers and signatures