From patchwork Mon Aug 2 20:20:37 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sebastian Pop X-Patchwork-Id: 60663 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 14735B6F14 for ; Tue, 3 Aug 2010 06:30:10 +1000 (EST) Received: (qmail 5114 invoked by alias); 2 Aug 2010 20:25:25 -0000 Received: (qmail 4733 invoked by uid 22791); 2 Aug 2010 20:25:18 -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, RCVD_IN_DNSWL_NONE, TW_SV, T_TO_NO_BRKTS_FREEMAIL X-Spam-Check-By: sourceware.org Received: from mail-yw0-f47.google.com (HELO mail-yw0-f47.google.com) (209.85.213.47) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Mon, 02 Aug 2010 20:25:04 +0000 Received: by ywe9 with SMTP id 9so1523067ywe.20 for ; Mon, 02 Aug 2010 13:25:02 -0700 (PDT) Received: by 10.100.54.19 with SMTP id c19mr6944877ana.71.1280780702579; Mon, 02 Aug 2010 13:25:02 -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 b17sm10334929anh.5.2010.08.02.13.25.00 (version=TLSv1/SSLv3 cipher=RC4-MD5); Mon, 02 Aug 2010 13:25:02 -0700 (PDT) Received: by napoca (sSMTP sendmail emulation); Mon, 02 Aug 2010 15:24:59 -0500 From: Sebastian Pop To: gcc-patches@gcc.gnu.org Cc: Tobias Grosser , gcc-graphite Subject: [PATCH 64/65] Fix gamess: the only constant phi nodes with one argument are is_gimple_min_invariant and SSA_NAME_IS_DEFAULT_DEF. Date: Mon, 2 Aug 2010 15:20:37 -0500 Message-Id: <1280780438-17543-65-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-07-28 Sebastian Pop * graphite-sese-to-poly.c (rewrite_close_phi_out_of_ssa): The only constant phi nodes with one argument are is_gimple_min_invariant and SSA_NAME_IS_DEFAULT_DEF. * gfortran.dg/graphite/id-22.f: New. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/graphite@162662 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/ChangeLog | 6 ++++++ gcc/ChangeLog.graphite | 8 ++++++++ gcc/graphite-sese-to-poly.c | 5 ++--- gcc/testsuite/ChangeLog | 4 ++++ gcc/testsuite/gfortran.dg/graphite/id-22.f | 10 ++++++++++ 5 files changed, 30 insertions(+), 3 deletions(-) create mode 100644 gcc/testsuite/gfortran.dg/graphite/id-22.f diff --git a/gcc/ChangeLog b/gcc/ChangeLog index bdc5f26..3e01871 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2010-08-02 Sebastian Pop + + * graphite-sese-to-poly.c (rewrite_close_phi_out_of_ssa): The only + constant phi nodes with one argument are is_gimple_min_invariant + and SSA_NAME_IS_DEFAULT_DEF. + 2010-08-02 Andreas Simbuerger * graphite-cloog-util.c (oppose_constraint): diff --git a/gcc/ChangeLog.graphite b/gcc/ChangeLog.graphite index fe58ec0..1d3e64d 100644 --- a/gcc/ChangeLog.graphite +++ b/gcc/ChangeLog.graphite @@ -1,3 +1,11 @@ +2010-07-28 Sebastian Pop + + * graphite-sese-to-poly.c (rewrite_close_phi_out_of_ssa): The only + constant phi nodes with one argument are is_gimple_min_invariant + and SSA_NAME_IS_DEFAULT_DEF. + + * gfortran.dg/graphite/id-22.f: New. + 2010-07-27 Andreas Simbuerger * graphite.c (graphite_initialize): Do not initialize diff --git a/gcc/graphite-sese-to-poly.c b/gcc/graphite-sese-to-poly.c index 44c6588..38e408c 100644 --- a/gcc/graphite-sese-to-poly.c +++ b/gcc/graphite-sese-to-poly.c @@ -2240,10 +2240,9 @@ rewrite_close_phi_out_of_ssa (gimple_stmt_iterator *psi, sese region) gcc_assert (gimple_phi_num_args (phi) == 1); /* 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. */ + invariant, or a default definition. */ if (is_gimple_min_invariant (arg) - || SSA_NAME_IS_DEFAULT_DEF (arg) - || gimple_bb (SSA_NAME_DEF_STMT (arg))->loop_father == bb->loop_father) + || SSA_NAME_IS_DEFAULT_DEF (arg)) { propagate_expr_outside_region (res, arg, region); gsi_next (psi); diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index c5d01bf..a388e00 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,5 +1,9 @@ 2010-08-02 Sebastian Pop + * gfortran.dg/graphite/id-22.f: New. + +2010-08-02 Sebastian Pop + * gcc.dg/graphite/id-26.c: New. 2010-08-02 Sebastian Pop diff --git a/gcc/testsuite/gfortran.dg/graphite/id-22.f b/gcc/testsuite/gfortran.dg/graphite/id-22.f new file mode 100644 index 0000000..4b943f1 --- /dev/null +++ b/gcc/testsuite/gfortran.dg/graphite/id-22.f @@ -0,0 +1,10 @@ +! { dg-options "-O3 -ffast-math" } + + COMMON /NONEQ / UNZOR + DO ITS = 1, NTS + DO JATOM = 1, NAT + IF(IEF.EQ.5.OR.IEF.EQ.8) + * UNZOR = UNZOR + 8 + ENDDO + ENDDO + END