This is an archive of the discontinued LLVM Phabricator instance.

Differential D147579

[nvptx-arch] Dynamically load `libcuda.so.1` directly instead
ClosedPublic

Authored by jhuber6 on Apr 4 2023, 4:12 PM.

Details

Reviewers
tra
Commits
rGad6a7d7dc9a2: [nvptx-arch] Dynamically load `libcuda.so.1` directly instead
Summary

This patch loads the CUDA driver library directly via its real
DT_SONAME. This prevents the filesystem from needing to reload it in
cases when it's already loaded.

Diff Detail

Event Timeline

jhuber6 created this revision.Apr 4 2023, 4:12 PM
Herald added a project: Restricted Project. · View Herald TranscriptApr 4 2023, 4:12 PM
Herald added subscribers: mattd, gchakrabarti, asavonic, yaxunl. · View Herald Transcript
jhuber6 requested review of this revision.Apr 4 2023, 4:12 PM
Herald added a project: Restricted Project. · View Herald TranscriptApr 4 2023, 4:12 PM
Herald added subscribers: cfe-commits, jholewinski. · View Herald Transcript
tra accepted this revision.Apr 4 2023, 4:36 PM
This revision is now accepted and ready to land.Apr 4 2023, 4:36 PM
This revision was landed with ongoing or failed builds.Apr 4 2023, 5:50 PM
Closed by commit rGad6a7d7dc9a2: [nvptx-arch] Dynamically load `libcuda.so.1` directly instead (authored by jhuber6). · Explain Why
This revision was automatically updated to reflect the committed changes.
jhuber6 added a commit: rGad6a7d7dc9a2: [nvptx-arch] Dynamically load `libcuda.so.1` directly instead.
Harbormaster completed remote builds in B223695: Diff 510957.Apr 4 2023, 6:00 PM

Revision Contents

PathSize
clang/
tools/
nvptx-arch/
2 lines

Diff 510978

clang/tools/nvptx-arch/NVPTXArch.cpp

Show First 20 Lines • Show All 43 Lines • ▼ Show 20 Lines
typedef uint32_t CUdevice; typedef uint32_t CUdevice;
CUresult (*cuInit)(unsigned int); CUresult (*cuInit)(unsigned int);
CUresult (*cuDeviceGetCount)(int *); CUresult (*cuDeviceGetCount)(int *);
CUresult (*cuGetErrorString)(CUresult, const char **); CUresult (*cuGetErrorString)(CUresult, const char **);
CUresult (*cuDeviceGet)(CUdevice *, int); CUresult (*cuDeviceGet)(CUdevice *, int);
CUresult (*cuDeviceGetAttribute)(int *, CUdevice_attribute, CUdevice); CUresult (*cuDeviceGetAttribute)(int *, CUdevice_attribute, CUdevice);
constexpr const char *DynamicCudaPath = "libcuda.so"; constexpr const char *DynamicCudaPath = "libcuda.so.1";
llvm::Error loadCUDA() { llvm::Error loadCUDA() {
std::string ErrMsg; std::string ErrMsg;
auto DynlibHandle = std::make_unique<llvm::sys::DynamicLibrary>( auto DynlibHandle = std::make_unique<llvm::sys::DynamicLibrary>(
llvm::sys::DynamicLibrary::getPermanentLibrary(DynamicCudaPath, &ErrMsg)); llvm::sys::DynamicLibrary::getPermanentLibrary(DynamicCudaPath, &ErrMsg));
if (!DynlibHandle->isValid()) { if (!DynlibHandle->isValid()) {
return llvm::createStringError(llvm::inconvertibleErrorCode(), return llvm::createStringError(llvm::inconvertibleErrorCode(),
"Failed to 'dlopen' %s", DynamicCudaPath); "Failed to 'dlopen' %s", DynamicCudaPath);
▲ Show 20 Lines • Show All 84 Lines • Show Last 20 Lines