measure: Fix scripts (again)

measure/clbg-mandelbrot.sh

@@ -10,7 +10,9 @@ function run-measure-clbg-mandelbrot {
 		return 0
 	fi
 
+	local bench_name="clbg-mandelbrot"
 	local bench_iterations="5"
+
 	local mb_size="200"
 
 	local smt="$(cat /sys/devices/system/cpu/smt/active)"

measure/nas-ft.sh

@@ -8,10 +8,6 @@ function run-measure-nas-ft {
 	local bench_name="nas-ft"
 	local bench_iterations="5"
 
-	if [ "${mode}" = "init" ]; then
-		bench_name="${bench_name}-init"
-	fi
-
 	local ft_sx="128"
 	local ft_sy="128"
 	local ft_sz="32"

measure/rodinia-srad.sh

@@ -3,15 +3,11 @@
 set -euo pipefail
 
 function run-measure-rodinia-srad {
-	local mode="${1:-}"
+	local mode="${1:-total}"
 
 	local bench_name="rodinia-srad"
 	local bench_iterations="5"
 
-	if [ "${mode}" = "init" ]; then
-		bench_name="${bench_name}-init"
-	fi
-
 	local srad_rows="1024"
 	local srad_cols="512"
 	local srad_y1="0"

measure/tug.sh

@@ -3,15 +3,11 @@
 set -euo pipefail
 
 function run-measure-tug {
-	local mode="${1:-}"
+	local mode="${1:-total}"
 
 	local bench_name="tug"
 	local bench_iterations="5"
 
-	if [ "${mode}" = "init" ]; then
-		bench_name="${bench_name}-init"
-	fi
-
 	local tug_iterations="2000"
 
 	if [ "${mode}" = "init" ]; then