From 4b5d9472fb1510ff79f735de9e8e4bef2c0af06a Mon Sep 17 00:00:00 2001 From: z30061262 Date: Fri, 28 Jun 2024 14:52:16 +0800 Subject: [PATCH 1/2] Support run asm test262 in qemu mode Signed-off-by: zhuheng --- build/compile_script/ark.py | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/build/compile_script/ark.py b/build/compile_script/ark.py index 97badc5a..1bbdee77 100755 --- a/build/compile_script/ark.py +++ b/build/compile_script/ark.py @@ -345,12 +345,23 @@ class ArkPy: test262_cmd = test262_cmd + " --enable-litecg" else: print("running test262 in AsmMode\n") - test262_cmd = "cd arkcompiler/ets_frontend && python3 test262/run_test262.py {0} --timeout 180000" \ - " --libs-dir ../../prebuilts/clang/ohos/linux-x86_64/llvm/lib" \ - " --ark-tool=../../{1}/arkcompiler/ets_runtime/ark_js_vm" \ - " --ark-frontend-binary=../../{1}/arkcompiler/ets_frontend/es2abc" \ - " --merge-abc-binary=../../{1}/arkcompiler/ets_frontend/merge_abc" \ - " --ark-frontend=es2panda".format(args_to_test262_cmd, out_path) + if any('target_cpu="arm64"' in arg for arg in gn_args): + test262_cmd = "cd arkcompiler/ets_frontend && python3 test262/run_test262.py {0} --timeout 1800000" \ + " --libs-dir ../../{1}/arkcompiler/ets_runtime:../../{1}/thirdparty/icu:" \ + "../../{1}/thirdparty/zlib:../../prebuilts/clang/ohos/linux-x86_64/llvm/lib" \ + " --ark-arch aarch64" \ + " --ark-arch-root=../../{1}/common/common/libc/" \ + " --ark-tool=../../{1}/arkcompiler/ets_runtime/ark_js_vm" \ + " --ark-frontend-binary=../../{2}/arkcompiler/ets_frontend/es2abc" \ + " --merge-abc-binary=../../{2}/arkcompiler/ets_frontend/merge_abc" \ + " --ark-frontend=es2panda".format(args_to_test262_cmd, out_path, x64_out_path) + else: + test262_cmd = "cd arkcompiler/ets_frontend && python3 test262/run_test262.py {0} --timeout 180000" \ + " --libs-dir ../../prebuilts/clang/ohos/linux-x86_64/llvm/lib" \ + " --ark-tool=../../{1}/arkcompiler/ets_runtime/ark_js_vm" \ + " --ark-frontend-binary=../../{1}/arkcompiler/ets_frontend/es2abc" \ + " --merge-abc-binary=../../{1}/arkcompiler/ets_frontend/merge_abc" \ + " --ark-frontend=es2panda".format(args_to_test262_cmd, out_path) return test262_cmd @staticmethod -- Gitee From 63053f6c04eb099417a03601074f7eb249cd859f Mon Sep 17 00:00:00 2001 From: z30061262 Date: Fri, 28 Jun 2024 15:04:30 +0800 Subject: [PATCH 2/2] Change test 262 timout out set Signed-off-by: zhuheng --- build/compile_script/ark.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/build/compile_script/ark.py b/build/compile_script/ark.py index 1bbdee77..a064f981 100755 --- a/build/compile_script/ark.py +++ b/build/compile_script/ark.py @@ -307,7 +307,7 @@ class ArkPy: print("running test262 in AotMode\n") if any('target_cpu="arm64"' in arg for arg in gn_args): if run_pgo: - test262_cmd = "cd arkcompiler/ets_frontend && python3 test262/run_test262.py {0} --timeout 180000" \ + test262_cmd = "cd arkcompiler/ets_frontend && python3 test262/run_test262.py {0} --timeout 400000" \ " --libs-dir ../../{1}/arkcompiler/ets_runtime:../../{1}/thirdparty/icu:" \ "../../{1}/thirdparty/zlib:../../prebuilts/clang/ohos/linux-x86_64/llvm/lib" \ " --ark-arch aarch64" \ @@ -320,7 +320,7 @@ class ArkPy: " --ark-frontend=es2panda"\ "{3}".format(args_to_test262_cmd, out_path, x64_out_path, " --run-pgo") else: - test262_cmd = "cd arkcompiler/ets_frontend && python3 test262/run_test262.py {0} --timeout 180000" \ + test262_cmd = "cd arkcompiler/ets_frontend && python3 test262/run_test262.py {0} --timeout 400000" \ " --libs-dir ../../prebuilts/clang/ohos/linux-x86_64/llvm/lib:../../{2}/thirdparty/icu/" \ " --ark-arch aarch64" \ " --ark-arch-root=../../{1}/common/common/libc/" \ @@ -331,7 +331,7 @@ class ArkPy: " --merge-abc-binary=../../{2}/arkcompiler/ets_frontend/merge_abc" \ " --ark-frontend=es2panda".format(args_to_test262_cmd, out_path, x64_out_path) else: - test262_cmd = "cd arkcompiler/ets_frontend && python3 test262/run_test262.py {0} --timeout 180000" \ + test262_cmd = "cd arkcompiler/ets_frontend && python3 test262/run_test262.py {0} --timeout 400000" \ " --libs-dir ../../{1}/arkcompiler/ets_runtime:../../{1}/thirdparty/icu" \ ":../../{1}/thirdparty/zlib:../../prebuilts/clang/ohos/linux-x86_64/llvm/lib" \ " --ark-tool=../../{1}/arkcompiler/ets_runtime/ark_js_vm" \ @@ -346,7 +346,7 @@ class ArkPy: else: print("running test262 in AsmMode\n") if any('target_cpu="arm64"' in arg for arg in gn_args): - test262_cmd = "cd arkcompiler/ets_frontend && python3 test262/run_test262.py {0} --timeout 1800000" \ + test262_cmd = "cd arkcompiler/ets_frontend && python3 test262/run_test262.py {0} --timeout 400000" \ " --libs-dir ../../{1}/arkcompiler/ets_runtime:../../{1}/thirdparty/icu:" \ "../../{1}/thirdparty/zlib:../../prebuilts/clang/ohos/linux-x86_64/llvm/lib" \ " --ark-arch aarch64" \ @@ -356,7 +356,7 @@ class ArkPy: " --merge-abc-binary=../../{2}/arkcompiler/ets_frontend/merge_abc" \ " --ark-frontend=es2panda".format(args_to_test262_cmd, out_path, x64_out_path) else: - test262_cmd = "cd arkcompiler/ets_frontend && python3 test262/run_test262.py {0} --timeout 180000" \ + test262_cmd = "cd arkcompiler/ets_frontend && python3 test262/run_test262.py {0} --timeout 400000" \ " --libs-dir ../../prebuilts/clang/ohos/linux-x86_64/llvm/lib" \ " --ark-tool=../../{1}/arkcompiler/ets_runtime/ark_js_vm" \ " --ark-frontend-binary=../../{1}/arkcompiler/ets_frontend/es2abc" \ -- Gitee