Hi! On Thu, 29 Oct 2015 13:15:13 -0700, Nathan Sidwell <nat...@acm.org> wrote: > I've committed this to gomp4 branch. It resolves a problem with > builtin_acc_on_device and C++.
> The test cases in the gcc testsuite were hiding the problem by providing part
> of
> openacc.h in the test directory, and this had diverged from the openacc.h we
> actually have. I deleted those tests and inserted one in the libgomp
> testsuite,
> which correctly picks up the openacc.h of the tool under test, (rather than
> one
> in system includes).
The idea had been to test the compiler handling of the acc_on_device
builtin in the compiler testsuite, but yes, having to duplicate parts of
openacc.h was ugly.
> --- libgomp/testsuite/libgomp.oacc-c-c++-common/acc-on-device.c
> (revision 0)
> +++ libgomp/testsuite/libgomp.oacc-c-c++-common/acc-on-device.c
> (working copy)
In r229568 committed to gomp-4_0-branch as obvious:
commit e2c1427d60ffcc9183fbd5a0996dfe98c7219dc5
Author: tschwinge <tschwinge@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Fri Oct 30 08:29:54 2015 +0000
De-duplicate testsuite file
libgomp/
* testsuite/libgomp.oacc-c-c++-common/acc-on-device.c:
De-duplicate file.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gomp-4_0-branch@229568
138bc75d-0d04-0410-961f-82ee72b054a4
---
libgomp/ChangeLog.gomp | 5 +++++
libgomp/testsuite/libgomp.oacc-c-c++-common/acc-on-device.c | 12 ------------
2 files changed, 5 insertions(+), 12 deletions(-)
diff --git libgomp/ChangeLog.gomp libgomp/ChangeLog.gomp
index ddbcdee..89f57ef 100644
--- libgomp/ChangeLog.gomp
+++ libgomp/ChangeLog.gomp
@@ -1,3 +1,8 @@
+2015-10-30 Thomas Schwinge <tho...@codesourcery.com>
+
+ * testsuite/libgomp.oacc-c-c++-common/acc-on-device.c:
+ De-duplicate file.
+
2015-10-29 Nathan Sidwell <nat...@codesourcery.com>
* openacc.h (enum acc_device_t): Ensure layout compatibility.
diff --git libgomp/testsuite/libgomp.oacc-c-c++-common/acc-on-device.c
libgomp/testsuite/libgomp.oacc-c-c++-common/acc-on-device.c
index 0f73aeb..c1eed0e 100644
--- libgomp/testsuite/libgomp.oacc-c-c++-common/acc-on-device.c
+++ libgomp/testsuite/libgomp.oacc-c-c++-common/acc-on-device.c
@@ -1,15 +1,3 @@
-/* { dg-do compile } */
-/* { dg-additional-options "-O2" } */
-
-#include <openacc.h>
-
-int Foo (acc_device_t x)
-{
- return acc_on_device (x);
-}
-
-/* { dg-final { scan-assembler-not "acc_on_device" } } */
-/* { dg-do compile } */
/* { dg-additional-options "-O2" } */
#include <openacc.h>
Grüße
Thomas
signature.asc
Description: PGP signature
