From 69071d86fcce4f8ce8a57ab013a31c06954cbe40 Mon Sep 17 00:00:00 2001
From: Martin Liska <mliska@suse.cz>
Date: Fri, 17 Jun 2016 16:28:57 +0200
Subject: [PATCH] Change PRED_LOOP_EXIT from 92 to 85.

	* analyze_brprob.py: Fix columns of script output.
	* predict.def: PRED_LOOP_EXIT from 92 to 85.
	* gcc.dg/predict-9.c: Fix dump scanning.

From-SVN: r237556
---
 contrib/ChangeLog                | 4 ++++
 contrib/analyze_brprob.py        | 4 ++--
 gcc/ChangeLog                    | 4 ++++
 gcc/predict.def                  | 2 +-
 gcc/testsuite/ChangeLog          | 4 ++++
 gcc/testsuite/gcc.dg/predict-9.c | 4 ++--
 6 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/contrib/ChangeLog b/contrib/ChangeLog
index c974b75e3587..1a0badc69ff5 100644
--- a/contrib/ChangeLog
+++ b/contrib/ChangeLog
@@ -1,3 +1,7 @@
+2016-06-17  Martin Liska  <mliska@suse.cz>
+
+	* analyze_brprob.py: Fix columns of script output.
+
 2016-06-13  Richard Biener  <rguenther@suse.de>
 
 	* download_prerequisites (ISL): Bump version to 0.16.1
diff --git a/contrib/analyze_brprob.py b/contrib/analyze_brprob.py
index 9808c46de16c..2526623ff550 100755
--- a/contrib/analyze_brprob.py
+++ b/contrib/analyze_brprob.py
@@ -119,10 +119,10 @@ class Profile:
         elif sorting == 'coverage':
             sorter = lambda x: x[1].count
 
-        print('%-36s %8s %6s  %-16s %14s %8s %6s' % ('HEURISTICS', 'BRANCHES', '(REL)',
+        print('%-40s %8s %6s  %-16s %14s %8s %6s' % ('HEURISTICS', 'BRANCHES', '(REL)',
               'HITRATE', 'COVERAGE', 'COVERAGE', '(REL)'))
         for (k, v) in sorted(self.heuristics.items(), key = sorter):
-            print('%-36s %8i %5.1f%% %6.2f%% / %6.2f%% %14i %8s %5.1f%%' %
+            print('%-40s %8i %5.1f%% %6.2f%% / %6.2f%% %14i %8s %5.1f%%' %
             (k, v.branches, percentage(v.branches, self.branches_max ()),
              percentage(v.hits, v.count), percentage(v.fits, v.count),
              v.count, v.count_formatted(), percentage(v.count, self.count_max()) ))
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 0f4846c2c4de..a93464d33a75 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,7 @@
+2016-06-17  Martin Liska  <mliska@suse.cz>
+
+	* predict.def: PRED_LOOP_EXIT from 92 to 85.
+
 2016-06-17  James Greenhalgh  <james.greenhalgh@arm.com>
 
 	* config/arm/arm_neon.h (vadd_f32): replace __FAST_MATH with
diff --git a/gcc/predict.def b/gcc/predict.def
index a0d0ba923a23..d3bc757bb97a 100644
--- a/gcc/predict.def
+++ b/gcc/predict.def
@@ -89,7 +89,7 @@ DEF_PREDICTOR (PRED_COLD_FUNCTION, "cold function call", PROB_VERY_LIKELY,
 	       PRED_FLAG_FIRST_MATCH)
 
 /* Edge causing loop to terminate is probably not taken.  */
-DEF_PREDICTOR (PRED_LOOP_EXIT, "loop exit", HITRATE (92),
+DEF_PREDICTOR (PRED_LOOP_EXIT, "loop exit", HITRATE (85),
 	       PRED_FLAG_FIRST_MATCH)
 
 /* Edge causing loop to terminate by computing value used by later
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 0071cee22b21..b3fa6a279029 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2016-06-17  Martin Liska  <mliska@suse.cz>
+
+	* gcc.dg/predict-9.c: Fix dump scanning.
+
 2016-06-17  Bin Cheng  <bin.cheng@arm.com>
 
 	PR tree-optimization/71354
diff --git a/gcc/testsuite/gcc.dg/predict-9.c b/gcc/testsuite/gcc.dg/predict-9.c
index a613961091d2..196e31c60ee6 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.0%" 3 "profile_estimate"} } */
-/* { dg-final { scan-tree-dump-times "first match heuristics: 4.0%" 1 "profile_estimate"} } */
+/* { 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"} } */
-- 
GitLab