Skip to content

[SYCL][NFC] Fix internal option name prefix #848

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 1 commit into from
Nov 20, 2019
Merged

[SYCL][NFC] Fix internal option name prefix #848

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
5 changes: 2 additions & 3 deletions clang/include/clang/Driver/Options.td
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1814,6 +1814,8 @@ def fintelfpga : Flag<["-"], "fintelfpga">, Group<f_Group>,
def fsycl : Flag<["-"], "fsycl">, Group<f_Group>, Flags<[CC1Option, NoArgumentUnused, CoreOption]>,
HelpText<"generate SYCL code.">;
def fno_sycl : Flag<["-"], "fno-sycl">, Group<f_Group>, Flags<[NoArgumentUnused, CoreOption]>;
def fsycl_device_only : Flag<["-"], "fsycl-device-only">, Flags<[CoreOption]>,
HelpText<"Compile SYCL kernels for device">;
def fsycl_targets_EQ : CommaJoined<["-"], "fsycl-targets=">, Flags<[DriverOption, CC1Option, CoreOption]>,
HelpText<"Specify comma-separated list of triples SYCL offloading targets to be supported">;
def fsycl_add_targets_EQ : CommaJoined<["-"], "fsycl-add-targets=">, Flags<[DriverOption, CoreOption]>,
Expand Down Expand Up @@ -3396,9 +3398,6 @@ defm stack_arrays : BooleanFFlag<"stack-arrays">, Group<gfortran_Group>;
defm underscoring : BooleanFFlag<"underscoring">, Group<gfortran_Group>;
defm whole_file : BooleanFFlag<"whole-file">, Group<gfortran_Group>;

def sycl_device_only : Flag<["-"], "fsycl-device-only">, Flags<[CoreOption]>,
HelpText<"Compile SYCL kernels for device">;

def reuse_exe_EQ : Joined<["-"], "reuse-exe=">,
HelpText<"Speed up FPGA aoc compile if the device code in <exe> is unchanged.">,
MetaVarName<"<exe>">;
Expand Down
8 changes: 4 additions & 4 deletions clang/lib/Driver/Driver.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -299,7 +299,7 @@ phases::ID Driver::getFinalPhase(const DerivedArgList &DAL,

// -S only runs up to the backend.
} else if ((PhaseArg = DAL.getLastArg(options::OPT_S)) ||
(PhaseArg = DAL.getLastArg(options::OPT_sycl_device_only))) {
(PhaseArg = DAL.getLastArg(options::OPT_fsycl_device_only))) {
FinalPhase = phases::Backend;

// -c compilation only runs up to the assembler.
Expand Down Expand Up @@ -730,7 +730,7 @@ void Driver::CreateOffloadingDeviceToolChains(Compilation &C,
// Use of -fsycl-device-only overrides -fsycl.
bool HasValidSYCLRuntime = (C.getInputArgs().hasFlag(options::OPT_fsycl,
options::OPT_fno_sycl, false) &&
!C.getInputArgs().hasArg(options::OPT_sycl_device_only));
!C.getInputArgs().hasArg(options::OPT_fsycl_device_only));

// A mechanism for retrieving SYCL-specific options, erroring out
// if SYCL offloading wasn't enabled prior to that
Expand Down Expand Up @@ -1201,7 +1201,7 @@ Compilation *Driver::BuildCompilation(ArrayRef<const char *> ArgList) {
T.setObjectFormat(llvm::Triple::COFF);
TargetTriple = T.str();
}
if (Args.hasArg(options::OPT_sycl_device_only)) {
if (Args.hasArg(options::OPT_fsycl_device_only)) {
// -fsycl-device-only implies spir arch and SYCL Device
llvm::Triple T(TargetTriple);
// FIXME: defaults to spir64, should probably have a way to set spir
Expand Down Expand Up @@ -4486,7 +4486,7 @@ Action *Driver::ConstructPhaseAction(
Args.hasArg(options::OPT_S) ? types::TY_LLVM_IR : types::TY_LLVM_BC;
return C.MakeAction<BackendJobAction>(Input, Output);
}
if (Args.hasArg(options::OPT_sycl_device_only)) {
if (Args.hasArg(options::OPT_fsycl_device_only)) {
if (Args.hasFlag(options::OPT_fsycl_use_bitcode,
options::OPT_fno_sycl_use_bitcode, true))
return C.MakeAction<BackendJobAction>(Input, types::TY_LLVM_BC);
Expand Down
2 changes: 1 addition & 1 deletion clang/lib/Driver/Types.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -362,7 +362,7 @@ void types::getCompilationPhases(const clang::driver::Driver &Driver,

else if (DAL.getLastArg(options::OPT_S) ||
DAL.getLastArg(options::OPT_emit_llvm) ||
DAL.getLastArg(options::OPT_sycl_device_only))
DAL.getLastArg(options::OPT_fsycl_device_only))
llvm::copy_if(PhaseList, std::back_inserter(P),
[](phases::ID Phase) { return Phase <= phases::Backend; });

Expand Down