[OpenMP] Add directive spellings introduced in OpenMP 6.0 (llvm#141772)

For background information see

https://discourse.llvm.org/t/rfc-alternative-spellings-of-openmp-directives/85507

Author: kparzysz

clang/test/OpenMP/declare_mapper_messages.c

@@ -1,12 +1,12 @@
-// RUN: %clang_cc1 -verify=omp50,expected -fopenmp -fopenmp-version=50 -ferror-limit 100 -DOMP50 %s
-// RUN: %clang_cc1 -verify=omp51,expected -fopenmp -ferror-limit 100 %s
-// RUN: %clang_cc1 -verify=expected,omp52 -fopenmp -fopenmp-version=52 -ferror-limit 100 -DOMP52 %s
-// RUN: %clang_cc1 -verify=expected,omp60 -fopenmp -fopenmp-version=60 -ferror-limit 100 -DOMP60 %s
+// RUN: %clang_cc1 -verify=omp50,omp5x,expected -fopenmp -fopenmp-version=50 -ferror-limit 100 -DOMP50 %s
+// RUN: %clang_cc1 -verify=omp51,omp5x,expected -fopenmp -ferror-limit 100 %s
+// RUN: %clang_cc1 -verify=expected,omp52,omp5x -fopenmp -fopenmp-version=52 -ferror-limit 100 -DOMP52 %s
+// RUN: %clang_cc1 -verify=expected,omp60,omp60-maybe-simd -fopenmp -fopenmp-version=60 -ferror-limit 100 -DOMP60 %s
 
-// RUN: %clang_cc1 -verify=omp50,expected -fopenmp-simd -fopenmp-version=50 -ferror-limit 100 -DOMP50 %s
-// RUN: %clang_cc1 -verify=omp51-simd,expected -fopenmp-simd -ferror-limit 100 %s
-// RUN: %clang_cc1 -verify=expected,omp52 -fopenmp-simd -fopenmp-version=52 -ferror-limit 100 -DOMP52 %s
-// RUN: %clang_cc1 -verify=expected,omp60-simd -fopenmp-simd -fopenmp-version=60 -ferror-limit 100 -DOMP60 %s
+// RUN: %clang_cc1 -verify=omp50,omp5x,expected -fopenmp-simd -fopenmp-version=50 -ferror-limit 100 -DOMP50 %s
+// RUN: %clang_cc1 -verify=omp51-simd,omp5x,expected -fopenmp-simd -ferror-limit 100 %s
+// RUN: %clang_cc1 -verify=expected,omp52,omp5x -fopenmp-simd -fopenmp-version=52 -ferror-limit 100 -DOMP52 %s
+// RUN: %clang_cc1 -verify=expected,omp60-simd,omp60-maybe-simd -fopenmp-simd -fopenmp-version=60 -ferror-limit 100 -DOMP60 %s
 
 int temp; // expected-note {{'temp' declared here}}
 
@@ -16,17 +16,38 @@ struct vec {                                                            // expec
   double *data;
 };
 
-#pragma omp declare mapper                                              // expected-error {{expected '(' after 'declare mapper'}}
-#pragma omp declare mapper {                                            // expected-error {{expected '(' after 'declare mapper'}}
-#pragma omp declare mapper(                                             // expected-error {{expected a type}} expected-error {{expected declarator on 'omp declare mapper' directive}}
-#pragma omp declare mapper(#                                            // expected-error {{expected a type}} expected-error {{expected declarator on 'omp declare mapper' directive}}
-#pragma omp declare mapper(struct v                                     // expected-error {{expected declarator on 'omp declare mapper' directive}}
-#pragma omp declare mapper(struct vec                                   // expected-error {{expected declarator on 'omp declare mapper' directive}}
-#pragma omp declare mapper(S v                                          // expected-error {{unknown type name 'S'}}
-#pragma omp declare mapper(struct vec v                                 // expected-error {{expected ')'}} expected-note {{to match this '('}}
-#pragma omp declare mapper(aa:struct vec v)                             // expected-error {{expected at least one clause on '#pragma omp declare mapper' directive}}
-#pragma omp declare mapper(bb:struct vec v) private(v)                  // expected-error {{expected at least one clause on '#pragma omp declare mapper' directive}} // expected-error {{unexpected OpenMP clause 'private' in directive '#pragma omp declare mapper'}}
-#pragma omp declare mapper(cc:struct vec v) map(v) (                    // expected-warning {{extra tokens at the end of '#pragma omp declare mapper' are ignored}}
+// omp60-maybe-simd-error@+2 {{expected '(' after 'declare_mapper'}}
+// omp5x-error@+1 {{expected '(' after 'declare mapper'}}
+#pragma omp declare mapper
+// omp60-maybe-simd-error@+2 {{expected '(' after 'declare_mapper'}}
+// omp5x-error@+1 {{expected '(' after 'declare mapper'}}
+#pragma omp declare mapper {
+// expected-error@+2 {{expected a type}}
+// expected-error@+1 {{expected declarator on 'omp declare mapper' directive}}
+#pragma omp declare mapper(
+// expected-error@+2 {{expected a type}}
+// expected-error@+1 {{expected declarator on 'omp declare mapper' directive}}
+#pragma omp declare mapper(#
+// expected-error@+1 {{expected declarator on 'omp declare mapper' directive}}
+#pragma omp declare mapper(struct v
+// expected-error@+1 {{expected declarator on 'omp declare mapper' directive}}
+#pragma omp declare mapper(struct vec
+// expected-error@+1 {{unknown type name 'S'}}
+#pragma omp declare mapper(S v
+// expected-error@+2 {{expected ')'}}
+// expected-note@+1 {{to match this '('}}
+#pragma omp declare mapper(struct vec v
+// omp60-maybe-simd-error@+2 {{expected at least one clause on '#pragma omp declare_mapper' directive}}
+// omp5x-error@+1 {{expected at least one clause on '#pragma omp declare mapper' directive}}
+#pragma omp declare mapper(aa:struct vec v)
+// omp60-maybe-simd-error@+4 {{expected at least one clause on '#pragma omp declare_mapper' directive}}
+// omp60-maybe-simd-error@+3 {{unexpected OpenMP clause 'private' in directive '#pragma omp declare_mapper'}}
+// omp5x-error@+2 {{expected at least one clause on '#pragma omp declare mapper' directive}}
+// omp5x-error@+1 {{unexpected OpenMP clause 'private' in directive '#pragma omp declare mapper'}}
+#pragma omp declare mapper(bb:struct vec v) private(v)
+// omp60-maybe-simd-warning@+2 {{extra tokens at the end of '#pragma omp declare_mapper' are ignored}}
+// omp5x-warning@+1 {{extra tokens at the end of '#pragma omp declare mapper' are ignored}}
+#pragma omp declare mapper(cc:struct vec v) map(v) (
 
 #pragma omp declare mapper(++: struct vec v) map(v.len)                 // expected-error {{illegal OpenMP user-defined mapper identifier}}
 #pragma omp declare mapper(id1: struct vec v) map(v.len, temp)          // expected-error {{only variable 'v' is allowed in map clauses of this 'omp declare mapper' directive}}
@@ -58,7 +79,9 @@ int fun(int arg) {
 #pragma omp declare mapper(id: struct vec v) map(v.len)                 // expected-note {{previous definition is here}}
 #pragma omp declare mapper(id: struct vec v) map(v.len)                 // expected-error {{redefinition of user-defined mapper for type 'struct vec' with name 'id'}}
     {
-#pragma omp declare mapper(id: struct vec v) map(v.len) allocate(v)   // expected-error {{unexpected OpenMP clause 'allocate' in directive '#pragma omp declare mapper'}}
+// omp60-maybe-simd-error@+2 {{unexpected OpenMP clause 'allocate' in directive '#pragma omp declare_mapper'}}
+// omp5x-error@+1 {{unexpected OpenMP clause 'allocate' in directive '#pragma omp declare mapper'}}
+#pragma omp declare mapper(id: struct vec v) map(v.len) allocate(v)
       struct vec vv, v1;
       struct vec arr[10];
       double d;