Report: Add SRv6, fix greps

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

9 files changed, 252 insertions, 31 deletions

diff --git a/docs/report/vpp_performance_tests/packet_latency_graphs/index.rst b/docs/report/vpp_performance_tests/packet_latency_graphs/index.rst
index 50074e1b6a..4507978b66 100644
--- a/docs/report/vpp_performance_tests/packet_latency_graphs/index.rst
+++ b/docs/report/vpp_performance_tests/packet_latency_graphs/index.rst
@@ -27,6 +27,7 @@ TGint2-to-SUT2-to-SUT1-to-TGint1.
     l2
     ip4
     ip6
+    srv6
     ip4_tunnels
     ip6_tunnels
     vm_vhost
diff --git a/docs/report/vpp_performance_tests/packet_latency_graphs/l2.rst b/docs/report/vpp_performance_tests/packet_latency_graphs/l2.rst
index dee31cef84..7842fc8343 100644
--- a/docs/report/vpp_performance_tests/packet_latency_graphs/l2.rst
+++ b/docs/report/vpp_performance_tests/packet_latency_graphs/l2.rst
@@ -22,22 +22,22 @@ VPP packet latency in 1t1c setup (1thread, 1core) is presented in the graph belo
             \label{fig:64B-1t1c-l2-sel1-ndrdisc-lat50}
     \end{figure}
 
+*Figure 1a. VPP 1thread 1core - packet latency for Phy-to-Phy L2 Ethernet
+Switching (base).*
+
 CSIT source code for the test cases used for above plots can be found in CSIT
 git repository:
 
 .. only:: html
 
