Remove invalid or redundant fields to make code more clean.
Signed-off-by: Chengwen Feng <fengcheng...@huawei.com>
---
app/test-dma-perf/benchmark.c | 20 +++++++++-----------
app/test-dma-perf/main.c | 19 ++++---------------
app/test-dma-perf/main.h | 12 ++++++------
3 files changed, 19 insertions(+), 32 deletions(-)
diff --git a/app/test-dma-perf/benchmark.c b/app/test-dma-perf/benchmark.c
index d7c8d4c1b0..663f81ef5c 100644
--- a/app/test-dma-perf/benchmark.c
+++ b/app/test-dma-perf/benchmark.c
@@ -103,7 +103,7 @@ output_result(struct test_configure *cfg, struct
lcore_params *para,
uint32_t lcore_id = para->lcore_id;
char *dma_name = para->dma_name;
- if (cfg->is_dma) {
+ if (cfg->test_type == TEST_TYPE_DMA_MEM_COPY) {
printf("lcore %u, DMA %s, DMA Ring Size: %u, Kick Batch Size:
%u", lcore_id,
dma_name, ring_size, kick_batch);
if (cfg->is_sg)
@@ -118,7 +118,7 @@ output_result(struct test_configure *cfg, struct
lcore_params *para,
ave_cycle, buf_size, nr_buf, memory,
rte_get_timer_hz()/1000000000.0);
printf("Average Bandwidth: %.3lf Gbps, MOps: %.3lf\n", bandwidth, mops);
- if (cfg->is_dma)
+ if (cfg->test_type == TEST_TYPE_DMA_MEM_COPY)
output_csv(CSV_LINE_DMA_FMT,
scenario_id, lcore_id, dma_name, ring_size, kick_batch,
buf_size,
nr_buf, memory, ave_cycle, bandwidth, mops);
@@ -436,16 +436,15 @@ dummy_free_ext_buf(void *addr, void *opaque)
}
static int
-setup_memory_env(struct test_configure *cfg,
+setup_memory_env(struct test_configure *cfg, uint32_t nr_buf,
struct rte_mbuf ***srcs, struct rte_mbuf ***dsts,
struct rte_dma_sge **src_sges, struct rte_dma_sge
**dst_sges)
{
unsigned int cur_buf_size = cfg->buf_size.cur;
unsigned int buf_size = cur_buf_size + RTE_PKTMBUF_HEADROOM;
+ bool is_src_numa_incorrect, is_dst_numa_incorrect;
unsigned int nr_sockets;
- uint32_t nr_buf = cfg->nr_buf;
uint32_t i;
- bool is_src_numa_incorrect, is_dst_numa_incorrect;
nr_sockets = rte_socket_count();
is_src_numa_incorrect = (cfg->src_numa_node >= nr_sockets);
@@ -579,7 +578,7 @@ get_work_function(struct test_configure *cfg)
{
lcore_function_t *fn;
- if (cfg->is_dma) {
+ if (cfg->test_type == TEST_TYPE_DMA_MEM_COPY) {
if (!cfg->is_sg)
fn = do_dma_plain_mem_copy;
else
@@ -694,12 +693,11 @@ mem_copy_benchmark(struct test_configure *cfg)
int ret = 0;
nr_buf = align_buffer_count(cfg, &nr_sgsrc, &nr_sgdst);
- cfg->nr_buf = nr_buf;
- if (setup_memory_env(cfg, &srcs, &dsts, &src_sges, &dst_sges) < 0)
+ if (setup_memory_env(cfg, nr_buf, &srcs, &dsts, &src_sges, &dst_sges) <
0)
goto out;
- if (cfg->is_dma)
+ if (cfg->test_type == TEST_TYPE_DMA_MEM_COPY)
if (config_dmadevs(cfg) < 0)
goto out;
@@ -722,7 +720,7 @@ mem_copy_benchmark(struct test_configure *cfg)
printf("lcore parameters malloc failure for lcore
%d\n", lcore_id);
break;
}
- if (cfg->is_dma) {
+ if (cfg->test_type == TEST_TYPE_DMA_MEM_COPY) {
lcores[i]->dma_name = lcore_dma_map->dma_names;
lcores[i]->dev_id = lcore_dma_map->dma_id;
lcores[i]->kick_batch = kick_batch;
@@ -921,7 +919,7 @@ mem_copy_benchmark(struct test_configure *cfg)
lcores[i] = NULL;
}
- if (cfg->is_dma) {
+ if (cfg->test_type == TEST_TYPE_DMA_MEM_COPY) {
for (i = 0; i < nb_workers; i++) {
lcore_dma_map = &cfg->dma_config[i].lcore_dma_map;
printf("Stopping dmadev %d\n", lcore_dma_map->dma_id);
diff --git a/app/test-dma-perf/main.c b/app/test-dma-perf/main.c
index 097f36b21c..e630d2980a 100644
--- a/app/test-dma-perf/main.c
+++ b/app/test-dma-perf/main.c
@@ -29,12 +29,6 @@
#define MAX_PARAMS_PER_ENTRY 4
-enum {
- TEST_TYPE_NONE = 0,
- TEST_TYPE_DMA_MEM_COPY,
- TEST_TYPE_CPU_MEM_COPY
-};
-
#define MAX_TEST_CASES 16
static struct test_configure test_cases[MAX_TEST_CASES];
@@ -90,7 +84,8 @@ output_env_info(void)
static void
output_header(uint32_t case_id, struct test_configure *case_cfg)
{
- output_csv(CSV_HDR_FMT, case_id, case_cfg->test_type_str);
+ static const char * const type_str[] = { "NONE", DMA_MEM_COPY,
CPU_MEM_COPY };
+ output_csv(CSV_HDR_FMT, case_id, type_str[case_cfg->test_type]);
}
static int
@@ -104,7 +99,7 @@ run_test_case(struct test_configure *case_cfg)
ret = mem_copy_benchmark(case_cfg);
break;
default:
- printf("Unknown test type. %s\n", case_cfg->test_type_str);
+ printf("Unknown test type\n");
break;
}
@@ -336,7 +331,6 @@ load_configs(const char *path)
const char *skip;
struct rte_kvargs *kvlist;
int args_nr, nb_vp;
- bool is_dma;
printf("config file parsing...\n");
cfgfile = rte_cfgfile_load(path, 0);
@@ -374,19 +368,14 @@ load_configs(const char *path)
if (strcmp(case_type, DMA_MEM_COPY) == 0) {
test_case->test_type = TEST_TYPE_DMA_MEM_COPY;
- test_case->test_type_str = DMA_MEM_COPY;
- is_dma = true;
} else if (strcmp(case_type, CPU_MEM_COPY) == 0) {
test_case->test_type = TEST_TYPE_CPU_MEM_COPY;
- test_case->test_type_str = CPU_MEM_COPY;
- is_dma = false;
} else {
printf("Error: Wrong test case type %s in case%d.\n",
case_type, i + 1);
test_case->is_valid = false;
continue;
}
- test_case->is_dma = is_dma;
test_case->src_numa_node =
(int)atoi(rte_cfgfile_get_entry(cfgfile,
section_name,
"src_numa_node"));
test_case->dst_numa_node =
(int)atoi(rte_cfgfile_get_entry(cfgfile,
@@ -410,7 +399,7 @@ load_configs(const char *path)
} else if (args_nr == 4)
nb_vp++;
- if (is_dma) {
+ if (test_case->test_type == TEST_TYPE_DMA_MEM_COPY) {
ring_size_str = rte_cfgfile_get_entry(cfgfile,
section_name,
"dma_ring_size");
args_nr = parse_entry(ring_size_str,
&test_case->ring_size);
diff --git a/app/test-dma-perf/main.h b/app/test-dma-perf/main.h
index 97c81eb2eb..c565dad9a7 100644
--- a/app/test-dma-perf/main.h
+++ b/app/test-dma-perf/main.h
@@ -12,7 +12,11 @@
#define MAX_WORKER_NB 128
-#define MAX_DMA_NB 128
+enum {
+ TEST_TYPE_NONE = 0,
+ TEST_TYPE_DMA_MEM_COPY,
+ TEST_TYPE_CPU_MEM_COPY
+};
typedef enum {
OP_NONE = 0,
@@ -49,12 +53,8 @@ struct test_configure {
bool is_valid;
bool is_skip;
uint8_t test_type;
- const char *test_type_str;
uint16_t src_numa_node;
uint16_t dst_numa_node;
- uint16_t opcode;
- bool is_dma;
- bool is_sg;
struct lcore_dma_config dma_config[MAX_WORKER_NB];
struct test_configure_entry mem_size;
struct test_configure_entry buf_size;
@@ -63,7 +63,7 @@ struct test_configure {
uint16_t num_worker;
uint8_t nb_src_sges;
uint8_t nb_dst_sges;
- uint32_t nr_buf;
+ bool is_sg;
uint8_t scenario_id;
};
--
2.17.1
