[HIP] Fix rocm not found on rocm3.5

[yaxunl]

Summary

Currently rocm detector expects device library bitcodes named as *.bc
instead of *.amdgcn.bc. However in rocm3.5 the device library bitcodes
are named as *.amdgcn.bc, which causes rocm3.5 not detected.

This patch fixes that. Tested works with rocm3.5.

[arsenm]

Can you add tests for this? Is this also sufficient with the directory layout change?

[yaxunl]

In D81713#2089672, @arsenm wrote:

Can you add tests for this? Is this also sufficient with the directory layout change?

You mean does this work after we move device lib from /opt/rocm/lib to /opt/rocm/amdgcn/bitcode ?

[arsenm]

In D81713#2089680, @yaxunl wrote:

In D81713#2089672, @arsenm wrote:

Can you add tests for this? Is this also sufficient with the directory layout change?

You mean does this work after we move device lib from /opt/rocm/lib to /opt/rocm/amdgcn/bitcode ?

Yes

[tra]

In D81713#2089760, @arsenm wrote:

In D81713#2089680, @yaxunl wrote:

In D81713#2089672, @arsenm wrote:

Can you add tests for this? Is this also sufficient with the directory layout change?

You mean does this work after we move device lib from /opt/rocm/lib to /opt/rocm/amdgcn/bitcode ?

Yes

I can tell that it does not. We're still looking under /opt/rocm by default. I've ran into it trying to get comgr working with the recent LLVM which prompted my comment on Github

[arsenm]

In D81713#2090265, @tra wrote:

In D81713#2089760, @arsenm wrote:

In D81713#2089680, @yaxunl wrote:

In D81713#2089672, @arsenm wrote:

Can you add tests for this? Is this also sufficient with the directory layout change?

You mean does this work after we move device lib from /opt/rocm/lib to /opt/rocm/amdgcn/bitcode ?

Yes

I can tell that it does not. We're still looking under /opt/rocm by default. I've ran into it trying to get comgr working with the recent LLVM which prompted my comment on Github

Not sure how that would be related to comgr? comgr doesn't rely on the dynamic path and embeds the bitcode in the library. The comgr build finds the libraries through cmake and doesn't care where they're located

[tra]

In D81713#2090309, @arsenm wrote:

I can tell that it does not. We're still looking under /opt/rocm by default. I've ran into it trying to get comgr working with the recent LLVM which prompted my comment on Github

Not sure how that would be related to comgr? comgr doesn't rely on the dynamic path and embeds the bitcode in the library. The comgr build finds the libraries through cmake and doesn't care where they're located

The version I have (~3.2. I should update it, maybe 3.5 is different) uses libclang (built from LLVM tree close to HEAD), creates Driver() instance and that driver instance goes through the motions trying to find ROCm installation and fails. Clang itself also fails the same way -- there's no /opt/rocm/amdgcn/bitcode/ it's looking for.

[arsenm]

This only solves compatability with the old layout in the case where the hipcc wrapper is pointing directly to the library directory. I think this will still fail with the native clang search process

[yaxunl]

I will commit this patch since it allows hipcc to use old rocm device library. Will fix other issues later.

clang/lib/Driver/ToolChains/AMDGPU.cpp

 using namespace clang::driver::toolchains;
 using namespace clang;
 using namespace llvm::opt;
 
 void RocmInstallationDetector::scanLibDevicePath() {
   assert(!LibDevicePath.empty());
 
   const StringRef Suffix(".bc");
+  const StringRef Suffix2(".amdgcn.bc");
 
   std::error_code EC;
   for (llvm::vfs::directory_iterator
            LI = D.getVFS().dir_begin(LibDevicePath, EC),
            LE;
        !EC && LI != LE; LI = LI.increment(EC)) {
     StringRef FilePath = LI->path();
     StringRef FileName = llvm::sys::path::filename(FilePath);
     if (!FileName.endswith(Suffix))
       continue;
 
-    StringRef BaseName = FileName.drop_back(Suffix.size());
+    StringRef BaseName;
+    if (FileName.endswith(Suffix2))
+      BaseName = FileName.drop_back(Suffix2.size());
+    else if (FileName.endswith(Suffix))
+      BaseName = FileName.drop_back(Suffix.size());
 
     if (BaseName == "ocml") {
       OCML = FilePath;
     } else if (BaseName == "ockl") {
       OCKL = FilePath;
     } else if (BaseName == "opencl") {
       OpenCL = FilePath;
     } else if (BaseName == "hip") {