Respond to reviews

Signed-off-by: Zahira Ammarguellat <[email protected]>

Author: zahiraam

clang/include/clang/Basic/DiagnosticSemaKinds.td

@@ -11611,7 +11611,7 @@ def ext_sycl_2020_attr_spelling : ExtWarn<
   "use of attribute %0 is a SYCL 2020 extension">,
   InGroup<Sycl2017Compat>;
 def err_sycl_esimd_not_supported_for_type : Error<
-  "type %0 is not support in 'esimd' context">;
+  "type %0 is not supported in 'esimd' context">;
 
 // errors of expect.with.probability
 def err_probability_not_constant_float : Error<

clang/lib/Sema/SemaSYCL.cpp

@@ -1668,13 +1668,13 @@ class SyclKernelFieldChecker : public SyclKernelFieldHandler {
       return SemaRef.Diag(Loc.getBegin(),
                           diag::err_sycl_esimd_not_supported_for_type)
              << RecD;
-    else
-      return false;
+    return false;
   }
 
 public:
-  SyclKernelFieldChecker(Sema &S)
-      : SyclKernelFieldHandler(S), Diag(S.getASTContext().getDiagnostics()) {}
+  SyclKernelFieldChecker(Sema &S, bool isSIMD)
+      : SyclKernelFieldHandler(S), Diag(S.getASTContext().getDiagnostics()),
+        IsSIMD(isSIMD) {}
   static constexpr const bool VisitNthArrayElement = false;
   bool isValid() { return !IsInvalid; }
 
@@ -3619,11 +3619,12 @@ void Sema::CheckSYCLKernelCall(FunctionDecl *KernelFunc, SourceRange CallLoc,
   if (KernelObj->isInvalidDecl())
     return;
 
+  bool IsSIMDKernel = isESIMDKernelType(KernelObj);
+
   SyclKernelDecompMarker DecompMarker(*this);
-  SyclKernelFieldChecker FieldChecker(*this);
+  SyclKernelFieldChecker FieldChecker(*this, IsSIMDKernel);
   SyclKernelUnionChecker UnionChecker(*this);
 
-  bool IsSIMDKernel = isESIMDKernelType(KernelObj);
   SyclKernelArgsSizeChecker ArgsSizeChecker(*this, Args[0]->getExprLoc(),
                                             IsSIMDKernel);
 

clang/test/CodeGenSYCL/esimd-special-class.cpp

@@ -0,0 +1,28 @@
+// RUN: %clang_cc1 -fsycl-is-device -verify \
+// RUN: -internal-isystem %S/Inputs -triple spir64-unknown-unknown \
+// RUN: -fsyntax-only -disable-llvm-passes -emit-llvm %s -o - %s
+
+// The test is to ensure that the use of sycl_explicit_simd attribute doesn't
+// crash when used with sampler or stream. Currently samplers/stream are not
+// supported in esimd.
+
+#include "sycl.hpp"
+using namespace cl::sycl;
+void test() {
+
+  queue q;
+
+  q.submit([&](handler &h) {
+    cl::sycl::sampler smplr;
+    cl::sycl::stream Stream(1024, 128, h);
+   // expected-note@+1{{in instantiation of function template specialization}}
+    h.single_task<class esimd_kernel>(
+        // expected-error@+1{{type 'sampler' is not supported in 'esimd' context}}
+        [=]() [[intel::sycl_explicit_simd]] { smplr.use(); });
+
+    // expected-note@+1{{in instantiation of function template specialization}}
+    h.single_task<class StreamTester>(
+        // expected-error@+1{{type 'stream' is not supported in 'esimd' context}}
+        [=]() [[intel::sycl_explicit_simd]] { Stream.use(); });
+  });
+}