From patchwork Wed Jun 26 17:26:44 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Biener X-Patchwork-Id: 1952738 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=fQBlNb+/; dkim=pass header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=USJot56t; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=fQBlNb+/; dkim=neutral header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=USJot56t; 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 4W8TDP5361z20X1 for ; Thu, 27 Jun 2024 03:27:49 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 076F43875409 for ; Wed, 26 Jun 2024 17:27:48 +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 [195.135.223.130]) by sourceware.org (Postfix) with ESMTPS id 879A1383E53F for ; Wed, 26 Jun 2024 17:26:50 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 879A1383E53F 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 879A1383E53F Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=195.135.223.130 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1719422812; cv=none; b=GdOASHoy4qERrpN8E2xl6YZHEzl19BotYRJIUywyRT6rxRyDKiamRlkA7Y1s33ht1JrOF6XyBJm9551yIaLt5YEj2AkY3hEf/zgUslaT5Gvf21qSP+yJlv2o4Q7bBUDC57csNC3RmvbqQV/3HOGfez/+Jp+2BDF0NBlD2DeziEY= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1719422812; c=relaxed/simple; bh=8wVv297hRYDW8ySYqviixdrNQUdtgwGhm1pYYptqIfs=; h=DKIM-Signature:DKIM-Signature:DKIM-Signature:DKIM-Signature:Date: From:To:Subject:MIME-Version:Message-Id; b=MhhehH8G5KrqlfKXlxgFEEypJNdMO9xMMO6uP86AiLtLA6KgRUcVgF7dxY8Ge/RrJSbkCIEinf0TaL2SRVo3ZVHEOQWshS2r2hu92KVczz0ajmggHlF+ta1suzNmlHVY4XmHygGqDrQtf32fmk8GT7pI2bG/aB7xNzjb4PHi17s= ARC-Authentication-Results: i=1; server2.sourceware.org Received: from imap1.dmz-prg2.suse.org (unknown [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 4AEAD21A5E for ; Wed, 26 Jun 2024 17:26:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1719422809; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version:content-type:content-type; bh=e2InwLgFRwObHGr12F44WrM1rPtDEZrbjJLNKrJOnZ0=; b=fQBlNb+//XgPfAexsk+jyJHML8xos+CmSNtNloUSeHXWuOa2kzUx/KQKH4pCtIp0uCFyse RiCACk1iSUA5s7Y4McUK06cxar4mJUKzrVfWAbYSn1y5HVv/i4usWunBx8rcggzBbantBN rOkRbz3VTamSsbIzZVT0AlYTeYCz8nA= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1719422809; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version:content-type:content-type; bh=e2InwLgFRwObHGr12F44WrM1rPtDEZrbjJLNKrJOnZ0=; b=USJot56t8MFJtymBiO6R+qGPbZOjmnn7btPwfeTdMzLbp461ph5AK7ataI9cEf7iEdt0rJ FZ3rx49G56KnZ8BQ== Authentication-Results: smtp-out1.suse.de; none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1719422809; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version:content-type:content-type; bh=e2InwLgFRwObHGr12F44WrM1rPtDEZrbjJLNKrJOnZ0=; b=fQBlNb+//XgPfAexsk+jyJHML8xos+CmSNtNloUSeHXWuOa2kzUx/KQKH4pCtIp0uCFyse RiCACk1iSUA5s7Y4McUK06cxar4mJUKzrVfWAbYSn1y5HVv/i4usWunBx8rcggzBbantBN rOkRbz3VTamSsbIzZVT0AlYTeYCz8nA= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1719422809; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version:content-type:content-type; bh=e2InwLgFRwObHGr12F44WrM1rPtDEZrbjJLNKrJOnZ0=; b=USJot56t8MFJtymBiO6R+qGPbZOjmnn7btPwfeTdMzLbp461ph5AK7ataI9cEf7iEdt0rJ FZ3rx49G56KnZ8BQ== 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 28A3713AAD for ; Wed, 26 Jun 2024 17:26:49 +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 YURPCFlPfGbPDwAAD6G6ig (envelope-from ) for ; Wed, 26 Jun 2024 17:26:49 +0000 Date: Wed, 26 Jun 2024 19:26:44 +0200 (CEST) From: Richard Biener To: gcc-patches@gcc.gnu.org Subject: [PATCH] RISC-V: tree-optimization/115652 - amend last fix MIME-Version: 1.0 Message-Id: <20240626172649.28A3713AAD@imap1.dmz-prg2.suse.org> X-Spam-Score: -4.30 X-Spam-Level: X-Spamd-Result: default: False [-4.30 / 50.00]; BAYES_HAM(-3.00)[100.00%]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_SHORT(-0.20)[-1.000]; MIME_GOOD(-0.10)[text/plain]; RCVD_VIA_SMTP_AUTH(0.00)[]; ARC_NA(0.00)[]; RCPT_COUNT_ONE(0.00)[1]; MIME_TRACE(0.00)[0:+]; MISSING_XM_UA(0.00)[]; RCVD_TLS_ALL(0.00)[]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; PREVIOUSLY_DELIVERED(0.00)[gcc-patches@gcc.gnu.org]; FROM_EQ_ENVFROM(0.00)[]; FROM_HAS_DN(0.00)[]; FUZZY_BLOCKED(0.00)[rspamd.com]; RCVD_COUNT_TWO(0.00)[2]; TO_MATCH_ENVRCPT_ALL(0.00)[]; TO_DN_NONE(0.00)[]; DBL_BLOCKED_OPENRESOLVER(0.00)[imap1.dmz-prg2.suse.org:helo] 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 previous fix breaks in the degenerate case when the discovered last_stmt is equal to the first stmt in the block since then we undo a required stmt advancement. Bootstrap and regtest running on x86_64-unknown-linux-gnu. PR tree-optimization/115652 * tree-vect-slp.cc (vect_schedule_slp_node): Only insert at the start of the block if that strictly dominates the discovered dependent stmt. --- gcc/tree-vect-slp.cc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gcc/tree-vect-slp.cc b/gcc/tree-vect-slp.cc index 896ea6dc14c..ce214dd652e 100644 --- a/gcc/tree-vect-slp.cc +++ b/gcc/tree-vect-slp.cc @@ -9752,7 +9752,8 @@ vect_schedule_slp_node (vec_info *vinfo, { gimple_stmt_iterator si2 = gsi_after_labels (LOOP_VINFO_LOOP (loop_vinfo)->header); - if (vect_stmt_dominates_stmt_p (last_stmt, *si2)) + if (last_stmt != *si2 + && vect_stmt_dominates_stmt_p (last_stmt, *si2)) si = si2; } }