From patchwork Fri Jan 19 09:42:19 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Biener X-Patchwork-Id: 189465 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7301:2bc4:b0:101:a8e8:374 with SMTP id hx4csp897081dyb; Fri, 19 Jan 2024 01:43:29 -0800 (PST) X-Google-Smtp-Source: AGHT+IEp4lfTnToNMyUX8dPOXH4tdWyIU9O+TQyMneh9dTRMhOGk9ROp5dAPfhC7HhAnzFH2CDAR X-Received: by 2002:a0d:de83:0:b0:5ee:381a:3b33 with SMTP id h125-20020a0dde83000000b005ee381a3b33mr2156958ywe.94.1705657409610; Fri, 19 Jan 2024 01:43:29 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1705657409; cv=pass; d=google.com; s=arc-20160816; b=w2c1/FgM1iO84lyF3r6ZX9b3KNYf4evRyXFhyyZwnMD/EXXpeKKTKPWrjaCWKc8aIn tEMHXOVNXm80KMAuiP5UiijpL35es7exp0bWapDnY31fbxSlS5uXWY4Bj4mkullL/Ih8 a/aht7XgX7pe6qRd3B3LFMHQ/t6Y8tSFCAorZLL3sZm5TgxiFRIxE7MemIUc2aIQXMbS Ixw+nxhoQdPiFKtHkdsKBxZzMc+o4LSVqXThCPUrXSLFkkXmlgLQE+zmeQ4XJclJ+/ic yE+oHCSkQcXrXcAk4MVVCXoMFAO7E5p67K9cRgKbGT0V5+05O5Qd+UaBm/cblcoF9dCZ 0C3A== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:message-id:mime-version:subject :to:from:date:dkim-signature:dkim-signature:dkim-signature :dkim-signature:arc-filter:dmarc-filter:delivered-to; bh=chnTpNw9TKPimhO0t1j/+Uxukw01ESM6eBk4qcFK+7s=; fh=hPrbWPhweUx4V0GV9uXJqbyAzg2ABmTz7kczrAQqMmM=; b=A7UAFM53buXIMotzsiVfYe2edmXtPlpQre5WHftHe9r95qWurZvbFVesP2ng8ND4+E rCHy6hcdOOetx9Rvq7Gnc6MI/3Cv5wvXNYdzZOp0vTK2WKMu+EwczvAUM3KIH3IAYQKJ 04xSK+757p9zuVo+1YPzTIjNyDakdnr+aeTih0oJS2UvUTN4CcOO9cwOOTIdx6c2Q8Ry /rqacbUF2D4VQlpgWw0DhkaomNfRb+IDH2SB4SCHSP7D8bNEWyX09VToIMox17F4qn8S GmKFcTOGax3Fp/WF37tF4xdWF3zoDyuiF6Ce4KkqUa/08Ql/FZaNIaxAIgWeLwIuu4Z3 2RKw== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@suse.de header.s=susede2_rsa header.b=wZ9rckmZ; dkim=neutral (no key) header.i=@suse.de header.s=susede2_ed25519; dkim=pass header.i=@suse.de header.s=susede2_rsa header.b=dJIYVkU0; dkim=neutral (no key) header.i=@suse.de header.s=susede2_ed25519; arc=pass (i=1); spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=suse.de Received: from server2.sourceware.org (server2.sourceware.org. [8.43.85.97]) by mx.google.com with ESMTPS id x1-20020a05622a000100b0042a12a1520bsi4827046qtw.602.2024.01.19.01.43.29 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 19 Jan 2024 01:43:29 -0800 (PST) Received-SPF: pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 as permitted sender) client-ip=8.43.85.97; Authentication-Results: mx.google.com; dkim=pass header.i=@suse.de header.s=susede2_rsa header.b=wZ9rckmZ; dkim=neutral (no key) header.i=@suse.de header.s=susede2_ed25519; dkim=pass header.i=@suse.de header.s=susede2_rsa header.b=dJIYVkU0; dkim=neutral (no key) header.i=@suse.de header.s=susede2_ed25519; arc=pass (i=1); spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=suse.de Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 4EEDC3858006 for ; Fri, 19 Jan 2024 09:43:29 +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 CBD7938582A0 for ; Fri, 19 Jan 2024 09:42:22 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org CBD7938582A0 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 CBD7938582A0 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=1705657344; cv=none; b=S0a3GDpLptfmFLL9nR5x86y+lLaujmVOO2lRLV5DvnYB9cVlgqWRJrEPsZ99jnEV2eHU1LcteN9ZNmCHyCDrObWLt4piI2tp1rOZVNBOSnYhkTnMpq8pcTj1IAyrVAFH59CrXvV9qz1gl32uRCGYtdRy0uMqZYC0bq0EVmkC3BU= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1705657344; c=relaxed/simple; bh=1CUnGgwp3uX4oXpZ9yOPVSsPVIkka9166RmP1ImorUI=; h=DKIM-Signature:DKIM-Signature:DKIM-Signature:DKIM-Signature:Date: From:To:Subject:MIME-Version:Message-Id; b=RpWpWNNbXdkzq7H1wQPoZb3H+/vv6EOVZta9K5Csv9jIFsyLgqUPG2U/dDojCaQ5usud9x8gidMRMqr0DpyNDLLEhcI9J9uPkQMmxT1YE2M+8THHK3n8rdCBIhyS0pGyZ1U2mtNKKonQb3Ps/kvlH/kdGBKl74s20ddphSBeb3s= ARC-Authentication-Results: i=1; server2.sourceware.org Received: from imap1.dmz-prg2.suse.org (imap1.dmz-prg2.suse.org [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-out2.suse.de (Postfix) with ESMTPS id B72C11FD10 for ; Fri, 19 Jan 2024 09:42:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1705657340; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version:content-type:content-type; bh=chnTpNw9TKPimhO0t1j/+Uxukw01ESM6eBk4qcFK+7s=; b=wZ9rckmZ7Mf5iVDUhLOaVuEv2Y646BcmZX+Yn1ey4ZhJJQbTzq1eg/kPvu6FMLHEszXRuy BBOeQ9dN4xqsNOoVmjAa9Ox/QzjIkRMpsWnlyQtj17XYvQTWrWzGUBJR6SXKMCKEAPAUYk gMRqI0mBg8x8GyVrx1rHEaHuW1Ve/rI= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1705657340; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version:content-type:content-type; bh=chnTpNw9TKPimhO0t1j/+Uxukw01ESM6eBk4qcFK+7s=; b=gUNGj4XCXAyBNX7SX1XWoE1NYgZbTryamzEMKGaCzjdv8iYIB+0JpGjNCRJX1kAWApCdBs qckJZt3uKbFdeXCg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1705657339; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version:content-type:content-type; bh=chnTpNw9TKPimhO0t1j/+Uxukw01ESM6eBk4qcFK+7s=; b=dJIYVkU03nDSkXQnwGS5yzTeN8JaNoNIwe91sOIZtXb/A7DfHLfVUbt3ZkrKbfhe++Kcfm BKaW7f2Q21XhZYbSoWK2E4UYWIRbJXrl7QRrN7ZlWB7SJHQarQOJ/hFjhgpij2qZk1Tvyr HjCQYr/fy7B4/tzDz9Ne4ADMSXhZOfk= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1705657339; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version:content-type:content-type; bh=chnTpNw9TKPimhO0t1j/+Uxukw01ESM6eBk4qcFK+7s=; b=QlbiSOdVOA6emYXzBHBh6i8tUWWuPPMv0bmNxPkxi+RnsFAxM1OJOROy94E9eJNigY4NOX X0VZSZiDfyb8GqBA== 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 9523C1388C for ; Fri, 19 Jan 2024 09:42:19 +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 K1HgIftDqmUZWAAAD6G6ig (envelope-from ) for ; Fri, 19 Jan 2024 09:42:19 +0000 Date: Fri, 19 Jan 2024 10:42:19 +0100 (CET) From: Richard Biener To: gcc-patches@gcc.gnu.org Subject: [PATCH] tree-optimization/113494 - Fix two observed regressions with r14-8206 MIME-Version: 1.0 Message-Id: <20240119094219.9523C1388C@imap1.dmz-prg2.suse.org> Authentication-Results: smtp-out2.suse.de; none X-Spamd-Result: default: False [-0.45 / 50.00]; ARC_NA(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; FROM_HAS_DN(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MIME_GOOD(-0.10)[text/plain]; PREVIOUSLY_DELIVERED(0.00)[gcc-patches@gcc.gnu.org]; TO_DN_NONE(0.00)[]; RCPT_COUNT_ONE(0.00)[1]; RCVD_COUNT_THREE(0.00)[3]; 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:+]; RCVD_TLS_ALL(0.00)[]; BAYES_HAM(-0.35)[76.53%] X-Spam-Level: X-Spam-Score: -0.45 X-Spam-Status: No, score=-11.4 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, KAM_NUMSUBJECT, SPF_HELO_NONE, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE 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+ouuuleilei=gmail.com@gcc.gnu.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1788511424217188644 X-GMAIL-MSGID: 1788511424217188644 The following handles the situation where we lack a loop-closed PHI for a virtual operand because a loop exit goes to a code region not having any virtual use (an endless loop). It also handles the situation of edge redirection re-allocating a PHI node in the destination block so we have to re-lookup that before populating the new PHI argument. Bootstrapped and tested on x86_64-unknown-linux-gnu, pushed. PR tree-optimization/113494 * tree-vect-loop-manip.cc (slpeel_tree_duplicate_loop_to_edge_cfg): Handle endless loop on exit. Handle re-allocated PHI. --- gcc/tree-vect-loop-manip.cc | 26 +++++++++++++++++++++----- 1 file changed, 21 insertions(+), 5 deletions(-) diff --git a/gcc/tree-vect-loop-manip.cc b/gcc/tree-vect-loop-manip.cc index 983ed2e9b1f..1477906e96e 100644 --- a/gcc/tree-vect-loop-manip.cc +++ b/gcc/tree-vect-loop-manip.cc @@ -1629,11 +1629,17 @@ slpeel_tree_duplicate_loop_to_edge_cfg (class loop *loop, edge loop_exit, alt_loop_exit_block = split_edge (exit); if (!need_virtual_phi) continue; - if (vphi_def && !vphi) - vphi = create_phi_node (copy_ssa_name (vphi_def), - alt_loop_exit_block); if (vphi_def) - add_phi_arg (vphi, vphi_def, exit, UNKNOWN_LOCATION); + { + if (!vphi) + vphi = create_phi_node (copy_ssa_name (vphi_def), + alt_loop_exit_block); + else + /* Edge redirection might re-allocate the PHI node + so we have to rediscover it. */ + vphi = get_virtual_phi (alt_loop_exit_block); + add_phi_arg (vphi, vphi_def, exit, UNKNOWN_LOCATION); + } } set_immediate_dominator (CDI_DOMINATORS, new_preheader, @@ -1748,7 +1754,17 @@ slpeel_tree_duplicate_loop_to_edge_cfg (class loop *loop, edge loop_exit, if (virtual_operand_p (alt_arg)) { gphi *vphi = get_virtual_phi (alt_loop_exit_block); - alt_arg = gimple_phi_result (vphi); + /* ??? When the exit yields to a path without + any virtual use we can miss a LC PHI for the + live virtual operand. Simply choosing the + one live at the start of the loop header isn't + correct, but we should get here only with + early-exit vectorization which will move all + defs after the main exit, so leave a temporarily + wrong virtual operand in place. This happens + for gcc.c-torture/execute/20150611-1.c */ + if (vphi) + alt_arg = gimple_phi_result (vphi); } edge main_e = single_succ_edge (alt_loop_exit_block); SET_PHI_ARG_DEF_ON_EDGE (to_phi, main_e, alt_arg);