Merge pull request #451 from bytecodealliance/main

Merge bytecodealliance:main into wenyongh:refactor_documents

Author: wenyongh

CMakeLists.txt

@@ -18,7 +18,7 @@ set (CMAKE_C_STANDARD 99)
 # "X86_64", "AMD_64", "X86_32", "AARCH64[sub]", "ARM[sub]", "THUMB[sub]",
 # "MIPS", "XTENSA", "RISCV64[sub]", "RISCV32[sub]"
 if (NOT DEFINED WAMR_BUILD_TARGET)
-  if (CMAKE_SYSTEM_PROCESSOR STREQUAL "arm64")
+  if (CMAKE_SYSTEM_PROCESSOR MATCHES "^(arm64|aarch64)")
     set (WAMR_BUILD_TARGET "AARCH64")
   elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "riscv64")
     set (WAMR_BUILD_TARGET "RISCV64")

build-scripts/runtime_lib.cmake

@@ -34,7 +34,7 @@ endif ()
 # "X86_64", "AMD_64", "X86_32", "AARCH64[sub]", "ARM[sub]", "THUMB[sub]",
 # "MIPS", "XTENSA", "RISCV64[sub]", "RISCV32[sub]"
 if (NOT DEFINED WAMR_BUILD_TARGET)
-    if (CMAKE_SYSTEM_PROCESSOR STREQUAL "arm64")
+    if (CMAKE_SYSTEM_PROCESSOR MATCHES "^(arm64|aarch64)")
         set (WAMR_BUILD_TARGET "AARCH64")
     elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "riscv64")
         set (WAMR_BUILD_TARGET "RISCV64")

ci/Dockerfile

@@ -1,6 +1,8 @@
 # Copyright (C) 2019 Intel Corporation.  All rights reserved.
 # SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
+# tie the ${VARIANT} and a llvm binary release together
+# please find a matched version on https://github.com/llvm/llvm-project/releases
 ARG VARIANT=focal
 FROM ubuntu:${VARIANT}
 
@@ -35,16 +37,21 @@ RUN cd /opt/emsdk \
   && echo "source /opt/emsdk/emsdk_env.sh" >> /root/.bashrc
 
 #
-# install clang and llvm
-RUN cd /tmp && wget https://apt.llvm.org/llvm.sh && chmod a+x llvm.sh
-RUN cd /tmp && ./llvm.sh 12
+# install clang and llvm release
+ARG CLANG_VER=13.0.0
+RUN wget https://github.com/llvm/llvm-project/releases/download/llvmorg-${CLANG_VER}/clang+llvm-${CLANG_VER}-x86_64-linux-gnu-ubuntu-20.04.tar.xz -P /opt
+RUN cd /opt \
+  && tar xf clang+llvm-${CLANG_VER}-x86_64-linux-gnu-ubuntu-20.04.tar.xz \
+  && ln -sf clang+llvm-${CLANG_VER}-x86_64-linux-gnu-ubuntu-20.04 clang-llvm
+RUN rm /opt/clang+llvm-${CLANG_VER}-x86_64-linux-gnu-ubuntu-20.04.tar.xz
+
 
 #
 # install wasi-sdk
 ARG WASI_SDK_VER=14
 RUN wget -c https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-${WASI_SDK_VER}/wasi-sdk-${WASI_SDK_VER}.0-linux.tar.gz -P /opt
 RUN tar xf /opt/wasi-sdk-${WASI_SDK_VER}.0-linux.tar.gz -C /opt \
-  && ln -fs /opt/was-sdk-${WASI_SDK_VER}.0 /opt/wasi-sdk
+  && ln -fs /opt/wasi-sdk-${WASI_SDK_VER}.0 /opt/wasi-sdk
 RUN rm /opt/wasi-sdk-${WASI_SDK_VER}.0-linux.tar.gz
 
 #
@@ -68,8 +75,8 @@ RUN chmod a+x /opt/bazelisk/bazelisk-linux-amd64 \
 RUN apt update && apt install -y clang-format
 
 # set path
