From patchwork Mon Aug 12 12:49:27 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Mattias_R=C3=B6nnblom?= X-Patchwork-Id: 143070 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.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 ; 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_R=C3=B6nnblom?= To: CC: , Heng Wang , "Stephen Hemminger" , Tyler Retzlaff , =?utf-8?q?Morten_Br=C3=B8rup?= , Jack Bond-Preston , =?utf-8?q?Mattias_R?= =?utf-8?q?=C3=B6nnblom?= 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 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?q?7FYBP2IHU0FVQs5WysoYM/TuEbAZen7?= =?utf-8?q?YB44/oo4SCfV7SenX/VJTTaTJ6W1XQCvxMs3GlkabZMjfwoK3ztUfgORAtQxrhthz?= =?utf-8?q?JdADA9EAguhDCCMRr/uLJZYQfUPZB8BoxAxTW3Z4RtG6ijANB6Ei6SL7HkwxlUdOW?= =?utf-8?q?VTh7zoc/wU7kpxaOU6r7FWDvWNR7SBlw806nMY6REg5kbJ2yok0D8Q3tTOTEtFQAx?= =?utf-8?q?qnYPYjRMZ0puM8fpJm1g4LOldDmWjWkgxb/Gl6Ivv08EgVzglA4prpGLosrt/6VlE?= =?utf-8?q?9RmoJKj3ZQtx6ROI/wQFyODTcMbwUovl+4XLnZYI64XcI+h5WqcPIS37NY9SI13uO?= =?utf-8?q?RENZ0GZmhZe4ND3DGwrsXLeVDMbHo6cHNETXm9DAJdmEUoqSAsnM85vt5FA9KN6td?= =?utf-8?q?a6KFV6p/CGfeoqQbzXdgXA9hBCDGCeO2QeOxe1masQleV/ByDNuDrYSd2zu5KsGxW?= =?utf-8?q?dRdblqBpd6rzJ6rNIiZyKwPpFLZoNbNOEWUjjvXUFakrBdhdPVkfg9VqeA/rt0Sd+?= =?utf-8?q?qQO2wsllopB+Px/V02yGhWCCFSnFTBeQEWa3HS26iTt3Zn3lXsqjgX9xBG7QkQ3Ao?= =?utf-8?q?oNT9QALSNHTvMGW7kJQ3lgWcDUXcnIZlA5neYU3gzaltpPMZKAyvb2uV4f8+qunBp?= =?utf-8?q?MpwsmL/fNbQDoKATv3RIqRpXAG/n1wi/26iJrqclulvywYoxTvbnBG1ZzhaXY4ttY?= =?utf-8?q?Yaj/yxQ2fpVZjSgGYNPRSgmLPIiNnnebRmqr8RoHnJq+4VEu+g6we2wKCvOugJhWY?= =?utf-8?q?wC2puOHCf8znLYj0+pBf72gULyGsWxxqOEa4G4xezHdPG1pM3s0e7wAJH7n4TPd+S?= =?utf-8?q?LUF1lwd4k6Z9NieCOM5gRiLya48sg86XqEUIK3lGsDo/JgqQzscJbM64O1HKaChmH?= =?utf-8?q?NWu3WpaYww3kca+NB9uEnqELDyPj88w3iX59/ChinVGirycF6rNeHMlP/nNnNYXpS?= =?utf-8?q?LaaUj6lrMsbIqrOYIUlAn/DOQM3gnKn5QOS9FlgmCFU/BKUsxq03zp8CPWuQJQwCt?= =?utf-8?q?9/NmBjmqiMHn4GcxPgy7xl9mlNYDaV5Hr15rTBbzlJj6YiUsRlUn+w+pfh6lNNU5o?= =?utf-8?q?4mfNvmE2Xs5361tOXBOp3gRwT2GMpGg+aNhGZnQ+AyABK/DsReGiXEdJPlnTLsHIU?= =?utf-8?q?qf7S+4N5QwJXCoX2MlTkOOOfM8sDnPAPK1uiPLSJ1XDmxPOvH6t4/BfxRay6lORKI?= =?utf-8?q?Y0ErR0ubEmro1Ok3/49/GWbeAJouw3xL8cH0LVZ+vKENwKIgP10ys8vh4VOvfjhzn?= =?utf-8?q?VNHn39wY0DbDNWW/3rxa70U/vIhM2o4wqj82zHqoV05uYJkx608rECp7K/M6Kqr+2?= =?utf-8?q?WJVrkwk/klHs4dtrBok4K0pRSIuuvEXqDA=3D=3D?= 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-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 Acked-by: Morten Brørup Acked-by: Tyler Retzlaff Acked-by: Jack Bond-Preston --- 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 + #include #include +#include #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);