Report: Add af-xdp data

Change-Id: I8beef5f0072e0c52476a8053f26640c537422a63
Signed-off-by: Tibor Frank <tifrank@cisco.com>
(cherry picked from commit e8b47c3df7529a6c087fb7639684f180dad8c03d)

2 files changed, 21 insertions, 50 deletions

diff --git a/resources/tools/presentation/specifications/report/data_sets.yaml b/resources/tools/presentation/specifications/report/data_sets.yaml
index e7a3b76ace..c5d10c0db9 100644
--- a/resources/tools/presentation/specifications/report/data_sets.yaml
+++ b/resources/tools/presentation/specifications/report/data_sets.yaml
@@ -251,19 +251,19 @@
       - 71  # rls2106.rel NDRPDR iter env 7
       - 89  # rls2106.rel NDRPDR AF-XDP iter env 7
       - 90  # rls2106.rel NDRPDR AF-XDP iter env 7
+      - 91  # rls2106.rel NDRPDR AF-XDP iter env 7
       - 92  # rls2106.rel NDRPDR AF-XDP iter env 7
       - 93  # rls2106.rel NDRPDR AF-XDP iter env 7
+      - 95  # rls2106.rel NDRPDR AF-XDP iter env 7
+      - 96  # rls2106.rel NDRPDR AF-XDP iter env 7
       - 97  # rls2106.rel NDRPDR AF-XDP iter env 7
       - 98  # rls2106.rel NDRPDR AF-XDP iter env 7
+      - 99  # rls2106.rel NDRPDR AF-XDP iter env 7
 
   vpp-2n-skx-curr-iter-best:
     csit-vpp-perf-report-iterative-2106-2n-skx:
       - 89  # rls2106.rel NDRPDR AF-XDP iter env 7
 
-  vpp-2n-skx-curr-iter-af-xdp:
-    csit-vpp-perf-report-iterative-2106-2n-skx:
-      - 69  # rls2106.rel NDRPDR iter env 7
-
   vpp-2n-skx-hist-iter-mrr-new-env:
     csit-vpp-perf-report-iterative-2101-2n-skx:
       - 21  # rls2009 MRR iter env 6
@@ -472,16 +472,21 @@
       - 45  # rls2106.rel NDRPDR iter env 7
       - 46  # rls2106.rel NDRPDR iter env 7
       - 47  # rls2106.rel NDRPDR iter env 7
+      - 49  # rls2106.rel NDRPDR AF-XDP iter env 7
+      - 50  # rls2106.rel NDRPDR AF-XDP iter env 7
+      - 51  # rls2106.rel NDRPDR AF-XDP iter env 7
+      - 52  # rls2106.rel NDRPDR AF-XDP iter env 7
+      - 53  # rls2106.rel NDRPDR AF-XDP iter env 7
+      - 54  # rls2106.rel NDRPDR AF-XDP iter env 7
       - 55  # rls2106.rel NDRPDR AF-XDP iter env 7
+      - 56  # rls2106.rel NDRPDR AF-XDP iter env 7
+      - 57  # rls2106.rel NDRPDR AF-XDP iter env 7
+      - 58  # rls2106.rel NDRPDR AF-XDP iter env 7
 
   vpp-2n-zn2-curr-iter-best:
     csit-vpp-perf-report-iterative-2106-2n-zn2:
       - 39  # rls2106.rel NDRPDR iter env 7
 
-  vpp-2n-zn2-curr-iter-af-xdp:
-    csit-vpp-perf-report-iterative-2106-2n-zn2:
-      - 55  # rls2106.rel NDRPDR AF-XDP iter env 7
-
   vpp-2n-zn2-curr-iter-gso:
     csit-vpp-perf-report-iterative-2106-2n-zn2:
       - 37  # rls2106.rel MRR GSO iter env 7
@@ -660,8 +665,11 @@
       - 124 # rls2106.rel NDRPDR AF-XDP iter env 7
       - 125 # rls2106.rel NDRPDR AF-XDP iter env 7
       - 126 # rls2106.rel NDRPDR AF-XDP iter env 7
