aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMaxim Kuvyrkov <maxim.kuvyrkov@linaro.org>2021-06-17 15:14:23 +0000
committerMaxim Kuvyrkov <maxim.kuvyrkov@linaro.org>2021-06-17 15:14:23 +0000
commit8f5f73d478402d35610eb86c063f0f5f3acaa1d7 (patch)
tree7433c99ceb94f24655c1268fa451f7e4713fe6f7
parent258abf1d296f91993d8f8b59c8678fa4628fbe7c (diff)
downloadconfigs-master.tar.gz
tcwg-benchmark: Resolve @hw_tag@ and @build_num@ hereHEADmaster
Change-Id: Ia1aa746973ce360c39b7a33cbcdbf14e6f4d9edb
-rw-r--r--tcwg-benchmark-sq.yaml20
-rw-r--r--tcwg-benchmark-stm32.yaml21
-rw-r--r--tcwg-benchmark-tk1.yaml19
-rw-r--r--tcwg-benchmark-tx1.yaml20
-rw-r--r--tcwg-benchmark.yaml24
-rw-r--r--tcwg-benchmark.yaml.in34
6 files changed, 110 insertions, 28 deletions
diff --git a/tcwg-benchmark-sq.yaml b/tcwg-benchmark-sq.yaml
index e4416d146..a81b8e62f 100644
--- a/tcwg-benchmark-sq.yaml
+++ b/tcwg-benchmark-sq.yaml
@@ -188,12 +188,24 @@
rm -rf artifacts
mkdir artifacts
+ case "$bmk_hw:$image_arch" in
+ sq:arm64) hw_tag=sq_64 ;;
+ sq:armhf) hw_tag=sq_32 ;;
+ esac
+
+ results_id=$(echo "$results_id" | sed \
+ -e "s/@build_num@/$BUILD_NUMBER/g" \
+ -e "s/@hw_tag@/$hw_tag/g")
+
n_boards=$(set +f; ls -tr $HOME/boards/tcwg-bmk-$bmk_hw-*.lock | wc -l)
count=1
while read -a bmks; do
- echo "bench_list=${bmks[@]}" > artifacts/bmk-$count-parameters
- echo "displaytag=#$BUILD_NUMBER+$count-$displaytag" >> artifacts/bmk-$count-parameters
- echo "bmk_node=tcwg-bmk-$bmk_hw" >> artifacts/bmk-$count-parameters
+ cat > artifacts/bmk-$count-parameters <<EOF
+ bench_list=${bmks[@]}"
+ displaytag=#$BUILD_NUMBER+$count-$displaytag
+ bmk_node=tcwg-bmk-$bmk_hw
+ results_id=$results_id
+ EOF
count=$(($count+1))
done < <(./bmk-scripts/break-up-bmks.sh \
--bench_list "$bench_list" \
@@ -246,4 +258,4 @@
artifacts: 'artifacts/**'
latest-only: false
allow-empty: true
-# checksum: 22026198269468221ae4e82fbdb0e8e7
+# checksum: 306f08e8ad166fdbcb56fcbe348712d9
diff --git a/tcwg-benchmark-stm32.yaml b/tcwg-benchmark-stm32.yaml
index cad950cc1..f00f4b0b0 100644
--- a/tcwg-benchmark-stm32.yaml
+++ b/tcwg-benchmark-stm32.yaml
@@ -110,7 +110,7 @@
description: 'Number of benchmark iterations'
- string:
name: results_id
- default: 'stm32_STM32L476RGTx/tcwg-benchmark/@build_num@'
+ default: '@hw_tag@/tcwg-benchmark/@build_num@'
description: 'ID for benchmarking results; results will appear in bkp-01.tcwglab:/home/tcwg-benchmark/results-$results_id/'
- bool:
name: forceinstall
@@ -187,12 +187,23 @@
rm -rf artifacts
mkdir artifacts
+ case "$bmk_hw:$image_arch" in
+ stm32:*) hw_tag=stm32_STM32L476RGTx ;;
+ esac
+
+ results_id=$(echo "$results_id" | sed \
+ -e "s/@build_num@/$BUILD_NUMBER/g" \
+ -e "s/@hw_tag@/$hw_tag/g")
+
n_boards=$(set +f; ls -tr $HOME/boards/tcwg-bmk-$bmk_hw-*.lock | wc -l)
count=1
while read -a bmks; do
- echo "bench_list=${bmks[@]}" > artifacts/bmk-$count-parameters
- echo "displaytag=#$BUILD_NUMBER+$count-$displaytag" >> artifacts/bmk-$count-parameters
- echo "bmk_node=tcwg-bmk-$bmk_hw" >> artifacts/bmk-$count-parameters
+ cat > artifacts/bmk-$count-parameters <<EOF
+ bench_list=${bmks[@]}"
+ displaytag=#$BUILD_NUMBER+$count-$displaytag
+ bmk_node=tcwg-bmk-$bmk_hw
+ results_id=$results_id
+ EOF
count=$(($count+1))
done < <(./bmk-scripts/break-up-bmks.sh \
--bench_list "$bench_list" \
@@ -245,4 +256,4 @@
artifacts: 'artifacts/**'
latest-only: false
allow-empty: true
-# checksum: 2ebe447e3b4934efe22bc836ba9ab427
+# checksum: e74659e4ca8ba33080c6142e6a265c66
diff --git a/tcwg-benchmark-tk1.yaml b/tcwg-benchmark-tk1.yaml
index f7ad050d5..601c92e39 100644
--- a/tcwg-benchmark-tk1.yaml
+++ b/tcwg-benchmark-tk1.yaml
@@ -187,12 +187,23 @@
rm -rf artifacts
mkdir artifacts
+ case "$bmk_hw:$image_arch" in
+ tk1:armhf) hw_tag=tk1_32 ;;
+ esac
+
+ results_id=$(echo "$results_id" | sed \
+ -e "s/@build_num@/$BUILD_NUMBER/g" \
+ -e "s/@hw_tag@/$hw_tag/g")
+
n_boards=$(set +f; ls -tr $HOME/boards/tcwg-bmk-$bmk_hw-*.lock | wc -l)
count=1
while read -a bmks; do
- echo "bench_list=${bmks[@]}" > artifacts/bmk-$count-parameters
- echo "displaytag=#$BUILD_NUMBER+$count-$displaytag" >> artifacts/bmk-$count-parameters
- echo "bmk_node=tcwg-bmk-$bmk_hw" >> artifacts/bmk-$count-parameters
+ cat > artifacts/bmk-$count-parameters <<EOF
+ bench_list=${bmks[@]}"
+ displaytag=#$BUILD_NUMBER+$count-$displaytag
+ bmk_node=tcwg-bmk-$bmk_hw
+ results_id=$results_id
+ EOF
count=$(($count+1))
done < <(./bmk-scripts/break-up-bmks.sh \
--bench_list "$bench_list" \
@@ -245,4 +256,4 @@
artifacts: 'artifacts/**'
latest-only: false
allow-empty: true
-# checksum: d49387bd75d04ebc976d00c92fd02cb5
+# checksum: 1b3d78acb138d16d914406e21bbb9926
diff --git a/tcwg-benchmark-tx1.yaml b/tcwg-benchmark-tx1.yaml
index 28c12d389..aefd7b0c9 100644
--- a/tcwg-benchmark-tx1.yaml
+++ b/tcwg-benchmark-tx1.yaml
@@ -188,12 +188,24 @@
rm -rf artifacts
mkdir artifacts
+ case "$bmk_hw:$image_arch" in
+ tx1:arm64) hw_tag=tx1_64 ;;
+ tx1:armhf) hw_tag=tx1_32 ;;
+ esac
+
+ results_id=$(echo "$results_id" | sed \
+ -e "s/@build_num@/$BUILD_NUMBER/g" \
+ -e "s/@hw_tag@/$hw_tag/g")
+
n_boards=$(set +f; ls -tr $HOME/boards/tcwg-bmk-$bmk_hw-*.lock | wc -l)
count=1
while read -a bmks; do
- echo "bench_list=${bmks[@]}" > artifacts/bmk-$count-parameters
- echo "displaytag=#$BUILD_NUMBER+$count-$displaytag" >> artifacts/bmk-$count-parameters
- echo "bmk_node=tcwg-bmk-$bmk_hw" >> artifacts/bmk-$count-parameters
+ cat > artifacts/bmk-$count-parameters <<EOF
+ bench_list=${bmks[@]}"
+ displaytag=#$BUILD_NUMBER+$count-$displaytag
+ bmk_node=tcwg-bmk-$bmk_hw
+ results_id=$results_id
+ EOF
count=$(($count+1))
done < <(./bmk-scripts/break-up-bmks.sh \
--bench_list "$bench_list" \
@@ -246,4 +258,4 @@
artifacts: 'artifacts/**'
latest-only: false
allow-empty: true
-# checksum: 766ce7e71287357ce92b60412e5f3c63
+# checksum: c9b2ef438d8f3d1eb140257e99b4c1df
diff --git a/tcwg-benchmark.yaml b/tcwg-benchmark.yaml
index ba9f5a6ea..199db002a 100644
--- a/tcwg-benchmark.yaml
+++ b/tcwg-benchmark.yaml
@@ -200,12 +200,28 @@
rm -rf artifacts
mkdir artifacts
+ case "$bmk_hw:$image_arch" in
+ sq:arm64) hw_tag=sq_64 ;;
+ sq:armhf) hw_tag=sq_32 ;;
+ stm32:*) hw_tag=stm32_STM32L476RGTx ;;
+ tk1:armhf) hw_tag=tk1_32 ;;
+ tx1:arm64) hw_tag=tx1_64 ;;
+ tx1:armhf) hw_tag=tx1_32 ;;
+ esac
+
+ results_id=$(echo "$results_id" | sed \
+ -e "s/@build_num@/$BUILD_NUMBER/g" \
+ -e "s/@hw_tag@/$hw_tag/g")
+
n_boards=$(set +f; ls -tr $HOME/boards/tcwg-bmk-$bmk_hw-*.lock | wc -l)
count=1
while read -a bmks; do
- echo "bench_list=${bmks[@]}" > artifacts/bmk-$count-parameters
- echo "displaytag=#$BUILD_NUMBER+$count-$displaytag" >> artifacts/bmk-$count-parameters
- echo "bmk_node=tcwg-bmk-$bmk_hw" >> artifacts/bmk-$count-parameters
+ cat > artifacts/bmk-$count-parameters <<EOF
+ bench_list=${bmks[@]}"
+ displaytag=#$BUILD_NUMBER+$count-$displaytag
+ bmk_node=tcwg-bmk-$bmk_hw
+ results_id=$results_id
+ EOF
count=$(($count+1))
done < <(./bmk-scripts/break-up-bmks.sh \
--bench_list "$bench_list" \
@@ -258,4 +274,4 @@
artifacts: 'artifacts/**'
latest-only: false
allow-empty: true
-# checksum: 4d8fd6d1ab047b085a3927fecca5c3e7
+# checksum: 31302e41bd2d55455cbb889ce6bd3fe4
diff --git a/tcwg-benchmark.yaml.in b/tcwg-benchmark.yaml.in
index 4b605d243..1660b67e8 100644
--- a/tcwg-benchmark.yaml.in
+++ b/tcwg-benchmark.yaml.in
@@ -76,11 +76,7 @@
description: 'Number of benchmark iterations'
- string:
name: results_id
-#if HW_stm32
- default: 'stm32_STM32L476RGTx/tcwg-benchmark/@build_num@'
-#else
default: '@hw_tag@/tcwg-benchmark/@build_num@'
-#endif
description: 'ID for benchmarking results; results will appear in bkp-01.tcwglab:/home/tcwg-benchmark/results-$results_id/'
- bool:
name: forceinstall
@@ -185,12 +181,36 @@
rm -rf artifacts
mkdir artifacts
+ case "$bmk_hw:$image_arch" in
+#if HW_sq || HW_any
+ sq:arm64) hw_tag=sq_64 ;;
+ sq:armhf) hw_tag=sq_32 ;;
+#endif
+#if HW_stm32 || HW_any
+ stm32:*) hw_tag=stm32_STM32L476RGTx ;;
+#endif
+#if HW_tk1 || HW_any
+ tk1:armhf) hw_tag=tk1_32 ;;
+#endif
+#if HW_tx1 || HW_any
+ tx1:arm64) hw_tag=tx1_64 ;;
+ tx1:armhf) hw_tag=tx1_32 ;;
+#endif
+ esac
+
+ results_id=$(echo "$results_id" | sed \
+ -e "s/@build_num@/$BUILD_NUMBER/g" \
+ -e "s/@hw_tag@/$hw_tag/g")
+
n_boards=$(set +f; ls -tr $HOME/boards/tcwg-bmk-$bmk_hw-*.lock | wc -l)
count=1
while read -a bmks; do
- echo "bench_list=${bmks[@]}" > artifacts/bmk-$count-parameters
- echo "displaytag=#$BUILD_NUMBER+$count-$displaytag" >> artifacts/bmk-$count-parameters
- echo "bmk_node=tcwg-bmk-$bmk_hw" >> artifacts/bmk-$count-parameters
+ cat > artifacts/bmk-$count-parameters <<EOF
+ bench_list=${bmks[@]}"
+ displaytag=#$BUILD_NUMBER+$count-$displaytag
+ bmk_node=tcwg-bmk-$bmk_hw
+ results_id=$results_id
+ EOF
count=$(($count+1))
done < <(./bmk-scripts/break-up-bmks.sh \
--bench_list "$bench_list" \