OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

re PR debug/41371 (var-tracking is slow and memory hungry) 

* var-tracking.c (dataflow_set_merge): Swap src and src2.
Reverted:
2010-01-13  Jakub Jelinek  <jakub@redhat.com>
PR debug/41371
* var-tracking.c (values_to_unmark): New variable.
(find_loc_in_1pdv): Clear VALUE_RECURSED_INTO of values in
values_to_unmark vector.  Moved body to...
(find_loc_in_1pdv_1): ... this.  Don't clear VALUE_RECURSED_INTO,
instead queue it into values_to_unmark vector.
(vt_find_locations): Free values_to_unmark vector.

From-SVN: r157257
This commit is contained in:
Alexandre Oliva 2010-03-06 20:26:15 +00:00 committed by Alexandre Oliva
parent da61ffc84c
commit 60d7a09b06
2 changed files with 38 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
gcc/ChangeLog
View File

@ -1,3 +1,16 @@
2010-03-06 Alexandre Oliva <aoliva@redhat.com>
* var-tracking.c (dataflow_set_merge): Swap src and src2.
Reverted:
2010-01-13 Jakub Jelinek <jakub@redhat.com>
PR debug/41371
* var-tracking.c (values_to_unmark): New variable.
(find_loc_in_1pdv): Clear VALUE_RECURSED_INTO of values in
values_to_unmark vector. Moved body to...
(find_loc_in_1pdv_1): ... this. Don't clear VALUE_RECURSED_INTO,
instead queue it into values_to_unmark vector.
(vt_find_locations): Free values_to_unmark vector.
2010-03-05 Eric Botcazou <ebotcazou@adacore.com> 2010-03-05 Eric Botcazou <ebotcazou@adacore.com>
* Makefile.in (PLUGINCC, PLUGINCFLAGS): New variables. * Makefile.in (PLUGINCC, PLUGINCFLAGS): New variables.

71
gcc/var-tracking.c
View File

