net/virtio: rationalize queue flushing

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

diff --git a/app/test-eventdev/test_perf_atq.c b/app/test-eventdev/test_perf_atq.c
index f58eab6..d07a054 100644 (file)
--- a/app/test-eventdev/test_perf_atq.c
+++ b/app/test-eventdev/test_perf_atq.c
@@ -10,7 +10,8 @@ static inline int
 atq_nb_event_queues(struct evt_options *opt)
 {
        /* nb_queues = number of producers */
-       return evt_nr_active_lcores(opt->plcores);
+       return opt->prod_type == EVT_PROD_TYPE_ETH_RX_ADPTR ?
+               rte_eth_dev_count() : evt_nr_active_lcores(opt->plcores);
 }
 
 static inline __attribute__((always_inline)) void
@@ -157,14 +158,32 @@ perf_atq_eventdev_setup(struct evt_test *test, struct evt_options *opt)
 {
        int ret;
        uint8_t queue;
+       uint8_t nb_queues;
+       uint8_t nb_ports;
+       struct rte_event_dev_info dev_info;
+
+       nb_ports = evt_nr_active_lcores(opt->wlcores);
+       nb_ports += opt->prod_type == EVT_PROD_TYPE_ETH_RX_ADPTR ? 0 :
+               evt_nr_active_lcores(opt->plcores);
+
+       nb_queues = atq_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;
+       }
 
        const struct rte_event_dev_config config = {
-                       .nb_event_queues = atq_nb_event_queues(opt),
-                       .nb_event_ports = perf_nb_event_ports(opt),
-                       .nb_events_limit  = 4096,
+                       .nb_event_queues = nb_queues,
+                       .nb_event_ports = nb_ports,
+                       .nb_events_limit  = dev_info.max_num_events,
                        .nb_event_queue_flows = opt->nb_flows,
-                       .nb_event_port_dequeue_depth = 128,
-                       .nb_event_port_enqueue_depth = 128,
+                       .nb_event_port_dequeue_depth =
+                               dev_info.max_event_port_dequeue_depth,
+                       .nb_event_port_enqueue_depth =
+                               dev_info.max_event_port_enqueue_depth,
        };
 
        ret = rte_event_dev_configure(opt->dev_id, &config);
@@ -180,7 +199,7 @@ perf_atq_eventdev_setup(struct evt_test *test, struct evt_options *opt)
                        .nb_atomic_order_sequences = opt->nb_flows,
        };
        /* queue configurations */
-       for (queue = 0; queue < atq_nb_event_queues(opt); queue++) {
+       for (queue = 0; queue < nb_queues; queue++) {
                ret = rte_event_queue_setup(opt->dev_id, queue, &q_conf);
                if (ret) {
                        evt_err("failed to setup queue=%d", queue);
@@ -188,15 +207,18 @@ perf_atq_eventdev_setup(struct evt_test *test, struct evt_options *opt)
                }
        }
 
-       ret = perf_event_dev_port_setup(test, opt, 1 /* stride */,
-                                       atq_nb_event_queues(opt));
+       ret = perf_event_dev_port_setup(test, opt, 1 /* stride */, nb_queues);
        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);
@@ -243,11 +265,13 @@ static const struct evt_test_ops perf_atq =  {
        .opt_check          = perf_atq_opt_check,
        .opt_dump           = perf_atq_opt_dump,
        .test_setup         = perf_test_setup,
+       .ethdev_setup       = perf_ethdev_setup,
        .mempool_setup      = perf_mempool_setup,
        .eventdev_setup     = perf_atq_eventdev_setup,
        .launch_lcores      = perf_atq_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,
 };