@@ -12,6 +12,7 @@
#include <rte_dmadev.h>
#include <rte_malloc.h>
#include <rte_lcore.h>
+#include <rte_random.h>
#include "main.h"
@@ -407,6 +408,11 @@ setup_memory_env(struct test_configure *cfg, struct rte_mbuf ***srcs,
return -1;
}
+ for (i = 0; i < nr_buf; i++) {
+ memset(rte_pktmbuf_mtod((*srcs)[i], void *), rte_rand(), buf_size);
+ memset(rte_pktmbuf_mtod((*dsts)[i], void *), 0, buf_size);
+ }
+
if (cfg->transfer_dir == RTE_DMA_DIR_DEV_TO_MEM ||
cfg->transfer_dir == RTE_DMA_DIR_MEM_TO_DEV) {
ext_buf_info = rte_malloc(NULL, sizeof(struct rte_mbuf_ext_shared_info), 0);
@@ -445,7 +451,7 @@ setup_memory_env(struct test_configure *cfg, struct rte_mbuf ***srcs,
return 0;
}
-void
+int
mem_copy_benchmark(struct test_configure *cfg, bool is_dma)
{
uint32_t i;
@@ -463,6 +469,7 @@ mem_copy_benchmark(struct test_configure *cfg, bool is_dma)
uint32_t avg_cycles_total;
float mops, mops_total;
float bandwidth, bandwidth_total;
+ int ret = 0;
if (setup_memory_env(cfg, &srcs, &dsts) < 0)
goto out;
@@ -536,6 +543,18 @@ mem_copy_benchmark(struct test_configure *cfg, bool is_dma)
rte_eal_mp_wait_lcore();
+ if (cfg->transfer_dir == RTE_DMA_DIR_MEM_TO_MEM) {
+ for (i = 0; i < (nr_buf / nb_workers) * nb_workers; i++) {
+ if (memcmp(rte_pktmbuf_mtod(srcs[i], void *),
+ rte_pktmbuf_mtod(dsts[i], void *),
+ cfg->buf_size.cur) != 0) {
+ printf("Copy validation fails for buffer number %d\n", i);
+ ret = -1;
+ goto out;
+ }
+ }
+ }
+
mops_total = 0;
bandwidth_total = 0;
avg_cycles_total = 0;
@@ -601,4 +620,6 @@ mem_copy_benchmark(struct test_configure *cfg, bool is_dma)
rte_dma_stop(ldm->dma_ids[i]);
}
}
+
+ return ret;
}
@@ -101,20 +101,24 @@ open_output_csv(const char *rst_path_ptr)
return 0;
}
-static void
+static int
run_test_case(struct test_configure *case_cfg)
{
+ int ret = 0;
+
switch (case_cfg->test_type) {
case TEST_TYPE_DMA_MEM_COPY:
- mem_copy_benchmark(case_cfg, true);
+ ret = mem_copy_benchmark(case_cfg, true);
break;
case TEST_TYPE_CPU_MEM_COPY:
- mem_copy_benchmark(case_cfg, false);
+ ret = mem_copy_benchmark(case_cfg, false);
break;
default:
printf("Unknown test type. %s\n", case_cfg->test_type_str);
break;
}
+
+ return ret;
}
static void
@@ -159,8 +163,10 @@ run_test(uint32_t case_id, struct test_configure *case_cfg)
case_cfg->scenario_id++;
printf("\nRunning scenario %d\n", case_cfg->scenario_id);
- run_test_case(case_cfg);
- output_csv(false);
+ if (run_test_case(case_cfg) < 0)
+ printf("\nTest fails! skipping this scenario.\n");
+ else
+ output_csv(false);
if (var_entry->op == OP_ADD)
var_entry->cur += var_entry->incr;
@@ -66,6 +66,6 @@ struct test_configure {
struct test_vchan_dev_config vchan_dev;
};
-void mem_copy_benchmark(struct test_configure *cfg, bool is_dma);
+int mem_copy_benchmark(struct test_configure *cfg, bool is_dma);
#endif /* MAIN_H */