> Last patch from the series it clean up of test-suite. > > Martin
> >From e76a4544e236d7d586380f33e20431f854436ce4 Mon Sep 17 00:00:00 2001 > From: marxin <mli...@suse.cz> > Date: Tue, 9 Jan 2018 10:52:36 +0100 > Subject: [PATCH 5/5] Fix test-suite fallout. > > gcc/testsuite/ChangeLog: > > 2018-01-09 Martin Liska <mli...@suse.cz> > > * gcc.dg/predict-1.c: Adjust expected probability. > * gcc.dg/predict-10.c: Remove. > * gcc.dg/predict-12.c: Do not scan for removed predictor. > * gcc.dg/predict-3.c: Adjust expected probability. > * gcc.dg/predict-5.c: Likewise. > * gcc.dg/predict-6.c: Likewise. > * gcc.dg/predict-9.c: Likewise. OK, thanks! Honza > --- > gcc/testsuite/gcc.dg/predict-1.c | 2 +- > gcc/testsuite/gcc.dg/predict-10.c | 11 ----------- > gcc/testsuite/gcc.dg/predict-12.c | 1 - > gcc/testsuite/gcc.dg/predict-3.c | 2 +- > gcc/testsuite/gcc.dg/predict-5.c | 2 +- > gcc/testsuite/gcc.dg/predict-6.c | 2 +- > gcc/testsuite/gcc.dg/predict-9.c | 4 ++-- > 7 files changed, 6 insertions(+), 18 deletions(-) > delete mode 100644 gcc/testsuite/gcc.dg/predict-10.c > > diff --git a/gcc/testsuite/gcc.dg/predict-1.c > b/gcc/testsuite/gcc.dg/predict-1.c > index 65f6bad9d7c..4ba26e6e256 100644 > --- a/gcc/testsuite/gcc.dg/predict-1.c > +++ b/gcc/testsuite/gcc.dg/predict-1.c > @@ -23,4 +23,4 @@ void foo (int bound) > } > } > > -/* { dg-final { scan-tree-dump-times "guess loop iv compare heuristics of > edge\[^:\]*: 2.0%" 4 "profile_estimate"} } */ > +/* { dg-final { scan-tree-dump-times "guess loop iv compare heuristics of > edge\[^:\]*: 36.0%" 4 "profile_estimate"} } */ > diff --git a/gcc/testsuite/gcc.dg/predict-10.c > b/gcc/testsuite/gcc.dg/predict-10.c > deleted file mode 100644 > index a99819a24c6..00000000000 > --- a/gcc/testsuite/gcc.dg/predict-10.c > +++ /dev/null > @@ -1,11 +0,0 @@ > -/* { dg-do compile } */ > -/* { dg-options "-O2 -fdump-tree-profile_estimate" } */ > -int > -ee(int i) > -{ > - if (i>2) > - return (ee(i-1)+ee(i-2))/2; > - else > - return i; > -} > -/* { dg-final { scan-tree-dump-times "recursive call" 1 "profile_estimate"} > } */ > diff --git a/gcc/testsuite/gcc.dg/predict-12.c > b/gcc/testsuite/gcc.dg/predict-12.c > index 1fd4d67c60e..eb5178e7a2e 100644 > --- a/gcc/testsuite/gcc.dg/predict-12.c > +++ b/gcc/testsuite/gcc.dg/predict-12.c > @@ -14,4 +14,3 @@ t(void) > } > /* { dg-final { scan-tree-dump-times "loop guard with recursion" 1 > "profile_estimate"} } */ > /* { dg-final { scan-tree-dump-times "loop exit with recursion" 2 > "profile_estimate"} } */ > -/* { dg-final { scan-tree-dump-times "recursive call" 1 "profile_estimate"} > } */ > diff --git a/gcc/testsuite/gcc.dg/predict-3.c > b/gcc/testsuite/gcc.dg/predict-3.c > index 7274963b943..81addde1667 100644 > --- a/gcc/testsuite/gcc.dg/predict-3.c > +++ b/gcc/testsuite/gcc.dg/predict-3.c > @@ -25,4 +25,4 @@ void foo (int bound) > } > } > > -/* { dg-final { scan-tree-dump-times "guess loop iv compare heuristics of > edge\[^:\]*: 98.0%" 3 "profile_estimate"} } */ > +/* { dg-final { scan-tree-dump-times "guess loop iv compare heuristics of > edge\[^:\]*: 64.0%" 3 "profile_estimate"} } */ > diff --git a/gcc/testsuite/gcc.dg/predict-5.c > b/gcc/testsuite/gcc.dg/predict-5.c > index 135081de2a4..c80b2928d57 100644 > --- a/gcc/testsuite/gcc.dg/predict-5.c > +++ b/gcc/testsuite/gcc.dg/predict-5.c > @@ -21,4 +21,4 @@ void foo (int base, int bound) > } > } > > -/* { dg-final { scan-tree-dump-times "guess loop iv compare heuristics of > edge\[^:\]*: 98.0%" 4 "profile_estimate"} } */ > +/* { dg-final { scan-tree-dump-times "guess loop iv compare heuristics of > edge\[^:\]*: 64.0%" 4 "profile_estimate"} } */ > diff --git a/gcc/testsuite/gcc.dg/predict-6.c > b/gcc/testsuite/gcc.dg/predict-6.c > index 104683f7f43..3acc7644629 100644 > --- a/gcc/testsuite/gcc.dg/predict-6.c > +++ b/gcc/testsuite/gcc.dg/predict-6.c > @@ -21,4 +21,4 @@ void foo (int base, int bound) > } > } > > -/* { dg-final { scan-tree-dump-times "guess loop iv compare heuristics of > edge\[^:\]*: 2.0%" 4 "profile_estimate"} } */ > +/* { dg-final { scan-tree-dump-times "guess loop iv compare heuristics of > edge\[^:\]*: 36.0%" 4 "profile_estimate"} } */ > diff --git a/gcc/testsuite/gcc.dg/predict-9.c > b/gcc/testsuite/gcc.dg/predict-9.c > index ec467519504..3823775e3f8 100644 > --- a/gcc/testsuite/gcc.dg/predict-9.c > +++ b/gcc/testsuite/gcc.dg/predict-9.c > @@ -19,5 +19,5 @@ void foo (int base) > } > } > > -/* { dg-final { scan-tree-dump-times "first match heuristics: 3.0%" 3 > "profile_estimate"} } */ > -/* { dg-final { scan-tree-dump-times "first match heuristics: 7.5%" 1 > "profile_estimate"} } */ > +/* { dg-final { scan-tree-dump-times "first match heuristics: 2.2%" 3 > "profile_estimate"} } */ > +/* { dg-final { scan-tree-dump-times "first match heuristics: 5.5%" 1 > "profile_estimate"} } */ > -- > 2.14.3 >