[patch] Second basic-block.h restructuring patch.

[patch] Second basic-block.h restructuring patch.

[Andrew MacLeod]

[-- Attachment #1: Type: text/plain, Size: 801 bytes --]

creates cfg.h, cfganal.h, lcm.h, and loop-unroll.h to house the 
prototypes for those .c files.

cfganal.h also gets "struct edge_list"  and "class control_dependences" 
definitions since that is where all the routines and manipulators are 
declared.

  loop-unroll.h only exports 2 routines, so rather than including that 
in basic-block.h I simply included it from the 2 .c files which consume 
those routines.  Again, the other includes will be flattened out of 
basic-block.h to just their consumers later.

loop-unroll.c also had one function I marked as static since it wasn't 
actually used anywhere else.

bootstraps on x86_64-unknown-linux-gnu, and regressions are running... I 
expect no regressions because of the nature of the changes.   OK to 
check in assuming everything is OK?

Andrew

[-- Attachment #2: bb2.patch --]
[-- Type: text/x-patch, Size: 17090 bytes --]



	* cfg.h: New.  Header file for cfg.c.
	* cfganal.h: New.  Header file for cfganal.c.
	* lcm.h: New.  Header file for lcm.c.
	* loop-unroll.h: New.  Header file for loop-unroll.h.
	* cfgloop.h: (unroll_loops): Remove prototype.
	* basic-block.h: Move prototypes and structs to new header files.
	Include cfg.h, cfganal.h, and lcm.h.
	* loop-init.c: Include loop-unroll.h.
	* loop-unroll.c: (referenced_in_one_insn_in_loop_p): Make static.
	* modulo-sched.c: Include loop-unroll.h.


Index: cfg.h
===================================================================
--- cfg.h	(revision 0)
+++ cfg.h	(working copy)
@@ -0,0 +1,65 @@
+/* Control flow graph manipulation code header file.
+   Copyright (C) 2014 Free Software Foundation, Inc.
+
+This file is part of GCC.
+
+GCC is free software; you can redistribute it and/or modify it under
+the terms of the GNU General Public License as published by the Free
+Software Foundation; either version 3, or (at your option) any later
+version.
+
+GCC is distributed in the hope that it will be useful, but WITHOUT ANY
+WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with GCC; see the file COPYING3.  If not see
+<http://www.gnu.org/licenses/>.  */
+
+#ifndef GCC_CFG_H
+#define GCC_CFG_H
+
+extern void init_flow (struct function *);
+extern void clear_edges (void);
+extern basic_block alloc_block (void);
+extern void link_block (basic_block, basic_block);
+extern void unlink_block (basic_block);
+extern void compact_blocks (void);
+extern void expunge_block (basic_block);
+extern edge unchecked_make_edge (basic_block, basic_block, int);
+extern edge cached_make_edge (sbitmap, basic_block, basic_block, int);
+extern edge make_edge (basic_block, basic_block, int);
+extern edge make_single_succ_edge (basic_block, basic_block, int);
+extern void remove_edge_raw (edge);
+extern void redirect_edge_succ (edge, basic_block);
+extern void redirect_edge_pred (edge, basic_block);
+extern void clear_bb_flags (void);
+extern void dump_edge_info (FILE *, edge, int, int);
+extern void debug (edge_def &ref);
+extern void debug (edge_def *ptr);
+extern void alloc_aux_for_blocks (int);
+extern void clear_aux_for_blocks (void);
+extern void free_aux_for_blocks (void);
+extern void alloc_aux_for_edge (edge, int);
+extern void alloc_aux_for_edges (int);
+extern void clear_aux_for_edges (void);
+extern void free_aux_for_edges (void);
+extern void debug_bb (basic_block);
+extern basic_block debug_bb_n (int);
+extern void dump_bb_info (FILE *, basic_block, int, int, bool, bool);
+extern void brief_dump_cfg (FILE *, int);
+extern void update_bb_profile_for_threading (basic_block, int, gcov_type, edge);
+extern void scale_bbs_frequencies_int (basic_block *, int, int, int);
+extern void scale_bbs_frequencies_gcov_type (basic_block *, int, gcov_type,
+					     gcov_type);
+extern void initialize_original_copy_tables (void);
+extern void free_original_copy_tables (void);
+extern void set_bb_original (basic_block, basic_block);
+extern basic_block get_bb_original (basic_block);
+extern void set_bb_copy (basic_block, basic_block);
+extern basic_block get_bb_copy (basic_block);
+void set_loop_copy (struct loop *, struct loop *);
+struct loop *get_loop_copy (struct loop *);
+
+#endif /* GCC_CFG_H */
Index: cfganal.h
===================================================================
--- cfganal.h	(revision 0)
+++ cfganal.h	(working copy)
@@ -0,0 +1,79 @@
+/* Control flow graph analysis header file.
+   Copyright (C) 2014 Free Software Foundation, Inc.
+
+This file is part of GCC.
+
+GCC is free software; you can redistribute it and/or modify it under
+the terms of the GNU General Public License as published by the Free
+Software Foundation; either version 3, or (at your option) any later
+version.
+
+GCC is distributed in the hope that it will be useful, but WITHOUT ANY
+WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with GCC; see the file COPYING3.  If not see
+<http://www.gnu.org/licenses/>.  */
+
+
+#ifndef GCC_CFGANAL_H
+#define GCC_CFGANAL_H
+
+/* This structure maintains an edge list vector.  */
+/* FIXME: Make this a vec<edge>.  */
+struct edge_list
+{
+  int num_edges;
+  edge *index_to_edge;
+};
+
+
+/* Class to compute and manage control dependences on an edge-list.  */
+class control_dependences
+{
+public:
+  control_dependences (edge_list *);
+  ~control_dependences ();
+  bitmap get_edges_dependent_on (int);
+  edge get_edge (int);
+
+private:
+  void set_control_dependence_map_bit (basic_block, int);
+  void clear_control_dependence_bitmap (basic_block);
+  void find_control_dependence (int);
+  vec<bitmap> control_dependence_map;
+  edge_list *m_el;
+};
+
+extern bool mark_dfs_back_edges (void);
+extern void find_unreachable_blocks (void);
+struct edge_list * create_edge_list (void);
+void free_edge_list (struct edge_list *);
+void print_edge_list (FILE *, struct edge_list *);
+void verify_edge_list (FILE *, struct edge_list *);
+edge find_edge (basic_block, basic_block);
+int find_edge_index (struct edge_list *, basic_block, basic_block);
+extern void remove_fake_edges (void);
+extern void remove_fake_exit_edges (void);
+extern void add_noreturn_fake_exit_edges (void);
+extern void connect_infinite_loops_to_exit (void);
+extern int post_order_compute (int *, bool, bool);
+extern basic_block dfs_find_deadend (basic_block);
+extern int inverted_post_order_compute (int *);
+extern int pre_and_rev_post_order_compute_fn (struct function *,
+					      int *, int *, bool);
+extern int pre_and_rev_post_order_compute (int *, int *, bool);
+extern int dfs_enumerate_from (basic_block, int,
+			       bool (*)(const_basic_block, const void *),
+			       basic_block *, int, const void *);
+extern void compute_dominance_frontiers (struct bitmap_head *);
+extern bitmap compute_idf (bitmap, struct bitmap_head *);
+extern void bitmap_intersection_of_succs (sbitmap, sbitmap *, basic_block);
+extern void bitmap_intersection_of_preds (sbitmap, sbitmap *, basic_block);
+extern void bitmap_union_of_succs (sbitmap, sbitmap *, basic_block);
+extern void bitmap_union_of_preds (sbitmap, sbitmap *, basic_block);
+extern basic_block * single_pred_before_succ_order (void);
+
+#endif /* GCC_CFGANAL_H */
Index: lcm.h
===================================================================
--- lcm.h	(revision 0)
+++ lcm.h	(working copy)
@@ -0,0 +1,34 @@
+/* Generic partial redundancy elimination with lazy code motion header file.
+   Copyright (C) 2014 Free Software Foundation, Inc.
+
+This file is part of GCC.
+
+GCC is free software; you can redistribute it and/or modify it under
+the terms of the GNU General Public License as published by the Free
+Software Foundation; either version 3, or (at your option) any later
+version.
+
+GCC is distributed in the hope that it will be useful, but WITHOUT ANY
+WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with GCC; see the file COPYING3.  If not see
+<http://www.gnu.org/licenses/>.  */
+
+#ifndef GCC_LCM_H
+#define GCC_LCM_H
+
+extern struct edge_list *pre_edge_lcm_avs (int, sbitmap *, sbitmap *,
+					   sbitmap *, sbitmap *, sbitmap *,
+					   sbitmap *, sbitmap **, sbitmap **);
+extern struct edge_list *pre_edge_lcm (int, sbitmap *, sbitmap *,
+				       sbitmap *, sbitmap *, sbitmap **,
+				       sbitmap **);
+extern void compute_available (sbitmap *, sbitmap *, sbitmap *, sbitmap *);
+extern struct edge_list *pre_edge_rev_lcm (int, sbitmap *,
+					   sbitmap *, sbitmap *,
+					   sbitmap *, sbitmap **,
+					   sbitmap **);
+#endif /* GCC_LCM_H */
Index: loop-unroll.h
===================================================================
--- loop-unroll.h	(revision 0)
+++ loop-unroll.h	(working copy)
@@ -0,0 +1,27 @@
+/* Loop unrolling header file.
+   Copyright (C) 2014 Free Software Foundation, Inc.
+
+This file is part of GCC.
+
+GCC is free software; you can redistribute it and/or modify it under
+the terms of the GNU General Public License as published by the Free
+Software Foundation; either version 3, or (at your option) any later
+version.
+
+GCC is distributed in the hope that it will be useful, but WITHOUT ANY
+WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with GCC; see the file COPYING3.  If not see
+<http://www.gnu.org/licenses/>.  */
+
+#ifndef GCC_LOOP_UNROLL_H
+#define GCC_LOOP_UNROLL_H
+
+extern void unroll_loops (int);
+extern basic_block split_edge_and_insert (edge, rtx_insn *);
+
+
+#endif /* GCC_LOOP_UNROLL_H */
Index: cfgloop.h
===================================================================
--- cfgloop.h	(revision 216483)
+++ cfgloop.h	(working copy)
@@ -740,7 +740,6 @@
   UAP_UNROLL_ALL = 2	/* Enables unrolling of all loops.  */
 };
 
-extern void unroll_loops (int);
 extern void doloop_optimize_loops (void);
 extern void move_loop_invariants (void);
 extern void scale_loop_profile (struct loop *loop, int scale, gcov_type iteration_bound);
Index: basic-block.h
===================================================================
--- basic-block.h	(revision 216485)
+++ basic-block.h	(working copy)
@@ -30,6 +30,9 @@
 #include "input.h"
 #include "function.h"
 #include "cfgrtl.h"
+#include "cfg.h"
+#include "cfganal.h"
+#include "lcm.h"
 
 /* Use gcov_type to hold basic block counters.  Should be at least
    64bit.  Although a counter cannot be negative, we use a signed
@@ -381,26 +384,7 @@
 #define NUM_FIXED_BLOCKS (2)
 
 
-basic_block split_edge_and_insert (edge, rtx_insn *);
-
-extern edge unchecked_make_edge (basic_block, basic_block, int);
-extern edge cached_make_edge (sbitmap, basic_block, basic_block, int);
-extern edge make_edge (basic_block, basic_block, int);
-extern edge make_single_succ_edge (basic_block, basic_block, int);
-extern void remove_edge_raw (edge);
-extern void redirect_edge_succ (edge, basic_block);
 extern edge redirect_edge_succ_nodup (edge, basic_block);
-extern void redirect_edge_pred (edge, basic_block);
-extern void clear_bb_flags (void);
-extern void dump_bb_info (FILE *, basic_block, int, int, bool, bool);
-extern void dump_edge_info (FILE *, edge, int, int);
-extern void debug (edge_def &ref);
-extern void debug (edge_def *ptr);
-extern void brief_dump_cfg (FILE *, int);
-extern void clear_edges (void);
-extern void scale_bbs_frequencies_int (basic_block *, int, int, int);
-extern void scale_bbs_frequencies_gcov_type (basic_block *, int, gcov_type,
-					     gcov_type);
 
 /* Structure to group all of the information to process IF-THEN and
    IF-THEN-ELSE blocks for the conditional execution support.  This
@@ -424,31 +408,6 @@
   int pass;				/* Pass number.  */
 };
 
