Skip to content

Commit 47fe254

Browse files
jplehrvvereschaka
authored andcommitted
[AMDGPU][Libc] Add cmake-cache based builder (llvm#581)
Move the buildbot that used to do the libc builds to the CMake cache file based approach. This is a bit of a WIP as we also sort out a few other things in the background.
1 parent ce54ff3 commit 47fe254

File tree

1 file changed

+6
-31
lines changed

1 file changed

+6
-31
lines changed

buildbot/osuosl/master/config/builders.py

Lines changed: 6 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -2087,37 +2087,12 @@
20872087
'workernames' : ["omp-vega20-1"],
20882088
# We would like to never collapse, but it seems the load is too high on that system to keep up.
20892089
'builddir': "openmp-offload-libc-amdgpu-runtime",
2090-
'factory' : OpenMPBuilder.getOpenMPCMakeBuildFactory(
2091-
clean=True,
2092-
depends_on_projects=['llvm', 'clang', 'compiler-rt', 'libc', 'lld', 'offload', 'openmp'],
2093-
# Special case this bot to account for new (verbose) libc build syntax
2094-
enable_runtimes=['openmp', 'compiler-rt', 'offload'],
2095-
extraCmakeArgs=[
2096-
"-DCMAKE_BUILD_TYPE=Release",
2097-
"-DCLANG_DEFAULT_LINKER=lld",
2098-
"-DLLVM_TARGETS_TO_BUILD=X86;AMDGPU",
2099-
"-DLLVM_ENABLE_ASSERTIONS=ON",
2100-
"-DCMAKE_C_COMPILER_LAUNCHER=ccache",
2101-
"-DCMAKE_CXX_COMPILER_LAUNCHER=ccache",
2102-
"-DLIBOMPTARGET_FOUND_AMDGPU_GPU=ON",
2103-
"-DLIBOMP_ARCHER_SUPPORT=OFF",
2104-
"-DRUNTIMES_amdgcn-amd-amdhsa_LLVM_ENABLE_RUNTIMES=libc",
2105-
"-DLLVM_RUNTIME_TARGETS=default;amdgcn-amd-amdhsa",
2106-
"-DRUNTIMES_amdgcn-amd-amdhsa_LIBC_GPU_TEST_ARCHITECTURE=gfx906",
2107-
],
2108-
env={
2109-
'HSA_ENABLE_SDMA':'0',
2110-
},
2111-
install=True,
2112-
testsuite=False,
2113-
testsuite_sollvevv=False,
2114-
extraTestsuiteCmakeArgs=[
2115-
"-DTEST_SUITE_SOLLVEVV_OFFLOADING_CFLAGS=-fopenmp;-fopenmp-targets=amdgcn-amd-amdhsa;-Xopenmp-target=amdgcn-amd-amdhsa;-march=gfx906",
2116-
"-DTEST_SUITE_SOLLVEVV_OFFLOADING_LDLAGS=-fopenmp;-fopenmp-targets=amdgcn-amd-amdhsa;-Xopenmp-target=amdgcn-amd-amdhsa;-march=gfx906",
2117-
],
2118-
add_lit_checks=["check-offload", "check-libc-amdgcn-amd-amdhsa"],
2119-
add_openmp_lit_args=["--filter-out=offloading/pgo1.c"],
2120-
)},
2090+
'factory' : AnnotatedBuilder.getAnnotatedBuildFactory(
2091+
depends_on_projects=['llvm', 'clang', 'compiler-rt', 'lld', 'libc', 'offload', 'openmp', 'libunwind'],
2092+
script='amdgpu-offload-cmake.py --cmake-file=AMDGPULibcBot.cmake',
2093+
checkout_llvm_sources=True,
2094+
script_interpreter=None
2095+
)},
21212096

21222097
{'name' : "openmp-offload-amdgpu-clang-flang",
21232098
'tags' : ["openmp,flang"],

0 commit comments

Comments
 (0)