Report: Configure rls2009 Report

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

diff --git a/docs/report/index.html.template b/docs/report/index.html.template
index 9ec3017..c197856 100644 (file)
--- a/docs/report/index.html.template
+++ b/docs/report/index.html.template
@@ -1,4 +1,4 @@
-CSIT-2005
+CSIT-2009
 =========
 
 .. toctree::

diff --git a/docs/report/index.pdf.template b/docs/report/index.pdf.template
index 54d4f85..cd69e02 100644 (file)
--- a/docs/report/index.pdf.template
+++ b/docs/report/index.pdf.template
@@ -1,4 +1,4 @@
-CSIT-2005
+CSIT-2009
 =========
 
 .. toctree::

diff --git a/docs/report/introduction/report_history.rst b/docs/report/introduction/report_history.rst
index 3e04365..caa31ca 100644 (file)
--- a/docs/report/introduction/report_history.rst
+++ b/docs/report/introduction/report_history.rst
@@ -6,43 +6,7 @@ FD.io CSIT-2005 Report history and per .[ww] revision changes are listed below.
 +----------------+------------------------------------------------------------+
 | .[ww] Revision | Changes                                                    |
 +================+============================================================+
-| .32            | 1. Added data:                                             |
-|                |                                                            |
-|                |    - VPP iterative                                         |
-|                |                                                            |
-|                |      - 3n-skx                                              |
-|                |                                                            |
-+----------------+------------------------------------------------------------+
-| .31            | 1. Added data:                                             |
-|                |                                                            |
-|                |    - VPP iterative                                         |
-|                |                                                            |
-|                |      - 3n-skx                                              |
-|                |      - 3n-tsh                                              |
-|                |                                                            |
-+----------------+------------------------------------------------------------+
-| .30            | 1. Added data:                                             |
-|                |                                                            |
-|                |    - VPP coverage                                          |
-|                |                                                            |
-|                |      - 2n-clx                                              |
-|                |      - 2n-skx                                              |
-|                |      - 3n-skx                                              |
-|                |                                                            |
-|                |    - VPP iterative                                         |
-|                |                                                            |
-|                |      - 2n-clx                                              |
-|                |      - 2n-skx                                              |
-|                |      - 3n-skx                                              |
-|                |      - 3n-tsh                                              |
-|                |                                                            |
-|                |    - VPP NF density                                        |
-|                |                                                            |
-|                |      - 2n-clx                                              |
-|                |      - 2n-skx                                              |
-|                |                                                            |
-+----------------+------------------------------------------------------------+
-| .29            | Initial version                                            |
+| .38            | Initial version                                            |
 |                |                                                            |
 +----------------+------------------------------------------------------------+
 

diff --git a/resources/tools/presentation/conf.py b/resources/tools/presentation/conf.py
index aa0e7e4..d8a5aec 100644 (file)
--- a/resources/tools/presentation/conf.py
+++ b/resources/tools/presentation/conf.py
@@ -46,8 +46,8 @@ source_suffix = [u'.rst', u'.md']
 master_doc = u'index'
 
 # General information about the project.
-report_week = u'32'
-project = u'FD.io CSIT-2005.{week}'.format(week=report_week)
+report_week = u'38'
+project = u'FD.io CSIT-2009.{week}'.format(week=report_week)
 copyright = u'2020, FD.io'
 author = u'FD.io CSIT'
 
