[HIP] Fix unbundling archive

[yaxunl]

Summary

HIP is able to unbundle archive of bundled bitcode.
However currently there are two bugs:

1. archives passed by -l: are not unbundled.
2. archives passed as input files are not unbundled

The actual file name of an archive passed by -l: should
not be prefixed with lib and appended with '.a',
but the file path is prefixed with paths in '-L' options.

The actual file name of an archive passed as an input file
stays the same, not affected by the '-L' options.

[yaxunl]

sorry. update with the correct patch.

[yaxunl]

remove debug output

[scchan]

clang/lib/Driver/ToolChains/CommonArgs.cpp

1840

The AOBFileNames small vector needs to be cleared if !FoundAOB or just move its declaration into the LibraryPaths loop.

[yaxunl]

clang/lib/Driver/ToolChains/CommonArgs.cpp

1840

The AOBFileNames small vector needs to be cleared if !FoundAOB or just move its declaration into the LibraryPaths loop.

will move the decl into LibraryPaths loop.

[yaxunl]

revised by Siu Chi's comments

[scchan]

LGTM

[tra]

Archives passed by -l: should not be prefixed with
prefix lib and appended with '.a', but still need to be prefixed with
paths in -L options.
Archives passed as input files should not be prefixed
or appended with anything.

I'm not sure I understand the requirements. WDYM by "archives passed as input files should not be prefixed or appended by anything" ? E.g. if i do clang -o foo foo.o mylib.a, is mylib.a prefixed with something or has something appended?

It may help if you could rephrase it in terms of what *does* the code expect. E.g. 'archives with names lib*.a passed as direct inputs are not unbundled. All others are treated as potentially containing device code and are unbundled during [linking?]'.

Also, using lib*.a as pattern to tell device libraries from the host-ony one will be insufficient. There will be libraries with other extensions (e.g. .lo is fairly common) and there will be libraries that do not have lib prefix. I.e. nothing stops me from building mylib.a and linking with it as in the example above.

[yaxunl]

In D133705#3784605, @tra wrote:

Archives passed by -l: should not be prefixed with
prefix lib and appended with '.a', but still need to be prefixed with
paths in -L options.
Archives passed as input files should not be prefixed
or appended with anything.

I'm not sure I understand the requirements. WDYM by "archives passed as input files should not be prefixed or appended by anything" ? E.g. if i do clang -o foo foo.o mylib.a, is mylib.a prefixed with something or has something appended?

It may help if you could rephrase it in terms of what *does* the code expect. E.g. 'archives with names lib*.a passed as direct inputs are not unbundled. All others are treated as potentially containing device code and are unbundled during [linking?]'.

It means "the file name is not prefixed with 'lib' and appended with '.a', and the file path is not prefixed with values from '-L' options. This is in contrast to archive names passed through '-l' options. The directly passed archives are still unbundled. I can update the description.

Also, using lib*.a as pattern to tell device libraries from the host-ony one will be insufficient. There will be libraries with other extensions (e.g. .lo is fairly common) and there will be libraries that do not have lib prefix. I.e. nothing stops me from building mylib.a and linking with it as in the example above.

For archives passed as input files, we use the extension ('.a' on Linux and '.lib' on MSVC) to identify them. We do not restrict the file names to 'lib*.a', but they need to be '*.a' or '*.lib' to be identified as archives.

For arbitrary file names to be identified as archives, users can pass them by '-l:', e.g. '-l:file.bin', then clang will treat 'file.bin' as an archive.

[tra]

In D133705#3785470, @yaxunl wrote:

Also, using lib*.a as pattern to tell device libraries from the host-ony one will be insufficient. There will be libraries with other extensions (e.g. .lo is fairly common) and there will be libraries that do not have lib prefix. I.e. nothing stops me from building mylib.a and linking with it as in the example above.

For archives passed as input files, we use the extension ('.a' on Linux and '.lib' on MSVC) to identify them. We do not restrict the file names to 'lib*.a', but they need to be '*.a' or '*.lib' to be identified as archives.

