From patchwork Mon Apr 8 21:01:00 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Faust X-Patchwork-Id: 1921038 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=oracle.com header.i=@oracle.com header.a=rsa-sha256 header.s=corp-2023-11-20 header.b=goOK6r1Y; dkim=pass (1024-bit key; unprotected) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.a=rsa-sha256 header.s=selector2-oracle-onmicrosoft-com header.b=PcBGe3og; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=2620:52:3:1:0:246e:9693:128c; helo=server2.sourceware.org; envelope-from=gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=patchwork.ozlabs.org) Received: from server2.sourceware.org (server2.sourceware.org [IPv6:2620:52:3:1:0:246e:9693:128c]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4VD1jZ3zxSz1yY8 for ; Tue, 9 Apr 2024 07:01:37 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 0E5C43858D28 for ; Mon, 8 Apr 2024 21:01:35 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mx0b-00069f02.pphosted.com (mx0b-00069f02.pphosted.com [205.220.177.32]) by sourceware.org (Postfix) with ESMTPS id 892993858D28 for ; Mon, 8 Apr 2024 21:01:13 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 892993858D28 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 892993858D28 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=1712610075; cv=pass; b=fIHbcZ9DH0mIiIY/JZmW5Ki3wWPGKd80ZAg9G7gKiaeHq7f+igfVg220WwJRLUFF0gh9mUzYFNSA/b93a7WIlzLsRAvAECYROiD0SOtT+CvDYqjGzIQwBNVAplrhhemYz+JaeYjfFpvdTzH0a3/FfycD+EaHCJRGd1NwkkVaKcU= ARC-Message-Signature: i=2; a=rsa-sha256; d=sourceware.org; s=key; t=1712610075; c=relaxed/simple; bh=tL+fWmGMmHsmsB6+fgfr3f0AZD7jzZAdP2ZvxUUlt8I=; h=DKIM-Signature:DKIM-Signature:From:To:Subject:Date:Message-ID: MIME-Version; b=JW5y8c3SyJmbm6EEgRwYf4MI4kS1G2mmEgVQOmhyhy3A96wb7O78bL+O9KETpCDi1oFhy9sN4BYCnyHAPzW7Xah5LL945sXBGIpbp+D/d5iXO++oxrw0XHNgqsDEF7/JrMa3KXHj+QPnY6t8Yy6TDK5Sx7iqNnZMrxD7h/oFwhM= ARC-Authentication-Results: i=2; server2.sourceware.org Received: from pps.filterd (m0333520.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 438ENpa4028687 for ; Mon, 8 Apr 2024 21:01:13 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : subject : date : message-id : content-transfer-encoding : content-type : mime-version; s=corp-2023-11-20; bh=VqeCCT11KVseP4OG0EuP6vamw3wcjtCgNJPjkzR7m90=; b=goOK6r1YCHNJ4Tp7r6pzobBcgcoQpH1oHLv1JKx3tYWTb8vxJt2fgIaMeqd3J6MbVx/l ZIjJy0agQ+WM/dnvyhKmW3EtUwGAOQwwKNRpoRhPWkdtHxnPY0hk6hwVwSd4pwETPyN2 fN7AusQ6RnSMfnS9M+cfjRZ2uOaa7UNB2RcHn1vniqD/pFFDXhm2boTPz8TDxFPnP8lz Z7Afqw6yXE0RyRzd1Ls9PMtcMLj1ro8iCLKQ0Psva7wgY6UYndx43vTyf0kYo+4sBuO9 Nf2v3nDV+m1qtRoi81gim9EkaW7CCJEe7+GmAroibkbchrgo81YxE2nHfFttS/M5e0Wv eg== Received: from phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta01.appoci.oracle.com [138.1.114.2]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3xaxedkr1c-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Mon, 08 Apr 2024 21:01:12 +0000 Received: from pps.filterd (phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com [127.0.0.1]) by phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (8.17.1.19/8.17.1.19) with ESMTP id 438JAQka007862 for ; Mon, 8 Apr 2024 21:01:11 GMT Received: from nam12-bn8-obe.outbound.protection.outlook.com (mail-bn8nam12lp2169.outbound.protection.outlook.com [104.47.55.169]) by phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTPS id 3xavu60sx4-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Mon, 08 Apr 2024 21:01:11 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=UnaEGB2ETI84Eiu4pmtp9HJHTUSFlBIDSG9zl16aGtaLpo6qqnk12eP6pWHZ8rCUhvAPLZB0GaXYFkiBWdRAN5eAIGkgyabfU36ONTx+FaRJ9B7nj2zFgW4UmSd8njtku+W8dGp6Ond3fo1BElzhAYBRPQnrHhF8d4MBQVKQRMAHeiqPo2QS5CNMPQXzkkx/fsvOyHzdyptTY/di1Eq1Eb9m19sipqKaXj8M4/44Khk/M8Odp6SVjnJl/TOnC2Iv7tNSv8AP12Xh1MvsdCQNMQ9XtSULQJFAQV3m7DT5fX7VyFhd8Dg06nu5k6FstEYBcvdiH8AG1FiYHDuxlPldJw== 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=VqeCCT11KVseP4OG0EuP6vamw3wcjtCgNJPjkzR7m90=; b=lEbHdCy947pP6NNWyQRNilNoT6kymHPbOEHc/0i8CPtFIpZCuquZBtTUrf8h/HRoJ8beKP+LZu64SXHyqRBmXBTkBlzQGhmcWyElUsBedLvK5OlBnmVSmMZRfNs13otGg09/5eD5kCdNypbsjmyMiY+EFYZhZvKFC4hbMkEjigGc/bOe7kEOuTYiqxj8uSRQGikX2PdkY9/DEmKD7wO7NYVknHABrn3op+S14AHhgEH1ysXwbYuR9WElPIC9732SIH8Tshz7gq39jaN5znndYfaQ0yFGLihH5hwx7dVq2tfIHnCLvfa/Q/x3F7vPi9T/ln3WcBKnZK5ltl3Sskg3CA== 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=VqeCCT11KVseP4OG0EuP6vamw3wcjtCgNJPjkzR7m90=; b=PcBGe3ogs6ucEr9CmMWHEGuiCgCv9Naa1dQWayDvVs8n8OYZmg9d6PI5BkYkx5ZFG8uZPvpa/aHPDZeB8DAtUEU0JZURxYDlbCLNu7rBb+BNAl6kXY8/l2+FSNYlpM6dnyIDY2he1rWHL4cku5H/q7iNM1oyzdDUyMey/DTKrrA= Received: from DS0PR10MB7953.namprd10.prod.outlook.com (2603:10b6:8:1a1::22) by SN7PR10MB6570.namprd10.prod.outlook.com (2603:10b6:806:2a9::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7409.46; Mon, 8 Apr 2024 21:01:08 +0000 Received: from DS0PR10MB7953.namprd10.prod.outlook.com ([fe80::ddec:934d:1117:499d]) by DS0PR10MB7953.namprd10.prod.outlook.com ([fe80::ddec:934d:1117:499d%3]) with mapi id 15.20.7409.042; Mon, 8 Apr 2024 21:01:08 +0000 From: David Faust To: gcc-patches@gcc.gnu.org Subject: [PATCH] btf: improve btf-datasec-3.c test [PR 114642] Date: Mon, 8 Apr 2024 14:01:00 -0700 Message-ID: <20240408210100.12099-1-david.faust@oracle.com> X-Mailer: git-send-email 2.44.0 X-ClientProxiedBy: LO6P265CA0014.GBRP265.PROD.OUTLOOK.COM (2603:10a6:600:339::12) To DS0PR10MB7953.namprd10.prod.outlook.com (2603:10b6:8:1a1::22) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DS0PR10MB7953:EE_|SN7PR10MB6570:EE_ X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: ETGqO6ZDFL2nmTzqfk3g10jruekELPWJOuInKdWsEYmADsE2dGrvcMDyPAposVIX98rhFMZNudy1Y+TDlpmk8Ps+X9Xh/uQZI2fKuxQqDISw3ySoq+Idwlq4XN3qqF/Hs813/fsT9eXSOZyRhVbeIIP29mEeP8+I90PeEg82RYF9G5nO0Y7bnx+GsokrSeQ6g1n84/AQIF57VP+5F2pon3rihgJKWLsgpX+/bGU/g3MIMvY18bVKT1HpSevp3OLBAAeJ1VsdctPXgF5kBcceZxoNqOZmLdbRjxCrdLlvrvterUfiuEU8OXoHYp/IF+Mb8xW70IXuGZ8nfhJkws78GNXANCjZ/oISqJuZp8IN+WqHXZFPOubMxQySdOQ9FTSXmV6sba0azYhLmkNRgP53wFPzTWDLJReII/3J2RltrfbwWtNcJDA8UwwsXsP/H6XMfLrBEXSmE7umNR1yIyv+KrEX77gi+NzmKg4TeF+2ocYAUY+I9WibMjMZlqgkWKzIHCxYJQDZCo9MJ8oD1/8LZqwPzROr/tAh3aCHryyW9kClf3pi5DP9oGKTgTDaRYXThmGp1w83716YIBsKLF3zsuoOmagpTjp58sgyXEaoQyg= 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)(366007)(1800799015)(376005); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: +KdvwMtdBm+ZoOdEWzHmgqkzGxlgq0tVntQf7wjtDSvrIREJQYA+TinEWhlUi4elwccAMZnWZk3Kaq9GFpk3aw7pP39ibzV2JWdILrjlpNIYfghqGsJ+Ivmm4U5Bn5fGbVwcVhU82Q2+IkxSY8gZ6nJTMf6C9GtO6UvRVGCk1xuyY6O8XdtnYxSfyjOFXHZGmRBR6IRf2gMYZY02sad1Mywxzv3mRNSvAKqvWicMvRogcxtFGvu9ODut7LWfHd7GFRK7rDmNE0CifILSz45JuW5M/TFKAi8+m4YsToKrhucLV7GaeqRSy5WlkV/mgaVQkZeht9NphMb2wC5xndVKY2qhWwwO9Z7SDcDq3mI7lzwRSBhTNxnYZ1y5eOcNsE/a/5tRhD23QMkP7uRa/9Y/Zog1bVbC7jwBTUfLYfONet2VCxllqSqJvqifkquJhrfVrqBIr9HXtqrDFk3zg+AOHrVRF7j5BLSf5Hf9xks9iC7ERfw3LubdAUEHLpo03UBP6mabFdrQKeoaFazz7I0PzLzHfHZ271nNDDXJzufgnD3Q9boc8YTVhZNf2DK4DlESgVpX00OHr8d7uf08qBfsWUX/wTfRgb29Cjusrm2xqamoWK4H4aUIw7m5bp0yWnS1+Jr0rPCk0mI1QytOsi+pmmm0QKnY4eUGLdQqo/KbGj33sz8/GdVfX0ZrVNGI4q6s0INGC8izoVemeKjEiKWFsJwt2H6IUCERxRgdr7ESiobt/UXbdxtjLnJKxw1HSVHzY4TK5ZGS9J2muxNZTAdDhCNgBze+c6g4WldgvvT9K1sivr9hRki3NipjU7QsedM9wsi+lM9RV+zVMgHjINNDgbRo6ZpVqX+6Cu9RC8MqQWkL5K/WpoRLeGiZnbFPvAZ7VJnmSLH+QhbHp6mXhYxFFje7kYXRteG4MoW7Gwt1TffMttSzkYxLp8rIrMfNYRE4zQJ0ya6BDQAZeaZkBm/HeZowc1u9Y+gEVna/+rYAXg2csKufjFIqDK+aXDhqI/JDMxn0bg3NCN6vf/GDggoBzlupIpje9yEslYt9Qpauim+jsPwC7LXIEEBvEIIZcqykyRbKbYeRtCgWTxkRnAe/g5b1VyqVxozOxazt6bMpIKG+1xVFdP1am9vFmoi0jg5hHpaZFuBCbm+lsx4QS8AkbuHpZyCun1e0XtdkJmTG/9XiIMNxmqrjO9I25Mg2lPrZf4+UnXf0kT+eCn/E1OP2TWu/bKmBbReiPEVa0VQ85nEODceY25RjNnnXnwqiYm8MNDMwfbxRMcdUYOBQd2M8oB8jR7kuKmYn1BLKHfVyDjcuenmmv7cFissUESPidnU/+/ltrP0POBhtRjIvDv+I8m7NoZt8qRO7m02PJg2P2WIogTycYlkq+8uEZg8FMFfhhXeGUc4oOEXXcmXLveWsM6Zao0XpmXbZwU+kNJeC6Mp/knmeuvEMvuQYF6CvxkP7SIn076JIxgKkMYEfP13vp+4NSA71xoIz7AEuo6EdmPcmibrg1VYxMCDggjdLO8WjWzvg/IYZllmOGmGGQSu/JYJW/nwXi3NG//aVXWpiilNrNBdo7cgNdoyT+HaiIuwL X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: LyXtpujZwEaq6fCIUBoq0y/MrPhi/Fh0t0YzitfJj4X7OMw1snmWR8UHQ5Wb9U34pmR3HzKSycGj5wiXpqYYmkjPAFi+/zqWBFoZuZwyFNTmLxfg2UqA208io0DvKfIjX6TdaC9FAGpqdNV+46xoLYzJdx53UKTKHfXP1B2IUhL3NCiyAP7C66C0Of1rufV+tniwth9TrnF2md+s8eveqO1a7hjJF0A8sMS/GOwl4JKfe8P1EQGR9igMherdWsh3A75hucZYWHBSh+WyRm+iGTupCbC0MXgjDNksFkMFEKflBCZJ73LV9vbMUSui7V2b0Ig00+0klXcWHmy+c9INJXVCrHgANgFbmv1AtxkoKPxTpF3RgCpWW+Opc/YTMns70NfJiyEJRw1ZJ1gXdE3ytHNuQyY5nvuOXfS+ptNDigSJXS8rFsANDcoJdlggLJNJFvd9lpNK5487XddWDxTCpg2sovOtnRyxJCj9VRdhp2WaB4scl9D7VIvYt1kj3fpF01fMS4hKPL5ITGq7lVcE40IDFH7T9cjJHN+1NJU8zXrCM8Vn3RoYGACCQSZ9Nzabqih9awu4BF25KfTS1PWhZUL1CFQQDPKw/ZgXVep4udI= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 43b151f0-0459-42e4-de0f-08dc580f02fa X-MS-Exchange-CrossTenant-AuthSource: DS0PR10MB7953.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Apr 2024 21:01:07.9615 (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: bGksdBMvWzKwa5XiX5PprazAbs475Leyfi26kGwXG9YsPaWPCN3Yb1Qe/1cGd25LVP+JYWWYjzmm8CLE4y72vQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN7PR10MB6570 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-08_17,2024-04-05_02,2023-05-22_02 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxlogscore=999 suspectscore=0 mlxscore=0 adultscore=0 phishscore=0 bulkscore=0 spamscore=0 malwarescore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2404010000 definitions=main-2404080161 X-Proofpoint-GUID: W3H-DssNLVWJoMZSjryxrtmVZv5c459c X-Proofpoint-ORIG-GUID: W3H-DssNLVWJoMZSjryxrtmVZv5c459c X-Spam-Status: No, score=-13.7 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, 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 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+incoming=patchwork.ozlabs.org@gcc.gnu.org This test failed on powerpc --target_board=unix'{-m32}' because two variables were not placed in sections where the test silently (and incorrectly) assumed they would be. The important thing for the test is only that BTF_KIND_DATASEC entries are NOT generated for the extern variable declarations without an explicit section attribute. Make the test more robust by placing the non-extern variables in explicit sections, and invert the checks to more accurately verify what we care about in this test. Tested on x86_64-linux-gnu and x86_64-linux-gnu host for powerpc64-linux-gnu and bpf-unkown-none targets. OK? gcc/testsuite/ PR testsuite/114642 * gcc.dg/debug/btf/btf-datasec-3.c: Make test more robust on different architectures. --- gcc/testsuite/gcc.dg/debug/btf/btf-datasec-3.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/gcc/testsuite/gcc.dg/debug/btf/btf-datasec-3.c b/gcc/testsuite/gcc.dg/debug/btf/btf-datasec-3.c index 297340cabfa..6b127aa14da 100644 --- a/gcc/testsuite/gcc.dg/debug/btf/btf-datasec-3.c +++ b/gcc/testsuite/gcc.dg/debug/btf/btf-datasec-3.c @@ -7,22 +7,22 @@ extern int VERSION __attribute__((section (".version"))); -extern int test_bss1; -extern int test_data1; +extern int ext1; +extern int ext2; -int test_bss2; -int test_data2 = 2; +int var1 __attribute__((section (".sec_a"))); +int var2 __attribute__((section (".sec_b"))) = 2; int foo (void) { - test_bss2 = VERSION; - return test_bss1 + test_data1 + test_data2; + ext2 = VERSION; + return ext1 + var1 + var2; } /* There should be 3 DATASEC entries total. Of the extern decls, only VERSION has a known section; entries are not created for the other two. */ /* { dg-final { scan-assembler-times "bts_type" 3 } } */ -/* { dg-final { scan-assembler-times "bts_type: \\(BTF_KIND_VAR 'test_data2'\\)" 1 } } */ -/* { dg-final { scan-assembler-times "bts_type: \\(BTF_KIND_VAR 'test_bss2'\\)" 1 } } */ /* { dg-final { scan-assembler-times "bts_type: \\(BTF_KIND_VAR 'VERSION'\\)" 1 } } */ +/* { dg-final { scan-assembler-not "bts_type: \\(BTF_KIND_VAR 'ext1'\\)" } } */ +/* { dg-final { scan-assembler-not "bts_type: \\(BTF_KIND_VAR 'ext2'\\)" } } */