From 19b5595858162b8a77b84db93b21b39a48dc2d0e Mon Sep 17 00:00:00 2001 From: Martin Liska Date: Wed, 24 Oct 2018 10:47:59 +0200 Subject: [PATCH] Remove reduntant dumps and make tp_first_run dump more compact. 2018-10-24 Martin Liska * cgraph.c (cgraph_node::dump): Remove reduntant dumps and make tp_first_run dump more compact. 2018-10-24 Martin Liska * libgcov-profiler.c: Start from 1 in order to distinguish functions which were seen and these that were not. From-SVN: r265454 --- gcc/ChangeLog | 5 +++++ gcc/cgraph.c | 15 ++++++--------- gcc/testsuite/gcc.dg/tree-prof/time-profiler-1.c | 2 +- gcc/testsuite/gcc.dg/tree-prof/time-profiler-2.c | 4 ++-- gcc/testsuite/gcc.dg/tree-prof/time-profiler-3.c | 2 +- libgcc/ChangeLog | 5 +++++ libgcc/libgcov-profiler.c | 2 +- 7 files changed, 21 insertions(+), 14 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 33c906afb09..e5f43678eec 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,8 @@ +2018-10-24 Martin Liska + + * cgraph.c (cgraph_node::dump): + Remove reduntant dumps and make tp_first_run dump more compact. + 2018-10-24 Richard Biener PR tree-optimization/87665 diff --git a/gcc/cgraph.c b/gcc/cgraph.c index 48bab9f2749..b432f7e6500 100644 --- a/gcc/cgraph.c +++ b/gcc/cgraph.c @@ -2016,7 +2016,6 @@ cgraph_node::dump (FILE *f) if (profile_id) fprintf (f, " Profile id: %i\n", profile_id); - fprintf (f, " First run: %i\n", tp_first_run); cgraph_function_version_info *vi = function_version (); if (vi != NULL) { @@ -2040,11 +2039,13 @@ cgraph_node::dump (FILE *f) fprintf (f, " Function flags:"); if (count.initialized_p ()) { - fprintf (f, " count: "); + fprintf (f, " count:"); count.dump (f); } + if (tp_first_run > 0) + fprintf (f, " first_run:%i", tp_first_run); if (origin) - fprintf (f, " nested in: %s", origin->asm_name ()); + fprintf (f, " nested in:%s", origin->asm_name ()); if (gimple_has_body_p (decl)) fprintf (f, " body"); if (process) @@ -2081,10 +2082,6 @@ cgraph_node::dump (FILE *f) fprintf (f, " unlikely_executed"); if (frequency == NODE_FREQUENCY_EXECUTED_ONCE) fprintf (f, " executed_once"); - if (only_called_at_startup) - fprintf (f, " only_called_at_startup"); - if (only_called_at_exit) - fprintf (f, " only_called_at_exit"); if (opt_for_fn (decl, optimize_size)) fprintf (f, " optimize_size"); if (parallelized_function) @@ -2096,7 +2093,7 @@ cgraph_node::dump (FILE *f) { fprintf (f, " Thunk"); if (thunk.alias) - fprintf (f, " of %s (asm: %s)", + fprintf (f, " of %s (asm:%s)", lang_hooks.decl_printable_name (thunk.alias, 2), IDENTIFIER_POINTER (DECL_ASSEMBLER_NAME (thunk.alias))); fprintf (f, " fixed offset %i virtual value %i indirect_offset %i " @@ -2112,7 +2109,7 @@ cgraph_node::dump (FILE *f) fprintf (f, " Alias of %s", lang_hooks.decl_printable_name (thunk.alias, 2)); if (DECL_ASSEMBLER_NAME_SET_P (thunk.alias)) - fprintf (f, " (asm: %s)", + fprintf (f, " (asm:%s)", IDENTIFIER_POINTER (DECL_ASSEMBLER_NAME (thunk.alias))); fprintf (f, "\n"); } diff --git a/gcc/testsuite/gcc.dg/tree-prof/time-profiler-1.c b/gcc/testsuite/gcc.dg/tree-prof/time-profiler-1.c index 455f923f3f4..a622df23ce6 100644 --- a/gcc/testsuite/gcc.dg/tree-prof/time-profiler-1.c +++ b/gcc/testsuite/gcc.dg/tree-prof/time-profiler-1.c @@ -16,6 +16,6 @@ int main () { return foo (); } -/* { dg-final-use-not-autofdo { scan-ipa-dump-times "Read tp_first_run: 0" 1 "profile"} } */ /* { dg-final-use-not-autofdo { scan-ipa-dump-times "Read tp_first_run: 1" 1 "profile"} } */ /* { dg-final-use-not-autofdo { scan-ipa-dump-times "Read tp_first_run: 2" 1 "profile"} } */ +/* { dg-final-use-not-autofdo { scan-ipa-dump-times "Read tp_first_run: 3" 1 "profile"} } */ diff --git a/gcc/testsuite/gcc.dg/tree-prof/time-profiler-2.c b/gcc/testsuite/gcc.dg/tree-prof/time-profiler-2.c index e6eaeb99810..497b585388e 100644 --- a/gcc/testsuite/gcc.dg/tree-prof/time-profiler-2.c +++ b/gcc/testsuite/gcc.dg/tree-prof/time-profiler-2.c @@ -43,7 +43,7 @@ int main () return r; } -/* { dg-final-use-not-autofdo { scan-ipa-dump-times "Read tp_first_run: 0" 2 "profile"} } */ -/* { dg-final-use-not-autofdo { scan-ipa-dump-times "Read tp_first_run: 1" 1 "profile"} } */ +/* { dg-final-use-not-autofdo { scan-ipa-dump-times "Read tp_first_run: 1" 2 "profile"} } */ /* { dg-final-use-not-autofdo { scan-ipa-dump-times "Read tp_first_run: 2" 1 "profile"} } */ /* { dg-final-use-not-autofdo { scan-ipa-dump-times "Read tp_first_run: 3" 1 "profile"} } */ +/* { dg-final-use-not-autofdo { scan-ipa-dump-times "Read tp_first_run: 4" 1 "profile"} } */ diff --git a/gcc/testsuite/gcc.dg/tree-prof/time-profiler-3.c b/gcc/testsuite/gcc.dg/tree-prof/time-profiler-3.c index 69ce0260828..69daf237483 100644 --- a/gcc/testsuite/gcc.dg/tree-prof/time-profiler-3.c +++ b/gcc/testsuite/gcc.dg/tree-prof/time-profiler-3.c @@ -17,6 +17,6 @@ int main () { return foo (); } -/* { dg-final-use-not-autofdo { scan-ipa-dump-times "Read tp_first_run: 0" 1 "profile"} } */ /* { dg-final-use-not-autofdo { scan-ipa-dump-times "Read tp_first_run: 1" 1 "profile"} } */ /* { dg-final-use-not-autofdo { scan-ipa-dump-times "Read tp_first_run: 2" 1 "profile"} } */ +/* { dg-final-use-not-autofdo { scan-ipa-dump-times "Read tp_first_run: 3" 1 "profile"} } */ diff --git a/libgcc/ChangeLog b/libgcc/ChangeLog index 722cf48e8c1..73c6f59ae1e 100644 --- a/libgcc/ChangeLog +++ b/libgcc/ChangeLog @@ -1,3 +1,8 @@ +2018-10-24 Martin Liska + + * libgcov-profiler.c: Start from 1 in order to distinguish + functions which were seen and these that were not. + 2018-10-18 Paul Koning * udivmodsi4.c (__udivmodsi4): Rename to conform to coding diff --git a/libgcc/libgcov-profiler.c b/libgcc/libgcov-profiler.c index 7a5e50009ce..47c00ee4b4a 100644 --- a/libgcc/libgcov-profiler.c +++ b/libgcc/libgcov-profiler.c @@ -335,7 +335,7 @@ __gcov_indirect_call_profiler_v2 (gcov_type value, void* cur_func) #ifdef L_gcov_time_profiler /* Counter for first visit of each function. */ -gcov_type __gcov_time_profiler_counter ATTRIBUTE_HIDDEN; +gcov_type __gcov_time_profiler_counter ATTRIBUTE_HIDDEN = 1; #endif -- 2.30.2