Skip to content

Commit 0ac8f9d

Browse files
MeinersburMeinersbur
authored
LLVM_ENABLE_RUNTIMES=flang-rt for OpenMPBuilder builders (#389)
Add `enable_runtimes=['flang-rt']`, `depends_on_projects=['flang-rt']`, and `add_lit_checks=['check-flang-rt']` to all OpenMPBuilder-based builders that build flang. This prepares the removal of the "projects" build of the flang runtime in llvm/llvm-project#124126. Split off from #333 Affected builders: * openmp-offload-amdgpu-clang-flang * openmp-offload-sles-build-only * openmp-offload-rhel-9_4 * openmp-offload-rhel-8_8 Affected workers: * rocm-worker-hw-01 (staging) * rocm-worker-hw-04-sles * rocm-worker-hw-04-rhel-9_4 (staging) * rocm-worker-hw-04-rhel-8_8 (staging) Admins listed for those workers: * AMD <[email protected]>
1 parent 98486bd commit 0ac8f9d

File tree

1 file changed

+12
-12
lines changed

1 file changed

+12
-12
lines changed

‎buildbot/osuosl/master/config/builders.py

+12-12
Original file line numberDiff line numberDiff line change
@@ -2034,8 +2034,8 @@
20342034
'builddir': "openmp-offload-amdgpu-clang-flang",
20352035
'factory' : OpenMPBuilder.getOpenMPCMakeBuildFactory(
20362036
clean=True,
2037-
enable_runtimes=['compiler-rt', 'openmp', 'offload'],
2038-
depends_on_projects=['llvm','clang','lld', 'offload', 'openmp', 'mlir', 'flang', 'compiler-rt'],
2037+
enable_runtimes=['compiler-rt', 'openmp', 'offload', 'flang-rt'],
2038+
depends_on_projects=['llvm','clang','lld', 'offload', 'openmp', 'mlir', 'flang', 'flang-rt', 'compiler-rt'],
20392039
extraCmakeArgs=[
20402040
"-DCMAKE_BUILD_TYPE=Release",
20412041
"-DCLANG_DEFAULT_LINKER=lld",
@@ -2064,7 +2064,7 @@
20642064
"-DTEST_SUITE_SOLLVEVV_OFFLOADING_CFLAGS=-fopenmp-targets=amdgcn-amd-amdhsa;-Xopenmp-target=amdgcn-amd-amdhsa",
20652065
"-DTEST_SUITE_SOLLVEVV_OFFLOADING_LDLAGS=-fopenmp-targets=amdgcn-amd-amdhsa;-Xopenmp-target=amdgcn-amd-amdhsa",
20662066
],
2067-
add_lit_checks=["check-flang", "check-offload"],
2067+
add_lit_checks=["check-flang", "check-flang-rt", "check-offload"],
20682068
add_openmp_lit_args=["--time-tests", "--timeout 100"],
20692069
)},
20702070

@@ -2076,8 +2076,8 @@
20762076
'factory' : OpenMPBuilder.getOpenMPCMakeBuildFactory(
20772077
clean=True,
20782078
test=False, # we have no GPU avail, skip runtime tests
2079-
enable_runtimes=['openmp', 'compiler-rt', 'offload'],
2080-
depends_on_projects=['llvm','clang', 'flang', 'lld', 'mlir', 'offload', 'openmp', 'compiler-rt'],
2079+
enable_runtimes=['openmp', 'compiler-rt', 'offload', 'flang-rt'],
2080+
depends_on_projects=['llvm','clang', 'flang', 'flang-rt', 'lld', 'mlir', 'offload', 'openmp', 'compiler-rt'],
20812081
extraCmakeArgs=[
20822082
"-DCMAKE_BUILD_TYPE=Release",
20832083
"-DCLANG_DEFAULT_LINKER=lld",
@@ -2097,7 +2097,7 @@
20972097
"-DTEST_SUITE_SOLLVEVV_OFFLOADING_CFLAGS=-fopenmp-targets=amdgcn-amd-amdhsa;-Xopenmp-target=amdgcn-amd-amdhsa",
20982098
"-DTEST_SUITE_SOLLVEVV_OFFLOADING_LDLAGS=-fopenmp-targets=amdgcn-amd-amdhsa;-Xopenmp-target=amdgcn-amd-amdhsa",
20992099
],
2100-
add_lit_checks=["check-clang", "check-flang", "check-llvm", "check-lld", "check-mlir"],
2100+
add_lit_checks=["check-clang", "check-flang", "check-flang-rt", "check-llvm", "check-lld", "check-mlir"],
21012101
add_openmp_lit_args=["--time-tests", "--timeout 100"],
21022102
)},
21032103

