Skip to content

[SYCL] Fix SYCL Kernel Body Check #5546

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
bader merged 4 commits into from
Feb 14, 2022
Merged

[SYCL] Fix SYCL Kernel Body Check #5546

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
22d92a9
[SYCL] Fix SYCL Kernel Body Check
elizabethandrews Feb 11, 2022
79bf8d4
Correct comment and rename variable
elizabethandrews Feb 11, 2022
2eaf47f
Revert changes and add check for attribute
elizabethandrews Feb 11, 2022
c523c9b
Remove extra space
elizabethandrews Feb 11, 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
3 changes: 2 additions & 1 deletion clang/lib/Sema/SemaSYCL.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -823,7 +823,8 @@ class SingleDeviceFunctionTracker {
// false-positives.
if (isSYCLKernelBodyFunction(CurrentDecl)) {
Comment thread
elizabethandrews marked this conversation as resolved.
// This is a direct callee of the kernel.
if (CallStack.size() == 1) {
if (CallStack.size() == 1 &&
CallStack.back()->hasAttr<SYCLKernelAttr>()) {
assert(!KernelBody && "inconsistent call graph - only one kernel body "
"function can be called");
KernelBody = CurrentDecl;
Expand Down
21 changes: 21 additions & 0 deletions clang/test/SemaSYCL/non-kernel-functor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
// RUN: %clang_cc1 -fsycl-is-device -triple spir64-unknown-unknown -verify %s
Comment thread
elizabethandrews marked this conversation as resolved.
Outdated

// Test to verify that non-kernel functors are not processed as SYCL kernel
// functors

// expected-no-diagnostics
Comment thread
Fznamznon marked this conversation as resolved.
class First {
public:
void operator()() { return; }
};

class Second {
public:
First operator()() { return First(); }
};

SYCL_EXTERNAL
void foo() {
Second NonKernelFunctorObj;
NonKernelFunctorObj()();
}