test mbuf attach

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

diff --git a/app/test-eventdev/test_perf_queue.c b/app/test-eventdev/test_perf_queue.c
index 41b70ad..f4ea3a7 100644 (file)
--- a/app/test-eventdev/test_perf_queue.c
+++ b/app/test-eventdev/test_perf_queue.c
@@ -4,16 +4,18 @@
 
 #include "test_perf_common.h"
 
-/* See http://dpdk.org/doc/guides/tools/testeventdev.html for test details */
+/* See http://doc.dpdk.org/guides/tools/testeventdev.html for test details */
 
 static inline int
 perf_queue_nb_event_queues(struct evt_options *opt)
 {
        /* nb_queues = number of producers * number of stages */
-       return evt_nr_active_lcores(opt->plcores) * opt->nb_stages;
+       uint8_t nb_prod = opt->prod_type == EVT_PROD_TYPE_ETH_RX_ADPTR ?
+               rte_eth_dev_count_avail() : evt_nr_active_lcores(opt->plcores);
+       return nb_prod * opt->nb_stages;
 }
 
-static inline __attribute__((always_inline)) void
+static __rte_always_inline void
 mark_fwd_latency(struct rte_event *const ev,
                const uint8_t nb_stages)
 {
@@ -24,7 +26,7 @@ mark_fwd_latency(struct rte_event *const ev,
        }
 }
 
-static inline __attribute__((always_inline)) void
+static __rte_always_inline void
 fwd_event(struct rte_event *const ev, uint8_t *const sched_type_list,
                const uint8_t nb_stages)
 {
@@ -47,7 +49,7 @@ perf_queue_worker(void *arg, const int enable_fwd_latency)
                        rte_pause();
                        continue;
                }
-               if (enable_fwd_latency)
+               if (enable_fwd_latency && !prod_timer_type)
                /* first q in pipeline, mark timestamp to compute fwd latency */
                        mark_fwd_latency(&ev, nb_stages);
 
