12 files changed, 422 insertions, 251 deletions
diff --git a/docs/cpta/trending/container_memif-3n-skx-xxv710.rst b/docs/cpta/trending/container_memif-3n-skx-xxv710.rst
index 4ae2c3bc10..ed15b59c54 100644
--- a/docs/cpta/trending/container_memif-3n-skx-xxv710.rst
+++ b/docs/cpta/trending/container_memif-3n-skx-xxv710.rst
@@ -1,16 +1,54 @@
 3n-skx-xxv710
 -------------
 
+64b-memif-base-avf
+``````````````````
+
+2t1c
+::::
+
+.. raw:: html
+
+    <a name="64b-2t1c-base-avf"></a>
+    <center>
+    Links to builds:
+    <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
+    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-3n-skx" target="_blank">csit-ref</a>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-xxv710-64b-2t1c-memif-base-avf.html"></iframe>
+    <p><br></p>
+    </center>
+
+4t2c
+::::
+
+.. raw:: html
+
+    <a name="64b-4t2c-base-avf"></a>
+    <center>
+    Links to builds:
+    <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
+    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-3n-skx" target="_blank">csit-ref</a>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-xxv710-64b-4t2c-memif-base-avf.html"></iframe>
+    <p><br></p>
+    </center>
+
+8t4c
+::::
+
+.. raw:: html
+
+    <a name="64b-8t4c-base-avf"></a>
+    <center>
+    Links to builds:
+    <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
+    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-3n-skx" target="_blank">csit-ref</a>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-xxv710-64b-8t4c-memif-base-avf.html"></iframe>
+    <p><br></p>
+    </center>
+
 64b-memif-base-dpdk
 ```````````````````
 
-..
-    25ge2p1xxv710-eth-l2xcbase-eth-2memif-1lxc-mrr
-    25ge2p1xxv710-eth-l2xcbase-eth-2memif-1dcr-mrr
-    25ge2p1xxv710-dot1q-l2bdbasemaclrn-eth-2memif-1dcr-mrr
-    25ge2p1xxv710-eth-l2bdbasemaclrn-eth-2memif-1lxc-mrr
-    25ge2p1xxv710-ethip4-ip4base-eth-2memif-1dcr-mrr
-
 2t1c
 ::::
 
diff --git a/docs/cpta/trending/ip4-3n-skx-x710.rst b/docs/cpta/trending/ip4-3n-skx-x710.rst
index 49b1415b0f..e419683aed 100644
--- a/docs/cpta/trending/ip4-3n-skx-x710.rst
+++ b/docs/cpta/trending/ip4-3n-skx-x710.rst
@@ -1,15 +1,8 @@
 3n-skx-x710
 -----------
 
-64b-ip4routing-base-scale-avf-dpdk
-``````````````````````````````````
-
-..
-    10ge2p1x710-avf-ethip4-ip4base-mrr
-    10ge2p1x710-avf-ethip4-ip4scale2m-mrr
-    10ge2p1x710-dot1q-ip4base-mrr
-    10ge2p1x710-ethip4-ip4base-mrr
-    10ge2p1x710-ethip4-ip4scale2m-mrr
+64b-ip4routing-base-scale-avf
+`````````````````````````````
 
 2t1c
 ::::
@@ -17,14 +10,12 @@
 .. raw:: html
 
     <a name="64b-2t1c-base-avf"></a>
-    <a name="64b-2t1c-base-dpdk"></a>
     <a name="64b-2t1c-scale-avf"></a>
-    <a name="64b-2t1c-scale-dpdk"></a>
     <center>
     Links to builds:
     <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-3n-skx" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-x710-64b-2t1c-ip4-base-scale-avf-dpdk.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-x710-64b-2t1c-ip4-base-scale-avf.html"></iframe>
     <p><br></p>
     </center>
 
@@ -34,14 +25,12 @@
 .. raw:: html
 
     <a name="64b-4t2c-base-avf"></a>
-    <a name="64b-4t2c-base-dpdk"></a>
     <a name="64b-4t2c-scale-avf"></a>
-    <a name="64b-4t2c-scale-dpdk"></a>
     <center>
     Links to builds:
     <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-3n-skx" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-x710-64b-4t2c-ip4-base-scale-avf-dpdk.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-x710-64b-4t2c-ip4-base-scale-avf.html"></iframe>
     <p><br></p>
     </center>
 
@@ -52,13 +41,11 @@
 .. raw:: html
 
     <a name="64b-8t4c-base-avf"></a>
-    <a name="64b-8t4c-base-dpdk"></a>
     <a name="64b-8t4c-scale-avf"></a>
-    <a name="64b-8t4c-scale-dpdk"></a>
     <center>
     Links to builds:
     <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-3n-skx" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-x710-64b-8t4c-ip4-base-scale-avf-dpdk.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-x710-64b-8t4c-ip4-base-scale-avf.html"></iframe>
     <p><br></p>
     </center>
