From c7340e97e5be2392ba5fe4ab09c679bbb11a26a8 Mon Sep 17 00:00:00 2001 From: "srividya.sundaram" Date: Mon, 9 Nov 2020 10:45:21 -0800 Subject: [PATCH 1/4] [SYCL]Improve diagnostic for invalid kernel name --- clang/include/clang/Basic/DiagnosticSemaKinds.td | 2 +- clang/lib/Sema/SemaSYCL.cpp | 2 +- clang/test/SemaSYCL/unnamed-kernel.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/clang/include/clang/Basic/DiagnosticSemaKinds.td b/clang/include/clang/Basic/DiagnosticSemaKinds.td index d29c0bd1175fd..4870f10594a66 100644 --- a/clang/include/clang/Basic/DiagnosticSemaKinds.td +++ b/clang/include/clang/Basic/DiagnosticSemaKinds.td @@ -11071,7 +11071,7 @@ def note_invalid_type_in_sycl_kernel : Note< "%select{%1 should be globally-visible" "|unscoped enum %1 requires fixed underlying type" "|type %1 cannot be in the \"std\" namespace" - "|kernel name is missing" + "|Unnamed type used in a SYCL kernel name" "}0">; def err_sycl_kernel_not_function_object diff --git a/clang/lib/Sema/SemaSYCL.cpp b/clang/lib/Sema/SemaSYCL.cpp index 180e25cc130de..97d62a88d1b15 100644 --- a/clang/lib/Sema/SemaSYCL.cpp +++ b/clang/lib/Sema/SemaSYCL.cpp @@ -2921,7 +2921,7 @@ class SYCLKernelNameTypeVisitor << KernelNameType; S.Diag(KernelInvocationFuncLoc, diag::note_invalid_type_in_sycl_kernel) - << /* kernel name is missing */ 3; + << /* Unnamed type used in a SYCL kernel name */ 3; IsInvalid = true; return; } diff --git a/clang/test/SemaSYCL/unnamed-kernel.cpp b/clang/test/SemaSYCL/unnamed-kernel.cpp index e452bd1c6430d..769e5a1de2a36 100644 --- a/clang/test/SemaSYCL/unnamed-kernel.cpp +++ b/clang/test/SemaSYCL/unnamed-kernel.cpp @@ -118,7 +118,7 @@ int main() { cl::sycl::queue q; #ifndef __SYCL_UNNAMED_LAMBDA__ // expected-error-re@Inputs/sycl.hpp:220 {{'(lambda at {{.*}}unnamed-kernel.cpp{{.*}}' is an invalid kernel name type}} - // expected-note@Inputs/sycl.hpp:220 {{kernel name is missing}} + // expected-note@Inputs/sycl.hpp:220 {{Unnamed type used in a SYCL kernel name}} // expected-note@+2{{in instantiation of function template specialization}} #endif q.submit([&](cl::sycl::handler &h) { h.single_task([] {}); }); From e7be07a75f8e06652edf9213d505d4b159a38b3e Mon Sep 17 00:00:00 2001 From: Srividya Sundaram Date: Tue, 10 Nov 2020 10:08:37 -0800 Subject: [PATCH 2/4] Update uppercase to lowercase Co-authored-by: Mariya Podchishchaeva --- clang/include/clang/Basic/DiagnosticSemaKinds.td | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/clang/include/clang/Basic/DiagnosticSemaKinds.td b/clang/include/clang/Basic/DiagnosticSemaKinds.td index 4870f10594a66..8a0518586c3c7 100644 --- a/clang/include/clang/Basic/DiagnosticSemaKinds.td +++ b/clang/include/clang/Basic/DiagnosticSemaKinds.td @@ -11071,7 +11071,7 @@ def note_invalid_type_in_sycl_kernel : Note< "%select{%1 should be globally-visible" "|unscoped enum %1 requires fixed underlying type" "|type %1 cannot be in the \"std\" namespace" - "|Unnamed type used in a SYCL kernel name" + "|unnamed type used in a SYCL kernel name" "}0">; def err_sycl_kernel_not_function_object From a8ce3d1a11eb3e4e114bcddb62ba32b5fd2fe2ef Mon Sep 17 00:00:00 2001 From: Srividya Sundaram Date: Tue, 10 Nov 2020 10:10:08 -0800 Subject: [PATCH 3/4] Update unnamed-kernel.cpp --- clang/test/SemaSYCL/unnamed-kernel.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/clang/test/SemaSYCL/unnamed-kernel.cpp b/clang/test/SemaSYCL/unnamed-kernel.cpp index 769e5a1de2a36..c4e3746f78679 100644 --- a/clang/test/SemaSYCL/unnamed-kernel.cpp +++ b/clang/test/SemaSYCL/unnamed-kernel.cpp @@ -118,7 +118,7 @@ int main() { cl::sycl::queue q; #ifndef __SYCL_UNNAMED_LAMBDA__ // expected-error-re@Inputs/sycl.hpp:220 {{'(lambda at {{.*}}unnamed-kernel.cpp{{.*}}' is an invalid kernel name type}} - // expected-note@Inputs/sycl.hpp:220 {{Unnamed type used in a SYCL kernel name}} + // expected-note@Inputs/sycl.hpp:220 {{unnamed type used in a SYCL kernel name}} // expected-note@+2{{in instantiation of function template specialization}} #endif q.submit([&](cl::sycl::handler &h) { h.single_task([] {}); }); From daa8051125592a4851b42d62611e4758a2faea29 Mon Sep 17 00:00:00 2001 From: Srividya Sundaram Date: Tue, 10 Nov 2020 10:11:14 -0800 Subject: [PATCH 4/4] Update SemaSYCL.cpp --- clang/lib/Sema/SemaSYCL.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/clang/lib/Sema/SemaSYCL.cpp b/clang/lib/Sema/SemaSYCL.cpp index 97d62a88d1b15..bac0e071d9812 100644 --- a/clang/lib/Sema/SemaSYCL.cpp +++ b/clang/lib/Sema/SemaSYCL.cpp @@ -2921,7 +2921,7 @@ class SYCLKernelNameTypeVisitor << KernelNameType; S.Diag(KernelInvocationFuncLoc, diag::note_invalid_type_in_sycl_kernel) - << /* Unnamed type used in a SYCL kernel name */ 3; + << /* unnamed type used in a SYCL kernel name */ 3; IsInvalid = true; return; }