Message ID | 559BD81B.6070200@redhat.com |
---|---|
State | New |
Headers | show |
On Tue, 7 Jul 2015, Andrew MacLeod wrote: > This patch flattens both sel-sched-dump.h and sel-sched-ir.h. Both these files > end up including cfgloop.h, so in preparation for flattening cfgloop.h, > flatten these. Note they actually have only a small effect on what includes > them. This patch removes #include "insn-attr.h" from sel-sched-ir.h without adding it to .c files. I'm curious how it works, is that file now arranged to be included elsewhere? (sorry if I missed it, but the patch series does not seem to mention insn-attr.h specifically) Thanks. Alexander
On 07/07/2015 10:01 AM, Alexander Monakov wrote: > On Tue, 7 Jul 2015, Andrew MacLeod wrote: > >> This patch flattens both sel-sched-dump.h and sel-sched-ir.h. Both these files >> end up including cfgloop.h, so in preparation for flattening cfgloop.h, >> flatten these. Note they actually have only a small effect on what includes >> them. > This patch removes #include "insn-attr.h" from sel-sched-ir.h without adding > it to .c files. I'm curious how it works, is that file now arranged to be > included elsewhere? (sorry if I missed it, but the patch series does not seem > to mention insn-attr.h specifically) > > Thanks. > Alexander That is because every file which includes sel-sched-ir.h already included insn-attr.h so didn't need adjustment... Andrew
* sel-sched-dump.h: Flatten includes. * sel-sched-ir.h: Flatten includes. * sel-sched-dump.c: Adjust includes. * sel-sched-ir.c: Adjust includes. * sel-sched.c: Adjust includes. Index: sel-sched-dump.h =================================================================== *** sel-sched-dump.h (revision 225452) --- sel-sched-dump.h (working copy) *************** along with GCC; see the file COPYING3. *** 21,29 **** #ifndef GCC_SEL_SCHED_DUMP_H #define GCC_SEL_SCHED_DUMP_H - #include "sel-sched-ir.h" - - /* These values control the dumping of control flow graph to the .dot file. */ enum sel_dump_cfg_def { --- 21,26 ---- Index: sel-sched-ir.h =================================================================== *** sel-sched-ir.h (revision 225452) --- sel-sched-ir.h (working copy) *************** along with GCC; see the file COPYING3. *** 21,35 **** #ifndef GCC_SEL_SCHED_IR_H #define GCC_SEL_SCHED_IR_H - /* For state_t. */ - #include "insn-attr.h" - #include "regset.h" - /* For reg_note. */ - #include "rtl.h" - #include "bitmap.h" - #include "sched-int.h" - #include "cfgloop.h" - /* tc_t is a short for target context. This is a state of the target backend. */ typedef void *tc_t; --- 21,26 ---- Index: sel-sched-dump.c =================================================================== *** sel-sched-dump.c (revision 225452) --- sel-sched-dump.c (working copy) *************** along with GCC; see the file COPYING3. *** 40,45 **** --- 40,49 ---- #include "target.h" #ifdef INSN_SCHEDULING + #include "regset.h" + #include "bitmap.h" + #include "sched-int.h" + #include "cfgloop.h" #include "sel-sched-ir.h" #include "sel-sched-dump.h" Index: sel-sched-ir.c =================================================================== *** sel-sched-ir.c (revision 225452) --- sel-sched-ir.c (working copy) *************** along with GCC; see the file COPYING3. *** 49,54 **** --- 49,57 ---- #include "emit-rtl.h" /* FIXME: Can go away once crtl is moved to rtl.h. */ #ifdef INSN_SCHEDULING + #include "regset.h" + #include "bitmap.h" + #include "cfgloop.h" #include "sel-sched-ir.h" /* We don't have to use it except for sel_print_insn. */ #include "sel-sched-dump.h" Index: sel-sched.c =================================================================== *** sel-sched.c (revision 225452) --- sel-sched.c (working copy) *************** along with GCC; see the file COPYING3. *** 49,54 **** --- 49,58 ---- #include "rtl-iter.h" #ifdef INSN_SCHEDULING + #include "regset.h" + #include "rtl.h" + #include "bitmap.h" + #include "cfgloop.h" #include "sel-sched-ir.h" #include "sel-sched-dump.h" #include "sel-sched.h"