Skip to content

[Clang] Always pass detected CUDA path to 'clang-nvlink-wrapper' #152789

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 11, 2025
Merged

[Clang] Always pass detected CUDA path to 'clang-nvlink-wrapper' #152789

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions clang/lib/Driver/ToolChains/Cuda.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -611,9 +611,12 @@ 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_cuda_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");
Expand Down
8 changes: 8 additions & 0 deletions clang/test/Driver/cuda-cross-compiling.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,3 +104,11 @@
// RUN: -nogpulib -nogpuinc -### %s 2>&1 | FileCheck -check-prefix=STARTUP %s

// STARTUP: clang-nvlink-wrapper{{.*}}"-lc" "-lm" "{{.*}}crt1.o"

//
// Test cuda path handling
//
// RUN: %clang -target nvptx64-nvidia-cuda -march=sm_52 --cuda-path=%S/Inputs/CUDA/usr/local/cuda \
// RUN: -nogpulib -nogpuinc -### %s 2>&1 | FileCheck -check-prefix=PATH %s

// PATH: clang-nvlink-wrapper{{.*}}"--cuda-path={{.*}}/Inputs/CUDA/usr/local/cuda"
20 changes: 13 additions & 7 deletions clang/tools/clang-nvlink-wrapper/ClangNVLinkWrapper.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -286,12 +286,16 @@ 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(A->getValue() + Twine("/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'");
Expand Down Expand Up @@ -691,9 +695,11 @@ 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(A->getValue() + Twine("/bin")));

Expected<std::string> NVLinkPath = findProgram(Args, "nvlink", SearchPaths);
if (!NVLinkPath)
return NVLinkPath.takeError();

Expand Down