lib/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2025-07-30 22:43:12 +03:00
Code Activity

string: Add len=0 to {w}memcmp{eq} tests and benchtests

Browse Source 
len=0 is valid and fairly common so should be tested.
Reviewed-by: Siddhesh Poyarekar <siddhesh@sourceware.org>
This commit is contained in:
Noah Goldstein
2022-10-29 15:19:57 -05:00
parent 2e274cd8c1
commit ca7d181b62
2 changed files with 19 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
benchtests/bench-memcmp.c
View File

@ -63,7 +63,7 @@ IMPL (MEMCMP, 1)
static void static void
do_one_test (json_ctx_t *json_ctx, impl_t *impl, const CHAR *s1, do_one_test (json_ctx_t *json_ctx, impl_t *impl, const CHAR *s1,
const CHAR *s2, size_t len, int exp_result) const CHAR *s2, size_t len)
{ {
size_t i, iters = INNER_LOOP_ITERS_LARGE; size_t i, iters = INNER_LOOP_ITERS_LARGE;
timing_t start, stop, cur; timing_t start, stop, cur;
@ -87,9 +87,6 @@ do_test (json_ctx_t *json_ctx, size_t align1, size_t align2, size_t len,
size_t i; size_t i;
CHAR *s1, *s2; CHAR *s1, *s2;
if (len == 0)
return;
align1 &= (4096 - CHARBYTES); align1 &= (4096 - CHARBYTES);
if (align1 + (len + 1) * CHARBYTES >= page_size) if (align1 + (len + 1) * CHARBYTES >= page_size)
return; return;
@ -111,13 +108,16 @@ do_test (json_ctx_t *json_ctx, size_t align1, size_t align2, size_t len,
for (i = 0; i < len; i++) for (i = 0; i < len; i++)
s1[i] = s2[i] = 1 + (23 << ((CHARBYTES - 1) * 8)) * i % MAX_CHAR; s1[i] = s2[i] = 1 + (23 << ((CHARBYTES - 1) * 8)) * i % MAX_CHAR;
if (len)
{
s1[len] = align1; s1[len] = align1;
s2[len] = align2; s2[len] = align2;
s2[len - 1] -= exp_result; s2[len - 1] -= exp_result;
}
FOR_EACH_IMPL (impl, 0) FOR_EACH_IMPL (impl, 0)
{ {
do_one_test (json_ctx, impl, s1, s2, len, exp_result); do_one_test (json_ctx, impl, s1, s2, len);
} }
json_array_end (json_ctx); json_array_end (json_ctx);
@ -147,7 +147,7 @@ test_main (void)
json_array_end (&json_ctx); json_array_end (&json_ctx);
json_array_begin (&json_ctx, "results"); json_array_begin (&json_ctx, "results");
for (i = 1; i < 32; ++i) for (i = 0; i < 32; ++i)
{ {
do_test (&json_ctx, i * CHARBYTES, i * CHARBYTES, i, 0); do_test (&json_ctx, i * CHARBYTES, i * CHARBYTES, i, 0);
do_test (&json_ctx, i * CHARBYTES, i * CHARBYTES, i, 1); do_test (&json_ctx, i * CHARBYTES, i * CHARBYTES, i, 1);

10
string/test-memcmp.c
View File

@ -117,9 +117,6 @@ do_test (size_t align1, size_t align2, size_t len, int exp_result)
size_t i; size_t i;
CHAR *s1, *s2; CHAR *s1, *s2;
if (len == 0)
return;
align1 &= (4096 - CHARBYTES); align1 &= (4096 - CHARBYTES);
if (align1 + (len + 1) * CHARBYTES >= page_size) if (align1 + (len + 1) * CHARBYTES >= page_size)
return; return;
@ -134,9 +131,16 @@ do_test (size_t align1, size_t align2, size_t len, int exp_result)
for (i = 0; i < len; i++) for (i = 0; i < len; i++)
s1[i] = s2[i] = 1 + (23 << ((CHARBYTES - 1) * 8)) * i % CHAR__MAX; s1[i] = s2[i] = 1 + (23 << ((CHARBYTES - 1) * 8)) * i % CHAR__MAX;
if (len)
{
s1[len] = align1; s1[len] = align1;
s2[len] = align2; s2[len] = align2;
s2[len - 1] -= exp_result; s2[len - 1] -= exp_result;
}
else
{
exp_result = 0;
}
FOR_EACH_IMPL (impl, 0) FOR_EACH_IMPL (impl, 0)
do_one_test (impl, s1, s2, len, exp_result); do_one_test (impl, s1, s2, len, exp_result);