-   .. program-output:: cd ../../../../../ && set +x && grep -E "64B-1t1c-(eth|dot1q|dot1ad)-(l2xcbase|l2bdbasemaclrn|l2bdscale.*|l2dbscale.*)-(eth.*)*ndrdisc" tests/vpp/perf/l2/* && grep -E "64B-1t1c-(eth|dot1q|dot1ad)-(l2xcbase|l2bdbasemaclrn|l2bdscale.*)-(eth.*)*ndrdisc" tests/vpp/perf/container_memif/*
+   .. program-output:: cd ../../../../../ && set +x && cd tests/vpp/perf/l2/ && grep -E "64B-1t1c-(eth|dot1q|dot1ad)-(l2xcbase|l2bdbasemaclrn|l2bdscale.*|l2dbscale.*)-(eth.*)*ndrdisc" *
       :shell:
 
 .. only:: latex
 
    .. code-block:: bash
 
-      $ grep -E "64B-1t1c-(eth|dot1q|dot1ad)-(l2xcbase|l2bdbasemaclrn|l2bdscale.*|l2dbscale.*)-(eth.*)*ndrdisc" tests/vpp/perf/l2/* && grep -E "64B-1t1c-(eth|dot1q|dot1ad)-(l2xcbase|l2bdbasemaclrn|l2bdscale.*)-(eth.*)*ndrdisc" tests/vpp/perf/container_memif/*
-
-*Figure 1a. VPP 1thread 1core - packet latency for Phy-to-Phy L2 Ethernet
-Switching (base).*
+      $ grep -E "64B-1t1c-(eth|dot1q|dot1ad)-(l2xcbase|l2bdbasemaclrn|l2bdscale.*|l2dbscale.*)-(eth.*)*ndrdisc" tests/vpp/perf/l2/*
 
 .. raw:: html
 
@@ -85,22 +85,22 @@ VPP packet latency in 2t2c setup (2thread, 2core) is presented in the graph belo
             \label{fig:64B-2t2c-l2-sel1-ndrdisc-lat50}
     \end{figure}
 
+*Figure 2a. VPP 2threads 2cores - packet latency for Phy-to-Phy L2 Ethernet
+Switching (base).*
+
 CSIT source code for the test cases used for above plots can be found in CSIT
 git repository:
 
 .. only:: html
 
-   .. program-output:: cd ../../../../../ && set +x && grep -E "64B-2t2c-(eth|dot1q|dot1ad)-(l2xcbase|l2bdbasemaclrn|l2bdscale.*|l2dbscale.*)-(eth.*)*ndrdisc" tests/vpp/perf/l2/* && grep -E "64B-2t2c-(eth|dot1q|dot1ad)-(l2xcbase|l2bdbasemaclrn|l2bdscale.*)-(eth.*)*ndrdisc" tests/vpp/perf/container_memif/*
+   .. program-output:: cd ../../../../../ && set +x && cd tests/vpp/perf/l2/ && grep -E "64B-2t2c-(eth|dot1q|dot1ad)-(l2xcbase|l2bdbasemaclrn|l2bdscale.*|l2dbscale.*)-(eth.*)*ndrdisc" *
       :shell:
 
 .. only:: latex
 
    .. code-block:: bash
 
-      $ grep -E "64B-2t2c-(eth|dot1q|dot1ad)-(l2xcbase|l2bdbasemaclrn|l2bdscale.*|l2dbscale.*)-(eth.*)*ndrdisc" tests/vpp/perf/l2/* && grep -E "64B-2t2c-(eth|dot1q|dot1ad)-(l2xcbase|l2bdbasemaclrn|l2bdscale.*)-(eth.*)*ndrdisc" tests/vpp/perf/container_memif/*
-
-*Figure 2a. VPP 2threads 2cores - packet latency for Phy-to-Phy L2 Ethernet
-Switching (base).*
+      $ grep -E "64B-2t2c-(eth|dot1q|dot1ad)-(l2xcbase|l2bdbasemaclrn|l2bdscale.*|l2dbscale.*)-(eth.*)*ndrdisc" tests/vpp/perf/l2/*
 
 .. raw:: html
 
diff --git a/docs/report/vpp_performance_tests/packet_latency_graphs/srv6.rst b/docs/report/vpp_performance_tests/packet_latency_graphs/srv6.rst
new file mode 100644
index 0000000000..bb45c4b9a5
--- /dev/null
+++ b/docs/report/vpp_performance_tests/packet_latency_graphs/srv6.rst
@@ -0,0 +1,72 @@
+SRv6
+====
+
+This section includes summary graphs of VPP Phy-to-Phy packet latency
+with SRv6 measured at 50% of discovered NDR throughput
+rate. Latency is reported for VPP running in multiple configurations of
+VPP worker thread(s), a.k.a. VPP data plane thread(s), and their
+physical CPU core(s) placement.
+
+VPP packet latency in 1t1c setup (1thread, 1core) is presented in the graph below.
+
+.. raw:: html
+
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/78B-1t1c-ethip6-srv6-ndrdisc-lat50.html"></iframe>
+
+.. raw:: latex
+
+    \begin{figure}[H]
+        \centering
+            \graphicspath{{../_build/_static/vpp/}}
+            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{78B-1t1c-ethip6-srv6-ndrdisc-lat50}
+            \label{fig:78B-1t1c-ethip6-srv6-ndrdisc-lat50}
+    \end{figure}
+
+*Figure 1. VPP 1thread 1core - packet latency for Phy-to-Phy SRv6.*
+
+CSIT source code for the test cases used for above plots can be found in CSIT
+git repository:
+
+.. only:: html
+
+   .. program-output:: cd ../../../../../ && set +x && cd tests/vpp/perf/srv6 && grep -E "78B-1t1c-ethip6.*srv6.*ndrdisc" *
+      :shell:
+
+.. only:: latex
+
+   .. code-block:: bash
+
+      $ cd tests/vpp/perf/srv6
+      $ grep -E "78B-1t1c-ethip6.*srv6.*ndrdisc" *
+
+VPP packet latency in 2t2c setup (2thread, 2core) is presented in the graph below.
+
+.. raw:: html
+
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/78B-2t2c-ethip6-srv6-ndrdisc-lat50.html"></iframe>
+
+.. raw:: latex
+
+    \begin{figure}[H]
+        \centering
+            \graphicspath{{../_build/_static/vpp/}}
+            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{78B-2t2c-ethip6-srv6-ndrdisc-lat50}
+            \label{fig:78B-2t2c-ethip6-srv6-ndrdisc-lat50}
+    \end{figure}
+
+*Figure 2. VPP 2threads 2cores - packet latency for Phy-to-Phy SRv6.*
+
+CSIT source code for the test cases used for above plots can be found in CSIT
+git repository:
+
+.. only:: html
+
+   .. program-output:: cd ../../../../../ && set +x && cd tests/vpp/perf/srv6 && grep -E "78B-2t2c-ethip6.*srv6.*ndrdisc" *
+      :shell:
+
+.. only:: latex
+
+   .. code-block:: bash
+
+      $ cd tests/vpp/perf/srv6
+      $ grep -E "78B-2t2c-ethip6.*srv6.*ndrdisc" *
diff --git a/docs/report/vpp_performance_tests/packet_throughput_graphs/index.rst b/docs/report/vpp_performance_tests/packet_throughput_graphs/index.rst
index 6bfe4fe1af..ec3c9f9173 100644
--- a/docs/report/vpp_performance_tests/packet_throughput_graphs/index.rst
+++ b/docs/report/vpp_performance_tests/packet_throughput_graphs/index.rst
@@ -39,6 +39,7 @@ and their indices.
     l2
     ip4
     ip6
+    srv6
     ip4_tunnels
     ip6_tunnels
     vm_vhost
diff --git a/docs/report/vpp_performance_tests/packet_throughput_graphs/l2.rst b/docs/report/vpp_performance_tests/packet_throughput_graphs/l2.rst
index 0adf9ccf5c..6966413b78 100644
--- a/docs/report/vpp_performance_tests/packet_throughput_graphs/l2.rst
+++ b/docs/report/vpp_performance_tests/packet_throughput_graphs/l2.rst
@@ -65,7 +65,7 @@ git repository:
 
 .. only:: html
 
-   .. program-output:: cd ../../../../../ && set +x && cd tests/vpp/perf/l2 && grep -E "64B-1t1c-(eth|dot1q|dot1ad)-(l2xcbase|l2bdbasemaclrn).*-(iacl50(-state(ful|less)|sl)-(flows10k.*|10kflows.*)|oacl50-state(ful|less)-flows10k.*)-ndrdisc" *
+   .. program-output:: cd ../../../../../ && set +x && cd tests/vpp/perf/l2 && grep -E "64B-1t1c-(eth|dot1q|dot1ad)-(l2xcbase|l2bdbasemaclrn).*-(iacl(10|50)(-state(ful|less)|sl)-(flows10k.*|10kflows.*)|oacl(10|50)-state(ful|less)-flows10k.*)-ndrdisc" *
       :shell:
 
 .. only:: latex
@@ -73,7 +73,7 @@ git repository:
    .. code-block:: bash
 
       $ cd tests/vpp/perf/l2
-      $ grep -E "64B-1t1c-(eth|dot1q|dot1ad)-(l2xcbase|l2bdbasemaclrn).*-(iacl50(-state(ful|less)|sl)-(flows10k.*|10kflows.*)|oacl50-state(ful|less)-flows10k.*)-ndrdisc" *
+      $ grep -E "64B-1t1c-(eth|dot1q|dot1ad)-(l2xcbase|l2bdbasemaclrn).*-(iacl(10|50)(-state(ful|less)|sl)-(flows10k.*|10kflows.*)|oacl(10|50)-state(ful|less)-flows10k.*)-ndrdisc" *
 
 VPP NDR 64B packet throughput in 2t2c setup (2thread, 2core) is presented
 in the graph below.
@@ -130,7 +130,7 @@ git repository:
 
 .. only:: html
 
-   .. program-output:: cd ../../../../../ && set +x && cd tests/vpp/perf/l2 && grep -E "64B-2t2c-(eth|dot1q|dot1ad)-(l2xcbase|l2bdbasemaclrn).*-(iacl50(-state(ful|less)|sl)-(flows10k.*|10kflows.*)|oacl50-state(ful|less)-flows10k.*)-ndrdisc" *
+   .. program-output:: cd ../../../../../ && set +x && cd tests/vpp/perf/l2 && grep -E "64B-2t2c-(eth|dot1q|dot1ad)-(l2xcbase|l2bdbasemaclrn).*-(iacl(10|50)(-state(ful|less)|sl)-(flows10k.*|10kflows.*)|oacl(10|50)-state(ful|less)-flows10k.*)-ndrdisc" *
       :shell:
 
 .. only:: latex
@@ -138,7 +138,7 @@ git repository:
    .. code-block:: bash
 
       $ cd tests/vpp/perf/l2
-      $ grep -E "64B-2t2c-(eth|dot1q|dot1ad)-(l2xcbase|l2bdbasemaclrn).*-(iacl50(-state(ful|less)|sl)-(flows10k.*|10kflows.*)|oacl50-state(ful|less)-flows10k.*)-ndrdisc" *
+      $ grep -E "64B-2t2c-(eth|dot1q|dot1ad)-(l2xcbase|l2bdbasemaclrn).*-(iacl(10|50)(-state(ful|less)|sl)-(flows10k.*|10kflows.*)|oacl(10|50)-state(ful|less)-flows10k.*)-ndrdisc" *
 
 
 PDR Throughput
@@ -199,7 +199,7 @@ git repository:
 
 .. only:: html
 
-   .. program-output:: cd ../../../../../ && set +x && cd tests/vpp/perf/l2 && grep -E "64B-1t1c-(eth|dot1q|dot1ad)-(l2xcbase|l2bdbasemaclrn).*-(iacl50(-state(ful|less)|sl)-(flows10k.*|10kflows.*)|oacl50-state(ful|less)-flows10k.*)-pdrdisc" *
+   .. program-output:: cd ../../../../../ && set +x && cd tests/vpp/perf/l2 && grep -E "64B-1t1c-(eth|dot1q|dot1ad)-(l2xcbase|l2bdbasemaclrn).*-(iacl(10|50)(-state(ful|less)|sl)-(flows10k.*|10kflows.*)|oacl(10|50)-state(ful|less)-flows10k.*)-pdrdisc" *
       :shell:
 
 .. only:: latex
@@ -207,12 +207,12 @@ git repository:
    .. code-block:: bash
 
       $ cd tests/vpp/perf/l2
-      $ grep -E "64B-1t1c-(eth|dot1q|dot1ad)-(l2xcbase|l2bdbasemaclrn).*-(iacl50(-state(ful|less)|sl)-(flows10k.*|10kflows.*)|oacl50-state(ful|less)-flows10k.*)-pdrdisc" *
+      $ grep -E "64B-1t1c-(eth|dot1q|dot1ad)-(l2xcbase|l2bdbasemaclrn).*-(iacl(10|50)(-state(ful|less)|sl)-(flows10k.*|10kflows.*)|oacl(10|50)-state(ful|less)-flows10k.*)-pdrdisc" *
 
 VPP PDR 64B packet throughput in 2t2c setup (2thread, 2core) is presented
 in the graph below. PDR measured for 0.5% packet loss ratio.
 
-.. raw:: htmlhttps://zoom.us/j/5695787389
+.. raw:: html
 
     <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/64B-2t2c-l2-sel1-pdrdisc.html"></iframe>
 
@@ -261,7 +261,7 @@ Switching (feature).*
 
 .. only:: html
 
-   .. program-output:: cd ../../../../../ && set +x && cd tests/vpp/perf/l2 && grep -E "64B-2t2c-(eth|dot1q|dot1ad)-(l2xcbase|l2bdbasemaclrn).*-(iacl50(-state(ful|less)|sl)-(flows10k.*|10kflows.*)|oacl50-state(ful|less)-flows10k.*)-pdrdisc" *
+   .. program-output:: cd ../../../../../ && set +x && cd tests/vpp/perf/l2 && grep -E "64B-2t2c-(eth|dot1q|dot1ad)-(l2xcbase|l2bdbasemaclrn).*-(iacl(10|50)(-state(ful|less)|sl)-(flows10k.*|10kflows.*)|oacl(10|50)-state(ful|less)-flows10k.*)-pdrdisc" *
       :shell:
 
 .. only:: latex
@@ -269,4 +269,4 @@ Switching (feature).*
    .. code-block:: bash
 
       $ cd tests/vpp/perf/l2
-      $ grep -E "64B-2t2c-(eth|dot1q|dot1ad)-(l2xcbase|l2bdbasemaclrn).*-(iacl50(-state(ful|less)|sl)-(flows10k.*|10kflows.*)|oacl50-state(ful|less)-flows10k.*)-pdrdisc" *
+      $ grep -E "64B-2t2c-(eth|dot1q|dot1ad)-(l2xcbase|l2bdbasemaclrn).*-(iacl(10|50)(-state(ful|less)|sl)-(flows10k.*|10kflows.*)|oacl(10|50)-state(ful|less)-flows10k.*)-pdrdisc" *
diff --git a/docs/report/vpp_performance_tests/packet_throughput_graphs/srv6.rst b/docs/report/vpp_performance_tests/packet_throughput_graphs/srv6.rst
new file mode 100644
index 0000000000..5df30d20d9
--- /dev/null
+++ b/docs/report/vpp_performance_tests/packet_throughput_graphs/srv6.rst
@@ -0,0 +1,147 @@
+SRv6
+====
+
+Following sections include summary graphs of VPP Phy-to-Phy performance
+with SRv6, including NDR throughput (zero packet loss)
+and PDR throughput (<0.5% packet loss). Performance is reported for VPP
+running in multiple configurations of VPP worker thread(s), a.k.a. VPP
+data plane thread(s), and their physical CPU core(s) placement.
+
+NDR Throughput
+~~~~~~~~~~~~~~
+
+VPP NDR 78B packet throughput in 1t1c setup (1thread, 1core) is presented
+in the graph below.
+
+.. raw:: html
+
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/78B-1t1c-ethip6-srv6-ndrdisc.html"></iframe>
+
+.. raw:: latex
+
+    \begin{figure}[H]
+        \centering
+            \graphicspath{{../_build/_static/vpp/}}
+            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{78B-1t1c-ethip6-srv6-ndrdisc}
+            \label{fig:78B-1t1c-ethip6-srv6-ndrdisc}
+    \end{figure}
+
+*Figure 1. VPP 1thread 1core - NDR Throughput for Phy-to-Phy SRv6.*
+
+CSIT source code for the test cases used for above plots can be found in CSIT
+git repository:
+
+.. only:: html
+
+   .. program-output:: cd ../../../../../ && set +x && cd tests/vpp/perf/srv6 && grep -E "78B-1t1c-ethip6.*srv6.*ndrdisc" *
+      :shell:
+
+.. only:: latex
+
+   .. code-block:: bash
+
+      $ cd tests/vpp/perf/srv6
+      $ grep -E "78B-1t1c-ethip6.*srv6.*ndrdisc" *
+
+VPP NDR 78B packet throughput in 2t2c setup (2thread, 2core) is presented
+in the graph below.
+
+.. raw:: html
+
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/78B-2t2c-ethip6-srv6-ndrdisc.html"></iframe>
+
+.. raw:: latex
+
+    \begin{figure}[H]
+        \centering
+            \graphicspath{{../_build/_static/vpp/}}
+            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{78B-2t2c-ethip6-srv6-ndrdisc}
+            \label{fig:78B-2t2c-ethip6-srv6-ndrdisc}
+    \end{figure}
+
+*Figure 2. VPP 2threads 2cores - NDR Throughput for Phy-to-Phy SRv6.*
+
+CSIT source code for the test cases used for above plots can be found in CSIT
+git repository:
+
+.. only:: html
+
+   .. program-output:: cd ../../../../../ && set +x && cd tests/vpp/perf/srv6 && grep -E "78B-2t2c-ethip6.*srv6.*ndrdisc" *
+      :shell:
+
+.. only:: latex
+
+   .. code-block:: bash
+
+      $ cd tests/vpp/perf/srv6
+      $ grep -E "78B-2t2c-ethip6.*srv6.*ndrdisc" *
+
+PDR Throughput
+~~~~~~~~~~~~~~
+
+VPP PDR 78B packet throughput in 1t1c setup (1thread, 1core) is presented
+in the graph below. PDR measured for 0.5% packet loss ratio.
+
+.. raw:: html
+
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/78B-1t1c-ethip6-srv6-pdrdisc.html"></iframe>
+
+.. raw:: latex
+
+    \begin{figure}[H]
+        \centering
+            \graphicspath{{../_build/_static/vpp/}}
+            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{78B-1t1c-ethip6-srv6-pdrdisc}
+            \label{fig:78B-1t1c-ethip6-srv6-pdrdisc}
+    \end{figure}
+
+*Figure 3. VPP 1thread 1core - PDR Throughput for Phy-to-Phy SRv6.*
+
+CSIT source code for the test cases used for above plots can be found in CSIT
+git repository:
+
+.. only:: html
+
+   .. program-output:: cd ../../../../../ && set +x && cd tests/vpp/perf/srv6 && grep -E "78B-1t1c-ethip6.*srv6.*pdrdisc" *
+      :shell:
+
+.. only:: latex
+
+   .. code-block:: bash
+
+      $ cd tests/vpp/perf/srv6
+      $ grep -E "78B-1t1c-ethip6.*srv6.*pdrdisc" *
+
+VPP PDR 78B packet throughput in 2t2c setup (2thread, 2core) is presented
+in the graph below. PDR measured for 0.5% packet loss ratio.
+
+.. raw:: html
+
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/78B-2t2c-ethip6-srv6-pdrdisc.html"></iframe>
+
+.. raw:: latex
+
+    \begin{figure}[H]
+        \centering
+            \graphicspath{{../_build/_static/vpp/}}
+            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{78B-2t2c-ethip6-srv6-pdrdisc}
+            \label{fig:78B-2t2c-ethip6-srv6-pdrdisc}
+    \end{figure}
+
+*Figure 4. VPP 2thread 2core - PDR Throughput for Phy-to-Phy IPv6
+Routed-Forwarding.*
+
+CSIT source code for the test cases used for above plots can be found in CSIT
+git repository:
+
+.. only:: html
+
+   .. program-output:: cd ../../../../../ && set +x && cd tests/vpp/perf/srv6 && grep -E "78B-2t2c-ethip6.*srv6.*pdrdisc" *
+      :shell:
+
+.. only:: latex
+
+   .. code-block:: bash
+
+      $ cd tests/vpp/perf/srv6
+      $ grep -E "78B-2t2c-ethip6.*srv6.*pdrdisc" *
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ipsec.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ipsec.rst
index da260d009a..46d426530e 100644
--- a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ipsec.rst
+++ b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ipsec.rst
@@ -41,7 +41,7 @@ git repository:
 
 .. only:: html
 
-   .. program-output:: cd ../../../../../ && set +x && cd tests/vpp/perf/crypto && grep -E "64B-(1t1c|2t2c|4t4c)-.*ipsec.*-ndrdisc" *
+   .. program-output:: cd ../../../../../ && set +x && cd tests/vpp/perf/crypto && grep -E "64B-(1t1c|2t2c|4t4c)-ethip4ipsec(base|tpt).*-ndrdisc" *
       :shell:
 
 .. only:: latex
@@ -49,7 +49,7 @@ git repository:
    .. code-block:: bash
 
       $ cd tests/vpp/perf/crypto
-      $ grep -E "64B-(1t1c|2t2c|4t4c)-.*ipsec.*-ndrdisc" *
+      $ grep -E "64B-(1t1c|2t2c|4t4c)-ethip4ipsec(base|tpt).*-ndrdisc" *
 
 PDR Throughput
 --------------
@@ -84,7 +84,7 @@ git repository:
 
 .. only:: html
 
-   .. program-output:: cd ../../../../../ && set +x && cd tests/vpp/perf/crypto && grep -E "64B-(1t1c|2t2c|4t4c)-.*ipsec.*-pdrdisc" *
+   .. program-output:: cd ../../../../../ && set +x && cd tests/vpp/perf/crypto && grep -E "64B-(1t1c|2t2c|4t4c)-ethip4ipsec(base|tpt).*-ndrdisc" *
       :shell:
 
 .. only:: latex
@@ -92,4 +92,4 @@ git repository:
    .. code-block:: bash
 
       $ cd tests/vpp/perf/crypto
-      $ grep -E "64B-(1t1c|2t2c|4t4c)-.*ipsec.*-pdrdisc" *
+      $ grep -E "64B-(1t1c|2t2c|4t4c)-ethip4ipsec(base|tpt).*-ndrdisc" *
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/l2.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/l2.rst
index f898534626..3c0a37edf0 100644
--- a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/l2.rst
+++ b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/l2.rst
@@ -39,14 +39,14 @@ git repository:
 
 .. only:: html
 
-   .. program-output:: cd ../../../../../ && set +x && cd tests/vpp/perf/l2 && grep -E "64B-(1t1c|2t2c|4t4c)-(eth|dot1q|dot1ad)-(l2xcbase|l2bdbasemaclrn|l2bdscale.*|l2dbscale.*)-(eth.*)*ndrdisc" 10ge2p1x520*
+   .. program-output:: cd ../../../../../ && set +x && cd tests/vpp/perf/l2 && grep -E "64B-(1t1c|2t2c|4t4c)-(eth|dot1q|dot1ad)-(l2xcbase|l2bdbasemaclrn)-(eth.*)*ndrdisc" 10ge2p1x520*
       :shell:
 
 .. only:: latex
 
    .. code-block:: bash
 
-      $ grep -E "64B-(1t1c|2t2c|4t4c)-(eth|dot1q|dot1ad)-(l2xcbase|l2bdbasemaclrn|l2bdscale.*|l2dbscale.*)-(eth.*)*ndrdisc" tests/vpp/perf/l2/10ge2p1x520*
+      $ grep -E "64B-(1t1c|2t2c|4t4c)-(eth|dot1q|dot1ad)-(l2xcbase|l2bdbasemaclrn)-(eth.*)*ndrdisc" tests/vpp/perf/l2/10ge2p1x520*
 
 NIC 40ge2p1xl710
 ~~~~~~~~~~~~~~~~
@@ -112,11 +112,11 @@ git repository:
 
 .. only:: html
 
-   .. program-output:: cd ../../../../../ && set +x && cd tests/vpp/perf/l2 && grep -E "64B-(1t1c|2t2c|4t4c)-(eth|dot1q|dot1ad)-(l2xcbase|l2bdbasemaclrn|l2bdscale.*|l2dbscale.*)-(eth.*)*pdrdisc" 10ge2p1x520*
+   .. program-output:: cd ../../../../../ && set +x && cd tests/vpp/perf/l2 && grep -E "64B-(1t1c|2t2c|4t4c)-(eth|dot1q|dot1ad)-(l2xcbase|l2bdbasemaclrn)-(eth.*)*pdrdisc" 10ge2p1x520*
       :shell:
 
 .. only:: latex
 
    .. code-block:: bash
 
-      $ grep -E "64B-(1t1c|2t2c|4t4c)-(eth|dot1q|dot1ad)-(l2xcbase|l2bdbasemaclrn|l2bdscale.*|l2dbscale.*)-(eth.*)*pdrdisc" tests/vpp/perf/l2/10ge2p1x520*
+      $ grep -E "64B-(1t1c|2t2c|4t4c)-(eth|dot1q|dot1ad)-(l2xcbase|l2bdbasemaclrn)-(eth.*)*pdrdisc" tests/vpp/perf/l2/10ge2p1x520*
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/vm_vhost.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/vm_vhost.rst
index 9a1c3df0eb..fe4d4deb6b 100644
--- a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/vm_vhost.rst
+++ b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/vm_vhost.rst
@@ -54,7 +54,7 @@ git repository:
 
 .. only:: html
 
-   .. program-output:: cd ../../../../../ && set +x && cd tests/vpp/perf/vm_vhost && grep -E "64B-(1t1c|2t2c|4t4c)-.*vhost.*-ndrdisc" 10ge2p1x520*
+   .. program-output:: cd ../../../../../ && set +x && cd tests/vpp/perf/vm_vhost && grep -E "64B-(1t1c|2t2c|4t4c)-(eth|ethip4)-.*vhost.*-ndrdisc" 10ge2p1x520*-ndrpdrdisc.robot
       :shell:
 
 .. only:: latex
@@ -62,7 +62,7 @@ git repository:
    .. code-block:: bash
 
       $ cd tests/vpp/perf/vm_vhost
-      $ grep -E "64B-(1t1c|2t2c|4t4c)-.*vhost.*-ndrdisc" 10ge2p1x520*
+      $ grep -E "grep -E "64B-(1t1c|2t2c|4t4c)-(eth|ethip4)-.*vhost.*-ndrdisc" 10ge2p1x520*-ndrpdrdisc.robot
 
 NIC 10ge2p1x710
 ~~~~~~~~~~~~~~~
@@ -194,7 +194,7 @@ git repository:
 
 .. only:: html
 
-   .. program-output:: cd ../../../../../ && set +x && cd tests/vpp/perf/vm_vhost && grep -E "64B-(1t1c|2t2c|4t4c)-.*vhost.*-pdrdisc" 10ge2p1x520*
+   .. program-output:: cd ../../../../../ && set +x && cd tests/vpp/perf/vm_vhost && grep -E "64B-(1t1c|2t2c|4t4c)-(eth|ethip4)-.*vhost.*-pdrdisc" 10ge2p1x520*-ndrpdrdisc.robot
       :shell:
 
 .. only:: latex
@@ -202,7 +202,7 @@ git repository:
    .. code-block:: bash
 
       $ cd tests/vpp/perf/vm_vhost
-      $ grep -E "64B-(1t1c|2t2c|4t4c)-.*vhost.*-pdrdisc" 10ge2p1x520*
+      $ grep -E "grep -E "64B-(1t1c|2t2c|4t4c)-(eth|ethip4)-.*vhost.*-pdrdisc" 10ge2p1x520*-ndrpdrdisc.robot
 
 NIC 10ge2p1x710
 ~~~~~~~~~~~~~~~