[HIP] Remove disabled irif library

[ashi1]

Summary

Device Libraries has removed irif.amdgcn.bc, so we need to remove this requirement from HIP Toolchains. Also a few header functions need to be updated. Since fence was previously included in irif, we need to move them into hip.amdgcn.bc instead.

[kristina]

If you don't mind, can you please do another revision with full context (-U99999), makes it easier to review and makes it less likely that svn patch screws up.

[yaxunl]

this seems to be duplicate of https://reviews.llvm.org/D51857

Is HIP github ready for this change?

[ashi1]

Added diff with full context. Also, I need to find replacements for few functions in HIP github before this can be submitted.

[ashi1]

I've added a hip.amdgcn.bc library for the fence functions that were originally in irif library.

[ashi1]

The device libraries has been updated, and the hip.amdgcn.bc library is now available there.

[yaxunl]

lib/Driver/ToolChains/HIP.cpp

85

maybe we should put hip.amdgcn.bc at the beginning. In the future, it may depend on other bc's.

[ashi1]

I've moved the hip.amdgcn.bc to the top of the libs. Updated test as well.

[yaxunl]

LGTM. Thanks!

lib/Driver/ToolChains/HIP.cpp

const char *AMDGCN::Linker::constructLLVMLinkCommand(
   addDirectoryList(Args, LibraryPaths, "-L", "HIP_DEVICE_LIB_PATH");
 
   llvm::SmallVector<std::string, 10> BCLibs;
 
   // Add bitcode library in --hip-device-lib.
   for (auto Lib : Args.getAllArgValues(options::OPT_hip_device_lib_EQ)) {
     BCLibs.push_back(Args.MakeArgString(Lib));
   }
-
-  // If --hip-device-lib is not set, add the default bitcode libraries.
+
+  // If --hip-device-lib is not set, add the default bitcode libraries.
   if (BCLibs.empty()) {
     // Get the bc lib file name for ISA version. For example,
     // gfx803 => oclc_isa_version_803.amdgcn.bc.
     std::string ISAVerBC =
         "oclc_isa_version_" + SubArchName.drop_front(3).str() + ".amdgcn.bc";
 
     llvm::StringRef FlushDenormalControlBC;
     if (Args.hasArg(options::OPT_fcuda_flush_denormals_to_zero))
       FlushDenormalControlBC = "oclc_daz_opt_on.amdgcn.bc";
     else
       FlushDenormalControlBC = "oclc_daz_opt_off.amdgcn.bc";
 
-    BCLibs.append({"opencl.amdgcn.bc",
-                   "ocml.amdgcn.bc", "ockl.amdgcn.bc", "irif.amdgcn.bc",
+    BCLibs.append({"hip.amdgcn.bc", "opencl.amdgcn.bc",
+                   "ocml.amdgcn.bc", "ockl.amdgcn.bc",
                    "oclc_finite_only_off.amdgcn.bc",
                    FlushDenormalControlBC,
                    "oclc_correctly_rounded_sqrt_on.amdgcn.bc",
                    "oclc_unsafe_math_off.amdgcn.bc", ISAVerBC});
   }
   for (auto Lib : BCLibs)
     addBCLib(C, Args, CmdArgs, LibraryPaths, Lib);
 

test/Driver/hip-device-libs.hip

 // RUN:   -fcuda-flush-denormals-to-zero \
 // RUN:   %S/Inputs/hip_multiple_inputs/b.hip \
 // RUN: 2>&1 | FileCheck %s --check-prefixes=COM,FLUSHD
 
 // Test flush-denormals-to-zero disabled uses oclc_daz_opt_off
 
 // RUN: %clang -### -target x86_64-linux-gnu \
 // RUN:   -x hip --cuda-gpu-arch=gfx900 \
-// RUN:   --hip-device-lib-path=%S/Inputs/hip_dev_lib \
-// RUN:   %S/Inputs/hip_multiple_inputs/b.hip \
-// RUN: 2>&1 | FileCheck %s --check-prefixes=COM,NOFLUSHD
+// RUN:   --hip-device-lib-path=%S/Inputs/hip_dev_lib \
+// RUN:   %S/Inputs/hip_multiple_inputs/b.hip \
+// RUN: 2>&1 | FileCheck %s --check-prefixes=COM,NOFLUSHD
+
 
-
-// COM: [[LLVM_LINK:"*.llvm-link"]]
-// COM-SAME: {{.*}} "{{.*}}ocml.amdgcn.bc" "{{.*}}ockl.amdgcn.bc" "{{.*}}irif.amdgcn.bc"
+// COM: [[LLVM_LINK:"*.llvm-link"]]
+// COM-SAME: "{{.*}}hip.amdgcn.bc" "{{.*}}opencl.amdgcn.bc"
+// COM-SAME: "{{.*}}ocml.amdgcn.bc" "{{.*}}ockl.amdgcn.bc"
 // FLUSHD-SAME: {{.*}} "{{.*}}oclc_daz_opt_on.amdgcn.bc"
 // NOFLUSHD-SAME: {{.*}} "{{.*}}oclc_daz_opt_off.amdgcn.bc"
 // COM-SAME: {{.*}} "-o" "{{.*}}-gfx900-linked-{{.*bc}}"