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 28ACC457A1;
Mon, 12 Aug 2024 14:59:11 +0200 (CEST)
Received: from mails.dpdk.org (localhost [127.0.0.1])
by mails.dpdk.org (Postfix) with ESMTP id CCA1240654;
Mon, 12 Aug 2024 14:59:07 +0200 (CEST)
Received: from EUR05-VI1-obe.outbound.protection.outlook.com
(mail-vi1eur05on2054.outbound.protection.outlook.com [40.107.21.54])
by mails.dpdk.org (Postfix) with ESMTP id B84224066A
for <dev@dpdk.org>; Mon, 12 Aug 2024 14:59:05 +0200 (CEST)
ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none;
b=wHfImwp1jg+u7r/EV49sv4UYe6aRwlcdfQTZzaBzysEk8Ni2i4iwnptWaml8zpXjMRxJWVWAyEaQFxCz45fOfVjHxTWSe98q6mxz3HLypyBXHs7Q47wgbLr/iA6ba/NDUI3VbGh9cz8aLZh+FMEH2/TYCJ5JwU/IV/jtWQ2DifIpfk2oRQb9SFhpHW/xTE5wORqhLfrnMBVkUky8GrMDnWvRkAowJdh6+DSXNpfuVcTVNuiTCec4GNwZNm/JAyN7NDqN8u60non1AZDMCL1X+QnlpAreIVtiqKb5hhrSHjBJPCxUyLouCmx7c5X9MibvDtGb73weLL/Ulu4X3rv2qQ==
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=rlj6TbwktGuphxsLT7E1iv4WZ/+LLJlVUku+K2BR9LA=;
b=vWKS0hu9E8XknSD16EEBS+xL5lZUp4AYR/nSvErDwk7yegFhUgzH1oyTxScHAc0o+zFYUCiPNjbV97QKq78xJrghe3qVJjwT88Ebp45+owZOOzjh6jPjoV92kELhOStah3gFzcj6qRpCwOZir4Ue2/Ev9f9qUcxuT5WCGLPVbLYjUEsH4zFhIYyOItlGrqmPQSZC8kPDfk9YDxDIHQ5cpHWzwlqaSChBGjJAM+QmKYgQ/yGgAzq/5BwmGXUOxklGt6Rx/qs9fCC2873kxXF6hmCDOz3apJMK+Efdy9+eOpHDczl00sjlWdULfDk1OsZ4PcXsU/2WDFCGLROl2IMQBQ==
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=rlj6TbwktGuphxsLT7E1iv4WZ/+LLJlVUku+K2BR9LA=;
b=cT//4uHMtaZRxzNQBYvoDfFwweIgWDP8TF01QA3cFLzrzJ92EvYPfgnC10ROQjr/5KxJXaDDaTlkALlHzdsRPn+/2hw258zwOccvsgIZZGH4qxQ2ZGXwiIZr8XA4uCTr8rl3UBB4zGhqH0OoAf9yylN4uSdTn4BcIK7o0OpKiTauiVaysG+yw0nrCjLbrZ1oGgA7O0uKoFIbrwiR7QPGMWICdqauJw7c15uTTdVT3N/5NCbOJ6HCpgcgDcGJTzefVVGog7T9bOzH+hPWnsQmhEOPB0IOuKWGR8uFsXyPckV4QFqjuz1cd/yEDV3GWiX5iqc1GrwuKfFsZmJNkiMh6A==
Received: from AM0PR06CA0144.eurprd06.prod.outlook.com (2603:10a6:208:ab::49)
by VI1PR07MB6431.eurprd07.prod.outlook.com (2603:10a6:800:13f::22)
with Microsoft SMTP Server (version=TLS1_2,
cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7849.22; Mon, 12 Aug
2024 12:59:03 +0000
Received: from AM3PEPF00009BA1.eurprd04.prod.outlook.com
(2603:10a6:208:ab:cafe::b1) by AM0PR06CA0144.outlook.office365.com
(2603:10a6:208:ab::49) with Microsoft SMTP Server (version=TLS1_2,
cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7849.20 via Frontend
Transport; Mon, 12 Aug 2024 12:59:03 +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
AM3PEPF00009BA1.mail.protection.outlook.com (10.167.16.26) with Microsoft
SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id
15.20.7849.8 via Frontend Transport; Mon, 12 Aug 2024 12:59:03 +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, 12 Aug 2024 14:59:03 +0200
Received: from breslau.. (seliicwb00002.seli.gic.ericsson.se [10.156.25.100])
by seliicinfr00049.seli.gic.ericsson.se (Postfix) with ESMTP id
0357038007A; Mon, 12 Aug 2024 14:59:03 +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>, =?UTF-8?q?Mattias=20R=C3=B6nnblom?=
<mattias.ronnblom@ericsson.com>
Subject: [PATCH v3 2/5] eal: add unit tests for bit operations
Date: Mon, 12 Aug 2024 14:49:27 +0200
Message-ID: <20240812124930.604796-3-mattias.ronnblom@ericsson.com>
X-Mailer: git-send-email 2.34.1
In-Reply-To: <20240812124930.604796-1-mattias.ronnblom@ericsson.com>
References: <20240809095829.589396-2-mattias.ronnblom@ericsson.com>
<20240812124930.604796-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: AM3PEPF00009BA1:EE_|VI1PR07MB6431:EE_
X-MS-Office365-Filtering-Correlation-Id: d1a75e42-5396-42e4-4a4e-08dcbace8adc
X-MS-Exchange-SenderADCheck: 1
X-MS-Exchange-AntiSpam-Relay: 0
X-Microsoft-Antispam: BCL:0;
ARA:13230040|1800799024|82310400026|36860700013|376014;
X-Microsoft-Antispam-Message-Info: =?utf-8?B?N0ZZQlAySUhVMEZWUXM1V3lzb1lNL1R1RWJBWmVuN1lCNDQvb280U0NmVjdT?=
=?utf-8?B?ZW5YL1ZKVFRhVEo2VzFYUUN2eE1zM0dsa2FiWk1qZndvSzN6dFVmZ09SQXRR?=
=?utf-8?B?eHJodGh6SmRBREE5RUFndWhEQ0NNUnIvdUxKWllRZlVQWkI4Qm94QXhUVzNa?=
=?utf-8?B?NFJ0RzZpakFOQjZFaTZTTDdIa3d4bFVkT1dWVGg3em9jL3dVN2tweGFPVTZy?=
=?utf-8?B?N0ZXRHZXTlI3U0JsdzgwNm5NWTZSRWc1a2JKMnlvazBEOFEzdFRPVEV0RlFB?=
=?utf-8?B?eHFuWVBZalJNWjBwdU04ZnBKbTFnNExPbGREbVdqV2tneGIvR2w2SXZ2MDhF?=
=?utf-8?B?Z1Z6Z2xBNHBycEdMb3NydC82VmxFOVJtb0pLajNaUXR4NlJPSS93UUZ5T0RU?=
=?utf-8?B?Y01id1VvdmwrNFhMblpZSTY0WGNJK2g1V3FjUElTMzdOWTlTSTEzdU9SRU5a?=
=?utf-8?B?MEdabWhaZTRORDNER3dyc1hMZVZETWJIbzZjSE5FVFhtOURBSmRtRVVvcVNB?=
=?utf-8?B?c25NODV2dDVGQTlLTjZ0ZGE2S0ZWNnAvQ0dmZW9xUWJ6WGRnWEE5aEJDREdD?=
=?utf-8?B?ZU8yUWVPeGUxbWFzUWxlVi9CeUROdURyWVNkMnp1NUtzR3hXZFJkYmxxQnBk?=
=?utf-8?B?NnJ6SjZyTklpWnlLd1BwRkxab05iTk9FV1VqanZYVUZha3JCZGhkUFZrZmc5?=
=?utf-8?B?VnFlQS9ydDBTZCtxUU8yd3NsbG9wQitQeC9WMDJ5R2hXQ0NGU25GVEJlUUVX?=
=?utf-8?B?YTNIUzI2aVR0M1puM2xYc3FqZ1g5eEJHN1FrUTNBb29OVDlRQUxTTkhUdk1H?=
=?utf-8?B?VzdrSlEzbGdXY0RVWGNuSVpsQTVuZVlVM2d6YWx0cFBNWktBeXZiMnVWNGY4?=
=?utf-8?B?K3F1bkJwTXB3c21ML2ZOYlFEb0tBVHYzUklxUnBYQUcvbjF3aS8yNmlKcnFj?=
=?utf-8?B?bHVsdnl3WW94VHZibkJHMVp6aGFYWTR0dFlZYWoveXhRMmZwVlpqU2dHWU5Q?=
=?utf-8?B?UlNnbUxQSWlObm5lYlJtcXI4Um9IbkpxKzRWRXUrZzZ3ZTJ3S0N2T3VnSmhX?=
=?utf-8?B?WXdDMnB1T0hDZjh6bkxZajArcEJmNzJnVUx5R3NXeHhxT0VhNEc0eGV6SGRQ?=
=?utf-8?B?RzFwTTNzMGU3d0FKSDduNFRQZCtTTFVGMWx3ZDRrNlo5TmllQ09NNWdSaUx5?=
=?utf-8?B?YTQ4c2c4NlhxRVVJSzNsR3NEby9KZ3FRenNjSmJNNjRPMUhLYUNobUhOV3Uz?=
=?utf-8?B?V3BhWXd3M2tjYStOQjl1RW5xRUxEeVBqODh3M2lYNTkvQ2hpblZHaXJ5Y0Y2?=
=?utf-8?B?ck5lSE1sUC9uTm5OWVhwU0xhYVVqNmxyTXNiSXFyT1lJVWxBbi9ET1FNM2du?=
=?utf-8?B?S241UU9TOUZsZ21DRlUvQktVc3hxMDN6cDhDUFd1UUpRd0N0OS9ObUJqbXFp?=
=?utf-8?B?TUhuNEdjeFBneTd4bDltbE5ZRGFWNUhyMTVyVEJiemxKajZZaVVzUmxVbit3?=
=?utf-8?B?K3BmaDZsTk5VNW80bWZOdm1FMlhzNTM2MXRPWEJPcDNnUndUMkdNcEdnK2FO?=
=?utf-8?B?aEdablErQXlBQksvRHNSZUdpWEVkSlBsblRMc0hJVXFmN1MrNE41UXdKWENv?=
=?utf-8?B?WDJNbFRrT09PZk04c0RuUEFQSzF1aVBMU0oxWERteFBPdkg2dDQvQmZ4UmF5?=
=?utf-8?B?NmxPUktJWTBFclIwdWJFbXJvMU9rMy80OS9HV2JlQUpvdXczeEw4Y0gwTFZa?=
=?utf-8?B?K3ZLRU53S0lnUDEweXM4dmg0Vk92Zmpoem5WTkhuMzl3WTBEYkROV1cvM3J4?=
=?utf-8?B?YTcwVS92SWhNMm80d3FqODJ6SHFvVjA1dVlKa3g2MDhyRUNwN0svTTZLcXIr?=
=?utf-8?B?MldKVnJrd2sva2xIczRkdHJCb2s0SzBwUlNJdXV2RVhxREE9PQ==?=
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)(1800799024)(82310400026)(36860700013)(376014);
DIR:OUT; SFP:1101;
X-OriginatorOrg: ericsson.com
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Aug 2024 12:59:03.5021 (UTC)
X-MS-Exchange-CrossTenant-Network-Message-Id: d1a75e42-5396-42e4-4a4e-08dcbace8adc
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: AM3PEPF00009BA1.eurprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Anonymous
X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem
X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR07MB6431
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
Extend bitops tests to cover the
rte_bit_[test|set|clear|assign|flip]()
functions.
The tests are converted to use the test suite runner framework.
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>
--
RFC v6:
* Test rte_bit_*test() usage through const pointers.
RFC v4:
* Remove redundant line continuations.
---
app/test/test_bitops.c | 85 ++++++++++++++++++++++++++++++++++--------
1 file changed, 70 insertions(+), 15 deletions(-)
diff --git a/app/test/test_bitops.c b/app/test/test_bitops.c
index 0d4ccfb468..322f58c066 100644
--- a/app/test/test_bitops.c
+++ b/app/test/test_bitops.c
@@ -1,13 +1,68 @@
/* SPDX-License-Identifier: BSD-3-Clause
* Copyright(c) 2019 Arm Limited
+ * Copyright(c) 2024 Ericsson AB
*/
+#include <stdbool.h>
+
#include <rte_launch.h>
#include <rte_bitops.h>
+#include <rte_random.h>
#include "test.h"
-uint32_t val32;
-uint64_t val64;
+#define GEN_TEST_BIT_ACCESS(test_name, set_fun, clear_fun, assign_fun, \
+ flip_fun, test_fun, size) \
+ static int \
+ test_name(void) \
+ { \
+ uint ## size ## _t reference = (uint ## size ## _t)rte_rand(); \
+ unsigned int bit_nr; \
+ uint ## size ## _t word = (uint ## size ## _t)rte_rand(); \
+ \
+ for (bit_nr = 0; bit_nr < size; bit_nr++) { \
+ bool reference_bit = (reference >> bit_nr) & 1; \
+ bool assign = rte_rand() & 1; \
+ if (assign) \
+ assign_fun(&word, bit_nr, reference_bit); \
+ else { \
+ if (reference_bit) \
+ set_fun(&word, bit_nr); \
+ else \
+ clear_fun(&word, bit_nr); \
+ \
+ } \
+ TEST_ASSERT(test_fun(&word, bit_nr) == reference_bit, \
+ "Bit %d had unexpected value", bit_nr); \
+ flip_fun(&word, bit_nr); \
+ TEST_ASSERT(test_fun(&word, bit_nr) != reference_bit, \
+ "Bit %d had unflipped value", bit_nr); \
+ flip_fun(&word, bit_nr); \
+ \
+ const uint ## size ## _t *const_ptr = &word; \
+ TEST_ASSERT(test_fun(const_ptr, bit_nr) == \
+ reference_bit, \
+ "Bit %d had unexpected value", bit_nr); \
+ } \
+ \
+ for (bit_nr = 0; bit_nr < size; bit_nr++) { \
+ bool reference_bit = (reference >> bit_nr) & 1; \
+ TEST_ASSERT(test_fun(&word, bit_nr) == reference_bit, \
+ "Bit %d had unexpected value", bit_nr); \
+ } \
+ \
+ TEST_ASSERT(reference == word, "Word had unexpected value"); \
+ \
+ return TEST_SUCCESS; \
+ }
+
+GEN_TEST_BIT_ACCESS(test_bit_access32, rte_bit_set, rte_bit_clear,
+ rte_bit_assign, rte_bit_flip, rte_bit_test, 32)
+
+GEN_TEST_BIT_ACCESS(test_bit_access64, rte_bit_set, rte_bit_clear,
+ rte_bit_assign, rte_bit_flip, rte_bit_test, 64)
+
+static uint32_t val32;
+static uint64_t val64;
#define MAX_BITS_32 32
#define MAX_BITS_64 64
@@ -117,22 +172,22 @@ test_bit_relaxed_test_set_clear(void)
return TEST_SUCCESS;
}
+static struct unit_test_suite test_suite = {
+ .suite_name = "Bitops test suite",
+ .unit_test_cases = {
+ TEST_CASE(test_bit_access32),
+ TEST_CASE(test_bit_access64),
+ TEST_CASE(test_bit_relaxed_set),
+ TEST_CASE(test_bit_relaxed_clear),
+ TEST_CASE(test_bit_relaxed_test_set_clear),
+ TEST_CASES_END()
+ }
+};
+
static int
test_bitops(void)
{
- val32 = 0;
- val64 = 0;
-
- if (test_bit_relaxed_set() < 0)
- return TEST_FAILED;
-
- if (test_bit_relaxed_clear() < 0)
- return TEST_FAILED;
-
- if (test_bit_relaxed_test_set_clear() < 0)
- return TEST_FAILED;
-
- return TEST_SUCCESS;
+ return unit_test_suite_runner(&test_suite);
}
REGISTER_FAST_TEST(bitops_autotest, true, true, test_bitops);
--
2.34.1