Skip to content

R
riscv-gcc-1
Commit 84568e14 by Jan Hubicka Committed by Jan Hubicka
Options

sched-deps.c (trye_dependency_cache, [...]): Trun to vectors of bitmaps 

	* sched-deps.c (trye_dependency_cache, anti_dependency_cache,
	outptu_dependency_cache, forward_dependency_cahe): Trun to vectors of
	bitmaps
	(cache_size): New variable
	(add_dependence): Update use; canonize early memory locations
	(sched_analyze_1): Likewise.
	(sched_analyze_2): Likewise.
	(init_dependency_caches): Initialize bitmaps.
	(free_dependency_caches): Free bitmaps

From-SVN: r75888
parent 3a179764
Showing with 72 additions and 37 deletions
gcc/ChangeLog
2004-01-14 Jan Hubicka <jh@suse.cz>
PR c++/10776
* sched-deps.c (trye_dependency_cache, anti_dependency_cache,
outptu_dependency_cache, forward_dependency_cahe): Trun to vectors of
bitmaps
(cache_size): New variable
(add_dependence): Update use; canonize early memory locations
(sched_analyze_1): Likewise.
(sched_analyze_2): Likewise.
(init_dependency_caches): Initialize bitmaps.
(free_dependency_caches): Free bitmaps
2004-01-14 Kazu Hirata <kazu@cs.umass.edu> 2004-01-14 Kazu Hirata <kazu@cs.umass.edu>
* calls.c: Replace STRICT_ARGUMENT_NAMING in comments with * calls.c: Replace STRICT_ARGUMENT_NAMING in comments with
......
gcc/sched-deps.c
...@@ -80,16 +80,17 @@ static enum reg_pending_barrier_mode reg_pending_barrier; ...@@ -80,16 +80,17 @@ static enum reg_pending_barrier_mode reg_pending_barrier;
has enough entries to represent a dependency on any other insn in has enough entries to represent a dependency on any other insn in
the insn chain. All bitmap for true dependencies cache is the insn chain. All bitmap for true dependencies cache is
allocated then the rest two ones are also allocated. */ allocated then the rest two ones are also allocated. */
static sbitmap *true_dependency_cache; static bitmap_head *true_dependency_cache;
static sbitmap *anti_dependency_cache; static bitmap_head *anti_dependency_cache;
static sbitmap *output_dependency_cache; static bitmap_head *output_dependency_cache;
int cache_size;
/* To speed up checking consistency of formed forward insn /* To speed up checking consistency of formed forward insn
dependencies we use the following cache. Another possible solution dependencies we use the following cache. Another possible solution
could be switching off checking duplication of insns in forward could be switching off checking duplication of insns in forward
dependencies. */ dependencies. */
#ifdef ENABLE_CHECKING #ifdef ENABLE_CHECKING
static sbitmap *forward_dependency_cache; static bitmap_head *forward_dependency_cache;
#endif #endif
static int deps_may_trap_p (rtx); static int deps_may_trap_p (rtx);
...@@ -244,13 +245,14 @@ add_dependence (rtx insn, rtx elem, enum reg_note dep_type) ...@@ -244,13 +245,14 @@ add_dependence (rtx insn, rtx elem, enum reg_note dep_type)
if (anti_dependency_cache == NULL || output_dependency_cache == NULL) if (anti_dependency_cache == NULL || output_dependency_cache == NULL)
abort (); abort ();
if (TEST_BIT (true_dependency_cache[INSN_LUID (insn)], INSN_LUID (elem))) if (bitmap_bit_p (&true_dependency_cache[INSN_LUID (insn)],
INSN_LUID (elem)))
/* Do nothing (present_set_type is already 0). */ /* Do nothing (present_set_type is already 0). */
; ;
else if (TEST_BIT (anti_dependency_cache[INSN_LUID (insn)], else if (bitmap_bit_p (&anti_dependency_cache[INSN_LUID (insn)],
INSN_LUID (elem))) INSN_LUID (elem)))
present_dep_type = REG_DEP_ANTI; present_dep_type = REG_DEP_ANTI;
else if (TEST_BIT (output_dependency_cache[INSN_LUID (insn)], else if (bitmap_bit_p (&output_dependency_cache[INSN_LUID (insn)],
INSN_LUID (elem))) INSN_LUID (elem)))
present_dep_type = REG_DEP_OUTPUT; present_dep_type = REG_DEP_OUTPUT;
else else
...@@ -271,12 +273,12 @@ add_dependence (rtx insn, rtx elem, enum reg_note dep_type) ...@@ -271,12 +273,12 @@ add_dependence (rtx insn, rtx elem, enum reg_note dep_type)
if (true_dependency_cache != NULL) if (true_dependency_cache != NULL)
{ {
if (REG_NOTE_KIND (link) == REG_DEP_ANTI) if (REG_NOTE_KIND (link) == REG_DEP_ANTI)
RESET_BIT (anti_dependency_cache[INSN_LUID (insn)], bitmap_clear_bit (&anti_dependency_cache[INSN_LUID (insn)],
INSN_LUID (elem)); INSN_LUID (elem));
else if (REG_NOTE_KIND (link) == REG_DEP_OUTPUT else if (REG_NOTE_KIND (link) == REG_DEP_OUTPUT
&& output_dependency_cache) && output_dependency_cache)
RESET_BIT (output_dependency_cache[INSN_LUID (insn)], bitmap_clear_bit (&output_dependency_cache[INSN_LUID (insn)],
INSN_LUID (elem)); INSN_LUID (elem));
else else
abort (); abort ();
} }
...@@ -293,14 +295,14 @@ add_dependence (rtx insn, rtx elem, enum reg_note dep_type) ...@@ -293,14 +295,14 @@ add_dependence (rtx insn, rtx elem, enum reg_note dep_type)
if (true_dependency_cache != NULL) if (true_dependency_cache != NULL)
{ {
if ((int) REG_NOTE_KIND (link) == 0) if ((int) REG_NOTE_KIND (link) == 0)
SET_BIT (true_dependency_cache[INSN_LUID (insn)], bitmap_set_bit (&true_dependency_cache[INSN_LUID (insn)],
INSN_LUID (elem)); INSN_LUID (elem));
else if (REG_NOTE_KIND (link) == REG_DEP_ANTI) else if (REG_NOTE_KIND (link) == REG_DEP_ANTI)
SET_BIT (anti_dependency_cache[INSN_LUID (insn)], bitmap_set_bit (&anti_dependency_cache[INSN_LUID (insn)],
INSN_LUID (elem)); INSN_LUID (elem));
else if (REG_NOTE_KIND (link) == REG_DEP_OUTPUT) else if (REG_NOTE_KIND (link) == REG_DEP_OUTPUT)
SET_BIT (output_dependency_cache[INSN_LUID (insn)], bitmap_set_bit (&output_dependency_cache[INSN_LUID (insn)],
INSN_LUID (elem)); INSN_LUID (elem));
} }
#endif #endif
return 0; return 0;
...@@ -319,11 +321,11 @@ add_dependence (rtx insn, rtx elem, enum reg_note dep_type) ...@@ -319,11 +321,11 @@ add_dependence (rtx insn, rtx elem, enum reg_note dep_type)
if (true_dependency_cache != NULL) if (true_dependency_cache != NULL)
{ {
if ((int) dep_type == 0) if ((int) dep_type == 0)
SET_BIT (true_dependency_cache[INSN_LUID (insn)], INSN_LUID (elem)); bitmap_set_bit (&true_dependency_cache[INSN_LUID (insn)], INSN_LUID (elem));
else if (dep_type == REG_DEP_ANTI) else if (dep_type == REG_DEP_ANTI)
SET_BIT (anti_dependency_cache[INSN_LUID (insn)], INSN_LUID (elem)); bitmap_set_bit (&anti_dependency_cache[INSN_LUID (insn)], INSN_LUID (elem));
else if (dep_type == REG_DEP_OUTPUT) else if (dep_type == REG_DEP_OUTPUT)
SET_BIT (output_dependency_cache[INSN_LUID (insn)], INSN_LUID (elem)); bitmap_set_bit (&output_dependency_cache[INSN_LUID (insn)], INSN_LUID (elem));
} }
#endif #endif
return 1; return 1;
...@@ -395,7 +397,7 @@ add_insn_mem_dependence (struct deps *deps, rtx *insn_list, rtx *mem_list, ...@@ -395,7 +397,7 @@ add_insn_mem_dependence (struct deps *deps, rtx *insn_list, rtx *mem_list,
mem = shallow_copy_rtx (mem); mem = shallow_copy_rtx (mem);
XEXP (mem, 0) = cselib_subst_to_values (XEXP (mem, 0)); XEXP (mem, 0) = cselib_subst_to_values (XEXP (mem, 0));
} }
link = alloc_EXPR_LIST (VOIDmode, mem, *mem_list); link = alloc_EXPR_LIST (VOIDmode, canon_rtx (mem), *mem_list);
*mem_list = link; *mem_list = link;
deps->pending_lists_length++; deps->pending_lists_length++;
...@@ -543,6 +545,7 @@ sched_analyze_1 (struct deps *deps, rtx x, rtx insn) ...@@ -543,6 +545,7 @@ sched_analyze_1 (struct deps *deps, rtx x, rtx insn)
cselib_lookup (XEXP (t, 0), Pmode, 1); cselib_lookup (XEXP (t, 0), Pmode, 1);
XEXP (t, 0) = cselib_subst_to_values (XEXP (t, 0)); XEXP (t, 0) = cselib_subst_to_values (XEXP (t, 0));
} }
XEXP (t, 0) = canon_rtx (XEXP (t, 0));
if (deps->pending_lists_length > MAX_PENDING_LIST_LENGTH) if (deps->pending_lists_length > MAX_PENDING_LIST_LENGTH)
{ {
...@@ -684,6 +687,7 @@ sched_analyze_2 (struct deps *deps, rtx x, rtx insn) ...@@ -684,6 +687,7 @@ sched_analyze_2 (struct deps *deps, rtx x, rtx insn)
cselib_lookup (XEXP (t, 0), Pmode, 1); cselib_lookup (XEXP (t, 0), Pmode, 1);
XEXP (t, 0) = cselib_subst_to_values (XEXP (t, 0)); XEXP (t, 0) = cselib_subst_to_values (XEXP (t, 0));
} }
XEXP (t, 0) = canon_rtx (XEXP (t, 0));
pending = deps->pending_read_insns; pending = deps->pending_read_insns;
pending_mem = deps->pending_read_mems; pending_mem = deps->pending_read_mems;
while (pending) while (pending)
...@@ -1345,14 +1349,14 @@ add_forward_dependence (rtx from, rtx to, enum reg_note dep_type) ...@@ -1345,14 +1349,14 @@ add_forward_dependence (rtx from, rtx to, enum reg_note dep_type)
if (GET_CODE (from) == NOTE if (GET_CODE (from) == NOTE
|| INSN_DELETED_P (from) || INSN_DELETED_P (from)
|| (forward_dependency_cache != NULL || (forward_dependency_cache != NULL
&& TEST_BIT (forward_dependency_cache[INSN_LUID (from)], && bitmap_bit_p (&forward_dependency_cache[INSN_LUID (from)],
INSN_LUID (to))) INSN_LUID (to)))
|| (forward_dependency_cache == NULL || (forward_dependency_cache == NULL
&& find_insn_list (to, INSN_DEPEND (from)))) && find_insn_list (to, INSN_DEPEND (from))))
abort (); abort ();
if (forward_dependency_cache != NULL) if (forward_dependency_cache != NULL)
SET_BIT (forward_dependency_cache[INSN_LUID (from)], bitmap_bit_p (&forward_dependency_cache[INSN_LUID (from)],
INSN_LUID (to)); INSN_LUID (to));
#endif #endif
new_link = alloc_INSN_LIST (to, INSN_DEPEND (from)); new_link = alloc_INSN_LIST (to, INSN_DEPEND (from));
...@@ -1457,16 +1461,23 @@ init_dependency_caches (int luid) ...@@ -1457,16 +1461,23 @@ init_dependency_caches (int luid)
what we consider "very high". */ what we consider "very high". */
if (luid / n_basic_blocks > 100 * 5) if (luid / n_basic_blocks > 100 * 5)
{ {
true_dependency_cache = sbitmap_vector_alloc (luid, luid); int i;
sbitmap_vector_zero (true_dependency_cache, luid); true_dependency_cache = xmalloc (luid * sizeof (bitmap_head));
anti_dependency_cache = sbitmap_vector_alloc (luid, luid); anti_dependency_cache = xmalloc (luid * sizeof (bitmap_head));
sbitmap_vector_zero (anti_dependency_cache, luid); output_dependency_cache = xmalloc (luid * sizeof (bitmap_head));
output_dependency_cache = sbitmap_vector_alloc (luid, luid); #ifdef ENABLE_CHECKING
sbitmap_vector_zero (output_dependency_cache, luid); forward_dependency_cache = xmalloc (luid * sizeof (bitmap_head));
#endif
for (i = 0; i < luid; i++)
{
bitmap_initialize (&true_dependency_cache[i], 0);
bitmap_initialize (&anti_dependency_cache[i], 0);
bitmap_initialize (&output_dependency_cache[i], 0);
#ifdef ENABLE_CHECKING #ifdef ENABLE_CHECKING
forward_dependency_cache = sbitmap_vector_alloc (luid, luid); bitmap_initialize (&forward_dependency_cache[i], 0);
sbitmap_vector_zero (forward_dependency_cache, luid);
#endif #endif
}
cache_size = luid;
} }
} }
...@@ -1477,14 +1488,25 @@ free_dependency_caches (void) ...@@ -1477,14 +1488,25 @@ free_dependency_caches (void)
{ {
if (true_dependency_cache) if (true_dependency_cache)
{ {
sbitmap_vector_free (true_dependency_cache); int i;
for (i = 0; i < cache_size; i++)
{
bitmap_clear (&true_dependency_cache[i]);
bitmap_clear (&anti_dependency_cache[i]);
bitmap_clear (&output_dependency_cache[i]);
#ifdef ENABLE_CHECKING
bitmap_clear (&forward_dependency_cache[i]);
#endif
}
free (true_dependency_cache);
true_dependency_cache = NULL; true_dependency_cache = NULL;
sbitmap_vector_free (anti_dependency_cache); free (anti_dependency_cache);
anti_dependency_cache = NULL; anti_dependency_cache = NULL;
sbitmap_vector_free (output_dependency_cache); free (output_dependency_cache);
output_dependency_cache = NULL; output_dependency_cache = NULL;
#ifdef ENABLE_CHECKING #ifdef ENABLE_CHECKING
sbitmap_vector_free (forward_dependency_cache); free (forward_dependency_cache);
forward_dependency_cache = NULL; forward_dependency_cache = NULL;
#endif #endif
} }
......
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