From: Isabella Basso <isabbasso@riseup.net>
To: geert@linux-m68k.org, brendanhiggins@google.com,
dlatypov@google.com, davidgow@google.com,
akpm@linux-foundation.org, skhan@linuxfoundation.org
Cc: ferreiraenzoa@gmail.com, augusto.duraes33@gmail.com,
linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org,
kunit-dev@googlegroups.com, ~lkcamp/patches@lists.sr.ht,
rodrigosiqueiramelo@gmail.com,
Isabella Basso <isabbasso@riseup.net>
Subject: [PATCH RESEND v3 2/5] test_hash.c: split test_int_hash into arch-specific functions
Date: Wed, 8 Dec 2021 15:37:08 -0300 [thread overview]
Message-ID: <20211208183711.390454-3-isabbasso@riseup.net> (raw)
In-Reply-To: <20211208183711.390454-1-isabbasso@riseup.net>
Split the test_int_hash function to keep its mainloop separate from
arch-specific chunks, which are only compiled as needed. This aims at
improving readability.
Reviewed-by: David Gow <davidgow@google.com>
Tested-by: David Gow <davidgow@google.com>
Signed-off-by: Isabella Basso <isabbasso@riseup.net>
---
Changes since v2:
- As suggested by David Gow:
1. Add comments to struct elements.
Changes since v1:
- As suggested by Marco Elver:
1. Add struct for carrying test variables.
lib/test_hash.c | 91 +++++++++++++++++++++++++++++++++----------------
1 file changed, 62 insertions(+), 29 deletions(-)
diff --git a/lib/test_hash.c b/lib/test_hash.c
index d4b0cfdb0377..2b4fe4976cc4 100644
--- a/lib/test_hash.c
+++ b/lib/test_hash.c
@@ -56,6 +56,58 @@ fill_buf(char *buf, size_t len, u32 seed)
}
}
+/* Holds most testing variables for the int test. */
+struct test_hash_params {
+ /* Pointer to integer to be hashed. */
+ unsigned long long *h64;
+ /* Low 32-bits of integer to be hashed. */
+ u32 h0;
+ /* Arch-specific hash result. */
+ u32 h1;
+ /* Generic hash result. */
+ u32 h2;
+ /* ORed hashes of given size (in bits). */
+ u32 (*hash_or)[33];
+};
+
+#ifdef HAVE_ARCH__HASH_32
+static bool __init
+test_int__hash_32(struct test_hash_params *params)
+{
+ params->hash_or[1][0] |= params->h2 = __hash_32_generic(params->h0);
+#if HAVE_ARCH__HASH_32 == 1
+ if (params->h1 != params->h2) {
+ pr_err("__hash_32(%#x) = %#x != __hash_32_generic() = %#x",
+ params->h0, params->h1, params->h2);
+ return false;
+ }
+#endif
+ return true;
+}
+#endif
+
+#ifdef HAVE_ARCH_HASH_64
+static bool __init
+test_int_hash_64(struct test_hash_params *params, u32 const *m, int *k)
+{
+ params->h2 = hash_64_generic(*params->h64, *k);
+#if HAVE_ARCH_HASH_64 == 1
+ if (params->h1 != params->h2) {
+ pr_err("hash_64(%#llx, %d) = %#x != hash_64_generic() = %#x",
+ *params->h64, *k, params->h1, params->h2);
+ return false;
+ }
+#else
+ if (params->h2 > *m) {
+ pr_err("hash_64_generic(%#llx, %d) = %#x > %#x",
+ *params->h64, *k, params->h1, *m);
+ return false;
+ }
+#endif
+ return true;
+}
+#endif
+
/*
* Test the various integer hash functions. h64 (or its low-order bits)
* is the integer to hash. hash_or accumulates the OR of the hash values,
@@ -69,19 +121,13 @@ static bool __init
test_int_hash(unsigned long long h64, u32 hash_or[2][33])
{
int k;
- u32 h0 = (u32)h64, h1, h2;
+ struct test_hash_params params = { &h64, (u32)h64, 0, 0, hash_or };
/* Test __hash32 */
- hash_or[0][0] |= h1 = __hash_32(h0);
+ hash_or[0][0] |= params.h1 = __hash_32(params.h0);
#ifdef HAVE_ARCH__HASH_32
- hash_or[1][0] |= h2 = __hash_32_generic(h0);
-#if HAVE_ARCH__HASH_32 == 1
- if (h1 != h2) {
- pr_err("__hash_32(%#x) = %#x != __hash_32_generic() = %#x",
- h0, h1, h2);
+ if (!test_int__hash_32(¶ms))
return false;
- }
-#endif
#endif
/* Test k = 1..32 bits */
@@ -89,37 +135,24 @@ test_int_hash(unsigned long long h64, u32 hash_or[2][33])
u32 const m = ((u32)2 << (k-1)) - 1; /* Low k bits set */
/* Test hash_32 */
- hash_or[0][k] |= h1 = hash_32(h0, k);
- if (h1 > m) {
- pr_err("hash_32(%#x, %d) = %#x > %#x", h0, k, h1, m);
+ hash_or[0][k] |= params.h1 = hash_32(params.h0, k);
+ if (params.h1 > m) {
+ pr_err("hash_32(%#x, %d) = %#x > %#x", params.h0, k, params.h1, m);
return false;
}
/* Test hash_64 */
- hash_or[1][k] |= h1 = hash_64(h64, k);
- if (h1 > m) {
- pr_err("hash_64(%#llx, %d) = %#x > %#x", h64, k, h1, m);
+ hash_or[1][k] |= params.h1 = hash_64(h64, k);
+ if (params.h1 > m) {
+ pr_err("hash_64(%#llx, %d) = %#x > %#x", h64, k, params.h1, m);
return false;
}
#ifdef HAVE_ARCH_HASH_64
- h2 = hash_64_generic(h64, k);
-#if HAVE_ARCH_HASH_64 == 1
- if (h1 != h2) {
- pr_err("hash_64(%#llx, %d) = %#x != hash_64_generic() "
- "= %#x", h64, k, h1, h2);
+ if (!test_int_hash_64(¶ms, &m, &k))
return false;
- }
-#else
- if (h2 > m) {
- pr_err("hash_64_generic(%#llx, %d) = %#x > %#x",
- h64, k, h1, m);
- return false;
- }
-#endif
#endif
}
- (void)h2; /* Suppress unused variable warning */
return true;
}
--
2.34.1
next prev parent reply other threads:[~2021-12-08 18:37 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-12-08 18:37 [PATCH RESEND v3 0/5] test_hash.c: refactor into KUnit Isabella Basso
2021-12-08 18:37 ` [PATCH RESEND v3 1/5] hash.h: remove unused define directive Isabella Basso
2021-12-08 18:37 ` Isabella Basso [this message]
2021-12-08 18:37 ` [PATCH RESEND v3 3/5] test_hash.c: split test_hash_init Isabella Basso
2021-12-08 18:37 ` [PATCH RESEND v3 4/5] lib/Kconfig.debug: properly split hash test kernel entries Isabella Basso
2021-12-08 18:37 ` [PATCH RESEND v3 5/5] test_hash.c: refactor into kunit Isabella Basso
2021-12-08 20:58 ` [PATCH RESEND v3 0/5] test_hash.c: refactor into KUnit David Gow
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20211208183711.390454-3-isabbasso@riseup.net \
--to=isabbasso@riseup.net \
--cc=akpm@linux-foundation.org \
--cc=augusto.duraes33@gmail.com \
--cc=brendanhiggins@google.com \
--cc=davidgow@google.com \
--cc=dlatypov@google.com \
--cc=ferreiraenzoa@gmail.com \
--cc=geert@linux-m68k.org \
--cc=kunit-dev@googlegroups.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-kselftest@vger.kernel.org \
--cc=rodrigosiqueiramelo@gmail.com \
--cc=skhan@linuxfoundation.org \
--cc=~lkcamp/patches@lists.sr.ht \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).