Improve tests for special type parameters for free function kernels

Author: lbushi25

clang/lib/Sema/SemaSYCL.cpp

@@ -2092,17 +2092,7 @@ class SyclKernelFieldChecker : public SyclKernelFieldHandler {
   }
 
   bool handleSyclSpecialType(ParmVarDecl *PD, QualType ParamTy) final {
-<<<<<<< HEAD
     IsInvalid |= checkSyclSpecialType(ParamTy, PD->getLocation());
-=======
-    if (!SemaSYCL::isSyclType(ParamTy, SYCLTypeAttr::work_group_memory) &&
-        !SemaSYCL::isSyclType(ParamTy,
-                              SYCLTypeAttr::dynamic_work_group_memory)) {
-      Diag.Report(PD->getLocation(), diag::err_bad_kernel_param_type)
-          << ParamTy;
-      IsInvalid = true;
-    }
->>>>>>> 8113cb9ccb03a97ae7f7c01cd107d549ebcbb322
     return isValid();
   }
 
@@ -2253,14 +2243,7 @@ class SyclKernelUnionChecker : public SyclKernelFieldHandler {
   }
 
   bool handleSyclSpecialType(ParmVarDecl *PD, QualType ParamTy) final {
-<<<<<<< HEAD
     return checkType(PD->getLocation(), ParamTy);
-=======
-    if (!SemaSYCL::isSyclType(ParamTy, SYCLTypeAttr::work_group_memory) &&
-        !SemaSYCL::isSyclType(ParamTy, SYCLTypeAttr::dynamic_work_group_memory))
-      unsupportedFreeFunctionParamType(); // TODO
-    return true;
->>>>>>> 8113cb9ccb03a97ae7f7c01cd107d549ebcbb322
   }
 
   bool handleSyclSpecialType(const CXXRecordDecl *, const CXXBaseSpecifier &BS,
@@ -3044,7 +3027,6 @@ class SyclKernelDeclCreator : public SyclKernelFieldHandler {
   }
 
   bool handleSyclSpecialType(ParmVarDecl *PD, QualType ParamTy) final {
-<<<<<<< HEAD
     const auto *RecordDecl = ParamTy->getAsCXXRecordDecl();
     assert(RecordDecl && "The type must be a RecordDecl");
     CXXMethodDecl *InitMethod = getMethodByName(RecordDecl, InitMethodName);
@@ -3061,29 +3043,6 @@ class SyclKernelDeclCreator : public SyclKernelFieldHandler {
         Params.back()->addAttr(AddIRAttr->clone(SemaSYCLRef.getASTContext()));
     }
     LastParamIndex = ParamIndex;
-=======
-    if (SemaSYCL::isSyclType(ParamTy, SYCLTypeAttr::work_group_memory) ||
-        SemaSYCL::isSyclType(ParamTy,
-                             SYCLTypeAttr::dynamic_work_group_memory)) {
-      const auto *RecordDecl = ParamTy->getAsCXXRecordDecl();
-      assert(RecordDecl && "The type must be a RecordDecl");
-      CXXMethodDecl *InitMethod = getMethodByName(RecordDecl, InitMethodName);
-      assert(InitMethod && "The type must have the __init method");
-      // Don't do -1 here because we count on this to be the first parameter
-      // added (if any).
-      size_t ParamIndex = Params.size();
-      for (const ParmVarDecl *Param : InitMethod->parameters()) {
-        QualType ParamTy = Param->getType();
-        addParam(Param, ParamTy.getCanonicalType());
-        // Propagate add_ir_attributes_kernel_parameter attribute.
-        if (const auto *AddIRAttr =
-                Param->getAttr<SYCLAddIRAttributesKernelParameterAttr>())
-          Params.back()->addAttr(AddIRAttr->clone(SemaSYCLRef.getASTContext()));
-      }
-      LastParamIndex = ParamIndex;
-    } else // TODO
-      unsupportedFreeFunctionParamType();
->>>>>>> 8113cb9ccb03a97ae7f7c01cd107d549ebcbb322
     return true;
   }
 
@@ -4577,26 +4536,13 @@ class FreeFunctionKernelBodyCreator : public SyclKernelFieldHandler {
   // TODO: Revisit this approach once https://github.com/intel/llvm/issues/16061
   // is closed.
   bool handleSyclSpecialType(ParmVarDecl *PD, QualType ParamTy) final {
-<<<<<<< HEAD
     const auto *RecordDecl = ParamTy->getAsCXXRecordDecl();
     AccessSpecifier DefaultConstructorAccess;
     auto DefaultConstructor =
         std::find_if(RecordDecl->ctor_begin(), RecordDecl->ctor_end(),
                      [](auto it) { return it->isDefaultConstructor(); });
     DefaultConstructorAccess = DefaultConstructor->getAccess();
     DefaultConstructor->setAccess(AS_public);
-=======
-    if (SemaSYCL::isSyclType(ParamTy, SYCLTypeAttr::work_group_memory) ||
-        SemaSYCL::isSyclType(ParamTy,
-                             SYCLTypeAttr::dynamic_work_group_memory)) {
-      const auto *RecordDecl = ParamTy->getAsCXXRecordDecl();
-      AccessSpecifier DefaultConstructorAccess;
-      auto DefaultConstructor =
-          std::find_if(RecordDecl->ctor_begin(), RecordDecl->ctor_end(),
-                       [](auto it) { return it->isDefaultConstructor(); });
-      DefaultConstructorAccess = DefaultConstructor->getAccess();
-      DefaultConstructor->setAccess(AS_public);
->>>>>>> 8113cb9ccb03a97ae7f7c01cd107d549ebcbb322
 
     QualType Ty = PD->getOriginalType();
     ASTContext &Ctx = SemaSYCLRef.SemaRef.getASTContext();
@@ -4936,7 +4882,6 @@ class SyclKernelIntHeaderCreator : public SyclKernelFieldHandler {
       addParam(PD, ParamTy, SYCLIntegrationHeader::kind_stream);
     } else if (SemaSYCL::isSyclType(ParamTy, SYCLTypeAttr::work_group_memory)) {
       addParam(PD, ParamTy, SYCLIntegrationHeader::kind_work_group_memory);
-<<<<<<< HEAD
     } else if (SemaSYCL::isSyclType(ParamTy, SYCLTypeAttr::sampler) ||
                SemaSYCL::isSyclType(ParamTy, SYCLTypeAttr::annotated_ptr) ||
                SemaSYCL::isSyclType(ParamTy, SYCLTypeAttr::annotated_arg)) {
@@ -4951,18 +4896,15 @@ class SyclKernelIntHeaderCreator : public SyclKernelFieldHandler {
               : (T->isPointerType() ? SYCLIntegrationHeader::kind_pointer
                                     : SYCLIntegrationHeader::kind_std_layout);
       addParam(PD, ParamTy, ParamKind);
-    } else {
+    } else if (SemaSYCL::isSyclType(ParamTy,
+                                    SYCLTypeAttr::dynamic_work_group_memory))
+      addParam(PD, ParamTy,
+               SYCLIntegrationHeader::kind_dynamic_work_group_memory);
+
+    else {
       llvm_unreachable(
           "Unexpected SYCL special class when generating integration header");
     }
-=======
-    else if (SemaSYCL::isSyclType(ParamTy,
-                                  SYCLTypeAttr::dynamic_work_group_memory))
-      addParam(PD, ParamTy,
-               SYCLIntegrationHeader::kind_dynamic_work_group_memory);
-    else
-      unsupportedFreeFunctionParamType(); // TODO
->>>>>>> 8113cb9ccb03a97ae7f7c01cd107d549ebcbb322
     return true;
   }
 

clang/test/CodeGenSYCL/Inputs/sycl.hpp

@@ -34,6 +34,7 @@ struct sampler_impl {
 class __attribute__((sycl_special_class)) __SYCL_TYPE(sampler) sampler {
   struct sampler_impl impl;
 #ifdef __SYCL_DEVICE_ONLY__
+  sampler() = default;
   void __init(__ocl_sampler_t Sampler) { impl.m_Sampler = Sampler; }
 #endif
 
@@ -327,6 +328,9 @@ template <typename dataT, int dimensions, access::mode accessmode,
 class __attribute__((sycl_special_class)) __SYCL_TYPE(accessor) accessor {
 
 public:
+#ifdef __SYCL_DEVICE_ONLY__               
+accessor() = default;
+#endif
   void use(void) const {}
   template <typename... T>
   void use(T... args) {}
@@ -420,6 +424,9 @@ local_accessor: public accessor<dataT,
         dimensions, access::mode::read_write,
         access::target::local> {
 public:
+#ifdef __SYCL_DEVICE_ONLY__  
+local_accessor();
+#endif
   void use(void) const {}
   template <typename... T>
   void use(T... args) {}
@@ -488,6 +495,7 @@ template <typename T, typename... Props>
 class __attribute__((sycl_special_class)) __SYCL_TYPE(annotated_arg) annotated_arg {
   T obj;
   #ifdef __SYCL_DEVICE_ONLY__
+    annotated_arg() = default;
     void __init(T _obj) {}
   #endif
 };
@@ -496,6 +504,7 @@ template <typename T, typename... Props>
 class __attribute__((sycl_special_class)) __SYCL_TYPE(annotated_ptr) annotated_ptr {
   T* obj;
   #ifdef __SYCL_DEVICE_ONLY__
+    annotated_ptr() = default;
     void __init(T* _obj) {}
   #endif
 };