pipeline: support action annotations

[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..1962438 100644 (file)
--- a/app/test-crypto-perf/cperf_test_verify.c
+++ b/app/test-crypto-perf/cperf_test_verify.c
@@ -203,11 +203,19 @@ cperf_mbuf_set(struct rte_mbuf *mbuf,
 {
        uint32_t segment_sz = options->segment_sz;
        uint8_t *mbuf_data;
-       uint8_t *test_data =
-                       (options->cipher_op == RTE_CRYPTO_CIPHER_OP_ENCRYPT) ?
+       uint8_t *test_data;
+       uint32_t remaining_bytes = options->max_buffer_size;
+
+       if (options->op_type == CPERF_AEAD) {
+               test_data = (options->aead_op == RTE_CRYPTO_AEAD_OP_ENCRYPT) ?
                                        test_vector->plaintext.data :
                                        test_vector->ciphertext.data;
-       uint32_t remaining_bytes = options->max_buffer_size;
+       } else {
+               test_data =
+                       (options->cipher_op == RTE_CRYPTO_CIPHER_OP_ENCRYPT) ?
+                               test_vector->plaintext.data :
+                               test_vector->ciphertext.data;
+       }
 
        while (remaining_bytes) {
                mbuf_data = rte_pktmbuf_mtod(mbuf, uint8_t *);
@@ -291,7 +299,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 */
@@ -398,7 +406,7 @@ cperf_verify_test_runner(void *test_ctx)
                                "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,