From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mx0a-00069f02.pphosted.com (mx0a-00069f02.pphosted.com [205.220.165.32]) by sourceware.org (Postfix) with ESMTPS id D53593858291 for ; Wed, 20 Mar 2024 20:32:07 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org D53593858291 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 D53593858291 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=1710966729; cv=pass; b=wsdfIyF6IgFFYMEaRfgJ+gl8p9xmnhxfsP0dpohOLKqfrUA+UZ8Uoe5+/AHXgeg/vsKfdtQJaqGK5kYSHFAqEyzDG1+KfRXXfWUMhY6LUrmIouhrufhCPQucsb4R62zqZqn/gFkKvAiTe9tcAMvwh8KxKAJk7x8yr9ZacWs2qJ8= ARC-Message-Signature: i=2; a=rsa-sha256; d=sourceware.org; s=key; t=1710966729; c=relaxed/simple; bh=P+5h1rRNGigJP2tyy5EPeSADaYX16yfkFuUEb87FJys=; h=DKIM-Signature:DKIM-Signature:From:To:Subject:Date:Message-ID: MIME-Version; b=K5yQ23Fc3ShVa8nh9ACmTg29mRmFYBnoTimo9aKWHLJUXqSCnveu+wO+oTlX3vwqPjO3+HhFLCkuFZioawJbBluuAPCDgN4fxTOHck0KB//tOa9qiwtoETbtzStZ3EpNO7i6CfCd2KaBfpQU9rpv/rpzDdquUgKoYRUJRHQouv4= ARC-Authentication-Results: i=2; server2.sourceware.org Received: from pps.filterd (m0246617.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 42KITG8r017539 for ; Wed, 20 Mar 2024 20:32:07 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=references : from : to : cc : subject : in-reply-to : date : message-id : content-type : mime-version; s=corp-2023-11-20; bh=dazBydJdHODGtNfgSg/+yCjmUEW82ylVOl7IzBlKlQk=; b=DQZhjcuEcc23ABHljJT1910XeoewxZLCgoCszNEABXzlGr2RtlrHUS4LOGhE01JyOkTP Ajb+ylB7Gd94phs+xPAyihFDa+C7vH/LJAMP1hBn+O2pL6K8yyH7n/gLZeRkbCqMh7A8 JGXR5LVfT2SqSULBXEFkd9hERmLE0j++Oqbiu9RnWtMLDZJBjtQwDUHFwm0ozodpyG50 OO93Alb75xtatU4Yilv1+gR4wLH1vu1y10Q9UYNTUdtil1u4e3jXvSGNIDZNqQwKJ5rW szui6X8ANIMarvrRCe1jBRaHIQEKeT7EHd0qtFECb9oSc2QjBac5wIyTPbSkB+vJ6wY8 Xw== Received: from phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta02.appoci.oracle.com [147.154.114.232]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3ww3yu9037-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Wed, 20 Mar 2024 20:32:06 +0000 Received: from pps.filterd (phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com [127.0.0.1]) by phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com (8.17.1.19/8.17.1.19) with ESMTP id 42KIouWN021834 for ; Wed, 20 Mar 2024 20:32:06 GMT Received: from nam10-bn7-obe.outbound.protection.outlook.com (mail-bn7nam10lp2100.outbound.protection.outlook.com [104.47.70.100]) by phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTPS id 3ww1v89kxe-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Wed, 20 Mar 2024 20:32:06 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=neQ3h0AA57qRcJ9Nw5lnkCcsn/wuCVzdc4oa16wpwqjds1mPSVG2bYw3gmTcrmWV6jXNywmv1VULEiWtwqLCy432AK20ekuxb7qIfpBzue2SEsXm0Lifja2HCPq4lHjaH26pWzuvp2yJH4x7p6Qzg2/dm/ADe/fVRxrvBDObz8VrwNZ7kTVWVzilaaWzDIX9uQVO8FL7ZGa3XAqe5ayR4zPBNhsv7cEsiZWgNYVD5V4dyTCPbWa9S/dX9XF1ADhAYZvU7bSGuFt0IeGmT4crxPaYblAzVBfBLVidmYVCW67HMM7OUEamMV2MZTKbkZ0Dv3Z+Of9PqR1kWzDdyR46Qg== 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=dazBydJdHODGtNfgSg/+yCjmUEW82ylVOl7IzBlKlQk=; b=gMq2UZQE4BHsew6CgyYcjQnHAHSwxSDL3kQTkfv5e+5J5WQN/UYWGZz1H3JcR4X58tUSb2gZPN3S/X9GjwZlqjfSOvx8C7q3MUqAYJ7mYnk0bpkomj9TXcFPjQACoXOnGp1yc4MsmTbqAw5XhdXrsKP3eJEuUIkIyYynzk9IHt3ed7hilNl6Rc0krI39zzEHjww/wWoAzAsccbENRsE8vlpU8+pjs7Z6oLdJZN85jZztmPTkX0m5+Es9Q2/6oERAOQgGvV7eDZ7jxXOmE+zXUg0s8ha9Rd16cDaTBBkBoYIHgeb0fPqXBT9+uVZsLlqsXq/Zt9f3pP/YB9NuIUu7QA== 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=dazBydJdHODGtNfgSg/+yCjmUEW82ylVOl7IzBlKlQk=; b=zIq+Qqi510IJWgQJyFI02qBgKbT7OgRgjqZVuBlrXhR9n9pwcJfH5h5IBPo0wG8GPcXTmhSlvZuXls7OUBvbhpQXb9IScXWKUdlE/MrMgLBnq0sQ5K7j+sRFxMCqucLf+k0C+G0jyamEF3z43WpmiRCsUyGVrcGQY+lXh93WldM= Received: from MN2PR10MB4382.namprd10.prod.outlook.com (2603:10b6:208:1d7::13) by SJ2PR10MB7059.namprd10.prod.outlook.com (2603:10b6:a03:4d2::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7386.30; Wed, 20 Mar 2024 20:32:02 +0000 Received: from MN2PR10MB4382.namprd10.prod.outlook.com ([fe80::8aee:c094:84e2:9401]) by MN2PR10MB4382.namprd10.prod.outlook.com ([fe80::8aee:c094:84e2:9401%5]) with mapi id 15.20.7386.030; Wed, 20 Mar 2024 20:32:02 +0000 References: <20240313142441.180242-1-cupertino.miranda@oracle.com> <20240313142441.180242-2-cupertino.miranda@oracle.com> User-agent: mu4e 1.4.15; emacs 28.1 From: Cupertino Miranda To: David Faust Cc: gcc-patches@gcc.gnu.org, jose.marchesi@oracle.com, elena.zannoni@oracle.com Subject: Re: [PATCH 2/3] bpf: Fix access string default for CO-RE type based relocations In-reply-to: Date: Wed, 20 Mar 2024 20:31:57 +0000 Message-ID: <87wmpwfxvm.fsf@oracle.com> Content-Type: text/plain X-ClientProxiedBy: LO4P123CA0604.GBRP123.PROD.OUTLOOK.COM (2603:10a6:600:314::13) To MN2PR10MB4382.namprd10.prod.outlook.com (2603:10b6:208:1d7::13) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: MN2PR10MB4382:EE_|SJ2PR10MB7059:EE_ X-MS-Office365-Filtering-Correlation-Id: 6bfb3af5-465d-4383-e420-08dc491ccca6 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 1BkWweCs+u3RdfINvFt1q2QMaxBoYiCyH9g9WOkx1cEy25+5OL4VG42odZXoO16LIEBiQEgQNHE2+YuIvMiW5dB3kgZLaQLVo9ciRBxj5Sjcosci93iTqMgII5nzlnPTKlUYh4iqogW+5YnrWq0TqrxJ+Uq/M4WFdyuJT5910ngT4zjZ2mbct/C/HZvYyYCaOP7EFVsauHcOUMT6dcxq3m5upFCXuGSvJW4ToiCIMrvLkgb36rQHaIYPXAYnij1hEhplpFP5uUE9uwW/ffdnD2NaRHMdaFsm0CQgFondWpfdSXwnOq8p252IBYK2101ERikuKVsP3remX/vvy0dnhu7x0/GCE2sLrjCgz7rCcVuviNi9cuJyTNQn3ae4dGWShYStSEhqPXkEUyA6U3QDm8yPoHPGJvADhvmI5US1AZS82KPZEBbs16iRJZCKQULqUJjJdSKXzFzMENKy5clez02V41ya+RaEiP0B/+wVFPXTlvL5Saf4PdOzsJjUOrlGZKa5/slYd/aHLkwTscs+WKAFoOOy2tmqETd03sqbhKKBsCkVKvJqeS5Th0/y/Q2UJdjrjAdcIBzzAmcj7VLucnmpuR7a2wu8xSaA9xIHhuo= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:MN2PR10MB4382.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230031)(366007)(376005)(1800799015);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?5ekVUJ/ucYw37fNMtUe1P6eISdyKqXYS4M5Nw/ZLUfgOdUCOcxI8l41T63Ot?= =?us-ascii?Q?kr3dXIf2T1+MSNQZ6vej5OkcVI/WaA+0tYf++RHtjx6uq9OtQpFfrmS2XPmX?= =?us-ascii?Q?UeyCcz5IuFy8B3pnYa+DttvnZ7BESzSa6CafjBl9rmJLzNxnZLi40heIXIpL?= =?us-ascii?Q?ds38+4rq3iC5uDHaUHLSpAGqHE4HrARsR2Cm6p6sx8aX9L5/sY69e3VdMp8K?= =?us-ascii?Q?kTGKkCauMxZ5b+X+nU5s84ob/B7UKgZzmlheCAanpavhDVdHK3NYbZEaDT8z?= =?us-ascii?Q?044uP7ECTvLcidlIULEbU4hLfW7AObf6RbDnPh12NYwcscKiNouwjseX2L4x?= =?us-ascii?Q?C/kLQn3pJ+RLtN9aWU5Z/B1VT8RDZ0j6t56MMZgvW+Tb6kdi80YK46FSaAV8?= =?us-ascii?Q?PJ7D/jgdJIU8MXZuaqUhwMYPLyooI8Fk7CjGkqfrCPKgl3W04KqIYIEpAeOV?= =?us-ascii?Q?p0oK2IGQl5ErT9T1qL0/OdGvDE4ySl07wfR52CqlndaZhyvr8kCDhI02Hmdo?= =?us-ascii?Q?hs7Jpv9kGIWKPSDF9hzIY4gFJvi5u+Da0PFpb71it771SuHd4+aFxFGePrBe?= =?us-ascii?Q?qURvY87RRbrubgVXlgAMo/jmT71hrKOQPLITJAaoBMPsdZ6eG4jCps4NPxse?= =?us-ascii?Q?G+1CuskSjeJmCG1v+Y7i2EHhlckzv3VrwAd76VNGNt/b/viqtD9D5PXlMQWj?= =?us-ascii?Q?LdJx09mjfv1K9DIo9rMzkUkWSpPK+2DyGIiHJ6KSvrXxJW4/HugEEDVLxhIK?= =?us-ascii?Q?5nwZM1dl1qvQ8vhI74C8QpleEawmTgnuOZJZiQ5vOPRUK/UPNaiCq314toF3?= =?us-ascii?Q?xg80LrwxQvxG45+ruwa5YQkAISYGj78+oMI5tLvFvnuLU54fu8QjqSBREQ8C?= =?us-ascii?Q?j7lOLyek74goFE9RVhx/EhKXn2CbrIha8rBgc8+BT1itqq3TG4g87Hd4ltS9?= =?us-ascii?Q?7GEkshDmTdhPWT726J3hqPLsKGjafBWdrXRi3O2kkvF24gtvqFY3vBEq6FAa?= =?us-ascii?Q?ncLKBFzNGdw2VyIYdE/DGGB+aVGhxJ9t8Zz1FOa0pg00SwmWCSRifUzgEc5m?= =?us-ascii?Q?4YdF+HmW67FN6Ku06ExCiDnmLS2MRvIrYob3qPH9gPgwoPG3nY7P9qnyLHA/?= =?us-ascii?Q?qOtkkh0524Kdl+mNBIw0EmXPN2UTMIE8+GMuvmy1KfXpFTtMkv61FvUToet+?= =?us-ascii?Q?5wTCU46cAYli5ADKJt77x8pBvNGBI1/w/QHAKVE6Pf8X6qOnVudzIKGC9zdo?= =?us-ascii?Q?u3gdZoRNG0BKbfH0oNKdkdIyr7JypHnPacOtwTCDM3GBMTNMvT7xRFTqmJK/?= =?us-ascii?Q?TzBQ4MihgI/4toG1JKrwY8vtfTc8IJ5XfIyiFcEZURt2WuZWirAgtVFJ1lTr?= =?us-ascii?Q?bxaBYX+MP+8BweJ57Kopy44Ao94OOWErP11Wd7/PSK8jew7eYTx1ktuPmSiA?= =?us-ascii?Q?ZImVUjtHfPPc8wIXWgCd65aYY5YalUwqNbsJ1f0CshStWH62vSsCg+atSuBM?= =?us-ascii?Q?q2pJFcgzno6lG8WECDUG0SJHwyzT/kwXlYn7qNVZGr6Un5MRyyj+HZUXomnV?= =?us-ascii?Q?K4UWGwnWHlcis63tukj1cUd7jQ1rMNOd5KYWsC1Jy8d1nH5XJM1awpHXFLAq?= =?us-ascii?Q?GZsY6GpnEULK4yK3z7yZVig=3D?= X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: E0us9X1wDCqbw9OgY6x4BkcULFBNxlktquG21nzYD1gewFWR8HGoGckqjNxhiWPhsPtT0JqiJauTwLd1MsDSSy5P5/iVKZsMQOOm5oghWlDIrf4U7Kc4PBbwepQDZLMys7d6V+QjxOlAnv+xFPMeRZgg3YKP/vWKjf3Tpsh8zQTrVcwHDR6W9wgCpFhj2dui/0UP4jr/E6+BxA0wNnuV/r1umnxzoiDeOtKCefkMnUv3GW8/cw1cL5GKCLKxpyOGdR94LiR9dYvPuRP+sfTLFTZPOw1iDnfmm/FRWOjPLO8qI4/Rx4qFA2mFr2K5OLJgRfR7rqVwzKl6XC6bezqWhY9nPRlGrWL0jblYfsc766NvTp2DZcp8bI8vvfkiNYWvYESm37WKJSPC0Bt9f030Ue/oo2Q9IWamI2Jc6kCIOt65zmow5Bz2Sj1DiauMZ71g+HZtnT62ffXBXSTC1Wrt8ciDF/A+KDu3HQCqHrdqWVd7jQwsBapi3hMogfgf4JW8bzgaUcioQw3cFYt0MMao90XmV4fGJsFSvzds01CUkpcri8utnOj1XZ79yOFo9iduTxWW78Y+WB/3FoLSK8yZs1Trj70DDGMY6xxXslTW4uE= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 6bfb3af5-465d-4383-e420-08dc491ccca6 X-MS-Exchange-CrossTenant-AuthSource: MN2PR10MB4382.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Mar 2024 20:32:02.3190 (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: d58WKv+FHdCQkI7AZUMEVvsMPmv4G/f0RZwIeERsitjVx1Sw0Lw0g9s9W/G+2ACntir2yN8mqwU8Fvm32DorQhJNDmC90bbxbhtkgVYvTMo= X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ2PR10MB7059 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-03-20_10,2024-03-18_03,2023-05-22_02 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 malwarescore=0 adultscore=0 mlxscore=0 bulkscore=0 mlxlogscore=999 suspectscore=0 phishscore=0 spamscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2403140000 definitions=main-2403200163 X-Proofpoint-GUID: 61fxVUdqKPk_UfqRC5uv02OKgHV6-qwi X-Proofpoint-ORIG-GUID: 61fxVUdqKPk_UfqRC5uv02OKgHV6-qwi X-Spam-Status: No, score=-12.8 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,KAM_SHORT,RCVD_IN_MSPIKE_H4,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 List-Id: David Faust writes: > On 3/13/24 07:24, Cupertino Miranda wrote: >> Although part of all CO-RE relocation data, type based relocations do >> not require an access string. >> Initial implementation defined it as an empty string. >> On the other hand, libbpf when parsing the CO-RE relocations verifies >> that those strings would contain "0", otherwise reports an error. >> This patch makes GCC compliant with libbpf expectations. > > OK, thanks. > Pushed! Thanks >> >> gcc/Changelog: >> * config/bpf/btfext-out.cc (cpf_core_reloc_add): Correct for new code. >> Add assert to validate the string is set. >> * config/bpf/core-builtins.cc (cr_final): Make string struct >> field as const. >> (process_enum_value): Correct for field type change. >> (process_type): Set access string to "0". >> >> gcc/testsuite/ChangeLog: >> * gcc.target/bpf/core-builtin-type-based.c: Correct. >> * gcc.target/bpf/core-builtin-type-id.c: Correct. >> --- >> gcc/config/bpf/btfext-out.cc | 5 +++-- >> gcc/config/bpf/core-builtins.cc | 10 ++++++---- >> gcc/testsuite/gcc.target/bpf/core-builtin-type-based.c | 1 + >> gcc/testsuite/gcc.target/bpf/core-builtin-type-id.c | 1 + >> 4 files changed, 11 insertions(+), 6 deletions(-) >> >> diff --git a/gcc/config/bpf/btfext-out.cc b/gcc/config/bpf/btfext-out.cc >> index 57c0dc323812..ff1fd0739f1e 100644 >> --- a/gcc/config/bpf/btfext-out.cc >> +++ b/gcc/config/bpf/btfext-out.cc >> @@ -299,8 +299,9 @@ bpf_core_reloc_add (const tree type, const char * section_name, >> >> /* Buffer the access string in the auxiliary strtab. */ >> bpfcr->bpfcr_astr_off = 0; >> - if (accessor != NULL) >> - bpfcr->bpfcr_astr_off = btf_ext_add_string (accessor); >> + gcc_assert (accessor != NULL); >> + bpfcr->bpfcr_astr_off = btf_ext_add_string (accessor); >> + >> bpfcr->bpfcr_type = get_btf_id (ctf_lookup_tree_type (ctfc, type)); >> bpfcr->bpfcr_insn_label = label; >> bpfcr->bpfcr_kind = kind; >> diff --git a/gcc/config/bpf/core-builtins.cc b/gcc/config/bpf/core-builtins.cc >> index 4256fea15e49..70b14e48e6e5 100644 >> --- a/gcc/config/bpf/core-builtins.cc >> +++ b/gcc/config/bpf/core-builtins.cc >> @@ -205,7 +205,7 @@ struct cr_local >> /* Core Relocation Final data */ >> struct cr_final >> { >> - char *str; >> + const char *str; >> tree type; >> enum btf_core_reloc_kind kind; >> }; >> @@ -868,8 +868,10 @@ process_enum_value (struct cr_builtins *data) >> { >> if (TREE_VALUE (l) == expr) >> { >> - ret.str = (char *) ggc_alloc_atomic ((index / 10) + 1); >> - sprintf (ret.str, "%d", index); >> + char *tmp = (char *) ggc_alloc_atomic ((index / 10) + 1); >> + sprintf (tmp, "%d", index); >> + ret.str = (const char *) tmp; >> + >> break; >> } >> index++; >> @@ -987,7 +989,7 @@ process_type (struct cr_builtins *data) >> || data->kind == BPF_RELO_TYPE_MATCHES); >> >> struct cr_final ret; >> - ret.str = NULL; >> + ret.str = ggc_strdup ("0"); >> ret.type = data->type; >> ret.kind = data->kind; >> >> 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 74a8d5a14d9d..9d818133c084 100644 >> --- a/gcc/testsuite/gcc.target/bpf/core-builtin-type-based.c >> +++ b/gcc/testsuite/gcc.target/bpf/core-builtin-type-based.c >> @@ -56,3 +56,4 @@ int foo(void *data) >> /* { 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 */ >> +/* { dg-final { scan-assembler-times "bpfcr_astr_off \[(\"\]+0\[(\"\]+" 37 } } */ >> 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 4b23288eac08..9576b91bc940 100644 >> --- a/gcc/testsuite/gcc.target/bpf/core-builtin-type-id.c >> +++ b/gcc/testsuite/gcc.target/bpf/core-builtin-type-id.c >> @@ -38,3 +38,4 @@ int foo(void *data) >> /* { 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 */ >> +/* { dg-final { scan-assembler-times "bpfcr_astr_off \[(\"\]+0\[(\"\]+" 20 } } */