fix warning group

Author: ro-i

clang/include/clang/Basic/DiagnosticCommonKinds.td

@@ -433,8 +433,12 @@ def err_omp_more_one_clause : Error<
   "directive '#pragma omp %0' cannot contain more than one '%1' clause%select{| with '%3' name modifier| with 'source' dependence}2">;
 def err_omp_required_clause : Error<
   "directive '#pragma omp %0' requires the '%1' clause">;
-def warn_omp_gpu_unsupported_clause: Warning<"clause '%0' is currently not supported on a GPU">;
-def warn_omp_gpu_unsupported_modifier_for_clause: Warning<"modifier '%0' is currently not supported on a GPU for the '%1' clause">;
+def warn_omp_gpu_unsupported_clause: Warning<
+  "clause '%0' is currently not supported on a GPU; clause ignored">,
+  InGroup<OpenMPClauses>;
+def warn_omp_gpu_unsupported_modifier_for_clause: Warning<
+  "modifier '%0' is currently not supported on a GPU for the '%1' clause; modifier ignored">,
+  InGroup<OpenMPClauses>;
 
 // Static Analyzer Core
 def err_unknown_analyzer_checker_or_package : Error<

clang/test/OpenMP/amdgcn_parallel_num_threads_strict_messages.cpp

@@ -15,15 +15,15 @@ tx ftemplate(int n) {
   tx a = 0;
 
 #ifdef TARGET
-  // expected-warning@+2 {{modifier 'strict' is currently not supported on a GPU for the 'num_threads' clause}}
+  // expected-warning@+2 {{modifier 'strict' is currently not supported on a GPU for the 'num_threads' clause; modifier ignored}}
 #endif
   #pragma omp parallel num_threads(strict: tx(20)) severity(fatal) message("msg")
   {
   }
 
   short b = 1;
 #ifdef TARGET
-  // expected-warning@+2 {{modifier 'strict' is currently not supported on a GPU for the 'num_threads' clause}}
+  // expected-warning@+2 {{modifier 'strict' is currently not supported on a GPU for the 'num_threads' clause; modifier ignored}}
 #endif
   #pragma omp parallel num_threads(strict: b) severity(warning) message("msg")
   {
@@ -39,14 +39,14 @@ static
 int fstatic(int n) {
 
 #ifdef TARGET
-  // expected-warning@+2 {{modifier 'strict' is currently not supported on a GPU for the 'num_threads' clause}}
+  // expected-warning@+2 {{modifier 'strict' is currently not supported on a GPU for the 'num_threads' clause; modifier ignored}}
 #endif
   #pragma omp target parallel num_threads(strict: n) message("msg")
   {
   }
 
 #ifdef TARGET
-  // expected-warning@+2 {{modifier 'strict' is currently not supported on a GPU for the 'num_threads' clause}}
+  // expected-warning@+2 {{modifier 'strict' is currently not supported on a GPU for the 'num_threads' clause; modifier ignored}}
 #endif
   #pragma omp target parallel num_threads(strict: 32+n) severity(warning)
   {
@@ -64,15 +64,15 @@ struct S1 {
     int b = 1;
 
 #ifdef TARGET
-    // expected-warning@+2 {{modifier 'strict' is currently not supported on a GPU for the 'num_threads' clause}}
+    // expected-warning@+2 {{modifier 'strict' is currently not supported on a GPU for the 'num_threads' clause; modifier ignored}}
 #endif
     #pragma omp parallel num_threads(strict: n-b) severity(warning) message("msg")
     {
       this->a = (double)b + 1.5;
     }
 
 #ifdef TARGET
-    // expected-warning@+2 {{modifier 'strict' is currently not supported on a GPU for the 'num_threads' clause}}
+    // expected-warning@+2 {{modifier 'strict' is currently not supported on a GPU for the 'num_threads' clause; modifier ignored}}
 #endif
     #pragma omp parallel num_threads(strict: 1024) severity(fatal)
     {

clang/test/OpenMP/nvptx_parallel_num_threads_strict_messages.cpp

@@ -15,15 +15,15 @@ tx ftemplate(int n) {
   tx a = 0;
 
 #ifdef TARGET
-  // expected-warning@+2 {{modifier 'strict' is currently not supported on a GPU for the 'num_threads' clause}}
+  // expected-warning@+2 {{modifier 'strict' is currently not supported on a GPU for the 'num_threads' clause; modifier ignored}}
 #endif
   #pragma omp parallel num_threads(strict: tx(20)) severity(fatal) message("msg")
   {
   }
 
   short b = 1;
 #ifdef TARGET
-  // expected-warning@+2 {{modifier 'strict' is currently not supported on a GPU for the 'num_threads' clause}}
+  // expected-warning@+2 {{modifier 'strict' is currently not supported on a GPU for the 'num_threads' clause; modifier ignored}}
 #endif
   #pragma omp parallel num_threads(strict: b) severity(warning) message("msg")
   {
@@ -39,14 +39,14 @@ static
 int fstatic(int n) {
 
 #ifdef TARGET
-  // expected-warning@+2 {{modifier 'strict' is currently not supported on a GPU for the 'num_threads' clause}}
+  // expected-warning@+2 {{modifier 'strict' is currently not supported on a GPU for the 'num_threads' clause; modifier ignored}}
 #endif
   #pragma omp target parallel num_threads(strict: n) message("msg")
   {
   }
 
 #ifdef TARGET
-  // expected-warning@+2 {{modifier 'strict' is currently not supported on a GPU for the 'num_threads' clause}}
+  // expected-warning@+2 {{modifier 'strict' is currently not supported on a GPU for the 'num_threads' clause; modifier ignored}}
 #endif
   #pragma omp target parallel num_threads(strict: 32+n) severity(warning)
   {
@@ -64,15 +64,15 @@ struct S1 {
     int b = 1;
 
 #ifdef TARGET
-    // expected-warning@+2 {{modifier 'strict' is currently not supported on a GPU for the 'num_threads' clause}}
+    // expected-warning@+2 {{modifier 'strict' is currently not supported on a GPU for the 'num_threads' clause; modifier ignored}}
 #endif
     #pragma omp parallel num_threads(strict: n-b) severity(warning) message("msg")
     {
       this->a = (double)b + 1.5;
     }
 
 #ifdef TARGET
-    // expected-warning@+2 {{modifier 'strict' is currently not supported on a GPU for the 'num_threads' clause}}
+    // expected-warning@+2 {{modifier 'strict' is currently not supported on a GPU for the 'num_threads' clause; modifier ignored}}
 #endif
     #pragma omp parallel num_threads(strict: 1024) severity(fatal)
     {