Report: Add dpdk data

Change-Id: Iad97217b99b25f14a85c98348d49339a4be8cec7
Signed-off-by: Tibor Frank <tifrank@cisco.com>

2 files changed, 143 insertions, 157 deletions

diff --git a/resources/tools/presentation/specifications/report/data_sets.yaml b/resources/tools/presentation/specifications/report/data_sets.yaml
index 22e3ddb185..34cdcecb67 100644
--- a/resources/tools/presentation/specifications/report/data_sets.yaml
+++ b/resources/tools/presentation/specifications/report/data_sets.yaml
@@ -162,25 +162,21 @@
       - 26  # rls2101 NDRPDR iter env 6
 
   dpdk-3n-skx-curr-iter:
-    # TODO: Replace
-    # csit-dpdk-perf-report-iterative-2106-3n-skx:
-    csit-dpdk-perf-report-iterative-2101-3n-skx:
-      - 12  # rls2101 NDRPDR iter env 6
-      - 14  # rls2101 NDRPDR iter env 6
-      - 15  # rls2101 NDRPDR iter env 6
-      - 17  # rls2101 NDRPDR iter env 6
-      - 19  # rls2101 NDRPDR iter env 6
-      - 20  # rls2101 NDRPDR iter env 6
-      - 21  # rls2101 NDRPDR iter env 6
-      - 22  # rls2101 NDRPDR iter env 6
-      - 25  # rls2101 NDRPDR iter env 6
-      - 26  # rls2101 NDRPDR iter env 6
+    csit-dpdk-perf-report-iterative-2106-3n-skx:
+      - 1   # rls2106 NDRPDR iter env 7
+      - 2   # rls2106 NDRPDR iter env 7
+      - 3   # rls2106 NDRPDR iter env 7
+      - 4   # rls2106 NDRPDR iter env 7
+      - 5   # rls2106 NDRPDR iter env 7
+      - 6   # rls2106 NDRPDR iter env 7
+      - 7   # rls2106 NDRPDR iter env 7
+      - 8   # rls2106 NDRPDR iter env 7
+      - 9   # rls2106 NDRPDR iter env 7
+      - 10  # rls2106 NDRPDR iter env 7
 
   dpdk-3n-skx-curr-iter-best:
-    # TODO: Replace
-    # csit-dpdk-perf-report-iterative-2106-3n-skx:
-    csit-dpdk-perf-report-iterative-2101-3n-skx:
-      - 12  # rls2101 NDRPDR iter env 6
+    csit-dpdk-perf-report-iterative-2106-3n-skx:
+      - 2   # rls2106 NDRPDR iter env 7
 
   # 2n-skx
 
@@ -456,25 +452,21 @@
       - 21  # rls2101 NDRPDR iter env 6
 
   dpdk-2n-skx-curr-iter:
-    # TODO: Replace
-    # csit-dpdk-perf-report-iterative-2106-2n-skx:
-    csit-dpdk-perf-report-iterative-2101-2n-skx:
-      - 11  # rls2101 NDRPDR iter env 6
-      - 12  # rls2101 NDRPDR iter env 6
-      - 13  # rls2101 NDRPDR iter env 6
-      - 14  # rls2101 NDRPDR iter env 6
-      - 15  # rls2101 NDRPDR iter env 6
-      - 17  # rls2101 NDRPDR iter env 6
-      - 18  # rls2101 NDRPDR iter env 6
-      - 19  # rls2101 NDRPDR iter env 6
-      - 20  # rls2101 NDRPDR iter env 6
-      - 21  # rls2101 NDRPDR iter env 6
+    csit-dpdk-perf-report-iterative-2106-2n-skx:
+      - 11  # rls2106 NDRPDR iter env 7
+      - 2   # rls2106 NDRPDR iter env 7
+      - 3   # rls2106 NDRPDR iter env 7
+      - 4   # rls2106 NDRPDR iter env 7
+      - 5   # rls2106 NDRPDR iter env 7
+      - 6   # rls2106 NDRPDR iter env 7
+      - 7   # rls2106 NDRPDR iter env 7
+      - 8   # rls2106 NDRPDR iter env 7
+      - 9   # rls2106 NDRPDR iter env 7
+      - 10  # rls2106 NDRPDR iter env 7
 
   dpdk-2n-skx-curr-iter-best:
