[Accel-config] [PATCH 4/8] rename dst length

From: lingyan <[email protected]>

change:
   since chaining could combine decompression & filter
   do not need separate MAX_DEST_SIZE

Signed-off-by: lingyan <[email protected]>
---
 test/algorithms/iaa_compress.c |  2 +-
 test/algorithms/iaa_compress.h |  3 +-
 test/algorithms/iaa_filter.h   |  1 -
 test/iaa.c                     | 92 +++++++++++++++++-----------------
 4 files changed, 48 insertions(+), 50 deletions(-)

diff --git a/test/algorithms/iaa_compress.c b/test/algorithms/iaa_compress.c
index aaa0b0a..90092f3 100644
--- a/test/algorithms/iaa_compress.c
+++ b/test/algorithms/iaa_compress.c
@@ -32,7 +32,7 @@ int iaa_do_decompress(void *dst, void *src, int src_len, int *out_len)
 
 	stream.avail_in = src_len;
 	stream.next_in = src;
-	stream.avail_out = IAA_COMPRESS_MAX_DEST_SIZE;
+	stream.avail_out = IAA_GENERAL_MAX_DEST_SIZE;
 	stream.next_out = dst;
 	dump_stream(&stream);
 
diff --git a/test/algorithms/iaa_compress.h b/test/algorithms/iaa_compress.h
index e3cdb6d..075772c 100644
--- a/test/algorithms/iaa_compress.h
+++ b/test/algorithms/iaa_compress.h
@@ -8,10 +8,9 @@
 
 #define IAA_COMPRESS_AECS_SIZE (1568)
 #define IAA_COMPRESS_SRC2_SIZE (IAA_COMPRESS_AECS_SIZE * 2)
-#define IAA_COMPRESS_MAX_DEST_SIZE (2097152 * 2)
 #define IAA_DECOMPRESS_AECS_SIZE (5376)
 #define IAA_DECOMPRESS_SRC2_SIZE (IAA_DECOMPRESS_AECS_SIZE * 2)
