From a77e3a39de3843a8c0a0d59635b2bdd07ee67812 Mon Sep 17 00:00:00 2001 From: Martin Liska Date: Fri, 3 Aug 2018 07:23:47 +0000 Subject: [PATCH] Print heuristics probability fraction part with 2 digits. 2018-08-03 Martin Liska * predict.c (dump_prediction): Change to 2 digits in fraction part. 2018-08-03 Martin Liska * gcc.dg/predict-1.c: Adjust scanned pattern to cover 2 digits. * gcc.dg/predict-13.c:Likewise. * gcc.dg/predict-3.c:Likewise. * gcc.dg/predict-4.c:Likewise. * gcc.dg/predict-5.c:Likewise. * gcc.dg/predict-6.c:Likewise. * gcc.dg/predict-9.c:Likewise. * gfortran.dg/predict-1.f90:Likewise. From-SVN: r263286 --- gcc/ChangeLog | 5 +++++ gcc/predict.c | 2 +- gcc/testsuite/ChangeLog | 25 ++++++++++++++++++------- gcc/testsuite/gcc.dg/predict-1.c | 2 +- gcc/testsuite/gcc.dg/predict-13.c | 4 ++-- gcc/testsuite/gcc.dg/predict-3.c | 2 +- gcc/testsuite/gcc.dg/predict-4.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 ++-- gcc/testsuite/gfortran.dg/predict-1.f90 | 2 +- 11 files changed, 34 insertions(+), 18 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 77d110d3c73..88553407612 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,8 @@ +2018-08-03 Martin Liska + + * predict.c (dump_prediction): Change to 2 digits + in fraction part. + 2018-08-03 Siddhesh Poyarekar * config/aarch64/falkor.md (falkor_am_1_vxvy_vxvy): Move diff --git a/gcc/predict.c b/gcc/predict.c index 65e088fb8df..a6769eda1c7 100644 --- a/gcc/predict.c +++ b/gcc/predict.c @@ -734,7 +734,7 @@ dump_prediction (FILE *file, enum br_predictor predictor, int probability, else edge_info_str[0] = '\0'; - fprintf (file, " %s heuristics%s%s: %.1f%%", + fprintf (file, " %s heuristics%s%s: %.2f%%", predictor_info[predictor].name, edge_info_str, reason_messages[reason], probability * 100.0 / REG_BR_PROB_BASE); diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 5400bbe9c92..f0ef23755c3 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,14 @@ +2018-08-03 Martin Liska + + * gcc.dg/predict-1.c: Adjust scanned pattern to cover 2 digits. + * gcc.dg/predict-13.c:Likewise. + * gcc.dg/predict-3.c:Likewise. + * gcc.dg/predict-4.c:Likewise. + * gcc.dg/predict-5.c:Likewise. + * gcc.dg/predict-6.c:Likewise. + * gcc.dg/predict-9.c:Likewise. + * gfortran.dg/predict-1.f90:Likewise. + 2018-08-02 Richard Biener PR c++/86763 @@ -266,13 +277,13 @@ PR tree-optimization/86636 * gcc.c-torture/compile/pr86636.c: New test. - -2018-07-24 Matthew Malcomson - - * gcc.target/aarch64/simd/vect_su_add_sub.c: New. - -2018-07-24 Jakub Jelinek - + +2018-07-24 Matthew Malcomson + + * gcc.target/aarch64/simd/vect_su_add_sub.c: New. + +2018-07-24 Jakub Jelinek + PR middle-end/86627 * gcc.target/i386/pr86627.c: New test. diff --git a/gcc/testsuite/gcc.dg/predict-1.c b/gcc/testsuite/gcc.dg/predict-1.c index 4ba26e6e256..9e5605a2e84 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\[^:\]*: 36.0%" 4 "profile_estimate"} } */ +/* { dg-final { scan-tree-dump-times "guess loop iv compare heuristics of edge\[^:\]*: 36.00%" 4 "profile_estimate"} } */ diff --git a/gcc/testsuite/gcc.dg/predict-13.c b/gcc/testsuite/gcc.dg/predict-13.c index 385be9e1389..c6da45f8127 100644 --- a/gcc/testsuite/gcc.dg/predict-13.c +++ b/gcc/testsuite/gcc.dg/predict-13.c @@ -20,5 +20,5 @@ int main(int argc, char **argv) return 10; } -/* { dg-final { scan-tree-dump-times "combined heuristics of edge\[^:\]*: 33.3%" 3 "profile_estimate"} } */ -/* { dg-final { scan-tree-dump-times "combined heuristics of edge\[^:\]*: 0.1%" 2 "profile_estimate"} } */ +/* { dg-final { scan-tree-dump-times "combined heuristics of edge\[^:\]*: 33.30%" 3 "profile_estimate"} } */ +/* { dg-final { scan-tree-dump-times "combined heuristics of edge\[^:\]*: 0.05%" 2 "profile_estimate"} } */ diff --git a/gcc/testsuite/gcc.dg/predict-3.c b/gcc/testsuite/gcc.dg/predict-3.c index 81addde1667..f3f416345e5 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\[^:\]*: 64.0%" 3 "profile_estimate"} } */ +/* { dg-final { scan-tree-dump-times "guess loop iv compare heuristics of edge\[^:\]*: 64.00%" 3 "profile_estimate"} } */ diff --git a/gcc/testsuite/gcc.dg/predict-4.c b/gcc/testsuite/gcc.dg/predict-4.c index 2ac2ec5721d..851afb1cff5 100644 --- a/gcc/testsuite/gcc.dg/predict-4.c +++ b/gcc/testsuite/gcc.dg/predict-4.c @@ -15,4 +15,4 @@ void foo (int bound) } } -/* { dg-final { scan-tree-dump " loop iv compare heuristics of edge\[^:\]*: 50.0%" "profile_estimate"} } */ +/* { dg-final { scan-tree-dump " loop iv compare heuristics of edge\[^:\]*: 50.00%" "profile_estimate"} } */ diff --git a/gcc/testsuite/gcc.dg/predict-5.c b/gcc/testsuite/gcc.dg/predict-5.c index c80b2928d57..5af5db1825e 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\[^:\]*: 64.0%" 4 "profile_estimate"} } */ +/* { dg-final { scan-tree-dump-times "guess loop iv compare heuristics of edge\[^:\]*: 64.00%" 4 "profile_estimate"} } */ diff --git a/gcc/testsuite/gcc.dg/predict-6.c b/gcc/testsuite/gcc.dg/predict-6.c index 3acc7644629..5d6fbf158f2 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\[^:\]*: 36.0%" 4 "profile_estimate"} } */ +/* { dg-final { scan-tree-dump-times "guess loop iv compare heuristics of edge\[^:\]*: 36.00%" 4 "profile_estimate"} } */ diff --git a/gcc/testsuite/gcc.dg/predict-9.c b/gcc/testsuite/gcc.dg/predict-9.c index 3823775e3f8..7e5ba085ece 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: 2.2%" 3 "profile_estimate"} } */ -/* { dg-final { scan-tree-dump-times "first match heuristics: 5.5%" 1 "profile_estimate"} } */ +/* { dg-final { scan-tree-dump-times "first match heuristics: 2.20%" 3 "profile_estimate"} } */ +/* { dg-final { scan-tree-dump-times "first match heuristics: 5.50%" 1 "profile_estimate"} } */ diff --git a/gcc/testsuite/gfortran.dg/predict-1.f90 b/gcc/testsuite/gfortran.dg/predict-1.f90 index a3feea9b123..5360c618515 100644 --- a/gcc/testsuite/gfortran.dg/predict-1.f90 +++ b/gcc/testsuite/gfortran.dg/predict-1.f90 @@ -14,4 +14,4 @@ end do end subroutine test -! { dg-final { scan-tree-dump-times "Fortran loop preheader heuristics of edge\[^:\]*: 1.0%" 2 "profile_estimate" } } +! { dg-final { scan-tree-dump-times "Fortran loop preheader heuristics of edge\[^:\]*: 1.00%" 2 "profile_estimate" } } -- 2.30.2