Re: [PATCH, SMS] Fix marking of SMSed loops as BB_DISABLE_SCHEDULE

[Revital Eres <revital.eres@linaro.org>]

[-- Attachment #1: Type: text/plain, Size: 602 bytes --]

Hello,

>> Tested and bootstrap on all languages except java (PR50879) on
>> ppc64-redhat-linux, enabling SMS on loops with SC 1.
>>
>> OK for mainline?
>>
>
> OK, seems reasonable.
>
> Please fix typo (in original comment):
> -            scheduling passes doesn't touch it.  */
> +            scheduling passes don't touch it.  */

I realize that I forgot to guard the marking in the epilogue and
prologue with -fresched-modulo-sched, sorry about that. I am testing
the attached patch and will commit it after testing completes if there
are no further comments.

Thanks,
Revital

[-- Attachment #2: patch_mark_fix.txt --]
[-- Type: text/plain, Size: 1635 bytes --]

Index: modulo-sched.c
===================================================================
--- modulo-sched.c	(revision 180557)
+++ modulo-sched.c	(working copy)
@@ -1173,6 +1173,8 @@ generate_prolog_epilog (partial_schedule
   /* Put the prolog on the entry edge.  */
   e = loop_preheader_edge (loop);
   split_edge_and_insert (e, get_insns ());
+  if (!flag_resched_modulo_sched)
+    e->dest->flags |= BB_DISABLE_SCHEDULE;
 
   end_sequence ();
 
@@ -1186,9 +1188,24 @@ generate_prolog_epilog (partial_schedule
   gcc_assert (single_exit (loop));
   e = single_exit (loop);
   split_edge_and_insert (e, get_insns ());
+  if (!flag_resched_modulo_sched)
+    e->dest->flags |= BB_DISABLE_SCHEDULE;
+
   end_sequence ();
 }
 
+/* Mark LOOP as software pipelined so the later
+   scheduling passes don't touch it.  */
+static void
+mark_loop_unsched (struct loop *loop)
+{
+  unsigned i;
+  basic_block *bbs = get_loop_body (loop);
+
+  for (i = 0; i < loop->num_nodes; i++)
+    bbs[i]->flags |= BB_DISABLE_SCHEDULE;
+}
+
 /* Return true if all the BBs of the loop are empty except the
    loop header.  */
 static bool
@@ -1714,9 +1731,10 @@ sms_schedule (void)
 	  permute_partial_schedule (ps, g->closing_branch->first_note);
 
           /* Mark this loop as software pipelined so the later
-	     scheduling passes doesn't touch it.  */
+	     scheduling passes don't touch it.  */
 	  if (! flag_resched_modulo_sched)
-	    g->bb->flags |= BB_DISABLE_SCHEDULE;
+	    mark_loop_unsched (loop);
+	  
 	  /* The life-info is not valid any more.  */
 	  df_set_bb_dirty (g->bb);