tcwg_bmk-build.sh: build llvm for flang for some projects

Change-Id: I40617eb82eb1d07050bdee7f8d99943f992eb3e6

1 files changed, 36 insertions, 31 deletions

diff --git a/tcwg_bmk-build.sh b/tcwg_bmk-build.sh
index 957c6ca2..20066dbd 100755
--- a/tcwg_bmk-build.sh
+++ b/tcwg_bmk-build.sh
@@ -21,7 +21,6 @@ rr[mode]="${rr[mode]-build}"
 rr[baseline_branch]="${rr[baseline_branch]-linaro-local/ci/${rr[ci_project]}/${rr[ci_config]}}"
 rr[update_baseline]="${rr[update_baseline]-ignore}"
 rr[top_artifacts]="${rr[top_artifacts]-$(pwd)/artifacts}"
-rr[ci_options]="${rr[ci_options]-}"
 
 # store date of the run
 rr[start_date]="$(date +%s)"
@@ -81,17 +80,10 @@ case "${rr[target]}" in
 					) ;;
 esac
 
-llvm_extra_projects=""
-if [ x"${rr[ci_options]}" != x"" ]; then
-    case "${rr[ci_options]}" in
-        build_llvm_flang)
-          llvm_extra_projects="mlir;flang"
-          ;;
-        *)
-          assert_with_msg  "Invalid rr[ci_options] \"${rr[ci_options]}\"" false
-          ;;
-    esac
-fi
+case "${rr[ci_project]}" in
+    *experimental_flang_llvm*) build_llvm_flang=true ;;
+    *) build_llvm_flang=false ;;
+esac
 
 case "${rr[toolchain]}" in
     llvm)
@@ -218,26 +210,39 @@ benchmark ()
 	    bmk_flags="$bmk_flags -fdump-statistics-asmname -fdump-tree-vect-details"
 	    ;;
     esac
-    case "${rr[toolchain]}:${rr[ci_options]}:${benchmarks[*]}:$bmk_mode" in
-	gnu::spec2k6:*) bench_list="all" ;;
-	gnu::cpu2017:code_speed) bench_list="spec2017_speed" ;;
-	gnu::cpu2017:code_size) bench_list="spec2017_rate" ;;
-	gnu::cpu2017rate:code_speed) bench_list="spec2017_rate" ;;
-	llvm::spec2k6:*) bench_list="c_and_cxx" ;;
-	llvm::cpu2017:code_speed) bench_list="spec2017_speed_nofortran" ;;
-	llvm::cpu2017:code_size) bench_list="spec2017_rate_nofortran" ;;
-	llvm::cpu2017rate:code_speed) bench_list="spec2017_rate_nofortran" ;;
-	llvm:build_llvm_flang:cpu2017:code_speed) bench_list="spec2017_speed" ;;
-	llvm:build_llvm_flang:cpu2017:code_size) bench_list="spec2017_rate" ;;
-	llvm:build_llvm_flang:cpu2017rate:code_speed) bench_list="spec2017_rate" ;;
+
+    # Benchs to run
+    case "${rr[ci_project]}:${benchmarks[*]}:$bmk_mode" in
+	tcwg_bmk_llvm_tx1:*:*)
+	   # Workaround instabilities of 433.milc and 464.h264ref in AArch64
+	   # LLVM speed benchmarking.
+	   # See https://linaro.atlassian.net/browse/LLVM-722
+	   bench_list="400.perlbench 401.bzip2 403.gcc 429.mcf 444.namd 445.gobmk 447.dealII 450.soplex 453.povray 456.hmmer 458.sjeng 462.libquantum 470.lbm 471.omnetpp 473.astar 482.sphinx3 483.xalancbmk"
+	   ;;
+
+	# experimental for fortran tests
+	*experimental_flang_llvm*:cpu2017:code_speed) bench_list="spec2017_speed" ;;
+	*experimental_flang_llvm*:cpu2017:code_size) bench_list="spec2017_rate" ;;
+	*experimental_flang_llvm*:cpu2017rate:code_speed) bench_list="spec2017_rate" ;;
+
+	# gnu_eabi toolchain
+	*gnu_eabi*:coremark:*) bench_list="coremark" ;;
+
+	# gnu toolchain
+	*gnu*:spec2k6:*) bench_list="all" ;;
+	*gnu*:cpu2017:code_speed) bench_list="spec2017_speed" ;;
+	*gnu*:cpu2017:code_size) bench_list="spec2017_rate" ;;
+	*gnu*:cpu2017rate:code_speed) bench_list="spec2017_rate" ;;
+
+	# llvm toolchain
+	*llvm*:spec2k6:*) bench_list="c_and_cxx" ;;
+	*llvm*:cpu2017:code_speed) bench_list="spec2017_speed_nofortran" ;;
+	*llvm*:cpu2017:code_size) bench_list="spec2017_rate_nofortran" ;;
+	*llvm*:cpu2017rate:code_speed) bench_list="spec2017_rate_nofortran" ;;
+
 	*) bench_list="${benchmarks[*]}" ;;
     esac
-    if [ x"${rr[ci_project]}" = x"tcwg_bmk_llvm_tx1" ]; then
-	# Workaround instabilities of 433.milc and 464.h264ref in AArch64
-	# LLVM speed benchmarking.
-	# See https://linaro.atlassian.net/browse/LLVM-722
-	bench_list="400.perlbench 401.bzip2 403.gcc 429.mcf 444.namd 445.gobmk 447.dealII 450.soplex 453.povray 456.hmmer 458.sjeng 462.libquantum 470.lbm 471.omnetpp 473.astar 482.sphinx3 483.xalancbmk"
-    fi
+
     # shellcheck disable=SC2154
     sysroot="ssh://$ssh_host:$ssh_port:$sysroot"
 
@@ -874,7 +879,7 @@ case "${rr[components]}" in
 esac
 run_step skip_on_fail -5 build_abe stage2 -- "${gcc_override_configure[@]}"
 case "${rr[toolchain]}" in
-    llvm) run_step skip_on_fail -3 build_llvm true "" "$llvm_extra_projects" ;;
+    llvm) run_step skip_on_fail -3 build_llvm true $build_llvm_flang "" ;;
 esac
 run_step skip_on_fail 1 benchmark -- "$cflags" ${rr[top_artifacts]}/results_id
 run_step reset_on_fail x check_regression