Show INSN_UIDs in compact mode

gcc/ChangeLog:
	* print-rtl.c (rtx_writer::print_rtx_operand_code_u): Print
	INSN_UIDs for all insns in compact mode.
	(rtx_writer::print_rtx): Likewise.
	* print-rtl.h (rtx_writer::flag_compact): Update comment.
	* rtl-tests.c (selftest::test_dumping_insns): Update expected
	output to include INSN_UID.
	(selftest::test_uncond_jump): Likewise.

From-SVN: r241593
This commit is contained in:
David Malcolm 2016-10-26 18:25:14 +00:00 committed by David Malcolm
parent a0019047b8
commit 7574cfd44c
4 changed files with 17 additions and 9 deletions

View File

@ -1,3 +1,13 @@
2016-10-26 David Malcolm <dmalcolm@redhat.com>
* print-rtl.c (rtx_writer::print_rtx_operand_code_u): Print
INSN_UIDs for all insns in compact mode.
(rtx_writer::print_rtx): Likewise.
* print-rtl.h (rtx_writer::flag_compact): Update comment.
* rtl-tests.c (selftest::test_dumping_insns): Update expected
output to include INSN_UID.
(selftest::test_uncond_jump): Likewise.
2016-10-26 Pat Haugen <pthaugen@us.ibm.com>
* haifa-sched.c (call_used_regs_num): Rename to...

View File

@ -423,8 +423,8 @@ rtx_writer::print_rtx_operand_code_r (const_rtx in_rtx)
void
rtx_writer::print_rtx_operand_code_u (const_rtx in_rtx, int idx)
{
/* Don't print insn UIDs in compact mode, apart from in LABEL_REFs. */
if (m_compact && GET_CODE (in_rtx) != LABEL_REF)
/* Don't print insn UIDs for PREV/NEXT_INSN in compact mode. */
if (m_compact && INSN_CHAIN_CODE_P (GET_CODE (in_rtx)) && idx < 2)
return;
if (XEXP (in_rtx, idx) != NULL)
@ -672,10 +672,8 @@ rtx_writer::print_rtx (const_rtx in_rtx)
idx = 5;
#endif
/* For insns, print the INSN_UID.
In compact mode, we only print the INSN_UID of CODE_LABELs. */
if (INSN_CHAIN_CODE_P (GET_CODE (in_rtx))
&& (!m_compact || GET_CODE (in_rtx) == CODE_LABEL))
/* For insns, print the INSN_UID. */
if (INSN_CHAIN_CODE_P (GET_CODE (in_rtx)))
{
if (flag_dump_unnumbered)
fprintf (m_outfile, " #");

View File

@ -50,7 +50,7 @@ class rtx_writer
bool m_simple;
/* If true, use compact dump format:
- INSN_UIDs are omitted, except for jumps and CODE_LABELs,
- PREV/NEXT_INSN UIDs are omitted
- INSN_CODEs are omitted,
- register numbers are omitted for hard and virtual regs, and
non-virtual pseudos are offset relative to the first such reg, and

View File

@ -121,7 +121,7 @@ test_dumping_insns ()
/* Barriers. */
rtx_barrier *barrier = as_a <rtx_barrier *> (rtx_alloc (BARRIER));
SET_NEXT_INSN (barrier) = NULL;
ASSERT_RTL_DUMP_EQ ("(cbarrier)\n", barrier);
ASSERT_RTL_DUMP_EQ ("(cbarrier 0)\n", barrier);
/* Labels. */
rtx_insn *label = gen_label_rtx ();
@ -179,7 +179,7 @@ test_uncond_jump ()
ASSERT_TRUE (onlyjump_p (jump_insn));
ASSERT_TRUE (control_flow_insn_p (jump_insn));
ASSERT_RTL_DUMP_EQ ("(cjump_insn (set (pc)\n"
ASSERT_RTL_DUMP_EQ ("(cjump_insn 1 (set (pc)\n"
" (label_ref 0))\n"
" (nil))\n",
jump_insn);