Merge pull request #897 from bytecodealliance/main

Merge main into dev/socket_api

Author: wenyongh

core/iwasm/aot/aot_loader.c

@@ -1689,11 +1689,19 @@ resolve_target_sym(const char *symbol, int32 *p_index)
     if (!(target_sym_map = get_target_symbol_map(&num)))
         return NULL;
 
-    for (i = 0; i < num; i++)
-        if (!strcmp(target_sym_map[i].symbol_name, symbol)) {
+    for (i = 0; i < num; i++) {
+        if (!strcmp(target_sym_map[i].symbol_name, symbol)
+#if defined(_WIN32) || defined(_WIN32_)
+            /* In Win32, the symbol name of function added by
+               LLVMAddFunction() is prefixed by '_', ignore it */
+            || (strlen(symbol) > 1 && symbol[0] == '_'
+                && !strcmp(target_sym_map[i].symbol_name, symbol + 1))
+#endif
+        ) {
             *p_index = (int32)i;
             return target_sym_map[i].symbol_addr;
         }
+    }
     return NULL;
 }
 

core/iwasm/compilation/aot_emit_aot_file.c

@@ -149,17 +149,17 @@ static void dump_buf(uint8 *buf, uint32 size, char *title)
 #endif
 
 static bool
-is_32bit_binary(LLVMBinaryRef binary)
+is_32bit_binary(const AOTObjectData *obj_data)
 {
-    LLVMBinaryType type = LLVMBinaryGetType(binary);
-    return (type == LLVMBinaryTypeELF32L || type == LLVMBinaryTypeELF32B);
+    /* bit 1: 0 is 32-bit, 1 is 64-bit */
+    return obj_data->target_info.bin_type & 2 ? false : true;
 }
 
 static bool
-is_little_endian_binary(LLVMBinaryRef binary)
+is_little_endian_binary(const AOTObjectData *obj_data)
 {
-    LLVMBinaryType type = LLVMBinaryGetType(binary);
-    return (type == LLVMBinaryTypeELF32L || type == LLVMBinaryTypeELF64L);
+    /* bit 0: 0 is little-endian, 1 is big-endian */
+    return obj_data->target_info.bin_type & 1 ? false : true;
 }
 
 static bool
@@ -568,7 +568,7 @@ get_func_section_size(AOTCompData *comp_data, AOTObjectData *obj_data)
     /* text offsets + function type indexs */
     uint32 size = 0;
 
-    if (is_32bit_binary(obj_data->binary))
+    if (is_32bit_binary(obj_data))
         size = (uint32)sizeof(uint32) * comp_data->func_count;
     else
         size = (uint32)sizeof(uint64) * comp_data->func_count;
@@ -852,7 +852,7 @@ get_relocation_section_size(AOTCompContext *comp_ctx, AOTObjectData *obj_data)
     return (uint32)sizeof(uint32) + symbol_table_size
            + get_relocation_groups_size(relocation_groups,
                                         relocation_group_count,
-                                        is_32bit_binary(obj_data->binary));
+                                        is_32bit_binary(obj_data));
 }
 
 static uint32
@@ -1181,7 +1181,7 @@ get_name_section_size(AOTCompData *comp_data)
         return 0;
     }
 
