From patchwork Thu Sep 30 18:01:24 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sebastian Pop X-Patchwork-Id: 66219 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 245E6B70A6 for ; Fri, 1 Oct 2010 04:06:44 +1000 (EST) Received: (qmail 20849 invoked by alias); 30 Sep 2010 18:05:41 -0000 Received: (qmail 12456 invoked by uid 22791); 30 Sep 2010 18:03:35 -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-gx0-f175.google.com (HELO mail-gx0-f175.google.com) (209.85.161.175) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Thu, 30 Sep 2010 18:03:30 +0000 Received: by mail-gx0-f175.google.com with SMTP id 10so993056gxk.20 for ; Thu, 30 Sep 2010 11:03:29 -0700 (PDT) Received: by 10.100.46.17 with SMTP id t17mr4433712ant.237.1285869809289; Thu, 30 Sep 2010 11:03:29 -0700 (PDT) Received: from napoca ([163.181.251.115]) by mx.google.com with ESMTPS id q7sm161592anf.6.2010.09.30.11.03.27 (version=TLSv1/SSLv3 cipher=RC4-MD5); Thu, 30 Sep 2010 11:03:28 -0700 (PDT) Received: by napoca (sSMTP sendmail emulation); Thu, 30 Sep 2010 13:03:26 -0500 From: Sebastian Pop To: gcc-patches@gcc.gnu.org Cc: gcc-graphite@googlegroups.com Subject: [PATCH 32/44] Fix lst_update_scattering. Date: Thu, 30 Sep 2010 13:01:24 -0500 Message-Id: <1285869696-10915-33-git-send-email-sebpop@gmail.com> In-Reply-To: <1285869696-10915-1-git-send-email-sebpop@gmail.com> References: <1285869696-10915-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-09-09 Sebastian Pop * graphite-poly.h (lst_update_scattering_seq): Removed. (lst_update_scattering): Correctly handle outermost loop dewey renumbering. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/graphite@164125 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/ChangeLog | 6 ++++++ gcc/ChangeLog.graphite | 6 ++++++ gcc/graphite-poly.h | 36 ++++++++++++++---------------------- 3 files changed, 26 insertions(+), 22 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 7f09a83..1e7141d 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,5 +1,11 @@ 2010-09-30 Sebastian Pop + * graphite-poly.h (lst_update_scattering_seq): Removed. + (lst_update_scattering): Correctly handle outermost loop dewey + renumbering. + +2010-09-30 Sebastian Pop + * graphite-blocking.c (pbb_strip_mine_profitable_p): Renamed lst_strip_mine_profitable_p. Call lst_niter_for_loop. * graphite-poly.h (lst_niter_for_loop): New. diff --git a/gcc/ChangeLog.graphite b/gcc/ChangeLog.graphite index a22f77e..f085803 100644 --- a/gcc/ChangeLog.graphite +++ b/gcc/ChangeLog.graphite @@ -1,5 +1,11 @@ 2010-09-09 Sebastian Pop + * graphite-poly.h (lst_update_scattering_seq): Removed. + (lst_update_scattering): Correctly handle outermost loop dewey + renumbering. + +2010-09-09 Sebastian Pop + * graphite-blocking.c (pbb_strip_mine_profitable_p): Renamed lst_strip_mine_profitable_p. Call lst_niter_for_loop. * graphite-poly.h (lst_niter_for_loop): New. diff --git a/gcc/graphite-poly.h b/gcc/graphite-poly.h index 5f536a8..e93c2ad 100644 --- a/gcc/graphite-poly.h +++ b/gcc/graphite-poly.h @@ -1120,24 +1120,6 @@ lst_update_scattering_under (lst_p lst, int level, int dewey) pbb_update_scattering (LST_PBB (lst), level, dewey); } -/* Updates the scattering of all the PBBs under LST and in sequence - with LST. */ - -static inline void -lst_update_scattering_seq (lst_p lst) -{ - int i; - lst_p l; - lst_p father = LST_LOOP_FATHER (lst); - int dewey = lst_dewey_number (lst); - int level = lst_depth (lst); - - gcc_assert (lst && father && dewey >= 0 && level >= 0); - - for (i = dewey; VEC_iterate (lst_p, LST_SEQ (father), i, l); i++) - lst_update_scattering_under (l, level, i); -} - /* Updates the all the scattering levels of all the PBBs under LST. */ @@ -1147,14 +1129,24 @@ lst_update_scattering (lst_p lst) int i; lst_p l; - if (!lst || !LST_LOOP_P (lst)) + if (!lst) return; if (LST_LOOP_FATHER (lst)) - lst_update_scattering_seq (lst); + { + lst_p father = LST_LOOP_FATHER (lst); + int dewey = lst_dewey_number (lst); + int level = lst_depth (lst); - for (i = 0; VEC_iterate (lst_p, LST_SEQ (lst), i, l); i++) - lst_update_scattering (l); + gcc_assert (lst && father && dewey >= 0 && level >= 0); + + for (i = dewey; VEC_iterate (lst_p, LST_SEQ (father), i, l); i++) + lst_update_scattering_under (l, level, i); + } + + if (LST_LOOP_P (lst)) + for (i = 0; VEC_iterate (lst_p, LST_SEQ (lst), i, l); i++) + lst_update_scattering (l); } /* Inserts LST1 before LST2 if BEFORE is true; inserts LST1 after LST2