> > FAIL: gfortran.dg/class_alias.f90 -Os execution test
>
> I see this failure on trunk as well, but I don't think it was
> introduced by my commit. Instead, I see I it starting with r267601:
>
> https://gcc.gnu.org/viewcvs/gcc?view=revision&revision=267601
>
> Jan, could you please have a look?
Actually I have noticed about half an hour ago that i commited WIP
variant of the patch. It is fixed by this patch
I apologize for the breakage.
Index: ChangeLog
===================================================================
--- ChangeLog (revision 267602)
+++ ChangeLog (working copy)
@@ -1,5 +1,15 @@
2019-01-05 Jan Hubicka <hubi...@ucw.cz>
+ * doc/invoke.texi (max-inline-insns-small): New parameters.
+ * ipa-inline.c (want_early_inline_function_p): simplify.
+ (want_inline_small_function_p): Fix pasto from previous patch;
+ use max-inline-insns-small bound.
+ * params.def (max-inline-insns-small): New param.
+ * ipa-fnsummary.c (analyze_function_body): Initialize time/size
+ variables correctly.
+
+2019-01-05 Jan Hubicka <hubi...@ucw.cz>
+
* doc/invoke.texi: Document max-inline-insns-size,
uninlined-function-insns, uninlined-function-time,
uninlined-thunk-insns and uninlined-thunk-time.
Index: testsuite/ChangeLog
===================================================================
--- testsuite/ChangeLog (revision 267601)
+++ testsuite/ChangeLog (working copy)
@@ -1,3 +1,7 @@
+2019-01-05 Jan Hubicka <hubi...@ucw.cz>
+
+ * gcc.dg/ipa/ipcp-2.c: Update bounds.
+
2019-01-05 Dominique d'Humieres <domi...@gcc.gnu.org>
* gcc.dg/plugin/plugindir1.c: Adjust dg-prune-output for Darwin.
Index: doc/invoke.texi
===================================================================
--- doc/invoke.texi (revision 267601)
+++ doc/invoke.texi (working copy)
@@ -11007,6 +11007,10 @@ by the compiler are investigated. To th
(more restrictive) limit compared to functions declared inline can
be applied.
+@item max-inline-insns-small
+This is bound applied to calls which are considered relevant with
+@option{-finline-small-functions}.
+
@item max-inline-insns-size
This is bound applied to calls which are optimized for size. Small growth
may be desirable to anticipate optimization oppurtunities exposed by inlining.
Index: testsuite/gcc.dg/ipa/ipcp-2.c
===================================================================
--- testsuite/gcc.dg/ipa/ipcp-2.c (revision 267601)
+++ testsuite/gcc.dg/ipa/ipcp-2.c (working copy)
@@ -1,5 +1,5 @@
/* { dg-do compile } */
-/* { dg-options "-O3 -fipa-cp -fipa-cp-clone -fdump-ipa-cp -fno-early-inlining
--param ipa-cp-eval-threshold=80" } */
+/* { dg-options "-O3 -fipa-cp -fipa-cp-clone -fdump-ipa-cp -fno-early-inlining
--param ipa-cp-eval-threshold=200" } */
/* { dg-add-options bind_pic_locally } */
extern int get_stuff (int);
Index: ipa-inline.c
===================================================================
--- ipa-inline.c (revision 267601)
+++ ipa-inline.c (working copy)
@@ -637,8 +637,7 @@ want_early_inline_function_p (struct cgr
if (growth <= PARAM_VALUE (PARAM_MAX_INLINE_INSNS_SIZE))
;
- else if (!e->maybe_hot_p ()
- && growth > 0)
+ else if (!e->maybe_hot_p ())
{
if (dump_enabled_p ())
dump_printf_loc (MSG_MISSED_OPTIMIZATION, e->call_stmt,
@@ -791,7 +790,7 @@ want_inline_small_function_p (struct cgr
ipa_hints hints = estimate_edge_hints (e);
int big_speedup = -1; /* compute this lazily */
- if (growth <= PARAM_VALUE (PARAM_VALUE (PARAM_MAX_INLINE_INSNS_SIZE)))
+ if (growth <= PARAM_VALUE (PARAM_MAX_INLINE_INSNS_SIZE))
;
/* Apply MAX_INLINE_INSNS_SINGLE limit. Do not do so when
hints suggests that inlining given function is very profitable. */
@@ -809,9 +808,8 @@ want_inline_small_function_p (struct cgr
want_inline = false;
}
else if (!DECL_DECLARED_INLINE_P (callee->decl)
- && (in_lto_p
- && growth >= PARAM_VALUE (PARAM_EARLY_INLINING_INSNS))
- && !opt_for_fn (e->caller->decl, flag_inline_functions))
+ && !opt_for_fn (e->caller->decl, flag_inline_functions)
+ && growth >= PARAM_VALUE (PARAM_MAX_INLINE_INSNS_SMALL))
{
/* growth_likely_positive is expensive, always test it last. */
if (growth >= MAX_INLINE_INSNS_SINGLE
Index: params.def
===================================================================
--- params.def (revision 267601)
+++ params.def (working copy)
@@ -83,6 +83,11 @@ DEFPARAM (PARAM_MAX_INLINE_INSNS_AUTO,
"The maximum number of instructions when automatically inlining.",
30, 0, 0)
+DEFPARAM (PARAM_MAX_INLINE_INSNS_SMALL,
+ "max-inline-insns-small",
+ "The maximum number of instructions when automatically inlining small
functions.",
+ 0, 0, 0)
+
DEFPARAM (PARAM_MAX_INLINE_INSNS_SIZE,
"max-inline-insns-size",
"The maximum number of instructions when inlining for size.",
Index: ipa-fnsummary.c
===================================================================
--- ipa-fnsummary.c (revision 267601)
+++ ipa-fnsummary.c (working copy)
@@ -1969,9 +1969,9 @@ fp_expression_p (gimple *stmt)
static void
analyze_function_body (struct cgraph_node *node, bool early)
{
- sreal time = 0;
+ sreal time = PARAM_VALUE (PARAM_UNINLINED_FUNCTION_TIME);
/* Estimate static overhead for function prologue/epilogue and alignment. */
- int size = 2;
+ int size = PARAM_VALUE (PARAM_UNINLINED_FUNCTION_INSNS);
/* Benefits are scaled by probability of elimination that is in range
<0,2>. */
basic_block bb;