@@ -2108,8 +2108,8 @@
21082108
'factory' : OpenMPBuilder.getOpenMPCMakeBuildFactory(
21092109
clean=True,
21102110
test=True,
2111-
enable_runtimes=['openmp', 'compiler-rt', 'offload'],
2112-
depends_on_projects=['llvm','clang', 'flang', 'lld', 'mlir', 'offload', 'openmp', 'compiler-rt'],
2111+
enable_runtimes=['openmp', 'compiler-rt', 'offload', 'flang-rt'],
2112+
depends_on_projects=['llvm','clang', 'flang', 'flang-rt', 'lld', 'mlir', 'offload', 'openmp', 'compiler-rt'],
21132113
extraCmakeArgs=[
21142114
"-DCMAKE_BUILD_TYPE=Release",
21152115
"-DCLANG_DEFAULT_LINKER=lld",
@@ -2130,7 +2130,7 @@
21302130
"-DTEST_SUITE_SOLLVEVV_OFFLOADING_CFLAGS=-fopenmp-targets=amdgcn-amd-amdhsa;-Xopenmp-target=amdgcn-amd-amdhsa",
21312131
"-DTEST_SUITE_SOLLVEVV_OFFLOADING_LDLAGS=-fopenmp-targets=amdgcn-amd-amdhsa;-Xopenmp-target=amdgcn-amd-amdhsa",
21322132
],
2133-
add_lit_checks=["check-clang", "check-flang", "check-llvm", "check-lld", "check-mlir", "check-offload"],
2133+
add_lit_checks=["check-clang", "check-flang", "check-flang-rt", "check-llvm", "check-lld", "check-mlir", "check-offload"],
21342134
add_openmp_lit_args=["--time-tests", "--timeout 100", "--xfail=affinity/format/proc_bind.c"],
21352135
)},
21362136

@@ -2141,8 +2141,8 @@
21412141
'factory' : OpenMPBuilder.getOpenMPCMakeBuildFactory(
21422142
clean=True,
21432143
test=True,
2144-
enable_runtimes=['openmp', 'compiler-rt', 'offload'],
2145-
depends_on_projects=['llvm','clang', 'flang', 'lld', 'mlir', 'offload', 'openmp', 'compiler-rt'],
2144+
enable_runtimes=['openmp', 'compiler-rt', 'offload', 'flang-rt'],
2145+
depends_on_projects=['llvm','clang', 'flang', 'flang-rt', 'lld', 'mlir', 'offload', 'openmp', 'compiler-rt'],
21462146
extraCmakeArgs=[
21472147
"-DCMAKE_BUILD_TYPE=Release",
21482148
"-DCLANG_DEFAULT_LINKER=lld",
@@ -2163,7 +2163,7 @@
21632163
"-DTEST_SUITE_SOLLVEVV_OFFLOADING_CFLAGS=-fopenmp-targets=amdgcn-amd-amdhsa;-Xopenmp-target=amdgcn-amd-amdhsa",
21642164
"-DTEST_SUITE_SOLLVEVV_OFFLOADING_LDLAGS=-fopenmp-targets=amdgcn-amd-amdhsa;-Xopenmp-target=amdgcn-amd-amdhsa",
21652165
],
2166-
add_lit_checks=["check-clang", "check-flang", "check-llvm", "check-lld", "check-mlir", "check-offload"],
2166+
add_lit_checks=["check-clang", "check-flang", "check-flang-rt", "check-llvm", "check-lld", "check-mlir", "check-offload"],
21672167
add_openmp_lit_args=["--time-tests", "--timeout 100", "--xfail=affinity/format/proc_bind.c"],
21682168
)},
21692169

0 commit comments

Comments
 (0)