@@ -97,19 +97,19 @@ rst_epilog = u"""
 .. _FD.io VPP compile job: https://jenkins.fd.io/view/vpp/job/vpp-merge-{srelease}-ubuntu1804/
 .. _CSIT Testbed Setup: https://git.fd.io/csit/tree/resources/tools/testbed-setup/README.md?h={release}
 .. _VPP startup.conf: https://git.fd.io/vpp/tree/src/vpp/conf/startup.conf?h=stable/{srelease}&id={vpp_release_commit_id}
-""".format(release=u'rls2005',
+""".format(release=u'rls2009',
            report_week=report_week,
-           prev_release=u'rls2001',
-           srelease=u'2005',
-           csitrelease=u'2005',
-           csit_prev_release=u'2001',
-           vpprelease=u'20.05',
-           vpp_prev_release=u'20.01',
-           dpdkrelease=u'20.02',
-           dpdk_prev_release=u'19.08',
-           sdpdkrelease=u'2002',
-           trex_version=u'v2.82',
-           vpp_release_commit_id=u'fce396738f865293f0a023bc7f172086f81da456')
+           prev_release=u'rls2005',
+           srelease=u'2009',
+           csitrelease=u'2009',
+           csit_prev_release=u'2005',
+           vpprelease=u'20.09',
+           vpp_prev_release=u'20.05',
+           dpdkrelease=u'20.02',  # TODO
+           dpdk_prev_release=u'19.08',  # TODO
+           sdpdkrelease=u'2002',  # TODO
+           trex_version=u'v2.82',  # TODO
+           vpp_release_commit_id=u'fce396738f865293f0a023bc7f172086f81da456')  # TODO
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

diff --git a/resources/tools/presentation/run_report.sh b/resources/tools/presentation/run_report.sh
index 651327d..9f6290e 100755 (executable)
--- a/resources/tools/presentation/run_report.sh
+++ b/resources/tools/presentation/run_report.sh
@@ -38,7 +38,7 @@ export PYTHONPATH=`pwd`:`pwd`/../../../:`pwd`/../../libraries/python
 python pal.py \
     --specification specification.yaml \
     --release ${RELEASE} \
-    --week "32" \
+    --week "38" \
     --logging INFO \
     --force
 

diff --git a/resources/tools/presentation/specification.yaml b/resources/tools/presentation/specification.yaml
index e47ef30..acf0afe 100644 (file)
--- a/resources/tools/presentation/specification.yaml
+++ b/resources/tools/presentation/specification.yaml
@@ -151,6 +151,8 @@
     # 3n-hsw
 
     plot-vpp-throughput-lat-tsa-3n-hsw:
+      # TODO: Replace:
+      # csit-vpp-perf-report-iterative-2009-3n-hsw:
       csit-vpp-perf-report-iterative-2005-3n-hsw:
         - 20  # NDRPDR sel env 4
         - 21  # NDRPDR sel env 4
@@ -164,27 +166,15 @@
         - 29  # NDRPDR sel env 4
 
     plot-vpp-hdrh-lat-3n-hsw:
+      # TODO: Replace:
+      # csit-vpp-perf-report-iterative-2009-3n-hsw:
       csit-vpp-perf-report-iterative-2005-3n-hsw:
         - 29  # NDRPDR sel env 4
 
-#    plot-vpp-nfv-3n-hsw-ndrpdr:
-#      csit-vpp-perf-report-iterative-2005-3n-hsw:
-#        - 3   # NDRPDR sel
-#        - 4   # NDRPDR sel
-#        - 5   # NDRPDR sel
-#        - 10  # NDRPDR sel
-#        - 11  # NDRPDR sel
-#        - 12  # NDRPDR sel
-#        - 15  # NDRPDR sel
-#        - 16  # NDRPDR sel
-#        - 18  # NDRPDR sel
-#        - 19  # NDRPDR sel
-
-#    plot-vpp-nfv-3n-hsw-mrr:
-#      csit-vpp-perf-report-iterative-2005-3n-hsw:
-#        - 13  # MRR
-
     plot-vpp-hoststack-3n-hsw:
+      # TODO: Replace:
+      # csit-vpp-perf-report-iterative-2009-3n-hsw: OR
+      # csit-vpp-perf-verify-2009-3n-hsw:
       csit-vpp-perf-verify-2005-3n-hsw:
         - 3   # hoststack
         - 5   # hoststack
@@ -198,6 +188,8 @@
         - 13  # hoststack
 
     plot-dpdk-throughput-latency-3n-hsw:
+      # TODO: Replace:
+      # csit-dpdk-perf-report-iterative-2009-3n-hsw:
       csit-dpdk-perf-report-iterative-2005-3n-hsw:
         - 25  # NDRPDR iter
         - 26  # NDRPDR iter
@@ -211,12 +203,16 @@
         - 34  # NDRPDR iter
 
     plot-dpdk-hdrh-lat-3n-hsw:
+      # TODO: Replace:
+      # csit-dpdk-perf-report-iterative-2009-3n-hsw:
       csit-dpdk-perf-report-iterative-2005-3n-hsw:
         - 25  # NDRPDR iter
 
     # 3n-skx
 
     plot-vpp-throughput-lat-tsa-3n-skx:
+      # TODO: Replace:
+      # csit-vpp-perf-report-iterative-2009-3n-skx:
       csit-vpp-perf-report-iterative-2005-3n-skx:
         - 42  # NDRPDR sel env 4
         - 43  # NDRPDR sel env 4
@@ -230,10 +226,14 @@
         - 62  # NDRPDR sel env 4
 
     plot-vpp-hdrh-lat-3n-skx:
+      # TODO: Replace:
+      # csit-vpp-perf-report-iterative-2009-3n-skx:
       csit-vpp-perf-report-iterative-2005-3n-skx:
         - 47  # NDRPDR sel env 4
 
     plot-vpp-nfv-3n-skx-ndrpdr:
+      # TODO: Replace:
+      # csit-vpp-perf-report-iterative-2009-3n-skx:
       csit-vpp-perf-report-iterative-2005-3n-skx:
         - 4   # NDRPDR sel
         - 5   # NDRPDR sel ??? all x710 failed
@@ -242,10 +242,14 @@
         - 34  # NDRPDR sel
 
     plot-vpp-nfv-3n-skx-mrr:
+      # TODO: Replace:
+      # csit-vpp-perf-report-iterative-2009-3n-skx:
       csit-vpp-perf-report-iterative-2005-3n-skx:
         - 49  # MRR sel env 4
 
     plot-dpdk-throughput-latency-3n-skx:
+      # TODO: Replace:
+      # csit-dpdk-perf-report-iterative-2009-3n-skx:
       csit-dpdk-perf-report-iterative-2005-3n-skx:
         - 28  # NDRPDR iter
         - 29  # NDRPDR iter
@@ -259,12 +263,16 @@
         - 37  # NDRPDR iter
 
     plot-dpdk-hdrh-lat-3n-skx:
+      # TODO: Replace:
+      # csit-dpdk-perf-report-iterative-2009-3n-skx:
       csit-dpdk-perf-report-iterative-2005-3n-skx:
         - 28  # NDRPDR iter
 
     # 2n-skx
 
     plot-vpp-throughput-lat-tsa-2n-skx:
+      # TODO: Replace:
+      # csit-vpp-perf-report-iterative-2009-2n-skx:
       csit-vpp-perf-report-iterative-2005-2n-skx:
         - 88  # NDRPDR sel env 4
         - 89  # NDRPDR sel env 4
@@ -278,15 +286,21 @@
         - 127 # NDRPDR sel env 4
 
     plot-vpp-hdrh-lat-2n-skx:
+      # TODO: Replace:
+      # csit-vpp-perf-report-iterative-2009-2n-skx:
       csit-vpp-perf-report-iterative-2005-2n-skx:
         - 94  # NDRPDR sel
 
     plot-vpp-soak-2n-skx:
+      # TODO: Replace:
+      # csit-vpp-perf-report-iterative-2009-2n-skx:
       csit-vpp-perf-report-iterative-2005-2n-skx:
         - 122 # Soak
         - 123 # Soak
 
     plot-vpp-nfv-2n-skx-ndrpdr:
+      # TODO: Replace:
+      # csit-vpp-perf-report-iterative-2009-2n-skx:
       csit-vpp-perf-report-iterative-2005-2n-skx:
         - 113 # nf-density-sel env 4
         - 114 # nf-density-sel env 4
@@ -300,10 +314,14 @@
         - 139 # nf-density-sel env 4
 
     plot-vpp-nfv-2n-skx-mrr:
+      # TODO: Replace:
+      # csit-vpp-perf-report-iterative-2009-2n-skx:
       csit-vpp-perf-report-iterative-2005-2n-skx:
         - 115 # nf-density-sel env 4
 
     plot-vpp-nfv-reconf-2n-skx:
+      # TODO: Replace:
+      # csit-vpp-perf-report-iterative-2009-2n-skx:
       csit-vpp-perf-report-iterative-2005-2n-skx:
         - 106 # Reconf env 4
         - 107 # Reconf env 4
@@ -317,6 +335,8 @@
         - 121 # Reconf env 4
 
     plot-dpdk-throughput-latency-2n-skx:
+      # TODO: Replace:
+      # csit-dpdk-perf-report-iterative-2009-2n-skx:
       csit-dpdk-perf-report-iterative-2005-2n-skx:
         - 20  # NDRPDR iter
         - 21  # NDRPDR iter
@@ -330,12 +350,16 @@
         - 29  # NDRPDR iter
 
     plot-dpdk-hdrh-lat-2n-skx:
+      # TODO: Replace:
+      # csit-dpdk-perf-report-iterative-2009-2n-skx:
       csit-dpdk-perf-report-iterative-2005-2n-skx:
         - 20  # NDRPDR iter
 
     # 2n-clx
 
     plot-vpp-throughput-lat-tsa-2n-clx:
+      # TODO: Replace:
+      # csit-vpp-perf-report-iterative-2009-2n-clx:
       csit-vpp-perf-report-iterative-2005-2n-clx:
         - 62  # NDRPDR sel env 4
         - 63  # NDRPDR sel env 4
@@ -349,10 +373,14 @@
         - 104 # NDRPDR sel env 4
 
     plot-vpp-hdrh-lat-2n-clx:
+      # TODO: Replace:
+      # csit-vpp-perf-report-iterative-2009-2n-clx:
       csit-vpp-perf-report-iterative-2005-2n-clx:
         - 70  # NDRPDR sel env 4
 
     plot-vpp-nfv-2n-clx-ndrpdr:
+      # TODO: Replace:
+      # csit-vpp-perf-report-iterative-2009-2n-clx:
       csit-vpp-perf-report-iterative-2005-2n-clx:
         - 91  # nfv-density-00 env 4
         - 92  # nfv-density-00 env 4
@@ -366,10 +394,14 @@
         - 108 # nfv-density-00 env 4
 
     plot-vpp-nfv-2n-clx-mrr:
+      # TODO: Replace:
+      # csit-vpp-perf-report-iterative-2009-2n-clx:
       csit-vpp-perf-report-iterative-2005-2n-clx:
         - 96  # MRR
 
     plot-vpp-nfv-reconf-2n-clx:
+      # TODO: Replace:
+      # csit-vpp-perf-report-iterative-2009-2n-clx:
       csit-vpp-perf-report-iterative-2005-2n-clx:
         - 81  # Reconf env 4
         - 82  # Reconf env 4
@@ -383,11 +415,15 @@
         - 90  # Reconf env 4
 
     plot-vpp-soak-2n-clx:
+      # TODO: Replace:
+      # csit-vpp-perf-report-iterative-2009-2n-clx:
       csit-vpp-perf-report-iterative-2005-2n-clx:
         - 101 # Soak
         - 102 # Soak
 
     plot-dpdk-throughput-latency-2n-clx:
+      # TODO: Replace:
+      # csit-dpdk-perf-report-iterative-2009-2n-clx:
       csit-dpdk-perf-report-iterative-2005-2n-clx:
         - 20  # NDRPDR iter
         - 21  # NDRPDR iter
@@ -401,12 +437,16 @@
         - 29  # NDRPDR iter
 
     plot-dpdk-hdrh-lat-2n-clx:
+      # TODO: Replace:
+      # csit-dpdk-perf-report-iterative-2009-2n-clx:
       csit-dpdk-perf-report-iterative-2005-2n-clx:
         - 21  # NDRPDR iter
 
     # 3n-tsh
 
     plot-vpp-throughput-lat-tsa-3n-tsh:
+      # TODO: Replace:
+      # csit-vpp-perf-report-iterative-2009-3n-tsh:
       csit-vpp-perf-report-iterative-2005-3n-tsh:
         - 23  # NDRPDR sel env 4
         - 25  # NDRPDR sel env 4
@@ -420,20 +460,28 @@
         - 40  # NDRPDR sel env 4
 
     plot-vpp-hdrh-lat-3n-tsh:
+      # TODO: Replace:
+      # csit-vpp-perf-report-iterative-2009-3n-tsh:
       csit-vpp-perf-report-iterative-2005-3n-tsh:
         - 35  # NDRPDR sel env 4
 
     plot-dpdk-throughput-latency-3n-tsh:
+      # TODO: Replace:
+      # csit-dpdk-perf-report-iterative-2009-3n-tsh:
       csit-dpdk-perf-report-iterative-2005-3n-tsh:
         - 5   # NDRPDR sel
 
     plot-dpdk-hdrh-lat-3n-tsh:
+      # TODO: Replace:
+      # csit-dpdk-perf-report-iterative-2009-3n-tsh:
       csit-dpdk-perf-report-iterative-2005-3n-tsh:
         - 5   # NDRPDR sel
 
     # 3n-dnv
 
     plot-vpp-throughput-lat-tsa-3n-dnv:
+      # TODO: Replace:
+      # csit-vpp-perf-report-iterative-2009-3n-dnv:
       csit-vpp-perf-report-iterative-2005-3n-dnv:
         - 2   # NDRPDR sel
         - 3   # NDRPDR sel
@@ -447,6 +495,8 @@
         - 12  # NDRPDR sel
 
     plot-dpdk-throughput-latency-3n-dnv:
+      # TODO: Replace:
+      # csit-dpdk-perf-report-iterative-2009-3n-dnv:
       csit-dpdk-perf-report-iterative-2005-3n-dnv:
         - 6   # NDRPDR sel
         - 7   # NDRPDR sel
@@ -462,6 +512,8 @@
     # 2n-dnv
 
     plot-vpp-throughput-lat-tsa-2n-dnv:
+      # TODO: Replace:
+      # csit-vpp-perf-report-iterative-2009-2n-dnv:
       csit-vpp-perf-report-iterative-2005-2n-dnv:
         - 3   # NDRPDR sel
         - 6   # NDRPDR sel
@@ -475,6 +527,8 @@
         - 14  # NDRPDR sel
 
     plot-dpdk-throughput-latency-2n-dnv:
+      # TODO: Replace:
+      # csit-dpdk-perf-report-iterative-2009-2n-dnv:
       csit-dpdk-perf-report-iterative-2005-2n-dnv:
         - 8   # NDRPDR sel
         - 9   # NDRPDR sel
@@ -493,6 +547,8 @@
     # NIC Comparisons
 
     vpp-nic-comparison-3n-skx:
+      # TODO: Replace:
+      # csit-vpp-perf-report-iterative-2009-3n-skx:
       csit-vpp-perf-report-iterative-2005-3n-skx:
         - 42  # NDRPDR sel env 4
         - 43  # NDRPDR sel env 4
@@ -506,6 +562,8 @@
         - 62  # NDRPDR sel env 4
 
     vpp-nic-comparison-2n-skx:
+      # TODO: Replace:
+      # csit-vpp-perf-report-iterative-2009-2n-skx:
       csit-vpp-perf-report-iterative-2005-2n-skx:
         - 88  # NDRPDR sel env 4
         - 89  # NDRPDR sel env 4
@@ -519,16 +577,22 @@
         - 127 # NDRPDR sel env 4
 
     vpp-nic-comparison-3n-skx-mrr:
+      # TODO: Replace:
+      # csit-vpp-perf-report-iterative-2009-3n-skx:
       csit-vpp-perf-report-iterative-2005-3n-skx:
         - 49  # MRR sel env 4
 
     vpp-nic-comparison-2n-skx-mrr:
+      # TODO: Replace:
+      # csit-vpp-perf-report-iterative-2009-2n-skx:
       csit-vpp-perf-report-iterative-2005-2n-skx:
         - 99  # MRR sel env 4
 
     # Results
 
     vpp-perf-results-3n-hsw:
+      # TODO: Replace:
+      # csit-vpp-perf-report-coverage-2009-3n-hsw:
       csit-vpp-perf-report-coverage-2005-3n-hsw:
         - 74  # crypto-00
         - 75  # crypto-01
@@ -568,6 +632,8 @@
         - 109 # vhost-02
 
     vpp-perf-results-3n-skx:
+      # TODO: Replace:
+      # csit-vpp-perf-report-coverage-2009-3n-skx:
       csit-vpp-perf-report-coverage-2005-3n-skx:
         - 45  # crypto-00
         - 46  # crypto-01
@@ -608,6 +674,8 @@
         - 83  # vhost-03
 
     vpp-perf-results-2n-skx:
+      # TODO: Replace:
+      # csit-vpp-perf-report-coverage-2009-2n-skx:
       csit-vpp-perf-report-coverage-2005-2n-skx:
         - 28  # ip4-00
         - 29  # ip4-01
@@ -626,6 +694,8 @@
         - 42  # vts-00
 
     vpp-perf-results-2n-clx:
+      # TODO: Replace:
+      # csit-vpp-perf-report-coverage-2009-2n-clx:
       csit-vpp-perf-report-coverage-2005-2n-clx:
         - 24  # ip4-00
         - 25  # ip4-01
@@ -644,10 +714,14 @@
         - 40  # vts-00
 
     vpp-perf-results-3n-tsh:
+      # TODO: Replace:
+      # csit-vpp-perf-report-iterative-2009-3n-tsh:
       csit-vpp-perf-report-iterative-2005-3n-tsh:
         - 35  # NDRPDR sel env 4
 
     vpp-perf-results-3n-dnv:
+      # TODO: Replace:
+      # csit-vpp-perf-report-coverage-2009-3n-dnv:
       csit-vpp-perf-report-coverage-2005-3n-dnv:
         - 1   # perf-full-3n-dnv-crypto_I
         - 24  # perf-full-3n-dnv-crypto_II
@@ -660,6 +734,8 @@
         - 23  # perf-full-3n-dnv-ip4-tunnels_I
 
     vpp-perf-results-2n-dnv:
+      # TODO: Replace:
+      # csit-vpp-perf-report-coverage-2009-2n-dnv:
       csit-vpp-perf-report-coverage-2005-2n-dnv:
         - 1   # perf-full-2n-dnv-ip4_I
         - 2   # perf-full-2n-dnv-ip4_II
@@ -669,62 +745,92 @@
         - 6   # perf-full-2n-dnv-l2_II
 
     vpp-mrr-results-3n-hsw:
+      # TODO: Replace:
+      # csit-vpp-perf-report-iterative-2009-3n-hsw:
       csit-vpp-perf-report-iterative-2005-3n-hsw:
         - 30  # MRR env 4
 
     vpp-mrr-results-3n-skx:
+      # TODO: Replace:
+      # csit-vpp-perf-report-iterative-2009-3n-skx:
       csit-vpp-perf-report-iterative-2005-3n-skx:
         - 49  # MRR sel env 4
 
     vpp-mrr-results-2n-skx:
+      # TODO: Replace:
+      # csit-vpp-perf-report-iterative-2009-2n-skx:
       csit-vpp-perf-report-iterative-2005-2n-skx:
         - 99  # MRR sel env 4
 
     vpp-mrr-results-2n-clx:
+      # TODO: Replace:
+      # csit-vpp-perf-report-iterative-2009-2n-clx:
       csit-vpp-perf-report-iterative-2005-2n-clx:
         - 72  # MRR env 4
 
     vpp-mrr-results-3n-tsh:
+      # TODO: Replace:
+      # csit-vpp-perf-report-iterative-2009-3n-tsh:
       csit-vpp-perf-report-iterative-2005-3n-tsh:
         - 27  # MRR sel env 4
 
     vpp-mrr-results-3n-dnv:
+      # TODO: Replace:
+      # csit-vpp-perf-report-iterative-2009-3n-dnv:
       csit-vpp-perf-report-iterative-2005-3n-dnv:
         - 8   # MRR
 
     vpp-mrr-results-2n-dnv:
+      # TODO: Replace:
+      # csit-vpp-perf-report-iterative-2009-2n-dnv:
       csit-vpp-perf-report-iterative-2005-2n-dnv:
         - 15  # MRR sel
 
     vpp-device-results-ubuntu:
+      # TODO: Replace:
+      # csit-vpp-device-2009-ubuntu1804-1n-skx:
       csit-vpp-device-2005-ubuntu1804-1n-skx:
         - 35
 
     dpdk-perf-results-3n-hsw:
+      # TODO: Replace:
+      # csit-dpdk-perf-report-iterative-2009-3n-hsw:
       csit-dpdk-perf-report-iterative-2005-3n-hsw:
         - 25  # NDRPDR iter
 
     dpdk-perf-results-3n-skx:
+      # TODO: Replace:
+      # csit-dpdk-perf-report-iterative-2009-3n-skx:
       csit-dpdk-perf-report-iterative-2005-3n-skx:
         - 28  # NDRPDR iter
 
     dpdk-perf-results-2n-skx:
+      # TODO: Replace:
+      # csit-dpdk-perf-report-iterative-2009-2n-skx:
       csit-dpdk-perf-report-iterative-2005-2n-skx:
         - 20  # NDRPDR iter
 
     dpdk-perf-results-2n-clx:
+      # TODO: Replace:
+      # csit-dpdk-perf-report-iterative-2009-2n-clx:
       csit-dpdk-perf-report-iterative-2005-2n-clx:
         - 21  # NDRPDR iter
 
     dpdk-perf-results-2n-dnv:
+      # TODO: Replace:
+      # csit-dpdk-perf-report-iterative-2009-2n-dnv:
       csit-dpdk-perf-report-iterative-2005-2n-dnv:
         - 8   # NDRPDR sel
 
     dpdk-perf-results-3n-dnv:
+      # TODO: Replace:
+      # csit-dpdk-perf-report-iterative-2009-3n-dnv:
       csit-dpdk-perf-report-iterative-2005-3n-dnv:
         - 6   # NDRPDR sel
 
     dpdk-perf-results-3n-tsh:
+      # TODO: Replace:
+      # csit-dpdk-perf-report-iterative-2009-3n-tsh:
       csit-dpdk-perf-report-iterative-2005-3n-tsh:
         - 5   # NDRPDR sel
 
@@ -734,42 +840,15 @@
     # Performance changes
 
     vpp-performance-changes-3n-hsw-h1:
-      csit-vpp-perf-verify-1908-3n-hsw:
-        - 12  # NDRPDR sel
-        - 13  # NDRPDR sel
-        - 14  # NDRPDR sel
-        - 15  # NDRPDR sel
-        - 16  # NDRPDR sel
-        - 17  # NDRPDR sel
-        - 18  # NDRPDR sel
-        - 19  # NDRPDR sel
-        - 20  # NDRPDR sel
-        - 21  # NDRPDR sel
-    vpp-performance-changes-3n-hsw-ref:
-      csit-vpp-perf-verify-2001-3n-hsw:
-        - 21  # NDRPDR sel
-        - 22  # NDRPDR sel
-        - 23  # NDRPDR sel
-        - 24  # NDRPDR sel
-        - 25  # NDRPDR sel
-        - 29  # NDRPDR sel
-        - 30  # NDRPDR sel
-        - 31  # NDRPDR sel
-        - 32  # NDRPDR sel
-        - 34  # NDRPDR sel
-    vpp-performance-changes-3n-hsw-cmp:
       csit-vpp-perf-report-iterative-2005-3n-hsw:
-        - 3   # NDRPDR sel
-        - 4   # NDRPDR sel
-        - 5   # NDRPDR sel
-        - 10  # NDRPDR sel
-        - 11  # NDRPDR sel
-        - 12  # NDRPDR sel
-        - 15  # NDRPDR sel
-        - 16  # NDRPDR sel
-        - 18  # NDRPDR sel
-        - 19  # NDRPDR sel
-    vpp-performance-changes-3n-hsw-cmp-2:
+        - 31  # NDRPDR sel 2001.0-4
+        - 32  # NDRPDR sel 2001.0-4
+        - 33  # NDRPDR sel 2001.0-4
+        - 34  # NDRPDR sel 2001.0-4
+        - 35  # NDRPDR sel 2001.0-4
+        - 36  # NDRPDR sel 2001.0-4
+        - 38  # NDRPDR sel 2001.0-4
+    vpp-performance-changes-3n-hsw-ref:
       csit-vpp-perf-report-iterative-2005-3n-hsw:
         - 20  # NDRPDR sel env 4
         - 21  # NDRPDR sel env 4
@@ -781,50 +860,29 @@
         - 27  # NDRPDR sel env 4
         - 28  # NDRPDR sel env 4
         - 29  # NDRPDR sel env 4
-    vpp-performance-changes-3n-hsw-cmp-2001.0-4:
+    vpp-performance-changes-3n-hsw-cmp:
+      # TODO: Replace:
+      # csit-vpp-perf-report-iterative-2009-3n-hsw:
       csit-vpp-perf-report-iterative-2005-3n-hsw:
-        - 31  # NDRPDR sel 2001.0-4
-        - 32  # NDRPDR sel 2001.0-4
-        - 33  # NDRPDR sel 2001.0-4
-        - 34  # NDRPDR sel 2001.0-4
-        - 35  # NDRPDR sel 2001.0-4
-        - 36  # NDRPDR sel 2001.0-4
-        - 38  # NDRPDR sel 2001.0-4
+        - 20  # NDRPDR sel env 4
+        - 21  # NDRPDR sel env 4
+        - 22  # NDRPDR sel env 4
+        - 23  # NDRPDR sel env 4
+        - 24  # NDRPDR sel env 4
+        - 25  # NDRPDR sel env 4
+        - 26  # NDRPDR sel env 4
+        - 27  # NDRPDR sel env 4
+        - 28  # NDRPDR sel env 4
+        - 29  # NDRPDR sel env 4
 
     vpp-performance-changes-3n-skx-h1:
-      csit-vpp-perf-verify-1908_1-3n-skx:
-        - 26  # NDRPDR sel - new1908.1
-        - 27  # NDRPDR sel - new1908.1
-        - 28  # NDRPDR sel - new1908.1
-        - 29  # NDRPDR sel - new1908.1
-        - 30  # NDRPDR sel - new1908.1
-        - 31  # NDRPDR sel - new1908.1
-        - 33  # NDRPDR sel - new1908.1
-        - 34  # NDRPDR sel - new1908.1
-        - 35  # NDRPDR sel - new1908.1
-        - 36  # NDRPDR sel - new1908.1
-    vpp-performance-changes-3n-skx-ref:
-      csit-vpp-perf-verify-2001-3n-skx:
-        - 69  # NDRPDR sel - new2001.0
-        - 71  # NDRPDR sel - new2001.0
-        - 72  # NDRPDR sel - new2001.0
-        - 76  # NDRPDR sel - new2001.0
-        - 77  # NDRPDR sel - new2001.0
-        - 78  # NDRPDR sel - new2001.0
-        - 80  # NDRPDR sel - new2001.0
-    vpp-performance-changes-3n-skx-cmp:
       csit-vpp-perf-report-iterative-2005-3n-skx:
-        - 4   # NDRPDR sel
-        - 5   # NDRPDR sel ??? all x710 failed
-        - 33  # NDRPDR sel
-        - 28  # NDRPDR sel
-        - 34  # NDRPDR sel
-        - 36  # NDRPDR sel
-        - 37  # NDRPDR sel
-        - 38  # NDRPDR sel
-        - 39  # NDRPDR sel
-        - 41  # NDRPDR sel
-    vpp-performance-changes-3n-skx-cmp-2:
+        - 50  # NDRPDR sel 2001.0-4
+        - 51  # NDRPDR sel 2001.0-4
+        - 52  # NDRPDR sel 2001.0-4
+        - 53  # NDRPDR sel 2001.0-4
+        - 54  # NDRPDR sel 2001.0-4
+    vpp-performance-changes-3n-skx-ref:
       csit-vpp-perf-report-iterative-2005-3n-skx:
         - 42  # NDRPDR sel env 4
         - 43  # NDRPDR sel env 4
@@ -836,51 +894,30 @@
         - 57  # NDRPDR sel env 4
         - 61  # NDRPDR sel env 4
         - 62  # NDRPDR sel env 4
-    vpp-performance-changes-3n-skx-cmp-2001.0-4:
+    vpp-performance-changes-3n-skx-cmp:
+      # TODO: Replace:
+      # csit-vpp-perf-report-iterative-2009-3n-skx:
       csit-vpp-perf-report-iterative-2005-3n-skx:
-        - 50  # NDRPDR sel 2001.0-4
-        - 51  # NDRPDR sel 2001.0-4
-        - 52  # NDRPDR sel 2001.0-4
-        - 53  # NDRPDR sel 2001.0-4
-        - 54  # NDRPDR sel 2001.0-4
+        - 42  # NDRPDR sel env 4
+        - 43  # NDRPDR sel env 4
+        - 44  # NDRPDR sel env 4
+        - 45  # NDRPDR sel env 4
+        - 47  # NDRPDR sel env 4
+        - 55  # NDRPDR sel env 4
+        - 56  # NDRPDR sel env 4
+        - 57  # NDRPDR sel env 4
+        - 61  # NDRPDR sel env 4
+        - 62  # NDRPDR sel env 4
 
     vpp-performance-changes-2n-skx-h1:
-      csit-vpp-perf-verify-1908_1-2n-skx:
-        - 39  # NDRPDR sel - new1908.1
-        - 40  # NDRPDR sel - new1908.1
-        - 41  # NDRPDR sel - new1908.1
-        - 43  # NDRPDR sel - new1908.1
-        - 44  # NDRPDR sel - new1908.1
-        - 45  # NDRPDR sel - new1908.1
-        - 46  # NDRPDR sel - new1908.1
-        - 47  # NDRPDR sel - new1908.1
-        - 48  # NDRPDR sel - new1908.1
-        - 49  # NDRPDR sel - new1908.1
-    vpp-performance-changes-2n-skx-ref:
-      csit-vpp-perf-verify-2001-2n-skx:
-        - 143  # NDRPDR sel - new2001.0
-        - 146  # NDRPDR sel - new2001.0
-        - 147  # NDRPDR sel - new2001.0
-        - 148  # NDRPDR sel - new2001.0
-        - 149  # NDRPDR sel - new2001.0
-        - 150  # NDRPDR sel - new2001.0
-        - 151  # NDRPDR sel - new2001.0
-        - 152  # NDRPDR sel - new2001.0
-        - 153  # NDRPDR sel - new2001.0
-        - 154  # NDRPDR sel - new2001.0
-    vpp-performance-changes-2n-skx-cmp:
       csit-vpp-perf-report-iterative-2005-2n-skx:
-        - 43  # NDRPDR sel
-        - 38  # NDRPDR sel
-        - 7   # NDRPDR sel
-        - 65  # NDRPDR sel
-        - 47  # NDRPDR sel
-        - 55  # NDRPDR sel
-        - 67  # NDRPDR sel
-        - 75  # NDRPDR sel
-        - 76  # NDRPDR sel
-        - 73  # NDRPDR sel
-    vpp-performance-changes-2n-skx-cmp-2:
+        - 100 # NDRPDR sel 2001.0-4
+        - 101 # NDRPDR sel 2001.0-4
+        - 102 # NDRPDR sel 2001.0-4
+        - 103 # NDRPDR sel 2001.0-4
+        - 104 # NDRPDR sel 2001.0-4
+        - 105 # NDRPDR sel 2001.0-4
+    vpp-performance-changes-2n-skx-ref:
       csit-vpp-perf-report-iterative-2005-2n-skx:
         - 88  # NDRPDR sel env 4
         - 89  # NDRPDR sel env 4
@@ -892,52 +929,32 @@
         - 125 # NDRPDR sel env 4
         - 126 # NDRPDR sel env 4
         - 127 # NDRPDR sel env 4
-    vpp-performance-changes-2n-skx-cmp-2001.0-4:
+    vpp-performance-changes-2n-skx-cmp:
+      # TODO: Replace:
+      # csit-vpp-perf-report-iterative-2009-2n-skx:
       csit-vpp-perf-report-iterative-2005-2n-skx:
-        - 100 # NDRPDR sel 2001.0-4
-        - 101 # NDRPDR sel 2001.0-4
-        - 102 # NDRPDR sel 2001.0-4
-        - 103 # NDRPDR sel 2001.0-4
-        - 104 # NDRPDR sel 2001.0-4
-        - 105 # NDRPDR sel 2001.0-4
-
-#    vpp-performance-changes-nfv-2n-skx-ref:
-#      csit-vpp-perf-verify-2001-2n-skx:
-#        - 30  # NFV
-#        - 31  # NFV
-#    vpp-performance-changes-nfv-2n-skx-cmp:
-#      csit-vpp-perf-report-iterative-2005-2n-skx:
-#        - 43  # NDRPDR sel
-#        - 38  # NDRPDR sel
-#        - 7   # NDRPDR sel
-#        - 78  # nf-density-sel
-#        - 83  # nf-density-sel
+        - 88  # NDRPDR sel env 4
+        - 89  # NDRPDR sel env 4
+        - 90  # NDRPDR sel env 4
+        - 91  # NDRPDR sel env 4
+        - 92  # NDRPDR sel env 4
+        - 93  # NDRPDR sel env 4
+        - 94  # NDRPDR sel env 4
+        - 125 # NDRPDR sel env 4
+        - 126 # NDRPDR sel env 4
+        - 127 # NDRPDR sel env 4
 
-    vpp-performance-changes-2n-clx-ref:
-      csit-vpp-perf-verify-2001-2n-clx:
-        - 28  # NDRPDR sel
-        - 29  # NDRPDR sel
-        - 32  # NDRPDR sel
-        - 40  # NDRPDR sel
-        - 43  # NDRPDR sel
-        - 44  # NDRPDR sel
-        - 45  # NDRPDR sel
-        - 47  # NDRPDR sel
-        - 48  # NDRPDR sel
-        - 49  # NDRPDR sel
-    vpp-performance-changes-2n-clx-cmp:
+    vpp-performance-changes-2n-clx-h1:
       csit-vpp-perf-report-iterative-2005-2n-clx:
-        - 7   # NDRPDR sel
-        - 38  # NDRPDR sel
-        - 9   # NDRPDR sel
-        - 32  # NDRPDR sel ???
-        - 33  # NDRPDR sel ???
-        - 39  # NDRPDR sel
-        - 40  # NDRPDR sel
-        - 43  # NDRPDR sel
-        - 50  # NDRPDR sel
-        - 51  # NDRPDR sel
-    vpp-performance-changes-2n-clx-cmp-2:
+        - 73  # NDRPDR sel 2001.0-4
+        - 74  # NDRPDR sel 2001.0-4
+        - 75  # NDRPDR sel 2001.0-4
+        - 76  # NDRPDR sel 2001.0-4
+        - 77  # NDRPDR sel 2001.0-4
+        - 78  # NDRPDR sel 2001.0-4
+        - 79  # NDRPDR sel 2001.0-4
+        - 80  # NDRPDR sel 2001.0-4
+    vpp-performance-changes-2n-clx-ref:
       csit-vpp-perf-report-iterative-2005-2n-clx:
         - 62  # NDRPDR sel env 4
         - 63  # NDRPDR sel env 4
@@ -949,30 +966,22 @@
         - 70  # NDRPDR sel env 4
         - 103 # NDRPDR sel env 4
         - 104 # NDRPDR sel env 4
-    vpp-performance-changes-2n-clx-cmp-2001.0-4:
+    vpp-performance-changes-2n-clx-cmp:
+      # TODO: Replace:
+      # csit-vpp-perf-report-iterative-2009-2n-clx:
       csit-vpp-perf-report-iterative-2005-2n-clx:
-        - 73  # NDRPDR sel 2001.0-4
-        - 74  # NDRPDR sel 2001.0-4
-        - 75  # NDRPDR sel 2001.0-4
-        - 76  # NDRPDR sel 2001.0-4
-        - 77  # NDRPDR sel 2001.0-4
-        - 78  # NDRPDR sel 2001.0-4
-        - 79  # NDRPDR sel 2001.0-4
-        - 80  # NDRPDR sel 2001.0-4
+        - 62  # NDRPDR sel env 4
+        - 63  # NDRPDR sel env 4
+        - 64  # NDRPDR sel env 4
+        - 65  # NDRPDR sel env 4
+        - 66  # NDRPDR sel env 4
+        - 68  # NDRPDR sel env 4
+        - 69  # NDRPDR sel env 4
+        - 70  # NDRPDR sel env 4
+        - 103 # NDRPDR sel env 4
+        - 104 # NDRPDR sel env 4
 
     vpp-performance-changes-2n-dnv-h1:
-      csit-vpp-perf-verify-1908-2n-dnv:
-        - 1   # NDRPDR sel
-        - 2   # NDRPDR sel
-        - 3   # NDRPDR sel
-        - 4   # NDRPDR sel
-        - 5   # NDRPDR sel
-        - 6   # NDRPDR sel
-        - 7   # NDRPDR sel
-        - 8   # NDRPDR sel
-        - 9   # NDRPDR sel
-        - 10  # NDRPDR sel
-    vpp-performance-changes-2n-dnv-ref:
       csit-vpp-perf-verify-2001-2n-dnv:
         - 4   # NDRPDR sel
         - 5   # NDRPDR sel
@@ -984,7 +993,7 @@
         - 11  # NDRPDR sel
         - 13  # NDRPDR sel
         - 16  # NDRPDR sel
-    vpp-performance-changes-2n-dnv-cmp:
+    vpp-performance-changes-2n-dnv-ref:
       csit-vpp-perf-report-iterative-2005-2n-dnv:
         - 3   # NDRPDR sel
         - 6   # NDRPDR sel
@@ -996,20 +1005,22 @@
         - 12  # NDRPDR sel
         - 13  # NDRPDR sel
         - 14  # NDRPDR sel
-
-    vpp-performance-changes-3n-dnv-h1:
-      csit-vpp-perf-verify-1908-3n-dnv:
+    vpp-performance-changes-2n-dnv-cmp:
+      # TODO: Replace:
+      # csit-vpp-perf-report-iterative-2009-2n-dnv:
+      csit-vpp-perf-report-iterative-2005-2n-dnv:
+        - 3   # NDRPDR sel
         - 6   # NDRPDR sel
         - 7   # NDRPDR sel
         - 8   # NDRPDR sel
         - 9   # NDRPDR sel
         - 10  # NDRPDR sel
+        - 11  # NDRPDR sel
         - 12  # NDRPDR sel
         - 13  # NDRPDR sel
         - 14  # NDRPDR sel
-        - 15  # NDRPDR sel
-        - 16  # NDRPDR sel
-    vpp-performance-changes-3n-dnv-ref:
+
+    vpp-performance-changes-3n-dnv-h1:
       csit-vpp-perf-verify-2001-3n-dnv:
         - 5   # NDRPDR sel
         - 6   # NDRPDR sel
@@ -1021,7 +1032,7 @@
         - 16  # NDRPDR sel
         - 17  # NDRPDR sel
         - 18  # NDRPDR sel
-    vpp-performance-changes-3n-dnv-cmp:
+    vpp-performance-changes-3n-dnv-ref:
       csit-vpp-perf-report-iterative-2005-3n-dnv:
         - 2   # NDRPDR sel
         - 3   # NDRPDR sel
@@ -1033,40 +1044,27 @@
         - 10  # NDRPDR sel
         - 11  # NDRPDR sel
         - 12  # NDRPDR sel
-
-    vpp-performance-changes-3n-tsh-h1:
-      csit-vpp-perf-verify-1908-3n-tsh:
-        - 7   # NDRPDR sel
-        - 8   # NDRPDR sel
-        - 9   # NDRPDR sel
-        - 10  # NDRPDR sel
-        - 11  # NDRPDR sel
-        - 12  # NDRPDR sel
-        - 13  # NDRPDR sel
-        - 14  # NDRPDR sel
-        - 15  # NDRPDR sel
-        - 16  # NDRPDR sel
-    vpp-performance-changes-3n-tsh-ref:
-      csit-vpp-perf-verify-2001-3n-tsh:
+    vpp-performance-changes-3n-dnv-cmp:
+      # TODO: Replace:
+      # csit-vpp-perf-report-iterative-2009-3n-dnv:
+      csit-vpp-perf-report-iterative-2005-3n-dnv:
+        - 2   # NDRPDR sel
         - 3   # NDRPDR sel
         - 4   # NDRPDR sel
+        - 5   # NDRPDR sel
+        - 6   # NDRPDR sel
         - 7   # NDRPDR sel
-        - 8   # NDRPDR sel
-        - 10  # NDRPDR sel
-        - 12  # NDRPDR sel
-        - 13  # NDRPDR sel
-        - 14  # NDRPDR sel
-        - 15  # NDRPDR sel
-        - 21  # NDRPDR sel
-    vpp-performance-changes-3n-tsh-cmp:
-      csit-vpp-perf-report-iterative-2005-3n-tsh:
         - 9   # NDRPDR sel
+        - 10  # NDRPDR sel
         - 11  # NDRPDR sel
         - 12  # NDRPDR sel
-        - 20  # NDRPDR sel
-        - 14  # NDRPDR sel
-        - 21  # NDRPDR sel
-    vpp-performance-changes-3n-tsh-cmp-2:
+
+    vpp-performance-changes-3n-tsh-h1:
+      csit-vpp-perf-report-iterative-2005-3n-tsh:
+        - 28  # NDRPDR sel 2001.0-4
+        - 29  # NDRPDR sel 2001.0-4
+        - 31  # NDRPDR sel 2001.0-4
+    vpp-performance-changes-3n-tsh-ref:
       csit-vpp-perf-report-iterative-2005-3n-tsh:
         - 23  # NDRPDR sel env 4
         - 25  # NDRPDR sel env 4
@@ -1078,13 +1076,24 @@
         - 38  # NDRPDR sel env 4
         - 39  # NDRPDR sel env 4
         - 40  # NDRPDR sel env 4
-    vpp-performance-changes-3n-tsh-cmp-2001.0-4:
+    vpp-performance-changes-3n-tsh-cmp:
+      # TODO: Replace:
+      # csit-vpp-perf-report-iterative-2009-3n-tsh:
       csit-vpp-perf-report-iterative-2005-3n-tsh:
-        - 28  # NDRPDR sel 2001.0-4
-        - 29  # NDRPDR sel 2001.0-4
-        - 31  # NDRPDR sel 2001.0-4
+        - 23  # NDRPDR sel env 4
+        - 25  # NDRPDR sel env 4
+        - 33  # NDRPDR sel env 4
+        - 34  # NDRPDR sel env 4
+        - 35  # NDRPDR sel env 4
+        - 36  # NDRPDR sel env 4
+        - 37  # NDRPDR sel env 4
+        - 38  # NDRPDR sel env 4
+        - 39  # NDRPDR sel env 4
+        - 40  # NDRPDR sel env 4
 
     vpp-soak-vs-ndr-2n-skx-ref:
+      # TODO: Replace:
+      # csit-vpp-perf-report-iterative-2009-2n-skx:
       csit-vpp-perf-report-iterative-2005-2n-skx:
         - 88  # NDRPDR sel env 4
         - 89  # NDRPDR sel env 4
@@ -1097,10 +1106,14 @@
         - 126 # NDRPDR sel env 4
         - 127 # NDRPDR sel env 4
     vpp-soak-vs-ndr-2n-skx-cmp:
+      # TODO: Replace:
+      # csit-vpp-perf-report-iterative-2009-2n-skx:
       csit-vpp-perf-report-iterative-2005-2n-skx:
         - 122 # Soak
         - 123 # Soak
     vpp-soak-vs-ndr-2n-skx:
+      # TODO: Replace:
+      # csit-vpp-perf-report-iterative-2009-2n-skx:
       csit-vpp-perf-report-iterative-2005-2n-skx:
         - 88  # NDRPDR sel env 4
         - 89  # NDRPDR sel env 4
@@ -1116,6 +1129,8 @@
         - 123 # Soak
 
     vpp-soak-vs-ndr-2n-clx-ref:
+      # TODO: Replace:
+      # csit-vpp-perf-report-iterative-2009-2n-clx:
       csit-vpp-perf-report-iterative-2005-2n-clx:
         - 62  # NDRPDR sel env 4
         - 63  # NDRPDR sel env 4
@@ -1128,10 +1143,14 @@
         - 103 # NDRPDR sel env 4
         - 104 # NDRPDR sel env 4
     vpp-soak-vs-ndr-2n-clx-cmp:
+      # TODO: Replace:
+      # csit-vpp-perf-report-iterative-2009-2n-clx:
       csit-vpp-perf-report-iterative-2005-2n-clx:
         - 101 # Soak
         - 102 # Soak
     vpp-soak-vs-ndr-2n-clx:
+      # TODO: Replace:
+      # csit-vpp-perf-report-iterative-2009-2n-clx:
       csit-vpp-perf-report-iterative-2005-2n-clx:
         - 62  # NDRPDR sel env 4
         - 63  # NDRPDR sel env 4
@@ -1147,53 +1166,52 @@
         - 102 # Soak
 
     vpp-performance-changes-3n-hsw-mrr-h1:
-      csit-vpp-perf-verify-1908-3n-hsw:
-        - 39  # MRR sel
-    vpp-performance-changes-3n-hsw-mrr-ref:
       csit-vpp-perf-verify-2001-3n-hsw:
         - 17  # MRR sel
-    vpp-performance-changes-3n-hsw-mrr-cmp:
+    vpp-performance-changes-3n-hsw-mrr-ref:
       csit-vpp-perf-report-iterative-2005-3n-hsw:
-        - 13  # MRR
-    vpp-performance-changes-3n-hsw-mrr-cmp-2:
+        - 30  # MRR env 4
+    vpp-performance-changes-3n-hsw-mrr-cmp:
+      # TODO: Replace:
+      # csit-vpp-perf-report-iterative-2009-3n-hsw:
       csit-vpp-perf-report-iterative-2005-3n-hsw:
         - 30  # MRR env 4
 
-#    vpp-performance-changes-3n-skx-mrr-h1:
-#      csit-vpp-perf-verify-1908-3n-skx:
-#        - 36  # MRR sel
-    vpp-performance-changes-3n-skx-mrr-ref:
+    vpp-performance-changes-3n-skx-mrr-h1:
       csit-vpp-perf-verify-2001-3n-skx:
         - 50  # MRR sel
         - 53  # MRR sel addition
-    vpp-performance-changes-3n-skx-mrr-cmp:
+    vpp-performance-changes-3n-skx-mrr-ref:
       csit-vpp-perf-report-iterative-2005-3n-skx:
-        - 6   # MRR sel
-    vpp-performance-changes-3n-skx-mrr-cmp-2:
+        - 49  # MRR sel env 4
+    vpp-performance-changes-3n-skx-mrr-cmp:
+      # TODO: Replace:
+      # csit-vpp-perf-report-iterative-2009-3n-skx:
       csit-vpp-perf-report-iterative-2005-3n-skx:
         - 49  # MRR sel env 4
 
-#    vpp-performance-changes-2n-skx-mrr-h1:
-#      csit-vpp-perf-verify-1908-2n-skx:
-#        - 69  # MRR sel
-    vpp-performance-changes-2n-skx-mrr-ref:
+    vpp-performance-changes-2n-skx-mrr-h1:
       csit-vpp-perf-verify-2001-2n-skx:
         - 101 # MRR sel
         - 128 # MRR sel addition
-    vpp-performance-changes-2n-skx-mrr-cmp:
+    vpp-performance-changes-2n-skx-mrr-ref:
       csit-vpp-perf-report-iterative-2005-2n-skx:
-        - 42  # MRR sel
-    vpp-performance-changes-2n-skx-mrr-cmp-2:
+        - 99  # MRR sel env 4
+    vpp-performance-changes-2n-skx-mrr-cmp:
+      # TODO: Replace:
+      # csit-vpp-perf-report-iterative-2009-2n-skx:
       csit-vpp-perf-report-iterative-2005-2n-skx:
         - 99  # MRR sel env 4
 
-    vpp-performance-changes-2n-clx-mrr-ref:
+    vpp-performance-changes-2n-clx-mrr-h1:
       csit-vpp-perf-verify-2001-2n-clx:
         - 39  # MRR
-    vpp-performance-changes-2n-clx-mrr-cmp:
+    vpp-performance-changes-2n-clx-mrr-ref:
       csit-vpp-perf-report-iterative-2005-2n-clx:
-        - 12   # MRR
-    vpp-performance-changes-2n-clx-mrr-cmp-2:
+        - 72   # MRR sel env 4
+    vpp-performance-changes-2n-clx-mrr-cmp:
+      # TODO: Replace:
+      # csit-vpp-perf-report-iterative-2009-2n-clx:
       csit-vpp-perf-report-iterative-2005-2n-clx:
         - 72   # MRR sel env 4
 
@@ -1206,51 +1224,42 @@
 #        - 71  # NFV MRR
 
     vpp-performance-changes-2n-dnv-mrr-h1:
-      csit-vpp-perf-verify-1908-2n-dnv:
-        - 11  # MRR sel
-    vpp-performance-changes-2n-dnv-mrr-ref:
       csit-vpp-perf-verify-2001-2n-dnv:
         - 12  # MRR sel
+    vpp-performance-changes-2n-dnv-mrr-ref:
+      csit-vpp-perf-report-iterative-2005-2n-dnv:
+        - 15  # MRR sel
     vpp-performance-changes-2n-dnv-mrr-cmp:
+      # TODO: Replace:
+      # csit-vpp-perf-report-iterative-2009-2n-dnv:
       csit-vpp-perf-report-iterative-2005-2n-dnv:
         - 15  # MRR sel
 
     vpp-performance-changes-3n-dnv-mrr-h1:
-      csit-vpp-perf-verify-1908-3n-dnv:
-        - 17  # MRR sel
-    vpp-performance-changes-3n-dnv-mrr-ref:
       csit-vpp-perf-verify-2001-3n-dnv:
         - 11  # MRR sel
+    vpp-performance-changes-3n-dnv-mrr-ref:
+      csit-vpp-perf-report-iterative-2005-3n-dnv:
+        - 8   # MRR
     vpp-performance-changes-3n-dnv-mrr-cmp:
+      # TODO: Replace:
+      # csit-vpp-perf-report-iterative-2009-3n-dnv:
       csit-vpp-perf-report-iterative-2005-3n-dnv:
         - 8   # MRR
 
     vpp-performance-changes-3n-tsh-mrr-h1:
-      csit-vpp-perf-verify-1908-3n-tsh:
-        - 17  # MRR sel
-    vpp-performance-changes-3n-tsh-mrr-ref:
       csit-vpp-perf-verify-2001-3n-tsh:
         - 9   # MRR sel
-    vpp-performance-changes-3n-tsh-mrr-cmp:
+    vpp-performance-changes-3n-tsh-mrr-ref:
       csit-vpp-perf-report-iterative-2005-3n-tsh:
-        - 10  # MRR sel
-    vpp-performance-changes-3n-tsh-mrr-cmp-2:
+        - 27  # MRR sel env 4
+    vpp-performance-changes-3n-tsh-mrr-cmp:
+      # TODO: Replace:
+      # csit-vpp-perf-report-iterative-2009-3n-tsh:
       csit-vpp-perf-report-iterative-2005-3n-tsh:
         - 27  # MRR sel env 4
 
     dpdk-performance-changes-3n-hsw-h1:
-      csit-dpdk-perf-verify-1908-3n-hsw:
-        - 2   # NDRPDR sel
-        - 3   # NDRPDR sel
-        - 4   # NDRPDR sel
-        - 5   # NDRPDR sel
-        - 6   # NDRPDR sel
-        - 7   # NDRPDR sel
-        - 8   # NDRPDR sel
-        - 9   # NDRPDR sel
-        - 10  # NDRPDR sel
-        - 11  # NDRPDR sel
-    dpdk-performance-changes-3n-hsw-ref:
       csit-dpdk-perf-verify-2001-3n-hsw:
         - 4   # NDRPDR sel
         - 5   # NDRPDR sel
@@ -1272,7 +1281,21 @@
         - 22  # NDRPDR sel
         - 23  # NDRPDR sel
         - 24  # NDRPDR sel
+    dpdk-performance-changes-3n-hsw-ref:
+      csit-dpdk-perf-report-iterative-2005-3n-hsw:
+        - 25  # NDRPDR iter
+        - 26  # NDRPDR iter
+        - 27  # NDRPDR iter
+        - 28  # NDRPDR iter
+        - 29  # NDRPDR iter
+        - 30  # NDRPDR iter
+        - 31  # NDRPDR iter
+        - 32  # NDRPDR iter
+        - 33  # NDRPDR iter
+        - 34  # NDRPDR iter
     dpdk-performance-changes-3n-hsw-cmp:
+      # TODO: Replace:
+      # csit-dpdk-perf-report-iterative-2009-3n-hsw:
       csit-dpdk-perf-report-iterative-2005-3n-hsw:
         - 25  # NDRPDR iter
         - 26  # NDRPDR iter
@@ -1286,18 +1309,6 @@
         - 34  # NDRPDR iter
 
     dpdk-performance-changes-3n-skx-h1:
-      csit-dpdk-perf-verify-1908-3n-skx:
-        - 3   # NDRPDR sel
-        - 4   # NDRPDR sel
-        - 5   # NDRPDR sel
-        - 6   # NDRPDR sel
-        - 7   # NDRPDR sel
-        - 8   # NDRPDR sel
-        - 9   # NDRPDR sel
-        - 10  # NDRPDR sel
-        - 11  # NDRPDR sel
-        - 12  # NDRPDR sel
-    dpdk-performance-changes-3n-skx-ref:
       csit-dpdk-perf-verify-2001-3n-skx:
         - 29  # NDRPDR sel xxv710
         - 33  # NDRPDR sel xxv710
@@ -1319,7 +1330,21 @@
         - 46  # NDRPDR sel x710
         - 47  # NDRPDR sel x710
         - 48  # NDRPDR sel x710
+    dpdk-performance-changes-3n-skx-ref:
+      csit-dpdk-perf-report-iterative-2005-3n-skx:
+        - 28  # NDRPDR iter
+        - 29  # NDRPDR iter
+        - 30  # NDRPDR iter
+        - 31  # NDRPDR iter
+        - 32  # NDRPDR iter
+        - 33  # NDRPDR iter
+        - 34  # NDRPDR iter
+        - 35  # NDRPDR iter
+        - 36  # NDRPDR iter
+        - 37  # NDRPDR iter
     dpdk-performance-changes-3n-skx-cmp:
+      # TODO: Replace:
+      # csit-dpdk-perf-report-iterative-2009-3n-skx:
       csit-dpdk-perf-report-iterative-2005-3n-skx:
         - 28  # NDRPDR iter
         - 29  # NDRPDR iter
@@ -1333,18 +1358,6 @@
         - 37  # NDRPDR iter
 
     dpdk-performance-changes-2n-skx-h1:
-      csit-dpdk-perf-verify-1908-2n-skx:
-        - 2   # NDRPDR sel
-        - 3   # NDRPDR sel
-        - 4   # NDRPDR sel
-        - 5   # NDRPDR sel
-        - 7   # NDRPDR sel
-        - 8   # NDRPDR sel
-        - 9   # NDRPDR sel
-        - 10  # NDRPDR sel
-        - 11  # NDRPDR sel
-        - 12  # NDRPDR sel
-    dpdk-performance-changes-2n-skx-ref:
       csit-dpdk-perf-verify-2001-2n-skx:
         - 35  # NDRPDR sel xxv710
         - 36  # NDRPDR sel xxv710
@@ -1366,7 +1379,21 @@
         - 50  # NDRPDR sel x710
         - 51  # NDRPDR sel x710
         - 54  # NDRPDR sel x710
+    dpdk-performance-changes-2n-skx-ref:
+      csit-dpdk-perf-report-iterative-2005-2n-skx:
+        - 20  # NDRPDR iter
+        - 21  # NDRPDR iter
+        - 22  # NDRPDR iter
+        - 23  # NDRPDR iter
+        - 24  # NDRPDR iter
+        - 25  # NDRPDR iter
+        - 26  # NDRPDR iter
+        - 27  # NDRPDR iter
+        - 28  # NDRPDR iter
+        - 29  # NDRPDR iter
     dpdk-performance-changes-2n-skx-cmp:
+      # TODO: Replace:
+      # csit-dpdk-perf-report-iterative-2009-2n-skx:
       csit-dpdk-perf-report-iterative-2005-2n-skx:
         - 20  # NDRPDR iter
         - 21  # NDRPDR iter
@@ -1379,7 +1406,7 @@
         - 28  # NDRPDR iter
         - 29  # NDRPDR iter
 
-    dpdk-performance-changes-2n-clx-ref:
+    dpdk-performance-changes-2n-clx-h1:
       csit-dpdk-perf-verify-2001-2n-clx:
         - 15  # NDRPDR sel
         - 16  # NDRPDR sel
@@ -1401,7 +1428,21 @@
         - 32  # NDRPDR sel
         - 33  # NDRPDR sel
         - 34  # NDRPDR sel
+    dpdk-performance-changes-2n-clx-ref:
+      csit-dpdk-perf-report-iterative-2005-2n-clx:
+        - 20  # NDRPDR iter
+        - 21  # NDRPDR iter
+        - 22  # NDRPDR iter
+        - 23  # NDRPDR iter
+        - 24  # NDRPDR iter
+        - 25  # NDRPDR iter
+        - 26  # NDRPDR iter
+        - 27  # NDRPDR iter
+        - 28  # NDRPDR iter
+        - 29  # NDRPDR iter
     dpdk-performance-changes-2n-clx-cmp:
+      # TODO: Replace:
+      # csit-dpdk-perf-report-iterative-2009-2n-clx:
       csit-dpdk-perf-report-iterative-2005-2n-clx:
         - 20  # NDRPDR iter
         - 21  # NDRPDR iter
@@ -1414,7 +1455,7 @@
         - 28  # NDRPDR iter
         - 29  # NDRPDR iter
 
-    dpdk-performance-changes-2n-dnv-ref:
+    dpdk-performance-changes-2n-dnv-h1:
       csit-dpdk-perf-verify-2001-2n-dnv:
         - 9   # NDRPDR sel
         - 10  # NDRPDR sel
@@ -1426,7 +1467,21 @@
         - 16  # NDRPDR sel
         - 17  # NDRPDR sel
         - 18  # NDRPDR sel
+    dpdk-performance-changes-2n-dnv-ref:
+      csit-dpdk-perf-report-iterative-2005-2n-dnv:
+        - 8   # NDRPDR sel
+        - 9   # NDRPDR sel
+        - 10  # NDRPDR sel
+        - 11  # NDRPDR sel
+        - 12  # NDRPDR sel
+        - 13  # NDRPDR sel
+        - 14  # NDRPDR sel
+        - 15  # NDRPDR sel
+        - 16  # NDRPDR sel
+        - 17  # NDRPDR sel
     dpdk-performance-changes-2n-dnv-cmp:
+      # TODO: Replace:
+      # csit-dpdk-perf-report-iterative-2009-2n-dnv:
       csit-dpdk-perf-report-iterative-2005-2n-dnv:
         - 8   # NDRPDR sel
         - 9   # NDRPDR sel
@@ -1439,7 +1494,7 @@
         - 16  # NDRPDR sel
         - 17  # NDRPDR sel
 
-    dpdk-performance-changes-3n-dnv-ref:
+    dpdk-performance-changes-3n-dnv-h1:
       csit-dpdk-perf-verify-2001-3n-dnv:
         - 12  # NDRPDR sel
         - 13  # NDRPDR sel
@@ -1451,7 +1506,21 @@
         - 19  # NDRPDR sel
         - 20  # NDRPDR sel
         - 22  # NDRPDR sel
+    dpdk-performance-changes-3n-dnv-ref:
+      csit-dpdk-perf-report-iterative-2005-3n-dnv:
+        - 6   # NDRPDR sel
+        - 7   # NDRPDR sel
+        - 8   # NDRPDR sel
+        - 9   # NDRPDR sel
+        - 10  # NDRPDR sel
+        - 11  # NDRPDR sel
+        - 12  # NDRPDR sel
+        - 13  # NDRPDR sel
+        - 14  # NDRPDR sel
+        - 16  # NDRPDR sel
     dpdk-performance-changes-3n-dnv-cmp:
+      # TODO: Replace:
+      # csit-dpdk-perf-report-iterative-2009-3n-dnv:
       csit-dpdk-perf-report-iterative-2005-3n-dnv:
         - 6   # NDRPDR sel
         - 7   # NDRPDR sel
@@ -1464,7 +1533,7 @@
         - 14  # NDRPDR sel
         - 16  # NDRPDR sel
 
-    dpdk-performance-changes-3n-tsh-ref:
+    dpdk-performance-changes-3n-tsh-h1:
       csit-dpdk-perf-verify-2001-3n-tsh:
         - 3   # NDRPDR sel
         - 4   # NDRPDR sel
@@ -1476,13 +1545,20 @@
         - 14  # NDRPDR sel
         - 15  # NDRPDR sel
         - 18  # NDRPDR sel
+    dpdk-performance-changes-3n-tsh-ref:
+      csit-dpdk-perf-report-iterative-2005-3n-tsh:
+        - 5   # NDRPDR sel
     dpdk-performance-changes-3n-tsh-cmp:
+      # TODO: Replace:
+      # csit-dpdk-perf-report-iterative-2009-3n-tsh:
       csit-dpdk-perf-report-iterative-2005-3n-tsh:
         - 5   # NDRPDR sel
 
     # Compare testbeds
 
     vpp-compare-testbeds-ref:
+      # TODO: Replace:
+      # csit-vpp-perf-report-iterative-2009-3n-hsw:
       csit-vpp-perf-report-iterative-2005-3n-hsw:
         - 20  # NDRPDR sel env 4
         - 21  # NDRPDR sel env 4
@@ -1495,6 +1571,8 @@
         - 28  # NDRPDR sel env 4
         - 29  # NDRPDR sel env 4
     vpp-compare-testbeds-cmp:
+      # TODO: Replace:
+      # csit-vpp-perf-report-iterative-2009-3n-skx:
       csit-vpp-perf-report-iterative-2005-3n-skx:
         - 42  # NDRPDR sel env 4
         - 43  # NDRPDR sel env 4
@@ -1508,6 +1586,8 @@
         - 62  # NDRPDR sel env 4
 
     vpp-compare-testbeds-skx-clx-ref:
+      # TODO: Replace:
+      # csit-vpp-perf-report-iterative-2009-2n-skx:
       csit-vpp-perf-report-iterative-2005-2n-skx:
         - 88  # NDRPDR sel env 4
         - 89  # NDRPDR sel env 4
@@ -1520,6 +1600,8 @@
         - 126 # NDRPDR sel env 4
         - 127 # NDRPDR sel env 4
     vpp-compare-testbeds-skx-clx-cmp:
+      # TODO: Replace:
+      # csit-vpp-perf-report-iterative-2009-2n-clx:
       csit-vpp-perf-report-iterative-2005-2n-clx:
         - 62  # NDRPDR sel env 4
         - 63  # NDRPDR sel env 4
@@ -1533,6 +1615,8 @@
         - 104 # NDRPDR sel env 4
 
     vpp-compare-testbeds-hsw-clx-ref:
+      # TODO: Replace:
+      # csit-vpp-perf-report-iterative-2009-3n-hsw:
       csit-vpp-perf-report-iterative-2005-3n-hsw:
         - 20  # NDRPDR sel env 4
         - 21  # NDRPDR sel env 4
@@ -1545,6 +1629,8 @@
         - 28  # NDRPDR sel env 4
         - 29  # NDRPDR sel env 4
     vpp-compare-testbeds-hsw-clx-cmp:
+      # TODO: Replace:
+      # csit-vpp-perf-report-iterative-2009-2n-clx:
       csit-vpp-perf-report-iterative-2005-2n-clx:
         - 62  # NDRPDR sel env 4
         - 63  # NDRPDR sel env 4
@@ -1558,27 +1644,41 @@
         - 104 # NDRPDR sel env 4
 
     vpp-compare-testbeds-mrr-ref:
+      # TODO: Replace:
+      # csit-vpp-perf-report-iterative-2009-3n-hsw:
       csit-vpp-perf-report-iterative-2005-3n-hsw:
         - 30  # MRR env 4
     vpp-compare-testbeds-mrr-cmp:
+      # TODO: Replace:
+      # csit-vpp-perf-report-iterative-2009-3n-skx:
       csit-vpp-perf-report-iterative-2005-3n-skx:
         - 49  # MRR sel env 4
 
     vpp-compare-testbeds-mrr-skx-clx-ref:
+      # TODO: Replace:
+      # csit-vpp-perf-report-iterative-2009-2n-skx:
       csit-vpp-perf-report-iterative-2005-2n-skx:
         - 99  # MRR sel env 4
     vpp-compare-testbeds-mrr-skx-clx-cmp:
+      # TODO: Replace:
+      # csit-vpp-perf-report-iterative-2009-2n-clx:
       csit-vpp-perf-report-iterative-2005-2n-clx:
         - 72  # MRR env 4
 
     vpp-compare-testbeds-mrr-hsw-clx-ref:
+      # TODO: Replace:
+      # csit-vpp-perf-report-iterative-2009-3n-hsw:
       csit-vpp-perf-report-iterative-2005-3n-hsw:
         - 30  # MRR env 4
     vpp-compare-testbeds-mrr-hsw-clx-cmp:
+      # TODO: Replace:
+      # csit-vpp-perf-report-iterative-2009-2n-clx:
       csit-vpp-perf-report-iterative-2005-2n-clx:
         - 72  # MRR env 4
 
     dpdk-compare-testbeds-ref:
+      # TODO: Replace:
+      # csit-dpdk-perf-report-iterative-2009-3n-hsw:
       csit-dpdk-perf-report-iterative-2005-3n-hsw:
         - 25  # NDRPDR iter
         - 26  # NDRPDR iter
@@ -1591,6 +1691,8 @@
         - 33  # NDRPDR iter
         - 34  # NDRPDR iter
     dpdk-compare-testbeds-cmp:
+      # TODO: Replace:
+      # csit-dpdk-perf-report-iterative-2009-3n-skx:
       csit-dpdk-perf-report-iterative-2005-3n-skx:
         - 28  # NDRPDR iter
         - 29  # NDRPDR iter
@@ -1604,6 +1706,8 @@
         - 37  # NDRPDR iter
 
     dpdk-compare-testbeds-skx-clx-ref:
+      # TODO: Replace:
+      # csit-dpdk-perf-report-iterative-2009-2n-skx:
       csit-dpdk-perf-report-iterative-2005-2n-skx:
         - 20  # NDRPDR iter
         - 21  # NDRPDR iter
@@ -1616,6 +1720,8 @@
         - 28  # NDRPDR iter
         - 29  # NDRPDR iter
     dpdk-compare-testbeds-skx-clx-cmp:
+      # TODO: Replace:
+      # csit-dpdk-perf-report-iterative-2009-2n-clx:
       csit-dpdk-perf-report-iterative-2005-2n-clx:
         - 20  # NDRPDR iter
         - 21  # NDRPDR iter
@@ -1631,6 +1737,8 @@
     # Compare topologies
 
     vpp-compare-topologies-ref:
+      # TODO: Replace:
+      # csit-vpp-perf-report-iterative-2009-3n-skx:
       csit-vpp-perf-report-iterative-2005-3n-skx:
         - 42  # NDRPDR sel env 4
         - 43  # NDRPDR sel env 4
@@ -1643,6 +1751,8 @@
         - 61  # NDRPDR sel env 4
         - 62  # NDRPDR sel env 4
     vpp-compare-topologies-cmp:
+      # TODO: Replace:
+      # csit-vpp-perf-report-iterative-2009-2n-skx:
       csit-vpp-perf-report-iterative-2005-2n-skx:
         - 88  # NDRPDR sel env 4
         - 89  # NDRPDR sel env 4
@@ -1656,13 +1766,19 @@
         - 127 # NDRPDR sel env 4
 
     vpp-compare-topologies-mrr-ref:
+      # TODO: Replace:
+      # csit-vpp-perf-report-iterative-2009-3n-skx:
       csit-vpp-perf-report-iterative-2005-3n-skx:
         - 49  # MRR sel env 4
     vpp-compare-topologies-mrr-cmp:
+      # TODO: Replace:
+      # csit-vpp-perf-report-iterative-2009-2n-skx:
       csit-vpp-perf-report-iterative-2005-2n-skx:
         - 99  # MRR sel env 4
 
     dpdk-compare-topologies-ref:
+      # TODO: Replace:
+      # csit-dpdk-perf-report-iterative-2009-3n-skx:
       csit-dpdk-perf-report-iterative-2005-3n-skx:
         - 28  # NDRPDR iter
         - 29  # NDRPDR iter
@@ -1675,6 +1791,8 @@
         - 36  # NDRPDR iter
         - 37  # NDRPDR iter
     dpdk-compare-topologies-cmp:
+      # TODO: Replace:
+      # csit-dpdk-perf-report-iterative-2009-2n-skx:
       csit-dpdk-perf-report-iterative-2005-2n-skx:
         - 20  # NDRPDR iter
         - 21  # NDRPDR iter
@@ -2225,41 +2343,9 @@
 
   builds:
 
-    csit-vpp-perf-verify-1908-3n-hsw:
-      - 12  # NDRPDR sel
-      - 13  # NDRPDR sel
-      - 14  # NDRPDR sel
-      - 15  # NDRPDR sel
-      - 16  # NDRPDR sel
-      - 17  # NDRPDR sel
-      - 18  # NDRPDR sel
-      - 19  # NDRPDR sel
-      - 20  # NDRPDR sel
-      - 21  # NDRPDR sel
-      - 39  # MRR sel
     csit-vpp-perf-verify-2001-3n-hsw:
-      - 21  # NDRPDR sel
-      - 22  # NDRPDR sel
-      - 23  # NDRPDR sel
-      - 24  # NDRPDR sel
-      - 25  # NDRPDR sel
-      - 29  # NDRPDR sel
-      - 30  # NDRPDR sel
-      - 31  # NDRPDR sel
-      - 32  # NDRPDR sel
-      - 34  # NDRPDR sel
       - 17  # MRR sel
     csit-vpp-perf-report-iterative-2005-3n-hsw:
-      - 3   # NDRPDR sel
-      - 4   # NDRPDR sel
-      - 5   # NDRPDR sel
-      - 10  # NDRPDR sel
-      - 11  # NDRPDR sel
-      - 12  # NDRPDR sel
-      - 15  # NDRPDR sel
-      - 16  # NDRPDR sel
-      - 18  # NDRPDR sel
-      - 19  # NDRPDR sel
       - 20  # NDRPDR sel env 4
       - 21  # NDRPDR sel env 4
       - 22  # NDRPDR sel env 4
@@ -2327,26 +2413,16 @@
       - 106 # vhost-00
       - 107 # vhost-01
       - 109 # vhost-02
+    # TODO: Add:
+    # csit-vpp-perf-report-iterative-2009-3n-hsw:
+    # TODO: Add:
+    # csit-vpp-perf-report-coverage-2009-3n-hsw:
+
+    # TODO: Add for hoststack:
+    # csit-vpp-perf-report-iterative-2009-3n-hsw: OR
+    # csit-vpp-perf-verify-2009-3n-hsw:
 
-    csit-vpp-perf-verify-1908_1-3n-skx:
-      - 26  # NDRPDR sel - new1908.1
-      - 27  # NDRPDR sel - new1908.1
-      - 28  # NDRPDR sel - new1908.1
-      - 29  # NDRPDR sel - new1908.1
-      - 30  # NDRPDR sel - new1908.1
-      - 31  # NDRPDR sel - new1908.1
-      - 33  # NDRPDR sel - new1908.1
-      - 34  # NDRPDR sel - new1908.1
-      - 35  # NDRPDR sel - new1908.1
-      - 36  # NDRPDR sel - new1908.1
     csit-vpp-perf-verify-2001-3n-skx:
-      - 69  # NDRPDR sel - new2001.0
-      - 71  # NDRPDR sel - new2001.0
-      - 72  # NDRPDR sel - new2001.0
-      - 76  # NDRPDR sel - new2001.0
-      - 77  # NDRPDR sel - new2001.0
-      - 78  # NDRPDR sel - new2001.0
-      - 80  # NDRPDR sel - new2001.0
       - 50  # MRR sel
       - 53  # MRR sel addition
     csit-vpp-perf-report-iterative-2005-3n-skx:
@@ -2355,11 +2431,6 @@
       - 33  # NDRPDR sel
       - 28  # NDRPDR sel
       - 34  # NDRPDR sel
-      - 36  # NDRPDR sel
-      - 37  # NDRPDR sel
-      - 38  # NDRPDR sel
-      - 39  # NDRPDR sel
-      - 41  # NDRPDR sel
       - 42  # NDRPDR sel env 4
       - 43  # NDRPDR sel env 4
       - 44  # NDRPDR sel env 4
@@ -2375,7 +2446,6 @@
       - 52  # NDRPDR sel 2001.0-4
       - 53  # NDRPDR sel 2001.0-4
       - 54  # NDRPDR sel 2001.0-4
-      - 6   # MRR sel
       - 49  # MRR sel env 4
     csit-vpp-perf-report-coverage-2005-3n-skx:
       - 45  # crypto-00
@@ -2415,42 +2485,15 @@
       - 89  # vhost-01
       - 81  # vhost-02
       - 83  # vhost-03
+    # TODO: Add:
+    # csit-vpp-perf-report-iterative-2009-3n-skx:
+    # TODO: Add:
+    # csit-vpp-perf-report-coverage-2009-3n-skx:
 
-    csit-vpp-perf-verify-1908_1-2n-skx:
-      - 39  # NDRPDR sel - new1908.1
-      - 40  # NDRPDR sel - new1908.1
-      - 41  # NDRPDR sel - new1908.1
-      - 43  # NDRPDR sel - new1908.1
-      - 44  # NDRPDR sel - new1908.1
-      - 45  # NDRPDR sel - new1908.1
-      - 46  # NDRPDR sel - new1908.1
-      - 47  # NDRPDR sel - new1908.1
-      - 48  # NDRPDR sel - new1908.1
-      - 49  # NDRPDR sel - new1908.1
     csit-vpp-perf-verify-2001-2n-skx:
-      - 143  # NDRPDR sel - new2001.0
-      - 146  # NDRPDR sel - new2001.0
-      - 147  # NDRPDR sel - new2001.0
-      - 148  # NDRPDR sel - new2001.0
-      - 149  # NDRPDR sel - new2001.0
-      - 150  # NDRPDR sel - new2001.0
-      - 151  # NDRPDR sel - new2001.0
-      - 152  # NDRPDR sel - new2001.0
-      - 153  # NDRPDR sel - new2001.0
-      - 154  # NDRPDR sel - new2001.0
       - 101  # MRR sel - old
       - 128  # MRR sel addition - old
     csit-vpp-perf-report-iterative-2005-2n-skx:
-      - 43  # NDRPDR sel
-      - 38  # NDRPDR sel
-      - 7   # NDRPDR sel
-      - 65  # NDRPDR sel
-      - 47  # NDRPDR sel
-      - 55  # NDRPDR sel
-      - 67  # NDRPDR sel
-      - 75  # NDRPDR sel
-      - 76  # NDRPDR sel
-      - 73  # NDRPDR sel
       - 88  # NDRPDR sel env 4
       - 89  # NDRPDR sel env 4
       - 90  # NDRPDR sel env 4
@@ -2467,7 +2510,6 @@
       - 103 # NDRPDR sel 2001.0-4
       - 104 # NDRPDR sel 2001.0-4
       - 105 # NDRPDR sel 2001.0-4
-      - 42  # MRR sel
       - 99  # MRR sel env 4
       - 106 # Reconf env 4
       - 107 # Reconf env 4
@@ -2508,36 +2550,14 @@
       - 40  # vhost-00
       - 41  # vhost-01
       - 42  # vts-00
+    # TODO: Add:
+    # csit-vpp-perf-report-iterative-2009-2n-skx:
+    # TODO: Add:
+    # csit-vpp-perf-report-coverage-2009-2n-skx:
 
-    csit-vpp-perf-verify-1908_1-2n-clx:
-      - 5  # NDRPDR sel
-      - 6  # NDRPDR sel
-      - 7  # NDRPDR sel
-      - 8  # NDRPDR sel
-      - 9  # NDRPDR sel
     csit-vpp-perf-verify-2001-2n-clx:
-      - 28  # NDRPDR sel
-      - 29  # NDRPDR sel
-      - 32  # NDRPDR sel
-      - 40  # NDRPDR sel
-      - 43  # NDRPDR sel
-      - 44  # NDRPDR sel
-      - 45  # NDRPDR sel
-      - 47  # NDRPDR sel
-      - 48  # NDRPDR sel
-      - 49  # NDRPDR sel
       - 39  # MRR
     csit-vpp-perf-report-iterative-2005-2n-clx:
-      - 7   # NDRPDR sel
-      - 38  # NDRPDR sel
-      - 9   # NDRPDR sel
-      - 32  # NDRPDR sel ???
-      - 33  # NDRPDR sel ???
-      - 39  # NDRPDR sel
-      - 40  # NDRPDR sel
-      - 43  # NDRPDR sel
-      - 50  # NDRPDR sel
-      - 51  # NDRPDR sel
       - 62  # NDRPDR sel env 4
       - 63  # NDRPDR sel env 4
       - 64  # NDRPDR sel env 4
@@ -2556,7 +2576,6 @@
       - 78  # NDRPDR sel 2001.0-4
       - 79  # NDRPDR sel 2001.0-4
       - 80  # NDRPDR sel 2001.0-4
-      - 12  # MRR
       - 72  # MRR env 4
       - 81  # Reconf env 4
       - 82  # Reconf env 4
@@ -2597,30 +2616,12 @@
       - 32  # vhost-00
       - 33  # vhost-01
       - 40  # vts-00
+    # TODO: Add:
+    # csit-vpp-perf-report-iterative-2009-2n-clx:
+    # TODO: Add:
+    # csit-vpp-perf-report-coverage-2009-2n-clx:
 
-    csit-vpp-perf-verify-1908-3n-tsh:
-      - 7   # NDRPDR sel
-      - 8   # NDRPDR sel
-      - 9   # NDRPDR sel
-      - 10  # NDRPDR sel
-      - 11  # NDRPDR sel
-      - 12  # NDRPDR sel
-      - 13  # NDRPDR sel
-      - 14  # NDRPDR sel
-      - 15  # NDRPDR sel
-      - 16  # NDRPDR sel
-      - 17  # MRR sel
     csit-vpp-perf-verify-2001-3n-tsh:
-      - 3   # NDRPDR sel
-      - 4   # NDRPDR sel
-      - 7   # NDRPDR sel
-      - 8   # NDRPDR sel
-      - 10  # NDRPDR sel
-      - 12  # NDRPDR sel
-      - 13  # NDRPDR sel
-      - 14  # NDRPDR sel
-      - 15  # NDRPDR sel
-      - 21  # NDRPDR sel
       - 9   # MRR sel
     csit-vpp-perf-report-iterative-2005-3n-tsh:
       - 9   # NDRPDR sel
@@ -2642,21 +2643,10 @@
       - 28  # NDRPDR sel 2001.0-4
       - 29  # NDRPDR sel 2001.0-4
       - 31  # NDRPDR sel 2001.0-4
-      - 10  # MRR sel
       - 27  # MRR sel env 4
+    # TODO: Replace:
+    # csit-vpp-perf-report-iterative-2009-3n-tsh:
 
-    csit-vpp-perf-verify-1908-3n-dnv:
-      - 6   # NDRPDR sel
-      - 7   # NDRPDR sel
-      - 8   # NDRPDR sel
-      - 9   # NDRPDR sel
-      - 10  # NDRPDR sel
-      - 12  # NDRPDR sel
-      - 13  # NDRPDR sel
-      - 14  # NDRPDR sel
-      - 15  # NDRPDR sel
-      - 16  # NDRPDR sel
-      - 17  # MRR sel
     csit-vpp-perf-verify-2001-3n-dnv:
       - 5   # NDRPDR sel
       - 6   # NDRPDR sel
@@ -2691,19 +2681,11 @@
       - 21  # perf-full-3n-dnv-l2_I
       - 22  # perf-full-3n-dnv-l2_II
       - 23  # perf-full-3n-dnv-ip4-tunnels_I
+    # TODO: Add:
+    # csit-vpp-perf-report-iterative-2009-3n-dnv:
+    # TODO: Add:
+    # csit-vpp-perf-report-coverage-2009-3n-dnv:
 
-    csit-vpp-perf-verify-1908-2n-dnv:
-      - 1   # NDRPDR sel
-      - 2   # NDRPDR sel
-      - 3   # NDRPDR sel
-      - 4   # NDRPDR sel
-      - 5   # NDRPDR sel
-      - 6   # NDRPDR sel
-      - 7   # NDRPDR sel
-      - 8   # NDRPDR sel
-      - 9   # NDRPDR sel
-      - 10  # NDRPDR sel
-      - 11  # MRR sel
     csit-vpp-perf-verify-2001-2n-dnv:
       - 4   # NDRPDR sel
       - 5   # NDRPDR sel
@@ -2735,18 +2717,11 @@
       - 4   # perf-full-2n-dnv-ip6_II
       - 5   # perf-full-2n-dnv-l2_I
       - 6   # perf-full-2n-dnv-l2_II
+    # TODO: Add:
+    # csit-vpp-perf-report-iterative-2009-2n-dnv:
+    # TODO: Add:
+    # csit-vpp-perf-report-coverage-2009-2n-dnv:
 
-    csit-dpdk-perf-verify-1908-3n-hsw:
-      - 2   # NDRPDR sel
-      - 3   # NDRPDR sel
-      - 4   # NDRPDR sel
-      - 5   # NDRPDR sel
-      - 6   # NDRPDR sel
-      - 7   # NDRPDR sel
-      - 8   # NDRPDR sel
-      - 9   # NDRPDR sel
-      - 10  # NDRPDR sel
-      - 11  # NDRPDR sel
     csit-dpdk-perf-verify-2001-3n-hsw:
       - 4   # NDRPDR sel
       - 5   # NDRPDR sel
@@ -2779,18 +2754,9 @@
       - 32  # NDRPDR iter
       - 33  # NDRPDR iter
       - 34  # NDRPDR iter
+    # TODO: Add:
+    # csit-dpdk-perf-report-iterative-2009-3n-hsw:
 
-    csit-dpdk-perf-verify-1908-3n-skx:
-      - 3   # NDRPDR sel
-      - 4   # NDRPDR sel
-      - 5   # NDRPDR sel
-      - 6   # NDRPDR sel
-      - 7   # NDRPDR sel
-      - 8   # NDRPDR sel
-      - 9   # NDRPDR sel
-      - 10  # NDRPDR sel
-      - 11  # NDRPDR sel
-      - 12  # NDRPDR sel
     csit-dpdk-perf-verify-2001-3n-skx:
       - 29  # NDRPDR sel xxv710
       - 33  # NDRPDR sel xxv710
@@ -2823,18 +2789,9 @@
       - 35  # NDRPDR iter
       - 36  # NDRPDR iter
       - 37  # NDRPDR iter
+    # TODO: Add:
+    # csit-dpdk-perf-report-iterative-2009-3n-skx:
 
-    csit-dpdk-perf-verify-1908-2n-skx:
-      - 2   # NDRPDR sel
-      - 3   # NDRPDR sel
-      - 4   # NDRPDR sel
-      - 5   # NDRPDR sel
-      - 7   # NDRPDR sel
-      - 8   # NDRPDR sel
-      - 9   # NDRPDR sel
-      - 10  # NDRPDR sel
-      - 11  # NDRPDR sel
-      - 12  # NDRPDR sel
     csit-dpdk-perf-verify-2001-2n-skx:
       - 35  # NDRPDR sel xxv710
       - 36  # NDRPDR sel xxv710
@@ -2867,6 +2824,8 @@
       - 27  # NDRPDR iter
       - 28  # NDRPDR iter
       - 29  # NDRPDR iter
+    # TODO: Add:
+    # csit-dpdk-perf-report-iterative-2009-2n-skx:
 
     csit-dpdk-perf-verify-2001-2n-clx:
       - 15  # NDRPDR sel
@@ -2900,6 +2859,8 @@
       - 27  # NDRPDR iter
       - 28  # NDRPDR iter
       - 29  # NDRPDR iter
+    # TODO: Add:
+    # csit-dpdk-perf-report-iterative-2009-2n-clx:
 
     csit-dpdk-perf-verify-2001-2n-dnv:
       - 9   # NDRPDR sel
@@ -2923,6 +2884,8 @@
       - 15  # NDRPDR sel
       - 16  # NDRPDR sel
       - 17  # NDRPDR sel
+    # TODO: Add:
+    # csit-dpdk-perf-report-iterative-2009-2n-dnv:
 
     csit-dpdk-perf-verify-2001-3n-dnv:
       - 12  # NDRPDR sel
@@ -2946,6 +2909,8 @@
       - 13  # NDRPDR sel
       - 14  # NDRPDR sel
       - 16  # NDRPDR sel
+    # TODO: Add:
+    # csit-dpdk-perf-report-iterative-2009-3n-dnv:
 
     csit-dpdk-perf-verify-2001-3n-tsh:
       - 3   # NDRPDR sel
@@ -2960,9 +2925,13 @@
       - 18  # NDRPDR sel
     csit-dpdk-perf-report-iterative-2005-3n-tsh:
       - 5   # NDRPDR sel
+    # TODO: Add:
+    # csit-dpdk-perf-report-iterative-2009-3n-tsh:
 
     csit-vpp-device-2005-ubuntu1804-1n-skx:
       - 35
+    # TODO: Add:
+    # csit-vpp-device-2009-ubuntu1804-1n-skx:
 
 - type: "output"
   output: "report"
@@ -3349,30 +3318,23 @@
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
   filter: "'1T1C' and 'NDRPDR' and 'NIC_Intel-XL710' and not 'NF_DENSITY'"
   columns:
-    - title: "1908.1-2"
-      data-set: "vpp-performance-changes-3n-hsw-h1"
-    - title: "2001.0-2"
-      data-set: "vpp-performance-changes-3n-hsw-ref"
     - title: "2001.0-4"
-      data-set: "vpp-performance-changes-3n-hsw-cmp-2001.0-4"
+      data-set: "vpp-performance-changes-3n-hsw-h1"
     - title: "2005.0-4"
-      data-set: "vpp-performance-changes-3n-hsw-cmp-2"
+      data-set: "vpp-performance-changes-3n-hsw-ref"
+    - title: "2009.0-4"
+      data-set: "vpp-performance-changes-3n-hsw-cmp"
   comparisons:
-    - title: "2001.0-4 vs 2001.0-2"
+    - title: "2009.0-4 vs 2005.0-4"
       reference: 2
       compare: 3
-      rca-file: "rca/rca-3n-hsw-1t1c-pdr-rca1.yaml"
-    - title: "2005.0-4 vs 2001.0-4"
-      reference: 3
-      compare: 4
-      rca-file: "rca/rca-3n-hsw-1t1c-pdr-rca2.yaml"
+#      rca-file: "rca/rca-3n-hsw-1t1c-pdr-rca1.yaml"
   legend:
     - ''
     - 'Test Case:            Test cases executed for: PDR throughput on 3n-hsw with xl710.'
     - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "2" for CSIT rls2001, "4" for CSIT rls2005).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-    - '2001.0-4 vs 2001.0-2: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2005.0-4 vs 2001.0-4: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2009.0-4 vs 2005.0-4: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 3n-hsw 2t2c pdr
 - type: "table"
@@ -3382,30 +3344,23 @@
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
   filter: "'2T2C' and 'NDRPDR' and 'NIC_Intel-XL710' and not 'NF_DENSITY'"
   columns:
-    - title: "1908.1-2"
-      data-set: "vpp-performance-changes-3n-hsw-h1"
-    - title: "2001.0-2"
-      data-set: "vpp-performance-changes-3n-hsw-ref"
     - title: "2001.0-4"
-      data-set: "vpp-performance-changes-3n-hsw-cmp-2001.0-4"
+      data-set: "vpp-performance-changes-3n-hsw-h1"
     - title: "2005.0-4"
-      data-set: "vpp-performance-changes-3n-hsw-cmp-2"
+      data-set: "vpp-performance-changes-3n-hsw-ref"
+    - title: "2009.0-4"
+      data-set: "vpp-performance-changes-3n-hsw-cmp"
   comparisons:
-    - title: "2001.0-4 vs 2001.0-2"
+    - title: "2009.0-4 vs 2005.0-4"
       reference: 2
       compare: 3
-      rca-file: "rca/rca-3n-hsw-2t2c-pdr-rca1.yaml"
-    - title: "2005.0-4 vs 2001.0-4"
-      reference: 3
-      compare: 4
-      rca-file: "rca/rca-3n-hsw-2t2c-pdr-rca2.yaml"
+#      rca-file: "rca/rca-3n-hsw-1t1c-pdr-rca1.yaml"
   legend:
     - ''
     - 'Test Case:            Test cases executed for: PDR throughput on 3n-hsw with xl710.'
     - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "2" for CSIT rls2001, "4" for CSIT rls2005).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-    - '2001.0-4 vs 2001.0-2: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2005.0-4 vs 2001.0-4: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2009.0-4 vs 2005.0-4: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 3n-hsw 1t1c ndr
 - type: "table"
@@ -3415,30 +3370,23 @@
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
   filter: "'1T1C' and 'NDRPDR' and 'NIC_Intel-XL710' and not 'NF_DENSITY'"
   columns:
-    - title: "1908.1-2"
-      data-set: "vpp-performance-changes-3n-hsw-h1"
-    - title: "2001.0-2"
-      data-set: "vpp-performance-changes-3n-hsw-ref"
     - title: "2001.0-4"
-      data-set: "vpp-performance-changes-3n-hsw-cmp-2001.0-4"
+      data-set: "vpp-performance-changes-3n-hsw-h1"
     - title: "2005.0-4"
-      data-set: "vpp-performance-changes-3n-hsw-cmp-2"
+      data-set: "vpp-performance-changes-3n-hsw-ref"
+    - title: "2009.0-4"
+      data-set: "vpp-performance-changes-3n-hsw-cmp"
   comparisons:
-    - title: "2001.0-4 vs 2001.0-2"
+    - title: "2009.0-4 vs 2005.0-4"
       reference: 2
       compare: 3
-      rca-file: "rca/rca-3n-hsw-1t1c-ndr-rca1.yaml"
-    - title: "2005.0-4 vs 2001.0-4"
-      reference: 3
-      compare: 4
-      rca-file: "rca/rca-3n-hsw-1t1c-ndr-rca2.yaml"
+#      rca-file: "rca/rca-3n-hsw-1t1c-ndr-rca1.yaml"
   legend:
     - ''
     - 'Test Case:            Test cases executed for: NDR throughput on 3n-hsw with xl710.'
     - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "2" for CSIT rls2001, "4" for CSIT rls2005).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-    - '2001.0-4 vs 2001.0-2: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2005.0-4 vs 2001.0-4: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2009.0-4 vs 2005.0-4: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 3n-hsw 2t2c ndr
 - type: "table"
@@ -3448,190 +3396,23 @@
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
   filter: "'2T2C' and 'NDRPDR' and 'NIC_Intel-XL710' and not 'NF_DENSITY'"
   columns:
-    - title: "1908.1-2"
+    - title: "2001.0-4"
       data-set: "vpp-performance-changes-3n-hsw-h1"
-    - title: "2001.0-2"
+    - title: "2005.0-4"
       data-set: "vpp-performance-changes-3n-hsw-ref"
-    - title: "2001.0-4"
-      data-set: "vpp-performance-changes-3n-hsw-cmp-2001.0-4"
-    - title: "2005.0-4"
-      data-set: "vpp-performance-changes-3n-hsw-cmp-2"
-  comparisons:
-    - title: "2001.0-4 vs 2001.0-2"
-      reference: 2
-      compare: 3
-      rca-file: "rca/rca-3n-hsw-2t2c-ndr-rca1.yaml"
-    - title: "2005.0-4 vs 2001.0-4"
-      reference: 3
-      compare: 4
-      rca-file: "rca/rca-3n-hsw-2t2c-ndr-rca2.yaml"
-  legend:
-    - ''
-    - 'Test Case:            Test cases executed for: NDR throughput on 3n-hsw with xl710.'
-    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "2" for CSIT rls2001, "4" for CSIT rls2005).'
-    - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-    - '2001.0-4 vs 2001.0-2: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2005.0-4 vs 2001.0-4: Compares VPP code current vs previous in the current CSIT environment.'
-
-# VPP Performance Changes 3n-hsw 1t1c pdr-full
-- type: "table"
-  title: "VPP Performance Changes 3n-hsw 1t1c pdr-full"
-  algorithm: "table_comparison"
-  output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-hsw-1t1c-pdr-full"
-  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
-  filter: "'1T1C' and 'NDRPDR' and 'NIC_Intel-XL710' and not 'NF_DENSITY'"
-  columns:
-    - title: "1908.1-2"
-      data-set: "vpp-performance-changes-3n-hsw-h1"
-    - title: "2001.0-2"
-      data-set: "vpp-performance-changes-3n-hsw-ref"
-    - title: "2001.0-4"
-      data-set: "vpp-performance-changes-3n-hsw-cmp-2001.0-4"
-    - title: "2005.0-3"
-      data-set: "vpp-performance-changes-3n-hsw-cmp"
-    - title: "2005.0-4"
-      data-set: "vpp-performance-changes-3n-hsw-cmp-2"
-  comparisons:
-    - title: "2005.0-4 vs 2005.0-3"
-      reference: 4
-      compare: 5
-      rca-file: "rca/rca-3n-hsw-1t1c-pdr-rca1.yaml"
-    - title: "2001.0-4 vs 2001.0-2"
-      reference: 2
-      compare: 3
-      rca-file: "rca/rca-3n-hsw-1t1c-pdr-rca2.yaml"
-    - title: "2005.0-4 vs 2001.0-4"
-      reference: 3
-      compare: 5
-      rca-file: "rca/rca-3n-hsw-1t1c-pdr-rca3.yaml"
-  legend:
-    - ''
-    - 'Test Case:            Test cases executed for: PDR throughput on 3n-hsw with xl710.'
-    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "2" for 2020-03-27, "3" for 2020-06-11, "4" for 2020-06-24).'
-    - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-    - '2005.0-4 vs 2005.0-3: Compares CSIT environments "4" to "3". "3" was discarded as it substantially changed TRex behaviour due to higher number of TRex workers used.'
-    - '2001.0-4 vs 2001.0-2: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2005.0-4 vs 2001.0-4: Compares VPP code current vs previous in the current CSIT environment.'
-
-# VPP Performance Changes 3n-hsw 2t2c pdr-full
-- type: "table"
-  title: "VPP Performance Changes 3n-hsw 2t2c pdr-full"
-  algorithm: "table_comparison"
-  output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-hsw-2t2c-pdr-full"
-  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
-  filter: "'2T2C' and 'NDRPDR' and 'NIC_Intel-XL710' and not 'NF_DENSITY'"
-  columns:
-    - title: "1908.1-2"
-      data-set: "vpp-performance-changes-3n-hsw-h1"
-    - title: "2001.0-2"
-      data-set: "vpp-performance-changes-3n-hsw-ref"
-    - title: "2001.0-4"
-      data-set: "vpp-performance-changes-3n-hsw-cmp-2001.0-4"
-    - title: "2005.0-3"
+    - title: "2009.0-4"
       data-set: "vpp-performance-changes-3n-hsw-cmp"
-    - title: "2005.0-4"
-      data-set: "vpp-performance-changes-3n-hsw-cmp-2"
   comparisons:
-    - title: "2005.0-4 vs 2005.0-3"
-      reference: 4
-      compare: 5
-      rca-file: "rca/rca-3n-hsw-2t2c-pdr-rca1.yaml"
-    - title: "2001.0-4 vs 2001.0-2"
+    - title: "2009.0-4 vs 2005.0-4"
       reference: 2
       compare: 3
-      rca-file: "rca/rca-3n-hsw-2t2c-pdr-rca2.yaml"
-    - title: "2005.0-4 vs 2001.0-4"
-      reference: 3
-      compare: 5
-      rca-file: "rca/rca-3n-hsw-2t2c-pdr-rca3.yaml"
-  legend:
-    - ''
-    - 'Test Case:            Test cases executed for: PDR throughput on 3n-hsw with xl710.'
-    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "2" for 2020-03-27, "3" for 2020-06-11, "4" for 2020-06-24).'
-    - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-    - '2005.0-4 vs 2005.0-3: Compares CSIT environments "4" to "3". "3" was discarded as it substantially changed TRex behaviour due to higher number of TRex workers used.'
-    - '2001.0-4 vs 2001.0-2: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2005.0-4 vs 2001.0-4: Compares VPP code current vs previous in the current CSIT environment.'
-
-# VPP Performance Changes 3n-hsw 1t1c ndr-full
-- type: "table"
-  title: "VPP Performance Changes 3n-hsw 1t1c ndr-full"
-  algorithm: "table_comparison"
-  output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-hsw-1t1c-ndr-full"
-  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
-  filter: "'1T1C' and 'NDRPDR' and 'NIC_Intel-XL710' and not 'NF_DENSITY'"
-  columns:
-    - title: "1908.1-2"
-      data-set: "vpp-performance-changes-3n-hsw-h1"
-    - title: "2001.0-2"
-      data-set: "vpp-performance-changes-3n-hsw-ref"
-    - title: "2001.0-4"
-      data-set: "vpp-performance-changes-3n-hsw-cmp-2001.0-4"
-    - title: "2005.0-3"
-      data-set: "vpp-performance-changes-3n-hsw-cmp"
-    - title: "2005.0-4"
-      data-set: "vpp-performance-changes-3n-hsw-cmp-2"
-  comparisons:
-    - title: "2005.0-4 vs 2005.0-3"
-      reference: 4
-      compare: 5
-      rca-file: "rca/rca-3n-hsw-1t1c-ndr-rca1.yaml"
-    - title: "2001.0-4 vs 2001.0-2"
-      reference: 2
-      compare: 3
-      rca-file: "rca/rca-3n-hsw-1t1c-ndr-rca2.yaml"
-    - title: "2005.0-4 vs 2001.0-4"
-      reference: 3
-      compare: 5
-      rca-file: "rca/rca-3n-hsw-1t1c-ndr-rca3.yaml"
+#      rca-file: "rca/rca-3n-hsw-1t1c-ndr-rca1.yaml"
   legend:
     - ''
     - 'Test Case:            Test cases executed for: NDR throughput on 3n-hsw with xl710.'
-    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "2" for 2020-03-27, "3" for 2020-06-11, "4" for 2020-06-24).'
-    - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-    - '2005.0-4 vs 2005.0-3: Compares CSIT environments "4" to "3". "3" was discarded as it substantially changed TRex behaviour due to higher number of TRex workers used.'
-    - '2001.0-4 vs 2001.0-2: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2005.0-4 vs 2001.0-4: Compares VPP code current vs previous in the current CSIT environment.'
-
-# VPP Performance Changes 3n-hsw 2t2c ndr-full
-- type: "table"
-  title: "VPP Performance Changes 3n-hsw 2t2c ndr-full"
-  algorithm: "table_comparison"
-  output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-hsw-2t2c-ndr-full"
-  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
-  filter: "'2T2C' and 'NDRPDR' and 'NIC_Intel-XL710' and not 'NF_DENSITY'"
-  columns:
-    - title: "1908.1-2"
-      data-set: "vpp-performance-changes-3n-hsw-h1"
-    - title: "2001.0-2"
-      data-set: "vpp-performance-changes-3n-hsw-ref"
-    - title: "2001.0-4"
-      data-set: "vpp-performance-changes-3n-hsw-cmp-2001.0-4"
-    - title: "2005.0-3"
-      data-set: "vpp-performance-changes-3n-hsw-cmp"
-    - title: "2005.0-4"
-      data-set: "vpp-performance-changes-3n-hsw-cmp-2"
-  comparisons:
-    - title: "2005.0-4 vs 2005.0-3"
-      reference: 4
-      compare: 5
-      rca-file: "rca/rca-3n-hsw-2t2c-ndr-rca1.yaml"
-    - title: "2001.0-4 vs 2001.0-2"
-      reference: 2
-      compare: 3
-      rca-file: "rca/rca-3n-hsw-2t2c-ndr-rca2.yaml"
-    - title: "2005.0-4 vs 2001.0-4"
-      reference: 3
-      compare: 5
-      rca-file: "rca/rca-3n-hsw-2t2c-ndr-rca3.yaml"
-  legend:
-    - ''
-    - 'Test Case:            Test cases executed for: NDR throughput on 3n-hsw with xl710.'
-    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "2" for 2020-03-27, "3" for 2020-06-11, "4" for 2020-06-24)..'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "2" for CSIT rls2001, "4" for CSIT rls2005).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-    - '2005.0-4 vs 2005.0-3: Compares CSIT environments "4" to "3". "3" was discarded as it substantially changed TRex behaviour due to higher number of TRex workers used.'
-    - '2001.0-4 vs 2001.0-2: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2005.0-4 vs 2001.0-4: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2009.0-4 vs 2005.0-4: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 3n-skx 2t1c pdr
 - type: "table"
@@ -3641,30 +3422,23 @@
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
   filter: "'2T1C' and 'NDRPDR' and 'NIC_Intel-XXV710' and not 'NF_DENSITY'"
   columns:
-    - title: "1908.1-2"
-      data-set: "vpp-performance-changes-3n-skx-h1"
-    - title: "2001.0-2"
-      data-set: "vpp-performance-changes-3n-skx-ref"
     - title: "2001.0-4"
-      data-set: "vpp-performance-changes-3n-skx-cmp-2001.0-4"
+      data-set: "vpp-performance-changes-3n-skx-h1"
     - title: "2005.0-4"
-      data-set: "vpp-performance-changes-3n-skx-cmp-2"
+      data-set: "vpp-performance-changes-3n-skx-ref"
+    - title: "2009.0-4"
+      data-set: "vpp-performance-changes-3n-skx-cmp"
   comparisons:
-    - title: "2001.0-4 vs 2001.0-2"
+    - title: "2009.0-4 vs 2005.0-4"
       reference: 2
       compare: 3
-      rca-file: "rca/rca-3n-skx-2t1c-pdr-rca1.yaml"
-    - title: "2005.0-4 vs 2001.0-4"
-      reference: 3
-      compare: 4
-      rca-file: "rca/rca-3n-skx-2t1c-pdr-rca2.yaml"
+#      rca-file: "rca/rca-3n-skx-2t1c-pdr-rca1.yaml"
   legend:
     - ''
     - 'Test Case:            Test cases executed for: PDR throughput on 3n-skx with xxv710.'
     - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "2" for CSIT rls2001, "4" for CSIT rls2005).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-    - '2001.0-4 vs 2001.0-2: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2005.0-4 vs 2001.0-4: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2009.0-4 vs 2005.0-4: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 3n-skx 4t2c pdr
 - type: "table"
@@ -3674,30 +3448,23 @@
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
   filter: "'4T2C' and 'NDRPDR' and 'NIC_Intel-XXV710' and not 'NF_DENSITY'"
   columns:
-    - title: "1908.1-2"
-      data-set: "vpp-performance-changes-3n-skx-h1"
-    - title: "2001.0-2"
-      data-set: "vpp-performance-changes-3n-skx-ref"
     - title: "2001.0-4"
-      data-set: "vpp-performance-changes-3n-skx-cmp-2001.0-4"
+      data-set: "vpp-performance-changes-3n-skx-h1"
     - title: "2005.0-4"
-      data-set: "vpp-performance-changes-3n-skx-cmp-2"
+      data-set: "vpp-performance-changes-3n-skx-ref"
+    - title: "2009.0-4"
+      data-set: "vpp-performance-changes-3n-skx-cmp"
   comparisons:
-    - title: "2001.0-4 vs 2001.0-2"
+    - title: "2009.0-4 vs 2005.0-4"
       reference: 2
       compare: 3
-      rca-file: "rca/rca-3n-skx-4t2c-pdr-rca1.yaml"
-    - title: "2005.0-4 vs 2001.0-4"
-      reference: 3
-      compare: 4
-      rca-file: "rca/rca-3n-skx-4t2c-pdr-rca2.yaml"
+#      rca-file: "rca/rca-3n-skx-2t1c-pdr-rca1.yaml"
   legend:
     - ''
     - 'Test Case:            Test cases executed for: PDR throughput on 3n-skx with xxv710.'
     - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "2" for CSIT rls2001, "4" for CSIT rls2005).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-    - '2001.0-4 vs 2001.0-2: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2005.0-4 vs 2001.0-4: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2009.0-4 vs 2005.0-4: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 3n-skx 2t1c ndr
 - type: "table"
@@ -3707,792 +3474,257 @@
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
   filter: "'2T1C' and 'NDRPDR' and 'NIC_Intel-XXV710' and not 'NF_DENSITY'"
   columns:
-    - title: "1908.1-2"
-      data-set: "vpp-performance-changes-3n-skx-h1"
-    - title: "2001.0-2"
-      data-set: "vpp-performance-changes-3n-skx-ref"
     - title: "2001.0-4"
-      data-set: "vpp-performance-changes-3n-skx-cmp-2001.0-4"
-    - title: "2005.0-4"
-      data-set: "vpp-performance-changes-3n-skx-cmp-2"
-  comparisons:
-    - title: "2001.0-4 vs 2001.0-2"
-      reference: 2
-      compare: 3
-      rca-file: "rca/rca-3n-skx-2t1c-ndr-rca1.yaml"
-    - title: "2005.0-4 vs 2001.0-4"
-      reference: 3
-      compare: 4
-      rca-file: "rca/rca-3n-skx-2t1c-ndr-rca2.yaml"
-  legend:
-    - ''
-    - 'Test Case:            Test cases executed for: NDR throughput on 3n-skx with xxv710.'
-    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "2" for CSIT rls2001, "4" for CSIT rls2005).'
-    - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-    - '2001.0-4 vs 2001.0-2: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2005.0-4 vs 2001.0-4: Compares VPP code current vs previous in the current CSIT environment.'
-
-# VPP Performance Changes 3n-skx 4t2c ndr
-- type: "table"
-  title: "VPP Performance Changes 3n-skx 4t2c ndr"
-  algorithm: "table_comparison"
-  output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-skx-4t2c-ndr"
-  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
-  filter: "'4T2C' and 'NDRPDR' and 'NIC_Intel-XXV710' and not 'NF_DENSITY'"
-  columns:
-    - title: "1908.1-2"
       data-set: "vpp-performance-changes-3n-skx-h1"
-    - title: "2001.0-2"
-      data-set: "vpp-performance-changes-3n-skx-ref"
-    - title: "2001.0-4"
-      data-set: "vpp-performance-changes-3n-skx-cmp-2001.0-4"
     - title: "2005.0-4"
-      data-set: "vpp-performance-changes-3n-skx-cmp-2"
-  comparisons:
-    - title: "2001.0-4 vs 2001.0-2"
-      reference: 2
-      compare: 3
-      rca-file: "rca/rca-3n-skx-4t2c-ndr-rca1.yaml"
-    - title: "2005.0-4 vs 2001.0-4"
-      reference: 3
-      compare: 4
-      rca-file: "rca/rca-3n-skx-4t2c-ndr-rca2.yaml"
-  legend:
-    - ''
-    - 'Test Case:            Test cases executed for: NDR throughput on 3n-skx with xxv710.'
-    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "2" for CSIT rls2001, "4" for CSIT rls2005).'
-    - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-    - '2001.0-4 vs 2001.0-2: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2005.0-4 vs 2001.0-4: Compares VPP code current vs previous in the current CSIT environment.'
-
-# VPP Performance Changes 3n-skx 2t1c pdr-full
-- type: "table"
-  title: "VPP Performance Changes 3n-skx 2t1c pdr-full"
-  algorithm: "table_comparison"
-  output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-skx-2t1c-pdr-full"
-  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
-  filter: "'2T1C' and 'NDRPDR' and 'NIC_Intel-XXV710' and not 'NF_DENSITY'"
-  columns:
-    - title: "1908.1-2"
-      data-set: "vpp-performance-changes-3n-skx-h1"
-    - title: "2001.0-2"
       data-set: "vpp-performance-changes-3n-skx-ref"
-    - title: "2001.0-4"
-      data-set: "vpp-performance-changes-3n-skx-cmp-2001.0-4"
-    - title: "2005.0-3"
+    - title: "2009.0-4"
       data-set: "vpp-performance-changes-3n-skx-cmp"
-    - title: "2005.0-4"
-      data-set: "vpp-performance-changes-3n-skx-cmp-2"
   comparisons:
-    - title: "2005.0-4 vs 2005.0-3"
-      reference: 4
-      compare: 5
-      rca-file: "rca/rca-3n-skx-2t1c-pdr-rca1.yaml"
-    - title: "2001.0-4 vs 2001.0-2"
+    - title: "2009.0-4 vs 2005.0-4"
       reference: 2
       compare: 3
-      rca-file: "rca/rca-3n-skx-2t1c-pdr-rca2.yaml"
-    - title: "2005.0-4 vs 2001.0-4"
-      reference: 3
-      compare: 5
-      rca-file: "rca/rca-3n-skx-2t1c-pdr-rca3.yaml"
-  legend:
-    - ''
-    - 'Test Case:            Test cases executed for: PDR throughput on 3n-skx with xxv710.'
-    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "2" for 2020-03-27, "3" for 2020-06-11, "4" for 2020-06-24).'
-    - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-    - '2005.0-4 vs 2005.0-3: Compares CSIT environments "4" to "3". "3" was discarded as it substantially changed TRex behaviour due to higher number of TRex workers used.'
-    - '2001.0-4 vs 2001.0-2: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2005.0-4 vs 2001.0-4: Compares VPP code current vs previous in the current CSIT environment.'
-
-# VPP Performance Changes 3n-skx 4t2c pdr-full
-- type: "table"
-  title: "VPP Performance Changes 3n-skx 4t2c pdr-full"
-  algorithm: "table_comparison"
-  output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-skx-4t2c-pdr-full"
-  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
-  filter: "'4T2C' and 'NDRPDR' and 'NIC_Intel-XXV710' and not 'NF_DENSITY'"
-  columns:
-    - title: "1908.1-2"
-      data-set: "vpp-performance-changes-3n-skx-h1"
-    - title: "2001.0-2"
-      data-set: "vpp-performance-changes-3n-skx-ref"
-    - title: "2001.0-4"
-      data-set: "vpp-performance-changes-3n-skx-cmp-2001.0-4"
-    - title: "2005.0-3"
-      data-set: "vpp-performance-changes-3n-skx-cmp"
-    - title: "2005.0-4"
-      data-set: "vpp-performance-changes-3n-skx-cmp-2"
-  comparisons:
-    - title: "2005.0-4 vs 2005.0-3"
-      reference: 4
-      compare: 5
-      rca-file: "rca/rca-3n-skx-4t2c-pdr-rca1.yaml"
-    - title: "2001.0-4 vs 2001.0-2"
-      reference: 2
-      compare: 3
-      rca-file: "rca/rca-3n-skx-4t2c-pdr-rca2.yaml"
-    - title: "2005.0-4 vs 2001.0-4"
-      reference: 3
-      compare: 5
-      rca-file: "rca/rca-3n-skx-4t2c-pdr-rca3.yaml"
-  legend:
-    - ''
-    - 'Test Case:            Test cases executed for: PDR throughput on 3n-skx with xxv710.'
-    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "2" for 2020-03-27, "3" for 2020-06-11, "4" for 2020-06-24).'
-    - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-    - '2005.0-4 vs 2005.0-3: Compares CSIT environments "4" to "3". "3" was discarded as it substantially changed TRex behaviour due to higher number of TRex workers used.'
-    - '2001.0-4 vs 2001.0-2: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2005.0-4 vs 2001.0-4: Compares VPP code current vs previous in the current CSIT environment.'
-
-# VPP Performance Changes 3n-skx 2t1c ndr-full
-- type: "table"
-  title: "VPP Performance Changes 3n-skx 2t1c ndr-full"
-  algorithm: "table_comparison"
-  output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-skx-2t1c-ndr-full"
-  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
-  filter: "'2T1C' and 'NDRPDR' and 'NIC_Intel-XXV710' and not 'NF_DENSITY'"
-  columns:
-    - title: "1908.1-2"
-      data-set: "vpp-performance-changes-3n-skx-h1"
-    - title: "2001.0-2"
-      data-set: "vpp-performance-changes-3n-skx-ref"
-    - title: "2001.0-4"
-      data-set: "vpp-performance-changes-3n-skx-cmp-2001.0-4"
-    - title: "2005.0-3"
-      data-set: "vpp-performance-changes-3n-skx-cmp"
-    - title: "2005.0-4"
-      data-set: "vpp-performance-changes-3n-skx-cmp-2"
-  comparisons:
-    - title: "2005.0-4 vs 2005.0-3"
-      reference: 4
-      compare: 5
-      rca-file: "rca/rca-3n-skx-2t1c-ndr-rca1.yaml"
-    - title: "2001.0-4 vs 2001.0-2"
-      reference: 2
-      compare: 3
-      rca-file: "rca/rca-3n-skx-2t1c-ndr-rca2.yaml"
-    - title: "2005.0-4 vs 2001.0-4"
-      reference: 3
-      compare: 5
-      rca-file: "rca/rca-3n-skx-2t1c-ndr-rca3.yaml"
-  legend:
-    - ''
-    - 'Test Case:            Test cases executed for: NDR throughput on 3n-skx with xxv710.'
-    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "2" for 2020-03-27, "3" for 2020-06-11, "4" for 2020-06-24).'
-    - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-    - '2005.0-4 vs 2005.0-3: Compares CSIT environments "4" to "3". "3" was discarded as it substantially changed TRex behaviour due to higher number of TRex workers used.'
-    - '2001.0-4 vs 2001.0-2: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2005.0-4 vs 2001.0-4: Compares VPP code current vs previous in the current CSIT environment.'
-
-# VPP Performance Changes 3n-skx 4t2c ndr-full
-- type: "table"
-  title: "VPP Performance Changes 3n-skx 4t2c ndr-full"
-  algorithm: "table_comparison"
-  output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-skx-4t2c-ndr-full"
-  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
-  filter: "'4T2C' and 'NDRPDR' and 'NIC_Intel-XXV710' and not 'NF_DENSITY'"
-  columns:
-    - title: "1908.1-2"
-      data-set: "vpp-performance-changes-3n-skx-h1"
-    - title: "2001.0-2"
-      data-set: "vpp-performance-changes-3n-skx-ref"
-    - title: "2001.0-4"
-      data-set: "vpp-performance-changes-3n-skx-cmp-2001.0-4"
-    - title: "2005.0-3"
-      data-set: "vpp-performance-changes-3n-skx-cmp"
-    - title: "2005.0-4"
-      data-set: "vpp-performance-changes-3n-skx-cmp-2"
-  comparisons:
-    - title: "2005.0-4 vs 2005.0-3"
-      reference: 4
-      compare: 5
-      rca-file: "rca/rca-3n-skx-4t2c-ndr-rca1.yaml"
-    - title: "2001.0-4 vs 2001.0-2"
-      reference: 2
-      compare: 3
-      rca-file: "rca/rca-3n-skx-4t2c-ndr-rca2.yaml"
-    - title: "2005.0-4 vs 2001.0-4"
-      reference: 3
-      compare: 5
-      rca-file: "rca/rca-3n-skx-4t2c-ndr-rca3.yaml"
+#      rca-file: "rca/rca-3n-skx-2t1c-ndr-rca1.yaml"
   legend:
     - ''
     - 'Test Case:            Test cases executed for: NDR throughput on 3n-skx with xxv710.'
-    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "2" for 2020-03-27, "3" for 2020-06-11, "4" for 2020-06-24).'
-    - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-    - '2005.0-4 vs 2005.0-3: Compares CSIT environments "4" to "3". "3" was discarded as it substantially changed TRex behaviour due to higher number of TRex workers used.'
-    - '2001.0-4 vs 2001.0-2: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2005.0-4 vs 2001.0-4: Compares VPP code current vs previous in the current CSIT environment.'
-
-# VPP Performance Changes 2n-skx 2t1c pdr
-- type: "table"
-  title: "VPP Performance Changes 2n-skx 2t1c pdr"
-  algorithm: "table_comparison"
-  output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-skx-2t1c-pdr"
-  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
-  filter: "'2T1C' and 'NDRPDR' and 'NIC_Intel-XXV710' and not 'NF_DENSITY'"
-  columns:
-    - title: "1908.1-2"
-      data-set: "vpp-performance-changes-2n-skx-h1"
-    - title: "2001.0-2"
-      data-set: "vpp-performance-changes-2n-skx-ref"
-    - title: "2001.0-4"
-      data-set: "vpp-performance-changes-2n-skx-cmp-2001.0-4"
-    - title: "2005.0-4"
-      data-set: "vpp-performance-changes-2n-skx-cmp-2"
-  comparisons:
-    - title: "2001.0-4 vs 2001.0-2"
-      reference: 2
-      compare: 3
-      rca-file: "rca/rca-2n-skx-2t1c-pdr-rca1.yaml"
-    - title: "2005.0-4 vs 2001.0-4"
-      reference: 3
-      compare: 4
-      rca-file: "rca/rca-2n-skx-2t1c-pdr-rca2.yaml"
-  legend:
-    - ''
-    - 'Test Case:            Test cases executed for: PDR throughput on 2n-skx with xxv710.'
-    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "2" for CSIT rls2001, "4" for CSIT rls2005).'
-    - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-    - '2001.0-4 vs 2001.0-2: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2005.0-4 vs 2001.0-4: Compares VPP code current vs previous in the current CSIT environment.'
-
-# VPP Performance Changes 2n-skx 4t2c pdr
-- type: "table"
-  title: "VPP Performance Changes 2n-skx 4t2c pdr"
-  algorithm: "table_comparison"
-  output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-skx-4t2c-pdr"
-  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
-  filter: "'4T2C' and 'NDRPDR' and 'NIC_Intel-XXV710' and not 'NF_DENSITY'"
-  columns:
-    - title: "1908.1-2"
-      data-set: "vpp-performance-changes-2n-skx-h1"
-    - title: "2001.0-2"
-      data-set: "vpp-performance-changes-2n-skx-ref"
-    - title: "2001.0-4"
-      data-set: "vpp-performance-changes-2n-skx-cmp-2001.0-4"
-    - title: "2005.0-4"
-      data-set: "vpp-performance-changes-2n-skx-cmp-2"
-  comparisons:
-    - title: "2001.0-4 vs 2001.0-2"
-      reference: 2
-      compare: 3
-      rca-file: "rca/rca-2n-skx-4t2c-pdr-rca1.yaml"
-    - title: "2005.0-4 vs 2001.0-4"
-      reference: 3
-      compare: 4
-      rca-file: "rca/rca-2n-skx-4t2c-pdr-rca2.yaml"
-  legend:
-    - ''
-    - 'Test Case:            Test cases executed for: PDR throughput on 2n-skx with xxv710.'
-    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "2" for CSIT rls2001, "4" for CSIT rls2005).'
-    - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-    - '2001.0-4 vs 2001.0-2: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2005.0-4 vs 2001.0-4: Compares VPP code current vs previous in the current CSIT environment.'
-
-# VPP Performance Changes 2n-skx 2t1c ndr
-- type: "table"
-  title: "VPP Performance Changes 2n-skx 2t1c ndr"
-  algorithm: "table_comparison"
-  output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-skx-2t1c-ndr"
-  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
-  filter: "'2T1C' and 'NDRPDR' and 'NIC_Intel-XXV710' and not 'NF_DENSITY'"
-  columns:
-    - title: "1908.1-2"
-      data-set: "vpp-performance-changes-2n-skx-h1"
-    - title: "2001.0-2"
-      data-set: "vpp-performance-changes-2n-skx-ref"
-    - title: "2001.0-4"
-      data-set: "vpp-performance-changes-2n-skx-cmp-2001.0-4"
-    - title: "2005.0-4"
-      data-set: "vpp-performance-changes-2n-skx-cmp-2"
-  comparisons:
-    - title: "2001.0-4 vs 2001.0-2"
-      reference: 2
-      compare: 3
-      rca-file: "rca/rca-2n-skx-2t1c-ndr-rca1.yaml"
-    - title: "2005.0-4 vs 2001.0-4"
-      reference: 3
-      compare: 4
-      rca-file: "rca/rca-2n-skx-2t1c-ndr-rca2.yaml"
-  legend:
-    - ''
-    - 'Test Case:            Test cases executed for: NDR throughput on 2n-skx with xxv710.'
-    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "2" for CSIT rls2001, "4" for CSIT rls2005).'
-    - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-    - '2001.0-4 vs 2001.0-2: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2005.0-4 vs 2001.0-4: Compares VPP code current vs previous in the current CSIT environment.'
-
-# VPP Performance Changes 2n-skx 4t2c ndr
-- type: "table"
-  title: "VPP Performance Changes 2n-skx 4t2c ndr"
-  algorithm: "table_comparison"
-  output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-skx-4t2c-ndr"
-  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
-  filter: "'4T2C' and 'NDRPDR' and 'NIC_Intel-XXV710' and not 'NF_DENSITY'"
-  columns:
-    - title: "1908.1-2"
-      data-set: "vpp-performance-changes-2n-skx-h1"
-    - title: "2001.0-2"
-      data-set: "vpp-performance-changes-2n-skx-ref"
-    - title: "2001.0-4"
-      data-set: "vpp-performance-changes-2n-skx-cmp-2001.0-4"
-    - title: "2005.0-4"
-      data-set: "vpp-performance-changes-2n-skx-cmp-2"
-  comparisons:
-    - title: "2001.0-4 vs 2001.0-2"
-      reference: 2
-      compare: 3
-      rca-file: "rca/rca-2n-skx-4t2c-ndr-rca1.yaml"
-    - title: "2005.0-4 vs 2001.0-4"
-      reference: 3
-      compare: 4
-      rca-file: "rca/rca-2n-skx-4t2c-ndr-rca2.yaml"
-  legend:
-    - ''
-    - 'Test Case:            Test cases executed for: NDR throughput on 2n-skx with xxv710.'
-    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "2" for CSIT rls2001, "4" for CSIT rls2005).'
-    - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-    - '2001.0-4 vs 2001.0-2: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2005.0-4 vs 2001.0-4: Compares VPP code current vs previous in the current CSIT environment.'
-
-# VPP Performance Changes 2n-skx 2t1c pdr-full
-- type: "table"
-  title: "VPP Performance Changes 2n-skx 2t1c pdr-full"
-  algorithm: "table_comparison"
-  output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-skx-2t1c-pdr-full"
-  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
-  filter: "'2T1C' and 'NDRPDR' and 'NIC_Intel-XXV710' and not 'NF_DENSITY'"
-  columns:
-    - title: "1908.1-2"
-      data-set: "vpp-performance-changes-2n-skx-h1"
-    - title: "2001.0-2"
-      data-set: "vpp-performance-changes-2n-skx-ref"
-    - title: "2001.0-4"
-      data-set: "vpp-performance-changes-2n-skx-cmp-2001.0-4"
-    - title: "2005.0-3"
-      data-set: "vpp-performance-changes-2n-skx-cmp"
-    - title: "2005.0-4"
-      data-set: "vpp-performance-changes-2n-skx-cmp-2"
-  comparisons:
-    - title: "2005.0-4 vs 2005.0-3"
-      reference: 4
-      compare: 5
-      rca-file: "rca/rca-2n-skx-2t1c-pdr-rca1.yaml"
-    - title: "2001.0-4 vs 2001.0-2"
-      reference: 2
-      compare: 3
-      rca-file: "rca/rca-2n-skx-2t1c-pdr-rca2.yaml"
-    - title: "2005.0-4 vs 2001.0-4"
-      reference: 3
-      compare: 5
-      rca-file: "rca/rca-2n-skx-2t1c-pdr-rca3.yaml"
-
-  legend:
-    - ''
-    - 'Test Case:            Test cases executed for: PDR throughput on 2n-skx with xxv710.'
-    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "2" for 2020-03-27, "3" for 2020-06-11, "4" for 2020-06-24).'
-    - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-    - '2005.0-4 vs 2005.0-3: Compares CSIT environments "4" to "3". "3" was discarded as it substantially changed TRex behaviour due to higher number of TRex workers used.'
-    - '2001.0-4 vs 2001.0-2: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2005.0-4 vs 2001.0-4: Compares VPP code current vs previous in the current CSIT environment.'
-
-# VPP Performance Changes 2n-skx 4t2c pdr-full
-- type: "table"
-  title: "VPP Performance Changes 2n-skx 4t2c pdr-full"
-  algorithm: "table_comparison"
-  output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-skx-4t2c-pdr-full"
-  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
-  filter: "'4T2C' and 'NDRPDR' and 'NIC_Intel-XXV710' and not 'NF_DENSITY'"
-  columns:
-    - title: "1908.1-2"
-      data-set: "vpp-performance-changes-2n-skx-h1"
-    - title: "2001.0-2"
-      data-set: "vpp-performance-changes-2n-skx-ref"
-    - title: "2001.0-4"
-      data-set: "vpp-performance-changes-2n-skx-cmp-2001.0-4"
-    - title: "2005.0-3"
-      data-set: "vpp-performance-changes-2n-skx-cmp"
-    - title: "2005.0-4"
-      data-set: "vpp-performance-changes-2n-skx-cmp-2"
-  comparisons:
-    - title: "2005.0-4 vs 2005.0-3"
-      reference: 4
-      compare: 5
-      rca-file: "rca/rca-2n-skx-4t2c-pdr-rca1.yaml"
-    - title: "2001.0-4 vs 2001.0-2"
-      reference: 2
-      compare: 3
-      rca-file: "rca/rca-2n-skx-4t2c-pdr-rca2.yaml"
-    - title: "2005.0-4 vs 2001.0-4"
-      reference: 3
-      compare: 5
-      rca-file: "rca/rca-2n-skx-4t2c-pdr-rca3.yaml"
-  legend:
-    - ''
-    - 'Test Case:            Test cases executed for: PDR throughput on 2n-skx with xxv710.'
-    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "2" for 2020-03-27, "3" for 2020-06-11, "4" for 2020-06-24).'
-    - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-    - '2005.0-4 vs 2005.0-3: Compares CSIT environments "4" to "3". "3" was discarded as it substantially changed TRex behaviour due to higher number of TRex workers used.'
-    - '2001.0-4 vs 2001.0-2: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2005.0-4 vs 2001.0-4: Compares VPP code current vs previous in the current CSIT environment.'
-
-# VPP Performance Changes 2n-skx 2t1c ndr-full
-- type: "table"
-  title: "VPP Performance Changes 2n-skx 2t1c ndr-full"
-  algorithm: "table_comparison"
-  output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-skx-2t1c-ndr-full"
-  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
-  filter: "'2T1C' and 'NDRPDR' and 'NIC_Intel-XXV710' and not 'NF_DENSITY'"
-  columns:
-    - title: "1908.1-2"
-      data-set: "vpp-performance-changes-2n-skx-h1"
-    - title: "2001.0-2"
-      data-set: "vpp-performance-changes-2n-skx-ref"
-    - title: "2001.0-4"
-      data-set: "vpp-performance-changes-2n-skx-cmp-2001.0-4"
-    - title: "2005.0-3"
-      data-set: "vpp-performance-changes-2n-skx-cmp"
-    - title: "2005.0-4"
-      data-set: "vpp-performance-changes-2n-skx-cmp-2"
-  comparisons:
-    - title: "2005.0-4 vs 2005.0-3"
-      reference: 4
-      compare: 5
-      rca-file: "rca/rca-2n-skx-2t1c-ndr-rca1.yaml"
-    - title: "2001.0-4 vs 2001.0-2"
-      reference: 2
-      compare: 3
-      rca-file: "rca/rca-2n-skx-2t1c-ndr-rca2.yaml"
-    - title: "2005.0-4 vs 2001.0-4"
-      reference: 3
-      compare: 5
-      rca-file: "rca/rca-2n-skx-2t1c-ndr-rca3.yaml"
-  legend:
-    - ''
-    - 'Test Case:            Test cases executed for: NDR throughput on 2n-skx with xxv710.'
-    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "2" for 2020-03-27, "3" for 2020-06-11, "4" for 2020-06-24).'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "2" for CSIT rls2001, "4" for CSIT rls2005).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-    - '2005.0-4 vs 2005.0-3: Compares CSIT environments "4" to "3". "3" was discarded as it substantially changed TRex behaviour due to higher number of TRex workers used.'
-    - '2001.0-4 vs 2001.0-2: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2005.0-4 vs 2001.0-4: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2009.0-4 vs 2005.0-4: Compares VPP code current vs previous in the current CSIT environment.'
 
-# VPP Performance Changes 2n-skx 4t2c ndr-full
+# VPP Performance Changes 3n-skx 4t2c ndr
 - type: "table"
-  title: "VPP Performance Changes 2n-skx 4t2c ndr-full"
+  title: "VPP Performance Changes 3n-skx 4t2c ndr"
   algorithm: "table_comparison"
-  output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-skx-4t2c-ndr-full"
+  output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-skx-4t2c-ndr"
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
   filter: "'4T2C' and 'NDRPDR' and 'NIC_Intel-XXV710' and not 'NF_DENSITY'"
   columns:
-    - title: "1908.1-2"
-      data-set: "vpp-performance-changes-2n-skx-h1"
-    - title: "2001.0-2"
-      data-set: "vpp-performance-changes-2n-skx-ref"
     - title: "2001.0-4"
-      data-set: "vpp-performance-changes-2n-skx-cmp-2001.0-4"
-    - title: "2005.0-3"
-      data-set: "vpp-performance-changes-2n-skx-cmp"
+      data-set: "vpp-performance-changes-3n-skx-h1"
     - title: "2005.0-4"
-      data-set: "vpp-performance-changes-2n-skx-cmp-2"
+      data-set: "vpp-performance-changes-3n-skx-ref"
+    - title: "2009.0-4"
+      data-set: "vpp-performance-changes-3n-skx-cmp"
   comparisons:
-    - title: "2005.0-4 vs 2005.0-3"
-      reference: 4
-      compare: 5
-      rca-file: "rca/rca-2n-skx-4t2c-ndr-rca1.yaml"
-    - title: "2001.0-4 vs 2001.0-2"
+    - title: "2009.0-4 vs 2005.0-4"
       reference: 2
       compare: 3
-      rca-file: "rca/rca-2n-skx-4t2c-ndr-rca2.yaml"
-    - title: "2005.0-4 vs 2001.0-4"
-      reference: 3
-      compare: 5
-      rca-file: "rca/rca-2n-skx-4t2c-ndr-rca3.yaml"
+#      rca-file: "rca/rca-3n-skx-2t1c-ndr-rca1.yaml"
   legend:
     - ''
-    - 'Test Case:            Test cases executed for: NDR throughput on 2n-skx with xxv710.'
-    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "2" for 2020-03-27, "3" for 2020-06-11, "4" for 2020-06-24).'
+    - 'Test Case:            Test cases executed for: NDR throughput on 3n-skx with xxv710.'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "2" for CSIT rls2001, "4" for CSIT rls2005).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-    - '2005.0-4 vs 2005.0-3: Compares CSIT environments "4" to "3". "3" was discarded as it substantially changed TRex behaviour due to higher number of TRex workers used.'
-    - '2001.0-4 vs 2001.0-2: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2005.0-4 vs 2001.0-4: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2009.0-4 vs 2005.0-4: Compares VPP code current vs previous in the current CSIT environment.'
 
-# VPP Performance Changes 2n-clx-xxv710 2t1c pdr
+# VPP Performance Changes 2n-skx 2t1c pdr
 - type: "table"
-  title: "VPP Performance Changes 2n-clx-xxv710 2t1c pdr"
+  title: "VPP Performance Changes 2n-skx 2t1c pdr"
   algorithm: "table_comparison"
-  output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-clx-xxv710-2t1c-pdr"
+  output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-skx-2t1c-pdr"
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
   filter: "'2T1C' and 'NDRPDR' and 'NIC_Intel-XXV710' and not 'NF_DENSITY'"
   columns:
-    - title: "2001.0-2"
-      data-set: "vpp-performance-changes-2n-clx-ref"
     - title: "2001.0-4"
-      data-set: "vpp-performance-changes-2n-clx-cmp-2001.0-4"
+      data-set: "vpp-performance-changes-2n-skx-h1"
     - title: "2005.0-4"
-      data-set: "vpp-performance-changes-2n-clx-cmp-2"
+      data-set: "vpp-performance-changes-2n-skx-ref"
+    - title: "2009.0-4"
+      data-set: "vpp-performance-changes-2n-skx-cmp"
   comparisons:
-    - title: "2001.0-4 vs 2001.0-2"
-      reference: 1
-      compare: 2
-      rca-file: "rca/rca-2n-clx-2t1c-pdr-rca1.yaml"
-    - title: "2005.0-4 vs 2001.0-4"
+    - title: "2009.0-4 vs 2005.0-4"
       reference: 2
       compare: 3
-      rca-file: "rca/rca-2n-clx-2t1c-pdr-rca2.yaml"
+#      rca-file: "rca/rca-2n-skx-2t1c-pdr-rca1.yaml"
   legend:
     - ''
-    - 'Test Case:            Test cases executed for: PDR throughput on 2n-clx with xxv710.'
+    - 'Test Case:            Test cases executed for: PDR throughput on 2n-skx with xxv710.'
     - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "2" for CSIT rls2001, "4" for CSIT rls2005).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-    - '2001.0-4 vs 2001.0-2: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2005.0-4 vs 2001.0-4: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2009.0-4 vs 2005.0-4: Compares VPP code current vs previous in the current CSIT environment.'
 
-# VPP Performance Changes 2n-clx-xxv710 4t2c pdr
+# VPP Performance Changes 2n-skx 4t2c pdr
 - type: "table"
-  title: "VPP Performance Changes 2n-clx-xxv710 4t2c pdr"
+  title: "VPP Performance Changes 2n-skx 4t2c pdr"
   algorithm: "table_comparison"
-  output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-clx-xxv710-4t2c-pdr"
+  output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-skx-4t2c-pdr"
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
   filter: "'4T2C' and 'NDRPDR' and 'NIC_Intel-XXV710' and not 'NF_DENSITY'"
   columns:
-    - title: "2001.0-2"
-      data-set: "vpp-performance-changes-2n-clx-ref"
     - title: "2001.0-4"
-      data-set: "vpp-performance-changes-2n-clx-cmp-2001.0-4"
+      data-set: "vpp-performance-changes-2n-skx-h1"
     - title: "2005.0-4"
-      data-set: "vpp-performance-changes-2n-clx-cmp-2"
+      data-set: "vpp-performance-changes-2n-skx-ref"
+    - title: "2009.0-4"
+      data-set: "vpp-performance-changes-2n-skx-cmp"
   comparisons:
-    - title: "2001.0-4 vs 2001.0-2"
-      reference: 1
-      compare: 2
-      rca-file: "rca/rca-2n-clx-4t2c-pdr-rca1.yaml"
-    - title: "2005.0-4 vs 2001.0-4"
+    - title: "2009.0-4 vs 2005.0-4"
       reference: 2
       compare: 3
-      rca-file: "rca/rca-2n-clx-4t2c-pdr-rca2.yaml"
+#      rca-file: "rca/rca-2n-skx-2t1c-pdr-rca1.yaml"
   legend:
     - ''
-    - 'Test Case:            Test cases executed for: PDR throughput on 2n-clx with xxv710.'
+    - 'Test Case:            Test cases executed for: PDR throughput on 2n-skx with xxv710.'
     - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "2" for CSIT rls2001, "4" for CSIT rls2005).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-    - '2001.0-4 vs 2001.0-2: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2005.0-4 vs 2001.0-4: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2009.0-4 vs 2005.0-4: Compares VPP code current vs previous in the current CSIT environment.'
 
-# VPP Performance Changes 2n-clx-xxv710 2t1c ndr
+# VPP Performance Changes 2n-skx 2t1c ndr
 - type: "table"
-  title: "VPP Performance Changes 2n-clx-xxv710 2t1c ndr"
+  title: "VPP Performance Changes 2n-skx 2t1c ndr"
   algorithm: "table_comparison"
-  output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-clx-xxv710-2t1c-ndr"
+  output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-skx-2t1c-ndr"
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
   filter: "'2T1C' and 'NDRPDR' and 'NIC_Intel-XXV710' and not 'NF_DENSITY'"
   columns:
-    - title: "2001.0-2"
-      data-set: "vpp-performance-changes-2n-clx-ref"
     - title: "2001.0-4"
-      data-set: "vpp-performance-changes-2n-clx-cmp-2001.0-4"
+      data-set: "vpp-performance-changes-2n-skx-h1"
     - title: "2005.0-4"
-      data-set: "vpp-performance-changes-2n-clx-cmp-2"
+      data-set: "vpp-performance-changes-2n-skx-ref"
+    - title: "2009.0-4"
+      data-set: "vpp-performance-changes-2n-skx-cmp"
   comparisons:
-    - title: "2001.0-4 vs 2001.0-2"
-      reference: 1
-      compare: 2
-      rca-file: "rca/rca-2n-clx-2t1c-ndr-rca1.yaml"
-    - title: "2005.0-4 vs 2001.0-4"
+    - title: "2009.0-4 vs 2005.0-4"
       reference: 2
       compare: 3
-      rca-file: "rca/rca-2n-clx-2t1c-ndr-rca2.yaml"
+#      rca-file: "rca/rca-2n-skx-2t1c-ndr-rca1.yaml"
   legend:
     - ''
-    - 'Test Case:            Test cases executed for: NDR throughput on 2n-clx with xxv710.'
+    - 'Test Case:            Test cases executed for: NDR throughput on 2n-skx with xxv710.'
     - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "2" for CSIT rls2001, "4" for CSIT rls2005).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-    - '2001.0-4 vs 2001.0-2: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2005.0-4 vs 2001.0-4: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2009.0-4 vs 2005.0-4: Compares VPP code current vs previous in the current CSIT environment.'
 
-# VPP Performance Changes 2n-clx-xxv710 4t2c ndr
+# VPP Performance Changes 2n-skx 4t2c ndr
 - type: "table"
-  title: "VPP Performance Changes 2n-clx-xxv710 ndr"
+  title: "VPP Performance Changes 2n-skx 4t2c ndr"
   algorithm: "table_comparison"
-  output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-clx-xxv710-4t2c-ndr"
+  output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-skx-4t2c-ndr"
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
   filter: "'4T2C' and 'NDRPDR' and 'NIC_Intel-XXV710' and not 'NF_DENSITY'"
   columns:
-    - title: "2001.0-2"
-      data-set: "vpp-performance-changes-2n-clx-ref"
     - title: "2001.0-4"
-      data-set: "vpp-performance-changes-2n-clx-cmp-2001.0-4"
+      data-set: "vpp-performance-changes-2n-skx-h1"
     - title: "2005.0-4"
-      data-set: "vpp-performance-changes-2n-clx-cmp-2"
+      data-set: "vpp-performance-changes-2n-skx-ref"
+    - title: "2009.0-4"
+      data-set: "vpp-performance-changes-2n-skx-cmp"
   comparisons:
-    - title: "2001.0-4 vs 2001.0-2"
-      reference: 1
-      compare: 2
-      rca-file: "rca/rca-2n-clx-4t2c-ndr-rca1.yaml"
-    - title: "2005.0-4 vs 2001.0-4"
+    - title: "2009.0-4 vs 2005.0-4"
       reference: 2
       compare: 3
-      rca-file: "rca/rca-2n-clx-4t2c-ndr-rca2.yaml"
+#      rca-file: "rca/rca-2n-skx-2t1c-ndr-rca1.yaml"
   legend:
     - ''
-    - 'Test Case:            Test cases executed for: NDR throughput on 2n-clx with xxv710.'
+    - 'Test Case:            Test cases executed for: NDR throughput on 2n-skx with xxv710.'
     - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "2" for CSIT rls2001, "4" for CSIT rls2005).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-    - '2001.0-4 vs 2001.0-2: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2005.0-4 vs 2001.0-4: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2009.0-4 vs 2005.0-4: Compares VPP code current vs previous in the current CSIT environment.'
 
-# VPP Performance Changes 2n-clx-xxv710 2t1c pdr-full
+# VPP Performance Changes 2n-clx-xxv710 2t1c pdr
 - type: "table"
-  title: "VPP Performance Changes 2n-clx-xxv710 2t1c pdr-full"
+  title: "VPP Performance Changes 2n-clx-xxv710 2t1c pdr"
   algorithm: "table_comparison"
-  output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-clx-xxv710-2t1c-pdr-full"
+  output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-clx-xxv710-2t1c-pdr"
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
   filter: "'2T1C' and 'NDRPDR' and 'NIC_Intel-XXV710' and not 'NF_DENSITY'"
   columns:
-    - title: "2001.0-2"
-      data-set: "vpp-performance-changes-2n-clx-ref"
     - title: "2001.0-4"
-      data-set: "vpp-performance-changes-2n-clx-cmp-2001.0-4"
-    - title: "2005.0-3"
-      data-set: "vpp-performance-changes-2n-clx-cmp"
+      data-set: "vpp-performance-changes-2n-clx-h1"
     - title: "2005.0-4"
-      data-set: "vpp-performance-changes-2n-clx-cmp-2"
+      data-set: "vpp-performance-changes-2n-clx-ref"
+    - title: "2009.0-4"
+      data-set: "vpp-performance-changes-2n-clx-cmp"
   comparisons:
-    - title: "2005.0-4 vs 2005.0-3"
-      reference: 3
-      compare: 4
-      rca-file: "rca/rca-2n-clx-2t1c-pdr-rca1.yaml"
-    - title: "2001.0-4 vs 2001.0-2"
-      reference: 1
-      compare: 2
-      rca-file: "rca/rca-2n-clx-2t1c-pdr-rca2.yaml"
-    - title: "2005.0-4 vs 2001.0-4"
+    - title: "2009.0-4 vs 2005.0-4"
       reference: 2
-      compare: 4
-      rca-file: "rca/rca-2n-clx-2t1c-pdr-rca3.yaml"
+      compare: 3
+#      rca-file: "rca/rca-2n-clx-2t1c-pdr-rca1.yaml"
   legend:
     - ''
     - 'Test Case:            Test cases executed for: PDR throughput on 2n-clx with xxv710.'
-    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "2" for 2020-03-27, "3" for 2020-06-11, "4" for 2020-06-24).'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "2" for CSIT rls2001, "4" for CSIT rls2005).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-    - '2005.0-4 vs 2005.0-3: Compares CSIT environments "4" to "3". "3" was discarded as it substantially changed TRex behaviour due to higher number of TRex workers used.'
-    - '2001.0-4 vs 2001.0-2: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2005.0-4 vs 2001.0-4: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2009.0-4 vs 2005.0-4: Compares VPP code current vs previous in the current CSIT environment.'
 
-# VPP Performance Changes 2n-clx-xxv710 4t2c pdr-full
+# VPP Performance Changes 2n-clx-xxv710 4t2c pdr
 - type: "table"
-  title: "VPP Performance Changes 2n-clx-xxv710 4t2c pdr-full"
+  title: "VPP Performance Changes 2n-clx-xxv710 4t2c pdr"
   algorithm: "table_comparison"
-  output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-clx-xxv710-4t2c-pdr-full"
+  output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-clx-xxv710-4t2c-pdr"
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
   filter: "'4T2C' and 'NDRPDR' and 'NIC_Intel-XXV710' and not 'NF_DENSITY'"
   columns:
-    - title: "2001.0-2"
-      data-set: "vpp-performance-changes-2n-clx-ref"
     - title: "2001.0-4"
-      data-set: "vpp-performance-changes-2n-clx-cmp-2001.0-4"
-    - title: "2005.0-3"
-      data-set: "vpp-performance-changes-2n-clx-cmp"
+      data-set: "vpp-performance-changes-2n-clx-h1"
     - title: "2005.0-4"
-      data-set: "vpp-performance-changes-2n-clx-cmp-2"
+      data-set: "vpp-performance-changes-2n-clx-ref"
+    - title: "2009.0-4"
+      data-set: "vpp-performance-changes-2n-clx-cmp"
   comparisons:
-    - title: "2005.0-4 vs 2005.0-3"
-      reference: 3
-      compare: 4
-      rca-file: "rca/rca-2n-clx-4t2c-pdr-rca1.yaml"
-    - title: "2001.0-4 vs 2001.0-2"
-      reference: 1
-      compare: 2
-      rca-file: "rca/rca-2n-clx-4t2c-pdr-rca2.yaml"
-    - title: "2005.0-4 vs 2001.0-4"
+    - title: "2009.0-4 vs 2005.0-4"
       reference: 2
-      compare: 4
-      rca-file: "rca/rca-2n-clx-4t2c-pdr-rca3.yaml"
+      compare: 3
+#      rca-file: "rca/rca-2n-clx-2t1c-pdr-rca1.yaml"
   legend:
     - ''
     - 'Test Case:            Test cases executed for: PDR throughput on 2n-clx with xxv710.'
-    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "2" for 2020-03-27, "3" for 2020-06-11, "4" for 2020-06-24).'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "2" for CSIT rls2001, "4" for CSIT rls2005).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-    - '2005.0-4 vs 2005.0-3: Compares CSIT environments "4" to "3". "3" was discarded as it substantially changed TRex behaviour due to higher number of TRex workers used.'
-    - '2001.0-4 vs 2001.0-2: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2005.0-4 vs 2001.0-4: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2009.0-4 vs 2005.0-4: Compares VPP code current vs previous in the current CSIT environment.'
 
-# VPP Performance Changes 2n-clx-xxv710 2t1c ndr-full
+# VPP Performance Changes 2n-clx-xxv710 2t1c ndr
 - type: "table"
-  title: "VPP Performance Changes 2n-clx-xxv710 2t1c ndr-full"
+  title: "VPP Performance Changes 2n-clx-xxv710 2t1c ndr"
   algorithm: "table_comparison"
-  output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-clx-xxv710-2t1c-ndr-full"
+  output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-clx-xxv710-2t1c-ndr"
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
   filter: "'2T1C' and 'NDRPDR' and 'NIC_Intel-XXV710' and not 'NF_DENSITY'"
   columns:
-    - title: "2001.0-2"
-      data-set: "vpp-performance-changes-2n-clx-ref"
     - title: "2001.0-4"
-      data-set: "vpp-performance-changes-2n-clx-cmp-2001.0-4"
-    - title: "2005.0-3"
-      data-set: "vpp-performance-changes-2n-clx-cmp"
+      data-set: "vpp-performance-changes-2n-clx-h1"
     - title: "2005.0-4"
-      data-set: "vpp-performance-changes-2n-clx-cmp-2"
+      data-set: "vpp-performance-changes-2n-clx-ref"
+    - title: "2009.0-4"
+      data-set: "vpp-performance-changes-2n-clx-cmp"
   comparisons:
-    - title: "2005.0-4 vs 2005.0-3"
-      reference: 3
-      compare: 4
-      rca-file: "rca/rca-2n-clx-2t1c-ndr-rca1.yaml"
-    - title: "2001.0-4 vs 2001.0-2"
-      reference: 1
-      compare: 2
-      rca-file: "rca/rca-2n-clx-2t1c-ndr-rca2.yaml"
-    - title: "2005.0-4 vs 2001.0-4"
+    - title: "2009.0-4 vs 2005.0-4"
       reference: 2
-      compare: 4
-      rca-file: "rca/rca-2n-clx-2t1c-ndr-rca3.yaml"
+      compare: 3
+#      rca-file: "rca/rca-2n-clx-2t1c-ndr-rca1.yaml"
   legend:
     - ''
     - 'Test Case:            Test cases executed for: NDR throughput on 2n-clx with xxv710.'
-    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "2" for 2020-03-27, "3" for 2020-06-11, "4" for 2020-06-24).'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "2" for CSIT rls2001, "4" for CSIT rls2005).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-    - '2005.0-4 vs 2005.0-3: Compares CSIT environments "4" to "3". "3" was discarded as it substantially changed TRex behaviour due to higher number of TRex workers used.'
-    - '2001.0-4 vs 2001.0-2: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2005.0-4 vs 2001.0-4: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2009.0-4 vs 2005.0-4: Compares VPP code current vs previous in the current CSIT environment.'
 
-# VPP Performance Changes 2n-clx-xxv710 4t2c ndr-full
+# VPP Performance Changes 2n-clx-xxv710 4t2c ndr
 - type: "table"
-  title: "VPP Performance Changes 2n-clx-xxv710 ndr-full"
+  title: "VPP Performance Changes 2n-clx-xxv710 ndr"
   algorithm: "table_comparison"
-  output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-clx-xxv710-4t2c-ndr-full"
+  output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-clx-xxv710-4t2c-ndr"
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
   filter: "'4T2C' and 'NDRPDR' and 'NIC_Intel-XXV710' and not 'NF_DENSITY'"
   columns:
-    - title: "2001.0-2"
-      data-set: "vpp-performance-changes-2n-clx-ref"
     - title: "2001.0-4"
-      data-set: "vpp-performance-changes-2n-clx-cmp-2001.0-4"
-    - title: "2005.0-3"
-      data-set: "vpp-performance-changes-2n-clx-cmp"
+      data-set: "vpp-performance-changes-2n-clx-h1"
     - title: "2005.0-4"
-      data-set: "vpp-performance-changes-2n-clx-cmp-2"
+      data-set: "vpp-performance-changes-2n-clx-ref"
+    - title: "2009.0-4"
+      data-set: "vpp-performance-changes-2n-clx-cmp"
   comparisons:
-    - title: "2005.0-4 vs 2005.0-3"
-      reference: 3
-      compare: 4
-      rca-file: "rca/rca-2n-clx-4t2c-ndr-rca1.yaml"
-    - title: "2001.0-4 vs 2001.0-2"
-      reference: 1
-      compare: 2
-      rca-file: "rca/rca-2n-clx-4t2c-ndr-rca2.yaml"
-    - title: "2005.0-4 vs 2001.0-4"
+    - title: "2009.0-4 vs 2005.0-4"
       reference: 2
-      compare: 4
-      rca-file: "rca/rca-2n-clx-4t2c-ndr-rca3.yaml"
+      compare: 3
+#      rca-file: "rca/rca-2n-clx-2t1c-ndr-rca1.yaml"
   legend:
     - ''
     - 'Test Case:            Test cases executed for: NDR throughput on 2n-clx with xxv710.'
-    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "2" for 2020-03-27, "3" for 2020-06-11, "4" for 2020-06-24).'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "2" for CSIT rls2001, "4" for CSIT rls2005).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-    - '2005.0-4 vs 2005.0-3: Compares CSIT environments "4" to "3". "3" was discarded as it substantially changed TRex behaviour due to higher number of TRex workers used.'
-    - '2001.0-4 vs 2001.0-2: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2005.0-4 vs 2001.0-4: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2009.0-4 vs 2005.0-4: Compares VPP code current vs previous in the current CSIT environment.'
 
 ## VPP Performance Changes 2n-clx-x556 2t1c pdr
 #- type: "table"
@@ -4598,14 +3830,14 @@
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
   filter: "'1T1C'"
   columns:
-    - title: "1908.1-2"
-      data-set: "vpp-performance-changes-2n-dnv-h1"
     - title: "2001.0-2"
-      data-set: "vpp-performance-changes-2n-dnv-ref"
+      data-set: "vpp-performance-changes-2n-dnv-h1"
     - title: "2005.0-3"
+      data-set: "vpp-performance-changes-2n-dnv-ref"
+    - title: "2009.0-4"
       data-set: "vpp-performance-changes-2n-dnv-cmp"
   comparisons:
-    - title: "2005.0-3 vs 2001.0-2"
+    - title: "2009.0-4 vs 2005.0-3"
       reference: 2
       compare: 3
   legend:
@@ -4613,7 +3845,7 @@
     - 'Test Case:            Test cases executed for: PDR throughput on 2n-dnv with x553.'
     - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "2" for CSIT rls2001, "4" for CSIT rls2005).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-    - '2005.0-3 vs 2001.0-2: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2009.0-4 vs 2005.0-3: Compares CSIT environment current vs previous with previous VPP code.'
 
 # VPP Performance Changes 2n-dnv 2t2c pdr
 - type: "table"
@@ -4623,14 +3855,14 @@
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
   filter: "'2T2C'"
   columns:
-    - title: "1908.1-2"
-      data-set: "vpp-performance-changes-2n-dnv-h1"
     - title: "2001.0-2"
-      data-set: "vpp-performance-changes-2n-dnv-ref"
+      data-set: "vpp-performance-changes-2n-dnv-h1"
     - title: "2005.0-3"
+      data-set: "vpp-performance-changes-2n-dnv-ref"
+    - title: "2009.0-4"
       data-set: "vpp-performance-changes-2n-dnv-cmp"
   comparisons:
-    - title: "2005.0-3 vs 2001.0-2"
+    - title: "2009.0-4 vs 2005.0-3"
       reference: 2
       compare: 3
   legend:
@@ -4638,7 +3870,7 @@
     - 'Test Case:            Test cases executed for: PDR throughput on 2n-dnv with x553.'
     - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "2" for CSIT rls2001, "4" for CSIT rls2005).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-    - '2005.0-3 vs 2001.0-2: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2009.0-4 vs 2005.0-3: Compares CSIT environment current vs previous with previous VPP code.'
 
 # VPP Performance Changes 2n-dnv 1t1c ndr
 - type: "table"
@@ -4648,14 +3880,14 @@
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
   filter: "'1T1C'"
   columns:
-    - title: "1908.1-2"
-      data-set: "vpp-performance-changes-2n-dnv-h1"
     - title: "2001.0-2"
-      data-set: "vpp-performance-changes-2n-dnv-ref"
+      data-set: "vpp-performance-changes-2n-dnv-h1"
     - title: "2005.0-3"
+      data-set: "vpp-performance-changes-2n-dnv-ref"
+    - title: "2009.0-4"
       data-set: "vpp-performance-changes-2n-dnv-cmp"
   comparisons:
-    - title: "2005.0-3 vs 2001.0-2"
+    - title: "2009.0-4 vs 2005.0-3"
       reference: 2
       compare: 3
   legend:
@@ -4663,7 +3895,7 @@
     - 'Test Case:            Test cases executed for: NDR throughput on 2n-dnv with x553.'
     - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "2" for CSIT rls2001, "4" for CSIT rls2005).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-    - '2005.0-3 vs 2001.0-2: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2009.0-4 vs 2005.0-3: Compares CSIT environment current vs previous with previous VPP code.'
 
 # VPP Performance Changes 2n-dnv 2t2c ndr
 - type: "table"
@@ -4673,14 +3905,14 @@
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
   filter: "'2T2C'"
   columns:
-    - title: "1908.1-2"
-      data-set: "vpp-performance-changes-2n-dnv-h1"
     - title: "2001.0-2"
-      data-set: "vpp-performance-changes-2n-dnv-ref"
+      data-set: "vpp-performance-changes-2n-dnv-h1"
     - title: "2005.0-3"
+      data-set: "vpp-performance-changes-2n-dnv-ref"
+    - title: "2009.0-4"
       data-set: "vpp-performance-changes-2n-dnv-cmp"
   comparisons:
-    - title: "2005.0-3 vs 2001.0-2"
+    - title: "2009.0-4 vs 2005.0-3"
       reference: 2
       compare: 3
   legend:
@@ -4688,7 +3920,7 @@
     - 'Test Case:            Test cases executed for: NDR throughput on 2n-dnv with x553.'
     - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "2" for CSIT rls2001, "4" for CSIT rls2005).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-    - '2005.0-3 vs 2001.0-2: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2009.0-4 vs 2005.0-3: Compares CSIT environment current vs previous with previous VPP code.'
 
 # VPP Performance Changes 3n-dnv 1t1c pdr
 - type: "table"
@@ -4698,14 +3930,14 @@
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
   filter: "'1T1C'"
   columns:
-    - title: "1908.1-2"
-      data-set: "vpp-performance-changes-3n-dnv-h1"
     - title: "2001.0-2"
-      data-set: "vpp-performance-changes-3n-dnv-ref"
+      data-set: "vpp-performance-changes-3n-dnv-h1"
     - title: "2005.0-3"
+      data-set: "vpp-performance-changes-3n-dnv-ref"
+    - title: "2009.0-4"
       data-set: "vpp-performance-changes-3n-dnv-cmp"
   comparisons:
-    - title: "2005.0-3 vs 2001.0-2"
+    - title: "2009.0-4 vs 2005.0-3"
       reference: 2
       compare: 3
   legend:
@@ -4713,7 +3945,7 @@
     - 'Test Case:            Test cases executed for: PDR throughput on 3n-dnv with x553.'
     - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "2" for CSIT rls2001, "4" for CSIT rls2005).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-    - '2005.0-3 vs 2001.0-2: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2009.0-4 vs 2005.0-3: Compares CSIT environment current vs previous with previous VPP code.'
 
 # VPP Performance Changes 3n-dnv 2t2c pdr
 - type: "table"
@@ -4723,14 +3955,14 @@
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
   filter: "'2T2C'"
   columns:
-    - title: "1908.1-2"
-      data-set: "vpp-performance-changes-3n-dnv-h1"
     - title: "2001.0-2"
-      data-set: "vpp-performance-changes-3n-dnv-ref"
+      data-set: "vpp-performance-changes-3n-dnv-h1"
     - title: "2005.0-3"
+      data-set: "vpp-performance-changes-3n-dnv-ref"
+    - title: "2009.0-4"
       data-set: "vpp-performance-changes-3n-dnv-cmp"
   comparisons:
-    - title: "2005.0-3 vs 2001.0-2"
+    - title: "2009.0-4 vs 2005.0-3"
       reference: 2
       compare: 3
   legend:
@@ -4738,7 +3970,7 @@
     - 'Test Case:            Test cases executed for: PDR throughput on 3n-dnv with x553.'
     - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "2" for CSIT rls2001, "4" for CSIT rls2005).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-    - '2005.0-3 vs 2001.0-2: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2009.0-4 vs 2005.0-3: Compares CSIT environment current vs previous with previous VPP code.'
 
 # VPP Performance Changes 3n-dnv 1t1c ndr
 - type: "table"
@@ -4748,14 +3980,14 @@
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
   filter: "'1T1C'"
   columns:
-    - title: "1908.1-2"
-      data-set: "vpp-performance-changes-3n-dnv-h1"
     - title: "2001.0-2"
-      data-set: "vpp-performance-changes-3n-dnv-ref"
+      data-set: "vpp-performance-changes-3n-dnv-h1"
     - title: "2005.0-3"
+      data-set: "vpp-performance-changes-3n-dnv-ref"
+    - title: "2009.0-4"
       data-set: "vpp-performance-changes-3n-dnv-cmp"
   comparisons:
-    - title: "2005.0-3 vs 2001.0-2"
+    - title: "2009.0-4 vs 2005.0-3"
       reference: 2
       compare: 3
   legend:
@@ -4763,7 +3995,7 @@
     - 'Test Case:            Test cases executed for: NDR throughput on 3n-dnv with x553.'
     - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "2" for CSIT rls2001, "4" for CSIT rls2005).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-    - '2005.0-3 vs 2001.0-2: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2009.0-4 vs 2005.0-3: Compares CSIT environment current vs previous with previous VPP code.'
 
 # VPP Performance Changes 3n-dnv 2t2c ndr
 - type: "table"
@@ -4773,14 +4005,14 @@
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
   filter: "'2T2C'"
   columns:
-    - title: "1908.1-2"
-      data-set: "vpp-performance-changes-3n-dnv-h1"
     - title: "2001.0-2"
-      data-set: "vpp-performance-changes-3n-dnv-ref"
+      data-set: "vpp-performance-changes-3n-dnv-h1"
     - title: "2005.0-3"
+      data-set: "vpp-performance-changes-3n-dnv-ref"
+    - title: "2009.0-4"
       data-set: "vpp-performance-changes-3n-dnv-cmp"
   comparisons:
-    - title: "2005.0-3 vs 2001.0-2"
+    - title: "2009.0-4 vs 2005.0-3"
       reference: 2
       compare: 3
   legend:
@@ -4788,7 +4020,7 @@
     - 'Test Case:            Test cases executed for: NDR throughput on 3n-dnv with x553.'
     - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "2" for CSIT rls2001, "4" for CSIT rls2005).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-    - '2005.0-3 vs 2001.0-2: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2009.0-4 vs 2005.0-3: Compares CSIT environment current vs previous with previous VPP code.'
 
 # VPP Performance Changes 3n-tsh 1t1c pdr
 - type: "table"
@@ -4798,30 +4030,23 @@
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
   filter: "'1T1C'"
   columns:
-    - title: "1908.1-2"
-      data-set: "vpp-performance-changes-3n-tsh-h1"
-    - title: "2001.0-2"
-      data-set: "vpp-performance-changes-3n-tsh-ref"
     - title: "2001.0-4"
-      data-set: "vpp-performance-changes-3n-tsh-cmp-2001.0-4"
+      data-set: "vpp-performance-changes-3n-tsh-h1"
     - title: "2005.0-4"
-      data-set: "vpp-performance-changes-3n-tsh-cmp-2"
+      data-set: "vpp-performance-changes-3n-tsh-ref"
+    - title: "2009.0-4"
+      data-set: "vpp-performance-changes-3n-tsh-cmp"
   comparisons:
-    - title: "2001.0-4 vs 2001.0-2"
+    - title: "2009.0-4 vs 2005.0-4"
       reference: 2
       compare: 3
-      rca-file: "rca/rca-3n-tsh-1t1c-pdr-rca1.yaml"
-    - title: "2005.0-4 vs 2001.0-4"
-      reference: 3
-      compare: 4
-      rca-file: "rca/rca-3n-tsh-1t1c-pdr-rca2.yaml"
+#      rca-file: "rca/rca-3n-tsh-1t1c-pdr-rca1.yaml"
   legend:
     - ''
     - 'Test Case:            Test cases executed for: PDR throughput on 3n-tsh with x520.'
     - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "2" for CSIT rls2001, "4" for CSIT rls2005).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-    - '2001.0-4 vs 2001.0-2: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2005.0-4 vs 2001.0-4: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2009.0-4 vs 2005.0-4: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 3n-tsh 2t2c pdr
 - type: "table"
@@ -4831,30 +4056,23 @@
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
   filter: "'2T2C'"
   columns:
-    - title: "1908.1-2"
-      data-set: "vpp-performance-changes-3n-tsh-h1"
-    - title: "2001.0-2"
-      data-set: "vpp-performance-changes-3n-tsh-ref"
     - title: "2001.0-4"
-      data-set: "vpp-performance-changes-3n-tsh-cmp-2001.0-4"
+      data-set: "vpp-performance-changes-3n-tsh-h1"
     - title: "2005.0-4"
-      data-set: "vpp-performance-changes-3n-tsh-cmp-2"
+      data-set: "vpp-performance-changes-3n-tsh-ref"
+    - title: "2009.0-4"
+      data-set: "vpp-performance-changes-3n-tsh-cmp"
   comparisons:
-    - title: "2001.0-4 vs 2001.0-2"
+    - title: "2009.0-4 vs 2005.0-4"
       reference: 2
       compare: 3
-      rca-file: "rca/rca-3n-tsh-2t2c-pdr-rca1.yaml"
-    - title: "2005.0-4 vs 2001.0-4"
-      reference: 3
-      compare: 4
-      rca-file: "rca/rca-3n-tsh-2t2c-pdr-rca2.yaml"
+#      rca-file: "rca/rca-3n-tsh-1t1c-pdr-rca1.yaml"
   legend:
     - ''
     - 'Test Case:            Test cases executed for: PDR throughput on 3n-tsh with x520.'
     - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "2" for CSIT rls2001, "4" for CSIT rls2005).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-    - '2001.0-4 vs 2001.0-2: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2005.0-4 vs 2001.0-4: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2009.0-4 vs 2005.0-4: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 3n-tsh 1t1c ndr
 - type: "table"
@@ -4864,30 +4082,23 @@
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
   filter: "'1T1C'"
   columns:
-    - title: "1908.1-2"
-      data-set: "vpp-performance-changes-3n-tsh-h1"
-    - title: "2001.0-2"
-      data-set: "vpp-performance-changes-3n-tsh-ref"
     - title: "2001.0-4"
-      data-set: "vpp-performance-changes-3n-tsh-cmp-2001.0-4"
+      data-set: "vpp-performance-changes-3n-tsh-h1"
     - title: "2005.0-4"
-      data-set: "vpp-performance-changes-3n-tsh-cmp-2"
+      data-set: "vpp-performance-changes-3n-tsh-ref"
+    - title: "2009.0-4"
+      data-set: "vpp-performance-changes-3n-tsh-cmp"
   comparisons:
-    - title: "2001.0-4 vs 2001.0-2"
+    - title: "2009.0-4 vs 2005.0-4"
       reference: 2
       compare: 3
-      rca-file: "rca/rca-3n-tsh-1t1c-ndr-rca1.yaml"
-    - title: "2005.0-4 vs 2001.0-4"
-      reference: 3
-      compare: 4
-      rca-file: "rca/rca-3n-tsh-1t1c-ndr-rca2.yaml"
+#      rca-file: "rca/rca-3n-tsh-1t1c-pdr-rca1.yaml"
   legend:
     - ''
     - 'Test Case:            Test cases executed for: NDR throughput on 3n-tsh with x520.'
     - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "2" for CSIT rls2001, "4" for CSIT rls2005).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-    - '2001.0-4 vs 2001.0-2: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2005.0-4 vs 2001.0-4: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2009.0-4 vs 2005.0-4: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 3n-tsh 2t2c ndr
 - type: "table"
@@ -4897,190 +4108,23 @@
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
   filter: "'2T2C'"
   columns:
-    - title: "1908.1-2"
-      data-set: "vpp-performance-changes-3n-tsh-h1"
-    - title: "2001.0-2"
-      data-set: "vpp-performance-changes-3n-tsh-ref"
-    - title: "2001.0-4"
-      data-set: "vpp-performance-changes-3n-tsh-cmp-2001.0-4"
-    - title: "2005.0-4"
-      data-set: "vpp-performance-changes-3n-tsh-cmp-2"
-  comparisons:
-    - title: "2001.0-4 vs 2001.0-2"
-      reference: 2
-      compare: 3
-      rca-file: "rca/rca-3n-tsh-2t2c-ndr-rca1.yaml"
-    - title: "2005.0-4 vs 2001.0-4"
-      reference: 3
-      compare: 4
-      rca-file: "rca/rca-3n-tsh-2t2c-ndr-rca2.yaml"
-  legend:
-    - ''
-    - 'Test Case:            Test cases executed for: NDR throughput on 3n-tsh with x520.'
-    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "2" for CSIT rls2001, "4" for CSIT rls2005).'
-    - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-    - '2001.0-4 vs 2001.0-2: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2005.0-4 vs 2001.0-4: Compares VPP code current vs previous in the current CSIT environment.'
-
-# VPP Performance Changes 3n-tsh 1t1c pdr-full
-- type: "table"
-  title: "VPP Performance Changes 3n-tsh 1t1c pdr-full"
-  algorithm: "table_comparison"
-  output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-tsh-1t1c-pdr-full"
-  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
-  filter: "'1T1C'"
-  columns:
-    - title: "1908.1-2"
-      data-set: "vpp-performance-changes-3n-tsh-h1"
-    - title: "2001.0-2"
-      data-set: "vpp-performance-changes-3n-tsh-ref"
-    - title: "2001.0-4"
-      data-set: "vpp-performance-changes-3n-tsh-cmp-2001.0-4"
-    - title: "2005.0-3"
-      data-set: "vpp-performance-changes-3n-tsh-cmp"
-    - title: "2005.0-4"
-      data-set: "vpp-performance-changes-3n-tsh-cmp-2"
-  comparisons:
-    - title: "2005.0-4 vs 2005.0-3"
-      reference: 4
-      compare: 5
-      rca-file: "rca/rca-3n-tsh-1t1c-pdr-rca1.yaml"
-    - title: "2001.0-4 vs 2001.0-2"
-      reference: 2
-      compare: 3
-      rca-file: "rca/rca-3n-tsh-1t1c-pdr-rca2.yaml"
-    - title: "2005.0-4 vs 2001.0-4"
-      reference: 3
-      compare: 5
-      rca-file: "rca/rca-3n-tsh-1t1c-pdr-rca3.yaml"
-  legend:
-    - ''
-    - 'Test Case:            Test cases executed for: PDR throughput on 3n-tsh with x520.'
-    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "2" for 2020-03-27, "3" for 2020-06-11, "4" for 2020-06-24).'
-    - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-    - '2005.0-4 vs 2005.0-3: Compares CSIT environments "4" to "3". "3" was discarded as it substantially changed TRex behaviour due to higher number of TRex workers used.'
-    - '2001.0-4 vs 2001.0-2: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2005.0-4 vs 2001.0-4: Compares VPP code current vs previous in the current CSIT environment.'
-
-# VPP Performance Changes 3n-tsh 2t2c pdr-full
-- type: "table"
-  title: "VPP Performance Changes 3n-tsh 2t2c pdr-full"
-  algorithm: "table_comparison"
-  output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-tsh-2t2c-pdr-full"
-  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
-  filter: "'2T2C'"
-  columns:
-    - title: "1908.1-2"
-      data-set: "vpp-performance-changes-3n-tsh-h1"
-    - title: "2001.0-2"
-      data-set: "vpp-performance-changes-3n-tsh-ref"
-    - title: "2001.0-4"
-      data-set: "vpp-performance-changes-3n-tsh-cmp-2001.0-4"
-    - title: "2005.0-3"
-      data-set: "vpp-performance-changes-3n-tsh-cmp"
-    - title: "2005.0-4"
-      data-set: "vpp-performance-changes-3n-tsh-cmp-2"
-  comparisons:
-    - title: "2005.0-4 vs 2005.0-3"
-      reference: 4
-      compare: 5
-      rca-file: "rca/rca-3n-tsh-2t2c-pdr-rca1.yaml"
-    - title: "2001.0-4 vs 2001.0-2"
-      reference: 2
-      compare: 3
-      rca-file: "rca/rca-3n-tsh-2t2c-pdr-rca2.yaml"
-    - title: "2005.0-4 vs 2001.0-4"
-      reference: 3
-      compare: 5
-      rca-file: "rca/rca-3n-tsh-2t2c-pdr-rca3.yaml"
-  legend:
-    - ''
-    - 'Test Case:            Test cases executed for: PDR throughput on 3n-tsh with x520.'
-    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "2" for 2020-03-27, "3" for 2020-06-11, "4" for 2020-06-24).'
-    - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-    - '2005.0-4 vs 2005.0-3: Compares CSIT environments "4" to "3". "3" was discarded as it substantially changed TRex behaviour due to higher number of TRex workers used.'
-    - '2001.0-4 vs 2001.0-2: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2005.0-4 vs 2001.0-4: Compares VPP code current vs previous in the current CSIT environment.'
-
-# VPP Performance Changes 3n-tsh 1t1c ndr-full
-- type: "table"
-  title: "VPP Performance Changes 3n-tsh 1t1c ndr-full"
-  algorithm: "table_comparison"
-  output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-tsh-1t1c-ndr-full"
-  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
-  filter: "'1T1C'"
-  columns:
-    - title: "1908.1-2"
-      data-set: "vpp-performance-changes-3n-tsh-h1"
-    - title: "2001.0-2"
-      data-set: "vpp-performance-changes-3n-tsh-ref"
-    - title: "2001.0-4"
-      data-set: "vpp-performance-changes-3n-tsh-cmp-2001.0-4"
-    - title: "2005.0-3"
-      data-set: "vpp-performance-changes-3n-tsh-cmp"
-    - title: "2005.0-4"
-      data-set: "vpp-performance-changes-3n-tsh-cmp-2"
-  comparisons:
-    - title: "2005.0-4 vs 2005.0-3"
-      reference: 4
-      compare: 5
-      rca-file: "rca/rca-3n-tsh-1t1c-ndr-rca1.yaml"
-    - title: "2001.0-4 vs 2001.0-2"
-      reference: 2
-      compare: 3
-      rca-file: "rca/rca-3n-tsh-1t1c-ndr-rca2.yaml"
-    - title: "2005.0-4 vs 2001.0-4"
-      reference: 3
-      compare: 5
-      rca-file: "rca/rca-3n-tsh-1t1c-ndr-rca3.yaml"
-  legend:
-    - ''
-    - 'Test Case:            Test cases executed for: NDR throughput on 3n-tsh with x520.'
-    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "2" for 2020-03-27, "3" for 2020-06-11, "4" for 2020-06-24).'
-    - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-    - '2005.0-4 vs 2005.0-3: Compares CSIT environments "4" to "3". "3" was discarded as it substantially changed TRex behaviour due to higher number of TRex workers used.'
-    - '2001.0-4 vs 2001.0-2: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2005.0-4 vs 2001.0-4: Compares VPP code current vs previous in the current CSIT environment.'
-
-# VPP Performance Changes 3n-tsh 2t2c ndr-full
-- type: "table"
-  title: "VPP Performance Changes 3n-tsh 2t2c ndr-full"
-  algorithm: "table_comparison"
-  output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-tsh-2t2c-ndr-full"
-  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
-  filter: "'2T2C'"
-  columns:
-    - title: "1908.1-2"
+    - title: "2001.0-4"
       data-set: "vpp-performance-changes-3n-tsh-h1"
-    - title: "2001.0-2"
+    - title: "2005.0-4"
       data-set: "vpp-performance-changes-3n-tsh-ref"
-    - title: "2001.0-4"
-      data-set: "vpp-performance-changes-3n-tsh-cmp-2001.0-4"
-    - title: "2005.0-3"
+    - title: "2009.0-4"
       data-set: "vpp-performance-changes-3n-tsh-cmp"
-    - title: "2005.0-4"
-      data-set: "vpp-performance-changes-3n-tsh-cmp-2"
   comparisons:
-    - title: "2005.0-4 vs 2005.0-3"
-      reference: 4
-      compare: 5
-      rca-file: "rca/rca-3n-tsh-2t2c-ndr-rca1.yaml"
-    - title: "2001.0-4 vs 2001.0-2"
+    - title: "2009.0-4 vs 2005.0-4"
       reference: 2
       compare: 3
-      rca-file: "rca/rca-3n-tsh-2t2c-ndr-rca2.yaml"
-    - title: "2005.0-4 vs 2001.0-4"
-      reference: 3
-      compare: 5
-      rca-file: "rca/rca-3n-tsh-2t2c-ndr-rca3.yaml"
+#      rca-file: "rca/rca-3n-tsh-1t1c-pdr-rca1.yaml"
   legend:
     - ''
     - 'Test Case:            Test cases executed for: NDR throughput on 3n-tsh with x520.'
-    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "2" for 2020-03-27, "3" for 2020-06-11, "4" for 2020-06-24).'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "2" for CSIT rls2001, "4" for CSIT rls2005).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-    - '2005.0-4 vs 2005.0-3: Compares CSIT environments "4" to "3". "3" was discarded as it substantially changed TRex behaviour due to higher number of TRex workers used.'
-    - '2001.0-4 vs 2001.0-2: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2005.0-4 vs 2001.0-4: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2009.0-4 vs 2005.0-4: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Comparison Across Testbeds 3n-hsw to 3n-skx 1c ndr
 - type: "table"
@@ -5442,30 +4486,23 @@
   include-tests: "MRR" # "PDR" | "NDR" | "MRR"
   filter: "'1T1C' and 'MRR' and 'NIC_Intel-XL710' and not 'NF_DENSITY'"
   columns:
-    - title: "1908.1-2"
-      data-set: "vpp-performance-changes-3n-hsw-mrr-h1"
     - title: "2001.0-2"
+      data-set: "vpp-performance-changes-3n-hsw-mrr-h1"
+    - title: "2005.0-4"
       data-set: "vpp-performance-changes-3n-hsw-mrr-ref"
-    - title: "2005.0-3"
+    - title: "2009.0-4"
       data-set: "vpp-performance-changes-3n-hsw-mrr-cmp"
-    - title: "2005.0-4"
-      data-set: "vpp-performance-changes-3n-hsw-mrr-cmp-2"
   comparisons:
-    - title: "2005.0-4 vs 2005.0-3"
-      reference: 3
-      compare: 4
-      rca-file: "rca/rca-3n-hsw-1t1c-mrr-rca1.yaml"
-    - title: "2005.0-4 vs 2001.0-2"
+    - title: "2009.0-4 vs 2005.0-4"
       reference: 2
-      compare: 4
-      rca-file: "rca/rca-3n-hsw-1t1c-mrr-rca2.yaml"
+      compare: 3
+#      rca-file: "rca/rca-3n-hsw-1t1c-mrr-rca1.yaml"
   legend:
     - ''
     - 'Test Case:            Test cases executed for: MRR throughput on 3n-hsw with xl710.'
     - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "2" for CSIT rls2001, "4" for CSIT rls2005).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-    - '2005.0-4 vs 2005.0-3: Environment version "3" was found to be incompatible with "2" due to higher number of TRex workers used.'
-    - '2005.0-4 vs 2001.0-2: Used as a reference to compare benchmark results of VPP current release v20.05.0 vs previous release v20.01.0.'
+    - '2009.0-4 vs 2005.0-4: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 3n-hsw 2t2c mrr
 - type: "table"
@@ -5475,30 +4512,23 @@
   include-tests: "MRR" # "PDR" | "NDR" | "MRR"
   filter: "'2T2C' and 'MRR' and 'NIC_Intel-XL710' and not 'NF_DENSITY'"
   columns:
-    - title: "1908.1-2"
-      data-set: "vpp-performance-changes-3n-hsw-mrr-h1"
     - title: "2001.0-2"
+      data-set: "vpp-performance-changes-3n-hsw-mrr-h1"
+    - title: "2005.0-4"
       data-set: "vpp-performance-changes-3n-hsw-mrr-ref"
-    - title: "2005.0-3"
+    - title: "2009.0-4"
       data-set: "vpp-performance-changes-3n-hsw-mrr-cmp"
-    - title: "2005.0-4"
-      data-set: "vpp-performance-changes-3n-hsw-mrr-cmp-2"
   comparisons:
-    - title: "2005.0-4 vs 2005.0-3"
-      reference: 3
-      compare: 4
-      rca-file: "rca/rca-3n-hsw-2t2c-mrr-rca1.yaml"
-    - title: "2005.0-4 vs 2001.0-2"
+    - title: "2009.0-4 vs 2005.0-4"
       reference: 2
-      compare: 4
-      rca-file: "rca/rca-3n-hsw-2t2c-mrr-rca2.yaml"
+      compare: 3
+#      rca-file: "rca/rca-3n-hsw-1t1c-mrr-rca1.yaml"
   legend:
     - ''
     - 'Test Case:            Test cases executed for: MRR throughput on 3n-hsw with xl710.'
     - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "2" for CSIT rls2001, "4" for CSIT rls2005).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-    - '2005.0-4 vs 2005.0-3: Environment version "3" was found to be incompatible with "2" due to higher number of TRex workers used.'
-    - '2005.0-4 vs 2001.0-2: Used as a reference to compare benchmark results of VPP current release v20.05.0 vs previous release v20.01.0.'
+    - '2009.0-4 vs 2005.0-4: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 3n-hsw 4t4c mrr
 - type: "table"
@@ -5508,30 +4538,23 @@
   include-tests: "MRR" # "PDR" | "NDR" | "MRR"
   filter: "'4T4C' and 'MRR' and 'NIC_Intel-XL710' and not 'NF_DENSITY'"
   columns:
-    - title: "1908.1-2"
-      data-set: "vpp-performance-changes-3n-hsw-mrr-h1"
     - title: "2001.0-2"
+      data-set: "vpp-performance-changes-3n-hsw-mrr-h1"
+    - title: "2005.0-4"
       data-set: "vpp-performance-changes-3n-hsw-mrr-ref"
-    - title: "2005.0-3"
+    - title: "2009.0-4"
       data-set: "vpp-performance-changes-3n-hsw-mrr-cmp"
-    - title: "2005.0-4"
-      data-set: "vpp-performance-changes-3n-hsw-mrr-cmp-2"
   comparisons:
-    - title: "2005.0-4 vs 2005.0-3"
-      reference: 3
-      compare: 4
-      rca-file: "rca/rca-3n-hsw-4t4c-mrr-rca1.yaml"
-    - title: "2005.0-4 vs 2001.0-2"
+    - title: "2009.0-4 vs 2005.0-4"
       reference: 2
-      compare: 4
-      rca-file: "rca/rca-3n-hsw-4t4c-mrr-rca2.yaml"
+      compare: 3
+#      rca-file: "rca/rca-3n-hsw-1t1c-mrr-rca1.yaml"
   legend:
     - ''
     - 'Test Case:            Test cases executed for: MRR throughput on 3n-hsw with xl710.'
     - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "2" for CSIT rls2001, "4" for CSIT rls2005).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-    - '2005.0-4 vs 2005.0-3: Environment version "3" was found to be incompatible with "2" due to higher number of TRex workers used.'
-    - '2005.0-4 vs 2001.0-2: Used as a reference to compare benchmark results of VPP current release v20.05.0 vs previous release v20.01.0.'
+    - '2009.0-4 vs 2005.0-4: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 3n-skx 2t1c mrr
 - type: "table"
@@ -5542,27 +4565,22 @@
   filter: "'2T1C' and 'MRR' and 'NIC_Intel-XXV710' and not 'NF_DENSITY'"
   columns:
     - title: "2001.0-2"
+      data-set: "vpp-performance-changes-3n-skx-mrr-h1"
+    - title: "2005.0-4"
       data-set: "vpp-performance-changes-3n-skx-mrr-ref"
-    - title: "2005.0-3"
+    - title: "2009.0-4"
       data-set: "vpp-performance-changes-3n-skx-mrr-cmp"
-    - title: "2005.0-4"
-      data-set: "vpp-performance-changes-3n-skx-mrr-cmp-2"
   comparisons:
-    - title: "2005.0-4 vs 2005.0-3"
+    - title: "2009.0-4 vs 2005.0-4"
       reference: 2
       compare: 3
-      rca-file: "rca/rca-3n-skx-2t1c-mrr-rca1.yaml"
-    - title: "2005.0-4 vs 2001.0-2"
-      reference: 1
-      compare: 3
-      rca-file: "rca/rca-3n-skx-2t1c-mrr-rca2.yaml"
+#      rca-file: "rca/rca-3n-hsw-2t1c-mrr-rca1.yaml"
   legend:
     - ''
     - 'Test Case:            Test cases executed for: MRR throughput on 3n-skx with xxv710.'
     - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "2" for CSIT rls2001, "4" for CSIT rls2005).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-    - '2005.0-4 vs 2005.0-3: Environment version "3" was found to be incompatible with "2" due to higher number of TRex workers used.'
-    - '2005.0-4 vs 2001.0-2: Used as a reference to compare benchmark results of VPP current release v20.05.0 vs previous release v20.01.0.'
+    - '2009.0-4 vs 2005.0-4: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 3n-skx 4t2c mrr
 - type: "table"
@@ -5573,27 +4591,22 @@
   filter: "'4T2C' and 'MRR' and 'NIC_Intel-XXV710' and not 'NF_DENSITY'"
   columns:
     - title: "2001.0-2"
+      data-set: "vpp-performance-changes-3n-skx-mrr-h1"
+    - title: "2005.0-4"
       data-set: "vpp-performance-changes-3n-skx-mrr-ref"
-    - title: "2005.0-3"
+    - title: "2009.0-4"
       data-set: "vpp-performance-changes-3n-skx-mrr-cmp"
-    - title: "2005.0-4"
-      data-set: "vpp-performance-changes-3n-skx-mrr-cmp-2"
   comparisons:
-    - title: "2005.0-4 vs 2005.0-3"
+    - title: "2009.0-4 vs 2005.0-4"
       reference: 2
       compare: 3
-      rca-file: "rca/rca-3n-skx-4t2c-mrr-rca1.yaml"
-    - title: "2005.0-4 vs 2001.0-2"
-      reference: 1
-      compare: 3
-      rca-file: "rca/rca-3n-skx-4t2c-mrr-rca2.yaml"
+#      rca-file: "rca/rca-3n-hsw-2t1c-mrr-rca1.yaml"
   legend:
     - ''
     - 'Test Case:            Test cases executed for: MRR throughput on 3n-skx with xxv710.'
     - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "2" for CSIT rls2001, "4" for CSIT rls2005).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-    - '2005.0-4 vs 2005.0-3: Environment version "3" was found to be incompatible with "2" due to higher number of TRex workers used.'
-    - '2005.0-4 vs 2001.0-2: Used as a reference to compare benchmark results of VPP current release v20.05.0 vs previous release v20.01.0.'
+    - '2009.0-4 vs 2005.0-4: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 3n-skx 8t4c mrr
 - type: "table"
@@ -5604,27 +4617,22 @@
   filter: "'8T4C' and 'MRR' and 'NIC_Intel-XXV710' and not 'NF_DENSITY'"
   columns:
     - title: "2001.0-2"
+      data-set: "vpp-performance-changes-3n-skx-mrr-h1"
+    - title: "2005.0-4"
       data-set: "vpp-performance-changes-3n-skx-mrr-ref"
-    - title: "2005.0-3"
+    - title: "2009.0-4"
       data-set: "vpp-performance-changes-3n-skx-mrr-cmp"
-    - title: "2005.0-4"
-      data-set: "vpp-performance-changes-3n-skx-mrr-cmp-2"
   comparisons:
-    - title: "2005.0-4 vs 2005.0-3"
+    - title: "2009.0-4 vs 2005.0-4"
       reference: 2
       compare: 3
-      rca-file: "rca/rca-3n-skx-8t4c-mrr-rca1.yaml"
-    - title: "2005.0-4 vs 2001.0-2"
-      reference: 1
-      compare: 3
-      rca-file: "rca/rca-3n-skx-8t4c-mrr-rca2.yaml"
+#      rca-file: "rca/rca-3n-hsw-2t1c-mrr-rca1.yaml"
   legend:
     - ''
     - 'Test Case:            Test cases executed for: MRR throughput on 3n-skx with xxv710.'
     - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "2" for CSIT rls2001, "4" for CSIT rls2005).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-    - '2005.0-4 vs 2005.0-3: Environment version "3" was found to be incompatible with "2" due to higher number of TRex workers used.'
-    - '2005.0-4 vs 2001.0-2: Used as a reference to compare benchmark results of VPP current release v20.05.0 vs previous release v20.01.0.'
+    - '2009.0-4 vs 2005.0-4: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 2n-skx 2t1c mrr
 - type: "table"
@@ -5635,27 +4643,22 @@
   filter: "'2T1C' and 'MRR' and 'NIC_Intel-XXV710' and not 'NF_DENSITY'"
   columns:
     - title: "2001.0-2"
+      data-set: "vpp-performance-changes-2n-skx-mrr-h1"
+    - title: "2005.0-4"
       data-set: "vpp-performance-changes-2n-skx-mrr-ref"
-    - title: "2005.0-3"
+    - title: "2009.0-4"
       data-set: "vpp-performance-changes-2n-skx-mrr-cmp"
-    - title: "2005.0-4"
-      data-set: "vpp-performance-changes-2n-skx-mrr-cmp-2"
   comparisons:
-    - title: "2005.0-4 vs 2005.0-3"
+    - title: "2009.0-4 vs 2005.0-4"
       reference: 2
       compare: 3
-      rca-file: "rca/rca-2n-skx-2t1c-mrr-rca1.yaml"
-    - title: "2005.0-4 vs 2001.0-2"
-      reference: 1
-      compare: 3
-      rca-file: "rca/rca-2n-skx-2t1c-mrr-rca2.yaml"
+#      rca-file: "rca/rca-2n-skx-2t1c-mrr-rca1.yaml"
   legend:
     - ''
     - 'Test Case:            Test cases executed for: MRR throughput on 2n-skx with xxv710.'
     - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "2" for CSIT rls2001, "4" for CSIT rls2005).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-    - '2005.0-4 vs 2005.0-3: Environment version "3" was found to be incompatible with "2" due to higher number of TRex workers used.'
-    - '2005.0-4 vs 2001.0-2: Used as a reference to compare benchmark results of VPP current release v20.05.0 vs previous release v20.01.0.'
+    - '2009.0-4 vs 2005.0-4: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 2n-skx 4t2c mrr
 - type: "table"
@@ -5666,27 +4669,22 @@
   filter: "'4T2C' and 'MRR' and 'NIC_Intel-XXV710' and not 'NF_DENSITY'"
   columns:
     - title: "2001.0-2"
+      data-set: "vpp-performance-changes-2n-skx-mrr-h1"
+    - title: "2005.0-4"
       data-set: "vpp-performance-changes-2n-skx-mrr-ref"
-    - title: "2005.0-3"
+    - title: "2009.0-4"
       data-set: "vpp-performance-changes-2n-skx-mrr-cmp"
-    - title: "2005.0-4"
-      data-set: "vpp-performance-changes-2n-skx-mrr-cmp-2"
   comparisons:
-    - title: "2005.0-4 vs 2005.0-3"
+    - title: "2009.0-4 vs 2005.0-4"
       reference: 2
       compare: 3
-      rca-file: "rca/rca-2n-skx-4t2c-mrr-rca1.yaml"
-    - title: "2005.0-4 vs 2001.0-2"
-      reference: 1
-      compare: 3
-      rca-file: "rca/rca-2n-skx-4t2c-mrr-rca2.yaml"
+#      rca-file: "rca/rca-2n-skx-2t1c-mrr-rca1.yaml"
   legend:
     - ''
     - 'Test Case:            Test cases executed for: MRR throughput on 2n-skx with xxv710.'
     - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "2" for CSIT rls2001, "4" for CSIT rls2005).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-    - '2005.0-4 vs 2005.0-3: Environment version "3" was found to be incompatible with "2" due to higher number of TRex workers used.'
-    - '2005.0-4 vs 2001.0-2: Used as a reference to compare benchmark results of VPP current release v20.05.0 vs previous release v20.01.0.'
+    - '2009.0-4 vs 2005.0-4: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 2n-skx 8t4c mrr
 - type: "table"
@@ -5697,27 +4695,22 @@
   filter: "'8T4C' and 'MRR' and 'NIC_Intel-XXV710' and not 'NF_DENSITY'"
   columns:
     - title: "2001.0-2"
+      data-set: "vpp-performance-changes-2n-skx-mrr-h1"
+    - title: "2005.0-4"
       data-set: "vpp-performance-changes-2n-skx-mrr-ref"
-    - title: "2005.0-3"
+    - title: "2009.0-4"
       data-set: "vpp-performance-changes-2n-skx-mrr-cmp"
-    - title: "2005.0-4"
-      data-set: "vpp-performance-changes-2n-skx-mrr-cmp-2"
   comparisons:
-    - title: "2005.0-4 vs 2005.0-3"
+    - title: "2009.0-4 vs 2005.0-4"
       reference: 2
       compare: 3
-      rca-file: "rca/rca-2n-skx-8t4c-mrr-rca1.yaml"
-    - title: "2005.0-4 vs 2001.0-2"
-      reference: 1
-      compare: 3
-      rca-file: "rca/rca-2n-skx-8t4c-mrr-rca2.yaml"
+#      rca-file: "rca/rca-2n-skx-2t1c-mrr-rca1.yaml"
   legend:
     - ''
     - 'Test Case:            Test cases executed for: MRR throughput on 2n-skx with xxv710.'
     - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "2" for CSIT rls2001, "4" for CSIT rls2005).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-    - '2005.0-4 vs 2005.0-3: Environment version "3" was found to be incompatible with "2" due to higher number of TRex workers used.'
-    - '2005.0-4 vs 2001.0-2: Used as a reference to compare benchmark results of VPP current release v20.05.0 vs previous release v20.01.0.'
+    - '2009.0-4 vs 2005.0-4: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 2n-clx-xxv710 2t1c mrr
 - type: "table"
@@ -5728,27 +4721,22 @@
   filter: "'2T1C' and 'MRR' and 'NIC_Intel-XXV710' and not 'NF_DENSITY'"
   columns:
     - title: "2001.0-2"
+      data-set: "vpp-performance-changes-2n-clx-mrr-h1"
+    - title: "2005.0-4"
       data-set: "vpp-performance-changes-2n-clx-mrr-ref"
-    - title: "2005.0-3"
+    - title: "2009.0-4"
       data-set: "vpp-performance-changes-2n-clx-mrr-cmp"
-    - title: "2005.0-4"
-      data-set: "vpp-performance-changes-2n-clx-mrr-cmp-2"
   comparisons:
-    - title: "2005.0-4 vs 2005.0-3"
+    - title: "2009.0-4 vs 2005.0-4"
       reference: 2
       compare: 3
-      rca-file: "rca/rca-2n-clx-2t1c-mrr-rca1.yaml"
-    - title: "2005.0-4 vs 2001.0-2"
-      reference: 1
-      compare: 3
-      rca-file: "rca/rca-2n-clx-2t1c-mrr-rca2.yaml"
+#      rca-file: "rca/rca-2n-clx-2t1c-mrr-rca1.yaml"
   legend:
     - ''
     - 'Test Case:            Test cases executed for: MRR throughput on 2n-clx with xxv710.'
     - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "2" for CSIT rls2001, "4" for CSIT rls2005).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-    - '2005.0-4 vs 2005.0-3: Environment version "3" was found to be incompatible with "2" due to higher number of TRex workers used.'
-    - '2005.0-4 vs 2001.0-2: Used as a reference to compare benchmark results of VPP current release v20.05.0 vs previous release v20.01.0.'
+    - '2009.0-4 vs 2005.0-4: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 2n-clx-xxv710 4t2c mrr
 - type: "table"
@@ -5759,27 +4747,22 @@
   filter: "'4T2C' and 'MRR' and 'NIC_Intel-XXV710' and not 'NF_DENSITY'"
   columns:
     - title: "2001.0-2"
+      data-set: "vpp-performance-changes-2n-clx-mrr-h1"
+    - title: "2005.0-4"
       data-set: "vpp-performance-changes-2n-clx-mrr-ref"
-    - title: "2005.0-3"
+    - title: "2009.0-4"
       data-set: "vpp-performance-changes-2n-clx-mrr-cmp"
-    - title: "2005.0-4"
-      data-set: "vpp-performance-changes-2n-clx-mrr-cmp-2"
   comparisons:
-    - title: "2005.0-4 vs 2005.0-3"
+    - title: "2009.0-4 vs 2005.0-4"
       reference: 2
       compare: 3
-      rca-file: "rca/rca-2n-clx-4t2c-mrr-rca1.yaml"
-    - title: "2005.0-4 vs 2001.0-2"
-      reference: 1
-      compare: 3
-      rca-file: "rca/rca-2n-clx-4t2c-mrr-rca2.yaml"
+#      rca-file: "rca/rca-2n-clx-2t1c-mrr-rca1.yaml"
   legend:
     - ''
     - 'Test Case:            Test cases executed for: MRR throughput on 2n-clx with xxv710.'
     - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "2" for CSIT rls2001, "4" for CSIT rls2005).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-    - '2005.0-4 vs 2005.0-3: Environment version "3" was found to be incompatible with "2" due to higher number of TRex workers used.'
-    - '2005.0-4 vs 2001.0-2: Used as a reference to compare benchmark results of VPP current release v20.05.0 vs previous release v20.01.0.'
+    - '2009.0-4 vs 2005.0-4: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 2n-clx-xxv710 8t4c mrr
 - type: "table"
@@ -5790,27 +4773,22 @@
   filter: "'8T4C' and 'MRR' and 'NIC_Intel-XXV710' and not 'NF_DENSITY'"
   columns:
     - title: "2001.0-2"
+      data-set: "vpp-performance-changes-2n-clx-mrr-h1"
+    - title: "2005.0-4"
       data-set: "vpp-performance-changes-2n-clx-mrr-ref"
-    - title: "2005.0-3"
+    - title: "2009.0-4"
       data-set: "vpp-performance-changes-2n-clx-mrr-cmp"
-    - title: "2005.0-4"
-      data-set: "vpp-performance-changes-2n-clx-mrr-cmp-2"
   comparisons:
-    - title: "2005.0-4 vs 2005.0-3"
+    - title: "2009.0-4 vs 2005.0-4"
       reference: 2
       compare: 3
-      rca-file: "rca/rca-2n-clx-8t4c-mrr-rca1.yaml"
-    - title: "2005.0-4 vs 2001.0-2"
-      reference: 1
-      compare: 3
-      rca-file: "rca/rca-2n-clx-8t4c-mrr-rca2.yaml"
+#      rca-file: "rca/rca-2n-clx-2t1c-mrr-rca1.yaml"
   legend:
     - ''
     - 'Test Case:            Test cases executed for: MRR throughput on 2n-clx with xxv710.'
     - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "2" for CSIT rls2001, "4" for CSIT rls2005).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-    - '2005.0-4 vs 2005.0-3: Environment version "3" was found to be incompatible with "2" due to higher number of TRex workers used.'
-    - '2005.0-4 vs 2001.0-2: Used as a reference to compare benchmark results of VPP current release v20.05.0 vs previous release v20.01.0.'
+    - '2009.0-4 vs 2005.0-4: Compares VPP code current vs previous in the current CSIT environment.'
 
 ## VPP Performance Changes 2n-clx-x556 2t1c mrr
 #- type: "table"
@@ -5883,14 +4861,14 @@
   include-tests: "MRR" # "PDR" | "NDR" | "MRR"
   filter: "'1T1C'"
   columns:
-    - title: "1908.1-2"
-      data-set: "vpp-performance-changes-2n-dnv-mrr-h1"
     - title: "2001.0-2"
-      data-set: "vpp-performance-changes-2n-dnv-mrr-ref"
+      data-set: "vpp-performance-changes-2n-dnv-mrr-h1"
     - title: "2005.0-3"
+      data-set: "vpp-performance-changes-2n-dnv-mrr-ref"
+    - title: "2009.0-4"
       data-set: "vpp-performance-changes-2n-dnv-mrr-cmp"
   comparisons:
-    - title: "2005.0-3 vs 2001.0-2"
+    - title: "2009.0-4 vs 2005.0-3"
       reference: 2
       compare: 3
   legend:
@@ -5898,7 +4876,7 @@
     - 'Test Case:            Test cases executed for: MRR throughput on 2n-dnv with x553.'
     - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "2" for CSIT rls2001, "4" for CSIT rls2005).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-    - '2005.0-3 vs 2001.0-2: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2009.0-4 vs 2005.0-3: Compares CSIT environment current vs previous with previous VPP code.'
 
 # VPP Performance Changes 2n-dnv 2t2c mrr
 - type: "table"
@@ -5908,14 +4886,14 @@
   include-tests: "MRR" # "PDR" | "NDR" | "MRR"
   filter: "'2T2C'"
   columns:
-    - title: "1908.1-2"
-      data-set: "vpp-performance-changes-2n-dnv-mrr-h1"
     - title: "2001.0-2"
-      data-set: "vpp-performance-changes-2n-dnv-mrr-ref"
+      data-set: "vpp-performance-changes-2n-dnv-mrr-h1"
     - title: "2005.0-3"
+      data-set: "vpp-performance-changes-2n-dnv-mrr-ref"
+    - title: "2009.0-4"
       data-set: "vpp-performance-changes-2n-dnv-mrr-cmp"
   comparisons:
-    - title: "2005.0-3 vs 2001.0-2"
+    - title: "2009.0-4 vs 2005.0-3"
       reference: 2
       compare: 3
   legend:
@@ -5923,7 +4901,7 @@
     - 'Test Case:            Test cases executed for: MRR throughput on 2n-dnv with x553.'
     - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "2" for CSIT rls2001, "4" for CSIT rls2005).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-    - '2005.0-3 vs 2001.0-2: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2009.0-4 vs 2005.0-3: Compares CSIT environment current vs previous with previous VPP code.'
 
 # VPP Performance Changes 2n-dnv 4t4c mrr
 - type: "table"
@@ -5933,14 +4911,14 @@
   include-tests: "MRR" # "PDR" | "NDR" | "MRR"
   filter: "'4T4C'"
   columns:
-    - title: "1908.1-2"
-      data-set: "vpp-performance-changes-2n-dnv-mrr-h1"
     - title: "2001.0-2"
-      data-set: "vpp-performance-changes-2n-dnv-mrr-ref"
+      data-set: "vpp-performance-changes-2n-dnv-mrr-h1"
     - title: "2005.0-3"
+      data-set: "vpp-performance-changes-2n-dnv-mrr-ref"
+    - title: "2009.0-4"
       data-set: "vpp-performance-changes-2n-dnv-mrr-cmp"
   comparisons:
-    - title: "2005.0-3 vs 2001.0-2"
+    - title: "2009.0-4 vs 2005.0-3"
       reference: 2
       compare: 3
   legend:
@@ -5948,7 +4926,7 @@
     - 'Test Case:            Test cases executed for: MRR throughput on 2n-dnv with x553.'
     - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "2" for CSIT rls2001, "4" for CSIT rls2005).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-    - '2005.0-3 vs 2001.0-2: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2009.0-4 vs 2005.0-3: Compares CSIT environment current vs previous with previous VPP code.'
 
 # VPP Performance Changes 3n-dnv 1t1c mrr
 - type: "table"
@@ -5958,14 +4936,14 @@
   include-tests: "MRR" # "PDR" | "NDR" | "MRR"
   filter: "'1T1C'"
   columns:
-    - title: "1908.1-2"
-      data-set: "vpp-performance-changes-3n-dnv-mrr-h1"
     - title: "2001.0-2"
-      data-set: "vpp-performance-changes-3n-dnv-mrr-ref"
+      data-set: "vpp-performance-changes-3n-dnv-mrr-h1"
     - title: "2005.0-3"
+      data-set: "vpp-performance-changes-3n-dnv-mrr-ref"
+    - title: "2009.0-4"
       data-set: "vpp-performance-changes-3n-dnv-mrr-cmp"
   comparisons:
-    - title: "2005.0-3 vs 2001.0-2"
+    - title: "2009.0-4 vs 2005.0-3"
       reference: 2
       compare: 3
   legend:
@@ -5973,7 +4951,7 @@
     - 'Test Case:            Test cases executed for: MRR throughput on 3n-dnv with x553.'
     - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "2" for CSIT rls2001, "4" for CSIT rls2005).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-    - '2005.0-3 vs 2001.0-2: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2009.0-4 vs 2005.0-3: Compares CSIT environment current vs previous with previous VPP code.'
 
 # VPP Performance Changes 3n-dnv 2t2c mrr
 - type: "table"
@@ -5983,14 +4961,14 @@
   include-tests: "MRR" # "PDR" | "NDR" | "MRR"
   filter: "'2T2C'"
   columns:
-    - title: "1908.1-2"
-      data-set: "vpp-performance-changes-3n-dnv-mrr-h1"
     - title: "2001.0-2"
-      data-set: "vpp-performance-changes-3n-dnv-mrr-ref"
+      data-set: "vpp-performance-changes-3n-dnv-mrr-h1"
     - title: "2005.0-3"
+      data-set: "vpp-performance-changes-3n-dnv-mrr-ref"
+    - title: "2009.0-4"
       data-set: "vpp-performance-changes-3n-dnv-mrr-cmp"
   comparisons:
-    - title: "2005.0-3 vs 2001.0-2"
+    - title: "2009.0-4 vs 2005.0-3"
       reference: 2
       compare: 3
   legend:
@@ -5998,7 +4976,7 @@
     - 'Test Case:            Test cases executed for: MRR throughput on 3n-dnv with x553.'
     - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "2" for CSIT rls2001, "4" for CSIT rls2005).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-    - '2005.0-3 vs 2001.0-2: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2009.0-4 vs 2005.0-3: Compares CSIT environment current vs previous with previous VPP code.'
 
 # VPP Performance Changes 3n-dnv 4t4c mrr
 - type: "table"
@@ -6008,14 +4986,14 @@
   include-tests: "MRR" # "PDR" | "NDR" | "MRR"
   filter: "'4T4C'"
   columns:
-    - title: "1908.1-2"
-      data-set: "vpp-performance-changes-3n-dnv-mrr-h1"
     - title: "2001.0-2"
-      data-set: "vpp-performance-changes-3n-dnv-mrr-ref"
+      data-set: "vpp-performance-changes-3n-dnv-mrr-h1"
     - title: "2005.0-3"
+      data-set: "vpp-performance-changes-3n-dnv-mrr-ref"
+    - title: "2009.0-4"
       data-set: "vpp-performance-changes-3n-dnv-mrr-cmp"
   comparisons:
-    - title: "2005.0-3 vs 2001.0-2"
+    - title: "2009.0-4 vs 2005.0-3"
       reference: 2
       compare: 3
   legend:
@@ -6023,7 +5001,7 @@
     - 'Test Case:            Test cases executed for: MRR throughput on 3n-dnv with x553.'
     - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "2" for CSIT rls2001, "4" for CSIT rls2005).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-    - '2005.0-3 vs 2001.0-2: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2009.0-4 vs 2005.0-3: Compares CSIT environment current vs previous with previous VPP code.'
 
 # VPP Performance Changes 3n-tsh 1t1c mrr
 - type: "table"
@@ -6033,30 +5011,23 @@
   include-tests: "MRR" # "PDR" | "NDR" | "MRR"
   filter: "'1T1C'"
   columns:
-    - title: "1908.1-2"
-      data-set: "vpp-performance-changes-3n-tsh-mrr-h1"
     - title: "2001.0-2"
+      data-set: "vpp-performance-changes-3n-tsh-mrr-h1"
+    - title: "2005.0-4"
       data-set: "vpp-performance-changes-3n-tsh-mrr-ref"
-    - title: "2005.0-3"
+    - title: "2009.0-4"
       data-set: "vpp-performance-changes-3n-tsh-mrr-cmp"
-    - title: "2005.0-4"
-      data-set: "vpp-performance-changes-3n-tsh-mrr-cmp-2"
   comparisons:
-    - title: "2005.0-4 vs 2005.0-3"
-      reference: 3
-      compare: 4
-      rca-file: "rca/rca-3n-tsh-1t1c-mrr-rca1.yaml"
-    - title: "2005.0-4 vs 2001.0-2"
+    - title: "2009.0-4 vs 2005.0-4"
       reference: 2
-      compare: 4
-      rca-file: "rca/rca-3n-tsh-1t1c-mrr-rca2.yaml"
+      compare: 3
+#      rca-file: "rca/rca-3n-tsh-1t1c-mrr-rca1.yaml"
   legend:
     - ''
     - 'Test Case:            Test cases executed for: MRR throughput on 3n-tsh with x520.'
     - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "2" for CSIT rls2001, "4" for CSIT rls2005).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-    - '2005.0-4 vs 2005.0-3: Environment version "3" was found to be incompatible with "2" due to higher number of TRex workers used.'
-    - '2005.0-4 vs 2001.0-2: Used as a reference to compare benchmark results of VPP current release v20.05.0 vs previous release v20.01.0.'
+    - '2009.0-4 vs 2005.0-4: Compares CSIT environment current vs previous with previous VPP code.'
 
 # VPP Performance Changes 3n-tsh 2t2c mrr
 - type: "table"
@@ -6066,30 +5037,23 @@
   include-tests: "MRR" # "PDR" | "NDR" | "MRR"
   filter: "'2T2C'"
   columns:
-    - title: "1908.1-2"
-      data-set: "vpp-performance-changes-3n-tsh-mrr-h1"
     - title: "2001.0-2"
+      data-set: "vpp-performance-changes-3n-tsh-mrr-h1"
+    - title: "2005.0-4"
       data-set: "vpp-performance-changes-3n-tsh-mrr-ref"
-    - title: "2005.0-3"
+    - title: "2009.0-4"
       data-set: "vpp-performance-changes-3n-tsh-mrr-cmp"
-    - title: "2005.0-4"
-      data-set: "vpp-performance-changes-3n-tsh-mrr-cmp-2"
   comparisons:
-    - title: "2005.0-4 vs 2005.0-3"
-      reference: 3
-      compare: 4
-      rca-file: "rca/rca-3n-tsh-2t2c-mrr-rca1.yaml"
-    - title: "2005.0-4 vs 2001.0-2"
+    - title: "2009.0-4 vs 2005.0-4"
       reference: 2
-      compare: 4
-      rca-file: "rca/rca-3n-tsh-2t2c-mrr-rca2.yaml"
+      compare: 3
+#      rca-file: "rca/rca-3n-tsh-1t1c-mrr-rca1.yaml"
   legend:
     - ''
     - 'Test Case:            Test cases executed for: MRR throughput on 3n-tsh with x520.'
     - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "2" for CSIT rls2001, "4" for CSIT rls2005).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-    - '2005.0-4 vs 2005.0-3: Environment version "3" was found to be incompatible with "2" due to higher number of TRex workers used.'
-    - '2005.0-4 vs 2001.0-2: Used as a reference to compare benchmark results of VPP current release v20.05.0 vs previous release v20.01.0.'
+    - '2009.0-4 vs 2005.0-4: Compares CSIT environment current vs previous with previous VPP code.'
 
 # VPP Performance Changes 3n-tsh 4t4c mrr
 - type: "table"
@@ -6099,30 +5063,23 @@
   include-tests: "MRR" # "PDR" | "NDR" | "MRR"
   filter: "'4T4C'"
   columns:
-    - title: "1908.1-2"
-      data-set: "vpp-performance-changes-3n-tsh-mrr-h1"
     - title: "2001.0-2"
+      data-set: "vpp-performance-changes-3n-tsh-mrr-h1"
+    - title: "2005.0-4"
       data-set: "vpp-performance-changes-3n-tsh-mrr-ref"
-    - title: "2005.0-3"
+    - title: "2009.0-4"
       data-set: "vpp-performance-changes-3n-tsh-mrr-cmp"
-    - title: "2005.0-4"
-      data-set: "vpp-performance-changes-3n-tsh-mrr-cmp-2"
   comparisons:
-    - title: "2005.0-4 vs 2005.0-3"
-      reference: 3
-      compare: 4
-      rca-file: "rca/rca-3n-tsh-4t4c-mrr-rca1.yaml"
-    - title: "2005.0-4 vs 2001.0-2"
+    - title: "2009.0-4 vs 2005.0-4"
       reference: 2
-      compare: 4
-      rca-file: "rca/rca-3n-tsh-4t4c-mrr-rca2.yaml"
+      compare: 3
+#      rca-file: "rca/rca-3n-tsh-1t1c-mrr-rca1.yaml"
   legend:
     - ''
     - 'Test Case:            Test cases executed for: MRR throughput on 3n-tsh with x520.'
     - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "2" for CSIT rls2001, "4" for CSIT rls2005).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-    - '2005.0-4 vs 2005.0-3: Environment version "3" was found to be incompatible with "2" due to higher number of TRex workers used.'
-    - '2005.0-4 vs 2001.0-2: Used as a reference to compare benchmark results of VPP current release v20.05.0 vs previous release v20.01.0.'
+    - '2009.0-4 vs 2005.0-4: Compares CSIT environment current vs previous with previous VPP code.'
 
 # VPP Comparison Across Testbeds 3n-hsw to 3n-skx 1c mrr
 - type: "table"
@@ -6967,11 +5924,11 @@
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
   filter: "'1T1C' and 'NDRPDR' and 'NIC_Intel-XL710'"
   columns:
-    - title: "1908"
-      data-set: "dpdk-performance-changes-3n-hsw-h1"
     - title: "2001"
-      data-set: "dpdk-performance-changes-3n-hsw-ref"
+      data-set: "dpdk-performance-changes-3n-hsw-h1"
     - title: "2005"
+      data-set: "dpdk-performance-changes-3n-hsw-ref"
+    - title: "2009"
       data-set: "dpdk-performance-changes-3n-hsw-cmp"
   comparisons:
     - title: "Diff"
@@ -6979,8 +5936,8 @@
       compare: 3
   legend:
     - ""
-    - "1908, 2001, 2005 - DPDK versions tested."
-    - "Diff - difference between 2001 and 2005 DPDK version."
+    - "2001, 2005, 2009 - DPDK versions tested."
+    - "Diff - difference between 2005 and 2009 DPDK version."
 
 # DPDK Performance Changes 3n-hsw 2t2c pdr
 - type: "table"
@@ -6990,11 +5947,11 @@
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
   filter: "'2T2C' and 'NDRPDR' and 'NIC_Intel-XL710'"
   columns:
-    - title: "1908"
-      data-set: "dpdk-performance-changes-3n-hsw-h1"
     - title: "2001"
-      data-set: "dpdk-performance-changes-3n-hsw-ref"
+      data-set: "dpdk-performance-changes-3n-hsw-h1"
     - title: "2005"
+      data-set: "dpdk-performance-changes-3n-hsw-ref"
+    - title: "2009"
       data-set: "dpdk-performance-changes-3n-hsw-cmp"
   comparisons:
     - title: "Diff"
@@ -7002,8 +5959,8 @@
       compare: 3
   legend:
     - ""
-    - "1908, 2001, 2005 - DPDK versions tested."
-    - "Diff - difference between 2001 and 2005 DPDK version."
+    - "2001, 2005, 2009 - DPDK versions tested."
+    - "Diff - difference between 2005 and 2009 DPDK version."
 
 # DPDK Performance Changes 3n-hsw 1t1c pdr
 - type: "table"
@@ -7013,11 +5970,11 @@
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
   filter: "'1T1C' and 'NDRPDR' and 'NIC_Intel-XL710'"
   columns:
-    - title: "1908"
-      data-set: "dpdk-performance-changes-3n-hsw-h1"
     - title: "2001"
-      data-set: "dpdk-performance-changes-3n-hsw-ref"
+      data-set: "dpdk-performance-changes-3n-hsw-h1"
     - title: "2005"
+      data-set: "dpdk-performance-changes-3n-hsw-ref"
+    - title: "2009"
       data-set: "dpdk-performance-changes-3n-hsw-cmp"
   comparisons:
     - title: "Diff"
@@ -7025,8 +5982,8 @@
       compare: 3
   legend:
     - ""
-    - "1908, 2001, 2005 - DPDK versions tested."
-    - "Diff - difference between 2001 and 2005 DPDK version."
+    - "2001, 2005, 2009 - DPDK versions tested."
+    - "Diff - difference between 2005 and 2009 DPDK version."
 
 # DPDK Performance Changes 3n-hsw 2t2c ndr
 - type: "table"
@@ -7036,11 +5993,11 @@
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
   filter: "'2T2C' and 'NDRPDR' and 'NIC_Intel-XL710'"
   columns:
-    - title: "1908"
-      data-set: "dpdk-performance-changes-3n-hsw-h1"
     - title: "2001"
-      data-set: "dpdk-performance-changes-3n-hsw-ref"
+      data-set: "dpdk-performance-changes-3n-hsw-h1"
     - title: "2005"
+      data-set: "dpdk-performance-changes-3n-hsw-ref"
+    - title: "2009"
       data-set: "dpdk-performance-changes-3n-hsw-cmp"
   comparisons:
     - title: "Diff"
@@ -7048,8 +6005,8 @@
       compare: 3
   legend:
     - ""
-    - "1908, 2001, 2005 - DPDK versions tested."
-    - "Diff - difference between 2001 and 2005 DPDK version."
+    - "2001, 2005, 2009 - DPDK versions tested."
+    - "Diff - difference between 2005 and 2009 DPDK version."
 
 # DPDK Performance Changes 3n-skx 2t1c pdr
 - type: "table"
@@ -7059,11 +6016,11 @@
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
   filter: "'2T1C' and 'NDRPDR' and 'NIC_Intel-XXV710'"
   columns:
-    - title: "1908"
-      data-set: "dpdk-performance-changes-3n-skx-h1"
     - title: "2001"
-      data-set: "dpdk-performance-changes-3n-skx-ref"
+      data-set: "dpdk-performance-changes-3n-skx-h1"
     - title: "2005"
+      data-set: "dpdk-performance-changes-3n-skx-ref"
+    - title: "2009"
       data-set: "dpdk-performance-changes-3n-skx-cmp"
   comparisons:
     - title: "Diff"
@@ -7071,8 +6028,8 @@
       compare: 3
   legend:
     - ""
-    - "1908, 2001, 2005 - DPDK versions tested."
-    - "Diff - difference between 2001 and 2005 DPDK version."
+    - "2001, 2005, 2009 - DPDK versions tested."
+    - "Diff - difference between 2005 and 2009 DPDK version."
 
 # DPDK Performance Changes 3n-skx 4t2c pdr
 - type: "table"
@@ -7082,11 +6039,11 @@
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
   filter: "'4T2C' and 'NDRPDR' and 'NIC_Intel-XXV710'"
   columns:
-    - title: "1908"
-      data-set: "dpdk-performance-changes-3n-skx-h1"
     - title: "2001"
-      data-set: "dpdk-performance-changes-3n-skx-ref"
+      data-set: "dpdk-performance-changes-3n-skx-h1"
     - title: "2005"
+      data-set: "dpdk-performance-changes-3n-skx-ref"
+    - title: "2009"
       data-set: "dpdk-performance-changes-3n-skx-cmp"
   comparisons:
     - title: "Diff"
@@ -7094,8 +6051,8 @@
       compare: 3
   legend:
     - ""
-    - "1908, 2001, 2005 - DPDK versions tested."
-    - "Diff - difference between 2001 and 2005 DPDK version."
+    - "2001, 2005, 2009 - DPDK versions tested."
+    - "Diff - difference between 2005 and 2009 DPDK version."
 
 # DPDK Performance Changes 3n-skx 2t1c ndr
 - type: "table"
@@ -7105,11 +6062,11 @@
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
   filter: "'2T1C' and 'NDRPDR' and 'NIC_Intel-XXV710'"
   columns:
-    - title: "1908"
-      data-set: "dpdk-performance-changes-3n-skx-h1"
     - title: "2001"
-      data-set: "dpdk-performance-changes-3n-skx-ref"
+      data-set: "dpdk-performance-changes-3n-skx-h1"
     - title: "2005"
+      data-set: "dpdk-performance-changes-3n-skx-ref"
+    - title: "2009"
       data-set: "dpdk-performance-changes-3n-skx-cmp"
   comparisons:
     - title: "Diff"
@@ -7117,8 +6074,8 @@
       compare: 3
   legend:
     - ""
-    - "1908, 2001, 2005 - DPDK versions tested."
-    - "Diff - difference between 2001 and 2005 DPDK version."
+    - "2001, 2005, 2009 - DPDK versions tested."
+    - "Diff - difference between 2005 and 2009 DPDK version."
 
 # DPDK Performance Changes 3n-skx 4t2c ndr
 - type: "table"
@@ -7128,11 +6085,11 @@
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
   filter: "'4T2C' and 'NDRPDR' and 'NIC_Intel-XXV710'"
   columns:
-    - title: "1908"
-      data-set: "dpdk-performance-changes-3n-skx-h1"
     - title: "2001"
-      data-set: "dpdk-performance-changes-3n-skx-ref"
+      data-set: "dpdk-performance-changes-3n-skx-h1"
     - title: "2005"
+      data-set: "dpdk-performance-changes-3n-skx-ref"
+    - title: "2009"
       data-set: "dpdk-performance-changes-3n-skx-cmp"
   comparisons:
     - title: "Diff"
@@ -7140,8 +6097,8 @@
       compare: 3
   legend:
     - ""
-    - "1908, 2001, 2005 - DPDK versions tested."
-    - "Diff - difference between 2001 and 2005 DPDK version."
+    - "2001, 2005, 2009 - DPDK versions tested."
+    - "Diff - difference between 2005 and 2009 DPDK version."
 
 # DPDK Performance Changes 2n-skx 2t1c pdr
 - type: "table"
@@ -7151,11 +6108,11 @@
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
   filter: "'2T1C' and 'NDRPDR' and 'NIC_Intel-XXV710'"
   columns:
-    - title: "1908"
-      data-set: "dpdk-performance-changes-2n-skx-h1"
     - title: "2001"
-      data-set: "dpdk-performance-changes-2n-skx-ref"
+      data-set: "dpdk-performance-changes-2n-skx-h1"
     - title: "2005"
+      data-set: "dpdk-performance-changes-2n-skx-ref"
+    - title: "2009"
       data-set: "dpdk-performance-changes-2n-skx-cmp"
   comparisons:
     - title: "Diff"
@@ -7163,8 +6120,8 @@
       compare: 3
   legend:
     - ""
-    - "1908, 2001, 2005 - DPDK versions tested."
-    - "Diff - difference between 2001 and 2005 DPDK version."
+    - "2001, 2005, 2009 - DPDK versions tested."
+    - "Diff - difference between 2005 and 2009 DPDK version."
 
 # DPDK Performance Changes 2n-skx 4t2c pdr
 - type: "table"
@@ -7174,11 +6131,11 @@
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
   filter: "'4T2C' and 'NDRPDR' and 'NIC_Intel-XXV710'"
   columns:
-    - title: "1908"
-      data-set: "dpdk-performance-changes-2n-skx-h1"
     - title: "2001"
-      data-set: "dpdk-performance-changes-2n-skx-ref"
+      data-set: "dpdk-performance-changes-2n-skx-h1"
     - title: "2005"
+      data-set: "dpdk-performance-changes-2n-skx-ref"
+    - title: "2009"
       data-set: "dpdk-performance-changes-2n-skx-cmp"
   comparisons:
     - title: "Diff"
@@ -7186,8 +6143,8 @@
       compare: 3
   legend:
     - ""
-    - "1908, 2001, 2005 - DPDK versions tested."
-    - "Diff - difference between 2001 and 2005 DPDK version."
+    - "2001, 2005, 2009 - DPDK versions tested."
+    - "Diff - difference between 2005 and 2009 DPDK version."
 
 # DPDK Performance Changes 2n-skx 2t1c ndr
 - type: "table"
@@ -7197,11 +6154,11 @@
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
   filter: "'2T1C' and 'NDRPDR' and 'NIC_Intel-XXV710'"
   columns:
-    - title: "1908"
-      data-set: "dpdk-performance-changes-2n-skx-h1"
     - title: "2001"
-      data-set: "dpdk-performance-changes-2n-skx-ref"
+      data-set: "dpdk-performance-changes-2n-skx-h1"
     - title: "2005"
+      data-set: "dpdk-performance-changes-2n-skx-ref"
+    - title: "2009"
       data-set: "dpdk-performance-changes-2n-skx-cmp"
   comparisons:
     - title: "Diff"
@@ -7209,8 +6166,8 @@
       compare: 3
   legend:
     - ""
-    - "1908, 2001, 2005 - DPDK versions tested."
-    - "Diff - difference between 2001 and 2005 DPDK version."
+    - "2001, 2005, 2009 - DPDK versions tested."
+    - "Diff - difference between 2005 and 2009 DPDK version."
 
 # DPDK Performance Changes 2n-skx 4t2c ndr
 - type: "table"
@@ -7220,11 +6177,11 @@
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
   filter: "'4T2C' and 'NDRPDR' and 'NIC_Intel-XXV710'"
   columns:
-    - title: "1908"
-      data-set: "dpdk-performance-changes-2n-skx-h1"
     - title: "2001"
-      data-set: "dpdk-performance-changes-2n-skx-ref"
+      data-set: "dpdk-performance-changes-2n-skx-h1"
     - title: "2005"
+      data-set: "dpdk-performance-changes-2n-skx-ref"
+    - title: "2009"
       data-set: "dpdk-performance-changes-2n-skx-cmp"
   comparisons:
     - title: "Diff"
@@ -7232,8 +6189,8 @@
       compare: 3
   legend:
     - ""
-    - "1908, 2001, 2005 - DPDK versions tested."
-    - "Diff - difference between 2001 and 2005 DPDK version."
+    - "2001, 2005, 2009 - DPDK versions tested."
+    - "Diff - difference between 2005 and 2009 DPDK version."
 
 # DPDK Performance Changes 2n-clx 2t1c pdr
 - type: "table"
@@ -7244,17 +6201,19 @@
   filter: "'2T1C' and 'NDRPDR' and 'NIC_Intel-XXV710'"
   columns:
     - title: "2001"
-      data-set: "dpdk-performance-changes-2n-clx-ref"
+      data-set: "dpdk-performance-changes-2n-clx-h1"
     - title: "2005"
+      data-set: "dpdk-performance-changes-2n-clx-ref"
+    - title: "2009"
       data-set: "dpdk-performance-changes-2n-clx-cmp"
   comparisons:
     - title: "Diff"
-      reference: 1
-      compare: 2
+      reference: 2
+      compare: 3
   legend:
     - ""
-    - "2001, 2005 - DPDK versions tested."
-    - "Diff - difference between 2001 and 2005 DPDK version."
+    - "2001, 2005, 2009 - DPDK versions tested."
+    - "Diff - difference between 2005 and 2009 DPDK version."
 
 # DPDK Performance Changes 2n-clx 4t2c pdr
 - type: "table"
@@ -7265,17 +6224,19 @@
   filter: "'4T2C' and 'NDRPDR' and 'NIC_Intel-XXV710'"
   columns:
     - title: "2001"
-      data-set: "dpdk-performance-changes-2n-clx-ref"
+      data-set: "dpdk-performance-changes-2n-clx-h1"
     - title: "2005"
+      data-set: "dpdk-performance-changes-2n-clx-ref"
+    - title: "2009"
       data-set: "dpdk-performance-changes-2n-clx-cmp"
   comparisons:
     - title: "Diff"
-      reference: 1
-      compare: 2
+      reference: 2
+      compare: 3
   legend:
     - ""
-    - "2001, 2005 - DPDK versions tested."
-    - "Diff - difference between 2001 and 2005 DPDK version."
+    - "2001, 2005, 2009 - DPDK versions tested."
+    - "Diff - difference between 2005 and 2009 DPDK version."
 
 # DPDK Performance Changes 2n-clx 2t1c ndr
 - type: "table"
@@ -7286,17 +6247,19 @@
   filter: "'2T1C' and 'NDRPDR' and 'NIC_Intel-XXV710'"
   columns:
     - title: "2001"
-      data-set: "dpdk-performance-changes-2n-clx-ref"
+      data-set: "dpdk-performance-changes-2n-clx-h1"
     - title: "2005"
+      data-set: "dpdk-performance-changes-2n-clx-ref"
+    - title: "2009"
       data-set: "dpdk-performance-changes-2n-clx-cmp"
   comparisons:
     - title: "Diff"
-      reference: 1
-      compare: 2
+      reference: 2
+      compare: 3
   legend:
     - ""
-    - "2001, 2005 - DPDK versions tested."
-    - "Diff - difference between 2001 and 2005 DPDK version."
+    - "2001, 2005, 2009 - DPDK versions tested."
+    - "Diff - difference between 2005 and 2009 DPDK version."
 
 # DPDK Performance Changes 2n-clx 4t2c ndr
 - type: "table"
@@ -7307,17 +6270,19 @@
   filter: "'4T2C' and 'NDRPDR' and 'NIC_Intel-XXV710'"
   columns:
     - title: "2001"
-      data-set: "dpdk-performance-changes-2n-clx-ref"
+      data-set: "dpdk-performance-changes-2n-clx-h1"
     - title: "2005"
+      data-set: "dpdk-performance-changes-2n-clx-ref"
+    - title: "2009"
       data-set: "dpdk-performance-changes-2n-clx-cmp"
   comparisons:
     - title: "Diff"
-      reference: 1
-      compare: 2
+      reference: 2
+      compare: 3
   legend:
     - ""
-    - "2001, 2005 - DPDK versions tested."
-    - "Diff - difference between 2001 and 2005 DPDK version."
+    - "2001, 2005, 2009 - DPDK versions tested."
+    - "Diff - difference between 2005 and 2009 DPDK version."
 
 # DPDK Performance Changes 2n-dnv 1t1c pdr
 - type: "table"
@@ -7328,17 +6293,19 @@
   filter: "'1T1C' and 'NDRPDR' and 'NIC_Intel-X553'"
   columns:
     - title: "2001"
-      data-set: "dpdk-performance-changes-2n-dnv-ref"
+      data-set: "dpdk-performance-changes-2n-dnv-h1"
     - title: "2005"
+      data-set: "dpdk-performance-changes-2n-dnv-ref"
+    - title: "2009"
       data-set: "dpdk-performance-changes-2n-dnv-cmp"
   comparisons:
     - title: "Diff"
-      reference: 1
-      compare: 2
+      reference: 2
+      compare: 3
   legend:
     - ""
-    - "2001, 2005 - DPDK versions tested."
-    - "Diff - difference between 2001 and 2005 DPDK version."
+    - "2001, 2005, 2009 - DPDK versions tested."
+    - "Diff - difference between 2005 and 2009 DPDK version."
 
 # DPDK Performance Changes 2n-dnv 2t2c pdr
 - type: "table"
@@ -7349,17 +6316,19 @@
   filter: "'2T2C' and 'NDRPDR' and 'NIC_Intel-X553'"
   columns:
     - title: "2001"
-      data-set: "dpdk-performance-changes-2n-dnv-ref"
+      data-set: "dpdk-performance-changes-2n-dnv-h1"
     - title: "2005"
+      data-set: "dpdk-performance-changes-2n-dnv-ref"
+    - title: "2009"
       data-set: "dpdk-performance-changes-2n-dnv-cmp"
   comparisons:
     - title: "Diff"
-      reference: 1
-      compare: 2
+      reference: 2
+      compare: 3
   legend:
     - ""
-    - "2001, 2005 - DPDK versions tested."
-    - "Diff - difference between 2001 and 2005 DPDK version."
+    - "2001, 2005, 2009 - DPDK versions tested."
+    - "Diff - difference between 2005 and 2009 DPDK version."
 
 # DPDK Performance Changes 2n-dnv 1t1c ndr
 - type: "table"
@@ -7370,17 +6339,19 @@
   filter: "'1T1C' and 'NDRPDR' and 'NIC_Intel-X553'"
   columns:
     - title: "2001"
-      data-set: "dpdk-performance-changes-2n-dnv-ref"
+      data-set: "dpdk-performance-changes-2n-dnv-h1"
     - title: "2005"
+      data-set: "dpdk-performance-changes-2n-dnv-ref"
+    - title: "2009"
       data-set: "dpdk-performance-changes-2n-dnv-cmp"
   comparisons:
     - title: "Diff"
-      reference: 1
-      compare: 2
+      reference: 2
+      compare: 3
   legend:
     - ""
-    - "2001, 2005 - DPDK versions tested."
-    - "Diff - difference between 2001 and 2005 DPDK version."
+    - "2001, 2005, 2009 - DPDK versions tested."
+    - "Diff - difference between 2005 and 2009 DPDK version."
 
 # DPDK Performance Changes 2n-dnv 2t2c ndr
 - type: "table"
@@ -7391,17 +6362,19 @@
   filter: "'2T2C' and 'NDRPDR' and 'NIC_Intel-X553'"
   columns:
     - title: "2001"
-      data-set: "dpdk-performance-changes-2n-dnv-ref"
+      data-set: "dpdk-performance-changes-2n-dnv-h1"
     - title: "2005"
+      data-set: "dpdk-performance-changes-2n-dnv-ref"
+    - title: "2009"
       data-set: "dpdk-performance-changes-2n-dnv-cmp"
   comparisons:
     - title: "Diff"
-      reference: 1
-      compare: 2
+      reference: 2
+      compare: 3
   legend:
     - ""
-    - "2001, 2005 - DPDK versions tested."
-    - "Diff - difference between 2001 and 2005 DPDK version."
+    - "2001, 2005, 2009 - DPDK versions tested."
+    - "Diff - difference between 2005 and 2009 DPDK version."
 
 # DPDK Performance Changes 3n-dnv 1t1c pdr
 - type: "table"
@@ -7412,17 +6385,19 @@
   filter: "'1T1C' and 'NDRPDR' and 'NIC_Intel-X553'"
   columns:
     - title: "2001"
-      data-set: "dpdk-performance-changes-3n-dnv-ref"
+      data-set: "dpdk-performance-changes-3n-dnv-h1"
     - title: "2005"
+      data-set: "dpdk-performance-changes-3n-dnv-ref"
+    - title: "2009"
       data-set: "dpdk-performance-changes-3n-dnv-cmp"
   comparisons:
     - title: "Diff"
-      reference: 1
-      compare: 2
+      reference: 2
+      compare: 3
   legend:
     - ""
-    - "2001, 2005 - DPDK versions tested."
-    - "Diff - difference between 2001 and 2005 DPDK version."
+    - "2001, 2005, 2009 - DPDK versions tested."
+    - "Diff - difference between 2005 and 2009 DPDK version."
 
 # DPDK Performance Changes 3n-dnv 2t2c pdr
 - type: "table"
@@ -7433,17 +6408,19 @@
   filter: "'2T2C' and 'NDRPDR' and 'NIC_Intel-X553'"
   columns:
     - title: "2001"
-      data-set: "dpdk-performance-changes-3n-dnv-ref"
+      data-set: "dpdk-performance-changes-3n-dnv-h1"
     - title: "2005"
+      data-set: "dpdk-performance-changes-3n-dnv-ref"
+    - title: "2009"
       data-set: "dpdk-performance-changes-3n-dnv-cmp"
   comparisons:
     - title: "Diff"
-      reference: 1
-      compare: 2
+      reference: 2
+      compare: 3
   legend:
     - ""
-    - "2001, 2005 - DPDK versions tested."
-    - "Diff - difference between 2001 and 2005 DPDK version."
+    - "2001, 2005, 2009 - DPDK versions tested."
+    - "Diff - difference between 2005 and 2009 DPDK version."
 
 # DPDK Performance Changes 3n-dnv 1t1c ndr
 - type: "table"
@@ -7454,17 +6431,19 @@
   filter: "'1T1C' and 'NDRPDR' and 'NIC_Intel-X553'"
   columns:
     - title: "2001"
-      data-set: "dpdk-performance-changes-3n-dnv-ref"
+      data-set: "dpdk-performance-changes-3n-dnv-h1"
     - title: "2005"
+      data-set: "dpdk-performance-changes-3n-dnv-ref"
+    - title: "2009"
       data-set: "dpdk-performance-changes-3n-dnv-cmp"
   comparisons:
     - title: "Diff"
-      reference: 1
-      compare: 2
+      reference: 2
+      compare: 3
   legend:
     - ""
-    - "2001, 2005 - DPDK versions tested."
-    - "Diff - difference between 2001 and 2005 DPDK version."
+    - "2001, 2005, 2009 - DPDK versions tested."
+    - "Diff - difference between 2005 and 2009 DPDK version."
 
 # DPDK Performance Changes 3n-dnv 2t2c ndr
 - type: "table"
@@ -7475,17 +6454,19 @@
   filter: "'2T2C' and 'NDRPDR' and 'NIC_Intel-X553'"
   columns:
     - title: "2001"
-      data-set: "dpdk-performance-changes-3n-dnv-ref"
+      data-set: "dpdk-performance-changes-3n-dnv-h1"
     - title: "2005"
+      data-set: "dpdk-performance-changes-3n-dnv-ref"
+    - title: "2009"
       data-set: "dpdk-performance-changes-3n-dnv-cmp"
   comparisons:
     - title: "Diff"
-      reference: 1
-      compare: 2
+      reference: 2
+      compare: 3
   legend:
     - ""
-    - "2001, 2005 - DPDK versions tested."
-    - "Diff - difference between 2001 and 2005 DPDK version."
+    - "2001, 2005, 2009 - DPDK versions tested."
+    - "Diff - difference between 2005 and 2009 DPDK version."
 
 # DPDK Performance Changes 3n-tsh 1t1c pdr
 - type: "table"
@@ -7496,17 +6477,19 @@
   filter: "'1T1C' and 'NDRPDR' and 'NIC_Intel-XXV710'"
   columns:
     - title: "2001"
-      data-set: "dpdk-performance-changes-3n-tsh-ref"
+      data-set: "dpdk-performance-changes-3n-tsh-h1"
     - title: "2005"
+      data-set: "dpdk-performance-changes-3n-tsh-ref"
+    - title: "2009"
       data-set: "dpdk-performance-changes-3n-tsh-cmp"
   comparisons:
     - title: "Diff"
-      reference: 1
-      compare: 2
+      reference: 2
+      compare: 3
   legend:
     - ""
-    - "2001, 2005 - DPDK versions tested."
-    - "Diff - difference between 2001 and 2005 DPDK version."
+    - "2001, 2005, 2009 - DPDK versions tested."
+    - "Diff - difference between 2005 and 2009 DPDK version."
 
 # DPDK Performance Changes 3n-tsh 2t2c pdr
 - type: "table"
@@ -7517,17 +6500,19 @@
   filter: "'2T2C' and 'NDRPDR' and 'NIC_Intel-XXV710'"
   columns:
     - title: "2001"
-      data-set: "dpdk-performance-changes-3n-tsh-ref"
+      data-set: "dpdk-performance-changes-3n-tsh-h1"
     - title: "2005"
+      data-set: "dpdk-performance-changes-3n-tsh-ref"
+    - title: "2009"
       data-set: "dpdk-performance-changes-3n-tsh-cmp"
   comparisons:
     - title: "Diff"
-      reference: 1
-      compare: 2
+      reference: 2
+      compare: 3
   legend:
     - ""
-    - "2001, 2005 - DPDK versions tested."
-    - "Diff - difference between 2001 and 2005 DPDK version."
+    - "2001, 2005, 2009 - DPDK versions tested."
+    - "Diff - difference between 2005 and 2009 DPDK version."
 
 # DPDK Performance Changes 3n-tsh 1t1c ndr
 - type: "table"
@@ -7538,17 +6523,19 @@
   filter: "'1T1C' and 'NDRPDR' and 'NIC_Intel-XXV710'"
   columns:
     - title: "2001"
-      data-set: "dpdk-performance-changes-3n-tsh-ref"
+      data-set: "dpdk-performance-changes-3n-tsh-h1"
     - title: "2005"
+      data-set: "dpdk-performance-changes-3n-tsh-ref"
+    - title: "2009"
       data-set: "dpdk-performance-changes-3n-tsh-cmp"
   comparisons:
     - title: "Diff"
-      reference: 1
-      compare: 2
+      reference: 2
+      compare: 3
   legend:
     - ""
-    - "2001, 2005 - DPDK versions tested."
-    - "Diff - difference between 2001 and 2005 DPDK version."
+    - "2001, 2005, 2009 - DPDK versions tested."
+    - "Diff - difference between 2005 and 2009 DPDK version."
 
 # DPDK Performance Changes 3n-tsh 2t2c ndr
 - type: "table"
@@ -7559,17 +6546,19 @@
   filter: "'2T2C' and 'NDRPDR' and 'NIC_Intel-XXV710'"
   columns:
     - title: "2001"
-      data-set: "dpdk-performance-changes-3n-tsh-ref"
+      data-set: "dpdk-performance-changes-3n-tsh-h1"
     - title: "2005"
+      data-set: "dpdk-performance-changes-3n-tsh-ref"
+    - title: "2009"
       data-set: "dpdk-performance-changes-3n-tsh-cmp"
   comparisons:
     - title: "Diff"
-      reference: 1
-      compare: 2
+      reference: 2
+      compare: 3
   legend:
     - ""
-    - "2001, 2005 - DPDK versions tested."
-    - "Diff - difference between 2001 and 2005 DPDK version."
+    - "2001, 2005, 2009 - DPDK versions tested."
+    - "Diff - difference between 2005 and 2009 DPDK version."
 
 # DPDK Comparison Across Testbeds 3n-hsw to 3n-skx ndr
 - type: "table"