diff options
| author | Maxim Kuvyrkov <maxim.kuvyrkov@linaro.org> | 2023-09-02 10:20:58 +0000 |
|---|---|---|
| committer | Maxim Kuvyrkov <maxim.kuvyrkov@linaro.org> | 2023-09-02 12:55:34 +0000 |
| commit | 71a58f4d38e20ef7ae31a527ce9a2f60e2686ab7 (patch) | |
| tree | 2ee3397dc7df839481ec1b50096bb2cf89088f75 /tcwg_bmk-build.sh | |
| parent | fd1841679e5130ca495be5e830d34b267022ebc4 (diff) | |
round-robin-notify.sh (bmk_generate_extra_details): Fix
Pass correct metric_id to output-bmk-results.py ("sample", not "time")
and do not ignore failure from the script.
Also add a few FIXMEs to cleanup code.
Change-Id: I8b3a1c42a6be3dca30dab5adc8d6a8484535e107
Diffstat (limited to 'tcwg_bmk-build.sh')
| -rwxr-xr-x | tcwg_bmk-build.sh | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/tcwg_bmk-build.sh b/tcwg_bmk-build.sh index 87062a65..de8cc730 100755 --- a/tcwg_bmk-build.sh +++ b/tcwg_bmk-build.sh @@ -37,8 +37,6 @@ rr[target]=${rr[target]-${ci_pjt_cfg[5]}} cflags="${cflags--${ci_pjt_cfg[7]}}" -metric_id="${metric_id-${ci_pjt_cfg[1]}}" - gcc_mode="" case "${rr[target]}:$cflags" in "arm:"*"mthumb"*) gcc_mode=thumb ;; @@ -56,11 +54,12 @@ case "${rr[target]}:$cflags" in ;; esac -case $metric_id in - *_size) metric_id="size";; - *_speed) metric_id="sample";; - *_vect) metric_id="num_vect_loops";; - *_sve) metric_id="num_sve_loops";; +case "${rr[ci_project]}" in + *-*_size-*) rr[metric_id]="size" ;; + *-*_speed-*) rr[metric_id]="sample" ;; + *-*_vect-*) rr[metric_id]="num_vect_loops" ;; + *-*_sve-*) rr[metric_id]="num_sve_loops" ;; + *) assert_with_msg "Cannot determine metric from ${rr[ci_project]}" false ;; esac called_from_notify=${called_from_notify-false} @@ -171,7 +170,7 @@ build_bmk_llvm () ;; esac - build_llvm "$projects" "" "$metric_id" + build_llvm "$projects" "" "${rr[metric_id]}" # Copy shared libraries to runtime sysroot dir mkdir -p llvm-install/libc @@ -464,7 +463,7 @@ no_regression_p () ${rr[top_artifacts]}/results-vs-prev/compare-results-internal.csv \ ${rr[top_artifacts]}/results-vs-prev/bmk-specific-variability.csv \ "$run_step_artifacts"/ \ - "$metric_id" "${rr[mode]}" quiet > $run_step_artifacts/output-bmk-results.log + "${rr[metric_id]}" "${rr[mode]}" quiet > $run_step_artifacts/output-bmk-results.log # copy inputs useful to build the mail / jira / .. to mail dir for resfile in $run_step_artifacts/{exe,symbol}.{regression,improvement}; do |