replica
/
hanchenye-llvm-project
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[OPENMP5.0]Allow teams directive outside of the target directives. 

According to OpenMP 5.0, teams directives are allowed not only in the
target context, but also in the implicit parallel regions.

llvm-svn: 371553
This commit is contained in:
Alexey Bataev 2019-09-10 20:19:58 +00:00
parent 38e033bf33
commit 7a54d76fa5
4 changed files with 49 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
clang/lib/Sema/SemaOpenMP.cpp
View File

@ -3876,7 +3876,10 @@ static bool checkNestingOfRegions(Sema &SemaRef, const DSAStackTy *Stack,
// OpenMP [2.16, Nesting of Regions] // OpenMP [2.16, Nesting of Regions]
// If specified, a teams construct must be contained within a target // If specified, a teams construct must be contained within a target
// construct. // construct.
NestingProhibited = ParentRegion != OMPD_target; NestingProhibited =
(SemaRef.LangOpts.OpenMP <= 45 && ParentRegion != OMPD_target) ||
(SemaRef.LangOpts.OpenMP >= 50 && ParentRegion != OMPD_unknown &&
ParentRegion != OMPD_target);
OrphanSeen = ParentRegion == OMPD_unknown; OrphanSeen = ParentRegion == OMPD_unknown;
Recommend = ShouldBeInTargetRegion; Recommend = ShouldBeInTargetRegion;
} }

13
clang/test/OpenMP/teams_ast_print.cpp
View File

