From 6b57479f97d81fb1f1e0820ae3dadccc9293953f Mon Sep 17 00:00:00 2001 From: Zongfang Lin Date: Sun, 22 Aug 2021 20:11:18 -0700 Subject: [PATCH 1/2] patch for modes --- testsuite/driver/src/mode/ASTO0.py | 6 +++--- testsuite/driver/src/mode/GC_O0.py | 16 ++++++++-------- testsuite/driver/src/mode/GC_O2.py | 16 ++++++++-------- testsuite/driver/src/mode/SCO0_TEST.py | 6 +++--- testsuite/driver/src/mode/SCO0_TRAIN.py | 8 ++++---- testsuite/driver/src/mode/SCO2_TEST.py | 6 +++--- testsuite/driver/src/mode/SCO2_TRAIN.py | 6 +++--- 7 files changed, 32 insertions(+), 32 deletions(-) diff --git a/testsuite/driver/src/mode/ASTO0.py b/testsuite/driver/src/mode/ASTO0.py index 673a3fda29..75a0e71c62 100644 --- a/testsuite/driver/src/mode/ASTO0.py +++ b/testsuite/driver/src/mode/ASTO0.py @@ -19,19 +19,19 @@ ASTO0 = { C2ast( clang="${OUT_ROOT}/tools/bin/clang", include_path=[ - "${OUT_ROOT}/aarch64-clang-release/lib/include" + "${OUT_ROOT}/${MAPLE_BUILD_TYPE}/lib/include" ], option="--target=aarch64", infile="${APP}.c", outfile="${APP}.ast" ), Mplfe( - mplfe="${OUT_ROOT}/aarch64-clang-release/bin/mplfe", + mplfe="${OUT_ROOT}/${MAPLE_BUILD_TYPE}/bin/mplfe", infile="${APP}.ast", outfile="${APP}.mpl" ), SimpleMaple( - maple="${OUT_ROOT}/aarch64-clang-release/bin/maple", + maple="${OUT_ROOT}/${MAPLE_BUILD_TYPE}/bin/maple", option="-O0", infile="${APP}.mpl" ), diff --git a/testsuite/driver/src/mode/GC_O0.py b/testsuite/driver/src/mode/GC_O0.py index 60ec59df62..ac89a0c3b7 100644 --- a/testsuite/driver/src/mode/GC_O0.py +++ b/testsuite/driver/src/mode/GC_O0.py @@ -18,20 +18,20 @@ GC_O0 = { "compile": [ Java2dex( jar_file=[ - "${OUT_ROOT}/aarch64-clang-release/ops/third_party/JAVA_LIBRARIES/core-oj_intermediates/classes.jar", - "${OUT_ROOT}/aarch64-clang-release/ops/third_party/JAVA_LIBRARIES/core-libart_intermediates/classes.jar" + "${OUT_ROOT}/${MAPLE_BUILD_TYPE}/ops/third_party/JAVA_LIBRARIES/core-oj_intermediates/classes.jar", + "${OUT_ROOT}/${MAPLE_BUILD_TYPE}/ops/third_party/JAVA_LIBRARIES/core-libart_intermediates/classes.jar" ], outfile="${APP}.dex", infile=["${APP}.java","${EXTRA_JAVA_FILE}"] ), Dex2mpl( - dex2mpl="${OUT_ROOT}/aarch64-clang-release/bin/dex2mpl", - mplt="${OUT_ROOT}/aarch64-clang-release/libjava-core/host-x86_64-GC_O0/libcore-all.mplt", + dex2mpl="${OUT_ROOT}/${MAPLE_BUILD_TYPE}/bin/dex2mpl", + mplt="${OUT_ROOT}/${MAPLE_BUILD_TYPE}/libjava-core/host-x86_64-GC_O0/libcore-all.mplt", litprofile="${OUT_ROOT}/tools/codetricks/profile.pv/meta.list", infile="${APP}.dex" ), Maple( - maple="${OUT_ROOT}/aarch64-clang-release/bin/maple", + maple="${OUT_ROOT}/${MAPLE_BUILD_TYPE}/bin/maple", run=["me", "mpl2mpl", "mplcg"], option={ "me": "--O2 --quiet --gconly", @@ -50,11 +50,11 @@ GC_O0 = { qemu="${OUT_ROOT}/tools/bin/qemu-aarch64", qemu_libc="/usr/aarch64-linux-gnu", qemu_ld_lib=[ - "${OUT_ROOT}/aarch64-clang-release/ops/third_party", - "${OUT_ROOT}/aarch64-clang-release/ops/host-x86_64-GC_O0", + "${OUT_ROOT}/${MAPLE_BUILD_TYPE}/ops/third_party", + "${OUT_ROOT}/${MAPLE_BUILD_TYPE}/ops/host-x86_64-GC_O0", "./" ], - mplsh="${OUT_ROOT}/aarch64-clang-release/ops/mplsh", + mplsh="${OUT_ROOT}/${MAPLE_BUILD_TYPE}/ops/mplsh", garbage_collection_kind="GC", xbootclasspath="libcore-all.so", infile="${APP}.so", diff --git a/testsuite/driver/src/mode/GC_O2.py b/testsuite/driver/src/mode/GC_O2.py index ee2ca4c3fe..6b8d4f440c 100644 --- a/testsuite/driver/src/mode/GC_O2.py +++ b/testsuite/driver/src/mode/GC_O2.py @@ -18,20 +18,20 @@ GC_O2 = { "compile": [ Java2dex( jar_file=[ - "${OUT_ROOT}/aarch64-clang-release/ops/third_party/JAVA_LIBRARIES/core-oj_intermediates/classes.jar", - "${OUT_ROOT}/aarch64-clang-release/ops/third_party/JAVA_LIBRARIES/core-libart_intermediates/classes.jar" + "${OUT_ROOT}/${MAPLE_BUILD_TYPE}/ops/third_party/JAVA_LIBRARIES/core-oj_intermediates/classes.jar", + "${OUT_ROOT}/${MAPLE_BUILD_TYPE}/ops/third_party/JAVA_LIBRARIES/core-libart_intermediates/classes.jar" ], outfile="${APP}.dex", infile=["${APP}.java","${EXTRA_JAVA_FILE}"] ), Dex2mpl( - dex2mpl="${OUT_ROOT}/aarch64-clang-release/bin/dex2mpl", - mplt="${OUT_ROOT}/aarch64-clang-release/libjava-core/host-x86_64-GC_O2/libcore-all.mplt", + dex2mpl="${OUT_ROOT}/${MAPLE_BUILD_TYPE}/bin/dex2mpl", + mplt="${OUT_ROOT}/${MAPLE_BUILD_TYPE}/libjava-core/host-x86_64-GC_O2/libcore-all.mplt", litprofile="${OUT_ROOT}/tools/codetricks/profile.pv/meta.list", infile="${APP}.dex" ), Maple( - maple="${OUT_ROOT}/aarch64-clang-release/bin/maple", + maple="${OUT_ROOT}/${MAPLE_BUILD_TYPE}/bin/maple", run=["me", "mpl2mpl", "mplcg"], option={ "me": "--O2 --quiet --gconly", @@ -50,11 +50,11 @@ GC_O2 = { qemu="${OUT_ROOT}/tools/bin/qemu-aarch64", qemu_libc="/usr/aarch64-linux-gnu", qemu_ld_lib=[ - "${OUT_ROOT}/aarch64-clang-release/ops/third_party", - "${OUT_ROOT}/aarch64-clang-release/ops/host-x86_64-GC_O2", + "${OUT_ROOT}/${MAPLE_BUILD_TYPE}/ops/third_party", + "${OUT_ROOT}/${MAPLE_BUILD_TYPE}/ops/host-x86_64-GC_O2", "./" ], - mplsh="${OUT_ROOT}/aarch64-clang-release/ops/mplsh", + mplsh="${OUT_ROOT}/${MAPLE_BUILD_TYPE}/ops/mplsh", garbage_collection_kind="GC", xbootclasspath="libcore-all.so", infile="${APP}.so", diff --git a/testsuite/driver/src/mode/SCO0_TEST.py b/testsuite/driver/src/mode/SCO0_TEST.py index be5710c35f..4801573680 100644 --- a/testsuite/driver/src/mode/SCO0_TEST.py +++ b/testsuite/driver/src/mode/SCO0_TEST.py @@ -20,7 +20,7 @@ SCO0_TEST = { C2ast( clang="${OUT_ROOT}/tools/bin/clang", include_path=[ - "${OUT_ROOT}/aarch64-clang-release/lib/include", + "${OUT_ROOT}/${MAPLE_BUILD_TYPE}/lib/include", "${OUT_ROOT}/tools/gcc-linaro-7.5.0/aarch64-linux-gnu/libc/usr/include", "${OUT_ROOT}/tools/gcc-linaro-7.5.0/lib/gcc/aarch64-linux-gnu/7.5.0/include" ], @@ -30,12 +30,12 @@ SCO0_TEST = { extra_opt="${SPEC_PARAM}" ), Mplfe( - mplfe="${OUT_ROOT}/aarch64-clang-release/bin/mplfe", + mplfe="${OUT_ROOT}/${MAPLE_BUILD_TYPE}/bin/mplfe", infile="${APP}.ast", outfile="${APP}.mpl" ), Maple( - maple="${OUT_ROOT}/aarch64-clang-release/bin/maple", + maple="${OUT_ROOT}/${MAPLE_BUILD_TYPE}/bin/maple", run=["mplcg"], option={ "mplcg": "--O0 --patch-long-branch --quiet --no-pie --fpic --verbose-asm" diff --git a/testsuite/driver/src/mode/SCO0_TRAIN.py b/testsuite/driver/src/mode/SCO0_TRAIN.py index 629f37f44a..16d4b2c835 100644 --- a/testsuite/driver/src/mode/SCO0_TRAIN.py +++ b/testsuite/driver/src/mode/SCO0_TRAIN.py @@ -1,4 +1,4 @@ -# +s# # Copyright (c) [2021] Huawei Technologies Co.,Ltd.All rights reserved. # # OpenArkCompiler is licensed under Mulan PSL v2. @@ -20,7 +20,7 @@ SCO0_TRAIN = { C2ast( clang="${OUT_ROOT}/tools/bin/clang", include_path=[ - "${OUT_ROOT}/aarch64-clang-release/lib/include", + "${OUT_ROOT}/${MAPLE_BUILD_TYPE}/lib/include", "${OUT_ROOT}/tools/gcc-linaro-7.5.0/aarch64-linux-gnu/libc/usr/include", "${OUT_ROOT}/tools/gcc-linaro-7.5.0/lib/gcc/aarch64-linux-gnu/7.5.0/include" ], @@ -30,12 +30,12 @@ SCO0_TRAIN = { extra_opt="${SPEC_PARAM}" ), Mplfe( - mplfe="${OUT_ROOT}/aarch64-clang-release/bin/mplfe", + mplfe="${OUT_ROOT}/${MAPLE_BUILD_TYPE}/bin/mplfe", infile="${APP}.ast", outfile="${APP}.mpl" ), Maple( - maple="${OUT_ROOT}/aarch64-clang-release/bin/maple", + maple="${OUT_ROOT}/${MAPLE_BUILD_TYPE}/bin/maple", run=["mplcg"], option={ "mplcg": "--O0 --patch-long-branch --quiet --no-pie --fpic --verbose-asm" diff --git a/testsuite/driver/src/mode/SCO2_TEST.py b/testsuite/driver/src/mode/SCO2_TEST.py index 960f4e5466..6a0d5644e7 100644 --- a/testsuite/driver/src/mode/SCO2_TEST.py +++ b/testsuite/driver/src/mode/SCO2_TEST.py @@ -20,7 +20,7 @@ SCO2_TEST = { C2ast( clang="${OUT_ROOT}/tools/bin/clang", include_path=[ - "${OUT_ROOT}/aarch64-clang-release/lib/include", + "${OUT_ROOT}/${MAPLE_BUILD_TYPE}/lib/include", "${OUT_ROOT}/tools/gcc-linaro-7.5.0/aarch64-linux-gnu/libc/usr/include", "${OUT_ROOT}/tools/gcc-linaro-7.5.0/lib/gcc/aarch64-linux-gnu/7.5.0/include" ], @@ -30,12 +30,12 @@ SCO2_TEST = { extra_opt="${SPEC_PARAM}" ), Mplfe( - mplfe="${OUT_ROOT}/aarch64-clang-release/bin/mplfe", + mplfe="${OUT_ROOT}/${MAPLE_BUILD_TYPE}/bin/mplfe", infile="${APP}.ast", outfile="${APP}.mpl" ), Maple( - maple="${OUT_ROOT}/aarch64-clang-release/bin/maple", + maple="${OUT_ROOT}/${MAPLE_BUILD_TYPE}/bin/maple", run=["me", "mpl2mpl", "mplcg"], option={ "me": "-O2 --quiet", diff --git a/testsuite/driver/src/mode/SCO2_TRAIN.py b/testsuite/driver/src/mode/SCO2_TRAIN.py index 23e7dfec6e..a6eb38312d 100644 --- a/testsuite/driver/src/mode/SCO2_TRAIN.py +++ b/testsuite/driver/src/mode/SCO2_TRAIN.py @@ -20,7 +20,7 @@ SCO2_TRAIN = { C2ast( clang="${OUT_ROOT}/tools/bin/clang", include_path=[ - "${OUT_ROOT}/aarch64-clang-release/lib/include", + "${OUT_ROOT}/${MAPLE_BUILD_TYPE}/lib/include", "${OUT_ROOT}/tools/gcc-linaro-7.5.0/aarch64-linux-gnu/libc/usr/include", "${OUT_ROOT}/tools/gcc-linaro-7.5.0/lib/gcc/aarch64-linux-gnu/7.5.0/include" ], @@ -30,12 +30,12 @@ SCO2_TRAIN = { extra_opt="${SPEC_PARAM}" ), Mplfe( - mplfe="${OUT_ROOT}/aarch64-clang-release/bin/mplfe", + mplfe="${OUT_ROOT}/${MAPLE_BUILD_TYPE}/bin/mplfe", infile="${APP}.ast", outfile="${APP}.mpl" ), Maple( - maple="${OUT_ROOT}/aarch64-clang-release/bin/maple", + maple="${OUT_ROOT}/${MAPLE_BUILD_TYPE}/bin/maple", run=["me", "mpl2mpl", "mplcg"], option={ "me": "-O2 --quiet", -- Gitee From b2f7f9a5a295c50a4e170c7e4fc81ecdea839c15 Mon Sep 17 00:00:00 2001 From: sunzibo Date: Wed, 25 Aug 2021 14:34:52 +0000 Subject: [PATCH 2/2] update testsuite/driver/src/mode/SCO0_TRAIN.py. --- testsuite/driver/src/mode/SCO0_TRAIN.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testsuite/driver/src/mode/SCO0_TRAIN.py b/testsuite/driver/src/mode/SCO0_TRAIN.py index 16d4b2c835..6bf0c49715 100644 --- a/testsuite/driver/src/mode/SCO0_TRAIN.py +++ b/testsuite/driver/src/mode/SCO0_TRAIN.py @@ -1,4 +1,4 @@ -s# +# # Copyright (c) [2021] Huawei Technologies Co.,Ltd.All rights reserved. # # OpenArkCompiler is licensed under Mulan PSL v2. -- Gitee