From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1534) id 216BA3857004; Mon, 12 Sep 2022 13:50:20 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 216BA3857004 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1662990620; bh=+lO9gfN13oF6ro9EBcLJJ29yBT+tlNDpe/OVaDl/j94=; h=From:To:Subject:Date:From; b=U7w+1ItQ4Oh4wkLRDZZG1EE4P60qFGuzCmJj1Wu0HfGBwLiIAXG9Y3zDkq8bCRGH+ Ggkpn+hGbeJN+ohHjVacyL8SCitoJLlF/yBC9WAUf0MkXQVGpVuh02JwWknNOatopI os/HwxaGN54pvXvkTfXE6hxMchiAkjkDweA9Va2A= Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Tobias Burnus To: gcc-cvs@gcc.gnu.org Subject: [gcc/devel/omp/gcc-12] libgomp: Fix up icv-6.c [PR106894] X-Act-Checkin: gcc X-Git-Author: Jakub Jelinek X-Git-Refname: refs/heads/devel/omp/gcc-12 X-Git-Oldrev: 7fbe23803a00cfb714073a25a095db645c61a405 X-Git-Newrev: c32eb6758d80afc3873fa29430275ab012022cd0 Message-Id: <20220912135020.216BA3857004@sourceware.org> Date: Mon, 12 Sep 2022 13:50:20 +0000 (GMT) List-Id: https://gcc.gnu.org/g:c32eb6758d80afc3873fa29430275ab012022cd0 commit c32eb6758d80afc3873fa29430275ab012022cd0 Author: Jakub Jelinek Date: Mon Sep 12 15:45:02 2022 +0200 libgomp: Fix up icv-6.c [PR106894] 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 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_?. (cherry picked from commit 994ea892bd02dd8a1c04875ad3553c57939c3abf) Diff: --- libgomp/ChangeLog.omp | 11 +++++++++++ libgomp/testsuite/libgomp.c-c++-common/icv-6.c | 26 +++++++++++++++++--------- 2 files changed, 28 insertions(+), 9 deletions(-) diff --git a/libgomp/ChangeLog.omp b/libgomp/ChangeLog.omp index e25a9ad8c49..ea0bd49d456 100644 --- a/libgomp/ChangeLog.omp +++ b/libgomp/ChangeLog.omp @@ -1,3 +1,14 @@ +2022-09-12 Tobias Burnus + + Backport from mainline: + 2022-09-12 Jakub Jelinek + + 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_?. + 2022-09-12 Tobias Burnus Backport from mainline: diff --git a/libgomp/testsuite/libgomp.c-c++-common/icv-6.c b/libgomp/testsuite/libgomp.c-c++-common/icv-6.c index 7151bd1e2b3..e199a185920 100644 --- a/libgomp/testsuite/libgomp.c-c++-common/icv-6.c +++ b/libgomp/testsuite/libgomp.c-c++-common/icv-6.c @@ -17,6 +17,7 @@ #include #include +#include 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; }