git.droids-corp.org
/
dpdk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
eal: fix FreeBSD build
[dpdk.git]
/
app
/
test
/
test_hash_functions.c
diff --git
a/app/test/test_hash_functions.c
b/app/test/test_hash_functions.c
index
8c7cf63
..
9652b04
100644
(file)
--- a/
app/test/test_hash_functions.c
+++ b/
app/test/test_hash_functions.c
@@
-54,26
+54,30
@@
* e.g.: key size = 4, key = 0x03020100
* key size = 8, key = 0x0706050403020100
*/
* e.g.: key size = 4, key = 0x03020100
* key size = 8, key = 0x0706050403020100
*/
-static uint32_t hash_values_jhash[2][10] = {{
+static uint32_t hash_values_jhash[2][12] = {{
+ 0x8ba9414b, 0xdf0d39c9,
0xe4cf1d42, 0xd4ccb93c, 0x5e84eafc, 0x21362cfe,
0x2f4775ab, 0x9ff036cc, 0xeca51474, 0xbc9d6816,
0x12926a31, 0x1c9fa888
},
{
0xe4cf1d42, 0xd4ccb93c, 0x5e84eafc, 0x21362cfe,
0x2f4775ab, 0x9ff036cc, 0xeca51474, 0xbc9d6816,
0x12926a31, 0x1c9fa888
},
{
+ 0x5c62c303, 0x1b8cf784,
0x8270ac65, 0x05fa6668, 0x762df861, 0xda088f2f,
0x59614cd4, 0x7a94f690, 0xdc1e4993, 0x30825494,
0x91d0e462, 0x768087fc
}
};
0x8270ac65, 0x05fa6668, 0x762df861, 0xda088f2f,
0x59614cd4, 0x7a94f690, 0xdc1e4993, 0x30825494,
0x91d0e462, 0x768087fc
}
};
-static uint32_t hash_values_crc[2][10] = {{
+static uint32_t hash_values_crc[2][12] = {{
+ 0x00000000, 0xf26b8303,
0x91545164, 0x06040eb1, 0x9bb99201, 0xcc4c4fe4,
0x91545164, 0x06040eb1, 0x9bb99201, 0xcc4c4fe4,
- 0x14a90993, 0xf8a5dd8c, 0xc
62beb31, 0x32bf340
e,
- 0x
72f9d22b
, 0x4a11475e
+ 0x14a90993, 0xf8a5dd8c, 0xc
aa1ad0b, 0x7ac1e03
e,
+ 0x
43f44466
, 0x4a11475e
},
{
},
{
+ 0xbdfd3980, 0x70204542,
0x98cd4c70, 0xd52c702f, 0x41fc0e1c, 0x3905f65c,
0x98cd4c70, 0xd52c702f, 0x41fc0e1c, 0x3905f65c,
- 0x94bff47f, 0x1bab102d, 0x
d2911ed7, 0xe8faa813
,
- 0x
6bea184b
, 0x53028d3e
+ 0x94bff47f, 0x1bab102d, 0x
f4a2c645, 0xbf441539
,
+ 0x
789c104f
, 0x53028d3e
}
};
}
};
@@
-85,10
+89,11
@@
static uint32_t hash_values_crc[2][10] = {{
* from the array entries is tested.
*/
#define HASHTEST_ITERATIONS 1000000
* from the array entries is tested.
*/
#define HASHTEST_ITERATIONS 1000000
-
+#define MAX_KEYSIZE 64
static rte_hash_function hashtest_funcs[] = {rte_jhash, rte_hash_crc};
static uint32_t hashtest_initvals[] = {0, 0xdeadbeef};
static uint32_t hashtest_key_lens[] = {
static rte_hash_function hashtest_funcs[] = {rte_jhash, rte_hash_crc};
static uint32_t hashtest_initvals[] = {0, 0xdeadbeef};
static uint32_t hashtest_key_lens[] = {
+ 1, 2, /* Unusual key sizes */
4, 8, 16, 32, 48, 64, /* standard key sizes */
9, /* IPv4 SRC + DST + protocol, unpadded */
13, /* IPv4 5-tuple, unpadded */
4, 8, 16, 32, 48, 64, /* standard key sizes */
9, /* IPv4 SRC + DST + protocol, unpadded */
13, /* IPv4 5-tuple, unpadded */
@@
-119,7
+124,7
@@
static void
run_hash_func_perf_test(uint32_t key_len, uint32_t init_val,
rte_hash_function f)
{
run_hash_func_perf_test(uint32_t key_len, uint32_t init_val,
rte_hash_function f)
{
- static uint8_t key[HASHTEST_ITERATIONS][
RTE_HASH_KEY_LENGTH_MAX
];
+ static uint8_t key[HASHTEST_ITERATIONS][
MAX_KEYSIZE
];
uint64_t ticks, start, end;
unsigned i, j;
uint64_t ticks, start, end;
unsigned i, j;
@@
-314,8
+319,4
@@
test_hash_functions(void)
return 0;
}
return 0;
}
-static struct test_command hash_functions_cmd = {
- .command = "hash_functions_autotest",
- .callback = test_hash_functions,
-};
-REGISTER_TEST_COMMAND(hash_functions_cmd);
+REGISTER_TEST_COMMAND(hash_functions_autotest, test_hash_functions);