diff --git a/docs/cpta/trending/ip4-3n-skx-xxv710.rst b/docs/cpta/trending/ip4-3n-skx-xxv710.rst
index 8092f6e5cd..1e943bd7bb 100644
--- a/docs/cpta/trending/ip4-3n-skx-xxv710.rst
+++ b/docs/cpta/trending/ip4-3n-skx-xxv710.rst
@@ -4,13 +4,6 @@
 64b-ip4routing-base-scale-avf
 `````````````````````````````
 
-..
-    25ge2p1xxv710-avf-dot1q-ip4base-mrr
-    25ge2p1xxv710-avf-ethip4-ip4base-mrr
-    25ge2p1xxv710-avf-ethip4-ip4scale20k-mrr
-    25ge2p1xxv710-avf-ethip4-ip4scale200k-mrr
-    25ge2p1xxv710-avf-ethip4-ip4scale2m-mrr
-
 2t1c
 ::::
 
@@ -59,13 +52,6 @@
 64b-ip4routing-base-scale-dpdk
 ``````````````````````````````
 
-..
-    25ge2p1xxv710-dot1q-ip4base-mrr
-    25ge2p1xxv710-ethip4-ip4base-mrr
-    25ge2p1xxv710-ethip4-ip4scale20k-mrr
-    25ge2p1xxv710-ethip4-ip4scale200k-mrr
-    25ge2p1xxv710-ethip4-ip4scale2m-mrr
-
 2t1c
 ::::
 
@@ -111,17 +97,54 @@
     <p><br></p>
     </center>
 
+64b-features-ip4routing-base-avf
+````````````````````````````````
+
+2t1c
+::::
+
+.. raw:: html
+
+    <a name="64b-2t1c-features-avf"></a>
+    <center>
+    Links to builds:
+    <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
+    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-3n-skx" target="_blank">csit-ref</a>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-xxv710-64b-2t1c-ip4-features-avf.html"></iframe>
+    <p><br></p>
+    </center>
+
+4t2c
+::::
+
+.. raw:: html
+
+    <a name="64b-4t2c-features-avf"></a>
+    <center>
+    Links to builds:
+    <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
+    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-3n-skx" target="_blank">csit-ref</a>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-xxv710-64b-4t2c-ip4-features-avf.html"></iframe>
+    <p><br></p>
+    </center>
+
+8t4c
+::::
+
+.. raw:: html
+
+    <a name="64b-8t4c-features-avf"></a>
+    <center>
+    Links to builds:
+    <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
+    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-3n-skx" target="_blank">csit-ref</a>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-xxv710-64b-8t4c-ip4-features-avf.html"></iframe>
+    <p><br></p>
+    </center>
+
 64b-features-ip4routing-base-dpdk
 `````````````````````````````````
 
-..
-    25ge2p1xxv710-ethip4-ip4base-mrr
-    25ge2p1xxv710-ethip4udp-ip4base-iacl50sf-10kflows-mrr
-    25ge2p1xxv710-ethip4udp-ip4base-iacl50sl-10kflows-mrr
-    25ge2p1xxv710-ethip4udp-ip4base-oacl50sf-10kflows-mrr
-    25ge2p1xxv710-ethip4udp-ip4base-oacl50sl-10kflows-mrr
-    25ge2p1xxv710-ethip4udp-ip4base-nat44-mrr
-
 2t1c
 ::::
 
diff --git a/docs/cpta/trending/ip4_tunnels-3n-skx-xxv710.rst b/docs/cpta/trending/ip4_tunnels-3n-skx-xxv710.rst
index 200bb01045..c68fbed195 100644
--- a/docs/cpta/trending/ip4_tunnels-3n-skx-xxv710.rst
+++ b/docs/cpta/trending/ip4_tunnels-3n-skx-xxv710.rst
@@ -1,14 +1,8 @@
 3n-skx-xxv710
 -------------
 
-64b-ip4tunnel-base-scale-dpdk
-`````````````````````````````
-
-..
-    25ge2p1xxv710-ethip4vxlan-l2xcbase-mrr
-    25ge2p1xxv710-ethip4vxlan-l2bdbasemaclrn-mrr
-    25ge2p1xxv710-dot1q--ethip4vxlan-l2bdscale1l2bd1vlan1vxlan-mrr
-    25ge2p1xxv710-dot1q--ethip4vxlan-l2bdscale100l2bd100vlan100vxlan-mrr
+64b-ip4tunnel-base-scale-avf-dpdk
+`````````````````````````````````
 
 2t1c
 ::::
@@ -16,12 +10,14 @@
 .. raw:: html
 
     <a name="64b-2t1c-base-dpdk"></a>
-    <a name="64b-2t1c-scale-dpdk"></a>
+    <a name="64b-2t1c-base-dpdk"></a>
+    <a name="64b-2t1c-scale-avf"></a>
+    <a name="64b-2t1c-scale-avf"></a>
     <center>
     Links to builds:
     <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-3n-skx" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-xxv710-64b-2t1c-ip4-tunnels-base-scale-dpdk.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-xxv710-64b-2t1c-ip4-tunnels-base-scale-avf-dpdk.html"></iframe>
     <p><br></p>
     </center>
 
@@ -32,11 +28,13 @@
 
     <a name="64b-4t2c-base-dpdk"></a>
     <a name="64b-4t2c-scale-dpdk"></a>
+    <a name="64b-4t2c-base-avf"></a>
+    <a name="64b-4t2c-scale-avf"></a>
     <center>
     Links to builds:
     <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-3n-skx" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-xxv710-64b-4t2c-ip4-tunnels-base-scale-dpdk.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-xxv710-64b-4t2c-ip4-tunnels-base-scale-avf-dpdk.html"></iframe>
     <p><br></p>
     </center>
 
@@ -47,10 +45,12 @@
 
     <a name="64b-8t4c-base-dpdk"></a>
     <a name="64b-8t4c-scale-dpdk"></a>
+    <a name="64b-4t2c-base-avf"></a>
+    <a name="64b-4t2c-scale-avf"></a>
     <center>
     Links to builds:
     <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-3n-skx" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-xxv710-64b-8t4c-ip4-tunnels-base-scale-dpdk.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-xxv710-64b-8t4c-ip4-tunnels-base-scale-avf-dpdk.html"></iframe>
     <p><br></p>
     </center>
