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 0102C38356A7 for ; Fri, 22 Jul 2022 11:23:31 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 0102C38356A7 Received: from pps.filterd (m0246631.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.5/8.17.1.5) with ESMTP id 26MB9ADi006327 for ; Fri, 22 Jul 2022 11:23:31 GMT Received: from iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta01.appoci.oracle.com [130.35.100.223]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3hbm42q6u3-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Fri, 22 Jul 2022 11:23:30 +0000 Received: from pps.filterd (iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com [127.0.0.1]) by iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com (8.17.1.5/8.17.1.5) with ESMTP id 26M9Eo6p007888 for ; Fri, 22 Jul 2022 11:23:30 GMT Received: from nam10-bn7-obe.outbound.protection.outlook.com (mail-bn7nam10lp2104.outbound.protection.outlook.com [104.47.70.104]) by iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTPS id 3hc1k6dbyq-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Fri, 22 Jul 2022 11:23:30 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=blhEnQsr9GBNZecObZMQASXv51TcNcdOwEoOZALsgNCAodRw7H5VMdQHuVnrd6Bp+uE9/XuEysFTvCeb+avR9ouEzXASne/N8swwqVmT3IaoqjgryQu2HQCjrqTegGK+MbwCevZCwGtbc+uNiybNSzO8EJqhYEI3mts8Qqd/kr/yc6kO+A/lSE12Y3cfWsiQZzO5+ihrfXPqtfR6AnvrNIqnBseV/x18I8Spb6vvyJg+3SyNSTAYbbeSHhv2GwSIgyIGlvg882cud57EJ00mk2qDltDHy8xGWfts+GdQ7IEJSOWCul+FX7EiFPslCzDt8yiGt7ADTwkHQGHuxOSGnA== 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=LeQXq8ZwCQ8Fua8uIKjoUdonrtOIup1E8F7CMH7CBtQ=; b=AIOQpZKfor/K6z9Oa8oF9Vei9mVUaQZHJLAVmYqDZgQWP3yPx5gd5gTjzKsQTzuhKeHy+3yj041z8y0GP4MDUOcvQitk3KDM1p7DS5tfZDCbVEwtwX9EGOyphuL7T/QnOKAZB7JdAXiYfhLcmgRduK9DqYhF5JKWJ359YSFytzMIRKX51kXkjcPH2yQr6q6p2PmXFTaCiDXC4DKppm8Qdvp3VOZvIqpqNT6X/qlrlF/8N3XP4EPb3jXpsMeWuCKso6bfCv3CIuBUOcqrKpxvZWPX4b/8/9ApJSqFdFn+a8MDrEAZ7tQ4UOoKgmm7uJHloetO9ffGm5K4PlKQyhUu1A== 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 Received: from BYAPR10MB2888.namprd10.prod.outlook.com (2603:10b6:a03:88::32) by SA1PR10MB5866.namprd10.prod.outlook.com (2603:10b6:806:22b::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5458.19; Fri, 22 Jul 2022 11:23:28 +0000 Received: from BYAPR10MB2888.namprd10.prod.outlook.com ([fe80::b5ee:262a:b151:2fdd]) by BYAPR10MB2888.namprd10.prod.outlook.com ([fe80::b5ee:262a:b151:2fdd%4]) with mapi id 15.20.5438.024; Fri, 22 Jul 2022 11:23:28 +0000 From: "Jose E. Marchesi" To: gcc-patches@gcc.gnu.org Cc: indu.bhagat@oracle.com, david.faust@oracle.com Subject: [PATCH] btf: do not use the CHAR `encoding' bit for BTF Date: Fri, 22 Jul 2022 13:23:20 +0200 Message-ID: <877d458k7r.fsf@oracle.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.0.50 (gnu/linux) Content-Type: text/plain X-ClientProxiedBy: AS9P251CA0003.EURP251.PROD.OUTLOOK.COM (2603:10a6:20b:50f::7) To BYAPR10MB2888.namprd10.prod.outlook.com (2603:10b6:a03:88::32) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 63efdd64-1043-4541-6b5b-08da6bd499c2 X-MS-TrafficTypeDiagnostic: SA1PR10MB5866:EE_ X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: cO0L86WZMMXmPHcz4yI9Ak86snhtMY2gEEQ0cl9uzZjIDhG9GS+r8kDMFz7J+AiguO+lQfXgP2bFw5XVLMoylzLmFjAiLgPF6romfP2lhZXm4i2HeyHix8t+1BzqcuFzSjUk0EwdHKgvmaNx6xZ+D9DrefJPDvCQdTO9/bPapxEyd1xlgG6f6s+//MYHWEXRxhEDOdxeTFCqhe/nFA8GYuUadIlcxCmvNWxb8kX2gIfw48fH0vQpoO4mYwiZouP4/mUDYqcfRmo12YtYruMJRm2zLNwj59rfjUy0qwMNziVnJyWzsSFBkQTmakHwSRM6maki0Hn23L1nHRD7U8QmGMAFXLYMchzBCjnwzr8iFyxN+IeDoTDquVLBhcPX9YlzHd+aTiP2ZjwbysPyzzIcDwZfmPcnTRx6Vfopl4aRurbU0KKnkSZOCGYLV9Q9DPpDe095wA85HfYM+VjAwvcpcZZ2SM3VEIH29CcU9h52U3S9CjR39+SPSXDVlgAohl+Cd0yjkbokUc62y3vHeo9oxyEmfDW+JNZb+wQu32LT+0ECh1EPqxoyhd+rHv1sAW72Nij779Dijz/y5kPhwOp64y7DJaPkB83SpNNGdVnnV9JlYEZfo9A4jbex51cVpHLLyeYi5rP2lXlNtNow1SqsWZvx2vDcWd5+ysVi2j2ap+7Ig3Km9IlfOaJS+5P5vRD9QTANP81NnU8feZi038/6LA5oReIdHeXQap6ehQb5zwMtbvVXV909282zudfXZihcY7INPvpJi74DC02pJqEYqAm8K5/UIZ2LmAdOk5g4VD3M5U8f/fyhpq815C2UUTx4qYrUc4HjImViW9scKtbPZg== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:BYAPR10MB2888.namprd10.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230016)(136003)(366004)(39860400002)(376002)(346002)(396003)(36756003)(86362001)(5660300002)(8936002)(6666004)(83380400001)(107886003)(26005)(2616005)(6506007)(52116002)(186003)(38350700002)(38100700002)(6512007)(84970400001)(6916009)(316002)(41300700001)(66946007)(66476007)(66556008)(966005)(8676002)(4326008)(2906002)(6486002)(478600001)(81973001); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?0h7Uv2svRuYq33kpEsjTVf+Zj8Hjm6HceYcZZy4NXYqldGlLdg1e2eiTGtTe?= =?us-ascii?Q?4ueFkjBQm1Qb1rxtbTL1bcs1DI2Swpfen008ApiyBl+TKzW84crkpBrz1+GP?= =?us-ascii?Q?+VA7oYAdgkt5mTJvzk/YEgiu2P1+MHDexyfPXJzK5jtOc7z0D7eEBKoFw3Wq?= =?us-ascii?Q?11mC8Pxp+5fO7nBZb7FZuNwKpIEvkW3wxMjXJih+UuQ+ErUOArTTn43O+UAC?= =?us-ascii?Q?STF1td44Tl3Hp+5Lkl5xCVLrflPd5Uwk23ieNb631HptrPXqpPqEIMX/k7iR?= =?us-ascii?Q?yI8k8QSK+YATCgoH/y3/of/aJy63X6HojqC7rKCVBf9UAnWyn20ipSG1WRNr?= =?us-ascii?Q?hDBti/lGHzlnnH/B3GI8aQluml4cCAhY8xncs9XfJq3rZYtyvfSEHM2BFTYq?= =?us-ascii?Q?Gj+lcXFQ45IZQKZ+uTrbwTw0QksIhyYlaCO4DGFTmwyHjJARzSkj0HgURPCT?= =?us-ascii?Q?iKsnl8+CD1awfpiG1viNH167UYy6F92ugu9anqyG56w6SXgImLQ6TzW/OSVm?= =?us-ascii?Q?cpu2QLTv0aTTKjakLkWI5zfLj/2FQXQrPig90PdQJtSNrEgxq8eRcHnx+ei0?= =?us-ascii?Q?KdQQ9EduUJ6UpbHT515xlnviz9VIM79cvSebOeTyG4FhwOe+yUhtSYMfON9E?= =?us-ascii?Q?rqVaSZ3dd721OadfNx4dACAOiua/T4oWchqaCq3aYFW/sNeNAMKwvwOa+lB3?= =?us-ascii?Q?m843XjsqKHRtF582ouBoMynE7pj4DkKoAB/ygg5nrxik51k+waW15m+z2xTW?= =?us-ascii?Q?jF/dyoWzevi7XM/8Gu7MrboUVKj/SL46aHHiwqouIMPPY3YV2Y8P+iTVZHJ6?= =?us-ascii?Q?XVrbRYGip8XMjB2026bbE4i4X299lSNDQiL9WDUp957S/U0IE+5Abj6u/fL3?= =?us-ascii?Q?l6ZReVPxbYzYKtoN51+Tk4JdQQgrQw50J0a/u4Q4k2uUq97EVckipRC0eGzH?= =?us-ascii?Q?cFUTzd8ZvNkgZywgtNHxtU2J3qkTiXLjeVAhtyXqBs9aEVw/5BPEVA/5pH26?= =?us-ascii?Q?FVPLN3rxZKfypnu3fRicT07jagbYBBgoQgByo9PkP6grjZZvnmu42fxuuh09?= =?us-ascii?Q?hSm+4/MAk0v2iWG4uQ/Ft3nO2UGJ6Ekc3d5kssKlXUPBXG8GbTSuW5l3XWNc?= =?us-ascii?Q?23LW8W/fmwzgu5fWf08xvpmCZXdewJRj+bSdXJQS/j9JbkIb24nmRgX1VN/q?= =?us-ascii?Q?1G7o/pHyW9iRzj1ZUmR0qve7GPC4fJay2OjEnaQghZQdmDGNrzNVNdyY0FX6?= =?us-ascii?Q?V+K/zsxyBAVUCBFiI7oyvix0GkCJ9Cc1Bh6+LnuDUCZHPyxY4TGzkwDAJcsL?= =?us-ascii?Q?s5Ga+ryKL4xAgLlf7beEhY6223LQ35U+OhXcJKKxuzaNzHx4Q+XgLltGd7VB?= =?us-ascii?Q?T1CRsnI5xkJ9TLl9yO5DoN3fQDBps1BtgQUFeGNKbfkyLLyHzVuYRAbYvf+t?= =?us-ascii?Q?VgjjiwKUgtmDQ/WGzR3PEXasFqNxl7Xd3+FU40sGTEuB7D71Bj+vnCLzg073?= =?us-ascii?Q?P9SMdXBXq7wkSsHzWHzrtYBmFMQfKRRe42Hg0yo5L5mKF61XnDGDOyqLYCCs?= =?us-ascii?Q?RDwvdyfehrjbMBoxoL3F/mWxQTp5Du++ZXqL8E8HLvdL3VgXSP3w6tQbjLqi?= =?us-ascii?Q?RA=3D=3D?= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 63efdd64-1043-4541-6b5b-08da6bd499c2 X-MS-Exchange-CrossTenant-AuthSource: BYAPR10MB2888.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Jul 2022 11:23:28.4646 (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: u9CzFbCcX87l2d3j1qfGZX37/iLdzGsw1/HWMhYsvirVA4XdqS4Ki2M9hGejPqChRfoD+qhM3Fiva7bEzQ8B07q5/14kzLVwT+BhPsG5O7c= X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA1PR10MB5866 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.205,Aquarius:18.0.883,Hydra:6.0.517,FMLib:17.11.122.1 definitions=2022-07-22_02,2022-07-21_02,2022-06-22_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxscore=0 adultscore=0 phishscore=0 mlxlogscore=927 spamscore=0 malwarescore=0 bulkscore=0 suspectscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2206140000 definitions=main-2207220048 X-Proofpoint-ORIG-GUID: IZ8UqVXpb6ornm7whOIGP0VYgjAome7U X-Proofpoint-GUID: IZ8UqVXpb6ornm7whOIGP0VYgjAome7U X-Spam-Status: No, score=-11.9 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_H2, 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.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 22 Jul 2022 11:23:35 -0000 Contrary to CTF and our previous expectations, as per [1], turns out that in BTF: 1) The `encoding' field in integer types shall not be treated as a bitmap, but as an enumerated, i.e. these bits are exclusive to each other. 2) The CHAR bit in `encoding' shall _not_ be set when emitting types for char nor `unsigned char'. Consequently this patch clears the CHAR bit before emitting the variable part of BTF integral types. It also updates the testsuite accordingly, expanding it to check for BOOL bits. [1] https://lore.kernel.org/bpf/a73586ad-f2dc-0401-1eba-2004357b7edf@fb.com/T/#t gcc/ChangeLog: * btfout.cc (output_asm_btf_vlen_bytes): Do not use the CHAR encoding bit in BTF. gcc/testsuite/ChangeLog: * gcc.dg/debug/btf/btf-int-1.c: Do not check for char bits in bti_encoding and check for bool bits. --- gcc/btfout.cc | 4 ++++ gcc/testsuite/gcc.dg/debug/btf/btf-int-1.c | 18 +++++++++++------- 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/gcc/btfout.cc b/gcc/btfout.cc index 31af50521da..576f73d47cf 100644 --- a/gcc/btfout.cc +++ b/gcc/btfout.cc @@ -914,6 +914,10 @@ output_asm_btf_vlen_bytes (ctf_container_ref ctfc, ctf_dtdef_ref dtd) if (dtd->dtd_data.ctti_size < 1) break; + /* In BTF the CHAR `encoding' seems to not be used, so clear it + here. */ + dtd->dtd_u.dtu_enc.cte_format &= ~BTF_INT_CHAR; + encoding = BTF_INT_DATA (dtd->dtd_u.dtu_enc.cte_format, dtd->dtd_u.dtu_enc.cte_offset, dtd->dtd_u.dtu_enc.cte_bits); diff --git a/gcc/testsuite/gcc.dg/debug/btf/btf-int-1.c b/gcc/testsuite/gcc.dg/debug/btf/btf-int-1.c index 2381decd6ff..87d9758e9cb 100644 --- a/gcc/testsuite/gcc.dg/debug/btf/btf-int-1.c +++ b/gcc/testsuite/gcc.dg/debug/btf/btf-int-1.c @@ -4,7 +4,8 @@ | 0 | encoding | offset | 00 | bits | encoding: signed 1 << 24 - char 2 << 24 + char 2 << 24 (not used) + bool 4 << 24 All offsets in this test should be 0. This test does _not_ check number of bits, as it may vary between targets. @@ -13,13 +14,14 @@ /* { dg-do compile } */ /* { dg-options "-O0 -gbtf -dA" } */ -/* Check for 8 BTF_KIND_INT types. */ -/* { dg-final { scan-assembler-times "\[\t \]0x1000000\[\t \]+\[^\n\]*btt_info" 8 } } */ +/* Check for 9 BTF_KIND_INT types. */ +/* { dg-final { scan-assembler-times "\[\t \]0x1000000\[\t \]+\[^\n\]*btt_info" 9 } } */ -/* Check the signed/char flags, but not bit size. */ -/* { dg-final { scan-assembler-times "\[\t \]0x10000..\[\t \]+\[^\n\]*bti_encoding" 3 } } */ -/* { dg-final { scan-assembler-times "\[\t \]0x20000..\[\t \]+\[^\n\]*bti_encoding" 1 } } */ -/* { dg-final { scan-assembler-times "\[\t \]0x30000..\[\t \]+\[^\n\]*bti_encoding" 1 } } */ +/* Check the signed flags, but not bit size. */ +/* { dg-final { scan-assembler-times "\[\t \]0x10000..\[\t \]+\[^\n\]*bti_encoding" 4 } } */ +/* { dg-final { scan-assembler-times "\[\t \]0x..\[\t \]+\[^\n\]*bti_encoding" 3 } } */ +/* { dg-final { scan-assembler-times "\[\t \]0x.\[\t \]+\[^\n\]*bti_encoding" 1 } } */ +/* { dg-final { scan-assembler-times "\[\t \]0x40000..\[\t \]+\[^\n\]*bti_encoding" 1 } } */ /* Check that there is a string entry for each type name. */ /* { dg-final { scan-assembler-times "ascii \"unsigned char.0\"\[\t \]+\[^\n\]*btf_string" 1 } } */ @@ -42,3 +44,5 @@ signed int f = -66; unsigned long int g = 77; signed long int h = 88; + +_Bool x = 1; -- 2.11.0