The following removes odd restrictions from data-ref handling, resulting
in 15% more optimized loop nests in SPEC CPU 2006. We're now also
running into existing PRs when building 481.wrf, I'll have a second
look into the respective PRs as a followup.
Bootstrapped and tested on x86_64-unknown-linux-gnu, applied to trunk.
Richard.
2017-09-18 Richard Biener <rguent...@suse.de>
* graphite-scop-detection.c (scop_detection::stmt_has_simple_data_ref):
Simplify.
(build_alias_set): Reject aliases with no access function.
Index: gcc/graphite-scop-detection.c
===================================================================
--- gcc/graphite-scop-detection.c (revision 252905)
+++ gcc/graphite-scop-detection.c (working copy)
@@ -1338,40 +1338,23 @@ scop_detection::stmt_has_simple_data_ref
{
loop_p nest = outermost_loop_in_sese (scop, gimple_bb (stmt));
loop_p loop = loop_containing_stmt (stmt);
- vec<data_reference_p> drs = vNULL;
+ if (!loop_in_sese_p (loop, scop))
+ loop = nest;
- graphite_find_data_references_in_stmt (nest, loop, stmt, &drs);
+ auto_vec<data_reference_p> drs;
+ if (! graphite_find_data_references_in_stmt (nest, loop, stmt, &drs))
+ return false;
int j;
data_reference_p dr;
FOR_EACH_VEC_ELT (drs, j, dr)
{
- int nb_subscripts = DR_NUM_DIMENSIONS (dr);
-
- if (nb_subscripts < 1)
- {
- free_data_refs (drs);
+ for (unsigned i = 0; i < DR_NUM_DIMENSIONS (dr); ++i)
+ if (! graphite_can_represent_scev (DR_ACCESS_FN (dr, i)))
return false;
- }
-
- tree ref = DR_REF (dr);
-
- for (int i = nb_subscripts - 1; i >= 0; i--)
- {
- if (!graphite_can_represent_scev (DR_ACCESS_FN (dr, i))
- || (TREE_CODE (ref) != ARRAY_REF && TREE_CODE (ref) != MEM_REF
- && TREE_CODE (ref) != COMPONENT_REF))
- {
- free_data_refs (drs);
- return false;
- }
-
- ref = TREE_OPERAND (ref, 0);
- }
}
- free_data_refs (drs);
- return true;
+ return true;
}
/* GIMPLE_ASM and GIMPLE_CALL may embed arbitrary side effects.
@@ -1875,7 +1858,8 @@ build_alias_set (scop_p scop)
{
/* Dependences in the same alias set need to be handled
by just looking at DR_ACCESS_FNs. */
- if (DR_NUM_DIMENSIONS (dr1->dr) != DR_NUM_DIMENSIONS (dr2->dr)
+ if (DR_NUM_DIMENSIONS (dr1->dr) == 0
+ || DR_NUM_DIMENSIONS (dr1->dr) != DR_NUM_DIMENSIONS (dr2->dr)
|| ! operand_equal_p (DR_BASE_OBJECT (dr1->dr),
DR_BASE_OBJECT (dr2->dr),
OEP_ADDRESS_OF)