diff --git a/docs/cpta/trending/ip6-3n-skx-x710.rst b/docs/cpta/trending/ip6-3n-skx-x710.rst
index ff9242f2d4..4bf6e82121 100644
--- a/docs/cpta/trending/ip6-3n-skx-x710.rst
+++ b/docs/cpta/trending/ip6-3n-skx-x710.rst
@@ -1,25 +1,21 @@
 3n-skx-x710
 -----------
 
-78b-ip6routing-base-scale-dpdk
+78b-ip6routing-base-scale-avf
 ``````````````````````````````
 
-..
-    10ge2p1x710-ethip6-ip6base-mrr
-    10ge2p1x710-ethip6-ip6scale2m-mrr
-
 2t1c
 ::::
 
 .. raw:: html
 
-    <a name="78b-2t1c-base-dpdk"></a>
-    <a name="78b-2t1c-scale-dpdk"></a>
+    <a name="78b-2t1c-base-avf"></a>
+    <a name="78b-2t1c-scale-avf"></a>
     <center>
     Links to builds:
     <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-3n-skx" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-x710-78b-2t1c-ip6-base-scale-dpdk.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-x710-78b-2t1c-ip6-base-scale-avf.html"></iframe>
     <p><br></p>
     </center>
 
@@ -28,13 +24,13 @@
 
 .. raw:: html
 
-    <a name="78b-4t2c-base-dpdk"></a>
-    <a name="78b-4t2c-scale-dpdk"></a>
+    <a name="78b-4t2c-base-avf"></a>
+    <a name="78b-4t2c-scale-avf"></a>
     <center>
     Links to builds:
     <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-3n-skx" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-x710-78b-4t2c-ip6-base-scale-dpdk.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-x710-78b-4t2c-ip6-base-scale-avf.html"></iframe>
     <p><br></p>
     </center>
 
@@ -43,12 +39,12 @@
 
 .. raw:: html
 
-    <a name="78b-8t4c-base-dpdk"></a>
-    <a name="78b-8t4c-scale-dpdk"></a>
+    <a name="78b-8t4c-base-avf"></a>
+    <a name="78b-8t4c-scale-avf"></a>
     <center>
     Links to builds:
     <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-3n-skx" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-x710-78b-8t4c-ip6-base-scale-dpdk.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-x710-78b-8t4c-ip6-base-scale-avf.html"></iframe>
     <p><br></p>
     </center>
diff --git a/docs/cpta/trending/ip6-3n-skx-xxv710.rst b/docs/cpta/trending/ip6-3n-skx-xxv710.rst
index 40a1c12eef..27e4ad32aa 100644
--- a/docs/cpta/trending/ip6-3n-skx-xxv710.rst
+++ b/docs/cpta/trending/ip6-3n-skx-xxv710.rst
@@ -1,16 +1,57 @@
 3n-skx-xxv710
 -------------
 
+78b-ip6routing-base-scale-avf
+`````````````````````````````
+
+2t1c
+::::
+
+.. raw:: html
+
+    <a name="78b-2t1c-base-avf"></a>
+    <a name="78b-2t1c-scale-avf"></a>
+    <center>
+    Links to builds:
+    <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
+    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-3n-skx" target="_blank">csit-ref</a>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-xxv710-78b-2t1c-ip6-base-scale-avf.html"></iframe>
+    <p><br></p>
+    </center>
+
+4t2c
+::::
+
+.. raw:: html
+
+    <a name="78b-4t2c-base-avf"></a>
+    <a name="78b-4t2c-scale-avf"></a>
+    <center>
+    Links to builds:
+    <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
+    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-3n-skx" target="_blank">csit-ref</a>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-xxv710-78b-4t2c-ip6-base-scale-avf.html"></iframe>
+    <p><br></p>
+    </center>
+
+8t4c
+::::
+
+.. raw:: html
+
+    <a name="78b-8t4c-base-avf"></a>
+    <a name="78b-8t4c-scale-avf"></a>
+    <center>
+    Links to builds:
+    <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
+    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-3n-skx" target="_blank">csit-ref</a>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-xxv710-78b-8t4c-ip6-base-scale-avf.html"></iframe>
+    <p><br></p>
+    </center>
+
 78b-ip6routing-base-scale-dpdk
 ``````````````````````````````
 
-..
-    25ge2p1xxv710-dot1q-ip6base-mrr
-    25ge2p1xxv710-ethip6-ip6base-mrr
-    25ge2p1xxv710-ethip6-ip6scale20k-mrr
-    25ge2p1xxv710-ethip6-ip6scale200k-mrr
-    25ge2p1xxv710-ethip6-ip6scale2m-mrr
-
 2t1c
 ::::
 
diff --git a/docs/cpta/trending/ipsec-3n-skx-xxv710.rst b/docs/cpta/trending/ipsec-3n-skx-xxv710.rst
index 3a6df1ada4..e855293464 100644
--- a/docs/cpta/trending/ipsec-3n-skx-xxv710.rst
+++ b/docs/cpta/trending/ipsec-3n-skx-xxv710.rst
@@ -1,17 +1,57 @@
 3n-skx-xxv710
 -------------
 
+imix-ipsec-ip4routing-base-scale-sw-avf
+```````````````````````````````````````
+
+2t1c
+::::
+
+.. raw:: html
+
+    <a name="imix-2t1c-base-sw-avf"></a>
+    <a name="imix-2t1c-scale-sw-avf"></a>
+    <center>
+    Links to builds:
+    <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
+    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-3n-skx" target="_blank">csit-ref</a>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-xxv710-imix-2t1c-ipsec-base-scale-sw-avf.html"></iframe>
+    <p><br></p>
+    </center>
+
+4t2c
+::::
+
+.. raw:: html
+
+    <a name="imix-4t2c-base-sw-avf"></a>
+    <a name="imix-4t2c-scale-sw-avf"></a>
+    <center>
+    Links to builds:
+    <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
+    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-3n-skx" target="_blank">csit-ref</a>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-xxv710-imix-4t2c-ipsec-base-scale-sw-avf.html"></iframe>
+    <p><br></p>
+    </center>
+
+8t4c
+::::
+
+.. raw:: html
+
+    <a name="imix-8t4c-base-sw-avf"></a>
+    <a name="imix-8t4c-scale-sw-avf"></a>
+    <center>
+    Links to builds:
+    <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
+    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-3n-skx" target="_blank">csit-ref</a>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-xxv710-imix-8t4c-ipsec-base-scale-sw-avf.html"></iframe>
+    <p><br></p>
+    </center>
+
 imix-ipsec-ip4routing-base-scale-sw-dpdk
 ````````````````````````````````````````
 
