From dd67a90ecc1a480b3d9dd44cccd59c94ff7d4c0d Mon Sep 17 00:00:00 2001 From: Maxim Kuvyrkov Date: Thu, 29 Jul 2021 08:35:20 +0000 Subject: tcwg_bmk-build.sh: Cleanup Change-Id: I8ad40413af0437b84dfa5aac595fa6dd9c6b39a7 --- tcwg_bmk-build.sh | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/tcwg_bmk-build.sh b/tcwg_bmk-build.sh index 87263a59..51ecc684 100755 --- a/tcwg_bmk-build.sh +++ b/tcwg_bmk-build.sh @@ -267,30 +267,29 @@ benchmark () *_tx1_64*:*) hw_tag=tx1_64 ;; *_tx1*:arm*) hw_tag=tx1_32 ;; *_tx1*:aarch64) hw_tag=tx1_64 ;; - *_stm32*:arm*) hw_tag=stm32_STM32L476RGTx ;; + *_stm32*:arm*) hw_tag=stm32 ;; *) echo "ERROR: Unknown hw_tag for ${rr[ci_project]}:${rr[target]}"; exit 1 ;; esac - local hw image_arch + local hw image_arch toolchain_proto + toolchain_proto=ssh case "$hw_tag" in sq_32) hw=sq; image_arch=armhf ;; sq_64) hw=sq; image_arch=arm64 ;; tk1_32) hw=tk1; image_arch=armhf ;; tx1_32) hw=tx1; image_arch=armhf ;; tx1_64) hw=tx1; image_arch=arm64 ;; - stm32_STM32L476RGTx) hw=stm32; image_arch=armhf ;; + stm32) + hw=stm32; image_arch=amd64 + # When running benchmarks on stm32, we prefer to rsync the + # toolchain to the board's host machine -- dev-02.tcwglab. + toolchain_proto=rsync + ;; *) echo "ERROR: Unknown hw_tag $hw_tag"; exit 1 ;; esac 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. - case "$hw" in - stm32) toolchain_proto=rsync ;; - *) toolchain_proto=ssh ;; - esac - # shellcheck disable=SC2154 remote_exec "ci.linaro.org:2222::-l $USER@linaro.org" \ build tcwg-benchmark -w \ -- cgit v1.2.3