Skip to content

[SYCL] Fix a way '-bo' options are passed to CPU AOT compiler #20202

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
wants to merge 1 commit into
base: sycl
Choose a base branch
from
Open

[SYCL] Fix a way '-bo' options are passed to CPU AOT compiler #20202

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
26 changes: 16 additions & 10 deletions clang/lib/Driver/ToolChains/SYCL.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1815,7 +1815,7 @@ void SYCLToolChain::AddImpliedTargetArgs(const llvm::Triple &Triple,
// Default device AOT: -g -cl-opt-disable
// Default device JIT: -g (-O0 is handled by the runtime)
// GEN: -options "-g -O0"
// CPU: "--bo=-g -cl-opt-disable"
// CPU: "--bo=-g" "-bo=-cl-opt-disable"
llvm::opt::ArgStringList BeArgs;
// Per-device argument vector storing the device name and the backend argument
// string
Expand Down Expand Up @@ -1969,17 +1969,23 @@ void SYCLToolChain::AddImpliedTargetArgs(const llvm::Triple &Triple,
CmdArgs.push_back(Args.MakeArgString(A));
return;
}
SmallString<128> BeOpt;
if (IsGen)
if (IsGen) {
SmallString<128> BeOpt;
CmdArgs.push_back("-options");
else
BeOpt = "--bo=";
for (unsigned I = 0; I < BeArgs.size(); ++I) {
if (I)
BeOpt += ' ';
BeOpt += BeArgs[I];
for (unsigned I = 0; I < BeArgs.size(); ++I) {
if (I)
BeOpt += ' ';
BeOpt += BeArgs[I];
}
CmdArgs.push_back(Args.MakeArgString(BeOpt));
} else {
for (unsigned I = 0; I < BeArgs.size(); ++I) {
SmallString<128> BeOpt;
BeOpt += "--bo=";
BeOpt += BeArgs[I];
CmdArgs.push_back(Args.MakeArgString(BeOpt));
}
}
CmdArgs.push_back(Args.MakeArgString(BeOpt));
}

void SYCLToolChain::TranslateBackendTargetArgs(
Expand Down
2 changes: 1 addition & 1 deletion clang/test/Driver/sycl-offload-aot.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@
// RUN: | FileCheck -check-prefix=CHK-TOOLS-IMPLIED-OPTS-CPU %s
// RUN: %clang_cl -### -fsycl -fsycl-targets=spir64_x86_64-unknown-unknown -Zi -Od -Xsycl-target-backend "-DFOO1 -DFOO2" -- %s 2>&1 \
// RUN: | FileCheck -check-prefix=CHK-TOOLS-IMPLIED-OPTS-CPU %s
// CHK-TOOLS-IMPLIED-OPTS-CPU: opencl-aot{{.*}} "--bo=-g -cl-opt-disable" "-DFOO1" "-DFOO2"
// CHK-TOOLS-IMPLIED-OPTS-CPU: opencl-aot{{.*}} "--bo=-g" "--bo=-cl-opt-disable" "-DFOO1" "-DFOO2"

// RUN: %clang -### -target x86_64-unknown-linux-gnu -fsycl -fsycl-targets=spir64_gen-unknown-unknown -g -O0 -Xsycl-target-backend "-DFOO1 -DFOO2" %s 2>&1 \
// RUN: | FileCheck -check-prefix=CHK-TOOLS-IMPLIED-OPTS-GEN %s
Expand Down
Loading