Skip to content

[Clang][AMDGPU] Fix early exit when finding hip dlls AMDGPUArchByHIP.cpp #166238

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 5 commits into from
Nov 10, 2025
+10 −4
Merged

[Clang][AMDGPU] Fix early exit when finding hip dlls AMDGPUArchByHIP.cpp #166238

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c751b8c
Fix early exit when finding hip dlls AMDGPUArchByHIP.cpp
harkgill-amd Nov 3, 2025
fecaeef
Fix compareVersion logic to handle `.dll` suffix
harkgill-amd Nov 5, 2025
8ca3af4
Merge branch 'main' into patch-1
harkgill-amd Nov 5, 2025
4034377
Merge branch 'main' into patch-1
harkgill-amd Nov 5, 2025
75cd013
Merge branch 'main' into patch-1
harkgill-amd Nov 10, 2025
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
14 changes: 10 additions & 4 deletions clang/tools/offload-arch/AMDGPUArchByHIP.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,8 +98,16 @@ static std::vector<std::string> getSearchPaths() {
// Custom comparison function for dll name
static bool compareVersions(StringRef A, StringRef B) {
auto ParseVersion = [](StringRef S) -> VersionTuple {
size_t Pos = S.find_last_of('_');
StringRef VerStr = (Pos == StringRef::npos) ? S : S.substr(Pos + 1);
StringRef Filename = sys::path::filename(S);
size_t Pos = Filename.find_last_of('_');
if (Pos == StringRef::npos)
return VersionTuple();

StringRef VerStr = Filename.substr(Pos + 1);
size_t DotPos = VerStr.find('.');
if (DotPos != StringRef::npos)
VerStr = VerStr.substr(0, DotPos);

VersionTuple Vt;
(void)Vt.tryParse(VerStr);
return Vt;
Expand Down Expand Up @@ -135,8 +143,6 @@ static std::pair<std::string, bool> findNewestHIPDLL() {
Filename.ends_with(HipDLLSuffix))
DLLNames.push_back(sys::path::convert_to_slash(DirIt->path()));
}
if (!DLLNames.empty())
break;
}

if (DLLNames.empty())
Expand Down
Loading