As I've pointed above that will create issues.

For arbitrary file names to be identified as archives, users can pass them by '-l:', e.g. '-l:file.bin', then clang will treat 'file.bin' as an archive.

It's not always possible. Linking with dependencies is often handled by the build tools that the end user may not control. E.g. TF is built w/ bazel which handles virtually all linking under the hood with almost no user controls over the names/extensions it assigns to files or how they are passed to the linker.

@MaskRay - WDYT?

[MaskRay]

I know very little about HIP, but I am concerned with relying on extensions as well. For example, I've seen libc++.a.1 (we use this for the real archive while libc++.a is a linker script) and .la (libtool).
A .so file is sometimes a linker script and it may reference an archive file. For example glibc libc.so typically does something like GROUP ( /lib/x86_64-linux-gnu/libc.so.6 /usr/lib/x86_64-linux-gnu/libc_nonshared.a AS_NEEDED ( /lib64/ld-linux-x86-64.so.2 ) )

An ELF linker doesn't really care what extensions are used for what kind of input (archive,relocatable file,shared object). .a and .so are only used for -lfoo lookup.

[yaxunl]

In D133705#3793702, @tra wrote:

In D133705#3785470, @yaxunl wrote:

Also, using lib*.a as pattern to tell device libraries from the host-ony one will be insufficient. There will be libraries with other extensions (e.g. .lo is fairly common) and there will be libraries that do not have lib prefix. I.e. nothing stops me from building mylib.a and linking with it as in the example above.

For archives passed as input files, we use the extension ('.a' on Linux and '.lib' on MSVC) to identify them. We do not restrict the file names to 'lib*.a', but they need to be '*.a' or '*.lib' to be identified as archives.

As I've pointed above that will create issues.

For arbitrary file names to be identified as archives, users can pass them by '-l:', e.g. '-l:file.bin', then clang will treat 'file.bin' as an archive.

It's not always possible. Linking with dependencies is often handled by the build tools that the end user may not control. E.g. TF is built w/ bazel which handles virtually all linking under the hood with almost no user controls over the names/extensions it assigns to files or how they are passed to the linker.

@MaskRay - WDYT?

A side note: this patch does not change clang's original behavior about how to link archives in host compilation. It only changes how clang determines what files to be unbundled as archives. The current patch only treats '*.a' or '*.lib' input files as archives and tries to unbundle them.

I think the root issue is that clang lacks a way to mark an arbitrary file name as an archive file. One solution might be to introduce a new file type 'Archive' and a '-x' value 'archive' to represent that. However, there are some complications with how currently clang treated '.lib' files. This makes me hesitate to introduce such changes. Since such unavoidably will affect how clang links archives for host compilation. My current patch does not change that. It has a limitation, but that limitation only affects HIP and I think it is acceptable.

[yaxunl]

In D133705#3793931, @MaskRay wrote:

I know very little about HIP, but I am concerned with relying on extensions as well. For example, I've seen libc++.a.1 (we use this for the real archive while libc++.a is a linker script) and .la (libtool).
A .so file is sometimes a linker script and it may reference an archive file. For example glibc libc.so typically does something like GROUP ( /lib/x86_64-linux-gnu/libc.so.6 /usr/lib/x86_64-linux-gnu/libc_nonshared.a AS_NEEDED ( /lib64/ld-linux-x86-64.so.2 ) )

An ELF linker doesn't really care what extensions are used for what kind of input (archive,relocatable file,shared object). .a and .so are only used for -lfoo lookup.

For HIP, we only need to unbundle archive files. We always try to unbundle files passed by -l options. If it is not archive files, it is OK, since the unbundled will generate an empty file. For input files, the current patch only tries to unbundle '*.a' or '*.lib' files. If it is a concern that some archive files not with extension '*.a' or '*.lib' are missed, one solution might be to try to unbundle any files classified as 'Nothing' (which is how clang classifies archive files).

