app/crypto-perf: add range/list of sizes
[dpdk.git] / app / test-crypto-perf / cperf_test_latency.c
index 20d7069..3275b4b 100644 (file)
@@ -115,8 +115,8 @@ cperf_mbuf_create(struct rte_mempool *mempool,
                const struct cperf_test_vector *test_vector)
 {
        struct rte_mbuf *mbuf;
-       uint32_t segment_sz = options->buffer_sz / segments_nb;
-       uint32_t last_sz = options->buffer_sz % segments_nb;
+       uint32_t segment_sz = options->max_buffer_size / segments_nb;
+       uint32_t last_sz = options->max_buffer_size % segments_nb;
        uint8_t *mbuf_data;
        uint8_t *test_data =
                        (options->cipher_op == RTE_CRYPTO_CIPHER_OP_ENCRYPT) ?
@@ -218,8 +218,8 @@ cperf_latency_test_constructor(uint8_t dev_id, uint16_t qp_id,
                        options->pool_sz * options->segments_nb, 0, 0,
                        RTE_PKTMBUF_HEADROOM +
                        RTE_CACHE_LINE_ROUNDUP(
-                               (options->buffer_sz / options->segments_nb) +
-                               (options->buffer_sz % options->segments_nb) +
+                               (options->max_buffer_size / options->segments_nb) +
+                               (options->max_buffer_size % options->segments_nb) +
                                        options->auth_digest_sz),
                        rte_socket_id());
 
@@ -249,7 +249,7 @@ cperf_latency_test_constructor(uint8_t dev_id, uint16_t qp_id,
                                pool_name, options->pool_sz, 0, 0,
                                RTE_PKTMBUF_HEADROOM +
                                RTE_CACHE_LINE_ROUNDUP(
-                                       options->buffer_sz +
+                                       options->max_buffer_size +
                                        options->auth_digest_sz),
                                rte_socket_id());
 
@@ -300,14 +300,16 @@ cperf_latency_test_runner(void *arg)
 {
        struct cperf_latency_ctx *ctx = arg;
        struct cperf_op_result *pres;
+       uint16_t test_burst_size;
+       uint8_t burst_size_idx = 0;
 
        static int only_once;
 
        if (ctx == NULL)
                return 0;
 
-       struct rte_crypto_op *ops[ctx->options->burst_sz];
-       struct rte_crypto_op *ops_processed[ctx->options->burst_sz];
+       struct rte_crypto_op *ops[ctx->options->max_burst_size];
+       struct rte_crypto_op *ops_processed[ctx->options->max_burst_size];
        uint64_t i;
 
        uint32_t lcore = rte_lcore_id();
@@ -331,188 +333,207 @@ cperf_latency_test_runner(void *arg)
        for (i = 0; i < ctx->options->total_ops; i++)
                rte_cryptodev_enqueue_burst(ctx->dev_id, ctx->qp_id, NULL, 0);
 
-       uint64_t ops_enqd = 0, ops_deqd = 0;
-       uint64_t m_idx = 0, b_idx = 0;
+       /* Get first size from range or list */
+       if (ctx->options->inc_burst_size != 0)
+               test_burst_size = ctx->options->min_burst_size;
+       else
+               test_burst_size = ctx->options->burst_size_list[0];
 
-       uint64_t tsc_val, tsc_end, tsc_start;
-       uint64_t tsc_max = 0, tsc_min = ~0UL, tsc_tot = 0, tsc_idx = 0;
-       uint64_t enqd_max = 0, enqd_min = ~0UL, enqd_tot = 0;
-       uint64_t deqd_max = 0, deqd_min = ~0UL, deqd_tot = 0;
+       while (test_burst_size <= ctx->options->max_burst_size) {
+               uint64_t ops_enqd = 0, ops_deqd = 0;
+               uint64_t m_idx = 0, b_idx = 0;
 
-       while (enqd_tot < ctx->options->total_ops) {
-               uint16_t burst_size = ((enqd_tot + ctx->options->burst_sz)
-                               <= ctx->options->total_ops) ?
-                                               ctx->options->burst_sz :
-                                               ctx->options->total_ops -
-                                               enqd_tot;
+               uint64_t tsc_val, tsc_end, tsc_start;
+               uint64_t tsc_max = 0, tsc_min = ~0UL, tsc_tot = 0, tsc_idx = 0;
+               uint64_t enqd_max = 0, enqd_min = ~0UL, enqd_tot = 0;
+               uint64_t deqd_max = 0, deqd_min = ~0UL, deqd_tot = 0;
 
-               /* Allocate crypto ops from pool */
-               if (burst_size != rte_crypto_op_bulk_alloc(
-                               ctx->crypto_op_pool,
-                               RTE_CRYPTO_OP_TYPE_SYMMETRIC,
-                               ops, burst_size))
-                       return -1;
+               while (enqd_tot < ctx->options->total_ops) {
 
-               /* Setup crypto op, attach mbuf etc */
-               (ctx->populate_ops)(ops, &ctx->mbufs_in[m_idx],
-                               &ctx->mbufs_out[m_idx],
-                               burst_size, ctx->sess, ctx->options,
-                               ctx->test_vector);
+                       uint16_t burst_size = ((enqd_tot + test_burst_size)
+                                       <= ctx->options->total_ops) ?
+                                                       test_burst_size :
+                                                       ctx->options->total_ops -
+                                                       enqd_tot;
 
-               tsc_start = rte_rdtsc_precise();
+                       /* Allocate crypto ops from pool */
+                       if (burst_size != rte_crypto_op_bulk_alloc(
+                                       ctx->crypto_op_pool,
+                                       RTE_CRYPTO_OP_TYPE_SYMMETRIC,
+                                       ops, burst_size))
+                               return -1;
+
+                       /* Setup crypto op, attach mbuf etc */
+                       (ctx->populate_ops)(ops, &ctx->mbufs_in[m_idx],
+                                       &ctx->mbufs_out[m_idx],
+                                       burst_size, ctx->sess, ctx->options,
+                                       ctx->test_vector);
+
+                       tsc_start = rte_rdtsc_precise();
 
 #ifdef CPERF_LINEARIZATION_ENABLE
-               if (linearize) {
-                       /* PMD doesn't support scatter-gather and source buffer
-                        * is segmented.
-                        * We need to linearize it before enqueuing.
-                        */
-                       for (i = 0; i < burst_size; i++)
-                               rte_pktmbuf_linearize(ops[i]->sym->m_src);
-               }
+                       if (linearize) {
+                               /* PMD doesn't support scatter-gather and source buffer
+                                * is segmented.
+                                * We need to linearize it before enqueuing.
+                                */
+                               for (i = 0; i < burst_size; i++)
+                                       rte_pktmbuf_linearize(ops[i]->sym->m_src);
+                       }
 #endif /* CPERF_LINEARIZATION_ENABLE */
 
-               /* Enqueue burst of ops on crypto device */
-               ops_enqd = rte_cryptodev_enqueue_burst(ctx->dev_id, ctx->qp_id,
-                               ops, burst_size);
+                       /* Enqueue burst of ops on crypto device */
+                       ops_enqd = rte_cryptodev_enqueue_burst(ctx->dev_id, ctx->qp_id,
+                                       ops, burst_size);
 
-               /* Dequeue processed burst of ops from crypto device */
-               ops_deqd = rte_cryptodev_dequeue_burst(ctx->dev_id, ctx->qp_id,
-                               ops_processed, ctx->options->burst_sz);
+                       /* Dequeue processed burst of ops from crypto device */
+                       ops_deqd = rte_cryptodev_dequeue_burst(ctx->dev_id, ctx->qp_id,
+                                       ops_processed, test_burst_size);
 
-               tsc_end = rte_rdtsc_precise();
+                       tsc_end = rte_rdtsc_precise();
 
-               for (i = 0; i < ops_enqd; i++) {
-                       ctx->res[tsc_idx].tsc_start = tsc_start;
-                       ops[i]->opaque_data = (void *)&ctx->res[tsc_idx];
-                       tsc_idx++;
-               }
+                       /* Free memory for not enqueued operations */
+                       for (i = ops_enqd; i < burst_size; i++)
+                               rte_crypto_op_free(ops[i]);
 
-               /* Free memory for not enqueued operations */
-               for (i = ops_enqd; i < burst_size; i++)
-                       rte_crypto_op_free(ops[i]);
-
-               if (likely(ops_deqd))  {
-                       /*
-                        * free crypto ops so they can be reused. We don't free
-                        * the mbufs here as we don't want to reuse them as
-                        * the crypto operation will change the data and cause
-                        * failures.
-                        */
-                       for (i = 0; i < ops_deqd; i++) {
-                               pres = (struct cperf_op_result *)
-                                               (ops_processed[i]->opaque_data);
-                               pres->status = ops_processed[i]->status;
-                               pres->tsc_end = tsc_end;
-
-                               rte_crypto_op_free(ops_processed[i]);
+                       for (i = 0; i < burst_size; i++) {
+                               ctx->res[tsc_idx].tsc_start = tsc_start;
+                               ops[i]->opaque_data = (void *)&ctx->res[tsc_idx];
+                               tsc_idx++;
                        }
 
-                       deqd_tot += ops_deqd;
-                       deqd_max = max(ops_deqd, deqd_max);
-                       deqd_min = min(ops_deqd, deqd_min);
-               }
+                       if (likely(ops_deqd))  {
+                               /*
+                                * free crypto ops so they can be reused. We don't free
+                                * the mbufs here as we don't want to reuse them as
+                                * the crypto operation will change the data and cause
+                                * failures.
+                                */
+                               for (i = 0; i < ops_deqd; i++) {
+                                       pres = (struct cperf_op_result *)
+                                                       (ops_processed[i]->opaque_data);
+                                       pres->status = ops_processed[i]->status;
+                                       pres->tsc_end = tsc_end;
+
+                                       rte_crypto_op_free(ops_processed[i]);
+                               }
+
+                               deqd_tot += ops_deqd;
+                               deqd_max = max(ops_deqd, deqd_max);
+                               deqd_min = min(ops_deqd, deqd_min);
+                       }
 
-               enqd_tot += ops_enqd;
-               enqd_max = max(ops_enqd, enqd_max);
-               enqd_min = min(ops_enqd, enqd_min);
+                       enqd_tot += ops_enqd;
+                       enqd_max = max(ops_enqd, enqd_max);
+                       enqd_min = min(ops_enqd, enqd_min);
 
-               m_idx += ops_enqd;
-               m_idx = m_idx + ctx->options->burst_sz > ctx->options->pool_sz ?
-                               0 : m_idx;
-               b_idx++;
-       }
+                       m_idx += ops_enqd;
+                       m_idx = m_idx + test_burst_size > ctx->options->pool_sz ?
+                                       0 : m_idx;
+                       b_idx++;
+               }
 
-       /* Dequeue any operations still in the crypto device */
-       while (deqd_tot < ctx->options->total_ops) {
-               /* Sending 0 length burst to flush sw crypto device */
-               rte_cryptodev_enqueue_burst(ctx->dev_id, ctx->qp_id, NULL, 0);
+               /* Dequeue any operations still in the crypto device */
+               while (deqd_tot < ctx->options->total_ops) {
+                       /* Sending 0 length burst to flush sw crypto device */
+                       rte_cryptodev_enqueue_burst(ctx->dev_id, ctx->qp_id, NULL, 0);
+
+                       /* dequeue burst */
+                       ops_deqd = rte_cryptodev_dequeue_burst(ctx->dev_id, ctx->qp_id,
+                                       ops_processed, test_burst_size);
 
-               /* dequeue burst */
-               ops_deqd = rte_cryptodev_dequeue_burst(ctx->dev_id, ctx->qp_id,
-                               ops_processed, ctx->options->burst_sz);
+                       tsc_end = rte_rdtsc_precise();
 
-               tsc_end = rte_rdtsc_precise();
+                       if (ops_deqd != 0) {
+                               for (i = 0; i < ops_deqd; i++) {
+                                       pres = (struct cperf_op_result *)
+                                                       (ops_processed[i]->opaque_data);
+                                       pres->status = ops_processed[i]->status;
+                                       pres->tsc_end = tsc_end;
 
-               if (ops_deqd != 0) {
-                       for (i = 0; i < ops_deqd; i++) {
-                               pres = (struct cperf_op_result *)
-                                               (ops_processed[i]->opaque_data);
-                               pres->status = ops_processed[i]->status;
-                               pres->tsc_end = tsc_end;
+                                       rte_crypto_op_free(ops_processed[i]);
+                               }
 
-                               rte_crypto_op_free(ops_processed[i]);
+                               deqd_tot += ops_deqd;
+                               deqd_max = max(ops_deqd, deqd_max);
+                               deqd_min = min(ops_deqd, deqd_min);
                        }
+               }
 
-                       deqd_tot += ops_deqd;
-                       deqd_max = max(ops_deqd, deqd_max);
-                       deqd_min = min(ops_deqd, deqd_min);
+               for (i = 0; i < tsc_idx; i++) {
+                       tsc_val = ctx->res[i].tsc_end - ctx->res[i].tsc_start;
+                       tsc_max = max(tsc_val, tsc_max);
+                       tsc_min = min(tsc_val, tsc_min);
+                       tsc_tot += tsc_val;
                }
-       }
 
-       for (i = 0; i < tsc_idx; i++) {
-               tsc_val = ctx->res[i].tsc_end - ctx->res[i].tsc_start;
-               tsc_max = max(tsc_val, tsc_max);
-               tsc_min = min(tsc_val, tsc_min);
-               tsc_tot += tsc_val;
-       }
+               double time_tot, time_avg, time_max, time_min;
 
-       double time_tot, time_avg, time_max, time_min;
+               const uint64_t tunit = 1000000; /* us */
+               const uint64_t tsc_hz = rte_get_tsc_hz();
 
-       const uint64_t tunit = 1000000; /* us */
-       const uint64_t tsc_hz = rte_get_tsc_hz();
+               uint64_t enqd_avg = enqd_tot / b_idx;
+               uint64_t deqd_avg = deqd_tot / b_idx;
+               uint64_t tsc_avg = tsc_tot / tsc_idx;
 
-       uint64_t enqd_avg = enqd_tot / b_idx;
-       uint64_t deqd_avg = deqd_tot / b_idx;
-       uint64_t tsc_avg = tsc_tot / tsc_idx;
+               time_tot = tunit*(double)(tsc_tot) / tsc_hz;
+               time_avg = tunit*(double)(tsc_avg) / tsc_hz;
+               time_max = tunit*(double)(tsc_max) / tsc_hz;
+               time_min = tunit*(double)(tsc_min) / tsc_hz;
 
-       time_tot = tunit*(double)(tsc_tot) / tsc_hz;
-       time_avg = tunit*(double)(tsc_avg) / tsc_hz;
-       time_max = tunit*(double)(tsc_max) / tsc_hz;
-       time_min = tunit*(double)(tsc_min) / tsc_hz;
+               if (ctx->options->csv) {
+                       if (!only_once)
+                               printf("\n# lcore, Buffer Size, Burst Size, Pakt Seq #, "
+                                               "Packet Size, cycles, time (us)");
 
-       if (ctx->options->csv) {
-               if (!only_once)
-                       printf("\n# lcore, Buffer Size, Burst Size, Pakt Seq #, "
-                                       "Packet Size, cycles, time (us)");
+                       for (i = 0; i < ctx->options->total_ops; i++) {
 
-               for (i = 0; i < ctx->options->total_ops; i++) {
+                               printf("\n%u;%u;%u;%"PRIu64";%"PRIu64";%.3f",
+                                       ctx->lcore_id, ctx->options->test_buffer_size,
+                                       test_burst_size, i + 1,
+                                       ctx->res[i].tsc_end - ctx->res[i].tsc_start,
+                                       tunit * (double) (ctx->res[i].tsc_end
+                                                       - ctx->res[i].tsc_start)
+                                               / tsc_hz);
 
-                       printf("\n%u;%u;%u;%"PRIu64";%"PRIu64";%.3f",
-                               ctx->lcore_id, ctx->options->buffer_sz,
-                               ctx->options->burst_sz, i + 1,
-                               ctx->res[i].tsc_end - ctx->res[i].tsc_start,
-                               tunit * (double) (ctx->res[i].tsc_end
-                                               - ctx->res[i].tsc_start)
-                                       / tsc_hz);
+                       }
+                       only_once = 1;
+               } else {
+                       printf("\n# Device %d on lcore %u\n", ctx->dev_id,
+                               ctx->lcore_id);
+                       printf("\n# total operations: %u", ctx->options->total_ops);
+                       printf("\n# Buffer size: %u", ctx->options->test_buffer_size);
+                       printf("\n# Burst size: %u", test_burst_size);
+                       printf("\n#     Number of bursts: %"PRIu64,
+                                       b_idx);
+
+                       printf("\n#");
+                       printf("\n#          \t       Total\t   Average\t   "
+                                       "Maximum\t   Minimum");
+                       printf("\n#  enqueued\t%12"PRIu64"\t%10"PRIu64"\t"
+                                       "%10"PRIu64"\t%10"PRIu64, enqd_tot,
+                                       enqd_avg, enqd_max, enqd_min);
+                       printf("\n#  dequeued\t%12"PRIu64"\t%10"PRIu64"\t"
+                                       "%10"PRIu64"\t%10"PRIu64, deqd_tot,
+                                       deqd_avg, deqd_max, deqd_min);
+                       printf("\n#    cycles\t%12"PRIu64"\t%10"PRIu64"\t"
+                                       "%10"PRIu64"\t%10"PRIu64, tsc_tot,
+                                       tsc_avg, tsc_max, tsc_min);
+                       printf("\n# time [us]\t%12.0f\t%10.3f\t%10.3f\t%10.3f",
+                                       time_tot, time_avg, time_max, time_min);
+                       printf("\n\n");
 
                }
-               only_once = 1;
-       } else {
-               printf("\n# Device %d on lcore %u\n", ctx->dev_id,
-                       ctx->lcore_id);
-               printf("\n# total operations: %u", ctx->options->total_ops);
-               printf("\n# Buffer size: %u", ctx->options->buffer_sz);
-               printf("\n# Burst size: %u", ctx->options->burst_sz);
-               printf("\n#     Number of bursts: %"PRIu64,
-                               b_idx);
-
-               printf("\n#");
-               printf("\n#          \t       Total\t   Average\t   "
-                               "Maximum\t   Minimum");
-               printf("\n#  enqueued\t%12"PRIu64"\t%10"PRIu64"\t"
-                               "%10"PRIu64"\t%10"PRIu64, enqd_tot,
-                               enqd_avg, enqd_max, enqd_min);
-               printf("\n#  dequeued\t%12"PRIu64"\t%10"PRIu64"\t"
-                               "%10"PRIu64"\t%10"PRIu64, deqd_tot,
-                               deqd_avg, deqd_max, deqd_min);
-               printf("\n#    cycles\t%12"PRIu64"\t%10"PRIu64"\t"
-                               "%10"PRIu64"\t%10"PRIu64, tsc_tot,
-                               tsc_avg, tsc_max, tsc_min);
-               printf("\n# time [us]\t%12.0f\t%10.3f\t%10.3f\t%10.3f",
-                               time_tot, time_avg, time_max, time_min);
-               printf("\n\n");
 
+               /* Get next size from range or list */
+               if (ctx->options->inc_burst_size != 0)
+                       test_burst_size += ctx->options->inc_burst_size;
+               else {
+                       if (++burst_size_idx == ctx->options->burst_size_count)
+                               break;
+                       test_burst_size =
+                               ctx->options->burst_size_list[burst_size_idx];
+               }
        }
 
        return 0;