From 9f637e6f0a8ba7d42f784375dfb1782baf2baeb5 Mon Sep 17 00:00:00 2001 From: YAMAMOTO Takashi Date: Thu, 18 Jul 2024 14:32:40 +0900 Subject: [PATCH] wamr-test-suites/test_wamr.sh: Add an option to specify wamrc binary (#3635) --- .../wamr-test-suites/spec-test-script/all.py | 22 ++++++++++++++----- tests/wamr-test-suites/test_wamr.sh | 16 +++++++++++--- 2 files changed, 30 insertions(+), 8 deletions(-) diff --git a/tests/wamr-test-suites/spec-test-script/all.py b/tests/wamr-test-suites/spec-test-script/all.py index dadf394da..56ec16bee 100644 --- a/tests/wamr-test-suites/spec-test-script/all.py +++ b/tests/wamr-test-suites/spec-test-script/all.py @@ -129,7 +129,7 @@ def ignore_the_case( return False -def preflight_check(aot_flag, eh_flag): +def preflight_check(aot_flag, aot_compiler, eh_flag): if not pathlib.Path(SPEC_TEST_DIR).resolve().exists(): print(f"Can not find {SPEC_TEST_DIR}") return False @@ -138,8 +138,8 @@ def preflight_check(aot_flag, eh_flag): print(f"Can not find {WAST2WASM_CMD}") return False - if aot_flag and not pathlib.Path(WAMRC_CMD).resolve().exists(): - print(f"Can not find {WAMRC_CMD}") + if aot_flag and not pathlib.Path(aot_compiler).resolve().exists(): + print(f"Can not find {aot_compiler}") return False return True @@ -149,6 +149,7 @@ def test_case( case_path, target, aot_flag=False, + aot_compiler=WAMRC_CMD, sgx_flag=False, multi_module_flag=False, multi_thread_flag=False, @@ -177,7 +178,7 @@ def test_case( if no_pty: CMD.append("--no-pty") CMD.append("--aot-compiler") - CMD.append(WAMRC_CMD) + CMD.append(aot_compiler) if aot_flag: CMD.append("--aot") @@ -274,6 +275,7 @@ def test_case( def test_suite( target, aot_flag=False, + aot_compiler=WAMRC_CMD, sgx_flag=False, multi_module_flag=False, multi_thread_flag=False, @@ -348,6 +350,7 @@ def test_suite( str(case_path), target, aot_flag, + aot_compiler, sgx_flag, multi_module_flag, multi_thread_flag, @@ -389,6 +392,7 @@ def test_suite( str(case_path), target, aot_flag, + aot_compiler, sgx_flag, multi_module_flag, multi_thread_flag, @@ -470,6 +474,12 @@ def main(): dest="aot_flag", help="Running with AOT mode", ) + parser.add_argument( + "--aot-compiler", + default=WAMRC_CMD, + dest="aot_compiler", + help="AOT compiler", + ) parser.add_argument( "-x", action="store_true", @@ -550,7 +560,7 @@ def main(): if options.target == "x86_32": options.target = "i386" - if not preflight_check(options.aot_flag, options.eh_flag): + if not preflight_check(options.aot_flag, options.aot_compiler, options.eh_flag): return False if not options.cases: @@ -564,6 +574,7 @@ def main(): ret = test_suite( options.target, options.aot_flag, + options.aot_compiler, options.sgx_flag, options.multi_module_flag, options.multi_thread_flag, @@ -591,6 +602,7 @@ def main(): case, options.target, options.aot_flag, + options.aot_compiler, options.sgx_flag, options.multi_module_flag, options.multi_thread_flag, diff --git a/tests/wamr-test-suites/test_wamr.sh b/tests/wamr-test-suites/test_wamr.sh index 563c47e47..c21da0a9f 100755 --- a/tests/wamr-test-suites/test_wamr.sh +++ b/tests/wamr-test-suites/test_wamr.sh @@ -39,6 +39,7 @@ function help() echo "-C enable code coverage collect" echo "-j set the platform to test" echo "-T set sanitizer to use in tests(ubsan|tsan|asan)" + echo "-A use the specified wamrc command instead of building it" echo "-r [requirement name] [N [N ...]] specify a requirement name followed by one or more" echo " subrequirement IDs, if no subrequirement is specificed," echo " it will run all subrequirements. When this optin is used," @@ -75,6 +76,7 @@ fi PARALLELISM=0 ENABLE_QEMU=0 QEMU_FIRMWARE="" +WAMRC_CMD="" # prod/testsuite-all branch WASI_TESTSUITE_COMMIT="ee807fc551978490bf1c277059aabfa1e589a6c2" TARGET_LIST=("AARCH64" "AARCH64_VFP" "ARMV7" "ARMV7_VFP" "THUMBV7" "THUMBV7_VFP" \ @@ -83,7 +85,7 @@ REQUIREMENT_NAME="" # Initialize an empty array for subrequirement IDs SUBREQUIREMENT_IDS=() -while getopts ":s:cabgvt:m:MCpSXexwWPGQF:j:T:r:" opt +while getopts ":s:cabgvt:m:MCpSXexwWPGQF:j:T:r:A:" opt do OPT_PARSED="TRUE" case $opt in @@ -214,6 +216,10 @@ do echo "Only Test requirement name: ${REQUIREMENT_NAME}" [[ ${#SUBREQUIREMENT_IDS[@]} -ne 0 ]] && echo "Choose subrequirement IDs: ${SUBREQUIREMENT_IDS[@]}" ;; + A) + echo "Using wamrc ${OPTARG}" + WAMRC_CMD=${OPTARG} + ;; ?) help exit 1 @@ -251,7 +257,7 @@ else readonly IWASM_CMD="${WAMR_DIR}/product-mini/platforms/${PLATFORM}/build/iwasm" fi -readonly WAMRC_CMD="${WAMR_DIR}/wamr-compiler/build/wamrc" +readonly WAMRC_CMD_DEFAULT="${WAMR_DIR}/wamr-compiler/build/wamrc" readonly CLASSIC_INTERP_COMPILE_FLAGS="\ -DWAMR_BUILD_TARGET=${TARGET} \ @@ -550,6 +556,7 @@ function spec_test() # require warmc only in aot mode if [[ $1 == 'aot' ]]; then ARGS_FOR_SPEC_TEST+="-t " + ARGS_FOR_SPEC_TEST+="--aot-compiler ${WAMRC_CMD} " fi if [[ ${PARALLELISM} == 1 ]]; then @@ -1052,7 +1059,10 @@ function trigger() if [[ ${ENABLE_QEMU} == 0 ]]; then build_iwasm_with_cfg $BUILD_FLAGS fi - build_wamrc + if [ -z "${WAMRC_CMD}" ]; then + build_wamrc + WAMRC_CMD=${WAMRC_CMD_DEFAULT} + fi for suite in "${TEST_CASE_ARR[@]}"; do $suite"_test" aot done