Use sycl_type to denote host pipes instead of new attribute

Author: rho180

clang/include/clang/Basic/Attr.td

@@ -1331,12 +1331,12 @@ def SYCLType: InheritableAttr {
                             "specialization_id", "kernel_handler", "buffer_location",
                             "no_alias", "accessor_property_list", "group",
                             "private_memory", "aspect", "annotated_ptr", "annotated_arg",
-                            "stream", "sampler"],
+                            "stream", "sampler", "host_pipe"],
                            ["accessor", "local_accessor", "spec_constant",
                             "specialization_id", "kernel_handler", "buffer_location",
                             "no_alias", "accessor_property_list", "group",
                             "private_memory", "aspect", "annotated_ptr", "annotated_arg",
-                            "stream", "sampler"]>];
+                            "stream", "sampler", "host_pipe"]>];
   // Only used internally by SYCL implementation
   let Documentation = [InternalOnly];
 }
@@ -1554,15 +1554,6 @@ def SYCLDeviceGlobal: InheritableAttr {
   let SimpleHandler = 1;
 }
 
-def SYCLHostPipe: InheritableAttr {
-  let Spellings = [CXX11<"__sycl_detail__", "host_pipe">];
-  let Subjects = SubjectList<[CXXRecord], ErrorDiag>;
-  let LangOpts = [SYCLIsDevice, SilentlyIgnoreSYCLIsHost];
-  // Only used internally by SYCL implementation
-  let Documentation = [SYCLHostPipeAttrDocs];
-  let SimpleHandler = 1;
-}
-
 def SYCLGlobalVariableAllowed : InheritableAttr {
   let Spellings = [CXX11<"__sycl_detail__", "global_variable_allowed">];
   let Subjects = SubjectList<[CXXRecord], ErrorDiag>;

clang/include/clang/Basic/AttrDocs.td

@@ -3124,26 +3124,6 @@ so we have this attribute in sycl_detail namespace.
   }];
 }
 
