From patchwork Wed Jun 5 06:23:15 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Biener X-Patchwork-Id: 1943658 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=nUiuvAKR; dkim=pass header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=cMPbllNS; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=q+v6CHt6; dkim=neutral header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=J07SUROF; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=2620:52:3:1:0:246e:9693:128c; helo=server2.sourceware.org; envelope-from=gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=patchwork.ozlabs.org) Received: from server2.sourceware.org (server2.sourceware.org [IPv6:2620:52:3:1:0:246e:9693:128c]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4VvHTs3Xnqz20KL for ; Wed, 5 Jun 2024 16:23:45 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id C7F8138CCBF2 for ; Wed, 5 Jun 2024 06:23:43 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from smtp-out1.suse.de (smtp-out1.suse.de [IPv6:2a07:de40:b251:101:10:150:64:1]) by sourceware.org (Postfix) with ESMTPS id DCA0838CCBC2 for ; Wed, 5 Jun 2024 06:23:17 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org DCA0838CCBC2 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=suse.de Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=suse.de ARC-Filter: OpenARC Filter v1.0.0 sourceware.org DCA0838CCBC2 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2a07:de40:b251:101:10:150:64:1 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1717568600; cv=none; b=ZrQqHyt+Fd1X7vVxZaFGrgfLF/v3+pOP/R4WWpqwLLABIbto+xq4DHxq1aCsZd54hOynsoja7GunQyMCuFN5mPwBmebBpmlsUZhN3zGl76xrvsT1le1Nwz2cWzVg2b4V2xrDHG3O4sRUMmHNAdXbabGKjpIXONiilNeFEqofrCE= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1717568600; c=relaxed/simple; bh=oL3WauKs3cetcJ7+VMwk4KRaYBrHq4T6YfhZNrHec1Y=; h=DKIM-Signature:DKIM-Signature:DKIM-Signature:DKIM-Signature:Date: From:To:Subject:MIME-Version; b=sj0A62IYImLY37IinQyQflBT76PJed5l8n/9qsQwmEx933wITjih+4tCcd73fSDxqiinRjait8iYPOcmjhvJt6DJg+gL0fegso+HEfUX6phikjYm0l1ZOf1WZKPb3/X6iHCzDDBx+UhfE+bhQNihaHw8WTaNgvjxWEBQ0t9HLcw= ARC-Authentication-Results: i=1; server2.sourceware.org Received: from murzim.nue2.suse.org (unknown [10.168.4.243]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id 8C36221A31 for ; Wed, 5 Jun 2024 06:23:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1717568596; h=from:from:reply-to:date:date:to:to:cc:mime-version:mime-version: content-type:content-type; bh=z9u8eZjmQ1J/82lhN+Az763lWE4OO3lkYFFdmgFTsaI=; b=nUiuvAKRkTxOpen20MiNkGO72gwh9uIGAXRV6RI68SHJZMh7o3AJI54B1HOd9hcjVzmiaH dOUfY3sBAWnmH20Z2ZdQkHio7RQHJIB5ch5yjcjYa1G7cbQdVJkU3XABf57AJud0AkOLnh FcS6UVQfEJme3UOiqVzZJBB4ofEGb2s= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1717568596; h=from:from:reply-to:date:date:to:to:cc:mime-version:mime-version: content-type:content-type; bh=z9u8eZjmQ1J/82lhN+Az763lWE4OO3lkYFFdmgFTsaI=; b=cMPbllNSblFnScELXgNntZHt30k4L95tKFzlpif/yg9kBVahyZ9CAbnCiwwtaoM/jEdrKg R1o8WdFPvZQ3WEDQ== Authentication-Results: smtp-out1.suse.de; none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1717568595; h=from:from:reply-to:date:date:to:to:cc:mime-version:mime-version: content-type:content-type; bh=z9u8eZjmQ1J/82lhN+Az763lWE4OO3lkYFFdmgFTsaI=; b=q+v6CHt6FJ+l/AsBgH2TjWbpvkYibm/Y5EqBIE4mY5hR4doIM9mUO17uJ8Yd20MdXCGbBk T7fGldRf4jm/YuyemYIsowpYJr1Qoyp1JV/S+DXDbVaxq5DkR0hq5TlAP+peWyVPpe3A+S rwZIesi3vPttiTCJ/HKX5m7os8NeayY= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1717568595; h=from:from:reply-to:date:date:to:to:cc:mime-version:mime-version: content-type:content-type; bh=z9u8eZjmQ1J/82lhN+Az763lWE4OO3lkYFFdmgFTsaI=; b=J07SUROFuozV1Q9aKNmbqg9bJfaUwj9So4YM3z3hdTSQiXHZYYKe7xuBoDSVmHCb9IARM6 hz1cbqH3+P3QKSBw== Date: Wed, 5 Jun 2024 08:23:15 +0200 (CEST) From: Richard Biener To: gcc-patches@gcc.gnu.org Subject: [PATCH 4/4] RISC-V: Allow single-lane SLP in-order reductions MIME-Version: 1.0 X-Spam-Level: X-Spamd-Result: default: False [0.57 / 50.00]; BAYES_HAM(-3.00)[100.00%]; MISSING_MID(2.50)[]; NEURAL_SPAM_SHORT(2.06)[0.687]; NEURAL_HAM_LONG(-0.89)[-0.886]; MIME_GOOD(-0.10)[text/plain]; ARC_NA(0.00)[]; FUZZY_BLOCKED(0.00)[rspamd.com]; RCPT_COUNT_ONE(0.00)[1]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; TO_MATCH_ENVRCPT_ALL(0.00)[]; FROM_HAS_DN(0.00)[]; MISSING_XM_UA(0.00)[]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+]; TO_DN_NONE(0.00)[]; RCVD_COUNT_ZERO(0.00)[0]; DBL_BLOCKED_OPENRESOLVER(0.00)[gcc.target:url,murzim.nue2.suse.org:helo] X-Spam-Score: 0.57 X-Spam-Status: No, score=-10.5 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, KAM_SHORT, MISSING_MID, SPF_HELO_NONE, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org Message-Id: <20240605062343.C7F8138CCBF2@sourceware.org> The single-lane case isn't different from non-SLP, no re-association implied. But the transform stage cannot handle a conditional reduction op which isn't checked during analysis - this makes it work, exercised with a single-lane non-reduction-chain by gcc.target/i386/pr112464.c * tree-vect-loop.cc (vectorizable_reduction): Allow single-lane SLP in-order reductions. (vectorize_fold_left_reduction): Handle SLP reduction with conditional reduction op. --- gcc/tree-vect-loop.cc | 48 +++++++++++++++++-------------------------- 1 file changed, 19 insertions(+), 29 deletions(-) diff --git a/gcc/tree-vect-loop.cc b/gcc/tree-vect-loop.cc index b9e8e9b5559..ceb92156b58 100644 --- a/gcc/tree-vect-loop.cc +++ b/gcc/tree-vect-loop.cc @@ -7139,56 +7139,46 @@ vectorize_fold_left_reduction (loop_vec_info loop_vinfo, gcc_assert (TREE_CODE_LENGTH (tree_code (code)) == binary_op); if (slp_node) - { - if (is_cond_op) - { - if (dump_enabled_p ()) - dump_printf_loc (MSG_MISSED_OPTIMIZATION, vect_location, - "fold-left reduction on SLP not supported.\n"); - return false; - } - - gcc_assert (known_eq (TYPE_VECTOR_SUBPARTS (vectype_out), - TYPE_VECTOR_SUBPARTS (vectype_in))); - } + gcc_assert (known_eq (TYPE_VECTOR_SUBPARTS (vectype_out), + TYPE_VECTOR_SUBPARTS (vectype_in))); /* The operands either come from a binary operation or an IFN_COND operation. The former is a gimple assign with binary rhs and the latter is a gimple call with four arguments. */ gcc_assert (num_ops == 2 || num_ops == 4); - tree op0, opmask; - if (!is_cond_op) - op0 = ops[1 - reduc_index]; - else - { - op0 = ops[2 + (1 - reduc_index)]; - opmask = ops[0]; - gcc_assert (!slp_node); - } int group_size = 1; stmt_vec_info scalar_dest_def_info; auto_vec vec_oprnds0, vec_opmask; if (slp_node) { - auto_vec > vec_defs (2); - vect_get_slp_defs (loop_vinfo, slp_node, &vec_defs); - vec_oprnds0.safe_splice (vec_defs[1 - reduc_index]); - vec_defs[0].release (); - vec_defs[1].release (); + vect_get_slp_defs (SLP_TREE_CHILDREN (slp_node)[(is_cond_op ? 2 : 0) + + (1 - reduc_index)], + &vec_oprnds0); group_size = SLP_TREE_SCALAR_STMTS (slp_node).length (); scalar_dest_def_info = SLP_TREE_SCALAR_STMTS (slp_node)[group_size - 1]; + /* For an IFN_COND_OP we also need the vector mask operand. */ + if (is_cond_op) + vect_get_slp_defs (SLP_TREE_CHILDREN (slp_node)[0], &vec_opmask); } else { + tree op0, opmask; + if (!is_cond_op) + op0 = ops[1 - reduc_index]; + else + { + op0 = ops[2 + (1 - reduc_index)]; + opmask = ops[0]; + } vect_get_vec_defs_for_operand (loop_vinfo, stmt_info, 1, op0, &vec_oprnds0); scalar_dest_def_info = stmt_info; /* For an IFN_COND_OP we also need the vector mask operand. */ if (is_cond_op) - vect_get_vec_defs_for_operand (loop_vinfo, stmt_info, 1, - opmask, &vec_opmask); + vect_get_vec_defs_for_operand (loop_vinfo, stmt_info, 1, + opmask, &vec_opmask); } gimple *sdef = vect_orig_stmt (scalar_dest_def_info)->stmt; @@ -8210,7 +8200,7 @@ vectorizable_reduction (loop_vec_info loop_vinfo, } if (reduction_type == FOLD_LEFT_REDUCTION - && slp_node + && (slp_node && SLP_TREE_LANES (slp_node) > 1) && !REDUC_GROUP_FIRST_ELEMENT (stmt_info)) { /* We cannot use in-order reductions in this case because there is