-    # TODO: Replace
-    # csit-dpdk-perf-report-iterative-2106-2n-skx:
-    csit-dpdk-perf-report-iterative-2101-2n-skx:
-      - 11  # rls2101 NDRPDR iter env 6
+    csit-dpdk-perf-report-iterative-2106-2n-skx:
+      - 2   # rls2106 NDRPDR iter env 7
 
   # 2n-zn2
 
@@ -645,25 +637,21 @@
       - 21  # rls2101 NDRPDR iter env 6
 
   dpdk-2n-zn2-curr-iter:
-    # TODO: Replace
-    # csit-dpdk-perf-report-iterative-2106-2n-zn2:
-    csit-dpdk-perf-report-iterative-2101-2n-zn2:
-      - 11  # rls2101 NDRPDR iter env 6
-      - 12  # rls2101 NDRPDR iter env 6
-      - 13  # rls2101 NDRPDR iter env 6
-      - 14  # rls2101 NDRPDR iter env 6
-      - 16  # rls2101 NDRPDR iter env 6
-      - 17  # rls2101 NDRPDR iter env 6
-      - 18  # rls2101 NDRPDR iter env 6
-      - 19  # rls2101 NDRPDR iter env 6
-      - 20  # rls2101 NDRPDR iter env 6
-      - 21  # rls2101 NDRPDR iter env 6
+    csit-dpdk-perf-report-iterative-2106-2n-zn2:
+#       - 11  # rls2106 NDRPDR iter env 7
+      - 2   # rls2106 NDRPDR iter env 7
+      - 3   # rls2106 NDRPDR iter env 7
+      - 4   # rls2106 NDRPDR iter env 7
+      - 5   # rls2106 NDRPDR iter env 7
+      - 6   # rls2106 NDRPDR iter env 7
+      - 7   # rls2106 NDRPDR iter env 7
+      - 8   # rls2106 NDRPDR iter env 7
+#       - 9   # rls2106 NDRPDR iter env 7
+#       - 10  # rls2106 NDRPDR iter env 7
 
   dpdk-2n-zn2-curr-iter-best:
-    # TODO: Replace
-    # csit-dpdk-perf-report-iterative-2106-2n-zn2:
-    csit-dpdk-perf-report-iterative-2101-2n-zn2:
-      - 11  # rls2101 NDRPDR iter env 6
+    csit-dpdk-perf-report-iterative-2106-2n-zn2:
+      - 2   # rls2106 NDRPDR iter env 7
 
   # 2n-clx
 
@@ -978,20 +966,21 @@
       - 22  # rls2101 NDRPDR iter env 6
 
   dpdk-2n-clx-curr-iter:
-    # TODO: Replace
-    # csit-dpdk-perf-report-iterative-2106-2n-clx:
-    csit-dpdk-perf-report-iterative-2101-2n-clx:
-      - 12  # rls2101 NDRPDR iter env 6
-      - 13  # rls2101 NDRPDR iter env 6
-      - 14  # rls2101 NDRPDR iter env 6
-      - 18  # rls2101 NDRPDR iter env 6
-      - 22  # rls2101 NDRPDR iter env 6
+    csit-dpdk-perf-report-iterative-2106-2n-clx:
+      - 11  # rls2106 NDRPDR iter env 7
+      - 2   # rls2106 NDRPDR iter env 7
+      - 3   # rls2106 NDRPDR iter env 7
+      - 4   # rls2106 NDRPDR iter env 7
+      - 5   # rls2106 NDRPDR iter env 7
+      - 6   # rls2106 NDRPDR iter env 7
+      - 7   # rls2106 NDRPDR iter env 7
+      - 8   # rls2106 NDRPDR iter env 7
+      - 9   # rls2106 NDRPDR iter env 7
+      - 10  # rls2106 NDRPDR iter env 7
 
   dpdk-2n-clx-curr-iter-best:
