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

[SYCL] Fix KernelNameInfo generated for empty template paramter pack #1775

Merged
merged 2 commits into from
Jun 1, 2020
+13 −0
Merged

[SYCL] Fix KernelNameInfo generated for empty template paramter pack #1775

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
09512d8
Fix KernelNameInfo generated in integration header when kernel
elizabethandrews May 28, 2020
25a1ad1
Implemented review comments:
elizabethandrews May 29, 2020
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/lib/Sema/SemaSYCL.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1903,6 +1903,10 @@ static void printArguments(ASTContext &Ctx, raw_ostream &ArgOS,
for (unsigned I = 0; I < Args.size(); I++) {
const TemplateArgument &Arg = Args[I];

// If argument is an empty pack argument, skip printing comma and argument.
if (Arg.getKind() == TemplateArgument::ArgKind::Pack && !Arg.pack_size())
continue;

if (I != 0)
elizabethandrews marked this conversation as resolved.
Show resolved Hide resolved
ArgOS << ", ";

Expand Down
9 changes: 9 additions & 0 deletions clang/test/CodeGenSYCL/int_header1.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
// CHECK:template <> struct KernelInfo<::nm1::KernelName4<KernelName7>> {
// CHECK:template <> struct KernelInfo<::nm1::KernelName8<::nm1::nm2::C>> {
// CHECK:template <> struct KernelInfo<::TmplClassInAnonNS<ClassInAnonNS>> {
// CHECK:template <> struct KernelInfo<::nm1::KernelName9<char>> {

// This test checks if the SYCL device compiler is able to generate correct
// integration header when the kernel name class is expressed in different
Expand Down Expand Up @@ -42,6 +43,9 @@ namespace nm1 {
template <> class KernelName4<nm1::nm2::KernelName0> {};
template <> class KernelName4<KernelName1> {};

template <typename T, typename...>
class KernelName9;

} // namespace nm1

namespace {
Expand Down Expand Up @@ -128,6 +132,10 @@ struct MyWrapper {
kernel_single_task<TmplClassInAnonNS<class ClassInAnonNS>>(
[=]() { acc.use(); });

// Kernel name type is a templated specialization class with empty template pack argument
kernel_single_task<nm1::KernelName9<char>>(
[=]() { acc.use(); });

return 0;
}
};
Expand All @@ -151,5 +159,6 @@ int main() {
KernelInfo<class nm1::KernelName4<class KernelName7>>::getName();
KernelInfo<class nm1::KernelName8<nm1::nm2::C>>::getName();
KernelInfo<class TmplClassInAnonNS<class ClassInAnonNS>>::getName();
KernelInfo<class nm1::KernelName9<char>>::getName();
#endif //__SYCL_DEVICE_ONLY__
}