[gcc(refs/users/marxin/heads/slp-entire-bb)] Version 2.
Martin Liska
marxin@gcc.gnu.org
Wed Jul 29 07:02:00 GMT 2020
https://gcc.gnu.org/g:41cf731efb6b76227928b287c568402330806267
commit 41cf731efb6b76227928b287c568402330806267
Author: Martin Liska <mliska@suse.cz>
Date: Tue Jul 28 12:18:46 2020 +0200
Version 2.
Diff:
---
gcc/testsuite/gcc.dg/vect/bb-slp-38.c | 2 +-
gcc/tree-data-ref.h | 4 ++
gcc/tree-vect-data-refs.c | 23 +++++++----
gcc/tree-vect-loop.c | 3 +-
gcc/tree-vect-slp.c | 73 ++++++++++++-----------------------
gcc/tree-vectorizer.h | 3 +-
6 files changed, 48 insertions(+), 60 deletions(-)
diff --git a/gcc/testsuite/gcc.dg/vect/bb-slp-38.c b/gcc/testsuite/gcc.dg/vect/bb-slp-38.c
index 59aec54fffd..9c57ea3c2c1 100644
--- a/gcc/testsuite/gcc.dg/vect/bb-slp-38.c
+++ b/gcc/testsuite/gcc.dg/vect/bb-slp-38.c
@@ -41,4 +41,4 @@ int main()
}
/* { dg-final { scan-tree-dump "basic block vectorized" "slp2" { target vect_perm } } } */
-/* { dg-final { scan-tree-dump-times "basic block part vectorized" 2 "slp2" { target vect_perm } } } */
+/* { dg-final { scan-tree-dump "basic block part vectorized" "slp2" { target vect_perm } } } */
diff --git a/gcc/tree-data-ref.h b/gcc/tree-data-ref.h
index 771d20fbbc3..ee785009002 100644
--- a/gcc/tree-data-ref.h
+++ b/gcc/tree-data-ref.h
@@ -174,6 +174,9 @@ struct data_reference
/* Alias information for the data reference. */
struct dr_alias alias;
+
+ /* Group ID that can be vectorized together. */
+ int group_id;
};
#define DR_STMT(DR) (DR)->stmt
@@ -196,6 +199,7 @@ struct data_reference
#define DR_OFFSET_ALIGNMENT(DR) (DR)->innermost.offset_alignment
#define DR_STEP_ALIGNMENT(DR) (DR)->innermost.step_alignment
#define DR_INNERMOST(DR) (DR)->innermost
+#define DR_GROUP_ID(DR) (DR)->group_id
typedef struct data_reference *data_reference_p;
diff --git a/gcc/tree-vect-data-refs.c b/gcc/tree-vect-data-refs.c
index e35a215e042..97059849e61 100644
--- a/gcc/tree-vect-data-refs.c
+++ b/gcc/tree-vect-data-refs.c
@@ -2772,10 +2772,10 @@ dr_group_sort_cmp (const void *dra_, const void *drb_)
return 0;
/* DRs in different loops never belong to the same group. */
- loop_p loopa = gimple_bb (DR_STMT (dra))->loop_father;
- loop_p loopb = gimple_bb (DR_STMT (drb))->loop_father;
- if (loopa != loopb)
- return loopa->num < loopb->num ? -1 : 1;
+ 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;
/* Ordering of DRs according to base. */
cmp = data_ref_compare_tree (DR_BASE_ADDRESS (dra),
@@ -2927,10 +2927,14 @@ 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 loop should not be put into the same
+ /* DRs in a different BBs should not be put into the same
interleaving group. */
- if (gimple_bb (DR_STMT (dra))->loop_father
- != gimple_bb (DR_STMT (drb))->loop_father)
+ 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 (DR_GROUP_ID (dra) != DR_GROUP_ID (drb))
break;
/* Check that the data-refs have same first location (except init)
@@ -3991,7 +3995,8 @@ vect_check_gather_scatter (stmt_vec_info stmt_info, loop_vec_info loop_vinfo,
opt_result
vect_find_stmt_data_reference (loop_p loop, gimple *stmt,
- vec<data_reference_p> *datarefs)
+ vec<data_reference_p> *datarefs,
+ int group_id)
{
/* We can ignore clobbers for dataref analysis - they are removed during
loop vectorization and BB vectorization checks dependences with a
@@ -4113,6 +4118,7 @@ vect_find_stmt_data_reference (loop_p loop, gimple *stmt,
DR_STEP (newdr) = step;
DR_OFFSET_ALIGNMENT (newdr) = BIGGEST_ALIGNMENT;
DR_STEP_ALIGNMENT (newdr) = highest_pow2_factor (step);
+ DR_GROUP_ID (newdr) = group_id;
/* Mark as simd-lane access. */
tree arg2 = gimple_call_arg (def, 1);
newdr->aux = (void *) (-1 - tree_to_uhwi (arg2));
@@ -4127,6 +4133,7 @@ vect_find_stmt_data_reference (loop_p loop, gimple *stmt,
}
datarefs->safe_push (dr);
+ DR_GROUP_ID (dr) = group_id;
return opt_result::success ();
}
diff --git a/gcc/tree-vect-loop.c b/gcc/tree-vect-loop.c
index 185019c3305..a58154c4ce8 100644
--- a/gcc/tree-vect-loop.c
+++ b/gcc/tree-vect-loop.c
@@ -1865,7 +1865,8 @@ vect_get_datarefs_in_loop (loop_p loop, basic_block *bbs,
if (is_gimple_debug (stmt))
continue;
++(*n_stmts);
- opt_result res = vect_find_stmt_data_reference (loop, stmt, datarefs);
+ opt_result res = vect_find_stmt_data_reference (loop, stmt, datarefs,
+ 0);
if (!res)
{
if (is_gimple_call (stmt) && loop->safelen)
diff --git a/gcc/tree-vect-slp.c b/gcc/tree-vect-slp.c
index 72192b5a813..8119438be86 100644
--- a/gcc/tree-vect-slp.c
+++ b/gcc/tree-vect-slp.c
@@ -3348,10 +3348,10 @@ vect_slp_analyze_bb_1 (bb_vec_info bb_vinfo, int n_stmts, bool &fatal)
given by DATAREFS. */
static bool
-vect_slp_bb_region (gimple_stmt_iterator region_begin,
- gimple_stmt_iterator region_end,
- vec<data_reference_p> datarefs,
- unsigned int n_stmts)
+vect_slp_region (gimple_stmt_iterator region_begin,
+ gimple_stmt_iterator region_end,
+ vec<data_reference_p> datarefs,
+ unsigned int n_stmts)
{
bb_vec_info bb_vinfo;
auto_vector_modes vector_modes;
@@ -3473,45 +3473,28 @@ vect_slp_bb_region (gimple_stmt_iterator region_begin,
bool
vect_slp_bb (basic_block bb)
{
- gimple_stmt_iterator gsi;
- bool any_vectorized = false;
-
- gsi = gsi_after_labels (bb);
- while (!gsi_end_p (gsi))
+ vec<data_reference_p> datarefs = vNULL;
+ int insns = 0;
+ int current_group = 0;
+ gimple_stmt_iterator region_begin = gsi_start_nondebug_after_labels_bb (bb);
+ gimple_stmt_iterator region_end = gsi_last_bb (bb);
+ if (!gsi_end_p (region_end))
+ gsi_next (®ion_end);
+
+ for (gimple_stmt_iterator gsi = gsi_after_labels (bb); !gsi_end_p (gsi);
+ gsi_next (&gsi))
{
- gimple_stmt_iterator region_begin = gsi;
- vec<data_reference_p> datarefs = vNULL;
- int insns = 0;
+ gimple *stmt = gsi_stmt (gsi);
+ if (is_gimple_debug (stmt))
+ continue;
- for (; !gsi_end_p (gsi); gsi_next (&gsi))
- {
- gimple *stmt = gsi_stmt (gsi);
- if (is_gimple_debug (stmt))
- {
- /* Skip leading debug stmts. */
- if (gsi_stmt (region_begin) == stmt)
- gsi_next (®ion_begin);
- continue;
- }
- insns++;
+ insns++;
- if (gimple_location (stmt) != UNKNOWN_LOCATION)
- vect_location = stmt;
+ if (gimple_location (stmt) != UNKNOWN_LOCATION)
+ vect_location = stmt;
- if (!vect_find_stmt_data_reference (NULL, stmt, &datarefs))
- break;
- }
- if (gsi_end_p (region_begin))
- break;
-
- /* Skip leading unhandled stmts. */
- if (gsi_stmt (region_begin) == gsi_stmt (gsi))
- {
- gsi_next (&gsi);
- continue;
- }
-
- gimple_stmt_iterator region_end = gsi;
+ if (!vect_find_stmt_data_reference (NULL, stmt, &datarefs, current_group))
+ ++current_group;
if (insns > param_slp_max_insns_in_bb)
{
@@ -3519,21 +3502,13 @@ vect_slp_bb (basic_block bb)
dump_printf_loc (MSG_MISSED_OPTIMIZATION, vect_location,
"not vectorized: too many instructions in "
"basic block.\n");
+ return false;
}
- else if (vect_slp_bb_region (region_begin, region_end, datarefs, insns))
- any_vectorized = true;
-
- if (gsi_end_p (region_end))
- break;
-
- /* Skip the unhandled stmt. */
- gsi_next (&gsi);
}
- return any_vectorized;
+ return vect_slp_region (region_begin, region_end, datarefs, insns);
}
-
/* Build a variable-length vector in which the elements in ELTS are repeated
to a fill NRESULTS vectors of type VECTOR_TYPE. Store the vectors in
RESULTS and add any new instructions to SEQ.
diff --git a/gcc/tree-vectorizer.h b/gcc/tree-vectorizer.h
index 5466c78c20b..394267ca18f 100644
--- a/gcc/tree-vectorizer.h
+++ b/gcc/tree-vectorizer.h
@@ -1924,7 +1924,8 @@ extern bool vect_gather_scatter_fn_p (vec_info *, bool, bool, tree, tree,
extern bool vect_check_gather_scatter (stmt_vec_info, loop_vec_info,
gather_scatter_info *);
extern opt_result vect_find_stmt_data_reference (loop_p, gimple *,
- vec<data_reference_p> *);
+ vec<data_reference_p> *,
+ int);
extern opt_result vect_analyze_data_refs (vec_info *, poly_uint64 *, bool *);
extern void vect_record_base_alignments (vec_info *);
extern tree vect_create_data_ref_ptr (vec_info *,
More information about the Gcc-cvs
mailing list