From patchwork Thu Jun 5 13:59:49 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Schwinge X-Patchwork-Id: 356420 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 D04F91400E9 for ; Fri, 6 Jun 2014 00:00:31 +1000 (EST) 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:subject:date:message-id:in-reply-to:references:mime-version :content-type; q=dns; s=default; b=jEPG1KzWcWTZ8qa9a35ftBR7iwXG2 kr/WO5AtVLiPWwqk/fRVYhQhGgr20l9M/Kwep4epRLOFV0CX+3M2FCvTjk/1+bjJ +tTfnde1cuh405MKDG0c7E7GWrxFQKw8ScGkrkoj4lw7bVgP5TITbTuboPuPuaTJ 8lc3bSfhbVz6+I= 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:subject:date:message-id:in-reply-to:references:mime-version :content-type; s=default; bh=6mOZHKSu5bX2QekJbrjMttwCQVw=; b=ySz HH8+MMwLsm6iBJzu4wWR7zBuMPXp7LlF6Woe/gVgilzmw1Rt/AWDuLY9MOcSH4p6 HZz+m9q1PUlUaFTnEQBU3MiBEus6fFTIE9CLwJnI7SOCBaScPRJuwT3Vqe2lR+Q8 xV0IhElpm2/YtPOjZGrQOPaUvsBSN4tIs58Qk9FU= Received: (qmail 31440 invoked by alias); 5 Jun 2014 14:00:21 -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 31405 invoked by uid 89); 5 Jun 2014 14:00:18 -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 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; Thu, 05 Jun 2014 14:00:16 +0000 Received: from svr-orw-fem-01.mgc.mentorg.com ([147.34.98.93]) by relay1.mentorg.com with esmtp id 1WsYDD-0006wG-JZ from Thomas_Schwinge@mentor.com for gcc-patches@gcc.gnu.org; Thu, 05 Jun 2014 07:00:11 -0700 Received: from SVR-IES-FEM-02.mgc.mentorg.com ([137.202.0.106]) by svr-orw-fem-01.mgc.mentorg.com over TLS secured channel with Microsoft SMTPSVC(6.0.3790.4675); Thu, 5 Jun 2014 07:00:11 -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.2.247.3; Thu, 5 Jun 2014 15:00:09 +0100 From: Thomas Schwinge To: Subject: [GOMP4, COMMITTED] OpenACC present data clause. Date: Thu, 5 Jun 2014 15:59:49 +0200 Message-ID: <1401976789-10523-1-git-send-email-thomas@codesourcery.com> In-Reply-To: <87ppnuvbv6.fsf@schwinge.name> References: <87ppnuvbv6.fsf@schwinge.name> MIME-Version: 1.0 From: tschwinge gcc/ * gimplify.c (gimplify_scan_omp_clauses) : Don't block OMP_CLAUSE_MAP_FORCE_PRESENT. gcc/testsuite/ * c-c++-common/goacc/data-clause-duplicate-1.c: Extend. * c-c++-common/goacc/present-1.c: New file. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gomp-4_0-branch@211277 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/ChangeLog.gomp | 5 +++++ gcc/gimplify.c | 1 - gcc/testsuite/ChangeLog.gomp | 5 +++++ gcc/testsuite/c-c++-common/goacc/data-clause-duplicate-1.c | 2 ++ gcc/testsuite/c-c++-common/goacc/present-1.c | 11 +++++++++++ 5 files changed, 23 insertions(+), 1 deletion(-) create mode 100644 gcc/testsuite/c-c++-common/goacc/present-1.c diff --git gcc/ChangeLog.gomp gcc/ChangeLog.gomp index 011fe77..7371aa5 100644 --- gcc/ChangeLog.gomp +++ gcc/ChangeLog.gomp @@ -1,3 +1,8 @@ +2014-06-05 Thomas Schwinge + + * gimplify.c (gimplify_scan_omp_clauses) : + Don't block OMP_CLAUSE_MAP_FORCE_PRESENT. + 2014-06-04 Thomas Schwinge * cgraphunit.c (ipa_passes, compile): Handle flag_openacc next to diff --git gcc/gimplify.c gcc/gimplify.c index e98e6e5..6eaf6fd 100644 --- gcc/gimplify.c +++ gcc/gimplify.c @@ -6014,7 +6014,6 @@ gimplify_scan_omp_clauses (tree *list_p, gimple_seq *pre_p, case OMP_CLAUSE_MAP: switch (OMP_CLAUSE_MAP_KIND (c)) { - case OMP_CLAUSE_MAP_FORCE_PRESENT: case OMP_CLAUSE_MAP_FORCE_DEALLOC: case OMP_CLAUSE_MAP_FORCE_DEVICEPTR: input_location = OMP_CLAUSE_LOCATION (c); diff --git gcc/testsuite/ChangeLog.gomp gcc/testsuite/ChangeLog.gomp index 78882c0..4e0ee28 100644 --- gcc/testsuite/ChangeLog.gomp +++ gcc/testsuite/ChangeLog.gomp @@ -1,3 +1,8 @@ +2014-06-05 Thomas Schwinge + + * c-c++-common/goacc/data-clause-duplicate-1.c: Extend. + * c-c++-common/goacc/present-1.c: New file. + 2014-03-20 Thomas Schwinge * c-c++-common/goacc-gomp/nesting-1.c: New file. diff --git gcc/testsuite/c-c++-common/goacc/data-clause-duplicate-1.c gcc/testsuite/c-c++-common/goacc/data-clause-duplicate-1.c index 4cb3cc2..5c5ab02 100644 --- gcc/testsuite/c-c++-common/goacc/data-clause-duplicate-1.c +++ gcc/testsuite/c-c++-common/goacc/data-clause-duplicate-1.c @@ -10,4 +10,6 @@ fun (void) /* { dg-error "'fp' appears more than once in map clauses" "" { target *-*-* } 9 } */ /* { dg-message "sorry, unimplemented: data clause not yet implemented" "" { target *-*-* } 9 } */ ; +#pragma acc data create(fp) present(fp) /* { dg-error "'fp' appears more than once in map clauses" } */ + ; } diff --git gcc/testsuite/c-c++-common/goacc/present-1.c gcc/testsuite/c-c++-common/goacc/present-1.c new file mode 100644 index 0000000..03ee592 --- /dev/null +++ gcc/testsuite/c-c++-common/goacc/present-1.c @@ -0,0 +1,11 @@ +/* { dg-additional-options "-fdump-tree-original" } */ + +void +f (char *cp) +{ +#pragma acc parallel present(cp[7:9]) + ; +} + +/* { dg-final { scan-tree-dump-times "#pragma acc parallel map\\(force_present:\\*\\(cp \\+ 7\\) \\\[len: 9]\\) map\\(alloc:cp \\\[pointer assign, bias: 7]\\)" 1 "original" } } */ +/* { dg-final { cleanup-tree-dump "original" } } */