From patchwork Wed Jan 10 15:54:42 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wilco Dijkstra X-Patchwork-Id: 83756 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 7767F3861033 for ; Wed, 10 Jan 2024 15:55:42 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05on2042.outbound.protection.outlook.com [40.107.22.42]) by sourceware.org (Postfix) with ESMTPS id 24A903857B82 for ; Wed, 10 Jan 2024 15:54:59 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 24A903857B82 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 24A903857B82 Authentication-Results: server2.sourceware.org; arc=pass smtp.remote-ip=40.107.22.42 ARC-Seal: i=3; a=rsa-sha256; d=sourceware.org; s=key; t=1704902102; cv=pass; b=M3Aya371VhxsZT4Dip7JjIGUyBbOWUYK2/zfAF505lCkxvqlxu22dJI7/gLyU0rHyttOb512u4TmE9izR28XYK98p2BWj/W5COKZVAJS3kbx3a5t3UzRiy/sdQXuL5yB4MnUyW2TYxZ1IGFoEy6Pp8BhRM0BZUIDtky9ba3B1kE= ARC-Message-Signature: i=3; a=rsa-sha256; d=sourceware.org; s=key; t=1704902102; c=relaxed/simple; bh=BrbhJeJI+ONBzTL4lvNG3ize21OZadQzg4P9B0MReO4=; h=DKIM-Signature:DKIM-Signature:From:To:Subject:Date:Message-ID: MIME-Version; b=gtH4RH1KASZ3DUbOArapbWOqwuazIYXBkJ9VUwYrxwfKg+8/FB7TrY4TKJLWur8XSYwzrMRvEERtxmdKkdAq4sB2i33YF20pHvSS3Jpdq33ATfbksAyX4QaOQFzp/qvxaKK7LskLbhPwu8zwENov4Wu6rq+6XS2psGoh71AENms= ARC-Authentication-Results: i=3; server2.sourceware.org ARC-Seal: i=2; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=pass; b=bmXbrUgTwSIxjg3R4KtcW/wTBR0Qk2oQsF26Kf1NHb+1q759ptcqjfuUrcVPUrJGA/F4sZUPOm7Mu4+jS841pVUdRzQaRVirLgOZqhf7vzSvK2lNNIwDwSvXaGeQbO9XXb3bLSrKfDw+0LvcWkqBGEddk1wc1NnV4tYnh8wOpN1urDjIE50npFuBlsEUB1DOWCtemCEt89sJvHzinT5xbdyP5n0HpROUwY4xlXlItaUm+1Hf9TEw0beBZT0poI5XMMmz+4tgGXzk84Slejo7PKXEqIN2/DeOcCkCb1eLBteM7WCTNCwwdCnsNbhzT9TsqXqXouzSWDcyXh15jB88Vw== 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=Q/1vINlR0QX4/njpZtHA/vrrOxiU/P99J+hT2Trrxhs=; b=nfrdkD8zvkjxaFaMC9OD9dbGnuSWbfGJ1td17lWuN5FoxRUVLmFr43URnMeWkIpwjUne9WOtpWcSlkKGhvbcyKlnGWBOXmE2PLojODTZFghBnJ5UJmd5iIBmGSq9OJlX5EnE33M4EblfI1P53coL/N3NSvXtvB4oQLXCa2+VhIhP8RtW/66B/Qik3aA0RCEPzNWeRJsvEv4XPmYQ6R1FvgHg0PzwtcGyhsucLyckbJF0nWbH+bKgo4miCUH6nAQlz+BQw8F54yMvsbZQpW81xN+3/F+rSowcc9nvvpL934XjzTu7XPjPNs0diP2z2gBJVLiWG7IPHbKI/+ls1bv1bw== 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=Q/1vINlR0QX4/njpZtHA/vrrOxiU/P99J+hT2Trrxhs=; b=dbWWrfTPqM6KhEK6byp06JmO1A5iSsZ1Irb6jIQFnPy1W1i0YOOzkcJMtJPZsI42e6cR/2nZq0uTPsW6TbBE8FOHk+uN93aANNJY6CeQ2Mffbif3/tKNfnlZguJ8+fZkTPihUlDnPD8M1Jn3ECZJAdKsSIIKFfARoiV1jvbbc7w= Received: from AM6P191CA0075.EURP191.PROD.OUTLOOK.COM (2603:10a6:209:8a::16) by AS8PR08MB6245.eurprd08.prod.outlook.com (2603:10a6:20b:293::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7159.23; Wed, 10 Jan 2024 15:54:56 +0000 Received: from AM3PEPF00009B9D.eurprd04.prod.outlook.com (2603:10a6:209:8a:cafe::50) by AM6P191CA0075.outlook.office365.com (2603:10a6:209:8a::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7181.17 via Frontend Transport; Wed, 10 Jan 2024 15:54:56 +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 AM3PEPF00009B9D.mail.protection.outlook.com (10.167.16.22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7181.14 via Frontend Transport; Wed, 10 Jan 2024 15:54:56 +0000 Received: ("Tessian outbound 1076c872ecc6:v228"); Wed, 10 Jan 2024 15:54:56 +0000 X-CheckRecipientChecked: true X-CR-MTA-CID: 1b3ae8304cc0b4fa X-CR-MTA-TID: 64aa7808 Received: from e3107e64e042.2 by 64aa7808-outbound-1.mta.getcheckrecipient.com id BBDB839E-26C8-44C6-A783-CEB284888159.1; Wed, 10 Jan 2024 15:54:45 +0000 Received: from EUR04-VI1-obe.outbound.protection.outlook.com by 64aa7808-outbound-1.mta.getcheckrecipient.com with ESMTPS id e3107e64e042.2 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384); Wed, 10 Jan 2024 15:54:45 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=X/rUe6M6KYu7r7pfGDADGwCzOJKjX0uvyuOB2/KQ2a+Psu919IWtnGIev8u0BXtVWuIxvIyMDpbbFYqIB1pd46oFlhM11api7gavq0W656vTu0Zy4Z3zVCcDlrFi8Eek3bGVIt7x2y85dcnZpYB2F2PVm8T1zoIKRVwywQBWeeW3PPm0ae9EnI2Wi2AS3+69z4v8ZrzI48mmb8/wDWzIM3F995ujMpkQLw1RkzclfULWMBT1oALsdMmBnvlsdbmyRgDoPLvXq/ZUBUI6oGYZZmIMqQ0xSBcmOFw08oybJpqwSc76sDRydZEWov12gaHgE9VsBcD91goAKk7szmvr2A== 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=Q/1vINlR0QX4/njpZtHA/vrrOxiU/P99J+hT2Trrxhs=; b=CZZ2Fb2/E8E+me8ARLmsMF08JF4P5bYYB+WV7UMImPbwgQnnTgzwT25bgWK5ZKiBf3yb+EYj4bZrKW0d4Qc9yuzW8ye/fSCvq2bX6iAzoB0iiuh+Avg2b/JBLFJ0/02OZF6hSKOE7zK4zbShkWqZ+JqtHiLhhDzKBKTQG8K8YNaJpkNfm4CQjmEFm9MZLAYpQqvL2KlF2JLJR/QgaxArZAz94aEsqchg1pWPTtuxHP/dQ1FuDSPXVEl14UB4YRJ5wId/4uE3c/BC3LPzovGH64vhC6nfwqqtnHS7b9SpjM4I/e9Cz1CFGomNKwH5YuArES/4Z6/kfQSZXnehDKZOxQ== 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=Q/1vINlR0QX4/njpZtHA/vrrOxiU/P99J+hT2Trrxhs=; b=dbWWrfTPqM6KhEK6byp06JmO1A5iSsZ1Irb6jIQFnPy1W1i0YOOzkcJMtJPZsI42e6cR/2nZq0uTPsW6TbBE8FOHk+uN93aANNJY6CeQ2Mffbif3/tKNfnlZguJ8+fZkTPihUlDnPD8M1Jn3ECZJAdKsSIIKFfARoiV1jvbbc7w= Received: from PAWPR08MB8982.eurprd08.prod.outlook.com (2603:10a6:102:33f::20) by AS8PR08MB7338.eurprd08.prod.outlook.com (2603:10a6:20b:445::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7159.23; Wed, 10 Jan 2024 15:54:42 +0000 Received: from PAWPR08MB8982.eurprd08.prod.outlook.com ([fe80::2ed5:dc23:2624:df0a]) by PAWPR08MB8982.eurprd08.prod.outlook.com ([fe80::2ed5:dc23:2624:df0a%7]) with mapi id 15.20.7159.020; Wed, 10 Jan 2024 15:54:42 +0000 From: Wilco Dijkstra To: GCC Patches CC: Richard Sandiford , Richard Earnshaw , Kyrylo Tkachov Subject: [PATCH] AArch64: Reassociate CONST in address expressions [PR112573] Thread-Topic: [PATCH] AArch64: Reassociate CONST in address expressions [PR112573] Thread-Index: AQHaQ9xz+ZOzZIze90eU0r/R7Damvw== Date: Wed, 10 Jan 2024 15:54:42 +0000 Message-ID: Accept-Language: en-GB, en-US Content-Language: en-GB X-MS-Has-Attach: X-MS-TNEF-Correlator: msip_labels: Authentication-Results-Original: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=arm.com; x-ms-traffictypediagnostic: PAWPR08MB8982:EE_|AS8PR08MB7338:EE_|AM3PEPF00009B9D:EE_|AS8PR08MB6245:EE_ X-MS-Office365-Filtering-Correlation-Id: c4e288cb-7426-4651-2c2d-08dc11f47e32 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: 08J69GySgDYjd6v4dljTmdsrCu3P6QeQQNjoXnBcCKU2xsPcu8uuD6ggxb0106Cvb9BSrr9N8kreP3XTDDNlPZo6Cu6uI9TTh7V7IbenyEyXYCaKTzV/aRKo1daB4lHUGUF2tOmL0kvczPmeq9dKfF5UaWgJPiDEmhNSGh6UxNBosuq4jQXzA+auE7e101OupajyavVkaGmEUxE5KfrcgZgLr5raNChAIInN+ZhydAg6r1qm56P9VzeqhmV4/M4WcG86YLwsf12u0IKhsdt2S1UZ9Z4pGt//dJxLdJfsQ1v0yM8jGrDMyO9AEAv5cyQhUhF4q5c2TdRFDljdU0hp5BEflW4FrppkdHEL3HO2x8ZpJpPxoiR+xlQnvT+CO3GOFQbWCir79DdGTYUqgGgoaS0qWbqhaLPRAplfTcbNDCtANGNHPXPuXjcyR1P9WeqnJtnhB7yQAvOzIH9KqstTtTAhas4aTf+RdHc9LL3mS2Xft8aUHL+2Ckm3+Dc8s4ZH1ARx5Da1z3CbLHHtFjR9SwOXv4UpF6vtI37id6cfnp5eUnQ/goC7UDVc6BlmG+jZ4b1aQOVkmqQ49vByUybnUWqN8oM7vWM2SiLCCM/bsC4= X-Forefront-Antispam-Report-Untrusted: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:PAWPR08MB8982.eurprd08.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230031)(136003)(396003)(376002)(39860400002)(366004)(346002)(230922051799003)(64100799003)(186009)(1800799012)(451199024)(8676002)(8936002)(9686003)(33656002)(71200400001)(478600001)(6506007)(7696005)(66476007)(26005)(66946007)(76116006)(66556008)(91956017)(6916009)(66446008)(38100700002)(122000001)(64756008)(86362001)(316002)(55016003)(38070700009)(54906003)(5660300002)(41300700001)(2906002)(4326008)(52536014)(84970400001); DIR:OUT; SFP:1101; MIME-Version: 1.0 X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR08MB7338 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: AM3PEPF00009B9D.eurprd04.prod.outlook.com X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id-Prvs: 15ef3625-a099-40fa-439d-08dc11f475b3 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: RKsAsplQMTDSj5Z4FBiKUmCC+XiJFk88hEfD7kz9wuGrl+/vwxTdIbtzs0MH6eKnvs5ZHKqP+UfCaAR8U5ot0RJbFxeYdexKpFhVMl4UFF/0qGHzepUsibXZAHVuiCQY+mb5va/tTMUTCJuXcva1t6cRrgIuFpRoRYONKra95Z3IxcxE/4trukPuzHyA3G3xqdRSZiGhEcsTM/9U33M8ub9CKVexSxot5s56aVMar11uS5VOtBAB2+AQ6fsM7JsThHgoT/Q/f0zfMGrUebgPDZp9EjPhq565oGUmC3Yt6DOe439pmoy8Hz9dfwreQGvliI1XoYhm7JI46bcEMBfs6m3z+8r23HmyEQoOM51sa+heMdUy1gKmq0lWvSM6ZiXD56QV2Te5mup4QBmmMheFQUuJKi9AF3DFwHDOywHCoOatMkzYEhM6MJP+OO2NUjmYq2E0VzBEujiA1bem/g3Kt5Dm6AvZBWetydS9iNqbsWyEn9UIxOJTxcDiyn3m5qGDTSLCxJi6Or0hzITQrEl7QAqCzo4SNiiw+/VKwvJp2lhwxRzD9WEctEv5GPN6WDZVr6Cx00iU+GxQ30cNHBMIFCzBRhh1ZS6WIf8dtBremG+qilpqEH2jQjzdTsj30rmj3bAfmAJwo6yMwXQiE8ak4/LUA6xzQ5TXZhwIQagbap/HP0oY3Dl4T3WU7qTahH0n3Jscd88BaOg+58NMZPNlDmF+KMKGoKh4TggMyc5tgaw= 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)(376002)(39860400002)(136003)(346002)(396003)(230922051799003)(64100799003)(186009)(1800799012)(451199024)(82310400011)(36840700001)(40470700004)(46966006)(7696005)(55016003)(33656002)(336012)(41300700001)(9686003)(6506007)(47076005)(478600001)(40460700003)(8936002)(54906003)(316002)(70206006)(70586007)(8676002)(356005)(82740400003)(84970400001)(26005)(40480700001)(36860700001)(81166007)(6916009)(52536014)(4326008)(5660300002)(2906002)(86362001); DIR:OUT; SFP:1101; X-OriginatorOrg: arm.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Jan 2024 15:54:56.6052 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: c4e288cb-7426-4651-2c2d-08dc11f47e32 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: AM3PEPF00009B9D.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR08MB6245 X-Spam-Status: No, score=-10.7 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+patchwork=sourceware.org@gcc.gnu.org GCC tends to optimistically create CONST of globals with an immediate offset. However it is almost always better to CSE addresses of globals and add immediate offsets separately (the offset could be merged later in single-use cases). Splitting CONST expressions with an index in aarch64_legitimize_address fixes part of PR112573. Passes regress & bootstrap, OK for commit? gcc/ChangeLog: PR target/112573 * config/aarch64/aarch64.cc (aarch64_legitimize_address): Reassociate badly formed CONST expressions. gcc/testsuite/ChangeLog: PR target/112573 * gcc.target/aarch64/pr112573.c: Add new test. diff --git a/gcc/config/aarch64/aarch64.cc b/gcc/config/aarch64/aarch64.cc index 0909b319d16b9a1587314bcfda0a8112b42a663f..9fbc8b62455f48baec533d3dd5e2d9ea995d5a8f 100644 --- a/gcc/config/aarch64/aarch64.cc +++ b/gcc/config/aarch64/aarch64.cc @@ -12608,6 +12608,20 @@ aarch64_legitimize_address (rtx x, rtx /* orig_x */, machine_mode mode) not to split a CONST for some forms of address expression, otherwise it will generate sub-optimal code. */ + /* First split X + CONST (base, offset) into (base + X) + offset. */ + if (GET_CODE (x) == PLUS && GET_CODE (XEXP (x, 1)) == CONST) + { + poly_int64 offset; + rtx base = strip_offset_and_salt (XEXP (x, 1), &offset); + + if (offset.is_constant ()) + { + base = expand_binop (Pmode, add_optab, base, XEXP (x, 0), + NULL_RTX, true, OPTAB_DIRECT); + x = plus_constant (Pmode, base, offset); + } + } + if (GET_CODE (x) == PLUS && CONST_INT_P (XEXP (x, 1))) { rtx base = XEXP (x, 0); diff --git a/gcc/testsuite/gcc.target/aarch64/pr112573.c b/gcc/testsuite/gcc.target/aarch64/pr112573.c new file mode 100644 index 0000000000000000000000000000000000000000..be04c0ca86ad9f33975a85f497549955d6d1236d --- /dev/null +++ b/gcc/testsuite/gcc.target/aarch64/pr112573.c @@ -0,0 +1,15 @@ +/* { dg-do compile } */ +/* { dg-options "-O2 -fno-section-anchors" } */ + +char a[100]; + +void f1 (int x, int y) +{ + *((a + y) + 3) = x; + *((a + y) + 2) = x; + *((a + y) + 1) = x; + *((a + y) + 0) = x; +} + +/* { dg-final { scan-assembler-times "strb" 4 } } */ +/* { dg-final { scan-assembler-times "adrp" 1 } } */