pass sycl device lib spv dir to sycl-post-link in clang linker wrapper

Signed-off-by: jinge90 <[email protected]>

Author: jinge90

clang/lib/Driver/ToolChains/Clang.cpp

@@ -10956,7 +10956,7 @@ static void getNonTripleBasedSYCLPostLinkOpts(const ToolChain &TC,
     SmallString<128> FullLibName(SpvLoc);
     llvm::sys::path::append(FullLibName, FallbackAssertName);
     if (llvm::sys::fs::exists(FullLibName)) {
-      SmallString<128> SYCLDeviceLibDir("--device-lib-dir=");
+      SmallString<128> SYCLDeviceLibDir("--device-lib-spv-dir=");
       SYCLDeviceLibDir += SpvLoc.str();
       addArgs(PostLinkArgs, TCArgs, {SYCLDeviceLibDir.str()});
       break;

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

@@ -727,6 +727,20 @@ runSYCLPostLinkTool(ArrayRef<StringRef> InputFiles, const ArgList &Args) {
   SmallVector<StringRef, 8> CmdArgs;
   CmdArgs.push_back(*SYCLPostLinkPath);
   const llvm::Triple Triple(Args.getLastArgValue(OPT_triple_EQ));
+  Arg *SYCLDeviceLibLoc = Args.getLastArg(OPT_sycl_device_library_location_EQ);
+  if (SYCLDeviceLibLoc) {
+    std::string SYCLDeviceLibSPVLoc = SYCLDeviceLibLoc->getValue();
+    llvm::Triple HostTriple(Args.getLastArgValue(OPT_host_triple_EQ));
+    if (HostTriple.isOSWindows())
+      SYCLDeviceLibSPVLoc += "../bin";
+
+    std::string AssertSPVLoc =
+        SYCLDeviceLibSPVLoc + "/libsycl-fallback-cassert.spv";
+    if (llvm::sys::fs::exists(AssertSPVLoc)) {
+      SYCLDeviceLibSPVLoc = "--device-lib-spv-dir=" + SYCLDeviceLibSPVLoc;
+      CmdArgs.push_back(Args.MakeArgString(StringRef(SYCLDeviceLibSPVLoc)));
+    }
+  }
   getTripleBasedSYCLPostLinkOpts(Args, CmdArgs, Triple);
   StringRef SYCLPostLinkOptions;
   if (Arg *A = Args.getLastArg(OPT_sycl_post_link_options_EQ))

llvm/tools/sycl-post-link/sycl-post-link.cpp

@@ -105,8 +105,8 @@ cl::opt<std::string> OutputDir{
     cl::value_desc("dirname"), cl::cat(PostLinkCat)};
 
 cl::opt<std::string> DeviceLibDir{
-    "device-lib-dir",
-    cl::desc("Directory where sycl fallback device libraries reside"),
+    "device-lib-spv-dir",
+    cl::desc("Directory where sycl fallback spirv device libraries  reside"),
     cl::value_desc("dirname"), cl::cat(PostLinkCat)};
 
 struct TargetFilenamePair {