From patchwork Thu Mar 7 17:53:24 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Faust X-Patchwork-Id: 86941 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 48CA33857C41 for ; Thu, 7 Mar 2024 17:55:09 +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 98BD73857732 for ; Thu, 7 Mar 2024 17:53:19 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 98BD73857732 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 98BD73857732 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=1709834001; cv=pass; b=xHhoYANcU1ldcLA+yQLmogJZA3CNzyQdriod2K2UGO8d74zSMhRR4SKDwOCmFa0SbwL0OE1hiwEmDeei6Obbv63tEr0HBzwGNfi7EgeNUiHtAHOF6YPiptukqHLSEvhNHy/hZx/D3B7uY9BMOkuWj6DsfB/A2pE++KRVWCCmSnc= ARC-Message-Signature: i=2; a=rsa-sha256; d=sourceware.org; s=key; t=1709834001; c=relaxed/simple; bh=eGLXHkbAce0ZxKSJIeQ1pN3dS1AFhjQHMMM+pNLvQPs=; h=DKIM-Signature:DKIM-Signature:From:To:Subject:Date:Message-ID: MIME-Version; b=wFTJke0B96snRtLHemDnD5TIX9gAXieWIwEMoZFN0fqp05c9t7TZTBdZhnUdoJgLiEPEA26wcxWQ5wAUkNnaVFgziR5/sDVHmfJgmfaGOlsyAPQZuhH6OQM9nqop9JIlwBQK78et3FprKvlVIZubZwC5/gb+0KTbBcMjnsR6Irk= ARC-Authentication-Results: i=2; server2.sourceware.org Received: from pps.filterd (m0246629.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 427HQOxA026818 for ; Thu, 7 Mar 2024 17:53:18 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=EaqCChkOurW31cwxJTe7CTIE3czo4DNOb7VT1XH0Hlo=; b=AnMiO6gOQ5Efqnqtkz+yiiIXohjSCEJxsmrW3701yJyzMcs9yGEV6bnlX2I4wimvYaP6 SZM9fwflhDBSQ/GQLb/Sbxh9/li3+Kb9AnuM8kIdOkR0vbayZoOhWjZYdKQ+l8MyetG+ O6TVpOeRBfu+9wtRHesEcawUzLMUrVxJ4B/rYKR5c63HKqwQ9lKRekA5DXQwkKh8iOK5 7IT8/O52QpYBzveHKjmO5InjzyYrMNeQdAQjUqoozybVzjPMwvcRIIxFphf8NWq3vr1B +6BMm9l1kA0W0Nfuw0onTDysRW3gugt32SyY+oJFxhN3a7KYIa6DWL1YM6an7gpAVny7 mQ== Received: from phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta03.appoci.oracle.com [138.1.37.129]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3wkv0bkxw0-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Thu, 07 Mar 2024 17:53:18 +0000 Received: from pps.filterd (phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com [127.0.0.1]) by phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com (8.17.1.19/8.17.1.19) with ESMTP id 427HMSgc027625 for ; Thu, 7 Mar 2024 17:53:17 GMT Received: from nam02-dm3-obe.outbound.protection.outlook.com (mail-dm3nam02lp2040.outbound.protection.outlook.com [104.47.56.40]) by phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTPS id 3wktjc25vu-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Thu, 07 Mar 2024 17:53:17 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=PFQIQ2MaRfOwNxQI6LniJ5tgKAHfuqCLYCPeSbIPn2CCfRFAt+XrNRYXnqxKXIu5DOTGF31u5HF6f8slI5GJnNQNW5snkTbj8Y9t8Vg21hFDzDbWxNw7wjUo67egO2ELKwB09zOP+B0UYNysQ9fyiiOl0PPaRERg5JlBmlHO7CYRIMHq4K+JbnbqGq7IasR9bnmrdSDrddJ2EnYMPJ968y3DuKmHz9wAMyQCF2s31eLMO8JZIvDBXxk/V1RxZGvr9n1lLRB0SAulDOys3E9BQMKfdI+l9nJFzP6sAAsBp6U0MOlxc9PMNXDoLaVtAz4aiBtcQQ9RidD+lt/pSL5B9A== 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=EaqCChkOurW31cwxJTe7CTIE3czo4DNOb7VT1XH0Hlo=; b=YUxHpbMuFgx6ImKUhTfsek+QIAomK2QPR0xhIwMaUZtH2LspiJ6Pc6jD50KvPZS9g2KgpuJcExJVqIsGaCbXxL3qMYndmpwr+1Cd+5muprM9BuaKah97LKmYTqLp5bvkTbsp8XVom6aoiiwtHRBl+1mkCQ6RcqvFC8jD+X9JkTH6vLNrT7GqFzcaEZMm9zE//pek6sksoKh83Z8VaE4KOxVrGMNzP2PmVQnv1n3qjOsU6qFPpJ6SVNdO1swOe/Ni6z2tcKUBGLaEHDwmSWAtqqd3pbzXcQ08dTE9BMmLbPnTv7mE+w4QWOTbys3UhTA7ivlFUtM6ubBC6Iy+55J2LA== 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=EaqCChkOurW31cwxJTe7CTIE3czo4DNOb7VT1XH0Hlo=; b=QENvGD/JxVJWg/VGBpM6E4rOQTyFTs2sG8G9+m+1ljKyWvuCk6ebBoAqQhac6V6mFsXnxBOZ13IIpnHTXecDeXBMeSlA/vZgjWd5cwwawO4RquEx7spJzI5Rdt1fYgcGjVSE8TYZfwATXVYb7TBvcBRSTvijjvZopP97AQ01Uc0= Received: from DS0PR10MB7953.namprd10.prod.outlook.com (2603:10b6:8:1a1::22) by DM4PR10MB6861.namprd10.prod.outlook.com (2603:10b6:8:106::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7362.26; Thu, 7 Mar 2024 17:53:06 +0000 Received: from DS0PR10MB7953.namprd10.prod.outlook.com ([fe80::c0b9:6482:3e36:a112]) by DS0PR10MB7953.namprd10.prod.outlook.com ([fe80::c0b9:6482:3e36:a112%3]) with mapi id 15.20.7362.019; Thu, 7 Mar 2024 17:53:02 +0000 From: David Faust To: gcc-patches@gcc.gnu.org Cc: jose.marchesi@oracle.com Subject: [PATCH] bpf: testsuite: fix unresolved test in memset-1.c Date: Thu, 7 Mar 2024 09:53:24 -0800 Message-ID: <20240307175324.25257-1-david.faust@oracle.com> X-Mailer: git-send-email 2.43.0 X-ClientProxiedBy: MW4PR04CA0181.namprd04.prod.outlook.com (2603:10b6:303:86::6) To DS0PR10MB7953.namprd10.prod.outlook.com (2603:10b6:8:1a1::22) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DS0PR10MB7953:EE_|DM4PR10MB6861:EE_ X-MS-Office365-Filtering-Correlation-Id: aba9bf6b-4068-4068-b3c7-08dc3ecf6f35 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 0uROQUX4D8GuGqyh2+1VXSTso83YpEUbOUbt1rdBkgDEH/AvvZJBbzoD0Rm+5RcGw/hRHZ2bQVHtkN2pyqi1nAyOzFV9DZwlEmv9hogLCtoQjkqbqNAGWU2Q5fjgtqrH7LVZzEYrkIMPy9VuuzZGGuMG6ODonV9qZJi7YQ1zUfZpPGjTAh9xTzFRZQsUGWPDbCcXd70I73vb/lvI1uQMqe0hR0O/0J423nCPQdO72Uqc0mfV9+IFdQPrpOmSO7IHGthl3zQFOO4OmCrT7XyBKw+H29Fd1xLeE1sLuC+DITdO2tgdChspSGlQopAtGuSpR8ohvDP1N8wup+1UlD3K0TREJk7uTcaIXA+xUtknnbPJDy9ssHlS5Wc1YSiPpgKzkuT6Or9RmOrnDERxf0zAzp1MyHsanAlHM0PCSZiWGHrAICJeZh5Mw83SRKKWhJJ7SQGB6bIZl57yqsJU0CiZloy+HFiA3m00mlnszRi9IivaREfFnjBqmO9nx1y2uHN1aC58JP7J4frJDzdUeiHVLLh3hkYLLSRE/iFmFINrlfszOoXMYuGfwjF9BeKLyNQOrCfo/AKxl9R4KsvY/Ixr5CgKOP+aSi3ClrULpseCXHoIjzNdoDuDGV9PM6u/NjsV X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DS0PR10MB7953.namprd10.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230031)(376005); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: hSH5+ZB2ffT/zRVWxqyHPPJMeWq1Mu1kjOvAl1QfGoxjENlLG/L05dCt3mpvlTAbZQdewgjgRpf+GwMHI2/qsTEFnqVngBCj2Vmwis1p15o1mNfi13Y5/6u3W95gtejPT//XWeiQRaVw3T4hsdXwGQtXJdxbFfdueVR9/8E8lC23Ig/yOP+OuIZOg9ZkxKtvt6qCB4GdA2lB5ILndVF2BGDfeS655RhfuxW2Wh5yqjwI0s5+MiS33xs7zwaAjRr1TtLmd4sIUzDolSyDFlljwn4d7bo6H73p+s5EjEBvDWd7UbIkkKOS77t3wtGkXLHSGMrA5YYmHwRE/BrdY6y9rzwRlLImn/A1SaXFrUA9cFA/61OY6MtHdTwHglnUwPm5KX77qXWcIkio7zal9u0gJzMm1fUJsidEOvRdz4NfmMUtTS7evT3psptrGwuM8oHxmiAjONUxzKcnTsQhuW2LdhrK8N+N84cOFfhDmePLeIUAt/COdrFcp8oWOlPupitqFtpANf9/OM0fqi5W4d4eCKuq50dHGci5cOVFMPvfEz+THWO8Xv9Uw4QWr628ASkYDe98o72zhcbYSs/jxZkLZTTEwfwx6hanL8Ur8zIWlWrFycfno0K14YT8WrbjCenQX8KjHcZx+ZoSB1pK1daRyn93xztqcWxef2R34h9eFRw9zp8PaOEZbmgmnFtClJGu7IUUQOshPDRtEs2PDxkeVxVHdrJVXcmeZ3d8WcTjiKMG37w0Ae1WBZaHvpcD7KJ5cTndToclyBP+h1LoaxHIgPuyl/D9BI2gnpAm9uDhnqkE+LYyEoHeJPO+WmdTGEdCjACMQ7Z76b18wlm9vt3/mAdyn0oDF2f+Nu/Z+NnitRVP8EsOazlXJgrFe8Yhcrn59zzM+aUsjv+9JF+UP5xg7GedKO4JDpROE4kc3FGMGHF8aRN0S8a0f8zm4Ey+BwaLOpwZOjOF6CD3z+5ksR80OE1uGqRdXjCAw61mmTxxwHYLlofT+lf7AfwjsH+CV/qv6EMJqvZHKaHzBes6GiPNgu1yfOkWTWMftWlzEQM7ZQ1YE2xMo/YYDUpLSyC68nCn/SDlv0Ke4YKjCeeGY/SOwdkF2tu3fyPGtLSxz3f6C/evPqst5oXDUSZ46/p+ezjIVeIpQntUAi92rt7ED8sdShmVac80a7nBp65dM1eYPKWpg2UbsEXxi7mdZTNkNYLoWN7VfRhpfVJkeq1s6X5AY4lYdbYlzh0I8nowtXNwpwiQi+wxbcJYE1R6xBhbQTRDD4b7/siiTC/YQIEe6bqucwDdJOtdvFAp9wZn+x+lHoTPToWpZ+6VvAnup6Dd/u8dY0Z/QWCTDhvkUezRqIPuy3po69jw5PDPmuChuKzix8tZwnu/DZFhRMBsfkRwjqY4zOlBc/TWKCLJQUqpPLpJ6zOibuBkWeA1js6ZvIE9k6LJBiDIX4yYL20Fioc8UriquGYUbimO3pzbO1/sC/wvneQzdtLyRlbWeHrGh2VhMvpC+yWQjueKX5kIArRWhJDEySZUelzJMtabScLfiB9YBEKpLhcoMyLmJ9mA6a8xQe6fb127SFmLPm//zwWm1phpCoa00q6Eh7ncISI9qUCcVA== X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: TOruzsETZOuGYmS0XWr/vxBh8wVbfnKentsWP9fn4XjmzydjIeXbwM/Ebsn6WPBfaJO78WUmrb0O6ieAFyG5MJmhz1vXUFpxO/xSbeKig10P7cGcmntwmjwvhpdzH3cHhZwYy76hnsFhMl+P5oYjUWP/pXnkuFsVHsPzW/JfCEEsdG6EUOHG8+ACcN8kcQlYZ31lUESaa0uJ6sC7WLBMVq5XjWZlAx8WK/pL8kyckuW2us2BDULtfg7eaUuJvX4yynZGooFpOmsaZyOssT30iFMgRpZRst8H8IfmRDjixu8bsopXvZCKvYhpbQvVPxuT4rJsIsmFPSQTsdVIX4RjjBCFnQVXSFNDyWEizAtKUHLT6WCDfo62d++0F0VXbWuA8goV8TzpwnVjDjWQ4WWvs6Ka+nau1vhny7bOYZ+s120LqeIIJFrmM2pkJ3ry0BjGwVWkB68eKWBAJVwtcqlVFPD5wdbI7zm8mmgfW6R5U271DtQe4M2C+UYMLQsvE9pQAtRYvyiCugB5+lC466BL0LC2z4ki25HND4/1o6xpmyHQN+EryHnFRY6r0si1euVIPfA1mKMEGsYRTj0Xnbh8mNATCxAprWZd05H+qRIlOYM= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: aba9bf6b-4068-4068-b3c7-08dc3ecf6f35 X-MS-Exchange-CrossTenant-AuthSource: DS0PR10MB7953.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Mar 2024 17:53:02.5714 (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: CltIzOZU00FpzKrZK60trntqN4CGx34VQTGFCVnTUSmRwNkBr/kBHtawh1Dz6IduYcdII4FS8mkroRj7MdTvPA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM4PR10MB6861 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-07_14,2024-03-06_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 phishscore=0 mlxlogscore=999 suspectscore=0 adultscore=0 bulkscore=0 malwarescore=0 mlxscore=0 spamscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2311290000 definitions=main-2403070123 X-Proofpoint-ORIG-GUID: z0vwXTVj0iLGrXCyLPOHh4KzRj4K5G9q X-Proofpoint-GUID: z0vwXTVj0iLGrXCyLPOHh4KzRj4K5G9q X-Spam-Status: No, score=-13.4 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 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 test was trying to do too much by both checking for an error, and checking the resulting assembly. Of course, due to the error no asm was produced, so the scan-asm went unresolved. Split it into two separate tests to fix the issue. Tested on x86_64-linux-gnu host for bpf-unknown-none target. gcc/testsuite/ * gcc.target/bpf/memset-1.c: Move error test case to... * gcc.target/bpf/memset-2.c: ... here. New test. --- gcc/testsuite/gcc.target/bpf/memset-1.c | 8 -------- gcc/testsuite/gcc.target/bpf/memset-2.c | 22 ++++++++++++++++++++++ 2 files changed, 22 insertions(+), 8 deletions(-) create mode 100644 gcc/testsuite/gcc.target/bpf/memset-2.c diff --git a/gcc/testsuite/gcc.target/bpf/memset-1.c b/gcc/testsuite/gcc.target/bpf/memset-1.c index 9e9f8eff028..7c4768c6e73 100644 --- a/gcc/testsuite/gcc.target/bpf/memset-1.c +++ b/gcc/testsuite/gcc.target/bpf/memset-1.c @@ -28,12 +28,4 @@ set_large (struct context *ctx) __builtin_memset (dest, 0xfe, 130); } -void -set_variable (struct context *ctx) -{ - void *data = (void *)(long)ctx->data; - char *dest = data; - __builtin_memset (dest, 0xbc, ctx->data_meta); /* { dg-error "could not inline call" } */ -} - /* { dg-final { scan-assembler-times "call" 0 } } */ diff --git a/gcc/testsuite/gcc.target/bpf/memset-2.c b/gcc/testsuite/gcc.target/bpf/memset-2.c new file mode 100644 index 00000000000..0602a1a277c --- /dev/null +++ b/gcc/testsuite/gcc.target/bpf/memset-2.c @@ -0,0 +1,22 @@ +/* Test that we error if memset cannot be expanded inline. */ + +/* { dg-do compile } */ +/* { dg-options "-O2" } */ + +struct context { + unsigned int data; + unsigned int data_end; + unsigned int data_meta; + unsigned int ingress; + unsigned int queue_index; + unsigned int egress; +}; + + +void +set_variable (struct context *ctx) +{ + void *data = (void *)(long)ctx->data; + char *dest = data; + __builtin_memset (dest, 0xbc, ctx->data_meta); /* { dg-error "could not inline call" } */ +}