[Acc] [PATCH 7/7] uadk_tool: support nosva test

24 Jul 2025

mempcy mode
./uadk_tool/uadk_tool benchmark --alg zlib --mode sva \
    --opt 0 --sync --pktlen 1024
user pointer mode, --user
./uadk_tool/uadk_tool benchmark --alg zlib --mode sva \
    --user --opt 0 --sync --pktlen 1024
sgl mode, --sgl
./uadk_tool/uadk_tool benchmark --alg zlib --mode sva \
    --sgl --opt 0 --sync --pktlen 1024
Signed-off-by: Zhangfei Gao zhangfei.gao@linaro.org
---
 uadk_tool/benchmark/uadk_benchmark.c     |   8 ++
 uadk_tool/benchmark/uadk_benchmark.h     |   2 +
 uadk_tool/benchmark/zip_uadk_benchmark.c | 146 +++++++++++++++++++++--
 3 files changed, 144 insertions(+), 12 deletions(-)

diff --git a/uadk_tool/benchmark/uadk_benchmark.c b/uadk_tool/benchmark/uadk_benchmark.c
index 1698061..064affc 100644
--- a/uadk_tool/benchmark/uadk_benchmark.c
+++ b/uadk_tool/benchmark/uadk_benchmark.c
@@ -718,6 +718,8 @@ int acc_cmd_parse(int argc, char *argv[], struct acc_option *option)
    	{"complevel",	required_argument,	0, 16},
    	{"init2",	no_argument,		0, 17},
    	{"device",	required_argument,	0, 18},
+		{"user",	no_argument,		0, 19},
+		{"sgl",		no_argument,		0, 20},
    	{0, 0, 0, 0}
    };
@@ -789,6 +791,12 @@ int acc_cmd_parse(int argc, char *argv[], struct acc_option *option)
    		}
    		strcpy(option->device, optarg);
    		break;
+		case 19:
+			option->user = true;
+			break;
+		case 20:
+			option->sgl = true;
+			break;
    	default:
    		ACC_TST_PRT("invalid: bad input parameter!\n");
    		print_benchmark_help();
diff --git a/uadk_tool/benchmark/uadk_benchmark.h b/uadk_tool/benchmark/uadk_benchmark.h
index 2739a0e..7fde341 100644
--- a/uadk_tool/benchmark/uadk_benchmark.h
+++ b/uadk_tool/benchmark/uadk_benchmark.h
@@ -81,6 +81,8 @@ struct acc_option {
    bool latency;
    u32 sched_type;
    int task_type;
+	bool user;
+	bool sgl;
 };
