From: Marko Kovacevic <marko.kovacevic@intel.com>
To: dev@dpdk.org
Cc: akhil.goyal@nxp.com, lee.daly@intel.com,
tomaszx.jozwiak@intel.com, cathal.ohare@intel.com,
fiona.trahe@intel.com,
Marko Kovacevic <marko.kovacevic@intel.com>
Subject: [dpdk-dev] [PATCH v2 2/2] test/compress: add varied buffer input/outputs
Date: Thu, 20 Dec 2018 14:58:24 +0000 [thread overview]
Message-ID: <20181220145824.37223-2-marko.kovacevic@intel.com> (raw)
In-Reply-To: <20181220145824.37223-1-marko.kovacevic@intel.com>
Added unit test to check if a SGL buffer
was added as an input and a Linear Buffer
as output and vice versa so we can test if the
application would process the different buffers
properly.
Signed-off-by: Marko Kovacevic <marko.kovacevic@intel.com>
Acked-by: Lee Daly <lee.daly@intel.com>
---
test/test/test_compressdev.c | 173 ++++++++++++++++++++++++++++++++-----------
1 file changed, 130 insertions(+), 43 deletions(-)
diff --git a/test/test/test_compressdev.c b/test/test/test_compressdev.c
index b2999fa..5d62206 100644
--- a/test/test/test_compressdev.c
+++ b/test/test/test_compressdev.c
@@ -71,6 +71,13 @@ struct comp_testsuite_params {
struct rte_comp_xform *def_decomp_xform;
};
+enum varied_buff {
+ LB_BOTH = 0, /* both input and output are linear*/
+ SGL_BOTH, /* both input and output are chained */
+ SGL_TO_LB, /* input buffer is chained */
+ LB_TO_SGL /* output buffer is chained */
+};
+
static struct comp_testsuite_params testsuite_params = { 0 };
static void
@@ -353,7 +360,7 @@ compress_zlib(struct rte_comp_op *op,
}
/* Assuming stateless operation */
- /* SGL */
+ /* SGL Input */
if (op->m_src->nb_segs > 1) {
single_src_buf = rte_malloc(NULL,
rte_pktmbuf_pkt_len(op->m_src), 0);
@@ -361,14 +368,10 @@ compress_zlib(struct rte_comp_op *op,
RTE_LOG(ERR, USER1, "Buffer could not be allocated\n");
goto exit;
}
- single_dst_buf = rte_malloc(NULL,
- rte_pktmbuf_pkt_len(op->m_dst), 0);
- if (single_dst_buf == NULL) {
- RTE_LOG(ERR, USER1, "Buffer could not be allocated\n");
- goto exit;
- }
- if (rte_pktmbuf_read(op->m_src, 0,
- rte_pktmbuf_pkt_len(op->m_src),
+
+ if (rte_pktmbuf_read(op->m_src, op->src.offset,
+ rte_pktmbuf_pkt_len(op->m_src) -
+ op->src.offset,
single_src_buf) == NULL) {
RTE_LOG(ERR, USER1,
"Buffer could not be read entirely\n");
@@ -377,15 +380,31 @@ compress_zlib(struct rte_comp_op *op,
stream.avail_in = op->src.length;
stream.next_in = single_src_buf;
- stream.avail_out = rte_pktmbuf_pkt_len(op->m_dst);
- stream.next_out = single_dst_buf;
} else {
stream.avail_in = op->src.length;
- stream.next_in = rte_pktmbuf_mtod(op->m_src, uint8_t *);
+ stream.next_in = rte_pktmbuf_mtod_offset(op->m_src, uint8_t *,
+ op->src.offset);
+ }
+ /* SGL output */
+ if (op->m_dst->nb_segs > 1) {
+
+ single_dst_buf = rte_malloc(NULL,
+ rte_pktmbuf_pkt_len(op->m_dst), 0);
+ if (single_dst_buf == NULL) {
+ RTE_LOG(ERR, USER1, "Buffer could not be allocated\n");
+ goto exit;
+ }
+
+ stream.avail_out = op->m_dst->pkt_len;
+ stream.next_out = single_dst_buf;
+
+ } else {/* linear output */
stream.avail_out = op->m_dst->data_len;
- stream.next_out = rte_pktmbuf_mtod(op->m_dst, uint8_t *);
+ stream.next_out = rte_pktmbuf_mtod_offset(op->m_dst, uint8_t *,
+ op->dst.offset);
}
+
/* Stateless operation, all buffer will be compressed in one go */
zlib_flush = map_zlib_flush_flag(op->flush_flag);
ret = deflate(&stream, zlib_flush);
@@ -399,14 +418,14 @@ compress_zlib(struct rte_comp_op *op,
goto exit;
/* Copy data to destination SGL */
- if (op->m_src->nb_segs > 1) {
+ if (op->m_dst->nb_segs > 1) {
uint32_t remaining_data = stream.total_out;
uint8_t *src_data = single_dst_buf;
struct rte_mbuf *dst_buf = op->m_dst;
while (remaining_data > 0) {
- uint8_t *dst_data = rte_pktmbuf_mtod(dst_buf,
- uint8_t *);
+ uint8_t *dst_data = rte_pktmbuf_mtod_offset(dst_buf,
+ uint8_t *, op->dst.offset);
/* Last segment */
if (remaining_data < dst_buf->data_len) {
memcpy(dst_data, src_data, remaining_data);
@@ -662,7 +681,7 @@ test_deflate_comp_decomp(const char * const test_bufs[],
struct rte_comp_xform *decompress_xforms[],
unsigned int num_xforms,
enum rte_comp_op_type state,
- unsigned int sgl,
+ enum varied_buff buff_type,
enum zlib_direction zlib_dir)
{
struct comp_testsuite_params *ts_params = &testsuite_params;
@@ -693,7 +712,7 @@ test_deflate_comp_decomp(const char * const test_bufs[],
memset(ops_processed, 0, sizeof(struct rte_comp_op *) * num_bufs);
memset(priv_xforms, 0, sizeof(void *) * num_bufs);
- if (sgl)
+ if (buff_type == SGL_BOTH)
buf_pool = ts_params->small_mbuf_pool;
else
buf_pool = ts_params->large_mbuf_pool;
@@ -708,7 +727,7 @@ test_deflate_comp_decomp(const char * const test_bufs[],
goto exit;
}
- if (sgl) {
+ if (buff_type == SGL_BOTH || buff_type == SGL_TO_LB) {
for (i = 0; i < num_bufs; i++) {
data_size = strlen(test_bufs[i]) + 1;
if (prepare_sgl_bufs(test_bufs[i], uncomp_bufs[i],
@@ -735,7 +754,7 @@ test_deflate_comp_decomp(const char * const test_bufs[],
goto exit;
}
- if (sgl) {
+ if (buff_type == SGL_BOTH || buff_type == LB_TO_SGL) {
for (i = 0; i < num_bufs; i++) {
out_of_space ? data_size = OUT_OF_SPACE_BUF :
(data_size = strlen(test_bufs[i]) *
@@ -947,7 +966,7 @@ test_deflate_comp_decomp(const char * const test_bufs[],
goto exit;
}
- if (sgl) {
+ if (buff_type == SGL_BOTH || buff_type == LB_TO_SGL) {
for (i = 0; i < num_bufs; i++) {
priv_data = (struct priv_op_data *)
(ops_processed[i] + 1);
@@ -1241,7 +1260,7 @@ test_compressdev_deflate_stateless_fixed(void)
&ts_params->def_decomp_xform,
1,
RTE_COMP_OP_STATELESS,
- 0,
+ LB_BOTH,
ZLIB_DECOMPRESS) < 0) {
ret = TEST_FAILED;
goto exit;
@@ -1254,7 +1273,7 @@ test_compressdev_deflate_stateless_fixed(void)
&ts_params->def_decomp_xform,
1,
RTE_COMP_OP_STATELESS,
- 0,
+ LB_BOTH,
ZLIB_COMPRESS) < 0) {
ret = TEST_FAILED;
goto exit;
@@ -1307,7 +1326,7 @@ test_compressdev_deflate_stateless_dynamic(void)
&ts_params->def_decomp_xform,
1,
RTE_COMP_OP_STATELESS,
- 0,
+ LB_BOTH,
ZLIB_DECOMPRESS) < 0) {
ret = TEST_FAILED;
goto exit;
@@ -1320,7 +1339,7 @@ test_compressdev_deflate_stateless_dynamic(void)
&ts_params->def_decomp_xform,
1,
RTE_COMP_OP_STATELESS,
- 0,
+ LB_BOTH,
ZLIB_COMPRESS) < 0) {
ret = TEST_FAILED;
goto exit;
@@ -1352,7 +1371,7 @@ test_compressdev_deflate_stateless_multi_op(void)
&ts_params->def_decomp_xform,
1,
RTE_COMP_OP_STATELESS,
- 0,
+ LB_BOTH,
ZLIB_DECOMPRESS) < 0)
return TEST_FAILED;
@@ -1363,7 +1382,7 @@ test_compressdev_deflate_stateless_multi_op(void)
&ts_params->def_decomp_xform,
1,
RTE_COMP_OP_STATELESS,
- 0,
+ LB_BOTH,
ZLIB_COMPRESS) < 0)
return TEST_FAILED;
@@ -1403,7 +1422,7 @@ test_compressdev_deflate_stateless_multi_level(void)
&ts_params->def_decomp_xform,
1,
RTE_COMP_OP_STATELESS,
- 0,
+ LB_BOTH,
ZLIB_DECOMPRESS) < 0) {
ret = TEST_FAILED;
goto exit;
@@ -1474,7 +1493,7 @@ test_compressdev_deflate_stateless_multi_xform(void)
decompress_xforms,
NUM_XFORMS,
RTE_COMP_OP_STATELESS,
- 0,
+ LB_BOTH,
ZLIB_DECOMPRESS) < 0) {
ret = TEST_FAILED;
goto exit;
@@ -1513,8 +1532,8 @@ test_compressdev_deflate_stateless_sgl(void)
&ts_params->def_decomp_xform,
1,
RTE_COMP_OP_STATELESS,
- 1,
- ZLIB_DECOMPRESS) < 0)
+ SGL_BOTH,
+ ZLIB_COMPRESS) < 0)
return TEST_FAILED;
/* Compress with Zlib, decompress with compressdev */
@@ -1524,13 +1543,12 @@ test_compressdev_deflate_stateless_sgl(void)
&ts_params->def_decomp_xform,
1,
RTE_COMP_OP_STATELESS,
- 1,
- ZLIB_COMPRESS) < 0)
+ SGL_BOTH,
+ ZLIB_DECOMPRESS) < 0)
return TEST_FAILED;
}
return TEST_SUCCESS;
-
}
static int
@@ -1592,7 +1610,7 @@ test_compressdev_deflate_stateless_checksum(void)
&decompress_xform,
1,
RTE_COMP_OP_STATELESS,
- 0,
+ LB_BOTH,
ZLIB_COMPRESS) < 0) {
ret = TEST_FAILED;
goto exit;
@@ -1607,7 +1625,7 @@ test_compressdev_deflate_stateless_checksum(void)
&decompress_xform,
1,
RTE_COMP_OP_STATELESS,
- 0,
+ LB_BOTH,
ZLIB_NONE) < 0) {
ret = TEST_FAILED;
goto exit;
@@ -1632,7 +1650,7 @@ test_compressdev_deflate_stateless_checksum(void)
&decompress_xform,
1,
RTE_COMP_OP_STATELESS,
- 0,
+ LB_BOTH,
ZLIB_COMPRESS) < 0) {
ret = TEST_FAILED;
goto exit;
@@ -1646,7 +1664,7 @@ test_compressdev_deflate_stateless_checksum(void)
&decompress_xform,
1,
RTE_COMP_OP_STATELESS,
- 0,
+ LB_BOTH,
ZLIB_NONE) < 0) {
ret = TEST_FAILED;
goto exit;
@@ -1673,7 +1691,7 @@ test_compressdev_deflate_stateless_checksum(void)
&decompress_xform,
1,
RTE_COMP_OP_STATELESS,
- 0,
+ LB_BOTH,
ZLIB_NONE) < 0) {
ret = TEST_FAILED;
goto exit;
@@ -1724,7 +1742,7 @@ test_compressdev_out_of_space_buffer(void)
&ts_params->def_decomp_xform,
1,
RTE_COMP_OP_STATELESS,
- 0,
+ LB_BOTH,
ZLIB_DECOMPRESS) == 0 && out_of_space == 1) {
ret = TEST_FAILED;
goto exit;
@@ -1738,7 +1756,7 @@ test_compressdev_out_of_space_buffer(void)
&ts_params->def_decomp_xform,
1,
RTE_COMP_OP_STATELESS,
- 0,
+ LB_BOTH,
ZLIB_COMPRESS) == 0 && out_of_space == 1) {
ret = TEST_FAILED;
goto exit;
@@ -1753,7 +1771,7 @@ test_compressdev_out_of_space_buffer(void)
&ts_params->def_decomp_xform,
1,
RTE_COMP_OP_STATELESS,
- 1,
+ SGL_BOTH,
ZLIB_DECOMPRESS) == 0 && out_of_space == 1) {
ret = TEST_FAILED;
goto exit;
@@ -1768,7 +1786,7 @@ test_compressdev_out_of_space_buffer(void)
&ts_params->def_decomp_xform,
1,
RTE_COMP_OP_STATELESS,
- 1,
+ SGL_BOTH,
ZLIB_COMPRESS) == 0 && out_of_space == 1) {
ret = TEST_FAILED;
goto exit;
@@ -1784,6 +1802,72 @@ test_compressdev_out_of_space_buffer(void)
return ret;
}
+static int
+test_compressdev_deflate_stateless_varied_buf(void)
+{
+ struct comp_testsuite_params *ts_params = &testsuite_params;
+ uint16_t i;
+ const char *test_buffer;
+ const struct rte_compressdev_capabilities *capab;
+
+ capab = rte_compressdev_capability_get(0, RTE_COMP_ALGO_DEFLATE);
+ TEST_ASSERT(capab != NULL, "Failed to retrieve device capabilities");
+
+ for (i = 0; i < RTE_DIM(compress_test_bufs); i++) {
+ test_buffer = compress_test_bufs[0];
+
+ if (capab->comp_feature_flags & RTE_COMP_FF_OOP_SGL_IN_LB_OUT) {
+ /* Compress with compressdev, decompress with Zlib*/
+ if (test_deflate_comp_decomp(&test_buffer, 1,
+ &i,
+ &ts_params->def_comp_xform,
+ &ts_params->def_decomp_xform,
+ 1,
+ RTE_COMP_OP_STATELESS,
+ SGL_TO_LB,
+ ZLIB_DECOMPRESS) < 0)
+ return TEST_FAILED;
+
+ /* Compress with Zlib, decompress with compressdev*/
+ if (test_deflate_comp_decomp(&test_buffer, 1,
+ &i,
+ &ts_params->def_comp_xform,
+ &ts_params->def_decomp_xform,
+ 1,
+ RTE_COMP_OP_STATELESS,
+ SGL_TO_LB,
+ ZLIB_COMPRESS) < 0)
+ return TEST_FAILED;
+ }
+
+ if (capab->comp_feature_flags & RTE_COMP_FF_OOP_LB_IN_SGL_OUT) {
+ /* Compress with compressdev, decompress with Zlib*/
+ if (test_deflate_comp_decomp(&test_buffer, 1,
+ &i,
+ &ts_params->def_comp_xform,
+ &ts_params->def_decomp_xform,
+ 1,
+ RTE_COMP_OP_STATELESS,
+ LB_TO_SGL,
+ ZLIB_DECOMPRESS) < 0)
+ return TEST_FAILED;
+
+ /* Compress with Zlib, decompress with compressdev*/
+ if (test_deflate_comp_decomp(&test_buffer, 1,
+ &i,
+ &ts_params->def_comp_xform,
+ &ts_params->def_decomp_xform,
+ 1,
+ RTE_COMP_OP_STATELESS,
+ LB_TO_SGL,
+ ZLIB_COMPRESS) < 0)
+ return TEST_FAILED;
+ }
+ }
+
+ return TEST_SUCCESS;
+}
+
static struct unit_test_suite compressdev_testsuite = {
.suite_name = "compressdev unit test suite",
.setup = testsuite_setup,
@@ -1807,6 +1891,9 @@ static struct unit_test_suite compressdev_testsuite = {
test_compressdev_deflate_stateless_checksum),
TEST_CASE_ST(generic_ut_setup, generic_ut_teardown,
test_compressdev_out_of_space_buffer),
+ TEST_CASE_ST(generic_ut_setup, generic_ut_teardown,
+ test_compressdev_deflate_stateless_varied_buf),
+
TEST_CASES_END() /**< NULL terminate unit test array */
}
};
--
2.9.5
next prev parent reply other threads:[~2018-12-20 14:58 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-12-14 15:33 [dpdk-dev] [PATCH v1 1/2] test/compress: add out of space test Marko Kovacevic
2018-12-14 15:33 ` [dpdk-dev] [PATCH v1 2/2] test/compress: add varied buffer input/outputs Marko Kovacevic
2018-12-14 15:56 ` Daly, Lee
2018-12-14 15:55 ` [dpdk-dev] [PATCH v1 1/2] test/compress: add out of space test Daly, Lee
2018-12-20 14:58 ` [dpdk-dev] [PATCH v2 " Marko Kovacevic
2018-12-20 14:58 ` Marko Kovacevic [this message]
2018-12-21 0:44 ` [dpdk-dev] [PATCH v2 2/2] test/compress: add varied buffer input/outputs Trahe, Fiona
2019-01-09 17:02 ` De Lara Guarch, Pablo
2018-12-21 0:41 ` [dpdk-dev] [PATCH v2 1/2] test/compress: add out of space test Trahe, Fiona
2019-01-09 16:47 ` De Lara Guarch, Pablo
2019-01-11 15:08 ` [dpdk-dev] [PATCH v3 0/3] Compression Unit Tests Kovacevic, Marko
2019-01-11 15:08 ` [dpdk-dev] [PATCH v3 1/3] test/compress: refactor main test function Kovacevic, Marko
2019-01-11 16:52 ` [dpdk-dev] [PATCH v4 0/3] Compression Unit Tests Kovacevic, Marko
2019-01-11 16:52 ` [dpdk-dev] [PATCH v4 1/3] test/compress: refactor main test function Kovacevic, Marko
2019-01-17 10:19 ` [dpdk-dev] [PATCH v5 0/3] Compression Unit Tests Kovacevic, Marko
2019-01-17 10:19 ` [dpdk-dev] [PATCH v5 1/3] test/compress: refactor main test function Kovacevic, Marko
2019-01-17 10:19 ` [dpdk-dev] [PATCH v5 2/3] test/compress: add out of space test Kovacevic, Marko
2019-01-17 10:19 ` [dpdk-dev] [PATCH v5 3/3] test/compress: add varied buffer input/outputs Kovacevic, Marko
2019-01-18 0:06 ` [dpdk-dev] [PATCH v5 0/3] Compression Unit Tests Thomas Monjalon
2019-01-11 16:52 ` [dpdk-dev] [PATCH v4 2/3] test/compress: add out of space test Kovacevic, Marko
2019-01-16 17:16 ` De Lara Guarch, Pablo
2019-01-11 16:52 ` [dpdk-dev] [PATCH v4 3/3] test/compress: add varied buffer input/outputs Kovacevic, Marko
2019-01-16 17:21 ` De Lara Guarch, Pablo
2019-01-11 15:08 ` [dpdk-dev] [PATCH v3 2/3] test/compress: add out of space test Kovacevic, Marko
2019-01-11 15:09 ` [dpdk-dev] [PATCH v3 3/3] test/compress: add varied buffer input/outputs Kovacevic, Marko
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20181220145824.37223-2-marko.kovacevic@intel.com \
--to=marko.kovacevic@intel.com \
--cc=akhil.goyal@nxp.com \
--cc=cathal.ohare@intel.com \
--cc=dev@dpdk.org \
--cc=fiona.trahe@intel.com \
--cc=lee.daly@intel.com \
--cc=tomaszx.jozwiak@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).