https://github.com/harkgill-amd updated https://github.com/llvm/llvm-project/pull/166238
>From c751b8caa8becda01966f08258da2fb18ccb3718 Mon Sep 17 00:00:00 2001 From: harkgill-amd <[email protected]> Date: Mon, 3 Nov 2025 16:06:58 -0500 Subject: [PATCH 1/2] Fix early exit when finding hip dlls AMDGPUArchByHIP.cpp --- clang/tools/offload-arch/AMDGPUArchByHIP.cpp | 2 -- 1 file changed, 2 deletions(-) diff --git a/clang/tools/offload-arch/AMDGPUArchByHIP.cpp b/clang/tools/offload-arch/AMDGPUArchByHIP.cpp index 11cff4f5ecdbe..45105f6ddd6ef 100644 --- a/clang/tools/offload-arch/AMDGPUArchByHIP.cpp +++ b/clang/tools/offload-arch/AMDGPUArchByHIP.cpp @@ -135,8 +135,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()) >From fecaeefb2b69f1f6f8c9b8780fe5819e67073f64 Mon Sep 17 00:00:00 2001 From: harkgill-amd <[email protected]> Date: Wed, 5 Nov 2025 10:02:05 -0500 Subject: [PATCH 2/2] Fix compareVersion logic to handle `.dll` suffix --- clang/tools/offload-arch/AMDGPUArchByHIP.cpp | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/clang/tools/offload-arch/AMDGPUArchByHIP.cpp b/clang/tools/offload-arch/AMDGPUArchByHIP.cpp index 45105f6ddd6ef..ff39a85d15628 100644 --- a/clang/tools/offload-arch/AMDGPUArchByHIP.cpp +++ b/clang/tools/offload-arch/AMDGPUArchByHIP.cpp @@ -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; _______________________________________________ cfe-commits mailing list [email protected] https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
