#include "cfghooks.h"
#include "output.h"
-static void duplicate_subloops (struct loops *, struct loop *, struct loop *);
-static void copy_loops_to (struct loops *, struct loop **, int,
+static void duplicate_subloops (struct loop *, struct loop *);
+static void copy_loops_to (struct loop **, int,
struct loop *);
static void loop_redirect_edge (edge, basic_block);
-static bool loop_delete_branch_edge (edge, int);
static void remove_bbs (basic_block *, int);
static bool rpe_enum_p (basic_block, void *);
static int find_path (edge, basic_block **);
-static bool alp_enum_p (basic_block, void *);
-static void fix_loop_placements (struct loops *, struct loop *, bool *);
-static bool fix_bb_placement (struct loops *, basic_block);
-static void fix_bb_placements (struct loops *, basic_block, bool *);
-static void place_new_loop (struct loops *, struct loop *);
-static void scale_loop_frequencies (struct loop *, int, int);
+static void fix_loop_placements (struct loop *, bool *);
+static bool fix_bb_placement (basic_block);
+static void fix_bb_placements (basic_block, bool *);
static basic_block create_preheader (struct loop *, int);
-static void unloop (struct loops *, struct loop *, bool *);
+static void unloop (struct loop *, bool *);
#define RDIV(X,Y) (((X) + (Y) / 2) / (Y))
n_basic_blocks, e->dest);
}
-/* Fix placement of basic block BB inside loop hierarchy stored in LOOPS --
+/* Fix placement of basic block BB inside loop hierarchy --
Let L be a loop to that BB belongs. Then every successor of BB must either
1) belong to some superloop of loop L, or
2) be a header of loop K such that K->outer is superloop of L
false if the placement of BB was already correct (provided that placements
of its successors are correct). */
static bool
-fix_bb_placement (struct loops *loops, basic_block bb)
+fix_bb_placement (basic_block bb)
{
edge e;
edge_iterator ei;
- struct loop *loop = loops->tree_root, *act;
+ struct loop *loop = current_loops->tree_root, *act;
FOR_EACH_EDGE (e, ei, bb->succs)
{
return true;
}
+/* Fix placement of LOOP inside loop tree, i.e. find the innermost superloop
+ of LOOP to that leads at least one exit edge of LOOP, and set it
+ as the immediate superloop of LOOP. Return true if the immediate superloop
+ of LOOP changed. */
+
+static bool
+fix_loop_placement (struct loop *loop)
+{
+ unsigned i;
+ edge e;
+ VEC (edge, heap) *exits = get_loop_exit_edges (loop);
+ struct loop *father = current_loops->tree_root, *act;
+ bool ret = false;
+
+ for (i = 0; VEC_iterate (edge, exits, i, e); i++)
+ {
+ act = find_common_loop (loop, e->dest->loop_father);
+ if (flow_loop_nested_p (father, act))
+ father = act;
+ }
+
+ if (father != loop->outer)
+ {
+ for (act = loop->outer; act != father; act = act->outer)
+ act->num_nodes -= loop->num_nodes;
+ flow_loop_tree_node_remove (loop);
+ flow_loop_tree_node_add (father, loop);
+
+ /* The exit edges of LOOP no longer exits its original immediate
+ superloops; remove them from the appropriate exit lists. */
+ for (i = 0; VEC_iterate (edge, exits, i, e); i++)
+ rescan_loop_exit (e, false, false);
+
+ ret = true;
+ }
+
+ VEC_free (edge, heap, exits);
+ return ret;
+}
+
/* Fix placements of basic blocks inside loop hierarchy stored in loops; i.e.
enforce condition condition stated in description of fix_bb_placement. We
start from basic block FROM that had some of its successors removed, so that
IRRED_INVALIDATED is set to true. */
static void
-fix_bb_placements (struct loops *loops, basic_block from,
+fix_bb_placements (basic_block from,
bool *irred_invalidated)
{
sbitmap in_queue;
fix_loop_placement. */
base_loop = from->loop_father;
- if (base_loop == loops->tree_root)
+ if (base_loop == current_loops->tree_root)
return;
in_queue = sbitmap_alloc (last_basic_block);
else
{
/* Ordinary basic block. */
- if (!fix_bb_placement (loops, from))
+ if (!fix_bb_placement (from))
continue;
}
}
/* Removes path beginning at edge E, i.e. remove basic blocks dominated by E
- and update loop structure stored in LOOPS and dominators. Return true if
- we were able to remove the path, false otherwise (and nothing is affected
- then). */
+ and update loop structures and dominators. Return true if we were able
+ to remove the path, false otherwise (and nothing is affected then). */
bool
-remove_path (struct loops *loops, edge e)
+remove_path (edge e)
{
edge ae;
basic_block *rem_bbs, *bord_bbs, *dom_bbs, from, bb;
int i, nrem, n_bord_bbs, n_dom_bbs, nreml;
sbitmap seen;
- bool deleted, irred_invalidated = false;
+ bool irred_invalidated = false;
struct loop **deleted_loop;
- if (!loop_delete_branch_edge (e, 0))
+ if (!can_remove_branch_p (e))
return false;
/* Keep track of whether we need to update information about irreducible
while (e->src->loop_father->outer
&& dominated_by_p (CDI_DOMINATORS,
e->src->loop_father->latch, e->dest))
- unloop (loops, e->src->loop_father, &irred_invalidated);
+ unloop (e->src->loop_father, &irred_invalidated);
/* Identify the path. */
nrem = find_path (e, &rem_bbs);
/* Remove the path. */
from = e->src;
- deleted = loop_delete_branch_edge (e, 1);
- gcc_assert (deleted);
+ remove_branch (e);
dom_bbs = XCNEWVEC (basic_block, n_basic_blocks);
/* Cancel loops contained in the path. */
free (rem_bbs);
for (i = 0; i < nreml; i++)
- cancel_loop_tree (loops, deleted_loop[i]);
+ cancel_loop_tree (deleted_loop[i]);
free (deleted_loop);
/* Find blocks whose dominators may be affected. */
/* Fix placements of basic blocks inside loops and the placement of
loops in the loop tree. */
- fix_bb_placements (loops, from, &irred_invalidated);
- fix_loop_placements (loops, from->loop_father, &irred_invalidated);
+ fix_bb_placements (from, &irred_invalidated);
+ fix_loop_placements (from->loop_father, &irred_invalidated);
if (irred_invalidated
- && (loops->state & LOOPS_HAVE_MARKED_IRREDUCIBLE_REGIONS) != 0)
- mark_irreducible_loops (loops);
+ && (current_loops->state & LOOPS_HAVE_MARKED_IRREDUCIBLE_REGIONS) != 0)
+ mark_irreducible_loops ();
return true;
}
-/* Predicate for enumeration in add_loop. */
-static bool
-alp_enum_p (basic_block bb, void *alp_header)
+/* Creates place for a new LOOP in loops structure. */
+
+static void
+place_new_loop (struct loop *loop)
{
- return bb != (basic_block) alp_header;
+ loop->num = number_of_loops ();
+ VEC_safe_push (loop_p, heap, current_loops->larray, loop);
}
/* Given LOOP structure with filled header and latch, find the body of the
- corresponding loop and add it to LOOPS tree. Insert the LOOP as a son of
+ corresponding loop and add it to loops tree. Insert the LOOP as a son of
outer. */
-static void
-add_loop (struct loops *loops, struct loop *loop, struct loop *outer)
+void
+add_loop (struct loop *loop, struct loop *outer)
{
basic_block *bbs;
int i, n;
+ struct loop *subloop;
/* Add it to loop structure. */
- place_new_loop (loops, loop);
+ place_new_loop (loop);
flow_loop_tree_node_add (outer, loop);
/* Find its nodes. */
- bbs = XCNEWVEC (basic_block, n_basic_blocks);
- n = dfs_enumerate_from (loop->latch, 1, alp_enum_p,
- bbs, n_basic_blocks, loop->header);
+ bbs = XNEWVEC (basic_block, n_basic_blocks);
+ n = get_loop_body_with_size (loop, bbs, n_basic_blocks);
for (i = 0; i < n; i++)
{
- remove_bb_from_loops (bbs[i]);
- add_bb_to_loop (bbs[i], loop);
+ if (bbs[i]->loop_father == outer)
+ {
+ remove_bb_from_loops (bbs[i]);
+ add_bb_to_loop (bbs[i], loop);
+ continue;
+ }
+
+ loop->num_nodes++;
+
+ /* If we find a direct subloop of OUTER, move it to LOOP. */
+ subloop = bbs[i]->loop_father;
+ if (subloop->outer == outer
+ && subloop->header == bbs[i])
+ {
+ flow_loop_tree_node_remove (subloop);
+ flow_loop_tree_node_add (loop, subloop);
+ }
}
- remove_bb_from_loops (loop->header);
- add_bb_to_loop (loop->header, loop);
free (bbs);
}
/* Multiply all frequencies in LOOP by NUM/DEN. */
-static void
+void
scale_loop_frequencies (struct loop *loop, int num, int den)
{
basic_block *bbs;
}
/* Make area between HEADER_EDGE and LATCH_EDGE a loop by connecting
- latch to header and update loop tree stored in LOOPS and dominators
+ latch to header and update loop tree and dominators
accordingly. Everything between them plus LATCH_EDGE destination must
be dominated by HEADER_EDGE destination, and back-reachable from
LATCH_EDGE source. HEADER_EDGE is redirected to basic block SWITCH_BB,
FALSE_EDGE of SWITCH_BB to original destination of HEADER_EDGE and
TRUE_EDGE of SWITCH_BB to original destination of LATCH_EDGE.
- Returns newly created loop. */
+ Returns the newly created loop. Frequencies and counts in the new loop
+ are scaled by FALSE_SCALE and in the old one by TRUE_SCALE. */
struct loop *
-loopify (struct loops *loops, edge latch_edge, edge header_edge,
+loopify (edge latch_edge, edge header_edge,
basic_block switch_bb, edge true_edge, edge false_edge,
- bool redirect_all_edges)
+ bool redirect_all_edges, unsigned true_scale, unsigned false_scale)
{
basic_block succ_bb = latch_edge->dest;
basic_block pred_bb = header_edge->src;
basic_block *dom_bbs, *body;
unsigned n_dom_bbs, i;
sbitmap seen;
- struct loop *loop = XCNEW (struct loop);
+ struct loop *loop = alloc_loop ();
struct loop *outer = succ_bb->loop_father->outer;
- int freq, prob, tot_prob;
+ int freq;
gcov_type cnt;
edge e;
edge_iterator ei;
freq = EDGE_FREQUENCY (header_edge);
cnt = header_edge->count;
- prob = EDGE_SUCC (switch_bb, 0)->probability;
- tot_prob = prob + EDGE_SUCC (switch_bb, 1)->probability;
- if (tot_prob == 0)
- tot_prob = 1;
/* Redirect edges. */
loop_redirect_edge (latch_edge, loop->header);
set_immediate_dominator (CDI_DOMINATORS, succ_bb, switch_bb);
/* Compute new loop. */
- add_loop (loops, loop, outer);
+ add_loop (loop, outer);
/* Add switch_bb to appropriate loop. */
if (switch_bb->loop_father)
add_bb_to_loop (switch_bb, outer);
/* Fix frequencies. */
- switch_bb->frequency = freq;
- switch_bb->count = cnt;
- FOR_EACH_EDGE (e, ei, switch_bb->succs)
- e->count = (switch_bb->count * e->probability) / REG_BR_PROB_BASE;
- scale_loop_frequencies (loop, prob, tot_prob);
- scale_loop_frequencies (succ_bb->loop_father, tot_prob - prob, tot_prob);
+ if (redirect_all_edges)
+ {
+ switch_bb->frequency = freq;
+ switch_bb->count = cnt;
+ FOR_EACH_EDGE (e, ei, switch_bb->succs)
+ {
+ e->count = (switch_bb->count * e->probability) / REG_BR_PROB_BASE;
+ }
+ }
+ scale_loop_frequencies (loop, false_scale, REG_BR_PROB_BASE);
+ scale_loop_frequencies (succ_bb->loop_father, true_scale, REG_BR_PROB_BASE);
/* Update dominators of blocks outside of LOOP. */
dom_bbs = XCNEWVEC (basic_block, n_basic_blocks);
return loop;
}
-/* Remove the latch edge of a LOOP and update LOOPS tree to indicate that
+/* Remove the latch edge of a LOOP and update loops to indicate that
the LOOP was removed. After this function, original loop latch will
have no successor, which caller is expected to fix somehow.
invalid, IRRED_INVALIDATED is set to true. */
static void
-unloop (struct loops *loops, struct loop *loop, bool *irred_invalidated)
+unloop (struct loop *loop, bool *irred_invalidated)
{
basic_block *body;
struct loop *ploop;
}
/* Remove the loop and free its data. */
- flow_loop_tree_node_remove (loop);
- loops->parray[loop->num] = NULL;
- flow_loop_free (loop);
+ delete_loop (loop);
remove_edge (single_succ_edge (latch));
/* We do not pass IRRED_INVALIDATED to fix_bb_placements here, as even if
there is an irreducible region inside the cancelled loop, the flags will
be still correct. */
- fix_bb_placements (loops, latch, &dummy);
-}
-
-/* Fix placement of LOOP inside loop tree, i.e. find the innermost superloop
- FATHER of LOOP such that all of the edges coming out of LOOP belong to
- FATHER, and set it as outer loop of LOOP. Return true if placement of
- LOOP changed. */
-
-int
-fix_loop_placement (struct loop *loop)
-{
- basic_block *body;
- unsigned i;
- edge e;
- edge_iterator ei;
- struct loop *father = loop->pred[0], *act;
-
- body = get_loop_body (loop);
- for (i = 0; i < loop->num_nodes; i++)
- FOR_EACH_EDGE (e, ei, body[i]->succs)
- if (!flow_bb_inside_loop_p (loop, e->dest))
- {
- act = find_common_loop (loop, e->dest->loop_father);
- if (flow_loop_nested_p (father, act))
- father = act;
- }
- free (body);
-
- if (father != loop->outer)
- {
- for (act = loop->outer; act != father; act = act->outer)
- act->num_nodes -= loop->num_nodes;
- flow_loop_tree_node_remove (loop);
- flow_loop_tree_node_add (father, loop);
- return 1;
- }
- return 0;
+ fix_bb_placements (latch, &dummy);
}
/* Fix placement of superloops of LOOP inside loop tree, i.e. ensure that
invalidate the information about irreducible regions. */
static void
-fix_loop_placements (struct loops *loops, struct loop *loop,
- bool *irred_invalidated)
+fix_loop_placements (struct loop *loop, bool *irred_invalidated)
{
struct loop *outer;
for its preheader, because the successor is the header and belongs
to the loop. So call fix_bb_placements to fix up the placement
of the preheader and (possibly) of its predecessors. */
- fix_bb_placements (loops, loop_preheader_edge (loop)->src,
+ fix_bb_placements (loop_preheader_edge (loop)->src,
irred_invalidated);
loop = outer;
}
}
-/* Creates place for a new LOOP in LOOPS structure. */
-static void
-place_new_loop (struct loops *loops, struct loop *loop)
-{
- loops->parray =
- xrealloc (loops->parray, (loops->num + 1) * sizeof (struct loop *));
- loops->parray[loops->num] = loop;
-
- loop->num = loops->num++;
-}
-
/* Copies copy of LOOP as subloop of TARGET loop, placing newly
- created loop into LOOPS structure. */
+ created loop into loops structure. */
struct loop *
-duplicate_loop (struct loops *loops, struct loop *loop, struct loop *target)
+duplicate_loop (struct loop *loop, struct loop *target)
{
struct loop *cloop;
- cloop = XCNEW (struct loop);
- place_new_loop (loops, cloop);
+ cloop = alloc_loop ();
+ place_new_loop (cloop);
/* Mark the new loop as copy of LOOP. */
loop->copy = cloop;
}
/* Copies structure of subloops of LOOP into TARGET loop, placing
- newly created loops into loop tree stored in LOOPS. */
+ newly created loops into loop tree. */
static void
-duplicate_subloops (struct loops *loops, struct loop *loop, struct loop *target)
+duplicate_subloops (struct loop *loop, struct loop *target)
{
struct loop *aloop, *cloop;
for (aloop = loop->inner; aloop; aloop = aloop->next)
{
- cloop = duplicate_loop (loops, aloop, target);
- duplicate_subloops (loops, aloop, cloop);
+ cloop = duplicate_loop (aloop, target);
+ duplicate_subloops (aloop, cloop);
}
}
/* Copies structure of subloops of N loops, stored in array COPIED_LOOPS,
- into TARGET loop, placing newly created loops into loop tree LOOPS. */
+ into TARGET loop, placing newly created loops into loop tree. */
static void
-copy_loops_to (struct loops *loops, struct loop **copied_loops, int n, struct loop *target)
+copy_loops_to (struct loop **copied_loops, int n, struct loop *target)
{
struct loop *aloop;
int i;
for (i = 0; i < n; i++)
{
- aloop = duplicate_loop (loops, copied_loops[i], target);
- duplicate_subloops (loops, copied_loops[i], aloop);
+ aloop = duplicate_loop (copied_loops[i], target);
+ duplicate_subloops (copied_loops[i], aloop);
}
}
redirect_edge_and_branch_force (e, dest);
}
-/* Deletes edge E from a branch if possible. Unless REALLY_DELETE is set,
- just test whether it is possible to remove the edge. */
-static bool
-loop_delete_branch_edge (edge e, int really_delete)
-{
- basic_block src = e->src;
- basic_block newdest;
- int irr;
- edge snd;
-
- gcc_assert (EDGE_COUNT (src->succs) > 1);
-
- /* Cannot handle more than two exit edges. */
- if (EDGE_COUNT (src->succs) > 2)
- return false;
- /* And it must be just a simple branch. */
- if (!any_condjump_p (BB_END (src)))
- return false;
-
- snd = e == EDGE_SUCC (src, 0) ? EDGE_SUCC (src, 1) : EDGE_SUCC (src, 0);
- newdest = snd->dest;
- if (newdest == EXIT_BLOCK_PTR)
- return false;
-
- /* Hopefully the above conditions should suffice. */
- if (!really_delete)
- return true;
-
- /* Redirecting behaves wrongly wrto this flag. */
- irr = snd->flags & EDGE_IRREDUCIBLE_LOOP;
-
- if (!redirect_edge_and_branch (e, newdest))
- return false;
- single_succ_edge (src)->flags &= ~EDGE_IRREDUCIBLE_LOOP;
- single_succ_edge (src)->flags |= irr;
-
- return true;
-}
-
/* Check whether LOOP's body can be duplicated. */
bool
can_duplicate_loop_p (struct loop *loop)
return ret;
}
-/* The NBBS blocks in BBS will get duplicated and the copies will be placed
- to LOOP. Update the single_exit information in superloops of LOOP. */
+/* Sets probability and count of edge E to zero. The probability and count
+ is redistributed evenly to the remaining edges coming from E->src. */
static void
-update_single_exits_after_duplication (basic_block *bbs, unsigned nbbs,
- struct loop *loop)
+set_zero_probability (edge e)
{
- unsigned i;
+ basic_block bb = e->src;
+ edge_iterator ei;
+ edge ae, last = NULL;
+ unsigned n = EDGE_COUNT (bb->succs);
+ gcov_type cnt = e->count, cnt1;
+ unsigned prob = e->probability, prob1;
- for (i = 0; i < nbbs; i++)
- bbs[i]->flags |= BB_DUPLICATED;
+ gcc_assert (n > 1);
+ cnt1 = cnt / (n - 1);
+ prob1 = prob / (n - 1);
- for (; loop->outer; loop = loop->outer)
+ FOR_EACH_EDGE (ae, ei, bb->succs)
{
- if (!single_exit (loop))
+ if (ae == e)
continue;
- if (single_exit (loop)->src->flags & BB_DUPLICATED)
- set_single_exit (loop, NULL);
+ ae->probability += prob1;
+ ae->count += cnt1;
+ last = ae;
}
- for (i = 0; i < nbbs; i++)
- bbs[i]->flags &= ~BB_DUPLICATED;
-}
-
-/* Updates single exit information for the copy of LOOP. */
-
-static void
-update_single_exit_for_duplicated_loop (struct loop *loop)
-{
- struct loop *copy = loop->copy;
- basic_block src, dest;
- edge exit = single_exit (loop);
-
- if (!exit)
- return;
-
- src = get_bb_copy (exit->src);
- dest = exit->dest;
- if (dest->flags & BB_DUPLICATED)
- dest = get_bb_copy (dest);
-
- exit = find_edge (src, dest);
- gcc_assert (exit != NULL);
- set_single_exit (copy, exit);
-}
-
-/* Updates single exit information for copies of ORIG_LOOPS and their subloops.
- N is the number of the loops in the ORIG_LOOPS array. */
-
-static void
-update_single_exit_for_duplicated_loops (struct loop *orig_loops[], unsigned n)
-{
- unsigned i;
+ /* Move the rest to one of the edges. */
+ last->probability += prob % (n - 1);
+ last->count += cnt % (n - 1);
- for (i = 0; i < n; i++)
- update_single_exit_for_duplicated_loop (orig_loops[i]);
+ e->probability = 0;
+ e->count = 0;
}
/* Duplicates body of LOOP to given edge E NDUPL times. Takes care of updating
- LOOPS structure and dominators. E's destination must be LOOP header for
+ loop structure and dominators. E's destination must be LOOP header for
this to work, i.e. it must be entry or latch edge of this loop; these are
unique, as the loops must have preheaders for this function to work
correctly (in case E is latch, the function unrolls the loop, if E is entry
original LOOP body, the other copies are numbered in order given by control
flow through them) into TO_REMOVE array. Returns false if duplication is
impossible. */
+
bool
-duplicate_loop_to_header_edge (struct loop *loop, edge e, struct loops *loops,
+duplicate_loop_to_header_edge (struct loop *loop, edge e,
unsigned int ndupl, sbitmap wont_exit,
- edge orig, edge *to_remove,
- unsigned int *n_to_remove, int flags)
+ edge orig, VEC (edge, heap) **to_remove,
+ int flags)
{
struct loop *target, *aloop;
struct loop **orig_loops;
unsigned i, j, n;
int is_latch = (latch == e->src);
int scale_act = 0, *scale_step = NULL, scale_main = 0;
+ int scale_after_exit = 0;
int p, freq_in, freq_le, freq_out_orig;
int prob_pass_thru, prob_pass_wont_exit, prob_pass_main;
int add_irreducible_flag;
basic_block place_after;
+ bitmap bbs_to_scale = NULL;
+ bitmap_iterator bi;
gcc_assert (e->dest == loop->header);
gcc_assert (ndupl > 0);
prob_pass_wont_exit =
RDIV (REG_BR_PROB_BASE * (freq_le + freq_out_orig), freq_in);
+ if (orig
+ && REG_BR_PROB_BASE - orig->probability != 0)
+ {
+ /* The blocks that are dominated by a removed exit edge ORIG have
+ frequencies scaled by this. */
+ scale_after_exit = RDIV (REG_BR_PROB_BASE * REG_BR_PROB_BASE,
+ REG_BR_PROB_BASE - orig->probability);
+ bbs_to_scale = BITMAP_ALLOC (NULL);
+ for (i = 0; i < n; i++)
+ {
+ if (bbs[i] != orig->src
+ && dominated_by_p (CDI_DOMINATORS, bbs[i], orig->src))
+ bitmap_set_bit (bbs_to_scale, i);
+ }
+ }
+
scale_step = XNEWVEC (int, ndupl);
- for (i = 1; i <= ndupl; i++)
- scale_step[i - 1] = TEST_BIT (wont_exit, i)
+ for (i = 1; i <= ndupl; i++)
+ scale_step[i - 1] = TEST_BIT (wont_exit, i)
? prob_pass_wont_exit
: prob_pass_thru;
first_active_latch = latch;
}
- /* Update the information about single exits. */
- if (loops->state & LOOPS_HAVE_MARKED_SINGLE_EXITS)
- update_single_exits_after_duplication (bbs, n, target);
-
- /* Record exit edge in original loop body. */
- if (orig && TEST_BIT (wont_exit, 0))
- to_remove[(*n_to_remove)++] = orig;
-
spec_edges[SE_ORIG] = orig;
spec_edges[SE_LATCH] = latch_edge;
for (j = 0; j < ndupl; j++)
{
/* Copy loops. */
- copy_loops_to (loops, orig_loops, n_orig_loops, target);
+ copy_loops_to (orig_loops, n_orig_loops, target);
/* Copy bbs. */
copy_bbs (bbs, n, new_bbs, spec_edges, 2, new_spec_edges, loop,
place_after);
place_after = new_spec_edges[SE_LATCH]->src;
- if (loops->state & LOOPS_HAVE_MARKED_SINGLE_EXITS)
- {
- for (i = 0; i < n; i++)
- bbs[i]->flags |= BB_DUPLICATED;
- update_single_exit_for_duplicated_loops (orig_loops, n_orig_loops);
- for (i = 0; i < n; i++)
- bbs[i]->flags &= ~BB_DUPLICATED;
- }
-
if (flags & DLTHE_RECORD_COPY_NUMBER)
for (i = 0; i < n; i++)
{
/* Record exit edge in this copy. */
if (orig && TEST_BIT (wont_exit, j + 1))
- to_remove[(*n_to_remove)++] = new_spec_edges[SE_ORIG];
+ {
+ if (to_remove)
+ VEC_safe_push (edge, heap, *to_remove, new_spec_edges[SE_ORIG]);
+ set_zero_probability (new_spec_edges[SE_ORIG]);
+
+ /* Scale the frequencies of the blocks dominated by the exit. */
+ if (bbs_to_scale)
+ {
+ EXECUTE_IF_SET_IN_BITMAP (bbs_to_scale, 0, i, bi)
+ {
+ scale_bbs_frequencies_int (new_bbs + i, 1, scale_after_exit,
+ REG_BR_PROB_BASE);
+ }
+ }
+ }
/* Record the first copy in the control flow order if it is not
the original loop (i.e. in case of peeling). */
free (new_bbs);
free (orig_loops);
+ /* Record the exit edge in the original loop body, and update the frequencies. */
+ if (orig && TEST_BIT (wont_exit, 0))
+ {
+ if (to_remove)
+ VEC_safe_push (edge, heap, *to_remove, orig);
+ set_zero_probability (orig);
+
+ /* Scale the frequencies of the blocks dominated by the exit. */
+ if (bbs_to_scale)
+ {
+ EXECUTE_IF_SET_IN_BITMAP (bbs_to_scale, 0, i, bi)
+ {
+ scale_bbs_frequencies_int (bbs + i, 1, scale_after_exit,
+ REG_BR_PROB_BASE);
+ }
+ }
+ }
+
/* Update the original loop. */
if (!is_latch)
set_immediate_dominator (CDI_DOMINATORS, e->dest, e->src);
free (first_active);
free (bbs);
+ BITMAP_FREE (bbs_to_scale);
return true;
}
gcc_assert (nentry);
if (nentry == 1)
{
- /* Get an edge that is different from the one from loop->latch
- to loop->header. */
- e = EDGE_PRED (loop->header,
- EDGE_PRED (loop->header, 0)->src == loop->latch);
-
- if (!(flags & CP_SIMPLE_PREHEADERS) || single_succ_p (e->src))
+ e = loop_preheader_edge (loop);
+
+ if (/* We do not allow entry block to be the loop preheader, since we
+ cannot emit code there. */
+ e->src != ENTRY_BLOCK_PTR
+ /* If we want simple preheaders, also force the preheader to have
+ just a single successor. */
+ && !((flags & CP_SIMPLE_PREHEADERS)
+ && !single_succ_p (e->src)))
return NULL;
}
return dummy;
}
-/* Create preheaders for each loop from loop tree stored in LOOPS; for meaning
- of FLAGS see create_preheader. */
+/* Create preheaders for each loop; for meaning of FLAGS see create_preheader. */
+
void
-create_preheaders (struct loops *loops, int flags)
+create_preheaders (int flags)
{
- unsigned i;
- for (i = 1; i < loops->num; i++)
- create_preheader (loops->parray[i], flags);
- loops->state |= LOOPS_HAVE_PREHEADERS;
+ loop_iterator li;
+ struct loop *loop;
+
+ FOR_EACH_LOOP (li, loop, 0)
+ create_preheader (loop, flags);
+ current_loops->state |= LOOPS_HAVE_PREHEADERS;
}
-/* Forces all loop latches of loops from loop tree LOOPS to have only single
- successor. */
+/* Forces all loop latches to have only single successor. */
+
void
-force_single_succ_latches (struct loops *loops)
+force_single_succ_latches (void)
{
- unsigned i;
+ loop_iterator li;
struct loop *loop;
edge e;
- for (i = 1; i < loops->num; i++)
+ FOR_EACH_LOOP (li, loop, 0)
{
- loop = loops->parray[i];
if (loop->latch != loop->header && single_succ_p (loop->latch))
continue;
split_edge (e);
}
- loops->state |= LOOPS_HAVE_SIMPLE_LATCHES;
+ current_loops->state |= LOOPS_HAVE_SIMPLE_LATCHES;
}
/* This function is called from loop_version. It splits the entry edge
--- edge e ---> [cond expr] ---> [first_head]
|
+---------> [second_head]
-*/
+
+ THEN_PROB is the probability of then branch of the condition. */
static basic_block
-lv_adjust_loop_entry_edge (basic_block first_head,
- basic_block second_head,
- edge e,
- void *cond_expr)
+lv_adjust_loop_entry_edge (basic_block first_head, basic_block second_head,
+ edge e, void *cond_expr, unsigned then_prob)
{
basic_block new_head = NULL;
edge e1;
insert conditional expr. */
new_head = split_edge (e);
-
lv_add_condition_to_bb (first_head, second_head, new_head,
cond_expr);
/* Don't set EDGE_TRUE_VALUE in RTL mode, as it's invalid there. */
+ e = single_succ_edge (new_head);
e1 = make_edge (new_head, first_head,
current_ir_type () == IR_GIMPLE ? EDGE_TRUE_VALUE : 0);
+ e1->probability = then_prob;
+ e->probability = REG_BR_PROB_BASE - then_prob;
+ e1->count = RDIV (e->count * e1->probability, REG_BR_PROB_BASE);
+ e->count = RDIV (e->count * e->probability, REG_BR_PROB_BASE);
+
set_immediate_dominator (CDI_DOMINATORS, first_head, new_head);
set_immediate_dominator (CDI_DOMINATORS, second_head, new_head);
may be a run time test for things that were not resolved by static
analysis (overlapping ranges (anti-aliasing), alignment, etc.).
+ THEN_PROB is the probability of the then edge of the if. THEN_SCALE
+ is the ratio by that the frequencies in the original loop should
+ be scaled. ELSE_SCALE is the ratio by that the frequencies in the
+ new loop should be scaled.
+
If PLACE_AFTER is true, we place the new loop after LOOP in the
instruction stream, otherwise it is placed before LOOP. */
struct loop *
-loop_version (struct loops *loops, struct loop * loop,
+loop_version (struct loop *loop,
void *cond_expr, basic_block *condition_bb,
+ unsigned then_prob, unsigned then_scale, unsigned else_scale,
bool place_after)
{
basic_block first_head, second_head;
- edge entry, latch_edge, exit, true_edge, false_edge;
+ edge entry, latch_edge, true_edge, false_edge;
int irred_flag;
struct loop *nloop;
basic_block cond_bb;
first_head = entry->dest;
/* Duplicate loop. */
- if (!cfg_hook_duplicate_loop_to_header_edge (loop, entry, loops, 1,
- NULL, NULL, NULL, NULL, 0))
+ if (!cfg_hook_duplicate_loop_to_header_edge (loop, entry, 1,
+ NULL, NULL, NULL, 0))
return NULL;
/* After duplication entry edge now points to new loop head block.
/* Split loop entry edge and insert new block with cond expr. */
cond_bb = lv_adjust_loop_entry_edge (first_head, second_head,
- entry, cond_expr);
+ entry, cond_expr, then_prob);
if (condition_bb)
*condition_bb = cond_bb;
latch_edge = single_succ_edge (get_bb_copy (loop->latch));
extract_cond_bb_edges (cond_bb, &true_edge, &false_edge);
- nloop = loopify (loops,
- latch_edge,
+ nloop = loopify (latch_edge,
single_pred_edge (get_bb_copy (loop->header)),
cond_bb, true_edge, false_edge,
- false /* Do not redirect all edges. */);
-
- exit = single_exit (loop);
- if (exit)
- set_single_exit (nloop, find_edge (get_bb_copy (exit->src), exit->dest));
+ false /* Do not redirect all edges. */,
+ then_scale, else_scale);
/* loopify redirected latch_edge. Update its PENDING_STMTS. */
lv_flush_pending_stmts (latch_edge);
return nloop;
}
-/* The structure of LOOPS might have changed. Some loops might get removed
+/* The structure of loops might have changed. Some loops might get removed
(and their headers and latches were set to NULL), loop exists might get
removed (thus the loop nesting may be wrong), and some blocks and edges
were changed (so the information about bb --> loop mapping does not have
marked in it. */
void
-fix_loop_structure (struct loops *loops, bitmap changed_bbs)
+fix_loop_structure (bitmap changed_bbs)
{
basic_block bb;
struct loop *loop, *ploop;
- unsigned i;
+ loop_iterator li;
/* Remove the old bb -> loop mapping. */
FOR_EACH_BB (bb)
{
bb->aux = (void *) (size_t) bb->loop_father->depth;
- bb->loop_father = loops->tree_root;
+ bb->loop_father = current_loops->tree_root;
}
/* Remove the dead loops from structures. */
- loops->tree_root->num_nodes = n_basic_blocks;
- for (i = 1; i < loops->num; i++)
+ current_loops->tree_root->num_nodes = n_basic_blocks;
+ FOR_EACH_LOOP (li, loop, 0)
{
- loop = loops->parray[i];
- if (!loop)
- continue;
-
loop->num_nodes = 0;
if (loop->header)
continue;
}
/* Remove the loop and free its data. */
- flow_loop_tree_node_remove (loop);
- loops->parray[loop->num] = NULL;
- flow_loop_free (loop);
+ delete_loop (loop);
}
/* Rescan the bodies of loops, starting from the outermost. */
- loop = loops->tree_root;
- while (1)
+ FOR_EACH_LOOP (li, loop, 0)
{
- if (loop->inner)
- loop = loop->inner;
- else
- {
- while (!loop->next
- && loop != loops->tree_root)
- loop = loop->outer;
- if (loop == loops->tree_root)
- break;
-
- loop = loop->next;
- }
-
loop->num_nodes = flow_loop_nodes_find (loop->header, loop);
}
/* Now fix the loop nesting. */
- for (i = 1; i < loops->num; i++)
+ FOR_EACH_LOOP (li, loop, 0)
{
- loop = loops->parray[i];
- if (!loop)
- continue;
-
bb = loop_preheader_edge (loop)->src;
if (bb->loop_father != loop->outer)
{
bb->aux = NULL;
}
- if (loops->state & LOOPS_HAVE_MARKED_SINGLE_EXITS)
- mark_single_exit_loops (loops);
- if (loops->state & LOOPS_HAVE_MARKED_IRREDUCIBLE_REGIONS)
- mark_irreducible_loops (loops);
+ if (current_loops->state & LOOPS_HAVE_MARKED_IRREDUCIBLE_REGIONS)
+ mark_irreducible_loops ();
+
+ if (current_loops->state & LOOPS_HAVE_RECORDED_EXITS)
+ {
+ release_recorded_exits ();
+ record_loop_exits ();
+ }
}
OSDN Git Service
