948d461954
The teams construct only permits omp_get_num_teams and omp_get_team_num as API call in strictly nested regions - check for it. Additionally, for Fortran, using DECL_NAME does not show the mangled name, hence, DECL_ASSEMBLER_NAME had to be used to. Finally, 'target device(ancestor:1)' wrongly rejected non-API calls as well. PR middle-end/102972 gcc/ChangeLog: * omp-low.c (omp_runtime_api_call): Use DECL_ASSEMBLER_NAME to get internal Fortran name; new permit_num_teams arg to permit omp_get_num_teams and omp_get_team_num. (scan_omp_1_stmt): Update call to it, add missing call for reverse offload, and check for strictly nested API calls in teams. gcc/testsuite/ChangeLog: * c-c++-common/gomp/target-device-ancestor-3.c: Add non-API routine test. * gfortran.dg/gomp/order-6.f90: Add missing bind(C). * c-c++-common/gomp/teams-3.c: New test. * gfortran.dg/gomp/teams-3.f90: New test. * gfortran.dg/gomp/teams-4.f90: New test. libgomp/ChangeLog: * testsuite/libgomp.c-c++-common/icv-3.c: Nest API calls inside parallel construct. * testsuite/libgomp.c-c++-common/icv-4.c: Likewise. * testsuite/libgomp.c/target-3.c: Likewise. * testsuite/libgomp.c/target-5.c: Likewise. * testsuite/libgomp.c/target-6.c: Likewise. * testsuite/libgomp.c/target-teams-1.c: Likewise. * testsuite/libgomp.c/teams-1.c: Likewise. * testsuite/libgomp.c/thread-limit-2.c: Likewise. * testsuite/libgomp.c/thread-limit-3.c: Likewise. * testsuite/libgomp.c/thread-limit-4.c: Likewise. * testsuite/libgomp.c/thread-limit-5.c: Likewise. * testsuite/libgomp.fortran/icv-3.f90: Likewise. * testsuite/libgomp.fortran/icv-4.f90: Likewise. * testsuite/libgomp.fortran/teams1.f90: Likewise.
57 lines
1.4 KiB
C
57 lines
1.4 KiB
C
#include <omp.h>
|
|
#include <stdlib.h>
|
|
|
|
int
|
|
main ()
|
|
{
|
|
if (getenv ("OMP_NUM_TEAMS") == NULL
|
|
&& omp_get_max_teams () != 0)
|
|
abort ();
|
|
omp_set_num_teams (7);
|
|
if (omp_get_max_teams () != 7)
|
|
abort ();
|
|
if (getenv ("OMP_TEAMS_THREAD_LIMIT") == NULL
|
|
&& omp_get_teams_thread_limit () != 0)
|
|
abort ();
|
|
omp_set_teams_thread_limit (15);
|
|
if (omp_get_teams_thread_limit () != 15)
|
|
abort ();
|
|
#pragma omp teams
|
|
{
|
|
#pragma omp parallel if(0)
|
|
if (omp_get_max_teams () != 7
|
|
|| omp_get_teams_thread_limit () != 15
|
|
|| omp_get_num_teams () < 1
|
|
|| omp_get_num_teams () > 7
|
|
|| omp_get_team_num () < 0
|
|
|| omp_get_team_num () >= omp_get_num_teams ()
|
|
|| omp_get_thread_limit () < 1
|
|
|| omp_get_thread_limit () > 15)
|
|
abort ();
|
|
}
|
|
#pragma omp teams num_teams(5) thread_limit (13)
|
|
{
|
|
#pragma omp parallel if(0)
|
|
if (omp_get_max_teams () != 7
|
|
|| omp_get_teams_thread_limit () != 15
|
|
|| omp_get_num_teams () != 5
|
|
|| omp_get_team_num () < 0
|
|
|| omp_get_team_num () >= omp_get_num_teams ()
|
|
|| omp_get_thread_limit () < 1
|
|
|| omp_get_thread_limit () > 13)
|
|
abort ();
|
|
}
|
|
#pragma omp teams num_teams(8) thread_limit (16)
|
|
{
|
|
#pragma omp parallel if(0)
|
|
if (omp_get_max_teams () != 7
|
|
|| omp_get_teams_thread_limit () != 15
|
|
|| omp_get_num_teams () != 8
|
|
|| omp_get_team_num () < 0
|
|
|| omp_get_team_num () >= omp_get_num_teams ()
|
|
|| omp_get_thread_limit () < 1
|
|
|| omp_get_thread_limit () > 16)
|
|
abort ();
|
|
}
|
|
return 0;
|
|
}
|