enum acc_type {
diff --git a/uadk_tool/benchmark/zip_uadk_benchmark.c b/uadk_tool/benchmark/zip_uadk_benchmark.c
index cad8016..0fd9ee2 100644
--- a/uadk_tool/benchmark/zip_uadk_benchmark.c
+++ b/uadk_tool/benchmark/zip_uadk_benchmark.c
@@ -8,6 +8,8 @@
 #include "include/wd_sched.h"
 #include "include/fse.h"
+#define HW_CTX_SIZE                     (64 * 1024)
+
 #define ZIP_TST_PRT			printf
 #define PATH_SIZE			64
 #define ZIP_FILE			"./zip"
@@ -22,6 +24,8 @@ struct uadk_bd {
    u8 *dst;
    u32 src_len;
    u32 dst_len;
+	void *pool_src;
+	void *pool_dst;
 };
struct bd_pool {
@@ -32,6 +36,8 @@ struct thread_pool {
    struct bd_pool *pool;
 } g_zip_pool;
+void *g_blkpool;
+
 enum ZIP_OP_MODE {
    BLOCK_MODE,
    STREAM_MODE
@@ -62,6 +68,7 @@ typedef struct uadk_thread_res {
    struct zip_async_tag *tag;
    COMP_TUPLE_TAG *ftuple;
    char *hw_buff_out;
+	bool sgl;
 } thread_data;
struct zip_file_head {
@@ -145,7 +152,11 @@ static int save_file_data(const char *alg, u32 pkg_len, u32 optype)
// write data for one buffer one buffer to file line.
    for (j = 0; j < MAX_POOL_LENTH_COMP; j++) {
-		size = write(fd, g_zip_pool.pool[0].bds[j].dst,
+		if (g_blkpool)
+			size = write(fd, g_zip_pool.pool[0].bds[j].pool_dst,
+				fhead->blk_sz[j]);
+		else
+			size = write(fd, g_zip_pool.pool[0].bds[j].dst,
    			fhead->blk_sz[j]);
    	if (size < 0) {
    		ZIP_TST_PRT("compress write data error size: %lu!\n", size);
@@ -297,6 +308,17 @@ static void uninit_ctx_config2(void)
    wd_comp_uninit2();
 }
+static void init_blkpool(struct acc_option *options)
+{
+	struct wd_blkpool_setup setup;
+
+	memset(&setup, 0, sizeof(setup));
+	setup.block_size = HW_CTX_SIZE;
+	setup.block_num = DEFAULT_BLOCK_NM;
+	setup.align_size = DEFAULT_ALIGN_SIZE;
+	g_blkpool = wd_comp_setup_blkpool(&setup);
+}
+
 static int init_ctx_config2(struct acc_option *options)
 {
    struct wd_ctx_params cparams = {0};
@@ -333,6 +355,10 @@ static int init_ctx_config2(struct acc_option *options)
    	ZIP_TST_PRT("failed to do comp init2!\n");
free(ctx_set_num);
+
+	if (options->user || options->sgl)
+		init_blkpool(options);
+
    return ret;
 }
@@ -506,6 +532,8 @@ static int init_ctx_config(struct acc_option *options)
    	goto free_sched;
    }
+	if (options->user || options->sgl)
+		init_blkpool(options);
    return 0;
free_sched:
@@ -614,6 +642,13 @@ static void free_uadk_bd_pool(void)
    		for (j = 0; j < MAX_POOL_LENTH_COMP; j++) {
    			free(g_zip_pool.pool[i].bds[j].src);
    			free(g_zip_pool.pool[i].bds[j].dst);
+
+				if (g_blkpool) {
+					wd_blkpool_free(g_blkpool,
+						g_zip_pool.pool[i].bds[j].pool_src);
+					wd_blkpool_free(g_blkpool,
+						g_zip_pool.pool[i].bds[j].pool_dst);
+				}
    		}
    	}
    	free(g_zip_pool.pool[i].bds);
@@ -981,6 +1016,7 @@ static void *zip_uadk_blk_sync_run(void *arg)
    u32 out_len = 0;
    u32 count = 0;
    int ret, i;
+	struct wd_datalist *list_src = NULL, *list_dst = NULL;
if (pdata->td_id > g_thread_num)
    	return NULL;
@@ -1003,23 +1039,71 @@ static void *zip_uadk_blk_sync_run(void *arg)
    out_len = uadk_pool->bds[0].dst_len;
creq.cb = NULL;
-	creq.data_fmt = 0;
+	if (pdata->sgl)
+		creq.data_fmt = WD_SGL_BUF;
+	else
+		creq.data_fmt = 0;
    creq.priv = 0;
    creq.status = 0;
+	if (pdata->sgl) {
+		struct wd_datalist *src, *dst;
+
+		list_src = calloc(MAX_POOL_LENTH_COMP, sizeof(struct wd_datalist));
+		list_dst = calloc(MAX_POOL_LENTH_COMP, sizeof(struct wd_datalist));
+
+		for (i = 0; i < MAX_POOL_LENTH_COMP; i++) {
+			src = &list_src[i];
+			dst = &list_dst[i];
+			if (g_blkpool) {
+				src->data = uadk_pool->bds[i].pool_src;
+				dst->data = uadk_pool->bds[i].pool_dst;
+			} else {
+				src->data = uadk_pool->bds[i].src;
+				dst->data = uadk_pool->bds[i].dst;
+			}
+			src->len = uadk_pool->bds[i].src_len;
+			dst->len = uadk_pool->bds[i].dst_len;
+			src->next = (i < MAX_POOL_LENTH_COMP-1) ? &list_src[i+1] : NULL;
+			dst->next = (i < MAX_POOL_LENTH_COMP-1) ? &list_dst[i+1] : NULL;
+		}
+	}
+
    while(1) {
-		i = count % MAX_POOL_LENTH_COMP;
-		creq.src = uadk_pool->bds[i].src;
-		creq.dst = uadk_pool->bds[i].dst;
-		creq.src_len = uadk_pool->bds[i].src_len;
-		creq.dst_len = out_len;
+		if (pdata->sgl) {
+			creq.list_src = list_src;
+			creq.list_dst = list_dst;
-		ret = wd_do_comp_sync(h_sess, &creq);
-		if (ret || creq.status)
-			break;
+			creq.src_len = uadk_pool->bds[0].src_len * MAX_POOL_LENTH_COMP;
+			creq.dst_len = out_len * MAX_POOL_LENTH_COMP;
-		count++;
-		uadk_pool->bds[i].dst_len = creq.dst_len;
+			ret = wd_do_comp_sync(h_sess, &creq);
+			if (ret || creq.status)
+				break;
+			count++;
+			uadk_pool->bds[0].dst_len = creq.dst_len;
+			if (get_run_state() == 0)
+				break;
+
+		} else {
+			i = count % MAX_POOL_LENTH_COMP;
+			if (g_blkpool) {
+				creq.src = uadk_pool->bds[i].pool_src;
+				creq.dst = uadk_pool->bds[i].pool_dst;
+			} else {
+				creq.src = uadk_pool->bds[i].src;
+				creq.dst = uadk_pool->bds[i].dst;
+			}
+			creq.src_len = uadk_pool->bds[i].src_len;
+			creq.dst_len = out_len;
+
+			ret = wd_do_comp_sync(h_sess, &creq);
+			if (ret || creq.status)
+				break;
+
+			count++;
+			uadk_pool->bds[i].dst_len = creq.dst_len;
+		}
    	if (get_run_state() == 0)
    		break;
    }
@@ -1028,6 +1112,10 @@ static void *zip_uadk_blk_sync_run(void *arg)
    cal_avg_latency(count);
    add_recv_data(count, g_pktlen);
+	if (pdata->sgl) {
+		free(list_src);
+		free(list_dst);
+	}
    return NULL;
 }
@@ -1202,6 +1290,7 @@ static int zip_uadk_sync_threads(struct acc_option *options)
    	threads_args[i].optype = threads_option.optype;
    	threads_args[i].win_sz = threads_option.win_sz;
    	threads_args[i].comp_lv = threads_option.comp_lv;
+		threads_args[i].sgl = options->sgl;
    	threads_args[i].td_id = i;
    	ret = pthread_create(&tdid[i], NULL, uadk_zip_sync_run, &threads_args[i]);
    	if (ret) {
@@ -1344,6 +1433,35 @@ async_error:
    return ret;
 }
+static int load_blkpool_data(void)
+{
+	int i, j;
+	int src_len, dst_len;
+
+	if (!g_blkpool)
+		return 0;
+
+	for (i = 0; i < g_thread_num; i++) {
+		for (j = 0; j < MAX_POOL_LENTH_COMP; j++) {
+			src_len = g_zip_pool.pool[i].bds[j].src_len;
+			g_zip_pool.pool[i].bds[j].pool_src =
+				wd_blkpool_alloc(g_blkpool, src_len);
+
+			dst_len = g_zip_pool.pool[i].bds[j].dst_len;
+			g_zip_pool.pool[i].bds[j].pool_dst =
+				wd_blkpool_alloc(g_blkpool, dst_len);
+
+			if (!g_zip_pool.pool[i].bds[j].pool_src ||
+			    !g_zip_pool.pool[i].bds[j].pool_dst)
+				return -EINVAL;
+
+			memcpy(g_zip_pool.pool[i].bds[j].pool_src,
+			       g_zip_pool.pool[0].bds[j].src, src_len);
+		}
+	}
+	return 0;
+}
+
 int zip_uadk_benchmark(struct acc_option *options)
 {
    u32 ptime;
@@ -1375,6 +1493,10 @@ int zip_uadk_benchmark(struct acc_option *options)
    if (ret)
    	return ret;
+	ret = load_blkpool_data();
+	if (ret)
+		return ret;
+
    get_pid_cpu_time(&ptime);
    time_start(options->times);
    if (options->syncmode)
-- 
2.25.1


    

2025

2024

2023

2022

[Acc] [PATCH 7/7] uadk_tool: support nosva test