Fix testcase

Author: kparzysz

clang/test/OpenMP/declare_target_messages.cpp

@@ -11,50 +11,58 @@
 
 // RUN: %clang_cc1 %{common_opts_mac} -verify=expected,omp45,omp45-to-51,omp45-to-51-var,omp45-to-51-clause,omp45-to-51-clause  %{openmp45} %{limit} -o - %s
 // RUN: %clang_cc1 %{common_opts_mac} -verify=expected,omp5,ompvar,omp45-to-51,omp5-and-51,omp5-or-later,omp5-or-later-var,omp45-to-51-var,omp45-to-51-clause,host5,host-5-and-51,no-host5-and-51  %{openmp50} %{target_mac} %{limit} -o - %s
-// RUN: %clang_cc1 %{common_opts_mac} -verify=expected,omp52,ompvar,omp5-or-later,omp5-or-later-var  %{openmp60} %{target_mac} %{limit} -o - %s
+// RUN: %clang_cc1 %{common_opts_mac} -verify=expected,omp60,omp52-or-later,ompvar,omp5-or-later,omp5-or-later-var  %{openmp60} %{target_mac} %{limit} -o - %s
 // RUN: %clang_cc1 %{common_opts_mac} -verify=expected,omp5,ompvar,omp45-to-51,omp5-and-51,omp5-or-later,omp5-or-later-var,omp45-to-51-var,omp45-to-51-clause,host-5-and-51,no-host5-and-51,dev5  %{openmp50} -fopenmp-is-target-device %{target_mac} %{aux_triple} %{limit} -o - %s
-// RUN: %clang_cc1 %{common_opts_mac} -verify=expected,omp52,ompvar,omp5-or-later,omp5-or-later-var %{openmp60} -fopenmp-is-target-device %{target_mac} %{aux_triple} %{limit} -o - %s
+// RUN: %clang_cc1 %{common_opts_mac} -verify=expected,omp60,omp52-or-later,ompvar,omp5-or-later,omp5-or-later-var %{openmp60} -fopenmp-is-target-device %{target_mac} %{aux_triple} %{limit} -o - %s
 
 // RUN: %clang_cc1 %{common_opts_mac} -verify=expected,omp5,ompvar,omp45-to-51,omp5-and-51,omp5-or-later,omp5-or-later-var,omp45-to-51-var,omp45-to-51-clause,host5,host-5-and-51,no-host5-and-51 %{openmp50_simd} %{target_mac} %{limit} -o - %s
-// RUN: %clang_cc1 %{common_opts_mac} -verify=expected,omp52,ompvar,omp5-or-later,omp5-or-later-var %{openmp60_simd} %{target_mac} %{limit} -o - %s
+// RUN: %clang_cc1 %{common_opts_mac} -verify=expected,omp60,omp52-or-later,ompvar,omp5-or-later,omp5-or-later-var %{openmp60_simd} %{target_mac} %{limit} -o - %s
 // RUN: %clang_cc1 %{common_opts_mac} -verify=expected,omp5,ompvar,omp45-to-51,omp5-and-51,omp5-or-later,omp5-or-later-var,omp45-to-51-var,omp45-to-51-clause,host5,host-5-and-51,no-host5-and-51 %{openmp50_simd} -fopenmp-is-target-device %{target_mac} %{limit} -o - %s
