Skip to content

[SYCL] Handle passing O-group options via -Xarch_<arch> for JIT compilation #21129

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

Open
srividya-sundaram wants to merge 9 commits into
base: sycl
Choose a base branch
from
+17 −9
Open

[SYCL] Handle passing O-group options via -Xarch_<arch> for JIT compilation #21129

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
9c911cb
Handle passing of O group via Xarch.
srividya-sundaram Jan 26, 2026
435b3dc
Add check for CLW.
srividya-sundaram Jan 26, 2026
202b2d6
Remove redundant code.
srividya-sundaram Jan 26, 2026
5df027e
Use render to append the argument.
srividya-sundaram Jan 27, 2026
0275cba
Update handling of non-JIT cae and update order of compile-opts in te…
srividya-sundaram Jan 27, 2026
718f782
Iterate through all device compiler args.
srividya-sundaram Jan 28, 2026
d2b6888
Fix test.
srividya-sundaram Jan 28, 2026
8c11e77
Optimize loop.
srividya-sundaram Jan 28, 2026
bc4cc04
Remove target-register-alloc-mode from supported compiler options.
srividya-sundaram Jan 28, 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
13 changes: 4 additions & 9 deletions clang/lib/Driver/ToolChains/Clang.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11214,7 +11214,6 @@ void LinkerWrapper::ConstructJob(Compilation &C, const JobAction &JA,
OPT_R_value_Group,
OPT_R_Group,
OPT_Xcuda_ptxas,
OPT_ftarget_register_alloc_mode_EQ,
OPT_ftime_report,
OPT_ftime_trace,
OPT_ftime_trace_EQ,
Expand Down Expand Up @@ -11278,22 +11277,18 @@ void LinkerWrapper::ConstructJob(Compilation &C, const JobAction &JA,
else if (ShouldForward(LinkerOptions, A, *TC))
A->render(Args, LinkerArgs);
}

// Append device compiler arguments and their values to `CompilerArgs`.
for (Arg *A : BaseCompilerArgs)
A->render(BaseCompilerArgs, CompilerArgs);
if (Kind == Action::OFK_SYCL) {
// Add implied SYCL target arguments to `CompilerArgs`
// based on the selected target.
const toolchains::SYCLToolChain &SYCLTC =
static_cast<const toolchains::SYCLToolChain &>(*TC);
const ToolChain *HostTC =
C.getSingleOffloadToolChain<Action::OFK_Host>();
SYCLTC.AddImpliedTargetArgs(SYCLTC.getTriple(), BaseCompilerArgs,
SYCLTC.AddImpliedTargetArgs(SYCLTC.getTriple(), ToolChainArgs,
CompilerArgs, JA, *HostTC);
} else {
// For non-SYCL offload kinds (CUDA, OpenMP, HIP), directly convert
// the BaseCompilerArgs to CompilerArgs without additional processing.
for (Arg *A : BaseCompilerArgs) {
A->render(BaseCompilerArgs, CompilerArgs);
}
}

// If the user explicitly requested it via `--offload-arch` we should
Expand Down
13 changes: 13 additions & 0 deletions clang/test/Driver/sycl-offload-jit-xarch.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
// Test passing of -Xarch_<arch> <option> to SYCL offload compilations.

// Verify that -Xarch_spir64 forwards options to the SYCL device compilation
// and clang-linker-wrapper call.
// RUN: %clang -fsycl --offload-new-driver -Xarch_spir64 -O3 -### %s 2>&1 \
// RUN: | FileCheck -check-prefixes=SYCL-DEVICE-O3 %s
// SYCL-DEVICE-O3: "-triple" "spir64-unknown-unknown" "-O3"{{.*}} "-fsycl-is-device"
// CLW-O3: {{"[^"]*clang-linker-wrapper[^"]*".* "--device-compiler=spirv64-unknown-unknown=-O3"}}

// Verify that `-Xarch_spir64` forwards libraries to the device linker.
// RUN: %clang -fsycl --offload-new-driver -Xarch_spir64 -Wl,-lfoo -### %s 2>&1 \
// RUN: | FileCheck -check-prefix=DEVICE-LINKER %s
// DEVICE-LINKER: {{"[^"]*clang-linker-wrapper[^"]*".* "--device-linker=spir64-unknown-unknown=-lfoo"}}
Loading