test/crypto-perf: support SDAP for PDCP operations

[dpdk.git] / app / test-crypto-perf / cperf_test_verify.c

diff --git a/app/test-crypto-perf/cperf_test_verify.c b/app/test-crypto-perf/cperf_test_verify.c
index bbdf37d..5c0dc82 100644 (file)
--- a/app/test-crypto-perf/cperf_test_verify.c
+++ b/app/test-crypto-perf/cperf_test_verify.c
@@ -42,8 +42,7 @@ cperf_verify_test_free(struct cperf_verify_ctx *ctx)
                        rte_cryptodev_sym_session_free(ctx->sess);
                }
 
-               if (ctx->pool)
-                       rte_mempool_free(ctx->pool);
+               rte_mempool_free(ctx->pool);
 
                rte_free(ctx);
        }
@@ -196,34 +195,6 @@ out:
        return !!res;
 }
 
-static void
-cperf_mbuf_set(struct rte_mbuf *mbuf,
-               const struct cperf_options *options,
-               const struct cperf_test_vector *test_vector)
-{
-       uint32_t segment_sz = options->segment_sz;
-       uint8_t *mbuf_data;
-       uint8_t *test_data =
-                       (options->cipher_op == RTE_CRYPTO_CIPHER_OP_ENCRYPT) ?
-                                       test_vector->plaintext.data :
-                                       test_vector->ciphertext.data;
-       uint32_t remaining_bytes = options->max_buffer_size;
-
-       while (remaining_bytes) {
-               mbuf_data = rte_pktmbuf_mtod(mbuf, uint8_t *);
-
-               if (remaining_bytes <= segment_sz) {
-                       memcpy(mbuf_data, test_data, remaining_bytes);
-                       return;
-               }
-
-               memcpy(mbuf_data, test_data, segment_sz);
-               remaining_bytes -= segment_sz;
-               test_data += segment_sz;
-               mbuf = mbuf->next;
-       }
-}
-
 int
 cperf_verify_test_runner(void *test_ctx)
 {
@@ -233,7 +204,7 @@ cperf_verify_test_runner(void *test_ctx)
        uint64_t ops_deqd = 0, ops_deqd_total = 0, ops_deqd_failed = 0;
        uint64_t ops_failed = 0;
 
-       static rte_atomic16_t display_once = RTE_ATOMIC16_INIT(0);
+       static uint16_t display_once;
 
        uint64_t i;
        uint16_t ops_unused = 0;
@@ -291,7 +262,7 @@ cperf_verify_test_runner(void *test_ctx)
                (ctx->populate_ops)(ops, ctx->src_buf_offset,
                                ctx->dst_buf_offset,
                                ops_needed, ctx->sess, ctx->options,
-                               ctx->test_vector, iv_offset, &imix_idx);
+                               ctx->test_vector, iv_offset, &imix_idx, NULL);
 
 
                /* Populate the mbuf with the test vector, for verification */
@@ -375,8 +346,10 @@ cperf_verify_test_runner(void *test_ctx)
                ops_deqd_total += ops_deqd;
        }
 
+       uint16_t exp = 0;
        if (!ctx->options->csv) {
-               if (rte_atomic16_test_and_set(&display_once))
+               if (__atomic_compare_exchange_n(&display_once, &exp, 1, 0,
+                               __ATOMIC_RELAXED, __ATOMIC_RELAXED))
                        printf("%12s%12s%12s%12s%12s%12s%12s%12s\n\n",
                                "lcore id", "Buf Size", "Burst size",
                                "Enqueued", "Dequeued", "Failed Enq",
@@ -393,12 +366,13 @@ cperf_verify_test_runner(void *test_ctx)
                                ops_deqd_failed,
                                ops_failed);
        } else {
-               if (rte_atomic16_test_and_set(&display_once))
+               if (__atomic_compare_exchange_n(&display_once, &exp, 1, 0,
+                               __ATOMIC_RELAXED, __ATOMIC_RELAXED))
                        printf("\n# lcore id, Buffer Size(B), "
                                "Burst Size,Enqueued,Dequeued,Failed Enq,"
                                "Failed Deq,Failed Ops\n");
 
-               printf("%10u;%10u;%u;%"PRIu64";%"PRIu64";%"PRIu64";%"PRIu64";"
+               printf("%10u,%10u,%u,%"PRIu64",%"PRIu64",%"PRIu64",%"PRIu64","
                                "%"PRIu64"\n",
                                ctx->lcore_id,
                                ctx->options->max_buffer_size,