diff --git a/testsuite/driver/src/mode/ASTO0.py b/testsuite/driver/src/mode/ASTO0.py index 673a3fda295bdc222621336df4ee7d540b471363..75a0e71c62c35217d0ad4b3bfcbd7348bd0af944 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 60ec59df621465bf00a5b601c5b9d458d89247ba..ac89a0c3b7da43ea49e8b9c41500a5820a06a656 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 ee2ca4c3fe77db2482beef14a9659a39539748c1..6b8d4f440c2024a14091811cec82e2ded325b0fc 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 be5710c35fca83db755481ed45abfcc5f7f5a53d..480157368003338c9a9ddd0c9f6a611d67827978 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 629f37f44ab1cceb6b844718505f5789182cc3a7..6bf0c497151063a8b328356876183b18ceac83da 100644 --- a/testsuite/driver/src/mode/SCO0_TRAIN.py +++ b/testsuite/driver/src/mode/SCO0_TRAIN.py @@ -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 960f4e54661352a6e63236b4a127a14d9e647fb9..6a0d5644e788c646a6dd07b80d2337eb3c430f5c 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 23e7dfec6eb83b17fdecea496c563842ba1772da..a6eb38312df4fdf366de3ea929e55c485ac87fc9 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",