-    # TODO: Replace
-    # csit-dpdk-perf-report-iterative-2106-2n-clx:
-    csit-dpdk-perf-report-iterative-2101-2n-clx:
-      - 12  # rls2101 NDRPDR iter env 6
+    csit-dpdk-perf-report-iterative-2106-2n-clx:
+      - 2   # rls2106 NDRPDR iter env 7
 
   # 3n-tsh
 
@@ -1126,29 +1115,25 @@
       - 21  # rls2101 NDRPDR iter env 6
 
   dpdk-3n-tsh-curr-iter:
-    # TODO: Replace
-    # csit-dpdk-perf-report-iterative-2106-3n-tsh:
-    csit-dpdk-perf-report-iterative-2101-3n-tsh:
-      - 11  # rls2101 NDRPDR iter env 6
-      - 12  # rls2101 NDRPDR iter env 6
-      - 13  # rls2101 NDRPDR iter env 6
-      - 14  # rls2101 NDRPDR iter env 6
-      - 16  # rls2101 NDRPDR iter env 6
-      - 17  # rls2101 NDRPDR iter env 6
-      - 18  # rls2101 NDRPDR iter env 6
-      - 19  # rls2101 NDRPDR iter env 6
-      - 20  # rls2101 NDRPDR iter env 6
-      - 21  # rls2101 NDRPDR iter env 6
+    csit-dpdk-perf-report-iterative-2106-3n-tsh:
+      - 1   # rls2106 NDRPDR iter env 7
+      - 2   # rls2106 NDRPDR iter env 7
+      - 3   # rls2106 NDRPDR iter env 7
+      - 4   # rls2106 NDRPDR iter env 7
+      - 5   # rls2106 NDRPDR iter env 7
+      - 6   # rls2106 NDRPDR iter env 7
+      - 7   # rls2106 NDRPDR iter env 7
+#       - 8   # rls2106 NDRPDR iter env 7
+#       - 9   # rls2106 NDRPDR iter env 7
+#       - 10  # rls2106 NDRPDR iter env 7
 
   dpdk-3n-tsh-curr-iter-best:
-    # TODO: Replace
-    # csit-dpdk-perf-report-iterative-2106-3n-tsh:
-    csit-dpdk-perf-report-iterative-2101-3n-tsh:
-      - 21  # rls2101 NDRPDR iter env 6
+    csit-dpdk-perf-report-iterative-2106-3n-tsh:
+      - 3   # rls2106 NDRPDR iter env 7
 
   # 2n-tx2
 
-  vpp-3n-tsh-hist-iter-new-env:
+  vpp-2n-tx2-hist-iter-new-env:
     csit-vpp-perf-report-iterative-2101-2n-tx2:
       - 6   # rls2009 NDRPDR iter env 6
       - 7   # rls2009 NDRPDR iter env 6
@@ -1161,7 +1146,7 @@
       - 19  # rls2009 NDRPDR iter env 6
       - 20  # rls2009 NDRPDR iter env 6
 
-  vpp-3n-tsh-prev-iter-old-env:
+  vpp-2n-tx2-iter-old-env:
     csit-vpp-perf-report-iterative-2101-2n-tx2:
       - 22  # rls2101.rel NDRPDR iter env 6
       - 23  # rls2101.rel NDRPDR iter env 6
@@ -1249,26 +1234,26 @@
       - 13  # rls2101.rel NDRPDR cov env 6 2n-tx2-l2-03
       - 15  # rls2101.rel NDRPDR cov env 6 2n-tx2-l2-04
 