@ -1,6 +1,9 @@
// RUN: %clang_cc1 -verify -fopenmp -ast-print %s | FileCheck %s // RUN: %clang_cc1 -verify -fopenmp -ast-print %s | FileCheck %s
// RUN: %clang_cc1 -fopenmp -x c++ -std=c++11 -emit-pch -o %t %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 // RUN: %clang_cc1 -fopenmp -std=c++11 -include-pch %t -fsyntax-only -verify %s -ast-print | FileCheck %s
// RUN: %clang_cc1 -verify -fopenmp -fopenmp-version=50 -DOMP5 -ast-print %s | FileCheck %s --check-prefix=CHECK --check-prefix=OMP5
// RUN: %clang_cc1 -fopenmp -fopenmp-version=50 -DOMP5 -x c++ -std=c++11 -emit-pch -o %t %s
// RUN: %clang_cc1 -fopenmp -fopenmp-version=50 -DOMP5 -std=c++11 -include-pch %t -fsyntax-only -verify %s -ast-print | FileCheck %s --check-prefix=CHECK --check-prefix=OMP5
// RUN: %clang_cc1 -verify -fopenmp-simd -ast-print %s | FileCheck %s // RUN: %clang_cc1 -verify -fopenmp-simd -ast-print %s | FileCheck %s
// RUN: %clang_cc1 -fopenmp-simd -x c++ -std=c++11 -emit-pch -o %t %s // RUN: %clang_cc1 -fopenmp-simd -x c++ -std=c++11 -emit-pch -o %t %s
@ -37,6 +40,10 @@ T tmain(T argc, T *argv) {
T b = argc, c, d, e, f, g; T b = argc, c, d, e, f, g;
static T a; static T a;
S<T> s; S<T> s;
#ifdef OMP5
#pragma omp teams
a=2;
#endif // OMP5
#pragma omp target #pragma omp target
#pragma omp teams #pragma omp teams
a=2; a=2;
@ -53,6 +60,8 @@ T tmain(T argc, T *argv) {
// CHECK-NEXT: T b = argc, c, d, e, f, g; // CHECK-NEXT: T b = argc, c, d, e, f, g;
// CHECK-NEXT: static T a; // CHECK-NEXT: static T a;
// CHECK-NEXT: S<T> s; // CHECK-NEXT: S<T> s;
// OMP5-NEXT: #pragma omp teams
// OMP5-NEXT: a = 2;
// CHECK-NEXT: #pragma omp target // CHECK-NEXT: #pragma omp target
// CHECK-NEXT: #pragma omp teams{{$}} // CHECK-NEXT: #pragma omp teams{{$}}
// CHECK-NEXT: a = 2; // CHECK-NEXT: a = 2;
@ -66,6 +75,8 @@ T tmain(T argc, T *argv) {
// CHECK-NEXT: int b = argc, c, d, e, f, g; // CHECK-NEXT: int b = argc, c, d, e, f, g;
// CHECK-NEXT: static int a; // CHECK-NEXT: static int a;
// CHECK-NEXT: S<int> s; // CHECK-NEXT: S<int> s;
// OMP5-NEXT: #pragma omp teams
// OMP5-NEXT: a = 2;
// CHECK-NEXT: #pragma omp target // CHECK-NEXT: #pragma omp target
// CHECK-NEXT: #pragma omp teams // CHECK-NEXT: #pragma omp teams
// CHECK-NEXT: a = 2; // CHECK-NEXT: a = 2;
@ -79,6 +90,8 @@ T tmain(T argc, T *argv) {
// CHECK-NEXT: long b = argc, c, d, e, f, g; // CHECK-NEXT: long b = argc, c, d, e, f, g;
// CHECK-NEXT: static long a; // CHECK-NEXT: static long a;
// CHECK-NEXT: S<long> s; // CHECK-NEXT: S<long> s;
// OMP5-NEXT: #pragma omp teams
// OMP5-NEXT: a = 2;
// CHECK-NEXT: #pragma omp target // CHECK-NEXT: #pragma omp target
// CHECK-NEXT: #pragma omp teams // CHECK-NEXT: #pragma omp teams
// CHECK-NEXT: a = 2; // CHECK-NEXT: a = 2;

27
clang/test/OpenMP/teams_codegen.cpp
View File

@ -394,4 +394,31 @@ int main (int argc, char **argv) {
// CK5-NEXT: } // CK5-NEXT: }
#endif // CK5 #endif // CK5
// Test host codegen.
// RUN: %clang_cc1 -DCK6 -verify -fopenmp -fopenmp-version=50 -x c++ -triple powerpc64le-unknown-unknown -fopenmp-targets=powerpc64le-ibm-linux-gnu -emit-llvm %s -o - | FileCheck %s --check-prefix CK6 --check-prefix CK6-64
// RUN: %clang_cc1 -DCK6 -fopenmp -fopenmp-version=50 -x c++ -std=c++11 -triple powerpc64le-unknown-unknown -fopenmp-targets=powerpc64le-ibm-linux-gnu -emit-pch -o %t %s
// RUN: %clang_cc1 -DCK6 -fopenmp-version=50 -fopenmp -x c++ -triple powerpc64le-unknown-unknown -fopenmp-targets=powerpc64le-ibm-linux-gnu -std=c++11 -include-pch %t -verify %s -emit-llvm -o - | FileCheck %s --check-prefix CK6 --check-prefix CK6-64
// RUN: %clang_cc1 -DCK6 -verify -fopenmp -fopenmp-version=50 -x c++ -triple i386-unknown-unknown -fopenmp-targets=i386-pc-linux-gnu -emit-llvm %s -o - | FileCheck %s --check-prefix CK6 --check-prefix CK6-32
// RUN: %clang_cc1 -DCK6 -fopenmp -fopenmp-version=50 -x c++ -std=c++11 -triple i386-unknown-unknown -fopenmp-targets=i386-pc-linux-gnu -emit-pch -o %t %s
// RUN: %clang_cc1 -DCK6 -fopenmp -fopenmp-version=50 -x c++ -triple i386-unknown-unknown -fopenmp-targets=i386-pc-linux-gnu -std=c++11 -include-pch %t -verify %s -emit-llvm -o - | FileCheck %s --check-prefix CK6 --check-prefix CK6-32
// RUN: %clang_cc1 -DCK6 -verify -fopenmp-version=50 -fopenmp-simd -x c++ -triple powerpc64le-unknown-unknown -fopenmp-targets=powerpc64le-ibm-linux-gnu -emit-llvm %s -o - | FileCheck --check-prefix SIMD-ONLY0 %s
// RUN: %clang_cc1 -DCK6 -fopenmp-simd -fopenmp-version=50 -x c++ -std=c++11 -triple powerpc64le-unknown-unknown -fopenmp-targets=powerpc64le-ibm-linux-gnu -emit-pch -o %t %s
// RUN: %clang_cc1 -DCK6 -fopenmp-simd -fopenmp-version=50 -x c++ -triple powerpc64le-unknown-unknown -fopenmp-targets=powerpc64le-ibm-linux-gnu -std=c++11 -include-pch %t -verify %s -emit-llvm -o - | FileCheck --check-prefix SIMD-ONLY0 %s
// RUN: %clang_cc1 -DCK6 -verify -fopenmp-simd -fopenmp-version=50 -x c++ -triple i386-unknown-unknown -fopenmp-targets=i386-pc-linux-gnu -emit-llvm %s -o - | FileCheck --check-prefix SIMD-ONLY0 %s
// RUN: %clang_cc1 -DCK6 -fopenmp-simd -fopenmp-version=50 -x c++ -std=c++11 -triple i386-unknown-unknown -fopenmp-targets=i386-pc-linux-gnu -emit-pch -o %t %s
// RUN: %clang_cc1 -DCK6 -fopenmp-simd -fopenmp-version=50 -x c++ -triple i386-unknown-unknown -fopenmp-targets=i386-pc-linux-gnu -std=c++11 -include-pch %t -verify %s -emit-llvm -o - | FileCheck --check-prefix SIMD-ONLY0 %s
// SIMD-ONLY0-NOT: {{__kmpc|__tgt}}
#ifdef CK6
// CK6-LABEL: foo
void foo() {
// CK6: call void (%struct.ident_t*, i32, void (i32*, i32*, ...)*, ...) @__kmpc_fork_teams(%struct.ident_t* @0, i32 0, void (i32*, i32*, ...)* bitcast (void (i32*, i32*)* @{{.+}} to void (i32*, i32*, ...)*))
#pragma omp teams
;
}
#endif // CK6
#endif #endif

7
clang/test/OpenMP/teams_messages.cpp
View File

@ -1,6 +1,7 @@
// RUN: %clang_cc1 -verify -fopenmp -std=c++11 -o - %s -Wuninitialized // RUN: %clang_cc1 -verify=expected,omp45 -fopenmp -std=c++11 -o - %s -Wuninitialized
// RUN: %clang_cc1 -verify -fopenmp -fopenmp-version=50 -std=c++11 -o - %s -Wuninitialized
// RUN: %clang_cc1 -verify -fopenmp-simd -std=c++11 -o - %s -Wuninitialized // RUN: %clang_cc1 -verify=expected,omp45 -fopenmp-simd -std=c++11 -o - %s -Wuninitialized
void xxx(int argc) { void xxx(int argc) {
int x; // expected-note {{initialize the variable 'x' to silence this warning}} int x; // expected-note {{initialize the variable 'x' to silence this warning}}
@ -15,6 +16,8 @@ void foo() {
#pragma omp teams // expected-error {{unexpected OpenMP directive '#pragma omp teams'}} #pragma omp teams // expected-error {{unexpected OpenMP directive '#pragma omp teams'}}
int main(int argc, char **argv) { int main(int argc, char **argv) {
#pragma omp teams // omp45-error {{orphaned 'omp teams' directives are prohibited; perhaps you forget to enclose the directive into a target region?}}
;
#pragma omp target #pragma omp target
#pragma omp teams #pragma omp teams
f; // expected-error {{use of undeclared identifier 'f'}} f; // expected-error {{use of undeclared identifier 'f'}}