Report: Add 2n-icx

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

4 files changed, 530 insertions, 25 deletions

diff --git a/resources/tools/presentation/conf.py b/resources/tools/presentation/conf.py
index 1b8c1f9f29..ac29fe43a8 100644
--- a/resources/tools/presentation/conf.py
+++ b/resources/tools/presentation/conf.py
@@ -99,6 +99,7 @@ rst_epilog = u"""
 .. _FD.io test executor vpp performance job 3n-dnv: https://jenkins.fd.io/job/csit-vpp-perf-report-iterative-{srelease}-3n-dnv
 .. _FD.io test executor vpp performance job 2n-dnv: https://jenkins.fd.io/job/csit-vpp-perf-report-iterative-{srelease}-2n-dnv
 .. _FD.io test executor vpp performance job 2n-clx: https://jenkins.fd.io/job/csit-vpp-perf-report-iterative-{srelease}-2n-clx
+.. _FD.io test executor vpp performance job 2n-icx: https://jenkins.fd.io/job/csit-vpp-perf-report-iterative-{srelease}-2n-icx
 .. _FD.io test executor vpp performance job 2n-zn2: https://jenkins.fd.io/job/csit-vpp-perf-report-iterative-{srelease}-2n-zn2
 .. _FD.io test executor vpp device jobs using Ubuntu: https://jenkins.fd.io/view/csit/job/csit-vpp-device-{srelease}-ubuntu1804-1n-skx
 .. _FD.io VPP compile job: https://jenkins.fd.io/view/vpp/job/vpp-merge-{srelease}-ubuntu1804-x86_64/
diff --git a/resources/tools/presentation/generator_plots.py b/resources/tools/presentation/generator_plots.py
index 1bfbda1a1b..965951a41e 100644
--- a/resources/tools/presentation/generator_plots.py
+++ b/resources/tools/presentation/generator_plots.py
@@ -1046,6 +1046,8 @@ def plot_tsa_name(plot, input_data):
                 limit = plot[u"limits"][u"nic"][u"x553"]
             elif u"cx556a" in test_name:
                 limit = plot[u"limits"][u"nic"][u"cx556a"]
+            elif u"e810cq" in test_name:
+                limit = plot[u"limits"][u"nic"][u"e810cq"]
             else:
                 limit = 0
             if limit > nic_limit:
diff --git a/resources/tools/presentation/input_data_files.py b/resources/tools/presentation/input_data_files.py
index d4cc8c64e6..63f91972e5 100644
--- a/resources/tools/presentation/input_data_files.py
+++ b/resources/tools/presentation/input_data_files.py
@@ -282,25 +282,25 @@ def download_and_unzip_data_file(spec, job, build, pid):
                         xml_file.write(file_content)
                 break
 
-    if not success:
-        # Try to download .zip from jenkins.fd.io
-        file_name = spec.input[u"zip-file-name"]
-        download_path = spec.input[u"zip-download-path"]
-        if job.startswith(u"csit-"):
-            url = spec.environment[u"urls"][u"URL[JENKINS,CSIT]"]
-        else:
-            raise PresentationError(f"No url defined for the job {job}.")
-
-        full_name = download_path.format(
-            job=job, build=build[u"build"], filename=file_name
-        )
-        url = u"{0}/{1}".format(url, full_name)
-        new_name = join(
-            spec.environment[u"paths"][u"DIR[WORKING,DATA]"],
-            f"{job}{SEPARATOR}{build[u'build']}{SEPARATOR}{file_name}"
-        )
-        logging.info(f"Downloading {url}")
-        success, downloaded_name = _download_file(url, new_name)
+    # if not success:
+    #     # Try to download .zip from jenkins.fd.io
+    #     file_name = spec.input[u"zip-file-name"]
+    #     download_path = spec.input[u"zip-download-path"]
+    #     if job.startswith(u"csit-"):
+    #         url = spec.environment[u"urls"][u"URL[JENKINS,CSIT]"]
+    #     else:
+    #         raise PresentationError(f"No url defined for the job {job}.")
+    #
+    #     full_name = download_path.format(
+    #         job=job, build=build[u"build"], filename=file_name
+    #     )
+    #     url = u"{0}/{1}".format(url, full_name)
+    #     new_name = join(
+    #         spec.environment[u"paths"][u"DIR[WORKING,DATA]"],
+    #         f"{job}{SEPARATOR}{build[u'build']}{SEPARATOR}{file_name}"
+    #     )
+    #     logging.info(f"Downloading {url}")
+    #     success, downloaded_name = _download_file(url, new_name)
 
     if success and downloaded_name.endswith(u".zip"):
         if not is_zipfile(downloaded_name):
diff --git a/resources/tools/presentation/specification.yaml b/resources/tools/presentation/specification.yaml
index cdc3158c0e..276bd7b760 100644
--- a/resources/tools/presentation/specification.yaml
+++ b/resources/tools/presentation/specification.yaml
@@ -41,6 +41,7 @@
     DIR[DTR,PERF,VPP,2N,SKX]: "{DIR[DTR]}/vpp_performance_results_2n_skx"
     DIR[DTR,PERF,VPP,2N,ZN2]: "{DIR[DTR]}/vpp_performance_results_2n_zn2"
     DIR[DTR,PERF,VPP,2N,CLX]: "{DIR[DTR]}/vpp_performance_results_2n_clx"
+    DIR[DTR,PERF,VPP,2N,ICX]: "{DIR[DTR]}/vpp_performance_results_2n_icx"
     DIR[DTR,PERF,VPP,3N,TSH]: "{DIR[DTR]}/vpp_performance_results_3n_tsh"
     DIR[DTR,PERF,VPP,2N,TX2]: "{DIR[DTR]}/vpp_performance_results_2n_tx2"
     DIR[DTR,PERF,VPP,3N,DNV]: "{DIR[DTR]}/vpp_performance_results_3n_dnv"
@@ -51,6 +52,7 @@
     DIR[DTR,MRR,VPP,2N,SKX]: "{DIR[DTR]}/vpp_mrr_results_2n_skx"
     DIR[DTR,MRR,VPP,2N,ZN2]: "{DIR[DTR]}/vpp_mrr_results_2n_zn2"
     DIR[DTR,MRR,VPP,2N,CLX]: "{DIR[DTR]}/vpp_mrr_results_2n_clx"
+    DIR[DTR,MRR,VPP,2N,ICX]: "{DIR[DTR]}/vpp_mrr_results_2n_icx"
     DIR[DTR,MRR,VPP,3N,TSH]: "{DIR[DTR]}/vpp_mrr_results_3n_tsh"
     DIR[DTR,MRR,VPP,2N,TX2]: "{DIR[DTR]}/vpp_mrr_results_2n_tx2"
     DIR[DTR,MRR,VPP,3N,DNV]: "{DIR[DTR]}/vpp_mrr_results_3n_dnv"
@@ -65,6 +67,7 @@
     DIR[DTC,PERF,VPP,2N,SKX]: "{DIR[DTC]}/vpp_performance_configuration_2n_skx"
     DIR[DTC,PERF,VPP,2N,ZN2]: "{DIR[DTC]}/vpp_performance_configuration_2n_zn2"
     DIR[DTC,PERF,VPP,2N,CLX]: "{DIR[DTC]}/vpp_performance_configuration_2n_clx"
+    DIR[DTC,PERF,VPP,2N,ICX]: "{DIR[DTC]}/vpp_performance_configuration_2n_icx"
     DIR[DTC,PERF,VPP,3N,TSH]: "{DIR[DTC]}/vpp_performance_configuration_3n_tsh"
     DIR[DTC,PERF,VPP,2N,TX2]: "{DIR[DTC]}/vpp_performance_configuration_2n_tx2"
     DIR[DTC,PERF,VPP,3N,DNV]: "{DIR[DTC]}/vpp_performance_configuration_3n_dnv"
@@ -75,6 +78,7 @@
     DIR[DTC,MRR,VPP,2N,SKX]: "{DIR[DTC]}/vpp_mrr_configuration_2n_skx"
     DIR[DTC,MRR,VPP,2N,ZN2]: "{DIR[DTC]}/vpp_mrr_configuration_2n_zn2"
     DIR[DTC,MRR,VPP,2N,CLX]: "{DIR[DTC]}/vpp_mrr_configuration_2n_clx"
+    DIR[DTC,MRR,VPP,2N,ICX]: "{DIR[DTC]}/vpp_mrr_configuration_2n_icx"
     DIR[DTC,MRR,VPP,3N,TSH]: "{DIR[DTC]}/vpp_mrr_configuration_3n_tsh"
     DIR[DTC,MRR,VPP,2N,TX2]: "{DIR[DTC]}/vpp_mrr_configuration_2n_tx2"
     DIR[DTC,MRR,VPP,3N,DNV]: "{DIR[DTC]}/vpp_mrr_configuration_3n_dnv"
@@ -89,6 +93,7 @@
     DIR[DTO,PERF,VPP,2N,SKX]: "{DIR[DTO]}/vpp_performance_operational_data_2n_skx"
     DIR[DTO,PERF,VPP,2N,ZN2]: "{DIR[DTO]}/vpp_performance_operational_data_2n_zn2"
     DIR[DTO,PERF,VPP,2N,CLX]: "{DIR[DTO]}/vpp_performance_operational_data_2n_clx"
+    DIR[DTO,PERF,VPP,2N,ICX]: "{DIR[DTO]}/vpp_performance_operational_data_2n_icx"
     DIR[DTO,PERF,VPP,3N,TSH]: "{DIR[DTO]}/vpp_performance_operational_data_3n_tsh"
     DIR[DTO,PERF,VPP,2N,TX2]: "{DIR[DTO]}/vpp_performance_operational_data_2n_tx2"
     DIR[DTO,PERF,VPP,3N,DNV]: "{DIR[DTO]}/vpp_performance_operational_data_3n_dnv"
@@ -144,6 +149,7 @@
       xxv710: 35800000
       xl710: 35800000
       cx556a: 148809523.81
+      e810cq: 148809523.81
 
     link:
       10ge: 14880952.38
@@ -569,6 +575,16 @@
       csit-dpdk-perf-report-iterative-2101-2n-clx:
         - 12  # rls2101 NDRPDR iter env 6
 
+    # 2n-icx
+
+    plot-vpp-throughput-lat-tsa-2n-icx:
+      intel-csit-vpp-perf-report-iterative-2101-2n-icx:
+        - 1   # master NDRPDR iter env 6
+
+    plot-vpp-hdrh-lat-2n-icx:
+      intel-csit-vpp-perf-report-iterative-2101-2n-icx:
+        - 1   # master NDRPDR iter env 6
+
     # 3n-tsh
 
     plot-vpp-throughput-lat-tsa-3n-tsh:
@@ -901,6 +917,10 @@
         - 17  # rls2101.rel NDRPDR cov env 6 2n-clx-vhost-01
         - 18  # rls2101.rel NDRPDR cov env 6 2n-clx-vts-00
 
+    vpp-perf-results-2n-icx:
+      intel-csit-vpp-perf-report-iterative-2101-2n-icx:
+        - 1   # master NDRPDR iter env 6
+
     vpp-perf-results-3n-tsh:
       csit-vpp-perf-report-coverage-2101-3n-tsh:
         - 1   # rls2101.rel NDRPDR cov env 6 3n-tsh-ip4-00
@@ -980,6 +1000,10 @@
       csit-vpp-perf-report-iterative-2101-2n-clx:
         - 53  # rls2101.rel MRR iter env 6
 
+    vpp-mrr-results-2n-icx:
+      intel-csit-vpp-perf-report-iterative-2101-2n-icx:
+        - 1   # master NDRPDR iter env 6
+
     vpp-mrr-results-3n-tsh:
       csit-vpp-perf-report-iterative-2101-3n-tsh:
         - 22  # rls2101.rel MRR iter env 6
@@ -2079,6 +2103,22 @@
         - 131 # rls2101.rel NDRPDR iter MLX env 6
         - 132 # rls2101.rel NDRPDR iter MLX env 6
 
+    vpp-compare-testbeds-clx-icx-ref:
+      csit-vpp-perf-report-iterative-2101-2n-clx:
+        - 54  # rls2101.rel NDRPDR iter env 6
+        - 59  # rls2101.rel NDRPDR iter env 6
+        - 60  # rls2101.rel NDRPDR iter env 6
+        - 63  # rls2101.rel NDRPDR iter env 6
+        - 66  # rls2101.rel NDRPDR iter env 6
+        - 68  # rls2101.rel NDRPDR iter env 6
+        - 73  # rls2101.rel NDRPDR iter env 6
+        - 75  # rls2101.rel NDRPDR iter env 6
+        - 86  # rls2101.rel NDRPDR iter env 6
+        - 90  # rls2101.rel NDRPDR iter env 6
+    vpp-compare-testbeds-clx-icx-cmp:
+      intel-csit-vpp-perf-report-iterative-2101-2n-icx:
+        - 1   # master NDRPDR iter env 6
+
     vpp-compare-testbeds-hsw-clx-ref:
       csit-vpp-perf-report-iterative-2101-3n-hsw:
         - 64  # rls2101.rel NDRPDR iter env 6
@@ -2164,6 +2204,13 @@
       csit-vpp-perf-report-iterative-2101-2n-clx:
         - 53  # rls2101.rel MRR iter env 6
 
+    vpp-compare-testbeds-mrr-clx-icx-ref:
+      csit-vpp-perf-report-iterative-2101-2n-clx:
+        - 53  # rls2101.rel MRR iter env 6
+    vpp-compare-testbeds-mrr-clx-icx-cmp:
+      intel-csit-vpp-perf-report-iterative-2101-2n-icx:
+        - 1   # master NDRPDR iter env 6
+
     dpdk-compare-testbeds-ref:
       csit-dpdk-perf-report-iterative-2101-3n-hsw:
         - 11  # rls2101 NDRPDR iter env 6
@@ -3152,8 +3199,8 @@
       - ".gz"
       - ".zip"
     download-path:
-      - "{job}/{build}/{filename}"
       - "{job}/{build}/archives/{filename}"
+      - "{job}/{build}/{filename}"
     extract: "output.xml"
 
     zip-file-name: "robot-plugin.zip"
@@ -3643,6 +3690,9 @@
       - 17  # rls2101.rel NDRPDR cov env 6 2n-clx-vhost-01
       - 18  # rls2101.rel NDRPDR cov env 6 2n-clx-vts-00
 
+    intel-csit-vpp-perf-report-iterative-2101-2n-icx:
+      - 1   # master NDRPDR iter env 6
+
     csit-vpp-perf-report-iterative-2009-2n-zn2:
       - 15  # rls2009 MRR iter env 5
       - 17  # rls2009 NDRPDR iter env 5
@@ -6063,6 +6113,98 @@
     - "3n-hsw xl710, 2n-clx xxv710 - testbeds and NICs tested."
     - "Diff - difference between 3n-hsw xl710 and 2n-clx xxv710 testbeds."
 
+# VPP Comparison Across Testbeds 2n-clx to 2n-icx 1c ndr
+- type: "table"
+  title: "VPP Comparison Across Testbeds 2n-clx to 2n-icx 1c ndr"
+  algorithm: "table_comparison"
+  output-file: "{DIR[STATIC,VPP]}/performance-compare-testbeds-2n-clx-2n-icx-1c-ndr"
+  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
+  filter: "('NIC_Intel-XXV710' or 'NIC_Intel-E810CQ') and 'NDRPDR' and '1C'"
+  columns:
+    - title: "2n-clx xxv710"
+      data-set: "vpp-compare-testbeds-clx-icx-ref"
+      tag: "NIC_Intel-XXV710"
+    - title: "2n-icx e810cq"
+      data-set: "vpp-compare-testbeds-clx-icx-cmp"
+      tag: "NIC_Intel-E810CQ"
+  comparisons:
+    - title: "Diff"
+      reference: 1
+      compare: 2
+  legend:
+    - ""
+    - "2n-clx xxv710, 2n-icx e810cq - testbeds and NICs tested."
+    - "Diff - difference between 2n-clx xxv710 and 2n-icx e810cq testbeds."
+
+# VPP Comparison Across Testbeds 2n-clx to 2n-icx 2c ndr
+- type: "table"
+  title: "VPP Comparison Across Testbeds 2n-clx to 2n-icx 2c ndr"
+  algorithm: "table_comparison"
+  output-file: "{DIR[STATIC,VPP]}/performance-compare-testbeds-2n-clx-2n-icx-2c-ndr"
+  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
+  filter: "('NIC_Intel-XXV710' or 'NIC_Intel-E810CQ') and 'NDRPDR' and '2C'"
+  columns:
+    - title: "2n-clx xxv710"
+      data-set: "vpp-compare-testbeds-clx-icx-ref"
+      tag: "NIC_Intel-XXV710"
+    - title: "2n-icx e810cq"
+      data-set: "vpp-compare-testbeds-clx-icx-cmp"
+      tag: "NIC_Intel-E810CQ"
+  comparisons:
+    - title: "Diff"
+      reference: 1
+      compare: 2
+  legend:
+    - ""
+    - "2n-clx xxv710, 2n-icx e810cq - testbeds and NICs tested."
+    - "Diff - difference between 2n-clx xxv710 and 2n-icx e810cq testbeds."
+
+# VPP Comparison Across Testbeds 2n-clx to 2n-icx 1c pdr
+- type: "table"
+  title: "VPP Comparison Across Testbeds 2n-clx to 2n-icx 1c pdr"
+  algorithm: "table_comparison"
+  output-file: "{DIR[STATIC,VPP]}/performance-compare-testbeds-2n-clx-2n-icx-1c-pdr"
+  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
+  filter: "('NIC_Intel-XXV710' or 'NIC_Intel-E810CQ') and 'NDRPDR' and '1C'"
+  columns:
+    - title: "2n-clx xxv710"
+      data-set: "vpp-compare-testbeds-clx-icx-ref"
+      tag: "NIC_Intel-XXV710"
+    - title: "2n-icx e810cq"
+      data-set: "vpp-compare-testbeds-clx-icx-cmp"
+      tag: "NIC_Intel-E810CQ"
+  comparisons:
+    - title: "Diff"
+      reference: 1
+      compare: 2
+  legend:
+    - ""
+    - "2n-clx xxv710, 2n-icx e810cq - testbeds and NICs tested."
+    - "Diff - difference between 2n-clx xxv710 and 2n-icx e810cq testbeds."
+
+# VPP Comparison Across Testbeds 2n-clx to 2n-icx 2c pdr
+- type: "table"
+  title: "VPP Comparison Across Testbeds 2n-clx to 2n-icx 2c pdr"
+  algorithm: "table_comparison"
+  output-file: "{DIR[STATIC,VPP]}/performance-compare-testbeds-2n-clx-2n-icx-2c-pdr"
+  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
+  filter: "('NIC_Intel-XXV710' or 'NIC_Intel-E810CQ') and 'NDRPDR' and '2C'"
+  columns:
+    - title: "2n-clx xxv710"
+      data-set: "vpp-compare-testbeds-clx-icx-ref"
+      tag: "NIC_Intel-XXV710"
+    - title: "2n-icx e810cq"
+      data-set: "vpp-compare-testbeds-clx-icx-cmp"
+      tag: "NIC_Intel-E810CQ"
+  comparisons:
+    - title: "Diff"
+      reference: 1
+      compare: 2
+  legend:
+    - ""
+    - "2n-clx xxv710, 2n-icx e810cq - testbeds and NICs tested."
+    - "Diff - difference between 2n-clx xxv710 and 2n-icx e810cq testbeds."
+
 # VPP Comparison Across Topologies 3n-skx to 2n-skx 1c ndr
 - type: "table"
   title: "VPP Comparison Across Topologies 3n-skx to 2n-skx 1c ndr"
@@ -7377,6 +7519,75 @@
     - "3n-hsw xl710, 2n-clx xxv710 - testbeds and NICs tested."
     - "Diff - difference between 3n-hsw xl710 and 2n-clx xxv710 testbeds."
 
+# VPP Comparison Across Testbeds 2n-clx to 2n-icx 1c mrr
+- type: "table"
+  title: "VPP Comparison Across Testbeds 2n-clx to 2n-icx 1c mrr"
+  algorithm: "table_comparison"
+  output-file: "{DIR[STATIC,VPP]}/performance-compare-testbeds-2n-clx-2n-icx-1c-mrr"
+  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
+  filter: "('NIC_Intel-XXV710' or 'NIC_Intel-E810CQ') and 'MRR' and '1C'"
+  columns:
+    - title: "2n-clx xxv710"
+      data-set: "vpp-compare-testbeds-mrr-clx-icx-ref"
+      tag: "NIC_Intel-XXV710"
+    - title: "2n-icx e810cq"
+      data-set: "vpp-compare-testbeds-mrr-clx-icx-cmp"
+      tag: "NIC_Intel-E810CQ"
+  comparisons:
+    - title: "Diff"
+      reference: 1
+      compare: 2
+  legend:
+    - ""
+    - "2n-clx xxv710, 2n-icx e810cq - testbeds and NICs tested."
+    - "Diff - difference between 2n-clx xxv710 and 2n-icx e810cq testbeds."
+
+# VPP Comparison Across Testbeds 2n-clx to 2n-icx 2c mrr
+- type: "table"
+  title: "VPP Comparison Across Testbeds 2n-clx to 2n-icx 2c mrr"
+  algorithm: "table_comparison"
+  output-file: "{DIR[STATIC,VPP]}/performance-compare-testbeds-2n-clx-2n-icx-2c-mrr"
+  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
+  filter: "('NIC_Intel-XXV710' or 'NIC_Intel-E810CQ') and 'MRR' and '2C'"
+  columns:
+    - title: "2n-clx xxv710"
+      data-set: "vpp-compare-testbeds-mrr-clx-icx-ref"
+      tag: "NIC_Intel-XXV710"
+    - title: "2n-icx e810cq"
+      data-set: "vpp-compare-testbeds-mrr-clx-icx-cmp"
+      tag: "NIC_Intel-E810CQ"
+  comparisons:
+    - title: "Diff"
+      reference: 1
+      compare: 2
+  legend:
+    - ""
+    - "2n-clx xxv710, 2n-icx e810cq - testbeds and NICs tested."
+    - "Diff - difference between 2n-clx xxv710 and 2n-icx e810cq testbeds."
+
+# VPP Comparison Across Testbeds 2n-clx to 2n-icx 4c mrr
+- type: "table"
+  title: "VPP Comparison Across Testbeds 2n-clx to 2n-icx 4c mrr"
+  algorithm: "table_comparison"
+  output-file: "{DIR[STATIC,VPP]}/performance-compare-testbeds-2n-clx-2n-icx-4c-mrr"
+  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
+  filter: "('NIC_Intel-XXV710' or 'NIC_Intel-E810CQ') and 'MRR' and '4C'"
+  columns:
+    - title: "2n-clx xxv710"
+      data-set: "vpp-compare-testbeds-mrr-clx-icx-ref"
+      tag: "NIC_Intel-XXV710"
+    - title: "2n-icx e810cq"
+      data-set: "vpp-compare-testbeds-mrr-clx-icx-cmp"
+      tag: "NIC_Intel-E810CQ"
+  comparisons:
+    - title: "Diff"
+      reference: 1
+      compare: 2
+  legend:
+    - ""
+    - "2n-clx xxv710, 2n-icx e810cq - testbeds and NICs tested."
+    - "Diff - difference between 2n-clx xxv710 and 2n-icx e810cq testbeds."
+
 # Detailed Test Results - VPP Performance Results 3n-hsw
 - type: "table"
   title: "Detailed Test Results - VPP Performance Results 3n-hsw"
@@ -7465,6 +7676,23 @@
   - "parent"
   - "msg"
 
+# Detailed Test Results - VPP Performance Results 2n-icx
+- type: "table"
+  title: "Detailed Test Results - VPP Performance Results 2n-icx"
+  algorithm: "table_merged_details"
+  output-file: "{DIR[DTR,PERF,VPP,2N,ICX]}/"
+  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: "vpp-perf-results-2n-icx"
+  filter: "'NDRPDR'"
+  parameters:
+  - "name"
+  - "parent"
+  - "msg"
+
 # Detailed Test Results - VPP Performance Results 3n-tsh
 - type: "table"
   title: "Detailed Test Results - VPP Performance Results 3n-tsh"
@@ -7618,6 +7846,23 @@
   - "name"
   - "conf-history"
 
+# Test configuration - VPP Performance Test Configs 2n-icx
+- type: "table"
+  title: "Test configuration - VPP Performance Test Configs 2n-icx"
+  algorithm: "table_merged_details"
+  output-file: "{DIR[DTC,PERF,VPP,2N,ICX]}/"
+  columns:
+    - title: " |prein| Test Name |preout| "
+      data: "data name"
+    - title: " |prein| VPP API Test Commands History - Commands Used Per Test Case |preout| "
+      data: "data conf-history"
+  data: "vpp-perf-results-2n-icx"
+  filter: "'NDRPDR'"
+  parameters:
+  - "parent"
+  - "name"
+  - "conf-history"
+
 # Test configuration - VPP Performance Test Configs 3n-tsh
 - type: "table"
   title: "Test configuration - VPP Performance Test Configs 3n-tsh"
@@ -7726,6 +7971,14 @@
   data: "vpp-perf-results-2n-clx"
   filter: "all"
 
+# Test Operational Data - VPP Performance Operational Data 2n-icx
+- type: "table"
+  title: "Test Operational Data - VPP Performance Operational Data 2n-icx"
+  algorithm: "table_oper_data_html"
+  output-file: "{DIR[DTO,PERF,VPP,2N,ICX]}/"
+  data: "vpp-perf-results-2n-icx"
+  filter: "'NDRPDR'"
+
 # Test Operational Data - VPP Performance Operational Data 3n-tsh
 - type: "table"
   title: "Test Operational Data - VPP Performance Operational Data 3n-tsh"
@@ -7843,6 +8096,23 @@
   - "parent"
   - "msg"
 
+# Detailed Test Results - VPP MRR Results 2n-icx
+- type: "table"
+  title: "Detailed Test Results - VPP MRR Results 2n-icx"
+  algorithm: "table_merged_details"
+  output-file: "{DIR[DTR,MRR,VPP,2N,ICX]}/"
+  columns:
+    - title: " |prein| Test Name |preout| "
+      data: "data name"
+    - title: " |prein| Maximum Receive Rate trial [Mpps] |preout| "
+      data: "data msg"
+  data: "vpp-mrr-results-2n-icx"
+  filter: "'MRR'"
+  parameters:
+  - "name"
+  - "parent"
+  - "msg"
+
 # Detailed Test Results - VPP MRR Results 3n-tsh
 - type: "table"
   title: "Detailed Test Results - VPP MRR Results 3n-tsh"
@@ -7996,6 +8266,23 @@
   - "name"
   - "conf-history"
 
+# Test configuration - VPP MRR Test Configs 2n-icx
+- type: "table"
+  title: "Test configuration - VPP MRR Test Configs 2n-icx"
+  algorithm: "table_merged_details"
+  output-file: "{DIR[DTC,MRR,VPP,2N,ICX]}/"
+  columns:
+    - title: " |prein| Test Name |preout| "
+      data: "data name"
+    - title: " |prein| VPP API Test Commands History - Commands Used Per Test Case |preout| "
+      data: "data conf-history"
+  data: "vpp-mrr-results-2n-icx"
+  filter: "'MRR'"
+  parameters:
+  - "parent"
+  - "name"
+  - "conf-history"
+
 # Test configuration - VPP MRR Test Configs 3n-tsh
 - type: "table"
   title: "Test configuration - VPP MRR Test Configs 3n-tsh"
@@ -9132,6 +9419,7 @@
     - "{DIR[DTR,PERF,VPP,2N,SKX]}"
     - "{DIR[DTR,PERF,VPP,3N,SKX]}"
     - "{DIR[DTR,PERF,VPP,2N,CLX]}"
+    - "{DIR[DTR,PERF,VPP,2N,ICX]}"
     - "{DIR[DTR,PERF,VPP,2N,ZN2]}"
     - "{DIR[DTR,PERF,VPP,3N,HSW]}"
     - "{DIR[DTR,PERF,VPP,3N,TSH]}"
@@ -9142,13 +9430,14 @@
     - "vpp-perf-results-2n-skx"
     - "vpp-perf-results-3n-skx"
     - "vpp-perf-results-2n-clx"
+    - "vpp-perf-results-2n-icx"
     - "vpp-perf-results-2n-zn2"
     - "vpp-perf-results-3n-hsw"
     - "vpp-perf-results-3n-tsh"
     - "vpp-perf-results-2n-tx2"
     - "vpp-perf-results-2n-dnv"
     - "vpp-perf-results-3n-dnv"
-  filter: "all"
+  filter: "'NDRPDR'"
   data-start-level: 4
   order-chapters:
     level-1:
@@ -9169,6 +9458,7 @@
       - "2n-skx"
       - "3n-skx"
       - "2n-clx"
+      - "2n-icx"
       - "2n-zn2"
       - "3n-hsw"
       - "3n-tsh"
@@ -9180,6 +9470,7 @@
       - "x520"
       - "xxv710"
       - "x710"
+      - "e810cq"
       - "x553"
       - "cx556a"
       - "vic1227"
@@ -9194,6 +9485,7 @@
     - "{DIR[DTC,PERF,VPP,2N,SKX]}"
     - "{DIR[DTC,PERF,VPP,3N,SKX]}"
     - "{DIR[DTC,PERF,VPP,2N,CLX]}"
+    - "{DIR[DTC,PERF,VPP,2N,ICX]}"
     - "{DIR[DTC,PERF,VPP,2N,ZN2]}"
     - "{DIR[DTC,PERF,VPP,3N,HSW]}"
     - "{DIR[DTC,PERF,VPP,3N,TSH]}"
@@ -9204,13 +9496,14 @@
     - "vpp-perf-results-2n-skx"
     - "vpp-perf-results-3n-skx"
     - "vpp-perf-results-2n-clx"
+    - "vpp-perf-results-2n-icx"
     - "vpp-perf-results-2n-zn2"
     - "vpp-perf-results-3n-hsw"
     - "vpp-perf-results-3n-tsh"
     - "vpp-perf-results-2n-tx2"
     - "vpp-perf-results-2n-dnv"
     - "vpp-perf-results-3n-dnv"
-  filter: "all"
+  filter: "'NDRPDR'"
   data-start-level: 4
   order-chapters:
     level-1:
@@ -9231,6 +9524,7 @@
       - "2n-skx"
       - "3n-skx"
       - "2n-clx"
+      - "2n-icx"
       - "2n-zn2"
       - "3n-hsw"
       - "3n-tsh"
@@ -9242,6 +9536,7 @@
       - "x520"
       - "xxv710"
       - "x710"
+      - "e810cq"
       - "x553"
       - "cx556a"
       - "vic1227"
@@ -9256,6 +9551,7 @@
     - "{DIR[DTO,PERF,VPP,2N,SKX]}"
     - "{DIR[DTO,PERF,VPP,3N,SKX]}"
     - "{DIR[DTO,PERF,VPP,2N,CLX]}"
+    - "{DIR[DTO,PERF,VPP,2N,ICX]}"
     - "{DIR[DTO,PERF,VPP,2N,ZN2]}"
     - "{DIR[DTO,PERF,VPP,3N,HSW]}"
     - "{DIR[DTO,PERF,VPP,3N,TSH]}"
@@ -9266,13 +9562,14 @@
     - "vpp-perf-results-2n-skx"
     - "vpp-perf-results-3n-skx"
     - "vpp-perf-results-2n-clx"
+    - "vpp-perf-results-2n-icx"
     - "vpp-perf-results-2n-zn2"
     - "vpp-perf-results-3n-hsw"
     - "vpp-perf-results-3n-tsh"
     - "vpp-perf-results-2n-tx2"
     - "vpp-perf-results-2n-dnv"
     - "vpp-perf-results-3n-dnv"
-  filter: "all"
+  filter: "'NDRPDR'"
   data-start-level: 4
   order-chapters:
     level-1:
@@ -9293,6 +9590,7 @@
       - "2n-skx"
       - "3n-skx"
       - "2n-clx"
+      - "2n-icx"
       - "2n-zn2"
       - "3n-hsw"
       - "3n-tsh"
@@ -9304,6 +9602,7 @@
       - "x520"
       - "xxv710"
       - "x710"
+      - "e810cq"
       - "x553"
       - "cx556a"
       - "vic1227"
@@ -9318,6 +9617,7 @@
     - "{DIR[DTR,MRR,VPP,2N,SKX]}"
     - "{DIR[DTR,MRR,VPP,3N,SKX]}"
     - "{DIR[DTR,MRR,VPP,2N,CLX]}"
+    - "{DIR[DTR,MRR,VPP,2N,ICX]}"
     - "{DIR[DTR,MRR,VPP,2N,ZN2]}"
     - "{DIR[DTR,MRR,VPP,3N,HSW]}"
     - "{DIR[DTR,MRR,VPP,3N,TSH]}"
@@ -9328,13 +9628,14 @@
     - "vpp-mrr-results-2n-skx"
     - "vpp-mrr-results-3n-skx"
     - "vpp-mrr-results-2n-clx"
+    - "vpp-mrr-results-2n-icx"
     - "vpp-mrr-results-2n-zn2"
     - "vpp-mrr-results-3n-hsw"
     - "vpp-mrr-results-3n-tsh"
     - "vpp-mrr-results-2n-tx2"
     - "vpp-mrr-results-2n-dnv"
     - "vpp-mrr-results-3n-dnv"
-  filter: "all"
+  filter: "'MRR'"
   data-start-level: 4
   order-chapters:
     level-1:
@@ -9355,6 +9656,7 @@
       - "2n-skx"
       - "3n-skx"
       - "2n-clx"
+      - "2n-icx"
       - "2n-zn2"
       - "3n-hsw"
       - "3n-tsh"
@@ -9366,6 +9668,7 @@
       - "x520"
       - "xxv710"
       - "x710"
+      - "e810cq"
       - "x553"
       - "cx556a"
       - "vic1227"
@@ -9380,6 +9683,7 @@
     - "{DIR[DTC,MRR,VPP,2N,SKX]}"
     - "{DIR[DTC,MRR,VPP,3N,SKX]}"
     - "{DIR[DTC,MRR,VPP,2N,CLX]}"
+    - "{DIR[DTC,MRR,VPP,2N,ICX]}"
     - "{DIR[DTC,MRR,VPP,2N,ZN2]}"
     - "{DIR[DTC,MRR,VPP,3N,HSW]}"
     - "{DIR[DTC,MRR,VPP,3N,TSH]}"
@@ -9390,13 +9694,14 @@
     - "vpp-mrr-results-2n-skx"
     - "vpp-mrr-results-3n-skx"
     - "vpp-mrr-results-2n-clx"
+    - "vpp-mrr-results-2n-icx"
     - "vpp-mrr-results-2n-zn2"
     - "vpp-mrr-results-3n-hsw"
     - "vpp-mrr-results-3n-tsh"
     - "vpp-mrr-results-2n-tx2"
     - "vpp-mrr-results-2n-dnv"
     - "vpp-mrr-results-3n-dnv"
-  filter: "all"
+  filter: "'MRR'"
   data-start-level: 4
   order-chapters:
     level-1:
@@ -9417,6 +9722,7 @@
       - "2n-skx"
       - "3n-skx"
       - "2n-clx"
+      - "2n-icx"
       - "2n-zn2"
       - "3n-hsw"
       - "3n-tsh"
@@ -9428,6 +9734,7 @@
       - "x520"
       - "xxv710"
       - "x710"
+      - "e810cq"
       - "x553"
       - "cx556a"
       - "vic1227"
@@ -14957,6 +15264,190 @@
     title: "2n-clx-xxv710-114b-vts-l2switching-base-[avf,dpdk]-{test_type}"
     layout: "plot-throughput-speedup-analysis"
 
+# 2n-icx
+
+- type: "plot"
+  title: "Throughput: 2n-icx-e810cq-64b-{core}-ip4routing-base-scale-avf-{test_type}"
+  algorithm: "plot_ndrpdr_box_name"
+  output-file: "{DIR[STATIC,VPP]}/2n-icx-e810cq-64b-{core}-ip4routing-base-scale-avf-{test_type}"
+  data: "plot-vpp-throughput-lat-tsa-2n-icx"
+  core: ["2t1c", ]
+  include:
+    - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1E810Cq-Avf-Ethip4-Ip4Base-Ndrpdr.64B-{core}-avf-ethip4-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1E810Cq-Avf-Ethip4-Ip4Scale20K-Ndrpdr.64B-{core}-avf-ethip4-ip4scale20k-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1E810Cq-Avf-Ethip4-Ip4Scale200K-Ndrpdr.64B-{core}-avf-ethip4-ip4scale200k-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1E810Cq-Avf-Ethip4-Ip4Scale2M-Ndrpdr.64B-{core}-avf-ethip4-ip4scale2m-ndrpdr"
+  layout:
+    title: "2n-icx-e810cq-64b-{core}-ip4routing-base-scale-avf-{test_type}"
+    layout: "plot-throughput"
+
+- type: "plot"
+  title: "Throughput: 2n-icx-e810cq-64b-{core}-ip4routing-base-scale-dpdk-{test_type}"
+  algorithm: "plot_ndrpdr_box_name"
+  output-file: "{DIR[STATIC,VPP]}/2n-icx-e810cq-64b-{core}-ip4routing-base-scale-dpdk-{test_type}"
+  data: "plot-vpp-throughput-lat-tsa-2n-icx"
+  core: ["2t1c", ]
+  include:
+    - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1E810Cq-Ethip4-Ip4Base-Ndrpdr.64B-{core}-ethip4-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1E810Cq-Ethip4-Ip4Scale20K-Ndrpdr.64B-{core}-ethip4-ip4scale20k-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1E810Cq-Ethip4-Ip4Scale200K-Ndrpdr.64B-{core}-ethip4-ip4scale200k-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1E810Cq-Ethip4-Ip4Scale2M-Ndrpdr.64B-{core}-ethip4-ip4scale2m-ndrpdr"
+  layout:
+    title: "2n-icx-e810cq-64b-{core}-ip4routing-base-scale-dpdk-{test_type}"
+    layout: "plot-throughput"
+
+- type: "plot"
+  title: "Throughput: 2n-icx-e810cq-78b-{core}-ip6routing-base-scale-avf-{test_type}"
+  algorithm: "plot_ndrpdr_box_name"
+  output-file: "{DIR[STATIC,VPP]}/2n-icx-e810cq-78b-{core}-ip6routing-base-scale-avf-{test_type}"
+  data: "plot-vpp-throughput-lat-tsa-2n-icx"
+  core: ["2t1c", ]
+  include:
+    - "Tests.Vpp.Perf.Ip6.2N1L-100Ge2P1E810Cq-Avf-Ethip6-Ip6Base-Ndrpdr.78B-{core}-avf-ethip6-ip6base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-100Ge2P1E810Cq-Avf-Ethip6-Ip6Scale20K-Ndrpdr.78B-{core}-avf-ethip6-ip6scale20k-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-100Ge2P1E810Cq-Avf-Ethip6-Ip6Scale200K-Ndrpdr.78B-{core}-avf-ethip6-ip6scale200k-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-100Ge2P1E810Cq-Avf-Ethip6-Ip6Scale2M-Ndrpdr.78B-{core}-avf-ethip6-ip6scale2m-ndrpdr"
+  layout:
+    title: "2n-icx-e810cq-78b-{core}-ip6routing-base-scale-avf-{test_type}"
+    layout: "plot-throughput"
+
+- type: "plot"
+  title: "Throughput: 2n-icx-e810cq-78b-{core}-ip6routing-base-scale-dpdk-{test_type}"
+  algorithm: "plot_ndrpdr_box_name"
+  output-file: "{DIR[STATIC,VPP]}/2n-icx-e810cq-78b-{core}-ip6routing-base-scale-dpdk-{test_type}"
+  data: "plot-vpp-throughput-lat-tsa-2n-icx"
+  core: ["2t1c", ]
+  include:
+    - "Tests.Vpp.Perf.Ip6.2N1L-100Ge2P1E810Cq-Ethip6-Ip6Base-Ndrpdr.78B-{core}-ethip6-ip6base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-100Ge2P1E810Cq-Ethip6-Ip6Scale20K-Ndrpdr.78B-{core}-ethip6-ip6scale20k-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-100Ge2P1E810Cq-Ethip6-Ip6Scale200K-Ndrpdr.78B-{core}-ethip6-ip6scale200k-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-100Ge2P1E810Cq-Ethip6-Ip6Scale2M-Ndrpdr.78B-{core}-ethip6-ip6scale2m-ndrpdr"
+  layout:
+    title: "2n-icx-e810cq-78b-{core}-ip6routing-base-scale-dpdk-{test_type}"
+    layout: "plot-throughput"
+
+- type: "plot"
+  title: "Throughput: 2n-icx-x710-64b-{core}-l2switching-base-scale-avf-{test_type}"
+  algorithm: "plot_ndrpdr_box_name"
+  output-file: "{DIR[STATIC,VPP]}/2n-icx-x710-64b-{core}-l2switching-base-scale-avf-{test_type}"
+  data: "plot-vpp-throughput-lat-tsa-2n-icx"
+  core: ["2t1c", ]
+  include:
+    - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1E810Cq-Avf-Eth-L2Patch-Ndrpdr.64B-{core}-avf-eth-l2patch-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1E810Cq-Avf-Eth-L2Xcbase-Ndrpdr.64B-{core}-avf-eth-l2xcbase-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1E810Cq-Avf-Eth-L2Bdbasemaclrn-Ndrpdr.64B-{core}-avf-eth-l2bdbasemaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1E810Cq-Avf-Eth-L2Bdscale10Kmaclrn-Ndrpdr.64B-{core}-avf-eth-l2bdscale10kmaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1E810Cq-Avf-Eth-L2Bdscale100Kmaclrn-Ndrpdr.64B-{core}-avf-eth-l2bdscale100kmaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1E810Cq-Avf-Eth-L2Bdscale1Mmaclrn-Ndrpdr.64B-{core}-avf-eth-l2bdscale1mmaclrn-ndrpdr"
+  layout:
+    title: "2n-icx-x710-64b-{core}-l2switching-base-scale-avf-{test_type}"
+    layout: "plot-throughput"
+
+- type: "plot"
+  title: "Throughput: 2n-icx-x710-64b-{core}-l2switching-base-scale-dpdk-{test_type}"
+  algorithm: "plot_ndrpdr_box_name"
+  output-file: "{DIR[STATIC,VPP]}/2n-icx-x710-64b-{core}-l2switching-base-scale-dpdk-{test_type}"
+  data: "plot-vpp-throughput-lat-tsa-2n-icx"
+  core: ["2t1c", ]
+  include:
+    - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1E810Cq-Eth-L2Patch-Ndrpdr.64B-{core}-eth-l2patch-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1E810Cq-Eth-L2Xcbase-Ndrpdr.64B-{core}-eth-l2xcbase-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1E810Cq-Eth-L2Bdbasemaclrn-Ndrpdr.64B-{core}-eth-l2bdbasemaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1E810Cq-Eth-L2Bdscale10Kmaclrn-Ndrpdr.64B-{core}-eth-l2bdscale10kmaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1E810Cq-Eth-L2Bdscale100Kmaclrn-Ndrpdr.64B-{core}-eth-l2bdscale100kmaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1E810Cq-Eth-L2Bdscale1Mmaclrn-Ndrpdr.64B-{core}-eth-l2bdscale1mmaclrn-ndrpdr"
+  layout:
+    title: "2n-icx-x710-64b-{core}-l2switching-base-scale-dpdk-{test_type}"
+    layout: "plot-throughput"
+
+- type: "plot"
+  title: "Speedup: 2n-icx-e810cq-64b-ip4routing-base-scale-avf-{test_type}-tsa"
+  algorithm: "plot_tsa_name"
+  output-file: "{DIR[STATIC,VPP]}/2n-icx-e810cq-64b-ip4routing-base-scale-avf-{test_type}-tsa"
+  data: "plot-vpp-throughput-lat-tsa-2n-icx"
+  include:
+    - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1E810Cq-Avf-Ethip4-Ip4Base-Ndrpdr.64B-.t.c-avf-ethip4-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1E810Cq-Avf-Ethip4-Ip4Scale20K-Ndrpdr.64B-.t.c-avf-ethip4-ip4scale20k-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1E810Cq-Avf-Ethip4-Ip4Scale200K-Ndrpdr.64B-.t.c-avf-ethip4-ip4scale200k-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1E810Cq-Avf-Ethip4-Ip4Scale2M-Ndrpdr.64B-.t.c-avf-ethip4-ip4scale2m-ndrpdr"
+  layout:
+    title: "2n-icx-e810cq-64b-ip4routing-base-scale-avf-{test_type}"
+    layout: "plot-throughput-speedup-analysis"
+
+- type: "plot"
+  title: "Speedup: 2n-icx-e810cq-64b-ip4routing-base-scale-dpdk-{test_type}-tsa"
+  algorithm: "plot_tsa_name"
+  output-file: "{DIR[STATIC,VPP]}/2n-icx-e810cq-64b-ip4routing-base-scale-dpdk-{test_type}-tsa"
+  data: "plot-vpp-throughput-lat-tsa-2n-icx"
+  include:
+    - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1E810Cq-Ethip4-Ip4Base-Ndrpdr.64B-.t.c-ethip4-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1E810Cq-Ethip4-Ip4Scale20K-Ndrpdr.64B-.t.c-ethip4-ip4scale20k-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1E810Cq-Ethip4-Ip4Scale200K-Ndrpdr.64B-.t.c-ethip4-ip4scale200k-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1E810Cq-Ethip4-Ip4Scale2M-Ndrpdr.64B-.t.c-ethip4-ip4scale2m-ndrpdr"
+  layout:
+    title: "2n-icx-e810cq-64b-ip4routing-base-scale-dpdk-{test_type}"
+    layout: "plot-throughput-speedup-analysis"
+
+- type: "plot"
+  title: "Speedup: 2n-icx-e810cq-78b-ip6routing-base-scale-avf-{test_type}-tsa"
+  algorithm: "plot_tsa_name"
+  output-file: "{DIR[STATIC,VPP]}/2n-icx-e810cq-78b-ip6routing-base-scale-avf-{test_type}-tsa"
+  data: "plot-vpp-throughput-lat-tsa-2n-icx"
+  include:
+    - "Tests.Vpp.Perf.Ip6.2N1L-100Ge2P1E810Cq-Avf-Ethip6-Ip6Base-Ndrpdr.78B-.t.c-avf-ethip6-ip6base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-100Ge2P1E810Cq-Avf-Ethip6-Ip6Scale20K-Ndrpdr.78B-.t.c-avf-ethip6-ip6scale20k-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-100Ge2P1E810Cq-Avf-Ethip6-Ip6Scale200K-Ndrpdr.78B-.t.c-avf-ethip6-ip6scale200k-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-100Ge2P1E810Cq-Avf-Ethip6-Ip6Scale2M-Ndrpdr.78B-.t.c-avf-ethip6-ip6scale2m-ndrpdr"
+  layout:
+    title: "2n-icx-e810cq-78b-ip6routing-base-scale-avf-{test_type}"
+    layout: "plot-throughput-speedup-analysis"
+
+- type: "plot"
+  title: "Speedup: 2n-icx-e810cq-78b-ip6routing-base-scale-dpdk-{test_type}-tsa"
+  algorithm: "plot_tsa_name"
+  output-file: "{DIR[STATIC,VPP]}/2n-icx-e810cq-78b-ip6routing-base-scale-dpdk-{test_type}-tsa"
+  data: "plot-vpp-throughput-lat-tsa-2n-icx"
+  include:
+    - "Tests.Vpp.Perf.Ip6.2N1L-100Ge2P1E810Cq-Ethip6-Ip6Base-Ndrpdr.78B-.t.c-ethip6-ip6base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-100Ge2P1E810Cq-Ethip6-Ip6Scale20K-Ndrpdr.78B-.t.c-ethip6-ip6scale20k-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-100Ge2P1E810Cq-Ethip6-Ip6Scale200K-Ndrpdr.78B-.t.c-ethip6-ip6scale200k-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-100Ge2P1E810Cq-Ethip6-Ip6Scale2M-Ndrpdr.78B-.t.c-ethip6-ip6scale2m-ndrpdr"
+  layout:
+    title: "2n-icx-e810cq-78b-ip6routing-base-scale-dpdk-{test_type}"
+    layout: "plot-throughput-speedup-analysis"
+
+- type: "plot"
+  title: "Speedup: 2n-icx-e810cq-64b-l2switching-base-scale-avf-{test_type}-tsa"
+  algorithm: "plot_tsa_name"
+  output-file: "{DIR[STATIC,VPP]}/2n-icx-e810cq-64b-l2switching-base-scale-avf-{test_type}-tsa"
+  data: "plot-vpp-throughput-lat-tsa-2n-icx"
+  include:
+    - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1E810Cq-Avf-Eth-L2Patch-Ndrpdr.64B-.t.c-avf-eth-l2patch-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1E810Cq-Avf-Eth-L2Xcbase-Ndrpdr.64B-.t.c-avf-eth-l2xcbase-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1E810Cq-Avf-Eth-L2Bdbasemaclrn-Ndrpdr.64B-.t.c-avf-eth-l2bdbasemaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1E810Cq-Avf-Eth-L2Bdscale10Kmaclrn-Ndrpdr.64B-.t.c-avf-eth-l2bdscale10kmaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1E810Cq-Avf-Eth-L2Bdscale100Kmaclrn-Ndrpdr.64B-.t.c-avf-eth-l2bdscale100kmaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1E810Cq-Avf-Eth-L2Bdscale1Mmaclrn-Ndrpdr.64B-.t.c-avf-eth-l2bdscale1mmaclrn-ndrpdr"
+  layout:
+    title: "2n-icx-e810cq-64b-l2switching-base-scale-avf-{test_type}"
+    layout: "plot-throughput-speedup-analysis"
+
+- type: "plot"
+  title: "Speedup: 2n-icx-e810cq-64b-l2switching-base-scale-dpdk-{test_type}-tsa"
+  algorithm: "plot_tsa_name"
+  output-file: "{DIR[STATIC,VPP]}/2n-icx-e810cq-64b-l2switching-base-scale-dpdk-{test_type}-tsa"
+  data: "plot-vpp-throughput-lat-tsa-2n-icx"
+  include:
+    - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1E810Cq-Eth-L2Patch-Ndrpdr.64B-.t.c-eth-l2patch-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1E810Cq-Eth-L2Xcbase-Ndrpdr.64B-.t.c-eth-l2xcbase-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1E810Cq-Eth-L2Bdbasemaclrn-Ndrpdr.64B-.t.c-eth-l2bdbasemaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1E810Cq-Eth-L2Bdscale10Kmaclrn-Ndrpdr.64B-.t.c-eth-l2bdscale10kmaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1E810Cq-Eth-L2Bdscale100Kmaclrn-Ndrpdr.64B-.t.c-eth-l2bdscale100kmaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1E810Cq-Eth-L2Bdscale1Mmaclrn-Ndrpdr.64B-.t.c-eth-l2bdscale1mmaclrn-ndrpdr"
+  layout:
+    title: "2n-icx-e810cq-64b-l2switching-base-scale-dpdk-{test_type}"
+    layout: "plot-throughput-speedup-analysis"
+
 # Packet Throughput - DPDK
 
 # 2n-clx
@@ -16349,6 +16840,17 @@
     layout: "plot-hdrh-latency-percentile-x-log"
 
 - type: "plot"
+  title: "Latency by percentile: 2n-icx"
+  algorithm: "plot_hdrh_lat_by_percentile_x_log"
+  output-file: "{DIR[STATIC,VPP]}/hdrh-lat-percentile-2n-icx"
+  output-file-links: "{DIR[LAT,VPP]}/2n_icx.rst"
+  target-links: "../../_static/vpp"
+  data: "plot-vpp-hdrh-lat-2n-icx"
+  filter: "'2T1C' and 'NIC_Intel-E810CQ' and 'NDRPDR'"
+  layout:
+    layout: "plot-hdrh-latency-percentile-x-log"
+
+- type: "plot"
   title: "Latency by percentile: 3n-hsw"
   algorithm: "plot_hdrh_lat_by_percentile_x_log"
   output-file: "{DIR[STATIC,VPP]}/hdrh-lat-percentile-3n-hsw"