Fix documenetation error. Add TODO for --sycl-link usage. Add couple of changes missed out from earlier commit.

Signed-off-by: Arvind Sudarsanam <[email protected]>

Author: asudarsa

clang/docs/index.rst

@@ -97,7 +97,7 @@ Using Clang Tools
    ClangOffloadBundler
    ClangOffloadPackager
    ClangRepl
-   ClangSYCLLinkWrapper
+   ClangSYCLLinker
 
 Design Documents
 ================

clang/lib/Driver/ToolChains/SPIRV.cpp

@@ -107,6 +107,8 @@ void SPIRV::Linker::ConstructJob(Compilation &C, const JobAction &JA,
 SPIRVToolChain::SPIRVToolChain(const Driver &D, const llvm::Triple &Triple,
                                const ArgList &Args)
     : ToolChain(D, Triple, Args) {
+  // TODO: Revisit need/use of --sycl-link option once SYCL toolchain is
+  // available and SYCL linking support is moved there.
   NativeLLVMSupport = Args.hasArg(options::OPT_sycl_link);
 }
 

clang/tools/clang-sycl-linker/ClangSYCLLinker.cpp

@@ -367,10 +367,11 @@ static void getSPIRVTransOpts(const ArgList &Args,
 static Expected<StringRef> runLLVMToSPIRVTranslation(StringRef File,
                                                      const ArgList &Args) {
   llvm::TimeTraceScope TimeScope("LLVMToSPIRVTranslation");
-  Expected<std::string> LLVMToSPIRVPath =
-      findProgram(Args, "llvm-spirv", {getMainExecutable("llvm-spirv")});
-  if (!LLVMToSPIRVPath)
-    return LLVMToSPIRVPath.takeError();
+  StringRef LLVMSPIRVPath = Args.getLastArgValue(llvm_spirv_path_EQ);
+  Expected<std::string> LLVMToSPIRVProg =
+      findProgram(Args, "llvm-spirv", {LLVMSPIRVPath});
+  if (!LLVMToSPIRVProg)
+    return LLVMToSPIRVProg.takeError();
 
   SmallVector<StringRef, 8> CmdArgs;
   CmdArgs.push_back(*LLVMToSPIRVPath);
@@ -383,7 +384,7 @@ static Expected<StringRef> runLLVMToSPIRVTranslation(StringRef File,
                            /* KeepEmpty = */ false);
   CmdArgs.append({"-o", OutputFile});
   CmdArgs.push_back(File);
-  if (Error Err = executeCommands(*LLVMToSPIRVPath, CmdArgs))
+  if (Error Err = executeCommands(*LLVMToSPIRVProg, CmdArgs))
     return std::move(Err);
 
   if (!SPIRVDumpDir.empty()) {