From 000220585db1b91f8c387e690ca51813ad760692 Mon Sep 17 00:00:00 2001 From: Jan Hubicka Date: Sat, 28 May 2016 18:23:33 +0200 Subject: [PATCH] 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 --- gcc/ChangeLog | 5 +++++ gcc/testsuite/ChangeLog | 4 ++++ gcc/testsuite/gcc.dg/tree-ssa/prefetch-5.c | 4 ++-- gcc/tree-ssa-loop-prefetch.c | 2 +- 4 files changed, 12 insertions(+), 3 deletions(-) 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 + + * tree-ssa-loop-prefetch.c (loop_prefetch_arrays): Use + likely_max_stmt_executions_int. + 2016-05-27 Jan Hubicka * 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 + + * gcc.dg/tree-ssa/prefetch-5.c: Remove xfail. + 2016-05-28 Ville Voutilainen 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. */ -- 2.30.2