From patchwork Wed Nov 29 18:36:37 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Faust X-Patchwork-Id: 80981 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 6DADF385B528 for ; Wed, 29 Nov 2023 18:37:08 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mx0a-00069f02.pphosted.com (mx0a-00069f02.pphosted.com [205.220.165.32]) by sourceware.org (Postfix) with ESMTPS id B32AE38582A0 for ; Wed, 29 Nov 2023 18:36:46 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org B32AE38582A0 Authentication-Results: sourceware.org; dmarc=pass (p=none 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 B32AE38582A0 Authentication-Results: server2.sourceware.org; arc=pass smtp.remote-ip=205.220.165.32 ARC-Seal: i=2; a=rsa-sha256; d=sourceware.org; s=key; t=1701283011; cv=pass; b=jmx1VUn1iUwBedkPz3IzxzMt0aJzd29Yk7+VlkgJwIVg2bFZqRXqjhg7IlClvn2kUpmtlYVbsYbSYN+wO7bpvUrmDqWdWGuev4yxGZuDc1TJr0H0EB+0vlXtP2VvlLnIP40nb56wXnem/XE8Ytb1XRq5BBHizZa2JiK+rfh2s9Y= ARC-Message-Signature: i=2; a=rsa-sha256; d=sourceware.org; s=key; t=1701283011; c=relaxed/simple; bh=YEI8UkhS8REkI8LWNpZ21x0OmbqgkWftPJLLvSLA7+k=; h=DKIM-Signature:DKIM-Signature:From:To:Subject:Date:Message-ID: MIME-Version; b=JH0PYVqH1ZkbIefp1Vu1HcegwYjaq30bG43uAL9vOyI//6HBk5cH5+L3CnDHzqU9WyJOFjfiP8BOpqGjNiXzLzmxmDcsKH1BqYcSeoOt/rzHtDciGR0F1g/ry3gGKWtOUOwBgjik09+DVdiGJoKGatyyRpV9tXiqlA1Mk/Reos4= ARC-Authentication-Results: i=2; server2.sourceware.org Received: from pps.filterd (m0246627.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 3ATFnmu3002593 for ; Wed, 29 Nov 2023 18:36:45 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : cc : subject : date : message-id : content-transfer-encoding : content-type : mime-version; s=corp-2023-11-20; bh=ueWbTKFRPUBhtCGCic7V6R4+uwGrEG0NpyWdQDkCnsA=; b=TB9hMI9fEbS6tRyLHdMoQaiSJHhNOpRTE+cx/brNYJ3HGI/YZWFi3gPVm4CtuRNzwtgZ oY83a2Tf7nBLXDifItRsL2G07iAhogTJgEZcu6kWSJ3aJLRxNn7ffBT8MJLKJSmjomNO n+d5obiYk2cL58D/fq6IdPWOtawav7rSz9IFtPJA/AaNuAAkxB1xBAoOVKSXkUAMQULQ MPfqnzCgoaBGleyZaY/u4TBDX9Iu1fFf84BmmhISPDxe37NPz7Zb9xtne9aB5cIjMTzg C1pNHVERrSQEgV5iDUsTkHs3DcvQGNOkNoH7VQV8UqFfmHR/l2HoJYwJIUtogTjk9838 3w== Received: from iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta01.appoci.oracle.com [130.35.100.223]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3uk7h2sgc7-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Wed, 29 Nov 2023 18:36:44 +0000 Received: from pps.filterd (iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com [127.0.0.1]) by iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com (8.17.1.19/8.17.1.19) with ESMTP id 3ATHmPj4027002 for ; Wed, 29 Nov 2023 18:36:43 GMT Received: from nam12-bn8-obe.outbound.protection.outlook.com (mail-bn8nam12lp2168.outbound.protection.outlook.com [104.47.55.168]) by iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTPS id 3uk7cfaafr-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Wed, 29 Nov 2023 18:36:43 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=VePVeA27T7uKv59Cqvp5VViBeUtFvJVqRvMAb+82ROrNAGnKuwXY13IN1eQNzJ1+oWIO5iz1Qx8TnjZ5g7qOKxYCrZNvunjvuAMnq15IrAw73hm9t0FkufLQyVNpLyIGHKUpMbPR0krKEP+5YdgsJxYQg1yn2zTw4O1ASGJADZsWIEZGDNIcf5OfrzUe66MfYeX6KEV9ER5ToJ7t2Aye5YiUUeNJYiWG7O7QBKBiXGJweA7LOI/Pe7GdOLux0hVfp4LSb6j4i5jL+iVMLmc4YaJNcwiVjN0/8dg84mveI1krZODYRNZu02uXofzjDyj72HllWjaGwjo3KZBVojLtXQ== 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=ueWbTKFRPUBhtCGCic7V6R4+uwGrEG0NpyWdQDkCnsA=; b=lENIkxBC+km14b/vEt4GUeF9dfZ5C2tYe73Hux19gvHmKFZS73BBaK53SBGTZQ6TnEjzgFjXHryVoR6fcYejCAs7oonbPER+732dxMO04G+Xmim+THDIXz/+fJ16WMevA9EQB+rDMHblLJHR+BNIHjptSwz5YZ1VRtL9Mdvpzbm65/c6Uty8LtQaPjNq9N8pux99hr3P/XUOcPQ5TFIYOU+iUVjrAmnEourZk9F/42Q+s+8tyf49LpNvksdBypvOtW8X/Go0i3k7WqKGfQqOvbgJVQm8tXr7ypgd/817Nu9JkvYHcc4LrzztebEmLv940yNbq4r1AV6Zzf6zAQj1bw== 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=ueWbTKFRPUBhtCGCic7V6R4+uwGrEG0NpyWdQDkCnsA=; b=OMr0XZ7KKvPF1SlbeE4n5c1bSo9/c/yWbmSO+ACm+zXggGga+VpKZM6YW5hqD7RRiTFKqrlsO7UzKyIqFPstoj56M5J2KV7fjBd/1AOpN/7pkBCRlKNVlgn7K4OcrSejsh7IdQdOJ7E18ukSBW3MRkKTaOvq37bxAXwzYVd2kV8= Received: from MN2PR10MB3213.namprd10.prod.outlook.com (2603:10b6:208:131::33) by DS0PR10MB6845.namprd10.prod.outlook.com (2603:10b6:8:13e::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7025.29; Wed, 29 Nov 2023 18:36:41 +0000 Received: from MN2PR10MB3213.namprd10.prod.outlook.com ([fe80::d8:db85:8025:ed64]) by MN2PR10MB3213.namprd10.prod.outlook.com ([fe80::d8:db85:8025:ed64%7]) with mapi id 15.20.7025.022; Wed, 29 Nov 2023 18:36:41 +0000 From: David Faust To: gcc-patches@gcc.gnu.org Cc: jose.marchesi@oracle.com Subject: [PATCH] bpf: change ASM_COMMENT_START to '#' Date: Wed, 29 Nov 2023 10:36:37 -0800 Message-ID: <20231129183637.9544-1-david.faust@oracle.com> X-Mailer: git-send-email 2.41.0 X-ClientProxiedBy: MN2PR16CA0065.namprd16.prod.outlook.com (2603:10b6:208:234::34) To MN2PR10MB3213.namprd10.prod.outlook.com (2603:10b6:208:131::33) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: MN2PR10MB3213:EE_|DS0PR10MB6845:EE_ X-MS-Office365-Filtering-Correlation-Id: 1f660f29-bf7f-4e9e-bec8-08dbf10a2143 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: gPeIdax8wWxWOKaAsJaTEYiPxWVddv2e52t9FFhxAtxyo2ZEyp9UePMdHgzd+pIjWGrKZZoExb6CCWUki2C6vsYwqs6W8QUMTrJQa4gDs95GkbaAj8sQXnVyse2QDwcDeF2+dm83wR3MQQ75j5xsusA0yxU++nTcyscRPtvMEHwZ/vLiUsNSfKYCUPOIAfO6HmWlrVvAEzIM/wD5QkeyqGCoioPxI07FF18kOj379UFXSmktoewQ7FBH3toUmd5END7Tm5+ZWkuo/ceWXIxesZICYQThLKnS+M/937gZa7SEFuab0+N6jzpBDtFyFy9/Oay10bTFBNnByNa0M7iFkOt6U6nymm83JRG5BxBps0kAILE+m+Uu+pqmmx8QJQ5eFuY+z0At47A2UuFiWLpdT/+pcBK8WZJpXLMeJ2dBYTVt3/sAG9lS7C0lc8SGixk+MbOU1x9IJOeH8tBBP0w92JH5OxjfsTS5Oh4OH2hezEpttrIjSGgueTU5V428jKFDd+WKHuItB262ROonnm0fmwIGbH4nMpwxXdzYt3EAa0c= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:MN2PR10MB3213.namprd10.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230031)(39860400002)(346002)(366004)(376002)(136003)(396003)(230922051799003)(64100799003)(186009)(451199024)(1800799012)(107886003)(1076003)(2616005)(26005)(6666004)(8676002)(4326008)(8936002)(5660300002)(6512007)(478600001)(966005)(66556008)(6916009)(66476007)(316002)(6486002)(86362001)(66946007)(44832011)(38100700002)(83380400001)(6506007)(36756003)(41300700001)(2906002)(84970400001); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: YIc4HoqLbQTJVMq1sQuHcinOSQhlnhtaDHwW9KUfXleJDWTy3VP4Ts1cVvEHysBDV80itfa3nmIl5kl0e7IsCzp8PApFJsnSWV5edZMV0G4cudZD/NRIf8ouvjwT7m+Vwm+xKrO9OsSWJhQt3nCO+yxVd53HHoGOSXR14qKXZxMIQiGon6tgl++Zl4cx7EyIudoVjI7fECoK5Gklwzjt8Tg3EiXO8EMaAeklXCpytr5LBxj6KYIIPQx74pVJTB7ZeUS86uBcnUzJELMgeKpkW0b5lMK5h5X6a+3irEurYatVbAAIx/mYcSUXZfWvkss9NX4rup+QjMkWxF/FVn/d19Q1ztVVqnKn0vq0df55lj6UUydUh0XudTBp4j/HkKOL3fRhQa9UWrKnkVZdCfWPQffV6sAeF+pjq7gkchAfrMshuab+wY6mJq9FmktGACeWtUKFuo3ghKG8NGSLOz2LJW3Hwwf2z/QB4BI0AXjMH59dDzItMxLhgZUYNq6R2JdKIG7IGeBvFrGDLhFw4q7fEMMZkDXGAgSp+FsxHCztG8rGxW6t94YgGHPaceU19sseq96mkzmP7rbKh2S/36MEY1lhwgXeUP1/rP6WUlfi8ICq/UOn56xGGTHEcROD/An6bWd5bw+VK+Q+aRbPQILFXBUvqVAtlstpDHDuFE31aHWbA6jDbG6Dt0MNymjZDPNp6H/Hs5brhSAKHWwEVQEoQz6ffAdUWW9j5Rhkv5A9UFGNgiEO9lpPid3BHVekCM1yPGKzE28riKQf3ZhClxUL9ILS2WWcinVlQ6IXuwHZux28f09GTFKe/YS0hfO5wdvgEzTS3FpTq15gy4AMQ6O+Emh5UeKszr9G9n039Ely6zy1GuM0f7HV0Js4kVbfTQsbPsp7Vr+5li73CnXC79zIpelTz+ySviXWC2WI2GsyazRe2nNA5WBjmSvYAzB3gtzmk5fekA7wd06CTQCkAuvZiVNs62aSDPy646h2KnkhGFcMM2Vpfvw5I+KjiHX1tPr5+U6GmmCqjRhZIFNo+tYemBa1UZ2q+i9XhYPzuC0xY4vz+CnVVeV2YfdOsSACA7SRfmxjUHXZq+3ohsJYVkAEwZhgaf6UqhlIWh4Cv4Pwux4qC8vPRLdaxvarEj3XHmJZ0x5ssIYElj3/yvYFihuXUFuUgA1aVgW3CB+9Zmy+px90pZxijF4kex/hpviPk/VF9mjFw27h00N3OHxeRmEiO6bygqGeEdgKGWbyJgCJgJEKAstkbgZ8EMe25/UHQSIcc8mjJOU5BYMkppyhubSlmbaO2EXCTTMOJ6ET6KzCJgqDg5RV4F4SY4m6vMF4RF+wO3lflT6FAEMEnjenPzJDhwhfPt8hhrhqPruTMZAOQBYgvot4Z7gyFQQ2b4yvsOEcX8xiqfG6ZoQrKvxdU1IozUEjcAvqfgyyxlgo2jk5n6nzYl5zY8Btdr5l1Q5QxcBqRESd4Hz49OpIQK6ny4Gc86rA6LSwF9ccPCJ6aEIQ3dVi3e7RRp0g90tewO+/0T4aTuQiub/IgDzIMF3mv2LxHVUwZSG6rx8nm0iW4q6Yk5fgNoEhCl/X/E6cuesrk+CA X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: CTQ3IgUSCuJ08MZDuH5XF6JxdurQhhVIhHxD4K9KpfPxqTxLSE67PzkNOd4qA5g6x6UaHUSco3GDcqPB0LjgB+5PZyGCOZDzCGzs27kYLVu8v7K1oDpoldmr5ZVkqQWG/uPjhab+ML/vYSHu8aCb9jnuDIAqqZH/l2JcblFVB7FEzzKODyEtm7Tphuv5hvPuTC/8gqIWj8p/XtQFvBfqKM3CI1GvkTIykafeV4zPZ01cnnNrO5FBIop3B2qmBnehU1Vdid1lpxKXxqjrjLssIUUK8kdUjUelZvOwLngbXQaBvRZklOTLKUDDWMhAz2StSk9nDeze5/HOJyrWkFnsA4Gy6mXeANgpxf4G0bSj1ap/rZey7hovMV6bXoAQJr7ImalYNbvTqkhrihLi08SccjiJe2H5A+Zo0t4tJ7fnFAv7A6I1eMeUtwwWnEdgnoCKUzkSp81qrq+HH8ym/e9qVjvI5G3CvGiL6TP77+1zACB7wGH6Nm5w6fLJNjFYIAvpw1RM7/D8qjgvbeKJJKOJHmGunSCwrVWRabzjlEbs+bRw8ApI5Id0gWYUkA7W3TYMF04cOCxHhHDyep106kdqzxEDnaVKFA//mpExfirBHa/5S3P3Mjte95EZsT0wj8NiOTkjXg5/VO2JDtO0Y4hDYepFXLFFs80wg4RHWFGny7B2NOcSZ9vviqQzybJi1BvOo4YOsDzBnJVu/6rAcY9mNVlXjCBcd1q66POd2bpQ/96adZzTdjKrXoA0V8WMPLBw X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 1f660f29-bf7f-4e9e-bec8-08dbf10a2143 X-MS-Exchange-CrossTenant-AuthSource: MN2PR10MB3213.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Nov 2023 18:36:41.4464 (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: 26x+Ek60eqmK12pvZabs5k6eN2S7z6RXue8iTKisjrDIHVoOkKANShDtxAH/MTAZD1l9VKb4WvK/ueDTJoyicw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS0PR10MB6845 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.272,Aquarius:18.0.997,Hydra:6.0.619,FMLib:17.11.176.26 definitions=2023-11-29_16,2023-11-29_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 bulkscore=0 malwarescore=0 suspectscore=0 spamscore=0 mlxlogscore=999 mlxscore=0 phishscore=0 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2311060000 definitions=main-2311290141 X-Proofpoint-GUID: vnIIxg2Z-58jWSCN0D7RkNAqhTu2dTTk X-Proofpoint-ORIG-GUID: vnIIxg2Z-58jWSCN0D7RkNAqhTu2dTTk X-Spam-Status: No, score=-13.3 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_H5, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_NONE, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gcc-patches-bounces+patchwork=sourceware.org@gcc.gnu.org The BPF "pseudo-C" assembly dialect uses semi-colon (;) to separate statements, not to begin line comments. The GNU assembler was recently changed accordingly: https://sourceware.org/pipermail/binutils/2023-November/130867.html This patch adapts the BPF backend in GCC accordingly, to use a hash (#) instead of semi-colon (;) for ASM_COMMENT_START. This is supported already in clang. Tested on x86_64-linux-gnu host for bpf-unknown-none target. gcc/ * config/bpf/bpf.h (ASM_COMMENT_START): Change from ';' to '#'. gcc/testsuite/ * gcc.target/bpf/core-builtin-enumvalue-opt.c: Change dg-final scans to not assume a specific comment character. * gcc.target/bpf/core-builtin-enumvalue.c: Likewise. * gcc.target/bpf/core-builtin-type-based.c: Likewise. * gcc.target/bpf/core-builtin-type-id.c: Likewise. --- gcc/config/bpf/bpf.h | 2 +- .../gcc.target/bpf/core-builtin-enumvalue-opt.c | 8 ++++---- .../gcc.target/bpf/core-builtin-enumvalue.c | 12 ++++++------ .../gcc.target/bpf/core-builtin-type-based.c | 8 ++++---- gcc/testsuite/gcc.target/bpf/core-builtin-type-id.c | 6 +++--- 5 files changed, 18 insertions(+), 18 deletions(-) diff --git a/gcc/config/bpf/bpf.h b/gcc/config/bpf/bpf.h index 1f177ec4c4e..d175e99046c 100644 --- a/gcc/config/bpf/bpf.h +++ b/gcc/config/bpf/bpf.h @@ -393,7 +393,7 @@ enum reg_class /*** The Overall Framework of an Assembler File. */ -#define ASM_COMMENT_START ";" +#define ASM_COMMENT_START "#" /* Output to assembler file text saying following lines may contain character constants, extra white space, comments, etc. */ diff --git a/gcc/testsuite/gcc.target/bpf/core-builtin-enumvalue-opt.c b/gcc/testsuite/gcc.target/bpf/core-builtin-enumvalue-opt.c index c87e1a3ba3b..fc3c299fe9c 100644 --- a/gcc/testsuite/gcc.target/bpf/core-builtin-enumvalue-opt.c +++ b/gcc/testsuite/gcc.target/bpf/core-builtin-enumvalue-opt.c @@ -26,10 +26,10 @@ unsigned long foo(void *data) return 0; } -/* { dg-final { scan-assembler-times "\t.4byte\t0x\[0-9a-f\]+\t; bpfcr_type \\(named_ue64\\)" 2 } } */ -/* { dg-final { scan-assembler-times "\t.4byte\t0x\[0-9a-f\]+\t; bpfcr_type \\(named_se64\\)" 2} } */ -/* { dg-final { scan-assembler-times "\t.4byte\t0xa\t; bpfcr_kind" 2 } } BPF_ENUMVAL_EXISTS */ -/* { dg-final { scan-assembler-times "\t.4byte\t0xb\t; bpfcr_kind" 2 } } BPF_ENUMVAL_VALUE */ +/* { dg-final { scan-assembler-times "bpfcr_type \\(named_ue64\\)" 2 } } */ +/* { dg-final { scan-assembler-times "bpfcr_type \\(named_se64\\)" 2} } */ +/* { dg-final { scan-assembler-times "0xa\[\t \]+\[^\n\]*bpfcr_kind" 2 } } BPF_ENUMVAL_EXISTS */ +/* { dg-final { scan-assembler-times "0xb\[\t \]+\[^\n\]*bpfcr_kind" 2 } } BPF_ENUMVAL_VALUE */ /* { dg-final { scan-assembler-times "bpfcr_astr_off \\(\"0\"\\)" 4 } } */ diff --git a/gcc/testsuite/gcc.target/bpf/core-builtin-enumvalue.c b/gcc/testsuite/gcc.target/bpf/core-builtin-enumvalue.c index 2f16903b8d6..23dfd8a10bf 100644 --- a/gcc/testsuite/gcc.target/bpf/core-builtin-enumvalue.c +++ b/gcc/testsuite/gcc.target/bpf/core-builtin-enumvalue.c @@ -40,12 +40,12 @@ int foo(void *data) return 0; } -/* { dg-final { scan-assembler-times "\t.4byte\t0x\[0-9a-f\]+\t; bpfcr_type \\(named_ue64\\)" 5 } } */ -/* { dg-final { scan-assembler-times "\t.4byte\t0x\[0-9a-f\]+\t; bpfcr_type \\(named_se64\\)" 5} } */ -/* { dg-final { scan-assembler-times "\t.4byte\t0x\[0-9a-f\]+\t; bpfcr_type \\(named_ue\\)" 5 } } */ -/* { dg-final { scan-assembler-times "\t.4byte\t0x\[0-9a-f\]+\t; bpfcr_type \\(named_se\\)" 5} } */ -/* { dg-final { scan-assembler-times "\t.4byte\t0xa\t; bpfcr_kind" 12 } } BPF_ENUMVAL_EXISTS */ -/* { dg-final { scan-assembler-times "\t.4byte\t0xb\t; bpfcr_kind" 8 } } BPF_ENUMVAL_VALUE */ +/* { dg-final { scan-assembler-times "bpfcr_type \\(named_ue64\\)" 5 } } */ +/* { dg-final { scan-assembler-times "bpfcr_type \\(named_se64\\)" 5} } */ +/* { dg-final { scan-assembler-times "bpfcr_type \\(named_ue\\)" 5 } } */ +/* { dg-final { scan-assembler-times "bpfcr_type \\(named_se\\)" 5} } */ +/* { dg-final { scan-assembler-times "0xa\[\t \]+\[^\n\]*bpfcr_kind" 12 } } BPF_ENUMVAL_EXISTS */ +/* { dg-final { scan-assembler-times "0xb\[\t \]+\[^\n\]*bpfcr_kind" 8 } } BPF_ENUMVAL_VALUE */ /* { dg-final { scan-assembler-times "bpfcr_astr_off \\(\"0\"\\)" 8 } } */ /* { dg-final { scan-assembler-times "bpfcr_astr_off \\(\"1\"\\)" 8 } } */ diff --git a/gcc/testsuite/gcc.target/bpf/core-builtin-type-based.c b/gcc/testsuite/gcc.target/bpf/core-builtin-type-based.c index 16b48ae0a00..74a8d5a14d9 100644 --- a/gcc/testsuite/gcc.target/bpf/core-builtin-type-based.c +++ b/gcc/testsuite/gcc.target/bpf/core-builtin-type-based.c @@ -52,7 +52,7 @@ int foo(void *data) return 0; } -/* { dg-final { scan-assembler-times "\t.4byte\t0x0\t; bpfcr_type" 0 } } */ -/* { dg-final { scan-assembler-times "\t.4byte\t0x8\t; bpfcr_kind" 13 } } BPF_TYPE_EXISTS */ -/* { dg-final { scan-assembler-times "\t.4byte\t0x9\t; bpfcr_kind" 11 } } BPF_TYPE_SIZE */ -/* { dg-final { scan-assembler-times "\t.4byte\t0xc\t; bpfcr_kind" 13 } } BPF_TYPE_MATCHES */ +/* { dg-final { scan-assembler-times "0x0\[\t \]+\[^\n\]*bpfcr_type" 0 } } */ +/* { dg-final { scan-assembler-times "0x8\[\t \]+\[^\n\]*bpfcr_kind" 13 } } BPF_TYPE_EXISTS */ +/* { dg-final { scan-assembler-times "0x9\[\t \]+\[^\n\]*bpfcr_kind" 11 } } BPF_TYPE_SIZE */ +/* { dg-final { scan-assembler-times "0xc\[\t \]+\[^\n\]*bpfcr_kind" 13 } } BPF_TYPE_MATCHES */ diff --git a/gcc/testsuite/gcc.target/bpf/core-builtin-type-id.c b/gcc/testsuite/gcc.target/bpf/core-builtin-type-id.c index 615bbc85a22..4b23288eac0 100644 --- a/gcc/testsuite/gcc.target/bpf/core-builtin-type-id.c +++ b/gcc/testsuite/gcc.target/bpf/core-builtin-type-id.c @@ -35,6 +35,6 @@ int foo(void *data) return 0; } -/* { dg-final { scan-assembler-times "\t.4byte\t0\t; bpfcr_type" 0 { xfail *-*-* } } } */ -/* { dg-final { scan-assembler-times "\t.4byte\t0x6\t; bpfcr_kind" 13 } } BPF_TYPE_ID_LOCAL */ -/* { dg-final { scan-assembler-times "\t.4byte\t0x7\t; bpfcr_kind" 7 } } BPF_TYPE_ID_TARGET */ +/* { dg-final { scan-assembler-times "0\[\t \]+\[^\n\]*bpfcr_type" 0 { xfail *-*-* } } } */ +/* { dg-final { scan-assembler-times "0x6\[\t \]+\[^\n\]*bpfcr_kind" 13 } } BPF_TYPE_ID_LOCAL */ +/* { dg-final { scan-assembler-times "0x7\[\t \]+\[^\n\]*bpfcr_kind" 7 } } BPF_TYPE_ID_TARGET */