summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMaxim Kuvyrkov <maxim.kuvyrkov@linaro.org>2021-06-23 03:07:54 +0000
committerMaxim Kuvyrkov <maxim.kuvyrkov@linaro.org>2021-06-23 03:07:54 +0000
commite63b457400fe3f584395480961d2cb3a959fa00d (patch)
treeb2e9fe4e45c0ef12d724bab60c6cbd7d97e51dac
parent293e0d0473a39f916d10a868c6ef664ed63949c0 (diff)
downloadjenkins-scripts-e63b457400fe3f584395480961d2cb3a959fa00d.tar.gz
tcwg_bmk-build.sh: Remove workaround for LLVM+BFD now that we use LLD
Change-Id: I52ebd8448bf66dbea7e592547b93fcf643b08d95
-rwxr-xr-xtcwg_bmk-build.sh22
1 files changed, 12 insertions, 10 deletions
diff --git a/tcwg_bmk-build.sh b/tcwg_bmk-build.sh
index daca18c2..835af50d 100755
--- a/tcwg_bmk-build.sh
+++ b/tcwg_bmk-build.sh
@@ -229,9 +229,7 @@ benchmark ()
local llvm_target
llvm_target=$(echo "$gnu_target" | sed -e "s/^arm-/armv7a-/")
bmk_flags="$bmk_flags --target=$llvm_target --sysroot=$sysroot"
- # When compiling with -Os/-Oz with LTO -- use "-O2 -flto".
- # See https://projects.linaro.org/browse/LLVM-557 .
- bmk_ldflags=$(echo "$bmk_flags" | sed -e "s/-O[sz] -flto/-O2 -flto/")
+ bmk_ldflags="$bmk_flags"
# Use LLD for LLVM configurations.
# Also, BFD linker crashes for AArch32 LTO builds,
# see https://projects.linaro.org/browse/LLVM-562 .
@@ -253,20 +251,24 @@ benchmark ()
case "${rr[toolchain]}:${benchmarks[@]}" in
llvm:spec2k6) bench_list="c_and_cxx" ;;
gnu:spec2k6) bench_list="all" ;;
+ llvm:spec2017) bench_list="spec2017_speed_nofortran" ;;
+ gnu:spec2017) bench_list="spec2017_speed" ;;
*) bench_list="${benchmarks[*]}" ;;
esac
# shellcheck disable=SC2154
sysroot="ssh://$ssh_host:$ssh_port:$sysroot"
- local hw results_top image_arch results_id
- case "${rr[target]}" in
- armv8*) hw=tx1; results_top=tx1_32; image_arch=armhf ;;
- arm_eabi) hw=stm32; results_top=stm32_STM32L476RGTx; image_arch=armhf ;;
- arm*) hw=tk1; results_top=tk1_32; image_arch=armhf ;;
- aarch64*) hw=tx1; results_top=tx1_64; image_arch=arm64 ;;
+ local hw hw_tag image_arch results_id
+ case "${rr[ci_project]}:${rr[target]}" in
+ *_sq*:arm*) hw=sq; hw_tag=sq_32; image_arch=armhf ;;
+ *_sq*:*) hw=sq; hw_tag=sq_64; image_arch=arm64 ;;
+ *_tk1*:arm*) hw=tk1; hw_tag=tk1_32; image_arch=armhf ;;
+ *_tx1*:arm*) hw=tx1; hw_tag=tx1_32; image_arch=armhf ;;
+ *_tx1*:*) hw=tx1; hw_tag=tx1_64; image_arch=arm64 ;;
+ *_stm32*:arm*) hw=stm32; hw_tag=stm32_STM32L476RGTx; image_arch=armhf ;;
*) echo "ERROR: Unknown target ${rr[target]}"; exit 1 ;;
esac
- local results_id="$results_top/${rr[ci_project]}/${rr[mode]}-${rr[ci_config]}/@build_num@"
+ local results_id="$hw_tag/${rr[ci_project]}/${rr[mode]}-${rr[ci_config]}/@build_num@"
# When running benchmarks on stm32, we prefer to rsync the
# toolchain towards tcwg-bmk-stm32-01.