10508db867
2020-11-05 Ulrich Drepper <drepper@redhat.com> Kwok Cheung Yeung <kcy@codesourcery.com> libgomp/ * Makefile.am (%.mod): Add -cpp and -fopenmp to compile flags. * Makefile.in: Regenerate. * fortran.c: Wrap uses of omp_set_nested and omp_get_nested with pragmas to ignore -Wdeprecated-declarations warnings. * icv.c: Likewise. * omp.h.in (__GOMP_DEPRECATED_5_0): Define. Mark omp_lock_hint_* enum values, omp_lock_hint_t, omp_set_nested, and omp_get_nested with __GOMP_DEPRECATED_5_0. * omp_lib.f90.in: Mark omp_get_nested and omp_set_nested as deprecated. * testsuite/libgomp.c++/affinity-1.C: Add -Wno-deprecated-declarations to test options. * testsuite/libgomp.c/affinity-1.c: Likewise. * testsuite/libgomp.c/affinity-2.c: Likewise. * testsuite/libgomp.c/appendix-a/a.15.1.c: Likewise. * testsuite/libgomp.c/lib-1.c: Likewise. * testsuite/libgomp.c/nested-1.c: Likewise. * testsuite/libgomp.c/nested-2.c: Likewise. * testsuite/libgomp.c/nested-3.c: Likewise. * testsuite/libgomp.c/pr32362-1.c: Likewise. * testsuite/libgomp.c/pr32362-2.c: Likewise. * testsuite/libgomp.c/pr32362-3.c: Likewise. * testsuite/libgomp.c/pr35549.c: Likewise. * testsuite/libgomp.c/pr42942.c: Likewise. * testsuite/libgomp.c/pr61200.c: Likewise. * testsuite/libgomp.c/sort-1.c: Likewise. * testsuite/libgomp.c/target-5.c: Likewise. * testsuite/libgomp.c/target-6.c: Likewise. * testsuite/libgomp.c/teams-1.c: Likewise. * testsuite/libgomp.c/thread-limit-1.c: Likewise. * testsuite/libgomp.c/thread-limit-2.c: Likewise. * testsuite/libgomp.c/thread-limit-4.c: Likewise. * testsuite/libgomp.fortran/affinity1.f90: Likewise. * testsuite/libgomp.fortran/lib1.f90: Likewise. * testsuite/libgomp.fortran/lib2.f: Likewise. * testsuite/libgomp.fortran/nested1.f90: Likewise. * testsuite/libgomp.fortran/teams1.f90: Likewise.
44 lines
951 B
C
44 lines
951 B
C
/* { dg-do run } */
|
|
/* { dg-set-target-env-var OMP_THREAD_LIMIT "6" } */
|
|
/* { dg-additional-options "-Wno-deprecated-declarations" } */
|
|
|
|
#include <stdlib.h>
|
|
#include <unistd.h>
|
|
#include <omp.h>
|
|
|
|
int
|
|
main ()
|
|
{
|
|
if (omp_get_thread_limit () != 6)
|
|
return 0;
|
|
omp_set_dynamic (0);
|
|
omp_set_nested (1);
|
|
#pragma omp parallel num_threads (3)
|
|
if (omp_get_num_threads () != 3)
|
|
abort ();
|
|
#pragma omp parallel num_threads (3)
|
|
if (omp_get_num_threads () != 3)
|
|
abort ();
|
|
#pragma omp parallel num_threads (8)
|
|
if (omp_get_num_threads () > 6)
|
|
abort ();
|
|
#pragma omp parallel num_threads (6)
|
|
if (omp_get_num_threads () != 6)
|
|
abort ();
|
|
int cnt = 0;
|
|
#pragma omp parallel num_threads (5)
|
|
#pragma omp parallel num_threads (5)
|
|
#pragma omp parallel num_threads (2)
|
|
{
|
|
int v;
|
|
#pragma omp atomic capture
|
|
v = ++cnt;
|
|
if (v > 6)
|
|
abort ();
|
|
usleep (10000);
|
|
#pragma omp atomic
|
|
--cnt;
|
|
}
|
|
return 0;
|
|
}
|