X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;ds=sidebyside;f=test%2Ftest%2Ftest_mempool_perf.c;h=4c877834e7b8def3502805490f9295b1e11f8824;hb=af7551e2bfceef7ddeb7941b26b06a9b6d6dee5e;hp=ebf1721ac32b932b14997d3bb63087b66f5c5846;hpb=7d3b1ec47fae5b2d972e05d0ee37bb7a1731b085;p=dpdk.git diff --git a/test/test/test_mempool_perf.c b/test/test/test_mempool_perf.c index ebf1721ac3..4c877834e7 100644 --- a/test/test/test_mempool_perf.c +++ b/test/test/test_mempool_perf.c @@ -1,34 +1,5 @@ -/*- - * BSD LICENSE - * - * 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 - * are met: - * - * * 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 - * distribution. - * * 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 - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +/* SPDX-License-Identifier: BSD-3-Clause + * Copyright(c) 2010-2014 Intel Corporation */ #include @@ -44,7 +15,6 @@ #include #include #include -#include #include #include #include @@ -55,6 +25,7 @@ #include #include #include +#include #include "test.h" @@ -109,8 +80,6 @@ goto label; \ } while (0) -static struct rte_mempool *mp; -static struct rte_mempool *mp_cache, *mp_nocache; static int use_external_cache; static unsigned external_cache_size = RTE_MEMPOOL_CACHE_MAX_SIZE; @@ -144,10 +113,11 @@ my_obj_init(struct rte_mempool *mp, __attribute__((unused)) void *arg, } static int -per_lcore_mempool_test(__attribute__((unused)) void *arg) +per_lcore_mempool_test(void *arg) { void *obj_table[MAX_KEEP]; unsigned i, idx; + struct rte_mempool *mp = arg; unsigned lcore_id = rte_lcore_id(); int ret = 0; uint64_t start_cycles, end_cycles; @@ -187,7 +157,7 @@ per_lcore_mempool_test(__attribute__((unused)) void *arg) ret = rte_mempool_generic_get(mp, &obj_table[idx], n_get_bulk, - cache, 0); + cache); if (unlikely(ret < 0)) { rte_mempool_dump(stdout, mp); /* in this case, objects are lost... */ @@ -201,7 +171,7 @@ per_lcore_mempool_test(__attribute__((unused)) void *arg) while (idx < n_keep) { rte_mempool_generic_put(mp, &obj_table[idx], n_put_bulk, - cache, 0); + cache); idx += n_put_bulk; } } @@ -221,7 +191,7 @@ out: /* launch all the per-lcore test, and display the result */ static int -launch_cores(unsigned cores) +launch_cores(struct rte_mempool *mp, unsigned int cores) { unsigned lcore_id; uint64_t rate; @@ -249,13 +219,13 @@ launch_cores(unsigned cores) break; cores--; rte_eal_remote_launch(per_lcore_mempool_test, - NULL, lcore_id); + mp, lcore_id); } /* start synchro and launch test on master */ rte_atomic32_set(&synchro, 1); - ret = per_lcore_mempool_test(NULL); + ret = per_lcore_mempool_test(mp); cores = cores_save; RTE_LCORE_FOREACH_SLAVE(lcore_id) { @@ -282,7 +252,7 @@ launch_cores(unsigned cores) /* for a given number of core, launch all test cases */ static int -do_one_mempool_test(unsigned cores) +do_one_mempool_test(struct rte_mempool *mp, unsigned int cores) { unsigned bulk_tab_get[] = { 1, 4, 32, 0 }; unsigned bulk_tab_put[] = { 1, 4, 32, 0 }; @@ -299,7 +269,7 @@ do_one_mempool_test(unsigned cores) n_get_bulk = *get_bulk_ptr; n_put_bulk = *put_bulk_ptr; n_keep = *keep_ptr; - ret = launch_cores(cores); + ret = launch_cores(mp, cores); if (ret < 0) return -1; @@ -312,72 +282,118 @@ do_one_mempool_test(unsigned cores) static int test_mempool_perf(void) { + struct rte_mempool *mp_cache = NULL; + struct rte_mempool *mp_nocache = NULL; + struct rte_mempool *default_pool = NULL; + const char *default_pool_ops; + int ret = -1; + rte_atomic32_init(&synchro); /* create a mempool (without cache) */ + mp_nocache = rte_mempool_create("perf_test_nocache", MEMPOOL_SIZE, + MEMPOOL_ELT_SIZE, 0, 0, + NULL, NULL, + my_obj_init, NULL, + SOCKET_ID_ANY, 0); if (mp_nocache == NULL) - mp_nocache = rte_mempool_create("perf_test_nocache", MEMPOOL_SIZE, - MEMPOOL_ELT_SIZE, 0, 0, - NULL, NULL, - my_obj_init, NULL, - SOCKET_ID_ANY, 0); - if (mp_nocache == NULL) - return -1; + goto err; /* create a mempool (with cache) */ + mp_cache = rte_mempool_create("perf_test_cache", MEMPOOL_SIZE, + MEMPOOL_ELT_SIZE, + RTE_MEMPOOL_CACHE_MAX_SIZE, 0, + NULL, NULL, + my_obj_init, NULL, + SOCKET_ID_ANY, 0); if (mp_cache == NULL) - mp_cache = rte_mempool_create("perf_test_cache", MEMPOOL_SIZE, - MEMPOOL_ELT_SIZE, - RTE_MEMPOOL_CACHE_MAX_SIZE, 0, - NULL, NULL, - my_obj_init, NULL, - SOCKET_ID_ANY, 0); - if (mp_cache == NULL) - return -1; + goto err; + + default_pool_ops = rte_mbuf_best_mempool_ops(); + /* Create a mempool based on Default handler */ + default_pool = rte_mempool_create_empty("default_pool", + MEMPOOL_SIZE, + MEMPOOL_ELT_SIZE, + 0, 0, + SOCKET_ID_ANY, 0); + + if (default_pool == NULL) { + printf("cannot allocate %s mempool\n", default_pool_ops); + goto err; + } + + if (rte_mempool_set_ops_byname(default_pool, default_pool_ops, NULL) + < 0) { + printf("cannot set %s handler\n", default_pool_ops); + goto err; + } + + if (rte_mempool_populate_default(default_pool) < 0) { + printf("cannot populate %s mempool\n", default_pool_ops); + goto err; + } + + rte_mempool_obj_iter(default_pool, my_obj_init, NULL); /* performance test with 1, 2 and max cores */ printf("start performance test (without cache)\n"); - mp = mp_nocache; - if (do_one_mempool_test(1) < 0) - return -1; + if (do_one_mempool_test(mp_nocache, 1) < 0) + goto err; - if (do_one_mempool_test(2) < 0) - return -1; + if (do_one_mempool_test(mp_nocache, 2) < 0) + goto err; - if (do_one_mempool_test(rte_lcore_count()) < 0) - return -1; + if (do_one_mempool_test(mp_nocache, rte_lcore_count()) < 0) + goto err; + + /* performance test with 1, 2 and max cores */ + printf("start performance test for %s (without cache)\n", + default_pool_ops); + + if (do_one_mempool_test(default_pool, 1) < 0) + goto err; + + if (do_one_mempool_test(default_pool, 2) < 0) + goto err; + + if (do_one_mempool_test(default_pool, rte_lcore_count()) < 0) + goto err; /* performance test with 1, 2 and max cores */ printf("start performance test (with cache)\n"); - mp = mp_cache; - if (do_one_mempool_test(1) < 0) - return -1; + if (do_one_mempool_test(mp_cache, 1) < 0) + goto err; - if (do_one_mempool_test(2) < 0) - return -1; + if (do_one_mempool_test(mp_cache, 2) < 0) + goto err; - if (do_one_mempool_test(rte_lcore_count()) < 0) - return -1; + if (do_one_mempool_test(mp_cache, rte_lcore_count()) < 0) + goto err; /* performance test with 1, 2 and max cores */ printf("start performance test (with user-owned cache)\n"); - mp = mp_nocache; use_external_cache = 1; - if (do_one_mempool_test(1) < 0) - return -1; + if (do_one_mempool_test(mp_nocache, 1) < 0) + goto err; - if (do_one_mempool_test(2) < 0) - return -1; + if (do_one_mempool_test(mp_nocache, 2) < 0) + goto err; - if (do_one_mempool_test(rte_lcore_count()) < 0) - return -1; + if (do_one_mempool_test(mp_nocache, rte_lcore_count()) < 0) + goto err; rte_mempool_list_dump(stdout); - return 0; + ret = 0; + +err: + rte_mempool_free(mp_cache); + rte_mempool_free(mp_nocache); + rte_mempool_free(default_pool); + return ret; } REGISTER_TEST_COMMAND(mempool_perf_autotest, test_mempool_perf);