[PATCH] Move RTL printing code from sched-vis.c into print-rtl.c

	* Makefile.in (OBJS): Remove sched-vis.c
	* sched-vis.c: Removed.  Code moved into...
	* print-rtl.c: Here.  Include cfg.h, pretty-print.h and print-rtl.h.
	* rtl.h: Remove prototypes for functions now living in print-rtl.c
	* print-rtl.h Add prototypes for new functions in print-rtl.c.
	* auto-inc-dec.c: Include print-rtl.h
	* cfgrtl.c, combine.c, final.c haifa-sched.c: Likewise.
	* ira.c, lra-constraints.c, lra.c, sel-sched-dump.c: Likewise.

From-SVN: r229110

gcc/ChangeLog

 2015-10-21  Jeff Law  <law@redhat.com>
 
+	* Makefile.in (OBJS): Remove sched-vis.c
+	* sched-vis.c: Removed.  Code moved into...
+	* print-rtl.c: Here.  Include cfg.h, pretty-print.h and print-rtl.h.
+	* rtl.h: Remove prototypes for functions now living in print-rtl.c
+	* print-rtl.h Add prototypes for new functions in print-rtl.c.
+	* auto-inc-dec.c: Include print-rtl.h
+	* cfgrtl.c, combine.c, final.c haifa-sched.c: Likewise.
+	* ira.c, lra-constraints.c, lra.c, sel-sched-dump.c: Likewise.
+
 	* varasm.c (handle_vtv_comdat_section): Mark 2nd parameter with
 	ATTRIBUTE_UNUSED.
 

gcc/Makefile.in

@@ -1385,7 +1385,6 @@ OBJS = \
 	sched-deps.o \
 	sched-ebb.o \
 	sched-rgn.o \
-	sched-vis.o \
 	sdbout.o \
 	sel-sched-ir.o \
 	sel-sched-dump.o \

gcc/auto-inc-dec.c

@@ -46,6 +46,7 @@ along with GCC; see the file COPYING3.  If not see
 #include "tree-pass.h"
 #include "dbgcnt.h"
 #include "target.h"
+#include "print-rtl.h"
 
 /* This pass was originally removed from flow.c. However there is
    almost nothing that remains of that code.

gcc/cfgrtl.c

@@ -70,6 +70,7 @@ along with GCC; see the file COPYING3.  If not see
 #include "common/common-target.h"
 #include "cfgloop.h"
 #include "tree-pass.h"
+#include "print-rtl.h"
 
 /* Holds the interesting leading and trailing notes for the function.
    Only applicable if the CFG is in cfglayout mode.  */

gcc/combine.c

@@ -112,6 +112,7 @@ along with GCC; see the file COPYING3.  If not see
 #include "valtrack.h"
 #include "cgraph.h"
 #include "rtl-iter.h"
+#include "print-rtl.h"
 
 #ifndef LOAD_EXTEND_OP
 #define LOAD_EXTEND_OP(M) UNKNOWN

gcc/final.c

@@ -86,6 +86,7 @@ along with GCC; see the file COPYING3.  If not see
 #include "asan.h"
 #include "wide-int-print.h"
 #include "rtl-iter.h"
+#include "print-rtl.h"
 
 #ifdef XCOFF_DEBUGGING_INFO
 #include "xcoffout.h"		/* Needed for external data

gcc/haifa-sched.c

@@ -148,6 +148,7 @@ along with GCC; see the file COPYING3.  If not see
 #include "ira.h"
 #include "emit-rtl.h"  /* FIXME: Can go away once crtl is moved to rtl.h.  */
 #include "dumpfile.h"
+#include "print-rtl.h"
 
 #ifdef INSN_SCHEDULING
 

gcc/ira.c

@@ -402,6 +402,7 @@ along with GCC; see the file COPYING3.  If not see
 #include "dbgcnt.h"
 #include "rtl-iter.h"
 #include "shrink-wrap.h"
+#include "print-rtl.h"
 
 struct target_ira default_target_ira;
 struct target_ira_int default_target_ira_int;

gcc/lra-constraints.c

@@ -141,6 +141,7 @@
 #include "lra.h"
 #include "insn-attr.h"
 #include "lra-int.h"
+#include "print-rtl.h"
 
 /* Value of LRA_CURR_RELOAD_NUM at the beginning of BB of the current
    insn.  Remember that LRA_CURR_RELOAD_NUM is the number of emitted

gcc/lra.c

@@ -137,6 +137,7 @@ along with GCC; see the file COPYING3.	If not see
 #include "lra.h"
 #include "insn-attr.h"
 #include "lra-int.h"
+#include "print-rtl.h"
 
 /* Dump bitmap SET with TITLE and BB INDEX.  */
 void

gcc/print-rtl.h

@@ -24,4 +24,13 @@ along with GCC; see the file COPYING3.  If not see
 extern void print_rtl (FILE *, const_rtx);
 #endif
 
+extern void dump_value_slim (FILE *, const_rtx, int);
+extern void dump_insn_slim (FILE *, const rtx_insn *);
+extern void dump_rtl_slim (FILE *, const rtx_insn *, const rtx_insn *,
+			   int, int);
+extern void print_value (pretty_printer *, const_rtx, int);
+extern void print_pattern (pretty_printer *, const_rtx, int);
+extern void rtl_dump_bb_for_graph (pretty_printer *, basic_block);
+extern const char *str_pattern_slim (const_rtx);
+
 #endif  // GCC_PRINT_RTL_H

gcc/rtl.h

@@ -3565,19 +3565,6 @@ extern int print_rtl_single (FILE *, const_rtx);
 extern int print_rtl_single_with_indent (FILE *, const_rtx, int);
 extern void print_inline_rtx (FILE *, const_rtx, int);
 
-/* Functions in sched-vis.c.  FIXME: Ideally these functions would
-   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.  */
-extern void dump_value_slim (FILE *, const_rtx, int);
-extern void dump_insn_slim (FILE *, const rtx_insn *);
-extern void dump_rtl_slim (FILE *, const rtx_insn *, const rtx_insn *,
-			   int, int);
-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_insn *, int);
-extern void rtl_dump_bb_for_graph (pretty_printer *, basic_block);
-extern const char *str_pattern_slim (const_rtx);
-
 /* In stmt.c */
 extern void expand_null_return (void);
 extern void expand_naked_return (void);

gcc/sel-sched-dump.c

@@ -40,6 +40,7 @@ along with GCC; see the file COPYING3.  If not see
 #include "cfgloop.h"
 #include "sel-sched-ir.h"
 #include "sel-sched-dump.h"
+#include "print-rtl.h"
 
 
 /* These variables control high-level pretty printing.  */