Commit ae788067 authored by Isabella Basso's avatar Isabella Basso Committed by Linus Torvalds
Browse files

test_hash.c: split test_int_hash into arch-specific functions 

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.

Link: https://lkml.kernel.org/r/20211208183711.390454-3-isabbasso@riseup.net


Reviewed-by: default avatarDavid Gow <davidgow@google.com>
Tested-by: default avatarDavid Gow <davidgow@google.com>
Signed-off-by: default avatarIsabella Basso <isabbasso@riseup.net>
Cc: Augusto Durães Camargo <augusto.duraes33@gmail.com>
Cc: Brendan Higgins <brendanhiggins@google.com>
Cc: Daniel Latypov <dlatypov@google.com>
Cc: Enzo Ferreira <ferreiraenzoa@gmail.com>
Cc: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: kernel test robot <lkp@intel.com>
Cc: Rodrigo Siqueira <rodrigosiqueiramelo@gmail.com>
Cc: Shuah Khan <skhan@linuxfoundation.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent fd0a1462

lib/test_hash.c

+62 −29
Original line number Diff line number Diff line
@@ -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(&params))

		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(&params, &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;

}