2010-01-28 Richard Guenther <rguenther@suse.de>

[pf3gnuchains/gcc-fork.git] / gcc / loop-unswitch.c

diff --git a/gcc/loop-unswitch.c b/gcc/loop-unswitch.c
index 38706d1..ca9543c 100644 (file)
--- a/gcc/loop-unswitch.c
+++ b/gcc/loop-unswitch.c
@@ -1,11 +1,12 @@
 /* Loop unswitching for GNU compiler.
 /* Loop unswitching for GNU compiler.

-   Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2003, 2004, 2005, 2007, 2008
+   Free Software Foundation, Inc.

 
 This file is part of GCC.
 
 GCC is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free
 
 This file is part of GCC.
 
 GCC is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free

-Software Foundation; either version 2, or (at your option) any later
+Software Foundation; either version 3, or (at your option) any later

 version.
 
 GCC is distributed in the hope that it will be useful, but WITHOUT ANY
 version.
 
 GCC is distributed in the hope that it will be useful, but WITHOUT ANY


@@ -14,9 +15,8 @@ FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
 for more details.
 
 You should have received a copy of the GNU General Public License
 for more details.
 
 You should have received a copy of the GNU General Public License

-along with GCC; see the file COPYING.  If not, write to the Free
-Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA
-02110-1301, USA.  */
+along with GCC; see the file COPYING3.  If not see
+<http://www.gnu.org/licenses/>.  */

 
 #include "config.h"
 #include "system.h"
 
 #include "config.h"
 #include "system.h"


@@ -126,8 +126,8 @@ compare_and_jump_seq (rtx op0, rtx op1, enum rtx_code comp, rtx label, int prob,
       JUMP_LABEL (jump) = label;
       LABEL_NUSES (label)++;
     }
       JUMP_LABEL (jump) = label;
       LABEL_NUSES (label)++;
     }

-  REG_NOTES (jump) = gen_rtx_EXPR_LIST (REG_BR_PROB, GEN_INT (prob),
-                                       REG_NOTES (jump));
+  add_reg_note (jump, REG_BR_PROB, GEN_INT (prob));
+

   seq = get_insns ();
   end_sequence ();
 
   seq = get_insns ();
   end_sequence ();
 


@@ -143,7 +143,7 @@ unswitch_loops (void)
 
   /* Go through inner loops (only original ones).  */
 
 
   /* Go through inner loops (only original ones).  */
 

-  FOR_EACH_LOOP (li, loop, LI_ONLY_OLD | LI_ONLY_INNERMOST)
+  FOR_EACH_LOOP (li, loop, LI_ONLY_INNERMOST)

     {
       unswitch_single_loop (loop, NULL_RTX, 0);
 #ifdef ENABLE_CHECKING
     {
       unswitch_single_loop (loop, NULL_RTX, 0);
 #ifdef ENABLE_CHECKING


@@ -291,7 +291,7 @@ unswitch_single_loop (struct loop *loop, rtx cond_checked, int num)
     }
 
   /* Do not unswitch in cold areas.  */
     }
 
   /* Do not unswitch in cold areas.  */

-  if (!maybe_hot_bb_p (loop->header))
+  if (optimize_loop_for_size_p (loop))

     {
       if (dump_file)
        fprintf (dump_file, ";; Not unswitching, not hot area\n");
     {
       if (dump_file)
        fprintf (dump_file, ";; Not unswitching, not hot area\n");


@@ -392,7 +392,6 @@ unswitch_loop (struct loop *loop, basic_block unswitch_on, rtx cond, rtx cinsn)
   edge entry, latch_edge, true_edge, false_edge, e;
   basic_block switch_bb, unswitch_on_alt;
   struct loop *nloop;
   edge entry, latch_edge, true_edge, false_edge, e;
   basic_block switch_bb, unswitch_on_alt;
   struct loop *nloop;

-  sbitmap zero_bitmap;

   int irred_flag, prob;
   rtx seq;
 
   int irred_flag, prob;
   rtx seq;
 


@@ -409,7 +408,6 @@ unswitch_loop (struct loop *loop, basic_block unswitch_on, rtx cond, rtx cinsn)
   /* Make a copy.  */
   irred_flag = entry->flags & EDGE_IRREDUCIBLE_LOOP;
   entry->flags &= ~EDGE_IRREDUCIBLE_LOOP;
   /* Make a copy.  */
   irred_flag = entry->flags & EDGE_IRREDUCIBLE_LOOP;
   entry->flags &= ~EDGE_IRREDUCIBLE_LOOP;

-  zero_bitmap = sbitmap_alloc (2);

   if (!duplicate_loop_to_header_edge (loop, entry, 1,
                                      NULL, NULL, NULL, 0))
     return NULL;
   if (!duplicate_loop_to_header_edge (loop, entry, 1,
                                      NULL, NULL, NULL, 0))
     return NULL;


@@ -451,17 +449,13 @@ unswitch_loop (struct loop *loop, basic_block unswitch_on, rtx cond, rtx cinsn)
   /* Loopify from the copy of LOOP body, constructing the new loop.  */
   nloop = loopify (latch_edge,
                   single_pred_edge (get_bb_copy (loop->header)), switch_bb,
   /* Loopify from the copy of LOOP body, constructing the new loop.  */
   nloop = loopify (latch_edge,
                   single_pred_edge (get_bb_copy (loop->header)), switch_bb,

-                  BRANCH_EDGE (switch_bb), FALLTHRU_EDGE (switch_bb), true);
+                  BRANCH_EDGE (switch_bb), FALLTHRU_EDGE (switch_bb), true,
+                  prob, REG_BR_PROB_BASE - prob);

 
   /* Remove branches that are now unreachable in new loops.  */
   remove_path (true_edge);
   remove_path (false_edge);
 
 
   /* Remove branches that are now unreachable in new loops.  */
   remove_path (true_edge);
   remove_path (false_edge);
 

-  /* One of created loops do not have to be subloop of the outer loop now,
-     so fix its placement in loop data structure.  */
-  fix_loop_placement (loop);
-  fix_loop_placement (nloop);
-

   /* Preserve the simple loop preheaders.  */
   split_edge (loop_preheader_edge (loop));
   split_edge (loop_preheader_edge (nloop));
   /* Preserve the simple loop preheaders.  */
   split_edge (loop_preheader_edge (loop));
   split_edge (loop_preheader_edge (nloop));