@@ -108,9 +108,11 @@ test_sources = files('commands.c',
'test_ring_mpmc_stress.c',
'test_ring_hts_stress.c',
'test_ring_mt_peek_stress.c',
+ 'test_ring_mt_peek_stress_zc.c',
'test_ring_perf.c',
'test_ring_rts_stress.c',
'test_ring_st_peek_stress.c',
+ 'test_ring_st_peek_stress_zc.c',
'test_ring_stress.c',
'test_rwlock.c',
'test_sched.c',
new file mode 100644
@@ -0,0 +1,56 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2020 Arm Limited
+ */
+
+#include "test_ring.h"
+#include "test_ring_stress_impl.h"
+#include <rte_ring_elem.h>
+
+static inline uint32_t
+_st_ring_dequeue_bulk(struct rte_ring *r, void **obj, uint32_t n,
+ uint32_t *avail)
+{
+ uint32_t m;
+ struct rte_ring_zc_data zcd;
+
+ m = rte_ring_dequeue_zc_bulk_start(r, n, &zcd, avail);
+ n = (m == n) ? n : 0;
+ if (n != 0) {
+ /* Copy the data from the ring */
+ test_ring_copy_from(&zcd, obj, -1, n);
+ rte_ring_dequeue_zc_finish(r, n);
+ }
+
+ return n;
+}
+
+static inline uint32_t
+_st_ring_enqueue_bulk(struct rte_ring *r, void * const *obj, uint32_t n,
+ uint32_t *free)
+{
+ uint32_t m;
+ struct rte_ring_zc_data zcd;
+
+ m = rte_ring_enqueue_zc_bulk_start(r, n, &zcd, free);
+ n = (m == n) ? n : 0;
+ if (n != 0) {
+ /* Copy the data from the ring */
+ test_ring_copy_to(&zcd, obj, -1, n);
+ rte_ring_enqueue_zc_finish(r, n);
+ }
+
+ return n;
+}
+
+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_mt_peek_stress_zc = {
+ .name = "MT_PEEK_ZC",
+ .nb_case = RTE_DIM(tests),
+ .cases = tests,
+};
new file mode 100644
@@ -0,0 +1,65 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2020 Arm Limited
+ */
+
+#include "test_ring.h"
+#include "test_ring_stress_impl.h"
+#include <rte_ring_elem.h>
+
+static inline uint32_t
+_st_ring_dequeue_bulk(struct rte_ring *r, void **obj, uint32_t n,
+ uint32_t *avail)
+{
+ uint32_t m;
+ struct rte_ring_zc_data zcd;
+
+ static rte_spinlock_t lck = RTE_SPINLOCK_INITIALIZER;
+
+ rte_spinlock_lock(&lck);
+
+ m = rte_ring_dequeue_zc_bulk_start(r, n, &zcd, avail);
+ n = (m == n) ? n : 0;
+ if (n != 0) {
+ /* Copy the data from the ring */
+ test_ring_copy_from(&zcd, obj, -1, n);
+ rte_ring_dequeue_zc_finish(r, n);
+ }
+
+ rte_spinlock_unlock(&lck);
+ return n;
+}
+
+static inline uint32_t
+_st_ring_enqueue_bulk(struct rte_ring *r, void * const *obj, uint32_t n,
+ uint32_t *free)
+{
+ uint32_t m;
+ struct rte_ring_zc_data zcd;
+
+ static rte_spinlock_t lck = RTE_SPINLOCK_INITIALIZER;
+
+ rte_spinlock_lock(&lck);
+
+ m = rte_ring_enqueue_zc_bulk_start(r, n, &zcd, free);
+ n = (m == n) ? n : 0;
+ if (n != 0) {
+ /* Copy the data from the ring */
+ test_ring_copy_to(&zcd, obj, -1, n);
+ rte_ring_enqueue_zc_finish(r, n);
+ }
+
+ rte_spinlock_unlock(&lck);
+ return n;
+}
+
+static int
+_st_ring_init(struct rte_ring *r, const char *name, uint32_t num)
+{
+ return rte_ring_init(r, name, num, RING_F_SP_ENQ | RING_F_SC_DEQ);
+}
+
+const struct test test_ring_st_peek_stress_zc = {
+ .name = "ST_PEEK_ZC",
+ .nb_case = RTE_DIM(tests),
+ .cases = tests,
+};
@@ -49,9 +49,15 @@ test_ring_stress(void)
n += test_ring_mt_peek_stress.nb_case;
k += run_test(&test_ring_mt_peek_stress);
+ n += test_ring_mt_peek_stress_zc.nb_case;
+ k += run_test(&test_ring_mt_peek_stress_zc);
+
n += test_ring_st_peek_stress.nb_case;
k += run_test(&test_ring_st_peek_stress);
+ n += test_ring_st_peek_stress_zc.nb_case;
+ k += run_test(&test_ring_st_peek_stress_zc);
+
printf("Number of tests:\t%u\nSuccess:\t%u\nFailed:\t%u\n",
n, k, n - k);
return (k != n);
@@ -36,4 +36,6 @@ extern const struct test test_ring_mpmc_stress;
extern const struct test test_ring_rts_stress;
extern const struct test test_ring_hts_stress;
extern const struct test test_ring_mt_peek_stress;
+extern const struct test test_ring_mt_peek_stress_zc;
extern const struct test test_ring_st_peek_stress;
+extern const struct test test_ring_st_peek_stress_zc;