-/* This structure maintains an edge list vector.  */
-/* FIXME: Make this a vec<edge>.  */
-struct edge_list
-{
-  int num_edges;
-  edge *index_to_edge;
-};
-
-/* Class to compute and manage control dependences on an edge-list.  */
-class control_dependences
-{
-public:
-  control_dependences (edge_list *);
-  ~control_dependences ();
-  bitmap get_edges_dependent_on (int);
-  edge get_edge (int);
-
-private:
-  void set_control_dependence_map_bit (basic_block, int);
-  void clear_control_dependence_bitmap (basic_block);
-  void find_control_dependence (int);
-  vec<bitmap> control_dependence_map;
-  edge_list *m_el;
-};
-
 /* The base value for branch probability notes and edge probabilities.  */
 #define REG_BR_PROB_BASE  10000
 
@@ -690,25 +649,8 @@
 #define CLEANUP_CFGLAYOUT	32	/* Do cleanup in cfglayout mode.  */
 #define CLEANUP_CFG_CHANGED	64      /* The caller changed the CFG.  */
 
-/* In cfganal.c */
-extern void bitmap_intersection_of_succs (sbitmap, sbitmap *, basic_block);
-extern void bitmap_intersection_of_preds (sbitmap, sbitmap *, basic_block);
-extern void bitmap_union_of_succs (sbitmap, sbitmap *, basic_block);
-extern void bitmap_union_of_preds (sbitmap, sbitmap *, basic_block);
+extern void dump_flow_info (FILE *, int);
 
