From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <dev-bounces@dpdk.org>
Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124])
by inbox.dpdk.org (Postfix) with ESMTP id EEB3445945;
Mon, 9 Sep 2024 17:07:23 +0200 (CEST)
Received: from mails.dpdk.org (localhost [127.0.0.1])
by mails.dpdk.org (Postfix) with ESMTP id BCF2F40EA5;
Mon, 9 Sep 2024 17:07:13 +0200 (CEST)
Received: from EUR03-AM7-obe.outbound.protection.outlook.com
(mail-am7eur03on2046.outbound.protection.outlook.com [40.107.105.46])
by mails.dpdk.org (Postfix) with ESMTP id 1990540E54
for <dev@dpdk.org>; Mon, 9 Sep 2024 17:07:11 +0200 (CEST)
ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none;
b=R2kfq+DW+Jue7aq9i6FzBBuYcJLNSrryW1jcfkT6IWGfinyDj+lICEPkdNoRsih0JsId5vy177KLWAASaBIclsUfy+6F9liYpx7jQfT46gWKDFs0781P5esfn8KEYNecfBI395a2RpH3ilZ0SZfC4uelWwyuLmgJv79Dpi+O2xnOFj3VsDdMYy3WUbNMFm9Aa6uy9Jpa/vW9wCJ5+iSSq8V/3pJYiuwPZ2NcsCgOcC5wsx0lpYkDnqwGb8cytr8bFVuSHYFa1Jcyyik3qvZ+FIciohPx1udDa3nA44yZRH45zsD6jqZZ7S/LAUJExtW9FlBjWJ68ZbGUe8FOqVk3zA==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com;
s=arcselector10001;
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=5UKgQdVaciDeShGgGbM6oo5b5b9ozFm128R5ONKGWa0=;
b=Dj6p3DfwrV7IDe59pFwCytneyPNytX8dmIVPb3FRhR325Z8R81v8gfrSGBzQI6yZ06CTJNmA8pfTRfyLNBwbQ8pUZmrYjJYniJ4cZJZ9NMvYMT++2CDnQP7sKkoCaIzLy/8DWVzGgmG2jU6QAJTTKSXaSY7Hk5qUFq/y6BHF/P54jSV8NC63a5Dr3k2at0HLKECT4HG9ZH03IsxgopgzWCQd3OnD7CbOZ8Nex4ZloITjFkh3FZwLRyL2mk/k94k94eGUpuCp2bR4EPOoefQ5yGqGkcQOpCS6hNili4R+zx3tHxNko5u3JhgQBMtrFlCgWExiEvUNYxrrN5dRG3B0xw==
ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is
192.176.1.74) smtp.rcpttodomain=dpdk.org smtp.mailfrom=ericsson.com;
dmarc=pass (p=reject sp=reject pct=100) action=none header.from=ericsson.com;
dkim=none (message not signed); arc=none (0)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ericsson.com;
s=selector1;
h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck;
bh=5UKgQdVaciDeShGgGbM6oo5b5b9ozFm128R5ONKGWa0=;
b=e8Z/QsuUgYEgzqCFyVUC3vIraDMgebCEpZYGo7mDopMwqkPXtBxhUi4OU4beMt7d/lzOGCgW/BS02ZmjiD1Eva0Q3Noo1P+RzABKAOJ119ujS+TEBINOwbIomHmTxfl6VA06dwMkb8SJGNVHGPdYrowbMyS57uGu78EtyFC/IkITknd1lqv63ye+7AH8H0RUL/pVS1GyoNt7fLC5c66A2k707d/BmfBKWbEIVln4dZRhOqFb10qKeKjnm5SDJzKSMQRrfbfAK2/AM8rgyqqmGjs82noLXMOz7npfqjVbV930q7qFPhEALHicUERDmKMe+Hor+zltzjrPmkfI7Uubyg==
Received: from AS9PR06CA0610.eurprd06.prod.outlook.com (2603:10a6:20b:46e::13)
by DB8PR07MB6217.eurprd07.prod.outlook.com (2603:10a6:10:13c::20)
with Microsoft SMTP Server (version=TLS1_2,
cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7897.24; Mon, 9 Sep
2024 15:07:05 +0000
Received: from AMS1EPF00000040.eurprd04.prod.outlook.com
(2603:10a6:20b:46e:cafe::35) by AS9PR06CA0610.outlook.office365.com
(2603:10a6:20b:46e::13) with Microsoft SMTP Server (version=TLS1_2,
cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7939.23 via Frontend
Transport; Mon, 9 Sep 2024 15:07:05 +0000
X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 192.176.1.74)
smtp.mailfrom=ericsson.com; dkim=none (message not signed)
header.d=none;dmarc=pass action=none header.from=ericsson.com;
Received-SPF: Pass (protection.outlook.com: domain of ericsson.com designates
192.176.1.74 as permitted sender)
receiver=protection.outlook.com;
client-ip=192.176.1.74; helo=oa.msg.ericsson.com; pr=C
Received: from oa.msg.ericsson.com (192.176.1.74) by
AMS1EPF00000040.mail.protection.outlook.com (10.167.16.37) with Microsoft
SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id
15.20.7918.13 via Frontend Transport; Mon, 9 Sep 2024 15:07:05 +0000
Received: from seliicinfr00049.seli.gic.ericsson.se (153.88.142.248) by
smtp-central.internal.ericsson.com (100.87.178.61) with Microsoft SMTP Server
id 15.2.1544.11; Mon, 9 Sep 2024 17:07:05 +0200
Received: from breslau.. (seliicwb00002.seli.gic.ericsson.se [10.156.25.100])
by seliicinfr00049.seli.gic.ericsson.se (Postfix) with ESMTP id
03503380061; Mon, 9 Sep 2024 17:07:05 +0200 (CEST)
From: =?UTF-8?q?Mattias=20R=C3=B6nnblom?= <mattias.ronnblom@ericsson.com>
To: <dev@dpdk.org>
CC: <hofors@lysator.liu.se>, Heng Wang <heng.wang@ericsson.com>, "Stephen
Hemminger" <stephen@networkplumber.org>, Tyler Retzlaff
<roretzla@linux.microsoft.com>, =?UTF-8?q?Morten=20Br=C3=B8rup?=
<mb@smartsharesystems.com>, Jack Bond-Preston
<jack.bond-preston@foss.arm.com>, David Marchand <david.marchand@redhat.com>,
=?UTF-8?q?Mattias=20R=C3=B6nnblom?= <mattias.ronnblom@ericsson.com>
Subject: [PATCH v4 2/6] eal: extend bit manipulation functionality
Date: Mon, 9 Sep 2024 16:57:39 +0200
Message-ID: <20240909145743.697342-3-mattias.ronnblom@ericsson.com>
X-Mailer: git-send-email 2.34.1
In-Reply-To: <20240909145743.697342-1-mattias.ronnblom@ericsson.com>
References: <20240812124930.604796-2-mattias.ronnblom@ericsson.com>
<20240909145743.697342-1-mattias.ronnblom@ericsson.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: 8bit
X-EOPAttributedMessage: 0
X-MS-PublicTrafficType: Email
X-MS-TrafficTypeDiagnostic: AMS1EPF00000040:EE_|DB8PR07MB6217:EE_
X-MS-Office365-Filtering-Correlation-Id: b2f5616f-daf9-4667-76fc-08dcd0e1113e
X-MS-Exchange-SenderADCheck: 1
X-MS-Exchange-AntiSpam-Relay: 0
X-Microsoft-Antispam: BCL:0;
ARA:13230040|36860700013|376014|1800799024|82310400026;
X-Microsoft-Antispam-Message-Info: =?utf-8?B?TVZWM0czZGlzYWdsYi9RZzV6TCs2b1FUSStKa3lGVm5oak5mRkNQWWJKayth?=
=?utf-8?B?Yko1TVcyNnhaTTdiSmh4dVF5eHh3dHA2Z1c2OGh0NW9UYWF1bUFuT29lbXlu?=
=?utf-8?B?enRBcDgrZ2t4aWE4cGdiK1BDZ0RiL1gzK2tMbHRWbTV3TzNVV09CaUZYVnZs?=
=?utf-8?B?QmlFYUlHeldCbTY0WkFqMVNxK3kyeDZkZW10cGw1QXA3VnhJNDNndkJjeGw0?=
=?utf-8?B?L2I5S2JJamxtTThKSnpqZUxPQy9GL0VEYUM5akMyWFlweGpjME1WNU8wQ1dq?=
=?utf-8?B?TUMrdFIyMHp2bTFzQkIvcXVyT28wVjNPQnVCeGVrZXl0K2x5WFQ4N3RiYkxK?=
=?utf-8?B?T2NacmJLNnY5aWNhMFZmWEhXMVZ3VnZaQTVxdlE0WjJyK3h5aFV1YUUwOHl2?=
=?utf-8?B?NjJFVmlHRHl5RTh6U1ZEMk1CVUxQS1ducy8yeENmNVI0WjBkMDhPMjYwRm0r?=
=?utf-8?B?aWFsdEVBd1MxZys1cHMwVThJb2hmakNidHpqUFBLV0t0bzFmSzc0dUMzNUZC?=
=?utf-8?B?SlQ1dFU5NDFGRnBHcVJ4T0lOQ2w5Uk9UdmtONUpRTXE0SHFleTZSNExMaXo1?=
=?utf-8?B?RHQ3LzVjcExmNXNpQzRUVEExangvb0E2cTl0YXk0VEh0RmU4MXp5bVdjcFJX?=
=?utf-8?B?RjY3SThEOUlzTzZLcEJqWWMzZEhzYXNvdGdNL0Mxa3ZKQjFiUmZxZUEzMDdO?=
=?utf-8?B?VjVUUVRob3NIcFZ6eXZwMURUbmpGdzkzMFFEd1NoUXpVWTdialBXaUI0QVJk?=
=?utf-8?B?L1VDM1hhYW1HWm1wQ01mQ3o1YVdxL3Q3VlNld1ZlSE1JdElhcE1EVWJVNVpT?=
=?utf-8?B?QW81TlBqU3FhL0dydGJyTXNDZVZTSFkyREVqSG1Ga0h3eWxwOG0xNlkra0t3?=
=?utf-8?B?SG5pOFh1d1RMN0hxa0JXZkVJbUk1UDhxV0h3VG9ZSnZRdTZ2c3pBbzRzSm50?=
=?utf-8?B?c2dBZml3ZHJ4ZWo2cDdBajNqVHhwSzNCZjIrdDZuU1RraHZJNHpTREFkRGJR?=
=?utf-8?B?NkpMSnoyOEJQTXUycEQ0Y2RkeTZFSC8rWTBrVWdaRFJxWGNZTWEwZC9ROERu?=
=?utf-8?B?K2JsTmdkaDNzbXZpZ2MvOUlpaFlBeFlRYlpSemhnMGUxbmhYeGlDS0dwYUVl?=
=?utf-8?B?cjdQYmpaSGhzc1ljeldhM0lZOFBJak5QRDhoRzA2RzlQbU85a3ZHSUFFYjc0?=
=?utf-8?B?QkYxNFB4VUNXTkdSc3V3MmJlcjVzeGkvTHROdTdUalVDc0ppTEQxUVcrQWlP?=
=?utf-8?B?eHlxTldKdDB5OHJiMng0RWQ0bHNSbUdlL1VYTnI0WCtwb3VjampXaEhzOVdY?=
=?utf-8?B?TEswZnVqL3V6eFd6d1F5aWFMYmZiZTVuU3pzajk0ZEFCbUN1THhNMzdCeEpN?=
=?utf-8?B?U0M5UWtpUlNFRmZpdWM2MjllanRrS0tnb3JxSjVha3ovS2h6MnY5YWRWdHBj?=
=?utf-8?B?QTlOb2p0Mzl1VzhyVEp0YVBnZjlVaHZJZ3NNZjNPSVpCemtJdk4rNlg0b21u?=
=?utf-8?B?enR2ZnVGKzl5K1VZZy9PSGQzVjVBYXFTbVlialMrYWJWVFdjTWlwZHg1b2tI?=
=?utf-8?B?TjhrKzMwUTAwd3EyTENtZ3VDeU5FSk5ZZlFmamFyRXdqbmVjU2FhUExCRFdj?=
=?utf-8?B?WXNBYUZPeDJkM2ZyUXRtV0xiQmNUR0Z1YXQxRGV6NDNzVVJWUDFNSVZGS2Qw?=
=?utf-8?B?MVRabHNvUDlPY2lCcHdUZERCR25KWlZXSEdHYmRMbUZuV0hoNGs0NmV0cnht?=
=?utf-8?B?cU5NT3pxUGRFeE82aTRpVlB0a21QalRZKzFQZ2p2cUpNUkdMY2ZqcXp0Y3px?=
=?utf-8?B?SXFKQ1pkQjBxV0hyamI4NGJZeVIrQzdjR1UyTStvQlpQYmtwOUI3cHBNbGpu?=
=?utf-8?B?Z2xGbmJib1l1Rm1aaURSUml6cVlobmNRdGxNVkJ4NFBNRDlUZmR3d3VoN1Yw?=
=?utf-8?Q?o/X/XEUhnqvOcVpsCA4Zs3dNycmtSehF?=
X-Forefront-Antispam-Report: CIP:192.176.1.74; CTRY:SE; LANG:en; SCL:1; SRV:;
IPV:NLI; SFV:NSPM; H:oa.msg.ericsson.com; PTR:office365.se.ericsson.net;
CAT:NONE; SFS:(13230040)(36860700013)(376014)(1800799024)(82310400026);
DIR:OUT; SFP:1101;
X-OriginatorOrg: ericsson.com
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Sep 2024 15:07:05.4824 (UTC)
X-MS-Exchange-CrossTenant-Network-Message-Id: b2f5616f-daf9-4667-76fc-08dcd0e1113e
X-MS-Exchange-CrossTenant-Id: 92e84ceb-fbfd-47ab-be52-080c6b87953f
X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=92e84ceb-fbfd-47ab-be52-080c6b87953f; Ip=[192.176.1.74];
Helo=[oa.msg.ericsson.com]
X-MS-Exchange-CrossTenant-AuthSource: AMS1EPF00000040.eurprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Anonymous
X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB8PR07MB6217
X-BeenThere: dev@dpdk.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: DPDK patches and discussions <dev.dpdk.org>
List-Unsubscribe: <https://mails.dpdk.org/options/dev>,
<mailto:dev-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://mails.dpdk.org/archives/dev/>
List-Post: <mailto:dev@dpdk.org>
List-Help: <mailto:dev-request@dpdk.org?subject=help>
List-Subscribe: <https://mails.dpdk.org/listinfo/dev>,
<mailto:dev-request@dpdk.org?subject=subscribe>
Errors-To: dev-bounces@dpdk.org
Add functionality to test and modify the value of individual bits in
32-bit or 64-bit words.
These functions have no implications on memory ordering, atomicity and
does not use volatile and thus does not prevent any compiler
optimizations.
Signed-off-by: Mattias Rönnblom <mattias.ronnblom@ericsson.com>
Acked-by: Morten Brørup <mb@smartsharesystems.com>
Acked-by: Tyler Retzlaff <roretzla@linux.microsoft.com>
Acked-by: Jack Bond-Preston <jack.bond-preston@foss.arm.com>
--
PATCH v3:
* Remove unnecessary <rte_compat.h> include.
* Remove redundant 'fun' parameter from the __RTE_GEN_BIT_*() macros
(Jack Bond-Preston).
* Introduce __RTE_BIT_BIT_OPS() macro, consistent with how things
are done when generating the atomic bit operations.
* Refer to volatile bit op functions as variants instead of families
(macro parameter naming).
RFC v6:
* Have rte_bit_test() accept const-marked bitsets.
RFC v4:
* Add rte_bit_flip() which, believe it or not, flips the value of a bit.
* Mark macro-generated private functions as experimental.
* Use macros to generate *assign*() functions.
RFC v3:
* Work around lack of C++ support for _Generic (Tyler Retzlaff).
* Fix ','-related checkpatch warnings.
---
lib/eal/include/rte_bitops.h | 260 ++++++++++++++++++++++++++++++++++-
1 file changed, 258 insertions(+), 2 deletions(-)
diff --git a/lib/eal/include/rte_bitops.h b/lib/eal/include/rte_bitops.h
index 449565eeae..6915b945ba 100644
--- a/lib/eal/include/rte_bitops.h
+++ b/lib/eal/include/rte_bitops.h
@@ -2,6 +2,7 @@
* Copyright(c) 2020 Arm Limited
* Copyright(c) 2010-2019 Intel Corporation
* Copyright(c) 2023 Microsoft Corporation
+ * Copyright(c) 2024 Ericsson AB
*/
#ifndef _RTE_BITOPS_H_
@@ -11,12 +12,14 @@
* @file
* Bit Operations
*
- * This file defines a family of APIs for bit operations
- * without enforcing memory ordering.
+ * This file provides functionality for low-level, single-word
+ * arithmetic and bit-level operations, such as counting or
+ * setting individual bits.
*/
#include <stdint.h>
+#include <rte_compat.h>
#include <rte_debug.h>
#ifdef __cplusplus
@@ -105,6 +108,197 @@ extern "C" {
#define RTE_FIELD_GET64(mask, reg) \
((typeof(mask))(((reg) & (mask)) >> rte_ctz64(mask)))
+/**
+ * @warning
+ * @b EXPERIMENTAL: this API may change without prior notice.
+ *
+ * Test bit in word.
+ *
+ * Generic selection macro to test the value of a bit in a 32-bit or
+ * 64-bit word. The type of operation depends on the type of the @c
+ * addr parameter.
+ *
+ * This macro does not give any guarantees in regards to memory
+ * ordering or atomicity.
+ *
+ * @param addr
+ * A pointer to the word to modify.
+ * @param nr
+ * The index of the bit.
+ */
+#define rte_bit_test(addr, nr) \
+ _Generic((addr), \
+ uint32_t *: __rte_bit_test32, \
+ const uint32_t *: __rte_bit_test32, \
+ uint64_t *: __rte_bit_test64, \
+ const uint64_t *: __rte_bit_test64)(addr, nr)
+
+/**
+ * @warning
+ * @b EXPERIMENTAL: this API may change without prior notice.
+ *
+ * Set bit in word.
+ *
+ * Generic selection macro to set a bit in a 32-bit or 64-bit
+ * word. The type of operation depends on the type of the @c addr
+ * parameter.
+ *
+ * This macro does not give any guarantees in regards to memory
+ * ordering or atomicity.
+ *
+ * @param addr
+ * A pointer to the word to modify.
+ * @param nr
+ * The index of the bit.
+ */
+#define rte_bit_set(addr, nr) \
+ _Generic((addr), \
+ uint32_t *: __rte_bit_set32, \
+ uint64_t *: __rte_bit_set64)(addr, nr)
+
+/**
+ * @warning
+ * @b EXPERIMENTAL: this API may change without prior notice.
+ *
+ * Clear bit in word.
+ *
+ * Generic selection macro to clear a bit in a 32-bit or 64-bit
+ * word. The type of operation depends on the type of the @c addr
+ * parameter.
+ *
+ * This macro does not give any guarantees in regards to memory
+ * ordering or atomicity.
+ *
+ * @param addr
+ * A pointer to the word to modify.
+ * @param nr
+ * The index of the bit.
+ */
+#define rte_bit_clear(addr, nr) \
+ _Generic((addr), \
+ uint32_t *: __rte_bit_clear32, \
+ uint64_t *: __rte_bit_clear64)(addr, nr)
+
+/**
+ * @warning
+ * @b EXPERIMENTAL: this API may change without prior notice.
+ *
+ * Assign a value to a bit in word.
+ *
+ * Generic selection macro to assign a value to a bit in a 32-bit or 64-bit
+ * word. The type of operation depends on the type of the @c addr parameter.
+ *
+ * This macro does not give any guarantees in regards to memory
+ * ordering or atomicity.
+ *
+ * @param addr
+ * A pointer to the word to modify.
+ * @param nr
+ * The index of the bit.
+ * @param value
+ * The new value of the bit - true for '1', or false for '0'.
+ */
+#define rte_bit_assign(addr, nr, value) \
+ _Generic((addr), \
+ uint32_t *: __rte_bit_assign32, \
+ uint64_t *: __rte_bit_assign64)(addr, nr, value)
+
+/**
+ * @warning
+ * @b EXPERIMENTAL: this API may change without prior notice.
+ *
+ * Flip a bit in word.
+ *
+ * Generic selection macro to change the value of a bit to '0' if '1'
+ * or '1' if '0' in a 32-bit or 64-bit word. The type of operation
+ * depends on the type of the @c addr parameter.
+ *
+ * This macro does not give any guarantees in regards to memory
+ * ordering or atomicity.
+ *
+ * @param addr
+ * A pointer to the word to modify.
+ * @param nr
+ * The index of the bit.
+ */
+#define rte_bit_flip(addr, nr) \
+ _Generic((addr), \
+ uint32_t *: __rte_bit_flip32, \
+ uint64_t *: __rte_bit_flip64)(addr, nr)
+
+#define __RTE_GEN_BIT_TEST(variant, qualifier, size) \
+ __rte_experimental \
+ static inline bool \
+ __rte_bit_ ## variant ## test ## size(const qualifier uint ## size ## _t *addr, \
+ unsigned int nr) \
+ { \
+ RTE_ASSERT(nr < size); \
+ \
+ uint ## size ## _t mask = (uint ## size ## _t)1 << nr; \
+ return *addr & mask; \
+ }
+
+#define __RTE_GEN_BIT_SET(variant, qualifier, size) \
+ __rte_experimental \
+ static inline void \
+ __rte_bit_ ## variant ## set ## size(qualifier uint ## size ## _t *addr, \
+ unsigned int nr) \
+ { \
+ RTE_ASSERT(nr < size); \
+ \
+ uint ## size ## _t mask = (uint ## size ## _t)1 << nr; \
+ *addr |= mask; \
+ } \
+
+#define __RTE_GEN_BIT_CLEAR(variant, qualifier, size) \
+ __rte_experimental \
+ static inline void \
+ __rte_bit_ ## variant ## clear ## size(qualifier uint ## size ## _t *addr, \
+ unsigned int nr) \
+ { \
+ RTE_ASSERT(nr < size); \
+ \
+ uint ## size ## _t mask = ~((uint ## size ## _t)1 << nr); \
+ (*addr) &= mask; \
+ } \
+
+#define __RTE_GEN_BIT_ASSIGN(variant, qualifier, size) \
+ __rte_experimental \
+ static inline void \
+ __rte_bit_ ## variant ## assign ## size(qualifier uint ## size ## _t *addr, \
+ unsigned int nr, bool value) \
+ { \
+ if (value) \
+ __rte_bit_ ## variant ## set ## size(addr, nr); \
+ else \
+ __rte_bit_ ## variant ## clear ## size(addr, nr); \
+ }
+
+#define __RTE_GEN_BIT_FLIP(variant, qualifier, size) \
+ __rte_experimental \
+ static inline void \
+ __rte_bit_ ## variant ## flip ## size(qualifier uint ## size ## _t *addr, \
+ unsigned int nr) \
+ { \
+ bool value; \
+ \
+ value = __rte_bit_ ## variant ## test ## size(addr, nr); \
+ __rte_bit_ ## variant ## assign ## size(addr, nr, !value); \
+ }
+
+#define __RTE_GEN_BIT_OPS(v, qualifier, size) \
+ __RTE_GEN_BIT_TEST(v, qualifier, size) \
+ __RTE_GEN_BIT_SET(v, qualifier, size) \
+ __RTE_GEN_BIT_CLEAR(v, qualifier, size) \
+ __RTE_GEN_BIT_ASSIGN(v, qualifier, size) \
+ __RTE_GEN_BIT_FLIP(v, qualifier, size)
+
+#define __RTE_GEN_BIT_OPS_SIZE(size) \
+ __RTE_GEN_BIT_OPS(,, size)
+
+__RTE_GEN_BIT_OPS_SIZE(32)
+__RTE_GEN_BIT_OPS_SIZE(64)
+
/*------------------------ 32-bit relaxed operations ------------------------*/
/**
@@ -787,6 +981,68 @@ rte_log2_u64(uint64_t v)
#ifdef __cplusplus
}
+
+/*
+ * Since C++ doesn't support generic selection (i.e., _Generic),
+ * function overloading is used instead. Such functions must be
+ * defined outside 'extern "C"' to be accepted by the compiler.
+ */
+
+#undef rte_bit_test
+#undef rte_bit_set
+#undef rte_bit_clear
+#undef rte_bit_assign
+#undef rte_bit_flip
+
+#define __RTE_BIT_OVERLOAD_SZ_2(fun, qualifier, size, arg1_type, arg1_name) \
+ static inline void \
+ rte_bit_ ## fun(qualifier uint ## size ## _t *addr, \
+ arg1_type arg1_name) \
+ { \
+ __rte_bit_ ## fun ## size(addr, arg1_name); \
+ }
+
+#define __RTE_BIT_OVERLOAD_2(fun, qualifier, arg1_type, arg1_name) \
+ __RTE_BIT_OVERLOAD_SZ_2(fun, qualifier, 32, arg1_type, arg1_name) \
+ __RTE_BIT_OVERLOAD_SZ_2(fun, qualifier, 64, arg1_type, arg1_name)
+
+#define __RTE_BIT_OVERLOAD_SZ_2R(fun, qualifier, size, ret_type, arg1_type, \
+ arg1_name) \
+ static inline ret_type \
+ rte_bit_ ## fun(qualifier uint ## size ## _t *addr, \
+ arg1_type arg1_name) \
+ { \
+ return __rte_bit_ ## fun ## size(addr, arg1_name); \
+ }
+
+#define __RTE_BIT_OVERLOAD_2R(fun, qualifier, ret_type, arg1_type, arg1_name) \
+ __RTE_BIT_OVERLOAD_SZ_2R(fun, qualifier, 32, ret_type, arg1_type, \
+ arg1_name) \
+ __RTE_BIT_OVERLOAD_SZ_2R(fun, qualifier, 64, ret_type, arg1_type, \
+ arg1_name)
+
+#define __RTE_BIT_OVERLOAD_SZ_3(fun, qualifier, size, arg1_type, arg1_name, \
+ arg2_type, arg2_name) \
+ static inline void \
+ rte_bit_ ## fun(uint ## size ## _t *addr, arg1_type arg1_name, \
+ arg2_type arg2_name) \
+ { \
+ __rte_bit_ ## fun ## size(addr, arg1_name, arg2_name); \
+ }
+
+#define __RTE_BIT_OVERLOAD_3(fun, qualifier, arg1_type, arg1_name, arg2_type, \
+ arg2_name) \
+ __RTE_BIT_OVERLOAD_SZ_3(fun, qualifier, 32, arg1_type, arg1_name, \
+ arg2_type, arg2_name) \
+ __RTE_BIT_OVERLOAD_SZ_3(fun, qualifier, 64, arg1_type, arg1_name, \
+ arg2_type, arg2_name)
+
+__RTE_BIT_OVERLOAD_2R(test, const, bool, unsigned int, nr)
+__RTE_BIT_OVERLOAD_2(set,, unsigned int, nr)
+__RTE_BIT_OVERLOAD_2(clear,, unsigned int, nr)
+__RTE_BIT_OVERLOAD_3(assign,, unsigned int, nr, bool, value)
+__RTE_BIT_OVERLOAD_2(flip,, unsigned int, nr)
+
#endif
#endif /* _RTE_BITOPS_H_ */
--
2.34.1