-  dpdk-2n-tx2-curr-iter:
-    # TODO: Replace
-    # csit-dpdk-perf-report-iterative-2106-2n-tx2:
-    csit-dpdk-perf-report-iterative-2101-2n-tx2:
-      - 4   # rls2101 NDRPDR iter env 6
-      - 6   # rls2101 NDRPDR iter env 6
-      - 7   # rls2101 NDRPDR iter env 6
-      - 8   # rls2101 NDRPDR iter env 6
-      - 9   # rls2101 NDRPDR iter env 6
-      - 10  # rls2101 NDRPDR iter env 6
-      - 11  # rls2101 NDRPDR iter env 6
-      - 12  # rls2101 NDRPDR iter env 6
-      - 13  # rls2101 NDRPDR iter env 6
-      - 14  # rls2101 NDRPDR iter env 6
-
-  dpdk-2n-tx2-curr-iter-best:
-    # TODO: Replace
-    # csit-dpdk-perf-report-iterative-2106-2n-tx2:
-    csit-dpdk-perf-report-iterative-2101-2n-tx2:
-      - 4   # rls2101 NDRPDR iter env 6
+#   dpdk-2n-tx2-curr-iter:
+#     # TODO: Replace
+#     # csit-dpdk-perf-report-iterative-2106-2n-tx2:
+#     csit-dpdk-perf-report-iterative-2101-2n-tx2:
+#       - 4   # rls2101 NDRPDR iter env 6
+#       - 6   # rls2101 NDRPDR iter env 6
+#       - 7   # rls2101 NDRPDR iter env 6
+#       - 8   # rls2101 NDRPDR iter env 6
+#       - 9   # rls2101 NDRPDR iter env 6
+#       - 10  # rls2101 NDRPDR iter env 6
+#       - 11  # rls2101 NDRPDR iter env 6
+#       - 12  # rls2101 NDRPDR iter env 6
+#       - 13  # rls2101 NDRPDR iter env 6
+#       - 14  # rls2101 NDRPDR iter env 6
+#
+#   dpdk-2n-tx2-curr-iter-best:
+#     # TODO: Replace
+#     # csit-dpdk-perf-report-iterative-2106-2n-tx2:
+#     csit-dpdk-perf-report-iterative-2101-2n-tx2:
+#       - 4   # rls2101 NDRPDR iter env 6
 
 
   # 3n-dnv
@@ -1567,6 +1552,7 @@
     intel-csit-vpp-perf-report-iterative-2101-2n-icx:
       - 2   # master NDRPDR iter env 6
       - 3   # master NDRPDR iter env 6
+      - 4   # master NDRPDR iter env 6
 
   vpp-2n-icx-curr-iter-best:
     intel-csit-vpp-perf-report-iterative-2101-2n-icx:
diff --git a/resources/tools/presentation/specifications/report/elements.yaml b/resources/tools/presentation/specifications/report/elements.yaml
index 6cf970fb05..7f03aedd1b 100644
--- a/resources/tools/presentation/specifications/report/elements.yaml
+++ b/resources/tools/presentation/specifications/report/elements.yaml
@@ -1416,9 +1416,9 @@
   filter: "'1T1C'"
   columns:
     - title: "2009.0-6"
-      data-set: "vpp-3n-tsh-hist-iter-new-env"
+      data-set: "vpp-2n-tx2-hist-iter-new-env"
     - title: "2101.0-6"
-      data-set: "vpp-3n-tsh-prev-iter-old-env"
+      data-set: "vpp-2n-tx2-prev-iter-old-env"
     - title: "2101.0-7"
       data-set: "vpp-2n-tx2-prev-iter-new-env"
     - title: "2106.0-7"
@@ -1447,9 +1447,9 @@
   filter: "'2T2C'"
   columns:
     - title: "2009.0-6"
-      data-set: "vpp-3n-tsh-hist-iter-new-env"
+      data-set: "vpp-2n-tx2-hist-iter-new-env"
     - title: "2101.0-6"
-      data-set: "vpp-3n-tsh-prev-iter-old-env"
+      data-set: "vpp-2n-tx2-prev-iter-old-env"
     - title: "2101.0-7"
       data-set: "vpp-2n-tx2-prev-iter-new-env"
     - title: "2106.0-7"
@@ -1478,9 +1478,9 @@
   filter: "'1T1C'"
   columns:
     - title: "2009.0-6"
