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

[Thomas Schwinge <thomas at codesourcery dot com>]

Hi!

On Wed, 14 Oct 2015 14:08:42 +0200, Bernd Schmidt <bschmidt@redhat.com> wrote:
> On 10/09/2015 05:14 PM, Thomas Schwinge wrote:
> > 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.anglin@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

> > OK to commit?
> 
> Ok.

Thanks for the review.  Committed in r229378:

commit a6dcb5581494a8b750daf173f04ef087d6dc60c5
Author: tschwinge <tschwinge@138bc75d-0d04-0410-961f-82ee72b054a4>
Date:   Mon Oct 26 16:24:17 2015 +0000

    [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.
    
    git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@229378 138bc75d-0d04-0410-961f-82ee72b054a4
---
 libgomp/ChangeLog                                    | 7 +++++++
 libgomp/oacc-mem.c                                   | 6 +++---
 libgomp/testsuite/libgomp.oacc-c-c++-common/lib-42.c | 4 +---
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git libgomp/ChangeLog libgomp/ChangeLog
index 658c47b..76cb423 100644
--- libgomp/ChangeLog
+++ libgomp/ChangeLog
@@ -1,3 +1,10 @@
+2015-10-26  Thomas Schwinge  <thomas@codesourcery.com>
+
+	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.
+
 2015-10-23  Tom de Vries  <tom@codesourcery.com>
 
 	PR testsuite/68063
diff --git libgomp/oacc-mem.c libgomp/oacc-mem.c
index af067d6..5410906 100644
--- libgomp/oacc-mem.c
+++ libgomp/oacc-mem.c
@@ -547,6 +547,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;
 
@@ -554,9 +557,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

Attachment: signature.asc
Description: PGP signature