diff options
author | Richard Biener <rguenther@suse.de> | 2016-08-12 07:38:24 +0000 |
---|---|---|
committer | Richard Biener <rguenth@gcc.gnu.org> | 2016-08-12 07:38:24 +0000 |
commit | 8df06bd0eb37240c40140bf2d2528ad6a665474a (patch) | |
tree | ec56bb1a6459b7d3c0776301373c8e2067935fae /gcc/timevar.c | |
parent | 663eecfd13dbedddf6fccc1a857dd1728078040b (diff) | |
download | gcc-8df06bd0eb37240c40140bf2d2528ad6a665474a.zip gcc-8df06bd0eb37240c40140bf2d2528ad6a665474a.tar.gz gcc-8df06bd0eb37240c40140bf2d2528ad6a665474a.tar.bz2 |
passes.c (execute_todo): Do not push/pop TV_TODO.
2016-08-12 Richard Biener <rguenther@suse.de>
* passes.c (execute_todo): Do not push/pop TV_TODO.
(execute_one_ipa_transform_pass): Move timevar push/pop TODO execution.
(execute_one_pass): Likewise.
* common.opt (ftime-report-details): New switch.
* doc/invoke.texi (ftime-report-details): Document.
* timevar.h (timer::print_row): Adjust signature.
(timer::all_zero): New static helper.
(timer::child_map_t): New typedef.
(timer::time_var_def): Add children field.
* timevar.c (timer::named_items::print): Adjust.
(timer::~timer): Free timevar recorded children.
(timer::pop_internal): When -ftime-report-details record
time spent in sub-timevars.
(timer::print_row): Adjust.
(timer::print): Print sub-timevar stats, use all_zero.
* timevar.def (TV_TODO): Remove.
From-SVN: r239406
Diffstat (limited to 'gcc/timevar.c')
-rw-r--r-- | gcc/timevar.c | 91 |
1 files changed, 70 insertions, 21 deletions
diff --git a/gcc/timevar.c b/gcc/timevar.c index a41ff39..4c8ceacc 100644 --- a/gcc/timevar.c +++ b/gcc/timevar.c @@ -205,7 +205,7 @@ timer::named_items::print (FILE *fp, const timevar_time_def *total) { timer::timevar_def *def = m_hash_map.get (item_name); gcc_assert (def); - m_timer->print_row (fp, total, def); + m_timer->print_row (fp, total, def->name, def->elapsed); } } @@ -296,6 +296,8 @@ timer::~timer () next = iter->next; free (iter); } + for (unsigned i = 0; i < TIMEVAR_LAST; ++i) + delete m_timevars[i].children; delete m_jit_client_items; } @@ -399,13 +401,26 @@ timer::pop_internal () /* Attribute the elapsed time to the element we're popping. */ timevar_accumulate (&popped->timevar->elapsed, &m_start_time, &now); + /* Take the item off the stack. */ + m_stack = m_stack->next; + + /* Record the elapsed sub-time to the parent as well. */ + if (m_stack && time_report_details) + { + if (! m_stack->timevar->children) + m_stack->timevar->children = new child_map_t (5); + bool existed_p; + timevar_time_def &time + = m_stack->timevar->children->get_or_insert (popped->timevar, &existed_p); + if (! existed_p) + memset (&time, 0, sizeof (timevar_time_def)); + timevar_accumulate (&time, &m_start_time, &now); + } + /* Reset the start time; from now on, time is attributed to the element just exposed on the stack. */ m_start_time = now; - /* Take the item off the stack. */ - m_stack = m_stack->next; - /* Don't delete the stack element; instead, add it to the list of unused elements for later use. */ popped->next = m_unused_stack_instances; @@ -619,42 +634,54 @@ timer::validate_phases (FILE *fp) const void timer::print_row (FILE *fp, const timevar_time_def *total, - const timevar_def *tv) + const char *name, const timevar_time_def &elapsed) { /* The timing variable name. */ - fprintf (fp, " %-24s:", tv->name); + fprintf (fp, " %-24s:", name); #ifdef HAVE_USER_TIME /* Print user-mode time for this process. */ fprintf (fp, "%7.2f (%2.0f%%) usr", - tv->elapsed.user, - (total->user == 0 ? 0 : tv->elapsed.user / total->user) * 100); + elapsed.user, + (total->user == 0 ? 0 : elapsed.user / total->user) * 100); #endif /* HAVE_USER_TIME */ #ifdef HAVE_SYS_TIME /* Print system-mode time for this process. */ fprintf (fp, "%7.2f (%2.0f%%) sys", - tv->elapsed.sys, - (total->sys == 0 ? 0 : tv->elapsed.sys / total->sys) * 100); + elapsed.sys, + (total->sys == 0 ? 0 : elapsed.sys / total->sys) * 100); #endif /* HAVE_SYS_TIME */ #ifdef HAVE_WALL_TIME /* Print wall clock time elapsed. */ fprintf (fp, "%7.2f (%2.0f%%) wall", - tv->elapsed.wall, - (total->wall == 0 ? 0 : tv->elapsed.wall / total->wall) * 100); + elapsed.wall, + (total->wall == 0 ? 0 : elapsed.wall / total->wall) * 100); #endif /* HAVE_WALL_TIME */ /* Print the amount of ggc memory allocated. */ fprintf (fp, "%8u kB (%2.0f%%) ggc", - (unsigned) (tv->elapsed.ggc_mem >> 10), + (unsigned) (elapsed.ggc_mem >> 10), (total->ggc_mem == 0 ? 0 - : (float) tv->elapsed.ggc_mem / total->ggc_mem) * 100); + : (float) elapsed.ggc_mem / total->ggc_mem) * 100); putc ('\n', fp); } +/* Return whether ELAPSED is all zero. */ + +bool +timer::all_zero (const timevar_time_def &elapsed) +{ + const double tiny = 5e-3; + return (elapsed.user < tiny + && elapsed.sys < tiny + && elapsed.wall < tiny + && elapsed.ggc_mem < GGC_MEM_BOUND); +} + /* Summarize timing variables to FP. The timing variable TV_TOTAL has a special meaning -- it's considered to be the total elapsed time, for normalizing the others, and is displayed last. */ @@ -691,7 +718,6 @@ timer::print (FILE *fp) for (id = 0; id < (unsigned int) TIMEVAR_LAST; ++id) { const timevar_def *tv = &m_timevars[(timevar_id_t) id]; - const double tiny = 5e-3; /* Don't print the total execution time here; that goes at the end. */ @@ -702,15 +728,38 @@ timer::print (FILE *fp) if (!tv->used) continue; + bool any_children_with_time = false; + if (tv->children) + for (child_map_t::iterator i = tv->children->begin (); + i != tv->children->end (); ++i) + if (! all_zero ((*i).second)) + { + any_children_with_time = true; + break; + } + /* Don't print timing variables if we're going to get a row of - zeroes. */ - if (tv->elapsed.user < tiny - && tv->elapsed.sys < tiny - && tv->elapsed.wall < tiny - && tv->elapsed.ggc_mem < GGC_MEM_BOUND) + zeroes. Unless there are children with non-zero time. */ + if (! any_children_with_time + && all_zero (tv->elapsed)) continue; - print_row (fp, total, tv); + print_row (fp, total, tv->name, tv->elapsed); + + if (tv->children) + for (child_map_t::iterator i = tv->children->begin (); + i != tv->children->end (); ++i) + { + timevar_def *tv2 = (*i).first; + /* Don't print timing variables if we're going to get a row of + zeroes. */ + if (! all_zero ((*i).second)) + { + char lname[256]; + snprintf (lname, 256, "`- %s", tv2->name); + print_row (fp, total, lname, (*i).second); + } + } } if (m_jit_client_items) m_jit_client_items->print (fp, total); |