[Clang] Always pass detected CUDA path to 'clang-nvlink-wrapper' #152789
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
llvmbot
added
clang
|
@llvm/pr-subscribers-clang @llvm/pr-subscribers-clang-driver Author: Joseph Huber (jhuber6) ChangesSummary: Full diff: https://github.com/llvm/llvm-project/pull/152789.diff 2 Files Affected:
diff --git a/clang/lib/Driver/ToolChains/Cuda.cpp b/clang/lib/Driver/ToolChains/Cuda.cpp
index fdfcea852b4f2..847d7235441c9 100644
--- a/clang/lib/Driver/ToolChains/Cuda.cpp
+++ b/clang/lib/Driver/ToolChains/Cuda.cpp
@@ -611,9 +611,13 @@ void NVPTX::Linker::ConstructJob(Compilation &C, const JobAction &JA,
CmdArgs.push_back(Args.MakeArgString(
"--pxtas-path=" + Args.getLastArgValue(options::OPT_ptxas_path_EQ)));
- if (Args.hasArg(options::OPT_cuda_path_EQ))
- CmdArgs.push_back(Args.MakeArgString(
- "--cuda-path=" + Args.getLastArgValue(options::OPT_cuda_path_EQ)));
+ if (Args.hasArg(options::OPT_ptxas_path_EQ) ||
+ TC.CudaInstallation.isValid()) {
+ StringRef CudaPath = Args.getLastArgValue(
+ options::OPT_cuda_path_EQ,
+ llvm::sys::path::parent_path(TC.CudaInstallation.getBinPath()));
+ CmdArgs.push_back(Args.MakeArgString("--cuda-path=" + CudaPath));
+ }
// Add paths specified in LIBRARY_PATH environment variable as -L options.
addDirectoryList(Args, CmdArgs, "-L", "LIBRARY_PATH");
diff --git a/clang/tools/clang-nvlink-wrapper/ClangNVLinkWrapper.cpp b/clang/tools/clang-nvlink-wrapper/ClangNVLinkWrapper.cpp
index 4b63971214f81..c78e37a1ffe89 100644
--- a/clang/tools/clang-nvlink-wrapper/ClangNVLinkWrapper.cpp
+++ b/clang/tools/clang-nvlink-wrapper/ClangNVLinkWrapper.cpp
@@ -286,12 +286,17 @@ struct Symbol {
};
Expected<StringRef> runPTXAs(StringRef File, const ArgList &Args) {
- std::string CudaPath = Args.getLastArgValue(OPT_cuda_path_EQ).str();
- std::string GivenPath = Args.getLastArgValue(OPT_ptxas_path_EQ).str();
- Expected<std::string> PTXAsPath =
- findProgram(Args, "ptxas", {CudaPath + "/bin", GivenPath});
+ SmallVector<StringRef, 1> SearchPaths;
+ if (Arg *A = Args.getLastArg(OPT_cuda_path_EQ))
+ SearchPaths.push_back(
+ Args.MakeArgString(StringRef(A->getValue()) + "/bin"));
+ if (Arg *A = Args.getLastArg(OPT_ptxas_path_EQ))
+ SearchPaths.push_back(Args.MakeArgString(A->getValue()));
+
+ Expected<std::string> PTXAsPath = findProgram(Args, "ptxas", SearchPaths);
if (!PTXAsPath)
return PTXAsPath.takeError();
+
if (!Args.hasArg(OPT_arch))
return createStringError(
"must pass in an explicit nvptx64 gpu architecture to 'ptxas'");
@@ -691,9 +696,12 @@ Error runNVLink(ArrayRef<StringRef> Files, const ArgList &Args) {
if (Args.hasArg(OPT_lto_emit_asm) || Args.hasArg(OPT_lto_emit_llvm))
return Error::success();
- std::string CudaPath = Args.getLastArgValue(OPT_cuda_path_EQ).str();
- Expected<std::string> NVLinkPath =
- findProgram(Args, "nvlink", {CudaPath + "/bin"});
+ SmallVector<StringRef, 1> SearchPaths;
+ if (Arg *A = Args.getLastArg(OPT_cuda_path_EQ))
+ SearchPaths.push_back(
+ Args.MakeArgString(StringRef(A->getValue()) + "/bin"));
+
+ Expected<std::string> NVLinkPath = findProgram(Args, "nvlink", SearchPaths);
if (!NVLinkPath)
return NVLinkPath.takeError();
|
arsenm
reviewed
Aug 9, 2025
Summary: We always want to use the detected path. The clang driver's detection is far more sophisticated so we should use that whenever possible. Also update the usage so we properly fall back to path instead of incorrectly using the `/bin` if not provided.
|
LLVM Buildbot has detected a new failure on builder Full details are available at: https://lab.llvm.org/buildbot/#/builders/206/builds/4592 Here is the relevant piece of the build log for the reference |
|
LLVM Buildbot has detected a new failure on builder Full details are available at: https://lab.llvm.org/buildbot/#/builders/18/builds/20297 Here is the relevant piece of the build log for the reference |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Summary:
We always want to use the detected path. The clang driver's detection is
far more sophisticated so we should use that whenever possible. Also
update the usage so we properly fall back to path instead of incorrectly
using the
/binif not provided.