@ -2251,18 +2251,12 @@ dv_changed_p (decl_or_value dv)
: DECL_CHANGED (dv_as_decl (dv))); : DECL_CHANGED (dv_as_decl (dv)));
} }
/* Vector of VALUEs that should have VALUE_RECURSED_INTO bit cleared /* Return a location list node whose loc is rtx_equal to LOC, in the
at the end of find_loc_in_1pdv. Not a static variable in find_loc_in_1pdv
to avoid constant allocation/freeing of it. */
static VEC(rtx, heap) *values_to_unmark;
/* Helper function for find_loc_in_1pdv.
Return a location list node whose loc is rtx_equal to LOC, in the
location list of a one-part variable or value VAR, or in that of location list of a one-part variable or value VAR, or in that of
any values recursively mentioned in the location lists. */ any values recursively mentioned in the location lists. */
static location_chain static location_chain
find_loc_in_1pdv_1 (rtx loc, variable var, htab_t vars) find_loc_in_1pdv (rtx loc, variable var, htab_t vars)
{ {
location_chain node; location_chain node;
@ -2290,33 +2284,18 @@ find_loc_in_1pdv_1 (rtx loc, variable var, htab_t vars)
{ {
location_chain where; location_chain where;
VALUE_RECURSED_INTO (node->loc) = true; VALUE_RECURSED_INTO (node->loc) = true;
VEC_safe_push (rtx, heap, values_to_unmark, node->loc); if ((where = find_loc_in_1pdv (loc, var, vars)))
if ((where = find_loc_in_1pdv_1 (loc, var, vars))) {
return where; VALUE_RECURSED_INTO (node->loc) = false;
return where;
}
VALUE_RECURSED_INTO (node->loc) = false;
} }
} }
return NULL; return NULL;
} }
/* Return a location list node whose loc is rtx_equal to LOC, in the
location list of a one-part variable or value VAR, or in that of
any values recursively mentioned in the location lists. */
static location_chain
find_loc_in_1pdv (rtx loc, variable var, htab_t vars)
{
location_chain ret;
unsigned int i;
rtx value;
ret = find_loc_in_1pdv_1 (loc, var, vars);
for (i = 0; VEC_iterate (rtx, values_to_unmark, i, value); i++)
VALUE_RECURSED_INTO (value) = false;
VEC_truncate (rtx, values_to_unmark, 0);
return ret;
}
/* Hash table iteration argument passed to variable_merge. */ /* Hash table iteration argument passed to variable_merge. */
struct dfset_merge struct dfset_merge
{ {
@ -3278,10 +3257,10 @@ variable_merge_over_cur (void **s1slot, void *data)
return 1; return 1;
} }
/* Combine variable in *S1SLOT (in DSM->src) with the corresponding /* Copy s2slot (in DSM->src) to DSM->dst if the variable is a
entry in DSM->src. Only multi-part variables are combined, using multi-part variable. Unions of multi-part variables and
variable_union. onepart dvs were already combined with intersections of one-part ones will be handled in
intersection in variable_merge_over_cur(). */ variable_merge_over_cur(). */
static int static int
variable_merge_over_src (void **s2slot, void *data) variable_merge_over_src (void **s2slot, void *data)
@ -3304,34 +3283,35 @@ variable_merge_over_src (void **s2slot, void *data)
return 1; return 1;
} }
/* Combine dataflow set information from SRC into DST, using PDST /* Combine dataflow set information from SRC2 into DST, using PDST
to carry over information across passes. */ to carry over information across passes. */
static void static void
dataflow_set_merge (dataflow_set *dst, dataflow_set *src) dataflow_set_merge (dataflow_set *dst, dataflow_set *src2)
{ {
dataflow_set src2 = *dst; dataflow_set cur = *dst;
dataflow_set *src1 = &cur;
struct dfset_merge dsm; struct dfset_merge dsm;
int i; int i;
size_t src_elems, dst_elems; size_t src1_elems, src2_elems;
src_elems = htab_elements (shared_hash_htab (src->vars)); src1_elems = htab_elements (shared_hash_htab (src1->vars));
dst_elems = htab_elements (shared_hash_htab (src2.vars)); src2_elems = htab_elements (shared_hash_htab (src2->vars));
dataflow_set_init (dst); dataflow_set_init (dst);
dst->stack_adjust = src2.stack_adjust; dst->stack_adjust = cur.stack_adjust;
shared_hash_destroy (dst->vars); shared_hash_destroy (dst->vars);
dst->vars = (shared_hash) pool_alloc (shared_hash_pool); dst->vars = (shared_hash) pool_alloc (shared_hash_pool);
dst->vars->refcount = 1; dst->vars->refcount = 1;
dst->vars->htab dst->vars->htab
= htab_create (MAX (src_elems, dst_elems), variable_htab_hash, = htab_create (MAX (src1_elems, src2_elems), variable_htab_hash,
variable_htab_eq, variable_htab_free); variable_htab_eq, variable_htab_free);
for (i = 0; i < FIRST_PSEUDO_REGISTER; i++) for (i = 0; i < FIRST_PSEUDO_REGISTER; i++)
attrs_list_mpdv_union (&dst->regs[i], src->regs[i], src2.regs[i]); attrs_list_mpdv_union (&dst->regs[i], src1->regs[i], src2->regs[i]);
dsm.dst = dst; dsm.dst = dst;
dsm.src = &src2; dsm.src = src2;
dsm.cur = src; dsm.cur = src1;
dsm.src_onepart_cnt = 0; dsm.src_onepart_cnt = 0;
htab_traverse (shared_hash_htab (dsm.src->vars), variable_merge_over_src, htab_traverse (shared_hash_htab (dsm.src->vars), variable_merge_over_src,
@ -3342,7 +3322,7 @@ dataflow_set_merge (dataflow_set *dst, dataflow_set *src)
if (dsm.src_onepart_cnt) if (dsm.src_onepart_cnt)
dst_can_be_shared = false; dst_can_be_shared = false;
dataflow_set_destroy (&src2); dataflow_set_destroy (src1);
} }
/* Mark register equivalences. */ /* Mark register equivalences. */
@ -5853,7 +5833,6 @@ vt_find_locations (void)
FOR_EACH_BB (bb) FOR_EACH_BB (bb)
gcc_assert (VTI (bb)->flooded); gcc_assert (VTI (bb)->flooded);
VEC_free (rtx, heap, values_to_unmark);
free (bb_order); free (bb_order);
fibheap_delete (worklist); fibheap_delete (worklist);
fibheap_delete (pending); fibheap_delete (pending);