Skip to content

[SYCL][Driver] Enable passing -Xarch_<arch> <option> to SYCL offload compilation #21001

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
uditagarwal97 merged 2 commits into from
Jan 6, 2026
Merged

[SYCL][Driver] Enable passing -Xarch_<arch> <option> to SYCL offload compilation #21001

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ccf273f
[SYCL][Driver] Enable passing -Xarch_<arch> <option> to SYCL offload …
srividya-sundaram Jan 5, 2026
3fd43b4
Add new test cases.
srividya-sundaram Jan 5, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 13 additions & 7 deletions clang/lib/Driver/Driver.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7660,16 +7660,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_75));
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_75));
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)
Expand Down
45 changes: 45 additions & 0 deletions clang/test/Driver/sycl-offload-Xarch.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
// 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,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,NVPTX-ARCH %s

// RUN: not %clang --offload-new-driver -fsycl -fsycl-targets=amdgcn-amd-amdhsa -nogpulib -fno-sycl-libspirv -nogpuinc \
// RUN: -Xarch_amdgcn -march=sm_75 %s 2>&1 \
// RUN: | FileCheck -check-prefixes=INVALID-ARCH-FOR-TARGET %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,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,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-AMD: "-triple" "amdgcn-amd-amdhsa" "-O3"
// O3ONCE-NVPTX: "-triple" "nvptx64-nvidia-cuda" "-O3"
// INVALID-ARCH-FOR-TARGET: clang: error: invalid target ID 'sm_75'; format is a processor name followed by an optional colon-delimited list of features followed by an enable/disable sign (e.g., 'gfx908:sramecc+:xnack-')
// 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"