-    max_aot_buf_size = 4 * (p_end - p);
+    max_aot_buf_size = 4 * (uint32)(p_end - p);
     if (!(buf = comp_data->aot_name_section_buf =
               wasm_runtime_malloc(max_aot_buf_size))) {
         aot_set_last_error("allocate memory for custom name section failed.");
@@ -1689,7 +1689,7 @@ aot_emit_func_section(uint8 *buf, uint8 *buf_end, uint32 *p_offset,
     EMIT_U32(section_size);
 
     for (i = 0; i < obj_data->func_count; i++, func++) {
-        if (is_32bit_binary(obj_data->binary))
+        if (is_32bit_binary(obj_data))
             EMIT_U32(func->text_offset);
         else
             EMIT_U64(func->text_offset);
@@ -1816,7 +1816,7 @@ aot_emit_relocation_section(uint8 *buf, uint8 *buf_end, uint32 *p_offset,
         /* emit each relocation */
         for (j = 0; j < relocation_group->relocation_count; j++, relocation++) {
             offset = align_uint(offset, 4);
-            if (is_32bit_binary(obj_data->binary)) {
+            if (is_32bit_binary(obj_data)) {
                 EMIT_U32(relocation->relocation_offset);
                 EMIT_U32(relocation->relocation_addend);
             }
@@ -1883,9 +1883,9 @@ aot_emit_name_section(uint8 *buf, uint8 *buf_end, uint32 *p_offset,
         /* sub section id + name section size */
         EMIT_U32(sizeof(uint32) * 1 + comp_data->aot_name_section_size);
         EMIT_U32(AOT_CUSTOM_SECTION_NAME);
-        bh_memcpy_s((uint8 *)(buf + offset), buf_end - buf,
+        bh_memcpy_s((uint8 *)(buf + offset), (uint32)(buf_end - buf),
                     comp_data->aot_name_section_buf,
-                    comp_data->aot_name_section_size);
+                    (uint32)comp_data->aot_name_section_size);
         offset += comp_data->aot_name_section_size;
 
         *p_offset = offset;
@@ -2321,8 +2321,8 @@ aot_resolve_object_relocation_group(AOTObjectData *obj_data,
     LLVMRelocationIteratorRef rel_itr;
     AOTRelocation *relocation = group->relocations;
     uint32 size;
-    bool is_binary_32bit = is_32bit_binary(obj_data->binary);
-    bool is_binary_little_endian = is_little_endian_binary(obj_data->binary);
+    bool is_binary_32bit = is_32bit_binary(obj_data);
+    bool is_binary_little_endian = is_little_endian_binary(obj_data);
     bool has_addend = str_starts_with(group->section_name, ".rela");
     uint8 *rela_content = NULL;
 

core/iwasm/compilation/aot_llvm.c

@@ -1069,6 +1069,7 @@ static ArchItem valid_archs[] = {
     { "i386", false },
     { "xtensa", false },
     { "mips", true },
+    { "mipsel", false },
     { "aarch64v8", false },
     { "aarch64v8.1", false },
     { "aarch64v8.2", false },

core/iwasm/interpreter/wasm_loader.c

@@ -3342,6 +3342,7 @@ create_sections(const uint8 *buf, uint32 size, WASMSection **p_section_list,
                 if (last_section_index != (uint8)-1
                     && (section_index <= last_section_index)) {
                     set_error_buf(error_buf, error_buf_size,
+                                  "unexpected content after last section or "
                                   "junk after last section");
                     return false;
                 }

core/iwasm/libraries/libc-builtin/libc_builtin_wrapper.c

@@ -1161,7 +1161,7 @@ static NativeSymbol native_symbols_libc_builtin[] = {
     REG_NATIVE_FUNC(strtol, "($*i)i"),
     REG_NATIVE_FUNC(strtoul, "($*i)i"),
     REG_NATIVE_FUNC(memchr, "(*ii)i"),
-    REG_NATIVE_FUNC(strncasecmp, "($$i)"),
+    REG_NATIVE_FUNC(strncasecmp, "($$i)i"),
     REG_NATIVE_FUNC(strspn, "($$)i"),
     REG_NATIVE_FUNC(strcspn, "($$)i"),
     REG_NATIVE_FUNC(strstr, "($$)i"),

tests/wamr-test-suites/spec-test-script/all.py

@@ -204,70 +204,59 @@ def test_suite(
     xip_flag=False,
     clean_up_flag=True,
     verbose_flag=True,
+    parl_flag=False,
 ):
     suite_path = pathlib.Path(SPEC_TEST_DIR).resolve()
     if not suite_path.exists():
         print(f"can not find spec test cases at {suite_path}")
         return False
 
-    case_list = sorted(suite_path.glob("**/*.wast"))
+    case_list = sorted(suite_path.glob("*.wast"))
+    if simd_flag:
+        simd_case_list = sorted(suite_path.glob("simd/*.wast"))
+        case_list.extend(simd_case_list)
+
     case_count = len(case_list)
     failed_case = 0
     successful_case = 0
-    for case_path in case_list:
-        try:
-            test_case(
-                str(case_path),
-                target,
-                aot_flag,
-                sgx_flag,
-                multi_module_flag,
-                multi_thread_flag,
-                simd_flag,
-                xip_flag,
-                clean_up_flag,
-                verbose_flag,
-            )
-            successful_case += 1
-        except Exception:
-            failed_case += 1
-            break
-
-    print(
-        f"IN ALL {case_count} cases: {successful_case} PASS, {failed_case} FAIL, {case_count - successful_case - failed_case} SKIP"
-    )
-
-    return 0 == failed_case
 
+    if parl_flag:
+        print(f"----- Run the whole spec test suite on {mp.cpu_count()} cores -----")
+        with mp.Pool() as pool:
+            results = {}
+            for case_path in case_list:
+                results[case_path.stem] = pool.apply_async(
+                    test_case,
+                    [
+                        str(case_path),
+                        target,
+                        aot_flag,
+                        sgx_flag,
+                        multi_module_flag,
+                        multi_thread_flag,
+                        simd_flag,
+                        xip_flag,
+                        clean_up_flag,
+                        verbose_flag,
+                    ],
+                )
 
-def test_suite_parallelly(
-    target,
-    aot_flag=False,
-    sgx_flag=False,
-    multi_module_flag=False,
-    multi_thread_flag=False,
-    simd_flag=False,
-    xip_flag=False,
-    clean_up_flag=False,
-    verbose_flag=False,
-):
-
-    suite_path = pathlib.Path(SPEC_TEST_DIR).resolve()
-    if not suite_path.exists():
-        print(f"can not find spec test cases at {suite_path}")
-        return False
-
-    case_list = sorted(suite_path.glob("**/*.wast"))
-    case_count = len(case_list)
-    failed_case = 0
-    successful_case = 0
-    print(f"----- Run the whole spec test suite on {mp.cpu_count()} cores -----")
-    with mp.Pool() as pool:
-        results = {}
+            for case_name, result in results.items():
+                try:
+                    # 5 min / case
+                    result.wait(300)
+                    if not result.successful():
+                        failed_case += 1
+                    else:
+                        successful_case += 1
+                except mp.TimeoutError:
+                    print(f"{case_name} meets TimeoutError")
+                    failed_case += 1
+    else:
+        print(f"----- Run the whole spec test suite -----")
         for case_path in case_list:
-            results[case_path.stem] = pool.apply_async(
-                test_case,
-                [
+            try:
+                test_case(
                     str(case_path),
                     target,
                     aot_flag,
@@ -278,20 +267,11 @@ def test_suite_parallelly(
                     xip_flag,
                     clean_up_flag,
                     verbose_flag,
-                ],
-            )
-
-        for case_name, result in results.items():
-            try:
-                # 5 min / case
-                result.wait(300)
-                if not result.successful():
-                    failed_case += 1
-                else:
-                    successful_case += 1
-            except mp.TimeoutError:
-                print(f"{case_name} meets TimeoutError")
+                )
+                successful_case += 1
+            except Exception:
                 failed_case += 1
+                break
 
     print(
         f"IN ALL {case_count} cases: {successful_case} PASS, {failed_case} FAIL, {case_count - successful_case - failed_case} SKIP"
@@ -396,37 +376,23 @@ def main():
             options.clean_up_flag = False
             options.verbose_flag = False
 
-            start = time.time_ns()
-            ret = test_suite_parallelly(
-                options.target,
-                options.aot_flag,
-                options.sgx_flag,
-                options.multi_module_flag,
-                options.multi_thread_flag,
-                options.simd_flag,
-                options.xip_flag,
-                options.clean_up_flag,
-                options.verbose_flag,
-            )
-            end = time.time_ns()
-            print(
-                f"It takes {((end - start) / 1000000):,} ms to run test_suite_parallelly"
-            )
-        else:
-            start = time.time_ns()
-            ret = test_suite(
-                options.target,
-                options.aot_flag,
-                options.sgx_flag,
-                options.multi_module_flag,
-                options.multi_thread_flag,
-                options.simd_flag,
-                options.xip_flag,
-                options.clean_up_flag,
-                options.verbose_flag,
-            )
-            end = time.time_ns()
-            print(f"It takes {((end - start) / 1000000):,} ms to run test_suite")
+        start = time.time_ns()
+        ret = test_suite(
+            options.target,
+            options.aot_flag,
+            options.sgx_flag,
+            options.multi_module_flag,
+            options.multi_thread_flag,
+            options.simd_flag,
+            options.xip_flag,
+            options.clean_up_flag,
+            options.verbose_flag,
+            options.parl_flag,
+        )
+        end = time.time_ns()
+        print(
+            f"It takes {((end - start) / 1000000):,} ms to run test_suite {'parallelly' if options.parl_flag else ''}"
+        )
     else:
         try:
             for case in options.cases:

tests/wamr-test-suites/test_wamr.sh

@@ -279,8 +279,12 @@ function spec_test()
     # restore from XX_ignore_cases.patch
     # resotre branch
     git checkout -B master
-    git reset --hard 397399a70565609bf142d211891724e21bffd01f
+    # [spec] Fix instruction table (#1402) Thu Dec 2 17:21:54 2021 +0100
+    git reset --hard 2460ad02b51fb5ed5824f44de287a8638b19a5f8
     git apply ../../spec-test-script/ignore_cases.patch
+    if [[ ${ENABLE_SIMD} == 1 ]]; then
+        git apply ../../spec-test-script/simd_ignore_cases.patch
+    fi
 
     # udpate thread cases
     if [ ${ENABLE_MULTI_THREAD} == 1 ]; then
@@ -298,20 +302,6 @@ function spec_test()
         git apply ../../spec-test-script/thread_proposal_ignore_cases.patch
     fi
 
-    # udpate SIMD cases
-    if [[ ${ENABLE_SIMD} == 1 ]]; then
-        echo "checkout spec for SIMD proposal"
-        # check spec test cases for simd
-        if [[ -z $(git remote | grep "\<simd\>") ]]; then
-            git remote add simd https://github.com/WebAssembly/simd.git
-        fi
-
-        git fetch simd
-        git checkout simd/main -- test/core/simd
-
-        git apply ../../spec-test-script/simd_ignore_cases.patch
-    fi
-
     popd
     echo $(pwd)