-      data-set: "vpp-3n-tsh-hist-iter-new-env"
+      data-set: "vpp-2n-tx2-hist-iter-new-env"
     - title: "2101.0-6"
-      data-set: "vpp-3n-tsh-prev-iter-old-env"
+      data-set: "vpp-2n-tx2-prev-iter-old-env"
     - title: "2101.0-7"
       data-set: "vpp-2n-tx2-prev-iter-new-env"
     - title: "2106.0-7"
@@ -1509,9 +1509,9 @@
   filter: "'2T2C'"
   columns:
     - title: "2009.0-6"
-      data-set: "vpp-3n-tsh-hist-iter-new-env"
+      data-set: "vpp-2n-tx2-hist-iter-new-env"
     - title: "2101.0-6"
-      data-set: "vpp-3n-tsh-prev-iter-old-env"
+      data-set: "vpp-2n-tx2-prev-iter-old-env"
     - title: "2101.0-7"
       data-set: "vpp-2n-tx2-prev-iter-new-env"
     - title: "2106.0-7"
@@ -4619,22 +4619,22 @@
   - "parent"
   - "msg"
 
-# Detailed Test Results - DPDK Performance Results 2n-tx2
-- type: "table"
-  title: "Detailed Test Results - DPDK Performance Results 2n-tx2"
-  algorithm: "table_merged_details"
-  output-file: "{DIR[DTR,PERF,DPDK,2N,TX2]}/dpdk_performance_results_2n_tx2"
-  columns:
-    - title: " |prein| Test Name |preout| "
-      data: "data name"
-    - title: " |prein| Throughput: |br| 1.  Mpps       Gbps (NDR) |br| 2.  Mpps       Gbps (PDR) |br| |br| One-Way Latency Percentiles in uSec at %PDR load, |br| one set per each direction: |br| 3.  P50  P90  P99       P50  P90  P99 (10% PDR) |br| 4.  P50  P90  P99       P50  P90  P99 (50% PDR) |br| 5.  P50  P90  P99       P50  P90  P99 (90% PDR) |preout| "
-      data: "data msg"
-  data: "dpdk-2n-tx2-curr-iter-best"
-  filter: "all"
-  parameters:
-  - "name"
-  - "parent"
-  - "msg"
+# # Detailed Test Results - DPDK Performance Results 2n-tx2
+# - type: "table"
+#   title: "Detailed Test Results - DPDK Performance Results 2n-tx2"
+#   algorithm: "table_merged_details"
+#   output-file: "{DIR[DTR,PERF,DPDK,2N,TX2]}/dpdk_performance_results_2n_tx2"
+#   columns:
+#     - title: " |prein| Test Name |preout| "
+#       data: "data name"
+#     - title: " |prein| Throughput: |br| 1.  Mpps       Gbps (NDR) |br| 2.  Mpps       Gbps (PDR) |br| |br| One-Way Latency Percentiles in uSec at %PDR load, |br| one set per each direction: |br| 3.  P50  P90  P99       P50  P90  P99 (10% PDR) |br| 4.  P50  P90  P99       P50  P90  P99 (50% PDR) |br| 5.  P50  P90  P99       P50  P90  P99 (90% PDR) |preout| "
+#       data: "data msg"
+#   data: "dpdk-2n-tx2-curr-iter-best"
+#   filter: "all"
+#   parameters:
+#   - "name"
+#   - "parent"
+#   - "msg"
 
 ################################################################################
 ###                                F I L E S                                 ###
@@ -5060,15 +5060,15 @@
   filter: "all"
   data-start-level: 4
 
-# DPDK Performance Results 2n-tx2
-- type: "file"
-  title: "DPDK Performance Results 2n-tx2"
-  algorithm: "file_test_results"
-  output-file: "{DIR[DTR,PERF,DPDK,2N,TX2]}"
-  dir-tables: "{DIR[DTR,PERF,DPDK,2N,TX2]}"
-  data: "dpdk-2n-tx2-curr-iter-best"
-  filter: "all"
-  data-start-level: 4
+# # DPDK Performance Results 2n-tx2
+# - type: "file"
+#   title: "DPDK Performance Results 2n-tx2"
+#   algorithm: "file_test_results"
+#   output-file: "{DIR[DTR,PERF,DPDK,2N,TX2]}"
+#   dir-tables: "{DIR[DTR,PERF,DPDK,2N,TX2]}"
+#   data: "dpdk-2n-tx2-curr-iter-best"
+#   filter: "all"
+#   data-start-level: 4
 
 ################################################################################
 ###                                P L O T S                                 ###
