[SYCL] reqd_work_group_size attribute is reversed (fix intel#13)

Signed-off-by: Aleksander Fadeev <aleksander.fadeev@intel.com>

Author: fadeeval

clang/include/clang/Basic/Attr.td

@@ -1147,7 +1147,7 @@ def SYCLIntelKernelArgsRestrict : InheritableAttr {
 
 def SYCLIntelNumSimdWorkItems : InheritableAttr {
   let Spellings = [CXX11<"intelfpga","num_simd_work_items">];
-  let Args = [UnsignedArgument<"Number">];
+  let Args = [IntArgument<"Number">];
   let LangOpts = [SYCLIsDevice, SYCLIsHost];
   let Subjects = SubjectList<[Function], ErrorDiag>;
   let Documentation = [SYCLIntelNumSimdWorkItemsAttrDocs];
@@ -2420,6 +2420,14 @@ def ReqdWorkGroupSize : InheritableAttr {
   let Documentation = [Undocumented];
 }
 
+def SYCLIntelReqdWorkGroupSize : InheritableAttr {
+  let Spellings = [CXX11<"intel","reqd_work_group_size">];
+  let Args = [IntArgument<"XDim">, DefaultIntArgument<"YDim", 1>,
+              DefaultIntArgument<"ZDim", 1>];
+  let Subjects = SubjectList<[Function], ErrorDiag>;
+  let Documentation = [Undocumented];
+}
+
 def WorkGroupSizeHint :  InheritableAttr {
   // Does not have a [[]] spelling because it is an OpenCL-related attribute.
   let Spellings = [GNU<"work_group_size_hint">];

clang/lib/Sema/SemaDeclAttr.cpp

@@ -2914,7 +2914,7 @@ static bool checkWorkGroupSizeValues(Sema &S, Decl *D, const ParsedAttr &Attr,
     }
   }
   if (const auto *A = D->getAttr<ReqdWorkGroupSizeAttr>()) {
-  
+
     if (S.getLangOpts().SYCLIsDevice &&
         !(WGSize[2] >= A->getXDim() && WGSize[1] >= A->getYDim() &&
           WGSize[0] >= A->getZDim())) {
@@ -2940,9 +2940,13 @@ static void handleWorkGroupSize(Sema &S, Decl *D, const ParsedAttr &AL) {
     return;
 
   uint32_t WGSize[3];
+  if (const auto *A = D->getAttr<SYCLIntelReqdWorkGroupSizeAttr>()){
+    WGSize[1] = SYCLIntelReqdWorkGroupSizeAttr::DefaultYDim;
+    WGSize[2] = SYCLIntelReqdWorkGroupSizeAttr::DefaultZDim;
+  }
   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, E, WGSize[i], i,
                              /*StrictlyUnsigned=*/true))
       return;
     if (WGSize[i] == 0) {

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

@@ -40,7 +40,7 @@ class Functor32 {
   //expected-warning@+2{{attribute 'reqd_work_group_size' is already applied with different parameters}}
   // expected-error@+1{{'reqd_work_group_size' attribute conflicts with 'reqd_work_group_size' attribute}}
   [[cl::reqd_work_group_size(32, 1, 1)]] [[cl::reqd_work_group_size(1, 1, 32)]] void operator()() {}
-}; 
+};
 #endif
 class Functor16x16x16 {
 public:
@@ -74,7 +74,7 @@ __attribute__((sycl_kernel)) void kernel(Func kernelFunc) {
 void bar() {
   Functor16 f16;
   kernel<class kernel_name1>(f16);
-  
+
   Functor f;
   kernel<class kernel_name2>(f);
 
@@ -96,7 +96,6 @@ void bar() {
   kernel<class kernel_name1>(f32);
 
   kernel<class kernel_name7>([]() { // expected-error {{conflicting attributes applied to a SYCL kernel}}
-
     f4x1x1();
     f32x1x1();
   });