Merge pull request #738 from bytecodealliance/main

Import test suites to test spec cases (#736)
bytecodealliance · Sep 9, 2021 · 87d0dfd · 87d0dfd
2 parents 3f71a1f + 00663f0
commit 87d0dfd
Show file tree

Hide file tree

Showing 15 changed files with 4,290 additions and 6 deletions.
diff --git a/ATTRIBUTIONS.md b/ATTRIBUTIONS.md
@@ -63,3 +63,7 @@ The WAMR fast interpreter is a clean room development. We would acknowledge the
 ### zephyr
 
 [LICENSE](./samples/gui/wasm-runtime-wgl/src/platform/zephyr/LICENSE)
+
+### wac
+
+[LICENSE](./tests/wamr-test-suites/spec-test-script/LICENSE)
diff --git a/core/iwasm/compilation/aot_llvm.c b/core/iwasm/compilation/aot_llvm.c
@@ -1220,7 +1220,7 @@ WAMRCreateMCJITCompilerForModule(LLVMExecutionEngineRef *OutJIT,
 void LLVMAddPromoteMemoryToRegisterPass(LLVMPassManagerRef PM);
 
 #if WASM_ENABLE_LAZY_JIT != 0
-void 
+void
 aot_handle_llvm_errmsg(char *error_buf,
                        uint32 error_buf_size,
                        const char *string,
@@ -1234,7 +1234,7 @@ aot_handle_llvm_errmsg(char *error_buf,
     LLVMDisposeErrorMessage(err_msg);
 }
 
-static bool 
+static bool
 llvm_orcjit_create(AOTCompContext *comp_ctx)
 {
     char *err_msg = NULL;
@@ -1329,7 +1329,7 @@ llvm_orcjit_create(AOTCompContext *comp_ctx)
     /* if success, it will dispose lazy_orcjit_builder memory */
     error = LLVMOrcCreateLLLazyJIT(&lazy_orcjit, lazy_orcjit_builder);
     if (error) {
-        aot_handle_llvm_errmsg(buf, sizeof(buf), 
+        aot_handle_llvm_errmsg(buf, sizeof(buf),
                                "failed to create llvm lazy orcjit instance",
                                error);
         goto fail;
@@ -1340,7 +1340,7 @@ llvm_orcjit_create(AOTCompContext *comp_ctx)
                 &main_gen, LLVMOrcLLLazyJITGetGlobalPrefix(lazy_orcjit),
                 0, NULL);
     if (error) {
-        aot_handle_llvm_errmsg(buf, sizeof(buf), 
+        aot_handle_llvm_errmsg(buf, sizeof(buf),
                 "failed to create dynmaic library search generator", error);
         goto fail;
     }

diff --git a/core/iwasm/compilation/aot_llvm.h b/core/iwasm/compilation/aot_llvm.h
@@ -430,7 +430,7 @@ bool
 aot_check_simd_compatibility(const char *arch_c_str, const char *cpu_c_str);
 
 #if WASM_ENABLE_LAZY_JIT != 0
-void 
+void
 aot_handle_llvm_errmsg(char *error_buf,
                        uint32 error_buf_size,
                        const char *string,

diff --git a/doc/build_wamr.md b/doc/build_wamr.md
@@ -199,7 +199,7 @@ make
 ```
 
 
-By default in Linux, the interpreter, AOT and WASI are enabled, and JIT and LazyJIT are disabled. 
+By default in Linux, the interpreter, AOT and WASI are enabled, and JIT and LazyJIT are disabled.
 And the build target is set to X86_64 or X86_32 depending on the platform's bitwidth.
 
 To enable WASM JIT, firstly we should build LLVM:

diff --git a/tests/wamr-test-suites/README.md b/tests/wamr-test-suites/README.md
@@ -0,0 +1,40 @@
+# WAMR test suites
+
+This folder contains test scripts and cases for wamr.
+
+## Help
+```
+./test_wamr.sh --help
+```
+
+## Examples
+Test spec cases with fast interpreter mode, which will create folder `workspace`, download the `spec` and `wabt` repo, and build `iwasm` automatically to test spec cases:
+```
+./test_wamr.sh -s spec -t fast-interp
+```
+
+Test spec cases with aot mode, and use the wabt binary release package instead of compiling wabt from the source code:
+```
+./test_wamr.sh -s spec -t aot -b
+```
+
+Test spec cases with all modes (classic-interp/fast-interp/aot/jit):
+```
+./test_wamr.sh -s spec
+```
+
+Test spec cases with aot mode and pthread enabled:
+```
+./test_wamr.sh -s spec -t aot -p
+```
+
+Test spec cases with aot mode and SIMD enabled:
+```
+./test_wamr.sh -s spec -t aot -S
+```
+
+Test spec cases with fast-interp on target x86_32:
+```
+./test_wamr.sh -s spec -t fast-interp -m x86_32
+```
+
diff --git a/tests/wamr-test-suites/spec-test-script/CHANGES b/tests/wamr-test-suites/spec-test-script/CHANGES
@@ -0,0 +1,5 @@
+####################
+2021-9-8
+
+Modify runtest.py from https://github.com/kanaka/wac/blob/master/runtest.py
+to enable testing spec cases with more checks and support more runtime modes.