From patchwork Wed Jun 24 08:56:00 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: 488014 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 A757814007F for ; Wed, 24 Jun 2015 18:58:23 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.b=c3A2UhZv; 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=MAEZ8xH3ZccZBTFwlyMJCLLDFyVPrZG7MAuvlso3B3I y4iEFevGguEidcr1lvOXHauLVI4VOkszB9wmPP8z17lzBmrXy7Vo5JpBs34NctyE eVGcy94ZNa7F7HzH+BcP+tFKyEx6FFG+FAlRYGun7/OXJUmhccLJsrIp+YE2zf2Y = 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=lmWDn/mTJPTX/kyCaoi1cZmYv3c=; b=c3A2UhZvyD0kqLGZN Uchl2bgZ63BAKUf5A94n01EpcyaYz8KC7KReGH09Wb69M6IdfRNIn5cktffmoP69 ynE52j48U3mskqjdo791/WY6pjIUQx2pe2VwaTaYhWThxyCyJH18pl9nGv3xJVB1 HoxIjZs1q9UbreX/wc5Cbe2Yhs= Received: (qmail 66817 invoked by alias); 24 Jun 2015 08:58:17 -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 66807 invoked by uid 89); 24 Jun 2015 08:58:16 -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:58:15 +0000 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55637) by fencepost.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1Z7gVZ-0002rj-AN for gcc-patches@gnu.org; Wed, 24 Jun 2015 04:58:13 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Z7gVY-0008AV-1V for gcc-patches@gnu.org; Wed, 24 Jun 2015 04:58:12 -0400 Received: from relay1.mentorg.com ([192.94.38.131]:52894) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z7gVX-0008AR-Sd for gcc-patches@gnu.org; Wed, 24 Jun 2015 04:58:11 -0400 Received: from nat-ies.mentorg.com ([192.94.31.2] helo=SVR-IES-FEM-02.mgc.mentorg.com) by relay1.mentorg.com with esmtp id 1Z7gVX-0007Ci-3r from Tom_deVries@mentor.com ; Wed, 24 Jun 2015 01:58:11 -0700 Received: from [127.0.0.1] (137.202.0.76) by SVR-IES-FEM-02.mgc.mentorg.com (137.202.0.106) with Microsoft SMTP Server id 14.3.224.2; Wed, 24 Jun 2015 09:56:09 +0100 Message-ID: <558A70A0.5090803@mentor.com> Date: Wed, 24 Jun 2015 10:56:00 +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 replace_uses_in_dominated_bbs X-detected-operating-system: by eggs.gnu.org: Windows NT kernel [generic] [fuzzy] X-Received-From: 192.94.38.131 Hi, this patch factors out a new function replace_uses_in_dominated_bbs out of rewrite_virtuals_into_loop_closed_ssa. Committed to gomp-4_0-branch. Thanks, - Tom Add replace_uses_in_dominated_bbs 2015-06-18 Tom de Vries * tree-ssa-loop-manip.c (replace_uses_in_dominated_bbs): Factor out of ... (rewrite_virtuals_into_loop_closed_ssa): ... here. --- gcc/tree-ssa-loop-manip.c | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/gcc/tree-ssa-loop-manip.c b/gcc/tree-ssa-loop-manip.c index 9c558ca..0d2c972 100644 --- a/gcc/tree-ssa-loop-manip.c +++ b/gcc/tree-ssa-loop-manip.c @@ -588,6 +588,21 @@ replace_uses_in_bbs_by (tree name, tree val, bitmap bbs) } } +/* Replace uses of OLD_VAL with NEW_VAL in bbs dominated by BB. */ + +static void +replace_uses_in_dominated_bbs (tree old_val, tree new_val, basic_block bb) +{ + bitmap dominated = BITMAP_ALLOC (NULL); + + bitmap_get_dominated_by (CDI_DOMINATORS, bb, dominated); + bitmap_set_bit (dominated, bb->index); + + replace_uses_in_bbs_by (old_val, new_val, dominated); + + BITMAP_FREE (dominated); +} + /* 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. */ @@ -635,17 +650,8 @@ rewrite_virtuals_into_loop_closed_ssa (struct loop *loop) tree res_new = copy_ssa_name (final_loop, NULL); gphi *nphi = create_phi_node (res_new, exit->dest); - - /* Gather the bbs dominated by the exit block. */ - bitmap exit_dominated = BITMAP_ALLOC (NULL); - bitmap_get_dominated_by (CDI_DOMINATORS, exit->dest, exit_dominated); - bitmap_set_bit (exit_dominated, exit->dest->index); - - replace_uses_in_bbs_by (final_loop, res_new, exit_dominated); - + replace_uses_in_dominated_bbs (final_loop, res_new, exit->dest); add_phi_arg (nphi, final_loop, exit, UNKNOWN_LOCATION); - - BITMAP_FREE (exit_dominated); } /* Check invariants of the loop closed ssa form for the USE in BB. */ -- 1.9.1