crypto/aesni_mb: fix zero burst dequeue

[dpdk.git] / app / test-crypto-perf / cperf_options.h

diff --git a/app/test-crypto-perf/cperf_options.h b/app/test-crypto-perf/cperf_options.h
index c0d919f..10cd2d8 100644 (file)
--- a/app/test-crypto-perf/cperf_options.h
+++ b/app/test-crypto-perf/cperf_options.h
@@ -17,7 +17,6 @@
 #define CPERF_OPTYPE           ("optype")
 #define CPERF_SESSIONLESS      ("sessionless")
 #define CPERF_OUT_OF_PLACE     ("out-of-place")
-#define CPERF_VERIFY           ("verify")
 #define CPERF_TEST_FILE                ("test-file")
 #define CPERF_TEST_NAME                ("test-name")
 
@@ -29,14 +28,24 @@
 #define CPERF_AUTH_ALGO                ("auth-algo")
 #define CPERF_AUTH_OP          ("auth-op")
 #define CPERF_AUTH_KEY_SZ      ("auth-key-sz")
-#define CPERF_AUTH_DIGEST_SZ   ("auth-digest-sz")
-#define CPERF_AUTH_AAD_SZ      ("auth-aad-sz")
+#define CPERF_AUTH_IV_SZ       ("auth-iv-sz")
+
+#define CPERF_AEAD_ALGO                ("aead-algo")
+#define CPERF_AEAD_OP          ("aead-op")
+#define CPERF_AEAD_KEY_SZ      ("aead-key-sz")
+#define CPERF_AEAD_IV_SZ       ("aead-iv-sz")
+#define CPERF_AEAD_AAD_SZ      ("aead-aad-sz")
+
+#define CPERF_DIGEST_SZ                ("digest-sz")
+
 #define CPERF_CSV              ("csv-friendly")
 
+#define MAX_LIST 32
 
 enum cperf_perf_test_type {
        CPERF_TEST_TYPE_THROUGHPUT,
-       CPERF_TEST_TYPE_LATENCY
+       CPERF_TEST_TYPE_LATENCY,
+       CPERF_TEST_TYPE_VERIFY
 };
 
 
@@ -57,22 +66,14 @@ struct cperf_options {
 
        uint32_t pool_sz;
        uint32_t total_ops;
-       uint32_t burst_sz;
-       uint32_t buffer_sz;
        uint32_t segments_nb;
-
-       char device_type[RTE_CRYPTODEV_NAME_LEN];
-       enum cperf_op_type op_type;
+       uint32_t test_buffer_size;
 
        uint32_t sessionless:1;
        uint32_t out_of_place:1;
-       uint32_t verify:1;
        uint32_t silent:1;
        uint32_t csv:1;
 
-       char *test_file;
-       char *test_name;
-
        enum rte_crypto_cipher_algorithm cipher_algo;
        enum rte_crypto_cipher_operation cipher_op;
 
@@ -83,8 +84,35 @@ struct cperf_options {
        enum rte_crypto_auth_operation auth_op;
 
        uint16_t auth_key_sz;
-       uint16_t auth_digest_sz;
-       uint16_t auth_aad_sz;
+       uint16_t auth_iv_sz;
+
+       enum rte_crypto_aead_algorithm aead_algo;
+       enum rte_crypto_aead_operation aead_op;
+
+       uint16_t aead_key_sz;
+       uint16_t aead_iv_sz;
+       uint16_t aead_aad_sz;
+
+       uint16_t digest_sz;
+
+       char device_type[RTE_CRYPTODEV_NAME_LEN];
+       enum cperf_op_type op_type;
+
+       char *test_file;
+       char *test_name;
+
+       uint32_t buffer_size_list[MAX_LIST];
+       uint8_t buffer_size_count;
+       uint32_t max_buffer_size;
+       uint32_t min_buffer_size;
+       uint32_t inc_buffer_size;
+
+       uint32_t burst_size_list[MAX_LIST];
+       uint8_t burst_size_count;
+       uint32_t max_burst_size;
+       uint32_t min_burst_size;
+       uint32_t inc_burst_size;
+
 };
 
 void