From patchwork Thu Jul 25 10:44:35 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Biener X-Patchwork-Id: 1964695 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=CZd1S3ct; dkim=pass header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=W8WLDkuz; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=CZd1S3ct; dkim=neutral header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=W8WLDkuz; 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 4WV6wF44Vdz1yXp for ; Thu, 25 Jul 2024 20:45:01 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 65A9D3858C35 for ; Thu, 25 Jul 2024 10:44:58 +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 871003858408 for ; Thu, 25 Jul 2024 10:44:37 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 871003858408 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 871003858408 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=1721904280; cv=none; b=FAfcNX440gNPHumFh/poi2S2OrqSmOZlia7E1Sp6nKCMASzwNcSKsVKDS1uIfwrgZWiAf5EK6qiDdv6/2HdbYyu3fewnP4Fd2OffDET9BMnBPiA046RtYMOWxwxTaGxU+N804T7gFKUmy2cERAlp5snBy1VqUbDa6nxxUomYXZY= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1721904280; c=relaxed/simple; bh=keRMT8JtnNSXSTCb1N8l5yxRbUNZGttzbZkBclaenIA=; h=DKIM-Signature:DKIM-Signature:DKIM-Signature:DKIM-Signature:Date: From:To:Subject:MIME-Version:Message-Id; b=IEHARqZ31AAUITr0Zh8/bF2iYHLVwL5XPyCGQt4MoHtGt/YO8/upbim9P9hxQV0ZCdIoFldcMSxACKFF7S8R2wed0KlBDCsHp5+qDQ+8RPivutrsJkTQNES0Mqwi6/PikrHGUux3Kv48PLGW5KFXXRnhL26CnHTmoxEATfdCZiY= 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 838302116C for ; Thu, 25 Jul 2024 10:44:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1721904276; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version:content-type:content-type; bh=3BcN2au7+dPmLN7yV55feuRQXcMiiA7UcAbcl0koEfI=; b=CZd1S3ctI1wBRKgxOyJs70ADfHoEb41ZV/ay3xCvqrlZMCFNxqciQjoSkxqmPIJHAbjkqm qUq66Ioval9eaDNcCUgymg1njiFlDm19LodeN6t3wfQ6ftNlOVDvU+n6SG1cwCmN7L4Ar5 f8YWYtz+T8DT8ylQ4+tt9e1h7O+7dWs= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1721904276; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version:content-type:content-type; bh=3BcN2au7+dPmLN7yV55feuRQXcMiiA7UcAbcl0koEfI=; b=W8WLDkuzgWMdjJnz9e8QXfEg7v/92yzVqlS+xdObv9PmP69aUZppvOaWUkiiLYHRpCMaEg RxzmJJerMgz0mJAg== Authentication-Results: smtp-out1.suse.de; dkim=pass header.d=suse.de header.s=susede2_rsa header.b=CZd1S3ct; dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b=W8WLDkuz DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1721904276; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version:content-type:content-type; bh=3BcN2au7+dPmLN7yV55feuRQXcMiiA7UcAbcl0koEfI=; b=CZd1S3ctI1wBRKgxOyJs70ADfHoEb41ZV/ay3xCvqrlZMCFNxqciQjoSkxqmPIJHAbjkqm qUq66Ioval9eaDNcCUgymg1njiFlDm19LodeN6t3wfQ6ftNlOVDvU+n6SG1cwCmN7L4Ar5 f8YWYtz+T8DT8ylQ4+tt9e1h7O+7dWs= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1721904276; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version:content-type:content-type; bh=3BcN2au7+dPmLN7yV55feuRQXcMiiA7UcAbcl0koEfI=; b=W8WLDkuzgWMdjJnz9e8QXfEg7v/92yzVqlS+xdObv9PmP69aUZppvOaWUkiiLYHRpCMaEg RxzmJJerMgz0mJAg== 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 5F03E13874 for ; Thu, 25 Jul 2024 10:44:36 +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 U/xVFZQsombRTgAAD6G6ig (envelope-from ) for ; Thu, 25 Jul 2024 10:44:36 +0000 Date: Thu, 25 Jul 2024 12:44:35 +0200 (CEST) From: Richard Biener To: gcc-patches@gcc.gnu.org Subject: [PATCH] tree-optimization/116079 - store motion and clobbers MIME-Version: 1.0 Message-Id: <20240725104436.5F03E13874@imap1.dmz-prg2.suse.org> X-Spam-Level: X-Rspamd-Server: rspamd2.dmz-prg2.suse.org X-Spamd-Result: default: False [-1.31 / 50.00]; NEURAL_HAM_LONG(-1.00)[-1.000]; R_DKIM_ALLOW(-0.20)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; MIME_GOOD(-0.10)[text/plain]; MX_GOOD(-0.01)[]; FUZZY_BLOCKED(0.00)[rspamd.com]; RBL_SPAMHAUS_BLOCKED_OPENRESOLVER(0.00)[2a07:de40:b281:104:10:150:64:97:from]; RECEIVED_SPAMHAUS_BLOCKED_OPENRESOLVER(0.00)[2a07:de40:b281:106:10:150:64:167:received]; RCVD_VIA_SMTP_AUTH(0.00)[]; RCPT_COUNT_ONE(0.00)[1]; ARC_NA(0.00)[]; MIME_TRACE(0.00)[0:+]; MISSING_XM_UA(0.00)[]; DBL_BLOCKED_OPENRESOLVER(0.00)[suse.de:dkim,imap1.dmz-prg2.suse.org:rdns,imap1.dmz-prg2.suse.org:helo]; 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)[]; SPAMHAUS_XBL(0.00)[2a07:de40:b281:104:10:150:64:97:from]; RCVD_COUNT_TWO(0.00)[2]; TO_MATCH_ENVRCPT_ALL(0.00)[]; TO_DN_NONE(0.00)[]; PREVIOUSLY_DELIVERED(0.00)[gcc-patches@gcc.gnu.org]; DKIM_TRACE(0.00)[suse.de:+] X-Rspamd-Action: no action X-Spam-Score: -1.31 X-Rspamd-Queue-Id: 838302116C 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 When we move a store out of an inner loop and remove a clobber in the process, analysis of the inner loop can run into the clobber via the meta-data and crash when accessing its basic-block. The following avoids this by clearing the VDEF which is how it identifies already processed stores. Bootstrapped and tested on x86_64-unknown-linux-gnu, pushed. PR tree-optimization/116079 * tree-ssa-loop-im.cc (hoist_memory_references): Clear VDEF of elided clobbers. * gcc.dg/torture/pr116079.c: New testcase. --- gcc/testsuite/gcc.dg/torture/pr116079.c | 20 ++++++++++++++++++++ gcc/tree-ssa-loop-im.cc | 2 ++ 2 files changed, 22 insertions(+) create mode 100644 gcc/testsuite/gcc.dg/torture/pr116079.c diff --git a/gcc/testsuite/gcc.dg/torture/pr116079.c b/gcc/testsuite/gcc.dg/torture/pr116079.c new file mode 100644 index 00000000000..e9120969d91 --- /dev/null +++ b/gcc/testsuite/gcc.dg/torture/pr116079.c @@ -0,0 +1,20 @@ +/* { dg-do compile } */ + +char g_132; +int g_701, g_1189, func_24___trans_tmp_15, func_24_l_2691; +long func_24___trans_tmp_9; +int *func_24_l_2684; +void func_24() { + for (; g_1189;) { + g_132 = 0; + for (; g_132 < 6; ++g_132) { + func_24___trans_tmp_9 = *func_24_l_2684 = func_24_l_2691; + g_701 = 4; + for (; g_701; g_701 -= 1) { + int l_2748[4]; + int si2 = l_2748[3]; + func_24___trans_tmp_15 = si2; + } + } + } +} diff --git a/gcc/tree-ssa-loop-im.cc b/gcc/tree-ssa-loop-im.cc index c53efbb8d59..ccc56dc42f6 100644 --- a/gcc/tree-ssa-loop-im.cc +++ b/gcc/tree-ssa-loop-im.cc @@ -2880,6 +2880,7 @@ hoist_memory_references (class loop *loop, bitmap mem_refs, gimple_stmt_iterator gsi = gsi_for_stmt (stmt); unlink_stmt_vdef (stmt); release_defs (stmt); + gimple_set_vdef (stmt, NULL_TREE); gsi_remove (&gsi, true); } @@ -3062,6 +3063,7 @@ hoist_memory_references (class loop *loop, bitmap mem_refs, gimple_stmt_iterator gsi = gsi_for_stmt (stmt); unlink_stmt_vdef (stmt); release_defs (stmt); + gimple_set_vdef (stmt, NULL_TREE); gsi_remove (&gsi, true); }