From patchwork Tue Nov 11 21:24:29 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Thomas Schwinge X-Patchwork-Id: 409683 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 C7AF4140139 for ; Wed, 12 Nov 2014 08:24:49 +1100 (AEDT) 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=TlCK+4CBy17KFyW2 1a6jbjXvPS6HcKeGvArDHuRS5b7uCHeJJEJhdfS4m2P+dcBZV8IYKM3petpsbWKf Vb3330NK+tPsIRTIXs6rBY0aBwX3KP80ekgadg5ZggcD2kN/i52BkD2qHmiMvOrh NoRWbABk9bsMl4cVzNyg1SrKeWI= 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=A+nH4P1+zyoLKgNU+GnF94 0kkfs=; b=f4zmXGDpQKJwhtHVqYRW352jlPODNKRV7XDr5gdb149eYuJM6zk05+ Ps8exBrITgBRmA3p0QjXNk6ZHA5Dztz2RCwxQ2yMbeiURnY2R/+VoU4BQOKTgXya ySkMqdzGkpTGQtHRx+1oXepl5u3Crc/g5MmSZMO73LIfGAK1VPMG4= Received: (qmail 8526 invoked by alias); 11 Nov 2014 21:24:38 -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 8459 invoked by uid 89); 11 Nov 2014 21:24:37 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.0 required=5.0 tests=AWL, BAYES_00, RCVD_IN_DNSWL_NONE 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; Tue, 11 Nov 2014 21:24:36 +0000 Received: from nat-ies.mentorg.com ([192.94.31.2] helo=SVR-IES-FEM-01.mgc.mentorg.com) by relay1.mentorg.com with esmtp id 1XoIvQ-0006rs-NN from Thomas_Schwinge@mentor.com for gcc-patches@gcc.gnu.org; Tue, 11 Nov 2014 13:24:33 -0800 Received: from feldtkeller.schwinge.homeip.net (137.202.0.76) by SVR-IES-FEM-01.mgc.mentorg.com (137.202.0.104) with Microsoft SMTP Server id 14.3.181.6; Tue, 11 Nov 2014 21:24:31 +0000 From: Thomas Schwinge To: CC: James Norris , Cesar Philippidis Subject: Re: [GOMP4, COMMITTED] OpenACC deviceptr clause. In-Reply-To: <1401976816-10577-1-git-send-email-thomas@codesourcery.com> References: <87ppnuvbv6.fsf@schwinge.name> <1401976816-10577-1-git-send-email-thomas@codesourcery.com> <5460F49F.3040904@mentor.com> User-Agent: Notmuch/0.9-101-g81dad07 (http://notmuchmail.org) Emacs/24.3.1 (x86_64-pc-linux-gnu) Date: Tue, 11 Nov 2014 22:24:29 +0100 Message-ID: <87bnodph0y.fsf@schwinge.name> MIME-Version: 1.0 Hi! On Thu, 5 Jun 2014 16:00:16 +0200, I wrote: > --- gcc/omp-low.c > +++ gcc/omp-low.c > @@ -1738,6 +1754,10 @@ scan_sharing_clauses (tree clauses, omp_context *ctx) > { > tree base = get_base_address (decl); > tree nc = OMP_CLAUSE_CHAIN (c); > + gcc_assert (nc == NULL_TREE > + || OMP_CLAUSE_CODE (nc) != OMP_CLAUSE_MAP > + || (OMP_CLAUSE_MAP_KIND (nc) > + != OMP_CLAUSE_MAP_FORCE_DEVICEPTR)); > if (DECL_P (base) > && nc != NULL_TREE > && OMP_CLAUSE_CODE (nc) == OMP_CLAUSE_MAP That's a bogus assertion; removed in r217372 on gomp-4_0-branch: commit 7ae51786d4a2aad4c82045dda780ae3e7904afa8 Author: tschwinge Date: Tue Nov 11 21:22:26 2014 +0000 OpenACC deviceptr clause: Remove bogus assertion. gcc/ * omp-low.c (scan_sharing_clauses): Remove bogus assertion. gcc/testsuite/ * c-c++-common/goacc/deviceptr-3.c: New file. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gomp-4_0-branch@217372 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/ChangeLog.gomp | 2 ++ gcc/omp-low.c | 4 ---- gcc/testsuite/ChangeLog.gomp | 5 +++++ gcc/testsuite/c-c++-common/goacc/deviceptr-3.c | 11 +++++++++++ 4 files changed, 18 insertions(+), 4 deletions(-) Grüße, Thomas diff --git gcc/ChangeLog.gomp gcc/ChangeLog.gomp index 94a7f8c..4ea28e2 100644 --- gcc/ChangeLog.gomp +++ gcc/ChangeLog.gomp @@ -1,5 +1,7 @@ 2014-11-11 Thomas Schwinge + * omp-low.c (scan_sharing_clauses): Remove bogus assertion. + * omp-low.c (delete_omp_context): Dispose of reduction_map. * omp-low.c (maybe_lookup_reduction): Don't require an OpenACC diff --git gcc/omp-low.c gcc/omp-low.c index 5695ec3..1263409 100644 --- gcc/omp-low.c +++ gcc/omp-low.c @@ -1920,10 +1920,6 @@ scan_sharing_clauses (tree clauses, omp_context *ctx) { tree base = get_base_address (decl); tree nc = OMP_CLAUSE_CHAIN (c); - gcc_assert (nc == NULL_TREE - || OMP_CLAUSE_CODE (nc) != OMP_CLAUSE_MAP - || (OMP_CLAUSE_MAP_KIND (nc) - != OMP_CLAUSE_MAP_FORCE_DEVICEPTR)); if (DECL_P (base) && nc != NULL_TREE && OMP_CLAUSE_CODE (nc) == OMP_CLAUSE_MAP diff --git gcc/testsuite/ChangeLog.gomp gcc/testsuite/ChangeLog.gomp index a02f58a..f8bacc3 100644 --- gcc/testsuite/ChangeLog.gomp +++ gcc/testsuite/ChangeLog.gomp @@ -1,3 +1,8 @@ +2014-11-07 Thomas Schwinge + James Norris + + * c-c++-common/goacc/deviceptr-3.c: New file. + 2014-11-05 Thomas Schwinge * c-c++-common/goacc/update-1.c: Extend. diff --git gcc/testsuite/c-c++-common/goacc/deviceptr-3.c gcc/testsuite/c-c++-common/goacc/deviceptr-3.c new file mode 100644 index 0000000..bab56c3 --- /dev/null +++ gcc/testsuite/c-c++-common/goacc/deviceptr-3.c @@ -0,0 +1,11 @@ +float *d_a; + +void +f (float *a) +{ +#pragma acc parallel copyout (a[3:10]) deviceptr (d_a) + d_a[2] += 1.0; + +#pragma acc parallel deviceptr (d_a) copyout (a[3:10]) + d_a[2] += 1.0; +}