From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from EUR01-DB5-obe.outbound.protection.outlook.com (mail-db5eur01on2084.outbound.protection.outlook.com [40.107.15.84]) by sourceware.org (Postfix) with ESMTPS id 1CBB638187D6 for ; Mon, 5 Dec 2022 12:12:52 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 1CBB638187D6 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-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=XFAOuAP1wlS3KtG6OkksiFxfd76KXALnRkGDAOQjaD/M9t7lWWIqWMsIAc6zODuIX6dpJd4LCUPSpdObljxveFOmNStxQgzsXw2i8YPHvwR82X/SQBburaeDYQVYFfEeKdom+5ofQDGAoJ82qLPSHvq1vrkVlhvLHDiMgWuFR+kqkBWVu48sOHe1VGfxiGv3rcPzHFivsuYYQE2CXmIsH168JHWhSNzPT2zMAZhOdPMMbMLms+YuIg4Hn6srmy+MtVXY0ystc0SGQpRoq7m1F0yakJCQOnnYosG9b5AkkQG2PO6oZ6lwzoL9O8Xn3dKavYaRDnjNQ2UgZcLvFyTq7A== 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=1THuC7AuNws4E2UWiOgx2ArhRLIEOnFZuVhLk0KWAfo=; b=h7kZPvFgEXjah+Byrl8eAH+Yu23cO9Ev+AkThplg0tYaL9pSnggN/Xw2xCwBS3cAW/0z4iTJNRkXm59+PpMMi9Vxhyb3SJSyUHbDYlz69+t36PIXtvvGSmikTowVmVuZcvTH7xFwAdQKdiVCDXiz23fPlH3B9TqT9oW49Uh+farByxuaXK9rKUZYV02sb8jfGWE/WqSe280V3sEWEt/Ss9ZeLmbD/2UoeQwzQGF7xRmvAhE+uY9hK4U324NUUSXRHe6RTsF3226W7b3fXEqvJuePZXZE+u8xf7L9SWP0x/zIsORv9vJr1WiPhnz5jrD3fcYW0LMoXbnoOv9802Kgkw== 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=1THuC7AuNws4E2UWiOgx2ArhRLIEOnFZuVhLk0KWAfo=; b=bkeIuumLI8gPtEmQsxY+4511Sd/xMzzxeMMIEeVtlARgAqZQXZM6fdKzbyEEMbHC3hUHDekOsKTk0uuzR9BlPN5DxfU/SRVAYocdc6IwDzA8TQ1cB66OQCGeBOEtRilsIwBjta54lHTZIkhLUgi+Kun+GtHB7m601oCENk2WkFo= Received: from PAWPR08MB8982.eurprd08.prod.outlook.com (2603:10a6:102:33f::20) by DU0PR08MB9155.eurprd08.prod.outlook.com (2603:10a6:10:416::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5880.13; Mon, 5 Dec 2022 12:12:42 +0000 Received: from PAWPR08MB8982.eurprd08.prod.outlook.com ([fe80::66e4:4940:d096:4f7]) by PAWPR08MB8982.eurprd08.prod.outlook.com ([fe80::66e4:4940:d096:4f7%8]) with mapi id 15.20.5880.008; Mon, 5 Dec 2022 12:12:42 +0000 From: Wilco Dijkstra To: Richard Sandiford CC: GCC Patches Subject: Re: [PATCH][AArch64] Cleanup move immediate code Thread-Topic: [PATCH][AArch64] Cleanup move immediate code Thread-Index: AQHY7fH0WskJzQzwrkGLJFQVAKTPzK5OInoSgAfqgNOAAv8ZsYAGSw6/ Date: Mon, 5 Dec 2022 12:12:42 +0000 Message-ID: References: In-Reply-To: Accept-Language: en-GB, en-US Content-Language: en-GB X-MS-Has-Attach: X-MS-TNEF-Correlator: msip_labels: authentication-results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=arm.com; x-ms-publictraffictype: Email x-ms-traffictypediagnostic: PAWPR08MB8982:EE_|DU0PR08MB9155:EE_ x-ms-office365-filtering-correlation-id: dbc5c672-4507-4175-64e6-08dad6ba02fa nodisclaimer: true x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: jUGWcWgy7CWZzAq5iQ4583gAKWggEOg9x5fTGGKuQnWP0U8cqIsI98DTx7uJ+fVQGSffsHoIqUHjByfujxdM8Li3wHjGEDsDYUvG/BfAQU4N3lC6q0XtDIQvLvluMw1wvvFl+wz2BruUgkUixvZ/rsJn/6vwe8ki73o0tnR2nofId216z4nei6vdM/IasOyMGzGzCEDoiihN4yY8jik88UvF/xPg7liNoswrwAZtK7Oyy0CwczBW8/Q4vu5x+sQSk4mr/K/4k3yEJiE4cA1SeFVC+eY1nYwQ5OT16HxhTNW8KdS5kqqa2G4/yXf5L5MQ8STI6AVI0Af86F8VilOF3u9jFJMQLEQ88IrZUzqiC3SCAi7NjhabpGKA51y9sfJf5FxaIAAKbiAJm1YNtvoW3lth3JZVwExhamcOnqGyJLaEvTypAuADbZgjCOC4j5pxrgZcf0VdJIE+bQJTRzZKc9rant+q3eUFUmHjA547QZmLEWYcAEHi/KVlLnabrurtLueApBKsbHXUvVQ2gZ4panxiSN8WzmihTzifa58TaTSH3tW4XnWpY/f8BgZU/FcBAaWk2Y0XRoGX3P8PIcEAmWMLmSkYJt3eYEgjzJgSTYyI74tiu+9x6S/xYFzBb9i8X5d+l55nwaSLoy5RdeaQww793tbsOZg0XzT3EfTDUlJw/F0+lgz+6/cC0eB0SUfD4jvYNzMPYji0QS55f3dqw1t1MnTIQJUHsWzTSqqt9lo= x-forefront-antispam-report: 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)(39860400002)(366004)(136003)(396003)(376002)(346002)(451199015)(38100700002)(38070700005)(122000001)(33656002)(86362001)(76116006)(91956017)(8676002)(66946007)(66556008)(66446008)(64756008)(66476007)(4326008)(6636002)(6862004)(8936002)(316002)(5660300002)(52536014)(30864003)(55016003)(2906002)(186003)(41300700001)(83380400001)(6506007)(7696005)(478600001)(9686003)(26005)(71200400001)(14773001);DIR:OUT;SFP:1101; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?iso-8859-1?Q?CN+Se6BxREqRa2g4mbvwjHXQrQ6TlqnRZhxk8V2cWvKZPk+/xZpSIS3i8l?= =?iso-8859-1?Q?Pv8Wjed+d2/MjPwhEWotgpRan+90TzOnrXF/szh3Z6XKLQhf39AW0uDLeE?= =?iso-8859-1?Q?AHHW+SXkWosWPw7bu+BHQ8MFgZWaVshRi+rzdjDCs7vnzrGIzg8E+ROOjZ?= =?iso-8859-1?Q?cD3tZWSd74aiE3IIeFSkDiFLH2a7AHojlG4hzEfQwWlT893v+pSr3JhLsm?= =?iso-8859-1?Q?0tGBNGcwwrtlXgJpgBkTCY4vdmPQVHIVwCbD4H5C7Bj7043pLevEjhKJ90?= =?iso-8859-1?Q?1DovOuR7CtNSkQOYAbvSYp9lMVRMRnlSi9/crzrRwX5wR9TO3PHtxeERQQ?= =?iso-8859-1?Q?K5CwSI7xYMvKFHVVlx0EhlDbbYxv442cc0zMRbQmVhrR34WgKjRs9ta19s?= =?iso-8859-1?Q?u/nl2MbwjATCjWyq8klnJhPAswfTpAXswdBwj4Kjv6XAGOyyQRb9dvTc3R?= =?iso-8859-1?Q?D2oYzy8GuqcvnTOGcfgeJ6tT0gnhZSb3IlxDbTTH7zCV94Y9Ub6K/sW6XU?= =?iso-8859-1?Q?ZWxBFWE4wGF+RWGdu6zjTC9JpJC7xWl0OJmrAmMj6hy76Q8+HkOJbdEUOM?= =?iso-8859-1?Q?7QK8Q4rBi9TmSDmWFfGXyaOu8VHFpV1qREEFQouPetPCzjNiSsVz+ov6f8?= =?iso-8859-1?Q?4wdf0vQNL1rS8yYGD1pWGNtKQF0onieMCsoOjVEfJ8CrsVn7+RwyJTZeJT?= =?iso-8859-1?Q?qrDqQD0PFatflxmR9/0ca1S+nbkBJ14+kVen9bm+F5+YnpuIZJzVPH6skl?= =?iso-8859-1?Q?zKn5yygO3lvCHw8302fve03T4AW029m2rB2gXWEpJA74lJY3R3NJeGOeBr?= =?iso-8859-1?Q?z9EWYtjDcGB2kY1el8vdWi7hVzt60x2MeGfUvLvtrdxLFAtdPAKwFE0a80?= =?iso-8859-1?Q?DLASo4PCR38NXearJA4jOPUM+Yd3SRm+xRdgpWINZsuEdteR9dY2RgY3ma?= =?iso-8859-1?Q?d7u3foW0+7/hJ0ftXr2c34t5sblSNNIFbFGmXJ/38puNdGNwzOZi5HsA2A?= =?iso-8859-1?Q?9NflSECRvmGl3C+cUQ4j0eeDWQUiLjVms0EgT//L+Y1XJs+7qkLd3TkBSb?= =?iso-8859-1?Q?uabREzU4fn2ilvhzklpOY1SOOaTd4RPBKkPiH0XsHmbxthxoDI24X/rjn5?= =?iso-8859-1?Q?0uxyiPToKtZbUPHdy0jumCLbPFd69G7JO9oeQuPpx7aHY1YKiawnJm1L1i?= =?iso-8859-1?Q?tXtnX5lArFhjaB4RUXRtU09Q66z27fbVeonmj9t6b1IvFqQ2dp9icC4WdZ?= =?iso-8859-1?Q?hX/BCnLgyPpaG+AOi1dAj9HxdoBZva3/7YY4V/5g3WxlBV5Da1KwgFXN3a?= =?iso-8859-1?Q?TohfrMSGAil2K4HR9g7fluRogO0MRNmZUdq9UYxGlCsa8X1Ptd7v6GDW5i?= =?iso-8859-1?Q?Lf0lTUFaTr/GW5k8j933uIRbd/bTw5WKi3iIGHdj46sEkrOPFjRkWOxB3N?= =?iso-8859-1?Q?nQOE1G6o7j0b7/MEMwIspVnkgG+CJtgdE1cTqauO1YPZnlENvTZkp6qsvY?= =?iso-8859-1?Q?HGNwRgSMt+eULlmZSxv2H9/jM6P/nZ00uM18RojMpnAe1PRPdo38hUlgFb?= =?iso-8859-1?Q?jLPErAyThb6zeJdqAo61h30CG2komTjUjGg5KoVXDYX3klYs6tl8Tg1tHM?= =?iso-8859-1?Q?tr7DbjL2uEnT1vvmFwQrMKEDXNbNt1VcJi?= Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-OriginatorOrg: arm.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: PAWPR08MB8982.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: dbc5c672-4507-4175-64e6-08dad6ba02fa X-MS-Exchange-CrossTenant-originalarrivaltime: 05 Dec 2022 12:12:42.7516 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: f34e5979-57d9-4aaa-ad4d-b122a662184d X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: shFAbJRftMOl7RoMhxccH3Ds8x6KBoOlA6vpLMIlU0SPyNiP/D7dGIylXDB21Z5b+yRWrM/nPB580dF+JcXkzQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DU0PR08MB9155 X-Spam-Status: No, score=-7.8 required=5.0 tests=BAYES_00,BODY_8BITS,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 autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: Hi Richard,=0A= =0A= > -=A0=A0=A0=A0=A0 scalar_int_mode imode =3D (mode =3D=3D HFmode=0A= > -=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0= =A0=A0=A0 ? SImode=0A= > -=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0= =A0=A0=A0 : int_mode_for_mode (mode).require ());=0A= > +=A0=A0=A0=A0=A0 machine_mode imode =3D (mode =3D=3D DFmode) ? DImode : S= Imode;=0A= =0A= > It looks like this might mishandle DDmode, if not now then in the future.= =0A= > Seems safer to use known_eq (GET_MODE_SIZE (mode), 8)=0A= =0A= I've changed that, but it does not matter for the narrow modes as the resul= t=0A= will be identical - only DDmode might get costed incorrectly.=0A= =0A= > Sorry for not noticing last time, but: rather than have=0A= > aarch64_zeroextended_move_imm (which is quite a complicated test),=0A= > could we just add an extra (default off) parameter to aarch64_move_imm=0A= > that suppresses the (val >> 32) =3D=3D 0 test?=0A= =0A= That makes things more complicated again - ultimately I'd like to get rid o= f the=0A= mode parameter since most callers use a fixed mode, and ones that don't are= =0A= now creating and passing fake modes... I've change it like aarch64_move_imm= =0A= and call aarch64_is_movz twice to check it is not a 64-bit MOVZ/MOVN.=0A= =0A= Cheers,=0A= Wilco=0A= =0A= v3: Use aarch64_is_movz, use known_eq=0A= =0A= Simplify, refactor and improve various move immediate functions.=0A= Allow 32-bit MOVI/N as a valid 64-bit immediate which removes special=0A= cases in aarch64_internal_mov_immediate. Add new constraint so the movdi= =0A= pattern only needs a single alternative for move immediate.=0A= =0A= Passes bootstrap and regress, OK for commit?=0A= =0A= gcc/ChangeLog:=0A= =0A= * config/aarch64/aarch64.cc (aarch64_bitmask_imm): Use unsigned type.=0A= (aarch64_zeroextended_move_imm): New function.=0A= (aarch64_move_imm): Refactor, assert mode is SImode or DImode.=0A= (aarch64_internal_mov_immediate): Assert mode is SImode or DImode.= =0A= Simplify special cases.=0A= (aarch64_uimm12_shift): Simplify code.=0A= (aarch64_clamp_to_uimm12_shift): Likewise.=0A= (aarch64_movw_imm): Rename to aarch64_is_movz.=0A= (aarch64_float_const_rtx_p): Pass either SImode or DImode to=0A= aarch64_internal_mov_immediate.=0A= (aarch64_rtx_costs): Likewise.=0A= * config/aarch64/aarch64.md (movdi_aarch64): Merge 'N' and 'M'=0A= constraints into single 'O'.=0A= (mov_aarch64): Likewise.=0A= * config/aarch64/aarch64-protos.h (aarch64_move_imm): Use unsigned.= =0A= (aarch64_bitmask_imm): Likewise.=0A= (aarch64_uimm12_shift): Likewise.=0A= (aarch64_zeroextended_move_imm): New prototype.=0A= * config/aarch64/constraints.md: Add 'O' for 32/64-bit immediates,= =0A= limit 'N' to 64-bit only moves.=0A= =0A= ---=0A= =0A= diff --git a/gcc/config/aarch64/aarch64-protos.h b/gcc/config/aarch64/aarch= 64-protos.h=0A= index 4be93c93c26e091f878bc8e4cf06e90888405fb2..8bce6ec7599edcc2e6a1d800645= 0f35c0ce7f61f 100644=0A= --- a/gcc/config/aarch64/aarch64-protos.h=0A= +++ b/gcc/config/aarch64/aarch64-protos.h=0A= @@ -756,7 +756,7 @@ void aarch64_post_cfi_startproc (void);=0A= poly_int64 aarch64_initial_elimination_offset (unsigned, unsigned);=0A= int aarch64_get_condition_code (rtx);=0A= bool aarch64_address_valid_for_prefetch_p (rtx, bool);=0A= -bool aarch64_bitmask_imm (HOST_WIDE_INT val, machine_mode);=0A= +bool aarch64_bitmask_imm (unsigned HOST_WIDE_INT val, machine_mode);=0A= unsigned HOST_WIDE_INT aarch64_and_split_imm1 (HOST_WIDE_INT val_in);=0A= unsigned HOST_WIDE_INT aarch64_and_split_imm2 (HOST_WIDE_INT val_in);=0A= bool aarch64_and_bitmask_imm (unsigned HOST_WIDE_INT val_in, machine_mode = mode);=0A= @@ -793,7 +793,7 @@ bool aarch64_masks_and_shift_for_bfi_p (scalar_int_mode= , unsigned HOST_WIDE_INT,=0A= unsigned HOST_WIDE_INT,=0A= unsigned HOST_WIDE_INT);=0A= bool aarch64_zero_extend_const_eq (machine_mode, rtx, machine_mode, rtx);= =0A= -bool aarch64_move_imm (HOST_WIDE_INT, machine_mode);=0A= +bool aarch64_move_imm (unsigned HOST_WIDE_INT, machine_mode);=0A= machine_mode aarch64_sve_int_mode (machine_mode);=0A= opt_machine_mode aarch64_sve_pred_mode (unsigned int);=0A= machine_mode aarch64_sve_pred_mode (machine_mode);=0A= @@ -843,8 +843,9 @@ bool aarch64_sve_float_arith_immediate_p (rtx, bool);= =0A= bool aarch64_sve_float_mul_immediate_p (rtx);=0A= bool aarch64_split_dimode_const_store (rtx, rtx);=0A= bool aarch64_symbolic_address_p (rtx);=0A= -bool aarch64_uimm12_shift (HOST_WIDE_INT);=0A= +bool aarch64_uimm12_shift (unsigned HOST_WIDE_INT);=0A= int aarch64_movk_shift (const wide_int_ref &, const wide_int_ref &);=0A= +bool aarch64_zeroextended_move_imm (unsigned HOST_WIDE_INT);=0A= bool aarch64_use_return_insn_p (void);=0A= const char *aarch64_output_casesi (rtx *);=0A= =0A= diff --git a/gcc/config/aarch64/aarch64.cc b/gcc/config/aarch64/aarch64.cc= =0A= index a73741800c963ee6605fd2cfa918f4399da4bfdf..00269632eeb52c29ba2011c4c82= 274968b850d71 100644=0A= --- a/gcc/config/aarch64/aarch64.cc=0A= +++ b/gcc/config/aarch64/aarch64.cc=0A= @@ -5625,12 +5625,10 @@ aarch64_bitmask_imm (unsigned HOST_WIDE_INT val)=0A= =0A= /* Return true if VAL is a valid bitmask immediate for MODE. */=0A= bool=0A= -aarch64_bitmask_imm (HOST_WIDE_INT val_in, machine_mode mode)=0A= +aarch64_bitmask_imm (unsigned HOST_WIDE_INT val, machine_mode mode)=0A= {=0A= if (mode =3D=3D DImode)=0A= - return aarch64_bitmask_imm (val_in);=0A= -=0A= - unsigned HOST_WIDE_INT val =3D val_in;=0A= + return aarch64_bitmask_imm (val);=0A= =0A= if (mode =3D=3D SImode)=0A= return aarch64_bitmask_imm ((val & 0xffffffff) | (val << 32));=0A= @@ -5669,51 +5667,58 @@ aarch64_check_bitmask (unsigned HOST_WIDE_INT val,= =0A= }=0A= =0A= =0A= -/* Return true if val is an immediate that can be loaded into a=0A= - register by a MOVZ instruction. */=0A= -static bool=0A= -aarch64_movw_imm (HOST_WIDE_INT val, scalar_int_mode mode)=0A= +/* Return true if VAL is a valid MOVZ immediate. */=0A= +static inline bool=0A= +aarch64_is_movz (unsigned HOST_WIDE_INT val)=0A= {=0A= - if (GET_MODE_SIZE (mode) > 4)=0A= - {=0A= - if ((val & (((HOST_WIDE_INT) 0xffff) << 32)) =3D=3D val=0A= - || (val & (((HOST_WIDE_INT) 0xffff) << 48)) =3D=3D val)=0A= - return 1;=0A= - }=0A= - else=0A= - {=0A= - /* Ignore sign extension. */=0A= - val &=3D (HOST_WIDE_INT) 0xffffffff;=0A= - }=0A= - return ((val & (((HOST_WIDE_INT) 0xffff) << 0)) =3D=3D val=0A= - || (val & (((HOST_WIDE_INT) 0xffff) << 16)) =3D=3D val);=0A= + return (val >> (ctz_hwi (val) & 48)) < 65536;=0A= }=0A= =0A= =0A= -/* Return true if VAL is an immediate that can be loaded into a=0A= - register in a single instruction. */=0A= +/* Return true if immediate VAL can only be created by using a 32-bit=0A= + zero-extended move immediate, not by a 64-bit move. */=0A= bool=0A= -aarch64_move_imm (HOST_WIDE_INT val, machine_mode mode)=0A= +aarch64_zeroextended_move_imm (unsigned HOST_WIDE_INT val)=0A= {=0A= - scalar_int_mode int_mode;=0A= - if (!is_a (mode, &int_mode))=0A= + if (aarch64_is_movz (val) || aarch64_is_movz (~val))=0A= return false;=0A= =0A= - if (aarch64_movw_imm (val, int_mode) || aarch64_movw_imm (~val, int_mode= ))=0A= - return 1;=0A= - return aarch64_bitmask_imm (val, int_mode);=0A= + return !aarch64_bitmask_imm (val);=0A= +}=0A= +=0A= +=0A= +/* Return true if VAL is an immediate that can be created by a single=0A= + MOV instruction. */=0A= +bool=0A= +aarch64_move_imm (unsigned HOST_WIDE_INT val, machine_mode mode)=0A= +{=0A= + gcc_assert (mode =3D=3D SImode || mode =3D=3D DImode);=0A= +=0A= + if (val < 65536)=0A= + return true;=0A= +=0A= + unsigned HOST_WIDE_INT mask =3D=0A= + (val >> 32) =3D=3D 0 || mode =3D=3D SImode ? 0xffffffff : HOST_WIDE_IN= T_M1U;=0A= +=0A= + if (aarch64_is_movz (val & mask) || aarch64_is_movz (~val & mask))=0A= + return true;=0A= +=0A= + val =3D (val & mask) | ((val << 32) & ~mask);=0A= + return aarch64_bitmask_imm (val);=0A= }=0A= =0A= =0A= static int=0A= aarch64_internal_mov_immediate (rtx dest, rtx imm, bool generate,=0A= - scalar_int_mode mode)=0A= + machine_mode mode)=0A= {=0A= int i;=0A= unsigned HOST_WIDE_INT val, val2, mask;=0A= int one_match, zero_match;=0A= int num_insns;=0A= =0A= + gcc_assert (mode =3D=3D SImode || mode =3D=3D DImode);=0A= +=0A= val =3D INTVAL (imm);=0A= =0A= if (aarch64_move_imm (val, mode))=0A= @@ -5723,31 +5728,6 @@ aarch64_internal_mov_immediate (rtx dest, rtx imm, b= ool generate,=0A= return 1;=0A= }=0A= =0A= - /* Check to see if the low 32 bits are either 0xffffXXXX or 0xXXXXffff= =0A= - (with XXXX non-zero). In that case check to see if the move can be do= ne in=0A= - a smaller mode. */=0A= - val2 =3D val & 0xffffffff;=0A= - if (mode =3D=3D DImode=0A= - && aarch64_move_imm (val2, SImode)=0A= - && (((val >> 32) & 0xffff) =3D=3D 0 || (val >> 48) =3D=3D 0))=0A= - {=0A= - if (generate)=0A= - emit_insn (gen_rtx_SET (dest, GEN_INT (val2)));=0A= -=0A= - /* Check if we have to emit a second instruction by checking to see= =0A= - if any of the upper 32 bits of the original DI mode value is set. */=0A= - if (val =3D=3D val2)=0A= - return 1;=0A= -=0A= - i =3D (val >> 48) ? 48 : 32;=0A= -=0A= - if (generate)=0A= - emit_insn (gen_insv_immdi (dest, GEN_INT (i),=0A= - GEN_INT ((val >> i) & 0xffff)));=0A= -=0A= - return 2;=0A= - }=0A= -=0A= if ((val >> 32) =3D=3D 0 || mode =3D=3D SImode)=0A= {=0A= if (generate)=0A= @@ -5771,24 +5751,31 @@ aarch64_internal_mov_immediate (rtx dest, rtx imm, = bool generate,=0A= one_match =3D ((~val & mask) =3D=3D 0) + ((~val & (mask << 16)) =3D=3D 0= ) +=0A= ((~val & (mask << 32)) =3D=3D 0) + ((~val & (mask << 48)) =3D=3D 0);= =0A= =0A= + /* Try a bitmask immediate and a movk to generate the immediate=0A= + in 2 instructions. */=0A= +=0A= if (zero_match < 2 && one_match < 2)=0A= {=0A= - /* Try emitting a bitmask immediate with a movk replacing 16 bits.= =0A= - For a 64-bit bitmask try whether changing 16 bits to all ones or=0A= - zeroes creates a valid bitmask. To check any repeated bitmask,=0A= - try using 16 bits from the other 32-bit half of val. */=0A= -=0A= for (i =3D 0; i < 64; i +=3D 16)=0A= - if (aarch64_check_bitmask (val, val2, mask << i))=0A= - {=0A= - if (generate)=0A= - {=0A= - emit_insn (gen_rtx_SET (dest, GEN_INT (val2)));=0A= - emit_insn (gen_insv_immdi (dest, GEN_INT (i),=0A= - GEN_INT ((val >> i) & 0xffff)));=0A= - }=0A= - return 2;=0A= - }=0A= + {=0A= + if (aarch64_check_bitmask (val, val2, mask << i))=0A= + break;=0A= +=0A= + val2 =3D val & ~(mask << i);=0A= + if ((val2 >> 32) =3D=3D 0 && aarch64_move_imm (val2, DImode))=0A= + break;=0A= + }=0A= +=0A= + if (i !=3D 64)=0A= + {=0A= + if (generate)=0A= + {=0A= + emit_insn (gen_rtx_SET (dest, GEN_INT (val2)));=0A= + emit_insn (gen_insv_immdi (dest, GEN_INT (i),=0A= + GEN_INT ((val >> i) & 0xffff)));=0A= + }=0A= + return 2;=0A= + }=0A= }=0A= =0A= /* Try a bitmask plus 2 movk to generate the immediate in 3 instructions= . */=0A= @@ -5857,26 +5844,24 @@ aarch64_mov128_immediate (rtx imm)=0A= /* Return true if val can be encoded as a 12-bit unsigned immediate with= =0A= a left shift of 0 or 12 bits. */=0A= bool=0A= -aarch64_uimm12_shift (HOST_WIDE_INT val)=0A= +aarch64_uimm12_shift (unsigned HOST_WIDE_INT val)=0A= {=0A= - return ((val & (((HOST_WIDE_INT) 0xfff) << 0)) =3D=3D val=0A= - || (val & (((HOST_WIDE_INT) 0xfff) << 12)) =3D=3D val=0A= - );=0A= + return val < 4096 || (val & 0xfff000) =3D=3D val;=0A= }=0A= =0A= /* Returns the nearest value to VAL that will fit as a 12-bit unsigned imm= ediate=0A= that can be created with a left shift of 0 or 12. */=0A= static HOST_WIDE_INT=0A= -aarch64_clamp_to_uimm12_shift (HOST_WIDE_INT val)=0A= +aarch64_clamp_to_uimm12_shift (unsigned HOST_WIDE_INT val)=0A= {=0A= /* Check to see if the value fits in 24 bits, as that is the maximum we = can=0A= handle correctly. */=0A= - gcc_assert ((val & 0xffffff) =3D=3D val);=0A= + gcc_assert (val < 0x1000000);=0A= =0A= - if (((val & 0xfff) << 0) =3D=3D val)=0A= + if (val < 4096)=0A= return val;=0A= =0A= - return val & (0xfff << 12);=0A= + return val & 0xfff000;=0A= }=0A= =0A= =0A= @@ -7024,8 +7009,7 @@ aarch64_expand_mov_immediate (rtx dest, rtx imm)=0A= return;=0A= }=0A= =0A= - aarch64_internal_mov_immediate (dest, imm, true,=0A= - as_a (mode));=0A= + aarch64_internal_mov_immediate (dest, imm, true, mode);=0A= }=0A= =0A= /* Return the MEM rtx that provides the canary value that should be used= =0A= @@ -11197,9 +11181,7 @@ aarch64_float_const_rtx_p (rtx x)=0A= && SCALAR_FLOAT_MODE_P (mode)=0A= && aarch64_reinterpret_float_as_int (x, &ival))=0A= {=0A= - scalar_int_mode imode =3D (mode =3D=3D HFmode=0A= - ? SImode=0A= - : int_mode_for_mode (mode).require ());=0A= + machine_mode imode =3D known_eq (GET_MODE_SIZE (mode), 8) ? DImode := SImode;=0A= int num_instr =3D aarch64_internal_mov_immediate=0A= (NULL_RTX, gen_int_mode (ival, imode), false, imode);=0A= return num_instr < 3;=0A= @@ -13857,10 +13839,10 @@ aarch64_rtx_costs (rtx x, machine_mode mode, int = outer ATTRIBUTE_UNUSED,=0A= proportionally expensive to the number of instructions=0A= required to build that constant. This is true whether we=0A= are compiling for SPEED or otherwise. */=0A= - if (!is_a (mode, &int_mode))=0A= - int_mode =3D word_mode;=0A= + machine_mode imode =3D known_le (GET_MODE_SIZE (mode), 4)=0A= + ? SImode : DImode;=0A= *cost =3D COSTS_N_INSNS (aarch64_internal_mov_immediate=0A= - (NULL_RTX, x, false, int_mode));=0A= + (NULL_RTX, x, false, imode));=0A= }=0A= return true;=0A= =0A= @@ -13876,9 +13858,8 @@ aarch64_rtx_costs (rtx x, machine_mode mode, int ou= ter ATTRIBUTE_UNUSED,=0A= bool succeed =3D aarch64_reinterpret_float_as_int (x, &ival);=0A= gcc_assert (succeed);=0A= =0A= - scalar_int_mode imode =3D (mode =3D=3D HFmode=0A= - ? SImode=0A= - : int_mode_for_mode (mode).require ());=0A= + machine_mode imode =3D known_eq (GET_MODE_SIZE (mode), 8)=0A= + ? DImode : SImode;=0A= int ncost =3D aarch64_internal_mov_immediate=0A= (NULL_RTX, gen_int_mode (ival, imode), false, imode);=0A= *cost +=3D COSTS_N_INSNS (ncost);=0A= diff --git a/gcc/config/aarch64/aarch64.md b/gcc/config/aarch64/aarch64.md= =0A= index 76b6898ca048c559ff7f7fba78119161b3d382f6..5694a1efea1df8e532520475140= c8748b54e3d89 100644=0A= --- a/gcc/config/aarch64/aarch64.md=0A= +++ b/gcc/config/aarch64/aarch64.md=0A= @@ -1309,16 +1309,15 @@ (define_insn_and_split "*movsi_aarch64"=0A= )=0A= =0A= (define_insn_and_split "*movdi_aarch64"=0A= - [(set (match_operand:DI 0 "nonimmediate_operand" "=3Dr,k,r,r,r,r,r, r,w,= m,m, r, r, r, w,r,w, w")=0A= - (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"))]=0A= + [(set (match_operand:DI 0 "nonimmediate_operand" "=3Dr,k,r,r,r,r, r,w, m= ,m, r, r, r, w,r,w, w")=0A= + (match_operand:DI 1 "aarch64_mov_operand" " r,r,k,O,n,Usv,m,m,rZ,w,Usw,U= sa,Ush,rZ,w,w,Dd"))]=0A= "(register_operand (operands[0], DImode)=0A= || aarch64_reg_or_zero (operands[1], DImode))"=0A= "@=0A= mov\\t%x0, %x1=0A= mov\\t%0, %x1=0A= mov\\t%x0, %1=0A= - mov\\t%x0, %1=0A= - mov\\t%w0, %1=0A= + * return aarch64_zeroextended_move_imm (INTVAL (operands[1])) ? \"mov\\= t%w0, %1\" : \"mov\\t%x0, %1\";=0A= #=0A= * return aarch64_output_sve_cnt_immediate (\"cnt\", \"%x0\", operands[1= ]);=0A= ldr\\t%x0, %1=0A= @@ -1340,11 +1339,11 @@ (define_insn_and_split "*movdi_aarch64"=0A= DONE;=0A= }"=0A= ;; The "mov_imm" type for CNTD is just a placeholder.=0A= - [(set_attr "type" "mov_reg,mov_reg,mov_reg,mov_imm,mov_imm,mov_imm,mov_i= mm,=0A= + [(set_attr "type" "mov_reg,mov_reg,mov_reg,mov_imm,mov_imm,mov_imm,=0A= load_8,load_8,store_8,store_8,load_8,adr,adr,f_mcr,f_mrc,=0A= fmov,neon_move")=0A= - (set_attr "arch" "*,*,*,*,*,*,sve,*,fp,*,fp,*,*,*,fp,fp,fp,simd")=0A= - (set_attr "length" "4,4,4,4,4,*, 4,4, 4,4, 4,8,4,4, 4, 4, 4, 4")]=0A= + (set_attr "arch" "*,*,*,*,*,sve,*,fp,*,fp,*,*,*,fp,fp,fp,simd")=0A= + (set_attr "length" "4,4,4,4,*, 4,4, 4,4, 4,8,4,4, 4, 4, 4, 4")]=0A= )=0A= =0A= (define_insn "insv_imm"=0A= @@ -1508,7 +1507,7 @@ (define_insn "*mov_aarch64"=0A= =0A= (define_insn "*mov_aarch64"=0A= [(set (match_operand:DFD 0 "nonimmediate_operand" "=3Dw, w ,?r,w,w ,w = ,w,m,r,m ,r,r")=0A= - (match_operand:DFD 1 "general_operand" "Y , ?rY, w,w,Ufc,Uvi,m,w,m,r= Y,r,N"))]=0A= + (match_operand:DFD 1 "general_operand" "Y , ?rY, w,w,Ufc,Uvi,m,w,m,r= Y,r,O"))]=0A= "TARGET_FLOAT && (register_operand (operands[0], mode)=0A= || aarch64_reg_or_fp_zero (operands[1], mode))"=0A= "@=0A= @@ -1523,7 +1522,7 @@ (define_insn "*mov_aarch64"=0A= ldr\\t%x0, %1=0A= str\\t%x1, %0=0A= mov\\t%x0, %x1=0A= - mov\\t%x0, %1"=0A= + * return aarch64_zeroextended_move_imm (INTVAL (operands[1])) ? \"mov\\= t%w0, %1\" : \"mov\\t%x0, %1\";"=0A= [(set_attr "type" "neon_move,f_mcr,f_mrc,fmov,fconstd,neon_move,\=0A= f_loadd,f_stored,load_8,store_8,mov_reg,\=0A= fconstd")=0A= diff --git a/gcc/config/aarch64/constraints.md b/gcc/config/aarch64/constra= ints.md=0A= index 29efb6c0cff7574c9b239ef358acaca96dd75d03..6168295814c3ce4b6f65030cddf= d08172b6febd8 100644=0A= --- a/gcc/config/aarch64/constraints.md=0A= +++ b/gcc/config/aarch64/constraints.md=0A= @@ -106,6 +106,12 @@ (define_constraint "M"=0A= =0A= (define_constraint "N"=0A= "A constant that can be used with a 64-bit MOV immediate operation."=0A= + (and (match_code "const_int")=0A= + (match_test "aarch64_move_imm (ival, DImode)")=0A= + (match_test "!aarch64_zeroextended_move_imm (ival)")))=0A= +=0A= +(define_constraint "O"=0A= + "A constant that can be used with a 32 or 64-bit MOV immediate operation.= "=0A= (and (match_code "const_int")=0A= (match_test "aarch64_move_imm (ival, DImode)")))=0A= =0A= =0A=