Index: cfe/trunk/include/clang/Basic/OpenMPKinds.def =================================================================== --- cfe/trunk/include/clang/Basic/OpenMPKinds.def +++ cfe/trunk/include/clang/Basic/OpenMPKinds.def @@ -451,7 +451,6 @@ OPENMP_TARGET_EXIT_DATA_CLAUSE(depend) // Clauses allowed for OpenMP directive 'target parallel'. -// TODO: add target clauses 'is_device_ptr' OPENMP_TARGET_PARALLEL_CLAUSE(if) OPENMP_TARGET_PARALLEL_CLAUSE(device) OPENMP_TARGET_PARALLEL_CLAUSE(map) @@ -465,6 +464,7 @@ OPENMP_TARGET_PARALLEL_CLAUSE(proc_bind) OPENMP_TARGET_PARALLEL_CLAUSE(shared) OPENMP_TARGET_PARALLEL_CLAUSE(reduction) +OPENMP_TARGET_PARALLEL_CLAUSE(is_device_ptr) // Clauses allowed for OpenMP directive 'target parallel for'. // TODO: add target clauses 'is_device_ptr' Index: cfe/trunk/lib/Sema/SemaOpenMP.cpp =================================================================== --- cfe/trunk/lib/Sema/SemaOpenMP.cpp +++ cfe/trunk/lib/Sema/SemaOpenMP.cpp @@ -7265,7 +7265,8 @@ // OpenMP 4.5 [2.15.5.1, Restrictions, p.3] // A list item cannot appear in both a map clause and a data-sharing // attribute clause on the same construct - if (DSAStack->getCurrentDirective() == OMPD_target) { + if (DSAStack->getCurrentDirective() == OMPD_target || + DSAStack->getCurrentDirective() == OMPD_target_parallel) { OpenMPClauseKind ConflictKind; if (DSAStack->checkMappableExprComponentListsForDecl( VD, /*CurrentRegionOnly=*/true, @@ -7522,7 +7523,7 @@ // OpenMP 4.5 [2.15.5.1, Restrictions, p.3] // A list item cannot appear in both a map clause and a data-sharing // attribute clause on the same construct - if (CurrDir == OMPD_target) { + if (CurrDir == OMPD_target || CurrDir == OMPD_target_parallel) { OpenMPClauseKind ConflictKind; if (DSAStack->checkMappableExprComponentListsForDecl( VD, /*CurrentRegionOnly=*/true, Index: cfe/trunk/test/OpenMP/target_parallel_is_device_ptr_ast_print.cpp =================================================================== --- cfe/trunk/test/OpenMP/target_parallel_is_device_ptr_ast_print.cpp +++ cfe/trunk/test/OpenMP/target_parallel_is_device_ptr_ast_print.cpp @@ -0,0 +1,294 @@ +// RUN: %clang_cc1 -verify -fopenmp -std=c++11 -ast-print %s | FileCheck %s +// RUN: %clang_cc1 -fopenmp -x c++ -std=c++11 -emit-pch -o %t %s +// RUN: %clang_cc1 -fopenmp -std=c++11 -include-pch %t -fsyntax-only -verify %s -ast-print | FileCheck %s +// expected-no-diagnostics + +#ifndef HEADER +#define HEADER + +struct ST { + int *a; +}; +typedef int arr[10]; +typedef ST STarr[10]; +struct SA { + const int da[5] = { 0 }; + ST g[10]; + STarr &rg = g; + int i; + int &j = i; + int *k = &j; + int *&z = k; + int aa[10]; + arr &raa = aa; + void func(int arg) { +#pragma omp target parallel is_device_ptr(k) + {} +#pragma omp target parallel is_device_ptr(z) + {} +#pragma omp target parallel is_device_ptr(aa) // OK + {} +#pragma omp target parallel is_device_ptr(raa) // OK + {} +#pragma omp target parallel is_device_ptr(g) // OK + {} +#pragma omp target parallel is_device_ptr(rg) // OK + {} +#pragma omp target parallel is_device_ptr(da) // OK + {} + return; + } +}; +// CHECK: struct SA +// CHECK-NEXT: const int da[5] = {0}; +// CHECK-NEXT: ST g[10]; +// CHECK-NEXT: STarr &rg = this->g; +// CHECK-NEXT: int i; +// CHECK-NEXT: int &j = this->i; +// CHECK-NEXT: int *k = &this->j; +// CHECK-NEXT: int *&z = this->k; +// CHECK-NEXT: int aa[10]; +// CHECK-NEXT: arr &raa = this->aa; +// CHECK-NEXT: func( +// CHECK-NEXT: #pragma omp target parallel is_device_ptr(this->k) +// CHECK-NEXT: { +// CHECK-NEXT: } +// CHECK-NEXT: #pragma omp target parallel is_device_ptr(this->z) +// CHECK-NEXT: { +// CHECK-NEXT: } +// CHECK-NEXT: #pragma omp target parallel is_device_ptr(this->aa) +// CHECK-NEXT: { +// CHECK-NEXT: } +// CHECK-NEXT: #pragma omp target parallel is_device_ptr(this->raa) +// CHECK-NEXT: { +// CHECK-NEXT: } +// CHECK-NEXT: #pragma omp target parallel is_device_ptr(this->g) +// CHECK-NEXT: { +// CHECK-NEXT: } +// CHECK-NEXT: #pragma omp target parallel is_device_ptr(this->rg) +// CHECK-NEXT: { +// CHECK-NEXT: } +// CHECK-NEXT: #pragma omp target parallel is_device_ptr(this->da) + +struct SB { + unsigned A; + unsigned B; + float Arr[100]; + float *Ptr; + float *foo() { + return &Arr[0]; + } +}; + +struct SC { + unsigned A : 2; + unsigned B : 3; + unsigned C; + unsigned D; + float Arr[100]; + SB S; + SB ArrS[100]; + SB *PtrS; + SB *&RPtrS; + float *Ptr; + + SC(SB *&_RPtrS) : RPtrS(_RPtrS) {} +}; + +union SD { + unsigned A; + float B; +}; + +struct S1; +extern S1 a; +class S2 { + mutable int a; +public: + S2():a(0) { } + S2(S2 &s2):a(s2.a) { } + static float S2s; + static const float S2sc; +}; +const float S2::S2sc = 0; +const S2 b; +const S2 ba[5]; +class S3 { + int a; +public: + S3():a(0) { } + S3(S3 &s3):a(s3.a) { } +}; +const S3 c; +const S3 ca[5]; +extern const int f; +class S4 { + int a; + S4(); + S4(const S4 &s4); +public: + S4(int v):a(v) { } +}; +class S5 { + int a; + S5():a(0) {} + S5(const S5 &s5):a(s5.a) { } +public: + S5(int v):a(v) { } +}; + +S3 h; +#pragma omp threadprivate(h) + +typedef struct { + int a; +} S6; + +template +T tmain(T argc) { + const T da[5] = { 0 }; + S6 h[10]; + auto &rh = h; + T i; + T &j = i; + T *k = &j; + T *&z = k; + T aa[10]; + auto &raa = aa; +#pragma omp target parallel is_device_ptr(k) + {} +#pragma omp target parallel is_device_ptr(z) + {} +#pragma omp target parallel is_device_ptr(aa) + {} +#pragma omp target parallel is_device_ptr(raa) + {} +#pragma omp target parallel is_device_ptr(h) + {} +#pragma omp target parallel is_device_ptr(rh) + {} +#pragma omp target parallel is_device_ptr(da) + {} + return 0; +} + +// CHECK: template<> int tmain(int argc) { +// CHECK-NEXT: const int da[5] = {0}; +// CHECK-NEXT: S6 h[10]; +// CHECK-NEXT: auto &rh = h; +// CHECK-NEXT: int i; +// CHECK-NEXT: int &j = i; +// CHECK-NEXT: int *k = &j; +// CHECK-NEXT: int *&z = k; +// CHECK-NEXT: int aa[10]; +// CHECK-NEXT: auto &raa = aa; +// CHECK-NEXT: #pragma omp target parallel is_device_ptr(k) +// CHECK-NEXT: { +// CHECK-NEXT: } +// CHECK-NEXT: #pragma omp target parallel is_device_ptr(z) +// CHECK-NEXT: { +// CHECK-NEXT: } +// CHECK-NEXT: #pragma omp target parallel is_device_ptr(aa) +// CHECK-NEXT: { +// CHECK-NEXT: } +// CHECK-NEXT: #pragma omp target parallel is_device_ptr(raa) +// CHECK-NEXT: { +// CHECK-NEXT: } +// CHECK-NEXT: #pragma omp target parallel is_device_ptr(h) +// CHECK-NEXT: { +// CHECK-NEXT: } +// CHECK-NEXT: #pragma omp target parallel is_device_ptr(rh) +// CHECK-NEXT: { +// CHECK-NEXT: } +// CHECK-NEXT: #pragma omp target parallel is_device_ptr(da) + +// CHECK: template<> int *tmain(int *argc) { +// CHECK-NEXT: int *const da[5] = {0}; +// CHECK-NEXT: S6 h[10]; +// CHECK-NEXT: auto &rh = h; +// CHECK-NEXT: int *i; +// CHECK-NEXT: int *&j = i; +// CHECK-NEXT: int **k = &j; +// CHECK-NEXT: int **&z = k; +// CHECK-NEXT: int *aa[10]; +// CHECK-NEXT: auto &raa = aa; +// CHECK-NEXT: #pragma omp target parallel is_device_ptr(k) +// CHECK-NEXT: { +// CHECK-NEXT: } +// CHECK-NEXT: #pragma omp target parallel is_device_ptr(z) +// CHECK-NEXT: { +// CHECK-NEXT: } +// CHECK-NEXT: #pragma omp target parallel is_device_ptr(aa) +// CHECK-NEXT: { +// CHECK-NEXT: } +// CHECK-NEXT: #pragma omp target parallel is_device_ptr(raa) +// CHECK-NEXT: { +// CHECK-NEXT: } +// CHECK-NEXT: #pragma omp target parallel is_device_ptr(h) +// CHECK-NEXT: { +// CHECK-NEXT: } +// CHECK-NEXT: #pragma omp target parallel is_device_ptr(rh) +// CHECK-NEXT: { +// CHECK-NEXT: } +// CHECK-NEXT: #pragma omp target parallel is_device_ptr(da) + +// CHECK-LABEL: int main(int argc, char **argv) { +int main(int argc, char **argv) { + const int da[5] = { 0 }; + S6 h[10]; + auto &rh = h; + int i; + int &j = i; + int *k = &j; + int *&z = k; + int aa[10]; + auto &raa = aa; +// CHECK-NEXT: const int da[5] = {0}; +// CHECK-NEXT: S6 h[10]; +// CHECK-NEXT: auto &rh = h; +// CHECK-NEXT: int i; +// CHECK-NEXT: int &j = i; +// CHECK-NEXT: int *k = &j; +// CHECK-NEXT: int *&z = k; +// CHECK-NEXT: int aa[10]; +// CHECK-NEXT: auto &raa = aa; +#pragma omp target parallel is_device_ptr(k) +// CHECK-NEXT: #pragma omp target parallel is_device_ptr(k) + {} +// CHECK-NEXT: { +// CHECK-NEXT: } +#pragma omp target parallel is_device_ptr(z) +// CHECK-NEXT: #pragma omp target parallel is_device_ptr(z) + {} +// CHECK-NEXT: { +// CHECK-NEXT: } +#pragma omp target parallel is_device_ptr(aa) +// CHECK-NEXT: #pragma omp target parallel is_device_ptr(aa) + {} +// CHECK-NEXT: { +// CHECK-NEXT: } +#pragma omp target parallel is_device_ptr(raa) +// CHECK-NEXT: #pragma omp target parallel is_device_ptr(raa) + {} +// CHECK-NEXT: { +// CHECK-NEXT: } +#pragma omp target parallel is_device_ptr(h) +// CHECK-NEXT: #pragma omp target parallel is_device_ptr(h) + {} +// CHECK-NEXT: { +// CHECK-NEXT: } +#pragma omp target parallel is_device_ptr(rh) +// CHECK-NEXT: #pragma omp target parallel is_device_ptr(rh) + {} +// CHECK-NEXT: { +// CHECK-NEXT: } +#pragma omp target parallel is_device_ptr(da) +// CHECK-NEXT: #pragma omp target parallel is_device_ptr(da) + {} +// CHECK-NEXT: { +// CHECK-NEXT: } + return tmain(argc) + *tmain(&argc); +} + + +#endif Index: cfe/trunk/test/OpenMP/target_parallel_is_device_ptr_messages.cpp =================================================================== --- cfe/trunk/test/OpenMP/target_parallel_is_device_ptr_messages.cpp +++ cfe/trunk/test/OpenMP/target_parallel_is_device_ptr_messages.cpp @@ -0,0 +1,268 @@ +// RUN: %clang_cc1 -std=c++11 -verify -fopenmp -ferror-limit 200 %s +struct ST { + int *a; +}; +typedef int arr[10]; +typedef ST STarr[10]; +struct SA { + const int d = 5; + const int da[5] = { 0 }; + ST e; + ST g[10]; + STarr &rg = g; + int i; + int &j = i; + int *k = &j; + int *&z = k; + int aa[10]; + arr &raa = aa; + void func(int arg) { +#pragma omp target parallel is_device_ptr // expected-error {{expected '(' after 'is_device_ptr'}} + {} +#pragma omp target parallel is_device_ptr( // expected-error {{expected ')'}} expected-note {{to match this '('}} expected-error {{expected expression}} + {} +#pragma omp target parallel is_device_ptr() // expected-error {{expected expression}} + {} +#pragma omp target parallel is_device_ptr(alloc) // expected-error {{use of undeclared identifier 'alloc'}} + {} +#pragma omp target parallel is_device_ptr(arg // expected-error {{expected ')'}} expected-note {{to match this '('}} expected-error {{expected pointer, array, reference to pointer, or reference to array in 'is_device_ptr clause'}} + {} +#pragma omp target parallel is_device_ptr(i) // expected-error {{expected pointer, array, reference to pointer, or reference to array in 'is_device_ptr clause'}} + {} +#pragma omp target parallel is_device_ptr(j) // expected-error {{expected pointer, array, reference to pointer, or reference to array in 'is_device_ptr clause'}} + {} +#pragma omp target parallel is_device_ptr(k) // OK + {} +#pragma omp target parallel is_device_ptr(z) // OK + {} +#pragma omp target parallel is_device_ptr(aa) // OK + {} +#pragma omp target parallel is_device_ptr(raa) // OK + {} +#pragma omp target parallel is_device_ptr(e) // expected-error{{expected pointer, array, reference to pointer, or reference to array in 'is_device_ptr clause'}} + {} +#pragma omp target parallel is_device_ptr(g) // OK + {} +#pragma omp target parallel is_device_ptr(rg) // OK + {} +#pragma omp target parallel is_device_ptr(k,i,j) // expected-error2 {{expected pointer, array, reference to pointer, or reference to array in 'is_device_ptr clause'}} + {} +#pragma omp target parallel is_device_ptr(d) // expected-error{{expected pointer, array, reference to pointer, or reference to array in 'is_device_ptr clause'}} + {} +#pragma omp target parallel is_device_ptr(da) // OK + {} + return; + } +}; +struct SB { + unsigned A; + unsigned B; + float Arr[100]; + float *Ptr; + float *foo() { + return &Arr[0]; + } +}; + +struct SC { + unsigned A : 2; + unsigned B : 3; + unsigned C; + unsigned D; + float Arr[100]; + SB S; + SB ArrS[100]; + SB *PtrS; + SB *&RPtrS; + float *Ptr; + + SC(SB *&_RPtrS) : RPtrS(_RPtrS) {} +}; + +union SD { + unsigned A; + float B; +}; + +struct S1; +extern S1 a; +class S2 { + mutable int a; +public: + S2():a(0) { } + S2(S2 &s2):a(s2.a) { } + static float S2s; + static const float S2sc; +}; +const float S2::S2sc = 0; +const S2 b; +const S2 ba[5]; +class S3 { + int a; +public: + S3():a(0) { } + S3(S3 &s3):a(s3.a) { } +}; +const S3 c; +const S3 ca[5]; +extern const int f; +class S4 { + int a; + S4(); + S4(const S4 &s4); +public: + S4(int v):a(v) { } +}; +class S5 { + int a; + S5():a(0) {} + S5(const S5 &s5):a(s5.a) { } +public: + S5(int v):a(v) { } +}; + +S3 h; +#pragma omp threadprivate(h) + +typedef struct { + int a; +} S6; + +template +T tmain(T argc) { + const T d = 5; + const T da[5] = { 0 }; + S4 e(4); + S5 g(5); + S6 h[10]; + auto &rh = h; + T i; + T &j = i; + T *k = &j; + T *&z = k; + T aa[10]; + auto &raa = aa; + S6 *ps; +#pragma omp target parallel is_device_ptr // expected-error {{expected '(' after 'is_device_ptr'}} + {} +#pragma omp target parallel is_device_ptr( // expected-error {{expected ')'}} expected-note {{to match this '('}} expected-error {{expected expression}} + {} +#pragma omp target parallel is_device_ptr() // expected-error {{expected expression}} + {} +#pragma omp target parallel is_device_ptr(alloc) // expected-error {{use of undeclared identifier 'alloc'}} + {} +#pragma omp target parallel is_device_ptr(argc // expected-error {{expected ')'}} expected-note {{to match this '('}} expected-error{{expected pointer, array, reference to pointer, or reference to array in 'is_device_ptr clause'}} + {} +#pragma omp target parallel is_device_ptr(i) // expected-error {{expected pointer, array, reference to pointer, or reference to array in 'is_device_ptr clause'}} + {} +#pragma omp target parallel is_device_ptr(j) // expected-error {{expected pointer, array, reference to pointer, or reference to array in 'is_device_ptr clause'}} + {} +#pragma omp target parallel is_device_ptr(k) // OK + {} +#pragma omp target parallel is_device_ptr(z) // OK + {} +#pragma omp target parallel is_device_ptr(aa) // OK + {} +#pragma omp target parallel is_device_ptr(raa) // OK + {} +#pragma omp target parallel is_device_ptr(e) // expected-error{{expected pointer, array, reference to pointer, or reference to array in 'is_device_ptr clause'}} + {} +#pragma omp target parallel is_device_ptr(g) // expected-error{{expected pointer, array, reference to pointer, or reference to array in 'is_device_ptr clause'}} + {} +#pragma omp target parallel is_device_ptr(h) // OK + {} +#pragma omp target parallel is_device_ptr(rh) // OK + {} +#pragma omp target parallel is_device_ptr(k,i,j) // expected-error2 {{expected pointer, array, reference to pointer, or reference to array in 'is_device_ptr clause'}} + {} +#pragma omp target parallel is_device_ptr(d) // expected-error{{expected pointer, array, reference to pointer, or reference to array in 'is_device_ptr clause'}} + {} +#pragma omp target parallel is_device_ptr(da) // OK + {} +#pragma omp target parallel map(ps) is_device_ptr(ps) // expected-error{{variable already marked as mapped in current construct}} expected-note{{used here}} + {} +#pragma omp target parallel is_device_ptr(ps) map(ps) // expected-error{{variable already marked as mapped in current construct}} expected-note{{used here}} + {} +#pragma omp target parallel map(ps->a) is_device_ptr(ps) // expected-error{{variable already marked as mapped in current construct}} expected-note{{used here}} + {} +#pragma omp target parallel is_device_ptr(ps) map(ps->a) // expected-error{{pointer cannot be mapped along with a section derived from itself}} expected-note{{used here}} + {} +#pragma omp target parallel is_device_ptr(ps) firstprivate(ps) // expected-error{{firstprivate variable cannot be in a is_device_ptr clause in '#pragma omp target parallel' directive}} + {} +#pragma omp target parallel firstprivate(ps) is_device_ptr(ps) // expected-error{{firstprivate variable cannot be in a is_device_ptr clause in '#pragma omp target parallel' directive}} expected-note{{defined as firstprivate}} + {} +#pragma omp target parallel is_device_ptr(ps) private(ps) // expected-error{{private variable cannot be in a is_device_ptr clause in '#pragma omp target parallel' directive}} + {} +#pragma omp target parallel private(ps) is_device_ptr(ps) // expected-error{{private variable cannot be in a is_device_ptr clause in '#pragma omp target parallel' directive}} expected-note{{defined as private}} + {} + return 0; +} + +int main(int argc, char **argv) { + const int d = 5; + const int da[5] = { 0 }; + S4 e(4); + S5 g(5); + S6 h[10]; + auto &rh = h; + int i; + int &j = i; + int *k = &j; + int *&z = k; + int aa[10]; + auto &raa = aa; + S6 *ps; +#pragma omp target parallel is_device_ptr // expected-error {{expected '(' after 'is_device_ptr'}} + {} +#pragma omp target parallel is_device_ptr( // expected-error {{expected ')'}} expected-note {{to match this '('}} expected-error {{expected expression}} + {} +#pragma omp target parallel is_device_ptr() // expected-error {{expected expression}} + {} +#pragma omp target parallel is_device_ptr(alloc) // expected-error {{use of undeclared identifier 'alloc'}} + {} +#pragma omp target parallel is_device_ptr(argc // expected-error {{expected ')'}} expected-note {{to match this '('}} expected-error {{expected pointer, array, reference to pointer, or reference to array in 'is_device_ptr clause'}} + {} +#pragma omp target parallel is_device_ptr(i) // expected-error {{expected pointer, array, reference to pointer, or reference to array in 'is_device_ptr clause'}} + {} +#pragma omp target parallel is_device_ptr(j) // expected-error {{expected pointer, array, reference to pointer, or reference to array in 'is_device_ptr clause'}} + {} +#pragma omp target parallel is_device_ptr(k) // OK + {} +#pragma omp target parallel is_device_ptr(z) // OK + {} +#pragma omp target parallel is_device_ptr(aa) // OK + {} +#pragma omp target parallel is_device_ptr(raa) // OK + {} +#pragma omp target parallel is_device_ptr(e) // expected-error{{expected pointer, array, reference to pointer, or reference to array in 'is_device_ptr clause'}} + {} +#pragma omp target parallel is_device_ptr(g) // expected-error{{expected pointer, array, reference to pointer, or reference to array in 'is_device_ptr clause'}} + {} +#pragma omp target parallel is_device_ptr(h) // OK + {} +#pragma omp target parallel is_device_ptr(rh) // OK + {} +#pragma omp target parallel is_device_ptr(k,i,j) // expected-error2 {{expected pointer, array, reference to pointer, or reference to array in 'is_device_ptr clause'}} + {} +#pragma omp target parallel is_device_ptr(d) // expected-error{{expected pointer, array, reference to pointer, or reference to array in 'is_device_ptr clause'}} + {} +#pragma omp target parallel is_device_ptr(da) // OK + {} +#pragma omp target parallel map(ps) is_device_ptr(ps) // expected-error{{variable already marked as mapped in current construct}} expected-note{{used here}} + {} +#pragma omp target parallel is_device_ptr(ps) map(ps) // expected-error{{variable already marked as mapped in current construct}} expected-note{{used here}} + {} +#pragma omp target parallel map(ps->a) is_device_ptr(ps) // expected-error{{variable already marked as mapped in current construct}} expected-note{{used here}} + {} +#pragma omp target parallel is_device_ptr(ps) map(ps->a) // expected-error{{pointer cannot be mapped along with a section derived from itself}} expected-note{{used here}} + {} +#pragma omp target parallel is_device_ptr(ps) firstprivate(ps) // expected-error{{firstprivate variable cannot be in a is_device_ptr clause in '#pragma omp target parallel' directive}} + {} +#pragma omp target parallel firstprivate(ps) is_device_ptr(ps) // expected-error{{firstprivate variable cannot be in a is_device_ptr clause in '#pragma omp target parallel' directive}} expected-note{{defined as firstprivate}} + {} +#pragma omp target parallel is_device_ptr(ps) private(ps) // expected-error{{private variable cannot be in a is_device_ptr clause in '#pragma omp target parallel' directive}} + {} +#pragma omp target parallel private(ps) is_device_ptr(ps) // expected-error{{private variable cannot be in a is_device_ptr clause in '#pragma omp target parallel' directive}} expected-note{{defined as private}} + {} + return tmain(argc); // expected-note {{in instantiation of function template specialization 'tmain' requested here}} +}