tcwg-benchmark-results.sh: Rework and cleanup.

Change-Id: I3af87f6a085ccdc781a67cf4462ebaf6abf393d7

1 files changed, 21 insertions, 17 deletions

diff --git a/tcwg-benchmark-results.sh b/tcwg-benchmark-results.sh
index 245e492a..6cdd2810 100755
--- a/tcwg-benchmark-results.sh
+++ b/tcwg-benchmark-results.sh
@@ -2,31 +2,35 @@
 
 # Clean: shellcheck -e 2001 ./tcwg-benchmark-results.sh
 
-set -ex
+set -ef -o pipefail
 
-# Make shellcheck happy and workaround Jenkins not defining variables
-# for empty arguments.
-results_id="$results_id"
-results_ref="$results_ref"
+scripts=$(dirname $0)
+. $scripts/jenkins-helpers.sh
+
+convert_args_to_variables "$@"
+
+obligatory_variables results_id results_ref
+
+top_artifacts="${top_artifacts-artifacts}"
+verbose="${verbose-true}"
 
 # Jenkins doesn't define variables when parameter value is empty (like cflags),
 # so enable "set -u" only after above binding of variables.
 set -u
 
-results_top="dev-01.tcwglab:/home/tcwg-benchmark/results"
+if $verbose; then set -x; fi
 
-rsync -az --delete "$results_top-$results_id/" results/
-rsync -az --delete "$results_top-$results_ref/" baseline/
+results_top="dev-01.tcwglab:/home/tcwg-benchmark/results"
 
-for i in baseline results; do
-    bmk-scripts/perfdatadir2csv.sh --buildid-dir local -t --num 0 --format sample --sort-field sample --results-dir "$i/" > "time-$i.csv"
-    bmk-scripts/perfdatadir2csv.sh --buildid-dir local --format sample --sort-field sample --results-dir "$i/" > "sample-$i.csv"
+num=0
+csvs=""
+for i in $results_ref $results_id; do
+    rsync -az --delete "$results_top-$i/" results-$num/
+    $scripts/../bmk-scripts/perfdatadir2csv.sh --buildid-dir local --format sample,size --sort-field sample --results-dir "results-$num/" > "results-$num.csv"
+    csvs="$csvs results-$num.csv"
+    num=$(($num+1))
 done
 
-mkdir -p artifacts
-
-bmk-scripts/csvs2table.py --relative time-baseline.csv time-results.csv > artifacts/time.csv
-
-bmk-scripts/csvs2table.py --relative sample-baseline.csv sample-results.csv > artifacts/sample.csv
+mkdir -p $top_artifacts
 
-exit 0
+$scripts/../bmk-scripts/csvs2table.py --relative $csvs > $top_artifacts/results.csv