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
net/bnxt: fix null dereference in session cleanup
[dpdk.git]
/
app
/
test
/
test_stack_perf.c
diff --git
a/app/test/test_stack_perf.c
b/app/test/test_stack_perf.c
index
3ab7267
..
1eae00a
100644
(file)
--- a/
app/test/test_stack_perf.c
+++ b/
app/test/test_stack_perf.c
@@
-6,7
+6,6
@@
#include <stdio.h>
#include <inttypes.h>
#include <stdio.h>
#include <inttypes.h>
-#include <rte_atomic.h>
#include <rte_cycles.h>
#include <rte_launch.h>
#include <rte_pause.h>
#include <rte_cycles.h>
#include <rte_launch.h>
#include <rte_pause.h>
@@
-24,7
+23,7
@@
*/
static volatile unsigned int bulk_sizes[] = {8, MAX_BURST};
*/
static volatile unsigned int bulk_sizes[] = {8, MAX_BURST};
-static
rte_atomic
32_t lcore_barrier;
+static
uint
32_t lcore_barrier;
struct lcore_pair {
unsigned int c1;
struct lcore_pair {
unsigned int c1;
@@
-144,9
+143,8
@@
bulk_push_pop(void *p)
s = args->s;
size = args->sz;
s = args->s;
size = args->sz;
- rte_atomic32_sub(&lcore_barrier, 1);
- while (rte_atomic32_read(&lcore_barrier) != 0)
- rte_pause();
+ __atomic_fetch_sub(&lcore_barrier, 1, __ATOMIC_RELAXED);
+ rte_wait_until_equal_32(&lcore_barrier, 0, __ATOMIC_RELAXED);
uint64_t start = rte_rdtsc();
uint64_t start = rte_rdtsc();
@@
-175,12
+173,12
@@
run_on_core_pair(struct lcore_pair *cores, struct rte_stack *s,
unsigned int i;
for (i = 0; i < RTE_DIM(bulk_sizes); i++) {
unsigned int i;
for (i = 0; i < RTE_DIM(bulk_sizes); i++) {
-
rte_atomic32_set(&lcore_barrier, 2
);
+
__atomic_store_n(&lcore_barrier, 2, __ATOMIC_RELAXED
);
args[0].sz = args[1].sz = bulk_sizes[i];
args[0].s = args[1].s = s;
args[0].sz = args[1].sz = bulk_sizes[i];
args[0].s = args[1].s = s;
- if (cores->c1 == rte_get_ma
ster
_lcore()) {
+ if (cores->c1 == rte_get_ma
in
_lcore()) {
rte_eal_remote_launch(fn, &args[1], cores->c2);
fn(&args[0]);
rte_eal_wait_lcore(cores->c2);
rte_eal_remote_launch(fn, &args[1], cores->c2);
fn(&args[0]);
rte_eal_wait_lcore(cores->c2);
@@
-208,9
+206,9
@@
run_on_n_cores(struct rte_stack *s, lcore_function_t fn, int n)
int cnt = 0;
double avg;
int cnt = 0;
double avg;
-
rte_atomic32_set(&lcore_barrier, n
);
+
__atomic_store_n(&lcore_barrier, n, __ATOMIC_RELAXED
);
- RTE_LCORE_FOREACH_
SLAVE
(lcore_id) {
+ RTE_LCORE_FOREACH_
WORKER
(lcore_id) {
if (++cnt >= n)
break;
if (++cnt >= n)
break;
@@
-235,7
+233,7
@@
run_on_n_cores(struct rte_stack *s, lcore_function_t fn, int n)
avg = args[rte_lcore_id()].avg;
cnt = 0;
avg = args[rte_lcore_id()].avg;
cnt = 0;
- RTE_LCORE_FOREACH_
SLAVE
(lcore_id) {
+ RTE_LCORE_FOREACH_
WORKER
(lcore_id) {
if (++cnt >= n)
break;
avg += args[lcore_id].avg;
if (++cnt >= n)
break;
avg += args[lcore_id].avg;
@@
-302,7
+300,7
@@
__test_stack_perf(uint32_t flags)
struct lcore_pair cores;
struct rte_stack *s;
struct lcore_pair cores;
struct rte_stack *s;
-
rte_atomic32_init(&lcore_barrier
);
+
__atomic_store_n(&lcore_barrier, 0, __ATOMIC_RELAXED
);
s = rte_stack_create(STACK_NAME, STACK_SIZE, rte_socket_id(), flags);
if (s == NULL) {
s = rte_stack_create(STACK_NAME, STACK_SIZE, rte_socket_id(), flags);
if (s == NULL) {
@@
-349,7
+347,11
@@
test_stack_perf(void)
static int
test_lf_stack_perf(void)
{
static int
test_lf_stack_perf(void)
{
+#if defined(RTE_STACK_LF_SUPPORTED)
return __test_stack_perf(RTE_STACK_F_LF);
return __test_stack_perf(RTE_STACK_F_LF);
+#else
+ return TEST_SKIPPED;
+#endif
}
REGISTER_TEST_COMMAND(stack_perf_autotest, test_stack_perf);
}
REGISTER_TEST_COMMAND(stack_perf_autotest, test_stack_perf);