This is an archive of the discontinued LLVM Phabricator instance.

Differential D16358

[OpenMP] Parsing + Sema for nowait clause on target directive
ClosedPublic

Authored by arpith-jacob on Jan 20 2016, 8:55 AM.

Details

Reviewers
kkwli0
sfantao
carlo.bertolli
ABataev
hfinkel
Commits
rGbfc33d0f3a78: [OpenMP] Parsing + Sema for nowait clause on target directive
rC258441: [OpenMP] Parsing + Sema for nowait clause on target directive
rL258441: [OpenMP] Parsing + Sema for nowait clause on target directive
Summary

Allow nowait clause on target directive in sema and add test cases.

Diff Detail

Event Timeline

arpith-jacob updated this revision to Diff 45399.Jan 20 2016, 8:55 AM
arpith-jacob retitled this revision from to [OpenMP] Parsing + Sema for nowait clause on target directive.
arpith-jacob updated this object.
arpith-jacob added reviewers: ABataev, kkwli0, hfinkel, sfantao, carlo.bertolli.
arpith-jacob added subscribers: cfe-commits, caomhin, • fraggamuffin.
ABataev accepted this revision.Jan 20 2016, 7:56 PM
ABataev edited edge metadata.
This revision is now accepted and ready to land.Jan 20 2016, 7:56 PM
Closed by commit rL258441: [OpenMP] Parsing + Sema for nowait clause on target directive (authored by arpith). · Explain WhyJan 21 2016, 2:22 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents

PathSize
include/
clang/
Basic/
1 line
test/
OpenMP/
13 lines
17 lines

Diff 45399

include/clang/Basic/OpenMPKinds.def

Show First 20 Lines • Show All 349 Lines • ▼ Show 20 Lines
OPENMP_ATOMIC_CLAUSE(seq_cst) OPENMP_ATOMIC_CLAUSE(seq_cst)
// Clauses allowed for OpenMP directive 'target'. // Clauses allowed for OpenMP directive 'target'.
// TODO More clauses for 'target' directive. // TODO More clauses for 'target' directive.
OPENMP_TARGET_CLAUSE(if) OPENMP_TARGET_CLAUSE(if)
OPENMP_TARGET_CLAUSE(device) OPENMP_TARGET_CLAUSE(device)
OPENMP_TARGET_CLAUSE(map) OPENMP_TARGET_CLAUSE(map)
OPENMP_TARGET_CLAUSE(private) OPENMP_TARGET_CLAUSE(private)
OPENMP_TARGET_CLAUSE(nowait)
// Clauses allowed for OpenMP directive 'target data'. // Clauses allowed for OpenMP directive 'target data'.
// TODO More clauses for 'target data' directive. // TODO More clauses for 'target data' directive.
OPENMP_TARGET_DATA_CLAUSE(if) OPENMP_TARGET_DATA_CLAUSE(if)
OPENMP_TARGET_DATA_CLAUSE(device) OPENMP_TARGET_DATA_CLAUSE(device)
OPENMP_TARGET_DATA_CLAUSE(map) OPENMP_TARGET_DATA_CLAUSE(map)
// Clauses allowed for OpenMP directive 'target enter data'. // Clauses allowed for OpenMP directive 'target enter data'.
▲ Show 20 Lines • Show All 118 Lines • Show Last 20 Lines

test/OpenMP/target_ast_print.cpp