-..
-    25ge2p1xxv710-ethip4ipsec4tnlsw-ip4base-int-aes256gcm-mrr
-    25ge2p1xxv710-ethip4ipsec4tnlsw-ip4base-int-aes128cbc-hmac512sha-mrr
-    25ge2p1xxv710-ethip4ipsec1000tnlsw-ip4base-int-aes256gcm-mrr
-    25ge2p1xxv710-ethip4ipsec1000tnlsw-ip4base-int-aes128cbc-hmac512sha-mrr
-    25ge2p1xxv710-ethip4ipsec10000tnlsw-ip4base-int-aes256gcm-mrr
-    25ge2p1xxv710-ethip4ipsec10000tnlsw-ip4base-int-aes128cbc-hmac512sha-mrr
-
 2t1c
 ::::
 
@@ -56,3 +96,99 @@ imix-ipsec-ip4routing-base-scale-sw-dpdk
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-xxv710-imix-8t4c-ipsec-base-scale-sw-dpdk.html"></iframe>
     <p><br></p>
     </center>
+
+1518b-ipsec-ip4routing-base-scale-sw-avf
+````````````````````````````````````````
+
+2t1c
+::::
+
+.. raw:: html
+
+    <a name="1518b-2t1c-base-sw-avf"></a>
+    <a name="1518b-2t1c-scale-sw-avf"></a>
+    <center>
+    Links to builds:
+    <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
+    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-3n-skx" target="_blank">csit-ref</a>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-xxv710-1518b-2t1c-ipsec-base-scale-sw-avf.html"></iframe>
+    <p><br></p>
+    </center>
+
+4t2c
+::::
+
+.. raw:: html
+
+    <a name="1518b-4t2c-base-sw-avf"></a>
+    <a name="1518b-4t2c-scale-sw-avf"></a>
+    <center>
+    Links to builds:
+    <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
+    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-3n-skx" target="_blank">csit-ref</a>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-xxv710-1518b-4t2c-ipsec-base-scale-sw-avf.html"></iframe>
+    <p><br></p>
+    </center>
+
+8t4c
+::::
+
+.. raw:: html
+
+    <a name="1518b-8t4c-base-sw-avf"></a>
+    <a name="1518b-8t4c-scale-sw-avf"></a>
+    <center>
+    Links to builds:
+    <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
+    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-3n-skx" target="_blank">csit-ref</a>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-xxv710-1518b-8t4c-ipsec-base-scale-sw-avf.html"></iframe>
+    <p><br></p>
+    </center>
+
+1518b-ipsec-ip4routing-base-scale-sw-dpdk
+`````````````````````````````````````````
+
+2t1c
+::::
+
+.. raw:: html
+
+    <a name="1518b-2t1c-base-sw-dpdk"></a>
+    <a name="1518b-2t1c-scale-sw-dpdk"></a>
+    <center>
+    Links to builds:
+    <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
+    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-3n-skx" target="_blank">csit-ref</a>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-xxv710-1518b-2t1c-ipsec-base-scale-sw-dpdk.html"></iframe>
+    <p><br></p>
+    </center>
+
+4t2c
+::::
+
+.. raw:: html
+
+    <a name="1518b-4t2c-base-sw-dpdk"></a>
+    <a name="1518b-4t2c-scale-sw-dpdk"></a>
+    <center>
+    Links to builds:
+    <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
+    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-3n-skx" target="_blank">csit-ref</a>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-xxv710-1518b-4t2c-ipsec-base-scale-sw-dpdk.html"></iframe>
+    <p><br></p>
+    </center>
+
+8t4c
+::::
+
+.. raw:: html
+
+    <a name="1518b-8t4c-base-sw-dpdk"></a>
+    <a name="1518b-8t4c-scale-sw-dpdk"></a>
+    <center>
+    Links to builds:
+    <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
+    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-3n-skx" target="_blank">csit-ref</a>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-xxv710-1518b-8t4c-ipsec-base-scale-sw-dpdk.html"></iframe>
+    <p><br></p>
+    </center>
diff --git a/docs/cpta/trending/l2-3n-skx-x710.rst b/docs/cpta/trending/l2-3n-skx-x710.rst
index bcb5929189..40083b21f6 100644
--- a/docs/cpta/trending/l2-3n-skx-x710.rst
+++ b/docs/cpta/trending/l2-3n-skx-x710.rst
@@ -1,16 +1,8 @@
 3n-skx-x710
 -----------
 
-64b-l2switching-base-scale-avf-dpdk
-```````````````````````````````````
-
-..
-    10ge2p1x710-avf-eth-l2patch-mrr
-    10ge2p1x710-avf-eth-l2xcbase-mrr
-    10ge2p1x710-avf-eth-l2bdbasemaclrn-mrr
-    10ge2p1x710-dot1q-l2bdbasemaclrn-mrr
-    10ge2p1x710-eth-l2bdbasemaclrn-mrr
-    10ge2p1x710-eth-l2bdscale1mmaclrn-mrr
+64b-l2switching-base-scale-avf
+``````````````````````````````
 
 2t1c
 ::::
