Address review comments

Signed-off-by: Soumi Manna <[email protected]>

Author: smanna12

clang/lib/Sema/SemaDeclAttr.cpp

@@ -3467,7 +3467,7 @@ static AttrArgResult AreAllAttrArgsOne(const Expr *E, const Expr *E1,
   if (!CE || !CE1 || !CE2 || !CE3)
     return AttrArgResult::Unknown;
 
-  // Otherwise, test that the attribute values.
+  // Otherwise, check if the attribute values are equal to one.
   if (CE->getResultAsAPSInt() == 0 &&
       (CE1->getResultAsAPSInt() != 1 || CE2->getResultAsAPSInt() != 1 ||
        CE3->getResultAsAPSInt() != 1)) {
@@ -3520,10 +3520,7 @@ void Sema::AddSYCLIntelMaxWorkGroupSizeAttr(Decl *D,
   // the attribute holds equal values to (1, 1, 1) in case the value of
   // SYCLIntelMaxGlobalWorkDimAttr equals to 0.
   if (const auto *DeclAttr = D->getAttr<SYCLIntelMaxGlobalWorkDimAttr>()) {
-    AttrArgResult Results[] = {
-        AreAllAttrArgsOne(DeclAttr->getValue(), XDim, YDim, ZDim)};
-
-    if (llvm::is_contained(Results, AttrArgResult::NotEqualToOne)) {
+    if (AreAllAttrArgsOne(DeclAttr->getValue(), XDim, YDim, ZDim) == AttrArgResult::NotEqualToOne) {
       Diag(CI.getLoc(), diag::err_sycl_x_y_z_arguments_must_be_one)
           << CI << DeclAttr;
       return;
@@ -3584,10 +3581,7 @@ SYCLIntelMaxWorkGroupSizeAttr *Sema::MergeSYCLIntelMaxWorkGroupSizeAttr(
   // (1, 1, 1) in case the value of SYCLIntelMaxGlobalWorkDimAttr
   // equals to 0.
   if (const auto *DeclAttr = D->getAttr<SYCLIntelMaxGlobalWorkDimAttr>()) {
-    AttrArgResult Results[] = {AreAllAttrArgsOne(
-        DeclAttr->getValue(), A.getXDim(), A.getYDim(), A.getZDim())};
-
-    if (llvm::is_contained(Results, AttrArgResult::NotEqualToOne)) {
+    if (AreAllAttrArgsOne(DeclAttr->getValue(),  A.getXDim(), A.getYDim(), A.getZDim()) == AttrArgResult::NotEqualToOne) {	  
       Diag(A.getLoc(), diag::err_sycl_x_y_z_arguments_must_be_one)
           << &A << DeclAttr;
       return nullptr;

clang/test/SemaSYCL/intel-max-global-work-dim-device.cpp

@@ -111,7 +111,7 @@ struct TRIFuncObjGood9 {
 [[intel::max_global_work_dim(1)]] void TRIFuncObjGood9::operator()() const {}
 
 // FIXME: We do not have support yet for checking
-// max_work_group_size and max_global_work_dim
+// reqd_work_group_size and max_global_work_dim
 // attributes when merging, so the test compiles without
 // any diagnostic when it shouldn't.
 struct TRIFuncObjBad1 {
@@ -123,7 +123,7 @@ struct TRIFuncObjBad1 {
 void TRIFuncObjBad1::operator()() const {}
 
 // FIXME: We do not have support yet for checking
-// max_work_group_size and max_global_work_dim
+// reqd_work_group_size and max_global_work_dim
 // attributes when merging, so the test compiles without
 // any diagnostic when it shouldn't.
 struct TRIFuncObjBad2 {

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

@@ -15,19 +15,13 @@
 [[intel::max_work_group_size(32, 32, 32)]] void f3(); // OK
 
 // Produce a conflicting attribute warning when the args are different.
-[[intel::max_work_group_size(16, 16, 16)]] void f4();   // expected-note {{previous attribute is here}}
-[[intel::max_work_group_size(32, 32, 32)]] void f4() {} // expected-warning {{attribute 'max_work_group_size' is already applied with different arguments}} \
-
 [[intel::max_work_group_size(6, 6, 6)]]                 // expected-note {{previous attribute is here}}
 [[intel::max_work_group_size(16, 16, 16)]] void         // expected-warning {{attribute 'max_work_group_size' is already applied with different arguments}}
-f5() {}
-
-[[intel::max_work_group_size(2, 2, 2)]] void f6();    // expected-note {{previous attribute is here}}
-[[intel::max_work_group_size(32, 32, 32)]] void f6(); // expected-warning {{attribute 'max_work_group_size' is already applied with different arguments}} \
+f4() {}
 
 // Catch the easy case where the attributes are all specified at once with
 // different arguments.
-[[intel::max_work_group_size(16, 16, 16), intel::max_work_group_size(2, 2, 2)]] void f7(); // expected-warning {{attribute 'max_work_group_size' is already applied with different arguments}} expected-note {{previous attribute is here}}
+[[intel::max_work_group_size(16, 16, 16), intel::max_work_group_size(2, 2, 2)]] void f5(); // expected-warning {{attribute 'max_work_group_size' is already applied with different arguments}} expected-note {{previous attribute is here}}
 
 // Show that the attribute works on member functions.
 class Functor {
@@ -38,30 +32,30 @@ class Functor {
 
 // Ensure that template arguments behave appropriately based on instantiations.
 template <int N>
-[[intel::max_work_group_size(N, 1, 1)]] void f8(); // #f8
+[[intel::max_work_group_size(N, 1, 1)]] void f6(); // #f6
 
 // Test that template redeclarations also get diagnosed properly.
 template <int X, int Y, int Z>
-[[intel::max_work_group_size(1, 1, 1)]] void f9(); // #f9prev
+[[intel::max_work_group_size(1, 1, 1)]] void f7(); // #f7prev
 
 template <int X, int Y, int Z>
-[[intel::max_work_group_size(X, Y, Z)]] void f9() {} // #f9
+[[intel::max_work_group_size(X, Y, Z)]] void f7() {} // #f7
 
 // Test that a template redeclaration where the difference is known up front is
 // diagnosed immediately, even without instantiation.
 template <int X, int Y, int Z>
-[[intel::max_work_group_size(X, 1, Z)]] void f10(); // expected-note {{previous attribute is here}}
+[[intel::max_work_group_size(X, 1, Z)]] void f8(); // expected-note {{previous attribute is here}}
 template <int X, int Y, int Z>
-[[intel::max_work_group_size(X, 2, Z)]] void f10(); // expected-warning {{attribute 'max_work_group_size' is already applied with different arguments}}
+[[intel::max_work_group_size(X, 2, Z)]] void f8(); // expected-warning {{attribute 'max_work_group_size' is already applied with different arguments}}
 
 void instantiate() {
-  f8<1>(); // OK
-  // expected-warning@#f8 {{implicit conversion changes signedness: 'int' to 'unsigned long long'}}
-  f8<-1>(); // expected-note {{in instantiation}}
-  // expected-error@#f8 {{'max_work_group_size' attribute must be greater than 0}}
-  f8<0>();       // expected-note {{in instantiation}}
-  f9<1, 1, 1>(); // OK, args are the same on the redecl.
-  // expected-warning@#f9 {{attribute 'max_work_group_size' is already applied with different arguments}}
-  // expected-note@#f9prev {{previous attribute is here}}
-  f9<2, 2, 2>(); // expected-note {{in instantiation}}
+  f6<1>(); // OK
+  // expected-warning@#f6 {{implicit conversion changes signedness: 'int' to 'unsigned long long'}}
+  f6<-1>(); // expected-note {{in instantiation}}
+  // expected-error@#f6 {{'max_work_group_size' attribute must be greater than 0}}
+  f6<0>();       // expected-note {{in instantiation}}
+  f7<1, 1, 1>(); // OK, args are the same on the redecl.
+  // expected-warning@#f7 {{attribute 'max_work_group_size' is already applied with different arguments}}
+  // expected-note@#f7prev {{previous attribute is here}}
+  f7<2, 2, 2>(); // expected-note {{in instantiation}}
 }