net/sfc: support API to negotiate delivery of Rx metadata

[dpdk.git] / app / test-eventdev / test_perf_common.c

diff --git a/app/test-eventdev/test_perf_common.c b/app/test-eventdev/test_perf_common.c
index 955edb7..cc10065 100644 (file)
--- a/app/test-eventdev/test_perf_common.c
+++ b/app/test-eventdev/test_perf_common.c
@@ -2,6 +2,8 @@
  * Copyright(c) 2017 Cavium, Inc
  */
 
+#include <math.h>
+
 #include "test_perf_common.h"
 
 int
@@ -95,11 +97,13 @@ perf_event_timer_producer(void *arg)
        uint64_t timeout_ticks = opt->expiry_nsec / opt->timer_tick_nsec;
 
        memset(&tim, 0, sizeof(struct rte_event_timer));
-       timeout_ticks = opt->optm_timer_tick_nsec ?
-                       (timeout_ticks * opt->timer_tick_nsec)
-                       / opt->optm_timer_tick_nsec : timeout_ticks;
+       timeout_ticks =
+               opt->optm_timer_tick_nsec
+                       ? ceil((double)(timeout_ticks * opt->timer_tick_nsec) /
+                              opt->optm_timer_tick_nsec)
+                       : timeout_ticks;
        timeout_ticks += timeout_ticks ? 0 : 1;
-       tim.ev.event_type =  RTE_EVENT_TYPE_TIMER;
+       tim.ev.event_type = RTE_EVENT_TYPE_TIMER;
        tim.ev.op = RTE_EVENT_OP_NEW;
        tim.ev.sched_type = t->opt->sched_type_list[0];
        tim.ev.queue_id = p->queue_id;
@@ -159,11 +163,13 @@ perf_event_timer_producer_burst(void *arg)
        uint64_t timeout_ticks = opt->expiry_nsec / opt->timer_tick_nsec;
 
        memset(&tim, 0, sizeof(struct rte_event_timer));
-       timeout_ticks = opt->optm_timer_tick_nsec ?
-                       (timeout_ticks * opt->timer_tick_nsec)
-                       / opt->optm_timer_tick_nsec : timeout_ticks;
+       timeout_ticks =
+               opt->optm_timer_tick_nsec
+                       ? ceil((double)(timeout_ticks * opt->timer_tick_nsec) /
+                              opt->optm_timer_tick_nsec)
+                       : timeout_ticks;
        timeout_ticks += timeout_ticks ? 0 : 1;
-       tim.ev.event_type =  RTE_EVENT_TYPE_TIMER;
+       tim.ev.event_type = RTE_EVENT_TYPE_TIMER;
        tim.ev.op = RTE_EVENT_OP_NEW;
        tim.ev.sched_type = t->opt->sched_type_list[0];
        tim.ev.queue_id = p->queue_id;
@@ -224,7 +230,6 @@ processed_pkts(struct test_perf *t)
        uint8_t i;
        uint64_t total = 0;
 
-       rte_smp_rmb();
        for (i = 0; i < t->nb_workers; i++)
                total += t->worker[i].processed_pkts;
 
@@ -237,7 +242,6 @@ total_latency(struct test_perf *t)
        uint8_t i;
        uint64_t total = 0;
 
-       rte_smp_rmb();
        for (i = 0; i < t->nb_workers; i++)
                total += t->worker[i].latency;
 
@@ -327,7 +331,6 @@ perf_launch_lcores(struct evt_test *test, struct evt_options *opt,
                                        opt->prod_type ==
                                        EVT_PROD_TYPE_EVENT_TIMER_ADPTR) {
                                        t->done = true;
-                                       rte_smp_wmb();
                                        break;
                                }
                        }
@@ -341,7 +344,6 @@ perf_launch_lcores(struct evt_test *test, struct evt_options *opt,
                                rte_event_dev_dump(opt->dev_id, stdout);
                                evt_err("No schedules for seconds, deadlock");
                                t->done = true;
-                               rte_smp_wmb();
                                break;
                        }
                        dead_lock_remaining = remaining;