git
/
gcc
mirror of git://gcc.gnu.org/git/gcc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

tree-vect-loop.c (vect_model_reduction_cost): Do not fail, instead get vector type from stmt_info. 

2017-06-13  Richard Biener  <rguenther@suse.de>

	* tree-vect-loop.c (vect_model_reduction_cost): Do not fail,
	instead get vector type from stmt_info.
	(vectorizable_reduction): Adjust.  Remove dead code.

From-SVN: r249145
This commit is contained in:
Richard Biener 2017-06-13 07:10:06 +00:00 committed by Richard Biener
parent 4f2c198d76
commit bae6eef009
2 changed files with 12 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gcc/ChangeLog
View File

@ -1,3 +1,9 @@
2017-06-13 Richard Biener <rguenther@suse.de>
* tree-vect-loop.c (vect_model_reduction_cost): Do not fail,
instead get vector type from stmt_info.
(vectorizable_reduction): Adjust. Remove dead code.
2017-06-13 Richard Biener <rguenther@suse.de> 2017-06-13 Richard Biener <rguenther@suse.de>
PR middle-end/81065 PR middle-end/81065

47
gcc/tree-vect-loop.c
View File

@ -3690,16 +3690,15 @@ get_reduction_op (gimple *stmt, int reduc_index)
generated within the strip-mine loop, the initial definition before generated within the strip-mine loop, the initial definition before
the loop, and the epilogue code that must be generated. */ the loop, and the epilogue code that must be generated. */
static bool static void
vect_model_reduction_cost (stmt_vec_info stmt_info, enum tree_code reduc_code, vect_model_reduction_cost (stmt_vec_info stmt_info, enum tree_code reduc_code,
int ncopies, int reduc_index) int ncopies)
{ {
int prologue_cost = 0, epilogue_cost = 0; int prologue_cost = 0, epilogue_cost = 0;
enum tree_code code; enum tree_code code;
optab optab; optab optab;
tree vectype; tree vectype;
gimple *stmt, *orig_stmt; gimple *orig_stmt;
tree reduction_op;
machine_mode mode; machine_mode mode;
loop_vec_info loop_vinfo = STMT_VINFO_LOOP_VINFO (stmt_info); loop_vec_info loop_vinfo = STMT_VINFO_LOOP_VINFO (stmt_info);
struct loop *loop = NULL; struct loop *loop = NULL;
@ -3720,24 +3719,8 @@ vect_model_reduction_cost (stmt_vec_info stmt_info, enum tree_code reduc_code,
/* Cost of reduction op inside loop. */ /* Cost of reduction op inside loop. */
unsigned inside_cost = add_stmt_cost (target_cost_data, ncopies, vector_stmt, unsigned inside_cost = add_stmt_cost (target_cost_data, ncopies, vector_stmt,
stmt_info, 0, vect_body); stmt_info, 0, vect_body);
stmt = STMT_VINFO_STMT (stmt_info);
reduction_op = get_reduction_op (stmt, reduc_index);
vectype = get_vectype_for_scalar_type (TREE_TYPE (reduction_op));
if (!vectype)
{
if (dump_enabled_p ())
{
dump_printf_loc (MSG_MISSED_OPTIMIZATION, vect_location,
"unsupported data-type ");
dump_generic_expr (MSG_MISSED_OPTIMIZATION, TDF_SLIM,
TREE_TYPE (reduction_op));
dump_printf (MSG_MISSED_OPTIMIZATION, "\n");
}
return false;
}
vectype = STMT_VINFO_VECTYPE (stmt_info);
mode = TYPE_MODE (vectype); mode = TYPE_MODE (vectype);
orig_stmt = STMT_VINFO_RELATED_STMT (stmt_info); orig_stmt = STMT_VINFO_RELATED_STMT (stmt_info);
@ -3829,8 +3812,6 @@ vect_model_reduction_cost (stmt_vec_info stmt_info, enum tree_code reduc_code,
"vect_model_reduction_cost: inside_cost = %d, " "vect_model_reduction_cost: inside_cost = %d, "
"prologue_cost = %d, epilogue_cost = %d .\n", inside_cost, "prologue_cost = %d, epilogue_cost = %d .\n", inside_cost,
prologue_cost, epilogue_cost); prologue_cost, epilogue_cost);
return true;
} }
@ -5288,20 +5269,6 @@ vectorizable_reduction (gimple *stmt, gimple_stmt_iterator *gsi,
/* Flatten RHS. */ /* Flatten RHS. */
switch (get_gimple_rhs_class (gimple_assign_rhs_code (stmt))) switch (get_gimple_rhs_class (gimple_assign_rhs_code (stmt)))
{ {
case GIMPLE_SINGLE_RHS:
op_type = TREE_OPERAND_LENGTH (gimple_assign_rhs1 (stmt));
if (op_type == ternary_op)
{
tree rhs = gimple_assign_rhs1 (stmt);
ops[0] = TREE_OPERAND (rhs, 0);
ops[1] = TREE_OPERAND (rhs, 1);
ops[2] = TREE_OPERAND (rhs, 2);
code = TREE_CODE (rhs);
}
else
return false;
break;
case GIMPLE_BINARY_RHS: case GIMPLE_BINARY_RHS:
code = gimple_assign_rhs_code (stmt); code = gimple_assign_rhs_code (stmt);
op_type = TREE_CODE_LENGTH (code); op_type = TREE_CODE_LENGTH (code);
@ -5781,10 +5748,8 @@ vectorizable_reduction (gimple *stmt, gimple_stmt_iterator *gsi,
if (!vec_stmt) /* transformation not required. */ if (!vec_stmt) /* transformation not required. */
{ {
if (first_p if (first_p)
&& !vect_model_reduction_cost (stmt_info, epilog_reduc_code, ncopies, vect_model_reduction_cost (stmt_info, epilog_reduc_code, ncopies);
reduc_index))
return false;
STMT_VINFO_TYPE (stmt_info) = reduc_vec_info_type; STMT_VINFO_TYPE (stmt_info) = reduc_vec_info_type;
return true; return true;
} }