OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

tree-optimization/101158 - adjust SLP call matching sequence 

This moves the check for same operands after verifying we're
facing compatible calls.

2021-06-22  Richard Biener  <rguenther@suse.de>

	PR tree-optimization/101158
	* tree-vect-slp.c (vect_build_slp_tree_1): Move same operand
	checking after checking for matching operation.

	* gfortran.dg/pr101158.f90: New testcase.
This commit is contained in:
Richard Biener 2021-06-22 09:24:24 +02:00
parent a5b773d3f8
commit 7a22d8a764
2 changed files with 41 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
gcc/testsuite/gfortran.dg/pr101158.f90 Normal file
View File

@ -0,0 +1,25 @@
! { dg-do compile }
! { dg-options "-O1 -ftree-slp-vectorize -fwrapv" }
! { dg-additional-options "-march=armv8-a+sve" { target aarch64-*-* } }
subroutine sprpl5 (left)
implicit none
integer :: left
integer :: avail1, avail2, delx1, delx2, i2, ic
ic = left
delx1 = ic / 2
delx2 = delx1 + 1
i2 = ic + delx2
avail1 = i2
avail2 = 1
do delx1 = 1, 2
ic = left + nint (real (left) / 2)
if (ic .ge. avail1) avail1 = ic + 1
i2 = ic + delx2
if (i2 .le. avail2) avail2 = i2 + 1
end do
end subroutine sprpl5

31
gcc/tree-vect-slp.c
View File

@ -1177,21 +1177,6 @@ vect_build_slp_tree_1 (vec_info *vinfo, unsigned char *swap,
continue;
}
if (need_same_oprnds)
{
tree other_op1 = (call_stmt
? gimple_call_arg (call_stmt, 1)
: gimple_assign_rhs2 (stmt));
if (!operand_equal_p (first_op1, other_op1, 0))
{
if (dump_enabled_p ())
dump_printf_loc (MSG_MISSED_OPTIMIZATION, vect_location,
"Build SLP failed: different shift "
"arguments in %G", stmt);
/* Mismatch. */
continue;
}
}
if (!load_p
&& first_stmt_code == BIT_FIELD_REF
&& (TREE_OPERAND (gimple_assign_rhs1 (first_stmt_info->stmt), 0)
@ -1231,6 +1216,22 @@ vect_build_slp_tree_1 (vec_info *vinfo, unsigned char *swap,
continue;
}
if (need_same_oprnds)
{
tree other_op1 = (call_stmt
? gimple_call_arg (call_stmt, 1)
: gimple_assign_rhs2 (stmt));
if (!operand_equal_p (first_op1, other_op1, 0))
{
if (dump_enabled_p ())
dump_printf_loc (MSG_MISSED_OPTIMIZATION, vect_location,
"Build SLP failed: different shift "
"arguments in %G", stmt);
/* Mismatch. */
continue;
}
}
if (!types_compatible_p (vectype, *node_vectype))
{
if (dump_enabled_p ())