@@ -18,14 +10,12 @@
 .. raw:: html
 
     <a name="64b-2t1c-base-avf"></a>
-    <a name="64b-2t1c-base-avf"></a>
-    <a name="64b-2t1c-scale-dpdk"></a>
-    <a name="64b-2t1c-scale-dpdk"></a>
+    <a name="64b-2t1c-scale-avf"></a>
     <center>
     Links to builds:
     <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-3n-skx" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-x710-64b-2t1c-l2-base-scale-avf-dpdk.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-x710-64b-2t1c-l2-base-scale-avf.html"></iframe>
     <p><br></p>
     </center>
 
@@ -35,14 +25,12 @@
 .. raw:: html
 
     <a name="64b-4t2c-base-avf"></a>
-    <a name="64b-4t2c-base-avf"></a>
-    <a name="64b-4t2c-scale-dpdk"></a>
-    <a name="64b-4t2c-scale-dpdk"></a>
+    <a name="64b-4t2c-scale-avf"></a>
     <center>
     Links to builds:
     <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-3n-skx" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-x710-64b-4t2c-l2-base-scale-avf-dpdk.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-x710-64b-4t2c-l2-base-scale-avf.html"></iframe>
     <p><br></p>
     </center>
 
@@ -52,13 +40,11 @@
 .. raw:: html
 
     <a name="64b-8t4c-base-avf"></a>
-    <a name="64b-8t4c-base-avf"></a>
-    <a name="64b-8t4c-scale-dpdk"></a>
-    <a name="64b-8t4c-scale-dpdk"></a>
+    <a name="64b-8t4c-scale-avf"></a>
     <center>
     Links to builds:
     <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-3n-skx" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-x710-64b-8t4c-l2-base-scale-avf-dpdk.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-x710-64b-8t4c-l2-base-scale-avf.html"></iframe>
     <p><br></p>
     </center>
diff --git a/docs/cpta/trending/l2-3n-skx-xxv710.rst b/docs/cpta/trending/l2-3n-skx-xxv710.rst
index 4eb425fd05..8006363abd 100644
--- a/docs/cpta/trending/l2-3n-skx-xxv710.rst
+++ b/docs/cpta/trending/l2-3n-skx-xxv710.rst
@@ -4,11 +4,6 @@
 64b-l2switching-base-avf
 ````````````````````````
 
-..
-    25ge2p1xxv710-avf-eth-l2patch-mrr
-    25ge2p1xxv710-avf-eth-l2xcbase-mrr
-    25ge2p1xxv710-avf-eth-l2bdbasemaclrn-mrr
-
 2t1c
 ::::
 
@@ -51,26 +46,20 @@
     <p><br></p>
     </center>
 
-64b-l2switching-base-dpdk
-`````````````````````````
-
-..
-    25ge2p1xxv710-dot1q-l2xcbase-mrr
-    25ge2p1xxv710-eth-l2xcbase-mrr
-    25ge2p1xxv710-dot1q-l2bdbasemaclrn-mrr
-    25ge2p1xxv710-eth-l2bdbasemaclrn-mrr
+64b-l2switching-base-scale-avf
+``````````````````````````````
 
 2t1c
 ::::
 
 .. raw:: html
 
-    <a name="64b-2t1c-base-dpdk"></a>
+    <a name="64b-2t1c-scale-avf"></a>
     <center>
     Links to builds:
     <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-3n-skx" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-xxv710-64b-2t1c-l2-base-dpdk.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-xxv710-64b-2t1c-l2-base-scale-avf.html"></iframe>
     <p><br></p>
     </center>
 
@@ -79,12 +68,12 @@
 
 .. raw:: html
 
-    <a name="64b-4t2c-base-dpdk"></a>
+    <a name="64b-4t2c-scale-avf"></a>
     <center>
     Links to builds:
     <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-3n-skx" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-xxv710-64b-4t2c-l2-base-dpdk.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-xxv710-64b-4t2c-l2-base-scale-avf.html"></iframe>
     <p><br></p>
     </center>
 
@@ -93,26 +82,18 @@
 
 .. raw:: html
 
-    <a name="64b-8t4c-base-dpdk"></a>
+    <a name="64b-8t4c-scale-avf"></a>
     <center>
     Links to builds:
     <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-3n-skx" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-xxv710-64b-8t4c-l2-base-dpdk.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-xxv710-64b-8t4c-l2-base-scale-avf.html"></iframe>
     <p><br></p>
     </center>
 
 64b-l2switching-base-scale-dpdk
 ```````````````````````````````
 
-..
-    25ge2p1xxv710-eth-l2patch-mrr
-    25ge2p1xxv710-eth-l2xcbase-mrr
-    25ge2p1xxv710-eth-l2bdbasemaclrn-mrr
-    25ge2p1xxv710-eth-l2bdscale10kmaclrn-mrr
-    25ge2p1xxv710-eth-l2bdscale100kmaclrn-mrr
-    25ge2p1xxv710-eth-l2bdscale1mmaclrn-mrr
-
 2t1c
 ::::
 
@@ -158,28 +139,20 @@
     <p><br></p>
     </center>
 
