Skip to content

R
riscv-gcc-1
Commit cfbeaedf by Steven Bosscher
Options

rtl.h (debug_bb_n_slim, [...]): Remove prototypes. 

	* rtl.h (debug_bb_n_slim, debug_bb_slim, debug_insn_slim): Remove
	prototypes.
	(debug_rtl_slim): Rename to dump_rtl_slim.
	(print_value_slim): Rename to dump_value_slim.
	* ira.c (ira_update_equiv_info_by_shuffle_insn): Update
	print_value_slim user.
	* lra.c (lra_process_new_insns): Use dump_insn_slim to dump single
	insns.  Use dump_rtl_slim for insn chains.
	* lra-constraints.c (get_reload_reg): Update print_value_slim user.
	(process_addr_reg): Likewise.
	(equiv_address_substitution): Likewise.
	(inherit_reload_reg): Likewise.  Use dump_insn_slim to dump single
	insns.
	(check_and_process_move): Likewise.
	(lra_constraints): Likewise.
	(split_reg): Likewise.
	(update_ebb_live_info): Likewise.
	(remove_inheritance_pseudos): Likewise.
	* sched-vis.c: Don't include sched-int.h.
	Remove #ifdef INSN_SCHEDULING tests.
	(print_value_slim): Rename to dump_value_slim.  Simplify a few
	cases using GET_RTX_NAME.
	(print_pattern): Do not handle UNSPEC and UNSPECV here, explain why.
	(print_insn): Reorganize code to be independent of INSN_SCHEDULING.
	Always print CALL_INSN patterns.  Harmonize INSN_UID dumping template.
	Handle NOTE_INSN_CALL_ARG_LOCATION.
	(dump_rtl_slim): Copied from debug_rtl_slim.
	(debug_rtl_slim): Wrapper around dump_rtl_slim to stderr.
	* haifa-sched.c (schedule_insn): Update print_insn user.

