From patchwork Wed Dec 20 09:28:57 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Coplan X-Patchwork-Id: 1878423 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=QvN6a+1S; 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=QvN6a+1S; 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 4Sw7Ym33cQz1ydg for ; Wed, 20 Dec 2023 20:29:32 +1100 (AEDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 45AE9386184A for ; Wed, 20 Dec 2023 09:29:30 +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-dbaeur03on2044.outbound.protection.outlook.com [40.107.104.44]) by sourceware.org (Postfix) with ESMTPS id 3A48F3858C2C for ; Wed, 20 Dec 2023 09:29:17 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 3A48F3858C2C 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 3A48F3858C2C Authentication-Results: server2.sourceware.org; arc=pass smtp.remote-ip=40.107.104.44 ARC-Seal: i=3; a=rsa-sha256; d=sourceware.org; s=key; t=1703064559; cv=pass; b=Y1lXN09ehaxf/9PNT/dSOPhxkIsAV1p4Ja8Hdy6my0+H7lPtiGmpBunSVsRhyk1tEgTwZoe39HibzQQ61wC/rMogK/tW1KRkiZhSQ27rwCKmn6mdt/2fCmYYEbfzgTEoNwrcXRI1m3P7ttc5jFNuP5E5WoX13uf703ZES4nxDPM= ARC-Message-Signature: i=3; a=rsa-sha256; d=sourceware.org; s=key; t=1703064559; c=relaxed/simple; bh=ZWen4pJTa1MrmwSzL9Kz6ci8nr9e1lCDNT37dFxcuyU=; h=DKIM-Signature:DKIM-Signature:Date:From:To:Subject:Message-ID: MIME-Version; b=PueY3q2j9pvhqkMadLTrKjjkMiVO3pN8CXfpIc6jGtDG7Mw+nYWbTCkpXeSPCovmLO77/OhkBisXPOFYtLmioAdBG8lPDYTbYcEo850Wzc17ZWlddsAdRUccjoWXXRcAstRJwjD6kqxm44zZxxoeOsJm5FxsfqnmloLrQWmjK5M= ARC-Authentication-Results: i=3; server2.sourceware.org ARC-Seal: i=2; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=pass; b=gjpi1c6lOzeJESC+dOwPv9GaSt0RboRiJkyofpWzCrjPNJ7FeVbL2kx/56BEQJjmv/5vvVNR2spUIGblnvNmm7mdJ8wH6BtT961vY8pgilka2ppCt27mJ6GhgwqYNF7BHkZxdv5x+4Hu4T0GugKzDOa7HqCOpqk08KyMB5SxgBeWOGoml3wFwe60ykm4CLx/BKRzUbPkvzRISOX1+/eG6xg3hCvtjulgA8doNXkEN8quZYyNroLc1AQEbjTOBCkixwtiOw9wdvxrVevgbC7CRLm+nRgefRTb2ZICaLiU8+3cqWFa7nRH5ZkYCmsPu/thqnPEDvfAmxTlMnWH/gLooA== 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=DGhAJFIvgUYo1RlINuxnVcnKZPe0eQqb69nGbCPhbHA=; b=ICiNLkWqTrOTrqamhRwvvNpGzc8BAYvgRHTGVTDJpqOyBmmQ8sK1haNszHkS68FQpDgMBEsFszAeVyM2MRqSV8QPhKihNGlbXkMAPuROsl87o/pzOIJnN3kxkF27nH8EBZtVzNj0zrsL4nYTmVJ9Xv/vu7OaOENkb1z/rJ1WDn7FOPvEpDxv9zd1NdPf/YP29iUfzcc3UieMGW+FSMXYuM74NRNFJrxRiVQMO8w21jqPG4WEzm7dCXrsKHfelAKQzoav3CXKAlogN/2c06tl+onb/GAA77FwuTOB3vSShudu1OnoWNCeUZhcEpsDoDauLP3CdcMV48LPf0OXWiAXIg== 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=DGhAJFIvgUYo1RlINuxnVcnKZPe0eQqb69nGbCPhbHA=; b=QvN6a+1SKC/u375oDwlRC6NBK4HIcI4F4WQG5W6cwtWR5j0EImFMcie5Cz0F9iyE+ab7Bc9obLR95Ev0892cLhXD3ivuJEg6h0uIxHoaByLn/d5csOUfGBCHxhR0lM/USUkcj32qiYNF++LZvxWpLiQA4nn3hTfyfI/P0s9xLlc= Received: from AS9PR04CA0107.eurprd04.prod.outlook.com (2603:10a6:20b:50e::19) by DBAPR08MB5765.eurprd08.prod.outlook.com (2603:10a6:10:1ac::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7113.18; Wed, 20 Dec 2023 09:29:14 +0000 Received: from AM1PEPF000252DF.eurprd07.prod.outlook.com (2603:10a6:20b:50e:cafe::7) by AS9PR04CA0107.outlook.office365.com (2603:10a6:20b:50e::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7113.18 via Frontend Transport; Wed, 20 Dec 2023 09:29:14 +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 AM1PEPF000252DF.mail.protection.outlook.com (10.167.16.57) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7113.14 via Frontend Transport; Wed, 20 Dec 2023 09:29:13 +0000 Received: ("Tessian outbound 7c4ecdadb9e7:v228"); Wed, 20 Dec 2023 09:29:13 +0000 X-CheckRecipientChecked: true X-CR-MTA-CID: abb684bc933618d7 X-CR-MTA-TID: 64aa7808 Received: from be8e74ab57f5.1 by 64aa7808-outbound-1.mta.getcheckrecipient.com id C4B749C0-8378-417D-9EEB-29A7CAA6CD2D.1; Wed, 20 Dec 2023 09:29:03 +0000 Received: from EUR05-DB8-obe.outbound.protection.outlook.com by 64aa7808-outbound-1.mta.getcheckrecipient.com with ESMTPS id be8e74ab57f5.1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384); Wed, 20 Dec 2023 09:29:03 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=mZ+ioOBGLUcxjv8em/27uG7zpNkAwiJSiZCcfkVJTHjTdbxzYHCkWKVqU8a7zMQ05yb6zlesWr/Xcup2nX1H+W2roy5zfut0LtR5fL1bxQaebqcvKjaaayWukmYGNOZcPIerVzlpchCr9W8WPIG7qC7+BL2FQg5rkVc9yo6KiNIndIL2ZCHKqATKkjuRwpXroMCQ7seysB0WV9SS7P25SMFpukdbQube4ojxGvpvIo5Ew4l3pQpluKu6fF1KvJY8JQH5iFIaLR8OAemMrrw9XfRT8SliUJmnHTpf/0zVmXAm4Ae5+MdRkJ21kqtGVz826wDBvzY/37ZVqCXbkEjMqg== 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=DGhAJFIvgUYo1RlINuxnVcnKZPe0eQqb69nGbCPhbHA=; b=mXu1aoSmPGX0Mohr/a1N31gNk3Beo4l60Zi2pNTvELeGvW0V+bWhW5+65VoWRrqoIN5IKPExP2tPUG5DkppOn1/2nkTY/JZav1Lj4PdPQy11XN3gkhO1M+EfYuuM/olbbhF7Kn2KP2GDBeGmMp/XlQ7FlungBtE71vmpxyFA5Gr/n/uoUj64+nSwQfrKOhsPxoOVGPanboongNhifPb9tyQ0nPkAOx4ICkKWpE5W9YUOKw5laMmKVHGwmBqxXacJWz3eROqLjEB4Wz3/ri40sJfzn0o+sV/YlEuHHgb56dmN6KI52RRypti6R5OBM5XR7Kve3TjXePRlS8oHJlHjMg== 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=DGhAJFIvgUYo1RlINuxnVcnKZPe0eQqb69nGbCPhbHA=; b=QvN6a+1SKC/u375oDwlRC6NBK4HIcI4F4WQG5W6cwtWR5j0EImFMcie5Cz0F9iyE+ab7Bc9obLR95Ev0892cLhXD3ivuJEg6h0uIxHoaByLn/d5csOUfGBCHxhR0lM/USUkcj32qiYNF++LZvxWpLiQA4nn3hTfyfI/P0s9xLlc= 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 DU0PR08MB9750.eurprd08.prod.outlook.com (2603:10a6:10:446::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7091.38; Wed, 20 Dec 2023 09:29:00 +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.7091.034; Wed, 20 Dec 2023 09:29:00 +0000 Date: Wed, 20 Dec 2023 09:28:57 +0000 From: Alex Coplan To: gcc-patches@gcc.gnu.org Cc: Richard Sandiford , Kyrylo Tkachov Subject: [PATCH v2] aarch64: Validate register operands early in ldp fusion pass [PR113062] Message-ID: Content-Disposition: inline X-ClientProxiedBy: LO4P123CA0089.GBRP123.PROD.OUTLOOK.COM (2603:10a6:600:190::22) To PAWPR08MB8958.eurprd08.prod.outlook.com (2603:10a6:102:33e::15) MIME-Version: 1.0 X-MS-TrafficTypeDiagnostic: PAWPR08MB8958:EE_|DU0PR08MB9750:EE_|AM1PEPF000252DF:EE_|DBAPR08MB5765:EE_ X-MS-Office365-Filtering-Correlation-Id: 6aa030c0-6d31-4578-5561-08dc013e216b 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: QZQBqNcrzv8Ya7RIc3nIFJlsM1ToKCMAaTjBA07fWsMoOUnvjtD3P6y4AJEY/AOHrE2ZLwy5PcwdvW07wR9Wzo3l/4w7e7bSKkoN3nQZjQn7wMNj3Di9A1rjBavfZ+QQTqQP8kJE/XHgrsII/HF9T2huTn+W7fTx3CwTVWU3gqUvD1Im2+rXPMevsr3dULO0alTjfweya9XP1NONqSbchm9E5YeJMa9GPnffb7TS83tcC7wZ4lcg4VRRozgPNbGVF4LZrv3QZQCBNX6qiwRON11SlWBMsbMc4SME9mlWyyZ5EE1V0We4ZZlNeF/8VJIXs0XofWzkJ4NzBHwDh2iblcceVJ/agMbs4+0Um8amEz2uIgAGEOtzLbMrG3JosE7YEnP5OagqaLVdIdLMvnp9Pq3+euFgS8020QfhYfFDQfKwN7j2K0uGiu9899zPlVWFgpuZecXayqBB8UTcTIuGpe94e77k0Icw1B5anCcjLLgGX+6mZQTgJOKTaeiyxcTjZwRsD3S8olol5K0647AU49VwzmdI3b1h7h6tXxfBy8yC/2udZ3MmlBJYVz1fBV2hjNhDOIybwYLy8xklpM2ufWAWzCWFOrmfH5R1R++nTOh2FvabXnJ8zqdlHn1dKrhJU1Hjlb2ikjkKKQ3tIEuTrQ== 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)(396003)(366004)(376002)(136003)(346002)(230922051799003)(64100799003)(1800799012)(186009)(451199024)(84970400001)(36756003)(4326008)(6506007)(6486002)(478600001)(2616005)(26005)(33964004)(2906002)(966005)(6666004)(66476007)(66556008)(44144004)(66946007)(8936002)(316002)(6916009)(6512007)(54906003)(8676002)(15650500001)(83380400001)(44832011)(86362001)(235185007)(5660300002)(41300700001)(38100700002)(21480400003)(2700100001); DIR:OUT; SFP:1101; X-MS-Exchange-Transport-CrossTenantHeadersStamped: DU0PR08MB9750 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: AM1PEPF000252DF.eurprd07.prod.outlook.com X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id-Prvs: 66d5022d-1722-460e-175e-08dc013e1907 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: K95g2mjWJ/qRc33V5Qv2tj8eCTch4rH51oapV4Hj8f/2zg5zWRBVOxhfdgmcq2NOlJ25VRSpQAfT8HTfqLciorkH6OjN86fJOf4zw7PwmuGMgZmTVZQ5pwpb1/DYdxph8HJKGDsenlxXT8wwYSQYU0I6jyGXGNcl9ulVBwEEcPGiEtItIbRS0Nxvj6ls0kmNQE4HsfFvaWiJ+vm0ortrC+TjfBoERUYNqz/5FnI9uWMnddiqz6li6+nBsN65Qbq16K+wDcDPw224Mzn7H0FASNGF+KdsYTHDTEfNdG4QSNtesj5cF1sLquFaCYjK4GNSjmcieCwDot+dKRVK9Kww8B3tW5zEZVikyCF8SWTJbY9B1J+u+ENVhxxzuqPvNi0YW+/x6sF1uHwIX+E22kt7AP2Auocrl7c6WB0ABEgDSdEiizfsuwW219NqlFSyefqmfHTHD53+0Wyg8Qnw+7gwBBkdllxYKhIyzngS945m4IG8gteFEOnJ79juN+/KZZivkHGzCgGR8ReZ+U8K4z0xNvJrNE0v7pQzM54TcEnWdGB7lnQiRG8fDBq7ALQ2GurQ5MgeEbpS56OMIYN6tiksrdt5EUNFbucHuKsO7irjfGrpZxV9MHK8Q047XJfKV6I4XR3AwbyEtHKFEtrohFXc2iD4sZ4VrBtff55c8gf1/xBCLF6OXhbdOQ6QR/sJ4fVEkmkpnU4QAgr81kc4fYXitFaIiTfLE10LeHN2UgtTvdI= 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)(396003)(346002)(376002)(136003)(39850400004)(230922051799003)(1800799012)(451199024)(186009)(82310400011)(64100799003)(36840700001)(46966006)(47076005)(2906002)(36756003)(356005)(82740400003)(8936002)(8676002)(15650500001)(235185007)(5660300002)(44832011)(4326008)(36860700001)(26005)(81166007)(2616005)(6486002)(41300700001)(40480700001)(84970400001)(966005)(478600001)(336012)(6506007)(6512007)(33964004)(6666004)(86362001)(44144004)(70206006)(70586007)(83380400001)(6916009)(54906003)(316002)(21480400003)(2700100001); DIR:OUT; SFP:1101; X-OriginatorOrg: arm.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Dec 2023 09:29:13.9425 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 6aa030c0-6d31-4578-5561-08dc013e216b 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: AM1PEPF000252DF.eurprd07.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DBAPR08MB5765 X-Spam-Status: No, score=-11.5 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, GIT_PATCH_0, KAM_DMARC_NONE, KAM_SHORT, LIKELY_SPAM_BODY, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2, SPF_HELO_NONE, 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 This is a v2 addressing Richard's feedback, v1 was posted here: https://gcc.gnu.org/pipermail/gcc-patches/2023-December/640957.html Bootstrapped/regtested on aarch64-linux-gnu, OK for trunk? Thanks, Alex -- >8 -- We were missing validation of the candidate register operands in the ldp/stp pass. I was relying on recog rejecting such cases when we formed the final pair insn, but the testcase shows that with -fharden-conditionals we attempt to combine two insns with asm_operands, both containing mem rtxes. This then trips the assert: gcc_assert (change->new_uses.is_valid ()); in the stp case as we aren't expecting to have (distinct) uses of mem in the candidate stores. While doing this I noticed that it seems more natural to have the initial definition of mem_size closer to its first use in track_access, so I moved that down. gcc/ChangeLog: PR target/113062 * config/aarch64/aarch64-ldp-fusion.cc (ldp_bb_info::track_access): Punt on accesses with invalid register operands, move definition of mem_size closer to its first use. gcc/testsuite/ChangeLog: PR target/113062 * gcc.dg/pr113062.c: New test. diff --git a/gcc/config/aarch64/aarch64-ldp-fusion.cc b/gcc/config/aarch64/aarch64-ldp-fusion.cc index 327ba4e417d..0e2c299a0bf 100644 --- a/gcc/config/aarch64/aarch64-ldp-fusion.cc +++ b/gcc/config/aarch64/aarch64-ldp-fusion.cc @@ -458,11 +458,14 @@ ldp_bb_info::track_access (insn_info *insn, bool load_p, rtx mem) if (!ldp_operand_mode_ok_p (mem_mode)) return; - // Note ldp_operand_mode_ok_p already rejected VL modes. - const HOST_WIDE_INT mem_size = GET_MODE_SIZE (mem_mode).to_constant (); - rtx reg_op = XEXP (PATTERN (insn->rtl ()), !load_p); + // Ignore the access if the register operand isn't suitable for ldp/stp. + if (load_p + ? !aarch64_ldp_reg_operand (reg_op, mem_mode) + : !aarch64_stp_reg_operand (reg_op, mem_mode)) + return; + // We want to segregate FP/SIMD accesses from GPR accesses. // // Before RA, we use the modes, noting that stores of constant zero @@ -474,6 +477,8 @@ ldp_bb_info::track_access (insn_info *insn, bool load_p, rtx mem) : (GET_MODE_CLASS (mem_mode) != MODE_INT && (load_p || !aarch64_const_zero_rtx_p (reg_op))); + // Note ldp_operand_mode_ok_p already rejected VL modes. + const HOST_WIDE_INT mem_size = GET_MODE_SIZE (mem_mode).to_constant (); const lfs_fields lfs = { load_p, fpsimd_op_p, mem_size }; if (track_via_mem_expr (insn, mem, lfs)) diff --git a/gcc/testsuite/gcc.dg/pr113062.c b/gcc/testsuite/gcc.dg/pr113062.c new file mode 100644 index 00000000000..5667c17b0f6 --- /dev/null +++ b/gcc/testsuite/gcc.dg/pr113062.c @@ -0,0 +1,10 @@ +/* { dg-do compile } */ +/* { dg-options "-Oz -fharden-conditional-branches" } */ +long double foo; +double bar; +void abort(); +void check() { + if (foo == bar) + abort(); +} +