app/eventdev: fix order test port creation

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

diff --git a/app/test-eventdev/test_order_common.c b/app/test-eventdev/test_order_common.c
index 80e14c0..252e4a1 100644 (file)
--- a/app/test-eventdev/test_order_common.c
+++ b/app/test-eventdev/test_order_common.c
@@ -1,33 +1,5 @@
-/*
- *   BSD LICENSE
- *
- *   Copyright (C) Cavium, Inc 2017.
- *
- *   Redistribution and use in source and binary forms, with or without
- *   modification, are permitted provided that the following conditions
- *   are met:
- *
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in
- *       the documentation and/or other materials provided with the
- *       distribution.
- *     * Neither the name of Cavium, Inc nor the names of its
- *       contributors may be used to endorse or promote products derived
- *       from this software without specific prior written permission.
- *
- *   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- *   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- *   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- *   A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- *   OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- *   SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- *   LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- *   DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- *   THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *   (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2017 Cavium, Inc
  */
 
 #include "test_order_common.h"
@@ -95,6 +67,11 @@ order_producer(void *arg)
 int
 order_opt_check(struct evt_options *opt)
 {
+       if (opt->prod_type != EVT_PROD_TYPE_SYNT) {
+               evt_err("Invalid producer type");
+               return -EINVAL;
+       }
+
        /* 1 producer + N workers + 1 master */
        if (rte_lcore_count() < 3) {
                evt_err("test need minimum 3 lcores");
@@ -292,9 +269,6 @@ order_launch_lcores(struct evt_test *test, struct evt_options *opt,
        int64_t old_remaining  = -1;
 
        while (t->err == false) {
-
-               rte_event_schedule(opt->dev_id);
-
                uint64_t new_cycles = rte_get_timer_cycles();
                int64_t remaining = rte_atomic64_read(&t->outstand_pkts);
 
@@ -329,12 +303,23 @@ order_event_dev_port_setup(struct evt_test *test, struct evt_options *opt,
        int ret;
        uint8_t port;
        struct test_order *t = evt_test_priv(test);
+       struct rte_event_dev_info dev_info;
+
+       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;
+       }
+
+       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 wkr_p_conf = {
+       const struct rte_event_port_conf p_conf = {
                        .dequeue_depth = opt->wkr_deq_dep,
-                       .enqueue_depth = 64,
-                       .new_event_threshold = 4096,
+                       .enqueue_depth = dev_info.max_event_port_dequeue_depth,
+                       .new_event_threshold = dev_info.max_num_events,
        };
 
        /* setup one port per worker, linking to all queues */
@@ -345,7 +330,7 @@ order_event_dev_port_setup(struct evt_test *test, struct evt_options *opt,
                w->port_id = port;
                w->t = t;
 
-               ret = rte_event_port_setup(opt->dev_id, port, &wkr_p_conf);
+               ret = rte_event_port_setup(opt->dev_id, port, &p_conf);
                if (ret) {
                        evt_err("failed to setup port %d", port);
                        return ret;
@@ -357,12 +342,6 @@ order_event_dev_port_setup(struct evt_test *test, struct evt_options *opt,
                        return -EINVAL;
                }
        }
-       /* port for producer, no links */
-       const struct rte_event_port_conf prod_conf = {
-                       .dequeue_depth = 8,
-                       .enqueue_depth = 32,
-                       .new_event_threshold = 1200,
-       };
        struct prod_data *p = &t->prod;
 
        p->dev_id = opt->dev_id;
@@ -370,7 +349,7 @@ order_event_dev_port_setup(struct evt_test *test, struct evt_options *opt,
        p->queue_id = 0;
        p->t = t;
 
-       ret = rte_event_port_setup(opt->dev_id, port, &prod_conf);
+       ret = rte_event_port_setup(opt->dev_id, port, &p_conf);
        if (ret) {
                evt_err("failed to setup producer port %d", port);
                return ret;