From patchwork Tue Apr 16 10:36:42 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Biener X-Patchwork-Id: 1924079 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=qVl+7JDw; dkim=pass header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=VvEcihV4; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=qVl+7JDw; dkim=neutral header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=VvEcihV4; 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 4VJgTM5HkGz1yZC for ; Tue, 16 Apr 2024 20:37:11 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id E7F4A3846402 for ; Tue, 16 Apr 2024 10:37:09 +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 [195.135.223.131]) by sourceware.org (Postfix) with ESMTPS id C18783858D3C for ; Tue, 16 Apr 2024 10:36:43 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org C18783858D3C 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 C18783858D3C Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=195.135.223.131 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1713263814; cv=none; b=S7m1jreeglG4EQK4hR0UyIBpQuWB3oVwttByQFHBqyuVlvqlCarlORHzTIcYTiBgs5bfK1yLSIHsUMc87YSWkqMJg1pHIpVLhupakNyzVneMEnFekpIlY5R3T/4DR1csbXRx0K6E60negbvUPvj1XGD9xmQxJL2AhrOFDB0tvOY= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1713263814; c=relaxed/simple; bh=E7BzE0Wm3iuYRRlEUQbkRd/3fZ/gyhhItzJtKHifhQk=; h=DKIM-Signature:DKIM-Signature:DKIM-Signature:DKIM-Signature:Date: From:To:Subject:MIME-Version; b=XZ88XadIYKU0MD6qasek08wuNy3BIOozZODrYwLIqd9vStG9koRqS9jY0NewYc71i+frVWFviSqYhJLnQWrFojSjHxxByEJ3xM2fOP6A1gPQc4EGV/2GZc8AuTqlsqWZW1j9vDKOpcy+KdsATh95GV4Kpkkyvevk5Y1UzL49I6Q= ARC-Authentication-Results: i=1; server2.sourceware.org Received: from [10.168.5.241] (unknown [10.168.5.241]) (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 C51B75BCCB for ; Tue, 16 Apr 2024 10:36:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1713263802; h=from:from:reply-to:date:date:to:to:cc:mime-version:mime-version: content-type:content-type; bh=MAaRU9vrxH3/4lUyjSis1lb55c+72mco83gOygzKOkE=; b=qVl+7JDwKzLei5ofBOGWnj8nFiwGDmDyE8ri3EcrxsuvVQUYoEJa0N3f33dwr1t7QSMdM+ TusWAY/NBWyptwaNNlg01fjRfpXkl5GFFRAdVln/2TEEXOIhUCj2NQu6I/vI2remhyqMGd yOK+v2qV9U5HZ+RfX02FM5XtkTds0Vg= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1713263802; h=from:from:reply-to:date:date:to:to:cc:mime-version:mime-version: content-type:content-type; bh=MAaRU9vrxH3/4lUyjSis1lb55c+72mco83gOygzKOkE=; b=VvEcihV42TJkRMcrSg2CK7RmUmYLqENvHhTmVeJ67eIRYChXUWkl3DXdpx8KG70T7mtMsi ok68GdUFRFj/txDw== Authentication-Results: smtp-out2.suse.de; none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1713263802; h=from:from:reply-to:date:date:to:to:cc:mime-version:mime-version: content-type:content-type; bh=MAaRU9vrxH3/4lUyjSis1lb55c+72mco83gOygzKOkE=; b=qVl+7JDwKzLei5ofBOGWnj8nFiwGDmDyE8ri3EcrxsuvVQUYoEJa0N3f33dwr1t7QSMdM+ TusWAY/NBWyptwaNNlg01fjRfpXkl5GFFRAdVln/2TEEXOIhUCj2NQu6I/vI2remhyqMGd yOK+v2qV9U5HZ+RfX02FM5XtkTds0Vg= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1713263802; h=from:from:reply-to:date:date:to:to:cc:mime-version:mime-version: content-type:content-type; bh=MAaRU9vrxH3/4lUyjSis1lb55c+72mco83gOygzKOkE=; b=VvEcihV42TJkRMcrSg2CK7RmUmYLqENvHhTmVeJ67eIRYChXUWkl3DXdpx8KG70T7mtMsi ok68GdUFRFj/txDw== Date: Tue, 16 Apr 2024 12:36:42 +0200 (CEST) From: Richard Biener To: gcc-patches@gcc.gnu.org Subject: [PATCH] tree-optimization/114736 - SLP DFS walk issue MIME-Version: 1.0 X-Spam-Score: -1.66 X-Spam-Level: X-Spamd-Result: default: False [-1.66 / 50.00]; BAYES_HAM(-3.00)[100.00%]; MISSING_MID(2.50)[]; NEURAL_HAM_LONG(-0.87)[-0.874]; NEURAL_HAM_SHORT(-0.19)[-0.944]; MIME_GOOD(-0.10)[text/plain]; RCPT_COUNT_ONE(0.00)[1]; RCVD_COUNT_ZERO(0.00)[0]; ARC_NA(0.00)[]; MISSING_XM_UA(0.00)[]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; FUZZY_BLOCKED(0.00)[rspamd.com]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+]; TO_DN_NONE(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; FROM_HAS_DN(0.00)[] 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, 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: <20240416103709.E7F4A3846402@sourceware.org> The following fixes a DFS walk issue when identifying to be ignored latch edges. We have (bogus) SLP_TREE_REPRESENTATIVEs for VEC_PERM nodes so those have to be explicitly ignored as possibly being PHIs. Bootstrapped and tested on x86_64-unknown-linux-gnu, pushed. Richard. PR tree-optimization/114736 * tree-vect-slp.cc (vect_optimize_slp_pass::is_cfg_latch_edge): Do not consider VEC_PERM_EXPRs as PHI use. * gfortran.dg/vect/pr114736.f90: New testcase. --- gcc/testsuite/gfortran.dg/vect/pr114736.f90 | 14 ++++++++++++++ gcc/tree-vect-slp.cc | 3 ++- 2 files changed, 16 insertions(+), 1 deletion(-) create mode 100644 gcc/testsuite/gfortran.dg/vect/pr114736.f90 diff --git a/gcc/testsuite/gfortran.dg/vect/pr114736.f90 b/gcc/testsuite/gfortran.dg/vect/pr114736.f90 new file mode 100644 index 00000000000..cdbfb6f415a --- /dev/null +++ b/gcc/testsuite/gfortran.dg/vect/pr114736.f90 @@ -0,0 +1,14 @@ +! { dg-do compile } +! { dg-additional-options "-O3" } + +SUBROUTINE MY_ROUTINE (N, A, B ) +IMPLICIT NONE +INTEGER, INTENT(IN) :: N +COMPLEX, INTENT(IN) :: A(N) +COMPLEX, INTENT(OUT) :: B(N) +INTEGER :: II +B(:) = (1.,0.) +DO II = 1, N-1 + B(II) = A(N-II+1) / A(N-II) +ENDDO +END SUBROUTINE MY_ROUTINE diff --git a/gcc/tree-vect-slp.cc b/gcc/tree-vect-slp.cc index 2e5481acbc7..109f318c7d6 100644 --- a/gcc/tree-vect-slp.cc +++ b/gcc/tree-vect-slp.cc @@ -4328,7 +4328,8 @@ vect_optimize_slp_pass::is_cfg_latch_edge (graph_edge *ud) { slp_tree use = m_vertices[ud->src].node; slp_tree def = m_vertices[ud->dest].node; - if (SLP_TREE_DEF_TYPE (use) != vect_internal_def + if ((SLP_TREE_DEF_TYPE (use) != vect_internal_def + || SLP_TREE_CODE (use) == VEC_PERM_EXPR) || SLP_TREE_DEF_TYPE (def) != vect_internal_def) return false;