From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mx0b-00069f02.pphosted.com (mx0b-00069f02.pphosted.com [205.220.177.32]) by sourceware.org (Postfix) with ESMTPS id 338063858C60 for ; Wed, 17 Apr 2024 15:07:47 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 338063858C60 Authentication-Results: sourceware.org; dmarc=pass (p=quarantine dis=none) header.from=oracle.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=oracle.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 338063858C60 Authentication-Results: server2.sourceware.org; arc=pass smtp.remote-ip=205.220.177.32 ARC-Seal: i=2; a=rsa-sha256; d=sourceware.org; s=key; t=1713366476; cv=pass; b=oJ5pEhh+fojNOb573bzjIkwySCeHVxIK41ZwFCO4Qb5GGtbL87Qvo7E3P5+lgwqVbTpkMSj/vOBca2NNk5CQ+vyMPECmaln71OmOw1HJTOz47uAk7mbinTbzHmx+xOGvH+pZAy0ba3EBjFCNs5x+Gz1txQNgnXuZWA42Ez91NgQ= ARC-Message-Signature: i=2; a=rsa-sha256; d=sourceware.org; s=key; t=1713366476; c=relaxed/simple; bh=ht/BI6URgpBLtdDr0QRJ1KNClGDUPuhL59+4Sl2tPks=; h=DKIM-Signature:DKIM-Signature:From:To:Subject:Date:Message-ID: MIME-Version; b=nBdu3rDkKXR+nkdV3hXGBsQIARcKy0aA2PCObCIpZmnp/vyhA5lnY+15yHBYY2+h/qqWvJ6bNm82sky/Epu9RJ9XYadigcvU6ATIXUNQVJEsjMTZv8aJYKVBNzHN07POiOPnwUrhroUvZ4YrVdNeCj0DsGFch1/k470xA5Wb5rA= ARC-Authentication-Results: i=2; server2.sourceware.org Received: from pps.filterd (m0246632.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 43HF41OM005482 for ; Wed, 17 Apr 2024 15:07:46 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : cc : subject : in-reply-to : references : date : message-id : content-type : mime-version; s=corp-2023-11-20; bh=dQBhcbz0inxk+GF5PPE364OdN5ECukchbKpqOdBq2tI=; b=HLyXYHbdheO7Canzi6J9SZdQKmWiSAG4Q/4hcgeaGCCWV47Tx5Tzf+icsZwNNgcG0EWr mhIRi/ffvJphRWIZk/o3+czoBAI3PGrlpZCD4TVilOhbUOpirW5lbtldVj+ncQe4ev/Z fCMXvh9tL5evO5agEoGUjL5QpAfEOXLd8aQNonTuzDimnmxhu+Y6EJIg0q1hjuiysrvu aCqn6AOV5pmPZqP0+i3jrG+Busyup1BYTy5THRC0EXOf1Y6zRPI6cDBbz4GVqA6bZpTE i/CWftbMKR6Lk62UijDVzBQYXEuyudS7/TNeodHMNN+54kZFSfNPcgiYLqdYYjbq7TnI yw== Received: from iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta03.appoci.oracle.com [130.35.103.27]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3xfhnug71c-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Wed, 17 Apr 2024 15:07:45 +0000 Received: from pps.filterd (iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com [127.0.0.1]) by iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (8.17.1.19/8.17.1.19) with ESMTP id 43HEV8IE004283 for ; Wed, 17 Apr 2024 15:07:45 GMT Received: from nam04-bn8-obe.outbound.protection.outlook.com (mail-bn8nam04lp2040.outbound.protection.outlook.com [104.47.74.40]) by iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTPS id 3xfggf89nx-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Wed, 17 Apr 2024 15:07:44 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=kdb5WmVB1I41B6GTF4viYwZ2htUZAsOBNXaFc3bKEilM29KfAmdWGZHaEbCFmjCR4RN9stUJAGR8UuQNwoFARBqIqp7F6nuiQ0eHRWqwSWkIqlzFmbUkI40lfoo9i+jCQ5L25RTbzsAdSPtvOUNa4mFfUOra1K1ltpv51CSIbQrO/mc5pMYe7MSRhZOi/vmEM2aQHkRBvTrFSSu5+MD+pIIzGT3RXQvxG+zPbJyNx+wi/Qnvae9/cg3x+UlpCVSfrDLmi0WEmzhst1mhZ5aKkE0WBDeyyknIDnzZRVMfUyL5tgIfiTb2QwtaMaGAeD8XjG70IOli2SjhEX28JmLupA== 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=dQBhcbz0inxk+GF5PPE364OdN5ECukchbKpqOdBq2tI=; b=SlKFro3jYUV9ddo3p/Zf0usK1U7e8bigQKCXZqynGK3kQh2UiEHm6JZ8P7GSIU5c4G7HvDpgJyuUoWiviIbZftGhsN8fiZC6rlsnu01DybV0CoXvgGAxDJYywhTcaZW4URn1jq6a3bhdKqxSaf3Pa5ORRPfFAiMu2vYGBIv1WTylV+zjvJZ0ul88F0RRDZXf3Ef7Cr2gGzmq1/Vhhez95AdBu7reO+nzAWHov0RW4qNvDw+0+0T1mwjjxeLqsqS5wsOjqC7BPT8N8C0itDAer4Gc/8dQ4zD0dsLSAFHKsQS0V2PK7kfDl4l67vpQMrgMkRwsl+qdDlRlD0YuEZuPJg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oracle.com; dmarc=pass action=none header.from=oracle.com; dkim=pass header.d=oracle.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.onmicrosoft.com; s=selector2-oracle-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=dQBhcbz0inxk+GF5PPE364OdN5ECukchbKpqOdBq2tI=; b=Nt8d1Jy2WUBgoE1D6AUOZRbfusopUn+E02V8Bq2qiZ1UAHODterflVg7MYRRMYCmNb3FegDaO7/JeN6KVikBKRPjmQZrVUmCJrm69mPgjUWUmV2Sb0kJ5pzvD2azxm37ZHQCJw8YaNC+2bXTd/gjKoaKKL5cw741q4ETZXPq1xs= Received: from DM6PR10MB3113.namprd10.prod.outlook.com (2603:10b6:5:1a7::12) by CH0PR10MB5148.namprd10.prod.outlook.com (2603:10b6:610:de::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7472.39; Wed, 17 Apr 2024 15:07:41 +0000 Received: from DM6PR10MB3113.namprd10.prod.outlook.com ([fe80::aa3:c80a:fc6d:d1f8]) by DM6PR10MB3113.namprd10.prod.outlook.com ([fe80::aa3:c80a:fc6d:d1f8%4]) with mapi id 15.20.7472.037; Wed, 17 Apr 2024 15:07:41 +0000 From: "Jose E. Marchesi" To: Cupertino Miranda Cc: gcc-patches@gcc.gnu.org, david.faust@oracle.com, elena.zannoni@oracle.com Subject: Re: [PATCH 1/3] bpf: support more instructions to match CO-RE relocations In-Reply-To: <20240411111118.215612-1-cupertino.miranda@oracle.com> (Cupertino Miranda's message of "Thu, 11 Apr 2024 12:11:16 +0100") References: <20240411111118.215612-1-cupertino.miranda@oracle.com> Date: Wed, 17 Apr 2024 17:07:37 +0200 Message-ID: <87msps81ty.fsf@oracle.com> User-Agent: Gnus/5.13 (Gnus v5.13) Content-Type: text/plain X-ClientProxiedBy: AM9P195CA0019.EURP195.PROD.OUTLOOK.COM (2603:10a6:20b:21f::24) To DM6PR10MB3113.namprd10.prod.outlook.com (2603:10b6:5:1a7::12) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DM6PR10MB3113:EE_|CH0PR10MB5148:EE_ X-MS-Office365-Filtering-Correlation-Id: 9042738c-ccc3-4780-55e4-08dc5ef020bd X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: pBK7uWxJfIV1VN4BmTnjqFHnrP30mSrCUqivdNRe5ixadPLT2w/8SNjx81Z6n9EYYMiiZuf7phAB2OnOMmBIeoXPt5zkKGioz63UIyxc9ZWp6g1T6ZQ5/8eXrK8NKiGXQLYafNCIYbeEyeYXWCwLPremd61R+ZjF15cZjZ7/ytH0RNAsklBftcHn4+9sOBXAE/p971FJMuLfCuOVyVNvQV5m0Gy92ufZmGLIrjJsBByAgXTXmbRQPTVplG9ytFc/8uIj4YjTHB9cbAsJdHJYmooioIpTQGPqO07h57HLX9Mr/iH8GHVnQAPy4pr9ldCT1Bxlz+XQdx1J5hsbMnpwtQLE9/AFFFUU6FqEdEa2vZIF8eGdbOTdr+NHguGnJe/UkjR8/JG9ntna+os7lN0VU3KAyQ3SjxewuSz/MBKremieyis4QM0WLwHJytdtEaFFrv3LlfXqm4nm6XLC6zC/v27v1y7D1T64FRxyENnpEtdPM421XiRgEyTFw7JjayuWAHvoOKIu+8N/V9GZRe/zfLRGXO0IEZ7hETenPDu0PasrGbHskpdqMB4nMJoXmA3//SSTa9a+dROPdO4+LELZedVjweEiL7E2bYD9Dwey15xcosU3SGvbDDHS2660dWtu X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DM6PR10MB3113.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230031)(376005)(1800799015)(366007);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?v6oaEWJ5kQ65Tqh/gAkcPzQUGuFR6l50706LevhODmXGEXkptzuufenU+Hgr?= =?us-ascii?Q?WJTgUtrF6PJq66XETMyiOJpDlJ/ss38O1/yaV/GGQdXd227C0FNw8Btuj7P5?= =?us-ascii?Q?0nV06BlNFI3Hr8el+heGQSih8tPLsdrGaD3E42aBMsLrb48VppR3e/Sn5cMM?= =?us-ascii?Q?xqKk6vAsL7zTtG/UJMFD743Ddw0CuC99M6Heq9ugkkv9HRK2tk0Av+bs4lF1?= =?us-ascii?Q?178UtnJPegZ4uSZYLlndEyp+fQefyUsfvDmeMocC9yM8lUIY6vnSK+iW5XnE?= =?us-ascii?Q?0Pqine+jiSZT8JWigOXj8Rsz2ItwKyP7EdxYtEVS+FMOcNYGzN4fE8DN/Dve?= =?us-ascii?Q?SfFf2ov2h94i8MGzVXvKjwnn0ZHIq/PJzl8mWU8+kq70ZN8jBm6nGhiPTjJ4?= =?us-ascii?Q?utOgvXVkkyNW+SIFVvtJ12Vmi/Tj7OPEVazbwyzRv9Zf63X8zk9pjiQ061BI?= =?us-ascii?Q?jDfMzhOWcfdPw1uy/OlrWTwXiKs0tuL6ej1JW5HUeVeJztGBTEcYS9y+6eyu?= =?us-ascii?Q?2BvO5+H0Q8Sj7G+1mkMbq5KYONscUof5nsWpq6MTFdk3uWXE/4IvMK/snPqn?= =?us-ascii?Q?NRfAe8ucAECkOtK7w+fubTX5osCbD+P7jbozcSPk0cep6S4D9Sq9viBy4Sgw?= =?us-ascii?Q?96/yi1thc/HwLd05vpEn5g6F+nswCWo8VDGYjw8RP7TEEE7NcyM/vX9FfQwW?= =?us-ascii?Q?s3Vw8z3rn3CAgjYn5rINBOmSRFnDWagkO5pregpwque36srCfsjCBhRS+qI4?= =?us-ascii?Q?+m3CS0QsvoU0qlvjj+Xlr3IbfwQv6B+1g7W+8FOMI7+Bq2+PgC1Ki5D0dKsk?= =?us-ascii?Q?EnjGe4rJoY7lURPy/zwMr6M9Rhhocm9AvbX2q3O0BNKChiUFzGjl72SugSdv?= =?us-ascii?Q?CNA/UoMwQhJMaHpw0/XLGJkf4IDbnL8yUhBPkEyoqz9nwtbByaxKbBfwV22P?= =?us-ascii?Q?qN2eyI1VnNCkgB0RpsoT8JQELZZ7ozpRQ5N2NW17HeM2D/umq6B7ZFKSJ1r9?= =?us-ascii?Q?BUtqD6SJ1eKXDKN6lvaRpGDSPXrD7HLQwMl6fu6nm2sAyq5H973LHCZ0hI+g?= =?us-ascii?Q?0+msH4qLsToJ8lpCSi7cgCm9TVIut1IsU9zK3VkIbpR0Tyl3vkOXGLISmukc?= =?us-ascii?Q?5b8viVaRTaAUky4LbtMrYhDrRGjd9Wcchg8c/s8VzHup78jARO0cEALBA52o?= =?us-ascii?Q?gcMeCqSa/5e3gUbSm6PyT8GfkA9k9QmK0u3ou+stqgmR4KmzasVt+s++DVTv?= =?us-ascii?Q?LoWToIlluVKUhRCWg2m2STwXqFhtqPLChd/LCdV9OwX7/kxjmHHz8uY5h4oE?= =?us-ascii?Q?zGlflhFT48cyt8+M0HSpf1V4avFFpnexdHmUhccBIRKuxp9l3hlmt9n8u+EM?= =?us-ascii?Q?GisvBnRtSiBzV05MlVaDgVmQd3Tp3QX44lNIVx/iYbpXU7DcMVnTIDF4g+A4?= =?us-ascii?Q?bYVSuAva/+nIFaUzPm82C695g82J5eYH2XJ/A8b3lD2kK/Q7zneME6WcA4NZ?= =?us-ascii?Q?yhZ8wUzrVtvmUziEi5w1JKdDfoBoondCMKx+LuuGGi5A2DMUTFx3k0hX+Yl2?= =?us-ascii?Q?VlbQZShSZi1kRbHxU2cKw22yUqNbJdrXWhxUrL/Pc4IlOwiZjnSPhL6N72vs?= =?us-ascii?Q?YQ=3D=3D?= X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: J6MAN46BBJJhu0+Z69yweDCJ3ZlMmFMjznYtbBoKGzxAz9qtgWrCS7gTntcDk2SZtMVU+vDoD2UkNUBXOCDlA8PPuFcVKE6oP5lo4pumOa5CeA9UUsxndi1AF1f0+gJ7gANKNvgFCCdC0XXxx9kxTjpjFp98m/yp6CwS/YpBXIlYOETAG3mYTRuBxObScS8RE3pxRf2wbMktJYemyQCjDvrCIQnpmGS04XBe9ICe0bMsmf5LFcahJwFwt1d+6hOWA4/vNhc4RMBTyewsyVN1mcvwVVSih2e2tq7CU/BV81mh53eeTeMP98EZM+iKGN7zEevgKSkQKAzFsXVVzph4LUAj3pdkoyumfNyLuk3tIxmlnLRbLL1+TsN4/pzM3zpesewDArXxmJb9NDdBbMul/7vi50I9ZXbTkdoApxJ1BiXBFCcRhkBrEkFs6YhP6beYk0qi6MW3tsyEdnsVgaSohILeML7NPHa550SJp/MR/o9ugWCKlWh37k7cqb4lymj11aPlFsbGUcpLZ5oR2lBDxYSkUfzXKXLviGrSZ6DL2x9j6JRjIUpPaupodpsVnroMut0CeeEbvbF1kvcROlUosIx5AwIR/V3NiQ49AE9v7AU= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 9042738c-ccc3-4780-55e4-08dc5ef020bd X-MS-Exchange-CrossTenant-AuthSource: DM6PR10MB3113.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Apr 2024 15:07:41.8160 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: N4gmX0UXMCL2nuTmF1N3TfTsvBeFKqYgErGaZhVR50QLIlOcSy+PuEYm9RIYSw3Gjr3n7RlU3m7QoDzaPB1Tpd7gtNrQK0+h8NJ5aMprfP4= X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH0PR10MB5148 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.272,Aquarius:18.0.1011,Hydra:6.0.619,FMLib:17.11.176.26 definitions=2024-04-17_12,2024-04-16_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 phishscore=0 adultscore=0 mlxlogscore=999 suspectscore=0 bulkscore=0 spamscore=0 mlxscore=0 malwarescore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2404010000 definitions=main-2404170104 X-Proofpoint-GUID: Rr-gE5ui570d1Z2lYqrCs-7eOOfyeGQA X-Proofpoint-ORIG-GUID: Rr-gE5ui570d1Z2lYqrCs-7eOOfyeGQA X-Spam-Status: No, score=-12.9 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,KAM_SHORT,RCVD_IN_DNSWL_LOW,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,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 Cupertino. OK for master. Thanks! > BPF supports multiple instructions to be CO-RE relocatable regardless of > the position of the immediate field in the encoding. > In particular, not only the MOV instruction allows a CO-RE > relocation of its immediate operand, but the LD and ST instructions can > have a CO-RE relocation happening to their offset immediate operand, > even though those operands are encoded in different encoding bits. > This patch moves matching from a more traditional matching of the > UNSPEC_CORE_RELOC pattern within a define_insn to a match within the > constraints of both immediates and address operands from more generic > mov define_insn rule. > > gcc/Changelog: > * config/bpf/bpf-protos.h (bpf_add_core_reloc): Renamed function > to bpf_output_move. > * config/bpf/bpf.cc (bpf_legitimate_address_p): Allow > UNSPEC_CORE_RELOC to match an address. > (bpf_insn_cost): Make UNSPEC_CORE_RELOC immediate moves > expensive to prioritize loads and stores. > (TARGET_INSN_COST): Add hook. > (bpf_output_move): Wrapper to call bpf_output_core_reloc. > (bpf_print_operand): Add support to print immediate operands > specified with the UNSPEC_CORE_RELOC. > (bpf_print_operand_address): Likewise, but to support > UNSPEC_CORE_RELOC in addresses. > (bpf_init_builtins): Flag BPF_BUILTIN_CORE_RELOC as NOTHROW. > * config/bpf/bpf.md: Wrap patterns for MOV, LD and ST > instruction with bpf_output_move call. > (mov_reloc_core): Remove now spurious define_insn. > * config/bpf/constraints.md: Added "c" and "C" constraints to > match immediates represented with UNSPEC_CORE_RELOC. > * config/bpf/core-builtins.cc (bpf_add_core_reloc): Remove > (bpf_output_core_reloc): Add function to create the CO-RE > relocations based on new matching rules. > * config/bpf/core-builtins.h (bpf_output_core_reloc): Add > prototype. > * config/bpf/predicates.md (core_imm_operand) Add predicate. > (mov_src_operand): Add match for core_imm_operand. > > gcc/testsuite/ChangeLog: > * gcc.target/bpf/btfext-funcinfo.c: Updated to changes. > * gcc.target/bpf/core-builtin-fieldinfo-const-elimination.c: > Likewise. > * gcc.target/bpf/core-builtin-fieldinfo-existence-1.c: Likewise. > * gcc.target/bpf/core-builtin-fieldinfo-lshift-1-be.c: Likewise. > * gcc.target/bpf/core-builtin-fieldinfo-lshift-1-le.c: Likewise. > * gcc.target/bpf/core-builtin-fieldinfo-lshift-2.c: Likewise. > * gcc.target/bpf/core-builtin-fieldinfo-offset-1.c: Likewise. > * gcc.target/bpf/core-builtin-fieldinfo-rshift-1.c: Likewise. > * gcc.target/bpf/core-builtin-fieldinfo-rshift-2.c: Likewise. > * gcc.target/bpf/core-builtin-fieldinfo-sign-1.c: Likewise. > * gcc.target/bpf/core-builtin-fieldinfo-sign-2.c: Likewise. > * gcc.target/bpf/core-builtin-fieldinfo-size-1.c: Likewise. > --- > gcc/config/bpf/bpf-protos.h | 2 +- > gcc/config/bpf/bpf.cc | 54 +++++++++++++- > gcc/config/bpf/bpf.md | 56 ++++++--------- > gcc/config/bpf/constraints.md | 20 ++++++ > gcc/config/bpf/core-builtins.cc | 71 ++++++++++++++----- > gcc/config/bpf/core-builtins.h | 2 + > gcc/config/bpf/predicates.md | 7 +- > .../gcc.target/bpf/btfext-funcinfo.c | 2 - > ...core-builtin-fieldinfo-const-elimination.c | 2 +- > .../bpf/core-builtin-fieldinfo-existence-1.c | 2 +- > .../bpf/core-builtin-fieldinfo-lshift-1-be.c | 8 +-- > .../bpf/core-builtin-fieldinfo-lshift-1-le.c | 8 +-- > .../bpf/core-builtin-fieldinfo-lshift-2.c | 6 +- > .../bpf/core-builtin-fieldinfo-offset-1.c | 12 ++-- > .../bpf/core-builtin-fieldinfo-rshift-1.c | 8 +-- > .../bpf/core-builtin-fieldinfo-rshift-2.c | 4 +- > .../bpf/core-builtin-fieldinfo-sign-1.c | 4 +- > .../bpf/core-builtin-fieldinfo-sign-2.c | 4 +- > .../bpf/core-builtin-fieldinfo-size-1.c | 8 +-- > 19 files changed, 189 insertions(+), 91 deletions(-) > > diff --git a/gcc/config/bpf/bpf-protos.h b/gcc/config/bpf/bpf-protos.h > index ac0c2f4038f..b4866d34209 100644 > --- a/gcc/config/bpf/bpf-protos.h > +++ b/gcc/config/bpf/bpf-protos.h > @@ -30,7 +30,7 @@ extern void bpf_print_operand_address (FILE *, rtx); > extern void bpf_expand_prologue (void); > extern void bpf_expand_epilogue (void); > extern void bpf_expand_cbranch (machine_mode, rtx *); > -const char *bpf_add_core_reloc (rtx *operands, const char *templ); > +const char *bpf_output_move (rtx *operands, const char *templ); > > class gimple_opt_pass; > gimple_opt_pass *make_pass_lower_bpf_core (gcc::context *ctxt); > diff --git a/gcc/config/bpf/bpf.cc b/gcc/config/bpf/bpf.cc > index fb60770c170..d9141dd625a 100644 > --- a/gcc/config/bpf/bpf.cc > +++ b/gcc/config/bpf/bpf.cc > @@ -584,6 +584,16 @@ bpf_legitimate_address_p (machine_mode mode, > if (bpf_address_base_p (x0, strict) && GET_CODE (x1) == CONST_INT) > return IN_RANGE (INTVAL (x1), -1 - 0x7fff, 0x7fff); > > + /* Check if any of the PLUS operation operands is a CORE unspec, and at > + least the local value for the offset fits in the 16 bits available > + in the encoding. */ > + if (bpf_address_base_p (x1, strict) > + && GET_CODE (x0) == UNSPEC && XINT (x0, 1) == UNSPEC_CORE_RELOC) > + return IN_RANGE (INTVAL (XVECEXP (x0, 0, 0)), -1 - 0x7fff, 0x7fff); > + if (bpf_address_base_p (x0, strict) > + && GET_CODE (x1) == UNSPEC && XINT (x1, 1) == UNSPEC_CORE_RELOC) > + return IN_RANGE (INTVAL (XVECEXP (x1, 0, 0)), -1 - 0x7fff, 0x7fff); > + > break; > } > default: > @@ -615,6 +625,21 @@ bpf_rtx_costs (rtx x ATTRIBUTE_UNUSED, > #undef TARGET_RTX_COSTS > #define TARGET_RTX_COSTS bpf_rtx_costs > > +static int > +bpf_insn_cost (rtx_insn *insn, bool speed ATTRIBUTE_UNUSED) > +{ > + rtx pat = PATTERN (insn); > + if(GET_CODE (pat) == SET > + && GET_CODE (XEXP (pat, 1)) == UNSPEC > + && XINT (XEXP (pat, 1), 1) == UNSPEC_CORE_RELOC) > + return COSTS_N_INSNS (100); > + > + return COSTS_N_INSNS (1); > +} > + > +#undef TARGET_INSN_COST > +#define TARGET_INSN_COST bpf_insn_cost > + > /* Return true if an argument at the position indicated by CUM should > be passed by reference. If the hook returns true, a copy of that > argument is made in memory and a pointer to the argument is passed > @@ -771,6 +796,13 @@ bpf_output_call (rtx target) > return ""; > } > > +const char * > +bpf_output_move (rtx *operands, const char *templ) > +{ > + bpf_output_core_reloc (operands, 2); > + return templ; > +} > + > /* Print register name according to assembly dialect. In normal > syntax registers are printed like %rN where N is the register > number. > @@ -852,6 +884,12 @@ bpf_print_operand (FILE *file, rtx op, int code) > gcc_unreachable (); > } > break; > + case UNSPEC: > + if (XINT (op, 1) == UNSPEC_CORE_RELOC) > + bpf_print_operand (file, XVECEXP (op, 0, 0), code); > + else > + gcc_unreachable (); > + break; > default: > output_addr_const (file, op); > } > @@ -880,13 +918,24 @@ bpf_print_operand_address (FILE *file, rtx addr) > rtx op0 = XEXP (addr, 0); > rtx op1 = XEXP (addr, 1); > > - if (GET_CODE (op0) == REG && GET_CODE (op1) == CONST_INT) > + if (GET_CODE (op1) == REG) { > + op0 = op1; > + op1 = XEXP (addr, 0); > + } > + > + if (GET_CODE (op0) == REG > + && (GET_CODE (op1) == CONST_INT > + || (GET_CODE (op1) == UNSPEC > + && XINT (op1, 1) == UNSPEC_CORE_RELOC))) > { > if (asm_dialect == ASM_NORMAL) > fprintf (file, "["); > bpf_print_register (file, op0, 0); > fprintf (file, "+"); > - output_addr_const (file, op1); > + if (GET_CODE (op1) == UNSPEC) > + output_addr_const (file, XVECEXP (op1, 0, 0)); > + else > + output_addr_const (file, op1); > if (asm_dialect == ASM_NORMAL) > fprintf (file, "]"); > } > @@ -962,6 +1011,7 @@ bpf_init_builtins (void) > build_function_type_list (integer_type_node,integer_type_node, > 0)); > DECL_PURE_P (bpf_builtins[BPF_BUILTIN_CORE_RELOC]) = 1; > + TREE_NOTHROW (bpf_builtins[BPF_BUILTIN_CORE_RELOC]) = 1; > > bpf_init_core_builtins (); > } > diff --git a/gcc/config/bpf/bpf.md b/gcc/config/bpf/bpf.md > index ea688aadf91..95859328d25 100644 > --- a/gcc/config/bpf/bpf.md > +++ b/gcc/config/bpf/bpf.md > @@ -281,8 +281,8 @@ > "" > "@ > {and\t%0,0xffff|%0 &= 0xffff} > - {mov\t%0,%1\;and\t%0,0xffff|%0 = %1;%0 &= 0xffff} > - {ldxh\t%0,%1|%0 = *(u16 *) (%1)}" > + *return bpf_output_move (operands, \"{mov\t%0,%1\;and\t%0,0xffff|%0 = %1;%0 &= 0xffff}\"); > + *return bpf_output_move (operands, \"{ldxh\t%0,%1|%0 = *(u16 *) (%1)}\");" > [(set_attr "type" "alu,alu,ldx")]) > > (define_insn "zero_extendqidi2" > @@ -291,8 +291,8 @@ > "" > "@ > {and\t%0,0xff|%0 &= 0xff} > - {mov\t%0,%1\;and\t%0,0xff|%0 = %1;%0 &= 0xff} > - {ldxb\t%0,%1|%0 = *(u8 *) (%1)}" > + *return bpf_output_move (operands, \"{mov\t%0,%1\;and\t%0,0xff|%0 = %1;%0 &= 0xff}\"); > + *return bpf_output_move (operands, \"{ldxb\t%0,%1|%0 = *(u8 *) (%1)}\");" > [(set_attr "type" "alu,alu,ldx")]) > > (define_insn "zero_extendsidi2" > @@ -301,8 +301,8 @@ > (match_operand:SI 1 "nonimmediate_operand" "r,q")))] > "" > "@ > - * return bpf_has_alu32 ? \"{mov32\t%0,%1|%0 = %1}\" : \"{mov\t%0,%1\;and\t%0,0xffffffff|%0 = %1;%0 &= 0xffffffff}\"; > - {ldxw\t%0,%1|%0 = *(u32 *) (%1)}" > + *return bpf_output_move (operands, bpf_has_alu32 ? \"{mov32\t%0,%1|%0 = %1}\" : \"{mov\t%0,%1\;and\t%0,0xffffffff|%0 = %1;%0 &= 0xffffffff}\"); > + *return bpf_output_move (operands, \"{ldxw\t%0,%1|%0 = *(u32 *) (%1)}\");" > [(set_attr "type" "alu,ldx")]) > > ;;; Sign-extension > @@ -328,8 +328,8 @@ > (sign_extend:DI (match_operand:SI 1 "nonimmediate_operand" "r,q")))] > "bpf_has_smov" > "@ > - {movs\t%0,%1,32|%0 = (s32) %1} > - {ldxsw\t%0,%1|%0 = *(s32 *) (%1)}" > + *return bpf_output_move (operands, \"{movs\t%0,%1,32|%0 = (s32) %1}\"); > + *return bpf_output_move (operands, \"{ldxsw\t%0,%1|%0 = *(s32 *) (%1)}\");" > [(set_attr "type" "alu,ldx")]) > > (define_insn "extendhidi2" > @@ -337,8 +337,8 @@ > (sign_extend:DI (match_operand:HI 1 "nonimmediate_operand" "r,q")))] > "bpf_has_smov" > "@ > - {movs\t%0,%1,16|%0 = (s16) %1} > - {ldxsh\t%0,%1|%0 = *(s16 *) (%1)}" > + *return bpf_output_move (operands, \"{movs\t%0,%1,16|%0 = (s16) %1}\"); > + *return bpf_output_move (operands, \"{ldxsh\t%0,%1|%0 = *(s16 *) (%1)}\");" > [(set_attr "type" "alu,ldx")]) > > (define_insn "extendqidi2" > @@ -346,22 +346,22 @@ > (sign_extend:DI (match_operand:QI 1 "nonimmediate_operand" "r,q")))] > "bpf_has_smov" > "@ > - {movs\t%0,%1,8|%0 = (s8) %1} > - {ldxsb\t%0,%1|%0 = *(s8 *) (%1)}" > + *return bpf_output_move (operands, \"{movs\t%0,%1,8|%0 = (s8) %1}\"); > + *return bpf_output_move (operands, \"{ldxsb\t%0,%1|%0 = *(s8 *) (%1)}\");" > [(set_attr "type" "alu,ldx")]) > > (define_insn "extendhisi2" > [(set (match_operand:SI 0 "register_operand" "=r") > (sign_extend:SI (match_operand:HI 1 "register_operand" "r")))] > "bpf_has_smov" > - "{movs32\t%0,%1,16|%w0 = (s16) %w1}" > + "*return bpf_output_move (operands, \"{movs32\t%0,%1,16|%w0 = (s16) %w1}\");" > [(set_attr "type" "alu")]) > > (define_insn "extendqisi2" > [(set (match_operand:SI 0 "register_operand" "=r") > (sign_extend:SI (match_operand:QI 1 "register_operand" "r")))] > "bpf_has_smov" > - "{movs32\t%0,%1,8|%w0 = (s8) %w1}" > + "*return bpf_output_move (operands, \"{movs32\t%0,%1,8|%w0 = (s8) %w1}\");" > [(set_attr "type" "alu")]) > > ;;;; Data movement > @@ -380,31 +380,17 @@ > }") > > (define_insn "*mov" > - [(set (match_operand:MM 0 "nonimmediate_operand" "=r, r,r,q,q") > - (match_operand:MM 1 "mov_src_operand" " q,rI,B,r,I"))] > + [(set (match_operand:MM 0 "nonimmediate_operand" "=r, r, r,q,q") > + (match_operand:MM 1 "mov_src_operand" " q,rIc,BC,r,I"))] > "" > "@ > - {ldx\t%0,%1|%0 = *( *) (%1)} > - {mov\t%0,%1|%0 = %1} > - {lddw\t%0,%1|%0 = %1 ll} > - {stx\t%0,%1|*( *) (%0) = %1} > - {st\t%0,%1|*( *) (%0) = %1}" > + *return bpf_output_move (operands, \"{ldx\t%0,%1|%0 = *( *) (%1)}\"); > + *return bpf_output_move (operands, \"{mov\t%0,%1|%0 = %1}\"); > + *return bpf_output_move (operands, \"{lddw\t%0,%1|%0 = %1 ll}\"); > + *return bpf_output_move (operands, \"{stx\t%0,%1|*( *) (%0) = %1}\"); > + *return bpf_output_move (operands, \"{st\t%0,%1|*( *) (%0) = %1}\");" > [(set_attr "type" "ldx,alu,alu,stx,st")]) > > -(define_insn "*mov_reloc_core" > - [(set (match_operand:MM 0 "nonimmediate_operand" "=r,q,r") > - (unspec:MM [ > - (match_operand:MM 1 "immediate_operand" " I,I,B") > - (match_operand:SI 2 "immediate_operand" " I,I,I") > - ] UNSPEC_CORE_RELOC) > - )] > - "" > - "@ > - *return bpf_add_core_reloc (operands, \"{mov\t%0,%1|%0 = %1}\"); > - *return bpf_add_core_reloc (operands, \"{st\t%0,%1|*( *) (%0) = %1}\"); > - *return bpf_add_core_reloc (operands, \"{lddw\t%0,%1|%0 = %1 ll}\");" > - [(set_attr "type" "alu,st,alu")]) > - > ;;;; Shifts > > (define_mode_iterator SIM [(SI "bpf_has_alu32") DI]) > diff --git a/gcc/config/bpf/constraints.md b/gcc/config/bpf/constraints.md > index 4b8d65883ee..dd04e67fa81 100644 > --- a/gcc/config/bpf/constraints.md > +++ b/gcc/config/bpf/constraints.md > @@ -33,6 +33,26 @@ > (define_register_constraint "t" "R0" > "Register r0") > > +;; > +;; BPF CO-RE immediate constraints. > +;; This constraints are used to match with the immediate operand that is > +;; represented with an UNSPEC_CORE_RELOC. This unspec is the result of using the > +;; BPF CO-RE infrastructure. > +;; It differentiates from a normal immediate constraints, as the instruction > +;; will also emit a BTF based specific relocation, i.e. a CO-RE relocation. > +;; > + > +(define_constraint "c" > + "A 32-bit CO-RE signed immediate." > + (and (match_code "unspec") > + (match_test "XINT (op, 1) == UNSPEC_CORE_RELOC") > + (match_test "IN_RANGE (XVECEXP (op, 0, 0), -1 - 0x7fffffff, 0x7fffffff)"))) > + > +(define_constraint "C" > + "For 64-bit CO-RE signed immediate." > + (and (match_code "unspec") > + (match_test "XINT (op, 1) == UNSPEC_CORE_RELOC"))) > + > ;; > ;; Memory constraints. > ;; > diff --git a/gcc/config/bpf/core-builtins.cc b/gcc/config/bpf/core-builtins.cc > index 8333ad81d0e..e03e986e2c1 100644 > --- a/gcc/config/bpf/core-builtins.cc > +++ b/gcc/config/bpf/core-builtins.cc > @@ -1561,6 +1561,7 @@ bpf_expand_core_builtin (tree exp, enum bpf_builtins code) > return NULL_RTX; > } > > + > /* This function is called in the final assembly output for the > unspec:UNSPEC_CORE_RELOC. It recovers the vec index kept as the third > operand and collects the data from the vec. With that it calls the process > @@ -1568,27 +1569,63 @@ bpf_expand_core_builtin (tree exp, enum bpf_builtins code) > Also it creates a label pointing to the unspec instruction and uses it in > the CO-RE relocation creation. */ > > -const char * > -bpf_add_core_reloc (rtx *operands, const char *templ) > +void > +bpf_output_core_reloc (rtx *operands, int nr_ops) > { > - struct cr_builtins *data = get_builtin_data (INTVAL (operands[2])); > - builtin_helpers helper; > - helper = core_builtin_helpers[data->orig_builtin_code]; > - > - rtx_code_label * tmp_label = gen_label_rtx (); > - output_asm_label (tmp_label); > - assemble_name (asm_out_file, ":\n"); > + /* Search for an UNSPEC_CORE_RELOC within the operands of the emitting > + intructions. */ > + rtx unspec_exp = NULL_RTX; > + for (int i = 0; i < nr_ops; i++) > + { > + rtx op = operands[i]; > > - gcc_assert (helper.process != NULL); > - struct cr_final reloc_data = helper.process (data); > - make_core_relo (&reloc_data, tmp_label); > + /* An immediate CO-RE reloc. */ > + if (GET_CODE (op) == UNSPEC > + && XINT (op, 1) == UNSPEC_CORE_RELOC) > + unspec_exp = op; > > - /* Replace default value for later processing builtin types. > - Example if the type id builtins. */ > - if (data->rtx_default_value != NULL_RTX) > - operands[1] = data->rtx_default_value; > + /* In case of a MEM operation with an offset resolved in CO-RE. */ > + if (GET_CODE (op) == MEM > + && (op = XEXP (op, 0)) != NULL_RTX > + && (GET_CODE (op) == PLUS)) > + { > + rtx x0 = XEXP (op, 0); > + rtx x1 = XEXP (op, 1); > + > + if (GET_CODE (x0) == UNSPEC > + && XINT (x0, 1) == UNSPEC_CORE_RELOC) > + unspec_exp = x0; > + if (GET_CODE (x1) == UNSPEC > + && XINT (x1, 1) == UNSPEC_CORE_RELOC) > + unspec_exp = x1; > + } > + if (unspec_exp != NULL_RTX) > + break; > + } > > - return templ; > + if (unspec_exp != NULL_RTX) > + { > + int index = INTVAL (XVECEXP (unspec_exp, 0, 1)); > + struct cr_builtins *data = get_builtin_data (index); > + builtin_helpers helper; > + helper = core_builtin_helpers[data->orig_builtin_code]; > + > + rtx_code_label * tmp_label = gen_label_rtx (); > + output_asm_label (tmp_label); > + assemble_name (asm_out_file, ":\n"); > + > + rtx orig_default_value = data->rtx_default_value; > + > + gcc_assert (helper.process != NULL); > + struct cr_final reloc_data = helper.process (data); > + make_core_relo (&reloc_data, tmp_label); > + > + /* Replace default value for later processing builtin types. > + An example are the type id builtins. */ > + if (data->rtx_default_value != NULL_RTX > + && orig_default_value != data->rtx_default_value) > + XVECEXP (unspec_exp, 0, 0) = data->rtx_default_value; > + } > } > > static tree > diff --git a/gcc/config/bpf/core-builtins.h b/gcc/config/bpf/core-builtins.h > index e56b55b94e0..ebe321b16fb 100644 > --- a/gcc/config/bpf/core-builtins.h > +++ b/gcc/config/bpf/core-builtins.h > @@ -59,5 +59,7 @@ void bpf_init_core_builtins (void); > rtx bpf_expand_core_builtin (tree exp, enum bpf_builtins code); > tree bpf_resolve_overloaded_core_builtin (location_t loc, tree fndecl, > void *arglist); > +void > +bpf_output_core_reloc (rtx *operands, int nr_ops); > > #endif > diff --git a/gcc/config/bpf/predicates.md b/gcc/config/bpf/predicates.md > index fa042585379..568156f56e3 100644 > --- a/gcc/config/bpf/predicates.md > +++ b/gcc/config/bpf/predicates.md > @@ -27,6 +27,10 @@ > (match_test "IN_RANGE (INTVAL (op), 0, 0xffffffff)")) > (match_code "symbol_ref,label_ref,const"))) > > +(define_predicate "core_imm_operand" > + (and (match_code "unspec") > + (match_test "XINT (op, 1) == UNSPEC_CORE_RELOC"))) > + > (define_predicate "lddw_operand" > (match_code "symbol_ref,label_ref,const,const_double,const_int")) > > @@ -57,7 +61,8 @@ > (define_predicate "mov_src_operand" > (ior (match_operand 0 "memory_operand") > (match_operand 0 "reg_or_imm_operand") > - (match_operand 0 "lddw_operand"))) > + (match_operand 0 "lddw_operand") > + (match_operand 0 "core_imm_operand"))) > > (define_predicate "register_compare_operator" > (match_code "eq,ne,geu,gtu,ge,gt")) > diff --git a/gcc/testsuite/gcc.target/bpf/btfext-funcinfo.c b/gcc/testsuite/gcc.target/bpf/btfext-funcinfo.c > index a59c5bd37eb..6fdd14574ec 100644 > --- a/gcc/testsuite/gcc.target/bpf/btfext-funcinfo.c > +++ b/gcc/testsuite/gcc.target/bpf/btfext-funcinfo.c > @@ -35,8 +35,6 @@ int bar_func (struct T *t) > /* { dg-final { scan-assembler-times "label for function foo_func" 1 } } */ > /* { dg-final { scan-assembler-times "label for function bar_func" 1 } } */ > > -/* { dg-final { scan-assembler-times "ascii \"0:2:1:1:3.0\"\[\t \]+\[^\n\]*btf_aux_string" 1 } } */ > -/* { dg-final { scan-assembler-times "ascii \"0:2:1:2.0\"\[\t \]+\[^\n\]*btf_aux_string" 1 } } */ > /* { dg-final { scan-assembler-times "ascii \"foo_sec.0\"\[\t \]+\[^\n\]*btf_aux_string" 1 } } */ > /* { dg-final { scan-assembler-times "ascii \"bar_sec.0\"\[\t \]+\[^\n\]*btf_aux_string" 1 } } */ > /* { dg-final { scan-assembler-times "FuncInfo entry size" 1 } } */ > diff --git a/gcc/testsuite/gcc.target/bpf/core-builtin-fieldinfo-const-elimination.c b/gcc/testsuite/gcc.target/bpf/core-builtin-fieldinfo-const-elimination.c > index 5f835487483..51e938c8aac 100644 > --- a/gcc/testsuite/gcc.target/bpf/core-builtin-fieldinfo-const-elimination.c > +++ b/gcc/testsuite/gcc.target/bpf/core-builtin-fieldinfo-const-elimination.c > @@ -25,5 +25,5 @@ unsigned int foo (struct T *t) > return __builtin_preserve_field_info (t->s[0].a1, FIELD_BYTE_OFFSET) + 1; > } > > -/* { dg-final { scan-assembler-times "\[\t \]mov\[\t \]%r\[0-9\],4" 1 } } */ > +/* { dg-final { scan-assembler-times "\[\t \]lddw\[\t \]%r\[0-9\],4" 1 } } */ > /* { dg-final { scan-assembler-times "\[\t \]add32\[\t \]%r\[0-9\],1" 1 } } */ > diff --git a/gcc/testsuite/gcc.target/bpf/core-builtin-fieldinfo-existence-1.c b/gcc/testsuite/gcc.target/bpf/core-builtin-fieldinfo-existence-1.c > index c55f21a9c11..96119daf7b2 100644 > --- a/gcc/testsuite/gcc.target/bpf/core-builtin-fieldinfo-existence-1.c > +++ b/gcc/testsuite/gcc.target/bpf/core-builtin-fieldinfo-existence-1.c > @@ -24,7 +24,7 @@ unsigned int foo (struct S *s) > return c + d + u + ar; > } > > -/* { dg-final { scan-assembler-times "\[\t \]mov\[\t \]%r\[0-9\],1" 4 } } */ > +/* { dg-final { scan-assembler-times "\[\t \]lddw\[\t \]%r\[0-9\],1" 4 } } */ > > /* { dg-final { scan-assembler-times "ascii \"0:0.0\"\[\t \]+\[^\n\]*btf_aux_string" 1 } } */ > /* { dg-final { scan-assembler-times "ascii \"0:1.0\"\[\t \]+\[^\n\]*btf_aux_string" 1 } } */ > diff --git a/gcc/testsuite/gcc.target/bpf/core-builtin-fieldinfo-lshift-1-be.c b/gcc/testsuite/gcc.target/bpf/core-builtin-fieldinfo-lshift-1-be.c > index dabf73dd259..579bc769b82 100644 > --- a/gcc/testsuite/gcc.target/bpf/core-builtin-fieldinfo-lshift-1-be.c > +++ b/gcc/testsuite/gcc.target/bpf/core-builtin-fieldinfo-lshift-1-be.c > @@ -24,10 +24,10 @@ unsigned int foo (struct S *s) > return x1 + x2 + x3 + x4; > } > > -/* { dg-final { scan-assembler-times "\[\t \]mov\[\t \]%r\[0-9\],32" 1 } } */ > -/* { dg-final { scan-assembler-times "\[\t \]mov\[\t \]%r\[0-9\],38" 1 } } */ > -/* { dg-final { scan-assembler-times "\[\t \]mov\[\t \]%r\[0-9\],41" 1 } } */ > -/* { dg-final { scan-assembler-times "\[\t \]mov\[\t \]%r\[0-9\],48" 1 } } */ > +/* { dg-final { scan-assembler-times "\[\t \]lddw\[\t \]%r\[0-9\],32" 1 } } */ > +/* { dg-final { scan-assembler-times "\[\t \]lddw\[\t \]%r\[0-9\],38" 1 } } */ > +/* { dg-final { scan-assembler-times "\[\t \]lddw\[\t \]%r\[0-9\],41" 1 } } */ > +/* { dg-final { scan-assembler-times "\[\t \]lddw\[\t \]%r\[0-9\],48" 1 } } */ > > /* { dg-final { scan-assembler-times "ascii \"0:0.0\"\[\t \]+\[^\n\]*btf_aux_string" 1 } } */ > /* { dg-final { scan-assembler-times "ascii \"0:1.0\"\[\t \]+\[^\n\]*btf_aux_string" 1 } } */ > diff --git a/gcc/testsuite/gcc.target/bpf/core-builtin-fieldinfo-lshift-1-le.c b/gcc/testsuite/gcc.target/bpf/core-builtin-fieldinfo-lshift-1-le.c > index 99e3982d932..d48f01ae522 100644 > --- a/gcc/testsuite/gcc.target/bpf/core-builtin-fieldinfo-lshift-1-le.c > +++ b/gcc/testsuite/gcc.target/bpf/core-builtin-fieldinfo-lshift-1-le.c > @@ -24,10 +24,10 @@ unsigned int foo (struct S *s) > return x1 + x2 + x3 + x4; > } > > -/* { dg-final { scan-assembler-times "\[\t \]mov\[\t \]%r\[0-9\],58" 1 } } */ > -/* { dg-final { scan-assembler-times "\[\t \]mov\[\t \]%r\[0-9\],55" 1 } } */ > -/* { dg-final { scan-assembler-times "\[\t \]mov\[\t \]%r\[0-9\],48" 1 } } */ > -/* { dg-final { scan-assembler-times "\[\t \]mov\[\t \]%r\[0-9\],32" 1 } } */ > +/* { dg-final { scan-assembler-times "\[\t \]lddw\[\t \]%r\[0-9\],58" 1 } } */ > +/* { dg-final { scan-assembler-times "\[\t \]lddw\[\t \]%r\[0-9\],55" 1 } } */ > +/* { dg-final { scan-assembler-times "\[\t \]lddw\[\t \]%r\[0-9\],48" 1 } } */ > +/* { dg-final { scan-assembler-times "\[\t \]lddw\[\t \]%r\[0-9\],32" 1 } } */ > > /* { dg-final { scan-assembler-times "ascii \"0:0.0\"\[\t \]+\[^\n\]*btf_aux_string" 1 } } */ > /* { dg-final { scan-assembler-times "ascii \"0:1.0\"\[\t \]+\[^\n\]*btf_aux_string" 1 } } */ > diff --git a/gcc/testsuite/gcc.target/bpf/core-builtin-fieldinfo-lshift-2.c b/gcc/testsuite/gcc.target/bpf/core-builtin-fieldinfo-lshift-2.c > index 25be969e22b..653ddf65e56 100644 > --- a/gcc/testsuite/gcc.target/bpf/core-builtin-fieldinfo-lshift-2.c > +++ b/gcc/testsuite/gcc.target/bpf/core-builtin-fieldinfo-lshift-2.c > @@ -26,9 +26,9 @@ unsigned int foo (union U *u) > return s0s + s1c + ll; > } > > -/* { dg-final { scan-assembler-times "\[\t \]mov\[\t \]%r\[0-9\],48" 1 } } */ > -/* { dg-final { scan-assembler-times "\[\t \]mov\[\t \]%r\[0-9\],56" 1 } } */ > -/* { dg-final { scan-assembler-times "\[\t \]mov\[\t \]%r\[0-9\],0" 1 } } */ > +/* { dg-final { scan-assembler-times "\[\t \]lddw\[\t \]%r\[0-9\],48" 1 } } */ > +/* { dg-final { scan-assembler-times "\[\t \]lddw\[\t \]%r\[0-9\],56" 1 } } */ > +/* { dg-final { scan-assembler-times "\[\t \]lddw\[\t \]%r\[0-9\],0" 1 } } */ > > /* { dg-final { scan-assembler-times "ascii \"0:0:0:1.0\"\[\t \]+\[^\n\]*btf_aux_string" 1 } } */ > /* { dg-final { scan-assembler-times "ascii \"0:0:1:0.0\"\[\t \]+\[^\n\]*btf_aux_string" 1 } } */ > diff --git a/gcc/testsuite/gcc.target/bpf/core-builtin-fieldinfo-offset-1.c b/gcc/testsuite/gcc.target/bpf/core-builtin-fieldinfo-offset-1.c > index 8b1d8b012a2..a0ddda83a07 100644 > --- a/gcc/testsuite/gcc.target/bpf/core-builtin-fieldinfo-offset-1.c > +++ b/gcc/testsuite/gcc.target/bpf/core-builtin-fieldinfo-offset-1.c > @@ -46,12 +46,12 @@ unsigned int foo (struct T *t) > return s0a1 + s0a4 + s0x + s1a1 + s1a4 + s1x + c + d + e1 + e2 + f1; > } > > -/* { dg-final { scan-assembler-times "\[\t \]mov\[\t \]%r\[0-9\],4" 2 } } */ > -/* { dg-final { scan-assembler-times "\[\t \]mov\[\t \]%r\[0-9\],8" 1 } } */ > -/* { dg-final { scan-assembler-times "\[\t \]mov\[\t \]%r\[0-9\],12" 3 } } */ > -/* { dg-final { scan-assembler-times "\[\t \]mov\[\t \]%r\[0-9\],16" 1 } } */ > -/* { dg-final { scan-assembler-times "\[\t \]mov\[\t \]%r\[0-9\],20" 1 } } */ > -/* { dg-final { scan-assembler-times "\[\t \]mov\[\t \]%r\[0-9\],21" 2 } } */ > +/* { dg-final { scan-assembler-times "\[\t \]lddw\[\t \]%r\[0-9\],4" 2 } } */ > +/* { dg-final { scan-assembler-times "\[\t \]lddw\[\t \]%r\[0-9\],8" 1 } } */ > +/* { dg-final { scan-assembler-times "\[\t \]lddw\[\t \]%r\[0-9\],12" 3 } } */ > +/* { dg-final { scan-assembler-times "\[\t \]lddw\[\t \]%r\[0-9\],16" 1 } } */ > +/* { dg-final { scan-assembler-times "\[\t \]lddw\[\t \]%r\[0-9\],20" 1 } } */ > +/* { dg-final { scan-assembler-times "\[\t \]lddw\[\t \]%r\[0-9\],21" 2 } } */ > > /* { dg-final { scan-assembler-times "ascii \"0:1:0:0.0\"\[\t \]+\[^\n\]*btf_aux_string" 1 } } */ > /* { dg-final { scan-assembler-times "ascii \"0:1:0:3.0\"\[\t \]+\[^\n\]*btf_aux_string" 1 } } */ > diff --git a/gcc/testsuite/gcc.target/bpf/core-builtin-fieldinfo-rshift-1.c b/gcc/testsuite/gcc.target/bpf/core-builtin-fieldinfo-rshift-1.c > index d0c75d944cd..47767832272 100644 > --- a/gcc/testsuite/gcc.target/bpf/core-builtin-fieldinfo-rshift-1.c > +++ b/gcc/testsuite/gcc.target/bpf/core-builtin-fieldinfo-rshift-1.c > @@ -23,10 +23,10 @@ unsigned int foo (struct S *s) > return x1 + x2 + x3 + x4; > } > > -/* { dg-final { scan-assembler-times "\[\t \]mov\[\t \]%r\[0-9\],58" 1 } } */ > -/* { dg-final { scan-assembler-times "\[\t \]mov\[\t \]%r\[0-9\],61" 1 } } */ > -/* { dg-final { scan-assembler-times "\[\t \]mov\[\t \]%r\[0-9\],57" 1 } } */ > -/* { dg-final { scan-assembler-times "\[\t \]mov\[\t \]%r\[0-9\],48" 1 } } */ > +/* { dg-final { scan-assembler-times "\[\t \]lddw\[\t \]%r\[0-9\],58" 1 } } */ > +/* { dg-final { scan-assembler-times "\[\t \]lddw\[\t \]%r\[0-9\],61" 1 } } */ > +/* { dg-final { scan-assembler-times "\[\t \]lddw\[\t \]%r\[0-9\],57" 1 } } */ > +/* { dg-final { scan-assembler-times "\[\t \]lddw\[\t \]%r\[0-9\],48" 1 } } */ > > /* { dg-final { scan-assembler-times "ascii \"0:0.0\"\[\t \]+\[^\n\]*btf_aux_string" 1 } } */ > /* { dg-final { scan-assembler-times "ascii \"0:1.0\"\[\t \]+\[^\n\]*btf_aux_string" 1 } } */ > diff --git a/gcc/testsuite/gcc.target/bpf/core-builtin-fieldinfo-rshift-2.c b/gcc/testsuite/gcc.target/bpf/core-builtin-fieldinfo-rshift-2.c > index a71ddc17728..a13ff8e261e 100644 > --- a/gcc/testsuite/gcc.target/bpf/core-builtin-fieldinfo-rshift-2.c > +++ b/gcc/testsuite/gcc.target/bpf/core-builtin-fieldinfo-rshift-2.c > @@ -25,8 +25,8 @@ unsigned int foo (union U *u) > return sx + sc + i; > } > > -/* { dg-final { scan-assembler-times "\[\t \]mov\[\t \]%r\[0-9\],32" 2 } } */ > -/* { dg-final { scan-assembler-times "\[\t \]mov\[\t \]%r\[0-9\],56" 1 } } */ > +/* { dg-final { scan-assembler-times "\[\t \]lddw\[\t \]%r\[0-9\],32" 2 } } */ > +/* { dg-final { scan-assembler-times "\[\t \]lddw\[\t \]%r\[0-9\],56" 1 } } */ > > /* { dg-final { scan-assembler-times "ascii \"0:1:0.0\"\[\t \]+\[^\n\]*btf_aux_string" 1 } } */ > /* { dg-final { scan-assembler-times "ascii \"0:1:1.0\"\[\t \]+\[^\n\]*btf_aux_string" 1 } } */ > diff --git a/gcc/testsuite/gcc.target/bpf/core-builtin-fieldinfo-sign-1.c b/gcc/testsuite/gcc.target/bpf/core-builtin-fieldinfo-sign-1.c > index 3b2081e197c..442ed076aa9 100644 > --- a/gcc/testsuite/gcc.target/bpf/core-builtin-fieldinfo-sign-1.c > +++ b/gcc/testsuite/gcc.target/bpf/core-builtin-fieldinfo-sign-1.c > @@ -23,8 +23,8 @@ unsigned int foo (struct S *s) > return d + u + ar; > } > > -/* { dg-final { scan-assembler-times "\[\t \]mov\[\t \]%r\[0-9\],1" 2 } } */ > -/* { dg-final { scan-assembler-times "\[\t \]mov\[\t \]%r\[0-9\],0" 1 } } */ > +/* { dg-final { scan-assembler-times "\[\t \]lddw\[\t \]%r\[0-9\],1" 2 } } */ > +/* { dg-final { scan-assembler-times "\[\t \]lddw\[\t \]%r\[0-9\],0" 1 } } */ > > /* { dg-final { scan-assembler-times "ascii \"0:1.0\"\[\t \]+\[^\n\]*btf_aux_string" 1 } } */ > /* { dg-final { scan-assembler-times "ascii \"0:2.0\"\[\t \]+\[^\n\]*btf_aux_string" 1 } } */ > diff --git a/gcc/testsuite/gcc.target/bpf/core-builtin-fieldinfo-sign-2.c b/gcc/testsuite/gcc.target/bpf/core-builtin-fieldinfo-sign-2.c > index bf184299984..cdc4d4db35d 100644 > --- a/gcc/testsuite/gcc.target/bpf/core-builtin-fieldinfo-sign-2.c > +++ b/gcc/testsuite/gcc.target/bpf/core-builtin-fieldinfo-sign-2.c > @@ -35,8 +35,8 @@ unsigned int foo (union U *u) > return i + sig + un; > } > > -/* { dg-final { scan-assembler-times "\[\t \]mov\[\t \]%r\[0-9\],1" 2 } } */ > -/* { dg-final { scan-assembler-times "\[\t \]mov\[\t \]%r\[0-9\],0" 1 } } */ > +/* { dg-final { scan-assembler-times "\[\t \]lddw\[\t \]%r\[0-9\],1" 2 } } */ > +/* { dg-final { scan-assembler-times "\[\t \]lddw\[\t \]%r\[0-9\],0" 1 } } */ > > /* { dg-final { scan-assembler-times "ascii \"0:0.0\"\[\t \]+\[^\n\]*btf_aux_string" 1 } } */ > /* { dg-final { scan-assembler-times "ascii \"0:1:0.0\"\[\t \]+\[^\n\]*btf_aux_string" 1 } } */ > diff --git a/gcc/testsuite/gcc.target/bpf/core-builtin-fieldinfo-size-1.c b/gcc/testsuite/gcc.target/bpf/core-builtin-fieldinfo-size-1.c > index 8747bdeb9c3..74707f1cb7d 100644 > --- a/gcc/testsuite/gcc.target/bpf/core-builtin-fieldinfo-size-1.c > +++ b/gcc/testsuite/gcc.target/bpf/core-builtin-fieldinfo-size-1.c > @@ -29,10 +29,10 @@ unsigned int foo (union U *u) > return ls + s + a2 + a3 + ca; > } > > -/* { dg-final { scan-assembler-times "\[\t \]mov\[\t \]%r\[0-9\],24" 1 } } */ > -/* { dg-final { scan-assembler-times "\[\t \]mov\[\t \]%r\[0-9\],20" 1 } } */ > -/* { dg-final { scan-assembler-times "\[\t \]mov\[\t \]%r\[0-9\],4" 2 } } */ > -/* { dg-final { scan-assembler-times "\[\t \]mov\[\t \]%r\[0-9\],15" 1 } } */ > +/* { dg-final { scan-assembler-times "\[\t \]lddw\[\t \]%r\[0-9\],24" 1 } } */ > +/* { dg-final { scan-assembler-times "\[\t \]lddw\[\t \]%r\[0-9\],20" 1 } } */ > +/* { dg-final { scan-assembler-times "\[\t \]lddw\[\t \]%r\[0-9\],4" 2 } } */ > +/* { dg-final { scan-assembler-times "\[\t \]lddw\[\t \]%r\[0-9\],15" 1 } } */ > > /* { dg-final { scan-assembler-times "ascii \"0:0.0\"\[\t \]+\[^\n\]*btf_aux_string" 1 } } */ > /* { dg-final { scan-assembler-times "ascii \"0:1.0\"\[\t \]+\[^\n\]*btf_aux_string" 1 } } */