From 37ae6c726bc510c4a3fc1ba4e5ef1b335d84ea52 Mon Sep 17 00:00:00 2001 From: jiangkaiwen Date: Sat, 6 May 2023 11:47:14 +0800 Subject: [PATCH] Simplify the execution command of the tests262 for ts2abc and es2abc Issue:I6UH3X Signed-off-by: jiangkaiwen Change-Id: I7a21554eebd242ba9f1d4961ce2dce1406a9dce8 --- test262/config.py | 30 +++++++++++++++++++++--------- test262/run_sunspider.py | 4 ++++ test262/run_test262.py | 17 +++++++++++++++++ 3 files changed, 42 insertions(+), 9 deletions(-) diff --git a/test262/config.py b/test262/config.py index b1d6c70a9b..e105be511c 100755 --- a/test262/config.py +++ b/test262/config.py @@ -30,10 +30,7 @@ BASE_OUT_DIR = os.path.join("out", "test262") CUR_FILE_DIR = os.path.dirname(__file__) CODE_ROOT = os.path.abspath(os.path.join(CUR_FILE_DIR, "../../..")) -ARK_DIR = f"{CODE_ROOT}/out/hispark_taurus/clang_x64/arkcompiler/ets_frontend" -ICUI_DIR = f"{CODE_ROOT}/out/hispark_taurus/clang_x64/thirdparty/icu" LLVM_DIR = f"{CODE_ROOT}/prebuilts/clang/ohos/linux-x86_64/llvm/lib/" -ARK_JS_RUNTIME_DIR = f"{CODE_ROOT}/out/hispark_taurus/clang_x64/arkcompiler/ets_runtime" DEFAULT_MODE = 2 @@ -44,9 +41,24 @@ TEST_ES2021_DIR = os.path.join(DATA_DIR, "test_es2021") TEST_INTL_DIR = os.path.join(DATA_DIR, "test_intl") TEST_CI_DIR = os.path.join(DATA_DIR, "test_CI") -DEFAULT_ARK_TOOL = os.path.join(ARK_JS_RUNTIME_DIR, "ark_js_vm") -DEFAULT_ARK_AOT_TOOL = os.path.join(ARK_JS_RUNTIME_DIR, "ark_aot_compiler") -DEFAULT_LIBS_DIR = f"{ICUI_DIR}:{LLVM_DIR}:{ARK_JS_RUNTIME_DIR}" +HISPARK_TAURUS_PRODUCT_NAME = "hispark_taurus" +RK3568_PRODUCT_NAME = "rk3568" +DEFAULT_PRODUCT_NAME = HISPARK_TAURUS_PRODUCT_NAME + +ARGS_PREFIX = f"{CODE_ROOT}/out/" +ARK_DIR_SUFFIX = "/clang_x64/arkcompiler/ets_frontend" +ICUI_DIR_SUFFIX = "/clang_x64/thirdparty/icu" +ARK_JS_RUNTIME_DIR_SUFFIX = "/clang_x64/arkcompiler/ets_runtime" +ZLIB_DIR_SUFFIX = "/clang_x64/thirdparty/zlib" + +DEFAULT_ARK_DIR = f"{CODE_ROOT}/out/hispark_taurus/clang_x64/arkcompiler/ets_frontend" +DEFAULT_ICUI_DIR = f"{CODE_ROOT}/out/hispark_taurus/clang_x64/thirdparty/icu" +DEFAULT_ARK_JS_RUNTIME_DIR = f"{CODE_ROOT}/out/hispark_taurus/clang_x64/arkcompiler/ets_runtime" +DEFAULT_ZLIB_DIR = f"{CODE_ROOT}/out/hispark_taurus/clang_x64/thirdparty/zlib" + +DEFAULT_ARK_TOOL = os.path.join(DEFAULT_ARK_JS_RUNTIME_DIR, "ark_js_vm") +DEFAULT_LIBS_DIR = f"{DEFAULT_ICUI_DIR}:{LLVM_DIR}:{DEFAULT_ARK_JS_RUNTIME_DIR}:{DEFAULT_ZLIB_DIR}" +DEFAULT_ARK_AOT_TOOL = os.path.join(DEFAULT_ARK_JS_RUNTIME_DIR, "ark_aot_compiler") DEFAULT_HOST_TYPE = "panda" DEFAULT_HOST_PATH = "python3" @@ -93,13 +105,13 @@ ARK_FRONTEND_LIST = [ ] ARK_FRONTEND_BINARY_LIST = [ - os.path.join(ARK_DIR, "build", "src", "index.js"), - os.path.join(ARK_DIR, "es2abc") + os.path.join(DEFAULT_ARK_DIR, "build", "src", "index.js"), + os.path.join(DEFAULT_ARK_DIR, "es2abc") ] DEFAULT_ARK_FRONTEND = ARK_FRONTEND_LIST[0] DEFAULT_ARK_FRONTEND_BINARY = ARK_FRONTEND_BINARY_LIST[0] -DEFAULT_MERGE_ABC_BINARY = os.path.join(ARK_DIR, "merge_abc") +DEFAULT_MERGE_ABC_BINARY = os.path.join(DEFAULT_ARK_DIR, "merge_abc") ARK_ARCH_LIST = [ "x64", diff --git a/test262/run_sunspider.py b/test262/run_sunspider.py index 71b61df6e6..c195d9936e 100755 --- a/test262/run_sunspider.py +++ b/test262/run_sunspider.py @@ -85,6 +85,10 @@ def parse_args(): default=DEFAULT_MERGE_ABC_MODE, required=False, help="run test for merge abc mode") + parser.add_argument('--product-name', + default=DEFAULT_PRODUCT_NAME, + required=False, + help="ark's product name") arguments = parser.parse_args() return arguments diff --git a/test262/run_test262.py b/test262/run_test262.py index 46557c6a1a..9a31f2edaf 100755 --- a/test262/run_test262.py +++ b/test262/run_test262.py @@ -103,6 +103,9 @@ def parse_args(): help="frontend merge abc binary tool") parser.add_argument('--merge-abc-mode', help="run test for merge abc mode") + parser.add_argument('--product-name', + default=DEFAULT_PRODUCT_NAME, + help="ark's product name") return parser.parse_args() @@ -493,6 +496,19 @@ def get_host_args(args, host_type): es2abc_thread_count = DEFAULT_ES2ABC_THREAD_COUNT merge_abc_binary = DEFAULT_MERGE_ABC_BINARY merge_abc_mode = DEFAULT_MERGE_ABC_MODE + product_name = DEFAULT_PRODUCT_NAME + + if args.product_name: + product_name = args.product_name + ark_dir = f"{ARGS_PREFIX}{product_name}{ARK_DIR_SUFFIX}" + icui_dir = f"{ARGS_PREFIX}{product_name}{ICUI_DIR_SUFFIX}" + ark_js_runtime_dir = f"{ARGS_PREFIX}{product_name}{ARK_JS_RUNTIME_DIR_SUFFIX}" + zlib_dir = f"{ARGS_PREFIX}{product_name}{ZLIB_DIR_SUFFIX}" + + ark_tool = os.path.join(ark_js_runtime_dir, "ark_js_vm") + libs_dir = f"{icui_dir}:{LLVM_DIR}:{ark_js_runtime_dir}:{zlib_dir}" + ark_aot_tool = os.path.join(ark_js_runtime_dir, "ark_aot_compiler") + merge_abc_binary = os.path.join(ark_dir, "merge_abc") if args.hostArgs: host_args = args.hostArgs @@ -537,6 +553,7 @@ def get_host_args(args, host_type): host_args += f"--es2abc-thread-count={es2abc_thread_count} " host_args += f"--merge-abc-binary={merge_abc_binary} " host_args += f"--merge-abc-mode={merge_abc_mode} " + host_args += f"--product-name={product_name} " if args.ark_arch != ark_arch: host_args += f"--ark-arch={args.ark_arch} " -- Gitee