From: Pablo de Lara <pablo.de.lara.guarch@intel.com>
To: dev@dpdk.org
Subject: [PATCH v6 05/10] test/hash: add new functional tests for hash functions
Date: Wed, 10 Jun 2015 16:25:22 +0100 [thread overview]
Message-ID: <1433949927-14767-6-git-send-email-pablo.de.lara.guarch@intel.com> (raw)
In-Reply-To: <1433949927-14767-1-git-send-email-pablo.de.lara.guarch@intel.com>
In order to make sure that the hash functions are returning
the correct values, new tests have been added:
- First test compares precalculated hash values with values calculated
from the existing hash functions.
- Second test compares values returned from rte_jhash2 and rte_jhash,
expecting same return (only for multiple of 4 bytes keys)
Signed-off-by: Pablo de Lara <pablo.de.lara.guarch@intel.com>
---
app/test/test_hash_functions.c | 126 +++++++++++++++++++++++++++++++++++++++++
1 file changed, 126 insertions(+)
diff --git a/app/test/test_hash_functions.c b/app/test/test_hash_functions.c
index 5156dfc..fcc9d05 100644
--- a/app/test/test_hash_functions.c
+++ b/app/test/test_hash_functions.c
@@ -47,6 +47,36 @@
#include "test.h"
+/*
+ * Hash values calculated for key sizes from array "hashtest_key_lens"
+ * and for initial values from array "hashtest_initvals.
+ * Each key will be formed by increasing each byte by 1:
+ * e.g.: key size = 4, key = 0x03020100
+ * key size = 8, key = 0x0706050403020100
+ */
+static uint32_t hash_values_jhash[2][10] = {{
+ 0x821cc2db, 0xa491f494, 0xace4cd87, 0x9e867842,
+ 0xd32442d6, 0x5fbafeab, 0x9cac434c, 0xecad9b0d,
+ 0x2dcf235e, 0xaab655d0
+},
+{
+ 0xc1111b14, 0x9a95039e, 0x84f208a0, 0xfa28f3fb,
+ 0xfa13f7d3, 0xc7aed470, 0x74caa938, 0xa9288066,
+ 0xd0140735, 0xbf00519d
+}
+};
+static uint32_t hash_values_crc[2][10] = {{
+ 0x91545164, 0x06040eb1, 0x9bb99201, 0xcc4c4fe4,
+ 0x14a90993, 0xf8a5dd8c, 0xc62beb31, 0x32bf340e,
+ 0x72f9d22b, 0x4a11475e
+},
+{
+ 0x98cd4c70, 0xd52c702f, 0x41fc0e1c, 0x3905f65c,
+ 0x94bff47f, 0x1bab102d, 0xd2911ed7, 0xe8faa813,
+ 0x6bea184b, 0x53028d3e
+}
+};
+
/*******************************************************************************
* Hash function performance test configuration section. Each performance test
* will be performed HASHTEST_ITERATIONS times.
@@ -132,9 +162,105 @@ run_hash_func_perf_tests(void)
}
}
+/*
+ * Verify that hash functions return what they are expected to return
+ * (using precalculated values stored above)
+ */
+static int
+verify_precalculated_hash_func_tests(void)
+{
+ unsigned i, j;
+ uint8_t key[64];
+ uint32_t hash;
+
+ for (i = 0; i < 64; i++)
+ key[i] = (uint8_t) i;
+
+ for (i = 0; i < sizeof(hashtest_key_lens) / sizeof(uint32_t); i++) {
+ for (j = 0; j < sizeof(hashtest_initvals) / sizeof(uint32_t); j++) {
+ hash = rte_jhash(key, hashtest_key_lens[i],
+ hashtest_initvals[j]);
+ if (hash != hash_values_jhash[j][i]) {
+ printf("jhash for %u bytes with initial value 0x%x."
+ "Expected 0x%x, but got 0x%x\n",
+ hashtest_key_lens[i], hashtest_initvals[j],
+ hash_values_jhash[j][i], hash);
+ return -1;
+ }
+
+ hash = rte_hash_crc(key, hashtest_key_lens[i],
+ hashtest_initvals[j]);
+ if (hash != hash_values_crc[j][i]) {
+ printf("CRC for %u bytes with initial value 0x%x."
+ "Expected 0x%x, but got 0x%x\n",
+ hashtest_key_lens[i], hashtest_initvals[j],
+ hash_values_crc[j][i], hash);
+ return -1;
+ }
+ }
+ }
+
+ return 0;
+}
+
+/*
+ * Verify that rte_jhash and rte_jhash2 return the same
+ */
+static int
+verify_jhash_32bits(void)
+{
+ unsigned i, j;
+ uint8_t key[64];
+ uint32_t hash, hash32;
+
+ for (i = 0; i < 64; i++)
+ key[i] = rand() & 0xff;
+
+ for (i = 0; i < sizeof(hashtest_key_lens) / sizeof(uint32_t); i++) {
+ for (j = 0; j < sizeof(hashtest_initvals) / sizeof(uint32_t); j++) {
+ /* Key size must be multiple of 4 (32 bits) */
+ if ((hashtest_key_lens[i] & 0x3) == 0) {
+ hash = rte_jhash(key, hashtest_key_lens[i],
+ hashtest_initvals[j]);
+ /* Divide key length by 4 in rte_jhash for 32 bits */
+ hash32 = rte_jhash2((const uint32_t *)key,
+ hashtest_key_lens[i] >> 2,
+ hashtest_initvals[j]);
+ if (hash != hash32) {
+ printf("rte_jhash returns different value (0x%x)"
+ "than rte_jhash2 (0x%x)\n",
+ hash, hash32);
+ return -1;
+ }
+ }
+ }
+ }
+
+ return 0;
+}
+
+/*
+ * Run all functional tests for hash functions
+ */
+static int
+run_hash_func_tests(void)
+{
+ if (verify_precalculated_hash_func_tests() != 0)
+ return -1;
+
+ if (verify_jhash_32bits() != 0)
+ return -1;
+
+ return 0;
+
+}
+
static int
test_hash_functions(void)
{
+ if (run_hash_func_tests() != 0)
+ return -1;
+
run_hash_func_perf_tests();
return 0;
--
2.4.2
next prev parent reply other threads:[~2015-06-10 15:25 UTC|newest]
Thread overview: 62+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-04-16 13:26 [PATCH] hash: update jhash function with the latest available Pablo de Lara
[not found] ` <1429190819-27402-1-git-send-email-pablo.de.lara.guarch-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>
2015-04-16 14:01 ` Bruce Richardson
2015-04-17 16:03 ` De Lara Guarch, Pablo
2015-04-24 11:23 ` [PATCH v2 0/6] update jhash function Pablo de Lara
[not found] ` <1429874587-17939-1-git-send-email-pablo.de.lara.guarch-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>
2015-04-24 11:23 ` [PATCH v2 1/6] test/hash: move hash function perf tests to separate file Pablo de Lara
2015-04-24 11:23 ` [PATCH v2 2/6] test/hash: improve accuracy on cycle measurements Pablo de Lara
2015-04-24 11:23 ` [PATCH v2 3/6] hash: update jhash function with the latest available Pablo de Lara
2015-04-24 11:23 ` [PATCH v2 4/6] hash: add two new functions to jhash library Pablo de Lara
2015-04-24 11:23 ` [PATCH v2 5/6] hash: remove duplicated code Pablo de Lara
2015-04-24 11:23 ` [PATCH v2 6/6] hash: rename rte_jhash2 to rte_jhash_32b Pablo de Lara
2015-05-05 14:43 ` [PATCH v3 0/6] update jhash function Pablo de Lara
[not found] ` <1430837034-21031-1-git-send-email-pablo.de.lara.guarch-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>
2015-05-05 14:43 ` [PATCH v3 1/6] test/hash: move hash function perf tests to separate file Pablo de Lara
2015-05-05 14:43 ` [PATCH v3 2/6] test/hash: improve accuracy on cycle measurements Pablo de Lara
2015-05-05 14:43 ` [PATCH v3 3/6] hash: update jhash function with the latest available Pablo de Lara
[not found] ` <1430837034-21031-4-git-send-email-pablo.de.lara.guarch-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>
2015-05-06 0:35 ` Ananyev, Konstantin
[not found] ` <2601191342CEEE43887BDE71AB97725821424ED1-pww93C2UFcwu0RiL9chJVbfspsVTdybXVpNB7YpNyf8@public.gmane.org>
2015-05-06 9:36 ` De Lara Guarch, Pablo
[not found] ` <E115CCD9D858EF4F90C690B0DCB4D8972729A7B7-kPTMFJFq+rEMvF1YICWikbfspsVTdybXVpNB7YpNyf8@public.gmane.org>
2015-05-06 16:11 ` Ananyev, Konstantin
2015-05-07 11:11 ` Ananyev, Konstantin
2015-05-05 14:43 ` [PATCH v3 4/6] hash: add two new functions to jhash library Pablo de Lara
2015-05-05 14:43 ` [PATCH v3 5/6] hash: remove duplicated code Pablo de Lara
2015-05-05 14:43 ` [PATCH v3 6/6] hash: rename rte_jhash2 to rte_jhash_32b Pablo de Lara
2015-05-12 11:02 ` [PATCH v4 0/6] update jhash function Pablo de Lara
2015-05-12 11:02 ` [PATCH v4 1/6] test/hash: move hash function perf tests to separate file Pablo de Lara
2015-05-12 11:02 ` [PATCH v4 2/6] test/hash: improve accuracy on cycle measurements Pablo de Lara
2015-05-12 11:02 ` [PATCH v4 3/6] hash: update jhash function with the latest available Pablo de Lara
2015-05-12 11:02 ` [PATCH v4 4/6] hash: add two new functions to jhash library Pablo de Lara
2015-05-12 11:02 ` [PATCH v4 5/6] hash: remove duplicated code Pablo de Lara
2015-05-12 11:02 ` [PATCH v4 6/6] hash: rename rte_jhash2 to rte_jhash_32b Pablo de Lara
2015-05-12 15:33 ` [PATCH v4 0/6] update jhash function Neil Horman
2015-05-13 13:52 ` De Lara Guarch, Pablo
2015-05-13 14:20 ` Neil Horman
2015-05-18 16:14 ` Bruce Richardson
2015-05-22 10:16 ` [PATCH v5 00/10] " Pablo de Lara
2015-05-22 10:16 ` [PATCH v5 01/10] test/hash: move hash function perf tests to separate file Pablo de Lara
2015-05-22 10:16 ` [PATCH v5 02/10] test/hash: improve accuracy on cycle measurements Pablo de Lara
2015-05-22 10:16 ` [PATCH v5 03/10] test/hash: update key size range and initial values for testing Pablo de Lara
2015-05-22 10:16 ` [PATCH v5 04/10] test/hash: change order of loops in hash function tests Pablo de Lara
2015-06-10 11:05 ` Bruce Richardson
2015-05-22 10:16 ` [PATCH v5 05/10] test/hash: add new functional tests for hash functions Pablo de Lara
2015-05-22 10:16 ` [PATCH v5 06/10] hash: update jhash function with the latest available Pablo de Lara
2015-06-10 11:07 ` Bruce Richardson
2015-05-22 10:16 ` [PATCH v5 07/10] hash: add two new functions to jhash library Pablo de Lara
2015-05-22 10:16 ` [PATCH v5 08/10] hash: remove duplicated code Pablo de Lara
2015-05-22 10:16 ` [PATCH v5 09/10] hash: rename rte_jhash2 to rte_jhash_32b Pablo de Lara
2015-06-10 11:09 ` Bruce Richardson
2015-05-22 10:16 ` [PATCH v5 10/10] test/hash: verify rte_jhash_1word/2words/3words Pablo de Lara
2015-06-10 15:25 ` [PATCH v6 00/10] update jhash function Pablo de Lara
2015-06-10 15:25 ` [PATCH v6 01/10] test/hash: move hash function perf tests to separate file Pablo de Lara
2015-06-10 15:25 ` [PATCH v6 02/10] test/hash: improve accuracy on cycle measurements Pablo de Lara
2015-06-10 15:25 ` [PATCH v6 03/10] test/hash: update key size range and initial values for testing Pablo de Lara
2015-06-10 15:25 ` [PATCH v6 04/10] test/hash: change order of loops in hash function tests Pablo de Lara
2015-06-10 15:25 ` Pablo de Lara [this message]
2015-06-10 15:25 ` [PATCH v6 06/10] hash: update jhash function with the latest available Pablo de Lara
2015-06-10 15:25 ` [PATCH v6 07/10] hash: add two new functions to jhash library Pablo de Lara
2015-06-10 15:25 ` [PATCH v6 08/10] hash: remove duplicated code Pablo de Lara
2015-06-16 9:33 ` Thomas Monjalon
2015-06-16 10:31 ` De Lara Guarch, Pablo
2015-06-16 13:08 ` Thomas Monjalon
2015-06-10 15:25 ` [PATCH v6 09/10] hash: rename rte_jhash2 to rte_jhash_32b Pablo de Lara
2015-06-10 15:25 ` [PATCH v6 10/10] test/hash: verify rte_jhash_1word/2words/3words Pablo de Lara
2015-06-12 10:37 ` [PATCH v6 00/10] update jhash function Bruce Richardson
2015-06-16 10:22 ` Thomas Monjalon
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=1433949927-14767-6-git-send-email-pablo.de.lara.guarch@intel.com \
--to=pablo.de.lara.guarch@intel.com \
--cc=dev@dpdk.org \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.