[PATCH] D107716: Correct openmp-offload-builders lld, openmp

[Ron Lieberman via Phabricator via llvm-commits]

ronlieb created this revision.
ronlieb added reviewers: david-salinas, JonChesterfield, Meinersbur, gkistanova.
Herald added subscribers: guansong, kristof.beyls, tpr, yaxunl.
ronlieb requested review of this revision.
Herald added a reviewer: jdoerfert.
Herald added subscribers: llvm-commits, sstefan1.
Herald added a project: LLVM.

Remove openmp from depends_on_projects, as it incorrectly builds amdgpu runtime stack corruption at runtime.
We need to use -DLLVM_ENABLE_RUNTIMES=openmp instead, and its presence conflicts if openmp is present.
Also adding "-DCLANG_DEFAULT_LINKER=lld" as it seems harmless.
Adding 'lld' to depends_on_projects so it gets built.


Repository:
  rG LLVM Github Monorepo

https://reviews.llvm.org/D107716

Files:
  buildbot/osuosl/master/config/builders.py


Index: buildbot/osuosl/master/config/builders.py
===================================================================
--- buildbot/osuosl/master/config/builders.py
+++ buildbot/osuosl/master/config/builders.py
@@ -1381,11 +1381,13 @@
     'factory' : OpenMPBuilder.getOpenMPCMakeBuildFactory(
                         clean=False,
                         enable_runtimes=[],
-                        depends_on_projects=['llvm','clang','openmp'],
+                        depends_on_projects=['llvm','clang','lld'],
                         extraCmakeArgs=[
                             "-DCMAKE_BUILD_TYPE=Release",
+                            "-DCLANG_DEFAULT_LINKER=lld",
                             "-DLLVM_TARGETS_TO_BUILD=X86;AMDGPU",
                             "-DLLVM_ENABLE_ASSERTIONS=ON",
+                            "-DLLVM_ENABLE_RUNTIMES=openmp",
                             ],
                         install=True,
                         testsuite=True,
@@ -1403,11 +1405,13 @@
     'factory' : OpenMPBuilder.getOpenMPCMakeBuildFactory(
                         clean=True,
                         enable_runtimes=['openmp'],
-                        depends_on_projects=['llvm','clang','openmp'],
+                        depends_on_projects=['llvm','clang','lld'],
                         extraCmakeArgs=[
                             "-DCMAKE_BUILD_TYPE=Release",
+                            "-DCLANG_DEFAULT_LINKER=lld",
                             "-DLLVM_TARGETS_TO_BUILD=X86;AMDGPU",
                             "-DLLVM_ENABLE_ASSERTIONS=ON",
+                            "-DLLVM_ENABLE_RUNTIMES=openmp",
                             ],
                         install=True,
                         testsuite=True,


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D107716.365032.patch
Type: text/x-patch
Size: 1752 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20210808/04374795/attachment.bin>