This first patch simply factors code a little bit.
2015-09-23 Segher Boessenkool <seg...@kernel.crashing.org>
* bb-reorder.c (reorder_basic_blocks_software_trace_cache): New
function, factored out from ...
(reorder_basic_blocks): ... here.
---
gcc/bb-reorder.c | 29 ++++++++++++++++++-----------
1 file changed, 18 insertions(+), 11 deletions(-)
diff --git a/gcc/bb-reorder.c b/gcc/bb-reorder.c
index 2110bd2..725cdc3 100644
--- a/gcc/bb-reorder.c
+++ b/gcc/bb-reorder.c
@@ -2226,24 +2226,15 @@ update_crossing_jump_flags (void)
}
}
-/* Reorder basic blocks. The main entry point to this file. FLAGS is
- the set of flags to pass to cfg_layout_initialize(). */
+/* Reorder basic blocks using the software trace cache (STC) algorithm. */
static void
-reorder_basic_blocks (void)
+reorder_basic_blocks_software_trace_cache (void)
{
int n_traces;
int i;
struct trace *traces;
- gcc_assert (current_ir_type () == IR_RTL_CFGLAYOUT);
-
- if (n_basic_blocks_for_fn (cfun) <= NUM_FIXED_BLOCKS + 1)
- return;
-
- set_edge_can_fallthru_flag ();
- mark_dfs_back_edges ();
-
/* We are estimating the length of uncond jump insn only once since the code
for getting the insn length always returns the minimal length now. */
if (uncond_jump_length == 0)
@@ -2268,6 +2259,22 @@ reorder_basic_blocks (void)
connect_traces (n_traces, traces);
FREE (traces);
FREE (bbd);
+}
+
+/* Reorder basic blocks. The main entry point to this file. */
+
+static void
+reorder_basic_blocks (void)
+{
+ gcc_assert (current_ir_type () == IR_RTL_CFGLAYOUT);
+
+ if (n_basic_blocks_for_fn (cfun) <= NUM_FIXED_BLOCKS + 1)
+ return;
+
+ set_edge_can_fallthru_flag ();
+ mark_dfs_back_edges ();
+
+ reorder_basic_blocks_software_trace_cache ();
relink_block_chain (/*stay_in_cfglayout_mode=*/true);
--
1.8.1.4