-// RUN: %clang_cc1 %{common_opts_mac} -verify=expected,omp52,ompvar,omp5-or-later,omp5-or-later-var %{openmp60_simd} -fopenmp-is-target-device %{target_mac} %{limit} -o - %s
+// RUN: %clang_cc1 %{common_opts_mac} -verify=expected,omp60,omp52-or-later,ompvar,omp5-or-later,omp5-or-later-var %{openmp60_simd} -fopenmp-is-target-device %{target_mac} %{limit} -o - %s
 
 // RUN: %clang_cc1 %{common_opts_mac} -verify=expected,omp45,omp45-to-51,omp45-to-51-var,omp45-to-51-clause -fopenmp-version=45 -fopenmp-simd %{limit} -o - %s
 // RUN: %clang_cc1 %{common_opts_mac} -verify=expected,omp51,ompvar,omp45-to-51,omp5-and-51,omp5-or-later,omp5-or-later-var,omp45-to-51-var,omp45-to-51-clause,host-5-and-51,no-host5-and-51 -fopenmp %{limit} -o - %s
 // RUN: %clang_cc1 %{common_opts_mac} -verify=expected,omp51,ompvar,omp45-to-51,omp5-and-51,omp5-or-later,omp5-or-later-var,omp45-to-51-var,omp45-to-51-clause,host-5-and-51,no-host5-and-51 -fopenmp %{limit} -DTESTEND=1 -o - %s
 // RUN: %clang_cc1 %{common_opts_mac} -verify=expected,omp51,ompvar,omp45-to-51,omp5-and-51,omp5-or-later,omp5-or-later-var,omp45-to-51-var,omp45-to-51-clause,host-5-and-51,no-host5-and-51 -fopenmp %{limit} -I%S/Inputs -DTESTENDINC=1 -o - %s
 // RUN: %clang_cc1 %{common_opts_mac} -verify=expected,omp51,ompvar,omp45-to-51,omp5-and-51,omp5-or-later,omp5-or-later-var,omp45-to-51-var,omp45-to-51-clause,host-5-and-51,no-host5-and-51 -fopenmp-simd %{limit} -o - %s
 
-// RUN: %clang_cc1 %{common_opts_mac} -verify=expected,omp52,ompvar,omp5-or-later,omp5-or-later-var %{openmp52} -DVERBOSE_MODE=1 %{limit} -o - %s
-// RUN: %clang_cc1 %{common_opts_mac} -verify=expected,omp52,ompvar,omp5-or-later,omp5-or-later-var %{openmp60} -DVERBOSE_MODE=1 %{limit} -o - %s
+// RUN: %clang_cc1 %{common_opts_mac} -verify=expected,omp52,omp52-or-later,ompvar,omp5-or-later,omp5-or-later-var %{openmp52} -DVERBOSE_MODE=1 %{limit} -o - %s
+// RUN: %clang_cc1 %{common_opts_mac} -verify=expected,omp60,omp52-or-later,ompvar,omp5-or-later,omp5-or-later-var %{openmp60} -DVERBOSE_MODE=1 %{limit} -o - %s
 
 // RUN: %clang_cc1 %{common_opts_mac} -verify=expected,omp5,ompvar,omp45-to-51,omp5-and-51,omp5-or-later,omp5-or-later-var,omp45-to-51-var,omp45-to-51-clause,host-5-and-51,no-host5-and-51 %{openmp50} %{limit} -o - %s
 // RUN: %clang_cc1 %{common_opts_mac} -verify=expected,omp51,ompvar,omp45-to-51,omp5-and-51,omp5-or-later,omp5-or-later-var,omp45-to-51-var,omp45-to-51-clause,host-5-and-51,no-host5-and-51 -fopenmp %{limit} -o - %s
-// RUN: %clang_cc1 %{common_opts_mac} -verify=expected,omp52,ompvar,omp5-or-later,omp5-or-later-var %{openmp60} %{limit} -o - %s
+// RUN: %clang_cc1 %{common_opts_mac} -verify=expected,omp60,omp52-or-later,ompvar,omp5-or-later,omp5-or-later-var %{openmp60} %{limit} -o - %s
 
 #pragma omp begin declare target
 static int gg;
 // expected-warning@+1 {{variable 'recursive' is uninitialized when used within its own initialization}}
 int recursive = recursive ^ 3 + gg;
 #pragma omp end declare target
 
