From patchwork Thu Nov 23 16:44:26 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Coplan X-Patchwork-Id: 1867869 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=vavvFZU/; 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=vavvFZU/; 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 4SbkVm3KVkz1yS0 for ; Fri, 24 Nov 2023 03:45:04 +1100 (AEDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 9F96338618E1 for ; Thu, 23 Nov 2023 16:45:01 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from EUR03-AM7-obe.outbound.protection.outlook.com (mail-am7eur03on2073.outbound.protection.outlook.com [40.107.105.73]) by sourceware.org (Postfix) with ESMTPS id 9688E385AC35 for ; Thu, 23 Nov 2023 16:44:46 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 9688E385AC35 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 9688E385AC35 Authentication-Results: server2.sourceware.org; arc=pass smtp.remote-ip=40.107.105.73 ARC-Seal: i=3; a=rsa-sha256; d=sourceware.org; s=key; t=1700757889; cv=pass; b=gLzkMxEelqfp8AQTN9F8EqP0P5IH2VTnWUNVqoeLSgLL1GcrMWL9vNQs6zZmeJsmYt1T2RsU6j1sKKApQijpg7ldVxvmMuD1XDrI5PDhcONDU6zJ+23Ae4Ne1N6tvvniO8+GJRgZwVxefoXKtmiPAViRK49NcUmlN1VJoQHu748= ARC-Message-Signature: i=3; a=rsa-sha256; d=sourceware.org; s=key; t=1700757889; c=relaxed/simple; bh=aHDPMk3QAU+xJYtzbB0F3xHjdoviIuz7tTml/jVnm8M=; h=DKIM-Signature:DKIM-Signature:Date:From:To:Subject:Message-ID: MIME-Version; b=xK90g4Dp8pL3PTwLuf8pv38eEpGbNBKNwuf10gmLUp+7wfcw2MEGdBMad0RpP5U01g1OF6XlyPvCIO0nHDT27al/BfVcy3h2pVQ9tQTlVkLfcdI3IVC0AWORrNQyRwlDqRrDdYKaF5S9I1QatK1n9yPmlRbo6od+1WzToxohAU8= ARC-Authentication-Results: i=3; server2.sourceware.org ARC-Seal: i=2; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=pass; b=MLQLZAd4HIicLgFuc6TvrWmNDRmqkRA8Feyk6NwwuZ+EPRTe8RfqlgMaD7MIIs6O57xqVZUUwsPr38AWz4Q/jHnacadZeUJgS8BtLrICsnd1eTIDPar+4kF17rguhMVxn4QO03BX4gRxuB7q8Fnv2Uy0sFAA0mmIiY3cS0ulkoPc9rBuB9lrXlTvVDLF/HMsHdSzGw1jE9HBpfsp0T3H4nqbM8knxO7qmTD/c8cKzv4IKknuwRXi8D4zITo59ToHGB+vvUI05YyqTVLNmSSaJpjKKv8Kbmc0Au/jpU41/SIdncnBrtdf9WzsbIsWw+lQWjXFkkrH2jRh0M8YREloRg== ARC-Message-Signature: i=2; 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=59dGpAsQ7YAAXnNjcSeLu87b6v9tfsIBEDVeOpdxJEk=; b=AEJPKs5KqA+5DbtfQnVJuUIy3z3f3fTEcCo+Klg1LmaCWzbKtiKnBN0bPaQhkvBbsV5qqXIghAHXY5l09M6K7jPvT9NAMscnUJEVruI6A4sH8g1+A2i/wSaWDJmqu+HqVkAmfKJme3uU7enCBbUlHvrM387RJCcBNM5aBTJaErnw447aD7teyqvX5C6D5/tB4YIhp4sEaa3MGYGqQr8ioXO6WWWqi/uElppPWHmHHyCT+dZfWAOmqWw4HxkAjgtv+H+qNuPR/iwqNBnGo2LE18pCEreICHv8RKD/emWQFIbnSSH5adBqHuIFAsHhofFzjqK4IJnp0P6DnhR5tC6zlA== ARC-Authentication-Results: i=2; mx.microsoft.com 1; spf=pass (sender ip is 63.35.35.123) smtp.rcpttodomain=gcc.gnu.org smtp.mailfrom=arm.com; dmarc=pass (p=none sp=none pct=100) action=none header.from=arm.com; dkim=pass (signature was verified) header.d=armh.onmicrosoft.com; arc=pass (0 oda=1 ltdi=1 spf=[1,1,smtp.mailfrom=arm.com] dkim=[1,1,header.d=arm.com] dmarc=[1,1,header.from=arm.com]) 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=59dGpAsQ7YAAXnNjcSeLu87b6v9tfsIBEDVeOpdxJEk=; b=vavvFZU/K7uAGhZXPZT5YXhGWiI/E4Bg0EVTsg1v8VZLWbONLOJ0yYwbTUdMGApvSFHCGNNf5ApTEOjz9QDZG5s+VL3Lv9X+/OovmPBq6Fdw2VtRpDT4vP6fNrX+u5dqHNUKJVj4uajOD/jtVslPegMkmcBPizsDNMI1G+H93cg= Received: from AS8PR04CA0027.eurprd04.prod.outlook.com (2603:10a6:20b:310::32) by DU0PR08MB8207.eurprd08.prod.outlook.com (2603:10a6:10:3b2::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7025.18; Thu, 23 Nov 2023 16:44:43 +0000 Received: from AMS0EPF000001AB.eurprd05.prod.outlook.com (2603:10a6:20b:310:cafe::e8) by AS8PR04CA0027.outlook.office365.com (2603:10a6:20b:310::32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7025.20 via Frontend Transport; Thu, 23 Nov 2023 16:44:42 +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 AMS0EPF000001AB.mail.protection.outlook.com (10.167.16.151) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7025.12 via Frontend Transport; Thu, 23 Nov 2023 16:44:42 +0000 Received: ("Tessian outbound 7671e7ddc218:v228"); Thu, 23 Nov 2023 16:44:42 +0000 X-CheckRecipientChecked: true X-CR-MTA-CID: a4a3d259daf33070 X-CR-MTA-TID: 64aa7808 Received: from efba435c022e.2 by 64aa7808-outbound-1.mta.getcheckrecipient.com id 8982918D-5BA2-4D5E-83D4-5B8CDA4F635C.1; Thu, 23 Nov 2023 16:44:30 +0000 Received: from EUR03-AM7-obe.outbound.protection.outlook.com by 64aa7808-outbound-1.mta.getcheckrecipient.com with ESMTPS id efba435c022e.2 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384); Thu, 23 Nov 2023 16:44:30 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=KCXukThjhpWXd6uvv9Q+QyUhlqPPNJw9U4O+vILmOwWsSPSpQeyysHYvsv++giLc+RPgtNOdmpuCE6oEHa0I9N0uv3mDFtuGEhqdM9cgtsRplln+At33YKYGOuV7Wb33NmQlfoac3EHkfMM6pRYbZsx+9n2LdqdnkVIbZNQ9t38VzFdo3Nal5x4KOTK+ImLoboNFH4RkGaIuEKfE53mqFbbWOBYWlBaXwScsMy64YB5+s9JArhRzHesvj/w9pJRd5pzHCdFvaCAR1tWn7JtkbryPNQ6Dv849fdcWMxN0H1pcVjF7MuYyC+8jcZy6SO3wMcjx1tq2r0Z5u4qQHBBEzQ== 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=59dGpAsQ7YAAXnNjcSeLu87b6v9tfsIBEDVeOpdxJEk=; b=a3+Uw7HBvDEs11QXPYVicrBfJR+BqqBhD/TIHEWQI1ePSLeqFovobdQ/NKQsJ8Q2gMFddW1x89sAMUPYKvdynvW6RBmrQ01Yvlz3BM/UcFE9ZFontEPIKa7VlMxgClRV9FN3ab9bEFRt0UVljgtVccIyUzp8PqRK9o1Yr+qFCq46XBQ/J9t31f7vG/t+spLa0cOetOVdeD5akOujsHtcwOg2K2QLNQPS1y05OfTbLm0MhLb8JqAhq3qkZu8x1L+K0J4U2GSs+2EOs2p1LhL4Y5SLx+Wmq0yKACEb+athnH1/O68J72f44oJBc66Y0jvpsxPyROfqZ7T5OsLJeTd3CA== 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=59dGpAsQ7YAAXnNjcSeLu87b6v9tfsIBEDVeOpdxJEk=; b=vavvFZU/K7uAGhZXPZT5YXhGWiI/E4Bg0EVTsg1v8VZLWbONLOJ0yYwbTUdMGApvSFHCGNNf5ApTEOjz9QDZG5s+VL3Lv9X+/OovmPBq6Fdw2VtRpDT4vP6fNrX+u5dqHNUKJVj4uajOD/jtVslPegMkmcBPizsDNMI1G+H93cg= 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 PA4PR08MB6174.eurprd08.prod.outlook.com (2603:10a6:102:e6::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7025.20; Thu, 23 Nov 2023 16:44:28 +0000 Received: from PAWPR08MB8958.eurprd08.prod.outlook.com ([fe80::8512:cc10:24d4:1919]) by PAWPR08MB8958.eurprd08.prod.outlook.com ([fe80::8512:cc10:24d4:1919%5]) with mapi id 15.20.7025.020; Thu, 23 Nov 2023 16:44:28 +0000 Date: Thu, 23 Nov 2023 16:44:26 +0000 From: Alex Coplan To: gcc-patches@gcc.gnu.org Cc: Richard Sandiford Subject: [PATCH v2 1/11] rtl-ssa: Support for inserting new insns Message-ID: Content-Disposition: inline X-ClientProxiedBy: LO6P123CA0022.GBRP123.PROD.OUTLOOK.COM (2603:10a6:600:313::15) To PAWPR08MB8958.eurprd08.prod.outlook.com (2603:10a6:102:33e::15) MIME-Version: 1.0 X-MS-TrafficTypeDiagnostic: PAWPR08MB8958:EE_|PA4PR08MB6174:EE_|AMS0EPF000001AB:EE_|DU0PR08MB8207:EE_ X-MS-Office365-Filtering-Correlation-Id: c204ed5f-6965-4744-a7d1-08dbec437e4e 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: GpK1kTkYdBrfbOerLSPt1AxT/20WEX20kAa9Bq5FVcH/JXoqn7EfNhUDiHbK7y3owWX85ViNTSxQbPL/KRhM8fsoBj4Da4VsjFkm7RAtTfTW7XcP95qW3D0g+uKVYXXKg2jnSolIgKOwUZTfiB0DV/LS6Mm7R9etaSl3qgVinvnHmmd143ELsyHYDwbdIIIVmOLtRlaB3bItY9XTmCR74+r6WlwkThx/Rv3VEiQJrbK6LExnJ1RTfl9aKIQOKWBfCtNOEGF7XDw3e7cuOt4bPy0CxCQbqaoD4heU0ABWolv8rVYYs75Y//IK2ZM/Ah6ZiA6wHvOznxsu5CuSoIn5BwQKWuHcSTTXoPCz33TCBoiSDKWgEEZ3L1Rkuu8j1+VqKNVmfN5rbzOTi634yb9JOAiCtubfZ61PdjMyYzfP9ABCG18NmusG3KDvuiRwa4dQxREVOCWbBJnxqZyfoDSLWCbxhem1gI+tgHXeDWXHcCCPiXpgGRSYhqeFKvLkdJmyC8160sTvnZbLxHtK4lhceuJLlOidF4VBZUVwmRBR0PYWdzPcEsHPJ45RuENAiHP3euSaKwBVGEazTQm7XOkrg3Tkc8dLp9J18arl1dlhwFDAvlDGOEJrtiG8p0KSfPDB 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)(39860400002)(346002)(376002)(366004)(396003)(136003)(230922051799003)(64100799003)(186009)(451199024)(1800799012)(4326008)(8936002)(5660300002)(44832011)(235185007)(8676002)(316002)(66946007)(6916009)(66476007)(66556008)(2906002)(36756003)(41300700001)(86362001)(38100700002)(44144004)(33964004)(6512007)(83380400001)(6506007)(6486002)(966005)(478600001)(21480400003)(2616005)(26005)(67856001)(2700100001); DIR:OUT; SFP:1101; X-MS-Exchange-Transport-CrossTenantHeadersStamped: PA4PR08MB6174 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: AMS0EPF000001AB.eurprd05.prod.outlook.com X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id-Prvs: f6adc490-3950-4884-6434-08dbec43756b X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: ipJakY9dlnA1X9sIW24doQ3HngXO0MVsX3oZ28XjOo1zfx+g5tRCrjaWHLmQfLdGO1oHtIzN9bGyxqcBJZE/pF74ZkpNkNYf9a4jxaruLogztEQ1HRFWt+0Kkgin9L3O7Ja6Pd8hUV+xiHCyNRCg75+qU8ooNnoKLgf8kN3/aOuF4BmivBSSx9mF/r9OKy2UQTLQ6HJO+wIZ0YEXG0JEXXqCLKD6iFyx/+cgBAxneDGY0noRdPz+pqUpox1h8QrK0OO5xUQAKm6RndUG96hjDBYh/TZXvbv7Du59BZd26DC3mcB70IZ+DMLWDfUzJvCcfjXLVvk84lw22VoIsVvnyHgmqbXuEbJ24CovccWNlEDQKGFzCcq72yJW9FkJGo8Dcvxpctp8E2GPTXy73rX5UWuE5PK8g2a//5sQz7eEM9HTcDSQmhv5k8wogMAteP1JBu/6362ggVcN+HMsPQrM7fnqZQPU1XhF0HM0bcUgQpZ9txQttjnW21Oc0VLnSo3FpTbV4ejFj0bZDhWGdacoT2G7R3MVyV3StQOW9IQevaMFvyMXDeWQFODcOHKnY0MbmBDc8YGqwgqmNsmndykd6CB+o3JbNfwYleOwlFGZRc16eqPXRk4OF2ywyPpvwKXVTpNQrTPJv6buzqWty+0G4nIv2lH3sQuV14NZSEwcg9dm7UZ1jux2DBUSgAPWefGmnis3Zzx8ceBPS7HMgrkIYu6EJtX861onKVZ4w+MNdZkyaqsBFoMDtixSfMPGQd+DoRO5mfVFmh5sNMKno3U8taVe494nvSm59HxuoYSVYo4= 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)(376002)(136003)(396003)(346002)(230922051799003)(451199024)(82310400011)(186009)(1800799012)(64100799003)(40470700004)(46966006)(36840700001)(70586007)(6486002)(40460700003)(966005)(478600001)(81166007)(44832011)(6916009)(356005)(316002)(4326008)(70206006)(8676002)(8936002)(2906002)(36860700001)(36756003)(235185007)(40480700001)(5660300002)(83380400001)(47076005)(2616005)(26005)(86362001)(336012)(82740400003)(33964004)(6512007)(44144004)(6506007)(21480400003)(41300700001)(67856001)(2700100001); DIR:OUT; SFP:1101; X-OriginatorOrg: arm.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Nov 2023 16:44:42.8323 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: c204ed5f-6965-4744-a7d1-08dbec437e4e 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: AMS0EPF000001AB.eurprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DU0PR08MB8207 X-Spam-Status: No, score=-12.0 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, FORGED_SPF_HELO, GIT_PATCH_0, KAM_DMARC_NONE, KAM_SHORT, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2, SPF_HELO_PASS, SPF_NONE, TXREP, T_SCC_BODY_TEXT_LINE, 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 is a v2, original patch is here: https://gcc.gnu.org/pipermail/gcc-patches/2023-November/637606.html This addresses review feedback and: - Fixes a bug in the previous version in function_info::finalize_new_accesses; we should now correctly handle the case where properties.refs () has two writes to a resource and we're adding a new (temporary) set for that resource. - Drops some handling for new uses which isn't needed now that RTL-SSA can infer uses of mem (since g:505f1202e3a1a1aecd0df10d0f1620df6fea4ab5). Bootstrapped/regtested as a series on aarch64-linux-gnu, OK for trunk? Thanks, Alex -- >8 -- The upcoming aarch64 load pair pass needs to form store pairs, and can re-order stores over loads when alias analysis determines this is safe. In the case that both mem defs have uses in the RTL-SSA IR, and both stores require re-ordering over their uses, we represent that as (tentative) deletion of the original store insns and creation of a new insn, to prevent requiring repeated re-parenting of uses during the pass. We then update all mem uses that require re-parenting in one go at the end of the pass. To support this, RTL-SSA needs to handle inserting new insns (rather than just changing existing ones), so this patch adds support for that. New insns (and new accesses) are temporaries, allocated above a temporary obstack_watermark, such that the user can easily back out of a change without awkward bookkeeping. gcc/ChangeLog: * rtl-ssa/accesses.cc (function_info::create_set): New. * rtl-ssa/accesses.h (access_info::is_temporary): New. * rtl-ssa/changes.cc (move_insn): Handle new (temporary) insns. (function_info::finalize_new_accesses): Handle new/temporary user-created accesses. (function_info::apply_changes_to_insn): Ensure m_is_temp flag on new insns gets cleared. (function_info::change_insns): Handle new/temporary insns. (function_info::create_insn): New. * rtl-ssa/changes.h (class insn_change): Make function_info a friend class. * rtl-ssa/functions.h (function_info): Declare new entry points: create_set, create_insn. Declare new change_alloc helper. * rtl-ssa/insns.cc (insn_info::print_full): Identify temporary insns in dump. * rtl-ssa/insns.h (insn_info): Add new m_is_temp flag and accompanying is_temporary accessor. * rtl-ssa/internals.inl (insn_info::insn_info): Initialize m_is_temp to false. * rtl-ssa/member-fns.inl (function_info::change_alloc): New. * rtl-ssa/movement.h (restrict_movement_for_defs_ignoring): Add handling for temporary defs. diff --git a/gcc/rtl-ssa/accesses.cc b/gcc/rtl-ssa/accesses.cc index 510545a8bad..76d70fd8bd3 100644 --- a/gcc/rtl-ssa/accesses.cc +++ b/gcc/rtl-ssa/accesses.cc @@ -1456,6 +1456,16 @@ function_info::make_uses_available (obstack_watermark &watermark, return use_array (new_uses, num_uses); } +set_info * +function_info::create_set (obstack_watermark &watermark, + insn_info *insn, + resource_info resource) +{ + auto set = change_alloc (watermark, insn, resource); + set->m_is_temp = true; + return set; +} + // Return true if ACCESS1 can represent ACCESS2 and if ACCESS2 can // represent ACCESS1. static bool diff --git a/gcc/rtl-ssa/accesses.h b/gcc/rtl-ssa/accesses.h index fce31d46717..7e7a90ece97 100644 --- a/gcc/rtl-ssa/accesses.h +++ b/gcc/rtl-ssa/accesses.h @@ -204,6 +204,10 @@ public: // in the main instruction pattern. bool only_occurs_in_notes () const { return m_only_occurs_in_notes; } + // Return true if this is a temporary access, e.g. one created for + // an insn that is about to be inserted. + bool is_temporary () const { return m_is_temp; } + protected: access_info (resource_info, access_kind); diff --git a/gcc/rtl-ssa/changes.cc b/gcc/rtl-ssa/changes.cc index aab532b9f26..2f2d12d5f30 100644 --- a/gcc/rtl-ssa/changes.cc +++ b/gcc/rtl-ssa/changes.cc @@ -394,14 +394,20 @@ move_insn (insn_change &change, insn_info *after) // At the moment we don't support moving instructions between EBBs, // but this would be worth adding if it's useful. insn_info *insn = change.insn (); - gcc_assert (after->ebb () == insn->ebb ()); + bb_info *bb = after->bb (); basic_block cfg_bb = bb->cfg_bb (); - if (insn->bb () != bb) - // Force DF to mark the old block as dirty. - df_insn_delete (rtl); - ::remove_insn (rtl); + if (!insn->is_temporary ()) + { + gcc_assert (after->ebb () == insn->ebb ()); + + if (insn->bb () != bb) + // Force DF to mark the old block as dirty. + df_insn_delete (rtl); + ::remove_insn (rtl); + } + ::add_insn_after (rtl, after_rtl, cfg_bb); } @@ -437,12 +443,33 @@ function_info::finalize_new_accesses (insn_change &change, insn_info *pos) { def_info *def = find_access (change.new_defs, ref.regno); gcc_assert (def); + + if (def->m_is_temp && is_a (def) && def->last_def ()) + { + // For temporary sets being added with this change, we keep track of + // the corresponding permanent def using the last_def link. + // + // So if we have one of these, follow it to get the permanent def. + def = def->last_def (); + gcc_assert (!def->m_is_temp && !def->m_has_been_superceded); + } + if (def->m_is_temp) { - // At present, the only temporary instruction definitions we - // create are clobbers, such as those added during recog. - gcc_assert (is_a (def)); - def = allocate (change.insn (), ref.regno); + if (is_a (def)) + def = allocate (change.insn (), ref.regno); + else if (is_a (def)) + { + // Install the permanent set in the last_def link of the + // temporary def. This allows us to find the permanent def + // later in case we see a second write to the same resource. + def_info *perm_def = allocate (change.insn (), + def->resource ()); + def->set_last_def (perm_def); + def = perm_def; + } + else + gcc_unreachable (); } else if (!def->m_has_been_superceded) { @@ -645,6 +672,8 @@ function_info::apply_changes_to_insn (insn_change &change) insn->set_accesses (builder.finish ().begin (), num_defs, num_uses); } + + insn->m_is_temp = false; } // Add a temporary placeholder instruction after AFTER. @@ -677,7 +706,8 @@ function_info::change_insns (array_slice changes) if (!change->is_deletion ()) { // Remove any notes that are no longer relevant. - update_notes (change->rtl ()); + if (!change->insn ()->m_is_temp) + update_notes (change->rtl ()); // Make sure that the placement of this instruction would still // leave room for previous instructions. @@ -686,6 +716,17 @@ function_info::change_insns (array_slice changes) // verify_insn_changes is supposed to make sure that this holds. gcc_unreachable (); min_insn = later_insn (min_insn, change->move_range.first); + + if (change->insn ()->m_is_temp) + { + change->m_insn = allocate (change->insn ()->bb (), + change->rtl (), + change->insn_uid ()); + + // Set the flag again so subsequent logic is aware. + // It will be cleared later on. + change->m_insn->m_is_temp = true; + } } } @@ -784,7 +825,8 @@ function_info::change_insns (array_slice changes) // Remove the placeholder first so that we have a wider range of // program points when inserting INSN. insn_info *after = placeholder->prev_any_insn (); - remove_insn (insn); + if (!insn->is_temporary ()) + remove_insn (insn); remove_insn (placeholder); insn->set_bb (after->bb ()); add_insn_after (insn, after); @@ -1105,6 +1147,28 @@ function_info::perform_pending_updates () return changed_cfg; } +insn_info * +function_info::create_insn (obstack_watermark &watermark, + rtx_code insn_code, + rtx pat) +{ + rtx_insn *rti = nullptr; + + // TODO: extend, move in to emit-rtl.cc. + switch (insn_code) + { + case INSN: + rti = make_insn_raw (pat); + break; + default: + gcc_unreachable (); + } + + auto insn = change_alloc (watermark, nullptr, rti, INSN_UID (rti)); + insn->m_is_temp = true; + return insn; +} + // Print a description of CHANGE to PP. void rtl_ssa::pp_insn_change (pretty_printer *pp, const insn_change &change) diff --git a/gcc/rtl-ssa/changes.h b/gcc/rtl-ssa/changes.h index d56e3a646e2..d91cf432afe 100644 --- a/gcc/rtl-ssa/changes.h +++ b/gcc/rtl-ssa/changes.h @@ -32,6 +32,8 @@ namespace rtl_ssa { // something that we might do. class insn_change { + friend class function_info; + public: enum delete_action { DELETE }; diff --git a/gcc/rtl-ssa/functions.h b/gcc/rtl-ssa/functions.h index ecb40fdaf57..4ffd3fa44e2 100644 --- a/gcc/rtl-ssa/functions.h +++ b/gcc/rtl-ssa/functions.h @@ -68,6 +68,16 @@ public: // Return the SSA information for CFG_BB. bb_info *bb (basic_block cfg_bb) const { return m_bbs[cfg_bb->index]; } + // Create a temporary def. + set_info *create_set (obstack_watermark &watermark, + insn_info *insn, + resource_info resource); + + // Create a temporary insn with code INSN_CODE and pattern PAT. + insn_info *create_insn (obstack_watermark &watermark, + rtx_code insn_code, + rtx pat); + // Return a list of all the instructions in the function, in reverse // postorder. The list includes both real and artificial instructions. // @@ -195,6 +205,10 @@ public: // Print the contents of the function to PP. void print (pretty_printer *pp) const; + // Allocate an object of type T above the obstack watermark WM. + template + T *change_alloc (obstack_watermark &wm, Ts... args); + private: class bb_phi_info; class build_info; diff --git a/gcc/rtl-ssa/insns.cc b/gcc/rtl-ssa/insns.cc index 5fde3f2bb4b..2fa48e0dacd 100644 --- a/gcc/rtl-ssa/insns.cc +++ b/gcc/rtl-ssa/insns.cc @@ -192,6 +192,11 @@ insn_info::print_full (pretty_printer *pp) const pp_newline_and_indent (pp, 0); pp_string (pp, "has volatile refs"); } + if (m_is_temp) + { + pp_newline_and_indent (pp, 0); + pp_string (pp, "temporary"); + } } pp_indentation (pp) -= 2; } diff --git a/gcc/rtl-ssa/insns.h b/gcc/rtl-ssa/insns.h index a604fe295cd..6d0506706ad 100644 --- a/gcc/rtl-ssa/insns.h +++ b/gcc/rtl-ssa/insns.h @@ -306,6 +306,8 @@ public: // Print a full description of the instruction. void print_full (pretty_printer *) const; + bool is_temporary () const { return m_is_temp; } + private: // The first-order way of representing the order between instructions // is to assign "program points", with higher point numbers coming @@ -414,8 +416,11 @@ private: unsigned int m_has_pre_post_modify : 1; unsigned int m_has_volatile_refs : 1; + // Indicates the insn is a temporary / new user-allocated insn. + unsigned int m_is_temp : 1; + // For future expansion. - unsigned int m_spare : 27; + unsigned int m_spare : 26; // The program point at which the instruction occurs. // diff --git a/gcc/rtl-ssa/internals.inl b/gcc/rtl-ssa/internals.inl index e49297c12b3..907c4504352 100644 --- a/gcc/rtl-ssa/internals.inl +++ b/gcc/rtl-ssa/internals.inl @@ -415,6 +415,7 @@ inline insn_info::insn_info (bb_info *bb, rtx_insn *rtl, int cost_or_uid) m_is_asm (false), m_has_pre_post_modify (false), m_has_volatile_refs (false), + m_is_temp (false), m_spare (0), m_point (0), m_cost_or_uid (cost_or_uid), diff --git a/gcc/rtl-ssa/member-fns.inl b/gcc/rtl-ssa/member-fns.inl index ce2db045b78..b8940ca5566 100644 --- a/gcc/rtl-ssa/member-fns.inl +++ b/gcc/rtl-ssa/member-fns.inl @@ -962,4 +962,16 @@ function_info::add_regno_clobber (obstack_watermark &watermark, return true; } +template +inline T * +function_info::change_alloc (obstack_watermark &wm, Ts... args) +{ + static_assert (std::is_trivially_destructible::value, + "destructor won't be called"); + static_assert (alignof (T) <= obstack_alignment, + "too much alignment required"); + void *addr = XOBNEW (wm, T); + return new (addr) T (std::forward (args)...); +} + } diff --git a/gcc/rtl-ssa/movement.h b/gcc/rtl-ssa/movement.h index ec076db406f..41226dd3666 100644 --- a/gcc/rtl-ssa/movement.h +++ b/gcc/rtl-ssa/movement.h @@ -182,6 +182,11 @@ restrict_movement_for_defs_ignoring (insn_range_info &move_range, { for (def_info *def : defs) { + // Skip fresh defs that are being inserted, as these shouldn't + // constrain movement. + if (def->is_temporary ()) + continue; + // If the definition is a clobber, we can move it with respect // to other clobbers. // @@ -247,7 +252,8 @@ restrict_movement_for_defs_ignoring (insn_range_info &move_range, // Make sure that we don't move stores between basic blocks, since we // don't have enough information to tell whether it's safe. - if (def_info *def = memory_access (defs)) + def_info *def = memory_access (defs); + if (def && !def->is_temporary ()) { move_range = move_later_than (move_range, def->bb ()->head_insn ()); move_range = move_earlier_than (move_range, def->bb ()->end_insn ());