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 X-Patchwork-Id: 3979 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id 1E9B223EFD for ; Thu, 8 Sep 2011 07:59:33 +0000 (UTC) Received: from mail-fx0-f52.google.com (mail-fx0-f52.google.com [209.85.161.52]) by fiordland.canonical.com (Postfix) with ESMTP id 050B9A180E6 for ; Thu, 8 Sep 2011 07:59:33 +0000 (UTC) Received: by fxd18 with SMTP id 18so1911448fxd.11 for ; Thu, 08 Sep 2011 00:59:32 -0700 (PDT) Received: by 10.223.76.201 with SMTP id d9mr662747fak.119.1315468772853; Thu, 08 Sep 2011 00:59:32 -0700 (PDT) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.152.11.8 with SMTP id m8cs166486lab; Thu, 8 Sep 2011 00:59:32 -0700 (PDT) Received: by 10.150.150.8 with SMTP id x8mr493576ybd.203.1315468771660; Thu, 08 Sep 2011 00:59:31 -0700 (PDT) Received: from mail-gx0-f174.google.com (mail-gx0-f174.google.com [209.85.161.174]) by mx.google.com with ESMTPS id y12si4467441ybe.85.2011.09.08.00.59.30 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 08 Sep 2011 00:59:30 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.161.174 is neither permitted nor denied by best guess record for domain of revital.eres@linaro.org) client-ip=209.85.161.174; Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.161.174 is neither permitted nor denied by best guess record for domain of revital.eres@linaro.org) smtp.mail=revital.eres@linaro.org Received: by gxk21 with SMTP id 21so799741gxk.5 for ; 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: Subject: [PATCH, SMS] Minor misc. fixes From: Revital Eres To: gcc-patches@gcc.gnu.org Cc: Ayal Zaks , Patch Tracking 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); }