Skip to content

R
riscv-gcc-1
Commit 36968131 by Pete Steinmetz Committed by Maxim Kuvyrkov
Options

sched-rgn.c (compute_dom_prob_ps, [...]): Eradicate use of float in probability computations. 

2006-02-07  Pete Steinmetz  <steinmtz@us.ibm.com>

        * sched-rgn.c (compute_dom_prob_ps, compute_trg_info): Eradicate
	use of float in probability computations.  Use edge probabilities
	in place of statically computed probabilities.
	(min_spec_prob): New static variable.
	(schedule_insns): Initialize it.
	(GET_SRC_PROB): Removed.
	* doc/invoke.texi (min-sched-prob): Renamed to min-spec-prob.

From-SVN: r110690
parent a58b0342
Showing with 42 additions and 45 deletions
gcc/ChangeLog
2006-02-07 Pete Steinmetz <steinmtz@us.ibm.com>
* sched-rgn.c (compute_dom_prob_ps, compute_trg_info): Eradicate
use of float in probability computations. Use edge probabilities
in place of statically computed probabilities.
(min_spec_prob): New static variable.
(schedule_insns): Initialize it.
(GET_SRC_PROB): Removed.
* doc/invoke.texi (min-sched-prob): Renamed to min-spec-prob.
2006-02-07 Alexandre Oliva <aoliva@redhat.com>
PR debug/24444
......
gcc/doc/invoke.texi
......@@ -6176,9 +6176,9 @@ interblock scheduling. The default value is 10.
The maximum number of insns in a region to be considered for
interblock scheduling. The default value is 100.
@item min-sched-prob
The minimum probability of reaching a source block for interblock
speculative scheduling. The default value is 40.
@item min-spec-prob
The minimum probability (in percents) of reaching a source block
for interblock speculative scheduling. The default value is 40.
@item max-last-value-rtl
......
gcc/sched-rgn.c
......@@ -119,6 +119,10 @@ static int *block_to_bb;
/* The number of the region containing a block. */
static int *containing_rgn;
/* The minimum probability of reaching a source block so that it will be
considered for speculative scheduling. */
static int min_spec_prob;
#define RGN_NR_BLOCKS(rgn) (rgn_table[rgn].rgn_nr_blocks)
#define RGN_BLOCKS(rgn) (rgn_table[rgn].rgn_blocks)
#define BLOCK_TO_BB(block) (block_to_bb[block])
......@@ -211,15 +215,9 @@ static sbitmap *dom;
#define IS_DOMINATED(bb_src, bb_trg) \
( TEST_BIT (dom[bb_src], bb_trg) )
/* Probability: Prob[i] is a float in [0, 1] which is the probability
of bb i relative to the region entry. */
static float *prob;
/* The probability of bb_src, relative to bb_trg. Note, that while the
'prob[bb]' is a float in [0, 1], this macro returns an integer
in [0, 100]. */
#define GET_SRC_PROB(bb_src, bb_trg) ((int) (100.0 * (prob[bb_src] / \
prob[bb_trg])))
/* Probability: Prob[i] is an int in [0, REG_BR_PROB_BASE] which is
the probability of bb i relative to the region entry. */
static int *prob;
/* Bit-set of edges, where bit i stands for edge i. */
typedef sbitmap edgeset;
......@@ -898,24 +896,27 @@ find_rgns (void)
static void
compute_dom_prob_ps (int bb)
{
int pred_bb;
int nr_out_edges, nr_rgn_out_edges;
edge_iterator in_ei, out_ei;
edge in_edge, out_edge;
edge_iterator in_ei;
edge in_edge;
prob[bb] = 0.0;
if (IS_RGN_ENTRY (bb))
{
SET_BIT (dom[bb], 0);
prob[bb] = 1.0;
prob[bb] = REG_BR_PROB_BASE;
return;
}
prob[bb] = 0;
/* Initialize dom[bb] to '111..1'. */
sbitmap_ones (dom[bb]);
FOR_EACH_EDGE (in_edge, in_ei, BASIC_BLOCK (BB_TO_BLOCK (bb))->preds)
{
int pred_bb;
edge out_edge;
edge_iterator out_ei;
if (in_edge->src == ENTRY_BLOCK_PTR)
continue;
......@@ -928,30 +929,10 @@ compute_dom_prob_ps (int bb)
sbitmap_a_or_b (pot_split[bb], pot_split[bb], pot_split[pred_bb]);
nr_out_edges = 0;
nr_rgn_out_edges = 0;
FOR_EACH_EDGE (out_edge, out_ei, in_edge->src->succs)
{
++nr_out_edges;
SET_BIT (pot_split[bb], EDGE_TO_BIT (out_edge));
/* The successor doesn't belong in the region? */
if (out_edge->dest != EXIT_BLOCK_PTR
&& CONTAINING_RGN (out_edge->dest->index)
!= CONTAINING_RGN (BB_TO_BLOCK (bb)))
++nr_rgn_out_edges;
SET_BIT (pot_split[bb], EDGE_TO_BIT (out_edge));
}
/* Now nr_rgn_out_edges is the number of region-exit edges from
pred, and nr_out_edges will be the number of pred out edges
not leaving the region. */
nr_out_edges -= nr_rgn_out_edges;
if (nr_rgn_out_edges > 0)
prob[bb] += 0.9 * prob[pred_bb] / nr_out_edges;
else
prob[bb] += prob[pred_bb] / nr_out_edges;
prob[bb] += ((prob[pred_bb] * in_edge->probability) / REG_BR_PROB_BASE);
}
SET_BIT (dom[bb], bb);
......@@ -959,7 +940,7 @@ compute_dom_prob_ps (int bb)
if (sched_verbose >= 2)
fprintf (sched_dump, ";; bb_prob(%d, %d) = %3d\n", bb, BB_TO_BLOCK (bb),
(int) (100.0 * prob[bb]));
(100 * prob[bb]) / REG_BR_PROB_BASE);
}
/* Functions for target info. */
......@@ -997,7 +978,7 @@ compute_trg_info (int trg)
sp = candidate_table + trg;
sp->is_valid = 1;
sp->is_speculative = 0;
sp->src_prob = 100;
sp->src_prob = REG_BR_PROB_BASE;
visited = sbitmap_alloc (last_basic_block);
......@@ -1008,8 +989,11 @@ compute_trg_info (int trg)
sp->is_valid = IS_DOMINATED (i, trg);
if (sp->is_valid)
{
sp->src_prob = GET_SRC_PROB (i, trg);
sp->is_valid = (sp->src_prob >= PARAM_VALUE (PARAM_MIN_SPEC_PROB));
int tf = prob[trg], cf = prob[i];
/* In CFGs with low probability edges TF can possibly be zero. */
sp->src_prob = (tf ? ((cf * REG_BR_PROB_BASE) / tf) : 0);
sp->is_valid = (sp->src_prob >= min_spec_prob);
}
if (sp->is_valid)
......@@ -2308,7 +2292,7 @@ schedule_region (int rgn)
/* Compute interblock info: probabilities, split-edges, dominators, etc. */
if (current_nr_blocks > 1)
{
prob = XNEWVEC (float, current_nr_blocks);
prob = XNEWVEC (int, current_nr_blocks);
dom = sbitmap_vector_alloc (current_nr_blocks, current_nr_blocks);
sbitmap_vector_zero (dom, current_nr_blocks);
......@@ -2530,6 +2514,9 @@ schedule_insns (void)
nr_spec = 0;
sched_init ();
min_spec_prob = ((PARAM_VALUE (PARAM_MIN_SPEC_PROB) * REG_BR_PROB_BASE)
/ 100);
init_regions ();
current_sched_info = &region_sched_info;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment