From 5e9647fd5a1a1427d926f16ea3a9e77a82bbaad6 Mon Sep 17 00:00:00 2001 From: Nithin Dabilpuram Date: Tue, 5 Jan 2021 14:27:28 +0530 Subject: [PATCH] test/bitmap: test scan after half cacheline is cleared Add a test case to test scan operation post clear of half cacheline of slabs. Also fix meson.build to include test_bitmap.c in the compilation. Signed-off-by: Nithin Dabilpuram --- app/test/meson.build | 1 + app/test/test_bitmap.c | 34 +++++++++++++++++++++++++++++++++- 2 files changed, 34 insertions(+), 1 deletion(-) diff --git a/app/test/meson.build b/app/test/meson.build index 94fd39fecb..bb06a92431 100644 --- a/app/test/meson.build +++ b/app/test/meson.build @@ -13,6 +13,7 @@ test_sources = files('commands.c', 'test_atomic.c', 'test_barrier.c', 'test_bitops.c', + 'test_bitmap.c', 'test_bpf.c', 'test_byteorder.c', 'test_cmdline.c', diff --git a/app/test/test_bitmap.c b/app/test/test_bitmap.c index a8204d329f..70d8fffb5a 100644 --- a/app/test/test_bitmap.c +++ b/app/test/test_bitmap.c @@ -16,9 +16,10 @@ static int test_bitmap_scan_operations(struct rte_bitmap *bmp) { - uint32_t pos = 0; uint64_t slab1_magic = 0xBADC0FFEEBADF00D; uint64_t slab2_magic = 0xFEEDDEADDEADF00D; + uint32_t pos = 0, start_pos; + int i, nb_clear, nb_set; uint64_t out_slab = 0; rte_bitmap_reset(bmp); @@ -70,6 +71,37 @@ test_bitmap_scan_operations(struct rte_bitmap *bmp) return TEST_FAILED; } + /* Test scan when a cline is half full */ + rte_bitmap_reset(bmp); + for (i = 0; i < MAX_BITS; i++) + rte_bitmap_set(bmp, i); + + nb_clear = RTE_MIN(RTE_BITMAP_CL_BIT_SIZE / 2, MAX_BITS); + for (i = 0; i < nb_clear; i++) + rte_bitmap_clear(bmp, i); + + /* Find remaining bits set in bmp */ + __rte_bitmap_scan_init(bmp); + + if (rte_bitmap_scan(bmp, &pos, &out_slab) != 1) { + printf("Initial scan failed with half CL empty.\n"); + return TEST_FAILED; + } + + start_pos = pos; + nb_set = 0; + do { + nb_set += __builtin_popcountll(out_slab); + if (!rte_bitmap_scan(bmp, &pos, &out_slab)) + break; + } while (pos != start_pos); + + if ((nb_clear + nb_set) != MAX_BITS) { + printf("Scan failed to find all set bits. " + "Expected %u, found %u.\n", MAX_BITS - nb_clear, nb_set); + return TEST_FAILED; + } + return TEST_SUCCESS; } -- 2.20.1