&& need_ssa_update_p (cfun))
gcc_assert (flags & TODO_update_ssa_any);
- timevar_push (TV_TODO);
-
statistics_fini_pass ();
if (flags)
df problems. */
if (flags & TODO_df_finish)
df_finish_pass ((flags & TODO_df_verify) != 0);
-
- timevar_pop (TV_TODO);
}
/* Verify invariants that should hold between passes. This is a place
pass_init_dump_file (pass);
- /* Run pre-pass verification. */
- execute_todo (ipa_pass->function_transform_todo_flags_start);
-
/* If a timevar is present, start it. */
if (pass->tv_id != TV_NONE)
timevar_push (pass->tv_id);
+ /* Run pre-pass verification. */
+ execute_todo (ipa_pass->function_transform_todo_flags_start);
+
/* Do it! */
todo_after = ipa_pass->function_transform (node);
- /* Stop timevar. */
- if (pass->tv_id != TV_NONE)
- timevar_pop (pass->tv_id);
-
if (profile_report && cfun && (cfun->curr_properties & PROP_cfg))
check_profile_consistency (pass->static_pass_number, 0, true);
if (profile_report && cfun && (cfun->curr_properties & PROP_cfg))
check_profile_consistency (pass->static_pass_number, 1, true);
+ /* Stop timevar. */
+ if (pass->tv_id != TV_NONE)
+ timevar_pop (pass->tv_id);
+
if (dump_file)
do_per_function (execute_function_dump, pass);
pass_fini_dump_file (pass);
pass_init_dump_file (pass);
+ /* If a timevar is present, start it. */
+ if (pass->tv_id != TV_NONE)
+ timevar_push (pass->tv_id);
+
/* Run pre-pass verification. */
execute_todo (pass->todo_flags_start);
do_per_function (verify_curr_properties,
(void *)(size_t)pass->properties_required);
- /* If a timevar is present, start it. */
- if (pass->tv_id != TV_NONE)
- timevar_push (pass->tv_id);
-
/* Do it! */
todo_after = pass->execute (cfun);
if (todo_after & TODO_discard_function)
{
+ /* Stop timevar. */
+ if (pass->tv_id != TV_NONE)
+ timevar_pop (pass->tv_id);
+
pass_fini_dump_file (pass);
gcc_assert (cfun);
do_per_function (clear_last_verified, NULL);
- /* Stop timevar. */
- if (pass->tv_id != TV_NONE)
- timevar_pop (pass->tv_id);
-
do_per_function (update_properties_after_pass, pass);
if (profile_report && cfun && (cfun->curr_properties & PROP_cfg))
check_profile_consistency (pass->static_pass_number, 1, true);
verify_interpass_invariants ();
+
+ /* Stop timevar. */
+ if (pass->tv_id != TV_NONE)
+ timevar_pop (pass->tv_id);
+
if (pass->type == IPA_PASS
&& ((ipa_opt_pass_d *)pass)->function_transform)
{
{
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);
}
}
next = iter->next;
free (iter);
}
+ for (unsigned i = 0; i < TIMEVAR_LAST; ++i)
+ delete m_timevars[i].children;
delete m_jit_client_items;
}
/* 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;
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. */
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. */
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);
projects / gcc.git / commitdiff