[SYCL] Support intel::reqd_work_group_size

clang/include/clang/Basic/Attr.td

@@ -236,6 +236,10 @@ class DefaultIntArgument<string name, int default> : IntArgument<name, 1> {
   int Default = default;
 }
 
+class DefaultUnsignedArgument<string name, int default> : UnsignedArgument<name, 1> {
+  int Default = default;
+}
+
 // This argument is more complex, it includes the enumerator type name,
 // a list of strings to accept, and a list of enumerators to map them to.
 class EnumArgument<string name, string type, list<string> values,
@@ -2413,13 +2417,16 @@ def NoDeref : TypeAttr {
   let Documentation = [NoDerefDocs];
 }
 
+// Default arguments in ReqWorkGroupSize can be used only with
+// intel::reqd_work_group_size spelling.
 def ReqdWorkGroupSize : InheritableAttr {
   let Spellings = [GNU<"reqd_work_group_size">,
-                   CXX11<"cl","reqd_work_group_size">];
-  let Args = [UnsignedArgument<"XDim">, UnsignedArgument<"YDim">,
-              UnsignedArgument<"ZDim">];
+                   CXX11<"intel","reqd_work_group_size">, 
+                   CXX11<"cl","reqd_work_group_size">]; 
+  let Args = [UnsignedArgument<"XDim">, DefaultUnsignedArgument<"YDim", 1>,
+              DefaultUnsignedArgument<"ZDim", 1>];
   let Subjects = SubjectList<[Function], ErrorDiag>;
-  let Documentation = [Undocumented];
+  let Documentation = [ReqdWorkGroupSizeAttrDocs];
 }
 
 def WorkGroupSizeHint :  InheritableAttr {

clang/include/clang/Basic/AttrDocs.td

@@ -1983,6 +1983,18 @@ device kernel, the attribute is ignored and it is not propagated to a kernel.
   }];
 }
 
