Skip to content

[ESIMD] Add driver option to control SYCL/ESIMD code splitting. #6174

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 8 commits into from
Jun 2, 2022
Merged

[ESIMD] Add driver option to control SYCL/ESIMD code splitting. #6174

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
8396fd7
[ESIMD] Add driver option to control SYCL/ESIMD code splitting.
kbobrovs May 19, 2022
f6a926c
Address review comments - CC1Option removed.
kbobrovs May 31, 2022
1639e6e
resolve merge conflict
kbobrovs May 31, 2022
e59fcba
Update clang/include/clang/Driver/Options.td
kbobrovs Jun 2, 2022
4f414bc
Added -fsycl-device-code-split-esimd option description to user docs.
kbobrovs Jun 2, 2022
bdfc85e
Merge remote-tracking branch 'intel/sycl' into driver_split_esimd
kbobrovs Jun 2, 2022
a0d52d0
Merge branch 'sycl' into driver_split_esimd
Jun 2, 2022
c1f2e55
Merge branch 'driver_split_esimd' of https://github.com/kbobrovs/llvm…
kbobrovs Jun 2, 2022
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
4 changes: 4 additions & 0 deletions clang/include/clang/Driver/Options.td
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2770,6 +2770,10 @@ def fsycl_device_code_split_EQ : Joined<["-"], "fsycl-device-code-split=">,
def fsycl_device_code_split : Flag<["-"], "fsycl-device-code-split">, Alias<fsycl_device_code_split_EQ>,
AliasArgs<["auto"]>, Flags<[CC1Option, CoreOption]>,
HelpText<"Perform SYCL device code split in the 'auto' mode, i.e. use heuristic to distribute device code across modules">;
def fsycl_device_code_split_esimd : Flag<["-"], "fsycl-device-code-split-esimd">,
Flags<[CoreOption]>, HelpText<"split ESIMD device code from SYCL into a separate device binary image (default). Has effect only for SPIR-based targets. (experimental)">;
def fno_sycl_device_code_split_esimd : Flag<["-"], "fno-sycl-device-code-split-esimd">,
Flags<[CoreOption]>, HelpText<"do not split ESIMD and SYCL device code into separate device binary images. Has effect only for SPIR-based targets. (experimental)">;
defm sycl_instrument_device_code
: BoolFOption<"sycl-instrument-device-code",
CodeGenOpts<"SPIRITTAnnotations">, DefaultFalse,
Expand Down
7 changes: 6 additions & 1 deletion clang/lib/Driver/ToolChains/Clang.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9382,11 +9382,16 @@ void SYCLPostLink::ConstructJob(Compilation &C, const JobAction &JA,
addArgs(CmdArgs, TCArgs, {"-ir-output-only"});
} else {
assert(SYCLPostLink->getTrueType() == types::TY_Tempfiletable);
bool SplitEsimdByDefault = getToolChain().getTriple().isSPIR();
bool SplitEsimd = TCArgs.hasFlag(
options::OPT_fsycl_device_code_split_esimd,
options::OPT_fno_sycl_device_code_split_esimd, SplitEsimdByDefault);
// Symbol file and specialization constant info generation is mandatory -
// add options unconditionally
addArgs(CmdArgs, TCArgs, {"-symbols"});
addArgs(CmdArgs, TCArgs, {"-emit-exported-symbols"});
addArgs(CmdArgs, TCArgs, {"-split-esimd"});
if (SplitEsimd)
addArgs(CmdArgs, TCArgs, {"-split-esimd"});
addArgs(CmdArgs, TCArgs, {"-lower-esimd"});
}
addArgs(CmdArgs, TCArgs,
Expand Down
14 changes: 14 additions & 0 deletions clang/test/Driver/sycl-offload-with-split.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -338,3 +338,17 @@
// RUN: %clang -### -fsycl -fsycl-targets=spir64_fpga-unknown-unknown %s 2>&1 | FileCheck %s -check-prefixes=CHK-ESIMD-LOWER
// RUN: %clang_cl -### -fsycl -fintelfpga %s 2>&1 | FileCheck %s -check-prefixes=CHK-ESIMD-LOWER
// CHK-ESIMD-LOWER: sycl-post-link{{.*}} "-lower-esimd"

// Check -f[no]sycl-device-code-split-esimd option's effect on sycl-post-link invocation
// RUN: %clang -### -fsycl -fsycl-device-code-split-esimd %s 2>&1 \
// RUN: | FileCheck %s -check-prefixes=CHK-ESIMD-SPLIT-ON
// RUN: %clang -### -fsycl -fno-sycl-device-code-split-esimd %s 2>&1 \
// RUN: | FileCheck %s -check-prefixes=CHK-ESIMD-SPLIT-OFF
// RUN: %clang -### -fsycl %s 2>&1 \
// RUN: | FileCheck %s -check-prefixes=CHK-ESIMD-SPLIT-DEFAULT
// RUN: %clang -### -fsycl -fsycl-targets=nvptx64-nvidia-cuda %s 2>&1 \
// RUN: | FileCheck %s -check-prefixes=CHK-ESIMD-SPLIT-NON-SPIRV
// CHK-ESIMD-SPLIT-ON: sycl-post-link{{.*}} "-split-esimd"{{.*}} "-o"{{.*}}
// CHK-ESIMD-SPLIT-OFF-NOT: sycl-post-link{{.*}} "-split-esimd"{{.*}}
// CHK-ESIMD-SPLIT-DEFAULT: sycl-post-link{{.*}} "-split-esimd"{{.*}} "-o"{{.*}}
// CHK-ESIMD-SPLIT-NON-SPIRV-NOT: sycl-post-link{{.*}} "-split-esimd"{{.*}}
10 changes: 10 additions & 0 deletions sycl/doc/UsersManual.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,6 +176,16 @@ and not recommended to use in production environment.
* auto - the compiler will use a heuristic to select the best way of
splitting device code. This is default mode.

**`-f[no-]sycl-device-code-split-esimd`** [EXPERIMENTAL]

Controls SYCL/ESIMD device code splitting. When enabled (this is the
default), SYCL and ESIMD entry points along with their call graphs are
put into separate device binary images. Otherwise, SYCL and ESIMD parts
of the device code are kept in the same device binary image and get
compiled by the Intel GPU compiler back end as a single module. This
option has effect only for SPIR-based targets and apps containing ESIMD
kernels.

**`-fsycl-max-parallel-link-jobs=<N>`**

Experimental feature. When specified, it informs the compiler
Expand Down