From a1f6fbd9ed5c55aeb0dd7452de065625183afcd4 Mon Sep 17 00:00:00 2001 From: Alexey Bataev Date: Wed, 29 Nov 2017 18:20:04 +0000 Subject: [PATCH] [OPENMP] Do not allow `linear` clauses on non-simd distribute directives. `linear` clause is not allowed on non-simd distribute-based directives. llvm-svn: 319332 --- clang/include/clang/Basic/OpenMPKinds.def | 3 - .../distribute_parallel_for_linear_messages.cpp | 338 --------------------- .../OpenMP/distribute_parallel_for_messages.cpp | 2 +- ...get_teams_distribute_parallel_for_ast_print.cpp | 8 +- ...ams_distribute_parallel_for_linear_messages.cpp | 248 --------------- ...rget_teams_distribute_parallel_for_messages.cpp | 2 +- .../teams_distribute_parallel_for_ast_print.cpp | 8 +- ...ams_distribute_parallel_for_linear_messages.cpp | 293 ------------------ .../teams_distribute_parallel_for_messages.cpp | 2 +- 9 files changed, 11 insertions(+), 893 deletions(-) delete mode 100644 clang/test/OpenMP/distribute_parallel_for_linear_messages.cpp delete mode 100644 clang/test/OpenMP/target_teams_distribute_parallel_for_linear_messages.cpp delete mode 100644 clang/test/OpenMP/teams_distribute_parallel_for_linear_messages.cpp diff --git a/clang/include/clang/Basic/OpenMPKinds.def b/clang/include/clang/Basic/OpenMPKinds.def index 70f3ba3..806d0b7 100644 --- a/clang/include/clang/Basic/OpenMPKinds.def +++ b/clang/include/clang/Basic/OpenMPKinds.def @@ -610,7 +610,6 @@ OPENMP_DISTRIBUTE_PARALLEL_FOR_CLAUSE(shared) OPENMP_DISTRIBUTE_PARALLEL_FOR_CLAUSE(reduction) OPENMP_DISTRIBUTE_PARALLEL_FOR_CLAUSE(copyin) OPENMP_DISTRIBUTE_PARALLEL_FOR_CLAUSE(schedule) -OPENMP_DISTRIBUTE_PARALLEL_FOR_CLAUSE(linear) // Clauses allowed for OpenMP directive 'distribute parallel for simd' OPENMP_DISTRIBUTE_PARALLEL_FOR_SIMD_CLAUSE(firstprivate) @@ -746,7 +745,6 @@ OPENMP_TEAMS_DISTRIBUTE_PARALLEL_FOR_CLAUSE(private) OPENMP_TEAMS_DISTRIBUTE_PARALLEL_FOR_CLAUSE(shared) OPENMP_TEAMS_DISTRIBUTE_PARALLEL_FOR_CLAUSE(reduction) OPENMP_TEAMS_DISTRIBUTE_PARALLEL_FOR_CLAUSE(schedule) -OPENMP_TEAMS_DISTRIBUTE_PARALLEL_FOR_CLAUSE(linear) OPENMP_TEAMS_DISTRIBUTE_PARALLEL_FOR_CLAUSE(num_teams) OPENMP_TEAMS_DISTRIBUTE_PARALLEL_FOR_CLAUSE(thread_limit) OPENMP_TEAMS_DISTRIBUTE_PARALLEL_FOR_CLAUSE(copyin) @@ -807,7 +805,6 @@ OPENMP_TARGET_TEAMS_DISTRIBUTE_PARALLEL_FOR_CLAUSE(dist_schedule) OPENMP_TARGET_TEAMS_DISTRIBUTE_PARALLEL_FOR_CLAUSE(num_threads) OPENMP_TARGET_TEAMS_DISTRIBUTE_PARALLEL_FOR_CLAUSE(proc_bind) OPENMP_TARGET_TEAMS_DISTRIBUTE_PARALLEL_FOR_CLAUSE(schedule) -OPENMP_TARGET_TEAMS_DISTRIBUTE_PARALLEL_FOR_CLAUSE(linear) // Clauses allowed for OpenMP directive // 'target teams distribute parallel for simd'. diff --git a/clang/test/OpenMP/distribute_parallel_for_linear_messages.cpp b/clang/test/OpenMP/distribute_parallel_for_linear_messages.cpp deleted file mode 100644 index 779620c..0000000 --- a/clang/test/OpenMP/distribute_parallel_for_linear_messages.cpp +++ /dev/null @@ -1,338 +0,0 @@ -// RUN: %clang_cc1 -verify -fopenmp %s - -namespace X { - int x; -}; - -struct B { - static int ib; // expected-note {{'B::ib' declared here}} - static int bfoo() { return 8; } -}; - -int bfoo() { return 4; } - -int z; -const int C1 = 1; -const int C2 = 2; -void test_linear_colons() -{ - int B = 0; - -#pragma omp target -#pragma omp teams -#pragma omp distribute parallel for linear(B:bfoo()) - for (int i = 0; i < 10; ++i) ; - -#pragma omp target -#pragma omp teams -#pragma omp distribute parallel for linear(B::ib:B:bfoo()) // expected-error {{unexpected ':' in nested name specifier; did you mean '::'}} - for (int i = 0; i < 10; ++i) ; - -#pragma omp target -#pragma omp teams -#pragma omp distribute parallel for linear(B:ib) // expected-error {{use of undeclared identifier 'ib'; did you mean 'B::ib'}} - for (int i = 0; i < 10; ++i) ; - -#pragma omp target -#pragma omp teams -#pragma omp distribute parallel for linear(z:B:ib) // expected-error {{unexpected ':' in nested name specifier; did you mean '::'?}} - for (int i = 0; i < 10; ++i) ; - -#pragma omp target -#pragma omp teams -#pragma omp distribute parallel for linear(B:B::bfoo()) - for (int i = 0; i < 10; ++i) ; - -#pragma omp target -#pragma omp teams -#pragma omp distribute parallel for linear(X::x : ::z) - for (int i = 0; i < 10; ++i) ; - -#pragma omp target -#pragma omp teams -#pragma omp distribute parallel for linear(B,::z, X::x) - for (int i = 0; i < 10; ++i) ; - -#pragma omp target -#pragma omp teams -#pragma omp distribute parallel for linear(::z) - for (int i = 0; i < 10; ++i) ; - -#pragma omp target -#pragma omp teams -#pragma omp distribute parallel for linear(B::bfoo()) // expected-error {{expected variable name}} - for (int i = 0; i < 10; ++i) ; - -#pragma omp target -#pragma omp teams -#pragma omp distribute parallel for linear(B::ib,B:C1+C2) - for (int i = 0; i < 10; ++i) ; -} - -template T test_template(T* arr, N num) { - N i; - T sum = (T)0; - T ind2 = - num * L; // expected-note {{'ind2' defined here}} - -#pragma omp target -#pragma omp teams -#pragma omp distribute parallel for linear(ind2:L) // expected-error {{argument of a linear clause should be of integral or pointer type}} - for (i = 0; i < num; ++i) { - T cur = arr[(int)ind2]; - ind2 += L; - sum += cur; - } - return T(); -} - -template int test_warn() { - int ind2 = 0; - #pragma omp target - #pragma omp teams - #pragma omp parallel for simd linear(ind2:LEN) // expected-warning {{zero linear step (ind2 should probably be const)}} - for (int i = 0; i < 100; i++) { - ind2 += LEN; - } - return ind2; -} - -struct S1; // expected-note 2 {{declared here}} expected-note 2 {{forward declaration of 'S1'}} -extern S1 a; -class S2 { - mutable int a; -public: - S2():a(0) { } -}; -const S2 b; // expected-note 2 {{'b' defined here}} -const S2 ba[5]; -class S3 { - int a; -public: - S3():a(0) { } -}; -const S3 ca[5]; -class S4 { - int a; - S4(); -public: - S4(int v):a(v) { } -}; -class S5 { - int a; - S5():a(0) {} -public: - S5(int v):a(v) { } -}; - -S3 h; -#pragma omp threadprivate(h) // expected-note 2 {{defined as threadprivate or thread local}} - -template int foomain(I argc, C **argv) { - I e(4); - I g(5); - int i; - int &j = i; - -#pragma omp target -#pragma omp teams -#pragma omp distribute parallel for linear // expected-error {{expected '(' after 'linear'}} - for (int k = 0; k < argc; ++k) ++k; - -#pragma omp target -#pragma omp teams -#pragma omp distribute parallel for linear ( // expected-error {{expected expression}} expected-error {{expected ')'}} expected-note {{to match this '('}} - for (int k = 0; k < argc; ++k) ++k; - -#pragma omp target -#pragma omp teams -#pragma omp distribute parallel for linear () // expected-error {{expected expression}} - for (int k = 0; k < argc; ++k) ++k; - -#pragma omp target -#pragma omp teams -#pragma omp distribute parallel for linear (argc // expected-error {{expected ')'}} expected-note {{to match this '('}} - for (int k = 0; k < argc; ++k) ++k; - -#pragma omp target -#pragma omp teams -#pragma omp distribute parallel for linear (argc, // expected-error {{expected expression}} expected-error {{expected ')'}} expected-note {{to match this '('}} - for (int k = 0; k < argc; ++k) ++k; - -#pragma omp target -#pragma omp teams -#pragma omp distribute parallel for linear (argc > 0 ? argv[1] : argv[2]) // expected-error {{expected variable name}} - for (int k = 0; k < argc; ++k) ++k; - -#pragma omp target -#pragma omp teams -#pragma omp distribute parallel for linear (argc : 5) - for (int k = 0; k < argc; ++k) ++k; - -#pragma omp target -#pragma omp teams -#pragma omp distribute parallel for linear (S1) // expected-error {{'S1' does not refer to a value}} - for (int k = 0; k < argc; ++k) ++k; - -#pragma omp target -#pragma omp teams -#pragma omp distribute parallel for linear (a, b:B::ib) // expected-error {{linear variable with incomplete type 'S1'}} expected-error {{const-qualified variable cannot be linear}} - for (int k = 0; k < argc; ++k) ++k; - -#pragma omp target -#pragma omp teams -#pragma omp distribute parallel for linear (argv[1]) // expected-error {{expected variable name}} - for (int k = 0; k < argc; ++k) ++k; - -#pragma omp target -#pragma omp teams -#pragma omp distribute parallel for linear(e, g) - for (int k = 0; k < argc; ++k) ++k; - -#pragma omp target -#pragma omp teams -#pragma omp distribute parallel for linear(h) // expected-error {{threadprivate or thread local variable cannot be linear}} - for (int k = 0; k < argc; ++k) ++k; - -#pragma omp target -#pragma omp teams -#pragma omp distribute parallel for linear(i) - for (int k = 0; k < argc; ++k) ++k; - - #pragma omp parallel - { - int v = 0; - int i; - #pragma omp target - #pragma omp teams - #pragma omp distribute parallel for linear(v:i) - for (int k = 0; k < argc; ++k) { i = k; v += i; } - } - -#pragma omp target -#pragma omp teams -#pragma omp parallel for simd linear(j) - for (int k = 0; k < argc; ++k) ++k; - - int v = 0; - -#pragma omp target -#pragma omp teams -#pragma omp distribute parallel for linear(v:j) - for (int k = 0; k < argc; ++k) { ++k; v += j; } - -#pragma omp target -#pragma omp teams -#pragma omp distribute parallel for linear(i) - for (int k = 0; k < argc; ++k) ++k; - return 0; -} - -namespace A { -double x; -#pragma omp threadprivate(x) // expected-note {{defined as threadprivate or thread local}} -} -namespace C { -using A::x; -} - -int main(int argc, char **argv) { - double darr[100]; - // expected-note@+1 {{in instantiation of function template specialization 'test_template<-4, double, int>' requested here}} - test_template<-4>(darr, 4); - // expected-note@+1 {{in instantiation of function template specialization 'test_warn<0>' requested here}} - test_warn<0>(); - - S4 e(4); // expected-note {{'e' defined here}} - S5 g(5); // expected-note {{'g' defined here}} - int i; - int &j = i; - -#pragma omp target -#pragma omp teams -#pragma omp distribute parallel for linear // expected-error {{expected '(' after 'linear'}} - for (int k = 0; k < argc; ++k) ++k; - -#pragma omp target -#pragma omp teams -#pragma omp distribute parallel for linear ( // expected-error {{expected expression}} expected-error {{expected ')'}} expected-note {{to match this '('}} - for (int k = 0; k < argc; ++k) ++k; - -#pragma omp target -#pragma omp teams -#pragma omp distribute parallel for linear () // expected-error {{expected expression}} - for (int k = 0; k < argc; ++k) ++k; - -#pragma omp target -#pragma omp teams -#pragma omp distribute parallel for linear (argc // expected-error {{expected ')'}} expected-note {{to match this '('}} - for (int k = 0; k < argc; ++k) ++k; - -#pragma omp target -#pragma omp teams -#pragma omp distribute parallel for linear (argc, // expected-error {{expected expression}} expected-error {{expected ')'}} expected-note {{to match this '('}} - for (int k = 0; k < argc; ++k) ++k; - -#pragma omp target -#pragma omp teams -#pragma omp distribute parallel for linear (argc > 0 ? argv[1] : argv[2]) // expected-error {{expected variable name}} - for (int k = 0; k < argc; ++k) ++k; - -#pragma omp target -#pragma omp teams -#pragma omp distribute parallel for linear (argc) - for (int k = 0; k < argc; ++k) ++k; - -#pragma omp target -#pragma omp teams -#pragma omp distribute parallel for linear (S1) // expected-error {{'S1' does not refer to a value}} - for (int k = 0; k < argc; ++k) ++k; - - -#pragma omp target -#pragma omp teams -#pragma omp distribute parallel for linear (a, b) // expected-error {{linear variable with incomplete type 'S1'}} expected-error {{const-qualified variable cannot be linear}} - for (int k = 0; k < argc; ++k) ++k; - -#pragma omp target -#pragma omp teams -#pragma omp distribute parallel for linear (argv[1]) // expected-error {{expected variable name}} - for (int k = 0; k < argc; ++k) ++k; - -#pragma omp target -#pragma omp teams -#pragma omp distribute parallel for linear(e, g) // expected-error {{argument of a linear clause should be of integral or pointer type, not 'S4'}} expected-error {{argument of a linear clause should be of integral or pointer type, not 'S5'}} - for (int k = 0; k < argc; ++k) ++k; - -#pragma omp target -#pragma omp teams -#pragma omp distribute parallel for linear(h, C::x) // expected-error 2 {{threadprivate or thread local variable cannot be linear}} - for (int k = 0; k < argc; ++k) ++k; - - #pragma omp parallel - { - int i; - #pragma omp target - #pragma omp teams - #pragma omp distribute parallel for linear(i) - for (int k = 0; k < argc; ++k) ++k; - - #pragma omp target - #pragma omp teams - #pragma omp distribute parallel for linear(i : 4) - for (int k = 0; k < argc; ++k) { ++k; i += 4; } - } - -#pragma omp target -#pragma omp teams -#pragma omp distribute parallel for linear(j) - for (int k = 0; k < argc; ++k) ++k; - -#pragma omp target -#pragma omp teams -#pragma omp distribute parallel for linear(i) - for (int k = 0; k < argc; ++k) ++k; - - foomain(argc,argv); // expected-note {{in instantiation of function template specialization 'foomain' requested here}} - return 0; -} - diff --git a/clang/test/OpenMP/distribute_parallel_for_messages.cpp b/clang/test/OpenMP/distribute_parallel_for_messages.cpp index b61c4e7..b1bb8d0 100644 --- a/clang/test/OpenMP/distribute_parallel_for_messages.cpp +++ b/clang/test/OpenMP/distribute_parallel_for_messages.cpp @@ -38,7 +38,7 @@ int main(int argc, char **argv) { foo(); #pragma omp target #pragma omp teams -#pragma omp distribute parallel for +#pragma omp distribute parallel for linear(argc) // expected-error {{unexpected OpenMP clause 'linear' in directive '#pragma omp distribute parallel for'}} for (int i = 0; i < argc; ++i) foo(); #pragma omp target diff --git a/clang/test/OpenMP/target_teams_distribute_parallel_for_ast_print.cpp b/clang/test/OpenMP/target_teams_distribute_parallel_for_ast_print.cpp index de8d630..f51c4fe 100644 --- a/clang/test/OpenMP/target_teams_distribute_parallel_for_ast_print.cpp +++ b/clang/test/OpenMP/target_teams_distribute_parallel_for_ast_print.cpp @@ -116,10 +116,10 @@ T tmain(T argc) { // CHECK: #pragma omp target teams distribute parallel for default(none) private(b) firstprivate(argc) shared(d) reduction(+: c) reduction(max: e) num_teams(f) thread_limit(d) // CHECK-NEXT: for (int k = 0; k < 10; ++k) // CHECK-NEXT: e += d + argc; -#pragma omp target teams distribute parallel for linear(d) +#pragma omp target teams distribute parallel for for (int k = 0; k < 10; ++k) e += d + argc; -// CHECK: #pragma omp target teams distribute parallel for linear(d) +// CHECK: #pragma omp target teams distribute parallel for // CHECK-NEXT: for (int k = 0; k < 10; ++k) // CHECK-NEXT: e += d + argc; return T(); @@ -161,10 +161,10 @@ int main (int argc, char **argv) { // CHECK: #pragma omp target teams distribute parallel for default(none) private(b) firstprivate(argc) shared(d) reduction(+: c) reduction(max: e) num_teams(f) thread_limit(d) // CHECK-NEXT: for (int k = 0; k < 10; ++k) // CHECK-NEXT: e += d + argc; -#pragma omp target teams distribute parallel for linear(d) +#pragma omp target teams distribute parallel for for (int k = 0; k < 10; ++k) e += d + argc; -// CHECK: #pragma omp target teams distribute parallel for linear(d) +// CHECK: #pragma omp target teams distribute parallel for // CHECK-NEXT: for (int k = 0; k < 10; ++k) // CHECK-NEXT: e += d + argc; return (0); diff --git a/clang/test/OpenMP/target_teams_distribute_parallel_for_linear_messages.cpp b/clang/test/OpenMP/target_teams_distribute_parallel_for_linear_messages.cpp deleted file mode 100644 index 82220dc..0000000 --- a/clang/test/OpenMP/target_teams_distribute_parallel_for_linear_messages.cpp +++ /dev/null @@ -1,248 +0,0 @@ -// RUN: %clang_cc1 -verify -fopenmp %s - -namespace X { - int x; -}; - -struct B { - static int ib; // expected-note {{'B::ib' declared here}} - static int bfoo() { return 8; } -}; - -int bfoo() { return 4; } - -int z; -const int C1 = 1; -const int C2 = 2; -void test_linear_colons() -{ - int B = 0; - -#pragma omp target teams distribute parallel for linear(B:bfoo()) - for (int i = 0; i < 10; ++i) ; - -#pragma omp target teams distribute parallel for linear(B::ib:B:bfoo()) // expected-error {{unexpected ':' in nested name specifier; did you mean '::'}} - for (int i = 0; i < 10; ++i) ; - -#pragma omp target teams distribute parallel for linear(B:ib) // expected-error {{use of undeclared identifier 'ib'; did you mean 'B::ib'}} - for (int i = 0; i < 10; ++i) ; - -#pragma omp target teams distribute parallel for linear(z:B:ib) // expected-error {{unexpected ':' in nested name specifier; did you mean '::'?}} - for (int i = 0; i < 10; ++i) ; - -#pragma omp target teams distribute parallel for linear(B:B::bfoo()) - for (int i = 0; i < 10; ++i) ; - -#pragma omp target teams distribute parallel for linear(X::x : ::z) - for (int i = 0; i < 10; ++i) ; - -#pragma omp target teams distribute parallel for linear(B,::z, X::x) - for (int i = 0; i < 10; ++i) ; - -#pragma omp target teams distribute parallel for linear(::z) - for (int i = 0; i < 10; ++i) ; - -#pragma omp target teams distribute parallel for linear(B::bfoo()) // expected-error {{expected variable name}} - for (int i = 0; i < 10; ++i) ; - -#pragma omp target teams distribute parallel for linear(B::ib,B:C1+C2) - for (int i = 0; i < 10; ++i) ; -} - -template T test_template(T* arr, N num) { - N i; - T sum = (T)0; - T ind2 = - num * L; // expected-note {{'ind2' defined here}} - -#pragma omp target teams distribute parallel for linear(ind2:L) // expected-error {{argument of a linear clause should be of integral or pointer type}} - for (i = 0; i < num; ++i) { - T cur = arr[(int)ind2]; - ind2 += L; - sum += cur; - } - return T(); -} - -template int test_warn() { - int ind2 = 0; -#pragma omp target teams distribute parallel for linear(ind2:LEN) // expected-warning {{zero linear step (ind2 should probably be const)}} - for (int i = 0; i < 100; i++) { - ind2 += LEN; - } - return ind2; -} - -struct S1; // expected-note 2 {{declared here}} expected-note 2 {{forward declaration of 'S1'}} -extern S1 a; -class S2 { - mutable int a; -public: - S2():a(0) { } -}; -const S2 b; // expected-note 2 {{'b' defined here}} -const S2 ba[5]; -class S3 { - int a; -public: - S3():a(0) { } -}; -const S3 ca[5]; -class S4 { - int a; - S4(); -public: - S4(int v):a(v) { } -}; -class S5 { - int a; - S5():a(0) {} -public: - S5(int v):a(v) { } -}; - -S3 h; -#pragma omp threadprivate(h) // expected-note 2 {{defined as threadprivate or thread local}} - -template int foomain(I argc, C **argv) { - I e(4); - I g(5); - int i; - int &j = i; - -#pragma omp target teams distribute parallel for linear // expected-error {{expected '(' after 'linear'}} - for (int k = 0; k < argc; ++k) ++k; - -#pragma omp target teams distribute parallel for linear ( // expected-error {{expected expression}} expected-error {{expected ')'}} expected-note {{to match this '('}} - for (int k = 0; k < argc; ++k) ++k; - -#pragma omp target teams distribute parallel for linear () // expected-error {{expected expression}} - for (int k = 0; k < argc; ++k) ++k; - -#pragma omp target teams distribute parallel for linear (argc // expected-error {{expected ')'}} expected-note {{to match this '('}} - for (int k = 0; k < argc; ++k) ++k; - -#pragma omp target teams distribute parallel for linear (argc, // expected-error {{expected expression}} expected-error {{expected ')'}} expected-note {{to match this '('}} - for (int k = 0; k < argc; ++k) ++k; - -#pragma omp target teams distribute parallel for linear (argc > 0 ? argv[1] : argv[2]) // expected-error {{expected variable name}} - for (int k = 0; k < argc; ++k) ++k; - -#pragma omp target teams distribute parallel for linear (argc : 5) - for (int k = 0; k < argc; ++k) ++k; - -#pragma omp target teams distribute parallel for linear (S1) // expected-error {{'S1' does not refer to a value}} - for (int k = 0; k < argc; ++k) ++k; - -#pragma omp target teams distribute parallel for linear (a, b:B::ib) // expected-error {{linear variable with incomplete type 'S1'}} expected-error {{const-qualified variable cannot be linear}} - for (int k = 0; k < argc; ++k) ++k; - -#pragma omp target teams distribute parallel for linear (argv[1]) // expected-error {{expected variable name}} - for (int k = 0; k < argc; ++k) ++k; - -#pragma omp target teams distribute parallel for linear(e, g) - for (int k = 0; k < argc; ++k) ++k; - -#pragma omp target teams distribute parallel for linear(h) // expected-error {{threadprivate or thread local variable cannot be linear}} - for (int k = 0; k < argc; ++k) ++k; - -#pragma omp target teams distribute parallel for linear(i) - for (int k = 0; k < argc; ++k) ++k; - - #pragma omp parallel - { - int v = 0; - int i; - #pragma omp target teams distribute parallel for linear(v:i) - for (int k = 0; k < argc; ++k) { i = k; v += i; } - } - -#pragma omp target teams distribute parallel for linear(j) - for (int k = 0; k < argc; ++k) ++k; - - int v = 0; - -#pragma omp target teams distribute parallel for linear(v:j) - for (int k = 0; k < argc; ++k) { ++k; v += j; } - -#pragma omp target teams distribute parallel for linear(i) - for (int k = 0; k < argc; ++k) ++k; - return 0; -} - -namespace A { -double x; -#pragma omp threadprivate(x) // expected-note {{defined as threadprivate or thread local}} -} -namespace C { -using A::x; -} - -int main(int argc, char **argv) { - double darr[100]; - // expected-note@+1 {{in instantiation of function template specialization 'test_template<-4, double, int>' requested here}} - test_template<-4>(darr, 4); - // expected-note@+1 {{in instantiation of function template specialization 'test_warn<0>' requested here}} - test_warn<0>(); - - S4 e(4); // expected-note {{'e' defined here}} - S5 g(5); // expected-note {{'g' defined here}} - int i; - int &j = i; - -#pragma omp target teams distribute parallel for linear // expected-error {{expected '(' after 'linear'}} - for (int k = 0; k < argc; ++k) ++k; - -#pragma omp target teams distribute parallel for linear ( // expected-error {{expected expression}} expected-error {{expected ')'}} expected-note {{to match this '('}} - for (int k = 0; k < argc; ++k) ++k; - -#pragma omp target teams distribute parallel for linear () // expected-error {{expected expression}} - for (int k = 0; k < argc; ++k) ++k; - -#pragma omp target teams distribute parallel for linear (argc // expected-error {{expected ')'}} expected-note {{to match this '('}} - for (int k = 0; k < argc; ++k) ++k; - -#pragma omp target teams distribute parallel for linear (argc, // expected-error {{expected expression}} expected-error {{expected ')'}} expected-note {{to match this '('}} - for (int k = 0; k < argc; ++k) ++k; - -#pragma omp target teams distribute parallel for linear (argc > 0 ? argv[1] : argv[2]) // expected-error {{expected variable name}} - for (int k = 0; k < argc; ++k) ++k; - -#pragma omp target teams distribute parallel for linear (argc) - for (int k = 0; k < argc; ++k) ++k; - -#pragma omp target teams distribute parallel for linear (S1) // expected-error {{'S1' does not refer to a value}} - for (int k = 0; k < argc; ++k) ++k; - - -#pragma omp target teams distribute parallel for linear (a, b) // expected-error {{linear variable with incomplete type 'S1'}} expected-error {{const-qualified variable cannot be linear}} - for (int k = 0; k < argc; ++k) ++k; - -#pragma omp target teams distribute parallel for linear (argv[1]) // expected-error {{expected variable name}} - for (int k = 0; k < argc; ++k) ++k; - -#pragma omp target teams distribute parallel for linear(e, g) // expected-error {{argument of a linear clause should be of integral or pointer type, not 'S4'}} expected-error {{argument of a linear clause should be of integral or pointer type, not 'S5'}} - for (int k = 0; k < argc; ++k) ++k; - -#pragma omp target teams distribute parallel for linear(h, C::x) // expected-error 2 {{threadprivate or thread local variable cannot be linear}} - for (int k = 0; k < argc; ++k) ++k; - -#pragma omp parallel -{ - int i; -#pragma omp target teams distribute parallel for linear(i) - for (int k = 0; k < argc; ++k) ++k; - -#pragma omp target teams distribute parallel for linear(i : 4) - for (int k = 0; k < argc; ++k) { ++k; i += 4; } -} - -#pragma omp target teams distribute parallel for linear(j) - for (int k = 0; k < argc; ++k) ++k; - -#pragma omp target teams distribute parallel for linear(i) - for (int k = 0; k < argc; ++k) ++k; - - foomain(argc,argv); // expected-note {{in instantiation of function template specialization 'foomain' requested here}} - return 0; -} - diff --git a/clang/test/OpenMP/target_teams_distribute_parallel_for_messages.cpp b/clang/test/OpenMP/target_teams_distribute_parallel_for_messages.cpp index cb76ef2..1513583 100644 --- a/clang/test/OpenMP/target_teams_distribute_parallel_for_messages.cpp +++ b/clang/test/OpenMP/target_teams_distribute_parallel_for_messages.cpp @@ -27,7 +27,7 @@ int main(int argc, char **argv) { #pragma omp target teams distribute parallel for } // expected-warning {{extra tokens at the end of '#pragma omp target teams distribute parallel for' are ignored}} for (int i = 0; i < argc; ++i) foo(); -#pragma omp target teams distribute parallel for +#pragma omp target teams distribute parallel for linear(argc) // expected-error {{unexpected OpenMP clause 'linear' in directive '#pragma omp target teams distribute parallel for'}} for (int i = 0; i < argc; ++i) foo(); // expected-warning@+1 {{extra tokens at the end of '#pragma omp target teams distribute parallel for' are ignored}} diff --git a/clang/test/OpenMP/teams_distribute_parallel_for_ast_print.cpp b/clang/test/OpenMP/teams_distribute_parallel_for_ast_print.cpp index 440ec7d..68bd424 100644 --- a/clang/test/OpenMP/teams_distribute_parallel_for_ast_print.cpp +++ b/clang/test/OpenMP/teams_distribute_parallel_for_ast_print.cpp @@ -138,11 +138,11 @@ T tmain(T argc) { // CHECK-NEXT: for (int k = 0; k < 10; ++k) // CHECK-NEXT: e += d + argc; #pragma omp target -#pragma omp teams distribute parallel for linear(d) +#pragma omp teams distribute parallel for for (int k = 0; k < 10; ++k) e += d + argc; // CHECK: #pragma omp target -// CHECK-NEXT: #pragma omp teams distribute parallel for linear(d) +// CHECK-NEXT: #pragma omp teams distribute parallel for // CHECK-NEXT: for (int k = 0; k < 10; ++k) // CHECK-NEXT: e += d + argc; return T(); @@ -193,11 +193,11 @@ int main (int argc, char **argv) { // CHECK-NEXT: for (int k = 0; k < 10; ++k) // CHECK-NEXT: e += d + argc; #pragma omp target -#pragma omp teams distribute parallel for linear(d) +#pragma omp teams distribute parallel for for (int k = 0; k < 10; ++k) e += d + argc; // CHECK: #pragma omp target -// CHECK-NEXT: #pragma omp teams distribute parallel for linear(d) +// CHECK-NEXT: #pragma omp teams distribute parallel for // CHECK-NEXT: for (int k = 0; k < 10; ++k) // CHECK-NEXT: e += d + argc; return (0); diff --git a/clang/test/OpenMP/teams_distribute_parallel_for_linear_messages.cpp b/clang/test/OpenMP/teams_distribute_parallel_for_linear_messages.cpp deleted file mode 100644 index b14fb23..0000000 --- a/clang/test/OpenMP/teams_distribute_parallel_for_linear_messages.cpp +++ /dev/null @@ -1,293 +0,0 @@ -// RUN: %clang_cc1 -verify -fopenmp %s - -namespace X { - int x; -}; - -struct B { - static int ib; // expected-note {{'B::ib' declared here}} - static int bfoo() { return 8; } -}; - -int bfoo() { return 4; } - -int z; -const int C1 = 1; -const int C2 = 2; -void test_linear_colons() -{ - int B = 0; - -#pragma omp target -#pragma omp teams distribute parallel for linear(B:bfoo()) - for (int i = 0; i < 10; ++i) ; - -#pragma omp target -#pragma omp teams distribute parallel for linear(B::ib:B:bfoo()) // expected-error {{unexpected ':' in nested name specifier; did you mean '::'}} - for (int i = 0; i < 10; ++i) ; - -#pragma omp target -#pragma omp teams distribute parallel for linear(B:ib) // expected-error {{use of undeclared identifier 'ib'; did you mean 'B::ib'}} - for (int i = 0; i < 10; ++i) ; - -#pragma omp target -#pragma omp teams distribute parallel for linear(z:B:ib) // expected-error {{unexpected ':' in nested name specifier; did you mean '::'?}} - for (int i = 0; i < 10; ++i) ; - -#pragma omp target -#pragma omp teams distribute parallel for linear(B:B::bfoo()) - for (int i = 0; i < 10; ++i) ; - -#pragma omp target -#pragma omp teams distribute parallel for linear(X::x : ::z) - for (int i = 0; i < 10; ++i) ; - -#pragma omp target -#pragma omp teams distribute parallel for linear(B,::z, X::x) - for (int i = 0; i < 10; ++i) ; - -#pragma omp target -#pragma omp teams distribute parallel for linear(::z) - for (int i = 0; i < 10; ++i) ; - -#pragma omp target -#pragma omp teams distribute parallel for linear(B::bfoo()) // expected-error {{expected variable name}} - for (int i = 0; i < 10; ++i) ; - -#pragma omp target -#pragma omp teams distribute parallel for linear(B::ib,B:C1+C2) - for (int i = 0; i < 10; ++i) ; -} - -template T test_template(T* arr, N num) { - N i; - T sum = (T)0; - T ind2 = - num * L; // expected-note {{'ind2' defined here}} - -#pragma omp target -#pragma omp teams distribute parallel for linear(ind2:L) // expected-error {{argument of a linear clause should be of integral or pointer type}} - for (i = 0; i < num; ++i) { - T cur = arr[(int)ind2]; - ind2 += L; - sum += cur; - } - return T(); -} - -template int test_warn() { - int ind2 = 0; - #pragma omp target - #pragma omp teams distribute parallel for linear(ind2:LEN) // expected-warning {{zero linear step (ind2 should probably be const)}} - for (int i = 0; i < 100; i++) { - ind2 += LEN; - } - return ind2; -} - -struct S1; // expected-note 2 {{declared here}} expected-note 2 {{forward declaration of 'S1'}} -extern S1 a; -class S2 { - mutable int a; -public: - S2():a(0) { } -}; -const S2 b; // expected-note 2 {{'b' defined here}} -const S2 ba[5]; -class S3 { - int a; -public: - S3():a(0) { } -}; -const S3 ca[5]; -class S4 { - int a; - S4(); -public: - S4(int v):a(v) { } -}; -class S5 { - int a; - S5():a(0) {} -public: - S5(int v):a(v) { } -}; - -S3 h; -#pragma omp threadprivate(h) // expected-note 2 {{defined as threadprivate or thread local}} - -template int foomain(I argc, C **argv) { - I e(4); - I g(5); - int i; - int &j = i; - -#pragma omp target -#pragma omp teams distribute parallel for linear // expected-error {{expected '(' after 'linear'}} - for (int k = 0; k < argc; ++k) ++k; - -#pragma omp target -#pragma omp teams distribute parallel for linear ( // expected-error {{expected expression}} expected-error {{expected ')'}} expected-note {{to match this '('}} - for (int k = 0; k < argc; ++k) ++k; - -#pragma omp target -#pragma omp teams distribute parallel for linear () // expected-error {{expected expression}} - for (int k = 0; k < argc; ++k) ++k; - -#pragma omp target -#pragma omp teams distribute parallel for linear (argc // expected-error {{expected ')'}} expected-note {{to match this '('}} - for (int k = 0; k < argc; ++k) ++k; - -#pragma omp target -#pragma omp teams distribute parallel for linear (argc, // expected-error {{expected expression}} expected-error {{expected ')'}} expected-note {{to match this '('}} - for (int k = 0; k < argc; ++k) ++k; - -#pragma omp target -#pragma omp teams distribute parallel for linear (argc > 0 ? argv[1] : argv[2]) // expected-error {{expected variable name}} - for (int k = 0; k < argc; ++k) ++k; - -#pragma omp target -#pragma omp teams distribute parallel for linear (argc : 5) - for (int k = 0; k < argc; ++k) ++k; - -#pragma omp target -#pragma omp teams distribute parallel for linear (S1) // expected-error {{'S1' does not refer to a value}} - for (int k = 0; k < argc; ++k) ++k; - -#pragma omp target -#pragma omp teams distribute parallel for linear (a, b:B::ib) // expected-error {{linear variable with incomplete type 'S1'}} expected-error {{const-qualified variable cannot be linear}} - for (int k = 0; k < argc; ++k) ++k; - -#pragma omp target -#pragma omp teams distribute parallel for linear (argv[1]) // expected-error {{expected variable name}} - for (int k = 0; k < argc; ++k) ++k; - -#pragma omp target -#pragma omp teams distribute parallel for linear(e, g) - for (int k = 0; k < argc; ++k) ++k; - -#pragma omp target -#pragma omp teams distribute parallel for linear(h) // expected-error {{threadprivate or thread local variable cannot be linear}} - for (int k = 0; k < argc; ++k) ++k; - -#pragma omp target -#pragma omp teams distribute parallel for linear(i) - for (int k = 0; k < argc; ++k) ++k; - - #pragma omp parallel - { - int v = 0; - int i; - #pragma omp target - #pragma omp teams distribute parallel for linear(v:i) - for (int k = 0; k < argc; ++k) { i = k; v += i; } - } - -#pragma omp target -#pragma omp teams distribute parallel for linear(j) - for (int k = 0; k < argc; ++k) ++k; - - int v = 0; - -#pragma omp target -#pragma omp teams distribute parallel for linear(v:j) - for (int k = 0; k < argc; ++k) { ++k; v += j; } - -#pragma omp target -#pragma omp teams distribute parallel for linear(i) - for (int k = 0; k < argc; ++k) ++k; - return 0; -} - -namespace A { -double x; -#pragma omp threadprivate(x) // expected-note {{defined as threadprivate or thread local}} -} -namespace C { -using A::x; -} - -int main(int argc, char **argv) { - double darr[100]; - // expected-note@+1 {{in instantiation of function template specialization 'test_template<-4, double, int>' requested here}} - test_template<-4>(darr, 4); - // expected-note@+1 {{in instantiation of function template specialization 'test_warn<0>' requested here}} - test_warn<0>(); - - S4 e(4); // expected-note {{'e' defined here}} - S5 g(5); // expected-note {{'g' defined here}} - int i; - int &j = i; - -#pragma omp target -#pragma omp teams distribute parallel for linear // expected-error {{expected '(' after 'linear'}} - for (int k = 0; k < argc; ++k) ++k; - -#pragma omp target -#pragma omp teams distribute parallel for linear ( // expected-error {{expected expression}} expected-error {{expected ')'}} expected-note {{to match this '('}} - for (int k = 0; k < argc; ++k) ++k; - -#pragma omp target -#pragma omp teams distribute parallel for linear () // expected-error {{expected expression}} - for (int k = 0; k < argc; ++k) ++k; - -#pragma omp target -#pragma omp teams distribute parallel for linear (argc // expected-error {{expected ')'}} expected-note {{to match this '('}} - for (int k = 0; k < argc; ++k) ++k; - -#pragma omp target -#pragma omp teams distribute parallel for linear (argc, // expected-error {{expected expression}} expected-error {{expected ')'}} expected-note {{to match this '('}} - for (int k = 0; k < argc; ++k) ++k; - -#pragma omp target -#pragma omp teams distribute parallel for linear (argc > 0 ? argv[1] : argv[2]) // expected-error {{expected variable name}} - for (int k = 0; k < argc; ++k) ++k; - -#pragma omp target -#pragma omp teams distribute parallel for linear (argc) - for (int k = 0; k < argc; ++k) ++k; - -#pragma omp target -#pragma omp teams distribute parallel for linear (S1) // expected-error {{'S1' does not refer to a value}} - for (int k = 0; k < argc; ++k) ++k; - - -#pragma omp target -#pragma omp teams distribute parallel for linear (a, b) // expected-error {{linear variable with incomplete type 'S1'}} expected-error {{const-qualified variable cannot be linear}} - for (int k = 0; k < argc; ++k) ++k; - -#pragma omp target -#pragma omp teams distribute parallel for linear (argv[1]) // expected-error {{expected variable name}} - for (int k = 0; k < argc; ++k) ++k; - -#pragma omp target -#pragma omp teams distribute parallel for linear(e, g) // expected-error {{argument of a linear clause should be of integral or pointer type, not 'S4'}} expected-error {{argument of a linear clause should be of integral or pointer type, not 'S5'}} - for (int k = 0; k < argc; ++k) ++k; - -#pragma omp target -#pragma omp teams distribute parallel for linear(h, C::x) // expected-error 2 {{threadprivate or thread local variable cannot be linear}} - for (int k = 0; k < argc; ++k) ++k; - - #pragma omp parallel - { - int i; - #pragma omp target - #pragma omp teams distribute parallel for linear(i) - for (int k = 0; k < argc; ++k) ++k; - - #pragma omp target - #pragma omp teams distribute parallel for linear(i : 4) - for (int k = 0; k < argc; ++k) { ++k; i += 4; } - } - -#pragma omp target -#pragma omp teams distribute parallel for linear(j) - for (int k = 0; k < argc; ++k) ++k; - -#pragma omp target -#pragma omp teams distribute parallel for linear(i) - for (int k = 0; k < argc; ++k) ++k; - - foomain(argc,argv); // expected-note {{in instantiation of function template specialization 'foomain' requested here}} - return 0; -} - diff --git a/clang/test/OpenMP/teams_distribute_parallel_for_messages.cpp b/clang/test/OpenMP/teams_distribute_parallel_for_messages.cpp index dd88abd..9b8d756 100644 --- a/clang/test/OpenMP/teams_distribute_parallel_for_messages.cpp +++ b/clang/test/OpenMP/teams_distribute_parallel_for_messages.cpp @@ -34,7 +34,7 @@ int main(int argc, char **argv) { for (int i = 0; i < argc; ++i) foo(); #pragma omp target -#pragma omp teams distribute parallel for +#pragma omp teams distribute parallel for linear(argc) // expected-error {{unexpected OpenMP clause 'linear' in directive '#pragma omp teams distribute parallel for'}} for (int i = 0; i < argc; ++i) foo(); // expected-warning@+2 {{extra tokens at the end of '#pragma omp teams distribute parallel for' are ignored}} -- 2.7.4