[SYCL] Enable Open CL types required for implementing the SYCL headers.

This patch implements a few of the OpenCL types for SYCL, however
doesn't bother handling semantic analysis as these are not intended to
be used anywhere but in the SYCL implementation.

Signed-off-by: Erich Keane <[email protected]>

Differential Revision: https://reviews.llvm.org/D77220

Author: bader

clang/lib/AST/ASTContext.cpp

@@ -1423,6 +1423,15 @@ void ASTContext::InitBuiltinTypes(const TargetInfo &Target,
   InitBuiltinType(ObjCBuiltinClassTy, BuiltinType::ObjCClass);
   InitBuiltinType(ObjCBuiltinSelTy, BuiltinType::ObjCSel);
 
+  if (LangOpts.SYCLIsDevice) {
+    InitBuiltinType(OCLSamplerTy, BuiltinType::OCLSampler);
+    InitBuiltinType(OCLEventTy, BuiltinType::OCLEvent);
+#define IMAGE_TYPE(ImgType, Id, SingletonId, Access, Suffix) \
+    InitBuiltinType(SingletonId, BuiltinType::Id);
+#include "clang/Basic/OpenCLImageTypes.def"
+#undef IMAGE_TYPE
+  }
+
   if (LangOpts.OpenCL) {
 #define IMAGE_TYPE(ImgType, Id, SingletonId, Access, Suffix) \
     InitBuiltinType(SingletonId, BuiltinType::Id);

clang/lib/CodeGen/CodeGenModule.cpp

@@ -139,7 +139,7 @@ CodeGenModule::CodeGenModule(ASTContext &C, const HeaderSearchOptions &HSO,
 
   if (LangOpts.ObjC)
     createObjCRuntime();
-  if (LangOpts.OpenCL)
+  if (LangOpts.OpenCL || LangOpts.SYCLIsDevice)
     createOpenCLRuntime();
   if (LangOpts.OpenMP)
     createOpenMPRuntime();

clang/lib/Sema/Sema.cpp

@@ -317,6 +317,17 @@ void Sema::Initialize() {
     addImplicitTypedef("size_t", Context.getSizeType());
   }
 
+  if (getLangOpts().SYCLIsDevice) {
+    addImplicitTypedef("__ocl_sampler_t", Context.OCLSamplerTy);
+    addImplicitTypedef("__ocl_event_t", Context.OCLEventTy);
+#define SEMA_STRINGIZE(s) #s
+#define IMAGE_TYPE(ImgType, Id, SingletonId, Access, Suffix)                   \
+  addImplicitTypedef(SEMA_STRINGIZE(__ocl_##ImgType##_##Suffix##_t),           \
+                     Context.SingletonId);
+#include "clang/Basic/OpenCLImageTypes.def"
+#undef SEMA_STRINGIZE
+  }
+
   // Initialize predefined OpenCL types and supported extensions and (optional)
   // core features.
   if (getLangOpts().OpenCL) {

clang/lib/Sema/SemaInit.cpp

@@ -5579,9 +5579,10 @@ static bool TryOCLSamplerInitialization(Sema &S,
                                         InitializationSequence &Sequence,
                                         QualType DestType,
                                         Expr *Initializer) {
-  if (!S.getLangOpts().OpenCL || !DestType->isSamplerT() ||
+  if ((!S.getLangOpts().OpenCL && !S.getLangOpts().SYCLIsDevice) ||
+      !DestType->isSamplerT() ||
       (!Initializer->isIntegerConstantExpr(S.Context) &&
-      !Initializer->getType()->isSamplerT()))
+       !Initializer->getType()->isSamplerT()))
     return false;
 
   Sequence.AddOCLSamplerInitStep(DestType);

clang/lib/Sema/SemaSYCL.cpp

@@ -63,6 +63,9 @@ class Util {
   /// Checks whether given clang type is a full specialization of the SYCL
   /// accessor class.
   static bool isSyclAccessorType(const QualType &Ty);
+  /// Checks whether given clang type is a full specialization of the SYCL
+  /// sampler class.
+  static bool isSyclSamplerType(const QualType &Ty);
 
   /// Checks whether given clang type is declared in the given hierarchy of
   /// declaration contexts.
@@ -258,7 +261,8 @@ static CompoundStmt *CreateOpenCLKernelBody(Sema &S,
       CXXRecordDecl *CRD = FieldType->getAsCXXRecordDecl();
       InitializedEntity Entity =
           InitializedEntity::InitializeMember(Field, &VarEntity);
-      if (Util::isSyclAccessorType(FieldType)) {
+      if (Util::isSyclAccessorType(FieldType) ||
+          Util::isSyclSamplerType(FieldType)) {
         // Initialize kernel object field with the default constructor and
         // construct a call of __init method.
         InitializationKind InitKind =
@@ -369,7 +373,7 @@ static void buildArgTys(ASTContext &Context, CXXRecordDecl *KernelObj,
   //     and add parameter decriptor for them properly.
   for (const auto *Fld : KernelObj->fields()) {
     QualType ArgTy = Fld->getType();
-    if (Util::isSyclAccessorType(ArgTy))
+    if (Util::isSyclAccessorType(ArgTy) || Util::isSyclSamplerType(ArgTy))
       createSpecialSYCLObjParamDesc(Fld, ArgTy);
     else if (ArgTy->isStructureOrClassType())
       CreateAndAddPrmDsc(Fld, ArgTy);
@@ -455,6 +459,15 @@ bool Util::isSyclAccessorType(const QualType &Ty) {
   return matchQualifiedTypeName(Ty, Scopes);
 }
 
+bool Util::isSyclSamplerType(const QualType &Ty) {
+  static const std::array<DeclContextDesc, 3> Scopes = {
+      Util::DeclContextDesc{clang::Decl::Kind::Namespace, "cl"},
+      Util::DeclContextDesc{clang::Decl::Kind::Namespace, "sycl"},
+      Util::DeclContextDesc{clang::Decl::Kind::CXXRecord,
+                            "sampler"}};
+  return matchQualifiedTypeName(Ty, Scopes);
+}
+
 bool Util::matchQualifiedTypeName(const QualType &Ty,
                                   ArrayRef<Util::DeclContextDesc> Scopes) {
   // The idea: check the declaration context chain starting from the type