net/ena: fix build with GCC 12

[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 76fcda4..cecf30e 100644 (file)
--- a/app/test-crypto-perf/cperf_test_throughput.c
+++ b/app/test-crypto-perf/cperf_test_throughput.c
@@ -35,14 +35,13 @@ cperf_throughput_test_free(struct cperf_throughput_ctx *ctx)
        if (!ctx)
                return;
        if (ctx->sess) {
-               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);
-               }
+               if (ctx->options->op_type == CPERF_ASYM_MODEX)
+                       rte_cryptodev_asym_session_free(ctx->dev_id,
+                                       (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_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);
@@ -56,8 +55,7 @@ cperf_throughput_test_free(struct cperf_throughput_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);
 }
@@ -112,7 +110,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];
@@ -185,7 +183,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
@@ -280,8 +278,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",
@@ -301,7 +301,8 @@ 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),"