From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1984) id 08E863858C39; Wed, 28 Jun 2023 13:32:43 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 08E863858C39 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1687959163; bh=cYQQEbZjI4yMvIwbcuiTTnxprEtixHmRJ4XZegQX634=; h=From:To:Subject:Date:From; b=jyEFnQeswSRkvdwNgT7Ta+NwyOiiEULrntjWKgN5a1TVU6mcNYH6RgSTUqHYOKUZk uQdES9MQGL7RsqRPl8Hs9S2/ckgHD6rbCdLZ5+XTdGI3kAvrS6aLFFF5std9+83aMK 1QwvC/4fMOSGXodwfaxvFrfubiduMih56JfXeTAc= Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Tamar Christina To: gcc-cvs@gcc.gnu.org Subject: [gcc(refs/users/tnfchris/heads/gcc-14-early-break)] refactor vectorizable_comparison to make the main body re-usable. X-Act-Checkin: gcc X-Git-Author: Tamar Christina X-Git-Refname: refs/users/tnfchris/heads/gcc-14-early-break X-Git-Oldrev: d188ca7d5af74af4aaf7c51ad82aba3675f8afb8 X-Git-Newrev: d66791ec9a36a570d045c318c011517ec31e861a Message-Id: <20230628133243.08E863858C39@sourceware.org> Date: Wed, 28 Jun 2023 13:32:43 +0000 (GMT) List-Id: https://gcc.gnu.org/g:d66791ec9a36a570d045c318c011517ec31e861a commit d66791ec9a36a570d045c318c011517ec31e861a Author: Tamar Christina Date: Wed Jun 28 13:48:40 2023 +0100 refactor vectorizable_comparison to make the main body re-usable. Vectorization of a gcond starts off essentially the same as vectorizing a comparison witht he only difference being how the operands are extracted. This refactors vectorable_comparison such that we now have a generic function that can be used from vectorizable_early_break. The refactoring splits the gassign checks and actual validation/codegen off to a helper function. No change in functionality expected. gcc/ChangeLog: * tree-vect-stmts.cc (vectorizable_comparison): Refactor, splitting body to ... (vectorizable_comparison_1): ...This. Diff: --- gcc/tree-vect-stmts.cc | 62 +++++++++++++++++++++++++++++++++++++------------- 1 file changed, 46 insertions(+), 16 deletions(-) diff --git a/gcc/tree-vect-stmts.cc b/gcc/tree-vect-stmts.cc index ae24f3e66e6..f3e33cd4ed1 100644 --- a/gcc/tree-vect-stmts.cc +++ b/gcc/tree-vect-stmts.cc @@ -11332,21 +11332,22 @@ vectorizable_condition (vec_info *vinfo, /* vectorizable_comparison. - Check if STMT_INFO is comparison expression that can be vectorized. +/* Helper of vectorizable_comparison. + + Check if STMT_INFO is comparison expression CODE that can be vectorized. If VEC_STMT is also passed, vectorize STMT_INFO: create a vectorized comparison, put it in VEC_STMT, and insert it at GSI. Return true if STMT_INFO is vectorizable in this way. */ static bool -vectorizable_comparison (vec_info *vinfo, - stmt_vec_info stmt_info, gimple_stmt_iterator *gsi, - gimple **vec_stmt, - slp_tree slp_node, stmt_vector_for_cost *cost_vec) +vectorizable_comparison_1 (vec_info *vinfo, tree vectype, + stmt_vec_info stmt_info, tree_code code, + gimple_stmt_iterator *gsi, gimple **vec_stmt, + slp_tree slp_node, stmt_vector_for_cost *cost_vec) { tree lhs, rhs1, rhs2; tree vectype1 = NULL_TREE, vectype2 = NULL_TREE; - tree vectype = STMT_VINFO_VECTYPE (stmt_info); tree vec_rhs1 = NULL_TREE, vec_rhs2 = NULL_TREE; tree new_temp; loop_vec_info loop_vinfo = dyn_cast (vinfo); @@ -11354,7 +11355,7 @@ vectorizable_comparison (vec_info *vinfo, int ndts = 2; poly_uint64 nunits; int ncopies; - enum tree_code code, bitop1 = NOP_EXPR, bitop2 = NOP_EXPR; + enum tree_code bitop1 = NOP_EXPR, bitop2 = NOP_EXPR; int i; bb_vec_info bb_vinfo = dyn_cast (vinfo); vec vec_oprnds0 = vNULL; @@ -11377,14 +11378,6 @@ vectorizable_comparison (vec_info *vinfo, ncopies = vect_get_num_copies (loop_vinfo, vectype); gcc_assert (ncopies >= 1); - if (STMT_VINFO_DEF_TYPE (stmt_info) != vect_internal_def) - return false; - - gassign *stmt = dyn_cast (stmt_info->stmt); - if (!stmt) - return false; - - code = gimple_assign_rhs_code (stmt); if (TREE_CODE_CLASS (code) != tcc_comparison) return false; @@ -11499,7 +11492,6 @@ vectorizable_comparison (vec_info *vinfo, return false; } - STMT_VINFO_TYPE (stmt_info) = comparison_vec_info_type; vect_model_simple_cost (vinfo, stmt_info, ncopies * (1 + (bitop2 != NOP_EXPR)), dts, ndts, slp_node, cost_vec); @@ -11565,6 +11557,44 @@ vectorizable_comparison (vec_info *vinfo, return true; } +/* vectorizable_comparison. + + Check if STMT_INFO is comparison expression that can be vectorized. + If VEC_STMT is also passed, vectorize STMT_INFO: create a vectorized + comparison, put it in VEC_STMT, and insert it at GSI. + + Return true if STMT_INFO is vectorizable in this way. */ + +static bool +vectorizable_comparison (vec_info *vinfo, + stmt_vec_info stmt_info, gimple_stmt_iterator *gsi, + gimple **vec_stmt, + slp_tree slp_node, stmt_vector_for_cost *cost_vec) +{ + bb_vec_info bb_vinfo = dyn_cast (vinfo); + + if (!STMT_VINFO_RELEVANT_P (stmt_info) && !bb_vinfo) + return false; + + if (STMT_VINFO_DEF_TYPE (stmt_info) != vect_internal_def) + return false; + + gassign *stmt = dyn_cast (stmt_info->stmt); + if (!stmt) + return false; + + enum tree_code code = gimple_assign_rhs_code (stmt); + tree vectype = STMT_VINFO_VECTYPE (stmt_info); + if (!vectorizable_comparison_1 (vinfo, vectype, stmt_info, code, gsi, + vec_stmt, slp_node, cost_vec)) + return false; + + if (!vec_stmt) + STMT_VINFO_TYPE (stmt_info) = comparison_vec_info_type; + + return true; +} + /* If SLP_NODE is nonnull, return true if vectorizable_live_operation can handle all live statements in the node. Otherwise return true if STMT_INFO is not live or if vectorizable_live_operation can handle it.