test/eventdev: add SW test infrastructure

Add the test infrastructure, create and destroy the test
instance.

Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
Signed-off-by: David Hunt <david.hunt@intel.com>
Signed-off-by: Harry van Haaren <harry.van.haaren@intel.com>
Acked-by: Anatoly Burakov <anatoly.burakov@intel.com>

diff --git a/test/test/Makefile b/test/test/Makefile
index 9f5dd49..5f93ac0 100644 (file)
--- a/test/test/Makefile
+++ b/test/test/Makefile
@@ -199,7 +199,10 @@ SRCS-$(CONFIG_RTE_LIBRTE_CRYPTODEV) += test_cryptodev_blockcipher.c
 SRCS-$(CONFIG_RTE_LIBRTE_CRYPTODEV) += test_cryptodev_perf.c
 SRCS-$(CONFIG_RTE_LIBRTE_CRYPTODEV) += test_cryptodev.c
 
-SRCS-$(CONFIG_RTE_LIBRTE_EVENTDEV) += test_eventdev.c
+ifeq ($(CONFIG_RTE_LIBRTE_EVENTDEV),y)
+SRCS-y += test_eventdev.c
+SRCS-$(CONFIG_RTE_LIBRTE_PMD_SW_EVENTDEV) += test_eventdev_sw.c
+endif
 
 SRCS-$(CONFIG_RTE_LIBRTE_KVARGS) += test_kvargs.c
 
@@ -215,6 +218,11 @@ ifeq ($(CONFIG_RTE_TOOLCHAIN_GCC),y)
 ifeq ($(shell test $(GCC_VERSION) -ge 44 && echo 1), 1)
 CFLAGS_test_memcpy.o += -fno-var-tracking-assignments
 CFLAGS_test_memcpy_perf.o += -fno-var-tracking-assignments
+# for older GCC versions, allow us to initialize an event using
+# designated initializers.
+ifeq ($(shell test $(GCC_VERSION) -le 50 && echo 1), 1)
+CFLAGS_test_eventdev_sw.o += -Wno-missing-field-initializers
+endif
 endif
 endif
 

diff --git a/test/test/autotest_data.py b/test/test/autotest_data.py
index 0cd598b..165ed6c 100644 (file)
--- a/test/test/autotest_data.py
+++ b/test/test/autotest_data.py
@@ -345,6 +345,32 @@ parallel_test_group_list = [
 # tests that should not be run when any other tests are running
 non_parallel_test_group_list = [
 
+    {
+        "Prefix":    "eventdev",
+        "Memory":    "512",
+        "Tests":
+        [
+            {
+                "Name":    "Eventdev common autotest",
+                "Command": "eventdev_common_autotest",
+                "Func":    default_autotest,
+                "Report":  None,
+            },
+        ]
+    },
+    {
+        "Prefix":    "eventdev_sw",
+        "Memory":    "512",
+        "Tests":
+        [
+            {
+                "Name":    "Eventdev sw autotest",
+                "Command": "eventdev_sw_autotest",
+                "Func":    default_autotest,
+                "Report":  None,
+            },
+        ]
+    },
     {
         "Prefix":    "kni",
         "Memory":    "512",

diff --git a/test/test/test_eventdev_sw.c b/test/test/test_eventdev_sw.c
new file mode 100644 (file)
index 0000000..dfbff00
--- /dev/null
+++ b/test/test/test_eventdev_sw.c
@@ -0,0 +1,137 @@
+/*-
+ *   BSD LICENSE
+ *
+ *   Copyright(c) 2016-2017 Intel Corporation. All rights reserved.
+ *   All rights reserved.
+ *
+ *   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 Intel Corporation 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.
+ */
+
+#include <stdio.h>
+#include <string.h>
+#include <stdint.h>
+#include <errno.h>
+#include <unistd.h>
+#include <sys/queue.h>
+
+#include <rte_memory.h>
+#include <rte_memzone.h>
+#include <rte_launch.h>
+#include <rte_eal.h>
+#include <rte_per_lcore.h>
+#include <rte_lcore.h>
+#include <rte_debug.h>
+#include <rte_ethdev.h>
+#include <rte_cycles.h>
+
+#include <rte_eventdev.h>
+#include "test.h"
+
+#define MAX_PORTS 16
+#define MAX_QIDS 16
+#define NUM_PACKETS (1<<18)
+
+static int evdev;
+
+struct test {
+       struct rte_mempool *mbuf_pool;
+       uint8_t port[MAX_PORTS];
+       uint8_t qid[MAX_QIDS];
+       int nb_qids;
+};
+
+
+struct test_event_dev_stats {
+       uint64_t rx_pkts;       /**< Total packets received */
+       uint64_t rx_dropped;    /**< Total packets dropped (Eg Invalid QID) */
+       uint64_t tx_pkts;       /**< Total packets transmitted */
+
+       /** Packets received on this port */
+       uint64_t port_rx_pkts[MAX_PORTS];
+       /** Packets dropped on this port */
+       uint64_t port_rx_dropped[MAX_PORTS];
+       /** Packets inflight on this port */
+       uint64_t port_inflight[MAX_PORTS];
+       /** Packets transmitted on this port */
+       uint64_t port_tx_pkts[MAX_PORTS];
+       /** Packets received on this qid */
+       uint64_t qid_rx_pkts[MAX_QIDS];
+       /** Packets dropped on this qid */
+       uint64_t qid_rx_dropped[MAX_QIDS];
+       /** Packets transmitted on this qid */
+       uint64_t qid_tx_pkts[MAX_QIDS];
+};
+
+static struct rte_mempool *eventdev_func_mempool;
+
+static int
+test_sw_eventdev(void)
+{
+       struct test *t = malloc(sizeof(struct test));
+
+       const char *eventdev_name = "event_sw0";
+       evdev = rte_event_dev_get_dev_id(eventdev_name);
+       if (evdev < 0) {
+               printf("%d: Eventdev %s not found - creating.\n",
+                               __LINE__, eventdev_name);
+               if (rte_eal_vdev_init(eventdev_name, NULL) < 0) {
+                       printf("Error creating eventdev\n");
+                       return -1;
+               }
+               evdev = rte_event_dev_get_dev_id(eventdev_name);
+               if (evdev < 0) {
+                       printf("Error finding newly created eventdev\n");
+                       return -1;
+               }
+       }
+
+       /* Only create mbuf pool once, reuse for each test run */
+       if (!eventdev_func_mempool) {
+               eventdev_func_mempool = rte_pktmbuf_pool_create(
+                               "EVENTDEV_SW_SA_MBUF_POOL",
+                               (1<<12), /* 4k buffers */
+                               32 /*MBUF_CACHE_SIZE*/,
+                               0,
+                               512, /* use very small mbufs */
+                               rte_socket_id());
+               if (!eventdev_func_mempool) {
+                       printf("ERROR creating mempool\n");
+                       return -1;
+               }
+       }
+       t->mbuf_pool = eventdev_func_mempool;
+
+       /*
+        * Free test instance, leaving mempool initialized, and a pointer to it
+        * in static eventdev_func_mempool, as it is re-used on re-runs
+        */
+       free(t);
+
+       return 0;
+}
+
+REGISTER_TEST_COMMAND(eventdev_sw_autotest, test_sw_eventdev);