From 40fbc3ff0c85d3537d3ade7903f35954694dd241 Mon Sep 17 00:00:00 2001 From: Martin Liska Date: Thu, 22 Jun 2017 13:40:00 +0200 Subject: [PATCH] Backport r248489 2017-06-22 Martin Liska Backport from mainline 2017-05-26 Martin Liska PR ipa/80663 * params.def: Bound partial-inlining-entry-probability param. 2017-06-22 Martin Liska Backport from mainline 2017-05-26 Martin Liska PR ipa/80663 * g++.dg/ipa/pr80212.C: Remove the test as it does not longer split at the problematic spot. * gcc.dg/ipa/pr48195.c: Change 101 to 100 as 101 is no longer a valid value of the param. From-SVN: r249548 --- gcc/ChangeLog | 8 ++++++++ gcc/params.def | 2 +- gcc/testsuite/ChangeLog | 11 +++++++++++ gcc/testsuite/g++.dg/ipa/pr80212.C | 18 ------------------ gcc/testsuite/gcc.dg/ipa/pr48195.c | 2 +- 5 files changed, 21 insertions(+), 20 deletions(-) delete mode 100644 gcc/testsuite/g++.dg/ipa/pr80212.C diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 92e3b11f097..c2de75d99ec 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,11 @@ +2017-06-22 Martin Liska + + Backport from mainline + 2017-05-26 Martin Liska + + PR ipa/80663 + * params.def: Bound partial-inlining-entry-probability param. + 2017-06-22 Martin Liska Backport from mainline diff --git a/gcc/params.def b/gcc/params.def index 1b058e49860..6b07518a34b 100644 --- a/gcc/params.def +++ b/gcc/params.def @@ -126,7 +126,7 @@ DEFPARAM (PARAM_COMDAT_SHARING_PROBABILITY, DEFPARAM (PARAM_PARTIAL_INLINING_ENTRY_PROBABILITY, "partial-inlining-entry-probability", "Maximum probability of the entry BB of split region (in percent relative to entry BB of the function) to make partial inlining happen.", - 70, 0, 0) + 70, 0, 100) /* Limit the number of expansions created by the variable expansion optimization to avoid register pressure. */ diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index e7fc9630881..010267a1819 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,14 @@ +2017-06-22 Martin Liska + + Backport from mainline + 2017-05-26 Martin Liska + + PR ipa/80663 + * g++.dg/ipa/pr80212.C: Remove the test as it does not longer + split at the problematic spot. + * gcc.dg/ipa/pr48195.c: Change 101 to 100 as 101 is no longer + a valid value of the param. + 2017-06-21 Michael Meissner Back port from mainline diff --git a/gcc/testsuite/g++.dg/ipa/pr80212.C b/gcc/testsuite/g++.dg/ipa/pr80212.C deleted file mode 100644 index 60d3b613035..00000000000 --- a/gcc/testsuite/g++.dg/ipa/pr80212.C +++ /dev/null @@ -1,18 +0,0 @@ -// PR ipa/80212 -// { dg-options "-O2 --param partial-inlining-entry-probability=403796683 -fno-early-inlining" } - -struct b -{ - virtual b *c () const; -}; -struct d : virtual b -{ -}; -struct e : d -{ - e * - c () const - { - } -}; -main () { e a; } diff --git a/gcc/testsuite/gcc.dg/ipa/pr48195.c b/gcc/testsuite/gcc.dg/ipa/pr48195.c index 2e38452d598..25e80bab8f8 100644 --- a/gcc/testsuite/gcc.dg/ipa/pr48195.c +++ b/gcc/testsuite/gcc.dg/ipa/pr48195.c @@ -1,5 +1,5 @@ /* { dg-do link } */ -/* { dg-options "-O2 -flto --param partial-inlining-entry-probability=101" } */ +/* { dg-options "-O2 -flto --param partial-inlining-entry-probability=100" } */ /* { dg-require-effective-target lto } */ extern void abort(void);