-/* In lcm.c */
-extern struct edge_list *pre_edge_lcm (int, sbitmap *, sbitmap *,
-				       sbitmap *, sbitmap *, sbitmap **,
-				       sbitmap **);
-extern struct edge_list *pre_edge_lcm_avs (int, sbitmap *, sbitmap *,
-					   sbitmap *, sbitmap *, sbitmap *,
-					   sbitmap *, sbitmap **, sbitmap **);
-extern struct edge_list *pre_edge_rev_lcm (int, sbitmap *,
-					   sbitmap *, sbitmap *,
-					   sbitmap *, sbitmap **,
-					   sbitmap **);
-extern void compute_available (sbitmap *, sbitmap *, sbitmap *, sbitmap *);
-
 /* In predict.c */
 extern bool maybe_hot_bb_p (struct function *, const_basic_block);
 extern bool maybe_hot_edge_p (edge);
@@ -733,50 +675,6 @@
 extern bool br_prob_note_reliable_p (const_rtx);
 extern bool predictable_edge_p (edge);
 
-/* In cfg.c  */
-extern void init_flow (struct function *);
-extern void debug_bb (basic_block);
-extern basic_block debug_bb_n (int);
-extern void dump_flow_info (FILE *, int);
-extern void expunge_block (basic_block);
-extern void link_block (basic_block, basic_block);
-extern void unlink_block (basic_block);
-extern void compact_blocks (void);
-extern basic_block alloc_block (void);
-extern void alloc_aux_for_blocks (int);
-extern void clear_aux_for_blocks (void);
-extern void free_aux_for_blocks (void);
-extern void alloc_aux_for_edge (edge, int);
-extern void alloc_aux_for_edges (int);
-extern void clear_aux_for_edges (void);
-extern void free_aux_for_edges (void);
-
-/* In cfganal.c  */
-extern void find_unreachable_blocks (void);
-extern bool mark_dfs_back_edges (void);
-struct edge_list * create_edge_list (void);
-void free_edge_list (struct edge_list *);
-void print_edge_list (FILE *, struct edge_list *);
-void verify_edge_list (FILE *, struct edge_list *);
-int find_edge_index (struct edge_list *, basic_block, basic_block);
-edge find_edge (basic_block, basic_block);
-extern void remove_fake_edges (void);
-extern void remove_fake_exit_edges (void);
-extern void add_noreturn_fake_exit_edges (void);
-extern void connect_infinite_loops_to_exit (void);
-extern int post_order_compute (int *, bool, bool);
-extern basic_block dfs_find_deadend (basic_block);
-extern int inverted_post_order_compute (int *);
-extern int pre_and_rev_post_order_compute_fn (struct function *,
-					      int *, int *, bool);
-extern int pre_and_rev_post_order_compute (int *, int *, bool);
-extern int dfs_enumerate_from (basic_block, int,
-			       bool (*)(const_basic_block, const void *),
-			       basic_block *, int, const void *);
-extern void compute_dominance_frontiers (struct bitmap_head *);
-extern bitmap compute_idf (bitmap, struct bitmap_head *);
-extern basic_block * single_pred_before_succ_order (void);
-
 /* In cfgbuild.c.  */
 extern void find_many_sub_basic_blocks (sbitmap);
 extern void rtl_make_eh_edge (sbitmap, basic_block, rtx);
