From: Pablo de Lara <pablo.de.lara.guarch@intel.com>
To: dev@dpdk.org
Subject: [dpdk-dev] [PATCH v6 08/10] hash: remove duplicated code
Date: Wed, 10 Jun 2015 16:25:25 +0100 [thread overview]
Message-ID: <1433949927-14767-9-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>
rte_jhash is basically like __rte_jhash_2hashes but
it returns only 1 hash, instead of 2.
In order to remove duplicated code, rte_jhash calls __rte_jhash_2hashes,
passing 0 as the second seed and returning just the first hash value.
(performance penalty is negligible)
The same is done with rte_jhash2. Also, rte_jhash2 is just an specific case
where keys are multiple of 32 bits, and where no key alignment check is required.
So,to avoid duplicated code, the function calls __rte_jhash_2hashes
with check_align = 0 (to use the optimal path)
Signed-off-by: Pablo de Lara <pablo.de.lara.guarch@intel.com>
---
lib/librte_hash/rte_jhash.h | 300 +++++++++-----------------------------------
1 file changed, 61 insertions(+), 239 deletions(-)
diff --git a/lib/librte_hash/rte_jhash.h b/lib/librte_hash/rte_jhash.h
index adfcef7..dd19ce0 100644
--- a/lib/librte_hash/rte_jhash.h
+++ b/lib/librte_hash/rte_jhash.h
@@ -102,29 +102,20 @@ extern "C" {
#define LOWER16b_MASK rte_le_to_cpu_32(0xffff)
#define LOWER24b_MASK rte_le_to_cpu_32(0xffffff)
-/**
- * The most generic version, hashes an arbitrary sequence
- * of bytes. No alignment or length assumptions are made about
- * the input key.
- *
- * @param key
- * Key to calculate hash of.
- * @param length
- * Length of key in bytes.
- * @param initval
- * Initialising value of hash.
- * @return
- * Calculated hash value.
- */
-static inline uint32_t
-rte_jhash(const void *key, uint32_t length, uint32_t initval)
+static inline void
+__rte_jhash_2hashes(const void *key, uint32_t length, uint32_t *pc,
+ uint32_t *pb, unsigned check_align)
{
uint32_t a, b, c;
/* Set up the internal state */
- a = b = c = RTE_JHASH_GOLDEN_RATIO + ((uint32_t)length) + initval;
+ a = b = c = RTE_JHASH_GOLDEN_RATIO + ((uint32_t)length) + *pc;
+ c += *pb;
- /* Check key alignment. For x86 architecture, first case is always optimal */
+ /*
+ * Check key alignment. For x86 architecture, first case is always optimal
+ * If check_align is not set, first case will be used
+ */
#if defined(RTE_ARCH_X86_64) || defined(RTE_ARCH_I686) || defined(RTE_ARCH_X86_X32)
const uint32_t *k = key;
const uint32_t s = 0;
@@ -132,8 +123,7 @@ rte_jhash(const void *key, uint32_t length, uint32_t initval)
const uint32_t *k = (uint32_t *)(uintptr_t)key & (uintptr_t)~3);
const uint32_t s = ((uintptr_t)key & 3) * CHAR_BIT;
#endif
-
- if (s == 0) {
+ if (!check_align || s == 0) {
while (length > 12) {
a += k[0];
b += k[1];
@@ -172,7 +162,9 @@ rte_jhash(const void *key, uint32_t length, uint32_t initval)
a += k[0] & LOWER8b_MASK; break;
/* zero length strings require no mixing */
case 0:
- return c;
+ *pc = c;
+ *pb = b;
+ return;
};
} else {
/* all but the last block: affect some 32 bits of (a, b, c) */
@@ -238,66 +230,16 @@ rte_jhash(const void *key, uint32_t length, uint32_t initval)
break;
/* zero length strings require no mixing */
case 0:
- return c;
+ *pc = c;
+ *pb = b;
+ return;
}
}
__rte_jhash_final(a, b, c);
- return c;
-}
-
-/**
- * A special optimized version that handles 1 or more of uint32_ts.
- * The length parameter here is the number of uint32_ts in the key.
- *
- * @param k
- * Key to calculate hash of.
- * @param length
- * Length of key in units of 4 bytes.
- * @param initval
- * Initialising value of hash.
- * @return
- * Calculated hash value.
- */
-static inline uint32_t
-rte_jhash2(const uint32_t *k, uint32_t length, uint32_t initval)
-{
- uint32_t a, b, c;
-
- /* Set up the internal state */
- a = b = c = RTE_JHASH_GOLDEN_RATIO + (((uint32_t)length) << 2) + initval;
-
- /* Handle most of the key */
- while (length > 3) {
- a += k[0];
- b += k[1];
- c += k[2];
-
- __rte_jhash_mix(a, b, c);
-
- k += 3;
- length -= 3;
- }
-
- /* Handle the last 3 uint32_t's */
- switch (length) {
- case 3:
- c += k[2];
- /* Fallthrough */
- case 2:
- b += k[1];
- /* Fallthrough */
- case 1:
- a += k[0];
- __rte_jhash_final(a, b, c);
- /* Fallthrough */
- /* case 0: nothing left to add */
- case 0:
- break;
- };
-
- return c;
+ *pc = c;
+ *pb = b;
}
/**
@@ -318,138 +260,7 @@ rte_jhash2(const uint32_t *k, uint32_t length, uint32_t initval)
static inline void
rte_jhash_2hashes(const void *key, uint32_t length, uint32_t *pc, uint32_t *pb)
{
- uint32_t a, b, c;
-
- /* Set up the internal state */
- a = b = c = RTE_JHASH_GOLDEN_RATIO + ((uint32_t)length) + *pc;
- c += *pb;
-
- /* Check key alignment. For x86 architecture, first case is always optimal */
-#if defined(RTE_ARCH_X86_64) || defined(RTE_ARCH_I686) || defined(RTE_ARCH_X86_X32)
- const uint32_t *k = key;
- const uint32_t s = 0;
-#else
- const uint32_t *k = (uint32_t *)(uintptr_t)key & (uintptr_t)~3);
- const uint32_t s = ((uintptr_t)key & 3) * CHAR_BIT;
-#endif
-
- if (s == 0) {
- while (length > 12) {
- a += k[0];
- b += k[1];
- c += k[2];
-
- __rte_jhash_mix(a, b, c);
-
- k += 3;
- length -= 12;
- }
-
- switch (length) {
- case 12:
- c += k[2]; b += k[1]; a += k[0]; break;
- case 11:
- c += k[2] & LOWER24b_MASK; b += k[1]; a += k[0]; break;
- case 10:
- c += k[2] & LOWER16b_MASK; b += k[1]; a += k[0]; break;
- case 9:
- c += k[2] & LOWER8b_MASK; b += k[1]; a += k[0]; break;
- case 8:
- b += k[1]; a += k[0]; break;
- case 7:
- b += k[1] & LOWER24b_MASK; a += k[0]; break;
- case 6:
- b += k[1] & LOWER16b_MASK; a += k[0]; break;
- case 5:
- b += k[1] & LOWER8b_MASK; a += k[0]; break;
- case 4:
- a += k[0]; break;
- case 3:
- a += k[0] & LOWER24b_MASK; break;
- case 2:
- a += k[0] & LOWER16b_MASK; break;
- case 1:
- a += k[0] & LOWER8b_MASK; break;
- /* zero length strings require no mixing */
- case 0:
- *pc = c;
- *pb = b;
- return;
- };
- } else {
- /* all but the last block: affect some 32 bits of (a, b, c) */
- while (length > 12) {
- a += BIT_SHIFT(k[0], k[1], s);
- b += BIT_SHIFT(k[1], k[2], s);
- c += BIT_SHIFT(k[2], k[3], s);
- __rte_jhash_mix(a, b, c);
-
- k += 3;
- length -= 12;
- }
-
- /* last block: affect all 32 bits of (c) */
- switch (length) {
- case 12:
- a += BIT_SHIFT(k[0], k[1], s);
- b += BIT_SHIFT(k[1], k[2], s);
- c += BIT_SHIFT(k[2], k[3], s);
- break;
- case 11:
- a += BIT_SHIFT(k[0], k[1], s);
- b += BIT_SHIFT(k[1], k[2], s);
- c += BIT_SHIFT(k[2], k[3], s) & LOWER24b_MASK;
- break;
- case 10:
- a += BIT_SHIFT(k[0], k[1], s);
- b += BIT_SHIFT(k[1], k[2], s);
- c += BIT_SHIFT(k[2], k[3], s) & LOWER16b_MASK;
- break;
- case 9:
- a += BIT_SHIFT(k[0], k[1], s);
- b += BIT_SHIFT(k[1], k[2], s);
- c += BIT_SHIFT(k[2], k[3], s) & LOWER8b_MASK;
- break;
- case 8:
- a += BIT_SHIFT(k[0], k[1], s);
- b += BIT_SHIFT(k[1], k[2], s);
- break;
- case 7:
- a += BIT_SHIFT(k[0], k[1], s);
- b += BIT_SHIFT(k[1], k[2], s) & LOWER24b_MASK;
- break;
- case 6:
- a += BIT_SHIFT(k[0], k[1], s);
- b += BIT_SHIFT(k[1], k[2], s) & LOWER16b_MASK;
- break;
- case 5:
- a += BIT_SHIFT(k[0], k[1], s);
- b += BIT_SHIFT(k[1], k[2], s) & LOWER8b_MASK;
- break;
- case 4:
- a += BIT_SHIFT(k[0], k[1], s);
- break;
- case 3:
- a += BIT_SHIFT(k[0], k[1], s) & LOWER24b_MASK;
- break;
- case 2:
- a += BIT_SHIFT(k[0], k[1], s) & LOWER16b_MASK;
- break;
- case 1:
- a += BIT_SHIFT(k[0], k[1], s) & LOWER8b_MASK;
- break;
- /* zero length strings require no mixing */
- case 0:
- *pc = c;
- *pb = b;
- return;
- }
- }
-
- __rte_jhash_final(a, b, c);
-
- *pc = c;
- *pb = b;
+ __rte_jhash_2hashes(key, length, pc, pb, 1);
}
/**
@@ -470,43 +281,54 @@ rte_jhash_2hashes(const void *key, uint32_t length, uint32_t *pc, uint32_t *pb)
static inline void
rte_jhash2_2hashes(const uint32_t *k, uint32_t length, uint32_t *pc, uint32_t *pb)
{
- uint32_t a, b, c;
+ __rte_jhash_2hashes((const void *) k, (length << 2), pc, pb, 0);
+}
- /* Set up the internal state */
- a = b = c = RTE_JHASH_GOLDEN_RATIO + (((uint32_t)length) << 2) + *pc;
- c += *pb;
+/**
+ * The most generic version, hashes an arbitrary sequence
+ * of bytes. No alignment or length assumptions are made about
+ * the input key.
+ *
+ * @param key
+ * Key to calculate hash of.
+ * @param length
+ * Length of key in bytes.
+ * @param initval
+ * Initialising value of hash.
+ * @return
+ * Calculated hash value.
+ */
+static inline uint32_t
+rte_jhash(const void *key, uint32_t length, uint32_t initval)
+{
+ uint32_t initval2 = 0;
- /* Handle most of the key */
- while (length > 3) {
- a += k[0];
- b += k[1];
- c += k[2];
+ rte_jhash_2hashes(key, length, &initval, &initval2);
- __rte_jhash_mix(a, b, c);
+ return initval;
+}
- k += 3;
- length -= 3;
- }
+/**
+ * A special optimized version that handles 1 or more of uint32_ts.
+ * The length parameter here is the number of uint32_ts in the key.
+ *
+ * @param k
+ * Key to calculate hash of.
+ * @param length
+ * Length of key in units of 4 bytes.
+ * @param initval
+ * Initialising value of hash.
+ * @return
+ * Calculated hash value.
+ */
+static inline uint32_t
+rte_jhash2(const uint32_t *k, uint32_t length, uint32_t initval)
+{
+ uint32_t initval2 = 0;
- /* Handle the last 3 uint32_t's */
- switch (length) {
- case 3:
- c += k[2];
- /* Fallthrough */
- case 2:
- b += k[1];
- /* Fallthrough */
- case 1:
- a += k[0];
- __rte_jhash_final(a, b, c);
- /* Fallthrough */
- /* case 0: nothing left to add */
- case 0:
- break;
- };
+ rte_jhash2_2hashes(k, length, &initval, &initval2);
- *pc = c;
- *pb = b;
+ return initval;
}
static inline uint32_t
--
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 [dpdk-dev] [PATCH] hash: update jhash function with the latest available Pablo de Lara
2015-04-16 14:01 ` Bruce Richardson
2015-04-17 16:03 ` De Lara Guarch, Pablo
2015-04-24 11:23 ` [dpdk-dev] [PATCH v2 0/6] update jhash function Pablo de Lara
2015-04-24 11:23 ` [dpdk-dev] [PATCH v2 1/6] test/hash: move hash function perf tests to separate file Pablo de Lara
2015-04-24 11:23 ` [dpdk-dev] [PATCH v2 2/6] test/hash: improve accuracy on cycle measurements Pablo de Lara
2015-04-24 11:23 ` [dpdk-dev] [PATCH v2 3/6] hash: update jhash function with the latest available Pablo de Lara
2015-04-24 11:23 ` [dpdk-dev] [PATCH v2 4/6] hash: add two new functions to jhash library Pablo de Lara
2015-04-24 11:23 ` [dpdk-dev] [PATCH v2 5/6] hash: remove duplicated code Pablo de Lara
2015-04-24 11:23 ` [dpdk-dev] [PATCH v2 6/6] hash: rename rte_jhash2 to rte_jhash_32b Pablo de Lara
2015-05-05 14:43 ` [dpdk-dev] [PATCH v3 0/6] update jhash function Pablo de Lara
2015-05-05 14:43 ` [dpdk-dev] [PATCH v3 1/6] test/hash: move hash function perf tests to separate file Pablo de Lara
2015-05-05 14:43 ` [dpdk-dev] [PATCH v3 2/6] test/hash: improve accuracy on cycle measurements Pablo de Lara
2015-05-05 14:43 ` [dpdk-dev] [PATCH v3 3/6] hash: update jhash function with the latest available Pablo de Lara
2015-05-06 0:35 ` Ananyev, Konstantin
2015-05-06 9:36 ` De Lara Guarch, Pablo
2015-05-06 16:11 ` Ananyev, Konstantin
2015-05-07 11:11 ` Ananyev, Konstantin
2015-05-05 14:43 ` [dpdk-dev] [PATCH v3 4/6] hash: add two new functions to jhash library Pablo de Lara
2015-05-05 14:43 ` [dpdk-dev] [PATCH v3 5/6] hash: remove duplicated code Pablo de Lara
2015-05-05 14:43 ` [dpdk-dev] [PATCH v3 6/6] hash: rename rte_jhash2 to rte_jhash_32b Pablo de Lara
2015-05-12 11:02 ` [dpdk-dev] [PATCH v4 0/6] update jhash function Pablo de Lara
2015-05-12 11:02 ` [dpdk-dev] [PATCH v4 1/6] test/hash: move hash function perf tests to separate file Pablo de Lara
2015-05-12 11:02 ` [dpdk-dev] [PATCH v4 2/6] test/hash: improve accuracy on cycle measurements Pablo de Lara
2015-05-12 11:02 ` [dpdk-dev] [PATCH v4 3/6] hash: update jhash function with the latest available Pablo de Lara
2015-05-12 11:02 ` [dpdk-dev] [PATCH v4 4/6] hash: add two new functions to jhash library Pablo de Lara
2015-05-12 11:02 ` [dpdk-dev] [PATCH v4 5/6] hash: remove duplicated code Pablo de Lara
2015-05-12 11:02 ` [dpdk-dev] [PATCH v4 6/6] hash: rename rte_jhash2 to rte_jhash_32b Pablo de Lara
2015-05-12 15:33 ` [dpdk-dev] [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 ` [dpdk-dev] [PATCH v5 00/10] " Pablo de Lara
2015-05-22 10:16 ` [dpdk-dev] [PATCH v5 01/10] test/hash: move hash function perf tests to separate file Pablo de Lara
2015-05-22 10:16 ` [dpdk-dev] [PATCH v5 02/10] test/hash: improve accuracy on cycle measurements Pablo de Lara
2015-05-22 10:16 ` [dpdk-dev] [PATCH v5 03/10] test/hash: update key size range and initial values for testing Pablo de Lara
2015-05-22 10:16 ` [dpdk-dev] [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 ` [dpdk-dev] [PATCH v5 05/10] test/hash: add new functional tests for hash functions Pablo de Lara
2015-05-22 10:16 ` [dpdk-dev] [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 ` [dpdk-dev] [PATCH v5 07/10] hash: add two new functions to jhash library Pablo de Lara
2015-05-22 10:16 ` [dpdk-dev] [PATCH v5 08/10] hash: remove duplicated code Pablo de Lara
2015-05-22 10:16 ` [dpdk-dev] [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 ` [dpdk-dev] [PATCH v5 10/10] test/hash: verify rte_jhash_1word/2words/3words Pablo de Lara
2015-06-10 15:25 ` [dpdk-dev] [PATCH v6 00/10] update jhash function Pablo de Lara
2015-06-10 15:25 ` [dpdk-dev] [PATCH v6 01/10] test/hash: move hash function perf tests to separate file Pablo de Lara
2015-06-10 15:25 ` [dpdk-dev] [PATCH v6 02/10] test/hash: improve accuracy on cycle measurements Pablo de Lara
2015-06-10 15:25 ` [dpdk-dev] [PATCH v6 03/10] test/hash: update key size range and initial values for testing Pablo de Lara
2015-06-10 15:25 ` [dpdk-dev] [PATCH v6 04/10] test/hash: change order of loops in hash function tests Pablo de Lara
2015-06-10 15:25 ` [dpdk-dev] [PATCH v6 05/10] test/hash: add new functional tests for hash functions Pablo de Lara
2015-06-10 15:25 ` [dpdk-dev] [PATCH v6 06/10] hash: update jhash function with the latest available Pablo de Lara
2015-06-10 15:25 ` [dpdk-dev] [PATCH v6 07/10] hash: add two new functions to jhash library Pablo de Lara
2015-06-10 15:25 ` Pablo de Lara [this message]
2015-06-16 9:33 ` [dpdk-dev] [PATCH v6 08/10] hash: remove duplicated code Thomas Monjalon
2015-06-16 10:31 ` De Lara Guarch, Pablo
2015-06-16 13:08 ` Thomas Monjalon
2015-06-10 15:25 ` [dpdk-dev] [PATCH v6 09/10] hash: rename rte_jhash2 to rte_jhash_32b Pablo de Lara
2015-06-10 15:25 ` [dpdk-dev] [PATCH v6 10/10] test/hash: verify rte_jhash_1word/2words/3words Pablo de Lara
2015-06-12 10:37 ` [dpdk-dev] [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-9-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 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).