Fixes after Prem's review

Signed-off-by: Zahira Ammarguellat <[email protected]>

Author: zahiraam

clang/include/clang/Basic/AttrDocs.td

@@ -2865,10 +2865,11 @@ def SYCLIntelFPGAMaxConcurrencyAttrDocs : Documentation {
   let Category = DocCatVariable;
   let Heading = "intel::max_concurrency";
   let Content = [{
-This attribute applies to a loop or a function. Indicates that the loop/function
-should allow no more than N threads or iterations to execute it simultaneously.
-N must be a non negative integer. '0' indicates the max_concurrency case to b
-unbounded. Cannot be applied multiple times to the same loop.
+This attribute applies to a loop or a function. It indicates that the
+loop/function should allow no more than N threads or iterations to execute it
+simultaneously. N must be a non negative integer. '0' indicates the
+max_concurrency case to be unbounded. Cannot be applied multiple times to the
+same loop.
 
 .. code-block:: c++
 

clang/lib/Sema/SemaDeclAttr.cpp

@@ -6471,9 +6471,9 @@ void Sema::AddSYCLIntelFPGAMaxConcurrencyAttr(Decl *D,
     E = Res.get();
 
     // This attribute requires a strictly positive value.
-    if (ArgVal <= 0) {
+    if (ArgVal < 0) {
       Diag(E->getExprLoc(), diag::err_attribute_requires_positive_integer)
-          << CI << /*positive*/ 0;
+          << CI << /*non-negative*/ 1;
       return;
     }
 

clang/test/SemaSYCL/max-concurrency.cpp

@@ -4,6 +4,11 @@
 
 using namespace cl::sycl;
 
+class Functor0 {
+public:
+  [[intel::max_concurrency(0)]] void operator()() const {}
+};
+
 class Functor1 {
 public:
   [[intel::max_concurrency(4)]] void operator()() const {}
@@ -36,7 +41,7 @@ class Functor4 {
   }
 };
 
-// expected-error@+1 {{'max_concurrency' attribute requires a positive integral compile time constant expression}}
+// expected-error@+1 {{'max_concurrency' attribute requires a non-negative integral compile time constant expression}}
 [[intel::max_concurrency(-1)]] void bar() {}
 class Functor5 {
 public:
@@ -45,6 +50,14 @@ class Functor5 {
   }
 };
 
+[[intel::max_concurrency(0)]] void bar0() {}
+class Functor6 {
+public:
+  void operator() () const {
+    bar0();
+  }
+};
+
 // expected-error@+1 {{integral constant expression must have integral or unscoped enumeration type, not 'const char [16]'}}
 [[intel::max_concurrency("numberofthreads")]] void zoo() {}
 
@@ -58,6 +71,9 @@ int main() {
   queue q;
 
   q.submit([&](handler &h) {
+    Functor1 f0;
+    h.single_task<class kernel_name1>(f0);
+
     Functor1 f1;
     h.single_task<class kernel_name1>(f1);
 
@@ -81,6 +97,11 @@ int main() {
   });
 }
 
+// CHECK: CXXMethodDecl {{.*}} operator() {{.*}}
+// CHECK: SYCLIntelFPGAMaxConcurrencyAttr
+// CHECK: ConstantExpr {{.*}} 'int'
+// CHECK: value: Int 0
+// CHECK: IntegerLiteral {{.*}}0{{$}}
 // CHECK: CXXMethodDecl {{.*}}used operator() {{.*}}
 // CHECK: SYCLIntelFPGAMaxConcurrencyAttr {{.*}}
 // CHECK: ConstantExpr {{.*}} 'int'
@@ -94,6 +115,11 @@ int main() {
 // CHECK: ConstantExpr {{.*}} 'int'
 // CHECK: value: Int 4
 // CHECK: IntegerLiteral {{.*}}4{{$}}
+// CHECK: FunctionDecl {{.*}}{{.*}} used bar0 {{.*}}
+// CHECK: SYCLIntelFPGAMaxConcurrencyAttr {{.*}}
+// CHECK: ConstantExpr {{.*}} 'int'
+// CHECK: value: Int 0
+// CHECK:IntegerLiteral {{.*}}{{.*}}0{{$}}
 // CHECK: FunctionDecl {{.*}}{{.*}}func {{.*}}
 // CHECK: SYCLIntelFPGAMaxConcurrencyAttr {{.*}}
 // CHECK: FunctionDecl {{.*}}{{.*}}used func 'void ()'