Skip to content
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

Jump to bottom

[SYCL][Driver] Enable PCH inclusion while performing host compilation with -fsycl #9864

Merged
merged 14 commits into from
Jul 10, 2023
Merged

[SYCL][Driver] Enable PCH inclusion while performing host compilation with -fsycl #9864

Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
5255df6
[Driver] Disable PCH inclusion in SYCL device mode.
srividya-sundaram Jun 14, 2023
bc4c6eb
Fix error message.
srividya-sundaram Jun 14, 2023
2324c56
Enable PCH usage with fsycl in host compilation mode.
srividya-sundaram Jun 15, 2023
00f112d
Remove diagnostic.
srividya-sundaram Jun 15, 2023
f0e2e81
Fix int-footer test failure.
srividya-sundaram Jun 16, 2023
756fb8f
Add /Yu test case.
srividya-sundaram Jun 16, 2023
82b3b92
Add check for -fsycl-is-device in test.
srividya-sundaram Jun 20, 2023
5418e18
Include PCH file in SYCL host and non-SYCL compilation.
srividya-sundaram Jun 21, 2023
34ecd01
Add SYCLDeviceCompilation check.
srividya-sundaram Jun 22, 2023
6e63155
Update test.
srividya-sundaram Jun 24, 2023
ee9457c
Remove redundant code.
srividya-sundaram Jun 26, 2023
fdafed1
Update pch-include-sycl.cpp
srividya-sundaram Jun 27, 2023
2e82a36
Merge branch 'sycl' into pch-use-fsycl
srividya-sundaram Jul 8, 2023
34c7661
Merge branch 'pch-use-fsycl' of https://github.com/srividya-sundaram/…
srividya-sundaram Jul 8, 2023
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
36 changes: 24 additions & 12 deletions clang/lib/Driver/ToolChains/Clang.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1343,9 +1343,15 @@ void Clang::AddPreprocessingOptions(Compilation &C, const JobAction &JA,

if (YcArg || YuArg) {
StringRef ThroughHeader = YcArg ? YcArg->getValue() : YuArg->getValue();
// Enable PCH inclusion when performing host compilation with -fsycl.
if (!isa<PrecompileJobAction>(JA) && JA.isOffloading(Action::OFK_SYCL) &&
!JA.isDeviceOffloading(Action::OFK_SYCL)) {
// If PCH file is available, include it while performing
// host compilation (-fsycl-is-host) in SYCL mode (-fsycl).
// as well as in non-sycl mode.
bool NonSYCLCompilation = !JA.isOffloading(Action::OFK_SYCL);
bool SYCLHostCompilation = JA.isOffloading(Action::OFK_SYCL) &&
!JA.isDeviceOffloading(Action::OFK_SYCL);
srividya-sundaram marked this conversation as resolved.
Show resolved Hide resolved

if (!isa<PrecompileJobAction>(JA) &&
(NonSYCLCompilation || SYCLHostCompilation)) {
CmdArgs.push_back("-include-pch");
CmdArgs.push_back(Args.MakeArgString(D.GetClPchPath(
C, !ThroughHeader.empty()
Expand All @@ -1371,14 +1377,6 @@ void Clang::AddPreprocessingOptions(Compilation &C, const JobAction &JA,
D.getProbePrecompiled()) ||
A->getOption().matches(options::OPT_include_pch)) {

// Enable PCH inclusion when performing host compilation with -fsycl.
if (JA.isOffloading(Action::OFK_SYCL) &&
!JA.isDeviceOffloading(Action::OFK_SYCL))
;
// Disable PCH inclusion when performing device compilation with -fsycl.
else if (JA.isDeviceOffloading(Action::OFK_SYCL) &&
!Args.hasArg(options::OPT_fno_sycl_use_footer))
break;
// Handling of gcc-style gch precompiled headers.
bool IsFirstImplicitInclude = !RenderedImplicitInclude;
RenderedImplicitInclude = true;
Expand All @@ -1398,8 +1396,15 @@ void Clang::AddPreprocessingOptions(Compilation &C, const JobAction &JA,
FoundPCH = true;
}
}
// If PCH file is available, include it while performing
// host compilation (-fsycl-is-host) in SYCL mode (-fsycl).
// as well as in non-sycl mode.
bool SYCLHostComp = JA.isOffloading(Action::OFK_SYCL) &&
!JA.isDeviceOffloading(Action::OFK_SYCL);

bool NonSYCLComp = !JA.isOffloading(Action::OFK_SYCL);

if (FoundPCH) {
if (FoundPCH && (SYCLHostComp || NonSYCLComp)) {
if (IsFirstImplicitInclude) {
A->claim();
CmdArgs.push_back("-include-pch");
Expand All @@ -1411,6 +1416,13 @@ void Clang::AddPreprocessingOptions(Compilation &C, const JobAction &JA,
<< A->getAsString(Args);
}
}
// No PCH file, but we still want to include the header file
// (-include dummy.h) in device compilation mode.
else if (JA.isDeviceOffloading(Action::OFK_SYCL) &&
A->getOption().matches(options::OPT_include_pch)) {
continue;
}

} else if (A->getOption().matches(options::OPT_isystem_after)) {
// Handling of paths which must come late. These entries are handled by
// the toolchain itself after the resource dir is inserted in the right
Expand Down