Implementing DefaultUnsignedArgument class

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

Author: fadeeval

clang/include/clang/Basic/Attr.td

@@ -236,6 +236,10 @@ class DefaultIntArgument<string name, int default> : IntArgument<name, 1> {
   int Default = default;
 }
 
+class DefaultUnsignedArgument<string name, int default> : UnsignedArgument<name, 1> {
+  int Default = default;
+}
+
 // This argument is more complex, it includes the enumerator type name,
 // a list of strings to accept, and a list of enumerators to map them to.
 class EnumArgument<string name, string type, list<string> values,
@@ -2413,14 +2417,14 @@ def NoDeref : TypeAttr {
   let Documentation = [NoDerefDocs];
 }
 
-//Default arguments in ReqWorkGroupSize can be used only with
-//intel::reqd_work_group_size spelling.
+// Default arguments in ReqWorkGroupSize can be used only with
+// intel::reqd_work_group_size spelling.
 def ReqdWorkGroupSize : InheritableAttr {
   let Spellings = [GNU<"reqd_work_group_size">,
-                   CXX11<"cl","reqd_work_group_size">, 
-                   CXX11<"intel","reqd_work_group_size">];
-  let Args = [IntArgument<"XDim">, DefaultIntArgument<"YDim", 1>,
-              DefaultIntArgument<"ZDim", 1>];
+                   CXX11<"intel","reqd_work_group_size">, 
+                   CXX11<"cl","reqd_work_group_size">]; 
+  let Args = [UnsignedArgument<"XDim">, DefaultUnsignedArgument<"YDim", 1>,
+              DefaultUnsignedArgument<"ZDim", 1>];
   let Subjects = SubjectList<[Function], ErrorDiag>;
   let Documentation = [ReqdWorkGroupSizeAttrDocs];
 }

clang/lib/Sema/SemaDeclAttr.cpp

@@ -2922,9 +2922,7 @@ static void handleWorkGroupSize(Sema &S, Decl *D, const ParsedAttr &AL) {
     return;
 
   uint32_t WGSize[3];
-  if (AL.getAttributeSpellingListIndex() == 2) {
-    WorkGroupAttr *Ex = D->getAttr<WorkGroupAttr>
-    std::string str(Ex->getSpelling());
+  if (AL.getNormalizedFullName() == "intel::reqd_work_group_size") {
     WGSize[1] = ReqdWorkGroupSizeAttr::DefaultYDim;
     WGSize[2] = ReqdWorkGroupSizeAttr::DefaultZDim;
   } else if (!checkAttributeNumArgs(S, AL, 3))

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

@@ -6,7 +6,7 @@
 // expected-no-diagnostics
 class Functor {
 public:
-  [[intel::reqd_work_group_size(4)]] [[intel::reqd_work_group_size(4)]] void operator()() {}
+  [[intel::reqd_work_group_size(4)]] void operator()() {}
 };
 
 template <typename name, typename Func>

clang/utils/TableGen/ClangAttrEmitter.cpp

@@ -1304,6 +1304,9 @@ createArgument(const Record &Arg, StringRef Attr,
   else if (ArgName == "DefaultIntArgument")
     Ptr = std::make_unique<DefaultSimpleArgument>(
         Arg, Attr, "int", Arg.getValueAsInt("Default"));
+  else if (ArgName == "DefaultUnsignedArgument")
+    Ptr = std::make_unique<DefaultSimpleArgument>(
+        Arg, Attr, "unsigned", Arg.getValueAsInt("Default"));
   else if (ArgName == "IntArgument")
     Ptr = std::make_unique<SimpleArgument>(Arg, Attr, "int");
   else if (ArgName == "StringArgument")