[yaxunl]

allow archive files to have unknown extension

[tra]

It's still not quite clear to me what the patch is intended to do. The description describes the existing issues (we don't unbundle some libraries), but is not clear what we do want to have in the end.

Are all library arguments expected to be unbundled? If we do not want to unbundle some libraries, then which arguments would lead to that outcome. The tests only seem to verify the cases where unbundling does happen. It would be great to test the cases when it should not. That is, assuming that there are such cases -- the code seems to

clang/lib/Driver/Driver.cpp

2907–2908

This is confusing. I do not understand how/why therefore should not be unbundled is inferred from they are actually archives.
The patch description says that not unbundling the archives is that the patch is intended to fix. The tests below with MSVC label show that we do unbundle the inputs with .lib extension.

Should this comment be fixed/updated? What do I miss?

clang/lib/Driver/ToolChains/CommonArgs.cpp

1828–1838

Nit: I'd restructure it a bit and move library file name construction out of the loop. Makes it a bit easier to see what's going on.

auto LibFile = Lib.startswith(":") ? Lib.drop_front() :  
                         IsMSVC ? Lib+Ext : "lib" + Lib + Ext;
for (auto Prefix : {"/libdevice/", "/"})
    AOBFileNames.push_back( Twine(LPath + Prefix + LibFile).str());

You may also skip AOBFileNames altogether and just check for the file existence directly within that for loop.

1833

Is it intentional that we're not adding lib prefix to library names passed with -l?

clang/test/Driver/hip-link-bundle-archive.hip

45

Just curious. Does GNU have some meaning in the check label?
GNU[12] seem to deal with unbundling while GNU-L* seem to be regular host libraries. It would be useful to use somewhat more descriptive labels. E.g. HOST*/OFFLOAD* ?

[yaxunl]

clang/lib/Driver/Driver.cpp

2907–2908

Here the driver is trying to unbundle bundled objects. This is different from unbundle archives. clang classifies '.lib' files as objects. If we do not exclude '.lib' files here, they will be incorrectly unbundled as objects here. The unbundling of '.lib' as archives should be done at other places.

Since this comment is confusing, I will change it to:

'therefore should not be unbundled as objects here. They will be handled at other places.'

clang/lib/Driver/ToolChains/CommonArgs.cpp

1828–1838

will do

1833

This is for MSVC, which assumes -labc corresponds to the lib file name 'abc.lib'.

clang/test/Driver/hip-link-bundle-archive.hip

45

Here 'GNU' is versus 'MSVC' regarding the library name ('.a' vs '.lib').

'GNU-L' is for '-l'. 'GNU-LA' is for '-l:*.a'. 'GNU-A' is for '*.a'.

[yaxunl]

revised by Artem's comments

[tra]

clang/lib/Driver/Driver.cpp

2907–2908

Thank you for the explanation. It makes more sense to me now.

[yaxunl]

I just found clang-offload-bundler reports an error when trying to unbundle an archive but the input file is not an archive.

This update let clang-offload-bundler to extract empty archives when the input file is not an archive and -allow-missing-bundles is specified.

[tra]

clang/test/Driver/clang-offload-bundler.c

410–412

Is there a distinction between "an archive, but has no offloading data in it" and "not an archive, at all"?
I can see how we may want the former case work with --allow-missing-bundles, but would we/should we report the error for the latter? I think we should, if we don't.

[yaxunl]

clang/test/Driver/clang-offload-bundler.c

410–412

I will let clang-offload-bundler keep the original behavior about reporting an error for the "not an archive" case.

I will let clang check the magic bytes of the input file so that it won't pass non-archive files to clang-offload-bundler. This also makes the compilation stages cleaner since there will not be spurious unbundlings.

[yaxunl]

check file magic and only unbundle real archives

[tra]

LGTM.

[yaxunl]

committed by 1172bdecfab364579d90e6aa5ba7fc64a5b96786

