From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1666) id 90E543836E96; Mon, 20 Feb 2023 10:56:04 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 90E543836E96 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1676890564; bh=lUIZ5W0pRBx3vdc8TsLlAmmYs1ZFgIi4FjbmJjYL6kk=; h=From:To:Subject:Date:From; b=B15UFDyiTs9g2Po/0SKAYaEHuxr/TmyyxcUaQhxBBY8ZgSE6RZSxQKvTxYeoQLLHc c7LfofM41CI9nt7jvDZam9+KH8JDsw0ynneUs/XYIghfzF6QTTd+Alri3EEY7VsoY3 xL3GjWb8ZVIv7sMk6KfeCTok5jVqWm0XnK95lJqc= 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-6140] tree-optimization/108816 - vect versioning check split confusion X-Act-Checkin: gcc X-Git-Author: Richard Biener X-Git-Refname: refs/heads/master X-Git-Oldrev: 7b8916a6fd098546e4e53e53b37a5153664ba17f X-Git-Newrev: 63471c5008819bbf6ec32a6f4d8701fe57b96fa9 Message-Id: <20230220105604.90E543836E96@sourceware.org> Date: Mon, 20 Feb 2023 10:56:04 +0000 (GMT) List-Id: https://gcc.gnu.org/g:63471c5008819bbf6ec32a6f4d8701fe57b96fa9 commit r13-6140-g63471c5008819bbf6ec32a6f4d8701fe57b96fa9 Author: Richard Biener Date: Mon Feb 20 10:59:15 2023 +0100 tree-optimization/108816 - vect versioning check split confusion The split of the versioning condition assumes the definition is in the condition block which is ensured by the versioning code. But that only works when we actually have to insert any statements for the versioning condition. The following adjusts the guard accordingly and asserts this condition. PR tree-optimization/108816 * tree-vect-loop-manip.cc (vect_loop_versioning): Adjust versioning condition split prerequesite, assert required invariant. * gcc.dg/torture/pr108816.c: New testcase. Diff: --- gcc/testsuite/gcc.dg/torture/pr108816.c | 18 ++++++++++++++++++ gcc/tree-vect-loop-manip.cc | 3 ++- 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/gcc/testsuite/gcc.dg/torture/pr108816.c b/gcc/testsuite/gcc.dg/torture/pr108816.c new file mode 100644 index 00000000000..4c24d5584c1 --- /dev/null +++ b/gcc/testsuite/gcc.dg/torture/pr108816.c @@ -0,0 +1,18 @@ +/* { dg-do compile } */ +/* { dg-additional-options "-fvect-cost-model=dynamic" } */ + +int m; + +void +foo (int p[][16], unsigned int x) +{ + while (x < 4) + { + int j; + + for (j = x * 4; j < (x + 1) * 4 - 2; j++) + p[0][j] = p[m][j]; + + ++x; + } +} diff --git a/gcc/tree-vect-loop-manip.cc b/gcc/tree-vect-loop-manip.cc index c04fcf40c44..6aa3d2ed0bf 100644 --- a/gcc/tree-vect-loop-manip.cc +++ b/gcc/tree-vect-loop-manip.cc @@ -3477,7 +3477,7 @@ vect_loop_versioning (loop_vec_info loop_vinfo, tree cost_name = NULL_TREE; profile_probability prob2 = profile_probability::uninitialized (); if (cond_expr - && !integer_truep (cond_expr) + && EXPR_P (cond_expr) && (version_niter || version_align || version_alias @@ -3711,6 +3711,7 @@ vect_loop_versioning (loop_vec_info loop_vinfo, if (cost_name && TREE_CODE (cost_name) == SSA_NAME) { gimple *def = SSA_NAME_DEF_STMT (cost_name); + gcc_assert (gimple_bb (def) == condition_bb); /* All uses of the cost check are 'true' after the check we are going to insert. */ replace_uses_by (cost_name, boolean_true_node);