From patchwork Mon Aug 2 20:19:59 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sebastian Pop X-Patchwork-Id: 60624 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 13D73B70AF for ; Tue, 3 Aug 2010 06:25:59 +1000 (EST) Received: (qmail 28019 invoked by alias); 2 Aug 2010 20:23:01 -0000 Received: (qmail 27959 invoked by uid 22791); 2 Aug 2010 20:22:59 -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_SV, 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; Mon, 02 Aug 2010 20:22:49 +0000 Received: by gxk2 with SMTP id 2so1547314gxk.20 for ; Mon, 02 Aug 2010 13:22:47 -0700 (PDT) Received: by 10.151.40.7 with SMTP id s7mr7630402ybj.440.1280780567747; Mon, 02 Aug 2010 13:22:47 -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 x3sm4386980ybl.10.2010.08.02.13.22.45 (version=TLSv1/SSLv3 cipher=RC4-MD5); Mon, 02 Aug 2010 13:22:47 -0700 (PDT) Received: by napoca (sSMTP sendmail emulation); Mon, 02 Aug 2010 15:22:44 -0500 From: Sebastian Pop To: gcc-patches@gcc.gnu.org Cc: Tobias Grosser , gcc-graphite Subject: [PATCH 26/65] Fix 435.gromacs miscompile: call rewrite_close_phi_out_of_ssa from rewrite_cross_bb_phi_deps. Date: Mon, 2 Aug 2010 15:19:59 -0500 Message-Id: <1280780438-17543-27-git-send-email-sebpop@gmail.com> In-Reply-To: <1280780438-17543-1-git-send-email-sebpop@gmail.com> References: <1280780438-17543-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 From: spop 2010-06-24 Sebastian Pop * graphite-sese-to-poly.c (rewrite_cross_bb_phi_deps): Call rewrite_close_phi_out_of_ssa. * gcc.dg/graphite/id-22.c: New. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/graphite@161359 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/ChangeLog | 5 +++++ gcc/ChangeLog.graphite | 7 +++++++ gcc/graphite-sese-to-poly.c | 8 ++++++-- gcc/testsuite/ChangeLog | 4 ++++ gcc/testsuite/gcc.dg/graphite/id-22.c | 15 +++++++++++++++ 5 files changed, 37 insertions(+), 2 deletions(-) create mode 100644 gcc/testsuite/gcc.dg/graphite/id-22.c diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 95b5413..2013c55 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,5 +1,10 @@ 2010-08-02 Sebastian Pop + * graphite-sese-to-poly.c (rewrite_cross_bb_phi_deps): Call + rewrite_close_phi_out_of_ssa. + +2010-08-02 Sebastian Pop + * graphite-sese-to-poly.c (rewrite_cross_bb_phi_deps): Remove dead code. 2010-08-02 Sebastian Pop diff --git a/gcc/ChangeLog.graphite b/gcc/ChangeLog.graphite index c2be7c7..ee63b7c 100644 --- a/gcc/ChangeLog.graphite +++ b/gcc/ChangeLog.graphite @@ -1,5 +1,12 @@ 2010-06-24 Sebastian Pop + * graphite-sese-to-poly.c (rewrite_cross_bb_phi_deps): Call + rewrite_close_phi_out_of_ssa. + + * gcc.dg/graphite/id-22.c: New. + +2010-06-24 Sebastian Pop + * graphite-sese-to-poly.c (rewrite_cross_bb_phi_deps): Remove dead code. 2010-06-24 Sebastian Pop diff --git a/gcc/graphite-sese-to-poly.c b/gcc/graphite-sese-to-poly.c index 318401e..8857946 100644 --- a/gcc/graphite-sese-to-poly.c +++ b/gcc/graphite-sese-to-poly.c @@ -2361,8 +2361,12 @@ rewrite_cross_bb_phi_deps (sese region, gimple_stmt_iterator gsi) FOR_EACH_IMM_USE_STMT (use_stmt, imm_iter, def) if (gimple_code (use_stmt) == GIMPLE_PHI) { - gimple_stmt_iterator si = gsi_for_stmt (use_stmt); - rewrite_phi_out_of_ssa (&si); + 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); + else + rewrite_phi_out_of_ssa (&psi); } } diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 90c2798..2463668 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,5 +1,9 @@ 2010-08-02 Sebastian Pop + * gcc.dg/graphite/id-22.c: New. + +2010-08-02 Sebastian Pop + * gcc.dg/graphite/run-id-2.c: Call abort. 2010-08-02 Sebastian Pop diff --git a/gcc/testsuite/gcc.dg/graphite/id-22.c b/gcc/testsuite/gcc.dg/graphite/id-22.c new file mode 100644 index 0000000..d825542 --- /dev/null +++ b/gcc/testsuite/gcc.dg/graphite/id-22.c @@ -0,0 +1,15 @@ +typedef float rvec[3]; +float calc_similar_ind (int nind, rvec x[]) +{ + int i, j, d; + float m, tm, xd, rd; + for(j=0; j