Messages in this thread Patch in this message | | | Date | Sun, 26 Apr 2020 00:33:06 +0530 | From | Syed Nayyar Waris <> | Subject | [PATCH v2 2/6] lib/test_bitmap.c: Add for_each_set_clump test cases |
| |
The introduction of the generic for_each_set_clump macro need test cases to verify the implementation. This patch adds test cases for scenarios in which clump sizes are 8 bits, 24 bits, 30 bits and 6 bits. The cases contain situations where clump is getting split at the word boundary and also when zeroes are present in the start and middle of bitmap.
Cc: Andy Shevchenko <andy.shevchenko@gmail.com> Cc: Linus Walleij <linus.walleij@linaro.org> Signed-off-by: Syed Nayyar Waris <syednwaris@gmail.com> Signed-off-by: William Breathitt Gray <vilhelm.gray@gmail.com> --- Changes in v2: - Unify different tests for 'for_each_set_clump'. Pass test data as function parameters. - Remove unnecessary bitmap_zero calls.
lib/test_bitmap.c | 121 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 121 insertions(+)
diff --git a/lib/test_bitmap.c b/lib/test_bitmap.c index 6b13150..13fe9a2 100644 --- a/lib/test_bitmap.c +++ b/lib/test_bitmap.c @@ -155,6 +155,38 @@ static bool __init __check_eq_clump8(const char *srcfile, unsigned int line, return true; } +static bool __init __check_eq_clump(const char *srcfile, unsigned int line, + const unsigned int offset, + const unsigned int size, + const unsigned long *const clump_exp, + const unsigned long *const clump, + const unsigned long clump_size) +{ + unsigned long exp; + + if (offset >= size) { + pr_warn("[%s:%u] bit offset for clump out-of-bounds: expected less than %u, got %u\n", + srcfile, line, size, offset); + return false; + } + + exp = clump_exp[offset / clump_size]; + if (!exp) { + pr_warn("[%s:%u] bit offset for zero clump: expected nonzero clump, got bit offset %u with clump value 0", + srcfile, line, offset); + return false; + } + + if (*clump != exp) { + pr_warn("[%s:%u] expected clump value of 0x%lX, got clump value of 0x%lX", + srcfile, line, exp, *clump); + return false; + } + + return true; +} + + #define __expect_eq(suffix, ...) \ ({ \ int result = 0; \ @@ -172,6 +204,7 @@ static bool __init __check_eq_clump8(const char *srcfile, unsigned int line, #define expect_eq_pbl(...) __expect_eq(pbl, ##__VA_ARGS__) #define expect_eq_u32_array(...) __expect_eq(u32_array, ##__VA_ARGS__) #define expect_eq_clump8(...) __expect_eq(clump8, ##__VA_ARGS__) +#define expect_eq_clump(...) __expect_eq(clump, ##__VA_ARGS__) static void __init test_zero_clear(void) { @@ -588,6 +621,46 @@ static const unsigned char clump_exp[] __initconst = { 0x05, /* non-adjacent 2 bits set */ }; +static const unsigned long clump_exp1[] __initconst = { + 0x01, /* 1 bit set */ + 0x02, /* non-edge 1 bit set */ + 0x00, /* zero bits set */ + 0x38, /* 3 bits set across 4-bit boundary */ + 0x38, /* Repeated clump */ + 0x0F, /* 4 bits set */ + 0xFF, /* all bits set */ + 0x05, /* non-adjacent 2 bits set */ +}; + +static const unsigned long clump_exp2[] __initconst = { + 0xfedcba, /* 24 bits */ + 0xabcdef, + 0xaabbbb, /* Clump split between 2 words */ + 0x000000, /* zeroes in between */ + 0x0000aa, + 0x000000, + 0x0000ff, + 0xaaaaaa, + 0x000000, + 0x0000ff, +}; + +static const unsigned long clump_exp3[] __initconst = { + 0x00000000, /* starting with 0s*/ + 0x00000000, /* All 0s */ + 0x00000000, + 0x00000000, + 0x3f00000f, /* Non zero set */ + 0x2aa80003, + 0x00000aaa, + 0x00003fc0, +}; + +static const unsigned long clump_exp4[] __initconst = { + 0x00, + 0x2b, +}; + static void __init test_for_each_set_clump8(void) { #define CLUMP_EXP_NUMBITS 64 @@ -610,6 +683,53 @@ static void __init test_for_each_set_clump8(void) expect_eq_clump8(start, CLUMP_EXP_NUMBITS, clump_exp, &clump); } +static void __init execute_for_each_set_clump(unsigned long *bits, + unsigned long size, + const unsigned long *clump_exp, + unsigned long clump_size) +{ + unsigned long start, clump; + + for_each_set_clump(start, clump, bits, size, clump_size) + expect_eq_clump(start, size, clump_exp, &clump, clump_size); +} + +static void __init test_for_each_set_clump(void) +{ + /* common bitmap of max size for different tests */ + DECLARE_BITMAP(bits, 256); + + /* set bitmap for test case 1 with clump size as 8 bits */ + bitmap_set_value(bits, 0x38000201, 0, 32); + bitmap_set_value(bits, 0x05ff0f38, 32, 32); + + execute_for_each_set_clump(bits, 64, clump_exp1, 8); + + /* set bitmap for test case 2 with clump size as 24 bits */ + bitmap_set_value(bits, 0xeffedcba, 0, 32); + bitmap_set_value(bits, 0xbbbbabcd, 32, 32); + bitmap_set_value(bits, 0x000000aa, 64, 32); + bitmap_set_value(bits, 0x000000aa, 96, 32); + bitmap_set_value(bits, 0x00ff0000, 128, 32); + bitmap_set_value(bits, 0xaaaaaa00, 160, 32); + bitmap_set_value(bits, 0xff000000, 192, 32); + bitmap_set_value(bits, 0x00aa0000, 224, 32); + + execute_for_each_set_clump(bits, 240, clump_exp2, 24); + + /* set bitmap for test case 3 with clump size as 30 bits */ + bitmap_set_value(bits, 0x00000000, 0, 32); + bitmap_set_value(bits, 0x00000000, 32, 32); + bitmap_set_value(bits, 0x00000000, 64, 32); + bitmap_set_value(bits, 0x0f000000, 96, 32); + + execute_for_each_set_clump(bits, 240, clump_exp3, 30); + + /* set bitmap for test case 4 with clump size as 6 bits */ + bitmap_set_value(bits, 0x00000ac0, 0, 32); + execute_for_each_set_clump(bits, 18, clump_exp4, 6); +} + static void __init selftest(void) { test_zero_clear(); @@ -623,6 +743,7 @@ static void __init selftest(void) test_bitmap_parselist_user(); test_mem_optimisations(); test_for_each_set_clump8(); + test_for_each_set_clump(); } KSTM_MODULE_LOADERS(test_bitmap); -- 2.7.4
| |