@@ -8717,18 +8717,18 @@
 
 # 2n-tx2-xl710
 
-- type: "plot"
-  title: "DPDK Throughput: 2n-tx2-xl710-64b-{core}-base-{test_type}"
-  algorithm: "plot_ndrpdr_box_name"
-  output-file: "{DIR[STATIC,DPDK]}/2n-tx2-xl710-64b-{core}-base-{test_type}"
-  data: "dpdk-2n-tx2-curr-iter"
-  core: ["1t1c", "2t2c"]
-  include:
-    - "tests.dpdk.perf.2N1L-40ge2p1xl710-eth-l2xcbase-testpmd-ndrpdr.64b-{core}-eth-l2xcbase-testpmd-ndrpdr"
-    - "tests.dpdk.perf.2N1L-40ge2p1xl710-ethip4-ip4base-l3fwd-ndrpdr.64b-{core}-ethip4-ip4base-l3fwd-ndrpdr"
-  layout:
-    title: "2n-tx2-xl710-64b-{core}-base-{test_type}"
-    layout: "plot-throughput"
+# - type: "plot"
+#   title: "DPDK Throughput: 2n-tx2-xl710-64b-{core}-base-{test_type}"
+#   algorithm: "plot_ndrpdr_box_name"
+#   output-file: "{DIR[STATIC,DPDK]}/2n-tx2-xl710-64b-{core}-base-{test_type}"
+#   data: "dpdk-2n-tx2-curr-iter"
+#   core: ["1t1c", "2t2c"]
+#   include:
+#     - "tests.dpdk.perf.2N1L-40ge2p1xl710-eth-l2xcbase-testpmd-ndrpdr.64b-{core}-eth-l2xcbase-testpmd-ndrpdr"
+#     - "tests.dpdk.perf.2N1L-40ge2p1xl710-ethip4-ip4base-l3fwd-ndrpdr.64b-{core}-ethip4-ip4base-l3fwd-ndrpdr"
+#   layout:
+#     title: "2n-tx2-xl710-64b-{core}-base-{test_type}"
+#     layout: "plot-throughput"
 
 ################################################################################
 ###   2n-clx                                                                 ###
@@ -11975,16 +11975,16 @@
   layout:
     layout: "plot-hdrh-latency-percentile-x-log"
 
-- type: "plot"
-  title: "Latency by percentile: DPDK 2n-tx2"
-  algorithm: "plot_hdrh_lat_by_percentile_x_log"
-  output-file: "{DIR[STATIC,DPDK]}/hdrh-lat-percentile-2n-tx2"
-  output-file-links: "{DIR[LAT,DPDK]}/2n-tx2.rst"
-  target-links: "../../_static/dpdk"
-  data: "dpdk-2n-tx2-curr-iter-best"
-  filter: "'1T1C' and 'NIC_Intel-XL710'"
-  layout:
-    layout: "plot-hdrh-latency-percentile-x-log"
+# - type: "plot"
+#   title: "Latency by percentile: DPDK 2n-tx2"
+#   algorithm: "plot_hdrh_lat_by_percentile_x_log"
+#   output-file: "{DIR[STATIC,DPDK]}/hdrh-lat-percentile-2n-tx2"
+#   output-file-links: "{DIR[LAT,DPDK]}/2n-tx2.rst"
+#   target-links: "../../_static/dpdk"
+#   data: "dpdk-2n-tx2-curr-iter-best"
+#   filter: "'1T1C' and 'NIC_Intel-XL710'"
+#   layout:
+#     layout: "plot-hdrh-latency-percentile-x-log"
 
 ###############################################################################