[dpdk-stable] patch 'test/ring: fix statistics in bulk enq/dequeue' has been queued to stable release 19.11.4

[luca.boccassi at gmail.com]

Hi,

FYI, your patch has been queued to stable release 19.11.4

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 07/26/20. So please
shout if anyone has objections.

Also note that after the patch there's a diff of the upstream commit vs the
patch applied to the branch. This will indicate if there was any rebasing
needed to apply to the stable branch. If there were code changes for rebasing
(ie: not only metadata diffs), please double check that the rebase was
correctly done.

Thanks.

Luca Boccassi

---
>From 95ad1c1bad8db6b2ae58d5267b5e407bf7193ef7 Mon Sep 17 00:00:00 2001
From: Feifei Wang <feifei.wang2 at arm.com>
Date: Mon, 8 Jun 2020 13:58:46 +0800
Subject: [PATCH] test/ring: fix statistics in bulk enq/dequeue

[ upstream commit 50959a899374cec9852eea3cd7dd638ee2d560ec ]

In size 32 bulk ring enq/dequeue performance test, the "Total count"
statistics is incorrect. For example, running the test on lcore 25 and
lcore 26, the output is as follows:

The test command:
$sudo ./arm64-armv8a-linuxapp-gcc/app/test -l 25-26
RTE>>ring_perf_autotest

Bulk enq/dequeue count on size 32
Core [25] count = 288268
Core [26] count = 288281
Total count (size: 32): 1066323

Fixed it by reset the counter at the beginning of each loop. The
revised output is as follows:

Bulk enq/dequeue count on size 32
Core [25] count = 285643
Core [26] count = 285688
Total count (size: 32): 571331

Fixes: 759cf9b5632c ("test/ring: enhance mp/mc coverage")

Signed-off-by: Feifei Wang <feifei.wang2 at arm.com>
Reviewed-by: Ruifeng Wang <ruifeng.wang at arm.com>
Reviewed-by: Phil Yang <phil.yang at arm.com>
Acked-by: Konstantin Ananyev <konstantin.ananyev at intel.com>
---
 app/test/test_ring_perf.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/test/test_ring_perf.c b/app/test/test_ring_perf.c
index 70ee46ffe..3cf27965d 100644
--- a/app/test/test_ring_perf.c
+++ b/app/test/test_ring_perf.c
@@ -296,12 +296,13 @@ load_loop_fn(void *p)
 static int
 run_on_all_cores(struct rte_ring *r)
 {
-	uint64_t total = 0;
+	uint64_t total;
 	struct thread_params param;
 	unsigned int i, c;
 
 	memset(&param, 0, sizeof(struct thread_params));
 	for (i = 0; i < RTE_DIM(bulk_sizes); i++) {
+		total = 0;
 		printf("\nBulk enq/dequeue count on size %u\n", bulk_sizes[i]);
 		param.size = bulk_sizes[i];
 		param.r = r;
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-07-24 12:53:51.321140254 +0100
+++ 0071-test-ring-fix-statistics-in-bulk-enq-dequeue.patch	2020-07-24 12:53:48.295006608 +0100
@@ -1,8 +1,10 @@
-From 50959a899374cec9852eea3cd7dd638ee2d560ec Mon Sep 17 00:00:00 2001
+From 95ad1c1bad8db6b2ae58d5267b5e407bf7193ef7 Mon Sep 17 00:00:00 2001
 From: Feifei Wang <feifei.wang2 at arm.com>
 Date: Mon, 8 Jun 2020 13:58:46 +0800
 Subject: [PATCH] test/ring: fix statistics in bulk enq/dequeue
 
+[ upstream commit 50959a899374cec9852eea3cd7dd638ee2d560ec ]
+
 In size 32 bulk ring enq/dequeue performance test, the "Total count"
 statistics is incorrect. For example, running the test on lcore 25 and
 lcore 26, the output is as follows:
@@ -25,7 +27,6 @@
 Total count (size: 32): 571331
 
 Fixes: 759cf9b5632c ("test/ring: enhance mp/mc coverage")
-Cc: stable at dpdk.org
 
 Signed-off-by: Feifei Wang <feifei.wang2 at arm.com>
 Reviewed-by: Ruifeng Wang <ruifeng.wang at arm.com>
@@ -36,19 +37,17 @@
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 diff --git a/app/test/test_ring_perf.c b/app/test/test_ring_perf.c
-index ee21faf71..ac9bf5608 100644
+index 70ee46ffe..3cf27965d 100644
 --- a/app/test/test_ring_perf.c
 +++ b/app/test/test_ring_perf.c
-@@ -380,7 +380,7 @@ load_loop_fn_16B(void *p)
+@@ -296,12 +296,13 @@ load_loop_fn(void *p)
  static int
- run_on_all_cores(struct rte_ring *r, const int esize)
+ run_on_all_cores(struct rte_ring *r)
  {
 -	uint64_t total = 0;
 +	uint64_t total;
  	struct thread_params param;
- 	lcore_function_t *lcore_f;
  	unsigned int i, c;
-@@ -392,6 +392,7 @@ run_on_all_cores(struct rte_ring *r, const int esize)
  
  	memset(&param, 0, sizeof(struct thread_params));
  	for (i = 0; i < RTE_DIM(bulk_sizes); i++) {