@@ -86,7 +88,7 @@ perf_queue_worker_burst(void *arg, const int enable_fwd_latency)
                }
 
                for (i = 0; i < nb_rx; i++) {
-                       if (enable_fwd_latency) {
+                       if (enable_fwd_latency && !prod_timer_type) {
                                rte_prefetch0(ev[i+1].event_ptr);
                                /* first queue in pipeline.
                                 * mark time stamp to compute fwd latency
@@ -156,25 +158,25 @@ perf_queue_eventdev_setup(struct evt_test *test, struct evt_options *opt)
        int ret;
        int nb_ports;
        int nb_queues;
+       uint16_t prod;
+       struct rte_event_dev_info dev_info;
+       struct test_perf *t = evt_test_priv(test);
 
        nb_ports = evt_nr_active_lcores(opt->wlcores);
-       nb_ports += opt->prod_type == EVT_PROD_TYPE_ETH_RX_ADPTR ? 0 :
+       nb_ports += opt->prod_type == EVT_PROD_TYPE_ETH_RX_ADPTR ||
+               opt->prod_type == EVT_PROD_TYPE_EVENT_TIMER_ADPTR ? 0 :
                evt_nr_active_lcores(opt->plcores);
 
-       nb_queues = opt->prod_type == EVT_PROD_TYPE_ETH_RX_ADPTR ?
-               rte_eth_dev_count() * nb_stages :
-               perf_queue_nb_event_queues(opt);
-
-       const struct rte_event_dev_config config = {
-                       .nb_event_queues = nb_queues,
-                       .nb_event_ports = nb_ports,
-                       .nb_events_limit  = 4096,
-                       .nb_event_queue_flows = opt->nb_flows,
-                       .nb_event_port_dequeue_depth = 128,
-                       .nb_event_port_enqueue_depth = 128,
-       };
+       nb_queues = perf_queue_nb_event_queues(opt);
+
+       memset(&dev_info, 0, sizeof(struct rte_event_dev_info));
+       ret = rte_event_dev_info_get(opt->dev_id, &dev_info);
+       if (ret) {
+               evt_err("failed to get eventdev info %d", opt->dev_id);
+               return ret;
+       }
 
-       ret = rte_event_dev_configure(opt->dev_id, &config);
+       ret = evt_configure_eventdev(opt, nb_queues, nb_ports);
        if (ret) {
                evt_err("failed to configure eventdev %d", opt->dev_id);
                return ret;
@@ -186,7 +188,7 @@ perf_queue_eventdev_setup(struct evt_test *test, struct evt_options *opt)
                        .nb_atomic_order_sequences = opt->nb_flows,
        };
        /* queue configurations */
-       for (queue = 0; queue < perf_queue_nb_event_queues(opt); queue++) {
+       for (queue = 0; queue < nb_queues; queue++) {
                q_conf.schedule_type =
                        (opt->sched_type_list[queue % nb_stages]);
 
@@ -209,15 +211,29 @@ perf_queue_eventdev_setup(struct evt_test *test, struct evt_options *opt)
                }
        }
 
+       if (opt->wkr_deq_dep > dev_info.max_event_port_dequeue_depth)
+               opt->wkr_deq_dep = dev_info.max_event_port_dequeue_depth;
+
+       /* port configuration */
+       const struct rte_event_port_conf p_conf = {
+                       .dequeue_depth = opt->wkr_deq_dep,
+                       .enqueue_depth = dev_info.max_event_port_dequeue_depth,
+                       .new_event_threshold = dev_info.max_num_events,
+       };
+
        ret = perf_event_dev_port_setup(test, opt, nb_stages /* stride */,
-                                       nb_queues);
+                                       nb_queues, &p_conf);
        if (ret)
                return ret;
 
-       ret = evt_service_setup(opt->dev_id);
-       if (ret) {
-               evt_err("No service lcore found to run event dev.");
-               return ret;
+       if (!evt_has_distributed_sched(opt->dev_id)) {
+               uint32_t service_id;
+               rte_event_dev_service_id_get(opt->dev_id, &service_id);
+               ret = evt_service_setup(service_id);
+               if (ret) {
+                       evt_err("No service lcore found to run event dev.");
+                       return ret;
+               }
        }
 
        ret = rte_event_dev_start(opt->dev_id);
@@ -226,6 +242,35 @@ perf_queue_eventdev_setup(struct evt_test *test, struct evt_options *opt)
                return ret;
        }
 
+       if (opt->prod_type == EVT_PROD_TYPE_ETH_RX_ADPTR) {
+               RTE_ETH_FOREACH_DEV(prod) {
+                       ret = rte_eth_dev_start(prod);
+                       if (ret) {
+                               evt_err("Ethernet dev [%d] failed to start. Using synthetic producer",
+                                               prod);
+                               return ret;
+                       }
+
+                       ret = rte_event_eth_rx_adapter_start(prod);
+                       if (ret) {
+                               evt_err("Rx adapter[%d] start failed", prod);
+                               return ret;
+                       }
+                       printf("%s: Port[%d] using Rx adapter[%d] started\n",
+                                       __func__, prod, prod);
+               }
+       } else if (opt->prod_type == EVT_PROD_TYPE_EVENT_TIMER_ADPTR) {
+               for (prod = 0; prod < opt->nb_timer_adptrs; prod++) {
+                       ret = rte_event_timer_adapter_start(
+                                       t->timer_adptr[prod]);
+                       if (ret) {
+                               evt_err("failed to Start event timer adapter %d"
+                                               , prod);
+                               return ret;
+                       }
+               }
+       }
+
        return 0;
 }
 
@@ -270,6 +315,7 @@ static const struct evt_test_ops perf_queue =  {
        .launch_lcores      = perf_queue_launch_lcores,
        .eventdev_destroy   = perf_eventdev_destroy,
        .mempool_destroy    = perf_mempool_destroy,
+       .ethdev_destroy     = perf_ethdev_destroy,
        .test_result        = perf_test_result,
        .test_destroy       = perf_test_destroy,
 };