address review comments

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

Author: smanna12

clang/include/clang/Sema/Sema.h

@@ -12971,15 +12971,12 @@ void Sema::addIntelSYCLSingleArgFunctionAttr(Decl *D,
         return;
       }
     }
-    if (CI.getParsedKind() == ParsedAttr::AT_SYCLIntelMaxGlobalWorkDim ||
-        CI.getParsedKind() == ParsedAttr::AT_SYCLIntelNoGlobalWorkOffset) {
+    if (CI.getParsedKind() == ParsedAttr::AT_SYCLIntelMaxGlobalWorkDim) {
       if (ArgInt < 0) {
         Diag(E->getExprLoc(), diag::err_attribute_requires_positive_integer)
             << CI.getAttrName() << /*non-negative*/ 1;
         return;
       }
-    }
-    if (CI.getParsedKind() == ParsedAttr::AT_SYCLIntelMaxGlobalWorkDim) {
       if (ArgInt > 3) {
         Diag(E->getBeginLoc(), diag::err_attribute_argument_out_of_range)
             << CI.getAttrName() << 0 << 3 << E->getSourceRange();

clang/lib/CodeGen/CodeGenFunction.cpp

@@ -699,7 +699,7 @@ void CodeGenFunction::EmitOpenCLKernelMetadata(const FunctionDecl *FD,
     Optional<llvm::APSInt> ArgVal =
         Arg->getIntegerConstantExpr(FD->getASTContext());
     assert(ArgVal.hasValue() && "Not an integer constant expression");
-    if (ArgVal)
+    if (ArgVal->getBoolValue())
       Fn->setMetadata("no_global_work_offset", llvm::MDNode::get(Context, {}));
   }
 

clang/test/SemaSYCL/intel-fpga-no-global-work-offset.cpp

@@ -26,7 +26,7 @@ int main() {
     h.single_task<class test_kernel3>(
         []() [[intel::no_global_work_offset(42)]]{});
 
-    // expected-error@+2{{'no_global_work_offset' attribute requires a non-negative integral compile time constant expression}}
+    // CHECK: SYCLIntelNoGlobalWorkOffsetAttr{{.*}}
     h.single_task<class test_kernel4>(
         []() [[intel::no_global_work_offset(-1)]]{});
 

clang/test/SemaSYCL/sycl-device-intel-fpga-no-global-work-offset.cpp

@@ -2,14 +2,17 @@
 
 // Test that checks template parameter support for 'no_global_work_offset' attribute on sycl device.
 
-// Test that checks wrong template instantiation.
+// Test that checks wrong function template instantiation and ensures that the type
+// is checked properly when instantiating from the template definition.
 template <typename Ty>
+// expected-error@+1{{'no_global_work_offset' attribute requires an integer constant}}
 [[intel::no_global_work_offset(Ty{})]] void func() {}
 
 struct S {};
-// expected-error@+2{{template specialization requires 'template<>'}}
-// expected-error@+1{{C++ requires a type specifier for all declarations}}
-func<S>();
+void var() {
+  //expected-note@+1{{in instantiation of function template specialization 'func<S>' requested here}}
+  func<S>();
+}
 
 // Test that checks expression is not a constant expression.
 int foo();
@@ -24,14 +27,10 @@ constexpr int bar() { return 0; }
 template <int SIZE>
 class KernelFunctor {
 public:
-  // expected-error@+1{{'no_global_work_offset' attribute requires a non-negative integral compile time constant expression}}
   [[intel::no_global_work_offset(SIZE)]] void operator()() {}
 };
 
 int main() {
-  //expected-note@+1{{in instantiation of template class 'KernelFunctor<-1>' requested here}}
-  KernelFunctor<-1>();
-  // no error expected
   KernelFunctor<1>();
 }