[SYCL] Remove deprecated spelling of IntelReqdSubGroupSize attribute

Commit b2da2c8 added support for new spelling [[intel::reqd_sub_group_size()]]
and deprecated previous spelling [[cl::intel_reqd_sub_group_size()]] of the
IntelReqdSubGroupSize attribute.

This patch removes that deprecated spelling and updates several tests
of IntelReqdSubGroupSize attribute.

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

Author: smanna12

clang/include/clang/Basic/Attr.td

@@ -1299,7 +1299,6 @@ def LoopUnrollHint : InheritableAttr {
 
 def IntelReqdSubGroupSize: InheritableAttr {
   let Spellings = [GNU<"intel_reqd_sub_group_size">,
-                   CXX11<"cl", "intel_reqd_sub_group_size">,
                    CXX11<"intel", "reqd_sub_group_size">];
   let Args = [ExprArgument<"SubGroupSize">];
   let Subjects = SubjectList<[Function, CXXMethod], ErrorDiag>;

clang/include/clang/Basic/AttrDocs.td

@@ -3476,30 +3476,16 @@ code. See `cl_intel_required_subgroup_size
 for details.
 
 SYCL documentation:
-The [[cl::intel_reqd_sub_group_size(n)]] and [[intel::reqd_sub_group_size(n)]]
-attribute indicates that the kernel must be compiled and executed with a
-sub-group of size n. The value of n must be set to a sub-group size supported
-by the device, or device compilation will fail.
+The [[intel::reqd_sub_group_size(n)]] attribute indicates that the kernel must
+be compiled and executed with a sub-group of size n. The value of n must be set
+to a sub-group size supported by the device, or device compilation will fail.
 
 In addition to device functions, the required sub-group size attribute may also
 be specified in the definition of a named functor object and lambda functions,
 as in the examples below:
 
 .. code-block:: c++
 
-  class Functor
-  {
-      void operator()(item<1> item) [[cl::intel_reqd_sub_group_size(16)]]
-      {
-          /* kernel code */
-      }
-  }
-
-  kernel<class kernel_name>(
-  []() [[cl::intel_reqd_sub_group_size(n)]] {
-       /* kernel code */
-  });
-
   class Functor
   {
       [[intel::reqd_sub_group_size(16)]] void operator()(item<1> item)

clang/include/clang/Basic/DiagnosticSemaKinds.td

@@ -11063,11 +11063,6 @@ def err_ivdep_declrefexpr_arg : Error<
 def warn_ivdep_redundant : Warning <"ignoring redundant Intel FPGA loop "
   "attribute 'ivdep': safelen %select{INF|%1}0 >= safelen %select{INF|%3}2">,
   InGroup<IgnoredAttributes>;
-def warn_attribute_spelling_deprecated : Warning<
-  "attribute %0 is deprecated">,
-  InGroup<DeprecatedAttributes>;
-def note_spelling_suggestion : Note<
-  "did you mean to use %0 instead?">;
 
 // errors of expect.with.probability
 def err_probability_not_constant_float : Error<

clang/lib/Sema/SemaDeclAttr.cpp

@@ -3013,13 +3013,6 @@ static void handleSubGroupSize(Sema &S, Decl *D, const ParsedAttr &AL) {
   if (D->getAttr<IntelReqdSubGroupSizeAttr>())
     S.Diag(AL.getLoc(), diag::warn_duplicate_attribute) << AL;
 
-  if (AL.getAttributeSpellingListIndex() ==
-      IntelReqdSubGroupSizeAttr::CXX11_cl_intel_reqd_sub_group_size) {
-    S.Diag(AL.getLoc(), diag::warn_attribute_spelling_deprecated) << AL;
-    S.Diag(AL.getLoc(), diag::note_spelling_suggestion)
-        << "'intel::reqd_sub_group_size'";
-  }
-
   S.addIntelReqdSubGroupSizeAttr(D, AL, E);
 }
 

clang/test/CodeGenSYCL/reqd-sub-group-size.cpp

@@ -2,10 +2,10 @@
 
 class Functor16 {
 public:
-  [[cl::intel_reqd_sub_group_size(16)]] void operator()() const {}
+  [[intel::reqd_sub_group_size(16)]] void operator()() const {}
 };
 
-[[cl::intel_reqd_sub_group_size(8)]] void foo() {}
+[[intel::reqd_sub_group_size(8)]] void foo() {}
 
 class Functor {
 public:
@@ -17,7 +17,7 @@ class Functor {
 template <int SIZE>
 class Functor5 {
 public:
-  [[cl::intel_reqd_sub_group_size(SIZE)]] void operator()() const {}
+  [[intel::reqd_sub_group_size(SIZE)]] void operator()() const {}
 };
 
 template <typename name, typename Func>
@@ -33,7 +33,7 @@ void bar() {
   kernel<class kernel_name2>(f);
 
   kernel<class kernel_name3>(
-  []() [[cl::intel_reqd_sub_group_size(4)]] {});
+      []() [[intel::reqd_sub_group_size(4)]] {});
 
   Functor5<2> f5;
   kernel<class kernel_name4>(f5);

clang/test/CodeGenSYCL/sycl-multi-kernel-attr.cpp

@@ -2,7 +2,7 @@
 
 class Functor {
 public:
-  [[cl::intel_reqd_sub_group_size(4), cl::reqd_work_group_size(32, 16, 16)]] void operator()() const {}
+  [[intel::reqd_sub_group_size(4), cl::reqd_work_group_size(32, 16, 16)]] void operator()() const {}
 };
 
 template <typename Name, typename Func>

clang/test/SemaSYCL/reqd-sub-group-size-device.cpp

@@ -7,9 +7,7 @@
 
 class Functor16 {
 public:
-  // expected-warning@+2 {{attribute 'intel_reqd_sub_group_size' is deprecated}}
-  // expected-note@+1 {{did you mean to use 'intel::reqd_sub_group_size' instead?}}
-  [[cl::intel_reqd_sub_group_size(16)]] void operator()() const {}
+  [[intel::reqd_sub_group_size(16)]] void operator()() const {}
 };
 
 class Functor8 { // expected-error {{conflicting attributes applied to a SYCL kernel}}
@@ -55,9 +53,7 @@ void bar() {
 
   kernel<class kernel_name5>([]() [[intel::reqd_sub_group_size(2)]]{});
   kernel<class kernel_name6>([]() [[intel::reqd_sub_group_size(4)]] { foo(); });
-  // expected-warning@+2 {{attribute 'intel_reqd_sub_group_size' is deprecated}}
-  // expected-note@+1 {{did you mean to use 'intel::reqd_sub_group_size' instead?}}
-  kernel<class kernel_name7>([]() [[cl::intel_reqd_sub_group_size(6)]]{});
+  kernel<class kernel_name7>([]() [[intel::reqd_sub_group_size(6)]]{});
 
   Functor4 f4;
   kernel<class kernel_name8>(f4);

clang/test/SemaSYCL/reqd-sub-group-size-host.cpp

@@ -1,9 +1,9 @@
 // RUN: %clang_cc1 -fsycl -fsycl-is-host -fsyntax-only -verify %s
 // expected-no-diagnostics
 
-[[cl::intel_reqd_sub_group_size(8)]] void fun() {}
+[[intel::reqd_sub_group_size(8)]] void fun() {}
 
 class Functor {
 public:
-  [[cl::intel_reqd_sub_group_size(16)]] void operator()() {}
+  [[intel::reqd_sub_group_size(16)]] void operator()() {}
 };