From 1f8b4e855848e2e2c3e790c109b8a57b57139b33 Mon Sep 17 00:00:00 2001
From: srividya sundaram <srividya.sundaram@intel.com>
Date: Tue, 16 Dec 2025 13:22:38 -0800
Subject: [PATCH] [SYCL][Driver] Enable passing -Xarch_<arch> <option> to SYCL
 offload compilations.

---
 clang/lib/Driver/Driver.cpp              | 20 +++++++-----
 clang/test/Driver/sycl-offload-Xarch.cpp | 40 ++++++++++++++++++++++++
 2 files changed, 53 insertions(+), 7 deletions(-)
 create mode 100644 clang/test/Driver/sycl-offload-Xarch.cpp

diff --git a/clang/lib/Driver/Driver.cpp b/clang/lib/Driver/Driver.cpp
index 8d5f4029f387e..aadf6bf0f4fac 100644
--- a/clang/lib/Driver/Driver.cpp
+++ b/clang/lib/Driver/Driver.cpp
@@ -7692,16 +7692,22 @@ Driver::getOffloadArchs(Compilation &C, const llvm::opt::DerivedArgList &Args,
                                            ? OffloadArch::Generic
                                            : OffloadArch::HIPDefault));
     } else if (Kind == Action::OFK_SYCL) {
+      // Accept legacy `-march` device arguments for SYCL.
       // For SYCL offloading, we need to check the triple for NVPTX or AMDGPU.
       // The default arch is set for NVPTX if not provided.  For AMDGPU, emit
       // an error as the user is responsible to set the arch.
-      if (TC.getTriple().isNVPTX())
-        Archs.insert(OffloadArchToString(OffloadArch::SM_50));
-      else if (TC.getTriple().isAMDGPU())
-        C.getDriver().Diag(clang::diag::err_drv_sycl_missing_amdgpu_arch)
-            << 1 << TC.getTriple().str();
-      else
-        Archs.insert(StringRef());
+      if (auto *Arg = C.getArgsForToolChain(&TC, /*BoundArch=*/"", Kind)
+                          .getLastArg(options::OPT_march_EQ)) {
+        Archs.insert(Arg->getValue());
+      } else {
+        if (TC.getTriple().isNVPTX())
+          Archs.insert(OffloadArchToString(OffloadArch::SM_50));
+        else if (TC.getTriple().isAMDGPU())
+          C.getDriver().Diag(clang::diag::err_drv_sycl_missing_amdgpu_arch)
+              << 1 << TC.getTriple().str();
+        else
+          Archs.insert(StringRef());
+      }
     } else if (Kind == Action::OFK_OpenMP) {
       // Accept legacy `-march` device arguments for OpenMP.
       if (auto *Arg = C.getArgsForToolChain(&TC, /*BoundArch=*/"", Kind)
diff --git a/clang/test/Driver/sycl-offload-Xarch.cpp b/clang/test/Driver/sycl-offload-Xarch.cpp
new file mode 100644
index 0000000000000..ac8ccbb9e36d4
--- /dev/null
+++ b/clang/test/Driver/sycl-offload-Xarch.cpp
@@ -0,0 +1,40 @@
+// Test passing of -Xarch_<arch> <option> to SYCL offload compilations.
+
+// RUN: %clang --offload-new-driver -fsycl -fsycl-targets=amdgcn-amd-amdhsa -nogpulib -fno-sycl-libspirv -nogpuinc \
+// RUN:   -Xarch_amdgcn -march=gfx90a -Xarch_amdgcn -O3 -S -### %s 2>&1 \
+// RUN: | FileCheck -check-prefixes=O3ONCE,AMD-ARCH %s
+// RUN: %clang --offload-new-driver -fsycl -fsycl-targets=nvptx64-nvidia-cuda -nogpulib -fno-sycl-libspirv -nogpuinc \
+// RUN:   -Xarch_nvptx64 -march=sm_52 -Xarch_nvptx64 -O3 -S -### %s 2>&1 \
+// RUN: | FileCheck -check-prefixes=O3ONCE,NVPTX-ARCH %s
+
+
+// RUN: %clang --offload-new-driver -fsycl -fsycl-targets=amdgcn-amd-amdhsa -nogpulib -fno-sycl-libspirv -nogpuinc \
+// RUN:   -Xarch_amdgcn --offload-arch=gfx90a -Xarch_amdgcn -O3 -S -### %s 2>&1 \
+// RUN: | FileCheck -check-prefixes=O3ONCE,AMD-ARCH %s
+// RUN: %clang --offload-new-driver -fsycl -fsycl-targets=nvptx64-nvidia-cuda -nogpulib -fno-sycl-libspirv -nogpuinc \
+// RUN:   -Xarch_nvptx64 --offload-arch=sm_52 -Xarch_nvptx64 -O3 -S -### %s 2>&1 \
+// RUN: | FileCheck -check-prefixes=O3ONCE,NVPTX-ARCH %s
+
+
+// RUN: %clang --offload-new-driver -fsycl -fsycl-targets=amdgcn-amd-amdhsa,nvptx64-nvidia-cuda -nogpulib -fno-sycl-libspirv -nogpuinc \
+// RUN:   -Xarch_amdgcn --offload-arch=gfx90a,gfx906 -Xarch_nvptx64 --offload-arch=sm_52,sm_89 -S -### %s 2>&1 \
+// RUN: | FileCheck -check-prefixes=MULTI-ARCH %s
+
+// O3ONCE: "-O3"
+// AMD-ARCH: {{"[^"]*llvm-offload-binary[^"]*" "-o".* "--image=file=.*.bc,triple=amdgcn-amd-amdhsa,arch=gfx90a,kind=sycl"}}
+// NVPTX-ARCH: {{"[^"]*llvm-offload-binary[^"]*" "-o".* "--image=file=.*.bc,triple=nvptx64-nvidia-cuda,arch=sm_52,kind=sycl"}}
+// MULTI-ARCH: {{"[^"]*llvm-offload-binary[^"]*" "-o".* "--image=file=.*.bc,triple=amdgcn-amd-amdhsa,arch=gfx906,kind=sycl"}}
+// MULTI-ARCH-SAME: {{"--image=file=.*.bc,triple=amdgcn-amd-amdhsa,arch=gfx90a,kind=sycl"}}
+// MULTI-ARCH-SAME: {{"--image=file=.*.bc,triple=nvptx64-nvidia-cuda,arch=sm_52,kind=sycl"}}
+// MULTI-ARCH-SAME: {{"--image=file=.*.bc,triple=nvptx64-nvidia-cuda,arch=sm_89,kind=sycl"}}
+
+// Make sure that `-Xarch_amdgcn` forwards libraries to the device linker.
+// RUN: %clang --offload-new-driver -fsycl --offload-arch=gfx90a -nogpulib -fno-sycl-libspirv -nogpuinc \
+// RUN:   --target=x86_64-unknown-linux-gnu -Xarch_amdgcn -Wl,-lfoo -### %s 2>&1 \
+// RUN: | FileCheck -check-prefix=LIBS %s
+// RUN: %clang --offload-new-driver -fsycl --offload-arch=gfx90a -nogpulib -fno-sycl-libspirv -nogpuinc \
+// RUN:   -Xoffload-linker-amdgcn-amd-amdhsa -lfoo -### %s 2>&1 \
+// RUN: | FileCheck -check-prefix=LIBS %s
+// LIBS: "--device-linker=amdgcn-amd-amdhsa=-lfoo"
+
+