-64b-features-l2switching-base-dpdk
-``````````````````````````````````
-
-..
-    25ge2p1xxv710-eth-l2bdbasemaclrn-mrr
-    25ge2p1xxv710-eth-l2bdbasemaclrn-iacl50sf-10kflows-mrr
-    25ge2p1xxv710-eth-l2bdbasemaclrn-iacl50sl-10kflows-mrr
-    25ge2p1xxv710-eth-l2bdbasemaclrn-oacl50sf-10kflows-mrr
-    25ge2p1xxv710-eth-l2bdbasemaclrn-oacl50sl-10kflows-mrr
-    25ge2p1xxv710-eth-l2bdbasemaclrn-macip-iacl50sl-10kflows-mrr
+64b-features-l2switching-base-avf
+`````````````````````````````````
 
 2t1c
 ::::
 
 .. raw:: html
 
-    <a name="64b-2t1c-features-dpdk"></a>
+    <a name="64b-2t1c-features-avf"></a>
     <center>
     Links to builds:
     <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-3n-skx" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-xxv710-64b-2t1c-l2-features-dpdk.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-xxv710-64b-2t1c-l2-features-avf.html"></iframe>
     <p><br></p>
     </center>
 
@@ -188,12 +161,12 @@
 
 .. raw:: html
 
-    <a name="64b-4t2c-features-dpdk"></a>
+    <a name="64b-4t2c-features-avf"></a>
     <center>
     Links to builds:
     <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-3n-skx" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-xxv710-64b-4t2c-l2-features-dpdk.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-xxv710-64b-4t2c-l2-features-avf.html"></iframe>
     <p><br></p>
     </center>
 
@@ -202,11 +175,11 @@
 
 .. raw:: html
 
-    <a name="64b-8t4c-features-dpdk"></a>
+    <a name="64b-8t4c-features-avf"></a>
     <center>
     Links to builds:
     <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-3n-skx" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-xxv710-64b-8t4c-l2-features-dpdk.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-xxv710-64b-8t4c-l2-features-avf.html"></iframe>
     <p><br></p>
     </center>
diff --git a/docs/cpta/trending/srv6-3n-skx-xxv710.rst b/docs/cpta/trending/srv6-3n-skx-xxv710.rst
index 0090fcfce7..2589d00822 100644
--- a/docs/cpta/trending/srv6-3n-skx-xxv710.rst
+++ b/docs/cpta/trending/srv6-3n-skx-xxv710.rst
@@ -1,16 +1,8 @@
 3n-skx-xxv710
 -------------
 
-78b-srv6-ip6routing-base-dpdk
-`````````````````````````````
-
-..
-    25ge2p1xxv710-ethip6ip6-ip6base-srv6enc1sid-mrr
-    25ge2p1xxv710-ethip6srhip6-ip6base-srv6enc2sids-mrr
-    25ge2p1xxv710-ethip6srhip6-ip6base-srv6enc2sids-nodecaps-mrr
-    25ge2p1xxv710-ethip6srhip6-ip6base-srv6proxy-dyn-mrr
-    25ge2p1xxv710-ethip6srhip6-ip6base-srv6proxy-masq-mrr
-    25ge2p1xxv710-ethip6srhip6-ip6base-srv6proxy-stat-mrr
+78b-srv6-ip6routing-base-avf
+````````````````````````````
 
 2t1c
 ::::
@@ -22,7 +14,7 @@
     Links to builds:
     <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-3n-skx" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-xxv710-78b-2t1c-srv6-base-dpdk.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-xxv710-78b-2t1c-srv6-base-avf.html"></iframe>
     <p><br></p>
     </center>
 
@@ -36,7 +28,7 @@
     Links to builds:
     <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-3n-skx" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-xxv710-78b-4t2c-srv6-base-dpdk.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-xxv710-78b-4t2c-srv6-base-avf.html"></iframe>
     <p><br></p>
     </center>
 
@@ -50,6 +42,6 @@
     Links to builds:
     <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-3n-skx" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-xxv710-78b-8t4c-srv6-base-dpdk.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-xxv710-78b-8t4c-srv6-base-avf.html"></iframe>
     <p><br></p>
     </center>
diff --git a/docs/cpta/trending/vhost-3n-skx-x710.rst b/docs/cpta/trending/vhost-3n-skx-x710.rst
index 0b604d2318..a22833c50a 100644
--- a/docs/cpta/trending/vhost-3n-skx-x710.rst
+++ b/docs/cpta/trending/vhost-3n-skx-x710.rst
@@ -1,28 +1,20 @@
 3n-skx-x710
 -----------
 
