Pass nanos6 location to the linker when using -fompss-2

Closes llvm#28

Author: mikaoP

clang/CMakeLists.txt

@@ -291,6 +291,9 @@ set(CLANG_DEFAULT_OBJCOPY "objcopy" CACHE STRING
 set(CLANG_DEFAULT_OPENMP_RUNTIME "libomp" CACHE STRING
   "Default OpenMP runtime used by -fopenmp.")
 
+set(CLANG_DEFAULT_NANOS6_HOME "" CACHE STRING
+  "Nanos6 home directory.")
+
 # OpenMP offloading requires at least sm_35 because we use shuffle instructions
 # to generate efficient code for reductions and the atomicMax instruction on
 # 64-bit integers in the implementation of conditional lastprivate.

clang/include/clang/Config/config.h.cmake

@@ -32,6 +32,9 @@
 /* Default OpenMP runtime used by -fopenmp. */
 #define CLANG_DEFAULT_OPENMP_RUNTIME "${CLANG_DEFAULT_OPENMP_RUNTIME}"
 
+/* Nanos6 home directory. */
+#define CLANG_DEFAULT_NANOS6_HOME "${CLANG_DEFAULT_NANOS6_HOME}"
+
 /* Default architecture for OpenMP offloading to Nvidia GPUs. */
 #define CLANG_OPENMP_NVPTX_DEFAULT_ARCH "${CLANG_OPENMP_NVPTX_DEFAULT_ARCH}"
 

clang/lib/Driver/ToolChains/CommonArgs.cpp

@@ -533,6 +533,29 @@ bool tools::addOpenMPRuntime(ArgStringList &CmdArgs, const ToolChain &TC,
   return true;
 }
 
+void tools::addOmpSsRuntime(ArgStringList &CmdArgs, const ToolChain &TC,
+                            const ArgList &Args) {
+  std::string RuntimeDefaultHome(CLANG_DEFAULT_NANOS6_HOME);
+  Optional<std::string> RuntimeHome =
+    llvm::sys::Process::GetEnv("NANOS6_HOME");
+  // First look at environment NANOS6_HOME,
+  // then CMAKE defined variable.
+  //
+  // Default to compiler lib dir. in case both are not defined.
+  if (RuntimeHome && !RuntimeHome->empty()) {
+    CmdArgs.push_back("-L");
+    CmdArgs.push_back(Args.MakeArgString(RuntimeHome.getValue() + "/lib"));
+    CmdArgs.push_back("-rpath");
+    CmdArgs.push_back(Args.MakeArgString(RuntimeHome.getValue() + "/lib"));
+  } else if (!RuntimeDefaultHome.empty()) {
+    CmdArgs.push_back("-L");
+    CmdArgs.push_back(Args.MakeArgString(RuntimeDefaultHome + "/lib"));
+    CmdArgs.push_back("-rpath");
+    CmdArgs.push_back(Args.MakeArgString(RuntimeDefaultHome + "/lib"));
+  }
+  CmdArgs.push_back("-lnanos6");
+}
+
 static void addSanitizerRuntime(const ToolChain &TC, const ArgList &Args,
                                 ArgStringList &CmdArgs, StringRef Sanitizer,
                                 bool IsShared, bool IsWhole) {

clang/lib/Driver/ToolChains/CommonArgs.h

@@ -86,6 +86,10 @@ bool addOpenMPRuntime(llvm::opt::ArgStringList &CmdArgs, const ToolChain &TC,
                       const llvm::opt::ArgList &Args,
                       bool IsOffloadingHost = false, bool GompNeedsRT = false);
 
+/// OmpSs Nanos6 linker flags
+void addOmpSsRuntime(llvm::opt::ArgStringList &CmdArgs, const ToolChain &TC,
+                     const llvm::opt::ArgList &Args);
+
 llvm::opt::Arg *getLastProfileUseArg(const llvm::opt::ArgList &Args);
 llvm::opt::Arg *getLastProfileSampleUseArg(const llvm::opt::ArgList &Args);
 

clang/lib/Driver/ToolChains/Gnu.cpp

@@ -564,6 +564,9 @@ void tools::gnutools::Linker::ConstructJob(Compilation &C, const JobAction &JA,
         // FIXME: Does this really make sense for all GNU toolchains?
         WantPthread = true;
 
+      if (Args.getLastArg(options::OPT_fompss))
+        addOmpSsRuntime(CmdArgs, ToolChain, Args);
+
       AddRunTimeLibs(ToolChain, D, CmdArgs, Args);
 
       if (WantPthread && !isAndroid)