X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=app%2Ftest%2Ftest_hash_perf.c;h=bd531ec82fcdb5ff87260ad7d68704667f024366;hb=972e365bfe7aab7d51d2b5e48230a7d145e68463;hp=8a0feb302bb0fc27cf35ea63ffc013b4b69d6b6e;hpb=b6df9fc8715f9a925136006b18fdd65f9c621757;p=dpdk.git diff --git a/app/test/test_hash_perf.c b/app/test/test_hash_perf.c index 8a0feb302b..bd531ec82f 100644 --- a/app/test/test_hash_perf.c +++ b/app/test/test_hash_perf.c @@ -1,35 +1,34 @@ /*- * BSD LICENSE - * - * Copyright(c) 2010-2013 Intel Corporation. All rights reserved. + * + * Copyright(c) 2010-2014 Intel Corporation. All rights reserved. * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions * are met: - * - * * Redistributions of source code must retain the above copyright + * + * * Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided with the * distribution. - * * Neither the name of Intel Corporation nor the names of its - * contributors may be used to endorse or promote products derived + * * Neither the name of Intel Corporation nor the names of its + * contributors may be used to endorse or promote products derived * from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * */ #include @@ -47,23 +46,16 @@ #include #include #include -#include #include #include #include +#include "test.h" + #include #include #include - -#ifdef RTE_MACHINE_CPUFLAG_SSE4_2 #include -#endif -#include - -#include "test.h" - -#ifdef RTE_LIBRTE_HASH /* Types of hash table performance test that can be performed */ enum hash_test_t { @@ -101,11 +93,7 @@ struct tbl_perf_test_params { */ #define HASHTEST_ITERATIONS 1000000 -#ifdef RTE_MACHINE_CPUFLAG_SSE4_2 static rte_hash_function hashtest_funcs[] = {rte_jhash, rte_hash_crc}; -#else -static rte_hash_function hashtest_funcs[] = {rte_jhash}; -#endif static uint32_t hashtest_initvals[] = {0}; static uint32_t hashtest_key_lens[] = {2, 4, 5, 6, 7, 8, 10, 11, 15, 16, 21, 31, 32, 33, 63, 64}; /******************************************************************************/ @@ -247,7 +235,6 @@ struct tbl_perf_test_params tbl_perf_params[] = { LOOKUP, ITERATIONS, 1048576, 4, 64, rte_jhash, 0}, { LOOKUP, ITERATIONS, 1048576, 8, 64, rte_jhash, 0}, { LOOKUP, ITERATIONS, 1048576, 16, 64, rte_jhash, 0}, -#ifdef RTE_MACHINE_CPUFLAG_SSE4_2 /* Small table, add */ /* Test type | Iterations | Entries | BucketSize | KeyLen | HashFunc | InitVal */ { ADD_ON_EMPTY, 1024, 1024, 1, 16, rte_hash_crc, 0}, @@ -380,7 +367,6 @@ struct tbl_perf_test_params tbl_perf_params[] = { LOOKUP, ITERATIONS, 1048576, 4, 64, rte_hash_crc, 0}, { LOOKUP, ITERATIONS, 1048576, 8, 64, rte_hash_crc, 0}, { LOOKUP, ITERATIONS, 1048576, 16, 64, rte_hash_crc, 0}, -#endif }; /******************************************************************************/ @@ -401,6 +387,7 @@ struct tbl_perf_test_params tbl_perf_params[] = if (cond) { \ printf("ERROR line %d: " str "\n", __LINE__, ##__VA_ARGS__); \ if (handle) rte_fbk_hash_free(handle); \ + if (keys) rte_free(keys); \ return -1; \ } \ } while(0) @@ -426,10 +413,8 @@ static const char *get_hash_name(rte_hash_function f) if (f == rte_jhash) return "jhash"; -#ifdef RTE_MACHINE_CPUFLAG_SSE4_2 if (f == rte_hash_crc) return "rte_hash_crc"; -#endif return "UnknownHash"; } @@ -462,13 +447,13 @@ run_single_tbl_perf_test(const struct rte_hash *h, hash_operation func, /* Initialise */ num_buckets = params->entries / params->bucket_entries; - key = (uint8_t *) rte_zmalloc("hash key", - params->key_len * sizeof(uint8_t), 16); + key = rte_zmalloc("hash key", + params->key_len * sizeof(uint8_t), 16); if (key == NULL) return -1; - bucket_occupancies = (uint32_t *) rte_zmalloc("bucket occupancies", - num_buckets * sizeof(uint32_t), 16); + bucket_occupancies = rte_calloc("bucket occupancies", + num_buckets, sizeof(uint32_t), 16); if (bucket_occupancies == NULL) { rte_free(key); return -1; @@ -540,7 +525,7 @@ run_tbl_perf_test(struct tbl_perf_test_params *params) char name[RTE_HASH_NAMESIZE]; char hashname[RTE_HASH_NAMESIZE]; - rte_snprintf(name, 32, "test%u", calledCount++); + snprintf(name, 32, "test%u", calledCount++); hash_params.name = name; handle = rte_hash_create(&hash_params); @@ -591,7 +576,7 @@ run_tbl_perf_test(struct tbl_perf_test_params *params) default: return -1; } - rte_snprintf(hashname, RTE_HASH_NAMESIZE, "%s", get_hash_name(params->hash_func)); + snprintf(hashname, RTE_HASH_NAMESIZE, "%s", get_hash_name(params->hash_func)); printf("%-12s, %-15s, %-16u, %-7u, %-18u, %-8u, %-19.2f, %.2f\n", hashname, @@ -701,8 +686,8 @@ fbk_hash_perf_test(void) .entries_per_bucket = 4, .socket_id = rte_socket_id(), }; - struct rte_fbk_hash_table *handle; - uint32_t keys[ENTRIES] = {0}; + struct rte_fbk_hash_table *handle = NULL; + uint32_t *keys = NULL; unsigned indexes[TEST_SIZE]; uint64_t lookup_time = 0; unsigned added = 0; @@ -712,6 +697,10 @@ fbk_hash_perf_test(void) handle = rte_fbk_hash_create(¶ms); RETURN_IF_ERROR_FBK(handle == NULL, "fbk hash creation failed"); + keys = rte_zmalloc(NULL, ENTRIES * sizeof(*keys), 0); + RETURN_IF_ERROR_FBK(keys == NULL, + "fbk hash: memory allocation for key store failed"); + /* Generate random keys and values. */ for (i = 0; i < ENTRIES; i++) { uint32_t key = (uint32_t)rte_rand(); @@ -763,7 +752,8 @@ fbk_hash_perf_test(void) /* * Do all unit and performance tests. */ -int test_hash_perf(void) +static int +test_hash_perf(void) { if (run_all_tbl_perf_tests() < 0) return -1; @@ -773,13 +763,9 @@ int test_hash_perf(void) return -1; return 0; } -#else -int -test_hash_perf(void) -{ - printf("The Hash library is not included in this build\n"); - return 0; -} - -#endif +static struct test_command hash_perf_cmd = { + .command = "hash_perf_autotest", + .callback = test_hash_perf, +}; +REGISTER_TEST_COMMAND(hash_perf_cmd);