Show All 19 Lines
#pragma omp target map(i) #pragma omp target map(i)
foo(); foo();
#pragma omp target map(a[0:10], i) #pragma omp target map(a[0:10], i)
foo(); foo();
#pragma omp target map(to: i) map(from: j) #pragma omp target map(to: i) map(from: j)
foo(); foo();
#pragma omp target map(always,alloc: i) #pragma omp target map(always,alloc: i)
foo(); foo();
#pragma omp target nowait
foo();
return 0; return 0;
} }
// CHECK: template <typename T = int, int C = 5> int tmain(int argc, int *argv) { // CHECK: template <typename T = int, int C = 5> int tmain(int argc, int *argv) {
// CHECK-NEXT: int i, j, a[20] // CHECK-NEXT: int i, j, a[20]
// CHECK-NEXT: #pragma omp target // CHECK-NEXT: #pragma omp target
// CHECK-NEXT: foo(); // CHECK-NEXT: foo();
// CHECK-NEXT: #pragma omp target if(target: argc > 0) // CHECK-NEXT: #pragma omp target if(target: argc > 0)
// CHECK-NEXT: foo() // CHECK-NEXT: foo()
// CHECK-NEXT: #pragma omp target if(5) // CHECK-NEXT: #pragma omp target if(5)
// CHECK-NEXT: foo() // CHECK-NEXT: foo()
// CHECK-NEXT: #pragma omp target map(tofrom: i) // CHECK-NEXT: #pragma omp target map(tofrom: i)
// CHECK-NEXT: foo() // CHECK-NEXT: foo()
// CHECK-NEXT: #pragma omp target map(tofrom: a[0:10],i) // CHECK-NEXT: #pragma omp target map(tofrom: a[0:10],i)
// CHECK-NEXT: foo() // CHECK-NEXT: foo()
// CHECK-NEXT: #pragma omp target map(to: i) map(from: j) // CHECK-NEXT: #pragma omp target map(to: i) map(from: j)
// CHECK-NEXT: foo() // CHECK-NEXT: foo()
// CHECK-NEXT: #pragma omp target map(always,alloc: i) // CHECK-NEXT: #pragma omp target map(always,alloc: i)
// CHECK-NEXT: foo() // CHECK-NEXT: foo()
// CHECK-NEXT: #pragma omp target nowait
// CHECK-NEXT: foo()
// CHECK: template <typename T = char, int C = 1> char tmain(char argc, char *argv) { // CHECK: template <typename T = char, int C = 1> char tmain(char argc, char *argv) {
// CHECK-NEXT: char i, j, a[20] // CHECK-NEXT: char i, j, a[20]
// CHECK-NEXT: #pragma omp target // CHECK-NEXT: #pragma omp target
// CHECK-NEXT: foo(); // CHECK-NEXT: foo();
// CHECK-NEXT: #pragma omp target if(target: argc > 0) // CHECK-NEXT: #pragma omp target if(target: argc > 0)
// CHECK-NEXT: foo() // CHECK-NEXT: foo()
// CHECK-NEXT: #pragma omp target if(1) // CHECK-NEXT: #pragma omp target if(1)
// CHECK-NEXT: foo() // CHECK-NEXT: foo()
// CHECK-NEXT: #pragma omp target map(tofrom: i) // CHECK-NEXT: #pragma omp target map(tofrom: i)
// CHECK-NEXT: foo() // CHECK-NEXT: foo()
// CHECK-NEXT: #pragma omp target map(tofrom: a[0:10],i) // CHECK-NEXT: #pragma omp target map(tofrom: a[0:10],i)
// CHECK-NEXT: foo() // CHECK-NEXT: foo()
// CHECK-NEXT: #pragma omp target map(to: i) map(from: j) // CHECK-NEXT: #pragma omp target map(to: i) map(from: j)
// CHECK-NEXT: foo() // CHECK-NEXT: foo()
// CHECK-NEXT: #pragma omp target map(always,alloc: i) // CHECK-NEXT: #pragma omp target map(always,alloc: i)
// CHECK-NEXT: foo() // CHECK-NEXT: foo()
// CHECK-NEXT: #pragma omp target nowait
// CHECK-NEXT: foo()
// CHECK: template <typename T, int C> T tmain(T argc, T *argv) { // CHECK: template <typename T, int C> T tmain(T argc, T *argv) {
// CHECK-NEXT: T i, j, a[20] // CHECK-NEXT: T i, j, a[20]
// CHECK-NEXT: #pragma omp target // CHECK-NEXT: #pragma omp target
// CHECK-NEXT: foo(); // CHECK-NEXT: foo();
// CHECK-NEXT: #pragma omp target if(target: argc > 0) // CHECK-NEXT: #pragma omp target if(target: argc > 0)
// CHECK-NEXT: foo() // CHECK-NEXT: foo()
// CHECK-NEXT: #pragma omp target if(C) // CHECK-NEXT: #pragma omp target if(C)
// CHECK-NEXT: foo() // CHECK-NEXT: foo()
// CHECK-NEXT: #pragma omp target map(tofrom: i) // CHECK-NEXT: #pragma omp target map(tofrom: i)
// CHECK-NEXT: foo() // CHECK-NEXT: foo()
// CHECK-NEXT: #pragma omp target map(tofrom: a[0:10],i) // CHECK-NEXT: #pragma omp target map(tofrom: a[0:10],i)
// CHECK-NEXT: foo() // CHECK-NEXT: foo()
// CHECK-NEXT: #pragma omp target map(to: i) map(from: j) // CHECK-NEXT: #pragma omp target map(to: i) map(from: j)
// CHECK-NEXT: foo() // CHECK-NEXT: foo()
// CHECK-NEXT: #pragma omp target map(always,alloc: i) // CHECK-NEXT: #pragma omp target map(always,alloc: i)
// CHECK-NEXT: foo() // CHECK-NEXT: foo()
// CHECK-NEXT: #pragma omp target nowait
// CHECK-NEXT: foo()
// CHECK-LABEL: int main(int argc, char **argv) { // CHECK-LABEL: int main(int argc, char **argv) {
int main (int argc, char **argv) { int main (int argc, char **argv) {
int i, j, a[20]; int i, j, a[20];
// CHECK-NEXT: int i, j, a[20] // CHECK-NEXT: int i, j, a[20]
#pragma omp target #pragma omp target
// CHECK-NEXT: #pragma omp target // CHECK-NEXT: #pragma omp target
foo(); foo();
Show All 23 Lines// CHECK-NEXT: #pragma omp target map(to: i) map(from: j)
foo(); foo();
// CHECK-NEXT: foo(); // CHECK-NEXT: foo();
#pragma omp target map(always,alloc: i) #pragma omp target map(always,alloc: i)
// CHECK-NEXT: #pragma omp target map(always,alloc: i) // CHECK-NEXT: #pragma omp target map(always,alloc: i)
foo(); foo();
// CHECK-NEXT: foo(); // CHECK-NEXT: foo();
#pragma omp target nowait
// CHECK-NEXT: #pragma omp target nowait
foo();
// CHECK-NEXT: foo();
return tmain<int, 5>(argc, &argc) + tmain<char, 1>(argv[0][0], argv[0]); return tmain<int, 5>(argc, &argc) + tmain<char, 1>(argv[0][0], argv[0]);
} }
#endif #endif

test/OpenMP/target_nowait_messages.cpp

  • This file was added.
// RUN: %clang_cc1 -triple x86_64-apple-macos10.7.0 -verify -fopenmp -ferror-limit 100 -o - %s
void foo() {
}
int main(int argc, char **argv) {
#pragma omp target nowait( // expected-warning {{extra tokens at the end of '#pragma omp target' are ignored}}
foo();
#pragma omp target nowait (argc)) // expected-warning {{extra tokens at the end of '#pragma omp target' are ignored}}
foo();
#pragma omp target nowait device (-10u)
foo();
#pragma omp target nowait (3.14) device (-10u) // expected-warning {{extra tokens at the end of '#pragma omp target' are ignored}}
foo();
return 0;
}