-def SYCLHostPipeAttrDocs : Documentation {
-  let Category = DocCatType;
-  let Heading = "__sycl_detail__::host_pipe";
-  let Content = [{
-This attribute is part of support for SYCL host_pipe feature.
-Global or static variables of type decorated with this attribute have
-`sycl-unique-id`, an LLVM IR attribute, added to the definition of each such
-variable, which provides a unique string identifier using
-__builtin_sycl_unique_stable_id.
-We do not intend to support this as a general attribute that user code can use,
-so we have this attribute in sycl_detail namespace.
-
-.. code-block:: c++
-  struct
-  [[__sycl_detail__::host_pipe]] __pipeType {}
-
-  __pipeType __pipe;
-  }];
-}
-
 def SYCLGlobalVariableAllowedAttrDocs : Documentation {
   let Category = DocCatType;
   let Heading = "__sycl_detail__::global_variable_allowed";

clang/lib/CodeGen/CodeGenModule.cpp

@@ -110,6 +110,23 @@ static bool SYCLCUDAIsSYCLDevice(const clang::LangOptions &LangOpts) {
   return LangOpts.SYCLIsDevice && LangOpts.CUDA && !LangOpts.CUDAIsDevice;
 }
 
+static bool isSyclType(QualType Ty, SYCLTypeAttr::SYCLType TypeName) {
+  const auto *RD = Ty->getAsCXXRecordDecl();
+  if (!RD)
+    return false;
+
+  if (const auto *Attr = RD->getAttr<SYCLTypeAttr>())
+    return Attr->getType() == TypeName;
+
+  if (const auto *CTSD = dyn_cast<ClassTemplateSpecializationDecl>(RD))
+    if (CXXRecordDecl *TemplateDecl =
+            CTSD->getSpecializedTemplate()->getTemplatedDecl())
+      if (const auto *Attr = TemplateDecl->getAttr<SYCLTypeAttr>())
+        return Attr->getType() == TypeName;
+
+  return false;
+}
+
 CodeGenModule::CodeGenModule(ASTContext &C,
                              IntrusiveRefCntPtr<llvm::vfs::FileSystem> FS,
                              const HeaderSearchOptions &HSO,
@@ -5512,10 +5529,15 @@ void CodeGenModule::EmitGlobalVarDefinition(const VarDecl *D,
     // type.
     if (RD && RD->hasAttr<SYCLAddIRAttributesGlobalVariableAttr>())
       AddGlobalSYCLIRAttributes(GV, RD);
-    // If VarDecl has a type decorated with SYCL device_global attribute or
-    // SYCL host_pipe attribute, emit IR attribute 'sycl-unique-id'.
-    if (RD && (RD->hasAttr<SYCLDeviceGlobalAttr>() || 
-               RD->hasAttr<SYCLHostPipeAttr>()))
+    // If VarDecl has a type decorated with SYCL device_global attribute 
+    // emit IR attribute 'sycl-unique-id'.
+    if (RD && (RD->hasAttr<SYCLDeviceGlobalAttr>()))
+      addSYCLUniqueID(GV, D, Context);
+
+    // If VarDecl type is SYCLTypeAttr::host_pipe, emit the IR attribute 
+    // 'sycl-unique-id'.
+    auto Ty = D->getType();
+    if (isSyclType(Ty, SYCLTypeAttr::host_pipe))
       addSYCLUniqueID(GV, D, Context);
   }
 

clang/lib/Sema/SemaSYCL.cpp

@@ -5377,7 +5377,7 @@ void SYCLIntegrationFooter::addVarDecl(const VarDecl *VD) {
     return;
   // Step 1: ensure that this is of the correct type template specialization.
   if (!isSyclType(VD->getType(), SYCLTypeAttr::specialization_id) &&
-      !S.isTypeDecoratedWithDeclAttribute<SYCLHostPipeAttr>(VD->getType()) &&
+      !isSyclType(VD->getType(), SYCLTypeAttr::host_pipe) &&
       !S.isTypeDecoratedWithDeclAttribute<SYCLDeviceGlobalAttr>(
           VD->getType())) {
     // Handle the case where this could be a deduced type, such as a deduction
@@ -5563,9 +5563,8 @@ bool SYCLIntegrationFooter::emit(raw_ostream &OS) {
     // Skip if this isn't a SpecIdType, DeviceGlobal, or HostPipe.  This 
     // can happen if it was a deduced type.
     if (!isSyclType(VD->getType(), SYCLTypeAttr::specialization_id) &&
+        !isSyclType(VD->getType(), SYCLTypeAttr::host_pipe) && 
         !S.isTypeDecoratedWithDeclAttribute<SYCLDeviceGlobalAttr>(
-            VD->getType()) &&
-        !S.isTypeDecoratedWithDeclAttribute<SYCLHostPipeAttr>(
             VD->getType()))
       continue;
 
@@ -5595,8 +5594,7 @@ bool SYCLIntegrationFooter::emit(raw_ostream &OS) {
       DeviceGlobOS << SYCLUniqueStableIdExpr::ComputeName(S.getASTContext(),
                                                           VD);
       DeviceGlobOS << "\");\n";
-    } else if (S.isTypeDecoratedWithDeclAttribute<SYCLHostPipeAttr>(
-            VD->getType())) {
+    } else if (isSyclType(VD->getType(), SYCLTypeAttr::host_pipe)) {
       HostPipesEmitted = true;
       HostPipesOS << "host_pipe_map::add(";
       HostPipesOS << "(void *)&";

clang/test/CodeGenSYCL/Inputs/sycl.hpp

@@ -163,9 +163,7 @@ host_pipe {
 public:
   struct
 #ifdef __SYCL_DEVICE_ONLY__
-  // [[ __sycl_detail__::add_ir_attributes_global_variable(
-    // "sycl-host-pipe", nullptr)]] [[__sycl_detail__::host_pipe]]
-  [[__sycl_detail__::host_pipe]]
+  [[__sycl_detail__::sycl_type(host_pipe)]]
 #endif
   __pipeType { const char __p; };