mempool: fix slow allocation of large mempools

[dpdk.git] / app / test-compress-perf / comp_perf_options.h

diff --git a/app/test-compress-perf/comp_perf_options.h b/app/test-compress-perf/comp_perf_options.h
index 7516ea0..2c26511 100644 (file)
--- a/app/test-compress-perf/comp_perf_options.h
+++ b/app/test-compress-perf/comp_perf_options.h
@@ -2,9 +2,31 @@
  * Copyright(c) 2018 Intel Corporation
  */
 
-#define MAX_DRIVER_NAME                64
-#define MAX_INPUT_FILE_NAME    64
+#ifndef _COMP_PERF_OPS_
+#define _COMP_PERF_OPS_
+
 #define MAX_LIST               32
+#define MIN_COMPRESSED_BUF_SIZE 8
+#define EXPANSE_RATIO 1.1
+#define MAX_MBUF_DATA_SIZE (UINT16_MAX - RTE_PKTMBUF_HEADROOM)
+#define MAX_SEG_SIZE ((int)(MAX_MBUF_DATA_SIZE / EXPANSE_RATIO))
+
+extern const char *comp_perf_test_type_strs[];
+
+/* Cleanup state machine */
+enum cleanup_st {
+       ST_CLEAR = 0,
+       ST_TEST_DATA,
+       ST_COMPDEV,
+       ST_INPUT_DATA,
+       ST_MEMORY_ALLOC,
+       ST_DURING_TEST
+};
+
+enum cperf_test_type {
+       CPERF_TEST_TYPE_BENCHMARK,
+       CPERF_TEST_TYPE_VERIFY
+};
 
 enum comp_operation {
        COMPRESS_ONLY,
@@ -21,31 +43,31 @@ struct range_list {
 };
 
 struct comp_test_data {
-       char driver_name[64];
-       char input_file[64];
-       struct rte_mbuf **comp_bufs;
-       struct rte_mbuf **decomp_bufs;
-       uint32_t total_bufs;
+       char driver_name[RTE_DEV_NAME_MAX_LEN];
+       char input_file[PATH_MAX];
+       enum cperf_test_type test;
+
        uint8_t *input_data;
        size_t input_data_sz;
-       uint8_t *compressed_data;
-       uint8_t *decompressed_data;
-       struct rte_mempool *comp_buf_pool;
-       struct rte_mempool *decomp_buf_pool;
-       struct rte_mempool *op_pool;
-       int8_t cdev_id;
+       uint16_t nb_qps;
        uint16_t seg_sz;
+       uint16_t out_seg_sz;
        uint16_t burst_sz;
        uint32_t pool_sz;
        uint32_t num_iter;
        uint16_t max_sgl_segs;
+       uint32_t total_segs;
+
        enum rte_comp_huffman huffman_enc;
        enum comp_operation test_op;
        int window_sz;
-       struct range_list level;
-       /* Store TSC duration for all levels (including level 0) */
-       uint64_t comp_tsc_duration[RTE_COMP_LEVEL_MAX + 1];
-       uint64_t decomp_tsc_duration[RTE_COMP_LEVEL_MAX + 1];
+       struct range_list level_lst;
+       uint8_t level;
+       int use_external_mbufs;
+
+       double ratio;
+       enum cleanup_st cleanup;
+       int perf_comp_force_stop;
 };
 
 int
@@ -57,3 +79,5 @@ comp_perf_options_default(struct comp_test_data *test_data);
 
 int
 comp_perf_options_check(struct comp_test_data *test_data);
+
+#endif