From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1666) id C5992386075A; Fri, 14 Oct 2022 10:00:44 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org C5992386075A DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1665741644; bh=r+Vk4dxVlLKzqH+uQmeHJqxCYXguX/WZnoT71OYN6gI=; h=From:To:Subject:Date:From; b=cl7g0vmyIS+mtkwSfnkqKqArqpvXJ+bgx1jTTM2/MBDl+pRNTng5gRnc41qNUfEhR JXeI1G6O+Mr1sIS2ThdYUootCd3xlvS8Unw6DzewiKNlZt43cPx8FQRytV/mLQUkYH O7w4zGcsYauInweIUn5SDT4emK6qlG15JCsdlh6Q= MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Richard Biener To: gcc-cvs@gcc.gnu.org Subject: [gcc r13-3297] tree-optimization/107254 - check and support live lanes from permutes X-Act-Checkin: gcc X-Git-Author: Richard Biener X-Git-Refname: refs/heads/master X-Git-Oldrev: e39b170695a161feba7401b7d21d824db9ee1f8f X-Git-Newrev: 9ed4a849afb5b18b462bea311e7eee454c2c9f68 Message-Id: <20221014100044.C5992386075A@sourceware.org> Date: Fri, 14 Oct 2022 10:00:44 +0000 (GMT) List-Id: https://gcc.gnu.org/g:9ed4a849afb5b18b462bea311e7eee454c2c9f68 commit r13-3297-g9ed4a849afb5b18b462bea311e7eee454c2c9f68 Author: Richard Biener Date: Fri Oct 14 11:14:59 2022 +0200 tree-optimization/107254 - check and support live lanes from permutes The following fixes an omission from adding SLP permute nodes which is live lanes originating from those. We have to check that we can extract the lane and have to actually code generate them. PR tree-optimization/107254 * tree-vect-slp.cc (vect_slp_analyze_node_operations_1): For permutes also analyze live lanes. (vect_schedule_slp_node): For permutes also code generate live lane extracts. * gfortran.dg/vect/pr107254.f90: New testcase. Diff: --- gcc/testsuite/gfortran.dg/vect/pr107254.f90 | 49 +++++++++++++++++++++++++++++ gcc/tree-vect-slp.cc | 33 ++++++++++++++++--- 2 files changed, 77 insertions(+), 5 deletions(-) diff --git a/gcc/testsuite/gfortran.dg/vect/pr107254.f90 b/gcc/testsuite/gfortran.dg/vect/pr107254.f90 new file mode 100644 index 00000000000..85bcb5f3fa2 --- /dev/null +++ b/gcc/testsuite/gfortran.dg/vect/pr107254.f90 @@ -0,0 +1,49 @@ +! { dg-do run } + +subroutine dlartg( f, g, s, r ) + implicit none + double precision :: f, g, r, s + double precision :: d, p + + d = sqrt( f*f + g*g ) + p = 1.d0 / d + if( abs( f ) > 1 ) then + s = g*sign( p, f ) + r = sign( d, f ) + else + s = g*sign( p, f ) + r = sign( d, f ) + end if +end subroutine + +subroutine dhgeqz( n, h, t ) + implicit none + integer n + double precision h( n, * ), t( n, * ) + integer jc + double precision c, s, temp, temp2, tempr + temp2 = 10d0 + call dlartg( 10d0, temp2, s, tempr ) + c = 0.9d0 + s = 1.d0 + do jc = 1, n + temp = c*h( 1, jc ) + s*h( 2, jc ) + h( 2, jc ) = -s*h( 1, jc ) + c*h( 2, jc ) + h( 1, jc ) = temp + temp2 = c*t( 1, jc ) + s*t( 2, jc ) + t( 2, jc ) = -s*t( 1, jc ) + c*t( 2, jc ) + t( 1, jc ) = temp2 + enddo +end subroutine dhgeqz + +program test + implicit none + double precision h(2,2), t(2,2) + h = 0 + t(1,1) = 1 + t(2,1) = 0 + t(1,2) = 0 + t(2,2) = 0 + call dhgeqz( 2, h, t ) + if (t(2,2).ne.0) STOP 1 +end program test diff --git a/gcc/tree-vect-slp.cc b/gcc/tree-vect-slp.cc index 229f2663ebc..af27fd56e02 100644 --- a/gcc/tree-vect-slp.cc +++ b/gcc/tree-vect-slp.cc @@ -5930,7 +5930,23 @@ vect_slp_analyze_node_operations_1 (vec_info *vinfo, slp_tree node, /* Handle purely internal nodes. */ if (SLP_TREE_CODE (node) == VEC_PERM_EXPR) - return vectorizable_slp_permutation (vinfo, NULL, node, cost_vec); + { + if (!vectorizable_slp_permutation (vinfo, NULL, node, cost_vec)) + return false; + + stmt_vec_info slp_stmt_info; + unsigned int i; + FOR_EACH_VEC_ELT (SLP_TREE_SCALAR_STMTS (node), i, slp_stmt_info) + { + if (STMT_VINFO_LIVE_P (slp_stmt_info) + && !vectorizable_live_operation (vinfo, + slp_stmt_info, NULL, node, + node_instance, i, + false, cost_vec)) + return false; + } + return true; + } gcc_assert (STMT_SLP_TYPE (stmt_info) != loop_vect); @@ -8897,8 +8913,6 @@ vect_schedule_slp_node (vec_info *vinfo, } } - bool done_p = false; - /* Handle purely internal nodes. */ if (SLP_TREE_CODE (node) == VEC_PERM_EXPR) { @@ -8909,9 +8923,18 @@ vect_schedule_slp_node (vec_info *vinfo, but open-code it here (partly). */ bool done = vectorizable_slp_permutation (vinfo, &si, node, NULL); gcc_assert (done); - done_p = true; + stmt_vec_info slp_stmt_info; + unsigned int i; + FOR_EACH_VEC_ELT (SLP_TREE_SCALAR_STMTS (node), i, slp_stmt_info) + if (STMT_VINFO_LIVE_P (slp_stmt_info)) + { + done = vectorizable_live_operation (vinfo, + slp_stmt_info, &si, node, + instance, i, true, NULL); + gcc_assert (done); + } } - if (!done_p) + else vect_transform_stmt (vinfo, stmt_info, &si, node, instance); }