diff options
author | Laurent Alfonsi <laurent.alfonsi@linaro.org> | 2023-06-23 07:23:10 +0000 |
---|---|---|
committer | Laurent Alfonsi <laurent.alfonsi@linaro.org> | 2023-06-23 07:23:35 +0000 |
commit | 6c89b83cbf8fd40f3bc7ce7157a18181aeda1339 (patch) | |
tree | ca3868c92a5e31dc59828555bccc75acf4b337f9 /tcwg_bmk-build.sh | |
parent | ae0777e8d530107cfc4981ab75f998547cf75267 (diff) |
Revert "tcwg_bmk-build.sh: Simplify compare_options handling"
This reverts commit 45c0646915879740a9f834b13345ae685595a703.
Reason for revert: pb with ci job deployment make it bancal
Change-Id: I84e2b3c2bad1894535d3a4db8c427e6fb42ce524
Diffstat (limited to 'tcwg_bmk-build.sh')
-rwxr-xr-x | tcwg_bmk-build.sh | 21 |
1 files changed, 13 insertions, 8 deletions
diff --git a/tcwg_bmk-build.sh b/tcwg_bmk-build.sh index 4d89c66b..291abea2 100755 --- a/tcwg_bmk-build.sh +++ b/tcwg_bmk-build.sh @@ -371,13 +371,12 @@ compare_results () set -euf -o pipefail local metric_id="$1" + local cmp_options="$2" - local compare_opts="" - case "${rr[target]}:$cflags" in - "arm_eabi":*"_LTO"*) compare_opts="--num_symbols 0 --entry_threshold 10 --has_perf_logs no" ;; - *:*"_LTO"*) compare_opts="--num_symbols 0 --entry_threshold 10" ;; - "arm_eabi":*) compare_opts="--has_perf_logs no" ;; - *) compare_opts="" ;; + case "${rr[target]}" in + "arm_eabi") + cmp_options="$cmp_options --has_perf_logs no" + ;; esac if [ -f /usr/lib/linux-tools/install-armhf-perf-workaround.sh ]; then @@ -427,7 +426,7 @@ compare_results () --results_ref $results_ref ++results $results_new \ --top_artifacts "${rr[top_artifacts]}/results-vs-prev" \ --verbose $verbose --hw_tag "$(tcwg_bmk_hw)" \ - $compare_opts \ + $cmp_options \ > ${rr[top_artifacts]}/results-vs-prev/tcwg-benchmark-results.log 2>&1 & local res @@ -521,11 +520,17 @@ no_regression_p () # as failure marker. assert ! [ -f $run_step_artifacts/results.regressions ] + local compare_opts="" + case "$cflags" in + *"_LTO"*) compare_opts="--num_symbols 0 --entry_threshold 10" ;; + esac + # At this stage, # - new/results_id should exist (score>0) # - ref/results_id might not exist, (ex: baseline score<0) # we call compare_results to generate the csv, and check metric regressions. - compare_results "$metric_id" + compare_results "$metric_id" \ + "$compare_opts" if [ -f $run_step_artifacts/results.regressions ]; then return 1 |