mirrors/gcc
0
0
Fork 0
mirror of https://gcc.gnu.org/git/gcc.git synced 2024-11-27 22:03:57 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

libgomp: Fix up icv-6.c [PR106894]

Browse Source 
The thing is,
make check
or
make check RUNTESTFLAGS="c.exp='icv-6.c' c++.exp='icv-6.c'"
in libgomp obj dir work fine, but
make -j32 -k check RUNTESTFLAGS="c.exp='icv-6.c' c++.exp='icv-6.c'"
fails.
The thing is that the testcase as written relies on OMP_NUM_THREADS not being
set in environment (as it takes priority over OMP_NUM_THREADS_ALL for the
host).
So, if either a user has OMP_NUM_THREADS=42 in the environment by himself, or
when doing make check with -jN, we trigger:
          if test $$num_cpus -gt 8 && test -z "$$OMP_NUM_THREADS"; then \
            OMP_NUM_THREADS=8; export OMP_NUM_THREADS; \
            echo @@@ libgomp OMP_NUM_THREADS adjusted to 8 because of parallel
make check and too many CPUs; \
          fi; \
in libgomp/testsuite/Makefile.am and so the test fails.

2022-09-12  Jakub Jelinek  <jakub@redhat.com>

	PR libgomp/106894
	* testsuite/libgomp.c-c++-common/icv-6.c: Include string.h.
	(main): Avoid tests for which corresponding non-_ALL suffixed variable
	is in the environment, or for OMP_NUM_TEAMS on the device
	OMP_NUM_TEAMS_DEV_?.
This commit is contained in:
Jakub Jelinek 2022-09-12 10:48:19 +02:00
parent 643ae816f1
commit 994ea892bd
1 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
libgomp/testsuite/libgomp.c-c++-common/icv-6.c
View File

@ -17,6 +17,7 @@
#include <omp.h>
#include <stdlib.h>
#include <string.h>
int
main ()
@ -25,21 +26,28 @@ main ()
int chunk_size;
omp_get_schedule(&kind, &chunk_size);
if (omp_get_max_teams () != 42
|| !omp_get_dynamic ()
|| kind != 3 || chunk_size != 4
|| omp_get_teams_thread_limit () != 44
|| omp_get_thread_limit () != 45
|| omp_get_max_threads () != 46
|| omp_get_proc_bind () != omp_proc_bind_spread
|| omp_get_max_active_levels () != 47)
if ((!getenv ("OMP_NUM_TEAMS") && omp_get_max_teams () != 42)
|| (!getenv ("OMP_DYNAMIC") && !omp_get_dynamic ())
|| (!getenv ("OMP_SCHEDULE") && (kind != 3 || chunk_size != 4))
|| (!getenv ("OMP_TEAMS_THREAD_LIMIT") && omp_get_teams_thread_limit () != 44)
|| (!getenv ("OMP_THREAD_LIMIT") && omp_get_thread_limit () != 45)
|| (!getenv ("OMP_NUM_THREADS") && omp_get_max_threads () != 46)
|| (!getenv ("OMP_PROC_BIND") && omp_get_proc_bind () != omp_proc_bind_spread)
|| (!getenv ("OMP_MAX_ACTIVE_LEVELS") && omp_get_max_active_levels () != 47))
abort ();
int num_devices = omp_get_num_devices () > 3 ? 3 : omp_get_num_devices ();
for (int i=0; i < num_devices; i++)
for (int i = 0; i < num_devices; i++)
{
char name[sizeof ("OMP_NUM_TEAMS_DEV_1")];
strcpy (name, "OMP_NUM_TEAMS_DEV_1");
name[sizeof ("OMP_NUM_TEAMS_DEV_1") - 2] = '0' + i;
if (getenv (name))
continue;
#pragma omp target device (i)
if (omp_get_max_teams () != 43)
abort ();
}
return 0;
}