d/numam-dpdk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

test/mempool_perf: remove mempool global vars

Browse Source 
Signed-off-by: Santosh Shukla <santosh.shukla@caviumnetworks.com>
Acked-by: Olivier Matz <olivier.matz@6wind.com>
This commit is contained in:
Santosh Shukla 2017-04-18 20:11:28 +05:30 committed by Thomas Monjalon
parent cbee51be40
commit 58856272ba
1 changed files with 30 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
test/test/test_mempool_perf.c
View File

@ -109,8 +109,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 +142,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;
@ -221,7 +220,7 @@ per_lcore_mempool_test(__attribute__((unused)) void *arg)
/* 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 +248,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 +281,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 +298,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,67 +311,65 @@ do_one_mempool_test(unsigned cores)
static int
test_mempool_perf(void)
{
struct rte_mempool *mp_cache = NULL;
struct rte_mempool *mp_nocache = NULL;
rte_atomic32_init(&synchro);
/* create a mempool (without cache) */
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);
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;
/* create a mempool (with cache) */
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);
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;
/* 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)
if (do_one_mempool_test(mp_nocache, 1) < 0)
return -1;
if (do_one_mempool_test(2) < 0)
if (do_one_mempool_test(mp_nocache, 2) < 0)
return -1;
if (do_one_mempool_test(rte_lcore_count()) < 0)
if (do_one_mempool_test(mp_nocache, rte_lcore_count()) < 0)
return -1;
/* 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)
if (do_one_mempool_test(mp_cache, 1) < 0)
return -1;
if (do_one_mempool_test(2) < 0)
if (do_one_mempool_test(mp_cache, 2) < 0)
return -1;
if (do_one_mempool_test(rte_lcore_count()) < 0)
if (do_one_mempool_test(mp_cache, rte_lcore_count()) < 0)
return -1;
/* 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)
if (do_one_mempool_test(mp_nocache, 1) < 0)
return -1;
if (do_one_mempool_test(2) < 0)
if (do_one_mempool_test(mp_nocache, 2) < 0)
return -1;
if (do_one_mempool_test(rte_lcore_count()) < 0)
if (do_one_mempool_test(mp_nocache, rte_lcore_count()) < 0)
return -1;
rte_mempool_list_dump(stdout);