From patchwork Thu Sep  8 07:59:29 2011
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Revital Eres <revital.eres@linaro.org>
X-Patchwork-Id: 113875
Return-Path: 
 <gcc-patches-return-301652-incoming=patchwork.ozlabs.org@gcc.gnu.org>
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 4473AB6F90
	for <incoming@patchwork.ozlabs.org>;
	Thu,  8 Sep 2011 17:59:49 +1000 (EST)
Received: (qmail 7423 invoked by alias); 8 Sep 2011 07:59:45 -0000
Received: (qmail 7412 invoked by uid 22791); 8 Sep 2011 07:59:44 -0000
X-SWARE-Spam-Status: No, hits=-2.0 required=5.0	tests=AWL, BAYES_00,
	RCVD_IN_DNSWL_LOW
X-Spam-Check-By: sourceware.org
Received: from mail-gx0-f173.google.com (HELO mail-gx0-f173.google.com)
	(209.85.161.173) by sourceware.org (qpsmtpd/0.43rc1) with
	ESMTP; Thu, 08 Sep 2011 07:59:30 +0000
Received: by gxk26 with SMTP id 26so924119gxk.18 for
	<gcc-patches@gcc.gnu.org>; Thu, 08 Sep 2011 00:59:30 -0700 (PDT)
MIME-Version: 1.0
Received: by 10.101.211.15 with SMTP id n15mr302258anq.127.1315468769917;
	Thu, 08 Sep 2011 00:59:29 -0700 (PDT)
Received: by 10.100.239.11 with HTTP; Thu, 8 Sep 2011 00:59:29 -0700 (PDT)
Date: Thu, 8 Sep 2011 10:59:29 +0300
Message-ID: 
 <CAHz1=dVAc0eYqSYt=0ODetANs4gJXt5KaUM5yRG2j4QSJg-LBg@mail.gmail.com>
Subject: [PATCH, SMS] Minor misc. fixes
From: Revital Eres <revital.eres@linaro.org>
To: gcc-patches@gcc.gnu.org
Cc: Ayal Zaks <ayal.zaks@gmail.com>, Patch Tracking <patches@linaro.org>
Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm
Precedence: bulk
List-Id: <gcc-patches.gcc.gnu.org>
List-Unsubscribe: 
 <mailto:gcc-patches-unsubscribe-incoming=patchwork.ozlabs.org@gcc.gnu.org>
List-Archive: <http://gcc.gnu.org/ml/gcc-patches/>
List-Post: <mailto:gcc-patches@gcc.gnu.org>
List-Help: <mailto:gcc-patches-help@gcc.gnu.org>
Sender: gcc-patches-owner@gcc.gnu.org
Delivered-To: mailing list gcc-patches@gcc.gnu.org

Hello,

The attached patch contains minor fixes.

Currently testing and bootstrap on ppc64-redhat-linux enabling SMS on
loops with SC 1.

OK for mainline once testing completes?

Thanks,
Revital


Changelog

        * modulo-sched.c (optimize_sc): Call remove_node_from_ps outside
        of gcc_assert.
        (sms_schedule): Add print info.

Index: modulo-sched.c
===================================================================
--- modulo-sched.c	(revision 178632)
+++ modulo-sched.c	(working copy)
@@ -773,7 +773,7 @@ optimize_sc (partial_schedule_ptr ps, dd
   if (get_sched_window (ps, g->closing_branch, sched_nodes, ii, &start,
 			&step, &end) == 0)
     {
-      bool success;
+      bool success, remove_branch_p;
       ps_insn_ptr next_ps_i;
       int branch_cycle = SCHED_TIME (g->closing_branch);
       int row = SMODULO (branch_cycle, ps->ii);
@@ -835,7 +835,8 @@ optimize_sc (partial_schedule_ptr ps, dd
 	  break;
 
       gcc_assert (next_ps_i);
-      gcc_assert (remove_node_from_ps (ps, next_ps_i));
+      remove_branch_p = remove_node_from_ps (ps, next_ps_i);
+      gcc_assert (remove_branch_p);
       success =
 	try_scheduling_node_in_cycle (ps, g->closing_branch,
 				      g->closing_branch->cuid, c,
@@ -1485,8 +1486,8 @@ sms_schedule (void)
           if (dump_file)
             {
 	      fprintf (dump_file,
-		       "SMS succeeded %d %d (with ii, sc)\n", ps->ii,
-		       stage_count);
+		       "%s:%d SMS succeeded %d %d (with ii, sc)\n",
+		       insn_file (tail), insn_line (tail), ps->ii, stage_count);
 	      print_partial_schedule (ps, dump_file);
 	    }