+def ReqdWorkGroupSizeAttrDocs : Documentation {
+  let Category = DocCatFunction;
+  let Heading = "cl::reqd_work_group_size, intel::reqd_work_group_size";
+  let Content = [{
+Applies to a device function/lambda function. Indicates the dimensions 
+of a work group. Values must be positive integers. Default arguments 
+equaling to one can be used for second and third dimensions if 
+intel::reqd_work_group_size spelling was applied. 
+This attribute is also valid for OpenCL C.
+  }];
+}
+
 def SYCLIntelMaxWorkGroupSizeAttrDocs : Documentation {
   let Category = DocCatFunction;
   let Heading = "max_work_group_size (IntelFPGA)";

clang/lib/Sema/SemaDeclAttr.cpp

@@ -2922,14 +2922,22 @@ static void handleWorkGroupSize(Sema &S, Decl *D, const ParsedAttr &AL) {
     return;
 
   uint32_t WGSize[3];
+  if (AL.getKind() == ParsedAttr::AT_ReqdWorkGroupSize &&
+      AL.getAttributeSpellingListIndex() ==
+          ReqdWorkGroupSizeAttr::CXX11_intel_reqd_work_group_size) {
+    WGSize[1] = ReqdWorkGroupSizeAttr::DefaultYDim;
+    WGSize[2] = ReqdWorkGroupSizeAttr::DefaultZDim;
+  } else if (!checkAttributeNumArgs(S, AL, 3))
+    return;
+
   for (unsigned i = 0; i < 3; ++i) {
-    const Expr *E = AL.getArgAsExpr(i);
-    if (!checkUInt32Argument(S, AL, E, WGSize[i], i,
+    if (i < AL.getNumArgs() &&
+        !checkUInt32Argument(S, AL, AL.getArgAsExpr(i), WGSize[i], i,
                              /*StrictlyUnsigned=*/true))
       return;
     if (WGSize[i] == 0) {
       S.Diag(AL.getLoc(), diag::err_attribute_argument_is_zero)
-          << AL << E->getSourceRange();
+          << AL << AL.getArgAsExpr(i)->getSourceRange();
       return;
     }
   }

clang/test/SemaSYCL/intel-reqd-work-group-size.cpp

@@ -0,0 +1,136 @@
+// RUN: %clang_cc1 -fsycl -fsycl-is-device -fsyntax-only -verify -DTRIGGER_ERROR %s
+// RUN: %clang_cc1 -fsycl -fsycl-is-device -ast-dump %s | FileCheck %s
+// RUN: %clang_cc1 -fsycl -fsycl-is-host -fsyntax-only -verify %s
+
+#ifndef __SYCL_DEVICE_ONLY__
+// expected-no-diagnostics
+class Functor {
+public:
+  [[intel::reqd_work_group_size(4)]] void operator()() {}
+};
+
+template <typename name, typename Func>
+void kernel(Func kernelFunc) {
+  kernelFunc();
+}
+
+void bar() {
+  Functor f;
+  kernel<class kernel_name>(f);
+}
+#else
+[[intel::reqd_work_group_size(4)]] void f4x1x1() {} // expected-note {{conflicting attribute is here}}
+// expected-note@-1 {{conflicting attribute is here}}
+[[intel::reqd_work_group_size(32)]] void f32x1x1() {} // expected-note {{conflicting attribute is here}}
+
+[[intel::reqd_work_group_size(16)]] void f16x1x1() {}      // expected-note {{conflicting attribute is here}}
+[[intel::reqd_work_group_size(16, 16)]] void f16x16x1() {} // expected-note {{conflicting attribute is here}}
+
+[[intel::reqd_work_group_size(32, 32)]] void f32x32x1() {}      // expected-note {{conflicting attribute is here}}
+[[intel::reqd_work_group_size(32, 32, 32)]] void f32x32x32() {} // expected-note {{conflicting attribute is here}}
+
+#ifdef TRIGGER_ERROR
+class Functor32 {
+public:
+  [[cl::reqd_work_group_size(32)]] void operator()() {} // expected-error {{'reqd_work_group_size' attribute requires exactly 3 arguments}}
+};
+class Functor33 {
+public:
+  [[intel::reqd_work_group_size(32, -4)]] void operator()() {} // expected-error {{'reqd_work_group_size' attribute requires a non-negative integral compile time constant expression}}
+};
+#endif
+
+class Functor16 {
+public:
+  [[intel::reqd_work_group_size(16)]] void operator()() {}
+};
+
+class Functor64 {
+public:
+  [[intel::reqd_work_group_size(64, 64)]] void operator()() {}
+};
+
+class Functor16x16x16 {
+public:
+  [[intel::reqd_work_group_size(16, 16, 16)]] void operator()() {}
+};
+
+class Functor8 { // expected-error {{conflicting attributes applied to a SYCL kernel}}
+public:
+  [[intel::reqd_work_group_size(8)]] void operator()() { // expected-note {{conflicting attribute is here}}
+    f4x1x1();
+  }
+};
+
+class Functor {
+public:
+  void operator()() {
+    f4x1x1();
+  }
+};
+
+class FunctorAttr {
+public:
+  __attribute__((reqd_work_group_size(128, 128, 128))) void operator()() {}
+};
+
+template <typename name, typename Func>
+__attribute__((sycl_kernel)) void kernel(Func kernelFunc) {
+  kernelFunc();
+}
+
+void bar() {
+  Functor16 f16;
+  kernel<class kernel_name1>(f16);
+
+  Functor f;
+  kernel<class kernel_name2>(f);
+
+  Functor16x16x16 f16x16x16;
+  kernel<class kernel_name3>(f16x16x16);
+
+  FunctorAttr fattr;
+  kernel<class kernel_name4>(fattr);
+
+  kernel<class kernel_name5>([]() [[intel::reqd_work_group_size(32, 32, 32)]] {
+    f32x32x32();
+  });
+
+#ifdef TRIGGER_ERROR
+  Functor8 f8;
+  kernel<class kernel_name6>(f8);
+
+  kernel<class kernel_name7>([]() { // expected-error {{conflicting attributes applied to a SYCL kernel}}
+    f4x1x1();
+    f32x1x1();
+  });
+
+  kernel<class kernel_name8>([]() { // expected-error {{conflicting attributes applied to a SYCL kernel}}
+    f16x1x1();
+    f16x16x1();
+  });
+
+  kernel<class kernel_name9>([]() { // expected-error {{conflicting attributes applied to a SYCL kernel}}
+    f32x32x32();
+    f32x32x1();
+  });
+
+  // expected-error@+1 {{expected variable name or 'this' in lambda capture list}}
+  kernel<class kernel_name10>([[intel::reqd_work_group_size(32, 32, 32)]][]() {
+    f32x32x32();
+  });
+
+#endif
+}
+
+// CHECK: FunctionDecl {{.*}} {{.*}}kernel_name1
+// CHECK: ReqdWorkGroupSizeAttr {{.*}}  1 1 16
+// CHECK: FunctionDecl {{.*}} {{.*}}kernel_name2
+// CHECK: ReqdWorkGroupSizeAttr {{.*}} 1 1 4
+// CHECK: FunctionDecl {{.*}} {{.*}}kernel_name3
+// CHECK: ReqdWorkGroupSizeAttr {{.*}} 16 16 16
+// CHECK: FunctionDecl {{.*}} {{.*}}kernel_name4
+// CHECK: ReqdWorkGroupSizeAttr {{.*}} 128 128 128
+// CHECK: FunctionDecl {{.*}} {{.*}}kernel_name5
+// CHECK: ReqdWorkGroupSizeAttr {{.*}} 32 32 32
+#endif // __SYCL_DEVICE_ONLY__

clang/utils/TableGen/ClangAttrEmitter.cpp

@@ -1304,6 +1304,9 @@ createArgument(const Record &Arg, StringRef Attr,
   else if (ArgName == "DefaultIntArgument")
     Ptr = std::make_unique<DefaultSimpleArgument>(
         Arg, Attr, "int", Arg.getValueAsInt("Default"));
+  else if (ArgName == "DefaultUnsignedArgument")
+    Ptr = std::make_unique<DefaultSimpleArgument>(
+        Arg, Attr, "unsigned", Arg.getValueAsInt("Default"));
   else if (ArgName == "IntArgument")
     Ptr = std::make_unique<SimpleArgument>(Arg, Attr, "int");
   else if (ArgName == "StringArgument")
@@ -2329,7 +2332,7 @@ static void emitAttributes(RecordKeeper &Records, raw_ostream &OS,
     SemanticSpellingMap SemanticToSyntacticMap;
 
     std::string SpellingEnum;
-    if (!ElideSpelling)
+    if (Spellings.size() > 1)
       SpellingEnum = CreateSemanticSpellings(Spellings, SemanticToSyntacticMap);
     if (Header)
       OS << SpellingEnum;