Skip to content

[Driver][SYCL] Improve -Xsycl-target option parsing #1586

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
merged 2 commits into from
Apr 28, 2020
Merged

[Driver][SYCL] Improve -Xsycl-target option parsing #1586

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
3f53a40
[Driver][SYCL] Improve -Xsycl-target option parsing
mdtoguchi Apr 25, 2020
aed5d83
[Driver] Address review comments
mdtoguchi Apr 27, 2020
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
28 changes: 14 additions & 14 deletions clang/lib/Driver/ToolChains/SYCL.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
#include "clang/Driver/Driver.h"
#include "clang/Driver/DriverDiagnostic.h"
#include "clang/Driver/Options.h"
#include "llvm/Support/CommandLine.h"
#include "llvm/Support/FileSystem.h"
#include "llvm/Support/Path.h"

Expand Down Expand Up @@ -421,6 +422,17 @@ SYCLToolChain::TranslateArgs(const llvm::opt::DerivedArgList &Args,
return DAL;
}

static void parseTargetOpts(StringRef ArgString, const llvm::opt::ArgList &Args,
llvm::opt::ArgStringList &CmdArgs) {
// Tokenize the string.
SmallVector<const char *, 8> TargetArgs;
llvm::BumpPtrAllocator A;
llvm::StringSaver S(A);
llvm::cl::TokenizeGNUCommandLine(ArgString, S, TargetArgs);
for (StringRef TA : TargetArgs)
CmdArgs.push_back(Args.MakeArgString(TA));
}

// Expects a specific type of option (e.g. -Xsycl-target-backend) and will
// extract the arguments.
void SYCLToolChain::TranslateTargetOpt(const llvm::opt::ArgList &Args,
Expand Down Expand Up @@ -455,13 +467,7 @@ void SYCLToolChain::TranslateTargetOpt(const llvm::opt::ArgList &Args,
// Triple found, add the next argument in line.
ArgString = A->getValue(1);

// Do a simple parse of the args to pass back
SmallVector<StringRef, 16> TargetArgs;
// TODO: Improve parsing, as this only handles arguments separated by
// spaces.
ArgString.split(TargetArgs, ' ', -1, false);
for (const auto &TA : TargetArgs)
CmdArgs.push_back(Args.MakeArgString(TA));
parseTargetOpts(ArgString, Args, CmdArgs);
A->claim();
}
}
Expand All @@ -485,13 +491,7 @@ void SYCLToolChain::TranslateBackendTargetArgs(const llvm::opt::ArgList &Args,
}
if (A->getOption().matches(options::OPT_Xs_separate)) {
StringRef ArgString(A->getValue());
// Do a simple parse of the args to pass back
SmallVector<StringRef, 16> TargetArgs;
// TODO: Improve parsing, as this only handles arguments separated by
// spaces.
ArgString.split(TargetArgs, ' ', -1, false);
for (const auto &TA : TargetArgs)
CmdArgs.push_back(Args.MakeArgString(TA));
parseTargetOpts(ArgString, Args, CmdArgs);
A->claim();
continue;
}
Expand Down
4 changes: 4 additions & 0 deletions clang/test/Driver/sycl-offload.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -671,6 +671,10 @@
// CHK-TOOLS-CPU-OPTS: opencl-aot{{.*}} "-DFOO1" "-DFOO2"
// CHK-TOOLS-CPU-OPTS-NOT: clang-offload-wrapper{{.*}} "-compile-opts={{.*}}

// RUN: %clang -### -target x86_64-unknown-linux-gnu -fsycl -fsycl-targets=spir64_x86_64-unknown-unknown-sycldevice -Xsycl-target-backend "--bo='\"-DFOO1 -DFOO2\"'" %s 2>&1 \
// RUN: | FileCheck -check-prefix=CHK-TOOLS-CPU-OPTS3 %s
// CHK-TOOLS-CPU-OPTS3: opencl-aot{{.*}} "--bo=\"-DFOO1 -DFOO2\""

// RUN: %clang -### -target x86_64-unknown-linux-gnu -fsycl -fsycl-targets=spir64-unknown-unknown-sycldevice -Xsycl-target-backend "-DFOO1 -DFOO2" %s 2>&1 \
// RUN: | FileCheck -check-prefix=CHK-TOOLS-OPTS %s
// CHK-TOOLS-OPTS: clang-offload-wrapper{{.*}} "-compile-opts=\"-DFOO1 -DFOO2\""
Expand Down