test: rely on dynamic log level to display hexdumps
[dpdk.git] / test / test / test_eventdev.c
index 47514e6..ba39cba 100644 (file)
@@ -37,6 +37,7 @@
 #include <rte_memcpy.h>
 #include <rte_eventdev.h>
 #include <rte_dev.h>
+#include <rte_bus_vdev.h>
 
 #include "test.h"
 
@@ -300,15 +301,13 @@ test_eventdev_queue_setup(void)
        /* Negative cases */
        ret = rte_event_queue_default_conf_get(TEST_DEV_ID, 0, &qconf);
        TEST_ASSERT_SUCCESS(ret, "Failed to get queue0 info");
-       qconf.event_queue_cfg = (RTE_EVENT_QUEUE_CFG_ALL_TYPES &
-                RTE_EVENT_QUEUE_CFG_TYPE_MASK);
+       qconf.event_queue_cfg = RTE_EVENT_QUEUE_CFG_ALL_TYPES;
        qconf.nb_atomic_flows = info.max_event_queue_flows + 1;
        ret = rte_event_queue_setup(TEST_DEV_ID, 0, &qconf);
        TEST_ASSERT(ret == -EINVAL, "Expected -EINVAL, %d", ret);
 
        qconf.nb_atomic_flows = info.max_event_queue_flows;
-       qconf.event_queue_cfg = (RTE_EVENT_QUEUE_CFG_ORDERED_ONLY &
-                RTE_EVENT_QUEUE_CFG_TYPE_MASK);
+       qconf.schedule_type = RTE_SCHED_TYPE_ORDERED;
        qconf.nb_atomic_order_sequences = info.max_event_queue_flows + 1;
        ret = rte_event_queue_setup(TEST_DEV_ID, 0, &qconf);
        TEST_ASSERT(ret == -EINVAL, "Expected -EINVAL, %d", ret);
@@ -356,7 +355,7 @@ test_eventdev_queue_count(void)
 }
 
 static int