+      - 127 # rls2106.rel NDRPDR AF-XDP iter env 7
+      - 128 # rls2106.rel NDRPDR AF-XDP iter env 7
       - 129 # rls2106.rel NDRPDR AF-XDP iter env 7
       - 130 # rls2106.rel NDRPDR AF-XDP iter env 7
+      - 131 # rls2106.rel NDRPDR AF-XDP iter env 7
       - 132 # rls2106.rel NDRPDR AF-XDP iter env 7
       - 133 # rls2106.rel NDRPDR AF-XDP iter env 7
 
@@ -669,10 +677,6 @@
     csit-vpp-perf-report-iterative-2106-2n-clx:
       - 85  # rls2106.rel NDRPDR iter env 7
 
-  vpp-2n-clx-curr-iter-af-xdp:
-    csit-vpp-perf-report-iterative-2106-2n-clx:
-      - 126 # rls2106.rel NDRPDR AF-XDP iter env 7
-
   vpp-2n-clx-hist-iter-mrr-new-env:
     csit-vpp-perf-report-iterative-2101-2n-clx:
       - 15  # rls2009 MRR iter env 6
diff --git a/resources/tools/presentation/specifications/report/elements.yaml b/resources/tools/presentation/specifications/report/elements.yaml
index 8b7bd368f2..617828b917 100644
--- a/resources/tools/presentation/specifications/report/elements.yaml
+++ b/resources/tools/presentation/specifications/report/elements.yaml
@@ -6156,7 +6156,7 @@
     layout: "plot-throughput"
 
 - type: "plot"
-  title: "Throughput: 2n-dnv-x553-64b-{core}-ip4routing-base-scale-[ixgbe,af_xdp]-{test_type}"
+  title: "Throughput: 2n-dnv-x553-64b-{core}-ip4routing-base-scale-ixgbe-{test_type}"
   algorithm: "plot_ndrpdr_box_name"
   output-file: "{DIR[STATIC,VPP]}/2n-dnv-x553-64b-{core}-ip4routing-base-scale-[ixgbe,af_xdp]-{test_type}"
   data: "vpp-2n-dnv-curr-iter"
@@ -6169,7 +6169,7 @@
     - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X553-af-xdp-Ethip4-Ip4Base-Ndrpdr.64B-{core}-af-xdp-ethip4-ip4base-ndrpdr"
     - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X553-af-xdp-Ethip4-Ip4Scale20K-rnd-Ndrpdr.64B-{core}-af-xdp-ethip4-ip4scale20k-rnd-ndrpdr"
   layout:
-    title: "2n-dnv-x553-64b-{core}-ip4routing-base-scale-[ixgbe,af_xdp]-{test_type}"
+    title: "2n-dnv-x553-64b-{core}-ip4routing-base-scale-ixgbe-{test_type}"
     layout: "plot-throughput"
 
 - type: "plot"
@@ -6368,7 +6368,7 @@
 - type: "plot"
   title: "Throughput: 2n-dnv-x553-78b-{core}-ip6routing-base-scale-[ixgbe,af_xdp]-{test_type}"
   algorithm: "plot_ndrpdr_box_name"
-  output-file: "{DIR[STATIC,VPP]}/2n-dnv-x553-78b-{core}-ip6routing-base-scale-ixgbe-{test_type}"
+  output-file: "{DIR[STATIC,VPP]}/2n-dnv-x553-78b-{core}-ip6routing-base-scale-[ixgbe,af_xdp]-{test_type}"
   data: "vpp-2n-dnv-curr-iter"
   core: ["1t1c", ]
   include:
@@ -8116,7 +8116,7 @@
 #    layout: "plot-throughput-speedup-analysis"
 
 - type: "plot"
-  title: "Speedup: 2n-dnv-x553-64b-ip4routing-base-scale-[ixgbe,af_xdp]-{test_type}-tsa"
+  title: "Speedup: 2n-dnv-x553-64b-ip4routing-base-scale-ixgbe-{test_type}-tsa"
   algorithm: "plot_tsa_name"
   output-file: "{DIR[STATIC,VPP]}/2n-dnv-x553-64b-ip4routing-base-scale-[ixgbe,af_xdp]-{test_type}-tsa"
   data: "vpp-2n-dnv-curr-iter"
