Author: arpith Date: Thu Jan 21 18:03:50 2016 New Revision: 258457 URL: http://llvm.org/viewvc/llvm-project?rev=258457&view=rev Log: [OpenMP] Parsing + Sema for nowait clause on target enter data directive.
Summary: Accept nowait clause on target enter data directive in sema and add test cases. Reviewers: ABataev Differential Revision: http://reviews.llvm.org/D16361 Added: cfe/trunk/test/OpenMP/target_enter_data_nowait_messages.cpp Modified: cfe/trunk/include/clang/Basic/OpenMPKinds.def cfe/trunk/test/OpenMP/target_enter_data_ast_print.cpp Modified: cfe/trunk/include/clang/Basic/OpenMPKinds.def URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Basic/OpenMPKinds.def?rev=258457&r1=258456&r2=258457&view=diff ============================================================================== --- cfe/trunk/include/clang/Basic/OpenMPKinds.def (original) +++ cfe/trunk/include/clang/Basic/OpenMPKinds.def Thu Jan 21 18:03:50 2016 @@ -368,6 +368,7 @@ OPENMP_TARGET_DATA_CLAUSE(map) OPENMP_TARGET_ENTER_DATA_CLAUSE(if) OPENMP_TARGET_ENTER_DATA_CLAUSE(device) OPENMP_TARGET_ENTER_DATA_CLAUSE(map) +OPENMP_TARGET_ENTER_DATA_CLAUSE(nowait) // Clauses allowed for OpenMP directive 'target exit data'. // TODO More clauses for 'target exit data' directive. Modified: cfe/trunk/test/OpenMP/target_enter_data_ast_print.cpp URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/OpenMP/target_enter_data_ast_print.cpp?rev=258457&r1=258456&r2=258457&view=diff ============================================================================== --- cfe/trunk/test/OpenMP/target_enter_data_ast_print.cpp (original) +++ cfe/trunk/test/OpenMP/target_enter_data_ast_print.cpp Thu Jan 21 18:03:50 2016 @@ -27,6 +27,22 @@ T tmain(T argc, T *argv) { #pragma omp target enter data map(always,alloc: e) +#pragma omp target enter data nowait map(to: i) + +#pragma omp target enter data nowait map(to: i) if (target enter data: j > 0) + +#pragma omp target enter data map(to: i) if (b) nowait + +#pragma omp target enter data map(to: c) nowait + +#pragma omp target enter data map(to: c) nowait if(b>e) + +#pragma omp target enter data nowait map(alloc: x[0:10], c) + +#pragma omp target enter data nowait map(to: c) map(alloc: d) + +#pragma omp target enter data nowait map(always,alloc: e) + return 0; } @@ -41,6 +57,14 @@ T tmain(T argc, T *argv) { // CHECK-NEXT: #pragma omp target enter data map(alloc: x[0:10],c) // CHECK-NEXT: #pragma omp target enter data map(to: c) map(alloc: d) // CHECK-NEXT: #pragma omp target enter data map(always,alloc: e) +// CHECK-NEXT: #pragma omp target enter data nowait map(to: i) +// CHECK-NEXT: #pragma omp target enter data nowait map(to: i) if(target enter data: j > 0) +// CHECK-NEXT: #pragma omp target enter data map(to: i) if(b) nowait +// CHECK-NEXT: #pragma omp target enter data map(to: c) nowait +// CHECK-NEXT: #pragma omp target enter data map(to: c) nowait if(b > e) +// CHECK-NEXT: #pragma omp target enter data nowait map(alloc: x[0:10],c) +// CHECK-NEXT: #pragma omp target enter data nowait map(to: c) map(alloc: d) +// CHECK-NEXT: #pragma omp target enter data nowait map(always,alloc: e) // CHECK: template <typename T = char, int C = 1> char tmain(char argc, char *argv) { // CHECK-NEXT: char i, j, b, c, d, e, x[20]; // CHECK-NEXT: i = argc; @@ -52,6 +76,14 @@ T tmain(T argc, T *argv) { // CHECK-NEXT: #pragma omp target enter data map(alloc: x[0:10],c) // CHECK-NEXT: #pragma omp target enter data map(to: c) map(alloc: d) // CHECK-NEXT: #pragma omp target enter data map(always,alloc: e) +// CHECK-NEXT: #pragma omp target enter data nowait map(to: i) +// CHECK-NEXT: #pragma omp target enter data nowait map(to: i) if(target enter data: j > 0) +// CHECK-NEXT: #pragma omp target enter data map(to: i) if(b) nowait +// CHECK-NEXT: #pragma omp target enter data map(to: c) nowait +// CHECK-NEXT: #pragma omp target enter data map(to: c) nowait if(b > e) +// CHECK-NEXT: #pragma omp target enter data nowait map(alloc: x[0:10],c) +// CHECK-NEXT: #pragma omp target enter data nowait map(to: c) map(alloc: d) +// CHECK-NEXT: #pragma omp target enter data nowait map(always,alloc: e) // CHECK: template <typename T, int C> T tmain(T argc, T *argv) { // CHECK-NEXT: T i, j, b, c, d, e, x[20]; // CHECK-NEXT: i = argc; @@ -63,6 +95,14 @@ T tmain(T argc, T *argv) { // CHECK-NEXT: #pragma omp target enter data map(alloc: x[0:10],c) // CHECK-NEXT: #pragma omp target enter data map(to: c) map(alloc: d) // CHECK-NEXT: #pragma omp target enter data map(always,alloc: e) +// CHECK-NEXT: #pragma omp target enter data nowait map(to: i) +// CHECK-NEXT: #pragma omp target enter data nowait map(to: i) if(target enter data: j > 0) +// CHECK-NEXT: #pragma omp target enter data map(to: i) if(b) nowait +// CHECK-NEXT: #pragma omp target enter data map(to: c) nowait +// CHECK-NEXT: #pragma omp target enter data map(to: c) nowait if(b > e) +// CHECK-NEXT: #pragma omp target enter data nowait map(alloc: x[0:10],c) +// CHECK-NEXT: #pragma omp target enter data nowait map(to: c) map(alloc: d) +// CHECK-NEXT: #pragma omp target enter data nowait map(always,alloc: e) int main (int argc, char **argv) { int b = argc, c, d, e, f, g, x[20]; @@ -94,6 +134,30 @@ int main (int argc, char **argv) { #pragma omp target enter data map(always,alloc: e) // CHECK-NEXT: #pragma omp target enter data map(always,alloc: e) +#pragma omp target enter data nowait map(to: a) +// CHECK: #pragma omp target enter data nowait map(to: a) + +#pragma omp target enter data nowait map(to: a) if (target enter data: b) +// CHECK: #pragma omp target enter data nowait map(to: a) if(target enter data: b) + +#pragma omp target enter data map(to: a) if (b > g) nowait +// CHECK: #pragma omp target enter data map(to: a) if(b > g) nowait + +#pragma omp target enter data map(to: c) nowait +// CHECK-NEXT: #pragma omp target enter data map(to: c) nowait + +#pragma omp target enter data map(alloc: c) nowait if(b>g) +// CHECK-NEXT: #pragma omp target enter data map(alloc: c) nowait if(b > g) + +#pragma omp target enter data nowait map(to: x[0:10], c) +// CHECK-NEXT: #pragma omp target enter data nowait map(to: x[0:10],c) + +#pragma omp target enter data nowait map(to: c) map(alloc: d) +// CHECK-NEXT: #pragma omp target enter data nowait map(to: c) map(alloc: d) + +#pragma omp target enter data nowait map(always,alloc: e) +// CHECK-NEXT: #pragma omp target enter data nowait map(always,alloc: e) + return tmain<int, 5>(argc, &argc) + tmain<char, 1>(argv[0][0], argv[0]); } Added: cfe/trunk/test/OpenMP/target_enter_data_nowait_messages.cpp URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/OpenMP/target_enter_data_nowait_messages.cpp?rev=258457&view=auto ============================================================================== --- cfe/trunk/test/OpenMP/target_enter_data_nowait_messages.cpp (added) +++ cfe/trunk/test/OpenMP/target_enter_data_nowait_messages.cpp Thu Jan 21 18:03:50 2016 @@ -0,0 +1,17 @@ +// RUN: %clang_cc1 -triple x86_64-apple-macos10.7.0 -verify -fopenmp -ferror-limit 100 -o - %s + +int main(int argc, char **argv) { + int i; + + #pragma omp nowait target enter data map(to: i) // expected-error {{expected an OpenMP directive}} + #pragma omp target nowait enter data map(to: i) // expected-warning {{extra tokens at the end of '#pragma omp target' are ignored}} + #pragma omp target enter nowait data map(to: i) // expected-error {{expected an OpenMP directive}} + #pragma omp target enter data nowait() map(to: i) // expected-warning {{extra tokens at the end of '#pragma omp target enter data' are ignored}} expected-error {{expected at least one map clause for '#pragma omp target enter data'}} + #pragma omp target enter data map(to: i) nowait( // expected-warning {{extra tokens at the end of '#pragma omp target enter data' are ignored}} + #pragma omp target enter data map(to: i) nowait (argc)) // expected-warning {{extra tokens at the end of '#pragma omp target enter data' are ignored}} + #pragma omp target enter data map(to: i) nowait device (-10u) + #pragma omp target enter data map(to: i) nowait (3.14) device (-10u) // expected-warning {{extra tokens at the end of '#pragma omp target enter data' are ignored}} + #pragma omp target enter data map(to: i) nowait nowait // expected-error {{directive '#pragma omp target enter data' cannot contain more than one 'nowait' clause}} + #pragma omp target enter data nowait map(to: i) nowait // expected-error {{directive '#pragma omp target enter data' cannot contain more than one 'nowait' clause}} + return 0; +} _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