From-SVN: r193873
parent 916bad55
Showing with 136 additions and 150 deletions
gcc/ChangeLog
2012-11-27 Steven Bosscher <steven@gcc.gnu.org>
* rtl.h (debug_bb_n_slim, debug_bb_slim, debug_insn_slim): Remove
prototypes.
(debug_rtl_slim): Rename to dump_rtl_slim.
(print_value_slim): Rename to dump_value_slim.
* ira.c (ira_update_equiv_info_by_shuffle_insn): Update
print_value_slim user.
* lra.c (lra_process_new_insns): Use dump_insn_slim to dump single
insns. Use dump_rtl_slim for insn chains.
* lra-constraints.c (get_reload_reg): Update print_value_slim user.
(process_addr_reg): Likewise.
(equiv_address_substitution): Likewise.
(inherit_reload_reg): Likewise. Use dump_insn_slim to dump single
insns.
(check_and_process_move): Likewise.
(lra_constraints): Likewise.
(split_reg): Likewise.
(update_ebb_live_info): Likewise.
(remove_inheritance_pseudos): Likewise.
* sched-vis.c: Don't include sched-int.h.
Remove #ifdef INSN_SCHEDULING tests.
(print_value_slim): Rename to dump_value_slim. Simplify a few
cases using GET_RTX_NAME.
(print_pattern): Do not handle UNSPEC and UNSPECV here, explain why.
(print_insn): Reorganize code to be independent of INSN_SCHEDULING.
Always print CALL_INSN patterns. Harmonize INSN_UID dumping template.
Handle NOTE_INSN_CALL_ARG_LOCATION.
(dump_rtl_slim): Copied from debug_rtl_slim.
(debug_rtl_slim): Wrapper around dump_rtl_slim to stderr.
* haifa-sched.c (schedule_insn): Update print_insn user.
2012-11-27 Vladimir Makarov <vmakarov@redhat.com> 2012-11-27 Vladimir Makarov <vmakarov@redhat.com>
PR rtl-optimization/55458 PR rtl-optimization/55458
gcc/haifa-sched.c
...@@ -3719,7 +3719,8 @@ schedule_insn (rtx insn) ...@@ -3719,7 +3719,8 @@ schedule_insn (rtx insn)
print_insn (buf, insn, 0); print_insn (buf, insn, 0);
buf[40] = 0; buf[40] = 0;
fprintf (sched_dump, ";;\t%3i--> %-40s:", clock_var, buf); fprintf (sched_dump, ";;\t%3i--> %s%-40s:",
clock_var, (*current_sched_info->print_insn) (insn, 1), buf);
if (recog_memoized (insn) < 0) if (recog_memoized (insn) < 0)
fprintf (sched_dump, "nothing"); fprintf (sched_dump, "nothing");
......
gcc/ira.c
...@@ -2246,7 +2246,7 @@ ira_update_equiv_info_by_shuffle_insn (int to_regno, int from_regno, rtx insns) ...@@ -2246,7 +2246,7 @@ ira_update_equiv_info_by_shuffle_insn (int to_regno, int from_regno, rtx insns)
fprintf (ira_dump_file, fprintf (ira_dump_file,
" Adding equiv note to insn %u for reg %d ", " Adding equiv note to insn %u for reg %d ",
INSN_UID (insn), to_regno); INSN_UID (insn), to_regno);
print_value_slim (ira_dump_file, x, 1); dump_value_slim (ira_dump_file, x, 1);
fprintf (ira_dump_file, "\n"); fprintf (ira_dump_file, "\n");
} }
} }
......
gcc/lra-constraints.c
...@@ -425,7 +425,7 @@ get_reload_reg (enum op_type type, enum machine_mode mode, rtx original, ...@@ -425,7 +425,7 @@ get_reload_reg (enum op_type type, enum machine_mode mode, rtx original,
if (lra_dump_file != NULL) if (lra_dump_file != NULL)
{ {
fprintf (lra_dump_file, " Reuse r%d for reload ", regno); fprintf (lra_dump_file, " Reuse r%d for reload ", regno);
print_value_slim (lra_dump_file, original, 1); dump_value_slim (lra_dump_file, original, 1);
} }
if (new_class != lra_get_allocno_class (regno)) if (new_class != lra_get_allocno_class (regno))
change_class (regno, new_class, ", change", false); change_class (regno, new_class, ", change", false);
...@@ -994,7 +994,7 @@ check_and_process_move (bool *change_p, bool *sec_mem_p) ...@@ -994,7 +994,7 @@ check_and_process_move (bool *change_p, bool *sec_mem_p)
if (lra_dump_file != NULL) if (lra_dump_file != NULL)
{ {
fprintf (lra_dump_file, "Deleting move %u\n", INSN_UID (curr_insn)); fprintf (lra_dump_file, "Deleting move %u\n", INSN_UID (curr_insn));
debug_rtl_slim (lra_dump_file, curr_insn, curr_insn, -1, 0); dump_insn_slim (lra_dump_file, curr_insn);
} }
lra_set_insn_deleted (curr_insn); lra_set_insn_deleted (curr_insn);
return true; return true;
...@@ -1088,7 +1088,7 @@ process_addr_reg (rtx *loc, rtx *before, rtx *after, enum reg_class cl) ...@@ -1088,7 +1088,7 @@ process_addr_reg (rtx *loc, rtx *before, rtx *after, enum reg_class cl)
fprintf (lra_dump_file, fprintf (lra_dump_file,
"Changing pseudo %d in address of insn %u on equiv ", "Changing pseudo %d in address of insn %u on equiv ",
REGNO (reg), INSN_UID (curr_insn)); REGNO (reg), INSN_UID (curr_insn));
print_value_slim (lra_dump_file, *loc, 1); dump_value_slim (lra_dump_file, *loc, 1);
fprintf (lra_dump_file, "\n"); fprintf (lra_dump_file, "\n");
} }
*loc = copy_rtx (*loc); *loc = copy_rtx (*loc);
...@@ -2215,7 +2215,7 @@ equiv_address_substitution (struct address_info *ad) ...@@ -2215,7 +2215,7 @@ equiv_address_substitution (struct address_info *ad)
{ {
fprintf (lra_dump_file, "Changing address in insn %d ", fprintf (lra_dump_file, "Changing address in insn %d ",
INSN_UID (curr_insn)); INSN_UID (curr_insn));
print_value_slim (lra_dump_file, *ad->outer, 1); dump_value_slim (lra_dump_file, *ad->outer, 1);
} }
if (base_reg != new_base_reg) if (base_reg != new_base_reg)
{ {
...@@ -2272,7 +2272,7 @@ equiv_address_substitution (struct address_info *ad) ...@@ -2272,7 +2272,7 @@ equiv_address_substitution (struct address_info *ad)
else else
{ {
fprintf (lra_dump_file, " on equiv "); fprintf (lra_dump_file, " on equiv ");
print_value_slim (lra_dump_file, *ad->outer, 1); dump_value_slim (lra_dump_file, *ad->outer, 1);
fprintf (lra_dump_file, "\n"); fprintf (lra_dump_file, "\n");
} }
} }
...@@ -2676,7 +2676,7 @@ curr_insn_transform (void) ...@@ -2676,7 +2676,7 @@ curr_insn_transform (void)
fprintf (lra_dump_file, fprintf (lra_dump_file,
"Changing pseudo %d in operand %i of insn %u on equiv ", "Changing pseudo %d in operand %i of insn %u on equiv ",
REGNO (old), i, INSN_UID (curr_insn)); REGNO (old), i, INSN_UID (curr_insn));
print_value_slim (lra_dump_file, subst, 1); dump_value_slim (lra_dump_file, subst, 1);
fprintf (lra_dump_file, "\n"); fprintf (lra_dump_file, "\n");
} }
op_change_p = change_p = true; op_change_p = change_p = true;
...@@ -3467,8 +3467,7 @@ lra_constraints (bool first_p) ...@@ -3467,8 +3467,7 @@ lra_constraints (bool first_p)
" Removing equiv init insn %i (freq=%d)\n", " Removing equiv init insn %i (freq=%d)\n",
INSN_UID (curr_insn), INSN_UID (curr_insn),
BLOCK_FOR_INSN (curr_insn)->frequency); BLOCK_FOR_INSN (curr_insn)->frequency);
debug_rtl_slim (lra_dump_file, dump_insn_slim (lra_dump_file, curr_insn);
curr_insn, curr_insn, -1, 0);
} }
if (contains_reg_p (x, true, false)) if (contains_reg_p (x, true, false))
lra_risky_transformations_p = true; lra_risky_transformations_p = true;
...@@ -3807,7 +3806,7 @@ inherit_reload_reg (bool def_p, int original_regno, ...@@ -3807,7 +3806,7 @@ inherit_reload_reg (bool def_p, int original_regno,
" Rejecting inheritance %d->%d " " Rejecting inheritance %d->%d "
"as it results in 2 or more insns:\n", "as it results in 2 or more insns:\n",
original_regno, REGNO (new_reg)); original_regno, REGNO (new_reg));
debug_rtl_slim (lra_dump_file, new_insns, NULL_RTX, -1, 0); dump_rtl_slim (lra_dump_file, new_insns, NULL_RTX, -1, 0);
fprintf (lra_dump_file, fprintf (lra_dump_file,
" >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>\n"); " >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>\n");
} }
...@@ -3853,8 +3852,7 @@ inherit_reload_reg (bool def_p, int original_regno, ...@@ -3853,8 +3852,7 @@ inherit_reload_reg (bool def_p, int original_regno,
" Inheritance reuse change %d->%d (bb%d):\n", " Inheritance reuse change %d->%d (bb%d):\n",
original_regno, REGNO (new_reg), original_regno, REGNO (new_reg),
BLOCK_FOR_INSN (usage_insn)->index); BLOCK_FOR_INSN (usage_insn)->index);
debug_rtl_slim (lra_dump_file, usage_insn, usage_insn, dump_insn_slim (lra_dump_file, usage_insn);
-1, 0);
} }
} }
if (lra_dump_file != NULL) if (lra_dump_file != NULL)
...@@ -4058,7 +4056,7 @@ split_reg (bool before_p, int original_regno, rtx insn, rtx next_usage_insns) ...@@ -4058,7 +4056,7 @@ split_reg (bool before_p, int original_regno, rtx insn, rtx next_usage_insns)
(lra_dump_file, (lra_dump_file,
" Rejecting split %d->%d resulting in > 2 %s save insns:\n", " Rejecting split %d->%d resulting in > 2 %s save insns:\n",
original_regno, REGNO (new_reg), call_save_p ? "call" : ""); original_regno, REGNO (new_reg), call_save_p ? "call" : "");
debug_rtl_slim (lra_dump_file, save, NULL_RTX, -1, 0); dump_rtl_slim (lra_dump_file, save, NULL_RTX, -1, 0);
fprintf (lra_dump_file, fprintf (lra_dump_file,
" ))))))))))))))))))))))))))))))))))))))))))))))))\n"); " ))))))))))))))))))))))))))))))))))))))))))))))))\n");
} }
...@@ -4074,7 +4072,7 @@ split_reg (bool before_p, int original_regno, rtx insn, rtx next_usage_insns) ...@@ -4074,7 +4072,7 @@ split_reg (bool before_p, int original_regno, rtx insn, rtx next_usage_insns)
" Rejecting split %d->%d " " Rejecting split %d->%d "
"resulting in > 2 %s restore insns:\n", "resulting in > 2 %s restore insns:\n",
original_regno, REGNO (new_reg), call_save_p ? "call" : ""); original_regno, REGNO (new_reg), call_save_p ? "call" : "");
debug_rtl_slim (lra_dump_file, restore, NULL_RTX, -1, 0); dump_rtl_slim (lra_dump_file, restore, NULL_RTX, -1, 0);
fprintf (lra_dump_file, fprintf (lra_dump_file,
" ))))))))))))))))))))))))))))))))))))))))))))))))\n"); " ))))))))))))))))))))))))))))))))))))))))))))))))\n");
} }
...@@ -4101,8 +4099,7 @@ split_reg (bool before_p, int original_regno, rtx insn, rtx next_usage_insns) ...@@ -4101,8 +4099,7 @@ split_reg (bool before_p, int original_regno, rtx insn, rtx next_usage_insns)
{ {
fprintf (lra_dump_file, " Split reuse change %d->%d:\n", fprintf (lra_dump_file, " Split reuse change %d->%d:\n",
original_regno, REGNO (new_reg)); original_regno, REGNO (new_reg));
debug_rtl_slim (lra_dump_file, usage_insn, usage_insn, dump_insn_slim (lra_dump_file, usage_insn);
-1, 0);
} }
} }
lra_assert (NOTE_P (usage_insn) || NONDEBUG_INSN_P (usage_insn)); lra_assert (NOTE_P (usage_insn) || NONDEBUG_INSN_P (usage_insn));
...@@ -4245,7 +4242,7 @@ update_ebb_live_info (rtx head, rtx tail) ...@@ -4245,7 +4242,7 @@ update_ebb_live_info (rtx head, rtx tail)
if (lra_dump_file != NULL) if (lra_dump_file != NULL)
{ {
fprintf (lra_dump_file, " Removing dead insn:\n "); fprintf (lra_dump_file, " Removing dead insn:\n ");
debug_rtl_slim (lra_dump_file, curr_insn, curr_insn, -1, 0); dump_insn_slim (lra_dump_file, curr_insn);
} }
lra_set_insn_deleted (curr_insn); lra_set_insn_deleted (curr_insn);
} }
...@@ -4861,8 +4858,7 @@ remove_inheritance_pseudos (bitmap remove_pseudos) ...@@ -4861,8 +4858,7 @@ remove_inheritance_pseudos (bitmap remove_pseudos)
bitmap_bit_p (&lra_split_regs, sregno) bitmap_bit_p (&lra_split_regs, sregno)
|| bitmap_bit_p (&lra_split_regs, dregno) || bitmap_bit_p (&lra_split_regs, dregno)
? "split" : "inheritance"); ? "split" : "inheritance");
debug_rtl_slim (lra_dump_file, dump_insn_slim (lra_dump_file, curr_insn);
curr_insn, curr_insn, -1, 0);
} }
lra_set_insn_deleted (curr_insn); lra_set_insn_deleted (curr_insn);
done_p = true; done_p = true;
...@@ -4914,8 +4910,7 @@ remove_inheritance_pseudos (bitmap remove_pseudos) ...@@ -4914,8 +4910,7 @@ remove_inheritance_pseudos (bitmap remove_pseudos)
if (lra_dump_file != NULL) if (lra_dump_file != NULL)
{ {
fprintf (lra_dump_file, " Change reload insn:\n"); fprintf (lra_dump_file, " Change reload insn:\n");
debug_rtl_slim (lra_dump_file, dump_insn_slim (lra_dump_file, curr_insn);
curr_insn, curr_insn, -1, 0);
} }
} }
} }
...@@ -4958,7 +4953,7 @@ remove_inheritance_pseudos (bitmap remove_pseudos) ...@@ -4958,7 +4953,7 @@ remove_inheritance_pseudos (bitmap remove_pseudos)
if (restored_regs_p && lra_dump_file != NULL) if (restored_regs_p && lra_dump_file != NULL)
{ {
fprintf (lra_dump_file, " Insn after restoring regs:\n"); fprintf (lra_dump_file, " Insn after restoring regs:\n");
debug_rtl_slim (lra_dump_file, curr_insn, curr_insn, -1, 0); dump_insn_slim (lra_dump_file, curr_insn);
} }
} }
} }
......
gcc/lra.c
...@@ -1817,16 +1817,16 @@ lra_process_new_insns (rtx insn, rtx before, rtx after, const char *title) ...@@ -1817,16 +1817,16 @@ lra_process_new_insns (rtx insn, rtx before, rtx after, const char *title)
if (lra_dump_file != NULL && (before != NULL_RTX || after != NULL_RTX)) if (lra_dump_file != NULL && (before != NULL_RTX || after != NULL_RTX))
{ {
debug_rtl_slim (lra_dump_file, insn, insn, -1, 0); dump_insn_slim (lra_dump_file, insn);
if (before != NULL_RTX) if (before != NULL_RTX)
{ {
fprintf (lra_dump_file," %s before:\n", title); fprintf (lra_dump_file," %s before:\n", title);
debug_rtl_slim (lra_dump_file, before, NULL_RTX, -1, 0); dump_rtl_slim (lra_dump_file, before, NULL_RTX, -1, 0);
} }
if (after != NULL_RTX) if (after != NULL_RTX)
{ {
fprintf (lra_dump_file, " %s after:\n", title); fprintf (lra_dump_file, " %s after:\n", title);
debug_rtl_slim (lra_dump_file, after, NULL_RTX, -1, 0); dump_rtl_slim (lra_dump_file, after, NULL_RTX, -1, 0);
} }
fprintf (lra_dump_file, "\n"); fprintf (lra_dump_file, "\n");
} }
......
gcc/rtl.h
...@@ -2575,14 +2575,6 @@ extern rtx make_compound_operation (rtx, enum rtx_code); ...@@ -2575,14 +2575,6 @@ extern rtx make_compound_operation (rtx, enum rtx_code);
/* In cfgcleanup.c */ /* In cfgcleanup.c */
extern void delete_dead_jumptables (void); extern void delete_dead_jumptables (void);
/* In sched-vis.c. */
extern void debug_bb_n_slim (int);
extern void debug_bb_slim (struct basic_block_def *);
extern void print_value_slim (FILE *, const_rtx, int);
extern void debug_rtl_slim (FILE *, const_rtx, const_rtx, int, int);
extern void dump_insn_slim (FILE *f, const_rtx x);
extern void debug_insn_slim (const_rtx x);
/* In sched-rgn.c. */ /* In sched-rgn.c. */
extern void schedule_insns (void); extern void schedule_insns (void);
...@@ -2609,9 +2601,12 @@ extern void print_inline_rtx (FILE *, const_rtx, int); ...@@ -2609,9 +2601,12 @@ extern void print_inline_rtx (FILE *, const_rtx, int);
sched-vis.c is compiled always. FIXME: Ideally these functions would sched-vis.c is compiled always. FIXME: Ideally these functions would
not be in sched-vis.c but in rtl.c, because they are not only used not be in sched-vis.c but in rtl.c, because they are not only used
by the scheduler anymore but for all "slim" RTL dumping. */ by the scheduler anymore but for all "slim" RTL dumping. */
extern void print_insn (char *, const_rtx, int); extern void dump_value_slim (FILE *, const_rtx, int);
extern void print_pattern (char *, const_rtx, int); extern void dump_insn_slim (FILE *, const_rtx);
extern void dump_rtl_slim (FILE *, const_rtx, const_rtx, int, int);
extern void print_value (char *, const_rtx, int); extern void print_value (char *, const_rtx, int);
extern void print_pattern (char *, const_rtx, int);
extern void print_insn (char *, const_rtx, int);
/* In function.c */ /* In function.c */
extern void reposition_prologue_and_epilogue_notes (void); extern void reposition_prologue_and_epilogue_notes (void);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment