From patchwork Fri Oct 4 09:57:45 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Biener X-Patchwork-Id: 1992670 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=T1Fa1xBc; dkim=pass header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=b0QjzQuu; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=T1Fa1xBc; dkim=neutral header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=b0QjzQuu; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=8.43.85.97; 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 [8.43.85.97]) (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 4XKkWR73wLz1xt7 for ; Fri, 4 Oct 2024 19:58:11 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 3246B3849AD7 for ; Fri, 4 Oct 2024 09:58:10 +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 89135385E027 for ; Fri, 4 Oct 2024 09:57:47 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 89135385E027 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 89135385E027 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=1728035869; cv=none; b=l5Qw1iUEcDGm3SjhWwvX7/BuUyyV6Mf+c4abkmeOIiKrNYQZmc1n/emAVtxap34A8hNVP6XBq5ZKximzCjvBDKp6c8o2ilIGVqzibMMHp9frAJvark0GKAt3Fv/BmcofqMzuf0gqyA2Yf7hROeo3c14Qn7yJR327z9Lxooz0kiA= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1728035869; c=relaxed/simple; bh=TYDGc6q+nJ1GTy9gqwRGcyV0FDGPOHZ3j4+/kQL046k=; h=DKIM-Signature:DKIM-Signature:DKIM-Signature:DKIM-Signature:Date: From:To:Subject:MIME-Version:Message-Id; b=AY7pmUZ15dTB9Sbo6vAL8fEbIU5OYssfI0SOvgCM4cx30u7kbowaoNfyTisZGFCaXfZQ+F+D2sCsUH8Jw7Jl4Z6l7oavUZyp3jntAldTNONOU3yoqb0ruAppQgQ8V6iX8bgcJdpsVN95h/1XH69+3ZAcZSfZn6dXovzoOO7iYpo= ARC-Authentication-Results: i=1; server2.sourceware.org Received: from imap1.dmz-prg2.suse.org (imap1.dmz-prg2.suse.org [IPv6:2a07:de40:b281:104:10:150:64:97]) (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 80CD721E59; Fri, 4 Oct 2024 09:57:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1728035866; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type; bh=pFwgaaogC3DAEhS+xi8512YnaXOJh48oP5UMV+yPCuA=; b=T1Fa1xBcBdXQtVKLXV6Icmuajbqw4jfM3R7WvtudJr3N0VEZBHJbaC3ulk1SItqJZ9EP9J hEMkEhAaRsPvV8kvU0uspzaGEY+NLszt5UVGeqSOtp0D5n4WuRy5i3Y/N7nYQf9NO0jDJG zydJNjjvhIzR07TQz0+5xQLl5NwEv5M= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1728035866; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type; bh=pFwgaaogC3DAEhS+xi8512YnaXOJh48oP5UMV+yPCuA=; b=b0QjzQuuNCAnrrCfDAOcu7uhN7IFI/HNXucSi2sesXRlghkNSTQcR5jK7hVcmUfdHjYXXL XxGkbjyFuWULPiDQ== Authentication-Results: smtp-out1.suse.de; dkim=pass header.d=suse.de header.s=susede2_rsa header.b=T1Fa1xBc; dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b=b0QjzQuu DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1728035866; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type; bh=pFwgaaogC3DAEhS+xi8512YnaXOJh48oP5UMV+yPCuA=; b=T1Fa1xBcBdXQtVKLXV6Icmuajbqw4jfM3R7WvtudJr3N0VEZBHJbaC3ulk1SItqJZ9EP9J hEMkEhAaRsPvV8kvU0uspzaGEY+NLszt5UVGeqSOtp0D5n4WuRy5i3Y/N7nYQf9NO0jDJG zydJNjjvhIzR07TQz0+5xQLl5NwEv5M= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1728035866; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type; bh=pFwgaaogC3DAEhS+xi8512YnaXOJh48oP5UMV+yPCuA=; b=b0QjzQuuNCAnrrCfDAOcu7uhN7IFI/HNXucSi2sesXRlghkNSTQcR5jK7hVcmUfdHjYXXL XxGkbjyFuWULPiDQ== Received: from imap1.dmz-prg2.suse.org (localhost [127.0.0.1]) (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 imap1.dmz-prg2.suse.org (Postfix) with ESMTPS id 619B013A6E; Fri, 4 Oct 2024 09:57:46 +0000 (UTC) Received: from dovecot-director2.suse.de ([2a07:de40:b281:106:10:150:64:167]) by imap1.dmz-prg2.suse.org with ESMTPSA id YthTFhq8/2bAEwAAD6G6ig (envelope-from ); Fri, 04 Oct 2024 09:57:46 +0000 Date: Fri, 4 Oct 2024 11:57:45 +0200 (CEST) From: Richard Biener To: gcc-patches@gcc.gnu.org cc: RISC-V Subject: [PATCH] Improve load permutation lowering MIME-Version: 1.0 Message-Id: <20241004095746.619B013A6E@imap1.dmz-prg2.suse.org> X-Rspamd-Queue-Id: 80CD721E59 X-Spam-Level: X-Spamd-Result: default: False [-4.51 / 50.00]; BAYES_HAM(-3.00)[100.00%]; NEURAL_HAM_LONG(-1.00)[-1.000]; R_DKIM_ALLOW(-0.20)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; NEURAL_HAM_SHORT(-0.20)[-1.000]; MIME_GOOD(-0.10)[text/plain]; MX_GOOD(-0.01)[]; FUZZY_BLOCKED(0.00)[rspamd.com]; ARC_NA(0.00)[]; MISSING_XM_UA(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; MIME_TRACE(0.00)[0:+]; RCPT_COUNT_TWO(0.00)[2]; RCVD_TLS_ALL(0.00)[]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; FROM_EQ_ENVFROM(0.00)[]; FROM_HAS_DN(0.00)[]; TO_DN_SOME(0.00)[]; RCVD_COUNT_TWO(0.00)[2]; TO_MATCH_ENVRCPT_ALL(0.00)[]; DBL_BLOCKED_OPENRESOLVER(0.00)[imap1.dmz-prg2.suse.org:mid,imap1.dmz-prg2.suse.org:helo,imap1.dmz-prg2.suse.org:rdns,suse.de:dkim]; DKIM_TRACE(0.00)[suse.de:+] X-Rspamd-Server: rspamd2.dmz-prg2.suse.org X-Rspamd-Action: no action X-Spam-Score: -4.51 X-Spam-Status: No, score=-11.7 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, 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 The following makes sure the emitted even/odd extraction scheme follows one that ends up with actual trivial even/odd extract permutes. When we choose a level 2 extract we generate { 0, 1, 4, 5, ... } which for example the x86 backend doesn't recognize with just SSE and QImode elements. So this now follows what the non-SLP interleaving code would do which is element granular even/odd extracts. This resolves gcc.dg/vect/vect-strided[-a]-u8-i8-gap*.c FAILs with --param vect-force-slp=1 on x86_64. Bootstrapped on x86_64-unknown-linux-gnu, testing in progress. * tree-vect-slp.cc (vect_lower_load_permutations): Prefer level 1 even/odd extracts. --- gcc/tree-vect-slp.cc | 31 +++++++++++++++++-------------- 1 file changed, 17 insertions(+), 14 deletions(-) diff --git a/gcc/tree-vect-slp.cc b/gcc/tree-vect-slp.cc index 482b9d50496..2274d0e428e 100644 --- a/gcc/tree-vect-slp.cc +++ b/gcc/tree-vect-slp.cc @@ -4426,25 +4426,28 @@ vect_lower_load_permutations (loop_vec_info loop_vinfo, /* Now build an even or odd extraction from the unpermuted load. */ lane_permutation_t perm; perm.create ((group_lanes + 1) / 2); - unsigned level; - if (even - && ((level = 1 << ctz_hwi (even)), true) - && group_lanes % (2 * level) == 0) + unsigned even_level = even ? 1 << ctz_hwi (even) : 0; + unsigned odd_level = odd ? 1 << ctz_hwi (odd) : 0; + if (even_level + && group_lanes % (2 * even_level) == 0 + /* ??? When code generating permutes we do not try to pun + to larger component modes so level != 1 isn't a natural + even/odd extract. Prefer one if possible. */ + && (even_level == 1 || !odd_level || odd_level != 1)) { /* { 0, 1, ... 4, 5 ..., } */ - unsigned level = 1 << ctz_hwi (even); - for (unsigned i = 0; i < group_lanes / 2 / level; ++i) - for (unsigned j = 0; j < level; ++j) - perm.quick_push (std::make_pair (0, 2 * i * level + j)); + for (unsigned i = 0; i < group_lanes / 2 / even_level; ++i) + for (unsigned j = 0; j < even_level; ++j) + perm.quick_push (std::make_pair (0, 2 * i * even_level + j)); } - else if (odd) + else if (odd_level) { /* { ..., 2, 3, ... 6, 7 } */ - unsigned level = 1 << ctz_hwi (odd); - gcc_assert (group_lanes % (2 * level) == 0); - for (unsigned i = 0; i < group_lanes / 2 / level; ++i) - for (unsigned j = 0; j < level; ++j) - perm.quick_push (std::make_pair (0, (2 * i + 1) * level + j)); + gcc_assert (group_lanes % (2 * odd_level) == 0); + for (unsigned i = 0; i < group_lanes / 2 / odd_level; ++i) + for (unsigned j = 0; j < odd_level; ++j) + perm.quick_push + (std::make_pair (0, (2 * i + 1) * odd_level + j)); } else {