From patchwork Mon Oct 26 16:26:21 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Thomas Schwinge X-Patchwork-Id: 536105 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id C24121412FD for ; Tue, 27 Oct 2015 03:27:00 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.b=y08e/YjQ; dkim-atps=neutral DomainKey-Signature: a=rsa-sha1; c=nofws; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:from :to:cc:subject:in-reply-to:references:date:message-id :mime-version:content-type; q=dns; s=default; b=yLJhTc++5uIaAOU9 sFKLBjb2zAnDiJxrfZnr501c5fE7/5zVXTxW/d+W5cL1HlhF54kLsx5EKzHFV6I2 SwPIn/8Y/aOL2iSQG/j+PpM0Wq+DPIxdzrVfEK0VSCHqIjgZTU/qVWxlhmRWBzIr uVuLbEbRjxc0SxSZSNJqm+pvkbE= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:from :to:cc:subject:in-reply-to:references:date:message-id :mime-version:content-type; s=default; bh=i9gd1KNJ1x1PYN6LGqlK9J p4ha0=; b=y08e/YjQuPE2Jnisc5A9zkfM+TEuH1fno09Ry+CvpCh9bezr6LrL97 Ge+UjfjCf8mMsjM4FVj9SX3LHO/QLReiuT3Wrz0w7Yk6+b25XczNM7VBcyMysXpX G33euMSYARJ/8L8rkm8NJiOEtF4Ad896tlso0K3qSl+ubAVskzWtw= Received: (qmail 126854 invoked by alias); 26 Oct 2015 16:26:35 -0000 Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Delivered-To: mailing list gcc-patches@gcc.gnu.org Received: (qmail 126816 invoked by uid 89); 26 Oct 2015 16:26:34 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.3 required=5.0 tests=AWL, BAYES_00, RCVD_IN_DNSWL_LOW, SPF_PASS autolearn=ham version=3.3.2 X-HELO: relay1.mentorg.com Received: from relay1.mentorg.com (HELO relay1.mentorg.com) (192.94.38.131) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Mon, 26 Oct 2015 16:26:33 +0000 Received: from nat-ies.mentorg.com ([192.94.31.2] helo=SVR-IES-FEM-02.mgc.mentorg.com) by relay1.mentorg.com with esmtp id 1ZqkbO-0004j0-14 from Thomas_Schwinge@mentor.com ; Mon, 26 Oct 2015 09:26:30 -0700 Received: from feldtkeller.schwinge.homeip.net (137.202.0.76) by SVR-IES-FEM-02.mgc.mentorg.com (137.202.0.106) with Microsoft SMTP Server id 14.3.224.2; Mon, 26 Oct 2015 16:26:27 +0000 From: Thomas Schwinge To: Bernd Schmidt , CC: James Norris , Jakub Jelinek Subject: Re: [PR libgomp/65437, libgomp/66518] Initialize runtime in acc_update_device, acc_update_self In-Reply-To: <561E45CA.9030408@redhat.com> References: <54FF0C91.8020307@mentor.com> <871tj1rdfc.fsf@schwinge.name> <87pp6gvj3v.fsf@kepler.schwinge.homeip.net> <878ud3pdfr.fsf@schwinge.name> <87vbekcf6q.fsf@kepler.schwinge.homeip.net> <87h9m0m5vo.fsf@kepler.schwinge.homeip.net> <561E45CA.9030408@redhat.com> User-Agent: Notmuch/0.9-125-g4686d11 (http://notmuchmail.org) Emacs/24.5.1 (i586-pc-linux-gnu) Date: Mon, 26 Oct 2015 17:26:21 +0100 Message-ID: <87twpd7g0i.fsf@kepler.schwinge.homeip.net> MIME-Version: 1.0 Hi! On Wed, 14 Oct 2015 14:08:42 +0200, Bernd Schmidt 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 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 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(-) Grüße Thomas diff --git libgomp/ChangeLog libgomp/ChangeLog index 658c47b..76cb423 100644 --- libgomp/ChangeLog +++ libgomp/ChangeLog @@ -1,3 +1,10 @@ +2015-10-26 Thomas Schwinge + + 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 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. - . */ -/* { dg-output "\\\[\[0-9a-fA-FxX\]+,256\\\] is not mapped" { xfail *-*-* } } */ +/* { dg-output "\\\[\[0-9a-fA-FxX\]+,256\\\] is not mapped" } */ /* { dg-shouldfail "" } */