From patchwork Fri Dec 12 20:02:40 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Thomas Schwinge X-Patchwork-Id: 420659 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 8ED40140082 for ; Sat, 13 Dec 2014 07:03:05 +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=By6aSL/hbz8DrYXj C57iPgkTtqOGIaffKcx4CPw+cJK0qSd/jFO+5U9UaJfUCIvnOaCp/V2MkkwCRrDR kVhPnuG2I3yj5g39ZZ8C7+WuDHUO6hu9aBl3CgR2oowrhSJh95T0urehGTNMHpyb bUNPkhA55KjxC9feXJe2HjEHNT4= 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=kMPvZT3Y91WIadugkJj9uA VMr9Q=; b=SpOpTSZOOfXuTJjNaZynf9CTt1cqjXkCfqEcNRQAVKymjV7oB4+vDc 38cbGlO/7rtnYndpA1+ODvBZ+cLshHdXIaqTNYT1h+ADoO+Gf6hek3P40nmd/KxO 78VP60pPoRI/hA4nW2Ux9mi25Xaj5gvPIlxh82ql+uYEvF4BsnrsE= Received: (qmail 12104 invoked by alias); 12 Dec 2014 20:02:57 -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 12092 invoked by uid 89); 12 Dec 2014 20:02:56 -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-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; Fri, 12 Dec 2014 20:02:54 +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 1XzWQM-00048f-Cd from Thomas_Schwinge@mentor.com ; Fri, 12 Dec 2014 12:02:50 -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; Fri, 12 Dec 2014 20:02:48 +0000 From: Thomas Schwinge To: Jakub Jelinek CC: Subject: Re: OpenACC GIMPLE_OACC_* -- or not? In-Reply-To: <20141210101047.GZ1667@tucnak.redhat.com> References: <1383766943-8863-5-git-send-email-thomas@codesourcery.com> <1383766943-8863-6-git-send-email-thomas@codesourcery.com> <1383766943-8863-7-git-send-email-thomas@codesourcery.com> <1383766943-8863-8-git-send-email-thomas@codesourcery.com> <1383766943-8863-9-git-send-email-thomas@codesourcery.com> <8761s5joir.fsf@schwinge.name> <87sihoczm0.fsf@kepler.schwinge.homeip.net> <20141112134502.GC5026@tucnak.redhat.com> <87wq5z7ro9.fsf@kepler.schwinge.homeip.net> <87mw6v7r86.fsf@kepler.schwinge.homeip.net> <20141210101047.GZ1667@tucnak.redhat.com> User-Agent: Notmuch/0.9-101-g81dad07 (http://notmuchmail.org) Emacs/24.3.1 (x86_64-pc-linux-gnu) Date: Fri, 12 Dec 2014 21:02:40 +0100 Message-ID: <87vblgws9r.fsf@schwinge.name> MIME-Version: 1.0 Hi! On Wed, 10 Dec 2014 11:10:47 +0100, Jakub Jelinek wrote: > On Wed, Dec 10, 2014 at 11:07:37AM +0100, Thomas Schwinge wrote: > > ..., I noticed that GIMPLE_OMP_TARGET doesn't walk the child_fn and > > data_arg. Is that intentional, or should that be done? If the latter > > (but this doesn't seem to cause any ill effects -- why?), OK to commit > > the following to trunk? > > Ok with proper ChangeLog. > > > gcc/gimple-walk.c | 8 ++++++++ > > 1 file changed, 8 insertions(+) > > > > diff --git gcc/gimple-walk.c gcc/gimple-walk.c > > index bfa3532..1330c04 100644 > > --- gcc/gimple-walk.c > > +++ gcc/gimple-walk.c > > @@ -416,6 +416,14 @@ walk_gimple_op (gimple stmt, walk_tree_fn callback_op, > > pset); > > if (ret) > > return ret; > > + ret = walk_tree (gimple_omp_target_child_fn_ptr (stmt), callback_op, wi, > > + pset); > > + if (ret) > > + return ret; > > + ret = walk_tree (gimple_omp_target_data_arg_ptr (stmt), callback_op, wi, > > + pset); > > + if (ret) > > + return ret; > > break; > > > > case GIMPLE_OMP_TEAMS: Committed to trunk in r218686: commit c1277edd4b50623bae89bea8cba84def9b308e77 Author: tschwinge Date: Fri Dec 12 20:01:18 2014 +0000 A bit of walk_gimple_op maintenance. * gimple-walk.c (walk_gimple_op) : Also check intermediate walk_tree results for for_incr. : Walk child_fn and data_arg, too. : Pretty printing. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@218686 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/ChangeLog | 7 +++++++ gcc/gimple-walk.c | 49 +++++++++++++++++++++++++++++++------------------ 2 files changed, 38 insertions(+), 18 deletions(-) Grüße, Thomas diff --git gcc/ChangeLog gcc/ChangeLog index bf9571b..3a20032 100644 --- gcc/ChangeLog +++ gcc/ChangeLog @@ -1,3 +1,10 @@ +2014-12-12 Thomas Schwinge + + * gimple-walk.c (walk_gimple_op) : Also check + intermediate walk_tree results for for_incr. + : Walk child_fn and data_arg, too. + : Pretty printing. + 2014-12-12 Richard Sandiford PR middle-end/64182 diff --git gcc/gimple-walk.c gcc/gimple-walk.c index 48fa05d..959d68e 100644 --- gcc/gimple-walk.c +++ gcc/gimple-walk.c @@ -321,11 +321,13 @@ walk_gimple_op (gimple stmt, walk_tree_fn callback_op, break; case GIMPLE_OMP_CRITICAL: - ret = walk_tree (gimple_omp_critical_name_ptr ( - as_a (stmt)), - callback_op, wi, pset); - if (ret) - return ret; + { + gomp_critical *omp_stmt = as_a (stmt); + ret = walk_tree (gimple_omp_critical_name_ptr (omp_stmt), + callback_op, wi, pset); + if (ret) + return ret; + } break; case GIMPLE_OMP_FOR: @@ -349,9 +351,9 @@ walk_gimple_op (gimple stmt, walk_tree_fn callback_op, return ret; ret = walk_tree (gimple_omp_for_incr_ptr (stmt, i), callback_op, wi, pset); + if (ret) + return ret; } - if (ret) - return ret; break; case GIMPLE_OMP_PARALLEL: @@ -404,7 +406,6 @@ walk_gimple_op (gimple stmt, walk_tree_fn callback_op, wi, pset); if (ret) return ret; - ret = walk_tree (gimple_omp_sections_control_ptr (stmt), callback_op, wi, pset); if (ret) @@ -420,10 +421,21 @@ walk_gimple_op (gimple stmt, walk_tree_fn callback_op, break; case GIMPLE_OMP_TARGET: - ret = walk_tree (gimple_omp_target_clauses_ptr (stmt), callback_op, wi, - pset); - if (ret) - return ret; + { + gomp_target *omp_stmt = as_a (stmt); + ret = walk_tree (gimple_omp_target_clauses_ptr (omp_stmt), + callback_op, wi, pset); + if (ret) + return ret; + ret = walk_tree (gimple_omp_target_child_fn_ptr (omp_stmt), + callback_op, wi, pset); + if (ret) + return ret; + ret = walk_tree (gimple_omp_target_data_arg_ptr (omp_stmt), + callback_op, wi, pset); + if (ret) + return ret; + } break; case GIMPLE_OMP_TEAMS: @@ -440,7 +452,6 @@ walk_gimple_op (gimple stmt, walk_tree_fn callback_op, callback_op, wi, pset); if (ret) return ret; - ret = walk_tree (gimple_omp_atomic_load_rhs_ptr (omp_stmt), callback_op, wi, pset); if (ret) @@ -449,11 +460,13 @@ walk_gimple_op (gimple stmt, walk_tree_fn callback_op, break; case GIMPLE_OMP_ATOMIC_STORE: - ret = walk_tree (gimple_omp_atomic_store_val_ptr ( - as_a (stmt)), - callback_op, wi, pset); - if (ret) - return ret; + { + gomp_atomic_store *omp_stmt = as_a (stmt); + ret = walk_tree (gimple_omp_atomic_store_val_ptr (omp_stmt), + callback_op, wi, pset); + if (ret) + return ret; + } break; case GIMPLE_TRANSACTION: