From patchwork Tue Oct 15 12:04:16 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Biener X-Patchwork-Id: 1997363 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=liHsJfOa; dkim=pass header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=cuuN4Q0r; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=0sU5J16M; dkim=neutral header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=TElPf5Ls; 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 4XSXpY6MxLz1xvP for ; Tue, 15 Oct 2024 23:04:53 +1100 (AEDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 87D0F3857C6C for ; Tue, 15 Oct 2024 12:04:51 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from smtp-out2.suse.de (smtp-out2.suse.de [IPv6:2a07:de40:b251:101:10:150:64:2]) by sourceware.org (Postfix) with ESMTPS id E34D0385841D for ; Tue, 15 Oct 2024 12:04:17 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org E34D0385841D 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 E34D0385841D Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2a07:de40:b251:101:10:150:64:2 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1728993865; cv=none; b=yFq8ofCe0pwAiDG6U0jnClUeeMRv9alLmRrlzXzEPCE55oyA0NfRXyT1diHmvF3cgn5pBUb0aCqw9QNeCAxOrwxCHuAMEgcT4wz6auUpyjcWq4z+tPEx+bbhPdSGydHL0ldFycC8uCuz8eXRjLCiQc6iISBZRnQz0c9D0N07nNQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1728993865; c=relaxed/simple; bh=wQY7emxBQM4tLusfovf8NlU/BNazCKiXtOesaSlv5bU=; h=DKIM-Signature:DKIM-Signature:DKIM-Signature:DKIM-Signature:Date: From:To:Subject:MIME-Version; b=lifdRRAiqUmIBW32YN3ZzdQLRV7+GRPrMg0v59PV5BQuvnSda/PuYWdbRz/a/ZRc02xDqHz9AA12axHukoMHNIs7Tk95tgSsE7yI7CHA5LlqTZZa2l4GGgisELDWEhTXq1KXy4v7AjoTWftVrMicBR8Yb/HcIzJxrlYBqyPCTME= 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-out2.suse.de (Postfix) with ESMTPS id DD71A1FB9A; Tue, 15 Oct 2024 12:04:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1728993857; h=from:from:reply-to:date:date:to:to:cc:cc:mime-version:mime-version: content-type:content-type; bh=07K/F/6HxiMVxvWt9b2xSeiyYqu7eOi5tPI5deAWmGw=; b=liHsJfOaFQlPk4KvKBRXcJ9bN25FHsW9oJrLWwaH3Foj9LzqvZ8Eb5LWTAPTjhY8T4cydM 4ZhByjdzHaejDdKT9SHMNaWkKhkoJaz21cqaP6HMuWXuAVM3x3W08jQic5OziakSGxp8Rt e+3Xix5woyQMLhGH3z01tQRSujUU2J4= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1728993857; h=from:from:reply-to:date:date:to:to:cc:cc:mime-version:mime-version: content-type:content-type; bh=07K/F/6HxiMVxvWt9b2xSeiyYqu7eOi5tPI5deAWmGw=; b=cuuN4Q0rbCeG4i5wMk6fQpetlLwiEwGpnaDhDZDPazwePXyP6dvZgUrBglYdhftuaGuVlH J35T6b+JYFQYK3Cw== Authentication-Results: smtp-out2.suse.de; none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1728993856; h=from:from:reply-to:date:date:to:to:cc:cc:mime-version:mime-version: content-type:content-type; bh=07K/F/6HxiMVxvWt9b2xSeiyYqu7eOi5tPI5deAWmGw=; b=0sU5J16MeYGIqjkFGDiOafU5Kaduedjx52ZH3tRokXBJU/HkHtArsBOBdOkIcWmcitm64m yWcEjuU76tNTH0TFGj7hxQ+Z/DCiXAu3YO1eR114JfCfFjShay1og+nbKO2TtPKGpkIG1Y gJnbmtTZtg9dkFCFz7O9g52IpYPg1Gs= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1728993856; h=from:from:reply-to:date:date:to:to:cc:cc:mime-version:mime-version: content-type:content-type; bh=07K/F/6HxiMVxvWt9b2xSeiyYqu7eOi5tPI5deAWmGw=; b=TElPf5LsShHYT/LmxTOnTloWfsdTEG5JtHhlIsBjcx1YFX0WkQDq+O6LQ3+s3xTjHK+3q1 HNQ67IFXpwZU0eBA== Date: Tue, 15 Oct 2024 14:04:16 +0200 (CEST) From: Richard Biener To: gcc-patches@gcc.gnu.org cc: RISC-V CI Subject: [PATCH 2/3] tree-optimization/117050 - fix ICE with non-grouped .MASK_LOAD SLP MIME-Version: 1.0 X-Spam-Level: X-Spamd-Result: default: False [-1.54 / 50.00]; BAYES_HAM(-3.00)[100.00%]; MISSING_MID(2.50)[]; NEURAL_HAM_LONG(-0.74)[-0.741]; 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-Score: -1.54 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: <20241015120451.87D0F3857C6C@sourceware.org> The following is a more complete fix for PR117050, restoring the ability to permute non-grouped .MASK_LOAD with. Bootstrapped on x86_64-unknown-linux-gnu, testing in progress. PR tree-optimization/117050 * tree-vect-slp.cc (vect_build_slp_tree_2): Properly handle non-grouped masked loads when handling permutations. --- gcc/tree-vect-slp.cc | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/gcc/tree-vect-slp.cc b/gcc/tree-vect-slp.cc index 959468cad8a..af00c5e35dd 100644 --- a/gcc/tree-vect-slp.cc +++ b/gcc/tree-vect-slp.cc @@ -1991,7 +1991,8 @@ vect_build_slp_tree_2 (vec_info *vinfo, slp_tree node, stmt_vec_info load_info; load_permutation.create (group_size); stmt_vec_info first_stmt_info - = DR_GROUP_FIRST_ELEMENT (SLP_TREE_SCALAR_STMTS (node)[0]); + = STMT_VINFO_GROUPED_ACCESS (stmt_info) + ? DR_GROUP_FIRST_ELEMENT (stmt_info) : stmt_info; bool any_permute = false; bool any_null = false; FOR_EACH_VEC_ELT (SLP_TREE_SCALAR_STMTS (node), j, load_info) @@ -2035,8 +2036,7 @@ vect_build_slp_tree_2 (vec_info *vinfo, slp_tree node, loads with gaps. */ if ((STMT_VINFO_GROUPED_ACCESS (stmt_info) && (DR_GROUP_GAP (first_stmt_info) != 0 || has_gaps)) - || STMT_VINFO_STRIDED_P (stmt_info) - || (!STMT_VINFO_GROUPED_ACCESS (stmt_info) && any_permute)) + || STMT_VINFO_STRIDED_P (stmt_info)) { load_permutation.release (); matches[0] = false; @@ -2051,17 +2051,17 @@ vect_build_slp_tree_2 (vec_info *vinfo, slp_tree node, { /* Discover the whole unpermuted load. */ vec stmts2; - stmts2.create (DR_GROUP_SIZE (first_stmt_info)); - stmts2.quick_grow_cleared (DR_GROUP_SIZE (first_stmt_info)); + unsigned dr_group_size = STMT_VINFO_GROUPED_ACCESS (stmt_info) + ? DR_GROUP_SIZE (first_stmt_info) : 1; + stmts2.create (dr_group_size); + stmts2.quick_grow_cleared (dr_group_size); unsigned i = 0; for (stmt_vec_info si = first_stmt_info; si; si = DR_GROUP_NEXT_ELEMENT (si)) stmts2[i++] = si; - bool *matches2 - = XALLOCAVEC (bool, DR_GROUP_SIZE (first_stmt_info)); + bool *matches2 = XALLOCAVEC (bool, dr_group_size); slp_tree unperm_load - = vect_build_slp_tree (vinfo, stmts2, - DR_GROUP_SIZE (first_stmt_info), + = vect_build_slp_tree (vinfo, stmts2, dr_group_size, &this_max_nunits, matches2, limit, &this_tree_size, bst_map); /* When we are able to do the full masked load emit that