diff options
author | Laurent Alfonsi <laurent.alfonsi@linaro.org> | 2023-06-22 09:30:38 +0200 |
---|---|---|
committer | Laurent Alfonsi <laurent.alfonsi@linaro.org> | 2023-06-29 15:22:45 +0000 |
commit | bf0aaa7d2d7c18e2d887a621b238f3ae388e4486 (patch) | |
tree | 271eb85d9825c3e516872e8cfe61718bc12383c8 /tcwg_bmk-build.sh | |
parent | 8d1e0068cf02ea9596ee00343fb7515a3160f46d (diff) |
tcwg_bmk-build.sh: Simplify compare_options handling
Change-Id: I9de549918eced19d8aaebc177d0122a0b3b0db8f
Diffstat (limited to 'tcwg_bmk-build.sh')
-rwxr-xr-x | tcwg_bmk-build.sh | 21 |
1 files changed, 8 insertions, 13 deletions
diff --git a/tcwg_bmk-build.sh b/tcwg_bmk-build.sh index c709bc34..3309397c 100755 --- a/tcwg_bmk-build.sh +++ b/tcwg_bmk-build.sh @@ -371,12 +371,13 @@ compare_results () set -euf -o pipefail local metric_id="$1" - local cmp_options="$2" - case "${rr[target]}" in - "arm_eabi") - cmp_options="$cmp_options --has_perf_logs no" - ;; + 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="" ;; esac if [ -f /usr/lib/linux-tools/install-armhf-perf-workaround.sh ]; then @@ -426,7 +427,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)" \ - $cmp_options \ + $compare_opts \ > ${rr[top_artifacts]}/results-vs-prev/tcwg-benchmark-results.log 2>&1 & local res @@ -520,17 +521,11 @@ 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_opts" + compare_results "$metric_id" if [ -f $run_step_artifacts/results.regressions ]; then return 1 |