public inbox for gcc-cvs@sourceware.org help / color / mirror / Atom feed
From: Tamar Christina <tnfchris@gcc.gnu.org> To: gcc-cvs@gcc.gnu.org Subject: [gcc r14-4707] middle-end: refactor vectorizable_comparison to make the main body re-usable. Date: Wed, 18 Oct 2023 08:04:08 +0000 (GMT) [thread overview] Message-ID: <20231018080408.83DB03858CDB@sourceware.org> (raw) https://gcc.gnu.org/g:46937e1b47274c5f5edfc22c7e70b820c6d55530 commit r14-4707-g46937e1b47274c5f5edfc22c7e70b820c6d55530 Author: Tamar Christina <tamar.christina@arm.com> Date: Wed Oct 18 09:01:41 2023 +0100 middle-end: 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 | 64 ++++++++++++++++++++++++++++++++++++-------------- 1 file changed, 46 insertions(+), 18 deletions(-) diff --git a/gcc/tree-vect-stmts.cc b/gcc/tree-vect-stmts.cc index 9bb43e98f56d..2974eb6a981b 100644 --- a/gcc/tree-vect-stmts.cc +++ b/gcc/tree-vect-stmts.cc @@ -12324,23 +12324,22 @@ vectorizable_condition (vec_info *vinfo, return true; } -/* vectorizable_comparison. +/* Helper of vectorizable_comparison. - Check if STMT_INFO is comparison expression that can be vectorized. + 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 <loop_vec_info> (vinfo); @@ -12348,7 +12347,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 <bb_vec_info> (vinfo); vec<tree> vec_oprnds0 = vNULL; @@ -12371,14 +12370,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 <gassign *> (stmt_info->stmt); - if (!stmt) - return false; - - code = gimple_assign_rhs_code (stmt); if (TREE_CODE_CLASS (code) != tcc_comparison) return false; @@ -12493,7 +12484,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); @@ -12503,7 +12493,7 @@ vectorizable_comparison (vec_info *vinfo, /* Transform. */ /* Handle def. */ - lhs = gimple_assign_lhs (stmt); + lhs = gimple_assign_lhs (STMT_VINFO_STMT (stmt_info)); mask = vect_create_destination_var (lhs, mask_type); vect_get_vec_defs (vinfo, stmt_info, slp_node, ncopies, @@ -12559,6 +12549,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 <bb_vec_info> (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 <gassign *> (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.
reply other threads:[~2023-10-18 8:04 UTC|newest] Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20231018080408.83DB03858CDB@sourceware.org \ --to=tnfchris@gcc.gnu.org \ --cc=gcc-cvs@gcc.gnu.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).