diff options
| author | Richard Biener <rguenther@suse.de> | 2021-08-20 11:32:00 +0200 |
|---|---|---|
| committer | Richard Biener <rguenther@suse.de> | 2021-08-20 12:37:19 +0200 |
| commit | 37744f8260857005c8409c9e2e633a05c768a7dd (patch) | |
| tree | 0301a71e812d7b304dfe9e76d38c1493ba149eb5 /gcc/tree-vect-data-refs.c | |
| parent | 77167196fe8cf840a69913e7739d39ae0df2b074 (diff) | |
| download | gcc-37744f8260857005c8409c9e2e633a05c768a7dd.zip gcc-37744f8260857005c8409c9e2e633a05c768a7dd.tar.gz gcc-37744f8260857005c8409c9e2e633a05c768a7dd.tar.bz2 | |
Refactor BB splitting of DRs for SLP group analysis
This uses the group_id computed to ensure DRs in different BBs do
not get merged into a DR group. To achieve this we seed the
group from the BB index when group_ids are not computed and we
make sure to bump the group_id when advancing to the next BB for
BB SLP analysis.
This paves the way for relaxing the grouping for BB vectorization
by adjusting its group_id computation.
2021-08-20 Richard Biener <rguenther@suse.de>
* tree-vect-data-refs.c (dr_group_sort_cmp): Do not compare
BBs.
(vect_analyze_data_ref_accesses): Likewise. Assign the BB
index as group_id when dataref_groups were not computed.
* tree-vect-slp.c (vect_slp_bbs): Bump current_group when
we advace to the next BB.
Diffstat (limited to 'gcc/tree-vect-data-refs.c')
| -rw-r--r-- | gcc/tree-vect-data-refs.c | 21 |
1 files changed, 8 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; |