81476bc4f4
This patch adds support for omp_get_max_teams, omp_set_num_teams, and
omp_{gs}et_teams_thread_limit on offload devices. That includes the usage of
device-specific ICV values (specified as environment variables or changed on a
device). In order to reuse device-specific ICV values, a copy back mechanism is
implemented that copies ICV values back from device to the host.
Additionally, a limitation of the number of teams on gcn offload devices is
implemented. The number of teams is limited by twice the number of compute
units (one team is executed on one compute unit). This avoids queueing
unnessecary many teams and a corresponding allocation of large amounts of
memory. Without that limitation the memory allocation for a large number of
user-specified teams can result in an "memory access fault".
A limitation of the number of teams is already also implemented for nvptx
devices (see nvptx_adjust_launch_bounds in libgomp/plugin/plugin-nvptx.c).
gcc/ChangeLog:
* gimplify.cc (optimize_target_teams): Set initial num_teams_upper
to "-2" instead of "1" for non-existing num_teams clause in order to
disambiguate from the case of an existing num_teams clause with value 1.
libgomp/ChangeLog:
* config/gcn/icv-device.c (omp_get_teams_thread_limit): Added to
allow processing of device-specific values.
(omp_set_teams_thread_limit): Likewise.
(ialias): Likewise.
* config/nvptx/icv-device.c (omp_get_teams_thread_limit): Likewise.
(omp_set_teams_thread_limit): Likewise.
(ialias): Likewise.
* icv-device.c (omp_get_teams_thread_limit): Likewise.
(ialias): Likewise.
(omp_set_teams_thread_limit): Likewise.
* icv.c (omp_set_teams_thread_limit): Removed.
(omp_get_teams_thread_limit): Likewise.
(ialias): Likewise.
* libgomp.texi: Updated documentation for nvptx and gcn corresponding
to the limitation of the number of teams.
* plugin/plugin-gcn.c (limit_teams): New helper function that limits
the number of teams by twice the number of compute units.
(parse_target_attributes): Limit the number of teams on gcn offload
devices.
* target.c (get_gomp_offload_icvs): Added teams_thread_limit_var
handling.
(gomp_load_image_to_device): Added a size check for the ICVs struct
variable.
(gomp_copy_back_icvs): New function that is used in GOMP_target_ext to
copy back the ICV values from device to host.
(GOMP_target_ext): Update the number of teams and threads in the kernel
args also considering device-specific values.
* testsuite/libgomp.c-c++-common/icv-4.c: Fixed an error in the reading
of OMP_TEAMS_THREAD_LIMIT from the environment.
* testsuite/libgomp.c-c++-common/icv-5.c: Extended.
* testsuite/libgomp.c-c++-common/icv-6.c: Extended.
* testsuite/libgomp.c-c++-common/icv-7.c: Extended.
* testsuite/libgomp.c-c++-common/icv-9.c: New test.
* testsuite/libgomp.fortran/icv-5.f90: New test.
* testsuite/libgomp.fortran/icv-6.f90: New test.
gcc/testsuite/ChangeLog:
* c-c++-common/gomp/target-teams-1.c: Adapt expected values for
num_teams from "1" to "-2" in cases without num_teams clause.
* g++.dg/gomp/target-teams-1.C: Likewise.
* gfortran.dg/gomp/defaultmap-4.f90: Likewise.
* gfortran.dg/gomp/defaultmap-5.f90: Likewise.
* gfortran.dg/gomp/defaultmap-6.f90: Likewise.
99 lines
2.8 KiB
C
99 lines
2.8 KiB
C
/* { dg-do run } */
|
|
/* { dg-set-target-env-var OMP_NUM_TEAMS_ALL "7" } */
|
|
/* { dg-set-target-env-var OMP_TEAMS_THREAD_LIMIT_ALL "2" } */
|
|
|
|
/* This tests the hierarchical usage of ICVs on the host and on devices, i.e. if
|
|
OMP_NUM_TEAMS_DEV_<device_num>, OMP_NUM_TEAMS_DEV, and
|
|
OMP_NUM_TEAMS are not configured, then the value of
|
|
OMP_NUM_TEAMS_ALL should be used for the host as well as for the
|
|
devices. */
|
|
|
|
#include <omp.h>
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
|
|
int
|
|
main ()
|
|
{
|
|
if ((!getenv ("OMP_NUM_TEAMS") && omp_get_max_teams () != 7)
|
|
|| (!getenv ("OMP_TEAMS_THREAD_LIMIT") && omp_get_teams_thread_limit () != 2))
|
|
abort ();
|
|
|
|
#pragma omp teams
|
|
if ((!getenv ("OMP_NUM_TEAMS"))
|
|
&& (omp_get_num_teams () > 7 || omp_get_team_num () >= 7))
|
|
abort ();
|
|
|
|
omp_set_num_teams (9);
|
|
omp_set_teams_thread_limit (3);
|
|
if (omp_get_max_teams () != 9
|
|
|| omp_get_teams_thread_limit () != 3)
|
|
abort ();
|
|
|
|
#pragma omp teams
|
|
if (omp_get_num_teams () > 9
|
|
|| omp_get_team_num () >= 9)
|
|
abort ();
|
|
|
|
#pragma omp teams num_teams(5)
|
|
if (omp_get_num_teams () > 5
|
|
|| omp_get_team_num () >= 5)
|
|
abort ();
|
|
|
|
if (getenv ("OMP_NUM_TEAMS_DEV") || getenv ("OMP_TEAMS_THREAD_LIMIT_DEV"))
|
|
return 0;
|
|
|
|
int num_devices = omp_get_num_devices () > 3 ? 3 : omp_get_num_devices ();
|
|
for (int i = 0; i < num_devices; i++)
|
|
{
|
|
char nteams[sizeof ("OMP_NUM_TEAMS_DEV_1")];
|
|
strcpy (nteams, "OMP_NUM_TEAMS_DEV_1");
|
|
nteams[sizeof ("OMP_NUM_TEAMS_DEV_1") - 2] = '0' + i;
|
|
char teams_thread_limit[sizeof ("OMP_TEAMS_THREAD_LIMIT_DEV_1")];
|
|
strcpy (teams_thread_limit, "OMP_TEAMS_THREAD_LIMIT_DEV_1");
|
|
teams_thread_limit[sizeof ("OMP_TEAMS_THREAD_LIMIT_DEV_1") - 2] = '0' + i;
|
|
if (getenv (nteams) || getenv (teams_thread_limit))
|
|
continue;
|
|
|
|
#pragma omp target device (i)
|
|
if (omp_get_max_teams () != 7
|
|
|| omp_get_teams_thread_limit () != 2)
|
|
abort ();
|
|
|
|
#pragma omp target device (i)
|
|
#pragma omp teams
|
|
if (omp_get_num_teams () > 7
|
|
|| omp_get_team_num () >= 7)
|
|
abort ();
|
|
|
|
#pragma omp target device (i)
|
|
{
|
|
omp_set_num_teams (8 + i);
|
|
omp_set_teams_thread_limit (4 + i);
|
|
if (omp_get_max_teams () != 8 + i
|
|
|| omp_get_teams_thread_limit () != 4 + i)
|
|
abort ();
|
|
}
|
|
|
|
/* omp_set_num_teams above set the value of nteams-var ICV on device 'i',
|
|
which has scope 'device' and should be avaible in subsequent target
|
|
regions. */
|
|
#pragma omp target device (i)
|
|
if (omp_get_max_teams () != 8 + i
|
|
|| omp_get_teams_thread_limit () != 4 + i)
|
|
abort ();
|
|
|
|
#pragma omp target device (i)
|
|
#pragma omp teams
|
|
if (omp_get_num_teams () > 8 + i
|
|
|| omp_get_team_num () >= 8 + i)
|
|
abort ();
|
|
|
|
#pragma omp target device (i)
|
|
#pragma omp teams num_teams(5 + i)
|
|
if (omp_get_num_teams () != 5 + i)
|
|
abort ();
|
|
}
|
|
|
|
return 0;
|
|
}
|