From 7660614c11e2079ac1bb09671f3058a6d1c7c755 Mon Sep 17 00:00:00 2001 From: Joyce Kong Date: Mon, 27 Apr 2020 15:58:52 +0800 Subject: [PATCH] test/bitops: add bit operations test case Add test cases for setting bit, clearing bit, testing and setting bit, testing and clearing bit operation. Signed-off-by: Joyce Kong Reviewed-by: Gavin Hu Reviewed-by: Phil Yang --- MAINTAINERS | 1 + app/test/Makefile | 1 + app/test/autotest_data.py | 6 ++ app/test/meson.build | 2 + app/test/test_bitops.c | 138 ++++++++++++++++++++++++++++++++++++++ 5 files changed, 148 insertions(+) create mode 100644 app/test/test_bitops.c diff --git a/MAINTAINERS b/MAINTAINERS index 71410478fc..816696caf2 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -249,6 +249,7 @@ F: app/test/test_service_cores.c Bitops M: Joyce Kong F: lib/librte_eal/include/rte_bitops.h +F: app/test/test_bitops.c Bitmap M: Cristian Dumitrescu diff --git a/app/test/Makefile b/app/test/Makefile index 5b119aa612..7b96a03a64 100644 --- a/app/test/Makefile +++ b/app/test/Makefile @@ -70,6 +70,7 @@ SRCS-y += test_ticketlock.c SRCS-y += test_memory.c SRCS-y += test_memzone.c SRCS-y += test_bitmap.c +SRCS-y += test_bitops.c SRCS-y += test_reciprocal_division.c SRCS-y += test_reciprocal_division_perf.c SRCS-y += test_fbarray.c diff --git a/app/test/autotest_data.py b/app/test/autotest_data.py index 7b1d01389b..fc3fcc159e 100644 --- a/app/test/autotest_data.py +++ b/app/test/autotest_data.py @@ -404,6 +404,12 @@ "Func": default_autotest, "Report": None, }, + { + "Name": "Bitops test", + "Command": "bitops_test", + "Func": default_autotest, + "Report": None, + }, { "Name": "Hash multiwriter autotest", "Command": "hash_multiwriter_autotest", diff --git a/app/test/meson.build b/app/test/meson.build index 1715ddbcb8..5233ead46e 100644 --- a/app/test/meson.build +++ b/app/test/meson.build @@ -12,6 +12,7 @@ test_sources = files('commands.c', 'test_alarm.c', 'test_atomic.c', 'test_barrier.c', + 'test_bitops.c', 'test_bpf.c', 'test_byteorder.c', 'test_cmdline.c', @@ -176,6 +177,7 @@ fast_tests = [ ['acl_autotest', true], ['alarm_autotest', false], ['atomic_autotest', false], + ['bitops_autotest', true], ['byteorder_autotest', true], ['cmdline_autotest', true], ['common_autotest', true], diff --git a/app/test/test_bitops.c b/app/test/test_bitops.c new file mode 100644 index 0000000000..c21426bf2f --- /dev/null +++ b/app/test/test_bitops.c @@ -0,0 +1,138 @@ +/* SPDX-License-Identifier: BSD-3-Clause + * Copyright(c) 2019 Arm Limited + */ + +#include +#include +#include "test.h" + +uint32_t val32; +uint64_t val64; + +#define MAX_BITS_32 32 +#define MAX_BITS_64 64 + +/* + * Bitops functions + * ================ + * + * - The main test function performs several subtests. + * - Check bit operations on one core. + * - Initialize valXX to specified values, then set each bit of valXX + * to 1 one by one in "test_bit_relaxed_set". + * + * - Clear each bit of valXX to 0 one by one in "test_bit_relaxed_clear". + * + * - Function "test_bit_relaxed_test_set_clear" checks whether each bit + * of valXX can do "test and set" and "test and clear" correctly. + */ + +static int +test_bit_relaxed_set(void) +{ + unsigned int i; + + for (i = 0; i < MAX_BITS_32; i++) + rte_bit_relaxed_set32(i, &val32); + + for (i = 0; i < MAX_BITS_32; i++) + if (!rte_bit_relaxed_get32(i, &val32)) { + printf("Failed to set bit in relaxed version.\n"); + return TEST_FAILED; + } + + for (i = 0; i < MAX_BITS_64; i++) + rte_bit_relaxed_set64(i, &val64); + + for (i = 0; i < MAX_BITS_64; i++) + if (!rte_bit_relaxed_get64(i, &val64)) { + printf("Failed to set bit in relaxed version.\n"); + return TEST_FAILED; + } + + return TEST_SUCCESS; +} + +static int +test_bit_relaxed_clear(void) +{ + unsigned int i; + + for (i = 0; i < MAX_BITS_32; i++) + rte_bit_relaxed_clear32(i, &val32); + + for (i = 0; i < MAX_BITS_32; i++) + if (rte_bit_relaxed_get32(i, &val32)) { + printf("Failed to clear bit in relaxed version.\n"); + return TEST_FAILED; + } + + for (i = 0; i < MAX_BITS_64; i++) + rte_bit_relaxed_clear64(i, &val64); + + for (i = 0; i < MAX_BITS_64; i++) + if (rte_bit_relaxed_get64(i, &val64)) { + printf("Failed to clear bit in relaxed version.\n"); + return TEST_FAILED; + } + + return TEST_SUCCESS; +} + +static int +test_bit_relaxed_test_set_clear(void) +{ + unsigned int i; + + for (i = 0; i < MAX_BITS_32; i++) + rte_bit_relaxed_test_and_set32(i, &val32); + + for (i = 0; i < MAX_BITS_32; i++) + if (!rte_bit_relaxed_test_and_clear32(i, &val32)) { + printf("Failed to set and test bit in relaxed version.\n"); + return TEST_FAILED; + } + + for (i = 0; i < MAX_BITS_32; i++) + if (rte_bit_relaxed_get32(i, &val32)) { + printf("Failed to test and clear bit in relaxed version.\n"); + return TEST_FAILED; + } + + for (i = 0; i < MAX_BITS_64; i++) + rte_bit_relaxed_test_and_set64(i, &val64); + + for (i = 0; i < MAX_BITS_64; i++) + if (!rte_bit_relaxed_test_and_clear64(i, &val64)) { + printf("Failed to set and test bit in relaxed version.\n"); + return TEST_FAILED; + } + + for (i = 0; i < MAX_BITS_64; i++) + if (rte_bit_relaxed_get64(i, &val64)) { + printf("Failed to test and clear bit in relaxed version.\n"); + return TEST_FAILED; + } + + return TEST_SUCCESS; +} + +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; +} + +REGISTER_TEST_COMMAND(bitops_autotest, test_bitops);