[SYCL] Add aliases to OpenCL event and sampler types for SYCL

event_t and sampler_t type names are replaced with __ocl_event_t and
__ocl_sampler_t to avoid potential collisions with user types.

This change allows to re-use OpenCL event and sampler types for SYCL and replace
OpTypeEvent and OpTypeSampler with __ocl_event_t and __ocl_sampler_t in SYCL
headers.

OpenCL diagnostics is not enabled.

Signed-off-by: Mariya Podchishchaeva <[email protected]>

Author: Fznamznon

clang/lib/AST/ASTContext.cpp

@@ -1285,7 +1285,7 @@ void ASTContext::InitBuiltinTypes(const TargetInfo &Target,
   InitBuiltinType(ObjCBuiltinClassTy, BuiltinType::ObjCClass);
   InitBuiltinType(ObjCBuiltinSelTy, BuiltinType::ObjCSel);
 
-  if (LangOpts.OpenCL) {
+  if (LangOpts.OpenCL || LangOpts.SYCLIsDevice) {
 #define IMAGE_TYPE(ImgType, Id, SingletonId, Access, Suffix) \
     InitBuiltinType(SingletonId, BuiltinType::Id);
 #include "clang/Basic/OpenCLImageTypes.def"

clang/lib/CodeGen/CodeGenModule.cpp

@@ -129,7 +129,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

@@ -264,6 +264,10 @@ void Sema::Initialize() {
 
     addImplicitTypedef("size_t", Context.getSizeType());
   }
+  if (getLangOpts().SYCLIsDevice) {
+    addImplicitTypedef("__ocl_event_t", Context.OCLEventTy);
+    addImplicitTypedef("__ocl_sampler_t", Context.OCLSamplerTy);
+  }
 
   // Initialize predefined OpenCL types and supported extensions and (optional)
   // core features.