-test_eventdev_queue_priority(void)
+test_eventdev_queue_attr_priority(void)
 {
        int i, ret;
        struct rte_event_dev_info info;
@@ -381,7 +380,11 @@ test_eventdev_queue_priority(void)
        }
 
        for (i = 0; i < (int)queue_count; i++) {
-               priority =  rte_event_queue_priority(TEST_DEV_ID, i);
+               uint32_t tmp;
+               TEST_ASSERT_SUCCESS(rte_event_queue_attr_get(TEST_DEV_ID, i,
+                                   RTE_EVENT_QUEUE_ATTR_PRIORITY, &tmp),
+                                   "Queue priority get failed");
+               priority = tmp;
 
                if (info.event_dev_cap & RTE_EVENT_DEV_CAP_QUEUE_QOS)
                        TEST_ASSERT_EQUAL(priority,
@@ -396,6 +399,134 @@ test_eventdev_queue_priority(void)
        return TEST_SUCCESS;
 }
 
+static int
+test_eventdev_queue_attr_nb_atomic_flows(void)
+{
+       int i, ret;
+       struct rte_event_dev_info info;
+       struct rte_event_queue_conf qconf;
+       uint32_t nb_atomic_flows;
+
+       ret = rte_event_dev_info_get(TEST_DEV_ID, &info);
+       TEST_ASSERT_SUCCESS(ret, "Failed to get event dev info");
+
+       uint32_t queue_count;
+       TEST_ASSERT_SUCCESS(rte_event_dev_attr_get(TEST_DEV_ID,
+                           RTE_EVENT_DEV_ATTR_QUEUE_COUNT, &queue_count),
+                           "Queue count get failed");
+
+       ret = rte_event_queue_default_conf_get(TEST_DEV_ID, 0, &qconf);
+       TEST_ASSERT_SUCCESS(ret, "Failed to get queue 0's def conf");
+
+       if (qconf.nb_atomic_flows == 0)
+               /* Assume PMD doesn't support atomic flows, return early */
+               return -ENOTSUP;
+
+       qconf.schedule_type = RTE_SCHED_TYPE_ATOMIC;
+
+       for (i = 0; i < (int)queue_count; i++) {
+               ret = rte_event_queue_setup(TEST_DEV_ID, i, &qconf);
+               TEST_ASSERT_SUCCESS(ret, "Failed to setup queue%d", i);
+       }
+
+       for (i = 0; i < (int)queue_count; i++) {
+               TEST_ASSERT_SUCCESS(rte_event_queue_attr_get(TEST_DEV_ID, i,
+                                   RTE_EVENT_QUEUE_ATTR_NB_ATOMIC_FLOWS,
+                                   &nb_atomic_flows),
+                                   "Queue nb_atomic_flows get failed");
+
+               TEST_ASSERT_EQUAL(nb_atomic_flows, qconf.nb_atomic_flows,
+                                 "Wrong atomic flows value for queue%d", i);
+       }
+
+       return TEST_SUCCESS;
+}
+
+static int
+test_eventdev_queue_attr_nb_atomic_order_sequences(void)
+{
+       int i, ret;
+       struct rte_event_dev_info info;
+       struct rte_event_queue_conf qconf;
+       uint32_t nb_atomic_order_sequences;
+
+       ret = rte_event_dev_info_get(TEST_DEV_ID, &info);
+       TEST_ASSERT_SUCCESS(ret, "Failed to get event dev info");
+
+       uint32_t queue_count;
+       TEST_ASSERT_SUCCESS(rte_event_dev_attr_get(TEST_DEV_ID,
+                           RTE_EVENT_DEV_ATTR_QUEUE_COUNT, &queue_count),
+                           "Queue count get failed");
+
+       ret = rte_event_queue_default_conf_get(TEST_DEV_ID, 0, &qconf);
+       TEST_ASSERT_SUCCESS(ret, "Failed to get queue 0's def conf");
+
+       if (qconf.nb_atomic_order_sequences == 0)
+               /* Assume PMD doesn't support reordering */
+               return -ENOTSUP;
+
+       qconf.schedule_type = RTE_SCHED_TYPE_ORDERED;
+
+       for (i = 0; i < (int)queue_count; i++) {
+               ret = rte_event_queue_setup(TEST_DEV_ID, i, &qconf);
+               TEST_ASSERT_SUCCESS(ret, "Failed to setup queue%d", i);
+       }
+
+       for (i = 0; i < (int)queue_count; i++) {
+               TEST_ASSERT_SUCCESS(rte_event_queue_attr_get(TEST_DEV_ID, i,
+                           RTE_EVENT_QUEUE_ATTR_NB_ATOMIC_ORDER_SEQUENCES,
+                           &nb_atomic_order_sequences),
+                           "Queue nb_atomic_order_sequencess get failed");
+
+               TEST_ASSERT_EQUAL(nb_atomic_order_sequences,
+                                 qconf.nb_atomic_order_sequences,
+                                 "Wrong atomic order sequences value for queue%d",
+                                 i);
+       }
+
+       return TEST_SUCCESS;
+}
+
+static int
+test_eventdev_queue_attr_event_queue_cfg(void)
+{
+       int i, ret;
+       struct rte_event_dev_info info;
+       struct rte_event_queue_conf qconf;
+       uint32_t event_queue_cfg;
+
+       ret = rte_event_dev_info_get(TEST_DEV_ID, &info);
+       TEST_ASSERT_SUCCESS(ret, "Failed to get event dev info");
+
+       uint32_t queue_count;
+       TEST_ASSERT_SUCCESS(rte_event_dev_attr_get(TEST_DEV_ID,
+                           RTE_EVENT_DEV_ATTR_QUEUE_COUNT, &queue_count),
+                           "Queue count get failed");
+
+       ret = rte_event_queue_default_conf_get(TEST_DEV_ID, 0, &qconf);
+       TEST_ASSERT_SUCCESS(ret, "Failed to get queue0 def conf");
+
+       qconf.event_queue_cfg = RTE_EVENT_QUEUE_CFG_SINGLE_LINK;
+
+       for (i = 0; i < (int)queue_count; i++) {
+               ret = rte_event_queue_setup(TEST_DEV_ID, i, &qconf);
+               TEST_ASSERT_SUCCESS(ret, "Failed to setup queue%d", i);
+       }
+
+       for (i = 0; i < (int)queue_count; i++) {
+               TEST_ASSERT_SUCCESS(rte_event_queue_attr_get(TEST_DEV_ID, i,
+                                   RTE_EVENT_QUEUE_ATTR_EVENT_QUEUE_CFG,
+                                   &event_queue_cfg),
+                                   "Queue event_queue_cfg get failed");
+
+               TEST_ASSERT_EQUAL(event_queue_cfg, qconf.event_queue_cfg,
+                                 "Wrong event_queue_cfg value for queue%d",
+                                 i);
+       }
+
+       return TEST_SUCCESS;
+}
+
 static int
 test_eventdev_port_default_conf_get(void)
 {
@@ -474,7 +605,7 @@ test_eventdev_port_setup(void)
 }
 
 static int
-test_eventdev_dequeue_depth(void)
+test_eventdev_port_attr_dequeue_depth(void)
 {
        int ret;
        struct rte_event_dev_info info;
@@ -491,7 +622,7 @@ test_eventdev_dequeue_depth(void)
        uint32_t value;
        TEST_ASSERT_EQUAL(rte_event_port_attr_get(TEST_DEV_ID, 0,
                        RTE_EVENT_PORT_ATTR_DEQ_DEPTH, &value),
-                       0, "Call to port dequeue depth failed");
+                       0, "Call to get port dequeue depth failed");
        TEST_ASSERT_EQUAL(value, pconf.dequeue_depth,
                        "Wrong port dequeue depth");
 
@@ -499,7 +630,7 @@ test_eventdev_dequeue_depth(void)
 }
 
 static int
