test/ring: add contention stress test for HTS ring

Introduce new test case to test HTS ring mode under contention.

Signed-off-by: Konstantin Ananyev <konstantin.ananyev@intel.com>
Acked-by: Honnappa Nagarahalli <honnappa.nagarahalli@arm.com>

diff --git a/app/test/Makefile b/app/test/Makefile
index 00b74b5..28f0b9a 100644 (file)
--- a/app/test/Makefile
+++ b/app/test/Makefile
@@ -78,6 +78,7 @@ SRCS-y += test_rand_perf.c
 
 SRCS-y += test_ring.c
 SRCS-y += test_ring_mpmc_stress.c
+SRCS-y += test_ring_hts_stress.c
 SRCS-y += test_ring_perf.c
 SRCS-y += test_ring_rts_stress.c
 SRCS-y += test_ring_stress.c

diff --git a/app/test/meson.build b/app/test/meson.build
index 97ad822..20c4978 100644 (file)
--- a/app/test/meson.build
+++ b/app/test/meson.build
@@ -101,6 +101,7 @@ test_sources = files('commands.c',
        'test_rib6.c',
        'test_ring.c',
        'test_ring_mpmc_stress.c',
+       'test_ring_hts_stress.c',
        'test_ring_perf.c',
        'test_ring_rts_stress.c',
        'test_ring_stress.c',

diff --git a/app/test/test_ring_hts_stress.c b/app/test/test_ring_hts_stress.c
new file mode 100644 (file)
index 0000000..edc9175
--- /dev/null
+++ b/app/test/test_ring_hts_stress.c
@@ -0,0 +1,32 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2020 Intel Corporation
+ */
+
+#include "test_ring_stress_impl.h"
+
+static inline uint32_t
+_st_ring_dequeue_bulk(struct rte_ring *r, void **obj, uint32_t n,
+       uint32_t *avail)
+{
+       return rte_ring_mc_hts_dequeue_bulk(r, obj, n, avail);
+}
+
+static inline uint32_t
+_st_ring_enqueue_bulk(struct rte_ring *r, void * const *obj, uint32_t n,
+       uint32_t *free)
+{
+       return rte_ring_mp_hts_enqueue_bulk(r, obj, n, free);
+}
+
+static int
+_st_ring_init(struct rte_ring *r, const char *name, uint32_t num)
+{
+       return rte_ring_init(r, name, num,
+               RING_F_MP_HTS_ENQ | RING_F_MC_HTS_DEQ);
+}
+
+const struct test test_ring_hts_stress = {
+       .name = "MT_HTS",
+       .nb_case = RTE_DIM(tests),
+       .cases = tests,
+};

diff --git a/app/test/test_ring_stress.c b/app/test/test_ring_stress.c
index eab395e..29a1368 100644 (file)
--- a/app/test/test_ring_stress.c
+++ b/app/test/test_ring_stress.c
@@ -43,6 +43,9 @@ test_ring_stress(void)
        n += test_ring_rts_stress.nb_case;
        k += run_test(&test_ring_rts_stress);
 
+       n += test_ring_hts_stress.nb_case;
+       k += run_test(&test_ring_hts_stress);
+
        printf("Number of tests:\t%u\nSuccess:\t%u\nFailed:\t%u\n",
                n, k, n - k);
        return (k != n);

diff --git a/app/test/test_ring_stress.h b/app/test/test_ring_stress.h
index 32aae20..9a87c7f 100644 (file)
--- a/app/test/test_ring_stress.h
+++ b/app/test/test_ring_stress.h
@@ -34,3 +34,4 @@ struct test {
 
 extern const struct test test_ring_mpmc_stress;
 extern const struct test test_ring_rts_stress;
+extern const struct test test_ring_hts_stress;