@@ -841,17 +739,6 @@
 unsigned bb_dom_dfs_in (enum cdi_direction, basic_block);
 unsigned bb_dom_dfs_out (enum cdi_direction, basic_block);
 
-extern void update_bb_profile_for_threading (basic_block, int, gcov_type, edge);
-
-extern void initialize_original_copy_tables (void);
-extern void free_original_copy_tables (void);
-extern void set_bb_original (basic_block, basic_block);
-extern basic_block get_bb_original (basic_block);
-extern void set_bb_copy (basic_block, basic_block);
-extern basic_block get_bb_copy (basic_block);
-void set_loop_copy (struct loop *, struct loop *);
-struct loop *get_loop_copy (struct loop *);
-
 #include "cfghooks.h"
 
 /* Return true if BB is in a transaction.  */
Index: loop-init.c
===================================================================
--- loop-init.c	(revision 216483)
+++ loop-init.c	(working copy)
@@ -32,6 +32,7 @@
 #include "df.h"
 #include "ggc.h"
 #include "tree-ssa-loop-niter.h"
+#include "loop-unroll.h"
 
 \f
 /* Apply FLAGS to the loop state.  */
Index: loop-unroll.c
===================================================================
--- loop-unroll.c	(revision 216485)
+++ loop-unroll.c	(working copy)
@@ -1236,7 +1236,7 @@
    Set *DEBUG_USES to the number of debug insns that reference the
    variable.  */
 
