public inbox for gcc-cvs@sourceware.org
help / color / mirror / Atom feed
From: Thomas Schwinge <tschwinge@gcc.gnu.org>
To: gcc-cvs@gcc.gnu.org
Subject: [gcc r12-1290] Fix 'libgomp.oacc-fortran/parallel-dims.f90' for 'acc_device_radeon'
Date: Tue, 8 Jun 2021 09:45:44 +0000 (GMT) [thread overview]
Message-ID: <20210608094544.99B5B3847830@sourceware.org> (raw)
https://gcc.gnu.org/g:32099c0d24adb93a031e0301ffd77b065b6f5472
commit r12-1290-g32099c0d24adb93a031e0301ffd77b065b6f5472
Author: Thomas Schwinge <thomas@codesourcery.com>
Date: Fri Jun 4 15:31:53 2021 +0200
Fix 'libgomp.oacc-fortran/parallel-dims.f90' for 'acc_device_radeon'
..., by simplifying 'libgomp.oacc-c-c++-common/parallel-dims.c', and updating
the former correspondingly. '__builtin_goacc_parlevel_id' does the right thing
for all 'acc_device_*'.
Follow-up to commit 09e0ad6253f4330977e1b2f116b5e289dc2c2a02 "Update OpenACC
tests for amdgcn".
libgomp/
* testsuite/libgomp.oacc-c-c++-common/parallel-dims.c: Simplify.
* testsuite/libgomp.oacc-fortran/parallel-dims-aux.c: Update.
Diff:
---
.../libgomp.oacc-c-c++-common/parallel-dims.c | 32 ++++------------------
.../libgomp.oacc-fortran/parallel-dims-aux.c | 31 ++++-----------------
2 files changed, 12 insertions(+), 51 deletions(-)
diff --git a/libgomp/testsuite/libgomp.oacc-c-c++-common/parallel-dims.c b/libgomp/testsuite/libgomp.oacc-c-c++-common/parallel-dims.c
index c7412c2ef3a..974e1504534 100644
--- a/libgomp/testsuite/libgomp.oacc-c-c++-common/parallel-dims.c
+++ b/libgomp/testsuite/libgomp.oacc-c-c++-common/parallel-dims.c
@@ -10,42 +10,22 @@
#include <openacc.h>
#include <gomp-constants.h>
-/* TODO: "(int) acc_device_*" casts because of the C++ acc_on_device wrapper
- not behaving as expected for -O0. */
#pragma acc routine seq
-static unsigned int __attribute__ ((optimize ("O2"))) acc_gang ()
+static int acc_gang ()
{
- if (acc_on_device ((int) acc_device_host))
- return 0;
- else if (acc_on_device ((int) acc_device_nvidia)
- || acc_on_device ((int) acc_device_radeon))
- return __builtin_goacc_parlevel_id (GOMP_DIM_GANG);
- else
- __builtin_abort ();
+ return __builtin_goacc_parlevel_id (GOMP_DIM_GANG);
}
#pragma acc routine seq
-static unsigned int __attribute__ ((optimize ("O2"))) acc_worker ()
+static int acc_worker ()
{
- if (acc_on_device ((int) acc_device_host))
- return 0;
- else if (acc_on_device ((int) acc_device_nvidia)
- || acc_on_device ((int) acc_device_radeon))
- return __builtin_goacc_parlevel_id (GOMP_DIM_WORKER);
- else
- __builtin_abort ();
+ return __builtin_goacc_parlevel_id (GOMP_DIM_WORKER);
}
#pragma acc routine seq
-static unsigned int __attribute__ ((optimize ("O2"))) acc_vector ()
+static int acc_vector ()
{
- if (acc_on_device ((int) acc_device_host))
- return 0;
- else if (acc_on_device ((int) acc_device_nvidia)
- || acc_on_device ((int) acc_device_radeon))
- return __builtin_goacc_parlevel_id (GOMP_DIM_VECTOR);
- else
- __builtin_abort ();
+ return __builtin_goacc_parlevel_id (GOMP_DIM_VECTOR);
}
diff --git a/libgomp/testsuite/libgomp.oacc-fortran/parallel-dims-aux.c b/libgomp/testsuite/libgomp.oacc-fortran/parallel-dims-aux.c
index b5986f4afef..cdece32d147 100644
--- a/libgomp/testsuite/libgomp.oacc-fortran/parallel-dims-aux.c
+++ b/libgomp/testsuite/libgomp.oacc-fortran/parallel-dims-aux.c
@@ -5,41 +5,22 @@
/* Used by 'parallel-dims.f90'. */
-#include <limits.h>
-#include <openacc.h>
#include <gomp-constants.h>
-/* TODO: "(int) acc_device_*" casts because of the C++ acc_on_device wrapper
- not behaving as expected for -O0. */
#pragma acc routine seq
-/* static */ unsigned int __attribute__ ((optimize ("O2"))) acc_gang ()
+/* static */ int acc_gang ()
{
- if (acc_on_device ((int) acc_device_host))
- return 0;
- else if (acc_on_device ((int) acc_device_nvidia))
- return __builtin_goacc_parlevel_id (GOMP_DIM_GANG);
- else
- __builtin_abort ();
+ return __builtin_goacc_parlevel_id (GOMP_DIM_GANG);
}
#pragma acc routine seq
-/* static */ unsigned int __attribute__ ((optimize ("O2"))) acc_worker ()
+/* static */ int acc_worker ()
{
- if (acc_on_device ((int) acc_device_host))
- return 0;
- else if (acc_on_device ((int) acc_device_nvidia))
- return __builtin_goacc_parlevel_id (GOMP_DIM_WORKER);
- else
- __builtin_abort ();
+ return __builtin_goacc_parlevel_id (GOMP_DIM_WORKER);
}
#pragma acc routine seq
-/* static */ unsigned int __attribute__ ((optimize ("O2"))) acc_vector ()
+/* static */ int acc_vector ()
{
- if (acc_on_device ((int) acc_device_host))
- return 0;
- else if (acc_on_device ((int) acc_device_nvidia))
- return __builtin_goacc_parlevel_id (GOMP_DIM_VECTOR);
- else
- __builtin_abort ();
+ return __builtin_goacc_parlevel_id (GOMP_DIM_VECTOR);
}
reply other threads:[~2021-06-08 9:45 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210608094544.99B5B3847830@sourceware.org \
--to=tschwinge@gcc.gnu.org \
--cc=gcc-cvs@gcc.gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).