test mbuf attach

[dpdk.git] / app / test-eventdev / test_perf_common.h

diff --git a/app/test-eventdev/test_perf_common.h b/app/test-eventdev/test_perf_common.h
index b6758a9..ff9705d 100644 (file)
--- a/app/test-eventdev/test_perf_common.h
+++ b/app/test-eventdev/test_perf_common.h
@@ -12,6 +12,8 @@
 #include <rte_cycles.h>
 #include <rte_ethdev.h>
 #include <rte_eventdev.h>
+#include <rte_event_eth_rx_adapter.h>
+#include <rte_event_timer_adapter.h>
 #include <rte_lcore.h>
 #include <rte_malloc.h>
 #include <rte_mempool.h>
@@ -38,6 +40,7 @@ struct prod_data {
        struct test_perf *t;
 } __rte_cache_aligned;
 
+
 struct test_perf {
        /* Don't change the offset of "done". Signal handler use this memory
         * to terminate all lcores work.
@@ -53,10 +56,18 @@ struct test_perf {
        struct worker_data worker[EVT_MAX_PORTS];
        struct evt_options *opt;
        uint8_t sched_type_list[EVT_MAX_STAGES] __rte_cache_aligned;
+       struct rte_event_timer_adapter *timer_adptr[
+               RTE_EVENT_TIMER_ADAPTER_NUM_MAX] __rte_cache_aligned;
 } __rte_cache_aligned;
 
 struct perf_elt {
-       uint64_t timestamp;
+       union {
+               struct rte_event_timer tim;
+               struct {
+                       char pad[offsetof(struct rte_event_timer, user_meta)];
+                       uint64_t timestamp;
+               };
+       };
 } __rte_cache_aligned;
 
 #define BURST_SIZE 16
@@ -67,6 +78,8 @@ struct perf_elt {
        struct evt_options *opt = t->opt;\
        const uint8_t dev = w->dev_id;\
        const uint8_t port = w->port_id;\
+       const uint8_t prod_timer_type = \
+               opt->prod_type == EVT_PROD_TYPE_EVENT_TIMER_ADPTR;\
        uint8_t *const sched_type_list = &t->sched_type_list[0];\
        struct rte_mempool *const pool = t->pool;\
        const uint8_t nb_stages = t->opt->nb_stages;\
@@ -78,7 +91,7 @@ struct perf_elt {
                printf("%s(): lcore %d dev_id %d port=%d\n", __func__,\
                                rte_lcore_id(), dev, port)
 
-static inline __attribute__((always_inline)) int
+static __rte_always_inline int
 perf_process_last_stage(struct rte_mempool *const pool,
                struct rte_event *const ev, struct worker_data *const w,
                void *bufs[], int const buf_sz, uint8_t count)
@@ -94,7 +107,7 @@ perf_process_last_stage(struct rte_mempool *const pool,
        return count;
 }
 
-static inline __attribute__((always_inline)) uint8_t
+static __rte_always_inline uint8_t
 perf_process_last_stage_latency(struct rte_mempool *const pool,
                struct rte_event *const ev, struct worker_data *const w,
                void *bufs[], int const buf_sz, uint8_t count)
@@ -132,13 +145,15 @@ int perf_test_setup(struct evt_test *test, struct evt_options *opt);
 int perf_ethdev_setup(struct evt_test *test, struct evt_options *opt);
 int perf_mempool_setup(struct evt_test *test, struct evt_options *opt);
 int perf_event_dev_port_setup(struct evt_test *test, struct evt_options *opt,
-                               uint8_t stride, uint8_t nb_queues);
+                               uint8_t stride, uint8_t nb_queues,
+                               const struct rte_event_port_conf *port_conf);
 int perf_event_dev_service_setup(uint8_t dev_id);
 int perf_launch_lcores(struct evt_test *test, struct evt_options *opt,
                int (*worker)(void *));
 void perf_opt_dump(struct evt_options *opt, uint8_t nb_queues);
 void perf_test_destroy(struct evt_test *test, struct evt_options *opt);
 void perf_eventdev_destroy(struct evt_test *test, struct evt_options *opt);
+void perf_ethdev_destroy(struct evt_test *test, struct evt_options *opt);
 void perf_mempool_destroy(struct evt_test *test, struct evt_options *opt);
 
 #endif /* _TEST_PERF_COMMON_ */