From patchwork Tue Jul 27 00:53:29 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sebastian Pop X-Patchwork-Id: 59966 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]) by ozlabs.org (Postfix) with SMTP id 8CB16B70AF for ; Tue, 27 Jul 2010 10:54:00 +1000 (EST) Received: (qmail 1258 invoked by alias); 27 Jul 2010 00:53:54 -0000 Received: (qmail 1059 invoked by uid 22791); 27 Jul 2010 00:53:51 -0000 X-SWARE-Spam-Status: No, hits=-1.8 required=5.0 tests=AWL, BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_FROM, TW_TM, T_TO_NO_BRKTS_FREEMAIL X-Spam-Check-By: sourceware.org Received: from mail-gx0-f175.google.com (HELO mail-gx0-f175.google.com) (209.85.161.175) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Tue, 27 Jul 2010 00:53:43 +0000 Received: by gxk2 with SMTP id 2so1266419gxk.20 for ; Mon, 26 Jul 2010 17:53:41 -0700 (PDT) Received: by 10.100.109.4 with SMTP id h4mr3900184anc.125.1280192021521; Mon, 26 Jul 2010 17:53:41 -0700 (PDT) Received: from napoca ([163.181.251.115]) by mx.google.com with ESMTPS id a12sm7506694and.16.2010.07.26.17.53.39 (version=TLSv1/SSLv3 cipher=RC4-MD5); Mon, 26 Jul 2010 17:53:41 -0700 (PDT) Received: by napoca (sSMTP sendmail emulation); Mon, 26 Jul 2010 19:53:38 -0500 From: Sebastian Pop To: gcc-patches@gcc.gnu.org Cc: gcc-graphite@googlegroups.com, Sebastian Pop Subject: [PATCH 2/2] Fix tonto: call propagate_expr_outside_region. Date: Mon, 26 Jul 2010 19:53:29 -0500 Message-Id: <1280192009-20472-3-git-send-email-sebpop@gmail.com> In-Reply-To: <1280192009-20472-1-git-send-email-sebpop@gmail.com> References: <1280192009-20472-1-git-send-email-sebpop@gmail.com> X-IsSubscribed: yes 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 2010-07-26 Sebastian Pop * graphite-sese-to-poly.c (propagate_expr_outside_region): Also handle the case when def is in the sese region. (rewrite_close_phi_out_of_ssa): Call propagate_expr_outside_region for invariant expressions. (rewrite_cross_bb_phi_deps): Removed. (rewrite_cross_bb_scalar_deps): Also handle GIMPLE_PHI nodes. (rewrite_cross_bb_scalar_deps_out_of_ssa): Do not call rewrite_cross_bb_phi_deps. --- gcc/ChangeLog.graphite | 11 +++++++ gcc/graphite-sese-to-poly.c | 64 ++++++++++++++----------------------------- 2 files changed, 32 insertions(+), 43 deletions(-) diff --git a/gcc/ChangeLog.graphite b/gcc/ChangeLog.graphite index 2d0b2ab..19ddf88 100644 --- a/gcc/ChangeLog.graphite +++ b/gcc/ChangeLog.graphite @@ -1,5 +1,16 @@ 2010-07-26 Sebastian Pop + * graphite-sese-to-poly.c (propagate_expr_outside_region): Also + handle the case when def is in the sese region. + (rewrite_close_phi_out_of_ssa): Call propagate_expr_outside_region + for invariant expressions. + (rewrite_cross_bb_phi_deps): Removed. + (rewrite_cross_bb_scalar_deps): Also handle GIMPLE_PHI nodes. + (rewrite_cross_bb_scalar_deps_out_of_ssa): Do not call + rewrite_cross_bb_phi_deps. + +2010-07-26 Sebastian Pop + * graphite-sese-to-poly.c (rewrite_commutative_reductions_out_of_ssa_loop): Call scev_analyzable_p only on is_gimple_reg diff --git a/gcc/graphite-sese-to-poly.c b/gcc/graphite-sese-to-poly.c index 3ca803e..2fc3ccf 100644 --- a/gcc/graphite-sese-to-poly.c +++ b/gcc/graphite-sese-to-poly.c @@ -2192,8 +2192,7 @@ propagate_expr_outside_region (tree def, tree expr, sese region) gimple_seq stmts; bool replaced_once = false; - gcc_assert (TREE_CODE (def) == SSA_NAME - && bb_in_sese_p (gimple_bb (SSA_NAME_DEF_STMT (def)), region)); + gcc_assert (TREE_CODE (def) == SSA_NAME); expr = force_gimple_operand (unshare_expr (expr), &stmts, true, NULL_TREE); @@ -2244,7 +2243,11 @@ rewrite_close_phi_out_of_ssa (gimple_stmt_iterator *psi, sese region) if (is_gimple_min_invariant (arg) || SSA_NAME_IS_DEFAULT_DEF (arg) || gimple_bb (SSA_NAME_DEF_STMT (arg))->loop_father == bb->loop_father) - stmt = gimple_build_assign (res, arg); + { + propagate_expr_outside_region (res, arg, region); + gsi_next (psi); + return; + } /* If res is scev analyzable and is not a scalar value, it is safe to ignore the close phi node: it will be code generated in the @@ -2261,7 +2264,7 @@ rewrite_close_phi_out_of_ssa (gimple_stmt_iterator *psi, sese region) scev = compute_overall_effect_of_inner_loop (loop, scev); } else - scev = scalar_evolution_in_region (region, loop, res); + scev = scalar_evolution_in_region (region, loop, res); if (tree_does_not_contain_chrecs (scev)) propagate_expr_outside_region (res, scev, region); @@ -2424,38 +2427,6 @@ rewrite_cross_bb_scalar_dependence (tree zero_dim_array, tree def, gimple use_st } /* Rewrite the scalar dependences crossing the boundary of the BB - containing STMT with an array. GSI points to a definition that is - used in a PHI node. */ - -static void -rewrite_cross_bb_phi_deps (sese region, gimple_stmt_iterator gsi) -{ - gimple stmt = gsi_stmt (gsi); - imm_use_iterator imm_iter; - tree def; - gimple use_stmt; - - if (gimple_code (stmt) != GIMPLE_ASSIGN) - return; - - def = gimple_assign_lhs (stmt); - if (!is_gimple_reg (def) - || scev_analyzable_p (def, region)) - return; - - FOR_EACH_IMM_USE_STMT (use_stmt, imm_iter, def) - if (gimple_code (use_stmt) == GIMPLE_PHI) - { - gimple_stmt_iterator psi = gsi_for_stmt (use_stmt); - - if (scalar_close_phi_node_p (gsi_stmt (psi))) - rewrite_close_phi_out_of_ssa (&psi, region); - else - rewrite_phi_out_of_ssa (&psi); - } -} - -/* Rewrite the scalar dependences crossing the boundary of the BB containing STMT with an array. */ static void @@ -2499,11 +2470,21 @@ rewrite_cross_bb_scalar_deps (sese region, gimple_stmt_iterator *gsi) def_bb = gimple_bb (stmt); FOR_EACH_IMM_USE_STMT (use_stmt, imm_iter, def) - if (def_bb != gimple_bb (use_stmt) - && !is_gimple_debug (use_stmt)) + if (gimple_code (use_stmt) == GIMPLE_PHI) { - gcc_assert (gimple_code (use_stmt) != GIMPLE_PHI); + gimple_stmt_iterator psi = gsi_for_stmt (use_stmt); + if (scalar_close_phi_node_p (gsi_stmt (psi))) + rewrite_close_phi_out_of_ssa (&psi, region); + else + rewrite_phi_out_of_ssa (&psi); + } + + FOR_EACH_IMM_USE_STMT (use_stmt, imm_iter, def) + if (gimple_code (use_stmt) != GIMPLE_PHI + && def_bb != gimple_bb (use_stmt) + && !is_gimple_debug (use_stmt)) + { if (!zero_dim_array) { zero_dim_array = create_zero_dim_array @@ -2529,10 +2510,7 @@ rewrite_cross_bb_scalar_deps_out_of_ssa (scop_p scop) FOR_EACH_BB (bb) if (bb_in_sese_p (bb, region)) for (psi = gsi_start_bb (bb); !gsi_end_p (psi); gsi_next (&psi)) - { - rewrite_cross_bb_phi_deps (region, psi); - rewrite_cross_bb_scalar_deps (region, &psi); - } + rewrite_cross_bb_scalar_deps (region, &psi); update_ssa (TODO_update_ssa); #ifdef ENABLE_CHECKING