-64b-link-bonding-vhost-base-dpdk-testpmd
-````````````````````````````````````````
-
-..
-    10ge2p1x710-dot1q-l2xcbase-eth-2vhostvr1024-1vm-mrr
-    10ge2p1x710-1lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-mrr
-    10ge2p1x710-2lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-mrr
-    10ge2p1x710-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-mrr
-    10ge2p1x710-1lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-mrr
-    10ge2p1x710-2lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-mrr
+64b-link-bonding-vhost-base-avf-testpmd
+```````````````````````````````````````
 
 2t1c
 ::::
 
 .. raw:: html
 
-    <a name="64b-2t1c-base-link-bonding-dpdk-testpmd"></a>
+    <a name="64b-2t1c-base-link-bonding-avf-testpmd"></a>
     <center>
     Links to builds:
     <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-3n-skx" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-x710-64b-2t1c-link-bonding-vhost-base-dpdk-testpmd.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-x710-64b-2t1c-link-bonding-vhost-base-avf-testpmd.html"></iframe>
     <p><br></p>
     </center>
 
@@ -31,12 +23,12 @@
 
 .. raw:: html
 
-    <a name="64b-4t2c-base-link-bonding-dpdk-testpmd"></a>
+    <a name="64b-4t2c-base-link-bonding-avf-testpmd"></a>
     <center>
     Links to builds:
     <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-3n-skx" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-x710-64b-4t2c-link-bonding-vhost-base-dpdk-testpmd.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-x710-64b-4t2c-link-bonding-vhost-base-avf-testpmd.html"></iframe>
     <p><br></p>
     </center>
 
@@ -45,37 +37,29 @@
 
 .. raw:: html
 
-    <a name="64b-8t4c-base-link-bonding-dpdk-testpmd"></a>
+    <a name="64b-8t4c-base-link-bonding-avf-testpmd"></a>
     <center>
     Links to builds:
     <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-3n-skx" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-x710-64b-8t4c-link-bonding-vhost-base-dpdk-testpmd.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-x710-64b-8t4c-link-bonding-vhost-base-avf-testpmd.html"></iframe>
     <p><br></p>
     </center>
 
-64b-link-bonding-vhost-base-dpdk-vpp
-````````````````````````````````````
-
-..
-    10ge2p1x710-dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-mrr
-    10ge2p1x710-1lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-mrr
-    10ge2p1x710-2lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-mrr
-    10ge2p1x710-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-mrr
-    10ge2p1x710-1lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-mrr
-    10ge2p1x710-2lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-mrr
+64b-link-bonding-vhost-base-avf-vpp
+```````````````````````````````````
 
 2t1c
 ::::
 
 .. raw:: html
 
-    <a name="64b-2t1c-base-link-bonding-dpdk-vpp"></a>
+    <a name="64b-2t1c-base-link-bonding-avf-vpp"></a>
     <center>
     Links to builds:
     <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-3n-skx" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-x710-64b-2t1c-link-bonding-vhost-base-dpdk-vpp.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-x710-64b-2t1c-link-bonding-vhost-base-avf-vpp.html"></iframe>
     <p><br></p>
     </center>
 
@@ -84,12 +68,12 @@
 
 .. raw:: html
 
-    <a name="64b-4t2c-base-link-bonding-dpdk-vpp"></a>
+    <a name="64b-4t2c-base-link-bonding-avf-vpp"></a>
     <center>
     Links to builds:
     <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-3n-skx" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-x710-64b-4t2c-link-bonding-vhost-base-dpdk-vpp.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-x710-64b-4t2c-link-bonding-vhost-base-avf-vpp.html"></iframe>
     <p><br></p>
     </center>
 
@@ -98,11 +82,11 @@
 
 .. raw:: html
 
-    <a name="64b-8t4c-base-link-bonding-dpdk-vpp"></a>
+    <a name="64b-8t4c-base-link-bonding-avf-vpp"></a>
     <center>
     Links to builds:
     <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-3n-skx" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-x710-64b-8t4c-link-bonding-vhost-base-dpdk-vpp.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-x710-64b-8t4c-link-bonding-vhost-base-avf-vpp.html"></iframe>
     <p><br></p>
     </center>
diff --git a/docs/cpta/trending/vhost-3n-skx-xxv710.rst b/docs/cpta/trending/vhost-3n-skx-xxv710.rst
index 1ae61377eb..488f8b7a15 100644
--- a/docs/cpta/trending/vhost-3n-skx-xxv710.rst
+++ b/docs/cpta/trending/vhost-3n-skx-xxv710.rst
@@ -4,13 +4,6 @@
 64b-vhost-base-dpdk-testpmd
 ```````````````````````````
 
-..
-    25ge2p1xxv710-dot1q-l2xcbase-eth-2vhostvr1024-1vm-mrr
-    25ge2p1xxv710-eth-l2xcbase-eth-2vhostvr1024-1vm-mrr
-    25ge2p1xxv710-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-mrr
-    25ge2p1xxv710-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-mrr
-    25ge2p1xxv710-ethip4-ip4base-eth-2vhostvr1024-1vm-mrr
-
 2t1c
 ::::
 
@@ -53,27 +46,20 @@
     <p><br></p>
     </center>
 
-64b-vhost-base-dpdk-vpp
-```````````````````````
-
-..
-    25ge2p1xxv710-dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-mrr
-    25ge2p1xxv710-eth-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-mrr
-    25ge2p1xxv710-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-mrr
-    25ge2p1xxv710-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-mrr
-    25ge2p1xxv710-ethip4-ip4base-eth-2vhostvr1024-1vm-vppl2xc-mrr
+64b-vhost-base-avf-testpmd
+``````````````````````````
 
 2t1c
 ::::
 
 .. raw:: html
 
-    <a name="64b-2t1c-base-dpdk-vpp"></a>
+    <a name="64b-2t1c-base-avf-testpmd"></a>
     <center>
     Links to builds:
     <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-3n-skx" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-xxv710-64b-2t1c-vhost-base-dpdk-vpp.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-xxv710-64b-2t1c-vhost-base-avf-testpmd.html"></iframe>
     <p><br></p>
     </center>
 
@@ -82,12 +68,12 @@
 
 .. raw:: html
 
-    <a name="64b-4t2c-base-dpdk-vpp"></a>
+    <a name="64b-4t2c-base-avf-testpmd"></a>
     <center>
     Links to builds:
     <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-3n-skx" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-xxv710-64b-4t2c-vhost-base-dpdk-vpp.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-xxv710-64b-4t2c-vhost-base-avf-testpmd.html"></iframe>
     <p><br></p>
     </center>
 
@@ -96,37 +82,29 @@
 
 .. raw:: html
 
-    <a name="64b-8t4c-base-dpdk-vpp"></a>
+    <a name="64b-8t4c-base-avf-testpmd"></a>
     <center>
     Links to builds:
     <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-3n-skx" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-xxv710-64b-8t4c-vhost-base-dpdk-vpp.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-xxv710-64b-8t4c-vhost-base-avf-testpmd.html"></iframe>
     <p><br></p>
     </center>
 