-bool
+static bool
 referenced_in_one_insn_in_loop_p (struct loop *loop, rtx reg,
 				  int *debug_uses)
 {
Index: modulo-sched.c
===================================================================
--- modulo-sched.c	(revision 216485)
+++ modulo-sched.c	(working copy)
@@ -50,6 +50,7 @@
 #include "tree-pass.h"
 #include "dbgcnt.h"
 #include "df.h"
+#include "loop-unroll.h"
 
 #ifdef INSN_SCHEDULING
 

Re: [patch] Second basic-block.h restructuring patch.

[Richard Biener]

On Mon, Oct 20, 2014 at 8:21 PM, Andrew MacLeod <amacleod@redhat.com> wrote:
> creates cfg.h, cfganal.h, lcm.h, and loop-unroll.h to house the prototypes
> for those .c files.
>
> cfganal.h also gets "struct edge_list"  and "class control_dependences"
> definitions since that is where all the routines and manipulators are
> declared.
>
>  loop-unroll.h only exports 2 routines, so rather than including that in
> basic-block.h I simply included it from the 2 .c files which consume those
> routines.  Again, the other includes will be flattened out of basic-block.h
> to just their consumers later.
>
> loop-unroll.c also had one function I marked as static since it wasn't
> actually used anywhere else.
>
> bootstraps on x86_64-unknown-linux-gnu, and regressions are running... I
> expect no regressions because of the nature of the changes.   OK to check in
> assuming everything is OK?

Ok.

Thanks,
Richard.

> Andrew

Re: [patch] Second basic-block.h restructuring patch.

[Jiong Wang]

On 20/10/14 19:21, Andrew MacLeod wrote:
> creates cfg.h, cfganal.h, lcm.h, and loop-unroll.h to house the
> prototypes for those .c files.
>
> cfganal.h also gets "struct edge_list"  and "class control_dependences"
> definitions since that is where all the routines and manipulators are
> declared.
>
>    loop-unroll.h only exports 2 routines, so rather than including that
> in basic-block.h I simply included it from the 2 .c files which consume
> those routines.  Again, the other includes will be flattened out of
> basic-block.h to just their consumers later.
>
> loop-unroll.c also had one function I marked as static since it wasn't
> actually used anywhere else.
>
> bootstraps on x86_64-unknown-linux-gnu, and regressions are running... I
> expect no regressions because of the nature of the changes.   OK to
> check in assuming everything is OK?

Happen to start a fresh build

../gcc/configure --target=arm-none-linux-gnueabihf --enable-languages=c,c++

with the following error.

cnumber -I../../gcc/gcc/../libbacktrace    -o loop-doloop.o -MT loop-doloop.o -MMD -MP -MF ./.deps/loop-doloop.TPo ../../gcc/gcc/loop-doloop.c
../../gcc/gcc/loop-doloop.c: In function ‘bool add_test(rtx, edge_def**, basic_block)’:
../../gcc/gcc/loop-doloop.c:371:38: error: ‘split_edge_and_insert’ was not declared in this scope


>
> Andrew

Re: [patch] Second basic-block.h restructuring patch.

[Andrew MacLeod]

[-- Attachment #1: Type: text/plain, Size: 940 bytes --]

On 10/21/2014 11:48 AM, Jiong Wang wrote:
>
>>
>> bootstraps on x86_64-unknown-linux-gnu, and regressions are running... I
>> expect no regressions because of the nature of the changes.   OK to
>> check in assuming everything is OK?
>
> Happen to start a fresh build
>
> ../gcc/configure --target=arm-none-linux-gnueabihf 
> --enable-languages=c,c++
>
> with the following error.
>
> cnumber -I../../gcc/gcc/../libbacktrace    -o loop-doloop.o -MT 
> loop-doloop.o -MMD -MP -MF ./.deps/loop-doloop.TPo 
> ../../gcc/gcc/loop-doloop.c
> ../../gcc/gcc/loop-doloop.c: In function ‘bool add_test(rtx, 
> edge_def**, basic_block)Â’:
> ../../gcc/gcc/loop-doloop.c:371:38: error: ‘split_edge_and_insert’ was 
> not declared in this scope
>
>
Try the following patch.

Apparently missed because that target is not in contrib/config-list.mk 
and no other target must have enabled that code path. Seems to work now.

checked in as obvious.

Andrew

[-- Attachment #2: doloop.patch --]
[-- Type: text/x-patch, Size: 447 bytes --]


	* loop-doloop.c: Include loop-unroll.h.

Index: loop-doloop.c
===================================================================
--- loop-doloop.c	(revision 216517)
+++ loop-doloop.c	(working copy)
@@ -33,6 +33,7 @@
 #include "params.h"
 #include "target.h"
 #include "dumpfile.h"
+#include "loop-unroll.h"
 
 /* This module is used to modify loops with a determinable number of
    iterations to use special low-overhead looping instructions.

Re: [patch] Second basic-block.h restructuring patch.

[Jiong Wang]

On 21/10/14 17:30, Andrew MacLeod wrote:
> Try the following patch.
>
> Apparently missed because that target is not in contrib/config-list.mk
> and no other target must have enabled that code path. Seems to work now.
>
> checked in as obvious.

verified OK, thanks.
Regards,

Jiong

>
> Andrew