From 9186a9d353815352d9625fc765dd0449fb64d8a9 Mon Sep 17 00:00:00 2001 From: Richard Biener Date: Fri, 2 Jun 2017 13:11:11 +0000 Subject: [PATCH] tree-vect-slp.c (vect_detect_hybrid_slp_2): Match up what we consider a relevant use stmt with vect_detect_hybrid_slp_stmts. 2017-06-02 Richard Biener * tree-vect-slp.c (vect_detect_hybrid_slp_2): Match up what we consider a relevant use stmt with vect_detect_hybrid_slp_stmts. From-SVN: r248825 --- gcc/ChangeLog | 5 +++++ gcc/tree-vect-slp.c | 9 ++++++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 499e6bb6385..4f861e16ade 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,8 @@ +2017-06-02 Richard Biener + + * tree-vect-slp.c (vect_detect_hybrid_slp_2): Match up + what we consider a relevant use stmt with vect_detect_hybrid_slp_stmts. + 2017-06-02 Richard Biener PR tree-optimization/80948 diff --git a/gcc/tree-vect-slp.c b/gcc/tree-vect-slp.c index d221fc63873..31194b823d0 100644 --- a/gcc/tree-vect-slp.c +++ b/gcc/tree-vect-slp.c @@ -2245,9 +2245,16 @@ static tree vect_detect_hybrid_slp_2 (gimple_stmt_iterator *gsi, bool *handled, walk_stmt_info *) { + stmt_vec_info use_vinfo = vinfo_for_stmt (gsi_stmt (*gsi)); /* If the stmt is in a SLP instance then this isn't a reason to mark use definitions in other SLP instances as hybrid. */ - if (STMT_SLP_TYPE (vinfo_for_stmt (gsi_stmt (*gsi))) != loop_vect) + if (! STMT_SLP_TYPE (use_vinfo) + && (STMT_VINFO_RELEVANT (use_vinfo) + || VECTORIZABLE_CYCLE_DEF (STMT_VINFO_DEF_TYPE (use_vinfo))) + && ! (gimple_code (gsi_stmt (*gsi)) == GIMPLE_PHI + && STMT_VINFO_DEF_TYPE (use_vinfo) == vect_reduction_def)) + ; + else *handled = true; return NULL_TREE; } -- 2.30.2