@@ -8128,7 +8128,7 @@
     - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X553-af-xdp-Ethip4-Ip4Scale20K-Ndrpdr.64B-.t.c-af-xdp-ethip4-ip4scale20k-ndrpdr"
     - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X553-af-xdp-Ethip4-Ip4Scale20K-rnd-Ndrpdr.64B-.t.c-af-xdp-ethip4-ip4scale20k-rnd-ndrpdr"
   layout:
-    title: "2n-dnv-x553-64b-ip4routing-base-scale-[ixgbe,af_xdp]-{test_type}"
+    title: "2n-dnv-x553-64b-ip4routing-base-scale-ixgbe-{test_type}"
     layout: "plot-throughput-speedup-analysis"
 
 - type: "plot"
@@ -11395,17 +11395,6 @@
     layout: "plot-hdrh-latency-percentile-x-log"
 
 - type: "plot"
-  title: "Latency by percentile: 2n-skx"
-  algorithm: "plot_hdrh_lat_by_percentile_x_log"
-  output-file: "{DIR[STATIC,VPP]}/hdrh-lat-percentile-2n-skx"
-  output-file-links: "{DIR[LAT,VPP]}/2n_skx.rst"
-  target-links: "../../_static/vpp"
-  data: "vpp-2n-skx-curr-iter-af-xdp"
-  filter: "'2T1C' and 'NIC_Intel-XXV710'"
-  layout:
-    layout: "plot-hdrh-latency-percentile-x-log"
-
-- type: "plot"
   title: "Latency by percentile: 2n-zn2"
   algorithm: "plot_hdrh_lat_by_percentile_x_log"
   output-file: "{DIR[STATIC,VPP]}/hdrh-lat-percentile-2n-zn2"
@@ -11417,17 +11406,6 @@
     layout: "plot-hdrh-latency-percentile-x-log"
 
 - type: "plot"
-  title: "Latency by percentile: 2n-zn2"
-  algorithm: "plot_hdrh_lat_by_percentile_x_log"
-  output-file: "{DIR[STATIC,VPP]}/hdrh-lat-percentile-2n-zn2"
-  output-file-links: "{DIR[LAT,VPP]}/2n_zn2.rst"
-  target-links: "../../_static/vpp"
-  data: "vpp-2n-zn2-curr-iter-af-xdp"
-  filter: "'2T1C' and 'NIC_Intel-XXV710'"
-  layout:
-    layout: "plot-hdrh-latency-percentile-x-log"
-
-- type: "plot"
   title: "Latency by percentile: 3n-skx"
   algorithm: "plot_hdrh_lat_by_percentile_x_log"
   output-file: "{DIR[STATIC,VPP]}/hdrh-lat-percentile-3n-skx"
@@ -11455,17 +11433,6 @@
   output-file: "{DIR[STATIC,VPP]}/hdrh-lat-percentile-2n-clx"
   output-file-links: "{DIR[LAT,VPP]}/2n_clx.rst"
   target-links: "../../_static/vpp"
-  data: "vpp-2n-clx-curr-iter-af-xdp"
-  filter: "'2T1C' and 'NIC_Intel-XXV710'"
-  layout:
-    layout: "plot-hdrh-latency-percentile-x-log"
-
-- type: "plot"
-  title: "Latency by percentile: 2n-clx"
-  algorithm: "plot_hdrh_lat_by_percentile_x_log"
-  output-file: "{DIR[STATIC,VPP]}/hdrh-lat-percentile-2n-clx"
-  output-file-links: "{DIR[LAT,VPP]}/2n_clx.rst"
-  target-links: "../../_static/vpp"
   data: "vpp-2n-clx-curr-iter-best"
   filter: "'2T1C' and 'NIC_Mellanox-CX556A'"
   layout: