[Driver][SYCL] Do not pull in late static device libs for AMD GPU (#6498)

The addition of the new OpenMP offloading driver path, which unbundles
archives later in the toolchain is interfering with the device linking
behaviors involving AMD GPU targets for SYCL offload compiles.

Disable the inclusion of these unbundled static archives as we do not yet
take advantage of the new offloading paths.

Author: mdtoguchi

clang/include/clang/Driver/Driver.h

@@ -733,6 +733,10 @@ class Driver {
 
   void setOffloadStaticLibSeen() { OffloadStaticLibSeen = true; }
 
+  /// Use the new offload driver for OpenMP
+  bool UseNewOffloadingDriver = false;
+  void setUseNewOffloadingDriver() { UseNewOffloadingDriver = true; }
+
   /// FPGA Emulation Mode.  By default, this is true due to the fact that
   /// an external option setting is required to target hardware.
   bool FPGAEmulationMode = true;
@@ -798,6 +802,9 @@ class Driver {
 
   bool getOffloadStaticLibSeen() const { return OffloadStaticLibSeen; };
 
+  /// getUseNewOffloadingDriver - use the new offload driver for OpenMP.
+  bool getUseNewOffloadingDriver() const { return UseNewOffloadingDriver; };
+
   /// addFPGATempDepFile - Add a file to be added to the bundling step of
   /// an FPGA object.
   void addFPGATempDepFile(const std::string &DepName,

clang/lib/Driver/Driver.cpp

@@ -1662,6 +1662,16 @@ Compilation *Driver::BuildCompilation(ArrayRef<const char *> ArgList) {
   // Populate the tool chains for the offloading devices, if any.
   CreateOffloadingDeviceToolChains(*C, Inputs);
 
+  // Use new offloading path for OpenMP.  This is disabled as the SYCL
+  // offloading path is not properly setup to use the updated device linking
+  // scheme.
+  if ((C->isOffloadingHostKind(Action::OFK_OpenMP) &&
+       Args.hasFlag(options::OPT_fopenmp_new_driver,
+                    options::OPT_no_offload_new_driver, true)) ||
+      Args.hasFlag(options::OPT_offload_new_driver,
+                   options::OPT_no_offload_new_driver, false))
+    setUseNewOffloadingDriver();
+
   // Determine FPGA emulation status.
   if (C->hasOffloadToolChain<Action::OFK_SYCL>()) {
     auto SYCLTCRange = C->getOffloadToolChains<Action::OFK_SYCL>();

clang/lib/Driver/ToolChains/HIPAMD.cpp

@@ -157,10 +157,12 @@ void AMDGCN::Linker::constructLldCommand(Compilation &C, const JobAction &JA,
   // Look for archive of bundled bitcode in arguments, and add temporary files
   // for the extracted archive of bitcode to inputs.
   auto TargetID = Args.getLastArgValue(options::OPT_mcpu_EQ);
-  AddStaticDeviceLibsLinking(C, *this, JA, Inputs, Args, LldArgs, "amdgcn",
-                             TargetID,
-                             /*IsBitCodeSDL=*/true,
-                             /*PostClangLink=*/false);
+  if (C.getDriver().getUseNewOffloadingDriver() ||
+      JA.getOffloadingDeviceKind() != Action::OFK_SYCL)
+    AddStaticDeviceLibsLinking(C, *this, JA, Inputs, Args, LldArgs, "amdgcn",
+                               TargetID,
+                               /*IsBitCodeSDL=*/true,
+                               /*PostClangLink=*/false);
 
   const char *Lld = Args.MakeArgString(getToolChain().GetProgramPath("lld"));
   C.addCommand(std::make_unique<Command>(JA, *this, ResponseFileSupport::None(),

clang/test/Driver/sycl-offload-amdgcn.cpp

@@ -43,3 +43,16 @@
 // CHK-PHASES-NO-CC: 19: file-table-tform, {12, 18}, tempfiletable, (device-sycl, gfx906)
 // CHK-PHASES-NO-CC: 20: clang-offload-wrapper, {19}, object, (device-sycl, gfx906)
 // CHK-PHASES-NO-CC: 21: offload, "host-sycl (x86_64-unknown-linux-gnu)" {10}, "device-sycl (amdgcn-amd-amdhsa:gfx906)" {20}, image
+
+/// Check that we only unbundle an archive once.
+// RUN: %clangxx -### -target x86_64-unknown-linux-gnu -fsycl \
+// RUN:   -fsycl-targets=amdgcn-amd-amdhsa -Xsycl-target-backend \
+// RUN:   --offload-arch=gfx906 %s -L%S/Inputs/SYCL -llin64 2>&1 \
+// RUN: | FileCheck -check-prefix=CHK-ARCHIVE %s
+// RUN: %clangxx -### -target x86_64-unknown-linux-gnu -fsycl \
+// RUN:   -fsycl-targets=amdgcn-amd-amdhsa -Xsycl-target-backend \
+// RUN:   --offload-arch=gfx906 %s %S/Inputs/SYCL/liblin64.a 2>&1 \
+// RUN: | FileCheck -check-prefix=CHK-ARCHIVE %s
+// CHK-ARCHIVE: clang-offload-bundler{{.*}} "-input={{.*}}/Inputs/SYCL/liblin64.a"
+// CHK-ARCHIVE: llvm-link{{.*}}
+// CHK-ARCHIVE-NOT: clang-offload-bundler{{.*}} "-unbundle"