[HIP] Fix version detection for old HIP-PATH

[yaxunl]

Summary

ROCm used to install components under individual directories,
e.g. HIP installed to /opt/rocm/hip and rocblas installed to
/opt/rocm/rocblas. ROCm has transitioned to a flat directory
structure where all components are installed to /opt/rocm.
HIP-PATH and --hip-path are supposed to be /opt/rocm as
clang detect HIP version by /opt/rocm/share/hip/version.
However, some existing HIP app still uses HIP-PATH=/opt/rocm/hip.
To avoid regression, clang will also try detect share/hip/version
under the parent directory of HIP-PATH or --hip-path.
This way, the detection will work for both new HIP-PATH and
old HIP-PATH.

[tra]

LGTM in general with a minor suggestion.

clang/lib/Driver/ToolChains/AMDGPU.cpp

471

We seem to be rather inconsistent about how we handle paths.

Above, we use llvm::sys::path::append, but here we revert to just appending a path as a string.

I think we should be using llvm::sys::path API consistently. It's unfortunate that the API does not provide a string-returning function to append elements.

auto Append = [](SmallVectorImpl<char> &path, const Twine &a,
                                         const Twine &b = "",
                                         const Twine &c = "",
                                         const Twine &d = "") {
    SmallVectorImpl<char> newpath = path;
    llvm::sys::path::append(newpath, a,b,c,d);
    return newpath; 
}
for (const auto &VersionFilePath :
         {Append(SharePath, "hip", "version"),
          Append(ParentSharePath,  "hip", "version"),
          Append(BinPath, ".hipVersion")}) {
  ...
}

[yaxunl]

clang/lib/Driver/ToolChains/AMDGPU.cpp

471

will do. thanks.

clang/lib/Driver/ToolChains/AMDGPU.cpp

for (const auto &Candidate : HIPSearchDirs) {
     llvm::sys::path::append(BinPath, "bin");
     IncludePath = InstallPath;
     llvm::sys::path::append(IncludePath, "include");
     LibPath = InstallPath;
     llvm::sys::path::append(LibPath, "lib");
     SharePath = InstallPath;
     llvm::sys::path::append(SharePath, "share");
 
+    // Get parent of InstallPath and append "share"
+    SmallString<0> ParentSharePath = llvm::sys::path::parent_path(InstallPath);
+    llvm::sys::path::append(ParentSharePath, "share");
+
     // If HIP version file can be found and parsed, use HIP version from there.
     for (const auto &VersionFilePath :
          {std::string(SharePath) + "/hip/version",
+          std::string(ParentSharePath) + "/hip/version",
           std::string(BinPath) + "/.hipVersion"}) {
       llvm::ErrorOr<std::unique_ptr<llvm::MemoryBuffer>> VersionFile =
           FS.getBufferForFile(VersionFilePath);
       if (!VersionFile)
         continue;
       if (HIPVersionArg.empty() && VersionFile)
         if (parseHIPVersionFile((*VersionFile)->getBuffer()))
           continue;

clang/test/Driver/hip-version.hip

 
 // RUN: env HIP_PATH=%S/Inputs/rocm %clang -v 2>&1 \
 // RUN:   | FileCheck -check-prefixes=FOUND %s
 
 // RUN: rm -rf %t/Inputs
 // RUN: mkdir -p %t/Inputs
 // RUN: cp -r %S/Inputs/rocm %t/Inputs
 // RUN: mkdir -p %t/Inputs/rocm/share/hip
+// RUN: mkdir -p %t/Inputs/rocm/hip
 // RUN: mv %t/Inputs/rocm/bin/.hipVersion %t/Inputs/rocm/share/hip/version
 // RUN: %clang -v --rocm-path=%t/Inputs/rocm 2>&1 \
 // RUN:   | FileCheck -check-prefixes=FOUND %s
+// RUN: %clang -v --hip-path=%t/Inputs/rocm 2>&1 \
+// RUN:   | FileCheck -check-prefixes=FOUND %s
+// RUN: %clang -v --hip-path=%t/Inputs/rocm/hip 2>&1 \
+// RUN:   | FileCheck -check-prefixes=HIP-PATH %s
 
 // FOUND: Found HIP installation: {{.*Inputs.*rocm}}, version 3.6.20214-a2917cd
+// HIP-PATH: Found HIP installation: {{.*Inputs.*rocm.*hip}}, version 3.6.20214-a2917cd
 
 // When --rocm-path is set and .hipVersion is not found, use default version
 
 // RUN: %clang -v --rocm-path=%S 2>&1 \
 // RUN:   | FileCheck -check-prefixes=DEFAULT %s
 
 // When --hip-path is set and .hipVersion is not found, use default version