-test_eventdev_enqueue_depth(void)
+test_eventdev_port_attr_enqueue_depth(void)
 {
        int ret;
        struct rte_event_dev_info info;
@@ -516,13 +647,38 @@ test_eventdev_enqueue_depth(void)
        uint32_t value;
        TEST_ASSERT_EQUAL(rte_event_port_attr_get(TEST_DEV_ID, 0,
                        RTE_EVENT_PORT_ATTR_ENQ_DEPTH, &value),
-                       0, "Call to port enqueue depth failed");
+                       0, "Call to get port enqueue depth failed");
        TEST_ASSERT_EQUAL(value, pconf.enqueue_depth,
                        "Wrong port enqueue depth");
 
        return TEST_SUCCESS;
 }
 
+static int
+test_eventdev_port_attr_new_event_threshold(void)
+{
+       int ret;
+       struct rte_event_dev_info info;
+       struct rte_event_port_conf pconf;
+
+       ret = rte_event_dev_info_get(TEST_DEV_ID, &info);
+       TEST_ASSERT_SUCCESS(ret, "Failed to get event dev info");
+
+       ret = rte_event_port_default_conf_get(TEST_DEV_ID, 0, &pconf);
+       TEST_ASSERT_SUCCESS(ret, "Failed to get port0 info");
+       ret = rte_event_port_setup(TEST_DEV_ID, 0, &pconf);
+       TEST_ASSERT_SUCCESS(ret, "Failed to setup port0");
+
+       uint32_t value;
+       TEST_ASSERT_EQUAL(rte_event_port_attr_get(TEST_DEV_ID, 0,
+                       RTE_EVENT_PORT_ATTR_NEW_EVENT_THRESHOLD, &value),
+                       0, "Call to get port new event threshold failed");
+       TEST_ASSERT_EQUAL((int32_t) value, pconf.new_event_threshold,
+                       "Wrong port new event threshold");
+
+       return TEST_SUCCESS;
+}
+
 static int
 test_eventdev_port_count(void)
 {
@@ -809,15 +965,23 @@ static struct unit_test_suite eventdev_common_testsuite  = {
                TEST_CASE_ST(eventdev_configure_setup, NULL,
                        test_eventdev_queue_count),
                TEST_CASE_ST(eventdev_configure_setup, NULL,
-                       test_eventdev_queue_priority),
+                       test_eventdev_queue_attr_priority),
+               TEST_CASE_ST(eventdev_configure_setup, NULL,
+                       test_eventdev_queue_attr_nb_atomic_flows),
+               TEST_CASE_ST(eventdev_configure_setup, NULL,
+                       test_eventdev_queue_attr_nb_atomic_order_sequences),
+               TEST_CASE_ST(eventdev_configure_setup, NULL,
+                       test_eventdev_queue_attr_event_queue_cfg),
                TEST_CASE_ST(eventdev_configure_setup, NULL,
                        test_eventdev_port_default_conf_get),
                TEST_CASE_ST(eventdev_configure_setup, NULL,
                        test_eventdev_port_setup),
                TEST_CASE_ST(eventdev_configure_setup, NULL,
-                       test_eventdev_dequeue_depth),
+                       test_eventdev_port_attr_dequeue_depth),
+               TEST_CASE_ST(eventdev_configure_setup, NULL,
+                       test_eventdev_port_attr_enqueue_depth),
                TEST_CASE_ST(eventdev_configure_setup, NULL,
-                       test_eventdev_enqueue_depth),
+                       test_eventdev_port_attr_new_event_threshold),
                TEST_CASE_ST(eventdev_configure_setup, NULL,
                        test_eventdev_port_count),
                TEST_CASE_ST(eventdev_configure_setup, NULL,