* rtl.h (print_insn_with_notes): Prototype.
* sched-vis.c (print_insn_with_notes): Export it.
* gimple-pretty-print.h (gimple_dump_bb_for_graph): Prototype.
* gimple-pretty-print.c (print_gimple_expr): Flush the buffer.
(pp_gimple_stmt_1): Don't do it here.
(gimple_dump_bb_for_graph): New function.
* tree-pretty-print.c (print_generic_expr): Flush the buffer here.
(dump_generic_node): Don't flush the buffer here.
* graph.h (print_rtl_graph_with_bb): Rename to print_graph_cfg.
* graph.c: Include gimple.h, dumpfile.h, and gimple-pretty-print.h.
(draw_cfg_node): Handle GIMPLE basic blocks also.
(print_rtl_graph_with_bb): Rename to print_graph_cfg.
* passes.c (finish_optimization_passes): Don't finish graph dumps here.
(execute_function_dump): Use print_graph_cfg. Enable dumping the CFG
for GIMPLE also.
(pass_init_dump_file): Wrap in TV_DUMP. Set up CFG graph dumps.
(pass_fini_dump_file): Wrap in TV_DUMP. Finish graph dumps.
(execute_one_pass): Don't set up graph dumps here.
From-SVN: r194085
+2012-12-03 Steven Bosscher <steven@gcc.gnu.org>
+
+ * rtl.h (print_insn_with_notes): Prototype.
+ * sched-vis.c (print_insn_with_notes): Export it.
+
+ * gimple-pretty-print.h (gimple_dump_bb_for_graph): Prototype.
+ * gimple-pretty-print.c (print_gimple_expr): Flush the buffer.
+ (pp_gimple_stmt_1): Don't do it here.
+ (gimple_dump_bb_for_graph): New function.
+ * tree-pretty-print.c (print_generic_expr): Flush the buffer here.
+ (dump_generic_node): Don't flush the buffer here.
+
+ * graph.h (print_rtl_graph_with_bb): Rename to print_graph_cfg.
+ * graph.c: Include gimple.h, dumpfile.h, and gimple-pretty-print.h.
+ (draw_cfg_node): Handle GIMPLE basic blocks also.
+ (print_rtl_graph_with_bb): Rename to print_graph_cfg.
+ * passes.c (finish_optimization_passes): Don't finish graph dumps here.
+ (execute_function_dump): Use print_graph_cfg. Enable dumping the CFG
+ for GIMPLE also.
+ (pass_init_dump_file): Wrap in TV_DUMP. Set up CFG graph dumps.
+ (pass_fini_dump_file): Wrap in TV_DUMP. Finish graph dumps.
+ (execute_one_pass): Don't set up graph dumps here.
+
2012-12-03 Eric Botcazou <ebotcazou@adacore.com>
* tree-ssa.c (warn_uninitialized_var): Use OPT_Wmaybe_uninitialized tag
flags |= TDF_RHS_ONLY;
maybe_init_pretty_print (file);
pp_gimple_stmt_1 (&buffer, g, spc, flags);
+ pp_flush (&buffer);
}
default:
GIMPLE_NIY;
}
-
- /* If we're building a diagnostic, the formatted text will be
- written into BUFFER's stream by the caller; otherwise, write it
- now. */
- if (!(flags & TDF_DIAGNOSTIC))
- pp_write_text_to_stream (buffer);
}
}
dump_gimple_bb_footer (file, bb, indent, flags);
}
+
+/* Dumps basic block BB to pretty-printer PP with default dump flags and
+ no indentation, for use as a label of a DOT graph record-node.
+ ??? Should just use gimple_dump_bb_buff here, except that value profiling
+ histogram dumping doesn't know about pretty-printers. */
+
+void
+gimple_dump_bb_for_graph (pretty_printer *pp, basic_block bb)
+{
+ gimple_stmt_iterator gsi;
+
+ pp_printf (pp, "<bb %d>:\n", bb->index);
+ pp_write_text_as_dot_label_to_stream (pp, /*for_record=*/true);
+
+ for (gsi = gsi_start_phis (bb); !gsi_end_p (gsi); gsi_next (&gsi))
+ {
+ gimple phi = gsi_stmt (gsi);
+ if (!virtual_operand_p (gimple_phi_result (phi))
+ || (dump_flags & TDF_VOPS))
+ {
+ pp_character (pp, '|');
+ pp_write_text_to_stream (pp);
+ pp_string (pp, "# ");
+ pp_gimple_stmt_1 (pp, phi, 0, dump_flags);
+ pp_newline (pp);
+ pp_write_text_as_dot_label_to_stream (pp, /*for_record=*/true);
+ }
+ }
+
+ for (gsi = gsi_start_bb (bb); !gsi_end_p (gsi); gsi_next (&gsi))
+ {
+ gimple stmt = gsi_stmt (gsi);
+ pp_character (pp, '|');
+ pp_write_text_to_stream (pp);
+ pp_gimple_stmt_1 (pp, stmt, 0, dump_flags);
+ pp_newline (pp);
+ pp_write_text_as_dot_label_to_stream (pp, /*for_record=*/true);
+ }
+ dump_implicit_edges (pp, bb, 0, dump_flags);
+ pp_write_text_as_dot_label_to_stream (pp, /*for_record=*/true);
+}
+
extern void print_gimple_stmt (FILE *, gimple, int, int);
extern void print_gimple_expr (FILE *, gimple, int, int);
extern void pp_gimple_stmt_1 (pretty_printer *, gimple, int, int);
+extern void gimple_dump_bb_for_graph (pretty_printer *, basic_block);
#endif /* ! GCC_GIMPLE_PRETTY_PRINT_H */
#include "basic-block.h"
#include "rtl.h"
#include "tree.h"
+#include "gimple.h"
#include "graph.h"
+#include "dumpfile.h"
#include "pretty-print.h"
+#include "gimple-pretty-print.h"
/* DOT files with the .dot extension are recognized as document templates
by a well-known piece of word processing software out of Redmond, WA.
static void
draw_cfg_node (pretty_printer *pp, int fndecl_uid, basic_block bb)
{
- rtx insn;
- bool first = true;
const char *shape;
const char *fillcolor;
pp_character (pp, '{');
pp_write_text_to_stream (pp);
- /* TODO: inter-bb stuff. */
- FOR_BB_INSNS (bb, insn)
+ /* This would be easier if there'd be an IR independent iterator... */
+ if (current_ir_type () == IR_GIMPLE)
+ gimple_dump_bb_for_graph (pp, bb);
+ else
{
- if (! first)
+ rtx insn;
+ bool first = true;
+
+ /* TODO: inter-bb stuff. */
+ FOR_BB_INSNS (bb, insn)
{
- pp_character (pp, '|');
- pp_write_text_to_stream (pp);
+ if (! first)
+ {
+ pp_character (pp, '|');
+ pp_write_text_to_stream (pp);
+ }
+ first = false;
+ print_insn_with_notes (pp, insn);
+ pp_write_text_as_dot_label_to_stream (pp, /*for_record=*/true);
}
- first = false;
-
- print_insn (pp, insn, 1);
- pp_newline (pp);
- if (INSN_P (insn) && REG_NOTES (insn))
- for (rtx note = REG_NOTES (insn); note; note = XEXP (note, 1))
- {
- pp_printf (pp, " %s: ",
- GET_REG_NOTE_NAME (REG_NOTE_KIND (note)));
- print_pattern (pp, XEXP (note, 0), 1);
- pp_newline (pp);
- }
- pp_write_text_as_dot_label_to_stream (pp, /*for_record=*/true);
}
pp_character (pp, '}');
}
pp_flush (pp);
}
-/* Print a graphical representation of the CFG of function FUN.
- Currently only supports RTL in cfgrtl or cfglayout mode, GIMPLE is TODO. */
+/* Print a graphical representation of the CFG of function FUN. */
+
void
-print_rtl_graph_with_bb (const char *base, tree fndecl)
+print_graph_cfg (const char *base, tree fndecl)
{
const char *funcname = fndecl_name (fndecl);
int fndecl_uid = DECL_UID (fndecl);
#ifndef GCC_GRAPH_H
#define GCC_GRAPH_H
-extern void print_rtl_graph_with_bb (const char *, tree);
+extern void print_graph_cfg (const char *, tree);
extern void clean_graph_dump_file (const char *);
extern void finish_graph_dump_file (const char *);
void
finish_optimization_passes (void)
{
- int i;
- struct dump_file_info *dfi;
- char *name;
-
timevar_push (TV_DUMP);
if (profile_arc_flag || flag_test_coverage || flag_branch_probabilities)
{
end_branch_prob ();
dump_finish (pass_profile.pass.static_pass_number);
}
-
if (optimize > 0)
{
dump_start (pass_profile.pass.static_pass_number, NULL);
print_combine_total_stats ();
dump_finish (pass_profile.pass.static_pass_number);
}
-
- /* Do whatever is necessary to finish printing the graphs. */
- for (i = TDI_end; (dfi = get_dump_file_info (i)) != NULL; ++i)
- if (dump_initialized_p (i)
- && (dfi->pflags & TDF_GRAPH) != 0
- && (name = get_dump_file_name (i)) != NULL)
- {
- finish_graph_dump_file (name);
- free (name);
- }
-
timevar_pop (TV_DUMP);
}
fflush (dump_file);
if ((cfun->curr_properties & PROP_cfg)
- && (cfun->curr_properties & PROP_rtl)
&& (dump_flags & TDF_GRAPH))
- print_rtl_graph_with_bb (dump_file_name, cfun->decl);
+ print_graph_cfg (dump_file_name, cfun->decl);
}
}
/* If a dump file name is present, open it if enabled. */
if (pass->static_pass_number != -1)
{
+ timevar_push (TV_DUMP);
bool initializing_dump = !dump_initialized_p (pass->static_pass_number);
dump_file_name = get_dump_file_name (pass->static_pass_number);
dump_start (pass->static_pass_number, &dump_flags);
if (dump_file && current_function_decl)
dump_function_header (dump_file, current_function_decl, dump_flags);
+ if (dump_file && (dump_flags & TDF_GRAPH)
+ && cfun && (cfun->curr_properties & PROP_cfg))
+ clean_graph_dump_file (dump_file_name);
+ timevar_pop (TV_DUMP);
return initializing_dump;
}
else
void
pass_fini_dump_file (struct opt_pass *pass)
{
+ timevar_push (TV_DUMP);
+
/* Flush and close dump file. */
if (dump_file_name)
{
+ gcc_assert (dump_file);
+ if (dump_flags & TDF_GRAPH
+ && cfun && (cfun->curr_properties & PROP_cfg))
+ finish_graph_dump_file (dump_file_name);
free (CONST_CAST (char *, dump_file_name));
dump_file_name = NULL;
}
dump_finish (pass->static_pass_number);
+ timevar_pop (TV_DUMP);
}
/* After executing the pass, apply expected changes to the function
bool
execute_one_pass (struct opt_pass *pass)
{
- bool initializing_dump;
unsigned int todo_after = 0;
bool gate_status;
This is a hack until the new folder is ready. */
in_gimple_form = (cfun && (cfun->curr_properties & PROP_trees)) != 0;
- initializing_dump = pass_init_dump_file (pass);
+ pass_init_dump_file (pass);
/* Run pre-pass verification. */
execute_todo (pass->todo_flags_start);
do_per_function (update_properties_after_pass, pass);
- if (initializing_dump
- && dump_file
- && (dump_flags & TDF_GRAPH)
- && cfun
- && (cfun->curr_properties & (PROP_cfg | PROP_rtl))
- == (PROP_cfg | PROP_rtl))
- {
- clean_graph_dump_file (dump_file_name);
- }
-
if (profile_report && cfun && (cfun->curr_properties & PROP_cfg))
check_profile_consistency (pass->static_pass_number, 0, true);
extern void print_value (pretty_printer *, const_rtx, int);
extern void print_pattern (pretty_printer *, const_rtx, int);
extern void print_insn (pretty_printer *, const_rtx, int);
+extern void print_insn_with_notes (pretty_printer *, const_rtx);
extern const char *str_pattern_slim (const_rtx);
/* In function.c */
/* Prerry-print a slim dump of X (an insn) to PP, including any register
note attached to the instruction. */
-static void
+void
print_insn_with_notes (pretty_printer *pp, const_rtx x)
{
pp_string (pp, print_rtx_head);
{
maybe_init_pretty_print (file);
dump_generic_node (&buffer, t, 0, flags, false);
+ pp_flush (&buffer);
}
/* Dump the name of a _DECL node and its DECL_UID if TDF_UID is set
if (is_stmt && is_expr)
pp_semicolon (buffer);
- /* If we're building a diagnostic, the formatted text will be written
- into BUFFER's stream by the caller; otherwise, write it now. */
- if (!(flags & TDF_DIAGNOSTIC))
- pp_write_text_to_stream (buffer);
-
return spc;
}
projects / gcc.git / commitdiff