-ENV PATH "$PATH:/opt/wasi-sdk/bin:/opt/wabt/bin:/opt/binaryen/bin:/opt/bazelisk"
-RUN echo "export PATH=/opt/wasi-sdk/bin:/opt/wabt/bin:/opt/binaryen/bin:/opt/bazelisk:${PATH}" >> /root/.bashrc
+ENV PATH "$PATH:/opt/wasi-sdk/bin:/opt/wabt/bin:/opt/binaryen/bin:/opt/bazelisk:/opt/clang-llvm/bin"
+RUN echo "export PATH=/opt/wasi-sdk/bin:/opt/wabt/bin:/opt/binaryen/bin:/opt/bazelisk:/opt/clang-llvm/bin:${PATH}" >> /root/.bashrc
 
 #
 # PS

ci/build_wamr.sh

@@ -8,7 +8,6 @@ readonly ROOT=$(realpath "${CURRENT_PATH}/..")
 readonly VARIANT=$(lsb_release -c | awk '{print $2}')
 
 docker build \
-    --build-arg VARIANT=${VARIANT} \
     --memory=4G --cpu-quota=50000 \
     -t wamr_dev_${VARIANT}:0.1 -f "${CURRENT_PATH}"/Dockerfile "${CURRENT_PATH}" \
   && docker run --rm -it \

core/iwasm/aot/aot_loader.c

