update device linking pt3

Author: jzc

clang/lib/Driver/ToolChains/Clang.cpp

@@ -11299,6 +11299,15 @@ void LinkerWrapper::ConstructJob(Compilation &C, const JobAction &JA,
     // Create a comma separated list to pass along to the linker wrapper.
     SmallString<256> LibList;
     SmallString<256> BCLibList;
+
+    // Lambda to append items to BCLibList with comma separation
+    auto appendToBCLibList = [&BCLibList](const llvm::Triple &Triple,
+                                          const Twine &Path) {
+      if (BCLibList.size() > 0)
+        BCLibList += ",";
+      BCLibList += (Twine(Triple.str()) + "=" + Path).str();
+    };
+
     llvm::Triple TargetTriple;
     auto ToolChainRange = C.getOffloadToolChains<Action::OFK_SYCL>();
     for (auto &I :
@@ -11316,15 +11325,23 @@ void LinkerWrapper::ConstructJob(Compilation &C, const JobAction &JA,
       SYCLDeviceLibs = SYCL::getDeviceLibraries(C, TargetTriple, UseAOTLink);
       for (const auto &AddLib : SYCLDeviceLibs) {
         if (llvm::sys::path::extension(AddLib) == ".bc") {
-          if (BCLibList.size() > 0)
-            BCLibList += ",";
-          BCLibList += Twine(TC->getTriple().str() + "=" + AddLib).str();
+          SmallString<256> LibPath(DeviceLibDir);
+          llvm::sys::path::append(LibPath, AddLib);
+          appendToBCLibList(TC->getTriple(), LibPath);
           continue;
         }
+
         if (LibList.size() > 0)
           LibList += ",";
         LibList += AddLib;
       }
+
+      if (TC->getTriple().isNVPTX()) {
+        if (const char *LibSpirvFile = SYCLInstallation.findLibspirvPath(
+                TC->getTriple(), Args, *TC->getAuxTriple())) {
+          appendToBCLibList(TC->getTriple(), LibSpirvFile);
+        }
+      }
     }
     // -sycl-device-libraries=<libs> provides a comma separate list of
     // libraries to add to the device linking step.
@@ -11334,7 +11351,7 @@ void LinkerWrapper::ConstructJob(Compilation &C, const JobAction &JA,
 
     if (BCLibList.size())
       CmdArgs.push_back(
-          Args.MakeArgString(Twine("--sycl-bc-device-libraries=") + BCLibList));
+          Args.MakeArgString(Twine("-sycl-bc-device-libraries=") + BCLibList));
 
     // -sycl-device-library-location=<dir> provides the location in which the
     // SYCL device libraries can be found.

clang/tools/clang-linker-wrapper/ClangLinkerWrapper.cpp

@@ -1418,21 +1418,21 @@ static Expected<StringRef> linkDevice(ArrayRef<StringRef> InputFiles,
   }
 
   for (StringRef Library : Args.getAllArgValues(OPT_sycl_bc_device_lib_EQ)) {
-    auto [LibraryTriple, LibraryName] = Library.split('=');
+    auto [LibraryTriple, LibraryPath] = Library.split('=');
     if (llvm::Triple(LibraryTriple) != Triple)
       continue;
-    StringRef DeviceLibraryDir("");
-    if (Arg *DeviceLibDirArg =
-            Args.getLastArg(OPT_sycl_device_library_location_EQ))
-      DeviceLibraryDir = DeviceLibDirArg->getValue();
-    SmallString<128> DeviceLibPath(DeviceLibraryDir);
-    llvm::sys::path::append(DeviceLibPath, LibraryName);
-    if (!llvm::sys::fs::exists(DeviceLibPath)) {
+    // StringRef DeviceLibraryDir("");
+    // if (Arg *DeviceLibDirArg =
+    //         Args.getLastArg(OPT_sycl_device_library_location_EQ))
+    //   DeviceLibraryDir = DeviceLibDirArg->getValue();
+    // SmallString<128> DeviceLibPath(DeviceLibraryDir);
+    // llvm::sys::path::append(DeviceLibPath, LibraryName);
+    if (!llvm::sys::fs::exists(LibraryPath)) {
       return createStringError(inconvertibleErrorCode(),
-                               "The specified device library " + DeviceLibPath +
+                               "The specified device library " + LibraryPath +
                                    " does not exist.");
     }
-    ExtractedDeviceLibFiles.emplace_back(DeviceLibPath.str());
+    ExtractedDeviceLibFiles.emplace_back(LibraryPath.str());
   }
 
   // Make sure that SYCL device library files are available.