diff options
| author | Laurent Alfonsi <laurent.alfonsi@linaro.org> | 2022-09-21 17:05:10 +0200 |
|---|---|---|
| committer | Laurent Alfonsi <laurent.alfonsi@linaro.org> | 2022-09-30 16:13:19 +0200 |
| commit | 9c8e86e1a37b52ff239ea71256b1f1f969ab3bdd (patch) | |
| tree | afe8d47c8016b076a6a67fcb28c9a9df459897a9 | |
| parent | 01e9c013d095de4d12947e108e2680982de40e92 (diff) | |
round-robin.sh,tcwg_bmk-build.sh: Add a way to choose to build flang from the ci project
This is controlled by option "==rr[ci_options] build_llvm_flang". This
can be used from ci project or directly in manifest.sh file
Change-Id: Ieab370e679817b28c3f834800bd92267c428337c
| -rw-r--r-- | round-robin.sh | 7 | ||||
| -rwxr-xr-x | tcwg_bmk-build.sh | 34 |
2 files changed, 30 insertions, 11 deletions
diff --git a/round-robin.sh b/round-robin.sh index 614a1184..b12e3f49 100644 --- a/round-robin.sh +++ b/round-robin.sh @@ -602,6 +602,7 @@ build_llvm () local use_abe="${1-false}" local extra_targets="${2-}" + local extra_projects="${3-}" clone_repo llvm wget -O llvm-vect-metric.diff "https://git.linaro.org/toolchain/jenkins-scripts.git/plain/downstream_patches/llvm-vect-metric.diff" @@ -656,11 +657,15 @@ EOF local llvm_targets llvm_targets="$(print_llvm_target ${rr[target]})${extra_targets}" + if [ x"$extra_projects" != x"" ]; then + extra_projects=";$extra_projects" + fi + rm -rf llvm-build mkdir -p llvm-build cd llvm-build - cmake -G Ninja ../llvm/llvm "-DLLVM_ENABLE_PROJECTS=clang;lld" \ + cmake -G Ninja ../llvm/llvm "-DLLVM_ENABLE_PROJECTS=clang;lld${extra_projects}" \ -DCMAKE_BUILD_TYPE=Release -DLLVM_ENABLE_ASSERTIONS=True \ -DCMAKE_INSTALL_PREFIX=../llvm-install \ "-DLLVM_TARGETS_TO_BUILD=$llvm_targets" \ diff --git a/tcwg_bmk-build.sh b/tcwg_bmk-build.sh index 58e7aba4..1b5741eb 100755 --- a/tcwg_bmk-build.sh +++ b/tcwg_bmk-build.sh @@ -21,6 +21,7 @@ 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)" @@ -80,6 +81,16 @@ case "${rr[target]}" in ) ;; esac +llvm_extra_projects="" +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 + case "${rr[toolchain]}" in llvm) rr[components]="binutils gcc linux glibc llvm" ;; @@ -205,15 +216,18 @@ benchmark () bmk_flags="$bmk_flags -fdump-statistics-asmname -fdump-tree-vect-details" ;; esac - case "${rr[toolchain]}:${benchmarks[*]}:$bmk_mode" in - llvm:spec2k6:*) bench_list="c_and_cxx" ;; - gnu:spec2k6:*) bench_list="all" ;; - llvm:cpu2017:code_speed) bench_list="spec2017_speed_nofortran" ;; - gnu:cpu2017:code_speed) bench_list="spec2017_speed" ;; - llvm:cpu2017rate:code_speed) bench_list="spec2017_rate_nofortran" ;; - gnu:cpu2017rate:code_speed) bench_list="spec2017_rate" ;; - llvm:cpu2017:code_size) bench_list="spec2017_rate_nofortran" ;; - gnu:cpu2017:code_size) bench_list="spec2017_rate" ;; + 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" ;; *) bench_list="${benchmarks[*]}" ;; esac if [ x"${rr[ci_project]}" = x"tcwg_bmk_llvm_tx1" ]; then @@ -858,7 +872,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) run_step skip_on_fail -3 build_llvm true "" "$llvm_extra_projects" ;; esac run_step skip_on_fail 1 benchmark -- "$cflags" ${rr[top_artifacts]}/results_id run_step reset_on_fail x check_regression |