gcc.dg/guality/pr45003-*.c have regressed with reordering of the
exploration of the loc expansion space, in a way that didn't always
privilege expansions without ENTRY_VALUEs over ones with it.
This patch fixes it, by ensuring that we'll only ever use ENTRY_VALUEs
if we can't help it given a maximum expression depth (complexity,
actually), and, if we can't help it, we'll go for an option that uses
the fewest ENTRY_VALUEs.
Regstrap time is about the same, as expected, assuming the 2% lower
regstrap time is not statistically significant.
Regstrapped on trunk on x86_64-linux-gnu and i686-linux-gnu. It
restored pr45003-[23].c to XPASS, without any regressions. pr45003-1.c
is unchanged by this patch by itself, but in combination with another
patch I'm posting soon that caused it to regress, this patch also avoids
the regression.
Ok to install?
for gcc/ChangeLog
from Alexandre Oliva aol...@redhat.com
PR debug/51570
* var-tracking.c (expand_depth): New type.
(onepart_aux, expand_loc_callback_data): Change depth type to it.
(loc_exp_dep_alloc): Adjust initializer.
(update_depth): Use new type. Add entryvals.
(vt_expand_var_loc_chain): Take note of expansions with
ENTRY_VALUEs, but don't accept them right away. Run an optional
second pass accepting the minimum ENTRY_VALUE count found in the
first pass.
(vt_expand_loc_callback, INIT_ELCD): Adjust.
Index: gcc/var-tracking.c
===
--- gcc/var-tracking.c.orig 2012-04-08 01:43:59.466998531 -0300
+++ gcc/var-tracking.c 2012-04-08 01:50:25.657377155 -0300
@@ -320,6 +320,19 @@ typedef struct loc_exp_dep_s
DEF_VEC_O (loc_exp_dep);
+/* This data structure holds information about the depth of a variable
+ expansion. */
+typedef struct expand_depth_struct
+{
+ /* This measures the complexity of the expanded expression. It
+ grows by one for each level of expansion that adds more than one
+ operand. */
+ int complexity;
+ /* This counts the number of ENTRY_VALUE expressions in an
+ expansion. We want to minimize their use. */
+ int entryvals;
+} expand_depth;
+
/* This data structure is allocated for one-part variables at the time
of emitting notes. */
struct onepart_aux
@@ -338,7 +351,7 @@ struct onepart_aux
a change notification from any of its active dependencies. */
rtx from;
/* The depth of the cur_loc expression. */
- int depth;
+ expand_depth depth;
/* Dependencies actively used when expand FROM into cur_loc. */
VEC (loc_exp_dep, none) deps;
};
@@ -7491,7 +7504,7 @@ struct expand_loc_callback_data
/* The maximum depth among the sub-expressions under expansion.
Zero indicates no expansion so far. */
- int depth;
+ expand_depth depth;
};
/* Allocate the one-part auxiliary data structure for VAR, with enough
@@ -7536,7 +7549,8 @@ loc_exp_dep_alloc (variable var, int cou
VAR_LOC_1PAUX (var) = XNEWVAR (struct onepart_aux, allocsize);
*VAR_LOC_DEP_LSTP (var) = NULL;
VAR_LOC_FROM (var) = NULL;
- VAR_LOC_DEPTH (var) = 0;
+ VAR_LOC_DEPTH (var).complexity = 0;
+ VAR_LOC_DEPTH (var).entryvals = 0;
}
VEC_embedded_init (loc_exp_dep, VAR_LOC_DEP_VEC (var), count);
}
@@ -7691,21 +7705,26 @@ static rtx vt_expand_loc_callback (rtx x
/* Return the combined depth, when one sub-expression evaluated to
BEST_DEPTH and the previous known depth was SAVED_DEPTH. */
-static inline int
-update_depth (int saved_depth, int best_depth)
+static inline expand_depth
+update_depth (expand_depth saved_depth, expand_depth best_depth)
{
/* If we didn't find anything, stick with what we had. */
- if (!best_depth)
+ if (!best_depth.complexity)
return saved_depth;
/* If we found hadn't found anything, use the depth of the current
expression. Do NOT add one extra level, we want to compute the
maximum depth among sub-expressions. We'll increment it later,
if appropriate. */
- if (!saved_depth)
+ if (!saved_depth.complexity)
return best_depth;
- if (saved_depth best_depth)
+ /* Combine the entryval count so that regardless of which one we
+ return, the entryval count is accurate. */
+ best_depth.entryvals = saved_depth.entryvals
+= best_depth.entryvals + saved_depth.entryvals;
+
+ if (saved_depth.complexity best_depth.complexity)
return best_depth;
else
return saved_depth;
@@ -7727,12 +7746,14 @@ vt_expand_var_loc_chain (variable var, b
bool pending_recursion;
rtx loc_from = NULL;
struct elt_loc_list *cloc = NULL;
- int depth = 0, saved_depth = elcd-depth;
+ expand_depth depth = { 0, 0 }, saved_depth = elcd-depth;
+ int wanted_entryvals, found_entryvals = 0;
/* Clear all backlinks pointing at this, so that we're not notified
while we're active. */
loc_exp_dep_clear (var);
+ retry:
if (var-onepart == ONEPART_VALUE)
{
cselib_val *val = CSELIB_VAL_PTR (dv_as_value (var-dv));
@@ -7745,13
