From patchwork Tue Nov 1 13:08:18 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wilco Dijkstra X-Patchwork-Id: 1697732 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org 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=sourceware.org; envelope-from=gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.a=rsa-sha256 header.s=default header.b=l+bIjTGM; dkim-atps=neutral Received: from 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 (P-384) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4N1r2N4DJKz23lC for ; Wed, 2 Nov 2022 00:09:12 +1100 (AEDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 341BB38576B9 for ; Tue, 1 Nov 2022 13:09:10 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 341BB38576B9 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1667308150; bh=ZFZ9fqyoI6852HXC3E6H8zVcS6CRsfj6JbehT+cjOhk=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:Cc:From; b=l+bIjTGMz3GpAX5bmPv2dC2o79dPZqeYKevVsco3FwTyjthOLbiq8Uayn1Cz2uD4s U3BZpT7VaVTWf3qAEn1dkdf9i5OzqZ62TV55dt/jfk+NBGs2xxA8GRxOg14LrCicHT yRPLddi+U3ZS91Fy/+EBJfv2HUXNIhXJACZSnOiA= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05on2065.outbound.protection.outlook.com [40.107.21.65]) by sourceware.org (Postfix) with ESMTPS id CA12438582BA for ; Tue, 1 Nov 2022 13:08:45 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org CA12438582BA ARC-Seal: i=2; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=pass; b=hpgsOIZ8CQ9ypJME1vf4Nv7ZF4HBnqy2Oj2SBvi7bHGfsctJMJwc40xUizi74LwOCmZeJNMQ9yJP4y0TZY/o+Fp6tvlmnIVsEWNGvE5MZ8QXjm/h7cV3d/RNs5wSsOOu0yvtjmYRORodQbYdzikWR3gMdXAeF4bU+TxANs/62uZVFtXVn+indTxMaCtCLDkdGJl46iRVki97cPV3YmQUtvkj/ybFBq5sqLBsRm/sHfEJWDVXX5TzDJLiOO1oxtWi0bYggBrlSyGMpGIwLNCJyu5JDHtERiBg2IUQVe17jY9kUB353KQMBycM5nW6M2Wq9yAJJjIoD/Ol6NF2PpERmQ== 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=ZFZ9fqyoI6852HXC3E6H8zVcS6CRsfj6JbehT+cjOhk=; b=CgDI7nvTGGxnqJj+RMTCRGoRfX9eEoAGdfhanNUt+UZsWuwQSNoxIeOpXJY7D8GT51pl1TbhEv10sUTuwqYlezIxZ70qFIL2UNO6JX0kAEujuW3UhqHXhFIxlx+oJpqH+nlKQTeSHPqrjFaiRQsEyDuwxH7CpmG2Kd8qMFsHRGuKvs8aqtiYx6/+oYU90/M951BodsmhYeO39U09BKEG0hJZapkPYHJwo5uSsH2Jo+Vr5wu73NFXqttLjHVkQI7t1FteQ2kkhDE2NpAI0EGzhkTBMHUZT0NAVIPLlyKpi9IVpK4lmjcNNY1wOwnuDI0QDfrc8kg3LfauGLkTsNP2YQ== 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]) Received: from DU2PR04CA0187.eurprd04.prod.outlook.com (2603:10a6:10:28d::12) by GV1PR08MB8570.eurprd08.prod.outlook.com (2603:10a6:150:82::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5769.16; Tue, 1 Nov 2022 13:08:32 +0000 Received: from DBAEUR03FT007.eop-EUR03.prod.protection.outlook.com (2603:10a6:10:28d:cafe::45) by DU2PR04CA0187.outlook.office365.com (2603:10a6:10:28d::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5769.15 via Frontend Transport; Tue, 1 Nov 2022 13:08:32 +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 DBAEUR03FT007.mail.protection.outlook.com (100.127.142.161) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5769.14 via Frontend Transport; Tue, 1 Nov 2022 13:08:32 +0000 Received: ("Tessian outbound f394866f3f2b:v130"); Tue, 01 Nov 2022 13:08:32 +0000 X-CheckRecipientChecked: true X-CR-MTA-CID: efe09c91ed59a253 X-CR-MTA-TID: 64aa7808 Received: from b24371e6deea.1 by 64aa7808-outbound-1.mta.getcheckrecipient.com id 9376AB08-F74F-436A-AFAE-DDD207927A09.1; Tue, 01 Nov 2022 13:08:21 +0000 Received: from EUR02-VE1-obe.outbound.protection.outlook.com by 64aa7808-outbound-1.mta.getcheckrecipient.com with ESMTPS id b24371e6deea.1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384); Tue, 01 Nov 2022 13:08:21 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=DCXMs0e9MPChmFPWePn6O8GY2n3iXU5+F96U+S9GJV98fxqtnoU6PKdvEvOs3+1cP8DX5s6vU3zOyng0JLwr9Wpq6dulVHqKbrIP7nnljOoASOh4QevKC5u0MZRhH94X/2r6/E1cgOz63wQri1q7QZHkn2dYWHlvEF7wTaCJKMgXBUyvZS2PKkXJLm+tzgYJHt7Z45Uke9ubX5fnCcAKpK+paZ1/+UC1KtPV5aAPoKCem/8m2F5VnDubdtpvmLSTPfGTd4UlciMBsQpQxsYci55r4f/ZXuJ9sAmTNkkN0XAxqduyAq4cJV9veNkQyAKMiJtKiKENL9Bb+p3osMTHZQ== 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=ZFZ9fqyoI6852HXC3E6H8zVcS6CRsfj6JbehT+cjOhk=; b=JzETfvBlgA9eDbgNBZqlAAMFZjykpYrjbZDPZ1URRP3FrnR8+V8gF1mlHEQtMnWOLnyU+bL2YPl0drB+7sSjC3KaBBLhvhjt0fLFT3/t/+cSgjALKg588cwM66bn3RvG9ypVq4kZmnvYWPbF8OwzUr3UhyPm4XqIedDxj5/jLOm2GzO3LvYiTsIoeRdBA3/3CDFTEbhsjRiGRCZp3oKgjZzsc13ZFH0u/wju+V5jn/eoNHCHEAR1wMdeRxSG5Jw3gFGjOBzGIzZ+gDyDzm75GrkJ9F+NyhtuhB7+52BEGdUzy5Tf8wvOfqbpbR3AvwHqkHS6HWt3QcqAPBVRtarp9g== 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 Received: from PAWPR08MB8982.eurprd08.prod.outlook.com (2603:10a6:102:33f::20) by DBBPR08MB6170.eurprd08.prod.outlook.com (2603:10a6:10:200::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5769.19; Tue, 1 Nov 2022 13:08:19 +0000 Received: from PAWPR08MB8982.eurprd08.prod.outlook.com ([fe80::4c73:7d14:fc39:a3cb]) by PAWPR08MB8982.eurprd08.prod.outlook.com ([fe80::4c73:7d14:fc39:a3cb%4]) with mapi id 15.20.5769.016; Tue, 1 Nov 2022 13:08:18 +0000 To: GCC Patches Subject: [PATCH][AArch64] Cleanup move immediate code Thread-Topic: [PATCH][AArch64] Cleanup move immediate code Thread-Index: AQHY7fH0WskJzQzwrkGLJFQVAKTPzA== Date: Tue, 1 Nov 2022 13:08:18 +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_|DBBPR08MB6170:EE_|DBAEUR03FT007:EE_|GV1PR08MB8570:EE_ X-MS-Office365-Filtering-Correlation-Id: e7888874-ba33-4727-a9e5-08dabc0a2d46 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: qqLzLdatc7TH58CsNUnH0VVO4AAF4/r7rnN/tjTRBoJ1rrAuHlpwjxWS5nMC1VJbEADsaLgw97D0fGapDSoG21d8gC5A/D12duZzq8AyiuQ6oggNM+0pWekZIv6US5dnHv2Mn7CM3Z1y/9549Jofh7uprIEm49xGpNdrgh1y5lf/VgxyDefwB37LZcUH826VWoSpmlgqaHjPQ5AN+eoVo9sQXGxTMMG0UHGJOL2JRmgNxJ+nEmo7xCaA6/KqnGQVEWUhR21itLg1O4aNeMq5J2spV9wI3zKldzKDcVHtYxbbiS+nSKjDLW9VouBJ3XJH/Ga7YkCnqvxFqVSHl/beRQ7ZGbdyqLlHJhLjsn0c0/u3x1VAuDzViLh/fBygFETPI97+wixG83XU9cGyFZ8yc8voMwZD2zZHSq3ylixfyw722y2wk8glnAarFhFSjmw1EXVQ0atygs/VkPBg8yC5RaAZPYOir39WnuPnSr9inAr+WN7IvF/+DbCDtR3tMzdvTBzkTKkaj19eJR8reJlFOa3Lg4jXPA8C2/RNU4/Zl394jhboIBqzoOuw6/ULBGrDb7nauFQ2PkGi0Y41ID4xF6llFlwm60r/qWIWO2GoOBK07QdKQcITjNmO8KdYMJ9TWFd0BymLt4I9r0KziDd99URF3HhpTGBdEL4EYVGpAVShet5OerAmoiSrn+HGiFHvXr9JBI20SBDXDzB0XINGgCRdwqdTEAkvE/npKt4aFDYihRPneLoT1H9Z5wCGafITU3zu5c6g22npBwJjUfV+aoRsP3qJNp3t1c7mlTt70v0= 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:(13230022)(4636009)(136003)(366004)(39860400002)(396003)(346002)(376002)(451199015)(8936002)(26005)(5660300002)(83380400001)(52536014)(9686003)(30864003)(186003)(2906002)(6506007)(71200400001)(33656002)(55016003)(478600001)(86362001)(38100700002)(7696005)(66946007)(66476007)(66556008)(66446008)(64756008)(91956017)(38070700005)(76116006)(122000001)(316002)(41300700001)(6916009)(4326008)(8676002)(14773001); DIR:OUT; SFP:1101; MIME-Version: 1.0 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DBBPR08MB6170 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: DBAEUR03FT007.eop-EUR03.prod.protection.outlook.com X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id-Prvs: 9c266f96-8f20-4895-a725-08dabc0a255b X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Q0KVwZsuxfRsWtngltbuGDOlnfZnyOpF/KeBimAaOJqjNxb0f/aL0XhxDSYOMlsYnEPCX4FaPasklnKv7k4hBuVsmDh3XGJopsVcgaJNUaT7h43c1U7KotJf7OuDN/0eHXDf4HTBFlWhUgNRlMysvrSPvHUeKC2Ch8DG1OxmSG+zUhxlk4swkKBqzGN9GXqM24DcHeKW4nBTuajqjuUOn4FrSGQHsY1XjkxzHYfwsb812e/HeuonmcQ8oIVx84e62qzhuG5cNzkwHRXhg87kuyAZ/+aayCZ/awS67hWlPr+oxbPETCC705NTjtAJmL6zZOz/1NXjdEh8tN2Pw6ElhNhQeN5o+3Fi/fRPeqwwkZaob82Pa3X2IEpxZzKG1roHlVmcxpnnIGkCYeu86AVU3F+sxLuK4oNfuRkIvGmXasSBGfLJMydDM/hnLXQj/M5p1HheqXI5srxJnlWCbutmqOeyA4doSwiM+LMZWKVJlb1VUef9p/T/1L9CUKxrtFotYR7A2jkm3gyM2Gsa+qLwhHRMN1gDxy5WMHF1AKR4ZSWvbQrnxAJZKH7SD+2IXgPU6lv1USOwBr47l8Gc5Q+apRiYyBXypNQ3pswD+RkcyOHkG2R5Ngxgrrw0rHYFMrgMe7lr3SmN8eivAtZjkrkuUigSR6djD6puzQWw3q0Oh/wmFC7J5nMKzvLXRmPdJ5qMTeg2BqhroLTswoZ/pVD6+1FFohZqncWV4LGR3XY7/lsFLBaIdQS0meY05YzW92sYnGbm+3VXFiWDkH6lDhwljrHJnnPI0reqjUkkfdPFJtE= 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:(13230022)(4636009)(396003)(39860400002)(346002)(376002)(136003)(451199015)(40470700004)(46966006)(36840700001)(70586007)(70206006)(356005)(81166007)(41300700001)(316002)(6916009)(82310400005)(55016003)(6506007)(7696005)(36860700001)(33656002)(52536014)(5660300002)(30864003)(478600001)(40480700001)(47076005)(83380400001)(186003)(8676002)(8936002)(4326008)(82740400003)(336012)(40460700003)(9686003)(26005)(86362001)(2906002)(14773001); DIR:OUT; SFP:1101; X-OriginatorOrg: arm.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Nov 2022 13:08:32.1647 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: e7888874-ba33-4727-a9e5-08dabc0a2d46 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: DBAEUR03FT007.eop-EUR03.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: GV1PR08MB8570 X-Spam-Status: No, score=-11.0 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, FORGED_SPF_HELO, GIT_PATCH_0, KAM_DMARC_NONE, KAM_LOTSOFHASH, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2, SPF_HELO_PASS, 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.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Wilco Dijkstra via Gcc-patches From: Wilco Dijkstra Reply-To: Wilco Dijkstra Cc: Richard Sandiford Errors-To: gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org Sender: "Gcc-patches" Hi Richard, Here is the immediate cleanup splitoff from the previous patch: Simplify, refactor and improve various move immediate functions. Allow 32-bit MOVZ/N as a valid 64-bit immediate which removes special cases in aarch64_internal_mov_immediate. Add new constraint so the movdi pattern only needs a single alternative for move immediate. Passes bootstrap and regress, OK for commit? gcc/ChangeLog: * config/aarch64/aarch64.cc (aarch64_bitmask_imm): Use unsigned type. (aarch64_zeroextended_move_imm): New function. (aarch64_move_imm): Refactor, assert mode is SImode or DImode. (aarch64_internal_mov_immediate): Assert mode is SImode or DImode. Simplify special cases. (aarch64_uimm12_shift): Simplify code. (aarch64_clamp_to_uimm12_shift): Likewise. (aarch64_movw_imm): Remove. (aarch64_float_const_rtx_p): Pass either SImode or DImode to aarch64_internal_mov_immediate. (aarch64_rtx_costs): Likewise. * config/aarch64/aarch64.md (movdi_aarch64): Merge 'N' and 'M' constraints into single 'O'. (mov_aarch64): Likewise. * config/aarch64/aarch64-protos.h (aarch64_move_imm): Use unsigned. (aarch64_bitmask_imm): Likewise. (aarch64_uimm12_shift): Likewise. (aarch64_zeroextended_move_imm): New prototype. * config/aarch64/constraints.md: Add 'O' for 32/64-bit immediates, limit 'N' to 64-bit only moves. diff --git a/gcc/config/aarch64/aarch64-protos.h b/gcc/config/aarch64/aarch64-protos.h index 1a71f02284137c64e7115b26e6aa00447596f105..a73bfa20acb9b92ae0475794c3f11c67d22feb97 100644 --- a/gcc/config/aarch64/aarch64-protos.h +++ b/gcc/config/aarch64/aarch64-protos.h @@ -755,7 +755,7 @@ void aarch64_post_cfi_startproc (void); poly_int64 aarch64_initial_elimination_offset (unsigned, unsigned); int aarch64_get_condition_code (rtx); bool aarch64_address_valid_for_prefetch_p (rtx, bool); -bool aarch64_bitmask_imm (HOST_WIDE_INT val, machine_mode); +bool aarch64_bitmask_imm (unsigned HOST_WIDE_INT val, machine_mode); unsigned HOST_WIDE_INT aarch64_and_split_imm1 (HOST_WIDE_INT val_in); unsigned HOST_WIDE_INT aarch64_and_split_imm2 (HOST_WIDE_INT val_in); bool aarch64_and_bitmask_imm (unsigned HOST_WIDE_INT val_in, machine_mode mode); @@ -792,7 +792,7 @@ bool aarch64_masks_and_shift_for_bfi_p (scalar_int_mode, unsigned HOST_WIDE_INT, unsigned HOST_WIDE_INT, unsigned HOST_WIDE_INT); bool aarch64_zero_extend_const_eq (machine_mode, rtx, machine_mode, rtx); -bool aarch64_move_imm (HOST_WIDE_INT, machine_mode); +bool aarch64_move_imm (unsigned HOST_WIDE_INT, machine_mode); machine_mode aarch64_sve_int_mode (machine_mode); opt_machine_mode aarch64_sve_pred_mode (unsigned int); machine_mode aarch64_sve_pred_mode (machine_mode); @@ -842,8 +842,9 @@ bool aarch64_sve_float_arith_immediate_p (rtx, bool); bool aarch64_sve_float_mul_immediate_p (rtx); bool aarch64_split_dimode_const_store (rtx, rtx); bool aarch64_symbolic_address_p (rtx); -bool aarch64_uimm12_shift (HOST_WIDE_INT); +bool aarch64_uimm12_shift (unsigned HOST_WIDE_INT); int aarch64_movk_shift (const wide_int_ref &, const wide_int_ref &); +bool aarch64_zeroextended_move_imm (unsigned HOST_WIDE_INT); bool aarch64_use_return_insn_p (void); const char *aarch64_output_casesi (rtx *); diff --git a/gcc/config/aarch64/aarch64.cc b/gcc/config/aarch64/aarch64.cc index 5d1ab5aa42b2cda0a655d2bc69c4df19da457ab3..798363bcc449c414de5bbb4f26b8e1c64a0cf71a 100644 --- a/gcc/config/aarch64/aarch64.cc +++ b/gcc/config/aarch64/aarch64.cc @@ -5558,12 +5558,10 @@ aarch64_bitmask_imm (unsigned HOST_WIDE_INT val) /* Return true if VAL is a valid bitmask immediate for MODE. */ bool -aarch64_bitmask_imm (HOST_WIDE_INT val_in, machine_mode mode) +aarch64_bitmask_imm (unsigned HOST_WIDE_INT val, machine_mode mode) { if (mode == DImode) - return aarch64_bitmask_imm (val_in); - - unsigned HOST_WIDE_INT val = val_in; + return aarch64_bitmask_imm (val); if (mode == SImode) return aarch64_bitmask_imm ((val & 0xffffffff) | (val << 32)); @@ -5602,51 +5600,60 @@ aarch64_check_bitmask (unsigned HOST_WIDE_INT val, } -/* Return true if val is an immediate that can be loaded into a - register by a MOVZ instruction. */ -static bool -aarch64_movw_imm (HOST_WIDE_INT val, scalar_int_mode mode) +/* Return true if immediate VAL can only be created by using a 32-bit + zero-extended move immediate, not by a 64-bit move. */ +bool +aarch64_zeroextended_move_imm (unsigned HOST_WIDE_INT val) { - if (GET_MODE_SIZE (mode) > 4) - { - if ((val & (((HOST_WIDE_INT) 0xffff) << 32)) == val - || (val & (((HOST_WIDE_INT) 0xffff) << 48)) == val) - return 1; - } - else - { - /* Ignore sign extension. */ - val &= (HOST_WIDE_INT) 0xffffffff; - } - return ((val & (((HOST_WIDE_INT) 0xffff) << 0)) == val - || (val & (((HOST_WIDE_INT) 0xffff) << 16)) == val); + if (val < 65536 || (val >> 32) != 0 || (val & 0xffff) == 0) + return false; + return !aarch64_bitmask_imm (val); } -/* Return true if VAL is an immediate that can be loaded into a - register in a single instruction. */ +/* Return true if VAL is an immediate that can be created by a single + MOV instruction. */ bool -aarch64_move_imm (HOST_WIDE_INT val, machine_mode mode) +aarch64_move_imm (unsigned HOST_WIDE_INT val, machine_mode mode) { - scalar_int_mode int_mode; - if (!is_a (mode, &int_mode)) - return false; + unsigned HOST_WIDE_INT val2; - if (aarch64_movw_imm (val, int_mode) || aarch64_movw_imm (~val, int_mode)) - return 1; - return aarch64_bitmask_imm (val, int_mode); + gcc_assert (mode == SImode || mode == DImode); + + if (val < 65536) + return true; + + val2 = val ^ ((HOST_WIDE_INT) val >> 63); + if ((val2 >> (__builtin_ctzll (val2) & 48)) < 65536) + return true; + + /* Special case 0xyyyyffffffffffff. */ + if (((val2 + 1) << 16) == 0) + return true; + + /* Special case immediates 0xffffyyyy and 0xyyyyffff. */ + val2 = (mode == DImode) ? val : val2; + if (((val2 + 1) & ~(unsigned HOST_WIDE_INT) 0xffff0000) == 0 + || (val2 >> 16) == 0xffff) + return true; + + if (mode == SImode || (val >> 32) == 0) + val = (val & 0xffffffff) | (val << 32); + return aarch64_bitmask_imm (val); } static int aarch64_internal_mov_immediate (rtx dest, rtx imm, bool generate, - scalar_int_mode mode) + machine_mode mode) { int i; unsigned HOST_WIDE_INT val, val2, mask; int one_match, zero_match; int num_insns; + gcc_assert (mode == SImode || mode == DImode); + val = INTVAL (imm); if (aarch64_move_imm (val, mode)) @@ -5656,31 +5663,6 @@ aarch64_internal_mov_immediate (rtx dest, rtx imm, bool generate, return 1; } - /* Check to see if the low 32 bits are either 0xffffXXXX or 0xXXXXffff - (with XXXX non-zero). In that case check to see if the move can be done in - a smaller mode. */ - val2 = val & 0xffffffff; - if (mode == DImode - && aarch64_move_imm (val2, SImode) - && (((val >> 32) & 0xffff) == 0 || (val >> 48) == 0)) - { - if (generate) - emit_insn (gen_rtx_SET (dest, GEN_INT (val2))); - - /* Check if we have to emit a second instruction by checking to see - if any of the upper 32 bits of the original DI mode value is set. */ - if (val == val2) - return 1; - - i = (val >> 48) ? 48 : 32; - - if (generate) - emit_insn (gen_insv_immdi (dest, GEN_INT (i), - GEN_INT ((val >> i) & 0xffff))); - - return 2; - } - if ((val >> 32) == 0 || mode == SImode) { if (generate) @@ -5704,24 +5686,31 @@ aarch64_internal_mov_immediate (rtx dest, rtx imm, bool generate, one_match = ((~val & mask) == 0) + ((~val & (mask << 16)) == 0) + ((~val & (mask << 32)) == 0) + ((~val & (mask << 48)) == 0); + /* Try a bitmask immediate and a movk to generate the immediate + in 2 instructions. */ + if (zero_match < 2 && one_match < 2) { - /* Try emitting a bitmask immediate with a movk replacing 16 bits. - For a 64-bit bitmask try whether changing 16 bits to all ones or - zeroes creates a valid bitmask. To check any repeated bitmask, - try using 16 bits from the other 32-bit half of val. */ - for (i = 0; i < 64; i += 16) - if (aarch64_check_bitmask (val, val2, mask << i)) - { - if (generate) - { - emit_insn (gen_rtx_SET (dest, GEN_INT (val2))); - emit_insn (gen_insv_immdi (dest, GEN_INT (i), - GEN_INT ((val >> i) & 0xffff))); - } - return 2; - } + { + if (aarch64_check_bitmask (val, val2, mask << i)) + break; + + val2 = val & ~(mask << i); + if ((val2 >> 32) == 0 && aarch64_move_imm (val2, DImode)) + break; + } + + if (i != 64) + { + if (generate) + { + emit_insn (gen_rtx_SET (dest, GEN_INT (val2))); + emit_insn (gen_insv_immdi (dest, GEN_INT (i), + GEN_INT ((val >> i) & 0xffff))); + } + return 2; + } } /* Try a bitmask plus 2 movk to generate the immediate in 3 instructions. */ @@ -5790,26 +5779,24 @@ aarch64_mov128_immediate (rtx imm) /* Return true if val can be encoded as a 12-bit unsigned immediate with a left shift of 0 or 12 bits. */ bool -aarch64_uimm12_shift (HOST_WIDE_INT val) +aarch64_uimm12_shift (unsigned HOST_WIDE_INT val) { - return ((val & (((HOST_WIDE_INT) 0xfff) << 0)) == val - || (val & (((HOST_WIDE_INT) 0xfff) << 12)) == val - ); + return val < 4096 || (val & 0xfff000) == val; } /* Returns the nearest value to VAL that will fit as a 12-bit unsigned immediate that can be created with a left shift of 0 or 12. */ static HOST_WIDE_INT -aarch64_clamp_to_uimm12_shift (HOST_WIDE_INT val) +aarch64_clamp_to_uimm12_shift (unsigned HOST_WIDE_INT val) { /* Check to see if the value fits in 24 bits, as that is the maximum we can handle correctly. */ - gcc_assert ((val & 0xffffff) == val); + gcc_assert (val < 0x1000000); - if (((val & 0xfff) << 0) == val) + if (val < 4096) return val; - return val & (0xfff << 12); + return val & 0xfff000; } @@ -6957,8 +6944,7 @@ aarch64_expand_mov_immediate (rtx dest, rtx imm) return; } - aarch64_internal_mov_immediate (dest, imm, true, - as_a (mode)); + aarch64_internal_mov_immediate (dest, imm, true, mode); } /* Return the MEM rtx that provides the canary value that should be used @@ -11130,9 +11116,7 @@ aarch64_float_const_rtx_p (rtx x) && SCALAR_FLOAT_MODE_P (mode) && aarch64_reinterpret_float_as_int (x, &ival)) { - scalar_int_mode imode = (mode == HFmode - ? SImode - : int_mode_for_mode (mode).require ()); + machine_mode imode = (mode == DFmode) ? DImode : SImode; int num_instr = aarch64_internal_mov_immediate (NULL_RTX, gen_int_mode (ival, imode), false, imode); return num_instr < 3; @@ -13790,10 +13774,9 @@ aarch64_rtx_costs (rtx x, machine_mode mode, int outer ATTRIBUTE_UNUSED, proportionally expensive to the number of instructions required to build that constant. This is true whether we are compiling for SPEED or otherwise. */ - if (!is_a (mode, &int_mode)) - int_mode = word_mode; + machine_mode imode = (mode == SImode) ? SImode : DImode; *cost = COSTS_N_INSNS (aarch64_internal_mov_immediate - (NULL_RTX, x, false, int_mode)); + (NULL_RTX, x, false, imode)); } return true; @@ -13809,9 +13792,7 @@ aarch64_rtx_costs (rtx x, machine_mode mode, int outer ATTRIBUTE_UNUSED, bool succeed = aarch64_reinterpret_float_as_int (x, &ival); gcc_assert (succeed); - scalar_int_mode imode = (mode == HFmode - ? SImode - : int_mode_for_mode (mode).require ()); + machine_mode imode = (mode == DFmode) ? DImode : SImode; int ncost = aarch64_internal_mov_immediate (NULL_RTX, gen_int_mode (ival, imode), false, imode); *cost += COSTS_N_INSNS (ncost); diff --git a/gcc/config/aarch64/aarch64.md b/gcc/config/aarch64/aarch64.md index f2e3d905dbbeb2949f2947f5cfd68208c94c9272..604a67d87a7ef525efebed48f39de43c97f2a397 100644 --- a/gcc/config/aarch64/aarch64.md +++ b/gcc/config/aarch64/aarch64.md @@ -1309,16 +1309,15 @@ (define_insn_and_split "*movsi_aarch64" ) (define_insn_and_split "*movdi_aarch64" - [(set (match_operand:DI 0 "nonimmediate_operand" "=r,k,r,r,r,r,r, r,w, m,m, r, r, r, w,r,w, w") - (match_operand:DI 1 "aarch64_mov_operand" " r,r,k,N,M,n,Usv,m,m,rZ,w,Usw,Usa,Ush,rZ,w,w,Dd"))] + [(set (match_operand:DI 0 "nonimmediate_operand" "=r,k,r,r,r,r, r,w, m,m, r, r, r, w,r,w, w") + (match_operand:DI 1 "aarch64_mov_operand" " r,r,k,O,n,Usv,m,m,rZ,w,Usw,Usa,Ush,rZ,w,w,Dd"))] "(register_operand (operands[0], DImode) || aarch64_reg_or_zero (operands[1], DImode))" "@ mov\\t%x0, %x1 mov\\t%0, %x1 mov\\t%x0, %1 - mov\\t%x0, %1 - mov\\t%w0, %1 + * return aarch64_zeroextended_move_imm (INTVAL (operands[1])) ? \"mov\\t%w0, %1\" : \"mov\\t%x0, %1\"; # * return aarch64_output_sve_cnt_immediate (\"cnt\", \"%x0\", operands[1]); ldr\\t%x0, %1 @@ -1340,11 +1339,11 @@ (define_insn_and_split "*movdi_aarch64" DONE; }" ;; The "mov_imm" type for CNTD is just a placeholder. - [(set_attr "type" "mov_reg,mov_reg,mov_reg,mov_imm,mov_imm,mov_imm,mov_imm, + [(set_attr "type" "mov_reg,mov_reg,mov_reg,mov_imm,mov_imm,mov_imm, load_8,load_8,store_8,store_8,load_8,adr,adr,f_mcr,f_mrc, fmov,neon_move") - (set_attr "arch" "*,*,*,*,*,*,sve,*,fp,*,fp,*,*,*,fp,fp,fp,simd") - (set_attr "length" "4,4,4,4,4,*, 4,4, 4,4, 4,8,4,4, 4, 4, 4, 4")] + (set_attr "arch" "*,*,*,*,*,sve,*,fp,*,fp,*,*,*,fp,fp,fp,simd") + (set_attr "length" "4,4,4,4,*, 4,4, 4,4, 4,8,4,4, 4, 4, 4, 4")] ) (define_insn "insv_imm" @@ -1508,7 +1507,7 @@ (define_insn "*mov_aarch64" (define_insn "*mov_aarch64" [(set (match_operand:DFD 0 "nonimmediate_operand" "=w, w ,?r,w,w ,w ,w,m,r,m ,r,r") - (match_operand:DFD 1 "general_operand" "Y , ?rY, w,w,Ufc,Uvi,m,w,m,rY,r,N"))] + (match_operand:DFD 1 "general_operand" "Y , ?rY, w,w,Ufc,Uvi,m,w,m,rY,r,O"))] "TARGET_FLOAT && (register_operand (operands[0], mode) || aarch64_reg_or_fp_zero (operands[1], mode))" "@ @@ -1523,7 +1522,7 @@ (define_insn "*mov_aarch64" ldr\\t%x0, %1 str\\t%x1, %0 mov\\t%x0, %x1 - mov\\t%x0, %1" + * return aarch64_zeroextended_move_imm (INTVAL (operands[1])) ? \"mov\\t%w0, %1\" : \"mov\\t%x0, %1\";" [(set_attr "type" "neon_move,f_mcr,f_mrc,fmov,fconstd,neon_move,\ f_loadd,f_stored,load_8,store_8,mov_reg,\ fconstd") diff --git a/gcc/config/aarch64/constraints.md b/gcc/config/aarch64/constraints.md index ee7587cca1673208e2bfd6b503a21d0c8b69bf75..e91c7eab0b3674ca34ac2f790c38fcd27986c35f 100644 --- a/gcc/config/aarch64/constraints.md +++ b/gcc/config/aarch64/constraints.md @@ -106,6 +106,12 @@ (define_constraint "M" (define_constraint "N" "A constant that can be used with a 64-bit MOV immediate operation." + (and (match_code "const_int") + (match_test "aarch64_move_imm (ival, DImode)") + (match_test "!aarch64_zeroextended_move_imm (ival)"))) + +(define_constraint "O" + "A constant that can be used with a 32 or 64-bit MOV immediate operation." (and (match_code "const_int") (match_test "aarch64_move_imm (ival, DImode)")))