Code Review
/
deb_dpdk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
New upstream version 17.11.1
[deb_dpdk.git]
/
test
/
test
/
test_ring_perf.c
diff --git
a/test/test/test_ring_perf.c
b/test/test/test_ring_perf.c
index
ed89896
..
66aa51a
100644
(file)
--- a/
test/test/test_ring_perf.c
+++ b/
test/test/test_ring_perf.c
@@
-37,6
+37,7
@@
#include <rte_ring.h>
#include <rte_cycles.h>
#include <rte_launch.h>
#include <rte_ring.h>
#include <rte_cycles.h>
#include <rte_launch.h>
+#include <rte_pause.h>
#include "test.h"
#include "test.h"
@@
-60,9
+61,6
@@
*/
static const volatile unsigned bulk_sizes[] = { 8, 32 };
*/
static const volatile unsigned bulk_sizes[] = { 8, 32 };
-/* The ring structure used for tests */
-static struct rte_ring *r;
-
struct lcore_pair {
unsigned c1, c2;
};
struct lcore_pair {
unsigned c1, c2;
};
@@
-143,7
+141,7
@@
get_two_sockets(struct lcore_pair *lcp)
/* Get cycle counts for dequeuing from an empty ring. Should be 2 or 3 cycles */
static void
/* Get cycle counts for dequeuing from an empty ring. Should be 2 or 3 cycles */
static void
-test_empty_dequeue(
void
)
+test_empty_dequeue(
struct rte_ring *r
)
{
const unsigned iter_shift = 26;
const unsigned iterations = 1<<iter_shift;
{
const unsigned iter_shift = 26;
const unsigned iterations = 1<<iter_shift;
@@
-171,6
+169,7
@@
test_empty_dequeue(void)
* and return two. Input = burst size, output = cycle average for sp/sc & mp/mc
*/
struct thread_params {
* and return two. Input = burst size, output = cycle average for sp/sc & mp/mc
*/
struct thread_params {
+ struct rte_ring *r;
unsigned size; /* input value, the burst size */
double spsc, mpmc; /* output value, the single or multi timings */
};
unsigned size; /* input value, the burst size */
double spsc, mpmc; /* output value, the single or multi timings */
};
@@
-185,6
+184,7
@@
enqueue_bulk(void *p)
const unsigned iter_shift = 23;
const unsigned iterations = 1<<iter_shift;
struct thread_params *params = p;
const unsigned iter_shift = 23;
const unsigned iterations = 1<<iter_shift;
struct thread_params *params = p;
+ struct rte_ring *r = params->r;
const unsigned size = params->size;
unsigned i;
void *burst[MAX_BURST] = {0};
const unsigned size = params->size;
unsigned i;
void *burst[MAX_BURST] = {0};
@@
-220,6
+220,7
@@
dequeue_bulk(void *p)
const unsigned iter_shift = 23;
const unsigned iterations = 1<<iter_shift;
struct thread_params *params = p;
const unsigned iter_shift = 23;
const unsigned iterations = 1<<iter_shift;
struct thread_params *params = p;
+ struct rte_ring *r = params->r;
const unsigned size = params->size;
unsigned i;
void *burst[MAX_BURST] = {0};
const unsigned size = params->size;
unsigned i;
void *burst[MAX_BURST] = {0};
@@
-250,7
+251,7
@@
dequeue_bulk(void *p)
* used to measure ring perf between hyperthreads, cores and sockets.
*/
static void
* used to measure ring perf between hyperthreads, cores and sockets.
*/
static void
-run_on_core_pair(struct lcore_pair *cores,
+run_on_core_pair(struct lcore_pair *cores,
struct rte_ring *r,
lcore_function_t f1, lcore_function_t f2)
{
struct thread_params param1 = {0}, param2 = {0};
lcore_function_t f1, lcore_function_t f2)
{
struct thread_params param1 = {0}, param2 = {0};
@@
-258,6
+259,7
@@
run_on_core_pair(struct lcore_pair *cores,
for (i = 0; i < sizeof(bulk_sizes)/sizeof(bulk_sizes[0]); i++) {
lcore_count = 0;
param1.size = param2.size = bulk_sizes[i];
for (i = 0; i < sizeof(bulk_sizes)/sizeof(bulk_sizes[0]); i++) {
lcore_count = 0;
param1.size = param2.size = bulk_sizes[i];
+ param1.r = param2.r = r;
if (cores->c1 == rte_get_master_lcore()) {
rte_eal_remote_launch(f2, ¶m2, cores->c2);
f1(¶m1);
if (cores->c1 == rte_get_master_lcore()) {
rte_eal_remote_launch(f2, ¶m2, cores->c2);
f1(¶m1);
@@
-280,7
+282,7
@@
run_on_core_pair(struct lcore_pair *cores,
* takes on a single lcore. Result is for comparison with the bulk enq+deq.
*/
static void
* takes on a single lcore. Result is for comparison with the bulk enq+deq.
*/
static void
-test_single_enqueue_dequeue(
void
)
+test_single_enqueue_dequeue(
struct rte_ring *r
)
{
const unsigned iter_shift = 24;
const unsigned iterations = 1<<iter_shift;
{
const unsigned iter_shift = 24;
const unsigned iterations = 1<<iter_shift;
@@
-313,7
+315,7
@@
test_single_enqueue_dequeue(void)
* as for the bulk function called on a single lcore.
*/
static void
* as for the bulk function called on a single lcore.
*/
static void
-test_burst_enqueue_dequeue(
void
)
+test_burst_enqueue_dequeue(
struct rte_ring *r
)
{
const unsigned iter_shift = 23;
const unsigned iterations = 1<<iter_shift;
{
const unsigned iter_shift = 23;
const unsigned iterations = 1<<iter_shift;
@@
-351,7
+353,7
@@
test_burst_enqueue_dequeue(void)
/* Times enqueue and dequeue on a single lcore */
static void
/* Times enqueue and dequeue on a single lcore */
static void
-test_bulk_enqueue_dequeue(
void
)
+test_bulk_enqueue_dequeue(
struct rte_ring *r
)
{
const unsigned iter_shift = 23;
const unsigned iterations = 1<<iter_shift;
{
const unsigned iter_shift = 23;
const unsigned iterations = 1<<iter_shift;
@@
-393,32
+395,35
@@
static int
test_ring_perf(void)
{
struct lcore_pair cores;
test_ring_perf(void)
{
struct lcore_pair cores;
+ struct rte_ring *r = NULL;
+
r = rte_ring_create(RING_NAME, RING_SIZE, rte_socket_id(), 0);
r = rte_ring_create(RING_NAME, RING_SIZE, rte_socket_id(), 0);
- if (r == NULL
&& (r = rte_ring_lookup(RING_NAME)) == NULL
)
+ if (r == NULL)
return -1;
printf("### Testing single element and burst enq/deq ###\n");
return -1;
printf("### Testing single element and burst enq/deq ###\n");
- test_single_enqueue_dequeue();
- test_burst_enqueue_dequeue();
+ test_single_enqueue_dequeue(
r
);
+ test_burst_enqueue_dequeue(
r
);
printf("\n### Testing empty dequeue ###\n");
printf("\n### Testing empty dequeue ###\n");
- test_empty_dequeue();
+ test_empty_dequeue(
r
);
printf("\n### Testing using a single lcore ###\n");
printf("\n### Testing using a single lcore ###\n");
- test_bulk_enqueue_dequeue();
+ test_bulk_enqueue_dequeue(
r
);
if (get_two_hyperthreads(&cores) == 0) {
printf("\n### Testing using two hyperthreads ###\n");
if (get_two_hyperthreads(&cores) == 0) {
printf("\n### Testing using two hyperthreads ###\n");
- run_on_core_pair(&cores, enqueue_bulk, dequeue_bulk);
+ run_on_core_pair(&cores,
r,
enqueue_bulk, dequeue_bulk);
}
if (get_two_cores(&cores) == 0) {
printf("\n### Testing using two physical cores ###\n");
}
if (get_two_cores(&cores) == 0) {
printf("\n### Testing using two physical cores ###\n");
- run_on_core_pair(&cores, enqueue_bulk, dequeue_bulk);
+ run_on_core_pair(&cores,
r,
enqueue_bulk, dequeue_bulk);
}
if (get_two_sockets(&cores) == 0) {
printf("\n### Testing using two NUMA nodes ###\n");
}
if (get_two_sockets(&cores) == 0) {
printf("\n### Testing using two NUMA nodes ###\n");
- run_on_core_pair(&cores, enqueue_bulk, dequeue_bulk);
+ run_on_core_pair(&cores,
r,
enqueue_bulk, dequeue_bulk);
}
}
+ rte_ring_free(r);
return 0;
}
return 0;
}