support systemd service convention for runtime directory

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

diff --git a/app/test-crypto-perf/cperf_test_throughput.c b/app/test-crypto-perf/cperf_test_throughput.c
index 35c5102..51512af 100644 (file)
--- a/app/test-crypto-perf/cperf_test_throughput.c
+++ b/app/test-crypto-perf/cperf_test_throughput.c
@@ -35,16 +35,24 @@ cperf_throughput_test_free(struct cperf_throughput_ctx *ctx)
        if (!ctx)
                return;
        if (ctx->sess) {
-#ifdef RTE_LIBRTE_SECURITY
-               if (ctx->options->op_type == CPERF_PDCP) {
+               if (ctx->options->op_type == CPERF_ASYM_MODEX) {
+                       rte_cryptodev_asym_session_clear(ctx->dev_id,
+                                                        (void *)ctx->sess);
+                       rte_cryptodev_asym_session_free((void *)ctx->sess);
+               }
+#ifdef RTE_LIB_SECURITY
+               else if (ctx->options->op_type == CPERF_PDCP ||
+                        ctx->options->op_type == CPERF_DOCSIS ||
+                        ctx->options->op_type == CPERF_IPSEC) {
                        struct rte_security_ctx *sec_ctx =
                                (struct rte_security_ctx *)
-                               rte_cryptodev_get_sec_ctx(ctx->dev_id);
-                       rte_security_session_destroy(sec_ctx,
+                                       rte_cryptodev_get_sec_ctx(ctx->dev_id);
+                       rte_security_session_destroy(
+                               sec_ctx,
                                (struct rte_security_session *)ctx->sess);
-               } else
+               }
 #endif
-               {
+               else {
                        rte_cryptodev_sym_session_clear(ctx->dev_id, ctx->sess);
                        rte_cryptodev_sym_session_free(ctx->sess);
                }
@@ -105,7 +113,7 @@ cperf_throughput_test_runner(void *test_ctx)
        uint8_t burst_size_idx = 0;
        uint32_t imix_idx = 0;
 
-       static rte_atomic16_t display_once = RTE_ATOMIC16_INIT(0);
+       static uint16_t display_once;
 
        struct rte_crypto_op *ops[ctx->options->max_burst_size];
        struct rte_crypto_op *ops_processed[ctx->options->max_burst_size];
@@ -118,7 +126,8 @@ cperf_throughput_test_runner(void *test_ctx)
        int linearize = 0;
 
        /* Check if source mbufs require coalescing */
-       if (ctx->options->segment_sz < ctx->options->max_buffer_size) {
+       if ((ctx->options->op_type != CPERF_ASYM_MODEX) &&
+           (ctx->options->segment_sz < ctx->options->max_buffer_size)) {
                rte_cryptodev_info_get(ctx->dev_id, &dev_info);
                if ((dev_info.feature_flags &
                                RTE_CRYPTODEV_FF_MBUF_SCATTER_GATHER) == 0)
@@ -177,7 +186,7 @@ cperf_throughput_test_runner(void *test_ctx)
                                        ctx->dst_buf_offset,
                                        ops_needed, ctx->sess,
                                        ctx->options, ctx->test_vector,
-                                       iv_offset, &imix_idx);
+                                       iv_offset, &imix_idx, &tsc_start);
 
                        /**
                         * When ops_needed is smaller than ops_enqd, the
@@ -199,7 +208,8 @@ cperf_throughput_test_runner(void *test_ctx)
                                 * We need to linearize it before enqueuing.
                                 */
                                for (i = 0; i < burst_size; i++)
-                                       rte_pktmbuf_linearize(ops[i]->sym->m_src);
+                                       rte_pktmbuf_linearize(
+                                               ops[i]->sym->m_src);
                        }
 #endif /* CPERF_LINEARIZATION_ENABLE */
 
@@ -271,8 +281,10 @@ cperf_throughput_test_runner(void *test_ctx)
                double cycles_per_packet = ((double)tsc_duration /
                                ctx->options->total_ops);
 
+               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%12s%12s\n\n",
                                        "lcore id", "Buf Size", "Burst Size",
                                        "Enqueued", "Dequeued", "Failed Enq",
@@ -292,14 +304,15 @@ cperf_throughput_test_runner(void *test_ctx)
                                        throughput_gbps,
                                        cycles_per_packet);
                } else {
-                       if (rte_atomic16_test_and_set(&display_once))
+                       if (__atomic_compare_exchange_n(&display_once, &exp, 1, 0,
+                                       __ATOMIC_RELAXED, __ATOMIC_RELAXED))
                                printf("#lcore id,Buffer Size(B),"
                                        "Burst Size,Enqueued,Dequeued,Failed Enq,"
                                        "Failed Deq,Ops(Millions),Throughput(Gbps),"
                                        "Cycles/Buf\n\n");
 
-                       printf("%u;%u;%u;%"PRIu64";%"PRIu64";%"PRIu64";%"PRIu64";"
-                                       "%.3f;%.3f;%.3f\n",
+                       printf("%u,%u,%u,%"PRIu64",%"PRIu64",%"PRIu64",%"PRIu64","
+                                       "%.3f,%.3f,%.3f\n",
                                        ctx->lcore_id,
                                        ctx->options->test_buffer_size,
                                        test_burst_size,