* tree-vrp.c (execute_vrp): Do not check whether current_loops == NULL.
* tree-chrec.c (evolution_function_is_invariant_rec_p): Ditto.
* ifcvt.c (if_convert): Ditto.
* tree-ssa-threadupdate.c (thread_block): Ditto.
(thread_through_all_blocks): Ditto. Assert that loops were analysed.
* tree-ssa-loop-manip.c (rewrite_into_loop_closed_ssa,
verify_loop_closed_ssa): Check number_of_loops instead of current_loops.
* predict.c (tree_estimate_probability): Ditto.
* tree-if-conv.c (main_tree_if_conversion): Ditto.
* tree-ssa-loop-ch.c (copy_loop_headers): Ditto.
* modulo-sched.c (sms_schedule): Ditto.
* tree-scalar-evolution.c (scev_const_prop): Ditto.
(scev_finalize): Do not do anything if scev analysis was not
initialized.
* cfgloopanal.c (mark_irreducible_loops): Do not check whether
current_loops == NULL.
(mark_loop_exit_edges): Check number_of_loops instead of current_loops.
* loop-init.c (loop_optimizer_init): Do not free current_loops when
there are no loops.
(loop_optimizer_finalize): Assert that loops were analyzed.
(rtl_move_loop_invariants, rtl_unswitch, rtl_unroll_and_peel_loops,
rtl_doloop): Check number_of_loops instead of current_loops.
* tree-ssa-loop.c (tree_loop_optimizer_init): Do not check whether
current_loops == NULL.
(tree_ssa_loop_init, tree_ssa_loop_im, tree_ssa_loop_unswitch,
gate_tree_vectorize tree_linear_transform, check_data_deps,
tree_ssa_loop_ivcanon, tree_ssa_empty_loop, tree_ssa_loop_bounds,
tree_complete_unroll, tree_ssa_loop_prefetch, tree_ssa_loop_ivopts):
Check number_of_loops instead of current_loops.
(tree_ssa_loop_done): Do not check whether current_loops == NULL.
* tree-ssa-pre.c (fini_pre): Do not take do_fre argument. Always
free loops if available.
(execute_pre): Do not pass do_fre to fini_pre.
From-SVN: r125114
+2007-05-27 Zdenek Dvorak <dvorakz@suse.cz>
+
+ * tree-vrp.c (execute_vrp): Do not check whether current_loops == NULL.
+ * tree-chrec.c (evolution_function_is_invariant_rec_p): Ditto.
+ * ifcvt.c (if_convert): Ditto.
+ * tree-ssa-threadupdate.c (thread_block): Ditto.
+ (thread_through_all_blocks): Ditto. Assert that loops were analysed.
+ * tree-ssa-loop-manip.c (rewrite_into_loop_closed_ssa,
+ verify_loop_closed_ssa): Check number_of_loops instead of current_loops.
+ * predict.c (tree_estimate_probability): Ditto.
+ * tree-if-conv.c (main_tree_if_conversion): Ditto.
+ * tree-ssa-loop-ch.c (copy_loop_headers): Ditto.
+ * modulo-sched.c (sms_schedule): Ditto.
+ * tree-scalar-evolution.c (scev_const_prop): Ditto.
+ (scev_finalize): Do not do anything if scev analysis was not
+ initialized.
+ * cfgloopanal.c (mark_irreducible_loops): Do not check whether
+ current_loops == NULL.
+ (mark_loop_exit_edges): Check number_of_loops instead of current_loops.
+ * loop-init.c (loop_optimizer_init): Do not free current_loops when
+ there are no loops.
+ (loop_optimizer_finalize): Assert that loops were analyzed.
+ (rtl_move_loop_invariants, rtl_unswitch, rtl_unroll_and_peel_loops,
+ rtl_doloop): Check number_of_loops instead of current_loops.
+ * tree-ssa-loop.c (tree_loop_optimizer_init): Do not check whether
+ current_loops == NULL.
+ (tree_ssa_loop_init, tree_ssa_loop_im, tree_ssa_loop_unswitch,
+ gate_tree_vectorize tree_linear_transform, check_data_deps,
+ tree_ssa_loop_ivcanon, tree_ssa_empty_loop, tree_ssa_loop_bounds,
+ tree_complete_unroll, tree_ssa_loop_prefetch, tree_ssa_loop_ivopts):
+ Check number_of_loops instead of current_loops.
+ (tree_ssa_loop_done): Do not check whether current_loops == NULL.
+ * tree-ssa-pre.c (fini_pre): Do not take do_fre argument. Always
+ free loops if available.
+ (execute_pre): Do not pass do_fre to fini_pre.
+
2007-05-27 Tobias Burnus <burnus@net-b.de>
PR middle-end/32083
edge_iterator ei;
int i, src, dest;
struct graph *g;
- int num = current_loops ? number_of_loops () : 1;
+ int num = number_of_loops ();
int *queue1 = XNEWVEC (int, last_basic_block + num);
int *queue2 = XNEWVEC (int, last_basic_block + num);
int nq;
struct loop *cloop, *loop;
loop_iterator li;
+ gcc_assert (current_loops != NULL);
+
/* Reset the flags. */
FOR_BB_BETWEEN (act, ENTRY_BLOCK_PTR, EXIT_BLOCK_PTR, next_bb)
{
src = BB_REPR (act);
dest = BB_REPR (e->dest);
- if (current_loops)
- {
- /* Ignore latch edges. */
- if (e->dest->loop_father->header == e->dest
- && e->dest->loop_father->latch == act)
- continue;
+ /* Ignore latch edges. */
+ if (e->dest->loop_father->header == e->dest
+ && e->dest->loop_father->latch == act)
+ continue;
+
+ /* Edges inside a single loop should be left where they are. Edges
+ to subloop headers should lead to representative of the subloop,
+ but from the same place.
- /* Edges inside a single loop should be left where they are. Edges
- to subloop headers should lead to representative of the subloop,
- but from the same place.
-
- Edges exiting loops should lead from representative
- of the son of nearest common ancestor of the loops in that
- act lays. */
-
- if (e->dest->loop_father->header == e->dest)
- dest = LOOP_REPR (e->dest->loop_father);
-
- if (!flow_bb_inside_loop_p (act->loop_father, e->dest))
- {
- depth = 1 + loop_depth (find_common_loop (act->loop_father,
- e->dest->loop_father));
- if (depth == loop_depth (act->loop_father))
- cloop = act->loop_father;
- else
- cloop = VEC_index (loop_p, act->loop_father->superloops,
- depth);
-
- src = LOOP_REPR (cloop);
- }
+ Edges exiting loops should lead from representative
+ of the son of nearest common ancestor of the loops in that
+ act lays. */
+
+ if (e->dest->loop_father->header == e->dest)
+ dest = LOOP_REPR (e->dest->loop_father);
+
+ if (!flow_bb_inside_loop_p (act->loop_father, e->dest))
+ {
+ depth = 1 + loop_depth (find_common_loop (act->loop_father,
+ e->dest->loop_father));
+ if (depth == loop_depth (act->loop_father))
+ cloop = act->loop_father;
+ else
+ cloop = VEC_index (loop_p, act->loop_father->superloops, depth);
+
+ src = LOOP_REPR (cloop);
}
add_edge (g, src, dest, e);
queue1[nq++] = BB_REPR (act);
}
- if (current_loops)
+ FOR_EACH_LOOP (li, loop, 0)
{
- FOR_EACH_LOOP (li, loop, 0)
- {
- queue1[nq++] = LOOP_REPR (loop);
- }
+ queue1[nq++] = LOOP_REPR (loop);
}
dfs (g, queue1, nq, queue2, false);
for (i = 0; i < nq; i++)
free (queue1);
free (queue2);
- if (current_loops)
- current_loops->state |= LOOPS_HAVE_MARKED_IRREDUCIBLE_REGIONS;
+ current_loops->state |= LOOPS_HAVE_MARKED_IRREDUCIBLE_REGIONS;
}
/* Counts number of insns inside LOOP. */
basic_block bb;
edge e;
- if (!current_loops)
+ if (number_of_loops () <= 1)
return;
FOR_EACH_BB (bb)
gcc_assert (! no_new_pseudos || reload_completed);
loop_optimizer_init (AVOID_CFG_MODIFICATIONS);
- if (current_loops)
- {
- mark_loop_exit_edges ();
- loop_optimizer_finalize ();
- }
+ mark_loop_exit_edges ();
+ loop_optimizer_finalize ();
free_dominance_info (CDI_DOMINATORS);
/* Compute postdominators if we think we'll use them. */
flow_loops_find (loops);
current_loops = loops;
- if (number_of_loops () <= 1)
- {
- /* No loops (the 1 returned by number_of_loops corresponds to the fake
- loop that we put as a root of the loop tree). */
- loop_optimizer_finalize ();
- return;
- }
-
if (flags & LOOPS_MAY_HAVE_MULTIPLE_LATCHES)
{
/* If the loops may have multiple latches, we cannot canonicalize
struct loop *loop;
basic_block bb;
- if (!current_loops)
- return;
+ gcc_assert (current_loops != NULL);
FOR_EACH_LOOP (li, loop, 0)
{
static unsigned int
rtl_move_loop_invariants (void)
{
- if (current_loops)
+ if (number_of_loops () > 1)
move_loop_invariants ();
return 0;
}
static unsigned int
rtl_unswitch (void)
{
- if (current_loops)
+ if (number_of_loops () > 1)
unswitch_loops ();
return 0;
}
static unsigned int
rtl_unroll_and_peel_loops (void)
{
- if (current_loops)
+ if (number_of_loops () > 1)
{
int flags = 0;
rtl_doloop (void)
{
#ifdef HAVE_doloop_end
- if (current_loops)
+ if (number_of_loops () > 1)
doloop_optimize_loops ();
#endif
return 0;
loop_optimizer_init (LOOPS_HAVE_PREHEADERS
| LOOPS_HAVE_RECORDED_EXITS);
- if (!current_loops)
- return; /* There are no loops to schedule. */
+ if (number_of_loops () <= 1)
+ {
+ loop_optimizer_finalize ();
+ return; /* There are no loops to schedule. */
+ }
/* Initialize issue_rate. */
if (targetm.sched.issue_rate)
basic_block bb;
loop_optimizer_init (0);
- if (current_loops && dump_file && (dump_flags & TDF_DETAILS))
+ if (dump_file && (dump_flags & TDF_DETAILS))
flow_loops_dump (dump_file, NULL, 0);
add_noreturn_fake_exit_edges ();
mark_irreducible_loops ();
record_loop_exits ();
- if (current_loops)
+ if (number_of_loops () > 1)
predict_loops ();
FOR_EACH_BB (bb)
basic_block bb;
/* Start by estimating the frequencies in the loops. */
- if (current_loops)
+ if (number_of_loops () > 1)
estimate_loops_at_level (current_loops->tree_root->inner);
/* Now propagate the frequencies through all the blocks. */
bool
evolution_function_is_invariant_p (tree chrec, int loopnum)
{
- if (evolution_function_is_constant_p (chrec))
- return true;
-
- if (current_loops != NULL)
- return evolution_function_is_invariant_rec_p (chrec, loopnum);
-
- return false;
+ return evolution_function_is_invariant_rec_p (chrec, loopnum);
}
/* Determine whether the given tree is an affine multivariate
loop_iterator li;
struct loop *loop;
- if (!current_loops)
+ if (number_of_loops () <= 1)
return 0;
FOR_EACH_LOOP (li, loop, 0)
void
scev_finalize (void)
{
+ if (!scalar_evolution_info)
+ return;
htab_delete (scalar_evolution_info);
BITMAP_FREE (already_instantiated);
scalar_evolution_info = NULL;
unsigned i;
loop_iterator li;
- if (!current_loops)
+ if (number_of_loops () <= 1)
return 0;
FOR_EACH_BB (bb)
loop_optimizer_init (LOOPS_HAVE_PREHEADERS
| LOOPS_HAVE_SIMPLE_LATCHES);
- if (!current_loops)
- return 0;
+ if (number_of_loops () <= 1)
+ {
+ loop_optimizer_finalize ();
+ return 0;
+ }
#ifdef ENABLE_CHECKING
verify_loop_structure ();
unsigned i, old_num_ssa_names;
bitmap names_to_rename;
- if (!current_loops)
+ current_loops->state |= LOOP_CLOSED_SSA;
+ if (number_of_loops () <= 1)
return;
loop_exits = get_loops_exits ();
/* Fix up all the names found to be used outside their original
loops. */
update_ssa (TODO_update_ssa);
-
- current_loops->state |= LOOP_CLOSED_SSA;
}
/* Check invariants of the loop closed ssa form for the USE in BB. */
tree phi;
unsigned i;
- if (current_loops == NULL)
+ if (number_of_loops () <= 1)
return;
verify_ssa (false);
{
loop_optimizer_init (LOOPS_NORMAL
| LOOPS_HAVE_RECORDED_EXITS);
- if (!current_loops)
- return;
-
rewrite_into_loop_closed_ssa (NULL, TODO_update_ssa);
}
tree_ssa_loop_init (void)
{
tree_loop_optimizer_init ();
- if (!current_loops)
+ if (number_of_loops () <= 1)
return 0;
scev_initialize ();
static unsigned int
tree_ssa_loop_im (void)
{
- if (!current_loops)
+ if (number_of_loops () <= 1)
return 0;
tree_ssa_lim ();
static unsigned int
tree_ssa_loop_unswitch (void)
{
- if (!current_loops)
+ if (number_of_loops () <= 1)
return 0;
return tree_ssa_unswitch_loops ();
static bool
gate_tree_vectorize (void)
{
- return flag_tree_vectorize && current_loops;
+ return flag_tree_vectorize && number_of_loops () > 1;
}
struct tree_opt_pass pass_vectorize =
static unsigned int
tree_linear_transform (void)
{
- if (!current_loops)
+ if (number_of_loops () <= 1)
return 0;
linear_transform_loops ();
static unsigned int
check_data_deps (void)
{
- if (!current_loops)
+ if (number_of_loops () <= 1)
return 0;
tree_check_data_deps ();
static unsigned int
tree_ssa_loop_ivcanon (void)
{
- if (!current_loops)
+ if (number_of_loops () <= 1)
return 0;
return canonicalize_induction_variables ();
static unsigned int
tree_ssa_empty_loop (void)
{
- if (!current_loops)
+ if (number_of_loops () <= 1)
return 0;
return remove_empty_loops ();
static unsigned int
tree_ssa_loop_bounds (void)
{
- if (!current_loops)
+ if (number_of_loops () <= 1)
return 0;
estimate_numbers_of_iterations ();
static unsigned int
tree_complete_unroll (void)
{
- if (!current_loops)
+ if (number_of_loops () <= 1)
return 0;
return tree_unroll_loops_completely (flag_unroll_loops
static unsigned int
tree_ssa_loop_prefetch (void)
{
- if (!current_loops)
+ if (number_of_loops () <= 1)
return 0;
return tree_ssa_prefetch_arrays ();
static unsigned int
tree_ssa_loop_ivopts (void)
{
- if (!current_loops)
+ if (number_of_loops () <= 1)
return 0;
tree_ssa_iv_optimize ();
static unsigned int
tree_ssa_loop_done (void)
{
- if (!current_loops)
- return 0;
-
free_numbers_of_iterations_estimates ();
scev_finalize ();
loop_optimizer_finalize ();
/* Deallocate data structures used by PRE. */
static void
-fini_pre (bool do_fre)
+fini_pre (void)
{
basic_block bb;
unsigned int i;
&& TREE_CODE (SSA_NAME_VALUE (name)) == VALUE_HANDLE)
SSA_NAME_VALUE (name) = NULL;
}
- if (!do_fre && current_loops)
+ if (current_loops != NULL)
loop_optimizer_finalize ();
}
realify_fake_stores ();
}
- fini_pre (do_fre);
+ fini_pre ();
}
/* Gate and execute functions for PRE. */
/* If we thread the latch of the loop to its exit, the loop ceases to
exist. Make sure we do not restrict ourselves in order to preserve
this loop. */
- if (current_loops && loop->header == bb)
+ if (loop->header == bb)
{
e = loop_latch_edge (loop);
e2 = e->aux;
/* If NOLOOP_ONLY is true, we only allow threading through the
header of a loop to exit edges. */
|| (noloop_only
- && current_loops
&& bb == bb->loop_father->header
&& !loop_exit_edge_p (bb->loop_father, e2)))
{
struct loop *loop;
loop_iterator li;
+ /* We must know about loops in order to preserve them. */
+ gcc_assert (current_loops != NULL);
+
if (threaded_edges == NULL)
return false;
/* Then perform the threading through loop headers. We start with the
innermost loop, so that the changes in cfg we perform won't affect
further threading. */
- if (current_loops)
+ FOR_EACH_LOOP (li, loop, LI_FROM_INNERMOST)
{
- FOR_EACH_LOOP (li, loop, LI_FROM_INNERMOST)
- {
- if (!loop->header
- || !bitmap_bit_p (threaded_blocks, loop->header->index))
- continue;
+ if (!loop->header
+ || !bitmap_bit_p (threaded_blocks, loop->header->index))
+ continue;
- retval |= thread_through_loop_header (loop, may_peel_loop_headers);
- }
+ retval |= thread_through_loop_header (loop, may_peel_loop_headers);
}
if (retval)
execute_vrp (void)
{
loop_optimizer_init (LOOPS_NORMAL | LOOPS_HAVE_RECORDED_EXITS);
- if (current_loops)
- {
- rewrite_into_loop_closed_ssa (NULL, TODO_update_ssa);
- scev_initialize ();
- }
+ rewrite_into_loop_closed_ssa (NULL, TODO_update_ssa);
+ scev_initialize ();
insert_range_assertions ();
update_ssa (TODO_update_ssa);
finalize_jump_threads ();
- if (current_loops)
- {
- scev_finalize ();
- loop_optimizer_finalize ();
- }
+ scev_finalize ();
+ loop_optimizer_finalize ();
return 0;
}
projects / thirdparty / gcc.git / commitdiff
