Skip to content

[SYCL] Refactor -fsycl-esimd and -fsycl-int-header options #2466

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.

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 1 commit into from
Sep 14, 2020
Merged
Changes from all commits
Commits
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
10 changes: 3 additions & 7 deletions clang/lib/Frontend/CompilerInvocation.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -823,14 +823,10 @@ static bool ParseCodeGenArgs(CodeGenOptions &Opts, ArgList &Args, InputKind IK,
Args.getLastArg(OPT_emit_llvm_uselists, OPT_no_emit_llvm_uselists))
Opts.EmitLLVMUseLists = A->getOption().getID() == OPT_emit_llvm_uselists;

// ESIMD GPU Back-end requires optimized IR
bool IsSyclESIMD = Args.hasFlag(options::OPT_fsycl_esimd,
options::OPT_fno_sycl_esimd, false);

Opts.DisableLLVMPasses =
Args.hasArg(OPT_disable_llvm_passes) ||
(Args.hasArg(OPT_fsycl_is_device) && Triple.isSPIR() &&
Args.hasArg(OPT_fno_sycl_early_optimizations) && !IsSyclESIMD);
Args.hasArg(OPT_fno_sycl_early_optimizations));
Opts.DisableLifetimeMarkers = Args.hasArg(OPT_disable_lifetimemarkers);

const llvm::Triple::ArchType DebugEntryValueArchs[] = {
Expand Down Expand Up @@ -2612,6 +2608,8 @@ static void ParseLangArgs(LangOptions &Opts, ArgList &Args, InputKind IK,
Opts.SYCLValueFitInMaxInt =
Args.hasFlag(options::OPT_fsycl_id_queries_fit_in_int,
options::OPT_fno_sycl_id_queries_fit_in_int, false);
Opts.SYCLIntHeader =
std::string(Args.getLastArgValue(OPT_fsycl_int_header));
}

Opts.IncludeDefaultHeader = Args.hasArg(OPT_finclude_default_header);
Expand Down Expand Up @@ -2672,8 +2670,6 @@ static void ParseLangArgs(LangOptions &Opts, ArgList &Args, InputKind IK,
Diags.Report(diag::warn_ignored_hip_only_option)
<< Args.getLastArg(OPT_gpu_max_threads_per_block_EQ)->getAsString(Args);

Opts.SYCLIntHeader = std::string(Args.getLastArgValue(OPT_fsycl_int_header));

if (Opts.ObjC) {
if (Arg *arg = Args.getLastArg(OPT_fobjc_runtime_EQ)) {
StringRef value = arg->getValue();
Expand Down