@@ -1575,8 +1575,10 @@ load_function_section(const uint8 *buf, const uint8 *buf_end, AOTModule *module,
 
 #if defined(OS_ENABLE_HW_BOUND_CHECK) && defined(BH_PLATFORM_WINDOWS)
     if (module->func_count > 0) {
+        uint32 plt_table_size =
+            module->is_indirect_mode ? 0 : get_plt_table_size();
         rtl_func_table[module->func_count - 1].EndAddress =
-            (DWORD)(module->code_size - get_plt_table_size());
+            (DWORD)(module->code_size - plt_table_size);
 
         if (!RtlAddFunctionTable(rtl_func_table, module->func_count,
                                  (DWORD64)(uintptr_t)module->code)) {
@@ -2113,19 +2115,29 @@ load_relocation_section(const uint8 *buf, const uint8 *buf_end,
             memcpy(group_name_buf, group_name, group_name_len);
             memcpy(symbol_name_buf, symbol_name, symbol_name_len);
 
-            if (group_name_len == strlen(".text")
+            if ((group_name_len == strlen(".text")
+                 || (module->is_indirect_mode
+                     && group_name_len == strlen(".text") + 1))
                 && !strncmp(group_name, ".text", strlen(".text"))) {
-                if (symbol_name_len == strlen(XMM_PLT_PREFIX) + 32
+                if ((symbol_name_len == strlen(XMM_PLT_PREFIX) + 32
+                     || (module->is_indirect_mode
+                         && symbol_name_len == strlen(XMM_PLT_PREFIX) + 32 + 1))
                     && !strncmp(symbol_name, XMM_PLT_PREFIX,
                                 strlen(XMM_PLT_PREFIX))) {
                     module->xmm_plt_count++;
                 }
-                else if (symbol_name_len == strlen(REAL_PLT_PREFIX) + 16
+                else if ((symbol_name_len == strlen(REAL_PLT_PREFIX) + 16
+                          || (module->is_indirect_mode
+                              && symbol_name_len
+                                     == strlen(REAL_PLT_PREFIX) + 16 + 1))
                          && !strncmp(symbol_name, REAL_PLT_PREFIX,
                                      strlen(REAL_PLT_PREFIX))) {
                     module->real_plt_count++;
                 }
-                else if (symbol_name_len == strlen(REAL_PLT_PREFIX) + 8
+                else if ((symbol_name_len >= strlen(REAL_PLT_PREFIX) + 8
+                          || (module->is_indirect_mode
+                              && symbol_name_len
+                                     == strlen(REAL_PLT_PREFIX) + 8 + 1))
                          && !strncmp(symbol_name, REAL_PLT_PREFIX,
                                      strlen(REAL_PLT_PREFIX))) {
                     module->float_plt_count++;
@@ -2230,7 +2242,7 @@ load_relocation_section(const uint8 *buf, const uint8 *buf_end,
 #endif
         ) {
 #if !defined(BH_PLATFORM_LINUX) && !defined(BH_PLATFORM_LINUX_SGX) \
-    && !defined(BH_PLATFORM_DARWIN)
+    && !defined(BH_PLATFORM_DARWIN) && !defined(BH_PLATFORM_WINDOWS)
             if (module->is_indirect_mode) {
                 set_error_buf(error_buf, error_buf_size,
                               "cannot apply relocation to text section "

core/iwasm/aot/aot_runtime.c

@@ -1260,6 +1260,11 @@ aot_exception_handler(EXCEPTION_POINTERS *exce_info)
             return EXCEPTION_CONTINUE_EXECUTION;
         }
     }
+
+    os_printf("Unhandled exception thrown:  exception code: 0x%lx, "
+              "exception address: %p, exception information: %p\n",
+              ExceptionRecord->ExceptionCode, ExceptionRecord->ExceptionAddress,
+              sig_addr);
     return EXCEPTION_CONTINUE_SEARCH;
 }
 #endif /* end of BH_PLATFORM_WINDOWS */

core/iwasm/compilation/aot_emit_function.c

@@ -560,6 +560,10 @@ aot_compile_op_call(AOTCompContext *comp_ctx, AOTFuncContext *func_ctx,
             goto fail;
     }
     else {
+        bool recursive_call =
+            (func_ctx == func_ctxes[func_idx - import_func_count]) ? true
+                                                                   : false;
+
         if (comp_ctx->is_indirect_mode) {
             LLVMTypeRef func_ptr_type;
 
@@ -603,7 +607,8 @@ aot_compile_op_call(AOTCompContext *comp_ctx, AOTFuncContext *func_ctx,
 
         /* Check whether there was exception thrown when executing
            the function */
-        if (!tail_call && !check_exception_thrown(comp_ctx, func_ctx))
+        if (!tail_call && !recursive_call
+            && !check_exception_thrown(comp_ctx, func_ctx))
             goto fail;
     }
 

core/iwasm/compilation/aot_llvm.c

@@ -500,7 +500,7 @@ create_cur_exception(AOTCompContext *comp_ctx, AOTFuncContext *func_ctx)
 
     offset = I32_CONST(offsetof(AOTModuleInstance, cur_exception));
     func_ctx->cur_exception = LLVMBuildInBoundsGEP(
-        comp_ctx->builder, func_ctx->aot_inst, &offset, 1, "cur_execption");
+        comp_ctx->builder, func_ctx->aot_inst, &offset, 1, "cur_exception");
     if (!func_ctx->cur_exception) {
         aot_set_last_error("llvm build in bounds gep failed.");
         return false;
@@ -1877,6 +1877,8 @@ aot_create_comp_context(AOTCompData *comp_data, aot_comp_option_t option)
             aot_set_last_error("create LLVM target machine failed.");
             goto fail;
         }
+
+        LLVMSetTarget(comp_ctx->module, triple_norm);
     }
 
     if (option->enable_simd && strcmp(comp_ctx->target_arch, "x86_64") != 0
@@ -1935,6 +1937,11 @@ aot_create_comp_context(AOTCompData *comp_data, aot_comp_option_t option)
     LLVMAddIndVarSimplifyPass(comp_ctx->pass_mgr);
 
     if (!option->is_jit_mode) {
+        /* Put Vectorize passes before GVN/LICM passes as the former
+           might gain more performance improvement and the latter might
+           break the optimizations for the former */
+        LLVMAddLoopVectorizePass(comp_ctx->pass_mgr);
+        LLVMAddSLPVectorizePass(comp_ctx->pass_mgr);
         LLVMAddLoopRotatePass(comp_ctx->pass_mgr);
         LLVMAddLoopUnswitchPass(comp_ctx->pass_mgr);
         LLVMAddInstructionCombiningPass(comp_ctx->pass_mgr);
@@ -1944,11 +1951,9 @@ aot_create_comp_context(AOTCompData *comp_data, aot_comp_option_t option)
                disable them when building as multi-thread mode */
             LLVMAddGVNPass(comp_ctx->pass_mgr);
             LLVMAddLICMPass(comp_ctx->pass_mgr);
+            LLVMAddInstructionCombiningPass(comp_ctx->pass_mgr);
+            LLVMAddCFGSimplificationPass(comp_ctx->pass_mgr);
         }
-        LLVMAddLoopVectorizePass(comp_ctx->pass_mgr);
-        LLVMAddSLPVectorizePass(comp_ctx->pass_mgr);
-        LLVMAddInstructionCombiningPass(comp_ctx->pass_mgr);
-        LLVMAddCFGSimplificationPass(comp_ctx->pass_mgr);
     }
 
     /* Create metadata for llvm float experimental constrained intrinsics */
@@ -2608,4 +2613,4 @@ aot_load_const_from_table(AOTCompContext *comp_ctx, LLVMValueRef base,
     }
 
     return const_value;
-}
+}