-// expected-error@+1 {{unexpected OpenMP directive '#pragma omp end declare target'}}
+// omp60-error@+3 {{unexpected OpenMP directive '#pragma omp end declare_target'}}
+// omp52-error@+2 {{unexpected OpenMP directive '#pragma omp end declare target'}}
+// omp45-to-51-error@+1 {{unexpected OpenMP directive '#pragma omp end declare target'}}
 #pragma omp end declare target 
 
 // ompvar-error@+1 {{variable captured in declare target region must appear in a to clause}}
 int a, b, z;
 // expected-note@+1 {{defined as threadprivate or thread local}}
 __thread int t;
 
-// expected-error@+1 {{expected '(' after 'declare target'}}
+// omp60-error@+3 {{expected '(' after 'declare_target'}}
+// omp52-error@+2 {{expected '(' after 'declare target'}}
+// omp45-to-51-error@+1 {{expected '(' after 'declare target'}}
 #pragma omp declare target . 
 
 #pragma omp declare target
 void f();
-// expected-warning@+1 {{extra tokens at the end of '#pragma omp end declare target' are ignored}}
+// omp60-warning@+3 {{extra tokens at the end of '#pragma omp end declare_target' are ignored}}
+// omp52-warning@+2 {{extra tokens at the end of '#pragma omp end declare target' are ignored}}
+// omp45-to-51-warning@+1 {{extra tokens at the end of '#pragma omp end declare target' are ignored}}
 #pragma omp end declare target shared(a) 
 
+// omp60-error@+10 {{unexpected 'map' clause, only 'enter', 'link', 'device_type' or 'indirect' clauses expected}}
+// omp60-error@+9 {{expected at least one 'enter', 'link' or 'indirect' clause}}
 // omp52-error@+8 {{unexpected 'map' clause, only 'enter', 'link', 'device_type' or 'indirect' clauses expected}}
 // omp52-error@+7 {{expected at least one 'enter', 'link' or 'indirect' clause}}
 // omp51-error@+6 {{unexpected 'map' clause, only 'to', 'link', 'device_type' or 'indirect' clauses expected}} 
@@ -65,6 +73,8 @@ void f();
 // omp45-error@+1 {{expected at least one 'to' or 'link' clause}} 
 #pragma omp declare target map(a)
 
+// omp60-error@+5 {{unexpected 'to' clause, use 'enter' instead}}
+// omp60-error@+4 {{expected at least one 'enter', 'link' or 'indirect' clause}}
 // omp52-error@+3 {{unexpected 'to' clause, use 'enter' instead}}
 // omp52-error@+2 {{expected at least one 'enter', 'link' or 'indirect' clause}}
 // omp45-to-51-error@+1 {{use of undeclared identifier 'foo1'}}
@@ -73,15 +83,17 @@ void f();
 // expected-error@+1 {{use of undeclared identifier 'foo2'}}
 #pragma omp declare target link(foo2) 
 
+// omp60-error@+6 {{unexpected 'to' clause, use 'enter' instead}}
+// omp60-error@+5 {{expected at least one 'enter', 'link' or 'indirect' clause}}
 // omp52-error@+4 {{unexpected 'to' clause, use 'enter' instead}}
 // omp52-error@+3 {{expected at least one 'enter', 'link' or 'indirect' clause}}
 // dev5-note@+2 {{marked as 'device_type(host)' here}}
 // omp45-error@+1 {{unexpected 'device_type' clause, only 'to' or 'link' clauses expected}}
 #pragma omp declare target to(f) device_type(host)
 
 void q();
-// omp52-error@+4 {{unexpected 'to' clause, use 'enter' instead}}
-// omp52-error@+3 {{expected at least one 'enter', 'link' or 'indirect' clause}}
+// omp52-or-later-error@+4 {{unexpected 'to' clause, use 'enter' instead}}
+// omp52-or-later-error@+3 {{expected at least one 'enter', 'link' or 'indirect' clause}}
 // omp5-and-51-warning@+2 {{more than one 'device_type' clause is specified}}
 // omp45-error@+1 {{unexpected 'device_type' clause, only 'to' or 'link' clauses expected}}
 #pragma omp declare target to(q) device_type(any) device_type(any) device_type(host) 