clang/lib/Driver/Driver.cpp

ActionBuilderReturnCode addDeviceDependences(Action *HostAction) override {
         if (UA->getType() == types::TY_Object && !Relocatable)
           return ABRT_Inactive;
 
         CudaDeviceActions.clear();
         auto *IA = cast<InputAction>(UA->getInputs().back());
         std::string FileName = IA->getInputArg().getAsString(Args);
         // Check if the type of the file is the same as the action. Do not
         // unbundle it if it is not. Do not unbundle .so files, for example,
-        // which are not object files.
+        // which are not object files. Files with extension ".lib" is classified
+        // as TY_Object but they are actually archives, therefore should not be
+        // unbundled here as objects. They will be handled at other places.
+        const StringRef LibFileExt = ".lib";
         if (IA->getType() == types::TY_Object &&
             (!llvm::sys::path::has_extension(FileName) ||
              types::lookupTypeForExtension(
                  llvm::sys::path::extension(FileName).drop_front()) !=
-                 types::TY_Object))
+                 types::TY_Object ||
+             llvm::sys::path::extension(FileName) == LibFileExt))
           return ABRT_Inactive;
 
         for (auto Arch : GpuArchList) {
           CudaDeviceActions.push_back(UA);
           UA->registerDependentActionInfo(ToolChains[0], Arch,
                                           AssociatedOffloadKind);
         }
         IsActive = true;

clang/lib/Driver/OffloadBundler.cpp

