89f930a7de
OpenMP has restrictions on directives allowed to be strictly nested
inside a
construct with the order(concurrent) clause specified.
- OpenMP 5.0, 5.1, and 5.2 allows: 'loop', 'parallel', 'simd', and
combined directives starting with 'parallel'.
- OpenMP 6.0 allows: the above directives plus 'atomic' and
all loop-transformation directives.
Furthermore, a region that corresponds to a construct with
order(concurrent)
specified may not contain calls to the OpenMP runtime API.
This PR fixes the following issues in the current implementation:
With -fopenmp-version=50: none of the nesting restrictions above were
enforced
With -fopenmp-version=60:
1. Clang did not reject OpenMP runtime APIs encountered in the region.
2. Clang erroneously rejected combined directives starting with
parallel.
---------
Co-authored-by: Zahira Ammarguellat <zahira.ammarguellat@intel.com>
112 lines
6.1 KiB
C++
112 lines
6.1 KiB
C++
// RUN: %clang_cc1 -fsyntax-only -fopenmp -fopenmp-version=50 -triple x86_64-unknown-unknown -verify=expected,omp50 %s -Wuninitialized
|
|
// RUN: %clang_cc1 -fsyntax-only -fopenmp -fopenmp-version=51 -triple x86_64-unknown-unknown -verify=expected,omp51 %s -Wuninitialized
|
|
// RUN: %clang_cc1 -fsyntax-only -fopenmp -fopenmp-version=52 -triple x86_64-unknown-unknown -verify=expected,omp51 %s -Wuninitialized
|
|
// RUN: %clang_cc1 -fsyntax-only -fopenmp -fopenmp-version=60 -triple x86_64-unknown-unknown -verify=expected,omp60 %s -Wuninitialized
|
|
|
|
// RUN: %clang_cc1 -fsyntax-only -fopenmp-simd -fopenmp-version=50 -triple x86_64-unknown-unknown -verify=expected,omp50 %s -Wuninitialized
|
|
// RUN: %clang_cc1 -fsyntax-only -fopenmp-simd -fopenmp-version=51 -triple x86_64-unknown-unknown -verify=expected,omp51 %s -Wuninitialized
|
|
// RUN: %clang_cc1 -fsyntax-only -fopenmp-simd -fopenmp-version=52 -triple x86_64-unknown-unknown -verify=expected,omp51 %s -Wuninitialized
|
|
// RUN: %clang_cc1 -fsyntax-only -fopenmp-simd -fopenmp-version=60 -triple x86_64-unknown-unknown -verify=expected,omp60 %s -Wuninitialized
|
|
|
|
// Constructs strictly nestable in a construct with order(concurrent) specified vary by OpenMP version:
|
|
// OMP5.0,5.1,5.2: loop, parallel, simd, and combined constructs with parallel as the first component.
|
|
// OMP6.0: in addition to the ones allowed in OMP5.x, also atomic and all loop-transformation constructs.
|
|
|
|
extern int omp_get_num_threads (void);
|
|
|
|
int main(int argc, char **argv) {
|
|
int A = 0;
|
|
#pragma omp parallel for order(concurrent)
|
|
for (int i = 0; i < 10; ++i)
|
|
omp_get_num_threads(); // omp50-error {{calls to OpenMP runtime API are not allowed within a region that corresponds to a construct with an order clause that specifies concurrent}} omp51-error {{calls to OpenMP runtime API are not allowed within a region that corresponds to a construct with an order clause that specifies concurrent}} omp60-error {{calls to OpenMP runtime API are not allowed within a region that corresponds to a construct with an order clause that specifies concurrent}}
|
|
|
|
#pragma omp parallel for order(reproducible:concurrent) // omp50-error {{expected 'concurrent' in OpenMP clause 'order'}}
|
|
for (int i = 0; i < 10; ++i)
|
|
omp_get_num_threads(); // omp51-error {{calls to OpenMP runtime API are not allowed within a region that corresponds to a construct with an order clause that specifies concurrent}} omp60-error {{calls to OpenMP runtime API are not allowed within a region that corresponds to a construct with an order clause that specifies concurrent}}
|
|
|
|
#pragma omp parallel for order(unconstrained:concurrent) // omp50-error {{expected 'concurrent' in OpenMP clause 'order'}}
|
|
for (int i = 0; i < 10; ++i)
|
|
omp_get_num_threads(); // omp51-error {{calls to OpenMP runtime API are not allowed within a region that corresponds to a construct with an order clause that specifies concurrent}} omp60-error {{calls to OpenMP runtime API are not allowed within a region that corresponds to a construct with an order clause that specifies concurrent}}
|
|
|
|
#pragma omp parallel for order(concurrent)
|
|
for (int i = 0; i < 10; ++i) {
|
|
for (int j = 0; j < 10; ++j) {
|
|
omp_get_num_threads(); // omp50-error {{calls to OpenMP runtime API are not allowed within a region that corresponds to a construct with an order clause that specifies concurrent}} omp51-error {{calls to OpenMP runtime API are not allowed within a region that corresponds to a construct with an order clause that specifies concurrent}} omp60-error {{calls to OpenMP runtime API are not allowed within a region that corresponds to a construct with an order clause that specifies concurrent}}
|
|
}
|
|
}
|
|
|
|
// nested atomic: OK in OMP6.0 but not in OMP5.x
|
|
#pragma omp parallel for order(concurrent)
|
|
for (int i = 0; i < 10; ++i) {
|
|
#pragma omp atomic //omp50-error {{construct 'atomic' not allowed in a region associated with a directive with 'order' clause}} omp51-error {{construct 'atomic' not allowed in a region associated with a directive with 'order' clause}}
|
|
A++;
|
|
}
|
|
|
|
// nested loop-transformation construct: OK in OMP6.0 but not in OMP5.x
|
|
#pragma omp parallel for order(concurrent)
|
|
for (int i = 0; i < 10; ++i) {
|
|
#pragma omp unroll //omp50-error {{construct 'unroll' not allowed in a region associated with a directive with 'order' clause}} omp51-error {{construct 'unroll' not allowed in a region associated with a directive with 'order' clause}}
|
|
for (int j = 0; j < 10; ++j);
|
|
}
|
|
|
|
#pragma omp parallel for order(reproducible: concurrent) // omp50-error {{expected 'concurrent' in OpenMP clause 'order'}}
|
|
for (int i = 0; i < 10; ++i) {
|
|
#pragma omp target //omp51-error {{construct 'target' not allowed in a region associated with a directive with 'order' clause}} omp60-error {{construct 'target' not allowed in a region associated with a directive with 'order' clause}}
|
|
A++;
|
|
}
|
|
|
|
#pragma omp parallel for order(unconstrained: concurrent) // omp50-error {{expected 'concurrent' in OpenMP clause 'order'}}
|
|
for (int i = 0; i < 10; ++i) {
|
|
#pragma omp target //omp51-error {{construct 'target' not allowed in a region associated with a directive with 'order' clause}} omp60-error {{construct 'target' not allowed in a region associated with a directive with 'order' clause}}
|
|
A++;
|
|
}
|
|
|
|
#pragma omp loop bind(parallel) order(concurrent)
|
|
for (int i = 0; i < 10; ++i) {
|
|
#pragma omp parallel for
|
|
for (int j = 0; j < 10; ++j) {
|
|
A += j;
|
|
}
|
|
}
|
|
|
|
#pragma omp distribute order(concurrent)
|
|
for (int i = 0; i < 10; ++i) {
|
|
#pragma omp parallel for simd
|
|
for (int j = 0; j < 10; ++j) {
|
|
A += j;
|
|
}
|
|
}
|
|
|
|
#pragma omp for order(concurrent)
|
|
for (int i = 0; i < 10; ++i) {
|
|
#pragma omp parallel master
|
|
for (int j = 0; j < 10; ++j) {
|
|
A += j;
|
|
}
|
|
}
|
|
|
|
#pragma omp for order(concurrent)
|
|
for (int i = 0; i < 10; ++i) {
|
|
#pragma omp parallel master taskloop
|
|
for (int j = 0; j < 10; ++j) {
|
|
A += j;
|
|
}
|
|
}
|
|
|
|
#pragma omp for order(concurrent)
|
|
for (int i = 0; i < 10; ++i) {
|
|
#pragma omp parallel master taskloop simd
|
|
for (int j = 0; j < 10; ++j) {
|
|
A += j;
|
|
}
|
|
}
|
|
|
|
#pragma omp for order(concurrent)
|
|
for (int i = 0; i < 10; ++i) {
|
|
#pragma omp parallel sections
|
|
{
|
|
A++;
|
|
}
|
|
}
|
|
}
|