predict.c (tree_estimate_probability_driver): Normalize the loop when initializing...

2012-07-31  Dehao Chen  <dehao@google.com>

	* predict.c (tree_estimate_probability_driver): Normalize the
	loop when initializing the loop optimizer.

From-SVN: r190015

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 6b1851a..c2df9d3 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2012-07-31  Dehao Chen  <dehao@google.com>
+
+       * predict.c (tree_estimate_probability_driver): Normalize the
+       loop when initializing the loop optimizer.
+
 2012-07-31  Richard Guenther  <rguenther@suse.de>
 
        * tree-flow.h (struct var_ann_d): Remove need_phi_state

diff --git a/gcc/predict.c b/gcc/predict.c
index b8acdba..c884d38 100644 (file)
--- a/gcc/predict.c
+++ b/gcc/predict.c
@@ -2200,7 +2200,7 @@ tree_estimate_probability_driver (void)
 {
   unsigned nb_loops;
 
-  loop_optimizer_init (0);
+  loop_optimizer_init (LOOPS_NORMAL);
   if (dump_file && (dump_flags & TDF_DETAILS))
     flow_loops_dump (dump_file, NULL, 0);
 

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 6a56342..00c8b70 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2012-07-31  Dehao Chen  <dehao@google.com>
+
+       * gcc.dg/predict-7.c: New test.
+
 2012-07-31  Janus Weil  <janus@gcc.gnu.org>
 
        PR fortran/54134

diff --git a/gcc/testsuite/gcc.dg/predict-7.c b/gcc/testsuite/gcc.dg/predict-7.c
new file mode 100644 (file)
index 0000000..2c1c36f
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/predict-7.c
@@ -0,0 +1,17 @@
+/* { dg-do compile } */
+/* { dg-options "-O2 -fdump-tree-profile_estimate" } */
+
+extern int global;
+
+int bar (int);
+
+void foo (int base)
+{
+  int i;
+  while (global < 10)
+    for (i = base; i < 10; i++)
+      bar (i);
+}
+
+/* { dg-final { scan-tree-dump-times "loop branch heuristics" 0 "profile_estimate"} } */
+/* { dg-final { cleanup-tree-dump "profile_estimate" } } */