From: Jan Hubicka <hubicka@ucw.cz>
Date: Sat, 28 May 2016 16:23:33 +0000 (+0200)
Subject: prefetch-5.c: Remove xfail.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=000220585db1b91f8c387e690ca51813ad760692;p=gcc.git

prefetch-5.c: Remove xfail.

	* gcc.dg/tree-ssa/prefetch-5.c: Remove xfail.
	* tree-ssa-loop-prefetch.c (loop_prefetch_arrays): Use
	likely_max_stmt_executions_int.

From-SVN: r236851
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 385674508df..cf3c946dca9 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2016-05-27  Jan Hubicka  <hubicka@ucw.cz>
+
+	* tree-ssa-loop-prefetch.c (loop_prefetch_arrays): Use
+	likely_max_stmt_executions_int.
+
 2016-05-27  Jan Hubicka  <hubicka@ucw.cz>
 
 	* profile.c (compute_branch_probabilities): Do not report hitrates
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 881470ba5c5..27fdbe1497a 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2016-05-27  Jan Hubicka  <hubicka@ucw.cz>
+
+	* gcc.dg/tree-ssa/prefetch-5.c: Remove xfail.
+
 2016-05-28  Ville Voutilainen  <ville.voutilainen@gmail.com>
 
 	Revert:
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/prefetch-5.c b/gcc/testsuite/gcc.dg/tree-ssa/prefetch-5.c
index fc2c267b178..af1bb13c254 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/prefetch-5.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/prefetch-5.c
@@ -56,5 +56,5 @@ int loop5 (int n, struct tail5 *x)
 
 /* Until we are able to track likely upper bounds, we can't really work out that
    small trailing arrays should not be prefetched.  */
-/* { dg-final { scan-tree-dump-times "Issued prefetch" 2 "aprefetch" { xfail *-*-* } } } */
-/* { dg-final { scan-tree-dump-times "Not prefetching" 1 "aprefetch" { xfail *-*-* } } } */
+/* { dg-final { scan-tree-dump-times "Issued prefetch" 2 "aprefetch"  } } */
+/* { dg-final { scan-tree-dump-times "Not prefetching" 1 "aprefetch"  } } */
diff --git a/gcc/tree-ssa-loop-prefetch.c b/gcc/tree-ssa-loop-prefetch.c
index fb8c4763769..e43ced656f5 100644
--- a/gcc/tree-ssa-loop-prefetch.c
+++ b/gcc/tree-ssa-loop-prefetch.c
@@ -1848,7 +1848,7 @@ loop_prefetch_arrays (struct loop *loop)
   ahead = (PREFETCH_LATENCY + time - 1) / time;
   est_niter = estimated_stmt_executions_int (loop);
   if (est_niter == -1)
-    est_niter = max_stmt_executions_int (loop);
+    est_niter = likely_max_stmt_executions_int (loop);
 
   /* Prefetching is not likely to be profitable if the trip count to ahead
      ratio is too small.  */