From patchwork Fri Oct 20 09:43:02 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Coplan X-Patchwork-Id: 1852404 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=armh.onmicrosoft.com header.i=@armh.onmicrosoft.com header.a=rsa-sha256 header.s=selector2-armh-onmicrosoft-com header.b=vAx3PjfM; dkim=pass (1024-bit key) header.d=armh.onmicrosoft.com header.i=@armh.onmicrosoft.com header.a=rsa-sha256 header.s=selector2-armh-onmicrosoft-com header.b=vAx3PjfM; 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 4SBfmB0DzSz23jM for ; Fri, 20 Oct 2023 20:43:38 +1100 (AEDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 6B61B3858434 for ; Fri, 20 Oct 2023 09:43:34 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from EUR03-DBA-obe.outbound.protection.outlook.com (mail-dbaeur03on2042.outbound.protection.outlook.com [40.107.104.42]) by sourceware.org (Postfix) with ESMTPS id 7DA1D3858D1E for ; Fri, 20 Oct 2023 09:43:19 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 7DA1D3858D1E Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=arm.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=arm.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 7DA1D3858D1E Authentication-Results: server2.sourceware.org; arc=fail smtp.remote-ip=40.107.104.42 ARC-Seal: i=2; a=rsa-sha256; d=sourceware.org; s=key; t=1697795001; cv=fail; b=HfWuqTPfgIDg3FlYQR3wbHXb+aIF6LjzO8+zf5BC6iH0WGhuZ88Jot0Y9pr0DQkZqHnZFNzAAxugj8nf18BRFTJx5DcQIjqv1oUU55CEg3ZqHbBkU/LH8VAoXfkpMvtpHiRghS4gyebQhzIKdnUdSPIrOna88vmMrT1uhq34zgE= ARC-Message-Signature: i=2; a=rsa-sha256; d=sourceware.org; s=key; t=1697795001; c=relaxed/simple; bh=I4zBJMOi0ORNkVJnR/j3/0ugIuuFx0OaARzhhuil66E=; h=DKIM-Signature:DKIM-Signature:Date:From:To:Subject:Message-ID: MIME-Version; b=HW4cujEdnZ88C7/dd6DkX9KkvN0TCkZpIhC/dTolNei1eG8fnwFAEX+CAiB9rFzIASHlvt/Ywxee1mpRxutUcfiw6ncc80QbuZb8frzHJOydGNcN9f3sACQZQM99aNIuSC/WYHqdFWhHxUq7Ox81Siu+Svu+eeHPXYAoTZ3RZTk= ARC-Authentication-Results: i=2; server2.sourceware.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=armh.onmicrosoft.com; s=selector2-armh-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=cl8g8xvKjCOOgxFgRjVPu9jnELt85M6iWCGHIoPcZRU=; b=vAx3PjfMiWzA8JQeiKb9l1XcJYgGxlSiFmp3zTVOhUUrsVNC2cCI5Hf93i6G6DfNxvH1xzpzhFqg1OakLjFecA0vFpx1sEN8RySGWsh7exFXashhG9uEX8nFHl1x7PUvj00ZAXNZMu1uY2Y0hLGbaL4+uy70IqzWUW+Cv7Ne/+c= Received: from AM0PR08CA0032.eurprd08.prod.outlook.com (2603:10a6:208:d2::45) by DB3PR08MB9035.eurprd08.prod.outlook.com (2603:10a6:10:429::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6907.26; Fri, 20 Oct 2023 09:43:16 +0000 Received: from AM4PEPF00027A60.eurprd04.prod.outlook.com (2603:10a6:208:d2:cafe::df) by AM0PR08CA0032.outlook.office365.com (2603:10a6:208:d2::45) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6907.25 via Frontend Transport; Fri, 20 Oct 2023 09:43:16 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 63.35.35.123) smtp.mailfrom=arm.com; dkim=pass (signature was verified) header.d=armh.onmicrosoft.com;dmarc=pass action=none header.from=arm.com; Received-SPF: Pass (protection.outlook.com: domain of arm.com designates 63.35.35.123 as permitted sender) receiver=protection.outlook.com; client-ip=63.35.35.123; helo=64aa7808-outbound-1.mta.getcheckrecipient.com; pr=C Received: from 64aa7808-outbound-1.mta.getcheckrecipient.com (63.35.35.123) by AM4PEPF00027A60.mail.protection.outlook.com (10.167.16.68) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6907.20 via Frontend Transport; Fri, 20 Oct 2023 09:43:14 +0000 Received: ("Tessian outbound 470906b1fe6c:v215"); Fri, 20 Oct 2023 09:43:14 +0000 X-CheckRecipientChecked: true X-CR-MTA-CID: b82ed79e00ad85f3 X-CR-MTA-TID: 64aa7808 Received: from f65ad30b4065.2 by 64aa7808-outbound-1.mta.getcheckrecipient.com id A4872BC5-0123-49DA-8702-86D477362D9F.1; Fri, 20 Oct 2023 09:43:07 +0000 Received: from EUR01-HE1-obe.outbound.protection.outlook.com by 64aa7808-outbound-1.mta.getcheckrecipient.com with ESMTPS id f65ad30b4065.2 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384); Fri, 20 Oct 2023 09:43:07 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=XELtA6EU8QbzJGeB9XX/b7Tjh7hiKNt37VSZFFFKiDcqs9aU1eLzDU+V4uEQSvMcmzjwNUIy6wVQYTLqDTtDxrU1ZFGou0PZzY0BdO5m19wX+B+av+Il9A4v0GOCn05sfQXn4i4Vkia10uJzflTpdc4rDlzm8DQYo8c9EnBnflshu/lwOvxTIyLri6kw5Sz0n4lv10znswjXSO8Cc3OWHx8iMOIfMKgiKh5c0qKAkymuCRs3SsBF3YVuZEPYcXmRa0RV5Ig9Pgt/zDuI9qpM1nBkCzcpbsWzNq1ILD3RJH+1gjQOrjfesC5gPIDsQ9rnevE6Y+j8br4R50GySeHZ6w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=cl8g8xvKjCOOgxFgRjVPu9jnELt85M6iWCGHIoPcZRU=; b=leKGkbqIk06fTSrKoVwSHuN5PxZZi0kDbXisqpFxrzGRlAab0kXh9vbhQWcdOhMEzFWw+iaWFl5ncQFI43Dnp78iCcOEoc0hf+goiYvhpGtY90mbk+WHaUQkEnMV1i+qeEmzrPEGhfI53/aM3yNHfjovsJjr1QiKj40P/l7c8xnOZzMWmoePHS3EaOYr+pGoW+Ibk2/GGL29RpNin2LMRF8qlZjJEdynH1p9uVigtBvcY7QWDl796C1YsMD4Vacm6ZgikS5WIB8Lj17E72vL3fsahOCW5yeDzguITTdCxhgI4fuD+ypt3YWahnrwLFb/m2+qzMpW10zACwfaqaqyAw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=arm.com; dmarc=pass action=none header.from=arm.com; dkim=pass header.d=arm.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=armh.onmicrosoft.com; s=selector2-armh-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=cl8g8xvKjCOOgxFgRjVPu9jnELt85M6iWCGHIoPcZRU=; b=vAx3PjfMiWzA8JQeiKb9l1XcJYgGxlSiFmp3zTVOhUUrsVNC2cCI5Hf93i6G6DfNxvH1xzpzhFqg1OakLjFecA0vFpx1sEN8RySGWsh7exFXashhG9uEX8nFHl1x7PUvj00ZAXNZMu1uY2Y0hLGbaL4+uy70IqzWUW+Cv7Ne/+c= Authentication-Results-Original: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=arm.com; Received: from PAWPR08MB8958.eurprd08.prod.outlook.com (2603:10a6:102:33e::15) by AM9PR08MB5987.eurprd08.prod.outlook.com (2603:10a6:20b:2da::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6907.26; Fri, 20 Oct 2023 09:43:04 +0000 Received: from PAWPR08MB8958.eurprd08.prod.outlook.com ([fe80::623a:d5c1:66a4:4acf]) by PAWPR08MB8958.eurprd08.prod.outlook.com ([fe80::623a:d5c1:66a4:4acf%4]) with mapi id 15.20.6907.022; Fri, 20 Oct 2023 09:43:04 +0000 Date: Fri, 20 Oct 2023 10:43:02 +0100 From: Alex Coplan To: gcc-patches@gcc.gnu.org Cc: Richard Sandiford Subject: [PATCH] rtl-ssa: Don't leave NOTE_INSN_DELETED around Message-ID: Content-Disposition: inline X-ClientProxiedBy: LO2P265CA0455.GBRP265.PROD.OUTLOOK.COM (2603:10a6:600:e::35) To PAWPR08MB8958.eurprd08.prod.outlook.com (2603:10a6:102:33e::15) MIME-Version: 1.0 X-MS-TrafficTypeDiagnostic: PAWPR08MB8958:EE_|AM9PR08MB5987:EE_|AM4PEPF00027A60:EE_|DB3PR08MB9035:EE_ X-MS-Office365-Filtering-Correlation-Id: c74aa7eb-e50c-43e4-6d8d-08dbd150fb60 x-checkrecipientrouted: true NoDisclaimer: true X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam-Untrusted: BCL:0; X-Microsoft-Antispam-Message-Info-Original: Qmso4/ypouMkEvUkkE/aM5h9/6WwefZ40vCLan/UdWXE7uFSXf+PrLu3Mgc3Y3NVsCz/17SNslPvy3pEHL52csFvgIlXhmJdigw96lP+yELn/lu9vWq8s6mkIWBmV0HF4AVrv30JqwpDNg25yBoFKiUgvxn1B22WVb+KDuXgFH8j15zxB6H79oO+Um7tjok6fWQCrC0DqGKkGM70IqT4BdjCbckiQrGpHFtl66+r6iXbE2ZkIKihU/il6HYGxCj8iSP5vq4IKXmco/3voKfaDFZ7wu1z11e3/OwnEXWKT2fKfNTHMNxcE6XzPz3vk8JwLUqi43mrqNrNnJ4d6v9k1SKSJM7YejfMwENBpe+1FOAEqTj8q92H6iZIswgnV0b18F26tfZMZLc+2xLza8lOVvzh8f3UgMMz87xpAmGbyctUfjV3Wj7tm7NaGH/vOqBNMvBAuvt1EE6dzvPeBVeyyrKHJcG30Heghw+9YCwVd9Wt+u57GEIIk6R7zEhdy+10n0mOunaftcKn/aEfYxlAMCEsGsY2yO+uMKSN1Xg+Boj4jj+XJZC2/g57Zk8Fr9QYwXfWnhl9+4Fpt1IXCdDazrgsjTCjcAgoeT6CfP1c714tFoX6pQqrAp7zhAna4ly+ksI0kjn82ZmtiEHgT5AvEg== X-Forefront-Antispam-Report-Untrusted: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:PAWPR08MB8958.eurprd08.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230031)(396003)(39860400002)(366004)(136003)(376002)(346002)(230922051799003)(186009)(64100799003)(1800799009)(451199024)(21480400003)(26005)(83380400001)(38100700002)(36756003)(6512007)(2616005)(86362001)(5660300002)(2906002)(33964004)(44144004)(235185007)(66946007)(41300700001)(6506007)(66556008)(6916009)(66476007)(316002)(8936002)(966005)(6486002)(478600001)(44832011)(8676002)(4326008)(2700100001); DIR:OUT; SFP:1101; X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM9PR08MB5987 Original-Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=arm.com; X-EOPAttributedMessage: 0 X-MS-Exchange-Transport-CrossTenantHeadersStripped: AM4PEPF00027A60.eurprd04.prod.outlook.com X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id-Prvs: 0a27e5b4-d672-4e25-f05d-08dbd150f525 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: S1NDEgBEO05F+lsm+gtvNJ+v5lGnyLdnRahtZv3viCSVDrDsYEWzyXqRjGXWvmjlnNqyV0PIhims6l8iQV/DYQB4r3mX7fIl010ijgv6mKBSAcPi8DX+rRIIXioEsZBc38IifW43XiPbWGFixGigk9QzG3J/P/2iEUtTpXSOcrNX1b2g0bclLKKA/fyw1fVKvtLol6syYj/UIb4JJDoI+hKq9u8OnidgrEMQbkn6b/YKljgxw8HJzG/BfSkB6XNvmCE/hnIgonD9iN9zjyhhI1WOZOAwprFjmnyp04Yqom9qWE0wHpASTp21TgJfsw9Qz9xi9Iom0iIy6CXnhMr1k4gdsFaHhehdI8u6ubAzTYp0gUAoYHji4aP6Cq3/OUp0woDzJifYuk33vocrUdJrlTKEwnjqxapfTBa8pKnto2R2B4LbxH+VJhUa9IdIDDRo4wKPNYWtpHV9fBLsSipRh9qx/MKcHiftfPnbx/fUFeChozcEfwfg0Z7A/oGU8U7ZTWH9tnRwLax02jx/82smiZCNWjNLqyo7Ph36NGRh5BY4Q669fjdjBD5u0hOtMgRjgMLpRqIaKFMR4v1+7ZFwjX/HKaq2+8mYt9T4aRabPtN9+Gr6/fSqeWPtj8zEGRfaXPoHZXoVSgw3+s5O+94ZP77l7bwaDc+Lhn3AYyY0CK8bghZmWeTDk1/2r5pi330V8Ht/XbsLFKDztpoMd0YdT7gpTbxibEr2rBD32FpOUcfw9C4+bPnj70uCHbVrib+TR4NAHzj/sx8xZwV5jQFUlA== X-Forefront-Antispam-Report: CIP:63.35.35.123; CTRY:IE; LANG:en; SCL:1; SRV:; IPV:CAL; SFV:NSPM; H:64aa7808-outbound-1.mta.getcheckrecipient.com; PTR:ec2-63-35-35-123.eu-west-1.compute.amazonaws.com; CAT:NONE; SFS:(13230031)(4636009)(39860400002)(396003)(346002)(376002)(136003)(230922051799003)(64100799003)(82310400011)(186009)(1800799009)(451199024)(36840700001)(46966006)(36860700001)(47076005)(21480400003)(83380400001)(336012)(2616005)(26005)(44144004)(33964004)(6512007)(6506007)(36756003)(86362001)(356005)(81166007)(82740400003)(966005)(6486002)(4326008)(41300700001)(8936002)(8676002)(44832011)(478600001)(5660300002)(40480700001)(235185007)(2906002)(70206006)(70586007)(6916009)(316002)(2700100001); DIR:OUT; SFP:1101; X-OriginatorOrg: arm.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Oct 2023 09:43:14.7577 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: c74aa7eb-e50c-43e4-6d8d-08dbd150fb60 X-MS-Exchange-CrossTenant-Id: f34e5979-57d9-4aaa-ad4d-b122a662184d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=f34e5979-57d9-4aaa-ad4d-b122a662184d; Ip=[63.35.35.123]; Helo=[64aa7808-outbound-1.mta.getcheckrecipient.com] X-MS-Exchange-CrossTenant-AuthSource: AM4PEPF00027A60.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB3PR08MB9035 X-Spam-Status: No, score=-12.5 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, GIT_PATCH_0, KAM_DMARC_NONE, KAM_SHORT, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2, SPF_HELO_NONE, SPF_NONE, TXREP, UNPARSEABLE_RELAY 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 Hi, This patch tweaks change_insns to also call ::remove_insn to ensure the underlying RTL insn gets removed from the insn chain in the case of a deletion. This avoids leaving NOTE_INSN_DELETED around after deleting insns. For movement, the RTL insn chain is updated earlier in change_insns with the call to move_insn. For deletion, it seems reasonable to do it here. Bootstrapped/regtested on aarch64-linux-gnu in combination with the upcoming aarch64 load pair pass, i.e.: https://gcc.gnu.org/pipermail/gcc-patches/2023-October/633601.html and all uncommitted prerequisites except for 6/11 i.e.: https://gcc.gnu.org/pipermail/gcc-patches/2023-October/633349.html which shows that 6/11 is no longer required in combination with this patch (as expected). Thanks, Alex gcc/ChangeLog: * rtl-ssa/changes.cc (function_info::change_insns): Ensure we call ::remove_insn on deleted insns. diff --git a/gcc/rtl-ssa/changes.cc b/gcc/rtl-ssa/changes.cc index b11a88e0919..d6874e5627c 100644 --- a/gcc/rtl-ssa/changes.cc +++ b/gcc/rtl-ssa/changes.cc @@ -732,7 +732,11 @@ function_info::change_insns (array_slice changes) insn_change &change = *changes[i]; insn_info *insn = change.insn (); if (change.is_deletion ()) - remove_insn (insn); + { + if (rtx_insn *rtl = insn->rtl ()) + ::remove_insn (rtl); // Remove the underlying RTL insn. + remove_insn (insn); + } else if (insn_info *placeholder = placeholders[i]) { // Check if earlier movements turned a move into a no-op.