From patchwork Wed Dec 10 09:54:13 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Thomas Schwinge X-Patchwork-Id: 419503 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 22F351400B7 for ; Wed, 10 Dec 2014 20:54:37 +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=BeqMrXxfHyQx5GaH uHlxyqQuPFwOhIZ0rwn3o45hSZFsP+dgQDi9ZIz80QJ8A/5f7T5NfORhM96/y9Cx ZQc0/qLw+52AkRlSm6EXw9XYZp0FJsW8i88lWWKWtu3wD4mO9/D574tPCMy8/WZL Bh/taAIIvHntLxl1YFExp0LdTE4= 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=8+xWxtBd1u20qttsd0f27P Aei84=; b=R8l8weV9nKeUh3TCJMuHnLol4uNFCdSw4zqWKkV34XzUF9LqIOTo3o xaoTLRZIVtH5gJwuNtMLdFBXIlE+dFYNZitayg1xtQICmHBpERRJTwhf5SH4IiUV bCzNfSSoOPmkL1iw2Mbhal4OAeTn4IEQmj0NQAwe/FOwts3vf1iCA= Received: (qmail 4533 invoked by alias); 10 Dec 2014 09:54:31 -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 4513 invoked by uid 89); 10 Dec 2014 09:54:30 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-1.9 required=5.0 tests=AWL, BAYES_00, RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.2 X-Spam-User: qpsmtpd, 2 recipients 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; Wed, 10 Dec 2014 09:54:27 +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 1XydyR-0001yl-T8 from Thomas_Schwinge@mentor.com ; Wed, 10 Dec 2014 01:54:24 -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; Wed, 10 Dec 2014 09:54:22 +0000 From: Thomas Schwinge To: "gcc-patches@gcc.gnu.org" CC: Cesar Philippidis , Subject: Re: [gomp4] acc enter/exit data In-Reply-To: <5452D398.2030709@codesourcery.com> References: <5452D398.2030709@codesourcery.com> User-Agent: Notmuch/0.9-101-g81dad07 (http://notmuchmail.org) Emacs/24.4.1 (i586-pc-linux-gnu) Date: Wed, 10 Dec 2014 10:54:13 +0100 Message-ID: <871to796ey.fsf@kepler.schwinge.homeip.net> MIME-Version: 1.0 Hi! On Thu, 30 Oct 2014 17:11:04 -0700, Cesar Philippidis wrote: > This patch add support for OpenACC's enter/exit data directive. [...] > gcc/ > * gimple.h (enum gf_mask): Add GF_OMP_TARGET_KIND_OACC_ENTER_EXIT_DATA. In r218567, I committed the following to gomp-4_0-branch: commit 86724db93ad780106102573f2cfadd6f884e8650 Author: tschwinge Date: Wed Dec 10 09:52:14 2014 +0000 Fix OpenACC enter/exit data ICE. [...]: In function 'f_acc_data': [...]:4:1: internal compiler error: in expand_gimple_stmt_1, at cfgexpand.c:3413 f_acc_data (void) ^ 0x70cad3 expand_gimple_stmt_1 [...]/source-gcc/gcc/cfgexpand.c:3413 0x70cad3 expand_gimple_stmt [...]/source-gcc/gcc/cfgexpand.c:3440 0x712b3d expand_gimple_basic_block [...]/source-gcc/gcc/cfgexpand.c:5273 0x71479e execute [...]/source-gcc/gcc/cfgexpand.c:5882 gcc/ * omp-low.c (build_omp_regions_1, make_gimple_omp_edges) : Handle GF_OMP_TARGET_KIND_OACC_ENTER_EXIT_DATA the same as GF_OMP_TARGET_KIND_OACC_UPDATE. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gomp-4_0-branch@218567 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/ChangeLog.gomp | 7 +++++++ gcc/omp-low.c | 8 ++++++-- gcc/testsuite/c-c++-common/goacc/nesting-2.c | 11 +++++++++++ 3 files changed, 24 insertions(+), 2 deletions(-) Grüße, Thomas diff --git gcc/ChangeLog.gomp gcc/ChangeLog.gomp index af59ada..bece7c1 100644 --- gcc/ChangeLog.gomp +++ gcc/ChangeLog.gomp @@ -1,3 +1,10 @@ +2014-12-10 Thomas Schwinge + + * omp-low.c (build_omp_regions_1, make_gimple_omp_edges) + : Handle + GF_OMP_TARGET_KIND_OACC_ENTER_EXIT_DATA the same as + GF_OMP_TARGET_KIND_OACC_UPDATE. + 2014-11-13 Cesar Philippidis * omp-low.c (oacc_get_reduction_array_id): Fix whitespace. diff --git gcc/omp-low.c gcc/omp-low.c index 9af3b8a..6fed38f 100644 --- gcc/omp-low.c +++ gcc/omp-low.c @@ -9404,7 +9404,9 @@ build_omp_regions_1 (basic_block bb, struct omp_region *parent, else if (code == GIMPLE_OMP_TARGET && (gimple_omp_target_kind (stmt) == GF_OMP_TARGET_KIND_UPDATE || (gimple_omp_target_kind (stmt) - == GF_OMP_TARGET_KIND_OACC_UPDATE))) + == GF_OMP_TARGET_KIND_OACC_UPDATE) + || (gimple_omp_target_kind (stmt) + == GF_OMP_TARGET_KIND_OACC_ENTER_EXIT_DATA))) new_omp_region (bb, code, parent); else { @@ -12270,7 +12272,9 @@ make_gimple_omp_edges (basic_block bb, struct omp_region **region, cur_region = new_omp_region (bb, code, cur_region); fallthru = true; if (gimple_omp_target_kind (last) == GF_OMP_TARGET_KIND_UPDATE - || gimple_omp_target_kind (last) == GF_OMP_TARGET_KIND_OACC_UPDATE) + || gimple_omp_target_kind (last) == GF_OMP_TARGET_KIND_OACC_UPDATE + || (gimple_omp_target_kind (last) + == GF_OMP_TARGET_KIND_OACC_ENTER_EXIT_DATA)) cur_region = cur_region->outer; break; diff --git gcc/testsuite/c-c++-common/goacc/nesting-2.c gcc/testsuite/c-c++-common/goacc/nesting-2.c new file mode 100644 index 0000000..0d350c6 --- /dev/null +++ gcc/testsuite/c-c++-common/goacc/nesting-2.c @@ -0,0 +1,11 @@ +int i; + +void +f_acc_data (void) +{ +#pragma acc data + { +#pragma acc update host(i) +#pragma acc enter data copyin(i) + } +}