From 19a30b7123aa90caf7de3e9ec588266e218f8028 Mon Sep 17 00:00:00 2001 From: Aldy Hernandez Date: Mon, 20 Nov 2017 08:32:57 +0000 Subject: [PATCH] vec.h (debug_helper): New function. * vec.h (debug_helper): New function. (DEFINE_DEBUG_VEC): New macro. * hash-set.h (debug_helper): New function. (DEFINE_DEBUG_HASH_SET): New macro. * cfg.c (debug_slim (edge)): New function. Call DEFINE_DEBUG_VEC for edges. Call DEFINE_DEBUG_HASH_SET for edges. * cfghooks.c (debug_slim (basic_block)): New function. Call DEFINE_DEBUG_VEC for basic blocks. Call DEFINE_DEBUG_HASH_SET for basic blocks. * print-tree.c (debug_slim): New function to handle trees. Call DEFINE_DEBUG_VEC for trees. Call DEFINE_DEBUG_HASH_SET for trees. (debug (vec) &): Remove. (debug () *): Remove. * print-rtl.c (debug_slim): New function to handle const_rtx. Call DEFINE_DEBUG_VEC for rtx_def. Call DEFINE_DEBUG_VEC for rtx_insn. Call DEFINE_DEBUG_HASH_SET for rtx_def. Call DEFINE_DEBUG_HASH_SET for rtx_insn. * sel-sched-dump.c (debug (vec &): Remove. (debug (vec *ptr): Remove. (debug_insn_vector): Remove. * stor-layout.c (debug_rli): Call debug() instead of debug_vec_tree. From-SVN: r254945 --- gcc/ChangeLog | 27 ++++++++++++++++ gcc/cfg.c | 10 ++++++ gcc/cfghooks.c | 8 +++++ gcc/hash-set.h | 38 ++++++++++++++++++++++ gcc/print-rtl.c | 17 ++++++++++ gcc/print-tree.c | 35 ++++---------------- gcc/sel-sched-dump.c | 29 ----------------- gcc/stor-layout.c | 2 +- gcc/vec.h | 77 ++++++++++++++++++++++++++++++++++++++++++++ 9 files changed, 184 insertions(+), 59 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 827ee608029..c0bec3a4394 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,30 @@ +2017-11-20 Aldy Hernandez + + * vec.h (debug_helper): New function. + (DEFINE_DEBUG_VEC): New macro. + * hash-set.h (debug_helper): New function. + (DEFINE_DEBUG_HASH_SET): New macro. + * cfg.c (debug_slim (edge)): New function. + Call DEFINE_DEBUG_VEC for edges. + Call DEFINE_DEBUG_HASH_SET for edges. + * cfghooks.c (debug_slim (basic_block)): New function. + Call DEFINE_DEBUG_VEC for basic blocks. + Call DEFINE_DEBUG_HASH_SET for basic blocks. + * print-tree.c (debug_slim): New function to handle trees. + Call DEFINE_DEBUG_VEC for trees. + Call DEFINE_DEBUG_HASH_SET for trees. + (debug (vec) &): Remove. + (debug () *): Remove. + * print-rtl.c (debug_slim): New function to handle const_rtx. + Call DEFINE_DEBUG_VEC for rtx_def. + Call DEFINE_DEBUG_VEC for rtx_insn. + Call DEFINE_DEBUG_HASH_SET for rtx_def. + Call DEFINE_DEBUG_HASH_SET for rtx_insn. + * sel-sched-dump.c (debug (vec &): Remove. + (debug (vec *ptr): Remove. + (debug_insn_vector): Remove. + * stor-layout.c (debug_rli): Call debug() instead of debug_vec_tree. + 2017-11-20 Tom de Vries PR rtl-optimization/82020 diff --git a/gcc/cfg.c b/gcc/cfg.c index 34bc11239f6..8e2683b8d6e 100644 --- a/gcc/cfg.c +++ b/gcc/cfg.c @@ -553,6 +553,16 @@ debug (edge_def *ptr) else fprintf (stderr, "\n"); } + +static void +debug_slim (edge e) +{ + fprintf (stderr, " %d)>", (void *) e, + e->src->index, e->dest->index); +} + +DEFINE_DEBUG_VEC (edge) +DEFINE_DEBUG_HASH_SET (edge) /* Simple routines to easily allocate AUX fields of basic blocks. */ diff --git a/gcc/cfghooks.c b/gcc/cfghooks.c index 4a224243e32..2bee65a0cb8 100644 --- a/gcc/cfghooks.c +++ b/gcc/cfghooks.c @@ -300,6 +300,14 @@ debug (basic_block_def *ptr) fprintf (stderr, "\n"); } +static void +debug_slim (basic_block ptr) +{ + fprintf (stderr, "", (void *) ptr, ptr->index); +} + +DEFINE_DEBUG_VEC (basic_block_def *) +DEFINE_DEBUG_HASH_SET (basic_block_def *) /* Dumps basic block BB to pretty-printer PP, for use as a label of a DOT graph record-node. The implementation of this hook is diff --git a/gcc/hash-set.h b/gcc/hash-set.h index 8ce796d1c48..75ca1475e0d 100644 --- a/gcc/hash-set.h +++ b/gcc/hash-set.h @@ -127,6 +127,44 @@ private: hash_table m_table; }; +/* Generic hash_set debug helper. + + This needs to be instantiated for each hash_set used throughout + the compiler like this: + + DEFINE_DEBUG_HASH_SET (TYPE) + + The reason we have a debug_helper() is because GDB can't + disambiguate a plain call to debug(some_hash), and it must be called + like debug(some_hash). */ +template +void +debug_helper (hash_set &ref) +{ + for (typename hash_set::iterator it = ref.begin (); + it != ref.end (); ++it) + { + debug_slim (*it); + fputc ('\n', stderr); + } +} + +#define DEFINE_DEBUG_HASH_SET(T) \ + template static void debug_helper (hash_set &); \ + DEBUG_FUNCTION void \ + debug (hash_set &ref) \ + { \ + debug_helper (ref); \ + } \ + DEBUG_FUNCTION void \ + debug (hash_set *ptr) \ + { \ + if (ptr) \ + debug (*ptr); \ + else \ + fprintf (stderr, "\n"); \ + } + /* ggc marking routines. */ template diff --git a/gcc/print-rtl.c b/gcc/print-rtl.c index 28d99862cad..5fe23801ab2 100644 --- a/gcc/print-rtl.c +++ b/gcc/print-rtl.c @@ -967,6 +967,23 @@ debug (const rtx_def *ptr) fprintf (stderr, "\n"); } +/* Like debug_rtx but with no newline, as debug_helper will add one. + + Note: No debug_slim(rtx_insn *) variant implemented, as this + function can serve for both rtx and rtx_insn. */ + +static void +debug_slim (const_rtx x) +{ + rtx_writer w (stderr, 0, false, false, NULL); + w.print_rtx (x); +} + +DEFINE_DEBUG_VEC (rtx_def *) +DEFINE_DEBUG_VEC (rtx_insn *) +DEFINE_DEBUG_HASH_SET (rtx_def *) +DEFINE_DEBUG_HASH_SET (rtx_insn *) + /* Count of rtx's to print with debug_rtx_list. This global exists because gdb user defined commands have no arguments. */ diff --git a/gcc/print-tree.c b/gcc/print-tree.c index d534c76ee49..3a0f85d4038 100644 --- a/gcc/print-tree.c +++ b/gcc/print-tree.c @@ -1094,32 +1094,6 @@ debug_raw (vec &ref) } } -DEBUG_FUNCTION void -debug (vec &ref) -{ - tree elt; - unsigned ix; - - /* Print the slot this node is in, and its code, and address. */ - fprintf (stderr, " *ptr) -{ - if (ptr) - debug (*ptr); - else - fprintf (stderr, "\n"); -} - DEBUG_FUNCTION void debug_raw (vec *ptr) { @@ -1129,8 +1103,11 @@ debug_raw (vec *ptr) fprintf (stderr, "\n"); } -DEBUG_FUNCTION void -debug_vec_tree (vec *vec) +static void +debug_slim (tree t) { - debug_raw (vec); + print_node_brief (stderr, "", t, 0); } + +DEFINE_DEBUG_VEC (tree) +DEFINE_DEBUG_HASH_SET (tree) diff --git a/gcc/sel-sched-dump.c b/gcc/sel-sched-dump.c index 388a8af54c6..027b6b1c7c6 100644 --- a/gcc/sel-sched-dump.c +++ b/gcc/sel-sched-dump.c @@ -989,35 +989,6 @@ debug_blist (blist_t bnds) restore_dump (); } -/* Dump a rtx vector REF. */ -DEBUG_FUNCTION void -debug (vec &ref) -{ - switch_dump (stderr); - dump_insn_vector (ref); - sel_print ("\n"); - restore_dump (); -} - -DEBUG_FUNCTION void -debug (vec *ptr) -{ - if (ptr) - debug (*ptr); - else - fprintf (stderr, "\n"); -} - -/* Dump an insn vector SUCCS. */ -DEBUG_FUNCTION void -debug_insn_vector (rtx_vec_t succs) -{ - switch_dump (stderr); - dump_insn_vector (succs); - sel_print ("\n"); - restore_dump (); -} - /* Dump a hard reg set SET to stderr. */ DEBUG_FUNCTION void debug_hard_reg_set (HARD_REG_SET set) diff --git a/gcc/stor-layout.c b/gcc/stor-layout.c index 7730ac33e4f..0ce97a5c5a3 100644 --- a/gcc/stor-layout.c +++ b/gcc/stor-layout.c @@ -942,7 +942,7 @@ debug_rli (record_layout_info rli) if (!vec_safe_is_empty (rli->pending_statics)) { fprintf (stderr, "pending statics:\n"); - debug_vec_tree (rli->pending_statics); + debug (rli->pending_statics); } } diff --git a/gcc/vec.h b/gcc/vec.h index cbdd439571b..b145eef2bc7 100644 --- a/gcc/vec.h +++ b/gcc/vec.h @@ -407,6 +407,83 @@ struct GTY((user)) vec { }; +/* Generic vec<> debug helpers. + + These need to be instantiated for each vec used throughout + the compiler like this: + + DEFINE_DEBUG_VEC (TYPE) + + The reason we have a debug_helper() is because GDB can't + disambiguate a plain call to debug(some_vec), and it must be called + like debug(some_vec). */ + +template +void +debug_helper (vec &ref) +{ + unsigned i; + for (i = 0; i < ref.length (); ++i) + { + fprintf (stderr, "[%d] = ", i); + debug_slim (ref[i]); + fputc ('\n', stderr); + } +} + +/* We need a separate va_gc variant here because default template + argument for functions cannot be used in c++-98. Once this + restriction is removed, those variant should be folded with the + above debug_helper. */ + +template +void +debug_helper (vec &ref) +{ + unsigned i; + for (i = 0; i < ref.length (); ++i) + { + fprintf (stderr, "[%d] = ", i); + debug_slim (ref[i]); + fputc ('\n', stderr); + } +} + +/* Macro to define debug(vec) and debug(vec) helper + functions for a type T. */ + +#define DEFINE_DEBUG_VEC(T) \ + template static void debug_helper (vec &); \ + template static void debug_helper (vec &); \ + /* Define the vec debug functions. */ \ + DEBUG_FUNCTION void \ + debug (vec &ref) \ + { \ + debug_helper (ref); \ + } \ + DEBUG_FUNCTION void \ + debug (vec *ptr) \ + { \ + if (ptr) \ + debug (*ptr); \ + else \ + fprintf (stderr, "\n"); \ + } \ + /* Define the vec debug functions. */ \ + DEBUG_FUNCTION void \ + debug (vec &ref) \ + { \ + debug_helper (ref); \ + } \ + DEBUG_FUNCTION void \ + debug (vec *ptr) \ + { \ + if (ptr) \ + debug (*ptr); \ + else \ + fprintf (stderr, "\n"); \ + } + /* Default-construct N elements in DST. */ template -- 2.30.2