[PR libgomp/65437, libgomp/66518] Initialize runtime in acc_update_device, acc_update_self

[Thomas Schwinge]

Hi!

On Fri, 19 Jun 2015 09:47:41 +0200, I wrote:
> On Tue, 5 May 2015 11:43:20 +0200, I wrote:
> > On Mon, 4 May 2015 10:20:14 -0400, John David Anglin <dave.ang...@bell.net> 
> > wrote:
> > > FAIL: libgomp.oacc-c/../libgomp.oacc-c-c++-common/lib-42.c 
> > > -DACC_DEVICE_TYPE_hos
> > > t=1 -DACC_MEM_SHARED=1 output pattern test, is , should match 
> > > \[[0-9a-fA-FxX]+,2
> > > 56\] is not mapped

> In r224639, now (at least, and at last...) XFAILed

OK to commit?

commit 673e59d5da9f5b003c4dac54b8ef6b1010b3f907
Author: Thomas Schwinge <tho...@codesourcery.com>
Date:   Fri Oct 9 14:29:51 2015 +0200

    [PR libgomp/65437, libgomp/66518] Initialize runtime in acc_update_device, 
acc_update_self
    
        libgomp/
        PR libgomp/65437
        PR libgomp/66518
        * oacc-mem.c (update_dev_host): Call goacc_lazy_initialize.
        * testsuite/libgomp.oacc-c-c++-common/lib-42.c: Remove XFAIL.
---
 libgomp/oacc-mem.c                                   | 6 +++---
 libgomp/testsuite/libgomp.oacc-c-c++-common/lib-42.c | 4 +---
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git libgomp/oacc-mem.c libgomp/oacc-mem.c
index 90d43eb..9eb30f1 100644
--- libgomp/oacc-mem.c
+++ libgomp/oacc-mem.c
@@ -546,6 +546,9 @@ update_dev_host (int is_dev, void *h, size_t s)
 {
   splay_tree_key n;
   void *d;
+
+  goacc_lazy_initialize ();
+
   struct goacc_thread *thr = goacc_thread ();
   struct gomp_device_descr *acc_dev = thr->dev;
 
@@ -553,9 +556,6 @@ update_dev_host (int is_dev, void *h, size_t s)
 
   n = lookup_host (acc_dev, h, s);
 
-  /* No need to call lazy open, as the data must already have been
-     mapped.  */
-
   if (!n)
     {
       gomp_mutex_unlock (&acc_dev->lock);
diff --git libgomp/testsuite/libgomp.oacc-c-c++-common/lib-42.c 
libgomp/testsuite/libgomp.oacc-c-c++-common/lib-42.c
index 95c4162..de5d1c1 100644
--- libgomp/testsuite/libgomp.oacc-c-c++-common/lib-42.c
+++ libgomp/testsuite/libgomp.oacc-c-c++-common/lib-42.c
@@ -35,7 +35,5 @@ main (int argc, char **argv)
 }
 
 /* { dg-output "CheCKpOInT(\n|\r\n|\r).*" } */
-/* TODO: currently doesn't print anything; SIGSEGV.
-   <https://gcc.gnu.org/PR66518>.  */
-/* { dg-output "\\\[\[0-9a-fA-FxX\]+,256\\\] is not mapped" { xfail *-*-* } } 
*/
+/* { dg-output "\\\[\[0-9a-fA-FxX\]+,256\\\] is not mapped" } */
 /* { dg-shouldfail "" } */


Grüße,
 Thomas

signature.asc
Description: PGP signature