Skip to content

Commit f840616

Browse files
authored
[OpenMP][AMDGPU] Build compiler-rt as runtime (#175)
This adds compiler-rt as runtime to build to unify our buildbots and removes the unneeded manual addition of openmp as a runtime to build in the CMake options list.
1 parent 0f90999 commit f840616

File tree

1 file changed

+3
-6
lines changed

1 file changed

+3
-6
lines changed

buildbot/osuosl/master/config/builders.py

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1807,14 +1807,13 @@
18071807
'builddir': "openmp-offload-amdgpu-runtime",
18081808
'factory' : OpenMPBuilder.getOpenMPCMakeBuildFactory(
18091809
clean=True,
1810-
enable_runtimes=['openmp', 'offload'],
1810+
enable_runtimes=['compiler-rt', 'openmp', 'offload'],
18111811
depends_on_projects=['llvm','clang','lld', 'offload', 'openmp'],
18121812
extraCmakeArgs=[
18131813
"-DCMAKE_BUILD_TYPE=Release",
18141814
"-DCLANG_DEFAULT_LINKER=lld",
18151815
"-DLLVM_TARGETS_TO_BUILD=X86;AMDGPU",
18161816
"-DLLVM_ENABLE_ASSERTIONS=ON",
1817-
"-DLLVM_ENABLE_RUNTIMES=openmp",
18181817
"-DCMAKE_C_COMPILER_LAUNCHER=ccache",
18191818
"-DCMAKE_CXX_COMPILER_LAUNCHER=ccache",
18201819
],
@@ -1837,14 +1836,13 @@
18371836
'builddir': "openmp-offload-amdgpu-runtime-2",
18381837
'factory' : OpenMPBuilder.getOpenMPCMakeBuildFactory(
18391838
clean=True,
1840-
enable_runtimes=['openmp', 'offload'],
1839+
enable_runtimes=['compiler-rt', 'openmp', 'offload'],
18411840
depends_on_projects=['llvm','clang','lld', 'offload', 'openmp'],
18421841
extraCmakeArgs=[
18431842
"-DCMAKE_BUILD_TYPE=Release",
18441843
"-DCLANG_DEFAULT_LINKER=lld",
18451844
"-DLLVM_TARGETS_TO_BUILD=X86;AMDGPU",
18461845
"-DLLVM_ENABLE_ASSERTIONS=ON",
1847-
"-DLLVM_ENABLE_RUNTIMES=openmp",
18481846
"-DCMAKE_C_COMPILER_LAUNCHER=ccache",
18491847
"-DCMAKE_CXX_COMPILER_LAUNCHER=ccache",
18501848
],
@@ -1932,14 +1930,13 @@
19321930
'builddir': "openmp-offload-amdgpu-clang-flang",
19331931
'factory' : OpenMPBuilder.getOpenMPCMakeBuildFactory(
19341932
clean=True,
1935-
enable_runtimes=['openmp', 'offload'],
1933+
enable_runtimes=['compiler-rt', 'openmp', 'offload'],
19361934
depends_on_projects=['llvm','clang','lld', 'offload', 'openmp','flang'],
19371935
extraCmakeArgs=[
19381936
"-DCMAKE_BUILD_TYPE=Release",
19391937
"-DCLANG_DEFAULT_LINKER=lld",
19401938
"-DLLVM_TARGETS_TO_BUILD=X86;AMDGPU",
19411939
"-DLLVM_ENABLE_ASSERTIONS=ON",
1942-
"-DLLVM_ENABLE_RUNTIMES=openmp",
19431940
"-DCMAKE_C_COMPILER_LAUNCHER=ccache",
19441941
"-DCMAKE_CXX_COMPILER_LAUNCHER=ccache",
19451942
],

0 commit comments

Comments
 (0)