predict.c: Remove May 4 change.

        * predict.c: Remove May 4 change.
        * bb-reorder.c (make_reorder_chain): Do not perform block movement
        if we have predicted the branch at 50-50 probability.

From-SVN: r33707

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index b4ef3843884efbf6857c6c8b9bdedb4be58e2abf..700601770a18cb3014ebebec984edfcf5286cab5 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+Fri May  5 10:11:41 2000  Jeffrey A Law  (law@cygnus.com)
+
+       * predict.c: Remove May 4 change.
+       * bb-reorder.c (make_reorder_chain): Do not perform block movement
+       if we have predicted the branch at 50-50 probability.
+
 2000-05-05  Richard Henderson  <rth@cygnus.com>
 
        * flow.c (init_propagate_block_info): Fix merge error

diff --git a/gcc/bb-reorder.c b/gcc/bb-reorder.c
index 83c2845cc839a3e6eaabeddd506f3e3ac95ac65e..c0c808a7636a60090b3c205f598f4a1a48c94924 100644 (file)
--- a/gcc/bb-reorder.c
+++ b/gcc/bb-reorder.c
@@ -478,7 +478,7 @@ make_reorder_chain (bb)
       else
        probability = 0;
 
-      if (probability >= REG_BR_PROB_BASE / 2)
+      if (probability > REG_BR_PROB_BASE / 2)
        e = bb->succ->succ_next;
     }
 

diff --git a/gcc/predict.c b/gcc/predict.c
index 148d46bb1e6f89d5d6ce081089a01cb9d1dc5ba3..b957e5f6050fb59408acac70c35ba13d62340a1e 100644 (file)
--- a/gcc/predict.c
+++ b/gcc/predict.c
@@ -202,19 +202,6 @@ estimate_probability (loops_info)
          break;
        }
 
-      /* If one of the blocks already directly follows the current
-        block, then predict it as the taken path.  This reduces
-        random block movement.  */
-      for (e = BASIC_BLOCK (i)->succ; e; e = e->succ_next)
-        if (e->dest->index == i + 1)
-          {
-            if (e->flags & EDGE_FALLTHRU)
-              prob = 0;
-            else
-              prob = REG_BR_PROB_BASE;
-            goto emitnote;
-          }
-
       /* If we havn't chosen something by now, predict 50-50.  */
       prob = REG_BR_PROB_BASE / 2;