From patchwork Wed Jun 24 08:57:40 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom de Vries X-Patchwork-Id: 488013 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 573DB14007F for ; Wed, 24 Jun 2015 18:58:07 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.b=Ws/BjAcE; dkim-atps=neutral DomainKey-Signature: a=rsa-sha1; c=nofws; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender :message-id:date:from:mime-version:to:cc:subject:content-type; q=dns; s=default; b=BmVhjmxe5sU+huOvrYThmLcDQc8hCdUlV/LVACZnQiW bmaAsVckaoZVIPfbWx+HjV6Mdg1yxslyGrxlLvaNgyciOu+eOkhytV6CoWSzWr4E mCe1NtENfRu68fMCPv/CGTfQQqraRLvCKdupduu+v6YcwHbHGySRO3v3W6eekU9w = 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 :message-id:date:from:mime-version:to:cc:subject:content-type; s=default; bh=d1ozDdMxUlvFIu85M1Pq1DQrmcs=; b=Ws/BjAcE60GvwF4sX GABPG3Q+1fHbNJX/0GixXvc+3HFVRPzY3WobTb0dkfvnJRE3/8cQmKst4O6/a4z0 j/d4viEZxKneMVvJJjU+rKYVd3g+mBM+EMi1oxlu4PU5LvfHiAQIrfw+z6tPnQ9y w56K5EDJM8k4iP0+AWVDommLMA= Received: (qmail 64827 invoked by alias); 24 Jun 2015 08:58:00 -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 64813 invoked by uid 89); 24 Jun 2015 08:57:59 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.7 required=5.0 tests=AWL, BAYES_00, RP_MATCHES_RCVD, SPF_PASS autolearn=ham version=3.3.2 X-HELO: fencepost.gnu.org Received: from fencepost.gnu.org (HELO fencepost.gnu.org) (208.118.235.10) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES128-SHA encrypted) ESMTPS; Wed, 24 Jun 2015 08:57:58 +0000 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55489) by fencepost.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1Z7gVI-0002oQ-Dn for gcc-patches@gnu.org; Wed, 24 Jun 2015 04:57:56 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Z7gVD-00084B-V5 for gcc-patches@gnu.org; Wed, 24 Jun 2015 04:57:56 -0400 Received: from relay1.mentorg.com ([192.94.38.131]:52847) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z7gVD-000844-PY for gcc-patches@gnu.org; Wed, 24 Jun 2015 04:57:51 -0400 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 1Z7gVC-0000WS-K8 from Tom_deVries@mentor.com ; Wed, 24 Jun 2015 01:57:50 -0700 Received: from [127.0.0.1] (137.202.0.76) by SVR-IES-FEM-01.mgc.mentorg.com (137.202.0.104) with Microsoft SMTP Server id 14.3.224.2; Wed, 24 Jun 2015 09:57:49 +0100 Message-ID: <558A7104.9090000@mentor.com> Date: Wed, 24 Jun 2015 10:57:40 +0200 From: Tom de Vries User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.7.0 MIME-Version: 1.0 To: "gcc-patches@gnu.org" CC: Jakub Jelinek , Richard Biener Subject: [gomp4, committed] Add get_virtual_phi X-detected-operating-system: by eggs.gnu.org: Windows NT kernel [generic] [fuzzy] X-Received-From: 192.94.38.131 Hi, this patch factors new function get_virtual_phi out of rewrite_virtuals_into_loop_closed_ssa. Committed to gomp-4_0-branch. Thanks, - Tom Add get_virtual_phi 2015-06-18 Tom de Vries * tree-ssa-loop-manip.c (get_virtual_phi): Factor out of ... (rewrite_virtuals_into_loop_closed_ssa): ... here. --- gcc/tree-ssa-loop-manip.c | 44 ++++++++++++++++++++------------------------ 1 file changed, 20 insertions(+), 24 deletions(-) diff --git a/gcc/tree-ssa-loop-manip.c b/gcc/tree-ssa-loop-manip.c index 0d2c972..b7c3676 100644 --- a/gcc/tree-ssa-loop-manip.c +++ b/gcc/tree-ssa-loop-manip.c @@ -603,6 +603,24 @@ replace_uses_in_dominated_bbs (tree old_val, tree new_val, basic_block bb) BITMAP_FREE (dominated); } +/* Return the virtual phi in BB. */ + +static gphi * +get_virtual_phi (basic_block bb) +{ + for (gphi_iterator gsi = gsi_start_phis (bb); + !gsi_end_p (gsi); + gsi_next (&gsi)) + { + gphi *phi = gsi.phi (); + + if (virtual_operand_p (PHI_RESULT (phi))) + return phi; + } + + return NULL; +} + /* Ensure a virtual phi is present in the exit block, if LOOP contains a vdef. In other words, ensure loop-closed ssa normal form for virtuals. */ @@ -612,35 +630,13 @@ rewrite_virtuals_into_loop_closed_ssa (struct loop *loop) gphi *phi; edge exit = single_dom_exit (loop); - phi = NULL; - for (gphi_iterator gsi = gsi_start_phis (loop->header); - !gsi_end_p (gsi); - gsi_next (&gsi)) - { - if (virtual_operand_p (PHI_RESULT (gsi.phi ()))) - { - phi = gsi.phi (); - break; - } - } - + phi = get_virtual_phi (loop->header); if (phi == NULL) return; tree final_loop = PHI_ARG_DEF_FROM_EDGE (phi, single_succ_edge (loop->latch)); - phi = NULL; - for (gphi_iterator gsi = gsi_start_phis (exit->dest); - !gsi_end_p (gsi); - gsi_next (&gsi)) - { - if (virtual_operand_p (PHI_RESULT (gsi.phi ()))) - { - phi = gsi.phi (); - break; - } - } - + phi = get_virtual_phi (exit->dest); if (phi != NULL) { tree final_exit = PHI_ARG_DEF_FROM_EDGE (phi, exit); -- 1.9.1