From c12176d716a0121cafc296c36bc256ea79700d1e Mon Sep 17 00:00:00 2001 From: Bin Cheng Date: Thu, 3 Nov 2016 09:15:45 +0000 Subject: [PATCH] tree-vect-loop.c (destroy_loop_vec_info): Handle cond_expr. * tree-vect-loop.c (destroy_loop_vec_info): Handle cond_expr. (vect_is_simple_reduction): Swap cond_reduction by inversion. From-SVN: r241810 --- gcc/ChangeLog | 5 ++++ gcc/tree-vect-loop.c | 85 ++++++++++++++++++++++++++++++++++++++-------------- 2 files changed, 67 insertions(+), 23 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 5a6f7bf..98e1cb2 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,8 @@ +2016-11-03 Bin Cheng + + * tree-vect-loop.c (destroy_loop_vec_info): Handle cond_expr. + (vect_is_simple_reduction): Swap cond_reduction by inversion. + 2016-11-02 Uros Bizjak * config/i386/i386.c (ix86_init_libfuncs): New. Call diff --git a/gcc/tree-vect-loop.c b/gcc/tree-vect-loop.c index 9cca9b7..1cd9c72 100644 --- a/gcc/tree-vect-loop.c +++ b/gcc/tree-vect-loop.c @@ -1225,6 +1225,27 @@ destroy_loop_vec_info (loop_vec_info loop_vinfo, bool clean_stmts) swap_ssa_operands (stmt, gimple_assign_rhs1_ptr (stmt), gimple_assign_rhs2_ptr (stmt)); + else if (code == COND_EXPR + && CONSTANT_CLASS_P (gimple_assign_rhs2 (stmt))) + { + tree cond_expr = gimple_assign_rhs1 (stmt); + enum tree_code cond_code = TREE_CODE (cond_expr); + + if (TREE_CODE_CLASS (cond_code) == tcc_comparison) + { + bool honor_nans = HONOR_NANS (TREE_OPERAND (cond_expr, + 0)); + cond_code = invert_tree_comparison (cond_code, + honor_nans); + if (cond_code != ERROR_MARK) + { + TREE_SET_CODE (cond_expr, cond_code); + swap_ssa_operands (stmt, + gimple_assign_rhs2_ptr (stmt), + gimple_assign_rhs3_ptr (stmt)); + } + } + } } /* Free stmt_vec_info. */ @@ -3006,38 +3027,56 @@ vect_is_simple_reduction (loop_vec_info loop_info, gimple *phi, && (code == COND_EXPR || !def2 || gimple_nop_p (def2) || !flow_bb_inside_loop_p (loop, gimple_bb (def2)) - || (def2 && flow_bb_inside_loop_p (loop, gimple_bb (def2)) - && (is_gimple_assign (def2) + || (def2 && flow_bb_inside_loop_p (loop, gimple_bb (def2)) + && (is_gimple_assign (def2) || is_gimple_call (def2) - || STMT_VINFO_DEF_TYPE (vinfo_for_stmt (def2)) - == vect_induction_def - || (gimple_code (def2) == GIMPLE_PHI + || STMT_VINFO_DEF_TYPE (vinfo_for_stmt (def2)) + == vect_induction_def + || (gimple_code (def2) == GIMPLE_PHI && STMT_VINFO_DEF_TYPE (vinfo_for_stmt (def2)) - == vect_internal_def + == vect_internal_def && !is_loop_header_bb_p (gimple_bb (def2))))))) { - if (check_reduction - && orig_code != MINUS_EXPR) - { + if (check_reduction && orig_code != MINUS_EXPR) + { + /* Check if we can swap operands (just for simplicity - so that + the rest of the code can assume that the reduction variable + is always the last (second) argument). */ if (code == COND_EXPR) { - /* No current known use where this case would be useful. */ - if (dump_enabled_p ()) - report_vect_op (MSG_NOTE, def_stmt, - "detected reduction: cannot currently swap " - "operands for cond_expr"); - return NULL; + /* Swap cond_expr by inverting the condition. */ + tree cond_expr = gimple_assign_rhs1 (def_stmt); + enum tree_code invert_code = ERROR_MARK; + enum tree_code cond_code = TREE_CODE (cond_expr); + + if (TREE_CODE_CLASS (cond_code) == tcc_comparison) + { + bool honor_nans = HONOR_NANS (TREE_OPERAND (cond_expr, 0)); + invert_code = invert_tree_comparison (cond_code, honor_nans); + } + if (invert_code != ERROR_MARK) + { + TREE_SET_CODE (cond_expr, invert_code); + swap_ssa_operands (def_stmt, + gimple_assign_rhs2_ptr (def_stmt), + gimple_assign_rhs3_ptr (def_stmt)); + } + else + { + if (dump_enabled_p ()) + report_vect_op (MSG_NOTE, def_stmt, + "detected reduction: cannot swap operands " + "for cond_expr"); + return NULL; + } } + else + swap_ssa_operands (def_stmt, gimple_assign_rhs1_ptr (def_stmt), + gimple_assign_rhs2_ptr (def_stmt)); - /* Swap operands (just for simplicity - so that the rest of the code - can assume that the reduction variable is always the last (second) - argument). */ - if (dump_enabled_p ()) + if (dump_enabled_p ()) report_vect_op (MSG_NOTE, def_stmt, - "detected reduction: need to swap operands: "); - - swap_ssa_operands (def_stmt, gimple_assign_rhs1_ptr (def_stmt), - gimple_assign_rhs2_ptr (def_stmt)); + "detected reduction: need to swap operands: "); if (CONSTANT_CLASS_P (gimple_assign_rhs1 (def_stmt))) LOOP_VINFO_OPERANDS_SWAPPED (loop_info) = true; -- 2.7.4