From af71fa391d8bdfd5c3156a03afa42f0363a495a7 Mon Sep 17 00:00:00 2001 From: Segher Boessenkool Date: Thu, 1 Oct 2015 08:33:09 +0200 Subject: [PATCH] bb-reorder: Split out STC 2015-09-23 Segher Boessenkool * bb-reorder.c (reorder_basic_blocks_software_trace_cache): New function, factored out from ... (reorder_basic_blocks): ... here. From-SVN: r228316 --- gcc/ChangeLog | 6 ++++++ gcc/bb-reorder.c | 29 ++++++++++++++++++----------- 2 files changed, 24 insertions(+), 11 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index c132980b9f4..053e9023277 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2015-10-01 Segher Boessenkool + + * bb-reorder.c (reorder_basic_blocks_software_trace_cache): New + function, factored out from ... + (reorder_basic_blocks): ... here. + 2015-10-01 Tom de Vries * tree-cfg.c (dump_function_to_file): Dump function attributes using diff --git a/gcc/bb-reorder.c b/gcc/bb-reorder.c index 2110bd2e0d8..725cdc3e6b0 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); -- 2.30.2