From: Isabella Basso <isabellabdoamaral@usp.br>
To: linux@sciencehorizons.net, geert@linux-m68k.org
Cc: ferreiraenzoa@gmail.com, augusto.duraes33@gmail.com,
brendanhiggins@google.com, dlatypov@google.com,
davidgow@google.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 <isabellabdoamaral@usp.br>
Subject: [PATCH 1/6] hash.h: remove unused define directive
Date: Wed, 25 Aug 2021 22:26:21 -0300 [thread overview]
Message-ID: <20210826012626.1163705-2-isabellabdoamaral@usp.br> (raw)
In-Reply-To: <20210826012626.1163705-1-isabellabdoamaral@usp.br>
The HAVE_ARCH_HASH_32 (single underscore) define hasn't been used for
any known supported architectures that have their own hash function
implementation (i.e. m68k, Microblaze, H8/300, pa-risc) since George's
patch [1], which introduced it.
The supported 32-bit architectures from the list above have only been
making use of the (more general) HAVE_ARCH__HASH_32 define, which only
lacks the right shift operator, that wasn't targeted for optimizations
so far.
[1] https://lore.kernel.org/lkml/20160525073311.5600.qmail@ns.sciencehorizons.net/
Co-developed-by: Augusto Durães Camargo <augusto.duraes33@gmail.com>
Signed-off-by: Augusto Durães Camargo <augusto.duraes33@gmail.com>
Co-developed-by: Enzo Ferreira <ferreiraenzoa@gmail.com>
Signed-off-by: Enzo Ferreira <ferreiraenzoa@gmail.com>
Signed-off-by: Isabella Basso <isabellabdoamaral@usp.br>
---
include/linux/hash.h | 5 +----
lib/test_hash.c | 24 +-----------------------
tools/include/linux/hash.h | 5 +----
3 files changed, 3 insertions(+), 31 deletions(-)
diff --git a/include/linux/hash.h b/include/linux/hash.h
index ad6fa21d977b..38edaa08f862 100644
--- a/include/linux/hash.h
+++ b/include/linux/hash.h
@@ -62,10 +62,7 @@ static inline u32 __hash_32_generic(u32 val)
return val * GOLDEN_RATIO_32;
}
-#ifndef HAVE_ARCH_HASH_32
-#define hash_32 hash_32_generic
-#endif
-static inline u32 hash_32_generic(u32 val, unsigned int bits)
+static inline u32 hash_32(u32 val, unsigned int bits)
{
/* High bits are more random, so use them. */
return __hash_32(val) >> (32 - bits);
diff --git a/lib/test_hash.c b/lib/test_hash.c
index 0ee40b4a56dd..d4b0cfdb0377 100644
--- a/lib/test_hash.c
+++ b/lib/test_hash.c
@@ -94,22 +94,7 @@ test_int_hash(unsigned long long h64, u32 hash_or[2][33])
pr_err("hash_32(%#x, %d) = %#x > %#x", h0, k, h1, m);
return false;
}
-#ifdef HAVE_ARCH_HASH_32
- h2 = hash_32_generic(h0, k);
-#if HAVE_ARCH_HASH_32 == 1
- if (h1 != h2) {
- pr_err("hash_32(%#x, %d) = %#x != hash_32_generic() "
- " = %#x", h0, k, h1, h2);
- return false;
- }
-#else
- if (h2 > m) {
- pr_err("hash_32_generic(%#x, %d) = %#x > %#x",
- h0, k, h1, m);
- return false;
- }
-#endif
-#endif
+
/* Test hash_64 */
hash_or[1][k] |= h1 = hash_64(h64, k);
if (h1 > m) {
@@ -227,13 +212,6 @@ test_hash_init(void)
#else
pr_info("__hash_32() has no arch implementation to test.");
#endif
-#ifdef HAVE_ARCH_HASH_32
-#if HAVE_ARCH_HASH_32 != 1
- pr_info("hash_32() is arch-specific; not compared to generic.");
-#endif
-#else
- pr_info("hash_32() has no arch implementation to test.");
-#endif
#ifdef HAVE_ARCH_HASH_64
#if HAVE_ARCH_HASH_64 != 1
pr_info("hash_64() is arch-specific; not compared to generic.");
diff --git a/tools/include/linux/hash.h b/tools/include/linux/hash.h
index ad6fa21d977b..38edaa08f862 100644
--- a/tools/include/linux/hash.h
+++ b/tools/include/linux/hash.h
@@ -62,10 +62,7 @@ static inline u32 __hash_32_generic(u32 val)
return val * GOLDEN_RATIO_32;
}
-#ifndef HAVE_ARCH_HASH_32
-#define hash_32 hash_32_generic
-#endif
-static inline u32 hash_32_generic(u32 val, unsigned int bits)
+static inline u32 hash_32(u32 val, unsigned int bits)
{
/* High bits are more random, so use them. */
return __hash_32(val) >> (32 - bits);
--
2.33.0
next prev parent reply other threads:[~2021-08-26 1:26 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-08-26 1:26 [PATCH 0/6] test_hash.c: refactor into KUnit Isabella Basso
2021-08-26 1:26 ` Isabella Basso [this message]
2021-08-26 4:01 ` [PATCH 1/6] hash.h: remove unused define directive David Gow
2021-09-05 22:31 ` Isabella B do Amaral
2021-08-26 1:26 ` [PATCH 2/6] test_hash.c: move common definitions to top of file Isabella Basso
2021-08-26 14:36 ` Marco Elver
2021-09-05 22:40 ` Isabella B do Amaral
2021-08-26 1:26 ` [PATCH 3/6] test_hash.c: split test_int_hash into arch-specific functions Isabella Basso
2021-08-26 4:21 ` David Gow
2021-09-05 22:53 ` Isabella B do Amaral
2021-08-26 1:26 ` [PATCH 4/6] test_hash.c: split test_hash_init Isabella Basso
2021-08-26 1:26 ` [PATCH 5/6] lib/Kconfig.debug: properly split hash test kernel entries Isabella Basso
2021-08-26 1:26 ` [PATCH 6/6] test_hash.c: refactor into kunit Isabella Basso
2021-08-26 4:26 ` David Gow
2021-09-05 23:32 ` Isabella B do Amaral
2021-08-26 6:00 ` kernel test robot
2021-08-26 10:10 ` kernel test robot
2021-08-26 1:36 ` [PATCH 0/6] test_hash.c: refactor into KUnit Daniel Latypov
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=20210826012626.1163705-2-isabellabdoamaral@usp.br \
--to=isabellabdoamaral@usp.br \
--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=linux@sciencehorizons.net \
--cc=rodrigosiqueiramelo@gmail.com \
--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).