-#define IAA_DECOMPRESS_MAX_DEST_SIZE (2097152 * 2)
+#define IAA_GENERAL_MAX_DEST_SIZE (2097152 * 2)
 
 static const uint32_t iaa_compress_aecs[IAA_COMPRESS_AECS_SIZE / 4] = {
 0x12345678, // crc
diff --git a/test/algorithms/iaa_filter.h b/test/algorithms/iaa_filter.h
index 44dbc1c..b7803e3 100644
--- a/test/algorithms/iaa_filter.h
+++ b/test/algorithms/iaa_filter.h
@@ -5,7 +5,6 @@
 
 #include <stdint.h>
 
-#define IAA_FILTER_MAX_DEST_SIZE (2097152 * 2)
 #define IAA_FILTER_MAX_SRC2_SIZE (2097152)
 
 #define IAA_FILTER_AECS_SIZE (32)
diff --git a/test/iaa.c b/test/iaa.c
index 7ed639c..a83877a 100644
--- a/test/iaa.c
+++ b/test/iaa.c
@@ -244,15 +244,15 @@ static int init_compress(struct task *tsk, int tflags, int opcode, unsigned long
 		return -ENOMEM;
 	memset_pattern(tsk->src2, 0, IAA_COMPRESS_SRC2_SIZE);
 
-	tsk->dst1 = aligned_alloc(32, IAA_COMPRESS_MAX_DEST_SIZE);
+	tsk->dst1 = aligned_alloc(32, IAA_GENERAL_MAX_DEST_SIZE);
 	if (!tsk->dst1)
 		return -ENOMEM;
-	memset_pattern(tsk->dst1, 0, IAA_COMPRESS_MAX_DEST_SIZE);
+	memset_pattern(tsk->dst1, 0, IAA_GENERAL_MAX_DEST_SIZE);
 
-	tsk->output = aligned_alloc(32, IAA_COMPRESS_MAX_DEST_SIZE);
+	tsk->output = aligned_alloc(32, IAA_GENERAL_MAX_DEST_SIZE);
 	if (!tsk->output)
 		return -ENOMEM;
-	memset_pattern(tsk->output, 0, IAA_COMPRESS_MAX_DEST_SIZE);
+	memset_pattern(tsk->output, 0, IAA_GENERAL_MAX_DEST_SIZE);
 
 	return ACCTEST_STATUS_OK;
 }
@@ -269,10 +269,10 @@ static int init_decompress(struct task *tsk, int tflags, int opcode, unsigned lo
 		return -ENOMEM;
 	memset_pattern(tsk->input, tsk->pattern, src1_xfer_size);
 
-	tsk->src1 = aligned_alloc(32, IAA_DECOMPRESS_MAX_DEST_SIZE);
+	tsk->src1 = aligned_alloc(32, IAA_GENERAL_MAX_DEST_SIZE);
 	if (!tsk->src1)
 		return -ENOMEM;
-	memset_pattern(tsk->src1, 0, IAA_DECOMPRESS_MAX_DEST_SIZE);
+	memset_pattern(tsk->src1, 0, IAA_GENERAL_MAX_DEST_SIZE);
 	memcpy(tsk->src1, tsk->input, src1_xfer_size);
 
 	if (tsk->is_shadow_compress) {
@@ -287,10 +287,10 @@ static int init_decompress(struct task *tsk, int tflags, int opcode, unsigned lo
 		return -ENOMEM;
 	memset_pattern(tsk->src2, 0, IAA_DECOMPRESS_SRC2_SIZE);
 
-	tsk->dst1 = aligned_alloc(32, IAA_DECOMPRESS_MAX_DEST_SIZE);
+	tsk->dst1 = aligned_alloc(32, IAA_GENERAL_MAX_DEST_SIZE);
 	if (!tsk->dst1)
 		return -ENOMEM;
-	memset_pattern(tsk->dst1, 0, IAA_DECOMPRESS_MAX_DEST_SIZE);
+	memset_pattern(tsk->dst1, 0, IAA_GENERAL_MAX_DEST_SIZE);
 
 	return ACCTEST_STATUS_OK;
 }
@@ -320,17 +320,17 @@ static int init_scan(struct task *tsk, int tflags,
 	memcpy(tsk->src2, (void *)&iaa_filter_aecs, IAA_FILTER_AECS_SIZE);
 	tsk->iaa_src2_xfer_size = IAA_FILTER_AECS_SIZE;
 
-	tsk->dst1 = aligned_alloc(ADDR_ALIGNMENT, IAA_FILTER_MAX_DEST_SIZE);
+	tsk->dst1 = aligned_alloc(ADDR_ALIGNMENT, IAA_GENERAL_MAX_DEST_SIZE);
 	if (!tsk->dst1)
 		return -ENOMEM;
-	memset_pattern(tsk->dst1, 0, IAA_FILTER_MAX_DEST_SIZE);
+	memset_pattern(tsk->dst1, 0, IAA_GENERAL_MAX_DEST_SIZE);
 
-	tsk->iaa_max_dst_size = IAA_FILTER_MAX_DEST_SIZE;
+	tsk->iaa_max_dst_size = IAA_GENERAL_MAX_DEST_SIZE;
 
-	tsk->output = aligned_alloc(ADDR_ALIGNMENT, IAA_FILTER_MAX_DEST_SIZE);
+	tsk->output = aligned_alloc(ADDR_ALIGNMENT, IAA_GENERAL_MAX_DEST_SIZE);
 	if (!tsk->output)
 		return -ENOMEM;
-	memset_pattern(tsk->output, 0, IAA_FILTER_MAX_DEST_SIZE);
+	memset_pattern(tsk->output, 0, IAA_GENERAL_MAX_DEST_SIZE);
 
 	return ACCTEST_STATUS_OK;
 }
@@ -354,17 +354,17 @@ static int init_set_membership(struct task *tsk, int tflags,
 	memset_pattern(tsk->src2, 0xa5a5a5a55a5a5a5a, IAA_FILTER_MAX_SRC2_SIZE);
 	tsk->iaa_src2_xfer_size = IAA_FILTER_MAX_SRC2_SIZE;
 
-	tsk->dst1 = aligned_alloc(ADDR_ALIGNMENT, IAA_FILTER_MAX_DEST_SIZE);
+	tsk->dst1 = aligned_alloc(ADDR_ALIGNMENT, IAA_GENERAL_MAX_DEST_SIZE);
 	if (!tsk->dst1)
 		return -ENOMEM;
-	memset_pattern(tsk->dst1, 0, IAA_FILTER_MAX_DEST_SIZE);
+	memset_pattern(tsk->dst1, 0, IAA_GENERAL_MAX_DEST_SIZE);
 
-	tsk->iaa_max_dst_size = IAA_FILTER_MAX_DEST_SIZE;
+	tsk->iaa_max_dst_size = IAA_GENERAL_MAX_DEST_SIZE;
 
-	tsk->output = aligned_alloc(ADDR_ALIGNMENT, IAA_FILTER_MAX_DEST_SIZE);
+	tsk->output = aligned_alloc(ADDR_ALIGNMENT, IAA_GENERAL_MAX_DEST_SIZE);
 	if (!tsk->output)
 		return -ENOMEM;
-	memset_pattern(tsk->output, 0, IAA_FILTER_MAX_DEST_SIZE);
+	memset_pattern(tsk->output, 0, IAA_GENERAL_MAX_DEST_SIZE);
 
 	return ACCTEST_STATUS_OK;
 }
@@ -394,17 +394,17 @@ static int init_extract(struct task *tsk, int tflags,
 	memcpy(tsk->src2, (void *)&iaa_filter_aecs, IAA_FILTER_AECS_SIZE);
 	tsk->iaa_src2_xfer_size = IAA_FILTER_AECS_SIZE;
 
-	tsk->dst1 = aligned_alloc(ADDR_ALIGNMENT, IAA_FILTER_MAX_DEST_SIZE);
+	tsk->dst1 = aligned_alloc(ADDR_ALIGNMENT, IAA_GENERAL_MAX_DEST_SIZE);
 	if (!tsk->dst1)
 		return -ENOMEM;
-	memset_pattern(tsk->dst1, 0, IAA_FILTER_MAX_DEST_SIZE);
+	memset_pattern(tsk->dst1, 0, IAA_GENERAL_MAX_DEST_SIZE);
 
-	tsk->iaa_max_dst_size = IAA_FILTER_MAX_DEST_SIZE;
+	tsk->iaa_max_dst_size = IAA_GENERAL_MAX_DEST_SIZE;
 
-	tsk->output = aligned_alloc(ADDR_ALIGNMENT, IAA_FILTER_MAX_DEST_SIZE);
+	tsk->output = aligned_alloc(ADDR_ALIGNMENT, IAA_GENERAL_MAX_DEST_SIZE);
 	if (!tsk->output)
 		return -ENOMEM;
-	memset_pattern(tsk->output, 0, IAA_FILTER_MAX_DEST_SIZE);
+	memset_pattern(tsk->output, 0, IAA_GENERAL_MAX_DEST_SIZE);
 
 	return ACCTEST_STATUS_OK;
 }
@@ -431,17 +431,17 @@ static int init_select(struct task *tsk, int tflags,
 	memset_pattern(tsk->src2, 0xa5a5a5a55a5a5a5a, IAA_FILTER_MAX_SRC2_SIZE);
 	tsk->iaa_src2_xfer_size = IAA_FILTER_MAX_SRC2_SIZE;
 
-	tsk->dst1 = aligned_alloc(ADDR_ALIGNMENT, IAA_FILTER_MAX_DEST_SIZE);
+	tsk->dst1 = aligned_alloc(ADDR_ALIGNMENT, IAA_GENERAL_MAX_DEST_SIZE);
 	if (!tsk->dst1)
 		return -ENOMEM;
-	memset_pattern(tsk->dst1, 0, IAA_FILTER_MAX_DEST_SIZE);
+	memset_pattern(tsk->dst1, 0, IAA_GENERAL_MAX_DEST_SIZE);
 
-	tsk->iaa_max_dst_size = IAA_FILTER_MAX_DEST_SIZE;
+	tsk->iaa_max_dst_size = IAA_GENERAL_MAX_DEST_SIZE;
 
-	tsk->output = aligned_alloc(ADDR_ALIGNMENT, IAA_FILTER_MAX_DEST_SIZE);
+	tsk->output = aligned_alloc(ADDR_ALIGNMENT, IAA_GENERAL_MAX_DEST_SIZE);
 	if (!tsk->output)
 		return -ENOMEM;
-	memset_pattern(tsk->output, 0, IAA_FILTER_MAX_DEST_SIZE);
+	memset_pattern(tsk->output, 0, IAA_GENERAL_MAX_DEST_SIZE);
 
 	return ACCTEST_STATUS_OK;
 }
@@ -482,17 +482,17 @@ static int init_rle_burst(struct task *tsk, int tflags,
 	memset_pattern(tsk->src2, 0xa5a5a5a55a5a5a5a, IAA_FILTER_MAX_SRC2_SIZE);
 	tsk->iaa_src2_xfer_size = IAA_FILTER_MAX_SRC2_SIZE;
 
-	tsk->dst1 = aligned_alloc(ADDR_ALIGNMENT, IAA_FILTER_MAX_DEST_SIZE);
+	tsk->dst1 = aligned_alloc(ADDR_ALIGNMENT, IAA_GENERAL_MAX_DEST_SIZE);
 	if (!tsk->dst1)
 		return -ENOMEM;
-	memset_pattern(tsk->dst1, 0, IAA_FILTER_MAX_DEST_SIZE);
+	memset_pattern(tsk->dst1, 0, IAA_GENERAL_MAX_DEST_SIZE);
 
-	tsk->iaa_max_dst_size = IAA_FILTER_MAX_DEST_SIZE;
+	tsk->iaa_max_dst_size = IAA_GENERAL_MAX_DEST_SIZE;
 
-	tsk->output = aligned_alloc(ADDR_ALIGNMENT, IAA_FILTER_MAX_DEST_SIZE);
+	tsk->output = aligned_alloc(ADDR_ALIGNMENT, IAA_GENERAL_MAX_DEST_SIZE);
 	if (!tsk->output)
 		return -ENOMEM;
-	memset_pattern(tsk->output, 0, IAA_FILTER_MAX_DEST_SIZE);
+	memset_pattern(tsk->output, 0, IAA_GENERAL_MAX_DEST_SIZE);
 
 	return ACCTEST_STATUS_OK;
 }
@@ -510,17 +510,17 @@ static int init_find_unique(struct task *tsk, int tflags,
 		return -ENOMEM;
 	memset_pattern(tsk->src1, tsk->pattern, src1_xfer_size);
 
-	tsk->dst1 = aligned_alloc(ADDR_ALIGNMENT, IAA_FILTER_MAX_DEST_SIZE);
+	tsk->dst1 = aligned_alloc(ADDR_ALIGNMENT, IAA_GENERAL_MAX_DEST_SIZE);
 	if (!tsk->dst1)
 		return -ENOMEM;
-	memset_pattern(tsk->dst1, 0, IAA_FILTER_MAX_DEST_SIZE);
+	memset_pattern(tsk->dst1, 0, IAA_GENERAL_MAX_DEST_SIZE);
 
-	tsk->iaa_max_dst_size = IAA_FILTER_MAX_DEST_SIZE;
+	tsk->iaa_max_dst_size = IAA_GENERAL_MAX_DEST_SIZE;
 
-	tsk->output = aligned_alloc(ADDR_ALIGNMENT, IAA_FILTER_MAX_DEST_SIZE);
+	tsk->output = aligned_alloc(ADDR_ALIGNMENT, IAA_GENERAL_MAX_DEST_SIZE);
 	if (!tsk->output)
 		return -ENOMEM;
-	memset_pattern(tsk->output, 0, IAA_FILTER_MAX_DEST_SIZE);
+	memset_pattern(tsk->output, 0, IAA_GENERAL_MAX_DEST_SIZE);
 
 	return ACCTEST_STATUS_OK;
 }
@@ -547,17 +547,17 @@ static int init_expand(struct task *tsk, int tflags,
 	memset_pattern(tsk->src2, 0xa5a5a5a55a5a5a5a, IAA_FILTER_MAX_SRC2_SIZE);
 	tsk->iaa_src2_xfer_size = IAA_FILTER_MAX_SRC2_SIZE;
 
-	tsk->dst1 = aligned_alloc(ADDR_ALIGNMENT, IAA_FILTER_MAX_DEST_SIZE);
+	tsk->dst1 = aligned_alloc(ADDR_ALIGNMENT, IAA_GENERAL_MAX_DEST_SIZE);
 	if (!tsk->dst1)
 		return -ENOMEM;
-	memset_pattern(tsk->dst1, 0, IAA_FILTER_MAX_DEST_SIZE);
+	memset_pattern(tsk->dst1, 0, IAA_GENERAL_MAX_DEST_SIZE);
 
-	tsk->iaa_max_dst_size = IAA_FILTER_MAX_DEST_SIZE;
+	tsk->iaa_max_dst_size = IAA_GENERAL_MAX_DEST_SIZE;
 
-	tsk->output = aligned_alloc(ADDR_ALIGNMENT, IAA_FILTER_MAX_DEST_SIZE);
+	tsk->output = aligned_alloc(ADDR_ALIGNMENT, IAA_GENERAL_MAX_DEST_SIZE);
 	if (!tsk->output)
 		return -ENOMEM;
-	memset_pattern(tsk->output, 0, IAA_FILTER_MAX_DEST_SIZE);
+	memset_pattern(tsk->output, 0, IAA_GENERAL_MAX_DEST_SIZE);
 
 	return ACCTEST_STATUS_OK;
 }
@@ -1328,7 +1328,7 @@ int iaa_compress_multi_task_nodes(struct acctest_context *ctx)
 
 		tsk_node->tsk->iaa_compr_flags = (IDXD_COMPRESS_FLAG_EOB_BFINAL |
 						  IDXD_COMPRESS_FLAG_FLUSH_OUTPUT);
-		tsk_node->tsk->iaa_max_dst_size = IAA_COMPRESS_MAX_DEST_SIZE;
+		tsk_node->tsk->iaa_max_dst_size = IAA_GENERAL_MAX_DEST_SIZE;
 
 		iaa_prep_compress(tsk_node->tsk);
 		tsk_node = tsk_node->next;
@@ -1391,7 +1391,7 @@ int iaa_prehook_compress_multi_task_nodes(struct acctest_context *ctx)
 
 		tsk_node->tsk->iaa_compr_flags = (IDXD_COMPRESS_FLAG_EOB_BFINAL |
 						  IDXD_COMPRESS_FLAG_FLUSH_OUTPUT);
-		tsk_node->tsk->iaa_max_dst_size = IAA_DECOMPRESS_MAX_DEST_SIZE;
+		tsk_node->tsk->iaa_max_dst_size = IAA_GENERAL_MAX_DEST_SIZE;
 
 		iaa_prep_compress(tsk_node->tsk);
 		tsk_node = tsk_node->next;
@@ -1449,7 +1449,7 @@ int iaa_decompress_multi_task_nodes(struct acctest_context *ctx)
 						    IDXD_DECOMPRESS_FLAG_STOP_ON_EOB |
 						    IDXD_DECOMPRESS_FLAG_FLUSH_OUTPUT |
 						    IDXD_DECOMPRESS_FLAG_EN_DECOMPRESS);
-		tsk_node->tsk->iaa_max_dst_size = IAA_DECOMPRESS_MAX_DEST_SIZE;
+		tsk_node->tsk->iaa_max_dst_size = IAA_GENERAL_MAX_DEST_SIZE;
 
 		iaa_prep_decompress(tsk_node->tsk);
 		tsk_node = tsk_node->next;
-- 
2.34.1