-64b-link-bonding-vhost-base-dpdk-testpmd
-````````````````````````````````````````
-
-..
-    25ge2p1xxv710-1lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-mrr
-    25ge2p1xxv710-dot1q-l2xcbase-eth-2vhostvr1024-1vm-mrr
-    25ge2p1xxv710-eth-l2xcbase-eth-2vhostvr1024-1vm-mrr
-    25ge2p1xxv710-1lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-mrr
-    25ge2p1xxv710-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-mrr
-    25ge2p1xxv710-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-mrr
+64b-vhost-base-avf-vpp
+``````````````````````
 
 2t1c
 ::::
 
 .. raw:: html
 
-    <a name="64b-2t1c-base-link-bonding-dpdk-testpmd"></a>
+    <a name="64b-2t1c-base-avf-vpp"></a>
     <center>
     Links to builds:
     <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-3n-skx" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-xxv710-64b-2t1c-link-bonding-vhost-base-dpdk-testpmd.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-xxv710-64b-2t1c-vhost-base-avf-vpp.html"></iframe>
     <p><br></p>
     </center>
 
@@ -135,12 +113,12 @@
 
 .. raw:: html
 
-    <a name="64b-4t2c-base-link-bonding-dpdk-testpmd"></a>
+    <a name="64b-4t2c-base-avf-vpp"></a>
     <center>
     Links to builds:
     <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-3n-skx" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-xxv710-64b-4t2c-link-bonding-vhost-base-dpdk-testpmd.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-xxv710-64b-4t2c-vhost-base-avf-vpp.html"></iframe>
     <p><br></p>
     </center>
 
@@ -149,37 +127,74 @@
 
 .. raw:: html
 
-    <a name="64b-8t4c-base-link-bonding-dpdk-testpmd"></a>
+    <a name="64b-8t4c-base-avf-vpp"></a>
+    <center>
+    Links to builds:
+    <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
+    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-3n-skx" target="_blank">csit-ref</a>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-xxv710-64b-8t4c-vhost-base-avf-vpp.html"></iframe>
+    <p><br></p>
+    </center>
+
+64b-link-bonding-vhost-base-avf-testpmd
+```````````````````````````````````````
+
+2t1c
+::::
+
+.. raw:: html
+
+    <a name="64b-2t1c-base-link-bonding-avf-testpmd"></a>
     <center>
     Links to builds:
     <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-3n-skx" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-xxv710-64b-8t4c-link-bonding-vhost-base-dpdk-testpmd.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-xxv710-64b-2t1c-link-bonding-vhost-base-avf-testpmd.html"></iframe>
     <p><br></p>
     </center>
 
-64b-link-bonding-vhost-base-dpdk-vpp
-````````````````````````````````````
+4t2c
+::::
+
+.. raw:: html
+
+    <a name="64b-4t2c-base-link-bonding-avf-testpmd"></a>
+    <center>
+    Links to builds:
+    <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
+    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-3n-skx" target="_blank">csit-ref</a>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-xxv710-64b-4t2c-link-bonding-vhost-base-avf-testpmd.html"></iframe>
+    <p><br></p>
+    </center>
+
+8t4c
+::::
+
+.. raw:: html
+
+    <a name="64b-8t4c-base-link-bonding-avf-testpmd"></a>
+    <center>
+    Links to builds:
+    <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
+    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-3n-skx" target="_blank">csit-ref</a>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-xxv710-64b-8t4c-link-bonding-vhost-base-avf-testpmd.html"></iframe>
+    <p><br></p>
+    </center>
 
-..
-    25ge2p1xxv710-1lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-mrr
-    25ge2p1xxv710-dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-mrr
-    25ge2p1xxv710-eth-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-mrr
-    25ge2p1xxv710-1lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-mrr
-    25ge2p1xxv710-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-mrr
-    25ge2p1xxv710-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-mrr
+64b-link-bonding-vhost-base-avf-vpp
+```````````````````````````````````
 
 2t1c
 ::::
 
 .. raw:: html
 
-    <a name="64b-2t1c-base-link-bonding-dpdk-vpp"></a>
+    <a name="64b-2t1c-base-link-bonding-avf-vpp"></a>
     <center>
     Links to builds:
     <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-3n-skx" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-xxv710-64b-2t1c-link-bonding-vhost-base-dpdk-vpp.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-xxv710-64b-2t1c-link-bonding-vhost-base-avf-vpp.html"></iframe>
     <p><br></p>
     </center>
 
@@ -188,12 +203,12 @@
 
 .. raw:: html
 
-    <a name="64b-4t2c-base-link-bonding-dpdk-vpp"></a>
+    <a name="64b-4t2c-base-link-bonding-avf-vpp"></a>
     <center>
     Links to builds:
     <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-3n-skx" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-xxv710-64b-4t2c-link-bonding-vhost-base-dpdk-vpp.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-xxv710-64b-4t2c-link-bonding-vhost-base-avf-vpp.html"></iframe>
     <p><br></p>
     </center>
 
@@ -202,11 +217,11 @@
 
 .. raw:: html
 
-    <a name="64b-8t4c-base-link-bonding-dpdk-vpp"></a>
+    <a name="64b-8t4c-base-link-bonding-avf-vpp"></a>
     <center>
     Links to builds:
     <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-3n-skx" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-xxv710-64b-8t4c-link-bonding-vhost-base-dpdk-vpp.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/3n-skx-xxv710-64b-8t4c-link-bonding-vhost-base-avf-vpp.html"></iframe>
     <p><br></p>
     </center>