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

Signed-off-by: Aleksander Fadeev <[email protected]>

Author: fadeeval

clang/lib/Sema/SemaDeclAttr.cpp

@@ -2914,6 +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())) {
@@ -2951,9 +2952,6 @@ static void handleWorkGroupSize(Sema &S, Decl *D, const ParsedAttr &AL) {
     }
   }
 
-  if (!checkWorkGroupSizeValues(S, D, AL, WGSize))
-    return;
-
   WorkGroupAttr *Existing = D->getAttr<WorkGroupAttr>();
   if (S.getLangOpts().SYCLIsDevice && Existing &&
       !(Existing->getXDim() == WGSize[2] && Existing->getYDim() == WGSize[1] &&
@@ -2964,6 +2962,9 @@ static void handleWorkGroupSize(Sema &S, Decl *D, const ParsedAttr &AL) {
         Existing->getZDim() == WGSize[2]))
     S.Diag(AL.getLoc(), diag::warn_duplicate_attribute) << AL;
 
+  if (!checkWorkGroupSizeValues(S, D, AL, WGSize))
+    return;
+
   if (S.getLangOpts().SYCLIsDevice)
     D->addAttr(::new (S.Context) WorkGroupAttr(S.Context, AL, WGSize[2],
                                                WGSize[1], WGSize[0]));

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

@@ -34,6 +34,14 @@ class Functor16 {
   [[cl::reqd_work_group_size(16, 1, 1)]] [[cl::reqd_work_group_size(16, 1, 1)]] void operator()() {}
 };
 
+#ifdef TRIGGER_ERROR
+class Functor32 {
+public:
+  //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:
   [[cl::reqd_work_group_size(16, 16, 16)]] void operator()() {}
@@ -66,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);
 
@@ -84,7 +92,11 @@ void bar() {
   Functor8 f8;
   kernel<class kernel_name6>(f8);
 
+  Functor32 f32;
+  kernel<class kernel_name1>(f32);
+
   kernel<class kernel_name7>([]() { // expected-error {{conflicting attributes applied to a SYCL kernel}}
+
     f4x1x1();
     f32x1x1();
   });