From f37b83de0e17caaa4d215e74622d9911159c8ba2 Mon Sep 17 00:00:00 2001 From: JP Lehr Date: Mon, 7 Oct 2024 03:05:42 -0500 Subject: [PATCH] [Flang] Update build config for AMDGPU Updates the build config for the flang OpenMP offload buildbot. --- buildbot/osuosl/master/config/builders.py | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/buildbot/osuosl/master/config/builders.py b/buildbot/osuosl/master/config/builders.py index 22433442a..413c9bd4d 100644 --- a/buildbot/osuosl/master/config/builders.py +++ b/buildbot/osuosl/master/config/builders.py @@ -1942,8 +1942,8 @@ 'builddir': "openmp-offload-amdgpu-clang-flang", 'factory' : OpenMPBuilder.getOpenMPCMakeBuildFactory( clean=True, - enable_runtimes=['compiler-rt', 'openmp', 'offload'], - depends_on_projects=['llvm','clang','lld', 'offload', 'openmp','flang', 'compiler-rt'], + enable_runtimes=['compiler-rt', 'libunwind', 'libcxx', 'libcxxabi', 'openmp', 'offload'], + depends_on_projects=['llvm','clang','lld', 'offload', 'openmp','flang', 'compiler-rt', 'libcxx', 'libcxxabi', 'libunwind'], extraCmakeArgs=[ "-DCMAKE_BUILD_TYPE=Release", "-DCLANG_DEFAULT_LINKER=lld", @@ -1952,6 +1952,22 @@ "-DCMAKE_C_COMPILER_LAUNCHER=ccache", "-DCMAKE_CXX_COMPILER_LAUNCHER=ccache", "-DFLANG_RUNTIME_F128_MATH_LIB=libquadmath", + "-DLIBCXX_ENABLE_SHARED=OFF", + "-DLIBCXX_ENABLE_STATIC=ON", + "-DLIBCXX_INSTALL_LIBRARY=OFF", + "-DLIBCXX_INSTALL_HEADERS=OFF", + "-DLIBCXXABI_ENABLE_SHARED=OFF", + "-DLIBCXXABI_ENABLE_STATIC=ON", + "-DLIBCXXABI_INSTALL_STATIC_LIBRARY=OFF", + "-DLLVM_ENABLE_ZLIB=ON", + "-DLLVM_ENABLE_Z3_SOLVER=OFF", + "-DLLVM_ENABLE_PER_TARGET_RUNTIME_DIR=ON", + "-DCMAKE_CXX_STANDARD=17", + "-DBUILD_SHARED_LIBS=ON", + "-DLLVM_ENABLE_LIBCXX=ON", + "-DCLANG_DEFAULT_RTLIB=compiler-rt", + "-DCLANG_DEFAULT_UNWINDLIB=libgcc", + "-DLIBOMPTARGET_PLUGINS_TO_BUILD=amdgpu;host", ], env={ 'HSA_ENABLE_SDMA':'0',