From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 1453 invoked by alias); 16 Jul 2010 07:04:52 -0000 Received: (qmail 1230 invoked by uid 22791); 16 Jul 2010 07:04:50 -0000 X-SWARE-Spam-Status: No, hits=-1.9 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; Fri, 16 Jul 2010 07:04:44 +0000 Received: by mail-gx0-f175.google.com with SMTP id 3so830309gxk.20 for ; Fri, 16 Jul 2010 00:04:44 -0700 (PDT) Received: by 10.100.134.3 with SMTP id h3mr826488and.100.1279263882451; Fri, 16 Jul 2010 00:04:42 -0700 (PDT) Received: from napoca (cpe-70-120-196-107.austin.res.rr.com [70.120.196.107]) by mx.google.com with ESMTPS id a12sm21503947and.16.2010.07.16.00.04.40 (version=TLSv1/SSLv3 cipher=RC4-MD5); Fri, 16 Jul 2010 00:04:42 -0700 (PDT) Received: by napoca (sSMTP sendmail emulation); Fri, 16 Jul 2010 02:04:39 -0500 From: Sebastian Pop To: gcc-patches@gcc.gnu.org Cc: gcc-graphite@googlegroups.com, Sebastian Pop Subject: [PATCH 08/12] Special case non close-phi nodes with one argument in rewrite_close_phi_out_of_ssa. Date: Fri, 16 Jul 2010 07:05:00 -0000 Message-Id: <1279263843-9149-9-git-send-email-sebpop@gmail.com> In-Reply-To: <1279263843-9149-1-git-send-email-sebpop@gmail.com> References: <1279263843-9149-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-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org X-SW-Source: 2010-07/txt/msg01320.txt.bz2 2010-07-15 Sebastian Pop * graphite-sese-to-poly.c (rewrite_close_phi_out_of_ssa): Special case non close-phi nodes with one argument. --- gcc/ChangeLog.graphite | 5 +++++ gcc/graphite-sese-to-poly.c | 28 ++++++++++++++++++++-------- 2 files changed, 25 insertions(+), 8 deletions(-) diff --git a/gcc/ChangeLog.graphite b/gcc/ChangeLog.graphite index bbd6a34..40db483 100644 --- a/gcc/ChangeLog.graphite +++ b/gcc/ChangeLog.graphite @@ -1,5 +1,10 @@ 2010-07-15 Sebastian Pop + * graphite-sese-to-poly.c (rewrite_close_phi_out_of_ssa): Special + case non close-phi nodes with one argument. + +2010-07-15 Sebastian Pop + * sese.h (scev_analyzable_p): Scevs could be expressions without chrecs and still be scev_analyzable_p. diff --git a/gcc/graphite-sese-to-poly.c b/gcc/graphite-sese-to-poly.c index 9c54f0b..3d02197 100644 --- a/gcc/graphite-sese-to-poly.c +++ b/gcc/graphite-sese-to-poly.c @@ -2202,22 +2202,34 @@ rewrite_close_phi_out_of_ssa (gimple_stmt_iterator *psi) gimple phi = gsi_stmt (*psi); tree res = gimple_phi_result (phi); tree var = SSA_NAME_VAR (res); - tree zero_dim_array = create_zero_dim_array (var, "Close_Phi"); - gimple_stmt_iterator gsi = gsi_after_labels (gimple_bb (phi)); - gimple stmt = gimple_build_assign (res, zero_dim_array); + basic_block bb = gimple_bb (phi); + gimple_stmt_iterator gsi = gsi_after_labels (bb); tree arg = gimple_phi_arg_def (phi, 0); + gimple stmt; /* Note that loop close phi nodes should have a single argument because we translated the representation into a canonical form before Graphite: see canonicalize_loop_closed_ssa_form. */ gcc_assert (gimple_phi_num_args (phi) == 1); - if (TREE_CODE (arg) == SSA_NAME - && !SSA_NAME_IS_DEFAULT_DEF (arg)) - insert_out_of_ssa_copy (zero_dim_array, arg, SSA_NAME_DEF_STMT (arg)); + /* The phi node can be a non close phi node, when its argument is + invariant, or when it is defined in the same loop as the phi node. */ + if (is_gimple_min_invariant (arg) + || gimple_bb (SSA_NAME_DEF_STMT (arg))->loop_father == bb->loop_father) + stmt = gimple_build_assign (res, arg); else - insert_out_of_ssa_copy_on_edge (single_pred_edge (gimple_bb (phi)), - zero_dim_array, arg); + { + tree zero_dim_array = create_zero_dim_array (var, "Close_Phi"); + + stmt = gimple_build_assign (res, zero_dim_array); + + if (TREE_CODE (arg) == SSA_NAME + && !SSA_NAME_IS_DEFAULT_DEF (arg)) + insert_out_of_ssa_copy (zero_dim_array, arg, SSA_NAME_DEF_STMT (arg)); + else + insert_out_of_ssa_copy_on_edge (single_pred_edge (bb), + zero_dim_array, arg); + } remove_phi_node (psi, false); gsi_insert_before (&gsi, stmt, GSI_NEW_STMT); -- 1.7.0.4