Error OffloadBundler::UnbundleArchive() {
   ErrorOr<std::unique_ptr<MemoryBuffer>> BufOrErr =
       MemoryBuffer::getFileOrSTDIN(IFName, true, false);
   if (std::error_code EC = BufOrErr.getError())
     return createFileError(BundlerConfig.InputFileNames.front(), EC);
 
   ArchiveBuffers.push_back(std::move(*BufOrErr));
   Expected<std::unique_ptr<llvm::object::Archive>> LibOrErr =
       Archive::create(ArchiveBuffers.back()->getMemBufferRef());
-  if (!LibOrErr)
-    return LibOrErr.takeError();
+  // If it is not an archive, create an empty archive for each target if missing
+  // bundles are allowed.
+  if (Error E = LibOrErr.takeError()) {
+    if (!BundlerConfig.AllowMissingBundles)
+      return E;
+    // Silence the error.
+    (void)toString(std::move(E));
+    for (auto &Target : BundlerConfig.TargetNames) {
+      StringRef FileName = TargetOutputFileNameMap[Target];
+      std::vector<llvm::NewArchiveMember> EmptyArchive;
+      EmptyArchive.clear();
+      if (Error WriteErr = writeArchive(FileName, EmptyArchive, true,
+                                        getDefaultArchiveKindForHost(), true,
+                                        false, nullptr))
+        return WriteErr;
+    }
+    return Error::success();
+  }
 
   auto Archive = std::move(*LibOrErr);
 
   Error ArchiveErr = Error::success();
   auto ChildEnd = Archive->child_end();
 
   /// Iterate over all bundled code object files in the input archive.
   for (auto ArchiveIter = Archive->child_begin(ArchiveErr);

clang/lib/Driver/ToolChains/CommonArgs.cpp

bool tools::GetSDLFromOffloadArchive(
     StringRef Lib, StringRef Arch, StringRef Target, bool isBitCodeSDL,
     bool postClangLink) {
 
   // We don't support bitcode archive bundles for nvptx
   if (isBitCodeSDL && Arch.contains("nvptx"))
     return false;
 
   bool FoundAOB = false;
-  SmallVector<std::string, 2> AOBFileNames;
   std::string ArchiveOfBundles;
-  for (auto LPath : LibraryPaths) {
-    ArchiveOfBundles.clear();
 
-    llvm::Triple Triple(D.getTargetTriple());
-    bool IsMSVC = Triple.isWindowsMSVCEnvironment();
+  auto Ext = IsMSVC ? ".lib" : ".a";
+  if (!Lib.startswith(":") && llvm::sys::fs::exists(Lib)) {
+    ArchiveOfBundles = Lib;
+    FoundAOB = true;
+  } else {
+    for (auto LPath : LibraryPaths) {
+      ArchiveOfBundles.clear();
+      SmallVector<std::string, 2> AOBFileNames;
+      auto LibFile =
+          (Lib.startswith(":") ? Lib.drop_front()
+                               : IsMSVC ? Lib + Ext : "lib" + Lib + Ext)
+              .str();
       for (auto Prefix : {"/libdevice/", "/"}) {
-      if (IsMSVC)
-        AOBFileNames.push_back(Twine(LPath + Prefix + Lib + ".lib").str());
-      AOBFileNames.push_back(Twine(LPath + Prefix + "lib" + Lib + ".a").str());
-    }
-
-    for (auto AOB : AOBFileNames) {
+        auto AOB = Twine(LPath + Prefix + LibFile).str();
         if (llvm::sys::fs::exists(AOB)) {
           ArchiveOfBundles = AOB;
           FoundAOB = true;
           break;
         }
       }
+      if (FoundAOB)
+        break;
+    }
+  }
 
-    if (!FoundAOB)
-      continue;
+    return false;
 
-    StringRef Prefix = isBitCodeSDL ? "libbc-" : "lib";
-    std::string OutputLib = D.GetTemporaryPath(
-        Twine(Prefix + Lib + "-" + Arch + "-" + Target).str(), "a");
+  std::string OutputLib =
+      D.GetTemporaryPath(Twine(Prefix + llvm::sys::path::filename(Lib) + "-" +
+                               Arch + "-" + Target)
+                             .str(),
+                         "a");
 
-    C.addTempFile(C.getArgs().MakeArgString(OutputLib));
 
-    ArgStringList CmdArgs;
-    SmallString<128> DeviceTriple;
-    DeviceTriple += Action::GetOffloadKindName(JA.getOffloadingDeviceKind());
-    DeviceTriple += '-';
-    std::string NormalizedTriple = T.getToolChain().getTriple().normalize();
-    DeviceTriple += NormalizedTriple;
     if (!Target.empty()) {
-      DeviceTriple += '-';
       DeviceTriple += Target;
-    }
 
-    std::string UnbundleArg("-unbundle");
-    std::string TypeArg("-type=a");
-    std::string InputArg("-input=" + ArchiveOfBundles);
-    std::string OffloadArg("-targets=" + std::string(DeviceTriple));
-    std::string OutputArg("-output=" + OutputLib);
 
-    const char *UBProgram = DriverArgs.MakeArgString(
-        T.getToolChain().GetProgramPath("clang-offload-bundler"));
 
-    ArgStringList UBArgs;
-    UBArgs.push_back(C.getArgs().MakeArgString(UnbundleArg));
-    UBArgs.push_back(C.getArgs().MakeArgString(TypeArg));
-    UBArgs.push_back(C.getArgs().MakeArgString(InputArg));
-    UBArgs.push_back(C.getArgs().MakeArgString(OffloadArg));
-    UBArgs.push_back(C.getArgs().MakeArgString(OutputArg));
 
-    // Add this flag to not exit from clang-offload-bundler if no compatible
-    // code object is found in heterogenous archive library.
-    std::string AdditionalArgs("-allow-missing-bundles");
-    UBArgs.push_back(C.getArgs().MakeArgString(AdditionalArgs));
 
-    // Add this flag to treat hip and hipv4 offload kinds as compatible with
-    // openmp offload kind while extracting code objects from a heterogenous
-    // archive library. Vice versa is also considered compatible.
-    std::string HipCompatibleArgs("-hip-openmp-compatible");
-    UBArgs.push_back(C.getArgs().MakeArgString(HipCompatibleArgs));
 
-    C.addCommand(std::make_unique<Command>(
-        JA, T, ResponseFileSupport::AtFileCurCP(), UBProgram, UBArgs, Inputs,
-        InputInfo(&JA, C.getArgs().MakeArgString(OutputLib))));
-    if (postClangLink)
-      CC1Args.push_back("-mlink-builtin-bitcode");
 
-    CC1Args.push_back(DriverArgs.MakeArgString(OutputLib));
-    break;
-  }
 
-  return FoundAOB;
+  return true;
 }
 
 // Wrapper function used by driver for adding SDLs during link phase.
 void tools::AddStaticDeviceLibsLinking(Compilation &C, const Tool &T,
                                 const JobAction &JA,
                                 const InputInfoList &Inputs,
                                 const llvm::opt::ArgList &DriverArgs,
                                 llvm::opt::ArgStringList &CC1Args,
void tools::AddStaticDeviceLibs(Compilation *C, const Tool *T,
   static const StringRef HostOnlyArchives[] = {
       "omp", "cudart", "m", "gcc", "gcc_s", "pthread", "hip_hcc"};
   for (auto SDLName : DriverArgs.getAllArgValues(options::OPT_l)) {
     if (!HostOnlyArchives->contains(SDLName)) {
       SDLNames.insert(SDLName);
     }
   }
 
+  for (auto Input : DriverArgs.getAllArgValues(options::OPT_INPUT)) {
+    auto FileName = StringRef(Input);
+    // Clang treats any unknown file types as archives and passes them to the
+    // linker. Files with extension 'lib' are classified as TY_Object by clang
+    // but they are usually archives. It is OK if the file is not really an
+    // archive since in that case the unbundler just extracts an empty bitcode
+    // to link with.
+    const StringRef LibFileExt = ".lib";
+    if (!llvm::sys::path::has_extension(FileName) ||
+        types::lookupTypeForExtension(
+            llvm::sys::path::extension(FileName).drop_front()) ==
+            types::TY_INVALID ||
+        llvm::sys::path::extension(FileName) == LibFileExt)
+      SDLNames.insert(Input);
+  }
+
   // The search stops as soon as an SDL file is found. The driver then provides
   // the full filename of the SDL to the llvm-link or clang-nvlink-wrapper
   // command. If no SDL is found after searching each LINKPATH with
   // SEARCH-ORDER, it is possible that an archive file lib<libname>.a exists
   // and may contain bundled object files.
   for (auto SDLName : SDLNames) {
     // This is the only call to SDLSearch
     if (!SDLSearch(D, DriverArgs, CC1Args, LibraryPaths, SDLName, Arch, Target,

clang/test/Driver/clang-offload-bundler.c

 // RUN:   -output=%T/hip_900.a -output=%T/hip_906.a -input=%T/hip_archive.a
 // RUN: llvm-ar t %T/hip_900.a | FileCheck -check-prefix=HIP-AR-900 %s
 // RUN: llvm-ar t %T/hip_906.a | FileCheck -check-prefix=HIP-AR-906 %s
 // HIP-AR-900-DAG: hip_bundle1-hip-amdgcn-amd-amdhsa--gfx900
 // HIP-AR-900-DAG: hip_bundle2-hip-amdgcn-amd-amdhsa--gfx900
 // HIP-AR-906-DAG: hip_bundle1-hip-amdgcn-amd-amdhsa--gfx906
 // HIP-AR-906-DAG: hip_bundle2-hip-amdgcn-amd-amdhsa--gfx906
 
+// Check clang-offload-bundler extracts empty archives if the input file
+// is not an archive when --allow-missing-bundles is specified, otherwise
+// report an error.
+//
+// RUN: echo 'This is not an archive file.' > %t.non-archive
+// RUN: clang-offload-bundler -unbundle -type=a -targets=hip-amdgcn-amd-amdhsa--gfx900 \
+// RUN:   -output=%t.res.a -input=%t.non-archive --allow-missing-bundles
+// RUN: llvm-ar t %t.res.a >%t.res.list 2>&1
+// RUN: diff %t.res.list %t.empty
+// RUN: not clang-offload-bundler -unbundle -type=a -targets=hip-amdgcn-amd-amdhsa--gfx900 \
+// RUN:   -output=%t.res.a -input=%t.non-archive 2>&1 | FileCheck %s -check-prefix=INVARCHIVE
+// INVARCHIVE: error: file too small to be an archive
+
 //
 // Check bundling without host target is allowed for HIP.
 //
 // RUN: clang-offload-bundler -type=bc -targets=hip-amdgcn-amd-amdhsa--gfx900,hip-amdgcn-amd-amdhsa--gfx906 \
 // RUN:   -input=%t.tgt1 -input=%t.tgt2 -output=%t.hip.bundle.bc
 // RUN: clang-offload-bundler -type=bc -list -input=%t.hip.bundle.bc | FileCheck -check-prefix=NOHOST %s
 // RUN: clang-offload-bundler -type=bc -targets=hip-amdgcn-amd-amdhsa--gfx900,hip-amdgcn-amd-amdhsa--gfx906 \
 // RUN:   -output=%t.res.tgt1 -output=%t.res.tgt2 -input=%t.hip.bundle.bc -unbundle

clang/test/Driver/hip-link-bundle-archive.hip

 // REQUIRES: x86-registered-target, amdgpu-registered-target
 
 
 // Check clang unbundle the archive and link them by lld.
 
 // RUN: rm -rf %t && mkdir %t
 // RUN: touch %t/libhipBundled.a
 // RUN: %clang -### --offload-arch=gfx906 --offload-arch=gfx1030 \
 // RUN:   --target=x86_64-unknown-linux-gnu \
 // RUN:   -nogpulib %s -fgpu-rdc -L%t -lhipBundled \
-// RUN:   2>&1 | FileCheck -check-prefix=GNU %s
+// RUN:   2>&1 | FileCheck -check-prefixes=GNU,GNU1,GNU-L %s
+
+// RUN: %clang -### --offload-arch=gfx906 --offload-arch=gfx1030 \
+// RUN:   --target=x86_64-unknown-linux-gnu \
+// RUN:   -nogpulib %s -fgpu-rdc -L%t -l:libhipBundled.a \
+// RUN:   2>&1 | FileCheck -check-prefixes=GNU,GNU1,GNU-LA %s
+
+// RUN: %clang -### --offload-arch=gfx906 --offload-arch=gfx1030 \
+// RUN:   --target=x86_64-unknown-linux-gnu \
+// RUN:   -nogpulib %s -fgpu-rdc %t/libhipBundled.a \
+// RUN:   2>&1 | FileCheck -check-prefixes=GNU,GNU1,GNU-A %s
+
+// RUN: touch %t/libhipBundled.a.5.2
+// RUN: %clang -### --offload-arch=gfx906 --offload-arch=gfx1030 \
+// RUN:   --target=x86_64-unknown-linux-gnu \
+// RUN:   -nogpulib %s -fgpu-rdc %t/libhipBundled.a.5.2 \
+// RUN:   2>&1 | FileCheck -check-prefixes=GNU,GNU2,GNU-A %s
 
 // RUN: touch %t/hipBundled2.lib
 // RUN: %clang -### --offload-arch=gfx906 --offload-arch=gfx1030 \
 // RUN:   --target=x86_64-pc-windows-msvc \
 // RUN:   -nogpulib %s -fgpu-rdc -L%t -lhipBundled2 \
 // RUN:   2>&1 | FileCheck -check-prefix=MSVC %s
 
-// GNU: "{{.*}}clang-offload-bundler" "-unbundle" "-type=a" "-input={{.*}}libhipBundled.a" "-targets=hip-amdgcn-amd-amdhsa-gfx1030" "-output=[[A1030:.*\.a]]" "-allow-missing-bundles"
+// RUN: %clang -### --offload-arch=gfx906 --offload-arch=gfx1030 \
+// RUN:   --target=x86_64-pc-windows-msvc \
+// RUN:   -nogpulib %s -fgpu-rdc -L%t -l:hipBundled2.lib \
+// RUN:   2>&1 | FileCheck -check-prefix=MSVC %s
+
+// RUN: %clang -### --offload-arch=gfx906 --offload-arch=gfx1030 \
+// RUN:   --target=x86_64-pc-windows-msvc \
+// RUN:   -nogpulib %s -fgpu-rdc %t/hipBundled2.lib \
+// RUN:   2>&1 | FileCheck -check-prefix=MSVC %s
+
+// GNU1: "{{.*}}clang-offload-bundler" "-unbundle" "-type=a" "-input={{.*}}[[LIB:libhipBundled\.a]]" "-targets=hip-amdgcn-amd-amdhsa-gfx1030" "-output=[[A1030:.*\.a]]" "-allow-missing-bundles"
+// GNU2: "{{.*}}clang-offload-bundler" "-unbundle" "-type=a" "-input={{.*}}[[LIB:libhipBundled\.a\.5\.2]]" "-targets=hip-amdgcn-amd-amdhsa-gfx1030" "-output=[[A1030:.*\.a]]" "-allow-missing-bundles"
 // GNU: "{{.*}}lld{{.*}}" {{.*}}"-plugin-opt=mcpu=gfx1030" {{.*}} "[[A1030]]"
-// GNU: "{{.*}}clang-offload-bundler" "-unbundle" "-type=a" "-input={{.*}}libhipBundled.a" "-targets=hip-amdgcn-amd-amdhsa-gfx906" "-output=[[A906:.*\.a]]" "-allow-missing-bundles"
+// GNU: "{{.*}}clang-offload-bundler" "-unbundle" "-type=a" "-input={{.*}}[[LIB]]" "-targets=hip-amdgcn-amd-amdhsa-gfx906" "-output=[[A906:.*\.a]]" "-allow-missing-bundles"
 // GNU: "{{.*}}lld{{.*}}" {{.*}}"-plugin-opt=mcpu=gfx906" {{.*}} "[[A906]]"
-// GNU: "{{.*}}ld{{.*}}" {{.*}}"-o" "a.out" {{.*}}"-lhipBundled"
+// GNU-L: "{{.*}}ld{{.*}}" {{.*}}"-o" "a.out" {{.*}}"-lhipBundled"
+// GNU-LA: "{{.*}}ld{{.*}}" {{.*}}"-o" "a.out" {{.*}}"-l:libhipBundled.a"
+// GNU-A: "{{.*}}ld{{.*}}" {{.*}}"-o" "a.out" "{{.*}}[[LIB]]"
 
 // MSVC: "{{.*}}clang-offload-bundler" "-unbundle" "-type=a" "-input={{.*}}hipBundled2.lib" "-targets=hip-amdgcn-amd-amdhsa-gfx1030" "-output=[[A1030:.*\.a]]" "-allow-missing-bundles"
 // MSVC: "{{.*}}lld{{.*}}" {{.*}}"-plugin-opt=mcpu=gfx1030" {{.*}} "[[A1030]]"
 // MSVC: "{{.*}}clang-offload-bundler" "-unbundle" "-type=a" "-input={{.*}}hipBundled2.lib" "-targets=hip-amdgcn-amd-amdhsa-gfx906" "-output=[[A906:.*\.a]]" "-allow-missing-bundles"
 // MSVC: "{{.*}}lld{{.*}}" {{.*}}"-plugin-opt=mcpu=gfx906" {{.*}} "[[A906]]"
-// MSVC: "{{.*}}link{{.*}}" {{.*}}"-out:a.exe" {{.*}}"hipBundled2.lib"
+// MSVC: "{{.*}}link{{.*}}" {{.*}}"-out:a.exe" {{.*}}hipBundled2.lib"