bc35512f09
* basic-block.h (create_basic_block, merge_blocks_nomove): Kill. * cfgcleanup.c (merge_blocks): Rename to merge_blocks_move. (merge_blocks_move_predecessor_nojumps, merge_blocks_move_successor_nojumps): Use merge_blocks. (try_optimize_cfg): Use merge_blocks_move. * cfgrtl.c (create_basic_block): Rename to rtl_create_basic_block. (merge_blocks_nomove): Rename to rtl_merge_blocks. (cfg_layout_create_basic_block): New. (rtl_can_merge_blocks): New. (cfg_layout_split_block): Do not alloc aux by hand. * cfghooks.h (cfg_hooks): Add create_basic_block, can_merge_blocks_p, merge_blocks. (create_basic_block, can_merge_blocks_p, merge_blocks): New macros. * cfglayout.c (cfg_layout_duplicate_bb): Do not allocate aux by hand. * cfgloopmanip.c (loop_split_edge_with): Likewise. * ifcvt.c (merge_if_block): Use merge_blocks_nomove. * basic-block.h (basic_block_def): Add field 'rbi'. * bb-reorder.c (find_traces, rotate_loop, mark_bb_visited, find_traces_1_round, copy_bb, connect_traces): Update use of rbi. * cfg.c (entry_exit_blocks): Add new field. * cfglayout.c: Include alloc-pool.h; (cfg_layout_pool): New. (record_effective_endpoints, fixup_reorder_chain, fixup_fallthru_exit_predecessor, cfg_layout_duplicate_bb): Update use of rbi. (cfg_layout_initialize_rbi): New function. (cfg_layout_initialize): Use it. (cfg_layout_finalize): Clear rbi fields. * cfglayout.h (RBI): Kill. (cfg_layout_initialize_rbi): Declare. * cfgloopmanip.c (copy_bbs): Use rbi. (record_exit_edges): Likewise. (duplicate_loop_to_header_edge): Likewise. * cfgrtl.c (cfg_layout_create_basic_block): Use cfg_layout_initialize_rbi. (cfg_layout_split_block): Use rbi. (cfg_layout_delete_block): Likewise. * loop-init.c (loop_optimizer_finalize): Likewise. * loop-unswitch.c (unswitch_loop): Likewise. * tracer.c (seen, tail_duplicate, layout_superblocks): Likewise. * cfgrtl.c: Update comments. (try_redirect_by_replacing_jump): New argument. (redirect_branch_edge): Break out from ... (rtl_redirect_edge_and_branch): ... this one. (update_cfg_after_block_merging): Break out from ... (rtl_merge_blocks): ... this one. (cfg_layout_split_edge): New. (cfg_layout_merge_blocks): New. (cfg_layout_can_merge_blocks_p): New. (cfg_layout_redirect_edge_and_branch): Reorganize. (cfg_layout_rtl_cfg_hooks): Fill in. (cfg_layout_delete_block): Kill barriers. * cfganal.c (can_fallthru): Deal with exit blocks * cfglayout.c (cfg_layout_function_header): New function (record_effective_endpoints): Record function header. (fixup_reorder_chain): Fixup dead jumptables; place header * basic-block.h (CLEANUP_CFGLAYOUT): New flag. * bb-reorder.c (cfg_layout_initialize): Update call. * cfgcleanup.c (try_optimize_cfg): Supress optimizations of fallthru edges in cfglayout mode. * cfglayout.c (cleanup_unconditional_jumps): Kill. (cfg_layout_initialize): Kill agrument loops; use cfgcleanup. * cfglayout.h (cfg_layout_initialize): Update prototype. * cfgloop.h (CP_INSIDE_CFGLAYOUT): Kill. * cfgloopmanip.c (loop_split_edge_with): Use split_edge. * flow.c (propagate_block): Do not crash when basic block ends by first insn in the chain. * loop-init.c (loop_optimizer_init): First enter cfglayout mode; later do loop discovery. * tracer.c (tracer): Update call of cfg_layout_initialize. From-SVN: r68899
122 lines
2.9 KiB
C
122 lines
2.9 KiB
C
/* Loop optimizer initialization routines.
|
|
Copyright (C) 2002, 2003 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 2, 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 COPYING. If not, write to the Free
|
|
Software Foundation, 59 Temple Place - Suite 330, Boston, MA
|
|
02111-1307, USA. */
|
|
|
|
#include "config.h"
|
|
#include "system.h"
|
|
#include "coretypes.h"
|
|
#include "tm.h"
|
|
#include "rtl.h"
|
|
#include "hard-reg-set.h"
|
|
#include "basic-block.h"
|
|
#include "cfgloop.h"
|
|
#include "cfglayout.h"
|
|
|
|
/* Initialize loop optimizer. */
|
|
|
|
struct loops *
|
|
loop_optimizer_init (dumpfile)
|
|
FILE *dumpfile;
|
|
{
|
|
struct loops *loops = xcalloc (1, sizeof (struct loops));
|
|
edge e;
|
|
|
|
/* Initialize structures for layout changes. */
|
|
cfg_layout_initialize ();
|
|
|
|
/* Avoid annoying special cases of edges going to exit
|
|
block. */
|
|
for (e = EXIT_BLOCK_PTR->pred; e; e = e->pred_next)
|
|
if ((e->flags & EDGE_FALLTHRU) && e->src->succ->succ_next)
|
|
split_edge (e);
|
|
|
|
/* Find the loops. */
|
|
|
|
if (flow_loops_find (loops, LOOP_TREE) <= 1)
|
|
{
|
|
basic_block bb;
|
|
|
|
/* No loops. */
|
|
flow_loops_free (loops);
|
|
free (loops);
|
|
/* Make chain. */
|
|
FOR_EACH_BB (bb)
|
|
if (bb->next_bb != EXIT_BLOCK_PTR)
|
|
bb->rbi->next = bb->next_bb;
|
|
cfg_layout_finalize ();
|
|
return NULL;
|
|
}
|
|
|
|
/* Not going to update these. */
|
|
free (loops->cfg.rc_order);
|
|
loops->cfg.rc_order = NULL;
|
|
free (loops->cfg.dfs_order);
|
|
loops->cfg.dfs_order = NULL;
|
|
|
|
/* Create pre-headers. */
|
|
create_preheaders (loops, CP_SIMPLE_PREHEADERS);
|
|
|
|
/* Force all latches to have only single successor. */
|
|
force_single_succ_latches (loops);
|
|
|
|
/* Mark irreducible loops. */
|
|
mark_irreducible_loops (loops);
|
|
|
|
/* Dump loops. */
|
|
flow_loops_dump (loops, dumpfile, NULL, 1);
|
|
|
|
#ifdef ENABLE_CHECKING
|
|
verify_dominators (loops->cfg.dom);
|
|
verify_loop_structure (loops);
|
|
#endif
|
|
|
|
return loops;
|
|
}
|
|
|
|
/* Finalize loop optimizer. */
|
|
void
|
|
loop_optimizer_finalize (loops, dumpfile)
|
|
struct loops *loops;
|
|
FILE *dumpfile;
|
|
{
|
|
basic_block bb;
|
|
|
|
/* Finalize layout changes. */
|
|
/* Make chain. */
|
|
FOR_EACH_BB (bb)
|
|
if (bb->next_bb != EXIT_BLOCK_PTR)
|
|
bb->rbi->next = bb->next_bb;
|
|
|
|
/* Another dump. */
|
|
flow_loops_dump (loops, dumpfile, NULL, 1);
|
|
|
|
/* Clean up. */
|
|
flow_loops_free (loops);
|
|
free (loops);
|
|
|
|
/* Finalize changes. */
|
|
cfg_layout_finalize ();
|
|
|
|
/* Checking. */
|
|
#ifdef ENABLE_CHECKING
|
|
verify_flow_info ();
|
|
#endif
|
|
}
|
|
|