@@ -121,7 +133,7 @@ void c();
 // expected-note@+1 {{'func' defined here}}
 void func() {} 
 
-// omp52-error@+5 {{unexpected 'allocate' clause, only 'enter', 'link', 'device_type' or 'indirect' clauses expected}}
+// omp52-or-later-error@+5 {{unexpected 'allocate' clause, only 'enter', 'link', 'device_type' or 'indirect' clauses expected}}
 // omp51-error@+4 {{unexpected 'allocate' clause, only 'to', 'link', 'device_type' or 'indirect' clauses expected}}
 // omp5-error@+3 {{unexpected 'allocate' clause, only 'to', 'link' or 'device_type' clauses expected}}
 // expected-error@+2 {{function name is not allowed in 'link' clause}}
@@ -171,7 +183,9 @@ void t2() {
   void abc();
 #pragma omp end declare target
 void cba();
-// expected-error@+1 {{unexpected OpenMP directive '#pragma omp end declare target'}}
+// omp60-error@+3 {{unexpected OpenMP directive '#pragma omp end declare_target'}}
+// omp52-error@+2 {{unexpected OpenMP directive '#pragma omp end declare target'}}
+// omp45-to-51-error@+1 {{unexpected OpenMP directive '#pragma omp end declare target'}}
 #pragma omp end declare target 
 
 #pragma omp declare target
@@ -234,7 +248,9 @@ void foo1() {
 
 #pragma omp end declare target
 #pragma omp end declare target
-// expected-error@+1 {{unexpected OpenMP directive '#pragma omp end declare target'}}
+// omp60-error@+3 {{unexpected OpenMP directive '#pragma omp end declare_target'}}
+// omp52-error@+2 {{unexpected OpenMP directive '#pragma omp end declare target'}}
+// omp45-to-51-error@+1 {{unexpected OpenMP directive '#pragma omp end declare target'}}
 #pragma omp end declare target 
 
 int C::method() {
@@ -255,18 +271,22 @@ int *y;
 int **w = &y;
 int main (int argc, char **argv) {
   int a = 2;
-// expected-error@+1 {{unexpected OpenMP directive '#pragma omp declare target'}}
+// omp60-error@+3 {{unexpected OpenMP directive '#pragma omp declare_target'}}
+// omp52-error@+2 {{unexpected OpenMP directive '#pragma omp declare target'}}
+// omp45-to-51-error@+1 {{unexpected OpenMP directive '#pragma omp declare target'}}
 #pragma omp declare target 
   int v;
-// expected-error@+1 {{unexpected OpenMP directive '#pragma omp end declare target'}}
+// omp60-error@+3 {{unexpected OpenMP directive '#pragma omp end declare_target'}}
+// omp52-error@+2 {{unexpected OpenMP directive '#pragma omp end declare target'}}
+// omp45-to-51-error@+1 {{unexpected OpenMP directive '#pragma omp end declare target'}}
 #pragma omp end declare target 
   foo(v);
 
-  // omp52-error@+2 {{expected at least one 'enter', 'link' or 'indirect' clause}}
-  // omp52-error@+1 {{unexpected 'to' clause, use 'enter' instead}}
+  // omp52-or-later-error@+2 {{expected at least one 'enter', 'link' or 'indirect' clause}}
+  // omp52-or-later-error@+1 {{unexpected 'to' clause, use 'enter' instead}}
 #pragma omp declare target to(foo3) link(w)
-  // omp52-error@+3 {{unexpected 'to' clause, use 'enter' instead}}
-  // omp52-error@+2 {{expected at least one 'enter', 'link' or 'indirect' clause}}
+  // omp52-or-later-error@+3 {{unexpected 'to' clause, use 'enter' instead}}
+  // omp52-or-later-error@+2 {{expected at least one 'enter', 'link' or 'indirect' clause}}
   // omp45-to-51-var-error@+1 {{local variable 'a' should not be used in 'declare target' directive}}
 #pragma omp declare target to(a) 
   return (0);
@@ -283,48 +303,48 @@ namespace {
 
 // expected-error@+1 {{'x' appears multiple times in clauses on the same declare target directive}}
 #pragma omp declare target (x, x) 
-// omp52-error@+3 {{unexpected 'to' clause, use 'enter' instead}}
-// omp52-error@+2 {{expected at least one 'enter', 'link' or 'indirect' clause}}
+// omp52-or-later-error@+3 {{unexpected 'to' clause, use 'enter' instead}}
+// omp52-or-later-error@+2 {{expected at least one 'enter', 'link' or 'indirect' clause}}
 // omp45-to-51-clause-error@+1 {{'x' appears multiple times in clauses on the same declare target directive}}
 #pragma omp declare target to(x) to(x)
 // expected-error@+1 {{'x' must not appear in both clauses 'to' and 'link'}}
 #pragma omp declare target link(x) 
 
 void bazz() {}
-// omp52-error@+4 {{unexpected 'to' clause, use 'enter' instead}}
-// omp52-error@+3 {{expected at least one 'enter', 'link' or 'indirect' clause}}
+// omp52-or-later-error@+4 {{unexpected 'to' clause, use 'enter' instead}}
+// omp52-or-later-error@+3 {{expected at least one 'enter', 'link' or 'indirect' clause}}
 // host5-note@+2 3 {{marked as 'device_type(nohost)' here}}
 // omp45-error@+1 {{unexpected 'device_type' clause, only 'to' or 'link' clauses expected}} 
 #pragma omp declare target to(bazz) device_type(nohost)
 void bazzz() {bazz();}
-// omp52-error@+3 {{unexpected 'to' clause, use 'enter' instead}}
-// omp52-error@+2 {{expected at least one 'enter', 'link' or 'indirect' clause}}
+// omp52-or-later-error@+3 {{unexpected 'to' clause, use 'enter' instead}}
+// omp52-or-later-error@+2 {{expected at least one 'enter', 'link' or 'indirect' clause}}
 // omp45-error@+1 {{unexpected 'device_type' clause, only 'to' or 'link' clauses expected}}
 #pragma omp declare target to(bazzz) device_type(nohost) 
 // host5-error@+1 {{function with 'device_type(nohost)' is not available on host}}
 void any() {bazz();} 
 // host5-error@+1 {{function with 'device_type(nohost)' is not available on host}}
 void host1() {bazz();}
-// omp52-error@+4 {{unexpected 'to' clause, use 'enter' instead}}
-// omp52-error@+3 {{expected at least one 'enter', 'link' or 'indirect' clause}}
+// omp52-or-later-error@+4 {{unexpected 'to' clause, use 'enter' instead}}
+// omp52-or-later-error@+3 {{expected at least one 'enter', 'link' or 'indirect' clause}}
 // dev5-note@+2 3 {{marked as 'device_type(host)' here}}
 // omp45-error@+1 {{unexpected 'device_type' clause, only 'to' or 'link' clauses expected}}
 #pragma omp declare target to(host1) device_type(host)
 //host5-error@+1 {{function with 'device_type(nohost)' is not available on host}}
 void host2() {bazz();}
-// omp52-error@+2 {{unexpected 'to' clause, use 'enter' instead}}
-// omp52-error@+1 {{expected at least one 'enter', 'link' or 'indirect' clause}}
+// omp52-or-later-error@+2 {{unexpected 'to' clause, use 'enter' instead}}
+// omp52-or-later-error@+1 {{expected at least one 'enter', 'link' or 'indirect' clause}}
 #pragma omp declare target to(host2) 
 // dev5-error@+1 {{function with 'device_type(host)' is not available on device}}
 void device() {host1();}
-// omp52-error@+4 {{unexpected 'to' clause, use 'enter' instead}}
-// omp52-error@+3 {{expected at least one 'enter', 'link' or 'indirect' clause}}
+// omp52-or-later-error@+4 {{unexpected 'to' clause, use 'enter' instead}}
+// omp52-or-later-error@+3 {{expected at least one 'enter', 'link' or 'indirect' clause}}
 // host5-note@+2 2 {{marked as 'device_type(nohost)' here}} 
 // omp45-error@+1 {{unexpected 'device_type' clause, only 'to' or 'link' clauses expected}}
 #pragma omp declare target to(device) device_type(nohost)
 void host3() {host1();} // dev5-error {{function with 'device_type(host)' is not available on device}}
-// omp52-error@+2 {{unexpected 'to' clause, use 'enter' instead}}
-// omp52-error@+1 {{expected at least one 'enter', 'link' or 'indirect' clause}}
+// omp52-or-later-error@+2 {{unexpected 'to' clause, use 'enter' instead}}
+// omp52-or-later-error@+1 {{expected at least one 'enter', 'link' or 'indirect' clause}}
 #pragma omp declare target to(host3)
 
 #pragma omp declare target
@@ -343,17 +363,17 @@ void any7() {device();}
 void any8() {any2();}
 
 int MultiDevTy;
-// omp52-error@+3 {{unexpected 'to' clause, use 'enter' instead}}
-// omp52-error@+2 {{expected at least one 'enter', 'link' or 'indirect' clause}}
+// omp52-or-later-error@+3 {{unexpected 'to' clause, use 'enter' instead}}
+// omp52-or-later-error@+2 {{expected at least one 'enter', 'link' or 'indirect' clause}}
 // omp45-error@+1 {{unexpected 'device_type' clause, only 'to' or 'link' clauses expected}}
 #pragma omp declare target to(MultiDevTy) device_type(any)
-// omp52-error@+4 {{unexpected 'to' clause, use 'enter' instead}}
-// omp52-error@+3 {{expected at least one 'enter', 'link' or 'indirect' clause}}
+// omp52-or-later-error@+4 {{unexpected 'to' clause, use 'enter' instead}}
+// omp52-or-later-error@+3 {{expected at least one 'enter', 'link' or 'indirect' clause}}
 // host-5-and-51-error@+2 {{'device_type(host)' does not match previously specified 'device_type(any)' for the same declaration}}
 // omp45-error@+1 {{unexpected 'device_type' clause, only 'to' or 'link' clauses expected}}
 #pragma omp declare target to(MultiDevTy) device_type(host)
-// omp52-error@+4 {{unexpected 'to' clause, use 'enter' instead}}
-// omp52-error@+3 {{expected at least one 'enter', 'link' or 'indirect' clause}}
+// omp52-or-later-error@+4 {{unexpected 'to' clause, use 'enter' instead}}
+// omp52-or-later-error@+3 {{expected at least one 'enter', 'link' or 'indirect' clause}}
 // no-host5-and-51-error@+2 {{'device_type(nohost)' does not match previously specified 'device_type(any)' for the same declaration}}
 // omp45-error@+1 {{unexpected 'device_type' clause, only 'to' or 'link' clauses expected}}
 #pragma omp declare target to(MultiDevTy) device_type(nohost)
@@ -414,6 +434,8 @@ target *S1 = &S;
 // expected-warning@+1 {{expected '#pragma omp end declare target' at end of file to match '#pragma omp declare target'}}
 #pragma omp declare target
 #else
-// expected-warning@+1 {{expected '#pragma omp end declare target' at end of file to match '#pragma omp begin declare target'}}
+// omp60-warning@+3 {{expected '#pragma omp end declare target' at end of file to match '#pragma omp begin declare_target'}}
+// omp52-warning@+2 {{expected '#pragma omp end declare target' at end of file to match '#pragma omp begin declare target'}}
+// omp45-to-51-warning@+1 {{expected '#pragma omp end declare target' at end of file to match '#pragma omp begin declare target'}}
 #pragma omp begin declare target
 #endif