diff options
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/tree-vect-data-refs.c | 21 | ||||
| -rw-r--r-- | gcc/tree-vect-slp.c | 2 |
2 files changed, 10 insertions, 13 deletions
diff --git a/gcc/tree-vect-data-refs.c b/gcc/tree-vect-data-refs.c index b7dde07..37f46d1 100644 --- a/gcc/tree-vect-data-refs.c +++ b/gcc/tree-vect-data-refs.c @@ -2831,12 +2831,6 @@ dr_group_sort_cmp (const void *dra_, const void *drb_) if (dra == drb) return 0; - /* DRs in different basic-blocks never belong to the same group. */ - int bb_index1 = gimple_bb (DR_STMT (dra))->index; - int bb_index2 = gimple_bb (DR_STMT (drb))->index; - if (bb_index1 != bb_index2) - return bb_index1 < bb_index2 ? -1 : 1; - /* Different group IDs lead never belong to the same group. */ if (dra_pair.second != drb_pair.second) return dra_pair.second < drb_pair.second ? -1 : 1; @@ -2963,7 +2957,13 @@ vect_analyze_data_ref_accesses (vec_info *vinfo, datarefs_copy.create (datarefs.length ()); for (unsigned i = 0; i < datarefs.length (); i++) { - int group_id = dataref_groups ? (*dataref_groups)[i] : 0; + int group_id; + /* If the caller computed DR grouping use that, otherwise group by + basic blocks. */ + if (dataref_groups) + group_id = (*dataref_groups)[i]; + else + group_id = gimple_bb (DR_STMT (datarefs[i]))->index; datarefs_copy.quick_push (data_ref_pair (datarefs[i], group_id)); } datarefs_copy.qsort (dr_group_sort_cmp); @@ -2999,13 +2999,8 @@ vect_analyze_data_ref_accesses (vec_info *vinfo, matters we can push those to a worklist and re-iterate over them. The we can just skip ahead to the next DR here. */ - /* DRs in a different BBs should not be put into the same + /* DRs in a different DR group should not be put into the same interleaving group. */ - int bb_index1 = gimple_bb (DR_STMT (dra))->index; - int bb_index2 = gimple_bb (DR_STMT (drb))->index; - if (bb_index1 != bb_index2) - break; - if (dra_group_id != drb_group_id) break; diff --git a/gcc/tree-vect-slp.c b/gcc/tree-vect-slp.c index 4dcc70c..d2f6a16 100644 --- a/gcc/tree-vect-slp.c +++ b/gcc/tree-vect-slp.c @@ -5985,6 +5985,8 @@ vect_slp_bbs (const vec<basic_block> &bbs) &dataref_groups, current_group)) ++current_group; } + /* New BBs always start a new DR group. */ + ++current_group; } return vect_slp_region (bbs, datarefs, &dataref_groups, insns); |