X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=app%2Ftest-eventdev%2Fevt_common.h;h=2f301a7e79f9cd23fdd32f7e29217f91c52e3b2a;hb=a538d1d2d01e85429e7dd011806b52250d37c5dc;hp=1c3522ff4dd2793a16a5497779381fdfb991abb3;hpb=f0959283edb22dbabaf51c1e20fea466284d634e;p=dpdk.git

diff --git a/app/test-eventdev/evt_common.h b/app/test-eventdev/evt_common.h
index 1c3522ff4d..2f301a7e79 100644
--- a/app/test-eventdev/evt_common.h
+++ b/app/test-eventdev/evt_common.h
@@ -7,6 +7,7 @@
 
 #include <rte_common.h>
 #include <rte_debug.h>
+#include <rte_event_crypto_adapter.h>
 #include <rte_eventdev.h>
 #include <rte_service.h>
 
@@ -39,6 +40,7 @@ enum evt_prod_type {
 	EVT_PROD_TYPE_SYNT,          /* Producer type Synthetic i.e. CPU. */
 	EVT_PROD_TYPE_ETH_RX_ADPTR,  /* Producer type Eth Rx Adapter. */
 	EVT_PROD_TYPE_EVENT_TIMER_ADPTR,  /* Producer type Timer Adapter. */
+	EVT_PROD_TYPE_EVENT_CRYPTO_ADPTR,  /* Producer type Crypto Adapter. */
 	EVT_PROD_TYPE_MAX,
 };
 
@@ -47,28 +49,37 @@ struct evt_options {
 	char test_name[EVT_TEST_NAME_MAX_LEN];
 	bool plcores[RTE_MAX_LCORE];
 	bool wlcores[RTE_MAX_LCORE];
-	uint8_t sched_type_list[EVT_MAX_STAGES];
-	uint32_t nb_flows;
-	int socket_id;
 	int pool_sz;
+	int socket_id;
 	int nb_stages;
 	int verbose_level;
-	uint64_t nb_pkts;
+	uint8_t dev_id;
+	uint8_t timdev_cnt;
 	uint8_t nb_timer_adptrs;
-	uint64_t nb_timers;
-	uint64_t timer_tick_nsec;
-	uint64_t optm_timer_tick_nsec;
-	uint64_t max_tmo_nsec;
-	uint64_t expiry_nsec;
+	uint8_t timdev_use_burst;
+	uint8_t per_port_pool;
+	uint8_t sched_type_list[EVT_MAX_STAGES];
+	uint16_t mbuf_sz;
 	uint16_t wkr_deq_dep;
-	uint8_t dev_id;
+	uint16_t vector_size;
+	uint16_t eth_queues;
+	uint32_t nb_flows;
 	uint32_t tx_first;
-	uint32_t fwd_latency:1;
-	uint32_t q_priority:1;
+	uint32_t max_pkt_sz;
+	uint32_t prod_enq_burst_sz;
 	uint32_t deq_tmo_nsec;
+	uint32_t q_priority:1;
+	uint32_t fwd_latency:1;
+	uint32_t ena_vector : 1;
+	uint64_t nb_pkts;
+	uint64_t nb_timers;
+	uint64_t expiry_nsec;
+	uint64_t max_tmo_nsec;
+	uint64_t vector_tmo_nsec;
+	uint64_t timer_tick_nsec;
+	uint64_t optm_timer_tick_nsec;
 	enum evt_prod_type prod_type;
-	uint8_t timdev_use_burst;
-	uint8_t timdev_cnt;
+	enum rte_event_crypto_adapter_mode crypto_adptr_mode;
 };
 
 static inline bool
@@ -102,6 +113,16 @@ evt_has_all_types_queue(uint8_t dev_id)
 			true : false;
 }
 
+static inline bool
+evt_has_flow_id(uint8_t dev_id)
+{
+	struct rte_event_dev_info dev_info;
+
+	rte_event_dev_info_get(dev_id, &dev_info);
+	return (dev_info.event_dev_cap & RTE_EVENT_DEV_CAP_CARRY_FLOW_ID) ?
+			true : false;
+}
+
 static inline int
 evt_service_setup(uint32_t service_id)
 {
@@ -167,6 +188,7 @@ evt_configure_eventdev(struct evt_options *opt, uint8_t nb_queues,
 			.dequeue_timeout_ns = opt->deq_tmo_nsec,
 			.nb_event_queues = nb_queues,
 			.nb_event_ports = nb_ports,
+			.nb_single_link_event_port_queues = 0,
 			.nb_events_limit  = info.max_num_events,
 			.nb_event_queue_flows = opt->nb_flows,
 			.nb_event_port_dequeue_depth =