From patchwork Wed Dec 10 10:07:37 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Thomas Schwinge X-Patchwork-Id: 419509 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 A798A14009B for ; Wed, 10 Dec 2014 21:07:58 +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:subject:in-reply-to:references:date:message-id:mime-version :content-type; q=dns; s=default; b=tbz2ULJZhDLt8cilr87t8QBlZbgS3 BGOL61jwHN3JgzRTUPtZJVnH8hZglKWI39FgZNW4q52J3ZHk8o7M5y9fzkczRyBo tcvNBGJr55bUF1r0Wm5hBV3IzyDFFLVEgzoN6BNOJ59TV76BLLUm+Ryg/ekmGl/U n3ao6B4iKhZ3/A= 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:in-reply-to:references:date:message-id:mime-version :content-type; s=default; bh=8xlQP0UCdd9BOsVf2KP10x5qy4A=; b=Vsf AaRgg9u5Ia/EKKzR2zzb8k/HhghwVI2Jf/kzsxHcO8FlcRIbzubjkYa9pf/COx9O 6WMrXCGngIHrRulsdfwvG5qjQjqZiC2igo+cY5EidOYtwuF8IjC7pFE8UbV0J/XK 2WHG5zFDiDZBDuVQSWY6PsZ8Dh3TltFYx3BSJ7NA= Received: (qmail 17332 invoked by alias); 10 Dec 2014 10:07:51 -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 17322 invoked by uid 89); 10 Dec 2014 10:07:51 -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; Wed, 10 Dec 2014 10:07:49 +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 1XyeBN-0005ap-3Y from Thomas_Schwinge@mentor.com ; Wed, 10 Dec 2014 02:07:45 -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 10:07:43 +0000 From: Thomas Schwinge To: , Jakub Jelinek Subject: Re: OpenACC GIMPLE_OACC_* -- or not? In-Reply-To: <87wq5z7ro9.fsf@kepler.schwinge.homeip.net> References: <1383766943-8863-2-git-send-email-thomas@codesourcery.com> <1383766943-8863-3-git-send-email-thomas@codesourcery.com> <1383766943-8863-4-git-send-email-thomas@codesourcery.com> <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> User-Agent: Notmuch/0.9-101-g81dad07 (http://notmuchmail.org) Emacs/24.4.1 (i586-pc-linux-gnu) Date: Wed, 10 Dec 2014 11:07:37 +0100 Message-ID: <87mw6v7r86.fsf@kepler.schwinge.homeip.net> MIME-Version: 1.0 Hi Jakub! On Wed, 10 Dec 2014 10:57:58 +0100, I wrote: > In r218568, I applied the following to gomp-4_0-branch: > > commit 28629d718a63a782170cfb06a4d0278de0779039 > Author: tschwinge > Date: Wed Dec 10 09:52:28 2014 +0000 > > Merge GIMPLE_OACC_KERNELS and GIMPLE_OACC_PARALLEL into GIMPLE_OMP_TARGET. > > gcc/ > * gimple.def (GIMPLE_OACC_KERNELS, GIMPLE_OACC_PARALLEL): Merge > into GIMPLE_OMP_TARGET. Update all users. Regarding this change: > --- gcc/gimple-walk.c > +++ gcc/gimple-walk.c > @@ -304,36 +304,6 @@ walk_gimple_op (gimple stmt, walk_tree_fn callback_op, > return ret; > break; > > - case GIMPLE_OACC_KERNELS: > - ret = walk_tree (gimple_oacc_kernels_clauses_ptr (stmt), callback_op, > - wi, pset); > - if (ret) > - return ret; > - ret = walk_tree (gimple_oacc_kernels_child_fn_ptr (stmt), callback_op, > - wi, pset); > - if (ret) > - return ret; > - ret = walk_tree (gimple_oacc_kernels_data_arg_ptr (stmt), callback_op, > - wi, pset); > - if (ret) > - return ret; > - break; > - > - case GIMPLE_OACC_PARALLEL: > - ret = walk_tree (gimple_oacc_parallel_clauses_ptr (stmt), callback_op, > - wi, pset); > - if (ret) > - return ret; > - ret = walk_tree (gimple_oacc_parallel_child_fn_ptr (stmt), callback_op, > - wi, pset); > - if (ret) > - return ret; > - ret = walk_tree (gimple_oacc_parallel_data_arg_ptr (stmt), callback_op, > - wi, pset); > - if (ret) > - return ret; > - break; > - > case GIMPLE_OMP_CONTINUE: > ret = walk_tree (gimple_omp_continue_control_def_ptr (stmt), > callback_op, wi, pset); ..., 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? gcc/gimple-walk.c | 8 ++++++++ 1 file changed, 8 insertions(+) Grüße, Thomas 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: