From patchwork Tue Oct 15 12:04:35 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Biener X-Patchwork-Id: 1997364 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=bJ7tcR6I; dkim=pass header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=zdCm/36Q; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=bJ7tcR6I; dkim=neutral header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=zdCm/36Q; 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 4XSXpp3Lc1z1xsc for ; Tue, 15 Oct 2024 23:05:06 +1100 (AEDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id A0C62385800F for ; Tue, 15 Oct 2024 12:05:04 +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 D27793858D21 for ; Tue, 15 Oct 2024 12:04:36 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org D27793858D21 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 D27793858D21 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=1728993880; cv=none; b=Bbu/kwBqjkONhPRRvGCKVuI01FLrTns3ZBllRoI9SbK9R7hT8R9wFuhNyB8GWZhrxgKSV8Zrv6zCIl+Iog/cehqAhB0XYe9pcwTGBre1UbI4T8qU9bjqBduoD67Dn4/nxPCD6i3pXFOasoiGNQ2ltjE9kYJOeatzhx9RZyzDWzo= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1728993880; c=relaxed/simple; bh=+EtB2AOKydu4tiCcHMT+ZGkstGHMPGwAcHbMb/uLqoc=; h=DKIM-Signature:DKIM-Signature:DKIM-Signature:DKIM-Signature:Date: From:To:Subject:MIME-Version; b=g54QGvVH+NarnOpDttXnzyhWonYdK2M7uTHpKAmrtR+NU3H7pKe1RYun73aX73o6LsNOmWB8laiXdKMkxltMkmVd9U0w/Fohi9sjSyroC2Bm0Toqxk+Z7+bwBlu0Vluc3Zlm0HQtVjKeS/G94Qz9WBi2MErnl5cZHNNduXUF0gA= 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 F06D221D88; Tue, 15 Oct 2024 12:04:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1728993876; h=from:from:reply-to:date:date:to:to:cc:cc:mime-version:mime-version: content-type:content-type; bh=mM1NVYSQo0k5CDgzqiNIx4TbEF287dMEuZXIvDc8vT8=; b=bJ7tcR6I76/3qhTbfWvhQ2Sf5Me+tu1gcHDd6x2IUpQsGALa+6dlQbaP+1YPVGQy1lELOW xFxOK0WlYx43DOkYbmYSdc9yfIrYkkwxqba9Cr/1TYvzQKsKcy/v5bDkzbi3wxA5A+8ZF2 3Vu+agPGJsQ7qaOLzrGKKxJi52/ka7c= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1728993876; h=from:from:reply-to:date:date:to:to:cc:cc:mime-version:mime-version: content-type:content-type; bh=mM1NVYSQo0k5CDgzqiNIx4TbEF287dMEuZXIvDc8vT8=; b=zdCm/36QekcwURGwTbHGMIZFW3XPX0uYv25Fp24xX8gxapQ5G4fTGF6C9UFdnsFq03bK1O ya+WXMokD2ou8aBg== Authentication-Results: smtp-out1.suse.de; none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1728993876; h=from:from:reply-to:date:date:to:to:cc:cc:mime-version:mime-version: content-type:content-type; bh=mM1NVYSQo0k5CDgzqiNIx4TbEF287dMEuZXIvDc8vT8=; b=bJ7tcR6I76/3qhTbfWvhQ2Sf5Me+tu1gcHDd6x2IUpQsGALa+6dlQbaP+1YPVGQy1lELOW xFxOK0WlYx43DOkYbmYSdc9yfIrYkkwxqba9Cr/1TYvzQKsKcy/v5bDkzbi3wxA5A+8ZF2 3Vu+agPGJsQ7qaOLzrGKKxJi52/ka7c= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1728993876; h=from:from:reply-to:date:date:to:to:cc:cc:mime-version:mime-version: content-type:content-type; bh=mM1NVYSQo0k5CDgzqiNIx4TbEF287dMEuZXIvDc8vT8=; b=zdCm/36QekcwURGwTbHGMIZFW3XPX0uYv25Fp24xX8gxapQ5G4fTGF6C9UFdnsFq03bK1O ya+WXMokD2ou8aBg== Date: Tue, 15 Oct 2024 14:04:35 +0200 (CEST) From: Richard Biener To: gcc-patches@gcc.gnu.org cc: RISC-V CI Subject: [PATCH 3/3] Avoid using SLP_TREE_LOAD_PERMUTATION for non-grouped SLP loads MIME-Version: 1.0 X-Spam-Score: -1.53 X-Spamd-Result: default: False [-1.53 / 50.00]; BAYES_HAM(-3.00)[100.00%]; MISSING_MID(2.50)[]; NEURAL_HAM_LONG(-0.74)[-0.738]; NEURAL_HAM_SHORT(-0.20)[-0.986]; MIME_GOOD(-0.10)[text/plain]; MISSING_XM_UA(0.00)[]; RCVD_COUNT_ZERO(0.00)[0]; ARC_NA(0.00)[]; RCPT_COUNT_TWO(0.00)[2]; FROM_HAS_DN(0.00)[]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+]; TO_MATCH_ENVRCPT_ALL(0.00)[]; FUZZY_BLOCKED(0.00)[rspamd.com]; TO_DN_SOME(0.00)[] X-Spam-Level: X-Spam-Status: No, score=-10.6 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, MISSING_MID, SPF_HELO_NONE, SPF_PASS, TXREP 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: <20241015120504.A0C62385800F@sourceware.org> The following makes sure to use a VEC_PERM SLP node to produce lane duplications for non-grouped SLP loads as those are later not lowered by load permutation lowering. For some reason gcc.dg/vect/pr106081.c now fails permute optimizing, in particular eliding vector reversal for the reduction. Bootstrapped on x86_64-unknown-linux-gnu, testing in progress. * tree-vect-slp.cc (vect_build_slp_tree_2): Use a VEC_PERM SLP node to duplicate lanes for non-grouped loads. * gcc.dg/vect/pr106081.c: Adjust. --- gcc/testsuite/gcc.dg/vect/pr106081.c | 2 +- gcc/tree-vect-slp.cc | 38 +++++++++++++++++++++++++++- 2 files changed, 38 insertions(+), 2 deletions(-) diff --git a/gcc/testsuite/gcc.dg/vect/pr106081.c b/gcc/testsuite/gcc.dg/vect/pr106081.c index 8f97af2d642..1864320c803 100644 --- a/gcc/testsuite/gcc.dg/vect/pr106081.c +++ b/gcc/testsuite/gcc.dg/vect/pr106081.c @@ -30,4 +30,4 @@ test(double *k) } /* { dg-final { scan-tree-dump "vectorized 1 loops" "vect" } } */ -/* { dg-final { scan-tree-dump-times "VEC_PERM" 4 "optimized" { target x86_64-*-* i?86-*-* } } } */ +/* { dg-final { scan-tree-dump-times "VEC_PERM" 5 "optimized" { target x86_64-*-* i?86-*-* } } } */ diff --git a/gcc/tree-vect-slp.cc b/gcc/tree-vect-slp.cc index af00c5e35dd..b34064103bd 100644 --- a/gcc/tree-vect-slp.cc +++ b/gcc/tree-vect-slp.cc @@ -2088,7 +2088,43 @@ vect_build_slp_tree_2 (vec_info *vinfo, slp_tree node, } else { - SLP_TREE_LOAD_PERMUTATION (node) = load_permutation; + if (!STMT_VINFO_GROUPED_ACCESS (stmt_info)) + { + /* Do not use SLP_TREE_LOAD_PERMUTATION for non-grouped + accesses. Instead when duplicated to so via a + VEC_PERM node. */ + if (!any_permute) + load_permutation.release (); + else + { + gcc_assert (group_size != 1); + vec stmts2; + stmts2.create (1); + stmts2.quick_push (stmt_info); + bool matches2; + slp_tree unperm_load + = vect_build_slp_tree (vinfo, stmts2, 1, + &this_max_nunits, &matches2, + limit, &this_tree_size, bst_map); + gcc_assert (unperm_load); + lane_permutation_t lperm; + lperm.create (group_size); + for (unsigned j = 0; j < load_permutation.length (); ++j) + { + gcc_assert (load_permutation[j] == 0); + lperm.quick_push (std::make_pair (0, 0)); + } + SLP_TREE_CODE (node) = VEC_PERM_EXPR; + SLP_TREE_CHILDREN (node).safe_push (unperm_load); + SLP_TREE_LANE_PERMUTATION (node) = lperm; + load_permutation.release (); + *max_nunits = this_max_nunits; + (*tree_size)++; + return node; + } + } + else + SLP_TREE_LOAD_PERMUTATION (node) = load_permutation; return node; } }