From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-eopbgr80054.outbound.protection.outlook.com [40.107.8.54]) by sourceware.org (Postfix) with ESMTPS id 51B183858D37 for ; Wed, 5 Oct 2022 14:56:03 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 51B183858D37 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=2; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=pass; b=Rp8j1aK7VZWq+l1YtQW7cjQ4xzcwnzGWbkUUmUOYC6OChdiH/ZzmLx0N+Z1RyoD9zUlnDNkFnZvfdf+1LP8PLzaOAZ1FVEbCADkQMZpk5fwS2NXACiLG+iXI2zy5i3Yyiols97uaDYeW/4UHSDIe3E3lN9B44aJj+238RDFUpuLcDLBV7CAijv+fKk7hzHRq8EN6ZBZUGk29UQisPjVjvxzVdGTyJ2gX3G7pqGSnsJZEz46wuBVHn9SiTInzFmyReCDpnJcnwIZtrVI1InYQs4/un3Wwj4/i/hWk2qfaPkm5WDW6WzBWUxPQyPWmFSnl8F5LfTKA8bMsk/l90Bqi2w== 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=ydihbsm7m+E4FSNcc0oo72khWdaN2L8Ix1COxrnFxyg=; b=GFeC6YeYJCKVFZac+ZxETIFpBJDhvx6bfkAAA6yjaiC57c6O+5eNTUKB/5IaEMm++4gdvA19UnArqMAylHwxLLZgqBy/NDzjGl+GpRoxa+TymLQXVnApnGMhDOl/FnkIWm4mdorn1hEHPVvLFgU+qExZf7LbYj9AjH/cMq3A0D9/sseJY3xLHJWIugccKu/AuwhdS9gm0z0vZ0w1tor0+57x/k8weO9KSD3pzNblD77DwEjGmHaGNV8zXd2+cZlOEQkuTWVy63139bsBY9V3lo0og0fGlgRHT5mxiIavfLk8VHYh4BCCOGW+wsWt+hPdv6EzE/NJ+u+USyxBzphIyw== 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=ydihbsm7m+E4FSNcc0oo72khWdaN2L8Ix1COxrnFxyg=; b=di7Q3UVZzuadPXyEYU3aJ+ykRkZeSHk/Vx+oHElsvQrMzGPVCprPU2YKPiWwARXLJdqrIAGd/YEC084uQvZsbuKPwyeT670AAeTdZF+fTs9MBqn1M0lsmr0BDtwyiCNmHDS1otCPdBcJ4lRL+YiLW21fnsn3LazWEtSnBq0ycas= Received: from DUZPR01CA0090.eurprd01.prod.exchangelabs.com (2603:10a6:10:46a::8) by DB4PR08MB8006.eurprd08.prod.outlook.com (2603:10a6:10:38e::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5676.28; Wed, 5 Oct 2022 14:55:59 +0000 Received: from DBAEUR03FT018.eop-EUR03.prod.protection.outlook.com (2603:10a6:10:46a:cafe::2a) by DUZPR01CA0090.outlook.office365.com (2603:10a6:10:46a::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5676.23 via Frontend Transport; Wed, 5 Oct 2022 14:55:59 +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 DBAEUR03FT018.mail.protection.outlook.com (100.127.142.74) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5709.10 via Frontend Transport; Wed, 5 Oct 2022 14:55:58 +0000 Received: ("Tessian outbound 7761be2ecf00:v128"); Wed, 05 Oct 2022 14:55:58 +0000 X-CheckRecipientChecked: true X-CR-MTA-CID: bab8203cc75b0d72 X-CR-MTA-TID: 64aa7808 Received: from c35ad7ab2d70.1 by 64aa7808-outbound-1.mta.getcheckrecipient.com id CDC1904C-5C49-4ACC-9880-8C9A5B840435.1; Wed, 05 Oct 2022 14:55:48 +0000 Received: from EUR04-VI1-obe.outbound.protection.outlook.com by 64aa7808-outbound-1.mta.getcheckrecipient.com with ESMTPS id c35ad7ab2d70.1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384); Wed, 05 Oct 2022 14:55:48 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=BVmjcxYjskKauZm75EEQ2CP+AoUIp/rw5sD+9lBGEW1NdAOGhUvA+wTA5W0b4FTnAb8JAl6H3O8NEcTZYl2F2ycVnzR+RFCinwGoeiyFY6tDTC8NQUUn+ERNg0XaVa2G7Njjqcenyl/gervqZ3iOI90XfrUD2Vzh8MMertyK/rTrPyQXIUa9TN/BgvHlrjJR7UV1u5zWk1n3dAJQC73TnQZx/RJ+LD6Ouc3jZrawq9/ejLbcuUz/E1SBAaX6Ujd5zEmE+PuGSrRAL8SkCXdsECNahCF8Q6SMNKSx3fvFxHNVyQAlxQ9bSanVQYcQrKwBJfvGDjZd4FRycP68/RpRNQ== 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=ydihbsm7m+E4FSNcc0oo72khWdaN2L8Ix1COxrnFxyg=; b=AMVvEtjBIlNmbZ9SjKPooWxKfr+XrMaIX0SJG67A7xwfj3JgBht82jBfwvwm48ZNBhRF6+1vXxIqKcnKXkjsXbUGONYphc1mi5QVn4kymGPBTcGH5xCrgx84eQPIG5ZE6eVoRF6eJu6MVXUuZCclmL4OZKykZTVDeyqNEHEZX0EL9lX8ZitxkGkvKZsNzP6+KIFunYXXIGwgT68/88RX8Zg1/WBYmb/wDMifoXF+vfSb8tK7nn/+cwff9nJVLgCUwZI5ctPze5mCZ7UD+vKL+anXCa1OkJnbxo8Gzz/2F6D75rlzakDzchU0iaU+NkpHcu5ubNMBHM/+wtDwkg/jHw== 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=ydihbsm7m+E4FSNcc0oo72khWdaN2L8Ix1COxrnFxyg=; b=di7Q3UVZzuadPXyEYU3aJ+ykRkZeSHk/Vx+oHElsvQrMzGPVCprPU2YKPiWwARXLJdqrIAGd/YEC084uQvZsbuKPwyeT670AAeTdZF+fTs9MBqn1M0lsmr0BDtwyiCNmHDS1otCPdBcJ4lRL+YiLW21fnsn3LazWEtSnBq0ycas= Authentication-Results-Original: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=arm.com; Received: from VI1PR08MB3390.eurprd08.prod.outlook.com (2603:10a6:803:7d::27) by AM7PR08MB5367.eurprd08.prod.outlook.com (2603:10a6:20b:dd::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5676.28; Wed, 5 Oct 2022 14:55:43 +0000 Received: from VI1PR08MB3390.eurprd08.prod.outlook.com ([fe80::245e:8d78:47b5:4e3e]) by VI1PR08MB3390.eurprd08.prod.outlook.com ([fe80::245e:8d78:47b5:4e3e%4]) with mapi id 15.20.5676.032; Wed, 5 Oct 2022 14:55:43 +0000 Message-ID: <8f8f6e91-9653-b802-e01f-e8c5337d20e5@arm.com> Date: Wed, 5 Oct 2022 16:55:38 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.11.0 Subject: Re: [PATCH][GCC 12] arm: Fix constant immediates predicates and constraints for some MVE builtins Content-Language: en-US To: gcc-patches@gcc.gnu.org, Kyrylo Tkachov References: <20220909093306.2548388-1-christophe.lyon@arm.com> <3557fd61-5f08-1bf0-e18b-9ec5c3d90d3b@arm.com> From: Christophe Lyon In-Reply-To: <3557fd61-5f08-1bf0-e18b-9ec5c3d90d3b@arm.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit X-ClientProxiedBy: SA9PR10CA0018.namprd10.prod.outlook.com (2603:10b6:806:a7::23) To VI1PR08MB3390.eurprd08.prod.outlook.com (2603:10a6:803:7d::27) MIME-Version: 1.0 X-MS-TrafficTypeDiagnostic: VI1PR08MB3390:EE_|AM7PR08MB5367:EE_|DBAEUR03FT018:EE_|DB4PR08MB8006:EE_ X-MS-Office365-Filtering-Correlation-Id: ae918f5a-43b2-4e29-3a02-08daa6e1b6b8 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: 1A34FgKXNbfclLT7O8SkJjdzs/xRcJ4s6HP1/b8x7mVr7hZt2qiutHs4T/EYK0fRSaN7DI+0TgzRlIFv0dzQ1w/NZDdCCtjW+z9tsIkHMv6Fch1AcFA/yFP/wO2aJ7oDA8JT8IYj3K0rgyBuQnfAy4LCOUP22kdCEacZYb7I6UwlGpS4qwKqNoZvQmjdvHhdPecOk8rpUcV5iUx7/l7g9h2QRcI+HQysa2Lcjd/JUcL/dXiqJ/C4P/XXDaCgH5U0QXd/61fB5dmdMMgWLPHz3xCTonxo+d6kxL5FbvrqemJLWx9Kqy+kiVi8Z3tSFEE6ViZwVkcOZxesUKA/Aac+GlFCQch5A0/wRQlVWtwmixCeWveLz9OZbTz/IVRmv/dNbUBaM6vL0c0Xt0bgSzjHo9IDCbG937sppOhefqZr6Kwk0Jze/CKk+UzP0AlCex0UuJ8qbDxaJ03dzV7Z+GR7fN7ZRnLK2jqOfslUbKmVlPjDSbfdXAF4fKIrZaBCVmQRBl96p/qu4Q7fpUpAQC0YLN4tKVPptrZ4h4Eawjtnr7/DYn5N6e29FkAwJd0IkmbIcjWP3R6j6cZXHPHNjpfkBNtvV3vgQNTXWbnqpYlodXdsxgfmKv7IYVPKOJvU7FoXhRnO8jjPMpMGWolBvWBIweh/9SsTDoLQ4axPvqOBkRQ5wS1FuarfQLguJm5lEhVNi3PiEwiXAg8WwGJluN5/zIQ914EBBOUCkzEKzoAFodjt7jdqSnMHJzyZxDMiFgYKo3Uncl6vgOVHbj0yyXz7cWAjX7HHO4F44fErku+Yhds3G2yYjJBQkhFMNqzzNmPl X-Forefront-Antispam-Report-Untrusted: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:VI1PR08MB3390.eurprd08.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230022)(4636009)(376002)(366004)(396003)(136003)(39850400004)(346002)(451199015)(2906002)(6512007)(6506007)(41300700001)(26005)(53546011)(36756003)(5660300002)(478600001)(6486002)(6666004)(38100700002)(31696002)(86362001)(6862004)(8936002)(186003)(44832011)(83380400001)(2616005)(316002)(31686004)(66556008)(6636002)(66476007)(37006003)(66946007)(8676002)(14773001)(45980500001)(43740500002);DIR:OUT;SFP:1101; X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM7PR08MB5367 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: DBAEUR03FT018.eop-EUR03.prod.protection.outlook.com X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id-Prvs: 51506d17-1d89-4257-47cc-08daa6e1ad05 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 27UnB6CMifF+Iu7yhxOh71j7VoOoKQHEf7GzCKK6I8WWTXX97kbPqG2NlES180aoivNdi6aL9DEsbTfzgQUQxgCaxx6+7mu3sgIvVsRiy8QxlCpV+cALV58yAQu/o9DRL/R6ClhNwc7lr6wXfMTZfCOnRR8XCATMBk9pEcvGfZxh6qx5i4m+FpmZJsIm0YX8os3m6AtDDymxpTVV36GxNepcKUVcXFMb4+kpu6J3aQkqcuh8zpZXyfxs6oDUUd9kWIEKGYSEVJ4dUCQP7N12XNSinD2OAJtxp9M2FURv40vZWZXMwkyTv6/A/KWs09xul7mPSpben61HFx1h3aypH6DKY5hp8lUZ2iRxoL5hsodpvAezKDtDH4E33sU1C9SeZL3a75VSMYgksVka/T2wIxRgI1gqKP+JxbPpwl1v371CDzVfNJOHNoIL6s2ZG5TPd4nW+LPFifJsHHNR+22CMJ5Tgb7dsd7d/VI/uncZLwZ+0zNyF3wF1tgzJmSgwju5PIHVbsr27DQOnaLRoMN3+hDspmvzUKXFUWhzXdoQxXwUElW0vE5BAACAv68b66e0KOF/15oQ4PegfWk6iIYW0u7qWYY+w+Rvwv0ReEAMfmTltEH6CHKdahtwqkESj20/p13tTMvCk0mdUEvII2tMr0pnkfyWzHhdZc7DFzskX6CeLG9ydGBOuV7YfaoQ/Ij/87VeGIFposVITTJzA4RxiwyVFwZjA+vIfo8pWKbxYrUprtAdzKa108LISLtFHDj7WRDB8hJW5axfUZkx/uXiD0zGHiAmV2YF0I04VEtkAZM= 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)(376002)(136003)(396003)(39850400004)(346002)(451199015)(36840700001)(46966006)(6486002)(31686004)(82310400005)(356005)(81166007)(478600001)(316002)(82740400003)(6636002)(37006003)(44832011)(47076005)(70586007)(70206006)(86362001)(8676002)(6666004)(53546011)(36756003)(83380400001)(31696002)(6862004)(40480700001)(36860700001)(41300700001)(8936002)(336012)(2906002)(26005)(6506007)(6512007)(5660300002)(2616005)(186003)(14773001)(43740500002);DIR:OUT;SFP:1101; X-OriginatorOrg: arm.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Oct 2022 14:55:58.9725 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: ae918f5a-43b2-4e29-3a02-08daa6e1b6b8 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: DBAEUR03FT018.eop-EUR03.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB4PR08MB8006 X-Spam-Status: No, score=-12.0 required=5.0 tests=BAYES_00,BODY_8BITS,DKIM_SIGNED,DKIM_VALID,FORGED_SPF_HELO,GIT_PATCH_0,KAM_DMARC_NONE,NICE_REPLY_A,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 List-Id: ping? On 9/12/22 10:13, Christophe Lyon via Gcc-patches wrote: > Hi! > > On 9/9/22 11:33, Christophe Lyon wrote: >> This is a backport from trunk to gcc-12. >> >> Several MVE builtins incorrectly use the same predicate/constraint >> pair for several modes, which does not match the specification. >> This patch uses the appropriate iterator instead. >> >> 2022-09-06  Christophe Lyon  >> >>     gcc/ >>     * config/arm/mve.md (mve_vqshluq_n_s): Use >>     MVE_pred/MVE_constraint instead of mve_imm_7/Ra. >>     (mve_vqshluq_m_n_s): Likewise. >>     (mve_vqrshrnbq_n_): Use MVE_pred3/MVE_constraint3 >>     instead of mve_imm_8/Rb. >>     (mve_vqrshrunbq_n_s): Likewise. >>     (mve_vqrshrntq_n_): Likewise. >>     (mve_vqrshruntq_n_s): Likewise. >>     (mve_vrshrnbq_n_): Likewise. >>     (mve_vrshrntq_n_): Likewise. >>     (mve_vqrshrnbq_m_n_): Likewise. >>     (mve_vqrshrntq_m_n_): Likewise. >>     (mve_vrshrnbq_m_n_): Likewise. >>     (mve_vrshrntq_m_n_): Likewise. >>     (mve_vqrshrunbq_m_n_s): Likewise. >>     (mve_vsriq_n_>     of mve_imm_selective_upto_8/Rg. >>     (mve_vsriq_m_n_): Likewise. >> >> (cheerry-picked from c3fb6658c7670e446f2fd00984404d971e416b3c) > > > Is this backport OK for gcc-12? (with the "cheerry" typo above fixed) > > Thanks, > > Christophe > > >> --- >>   gcc/config/arm/mve.md | 30 +++++++++++++++--------------- >>   1 file changed, 15 insertions(+), 15 deletions(-) >> >> diff --git a/gcc/config/arm/mve.md b/gcc/config/arm/mve.md >> index f16991c0a34..469e7e7f8dc 100644 >> --- a/gcc/config/arm/mve.md >> +++ b/gcc/config/arm/mve.md >> @@ -1617,7 +1617,7 @@ (define_insn "mve_vqshluq_n_s" >>     [ >>      (set (match_operand:MVE_2 0 "s_register_operand" "=w") >>       (unspec:MVE_2 [(match_operand:MVE_2 1 "s_register_operand" "w") >> -               (match_operand:SI 2 "mve_imm_7" "Ra")] >> +               (match_operand:SI 2 "" "")] >>        VQSHLUQ_N_S)) >>     ] >>     "TARGET_HAVE_MVE" >> @@ -2608,7 +2608,7 @@ (define_insn "mve_vqrshrnbq_n_" >>      (set (match_operand: 0 "s_register_operand" "=w") >>       (unspec: [(match_operand: 1 >> "s_register_operand" "0") >>                    (match_operand:MVE_5 2 "s_register_operand" "w") >> -                 (match_operand:SI 3 "mve_imm_8" "Rb")] >> +                 (match_operand:SI 3 "" "")] >>        VQRSHRNBQ_N)) >>     ] >>     "TARGET_HAVE_MVE" >> @@ -2623,7 +2623,7 @@ (define_insn "mve_vqrshrunbq_n_s" >>      (set (match_operand: 0 "s_register_operand" "=w") >>       (unspec: [(match_operand: 1 >> "s_register_operand" "0") >>                    (match_operand:MVE_5 2 "s_register_operand" "w") >> -                 (match_operand:SI 3 "mve_imm_8" "Rb")] >> +                 (match_operand:SI 3 "" "")] >>        VQRSHRUNBQ_N_S)) >>     ] >>     "TARGET_HAVE_MVE" >> @@ -3563,7 +3563,7 @@ (define_insn "mve_vsriq_n_" >>      (set (match_operand:MVE_2 0 "s_register_operand" "=w") >>       (unspec:MVE_2 [(match_operand:MVE_2 1 "s_register_operand" "0") >>                  (match_operand:MVE_2 2 "s_register_operand" "w") >> -               (match_operand:SI 3 "mve_imm_selective_upto_8" "Rg")] >> +               (match_operand:SI 3 "" "")] >>        VSRIQ_N)) >>     ] >>     "TARGET_HAVE_MVE" >> @@ -4466,7 +4466,7 @@ (define_insn "mve_vqrshrntq_n_" >>      (set (match_operand: 0 "s_register_operand" "=w") >>       (unspec: [(match_operand: 1 >> "s_register_operand" "0") >>                  (match_operand:MVE_5 2 "s_register_operand" "w") >> -               (match_operand:SI 3 "mve_imm_8" "Rb")] >> +               (match_operand:SI 3 "" "")] >>        VQRSHRNTQ_N)) >>     ] >>     "TARGET_HAVE_MVE" >> @@ -4482,7 +4482,7 @@ (define_insn "mve_vqrshruntq_n_s" >>      (set (match_operand: 0 "s_register_operand" "=w") >>       (unspec: [(match_operand: 1 >> "s_register_operand" "0") >>                  (match_operand:MVE_5 2 "s_register_operand" "w") >> -               (match_operand:SI 3 "mve_imm_8" "Rb")] >> +               (match_operand:SI 3 "" "")] >>        VQRSHRUNTQ_N_S)) >>     ] >>     "TARGET_HAVE_MVE" >> @@ -4770,7 +4770,7 @@ (define_insn "mve_vrshrnbq_n_" >>      (set (match_operand: 0 "s_register_operand" "=w") >>       (unspec: [(match_operand: 1 >> "s_register_operand" "0") >>                  (match_operand:MVE_5 2 "s_register_operand" "w") >> -               (match_operand:SI 3 "mve_imm_8" "Rb")] >> +               (match_operand:SI 3 "" "")] >>        VRSHRNBQ_N)) >>     ] >>     "TARGET_HAVE_MVE" >> @@ -4786,7 +4786,7 @@ (define_insn "mve_vrshrntq_n_" >>      (set (match_operand: 0 "s_register_operand" "=w") >>       (unspec: [(match_operand: 1 >> "s_register_operand" "0") >>                  (match_operand:MVE_5 2 "s_register_operand" "w") >> -               (match_operand:SI 3 "mve_imm_8" "Rb")] >> +               (match_operand:SI 3 "" "")] >>        VRSHRNTQ_N)) >>     ] >>     "TARGET_HAVE_MVE" >> @@ -4980,7 +4980,7 @@ (define_insn "mve_vqshluq_m_n_s" >>      (set (match_operand:MVE_2 0 "s_register_operand" "=w") >>       (unspec:MVE_2 [(match_operand:MVE_2 1 "s_register_operand" "0") >>                  (match_operand:MVE_2 2 "s_register_operand" "w") >> -               (match_operand:SI 3 "mve_imm_7" "Ra") >> +               (match_operand:SI 3 "" "") >>                  (match_operand: 4 "vpr_register_operand" >> "Up")] >>        VQSHLUQ_M_N_S)) >>     ] >> @@ -5012,7 +5012,7 @@ (define_insn "mve_vsriq_m_n_" >>      (set (match_operand:MVE_2 0 "s_register_operand" "=w") >>       (unspec:MVE_2 [(match_operand:MVE_2 1 "s_register_operand" "0") >>                  (match_operand:MVE_2 2 "s_register_operand" "w") >> -               (match_operand:SI 3 "mve_imm_selective_upto_8" "Rg") >> +               (match_operand:SI 3 "" "") >>                  (match_operand: 4 "vpr_register_operand" >> "Up")] >>        VSRIQ_M_N)) >>     ] >> @@ -6131,7 +6131,7 @@ (define_insn "mve_vqrshrnbq_m_n_" >>      (set (match_operand: 0 "s_register_operand" "=w") >>       (unspec: [(match_operand: 1 >> "s_register_operand" "0") >>                  (match_operand:MVE_5 2 "s_register_operand" "w") >> -               (match_operand:SI 3 "mve_imm_8" "Rb") >> +               (match_operand:SI 3 "" "") >>                  (match_operand: 4 "vpr_register_operand" >> "Up")] >>        VQRSHRNBQ_M_N)) >>     ] >> @@ -6148,7 +6148,7 @@ (define_insn "mve_vqrshrntq_m_n_" >>      (set (match_operand: 0 "s_register_operand" "=w") >>       (unspec: [(match_operand: 1 >> "s_register_operand" "0") >>                  (match_operand:MVE_5 2 "s_register_operand" "w") >> -               (match_operand:SI 3 "mve_imm_8" "Rb") >> +               (match_operand:SI 3 "" "") >>                  (match_operand: 4 "vpr_register_operand" >> "Up")] >>        VQRSHRNTQ_M_N)) >>     ] >> @@ -6216,7 +6216,7 @@ (define_insn "mve_vrshrnbq_m_n_" >>      (set (match_operand: 0 "s_register_operand" "=w") >>       (unspec: [(match_operand: 1 >> "s_register_operand" "0") >>                  (match_operand:MVE_5 2 "s_register_operand" "w") >> -               (match_operand:SI 3 "mve_imm_8" "Rb") >> +               (match_operand:SI 3 "" "") >>                  (match_operand: 4 "vpr_register_operand" >> "Up")] >>        VRSHRNBQ_M_N)) >>     ] >> @@ -6233,7 +6233,7 @@ (define_insn "mve_vrshrntq_m_n_" >>      (set (match_operand: 0 "s_register_operand" "=w") >>       (unspec: [(match_operand: 1 >> "s_register_operand" "0") >>                  (match_operand:MVE_5 2 "s_register_operand" "w") >> -               (match_operand:SI 3 "mve_imm_8" "Rb") >> +               (match_operand:SI 3 "" "") >>                  (match_operand: 4 "vpr_register_operand" >> "Up")] >>        VRSHRNTQ_M_N)) >>     ] >> @@ -6454,7 +6454,7 @@ (define_insn "mve_vqrshrunbq_m_n_s" >>      (set (match_operand: 0 "s_register_operand" "=w") >>       (unspec: [(match_operand: 1 >> "s_register_operand" "0") >>                  (match_operand:MVE_5 2 "s_register_operand" "w") >> -               (match_operand:SI 3 "mve_imm_8" "Rb") >> +               (match_operand:SI 3 "" "") >>                  (match_operand: 4 "vpr_register_operand" >> "Up")] >>        VQRSHRUNBQ_M_N_S)) >>     ]