CSIT-1510: Report 1901.2 35/19835/3
authorTibor Frank <tifrank@cisco.com>
Mon, 27 May 2019 08:37:04 +0000 (10:37 +0200)
committerTibor Frank <tifrank@cisco.com>
Mon, 27 May 2019 11:02:44 +0000 (13:02 +0200)
Change-Id: I0ff0690d41db0817b5a1275e6b609e3eb7110127
Signed-off-by: Tibor Frank <tifrank@cisco.com>
21 files changed:
docs/report/detailed_test_results/vpp_performance_results/index.rst
docs/report/test_configuration/vpp_performance_configuration/index.rst
docs/report/test_operational_data/vpp_performance_operational_data/index.rst
docs/report/vpp_performance_tests/comparisons/current_vs_previous_release.rst
docs/report/vpp_performance_tests/comparisons/index.rst
docs/report/vpp_performance_tests/packet_latency_graphs/index.rst
docs/report/vpp_performance_tests/packet_latency_graphs/ip4-3n-hsw-x520.rst
docs/report/vpp_performance_tests/packet_latency_graphs/ip4.rst
docs/report/vpp_performance_tests/packet_latency_graphs/l2-3n-hsw-x520.rst
docs/report/vpp_performance_tests/packet_latency_graphs/l2.rst
docs/report/vpp_performance_tests/packet_throughput_graphs/index.rst
docs/report/vpp_performance_tests/packet_throughput_graphs/ip4-3n-hsw-x520.rst
docs/report/vpp_performance_tests/packet_throughput_graphs/ip4.rst
docs/report/vpp_performance_tests/packet_throughput_graphs/l2-3n-hsw-x520.rst
docs/report/vpp_performance_tests/packet_throughput_graphs/l2.rst
docs/report/vpp_performance_tests/throughput_speedup_multi_core/index.rst
docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip4-3n-hsw-x520.rst
docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip4.rst
docs/report/vpp_performance_tests/throughput_speedup_multi_core/l2-3n-hsw-x520.rst
docs/report/vpp_performance_tests/throughput_speedup_multi_core/l2.rst
resources/tools/presentation/specification.yaml

index 4332700..bf89346 100644 (file)
@@ -3,9 +3,9 @@ VPP Throughput
 
 .. toctree::
 
+    ../vpp_performance_results_3n_hsw/index
     ../vpp_performance_results_3n_skx/index
 
 ..
-    ../vpp_performance_results_3n_hsw/index
     ../vpp_performance_results_2n_skx/index
     ../vpp_performance_results_2n_dnv/index
index f51245d..4584a15 100644 (file)
@@ -3,9 +3,9 @@ VPP Throughput
 
 .. toctree::
 
+    ../vpp_performance_configuration_3n_hsw/index
     ../vpp_performance_configuration_3n_skx/index
 
 ..
-    ../vpp_performance_configuration_3n_hsw/index
     ../vpp_performance_configuration_2n_dnv/index
     ../vpp_performance_configuration_2n_skx/index
index bad21ea..ff8009d 100644 (file)
@@ -3,9 +3,9 @@ VPP Throughput
 
 .. toctree::
 
+    ../vpp_performance_operational_data_3n_hsw/index
     ../vpp_performance_operational_data_3n_skx/index
 
 ..
-    ../vpp_performance_operational_data_3n_hsw/index
     ../vpp_performance_operational_data_2n_dnv/index
     ../vpp_performance_operational_data_2n_skx/index
index 80280f0..e13cac3 100644 (file)
@@ -30,30 +30,30 @@ results repeatability vary between the test cases.
     with RF result files csit-vpp-perf-|srelease|-\*.zip
     `archived here <../../_static/archive/>`_.
 
-..
-    3n-hsw
-    ~~~~~~
+3n-hsw
+~~~~~~
 
-    NDR Comparison
-    ``````````````
+NDR Comparison
+``````````````
 
-    Comparison tables in ASCII and CSV formats:
+Comparison tables in ASCII and CSV formats:
 
-      - `ASCII 1t1c NDR comparison <../../_static/vpp/performance-changes-3n-hsw-1t1c-ndr.txt>`_
-      - `ASCII 2t2c NDR comparison <../../_static/vpp/performance-changes-3n-hsw-2t2c-ndr.txt>`_
-      - `CSV 1t1c NDR comparison <../../_static/vpp/performance-changes-3n-hsw-1t1c-ndr.csv>`_
-      - `CSV 2t2c NDR comparison <../../_static/vpp/performance-changes-3n-hsw-2t2c-ndr.csv>`_
+  - `ASCII 1t1c NDR comparison <../../_static/vpp/performance-changes-3n-hsw-1t1c-ndr.txt>`_
+  - `ASCII 2t2c NDR comparison <../../_static/vpp/performance-changes-3n-hsw-2t2c-ndr.txt>`_
+  - `CSV 1t1c NDR comparison <../../_static/vpp/performance-changes-3n-hsw-1t1c-ndr.csv>`_
+  - `CSV 2t2c NDR comparison <../../_static/vpp/performance-changes-3n-hsw-2t2c-ndr.csv>`_
 
-    PDR Comparison
-    ``````````````
+PDR Comparison
+``````````````
 
-    Comparison tables in ASCII and CSV formats:
+Comparison tables in ASCII and CSV formats:
 
-      - `ASCII 1t1c PDR comparison <../../_static/vpp/performance-changes-3n-hsw-1t1c-pdr.txt>`_
-      - `ASCII 2t2c PDR comparison <../../_static/vpp/performance-changes-3n-hsw-2t2c-pdr.txt>`_
-      - `CSV 1t1c PDR comparison <../../_static/vpp/performance-changes-3n-hsw-1t1c-pdr.csv>`_
-      - `CSV 2t2c PDR comparison <../../_static/vpp/performance-changes-3n-hsw-2t2c-pdr.csv>`_
+  - `ASCII 1t1c PDR comparison <../../_static/vpp/performance-changes-3n-hsw-1t1c-pdr.txt>`_
+  - `ASCII 2t2c PDR comparison <../../_static/vpp/performance-changes-3n-hsw-2t2c-pdr.txt>`_
+  - `CSV 1t1c PDR comparison <../../_static/vpp/performance-changes-3n-hsw-1t1c-pdr.csv>`_
+  - `CSV 2t2c PDR comparison <../../_static/vpp/performance-changes-3n-hsw-2t2c-pdr.csv>`_
 
+..
     MRR Comparison
     ``````````````
 
index 2664bb9..952b844 100644 (file)
@@ -11,9 +11,9 @@ Comparisons
 .. toctree::
 
     current_vs_previous_release
+    3n-skx_vs_3n-hsw_testbeds
 
 ..
-    3n-skx_vs_3n-hsw_testbeds
     3n-skx_vs_2n-skx_testbeds
     nic_comparison
 
index 0436c77..d7deda2 100644 (file)
@@ -53,10 +53,10 @@ Additional information about graph data:
     ip4_tunnels
     vm_vhost
     container_memif
-
-..
+    ipsec
     srv6
     vts
+
+..
     ip6_tunnels
-    ipsec
     container_orchestrated
index f001c6a..a666fff 100644 (file)
 3n-hsw-x520
 ~~~~~~~~~~~
 
-64b-1t1c-base_and_scale
------------------------
+..
+    64b-1t1c-base_and_scale
+    -----------------------
 
-.. raw:: html
+    .. raw:: html
 
-    <center>
-    <iframe id="ifrm01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-3n-hsw-x520-64b-1t1c-base_and_scale-ndr-lat.html"></iframe>
-    <p><br></p>
-    </center>
+        <center>
+        <iframe id="ifrm01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-3n-hsw-x520-64b-1t1c-base_and_scale-ndr-lat.html"></iframe>
+        <p><br></p>
+        </center>
 
-.. raw:: latex
+    .. raw:: latex
 
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{ip4-3n-hsw-x520-64b-1t1c-base_and_scale-ndr-lat}
-            \label{fig:ip4-3n-hsw-x520-64b-1t1c-base_and_scale-ndr-lat}
-    \end{figure}
+        \begin{figure}[H]
+            \centering
+                \graphicspath{{../_build/_static/vpp/}}
+                \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{ip4-3n-hsw-x520-64b-1t1c-base_and_scale-ndr-lat}
+                \label{fig:ip4-3n-hsw-x520-64b-1t1c-base_and_scale-ndr-lat}
+        \end{figure}
 
-.. raw:: latex
+    .. raw:: latex
 
-    \clearpage
+        \clearpage
 
-64b-2t2c-base_and_scale
------------------------
+    64b-2t2c-base_and_scale
+    -----------------------
 
-.. raw:: html
+    .. raw:: html
 
-    <center>
-    <iframe id="ifrm02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-3n-hsw-x520-64b-2t2c-base_and_scale-ndr-lat.html"></iframe>
-    <p><br></p>
-    </center>
+        <center>
+        <iframe id="ifrm02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-3n-hsw-x520-64b-2t2c-base_and_scale-ndr-lat.html"></iframe>
+        <p><br></p>
+        </center>
 
-.. raw:: latex
+    .. raw:: latex
 
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{ip4-3n-hsw-x520-64b-2t2c-base_and_scale-ndr-lat}
-            \label{fig:ip4-3n-hsw-x520-64b-2t2c-base_and_scale-ndr-lat}
-    \end{figure}
+        \begin{figure}[H]
+            \centering
+                \graphicspath{{../_build/_static/vpp/}}
+                \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{ip4-3n-hsw-x520-64b-2t2c-base_and_scale-ndr-lat}
+                \label{fig:ip4-3n-hsw-x520-64b-2t2c-base_and_scale-ndr-lat}
+        \end{figure}
 
-.. raw:: latex
+    .. raw:: latex
 
-    \clearpage
+        \clearpage
 
-64b-1t1c-features
------------------
+    64b-1t1c-features
+    -----------------
 
-.. raw:: html
+    .. raw:: html
 
-    <center>
-    <iframe id="ifrm03" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-3n-hsw-x520-64b-1t1c-features-ndr-lat.html"></iframe>
-    <p><br></p>
-    </center>
+        <center>
+        <iframe id="ifrm03" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-3n-hsw-x520-64b-1t1c-features-ndr-lat.html"></iframe>
+        <p><br></p>
+        </center>
 
-.. raw:: latex
+    .. raw:: latex
 
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{ip4-3n-hsw-x520-64b-1t1c-features-ndr-lat}
-            \label{fig:ip4-3n-hsw-x520-64b-1t1c-features-ndr-lat}
-    \end{figure}
+        \begin{figure}[H]
+            \centering
+                \graphicspath{{../_build/_static/vpp/}}
+                \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{ip4-3n-hsw-x520-64b-1t1c-features-ndr-lat}
+                \label{fig:ip4-3n-hsw-x520-64b-1t1c-features-ndr-lat}
+        \end{figure}
 
-.. raw:: latex
+    .. raw:: latex
 
-    \clearpage
+        \clearpage
 
-64b-2t2c-features
------------------
+    64b-2t2c-features
+    -----------------
 
-.. raw:: html
+    .. raw:: html
 
-    <center>
-    <iframe id="ifrm04" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-3n-hsw-x520-64b-2t2c-features-ndr-lat.html"></iframe>
-    <p><br></p>
-    </center>
+        <center>
+        <iframe id="ifrm04" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-3n-hsw-x520-64b-2t2c-features-ndr-lat.html"></iframe>
+        <p><br></p>
+        </center>
 
-.. raw:: latex
+    .. raw:: latex
 
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{ip4-3n-hsw-x520-64b-2t2c-features-ndr-lat}
-            \label{fig:ip4-3n-hsw-x520-64b-2t2c-features-ndr-lat}
-    \end{figure}
+        \begin{figure}[H]
+            \centering
+                \graphicspath{{../_build/_static/vpp/}}
+                \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{ip4-3n-hsw-x520-64b-2t2c-features-ndr-lat}
+                \label{fig:ip4-3n-hsw-x520-64b-2t2c-features-ndr-lat}
+        \end{figure}
 
-.. raw:: latex
+    .. raw:: latex
 
-    \clearpage
+        \clearpage
 
-64b-1t1c-features-nat44
------------------------
+    64b-1t1c-features-nat44
+    -----------------------
 
-.. raw:: html
+    .. raw:: html
 
-    <center>
-    <iframe id="ifrm05" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-3n-hsw-x520-64b-1t1c-features-nat44-ndr-lat.html"></iframe>
-    <p><br></p>
-    </center>
+        <center>
+        <iframe id="ifrm05" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-3n-hsw-x520-64b-1t1c-features-nat44-ndr-lat.html"></iframe>
+        <p><br></p>
+        </center>
 
-.. raw:: latex
+    .. raw:: latex
 
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{ip4-3n-hsw-x520-64b-1t1c-features-nat44-ndr-lat}
-            \label{fig:ip4-3n-hsw-x520-64b-1t1c-features-nat44-ndr-lat}
-    \end{figure}
+        \begin{figure}[H]
+            \centering
+                \graphicspath{{../_build/_static/vpp/}}
+                \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{ip4-3n-hsw-x520-64b-1t1c-features-nat44-ndr-lat}
+                \label{fig:ip4-3n-hsw-x520-64b-1t1c-features-nat44-ndr-lat}
+        \end{figure}
 
-.. raw:: latex
+    .. raw:: latex
 
-    \clearpage
+        \clearpage
 
-64b-2t2c-features-nat44
------------------------
+    64b-2t2c-features-nat44
+    -----------------------
 
-.. raw:: html
+    .. raw:: html
 
-    <center>
-    <iframe id="ifrm06" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-3n-hsw-x520-64b-2t2c-features-nat44-ndr-lat.html"></iframe>
-    <p><br></p>
-    </center>
+        <center>
+        <iframe id="ifrm06" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-3n-hsw-x520-64b-2t2c-features-nat44-ndr-lat.html"></iframe>
+        <p><br></p>
+        </center>
 
-.. raw:: latex
+    .. raw:: latex
 
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{ip4-3n-hsw-x520-64b-2t2c-features-nat44-ndr-lat}
-            \label{fig:ip4-3n-hsw-x520-64b-2t2c-features-nat44-ndr-lat}
-    \end{figure}
+        \begin{figure}[H]
+            \centering
+                \graphicspath{{../_build/_static/vpp/}}
+                \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{ip4-3n-hsw-x520-64b-2t2c-features-nat44-ndr-lat}
+                \label{fig:ip4-3n-hsw-x520-64b-2t2c-features-nat44-ndr-lat}
+        \end{figure}
 
-.. raw:: latex
+    .. raw:: latex
 
-    \clearpage
+        \clearpage
 
-64b-1t1c-features-iacl
-----------------------
+    64b-1t1c-features-iacl
+    ----------------------
 
-.. raw:: html
+    .. raw:: html
 
-    <center>
-    <iframe id="ifrm07" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-3n-hsw-x520-64b-1t1c-features-iacl-ndr-lat.html"></iframe>
-    <p><br></p>
-    </center>
+        <center>
+        <iframe id="ifrm07" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-3n-hsw-x520-64b-1t1c-features-iacl-ndr-lat.html"></iframe>
+        <p><br></p>
+        </center>
 
-.. raw:: latex
+    .. raw:: latex
 
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{ip4-3n-hsw-x520-64b-1t1c-features-iacl-ndr-lat}
-            \label{fig:ip4-3n-hsw-x520-64b-1t1c-features-iacl-ndr-lat}
-    \end{figure}
+        \begin{figure}[H]
+            \centering
+                \graphicspath{{../_build/_static/vpp/}}
+                \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{ip4-3n-hsw-x520-64b-1t1c-features-iacl-ndr-lat}
+                \label{fig:ip4-3n-hsw-x520-64b-1t1c-features-iacl-ndr-lat}
+        \end{figure}
 
-.. raw:: latex
+    .. raw:: latex
 
-    \clearpage
+        \clearpage
 
-64b-2t2c-features-iacl
-----------------------
+    64b-2t2c-features-iacl
+    ----------------------
 
-.. raw:: html
+    .. raw:: html
 
-    <center>
-    <iframe id="ifrm08" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-3n-hsw-x520-64b-2t2c-features-iacl-ndr-lat.html"></iframe>
-    <p><br></p>
-    </center>
+        <center>
+        <iframe id="ifrm08" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-3n-hsw-x520-64b-2t2c-features-iacl-ndr-lat.html"></iframe>
+        <p><br></p>
+        </center>
 
-.. raw:: latex
+    .. raw:: latex
 
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{ip4-3n-hsw-x520-64b-2t2c-features-iacl-ndr-lat}
-            \label{fig:ip4-3n-hsw-x520-64b-2t2c-features-iacl-ndr-lat}
-    \end{figure}
+        \begin{figure}[H]
+            \centering
+                \graphicspath{{../_build/_static/vpp/}}
+                \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{ip4-3n-hsw-x520-64b-2t2c-features-iacl-ndr-lat}
+                \label{fig:ip4-3n-hsw-x520-64b-2t2c-features-iacl-ndr-lat}
+        \end{figure}
 
 .. raw:: latex
 
index b8024e1..1c71d99 100644 (file)
@@ -17,9 +17,9 @@ CSIT source code for the test cases used for plots can be found in
 
 .. toctree::
 
+    ip4-3n-hsw-x520
     ip4-3n-skx-x710
 ..
-    ip4-3n-hsw-x520
     ip4-3n-hsw-x710
     ip4-3n-hsw-xl710
     ip4-2n-skx-x710
index deaf863..1394847 100644 (file)
 3n-hsw-x520
 ~~~~~~~~~~~
 
-64b-1t1c-base_and_scale
------------------------
+..
+    64b-1t1c-base_and_scale
+    -----------------------
+
+    .. raw:: html
+
+        <center>
+        <iframe id="ifrm01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2sw-3n-hsw-x520-64b-1t1c-base_and_scale-ndr-lat.html"></iframe>
+        <p><br></p>
+        </center>
+
+    .. raw:: latex
+
+        \begin{figure}[H]
+            \centering
+                \graphicspath{{../_build/_static/vpp/}}
+                \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{l2sw-3n-hsw-x520-64b-1t1c-base_and_scale-ndr-lat}
+                \label{fig:l2sw-3n-hsw-x520-64b-1t1c-base_and_scale-ndr-lat}
+        \end{figure}
+
+    .. raw:: latex
+
+        \clearpage
+
+    64b-2t2c-base_and_scale
+    -----------------------
+
+    .. raw:: html
+
+        <center>
+        <iframe id="ifrm02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2sw-3n-hsw-x520-64b-2t2c-base_and_scale-ndr-lat.html"></iframe>
+        <p><br></p>
+        </center>
+
+    .. raw:: latex
+
+        \begin{figure}[H]
+            \centering
+                \graphicspath{{../_build/_static/vpp/}}
+                \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{l2sw-3n-hsw-x520-64b-2t2c-base_and_scale-ndr-lat}
+                \label{fig:l2sw-3n-hsw-x520-64b-2t2c-base_and_scale-ndr-lat}
+        \end{figure}
+
+    .. raw:: latex
+
+        \clearpage
+
+    64b-1t1c-features
+    -----------------
+
+    .. raw:: html
+
+        <center>
+        <iframe id="ifrm03" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2sw-3n-hsw-x520-64b-1t1c-features-ndr-lat.html"></iframe>
+        <p><br></p>
+        </center>
+
+    .. raw:: latex
+
+        \begin{figure}[H]
+            \centering
+                \graphicspath{{../_build/_static/vpp/}}
+                \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{l2sw-3n-hsw-x520-64b-1t1c-features-ndr-lat}
+                \label{fig:l2sw-3n-hsw-x520-64b-1t1c-features-ndr-lat}
+        \end{figure}
+
+    .. raw:: latex
+
+        \clearpage
+
+    64b-2t2c-features
+    -----------------
+
+    .. raw:: html
+
+        <center>
+        <iframe id="ifrm04" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2sw-3n-hsw-x520-64b-2t2c-features-ndr-lat.html"></iframe>
+        <p><br></p>
+        </center>
+
+    .. raw:: latex
+
+        \begin{figure}[H]
+            \centering
+                \graphicspath{{../_build/_static/vpp/}}
+                \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{l2sw-3n-hsw-x520-64b-2t2c-features-ndr-lat}
+                \label{fig:l2sw-3n-hsw-x520-64b-2t2c-features-ndr-lat}
+        \end{figure}
+
+.. raw:: latex
+
+    \clearpage
+
+64b-1t1c-features-oacl
+----------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="ifrm01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2sw-3n-hsw-x520-64b-1t1c-base_and_scale-ndr-lat.html"></iframe>
+    <iframe id="ifrm05" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2sw-3n-hsw-x520-64b-1t1c-features-oacl-ndr-lat.html"></iframe>
     <p><br></p>
     </center>
 
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{l2sw-3n-hsw-x520-64b-1t1c-base_and_scale-ndr-lat}
-            \label{fig:l2sw-3n-hsw-x520-64b-1t1c-base_and_scale-ndr-lat}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{l2sw-3n-hsw-x520-64b-1t1c-features-oacl-ndr-lat}
+            \label{fig:l2sw-3n-hsw-x520-64b-1t1c-features-oacl-ndr-lat}
     \end{figure}
 
 .. raw:: latex
 
     \clearpage
 
-64b-2t2c-base_and_scale
------------------------
+64b-2t2c-features-oacl
+----------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="ifrm02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2sw-3n-hsw-x520-64b-2t2c-base_and_scale-ndr-lat.html"></iframe>
+    <iframe id="ifrm06" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2sw-3n-hsw-x520-64b-2t2c-features-oacl-ndr-lat.html"></iframe>
     <p><br></p>
     </center>
 
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{l2sw-3n-hsw-x520-64b-2t2c-base_and_scale-ndr-lat}
-            \label{fig:l2sw-3n-hsw-x520-64b-2t2c-base_and_scale-ndr-lat}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{l2sw-3n-hsw-x520-64b-2t2c-features-oacl-ndr-lat}
+            \label{fig:l2sw-3n-hsw-x520-64b-2t2c-features-oacl-ndr-lat}
     \end{figure}
 
 .. raw:: latex
 
     \clearpage
 
-64b-1t1c-features
------------------
+64b-1t1c-features-macip
+----------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="ifrm03" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2sw-3n-hsw-x520-64b-1t1c-features-ndr-lat.html"></iframe>
+    <iframe id="ifrm07" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2sw-3n-hsw-x520-64b-1t1c-features-macip-ndr-lat.html"></iframe>
     <p><br></p>
     </center>
 
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{l2sw-3n-hsw-x520-64b-1t1c-features-ndr-lat}
-            \label{fig:l2sw-3n-hsw-x520-64b-1t1c-features-ndr-lat}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{l2sw-3n-hsw-x520-64b-1t1c-features-macip-ndr-lat}
+            \label{fig:l2sw-3n-hsw-x520-64b-1t1c-features-macip-ndr-lat}
     \end{figure}
 
 .. raw:: latex
 
     \clearpage
 
-64b-2t2c-features
------------------
+64b-2t2c-features-macip
+----------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="ifrm04" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2sw-3n-hsw-x520-64b-2t2c-features-ndr-lat.html"></iframe>
+    <iframe id="ifrm08" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2sw-3n-hsw-x520-64b-2t2c-features-macip-ndr-lat.html"></iframe>
     <p><br></p>
     </center>
 
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{l2sw-3n-hsw-x520-64b-2t2c-features-ndr-lat}
-            \label{fig:l2sw-3n-hsw-x520-64b-2t2c-features-ndr-lat}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{l2sw-3n-hsw-x520-64b-2t2c-features-macip-ndr-lat}
+            \label{fig:l2sw-3n-hsw-x520-64b-2t2c-features-macip-ndr-lat}
     \end{figure}
index 66b1fa4..ac90740 100644 (file)
@@ -43,10 +43,10 @@ CSIT source code for the test cases used for plots can be found in
 
 .. toctree::
 
+    l2-3n-hsw-x520
     l2-3n-skx-x710
 
 ..
-    l2-3n-hsw-x520
     l2-3n-hsw-x710
     l2-3n-hsw-xl710
     l2-3n-skx-xxv710
index 2e7ab8b..252f670 100644 (file)
@@ -63,10 +63,10 @@ Additional information about graph data:
     ip4_tunnels
     vm_vhost
     container_memif
-
-..
-    ip6_tunnels
     ipsec
     srv6
     vts
+
+..
+    ip6_tunnels
     container_orchestrated
index 67c06d4..626eb02 100644 (file)
 3n-hsw-x520
 ~~~~~~~~~~~
 
-64b-1t1c-base_and_scale
------------------------
+..
+    64b-1t1c-base_and_scale
+    -----------------------
 
-.. raw:: html
+    .. raw:: html
 
-    <center>
-    <iframe id="ifrm01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-3n-hsw-x520-64b-1t1c-base_and_scale-ndr.html"></iframe>
-    <p><br></p>
-    </center>
+        <center>
+        <iframe id="ifrm01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-3n-hsw-x520-64b-1t1c-base_and_scale-ndr.html"></iframe>
+        <p><br></p>
+        </center>
 
-.. raw:: latex
+    .. raw:: latex
 
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{ip4-3n-hsw-x520-64b-1t1c-base_and_scale-ndr}
-            \label{fig:ip4-3n-hsw-x520-64b-1t1c-base_and_scale-ndr}
-    \end{figure}
+        \begin{figure}[H]
+            \centering
+                \graphicspath{{../_build/_static/vpp/}}
+                \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{ip4-3n-hsw-x520-64b-1t1c-base_and_scale-ndr}
+                \label{fig:ip4-3n-hsw-x520-64b-1t1c-base_and_scale-ndr}
+        \end{figure}
 
-.. raw:: latex
+    .. raw:: latex
 
-    \clearpage
+        \clearpage
 
-.. raw:: html
+    .. raw:: html
 
-    <center>
-    <iframe id="ifrm02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-3n-hsw-x520-64b-1t1c-base_and_scale-pdr.html"></iframe>
-    <p><br></p>
-    </center>
+        <center>
+        <iframe id="ifrm02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-3n-hsw-x520-64b-1t1c-base_and_scale-pdr.html"></iframe>
+        <p><br></p>
+        </center>
 
-.. raw:: latex
+    .. raw:: latex
 
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{ip4-3n-hsw-x520-64b-1t1c-base_and_scale-pdr}
-            \label{fig:ip4-3n-hsw-x520-64b-1t1c-base_and_scale-pdr}
-    \end{figure}
+        \begin{figure}[H]
+            \centering
+                \graphicspath{{../_build/_static/vpp/}}
+                \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{ip4-3n-hsw-x520-64b-1t1c-base_and_scale-pdr}
+                \label{fig:ip4-3n-hsw-x520-64b-1t1c-base_and_scale-pdr}
+        \end{figure}
 
-.. raw:: latex
+    .. raw:: latex
 
-    \clearpage
+        \clearpage
 
-64b-2t2c-base_and_scale
------------------------
+    64b-2t2c-base_and_scale
+    -----------------------
 
-.. raw:: html
+    .. raw:: html
 
-    <center>
-    <iframe id="ifrm03" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-3n-hsw-x520-64b-2t2c-base_and_scale-ndr.html"></iframe>
-    <p><br></p>
-    </center>
+        <center>
+        <iframe id="ifrm03" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-3n-hsw-x520-64b-2t2c-base_and_scale-ndr.html"></iframe>
+        <p><br></p>
+        </center>
 
-.. raw:: latex
+    .. raw:: latex
 
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{ip4-3n-hsw-x520-64b-2t2c-base_and_scale-ndr}
-            \label{fig:ip4-3n-hsw-x520-64b-2t2c-base_and_scale-ndr}
-    \end{figure}
+        \begin{figure}[H]
+            \centering
+                \graphicspath{{../_build/_static/vpp/}}
+                \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{ip4-3n-hsw-x520-64b-2t2c-base_and_scale-ndr}
+                \label{fig:ip4-3n-hsw-x520-64b-2t2c-base_and_scale-ndr}
+        \end{figure}
 
-.. raw:: latex
+    .. raw:: latex
 
-    \clearpage
+        \clearpage
 
-.. raw:: html
+    .. raw:: html
 
-    <center>
-    <iframe id="ifrm04" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-3n-hsw-x520-64b-2t2c-base_and_scale-pdr.html"></iframe>
-    <p><br></p>
-    </center>
+        <center>
+        <iframe id="ifrm04" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-3n-hsw-x520-64b-2t2c-base_and_scale-pdr.html"></iframe>
+        <p><br></p>
+        </center>
 
-.. raw:: latex
+    .. raw:: latex
 
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{ip4-3n-hsw-x520-64b-2t2c-base_and_scale-pdr}
-            \label{fig:ip4-3n-hsw-x520-64b-2t2c-base_and_scale-pdr}
-    \end{figure}
+        \begin{figure}[H]
+            \centering
+                \graphicspath{{../_build/_static/vpp/}}
+                \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{ip4-3n-hsw-x520-64b-2t2c-base_and_scale-pdr}
+                \label{fig:ip4-3n-hsw-x520-64b-2t2c-base_and_scale-pdr}
+        \end{figure}
 
-.. raw:: latex
+    .. raw:: latex
 
-    \clearpage
+        \clearpage
 
-64b-1t1c-features
------------------
+    64b-1t1c-features
+    -----------------
 
-.. raw:: html
+    .. raw:: html
 
-    <center>
-    <iframe id="ifrm05" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-3n-hsw-x520-64b-1t1c-features-ndr.html"></iframe>
-    <p><br></p>
-    </center>
+        <center>
+        <iframe id="ifrm05" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-3n-hsw-x520-64b-1t1c-features-ndr.html"></iframe>
+        <p><br></p>
+        </center>
 
-.. raw:: latex
+    .. raw:: latex
 
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{ip4-3n-hsw-x520-64b-1t1c-features-ndr}
-            \label{fig:ip4-3n-hsw-x520-64b-1t1c-features-ndr}
-    \end{figure}
+        \begin{figure}[H]
+            \centering
+                \graphicspath{{../_build/_static/vpp/}}
+                \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{ip4-3n-hsw-x520-64b-1t1c-features-ndr}
+                \label{fig:ip4-3n-hsw-x520-64b-1t1c-features-ndr}
+        \end{figure}
 
-.. raw:: latex
+    .. raw:: latex
 
-    \clearpage
+        \clearpage
 
-.. raw:: html
+    .. raw:: html
 
-    <center>
-    <iframe id="ifrm06" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-3n-hsw-x520-64b-1t1c-features-pdr.html"></iframe>
-    <p><br></p>
-    </center>
+        <center>
+        <iframe id="ifrm06" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-3n-hsw-x520-64b-1t1c-features-pdr.html"></iframe>
+        <p><br></p>
+        </center>
 
-.. raw:: latex
+    .. raw:: latex
 
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{ip4-3n-hsw-x520-64b-1t1c-features-pdr}
-            \label{fig:ip4-3n-hsw-x520-64b-1t1c-features-pdr}
-    \end{figure}
+        \begin{figure}[H]
+            \centering
+                \graphicspath{{../_build/_static/vpp/}}
+                \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{ip4-3n-hsw-x520-64b-1t1c-features-pdr}
+                \label{fig:ip4-3n-hsw-x520-64b-1t1c-features-pdr}
+        \end{figure}
 
-.. raw:: latex
+    .. raw:: latex
 
-    \clearpage
+        \clearpage
 
-64b-2t2c-features
------------------
+    64b-2t2c-features
+    -----------------
 
-.. raw:: html
+    .. raw:: html
 
-    <center>
-    <iframe id="ifrm07" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-3n-hsw-x520-64b-2t2c-features-ndr.html"></iframe>
-    <p><br></p>
-    </center>
+        <center>
+        <iframe id="ifrm07" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-3n-hsw-x520-64b-2t2c-features-ndr.html"></iframe>
+        <p><br></p>
+        </center>
 
-.. raw:: latex
+    .. raw:: latex
 
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{ip4-3n-hsw-x520-64b-2t2c-features-ndr}
-            \label{fig:ip4-3n-hsw-x520-64b-2t2c-features-ndr}
-    \end{figure}
+        \begin{figure}[H]
+            \centering
+                \graphicspath{{../_build/_static/vpp/}}
+                \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{ip4-3n-hsw-x520-64b-2t2c-features-ndr}
+                \label{fig:ip4-3n-hsw-x520-64b-2t2c-features-ndr}
+        \end{figure}
 
-.. raw:: latex
+    .. raw:: latex
 
-    \clearpage
+        \clearpage
 
-.. raw:: html
+    .. raw:: html
 
-    <center>
-    <iframe id="ifrm08" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-3n-hsw-x520-64b-2t2c-features-pdr.html"></iframe>
-    <p><br></p>
-    </center>
+        <center>
+        <iframe id="ifrm08" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-3n-hsw-x520-64b-2t2c-features-pdr.html"></iframe>
+        <p><br></p>
+        </center>
 
-.. raw:: latex
+    .. raw:: latex
 
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{ip4-3n-hsw-x520-64b-2t2c-features-pdr}
-            \label{fig:ip4-3n-hsw-x520-64b-2t2c-base_and_scale-features}
-    \end{figure}
+        \begin{figure}[H]
+            \centering
+                \graphicspath{{../_build/_static/vpp/}}
+                \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{ip4-3n-hsw-x520-64b-2t2c-features-pdr}
+                \label{fig:ip4-3n-hsw-x520-64b-2t2c-base_and_scale-features}
+        \end{figure}
 
-.. raw:: latex
+    .. raw:: latex
 
-    \clearpage
+        \clearpage
 
-64b-1t1c-features-nat44
------------------------
+    64b-1t1c-features-nat44
+    -----------------------
 
-.. raw:: html
+    .. raw:: html
 
-    <center>
-    <iframe id="ifrm09" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-3n-hsw-x520-64b-1t1c-features-nat44-ndr.html"></iframe>
-    <p><br></p>
-    </center>
+        <center>
+        <iframe id="ifrm09" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-3n-hsw-x520-64b-1t1c-features-nat44-ndr.html"></iframe>
+        <p><br></p>
+        </center>
 
-.. raw:: latex
+    .. raw:: latex
 
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{ip4-3n-hsw-x520-64b-1t1c-features-nat44-ndr}
-            \label{fig:ip4-3n-hsw-x520-64b-1t1c-features-nat44-ndr}
-    \end{figure}
+        \begin{figure}[H]
+            \centering
+                \graphicspath{{../_build/_static/vpp/}}
+                \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{ip4-3n-hsw-x520-64b-1t1c-features-nat44-ndr}
+                \label{fig:ip4-3n-hsw-x520-64b-1t1c-features-nat44-ndr}
+        \end{figure}
 
-.. raw:: latex
+    .. raw:: latex
 
-    \clearpage
+        \clearpage
 
-.. raw:: html
+    .. raw:: html
 
-    <center>
-    <iframe id="ifrm10" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-3n-hsw-x520-64b-1t1c-features-nat44-pdr.html"></iframe>
-    <p><br></p>
-    </center>
+        <center>
+        <iframe id="ifrm10" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-3n-hsw-x520-64b-1t1c-features-nat44-pdr.html"></iframe>
+        <p><br></p>
+        </center>
 
-.. raw:: latex
+    .. raw:: latex
 
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{ip4-3n-hsw-x520-64b-1t1c-features-nat44-pdr}
-            \label{fig:ip4-3n-hsw-x520-64b-1t1c-features-nat44-pdr}
-    \end{figure}
+        \begin{figure}[H]
+            \centering
+                \graphicspath{{../_build/_static/vpp/}}
+                \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{ip4-3n-hsw-x520-64b-1t1c-features-nat44-pdr}
+                \label{fig:ip4-3n-hsw-x520-64b-1t1c-features-nat44-pdr}
+        \end{figure}
 
-.. raw:: latex
+    .. raw:: latex
 
-    \clearpage
+        \clearpage
 
-64b-2t2c-features-nat44
------------------------
+    64b-2t2c-features-nat44
+    -----------------------
 
-.. raw:: html
+    .. raw:: html
 
-    <center>
-    <iframe id="ifrm11" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-3n-hsw-x520-64b-2t2c-features-nat44-ndr.html"></iframe>
-    <p><br></p>
-    </center>
+        <center>
+        <iframe id="ifrm11" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-3n-hsw-x520-64b-2t2c-features-nat44-ndr.html"></iframe>
+        <p><br></p>
+        </center>
 
-.. raw:: latex
+    .. raw:: latex
 
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{ip4-3n-hsw-x520-64b-2t2c-features-nat44-ndr}
-            \label{fig:ip4-3n-hsw-x520-64b-2t2c-features-nat44-ndr}
-    \end{figure}
+        \begin{figure}[H]
+            \centering
+                \graphicspath{{../_build/_static/vpp/}}
+                \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{ip4-3n-hsw-x520-64b-2t2c-features-nat44-ndr}
+                \label{fig:ip4-3n-hsw-x520-64b-2t2c-features-nat44-ndr}
+        \end{figure}
 
-.. raw:: latex
+    .. raw:: latex
 
-    \clearpage
+        \clearpage
 
-.. raw:: html
+    .. raw:: html
 
-    <center>
-    <iframe id="ifrm12" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-3n-hsw-x520-64b-2t2c-features-nat44-pdr.html"></iframe>
-    <p><br></p>
-    </center>
+        <center>
+        <iframe id="ifrm12" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-3n-hsw-x520-64b-2t2c-features-nat44-pdr.html"></iframe>
+        <p><br></p>
+        </center>
 
-.. raw:: latex
+    .. raw:: latex
 
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{ip4-3n-hsw-x520-64b-2t2c-features-nat44-pdr}
-            \label{fig:ip4-3n-hsw-x520-64b-2t2c-base_and_scale-features-nat44}
-    \end{figure}
+        \begin{figure}[H]
+            \centering
+                \graphicspath{{../_build/_static/vpp/}}
+                \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{ip4-3n-hsw-x520-64b-2t2c-features-nat44-pdr}
+                \label{fig:ip4-3n-hsw-x520-64b-2t2c-base_and_scale-features-nat44}
+        \end{figure}
 
-.. raw:: latex
+    .. raw:: latex
 
-    \clearpage
+        \clearpage
 
-64b-1t1c-features-iacl
-----------------------
+    64b-1t1c-features-iacl
+    ----------------------
 
-.. raw:: html
+    .. raw:: html
 
-    <center>
-    <iframe id="ifrm13" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-3n-hsw-x520-64b-1t1c-features-iacl-ndr.html"></iframe>
-    <p><br></p>
-    </center>
+        <center>
+        <iframe id="ifrm13" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-3n-hsw-x520-64b-1t1c-features-iacl-ndr.html"></iframe>
+        <p><br></p>
+        </center>
 
-.. raw:: latex
+    .. raw:: latex
 
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{ip4-3n-hsw-x520-64b-1t1c-features-iacl-ndr}
-            \label{fig:ip4-3n-hsw-x520-64b-1t1c-features-iacl-ndr}
-    \end{figure}
+        \begin{figure}[H]
+            \centering
+                \graphicspath{{../_build/_static/vpp/}}
+                \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{ip4-3n-hsw-x520-64b-1t1c-features-iacl-ndr}
+                \label{fig:ip4-3n-hsw-x520-64b-1t1c-features-iacl-ndr}
+        \end{figure}
 
-.. raw:: latex
+    .. raw:: latex
 
-    \clearpage
+        \clearpage
 
-.. raw:: html
+    .. raw:: html
 
-    <center>
-    <iframe id="ifrm14" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-3n-hsw-x520-64b-1t1c-features-iacl-pdr.html"></iframe>
-    <p><br></p>
-    </center>
+        <center>
+        <iframe id="ifrm14" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-3n-hsw-x520-64b-1t1c-features-iacl-pdr.html"></iframe>
+        <p><br></p>
+        </center>
 
-.. raw:: latex
+    .. raw:: latex
 
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{ip4-3n-hsw-x520-64b-1t1c-features-iacl-pdr}
-            \label{fig:ip4-3n-hsw-x520-64b-1t1c-features-iacl-pdr}
-    \end{figure}
+        \begin{figure}[H]
+            \centering
+                \graphicspath{{../_build/_static/vpp/}}
+                \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{ip4-3n-hsw-x520-64b-1t1c-features-iacl-pdr}
+                \label{fig:ip4-3n-hsw-x520-64b-1t1c-features-iacl-pdr}
+        \end{figure}
 
-.. raw:: latex
+    .. raw:: latex
 
-    \clearpage
+        \clearpage
 
-64b-2t2c-features-iacl
-----------------------
+    64b-2t2c-features-iacl
+    ----------------------
 
-.. raw:: html
+    .. raw:: html
 
-    <center>
-    <iframe id="ifrm15" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-3n-hsw-x520-64b-2t2c-features-iacl-ndr.html"></iframe>
-    <p><br></p>
-    </center>
+        <center>
+        <iframe id="ifrm15" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-3n-hsw-x520-64b-2t2c-features-iacl-ndr.html"></iframe>
+        <p><br></p>
+        </center>
 
-.. raw:: latex
+    .. raw:: latex
 
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{ip4-3n-hsw-x520-64b-2t2c-features-iacl-ndr}
-            \label{fig:ip4-3n-hsw-x520-64b-2t2c-features-iacl-ndr}
-    \end{figure}
+        \begin{figure}[H]
+            \centering
+                \graphicspath{{../_build/_static/vpp/}}
+                \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{ip4-3n-hsw-x520-64b-2t2c-features-iacl-ndr}
+                \label{fig:ip4-3n-hsw-x520-64b-2t2c-features-iacl-ndr}
+        \end{figure}
 
-.. raw:: latex
+    .. raw:: latex
 
-    \clearpage
+        \clearpage
 
-.. raw:: html
+    .. raw:: html
 
-    <center>
-    <iframe id="ifrm16" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-3n-hsw-x520-64b-2t2c-features-iacl-pdr.html"></iframe>
-    <p><br></p>
-    </center>
+        <center>
+        <iframe id="ifrm16" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-3n-hsw-x520-64b-2t2c-features-iacl-pdr.html"></iframe>
+        <p><br></p>
+        </center>
 
-.. raw:: latex
+    .. raw:: latex
 
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{ip4-3n-hsw-x520-64b-2t2c-features-iacl-pdr}
-            \label{fig:ip4-3n-hsw-x520-64b-2t2c-base_and_scale-features-iacl}
-    \end{figure}
+        \begin{figure}[H]
+            \centering
+                \graphicspath{{../_build/_static/vpp/}}
+                \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{ip4-3n-hsw-x520-64b-2t2c-features-iacl-pdr}
+                \label{fig:ip4-3n-hsw-x520-64b-2t2c-base_and_scale-features-iacl}
+        \end{figure}
 
 .. raw:: latex
 
index 47facdc..32592d4 100644 (file)
@@ -17,10 +17,10 @@ CSIT source code for the test cases used for plots can be found in
 
 .. toctree::
 
+    ip4-3n-hsw-x520
     ip4-3n-skx-x710
 
 ..
-    ip4-3n-hsw-x520
     ip4-3n-hsw-x710
     ip4-3n-hsw-xl710
     ip4-2n-skx-x710
index 05007a4..ff539e2 100644 (file)
 3n-hsw-x520
 ~~~~~~~~~~~
 
-64b-1t1c-base_and_scale
------------------------
+..
+    64b-1t1c-base_and_scale
+    -----------------------
+
+    .. raw:: html
+
+        <center>
+        <iframe id="ifrm01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2sw-3n-hsw-x520-64b-1t1c-base_and_scale-ndr.html"></iframe>
+        <p><br></p>
+        </center>
+
+    .. raw:: latex
+
+        \begin{figure}[H]
+            \centering
+                \graphicspath{{../_build/_static/vpp/}}
+                \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{l2sw-3n-hsw-x520-64b-1t1c-base_and_scale-ndr}
+                \label{fig:l2sw-3n-hsw-x520-64b-1t1c-base_and_scale-ndr}
+        \end{figure}
+
+    .. raw:: latex
+
+        \clearpage
+
+    .. raw:: html
+
+        <center>
+        <iframe id="ifrm02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2sw-3n-hsw-x520-64b-1t1c-base_and_scale-pdr.html"></iframe>
+        <p><br></p>
+        </center>
+
+    .. raw:: latex
+
+        \begin{figure}[H]
+            \centering
+                \graphicspath{{../_build/_static/vpp/}}
+                \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{l2sw-3n-hsw-x520-64b-1t1c-base_and_scale-pdr}
+                \label{fig:l2sw-3n-hsw-x520-64b-1t1c-base_and_scale-pdr}
+        \end{figure}
+
+    .. raw:: latex
+
+        \clearpage
+
+    64b-2t2c-base_and_scale
+    -----------------------
+
+    .. raw:: html
+
+        <center>
+        <iframe id="ifrm03" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2sw-3n-hsw-x520-64b-2t2c-base_and_scale-ndr.html"></iframe>
+        <p><br></p>
+        </center>
+
+    .. raw:: latex
+
+        \begin{figure}[H]
+            \centering
+                \graphicspath{{../_build/_static/vpp/}}
+                \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{l2sw-3n-hsw-x520-64b-2t2c-base_and_scale-ndr}
+                \label{fig:l2sw-3n-hsw-x520-64b-2t2c-base_and_scale-ndr}
+        \end{figure}
+
+    .. raw:: latex
+
+        \clearpage
+
+    .. raw:: html
+
+        <center>
+        <iframe id="ifrm04" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2sw-3n-hsw-x520-64b-2t2c-base_and_scale-pdr.html"></iframe>
+        <p><br></p>
+        </center>
+
+    .. raw:: latex
+
+        \begin{figure}[H]
+            \centering
+                \graphicspath{{../_build/_static/vpp/}}
+                \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{l2sw-3n-hsw-x520-64b-2t2c-base_and_scale-pdr}
+                \label{fig:l2sw-3n-hsw-x520-64b-2t2c-base_and_scale-pdr}
+        \end{figure}
+
+    .. raw:: latex
+
+        \clearpage
+
+    64b-1t1c-features
+    -----------------
+
+    .. raw:: html
+
+        <center>
+        <iframe id="ifrm05" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2sw-3n-hsw-x520-64b-1t1c-features-ndr.html"></iframe>
+        <p><br></p>
+        </center>
+
+    .. raw:: latex
+
+        \begin{figure}[H]
+            \centering
+                \graphicspath{{../_build/_static/vpp/}}
+                \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{l2sw-3n-hsw-x520-64b-1t1c-features-ndr}
+                \label{fig:l2sw-3n-hsw-x520-64b-1t1c-features-ndr}
+        \end{figure}
+
+    .. raw:: latex
+
+        \clearpage
+
+    .. raw:: html
+
+        <center>
+        <iframe id="ifrm06" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2sw-3n-hsw-x520-64b-1t1c-features-pdr.html"></iframe>
+        <p><br></p>
+        </center>
+
+    .. raw:: latex
+
+        \begin{figure}[H]
+            \centering
+                \graphicspath{{../_build/_static/vpp/}}
+                \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{l2sw-3n-hsw-x520-64b-1t1c-features-pdr}
+                \label{fig:l2sw-3n-hsw-x520-64b-1t1c-features-pdr}
+        \end{figure}
+
+    .. raw:: latex
+
+        \clearpage
+
+    64b-2t2c-features
+    -----------------
+
+    .. raw:: html
+
+        <center>
+        <iframe id="ifrm07" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2sw-3n-hsw-x520-64b-2t2c-features-ndr.html"></iframe>
+        <p><br></p>
+        </center>
+
+    .. raw:: latex
+
+        \begin{figure}[H]
+            \centering
+                \graphicspath{{../_build/_static/vpp/}}
+                \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{l2sw-3n-hsw-x520-64b-2t2c-features-ndr}
+                \label{fig:l2sw-3n-hsw-x520-64b-2t2c-features-ndr}
+        \end{figure}
+
+    .. raw:: latex
+
+        \clearpage
+
+    .. raw:: html
+
+        <center>
+        <iframe id="ifrm08" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2sw-3n-hsw-x520-64b-2t2c-features-pdr.html"></iframe>
+        <p><br></p>
+        </center>
+
+    .. raw:: latex
+
+        \begin{figure}[H]
+            \centering
+                \graphicspath{{../_build/_static/vpp/}}
+                \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{l2sw-3n-hsw-x520-64b-2t2c-features-pdr}
+                \label{fig:l2sw-3n-hsw-x520-64b-2t2c-base_and_scale-features}
+        \end{figure}
+
+
+.. raw:: latex
+
+    \clearpage
+
+64b-1t1c-features-oacl
+----------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="ifrm01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2sw-3n-hsw-x520-64b-1t1c-base_and_scale-ndr.html"></iframe>
+    <iframe id="ifrm09" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2sw-3n-hsw-x520-64b-1t1c-features-oacl-ndr.html"></iframe>
     <p><br></p>
     </center>
 
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{l2sw-3n-hsw-x520-64b-1t1c-base_and_scale-ndr}
-            \label{fig:l2sw-3n-hsw-x520-64b-1t1c-base_and_scale-ndr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{l2sw-3n-hsw-x520-64b-1t1c-features-oacl-ndr}
+            \label{fig:l2sw-3n-hsw-x520-64b-1t1c-features-oacl-ndr}
     \end{figure}
 
 .. raw:: latex
 .. raw:: html
 
     <center>
-    <iframe id="ifrm02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2sw-3n-hsw-x520-64b-1t1c-base_and_scale-pdr.html"></iframe>
+    <iframe id="ifrm10" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2sw-3n-hsw-x520-64b-1t1c-features-oacl-pdr.html"></iframe>
     <p><br></p>
     </center>
 
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{l2sw-3n-hsw-x520-64b-1t1c-base_and_scale-pdr}
-            \label{fig:l2sw-3n-hsw-x520-64b-1t1c-base_and_scale-pdr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{l2sw-3n-hsw-x520-64b-1t1c-features-oacl-pdr}
+            \label{fig:l2sw-3n-hsw-x520-64b-1t1c-features-oacl-pdr}
     \end{figure}
 
 .. raw:: latex
 
     \clearpage
 
-64b-2t2c-base_and_scale
------------------------
+64b-2t2c-features-oacl
+----------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="ifrm03" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2sw-3n-hsw-x520-64b-2t2c-base_and_scale-ndr.html"></iframe>
+    <iframe id="ifrm11" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2sw-3n-hsw-x520-64b-2t2c-features-oacl-ndr.html"></iframe>
     <p><br></p>
     </center>
 
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{l2sw-3n-hsw-x520-64b-2t2c-base_and_scale-ndr}
-            \label{fig:l2sw-3n-hsw-x520-64b-2t2c-base_and_scale-ndr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{l2sw-3n-hsw-x520-64b-2t2c-features-oacl-ndr}
+            \label{fig:l2sw-3n-hsw-x520-64b-2t2c-features-oacl-ndr}
     \end{figure}
 
 .. raw:: latex
 .. raw:: html
 
     <center>
-    <iframe id="ifrm04" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2sw-3n-hsw-x520-64b-2t2c-base_and_scale-pdr.html"></iframe>
+    <iframe id="ifrm12" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2sw-3n-hsw-x520-64b-2t2c-features-oacl-pdr.html"></iframe>
     <p><br></p>
     </center>
 
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{l2sw-3n-hsw-x520-64b-2t2c-base_and_scale-pdr}
-            \label{fig:l2sw-3n-hsw-x520-64b-2t2c-base_and_scale-pdr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{l2sw-3n-hsw-x520-64b-2t2c-features-oacl-pdr}
+            \label{fig:l2sw-3n-hsw-x520-64b-2t2c-base_and_scale-features-oacl}
     \end{figure}
 
 .. raw:: latex
 
     \clearpage
 
-64b-1t1c-features
------------------
+64b-1t1c-features-macip
+-----------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="ifrm05" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2sw-3n-hsw-x520-64b-1t1c-features-ndr.html"></iframe>
+    <iframe id="ifrm13" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2sw-3n-hsw-x520-64b-1t1c-features-macip-ndr.html"></iframe>
     <p><br></p>
     </center>
 
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{l2sw-3n-hsw-x520-64b-1t1c-features-ndr}
-            \label{fig:l2sw-3n-hsw-x520-64b-1t1c-features-ndr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{l2sw-3n-hsw-x520-64b-1t1c-features-macip-ndr}
+            \label{fig:l2sw-3n-hsw-x520-64b-1t1c-features-macip-ndr}
     \end{figure}
 
 .. raw:: latex
 .. raw:: html
 
     <center>
-    <iframe id="ifrm06" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2sw-3n-hsw-x520-64b-1t1c-features-pdr.html"></iframe>
+    <iframe id="ifrm14" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2sw-3n-hsw-x520-64b-1t1c-features-macip-pdr.html"></iframe>
     <p><br></p>
     </center>
 
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{l2sw-3n-hsw-x520-64b-1t1c-features-pdr}
-            \label{fig:l2sw-3n-hsw-x520-64b-1t1c-features-pdr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{l2sw-3n-hsw-x520-64b-1t1c-features-macip-pdr}
+            \label{fig:l2sw-3n-hsw-x520-64b-1t1c-features-macip-pdr}
     \end{figure}
 
 .. raw:: latex
 
     \clearpage
 
-64b-2t2c-features
------------------
+64b-2t2c-features-macip
+-----------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="ifrm07" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2sw-3n-hsw-x520-64b-2t2c-features-ndr.html"></iframe>
+    <iframe id="ifrm15" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2sw-3n-hsw-x520-64b-2t2c-features-macip-ndr.html"></iframe>
     <p><br></p>
     </center>
 
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{l2sw-3n-hsw-x520-64b-2t2c-features-ndr}
-            \label{fig:l2sw-3n-hsw-x520-64b-2t2c-features-ndr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{l2sw-3n-hsw-x520-64b-2t2c-features-macip-ndr}
+            \label{fig:l2sw-3n-hsw-x520-64b-2t2c-features-macip-ndr}
     \end{figure}
 
 .. raw:: latex
 .. raw:: html
 
     <center>
-    <iframe id="ifrm08" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2sw-3n-hsw-x520-64b-2t2c-features-pdr.html"></iframe>
+    <iframe id="ifrm16" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2sw-3n-hsw-x520-64b-2t2c-features-macip-pdr.html"></iframe>
     <p><br></p>
     </center>
 
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{l2sw-3n-hsw-x520-64b-2t2c-features-pdr}
-            \label{fig:l2sw-3n-hsw-x520-64b-2t2c-base_and_scale-features}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{l2sw-3n-hsw-x520-64b-2t2c-features-macip-pdr}
+            \label{fig:l2sw-3n-hsw-x520-64b-2t2c-base_and_scale-features-macip}
     \end{figure}
index 35f657f..2695ffe 100644 (file)
@@ -42,10 +42,10 @@ CSIT source code for the test cases used for plots can be found in
 
 .. toctree::
 
+    l2-3n-hsw-x520
     l2-3n-skx-x710
 
 ..
-    l2-3n-hsw-x520
     l2-3n-hsw-x710
     l2-3n-hsw-xl710
     l2-3n-skx-xxv710
index 8bcdfd6..b1b1ebc 100644 (file)
@@ -51,12 +51,12 @@ Additional information about graph data:
     ip4
     ip6
     ip4_tunnels
-    vm_vhost
     container_memif
-
-..
-    ip6_tunnels
     ipsec
     srv6
     vts
+
+..
+    vm_vhost
+    ip6_tunnels
     container_orchestrated
index 9e708fe..18885bb 100644 (file)
 3n-hsw-x520
 ~~~~~~~~~~~
 
-64b-base_and_scale
-------------------
+..
+    64b-base_and_scale
+    ------------------
 
-.. raw:: html
+    .. raw:: html
 
-    <center>
-    <iframe id="ifrm01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-3n-hsw-x520-64b-base_and_scale-ndr-tsa.html"></iframe>
-    <p><br></p>
-    </center>
+        <center>
+        <iframe id="ifrm01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-3n-hsw-x520-64b-base_and_scale-ndr-tsa.html"></iframe>
+        <p><br></p>
+        </center>
 
-.. raw:: latex
+    .. raw:: latex
 
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{ip4-3n-hsw-x520-64b-base_and_scale-ndr-tsa}
-            \label{fig:ip4-3n-hsw-x520-64b-base_and_scale-ndr-tsa}
-    \end{figure}
+        \begin{figure}[H]
+            \centering
+                \graphicspath{{../_build/_static/vpp/}}
+                \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{ip4-3n-hsw-x520-64b-base_and_scale-ndr-tsa}
+                \label{fig:ip4-3n-hsw-x520-64b-base_and_scale-ndr-tsa}
+        \end{figure}
 
-.. raw:: latex
+    .. raw:: latex
 
-    \clearpage
+        \clearpage
 
-.. raw:: html
+    .. raw:: html
 
-    <center>
-    <iframe id="ifrm02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-3n-hsw-x520-64b-base_and_scale-pdr-tsa.html"></iframe>
-    <p><br></p>
-    </center>
+        <center>
+        <iframe id="ifrm02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-3n-hsw-x520-64b-base_and_scale-pdr-tsa.html"></iframe>
+        <p><br></p>
+        </center>
 
-.. raw:: latex
+    .. raw:: latex
 
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{ip4-3n-hsw-x520-64b-base_and_scale-pdr-tsa}
-            \label{fig:ip4-3n-hsw-x520-64b-base_and_scale-pdr-tsa}
-    \end{figure}
+        \begin{figure}[H]
+            \centering
+                \graphicspath{{../_build/_static/vpp/}}
+                \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{ip4-3n-hsw-x520-64b-base_and_scale-pdr-tsa}
+                \label{fig:ip4-3n-hsw-x520-64b-base_and_scale-pdr-tsa}
+        \end{figure}
 
-.. raw:: latex
+    .. raw:: latex
 
-    \clearpage
+        \clearpage
 
-64b-features
-------------
+    64b-features
+    ------------
 
-.. raw:: html
+    .. raw:: html
 
-    <center>
-    <iframe id="ifrm03" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-3n-hsw-x520-64b-features-ndr-tsa.html"></iframe>
-    <p><br></p>
-    </center>
+        <center>
+        <iframe id="ifrm03" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-3n-hsw-x520-64b-features-ndr-tsa.html"></iframe>
+        <p><br></p>
+        </center>
 
-.. raw:: latex
+    .. raw:: latex
 
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{ip4-3n-hsw-x520-64b-features-ndr-tsa}
-            \label{fig:ip4-3n-hsw-x520-64b-features-ndr-tsa}
-    \end{figure}
+        \begin{figure}[H]
+            \centering
+                \graphicspath{{../_build/_static/vpp/}}
+                \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{ip4-3n-hsw-x520-64b-features-ndr-tsa}
+                \label{fig:ip4-3n-hsw-x520-64b-features-ndr-tsa}
+        \end{figure}
 
-.. raw:: latex
+    .. raw:: latex
 
-    \clearpage
+        \clearpage
 
-.. raw:: html
+    .. raw:: html
 
-    <center>
-    <iframe id="ifrm04" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-3n-hsw-x520-64b-features-pdr-tsa.html"></iframe>
-    <p><br></p>
-    </center>
+        <center>
+        <iframe id="ifrm04" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-3n-hsw-x520-64b-features-pdr-tsa.html"></iframe>
+        <p><br></p>
+        </center>
 
-.. raw:: latex
+    .. raw:: latex
 
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{ip4-3n-hsw-x520-64b-features-pdr-tsa}
-            \label{fig:ip4-3n-hsw-x520-64b-features-pdr-tsa}
-    \end{figure}
+        \begin{figure}[H]
+            \centering
+                \graphicspath{{../_build/_static/vpp/}}
+                \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{ip4-3n-hsw-x520-64b-features-pdr-tsa}
+                \label{fig:ip4-3n-hsw-x520-64b-features-pdr-tsa}
+        \end{figure}
 
-.. raw:: latex
+    .. raw:: latex
 
-    \clearpage
+        \clearpage
 
-64b-features-nat44
-------------------
+    64b-features-nat44
+    ------------------
 
-.. raw:: html
+    .. raw:: html
 
-    <center>
-    <iframe id="ifrm05" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-3n-hsw-x520-64b-features-nat44-ndr-tsa.html"></iframe>
-    <p><br></p>
-    </center>
+        <center>
+        <iframe id="ifrm05" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-3n-hsw-x520-64b-features-nat44-ndr-tsa.html"></iframe>
+        <p><br></p>
+        </center>
 
-.. raw:: latex
+    .. raw:: latex
 
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{ip4-3n-hsw-x520-64b-features-nat44-ndr-tsa}
-            \label{fig:ip4-3n-hsw-x520-64b-features-nat44-ndr-tsa}
-    \end{figure}
+        \begin{figure}[H]
+            \centering
+                \graphicspath{{../_build/_static/vpp/}}
+                \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{ip4-3n-hsw-x520-64b-features-nat44-ndr-tsa}
+                \label{fig:ip4-3n-hsw-x520-64b-features-nat44-ndr-tsa}
+        \end{figure}
 
-.. raw:: latex
+    .. raw:: latex
 
-    \clearpage
+        \clearpage
 
-.. raw:: html
+    .. raw:: html
 
-    <center>
-    <iframe id="ifrm06" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-3n-hsw-x520-64b-features-nat44-pdr-tsa.html"></iframe>
-    <p><br></p>
-    </center>
+        <center>
+        <iframe id="ifrm06" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-3n-hsw-x520-64b-features-nat44-pdr-tsa.html"></iframe>
+        <p><br></p>
+        </center>
 
-.. raw:: latex
+    .. raw:: latex
 
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{ip4-3n-hsw-x520-64b-features-nat44-pdr-tsa}
-            \label{fig:ip4-3n-hsw-x520-64b-features-nat44-pdr-tsa}
-    \end{figure}
+        \begin{figure}[H]
+            \centering
+                \graphicspath{{../_build/_static/vpp/}}
+                \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{ip4-3n-hsw-x520-64b-features-nat44-pdr-tsa}
+                \label{fig:ip4-3n-hsw-x520-64b-features-nat44-pdr-tsa}
+        \end{figure}
 
-.. raw:: latex
+    .. raw:: latex
 
-    \clearpage
+        \clearpage
 
-64b-features-iacl
------------------
+    64b-features-iacl
+    -----------------
 
-.. raw:: html
+    .. raw:: html
 
-    <center>
-    <iframe id="ifrm07" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-3n-hsw-x520-64b-features-iacl-ndr-tsa.html"></iframe>
-    <p><br></p>
-    </center>
+        <center>
+        <iframe id="ifrm07" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-3n-hsw-x520-64b-features-iacl-ndr-tsa.html"></iframe>
+        <p><br></p>
+        </center>
 
-.. raw:: latex
+    .. raw:: latex
 
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{ip4-3n-hsw-x520-64b-features-iacl-ndr-tsa}
-            \label{fig:ip4-3n-hsw-x520-64b-features-iacl-ndr-tsa}
-    \end{figure}
+        \begin{figure}[H]
+            \centering
+                \graphicspath{{../_build/_static/vpp/}}
+                \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{ip4-3n-hsw-x520-64b-features-iacl-ndr-tsa}
+                \label{fig:ip4-3n-hsw-x520-64b-features-iacl-ndr-tsa}
+        \end{figure}
 
-.. raw:: latex
+    .. raw:: latex
 
-    \clearpage
+        \clearpage
 
-.. raw:: html
+    .. raw:: html
 
-    <center>
-    <iframe id="ifrm08" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-3n-hsw-x520-64b-features-iacl-pdr-tsa.html"></iframe>
-    <p><br></p>
-    </center>
+        <center>
+        <iframe id="ifrm08" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-3n-hsw-x520-64b-features-iacl-pdr-tsa.html"></iframe>
+        <p><br></p>
+        </center>
 
-.. raw:: latex
+    .. raw:: latex
 
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{ip4-3n-hsw-x520-64b-features-iacl-pdr-tsa}
-            \label{fig:ip4-3n-hsw-x520-64b-features-iacl-pdr-tsa}
-    \end{figure}
+        \begin{figure}[H]
+            \centering
+                \graphicspath{{../_build/_static/vpp/}}
+                \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{ip4-3n-hsw-x520-64b-features-iacl-pdr-tsa}
+                \label{fig:ip4-3n-hsw-x520-64b-features-iacl-pdr-tsa}
+        \end{figure}
 
 .. raw:: latex
 
index 22ca300..1a5d328 100644 (file)
@@ -19,10 +19,10 @@ CSIT source code for the test cases used for plots can be found in
 
 .. toctree::
 
+    ip4-3n-hsw-x520
     ip4-3n-skx-x710
 
 ..
-    ip4-3n-hsw-x520
     ip4-3n-hsw-x710
     ip4-3n-hsw-xl710
     ip4-3n-skx-x710
index d7c38a5..dab0280 100644 (file)
 3n-hsw-x520
 ~~~~~~~~~~~
 
-64b-base_and_scale
-------------------
+..
+    64b-base_and_scale
+    ------------------
+
+    .. raw:: html
+
+        <center>
+        <iframe id="ifrm01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2sw-3n-hsw-x520-64b-base_and_scale-ndr-tsa.html"></iframe>
+        <p><br></p>
+        </center>
+
+    .. raw:: latex
+
+        \begin{figure}[H]
+            \centering
+                \graphicspath{{../_build/_static/vpp/}}
+                \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{l2sw-3n-hsw-x520-64b-base_and_scale-ndr-tsa}
+                \label{fig:l2sw-3n-hsw-x520-64b-base_and_scale-ndr-tsa}
+        \end{figure}
+
+    .. raw:: latex
+
+        \clearpage
+
+    .. raw:: html
+
+        <center>
+        <iframe id="ifrm02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2sw-3n-hsw-x520-64b-base_and_scale-pdr-tsa.html"></iframe>
+        <p><br></p>
+        </center>
+
+    .. raw:: latex
+
+        \begin{figure}[H]
+            \centering
+                \graphicspath{{../_build/_static/vpp/}}
+                \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{l2sw-3n-hsw-x520-64b-base_and_scale-pdr-tsa}
+                \label{fig:l2sw-3n-hsw-x520-64b-base_and_scale-pdr-tsa}
+        \end{figure}
+
+    .. raw:: latex
+
+        \clearpage
+
+    64b-features
+    ------------
+
+    .. raw:: html
+
+        <center>
+        <iframe id="ifrm03" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2sw-3n-hsw-x520-64b-features-ndr-tsa.html"></iframe>
+        <p><br></p>
+        </center>
+
+    .. raw:: latex
+
+        \begin{figure}[H]
+            \centering
+                \graphicspath{{../_build/_static/vpp/}}
+                \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{l2sw-3n-hsw-x520-64b-features-ndr-tsa}
+                \label{fig:l2sw-3n-hsw-x520-64b-features-ndr-tsa}
+        \end{figure}
+
+    .. raw:: latex
+
+        \clearpage
+
+    .. raw:: html
+
+        <center>
+        <iframe id="ifrm04" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2sw-3n-hsw-x520-64b-features-pdr-tsa.html"></iframe>
+        <p><br></p>
+        </center>
+
+    .. raw:: latex
+
+        \begin{figure}[H]
+            \centering
+                \graphicspath{{../_build/_static/vpp/}}
+                \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{l2sw-3n-hsw-x520-64b-features-pdr-tsa}
+                \label{fig:l2sw-3n-hsw-x520-64b-features-pdr-tsa}
+        \end{figure}
+
+
+64b-features-oacl
+-----------------
 
 .. raw:: html
 
     <center>
-    <iframe id="ifrm01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2sw-3n-hsw-x520-64b-base_and_scale-ndr-tsa.html"></iframe>
+    <iframe id="ifrm07" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2sw-3n-hsw-x520-64b-features-oacl-ndr-tsa.html"></iframe>
     <p><br></p>
     </center>
 
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{l2sw-3n-hsw-x520-64b-base_and_scale-ndr-tsa}
-            \label{fig:l2sw-3n-hsw-x520-64b-base_and_scale-ndr-tsa}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{l2sw-3n-hsw-x520-64b-features-oacl-ndr-tsa}
+            \label{fig:l2sw-3n-hsw-x520-64b-features-oacl-ndr-tsa}
     \end{figure}
 
 .. raw:: latex
 .. raw:: html
 
     <center>
-    <iframe id="ifrm02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2sw-3n-hsw-x520-64b-base_and_scale-pdr-tsa.html"></iframe>
+    <iframe id="ifrm08" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2sw-3n-hsw-x520-64b-features-oacl-pdr-tsa.html"></iframe>
     <p><br></p>
     </center>
 
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{l2sw-3n-hsw-x520-64b-base_and_scale-pdr-tsa}
-            \label{fig:l2sw-3n-hsw-x520-64b-base_and_scale-pdr-tsa}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{l2sw-3n-hsw-x520-64b-features-oacl-pdr-tsa}
+            \label{fig:l2sw-3n-hsw-x520-64b-features-oacl-pdr-tsa}
     \end{figure}
 
 .. raw:: latex
 
     \clearpage
 
-64b-features
-------------
+64b-features-macip
+------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="ifrm03" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2sw-3n-hsw-x520-64b-features-ndr-tsa.html"></iframe>
+    <iframe id="ifrm09" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2sw-3n-hsw-x520-64b-features-macip-ndr-tsa.html"></iframe>
     <p><br></p>
     </center>
 
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{l2sw-3n-hsw-x520-64b-features-ndr-tsa}
-            \label{fig:l2sw-3n-hsw-x520-64b-features-ndr-tsa}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{l2sw-3n-hsw-x520-64b-features-macip-ndr-tsa}
+            \label{fig:l2sw-3n-hsw-x520-64b-features-macip-ndr-tsa}
     \end{figure}
 
 .. raw:: latex
 .. raw:: html
 
     <center>
-    <iframe id="ifrm04" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2sw-3n-hsw-x520-64b-features-pdr-tsa.html"></iframe>
+    <iframe id="ifrm10" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2sw-3n-hsw-x520-64b-features-macip-pdr-tsa.html"></iframe>
     <p><br></p>
     </center>
 
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{l2sw-3n-hsw-x520-64b-features-pdr-tsa}
-            \label{fig:l2sw-3n-hsw-x520-64b-features-pdr-tsa}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{l2sw-3n-hsw-x520-64b-features-macip-pdr-tsa}
+            \label{fig:l2sw-3n-hsw-x520-64b-features-macip-pdr-tsa}
     \end{figure}
index 327fd68..cd78d5a 100644 (file)
@@ -19,10 +19,10 @@ CSIT source code for the test cases used for above plots can be found in
 
 .. toctree::
 
+    l2-3n-hsw-x520
     l2-3n-skx-x710
 
 ..
-    l2-3n-hsw-x520
     l2-3n-hsw-x710
     l2-3n-hsw-xl710
     l2-3n-skx-xxv710
index e9be6b2..f8efa9e 100644 (file)
 
     # 3n-hsw
 
-#    plot-vpp-throughput-latency-3n-hsw:
-#      csit-vpp-perf-verify-1901-3n-hsw:
-#        - 10  # NDRPDR sel
-#        - 19  # NDRPDR sel
-#        - 31  # NDRPDR sel
-#        - 36  # NDRPDR sel
-#        - 40  # NDRPDR sel
-#        - 42  # NDRPDR sel
-#        - 44  # NDRPDR sel
-#        - 46  # NDRPDR sel
-#        - 47  # NDRPDR sel
-#        - 48  # NDRPDR sel
-#        - 61  # NDRPDR LB
-#        - 62  # NDRPDR LB
-#        - 63  # NDRPDR LB
-#        - 64  # NDRPDR LB
-#        - 65  # NDRPDR LB
-#        - 66  # NDRPDR LB
-#        - 67  # NDRPDR LB
-#        - 69  # NDRPDR LB
-#        - 70  # NDRPDR LB
-#        - 71  # NDRPDR LB
-#        - 72  # 1901.1 NDRPDR sel
-#        - 78  # 1901.1 NDRPDR sel
-
-#    plot-throughput-speedup-analysis-3n-hsw:
-#      csit-vpp-perf-verify-1901-3n-hsw:
-#        - 10  # NDRPDR sel
-#        - 19  # NDRPDR sel
-#        - 31  # NDRPDR sel
-#        - 36  # NDRPDR sel
-#        - 40  # NDRPDR sel
-#        - 42  # NDRPDR sel
-#        - 44  # NDRPDR sel
-#        - 46  # NDRPDR sel
-#        - 47  # NDRPDR sel
-#        - 48  # NDRPDR sel
-#        - 61  # NDRPDR LB
-#        - 62  # NDRPDR LB
-#        - 63  # NDRPDR LB
-#        - 64  # NDRPDR LB
-#        - 65  # NDRPDR LB
-#        - 66  # NDRPDR LB
-#        - 67  # NDRPDR LB
-#        - 69  # NDRPDR LB
-#        - 70  # NDRPDR LB
-#        - 71  # NDRPDR LB
-#        - 72  # 1901.1 NDRPDR sel
-#        - 78  # 1901.1 NDRPDR sel
+    plot-vpp-throughput-latency-3n-hsw:
+      csit-vpp-perf-verify-1901-3n-hsw:
+        - 84  # 1901.2 NDRPDR sel
+
+    plot-throughput-speedup-analysis-3n-hsw:
+      csit-vpp-perf-verify-1901-3n-hsw:
+        - 84  # 1901.2 NDRPDR sel
 
 #    plot-vpp-http-server-performance:
 #      # TODO: Replace with new data
 
     plot-vpp-throughput-latency-3n-skx:
       csit-vpp-perf-verify-1901-3n-skx:
-#        - 18  # NDRPDR sel
-#        - 19  # NDRPDR sel
-#        - 20  # NDRPDR sel
-#        - 28  # NDRPDR sel
-#        - 31  # NDRPDR sel
-#        - 33  # NDRPDR sel
-#        - 36  # NDRPDR sel
-#        - 38  # NDRPDR sel
-#        - 47  # NDRPDR sel
-#        - 48  # NDRPDR sel
-#        - 54  # NDRPDR LB
-#        - 57  # NDRPDR LB
-#        - 58  # NDRPDR LB
-#        - 59  # NDRPDR LB
-#        - 60  # NDRPDR LB
-#        - 63  # NDRPDR LB
-#        - 64  # NDRPDR LB
-#        - 65  # NDRPDR LB
-#        - 66  # NDRPDR LB
-#        - 67  # NDRPDR LB
         - 70  # 1901.2 NDRPDR sel
 
     plot-throughput-speedup-analysis-3n-skx:
       csit-vpp-perf-verify-1901-3n-skx:
-#        - 18  # NDRPDR sel
-#        - 19  # NDRPDR sel
-#        - 20  # NDRPDR sel
-#        - 28  # NDRPDR sel
-#        - 31  # NDRPDR sel
-#        - 33  # NDRPDR sel
-#        - 36  # NDRPDR sel
-#        - 38  # NDRPDR sel
-#        - 47  # NDRPDR sel
-#        - 48  # NDRPDR sel
-#        - 54  # NDRPDR LB
-#        - 57  # NDRPDR LB
-#        - 58  # NDRPDR LB
-#        - 59  # NDRPDR LB
-#        - 60  # NDRPDR LB
-#        - 63  # NDRPDR LB
-#        - 64  # NDRPDR LB
-#        - 65  # NDRPDR LB
-#        - 66  # NDRPDR LB
-#        - 67  # NDRPDR LB
         - 70  # 1901.2 NDRPDR sel
 
     plot-dpdk-throughput-latency-3n-skx:
 
 #    vpp-nic-comparison-3n-hsw:
 #      csit-vpp-perf-verify-1901-3n-hsw:
-#        - 10  # NDRPDR sel
-#        - 19  # NDRPDR sel
-#        - 31  # NDRPDR sel
-#        - 36  # NDRPDR sel
-#        - 40  # NDRPDR sel
-#        - 42  # NDRPDR sel
-#        - 44  # NDRPDR sel
-#        - 46  # NDRPDR sel
-#        - 47  # NDRPDR sel
-#        - 48  # NDRPDR sel
-#        - 61  # NDRPDR LB
-#        - 62  # NDRPDR LB
-#        - 63  # NDRPDR LB
-#        - 64  # NDRPDR LB
-#        - 65  # NDRPDR LB
-#        - 66  # NDRPDR LB
-#        - 67  # NDRPDR LB
-#        - 69  # NDRPDR LB
-#        - 70  # NDRPDR LB
-#        - 71  # NDRPDR LB
-#        - 72  # 1901.1 NDRPDR sel
-#        - 78  # 1901.1 NDRPDR sel
+#        - 84  # 1901.2 NDRPDR sel
 
     vpp-nic-comparison-3n-skx:
       csit-vpp-perf-verify-1901-3n-skx:
-#        - 18  # NDRPDR sel
-#        - 19  # NDRPDR sel
-#        - 20  # NDRPDR sel
-#        - 28  # NDRPDR sel
-#        - 31  # NDRPDR sel
-#        - 33  # NDRPDR sel
-#        - 36  # NDRPDR sel
-#        - 38  # NDRPDR sel
-#        - 47  # NDRPDR sel
-#        - 48  # NDRPDR sel
-#        - 54  # NDRPDR LB
-#        - 57  # NDRPDR LB
-#        - 58  # NDRPDR LB
-#        - 59  # NDRPDR LB
-#        - 60  # NDRPDR LB
-#        - 63  # NDRPDR LB
-#        - 64  # NDRPDR LB
-#        - 65  # NDRPDR LB
-#        - 66  # NDRPDR LB
-#        - 67  # NDRPDR LB
         - 70  # 1901.2 NDRPDR sel
 
 #    vpp-nic-comparison-2n-skx:
 
     # Results
 
-#    vpp-perf-results-3n-hsw:
-#      csit-vpp-perf-verify-1901-3n-hsw:
-#        - 38  # NDRPDR full
-#        - 43  # NDRPDR full
-#        - 45  # NDRPDR full
-#        - 49  # NDRPDR full
-#        - 72  # 1901.1 NDRPDR sel
-#        - 78  # 1901.1 NDRPDR sel
+    vpp-perf-results-3n-hsw:
+      csit-vpp-perf-verify-1901-3n-hsw:
+        - 84  # 1901.2 NDRPDR sel
 
     vpp-perf-results-3n-skx:
       csit-vpp-perf-verify-1901-3n-skx:
-#        - 37  # NDRPDR full
-#        - 39  # NDRPDR full
-#        - 40  # NDRPDR full
-#        - 49  # NDRPDR full
         - 70  # 1901.2 NDRPDR sel
 
 #    vpp-perf-results-2n-skx:
 #      - "intel-dnv-vpp-changes-2n-dnv-ref"
 #      - "intel-dnv-vpp-changes-2n-dnv-cmp"
 
-#    vpp-performance-changes-3n-hsw-h1:
-#      csit-vpp-perf-verify-1807-3n-hsw:
-#        - 11  # NDRPDR full 1
-#        - 22  # NDRPDR full 2
-#        - 45  # NDRPDR full 3
-#        - 46  # NDRPDR full 4
-#        - 15  # NDRPDR sel
-#        - 16  # NDRPDR sel
-#        - 19  # NDRPDR sel
-#        - 18  # NDRPDR sel
-#        - 20  # NDRPDR sel
-#        - 38  # NDRPDR sel
-#        - 40  # NDRPDR sel
-#        - 44  # NDRPDR sel
-#        - 47  # NDRPDR sel
-#    vpp-performance-changes-3n-hsw-ref:
-#      csit-vpp-perf-verify-1810-3n-hsw:
-#        - 8   # NDRPDR sel
-#        - 12  # NDRPDR sel
-#        - 14  # NDRPDR sel
-#        - 18  # NDRPDR sel
-#        - 23  # NDRPDR sel
-#        - 25  # NDRPDR sel
-#        - 38  # NDRPDR sel
-#        - 39  # NDRPDR sel
-#        - 41  # NDRPDR sel
-#        - 42  # NDRPDR sel
-#    vpp-performance-changes-3n-hsw-cmp:
-#      csit-vpp-perf-verify-1901-3n-hsw:
-##        - 10  # NDRPDR sel
-##        - 19  # NDRPDR sel
-##        - 31  # NDRPDR sel
-##        - 36  # NDRPDR sel
-##        - 40  # NDRPDR sel
-##        - 42  # NDRPDR sel
-##        - 44  # NDRPDR sel
-##        - 46  # NDRPDR sel
-##        - 47  # NDRPDR sel
-##        - 48  # NDRPDR sel
-##        - 61  # NDRPDR LB
-##        - 62  # NDRPDR LB
-##        - 63  # NDRPDR LB
-##        - 64  # NDRPDR LB
-##        - 65  # NDRPDR LB
-##        - 66  # NDRPDR LB
-##        - 67  # NDRPDR LB
-##        - 69  # NDRPDR LB
-##        - 70  # NDRPDR LB
-##        - 71  # NDRPDR LB
-#        - 72  # 1901.1 NDRPDR sel
-#        - 78  # 1901.1 NDRPDR sel
-#    vpp-performance-changes-3n-hsw:
-#      - "vpp-performance-changes-3n-hsw-h1"
-#      - "vpp-performance-changes-3n-hsw-ref"
-#      - "vpp-performance-changes-3n-hsw-cmp"
+    vpp-performance-changes-3n-hsw-h1:
+      csit-vpp-perf-verify-1807-3n-hsw:
+        - 15  # NDRPDR sel
+        - 16  # NDRPDR sel
+        - 19  # NDRPDR sel
+        - 18  # NDRPDR sel
+        - 20  # NDRPDR sel
+        - 38  # NDRPDR sel
+        - 40  # NDRPDR sel
+        - 44  # NDRPDR sel
+        - 47  # NDRPDR sel
+    vpp-performance-changes-3n-hsw-ref:
+      csit-vpp-perf-verify-1810-3n-hsw:
+        - 8   # NDRPDR sel
+        - 12  # NDRPDR sel
+        - 14  # NDRPDR sel
+        - 18  # NDRPDR sel
+        - 23  # NDRPDR sel
+        - 25  # NDRPDR sel
+        - 38  # NDRPDR sel
+        - 39  # NDRPDR sel
+        - 41  # NDRPDR sel
+        - 42  # NDRPDR sel
+    vpp-performance-changes-3n-hsw-cmp:
+      csit-vpp-perf-verify-1901-3n-hsw:
+        - 84  # 1901.2 NDRPDR sel
+    vpp-performance-changes-3n-hsw:
+      - "vpp-performance-changes-3n-hsw-h1"
+      - "vpp-performance-changes-3n-hsw-ref"
+      - "vpp-performance-changes-3n-hsw-cmp"
 
     vpp-performance-changes-3n-skx-h1:
       csit-vpp-perf-verify-1807-3n-skx:
         - 25  # NDRPDR sel
     vpp-performance-changes-3n-skx-cmp:
       csit-vpp-perf-verify-1901-3n-skx:
-#        - 18  # NDRPDR sel
-#        - 19  # NDRPDR sel
-#        - 20  # NDRPDR sel
-#        - 28  # NDRPDR sel
-#        - 31  # NDRPDR sel
-#        - 33  # NDRPDR sel
-#        - 36  # NDRPDR sel
-#        - 38  # NDRPDR sel
-#        - 47  # NDRPDR sel
-#        - 48  # NDRPDR sel
-#        - 54  # NDRPDR LB
-#        - 57  # NDRPDR LB
-#        - 58  # NDRPDR LB
-#        - 59  # NDRPDR LB
-#        - 60  # NDRPDR LB
-#        - 63  # NDRPDR LB
-#        - 64  # NDRPDR LB
-#        - 65  # NDRPDR LB
-#        - 66  # NDRPDR LB
-#        - 67  # NDRPDR LB
         - 70  # 1901.2 NDRPDR sel
     vpp-performance-changes-3n-skx:
       - "vpp-performance-changes-3n-skx-h1"
 
     # Compare testbeds
 
-#    vpp-compare-testbeds-ref:
-#      csit-vpp-perf-verify-1901-3n-hsw:
-##        - 10  # NDRPDR sel
-##        - 19  # NDRPDR sel
-##        - 31  # NDRPDR sel
-##        - 36  # NDRPDR sel
-##        - 40  # NDRPDR sel
-##        - 42  # NDRPDR sel
-##        - 44  # NDRPDR sel
-##        - 46  # NDRPDR sel
-##        - 47  # NDRPDR sel
-##        - 48  # NDRPDR sel
-##        - 61  # NDRPDR LB
-##        - 62  # NDRPDR LB
-##        - 63  # NDRPDR LB
-##        - 64  # NDRPDR LB
-##        - 65  # NDRPDR LB
-##        - 66  # NDRPDR LB
-##        - 67  # NDRPDR LB
-##        - 69  # NDRPDR LB
-##        - 70  # NDRPDR LB
-##        - 71  # NDRPDR LB
-#        - 72  # 1901.1 NDRPDR sel
-#        - 78  # 1901.1 NDRPDR sel
-#    vpp-compare-testbeds-cmp:
-#      csit-vpp-perf-verify-1901-3n-skx:
-##        - 18  # NDRPDR sel
-##        - 19  # NDRPDR sel
-##        - 20  # NDRPDR sel
-##        - 28  # NDRPDR sel
-##        - 31  # NDRPDR sel
-##        - 33  # NDRPDR sel
-##        - 36  # NDRPDR sel
-##        - 38  # NDRPDR sel
-##        - 47  # NDRPDR sel
-##        - 48  # NDRPDR sel
-##        - 54  # NDRPDR LB
-##        - 57  # NDRPDR LB
-##        - 58  # NDRPDR LB
-##        - 59  # NDRPDR LB
-##        - 60  # NDRPDR LB
-##        - 63  # NDRPDR LB
-##        - 64  # NDRPDR LB
-##        - 65  # NDRPDR LB
-##        - 66  # NDRPDR LB
-##        - 67  # NDRPDR LB
-#        - 70  # 1901.2 NDRPDR sel
-#    vpp-compare-testbeds:
-#      - "vpp-compare-testbeds-ref"
-#      - "vpp-compare-testbeds-cmp"
+    vpp-compare-testbeds-ref:
+      csit-vpp-perf-verify-1901-3n-hsw:
+        - 84  # 1901.2 NDRPDR sel
+    vpp-compare-testbeds-cmp:
+      csit-vpp-perf-verify-1901-3n-skx:
+        - 70  # 1901.2 NDRPDR sel
+    vpp-compare-testbeds:
+      - "vpp-compare-testbeds-ref"
+      - "vpp-compare-testbeds-cmp"
 
 #    vpp-compare-testbeds-mrr-ref:
 #      csit-vpp-perf-verify-1901-3n-hsw:
 #    intel-dnv-vpp-release-1810:
 #      - 1
 
-#    csit-vpp-perf-verify-1807-3n-hsw:
+    csit-vpp-perf-verify-1807-3n-hsw:
 #      - 8   # MRR full
 #      - 9   # MRR sel
 #      - 21  # MRR sel
 #      - 22  # NDRPDR full 2
 #      - 45  # NDRPDR full 3
 #      - 46  # NDRPDR full 4
-#      - 15  # NDRPDR sel
-#      - 16  # NDRPDR sel
-#      - 19  # NDRPDR sel
-#      - 18  # NDRPDR sel
-#      - 20  # NDRPDR sel
-#      - 38  # NDRPDR sel
-#      - 40  # NDRPDR sel
-#      - 44  # NDRPDR sel
-#      - 47  # NDRPDR sel
-#    csit-vpp-perf-verify-1810-3n-hsw:
+      - 15  # NDRPDR sel
+      - 16  # NDRPDR sel
+      - 19  # NDRPDR sel
+      - 18  # NDRPDR sel
+      - 20  # NDRPDR sel
+      - 38  # NDRPDR sel
+      - 40  # NDRPDR sel
+      - 44  # NDRPDR sel
+      - 47  # NDRPDR sel
+    csit-vpp-perf-verify-1810-3n-hsw:
 #      - 9   # MRR sel
 #      - 20  # NDRPDR full
 #      - 21  # NDRPDR full
 #      - 22  # NDRPDR full
 #      - 27  # NDRPDR full
-#      - 8   # NDRPDR sel
-#      - 12  # NDRPDR sel
-#      - 14  # NDRPDR sel
-#      - 18  # NDRPDR sel
-#      - 23  # NDRPDR sel
-#      - 25  # NDRPDR sel
-#      - 38  # NDRPDR sel
-#      - 39  # NDRPDR sel
-#      - 41  # NDRPDR sel
-#      - 42  # NDRPDR sel
+      - 8   # NDRPDR sel
+      - 12  # NDRPDR sel
+      - 14  # NDRPDR sel
+      - 18  # NDRPDR sel
+      - 23  # NDRPDR sel
+      - 25  # NDRPDR sel
+      - 38  # NDRPDR sel
+      - 39  # NDRPDR sel
+      - 41  # NDRPDR sel
+      - 42  # NDRPDR sel
 #      - 28  # WRK
 #      - 29  # WRK
 #      - 30  # WRK
 #      - 35  # WRK
 #      - 36  # WRK
 #      - 37  # WRK
-#    csit-vpp-perf-verify-1901-3n-hsw:
-##      - 35  # MRR sel
-##      - 38  # NDRPDR full
-##      - 43  # NDRPDR full
-##      - 45  # NDRPDR full
-##      - 49  # NDRPDR full
-##      - 10  # NDRPDR sel
-##      - 19  # NDRPDR sel
-##      - 31  # NDRPDR sel
-##      - 36  # NDRPDR sel
-##      - 40  # NDRPDR sel
-##      - 42  # NDRPDR sel
-##      - 44  # NDRPDR sel
-##      - 46  # NDRPDR sel
-##      - 47  # NDRPDR sel
-##      - 48  # NDRPDR sel
-##      - 61  # NDRPDR LB
-##      - 62  # NDRPDR LB
-##      - 63  # NDRPDR LB
-##      - 64  # NDRPDR LB
-##      - 65  # NDRPDR LB
-##      - 66  # NDRPDR LB
-##      - 67  # NDRPDR LB
-##      - 69  # NDRPDR LB
-##      - 70  # NDRPDR LB
-##      - 71  # NDRPDR LB
-#      - 72  # 1901.1 NDRPDR sel
-#      - 78  # 1901.1 NDRPDR sel
-#      - 73  # 1901.1 MRR sel
-#      - 77  # 1901.1 MRR sel
+    csit-vpp-perf-verify-1901-3n-hsw:
+      - 84  # 1901.2 NDRPDR sel
 
     csit-vpp-perf-verify-1807-3n-skx:
-#      - 31  # MRR full
-#      - 28  # MRR sel
-#      - 32  # MRR sel
-#      - 36  # MRR sel
-#      - 42  # MRR sel
-#      - 47  # MRR sel
-#      - 48  # MRR sel
-#      - 51  # MRR sel
-#      - 52  # MRR sel
-#      - 53  # MRR sel
-#      - 54  # MRR sel
-#      - 40  # NDRPDR full 1
-#      - 41  # NDRPDR full 2
       - 33  # NDRPDR sel
       - 35  # NDRPDR sel
       - 37  # NDRPDR sel
       - 50  # NDRPDR sel
       - 56  # NDRPDR sel
     csit-vpp-perf-verify-1810-3n-skx:
-#      - 9   # MRR sel
-#      - 11  # MRR sel
-#      - 12  # MRR sel
-#      - 13  # MRR sel
-#      - 23  # NDRPDR full
-#      - 24  # NDRPDR full
       - 10  # NDRPDR sel
       - 14  # NDRPDR sel
       - 15  # NDRPDR sel
       - 22  # NDRPDR sel
       - 25  # NDRPDR sel
     csit-vpp-perf-verify-1901-3n-skx:
-#      - 32  # MRR sel
-#      - 37  # NDRPDR full
-#      - 39  # NDRPDR full
-#      - 40  # NDRPDR full
-#      - 49  # NDRPDR full
-#      - 18  # NDRPDR sel
-#      - 19  # NDRPDR sel
-#      - 20  # NDRPDR sel
-#      - 28  # NDRPDR sel
-#      - 31  # NDRPDR sel
-#      - 33  # NDRPDR sel
-#      - 36  # NDRPDR sel
-#      - 38  # NDRPDR sel
-#      - 47  # NDRPDR sel
-#      - 48  # NDRPDR sel
-#      - 54  # NDRPDR LB
-#      - 57  # NDRPDR LB
-#      - 58  # NDRPDR LB
-#      - 59  # NDRPDR LB
-#      - 60  # NDRPDR LB
-#      - 63  # NDRPDR LB
-#      - 64  # NDRPDR LB
-#      - 65  # NDRPDR LB
-#      - 66  # NDRPDR LB
-#      - 67  # NDRPDR LB
-#      - 68  # 1901.1 NDRPDR sel
-#      - 69  # 1901.1 MRR sel
       - 70  # 1901.2 NDRPDR sel
+
 #    csit-vpp-perf-verify-1807-2n-skx:
 #      - 27  # MRR full
 #      - 31  # MRR sel
 #  - "parent"
 #  - "throughput"
 #  - "tags"
-#
+
 ## VPP Compare NICs 3n-hsw 1t1c mrr
 #-
 #  type: "table"
 #  - "parent"
 #  - "result"
 
-## VPP Performance Changes 3n-hsw 1t1c pdr
-#-
-#  type: "table"
-#  title: "VPP Performance Changes 3n-hsw 1t1c pdr"
-#  algorithm: "table_performance_comparison"
-#  output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-hsw-1t1c-pdr"
-#  history:
-#    -
-#      title: "rls1807"
-#      data: "vpp-performance-changes-3n-hsw-h1"
-#  reference:
-#    title: "rls1810"
-#    data: "vpp-performance-changes-3n-hsw-ref"
-#  compare:
-#    title: "rls1901.1"
-#    data: "vpp-performance-changes-3n-hsw-cmp"
-#  data: "vpp-performance-changes-3n-hsw"
-#  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
-#  filter: "'1T1C' and ('NDRPDR' or 'NDRPDRDISC')" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
-#  parameters:
-#  - "name"
-#  - "parent"
-#  - "throughput"
-#
-## VPP Performance Changes 3n-hsw 2t2c pdr
-#-
-#  type: "table"
-#  title: "VPP Performance Changes 3n-hsw 2t2c pdr"
-#  algorithm: "table_performance_comparison"
-#  output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-hsw-2t2c-pdr"
-#  history:
-#    -
-#      title: "rls1807"
-#      data: "vpp-performance-changes-3n-hsw-h1"
-#  reference:
-#    title: "rls1810"
-#    data: "vpp-performance-changes-3n-hsw-ref"
-#  compare:
-#    title: "rls1901.1"
-#    data: "vpp-performance-changes-3n-hsw-cmp"
-#  data: "vpp-performance-changes-3n-hsw"
-#  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
-#  filter: "'2T2C' and ('NDRPDR' or 'NDRPDRDISC')" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
-#  parameters:
-#  - "name"
-#  - "parent"
-#  - "throughput"
-#
-## VPP Performance Changes 3n-hsw 1t1c ndr
-#-
-#  type: "table"
-#  title: "VPP Performance Changes 3n-hsw 1t1c ndr"
-#  algorithm: "table_performance_comparison"
-#  output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-hsw-1t1c-ndr"
-#  history:
-#    -
-#      title: "rls1807"
-#      data: "vpp-performance-changes-3n-hsw-h1"
-#  reference:
-#    title: "rls1810"
-#    data: "vpp-performance-changes-3n-hsw-ref"
-#  compare:
-#    title: "rls1901.1"
-#    data: "vpp-performance-changes-3n-hsw-cmp"
-#  data: "vpp-performance-changes-3n-hsw"
-#  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
-#  filter: "'1T1C' and ('NDRPDR' or 'NDRPDRDISC')" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
-#  parameters:
-#  - "name"
-#  - "parent"
-#  - "throughput"
-#
-## VPP Performance Changes 3n-hsw 2t2c ndr
-#-
-#  type: "table"
-#  title: "VPP Performance Changes 3n-hsw 2t2c ndr"
-#  algorithm: "table_performance_comparison"
-#  output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-hsw-2t2c-ndr"
-#  history:
-#    -
-#      title: "rls1807"
-#      data: "vpp-performance-changes-3n-hsw-h1"
-#  reference:
-#    title: "rls1810"
-#    data: "vpp-performance-changes-3n-hsw-ref"
-#  compare:
-#    title: "rls1901.1"
-#    data: "vpp-performance-changes-3n-hsw-cmp"
-#  data: "vpp-performance-changes-3n-hsw"
-#  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
-#  filter: "'2T2C' and ('NDRPDR' or 'NDRPDRDISC')" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
-#  parameters:
-#  - "name"
-#  - "parent"
-#  - "throughput"
-
-# VPP Performance Changes 3n-skx 2t1c pdr
+# VPP Performance Changes 3n-hsw 1t1c pdr
 -
   type: "table"
-  title: "VPP Performance Changes 3n-skx 2t1c pdr"
+  title: "VPP Performance Changes 3n-hsw 1t1c pdr"
   algorithm: "table_performance_comparison"
-  output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-skx-2t1c-pdr"
+  output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-hsw-1t1c-pdr"
   history:
     -
       title: "rls1807"
-      data: "vpp-performance-changes-3n-skx-h1"
+      data: "vpp-performance-changes-3n-hsw-h1"
   reference:
     title: "rls1810"
-    data: "vpp-performance-changes-3n-skx-ref"
+    data: "vpp-performance-changes-3n-hsw-ref"
   compare:
     title: "rls1901.1"
-    data: "vpp-performance-changes-3n-skx-cmp"
-  data: "vpp-performance-changes-3n-skx"
+    data: "vpp-performance-changes-3n-hsw-cmp"
+  data: "vpp-performance-changes-3n-hsw"
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
-  filter: "'2T1C' and ('NDRPDR' or 'NDRPDRDISC')" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
+  filter: "'1T1C' and ('NDRPDR' or 'NDRPDRDISC')" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
   parameters:
   - "name"
   - "parent"
   - "throughput"
 
-# VPP Performance Changes 3n-skx 4t2c pdr
+# VPP Performance Changes 3n-hsw 2t2c pdr
 -
   type: "table"
-  title: "VPP Performance Changes 3n-skx 4t2c pdr"
+  title: "VPP Performance Changes 3n-hsw 2t2c pdr"
   algorithm: "table_performance_comparison"
-  output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-skx-4t2c-pdr"
+  output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-hsw-2t2c-pdr"
   history:
     -
       title: "rls1807"
-      data: "vpp-performance-changes-3n-skx-h1"
+      data: "vpp-performance-changes-3n-hsw-h1"
   reference:
     title: "rls1810"
-    data: "vpp-performance-changes-3n-skx-ref"
+    data: "vpp-performance-changes-3n-hsw-ref"
   compare:
     title: "rls1901.1"
-    data: "vpp-performance-changes-3n-skx-cmp"
-  data: "vpp-performance-changes-3n-skx"
+    data: "vpp-performance-changes-3n-hsw-cmp"
+  data: "vpp-performance-changes-3n-hsw"
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
-  filter: "'4T2C' and ('NDRPDR' or 'NDRPDRDISC')" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
+  filter: "'2T2C' and ('NDRPDR' or 'NDRPDRDISC')" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
   parameters:
   - "name"
   - "parent"
   - "throughput"
 
-# VPP Performance Changes 3n-skx 2t1c ndr
+# VPP Performance Changes 3n-hsw 1t1c ndr
 -
   type: "table"
-  title: "VPP Performance Changes 3n-skx 2t1c ndr"
+  title: "VPP Performance Changes 3n-hsw 1t1c ndr"
   algorithm: "table_performance_comparison"
-  output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-skx-2t1c-ndr"
+  output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-hsw-1t1c-ndr"
   history:
     -
       title: "rls1807"
-      data: "vpp-performance-changes-3n-skx-h1"
+      data: "vpp-performance-changes-3n-hsw-h1"
   reference:
     title: "rls1810"
-    data: "vpp-performance-changes-3n-skx-ref"
+    data: "vpp-performance-changes-3n-hsw-ref"
+  compare:
+    title: "rls1901.1"
+    data: "vpp-performance-changes-3n-hsw-cmp"
+  data: "vpp-performance-changes-3n-hsw"
+  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
+  filter: "'1T1C' and ('NDRPDR' or 'NDRPDRDISC')" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
+  parameters:
+  - "name"
+  - "parent"
+  - "throughput"
+
+# VPP Performance Changes 3n-hsw 2t2c ndr
+-
+  type: "table"
+  title: "VPP Performance Changes 3n-hsw 2t2c ndr"
+  algorithm: "table_performance_comparison"
+  output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-hsw-2t2c-ndr"
+  history:
+    -
+      title: "rls1807"
+      data: "vpp-performance-changes-3n-hsw-h1"
+  reference:
+    title: "rls1810"
+    data: "vpp-performance-changes-3n-hsw-ref"
+  compare:
+    title: "rls1901.1"
+    data: "vpp-performance-changes-3n-hsw-cmp"
+  data: "vpp-performance-changes-3n-hsw"
+  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
+  filter: "'2T2C' and ('NDRPDR' or 'NDRPDRDISC')" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
+  parameters:
+  - "name"
+  - "parent"
+  - "throughput"
+
+# VPP Performance Changes 3n-skx 2t1c pdr
+-
+  type: "table"
+  title: "VPP Performance Changes 3n-skx 2t1c pdr"
+  algorithm: "table_performance_comparison"
+  output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-skx-2t1c-pdr"
+  history:
+    -
+      title: "rls1807"
+      data: "vpp-performance-changes-3n-skx-h1"
+  reference:
+    title: "rls1810"
+    data: "vpp-performance-changes-3n-skx-ref"
+  compare:
+    title: "rls1901.1"
+    data: "vpp-performance-changes-3n-skx-cmp"
+  data: "vpp-performance-changes-3n-skx"
+  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
+  filter: "'2T1C' and ('NDRPDR' or 'NDRPDRDISC')" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
+  parameters:
+  - "name"
+  - "parent"
+  - "throughput"
+
+# VPP Performance Changes 3n-skx 4t2c pdr
+-
+  type: "table"
+  title: "VPP Performance Changes 3n-skx 4t2c pdr"
+  algorithm: "table_performance_comparison"
+  output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-skx-4t2c-pdr"
+  history:
+    -
+      title: "rls1807"
+      data: "vpp-performance-changes-3n-skx-h1"
+  reference:
+    title: "rls1810"
+    data: "vpp-performance-changes-3n-skx-ref"
+  compare:
+    title: "rls1901.1"
+    data: "vpp-performance-changes-3n-skx-cmp"
+  data: "vpp-performance-changes-3n-skx"
+  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
+  filter: "'4T2C' and ('NDRPDR' or 'NDRPDRDISC')" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
+  parameters:
+  - "name"
+  - "parent"
+  - "throughput"
+
+# VPP Performance Changes 3n-skx 2t1c ndr
+-
+  type: "table"
+  title: "VPP Performance Changes 3n-skx 2t1c ndr"
+  algorithm: "table_performance_comparison"
+  output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-skx-2t1c-ndr"
+  history:
+    -
+      title: "rls1807"
+      data: "vpp-performance-changes-3n-skx-h1"
+  reference:
+    title: "rls1810"
+    data: "vpp-performance-changes-3n-skx-ref"
   compare:
     title: "rls1901.1"
     data: "vpp-performance-changes-3n-skx-cmp"
 #  - "parent"
 #  - "throughput"
 
-## VPP Comparison Across Testbeds 3n-hsw to 3n-skx 1c ndr
-#-
-#  type: "table"
-#  title: "VPP Comparison Across Testbeds 3n-hsw to 3n-skx 1c ndr"
-#  algorithm: "table_performance_comparison"
-#  output-file: "{DIR[STATIC,VPP]}/performance-compare-testbeds-3n-hsw-3n-skx-1c-ndr"
-#  reference:
-#    title: "3-Node Hsw"
-#    data: "vpp-compare-testbeds-ref"
-#  compare:
-#    title: "3-Node Skx"
-#    data: "vpp-compare-testbeds-cmp"
-#  data: "vpp-compare-testbeds"
-#  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
-#  filter: "'NIC_Intel-X710' and 'NDRPDR' and '1C'"
-#  parameters:
-#  - "name"
-#  - "parent"
-#  - "throughput"
-#
-## VPP Comparison Across Testbeds 3n-hsw to 3n-skx 2c ndr
-#-
-#  type: "table"
-#  title: "VPP Comparison Across Testbeds 3n-hsw to 3n-skx 2c ndr"
-#  algorithm: "table_performance_comparison"
-#  output-file: "{DIR[STATIC,VPP]}/performance-compare-testbeds-3n-hsw-3n-skx-2c-ndr"
-#  reference:
-#    title: "3-Node Hsw"
-#    data: "vpp-compare-testbeds-ref"
-#  compare:
-#    title: "3-Node Skx"
-#    data: "vpp-compare-testbeds-cmp"
-#  data: "vpp-compare-testbeds"
-#  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
-#  filter: "'NIC_Intel-X710' and 'NDRPDR' and '2C'"
-#  parameters:
-#  - "name"
-#  - "parent"
-#  - "throughput"
-#
-## VPP Comparison Across Testbeds 3n-hsw to 3n-skx 1c pdr
-#-
-#  type: "table"
-#  title: "VPP Comparison Across Testbeds 3n-hsw to 3n-skx 1c pdr"
-#  algorithm: "table_performance_comparison"
-#  output-file: "{DIR[STATIC,VPP]}/performance-compare-testbeds-3n-hsw-3n-skx-1c-pdr"
-#  reference:
-#    title: "3-Node Hsw"
-#    data: "vpp-compare-testbeds-ref"
-#  compare:
-#    title: "3-Node Skx"
-#    data: "vpp-compare-testbeds-cmp"
-#  data: "vpp-compare-testbeds"
-#  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
-#  filter: "'NIC_Intel-X710' and 'NDRPDR' and '1C'"
-#  parameters:
-#  - "name"
-#  - "parent"
-#  - "throughput"
-#
-## VPP Comparison Across Testbeds 3n-hsw to 3n-skx 2c pdr
-#-
-#  type: "table"
-#  title: "VPP Comparison Across Testbeds 3n-hsw to 3n-skx 2c pdr"
-#  algorithm: "table_performance_comparison"
-#  output-file: "{DIR[STATIC,VPP]}/performance-compare-testbeds-3n-hsw-3n-skx-2c-pdr"
-#  reference:
-#    title: "3-Node Hsw"
-#    data: "vpp-compare-testbeds-ref"
-#  compare:
-#    title: "3-Node Skx"
-#    data: "vpp-compare-testbeds-cmp"
-#  data: "vpp-compare-testbeds"
-#  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
-#  filter: "'NIC_Intel-X710' and 'NDRPDR' and '2C'"
-#  parameters:
-#  - "name"
-#  - "parent"
-#  - "throughput"
+# VPP Comparison Across Testbeds 3n-hsw to 3n-skx 1c ndr
+-
+  type: "table"
+  title: "VPP Comparison Across Testbeds 3n-hsw to 3n-skx 1c ndr"
+  algorithm: "table_performance_comparison"
+  output-file: "{DIR[STATIC,VPP]}/performance-compare-testbeds-3n-hsw-3n-skx-1c-ndr"
+  reference:
+    title: "3-Node Hsw"
+    data: "vpp-compare-testbeds-ref"
+  compare:
+    title: "3-Node Skx"
+    data: "vpp-compare-testbeds-cmp"
+  data: "vpp-compare-testbeds"
+  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
+  filter: "'NIC_Intel-X710' and 'NDRPDR' and '1C'"
+  parameters:
+  - "name"
+  - "parent"
+  - "throughput"
+
+# VPP Comparison Across Testbeds 3n-hsw to 3n-skx 2c ndr
+-
+  type: "table"
+  title: "VPP Comparison Across Testbeds 3n-hsw to 3n-skx 2c ndr"
+  algorithm: "table_performance_comparison"
+  output-file: "{DIR[STATIC,VPP]}/performance-compare-testbeds-3n-hsw-3n-skx-2c-ndr"
+  reference:
+    title: "3-Node Hsw"
+    data: "vpp-compare-testbeds-ref"
+  compare:
+    title: "3-Node Skx"
+    data: "vpp-compare-testbeds-cmp"
+  data: "vpp-compare-testbeds"
+  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
+  filter: "'NIC_Intel-X710' and 'NDRPDR' and '2C'"
+  parameters:
+  - "name"
+  - "parent"
+  - "throughput"
+
+# VPP Comparison Across Testbeds 3n-hsw to 3n-skx 1c pdr
+-
+  type: "table"
+  title: "VPP Comparison Across Testbeds 3n-hsw to 3n-skx 1c pdr"
+  algorithm: "table_performance_comparison"
+  output-file: "{DIR[STATIC,VPP]}/performance-compare-testbeds-3n-hsw-3n-skx-1c-pdr"
+  reference:
+    title: "3-Node Hsw"
+    data: "vpp-compare-testbeds-ref"
+  compare:
+    title: "3-Node Skx"
+    data: "vpp-compare-testbeds-cmp"
+  data: "vpp-compare-testbeds"
+  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
+  filter: "'NIC_Intel-X710' and 'NDRPDR' and '1C'"
+  parameters:
+  - "name"
+  - "parent"
+  - "throughput"
+
+# VPP Comparison Across Testbeds 3n-hsw to 3n-skx 2c pdr
+-
+  type: "table"
+  title: "VPP Comparison Across Testbeds 3n-hsw to 3n-skx 2c pdr"
+  algorithm: "table_performance_comparison"
+  output-file: "{DIR[STATIC,VPP]}/performance-compare-testbeds-3n-hsw-3n-skx-2c-pdr"
+  reference:
+    title: "3-Node Hsw"
+    data: "vpp-compare-testbeds-ref"
+  compare:
+    title: "3-Node Skx"
+    data: "vpp-compare-testbeds-cmp"
+  data: "vpp-compare-testbeds"
+  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
+  filter: "'NIC_Intel-X710' and 'NDRPDR' and '2C'"
+  parameters:
+  - "name"
+  - "parent"
+  - "throughput"
 
 ## VPP Comparison Across Topologies 3n-skx to 2n-skx 1c ndr
 #-
 #  - "parent"
 #  - "result"
 
-## Detailed Test Results - VPP Performance Results 3n-hsw
-#-
-#  type: "table"
-#  title: "Detailed Test Results - VPP Performance Results 3n-hsw"
-#  algorithm: "table_merged_details"
-#  output-file-ext: ".csv"
-#  output-file: "{DIR[DTR,PERF,VPP,3N,HSW]}/vpp_performance_results_3n_hsw"
-#  columns:
-#  -
-#    title: "Name"
-#    data: "data name"
-#  -
-#    title: "Status"
-#    data: "data msg"
-#  rows: "generated"
-#  data: "vpp-perf-results-3n-hsw"
-#  filter: "not 'NDRCHK' and not 'PDRCHK'"
-#  parameters:
-#  - "name"
-#  - "parent"
-#  - "msg"
+# Detailed Test Results - VPP Performance Results 3n-hsw
+-
+  type: "table"
+  title: "Detailed Test Results - VPP Performance Results 3n-hsw"
+  algorithm: "table_merged_details"
+  output-file-ext: ".csv"
+  output-file: "{DIR[DTR,PERF,VPP,3N,HSW]}/vpp_performance_results_3n_hsw"
+  columns:
+  -
+    title: "Name"
+    data: "data name"
+  -
+    title: "Status"
+    data: "data msg"
+  rows: "generated"
+  data: "vpp-perf-results-3n-hsw"
+  filter: "not 'NDRCHK' and not 'PDRCHK'"
+  parameters:
+  - "name"
+  - "parent"
+  - "msg"
 
 # Detailed Test Results - VPP Performance Results 3n-skx
 -
 #  - "parent"
 #  - "msg"
 
-## Test configuration - VPP Performance Test Configs 3n-hsw
-#-
-#  type: "table"
-#  title: "Test configuration - VPP Performance Test Configs 3n-hsw"
-#  algorithm: "table_merged_details"
-#  output-file-ext: ".csv"
-#  output-file: "{DIR[DTC,PERF,VPP,3N,HSW]}/vpp_test_configuration_3n_hsw"
-#  columns:
-#  -
-#    title: "Name"
-#    data: "data name"
-#  -
-#    title: "VPP API Test Commands History - Commands Used Per Test Case"
-#    data: "data conf-history"
-#  rows: "generated"
-#  data: "vpp-perf-results-3n-hsw"
-#  filter: "not 'NDRCHK' and not 'PDRCHK'"
-#  parameters:
-#  - "parent"
-#  - "name"
-#  - "conf-history"
-
-# Test configuration - VPP Performance Test Configs 3n-skx
+# Test configuration - VPP Performance Test Configs 3n-hsw
 -
   type: "table"
-  title: "Test configuration - VPP Performance Test Configs 3n-skx"
+  title: "Test configuration - VPP Performance Test Configs 3n-hsw"
   algorithm: "table_merged_details"
   output-file-ext: ".csv"
-  output-file: "{DIR[DTC,PERF,VPP,3N,SKX]}/vpp_test_configuration_3n_skx"
+  output-file: "{DIR[DTC,PERF,VPP,3N,HSW]}/vpp_test_configuration_3n_hsw"
   columns:
   -
     title: "Name"
     title: "VPP API Test Commands History - Commands Used Per Test Case"
     data: "data conf-history"
   rows: "generated"
-  data: "vpp-perf-results-3n-skx"
+  data: "vpp-perf-results-3n-hsw"
   filter: "not 'NDRCHK' and not 'PDRCHK'"
   parameters:
   - "parent"
   - "name"
   - "conf-history"
 
-## Test configuration - VPP Performance Test Configs 2n-skx
-#-
-#  type: "table"
-#  title: "Test configuration - VPP Performance Test Configs 2n-skx"
-#  algorithm: "table_merged_details"
-#  output-file-ext: ".csv"
-#  output-file: "{DIR[DTC,PERF,VPP,2N,SKX]}/vpp_test_configuration_2n_skx"
-#  columns:
-#  -
-#    title: "Name"
-#    data: "data name"
+# Test configuration - VPP Performance Test Configs 3n-skx
+-
+  type: "table"
+  title: "Test configuration - VPP Performance Test Configs 3n-skx"
+  algorithm: "table_merged_details"
+  output-file-ext: ".csv"
+  output-file: "{DIR[DTC,PERF,VPP,3N,SKX]}/vpp_test_configuration_3n_skx"
+  columns:
+  -
+    title: "Name"
+    data: "data name"
+  -
+    title: "VPP API Test Commands History - Commands Used Per Test Case"
+    data: "data conf-history"
+  rows: "generated"
+  data: "vpp-perf-results-3n-skx"
+  filter: "not 'NDRCHK' and not 'PDRCHK'"
+  parameters:
+  - "parent"
+  - "name"
+  - "conf-history"
+
+## Test configuration - VPP Performance Test Configs 2n-skx
+#-
+#  type: "table"
+#  title: "Test configuration - VPP Performance Test Configs 2n-skx"
+#  algorithm: "table_merged_details"
+#  output-file-ext: ".csv"
+#  output-file: "{DIR[DTC,PERF,VPP,2N,SKX]}/vpp_test_configuration_2n_skx"
+#  columns:
+#  -
+#    title: "Name"
+#    data: "data name"
 #  -
 #    title: "VPP API Test Commands History - Commands Used Per Test Case"
 #    data: "data conf-history"
 #  - "name"
 #  - "conf-history"
 
-## Test Operational Data - VPP Performance Operational Data 3n-hsw
-#-
-#  type: "table"
-#  title: "Test Operational Data - VPP Performance Operational Data 3n-hsw"
-#  algorithm: "table_merged_details"
-#  output-file-ext: ".csv"
-#  output-file: "{DIR[DTO,PERF,VPP,3N,HSW]}/vpp_test_operational_3n_hsw"
-#  columns:
-#  -
-#    title: "Name"
-#    data: "data name"
-#  -
-#    title: "VPP Operational Data - Outputs of 'show runtime' at NDR packet rate"
-#    data: "data show-run"
-#  rows: "generated"
-#  data: "vpp-perf-results-3n-hsw"
-#  filter: "not 'NDRCHK' and not 'PDRCHK'"
-#  parameters:
-#  - "parent"
-#  - "name"
-#  - "show-run"
+# Test Operational Data - VPP Performance Operational Data 3n-hsw
+-
+  type: "table"
+  title: "Test Operational Data - VPP Performance Operational Data 3n-hsw"
+  algorithm: "table_merged_details"
+  output-file-ext: ".csv"
+  output-file: "{DIR[DTO,PERF,VPP,3N,HSW]}/vpp_test_operational_3n_hsw"
+  columns:
+  -
+    title: "Name"
+    data: "data name"
+  -
+    title: "VPP Operational Data - Outputs of 'show runtime' at NDR packet rate"
+    data: "data show-run"
+  rows: "generated"
+  data: "vpp-perf-results-3n-hsw"
+  filter: "not 'NDRCHK' and not 'PDRCHK'"
+  parameters:
+  - "parent"
+  - "name"
+  - "show-run"
 
 # Test Operational Data - VPP Performance Operational Data 3n-skx
 -
 ###                                F I L E S                                 ###
 ################################################################################
 
-## VPP Performance Results 3n-hsw
-#-
-#  type: "file"
-#  title: "VPP Performance Results 3n-hsw"
-#  algorithm: "file_test_results"
-#  output-file-ext: ".rst"
-#  output-file: "{DIR[DTR,PERF,VPP,3N,HSW]}/vpp_performance_results_3n_hsw"
-#  file-header: "\n.. |br| raw:: html\n\n    <br />\n\n\n.. |prein| raw:: html\n\n    <pre>\n\n\n.. |preout| raw:: html\n\n    </pre>\n\n"
-#  dir-tables: "{DIR[DTR,PERF,VPP,3N,HSW]}"
-#  data: "vpp-perf-results-3n-hsw"
-#  filter: "not 'NDRCHK' and not 'PDRCHK'"
-#  parameters:
-#  - "name"
-#  - "doc"
-#  - "level"
-#  - "parent"
-#  data-start-level: 3
+# VPP Performance Results 3n-hsw
+-
+  type: "file"
+  title: "VPP Performance Results 3n-hsw"
+  algorithm: "file_test_results"
+  output-file-ext: ".rst"
+  output-file: "{DIR[DTR,PERF,VPP,3N,HSW]}/vpp_performance_results_3n_hsw"
+  file-header: "\n.. |br| raw:: html\n\n    <br />\n\n\n.. |prein| raw:: html\n\n    <pre>\n\n\n.. |preout| raw:: html\n\n    </pre>\n\n"
+  dir-tables: "{DIR[DTR,PERF,VPP,3N,HSW]}"
+  data: "vpp-perf-results-3n-hsw"
+  filter: "not 'NDRCHK' and not 'PDRCHK'"
+  parameters:
+  - "name"
+  - "doc"
+  - "level"
+  - "parent"
+  data-start-level: 3
 
 # VPP Performance Results 3n-skx
 -
 #  - "parent"
 #  data-start-level: 3
 
-## VPP Performance Configuration 3n-hsw
-#-
-#  type: "file"
-#  title: "VPP Performance Configuration 3n-hsw"
-#  algorithm: "file_test_results"
-#  output-file-ext: ".rst"
-#  output-file: "{DIR[DTC,PERF,VPP,3N,HSW]}/vpp_performance_configuration_3n_hsw"
-#  file-header: "\n.. |br| raw:: html\n\n    <br />\n\n\n.. |prein| raw:: html\n\n    <pre>\n\n\n.. |preout| raw:: html\n\n    </pre>\n\n"
-#  dir-tables: "{DIR[DTC,PERF,VPP,3N,HSW]}"
-#  data: "vpp-perf-results-3n-hsw"
-#  filter: "not 'NDRCHK' and not 'PDRCHK'"
-#  parameters:
-#  - "name"
-#  - "doc"
-#  - "level"
-#  - "parent"
-#  data-start-level: 3
+# VPP Performance Configuration 3n-hsw
+-
+  type: "file"
+  title: "VPP Performance Configuration 3n-hsw"
+  algorithm: "file_test_results"
+  output-file-ext: ".rst"
+  output-file: "{DIR[DTC,PERF,VPP,3N,HSW]}/vpp_performance_configuration_3n_hsw"
+  file-header: "\n.. |br| raw:: html\n\n    <br />\n\n\n.. |prein| raw:: html\n\n    <pre>\n\n\n.. |preout| raw:: html\n\n    </pre>\n\n"
+  dir-tables: "{DIR[DTC,PERF,VPP,3N,HSW]}"
+  data: "vpp-perf-results-3n-hsw"
+  filter: "not 'NDRCHK' and not 'PDRCHK'"
+  parameters:
+  - "name"
+  - "doc"
+  - "level"
+  - "parent"
+  data-start-level: 3
 
 # VPP Performance Configuration 3n-skx
 -
 #  - "parent"
 #  data-start-level: 3
 
-## VPP Performance Operational Data 3n-hsw
-#-
-#  type: "file"
-#  title: "VPP Performance Operational Data 3n-hsw"
-#  algorithm: "file_test_results"
-#  output-file-ext: ".rst"
-#  output-file: "{DIR[DTO,PERF,VPP,3N,HSW]}/vpp_performance_operational_data_3n_hsw"
-#  file-header: "\n.. |br| raw:: html\n\n    <br />\n\n\n.. |prein| raw:: html\n\n    <pre>\n\n\n.. |preout| raw:: html\n\n    </pre>\n\n"
-#  dir-tables: "{DIR[DTO,PERF,VPP,3N,HSW]}"
-#  data: "vpp-perf-results-3n-hsw"
-#  filter: "not 'NDRCHK' and not 'PDRCHK'"
-#  parameters:
-#  - "name"
-#  - "doc"
-#  - "level"
-#  - "parent"
-#  data-start-level: 3
+# VPP Performance Operational Data 3n-hsw
+-
+  type: "file"
+  title: "VPP Performance Operational Data 3n-hsw"
+  algorithm: "file_test_results"
+  output-file-ext: ".rst"
+  output-file: "{DIR[DTO,PERF,VPP,3N,HSW]}/vpp_performance_operational_data_3n_hsw"
+  file-header: "\n.. |br| raw:: html\n\n    <br />\n\n\n.. |prein| raw:: html\n\n    <pre>\n\n\n.. |preout| raw:: html\n\n    </pre>\n\n"
+  dir-tables: "{DIR[DTO,PERF,VPP,3N,HSW]}"
+  data: "vpp-perf-results-3n-hsw"
+  filter: "not 'NDRCHK' and not 'PDRCHK'"
+  parameters:
+  - "name"
+  - "doc"
+  - "level"
+  - "parent"
+  data-start-level: 3
 
 # VPP Performance Operational Data 3n-skx
 -
 #  layout:
 #    title: "l2sw-3n-hsw-x520-64b-2t2c-features-pdr"
 #    layout: "plot-throughput"
-#
-## Packet Throughput - VPP L2 3n-hsw-x710 base and scale
-#-
-#  type: "plot"
-#  title: "VPP Throughput: l2sw-3n-hsw-x710-64b-1t1c-base_and_scale-ndr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x710-64b-1t1c-base_and_scale-ndr"
-#  data: "plot-vpp-throughput-latency-3n-hsw"
-#  filter: "'NIC_Intel-X710' and
-#           '64B' and
-#           ('BASE' or 'SCALE') and
-#           'NDRPDR' and
-#           'ETH' and
-#           '1T1C' and
-#           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
-#           not 'VHOST' and
-#           not 'MEMIF'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "L2PATCH"
-#  - "L2XCFWD"
-#  - "L2BDMACLRN"
-#  - "FIB_10K"
-#  - "FIB_100K"
-#  - "FIB_1M"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "l2sw-3n-hsw-x710-64b-1t1c-base_and_scale-ndr"
-#    layout: "plot-throughput"
-#
-#-
-#  type: "plot"
-#  title: "VPP Throughput: l2sw-3n-hsw-x710-64b-1t1c-base_and_scale-pdr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x710-64b-1t1c-base_and_scale-pdr"
-#  data: "plot-vpp-throughput-latency-3n-hsw"
-#  filter: "'NIC_Intel-X710' and
-#           '64B' and
-#           ('BASE' or 'SCALE') and
-#           'NDRPDR' and
-#           'ETH' and
-#           '1T1C' and
-#           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
-#           not 'VHOST' and
-#           not 'MEMIF'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "L2PATCH"
-#  - "L2XCFWD"
-#  - "L2BDMACLRN"
-#  - "FIB_10K"
-#  - "FIB_100K"
-#  - "FIB_1M"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "l2sw-3n-hsw-x710-64b-1t1c-base_and_scale-pdr"
-#    layout: "plot-throughput"
-#
-#-
-#  type: "plot"
-#  title: "VPP Throughput: l2sw-3n-hsw-x710-64b-2t2c-base_and_scale-ndr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x710-64b-2t2c-base_and_scale-ndr"
-#  data: "plot-vpp-throughput-latency-3n-hsw"
-#  filter: "'NIC_Intel-X710' and
-#           '64B' and
-#           ('BASE' or 'SCALE') and
-#           'NDRPDR' and
-#           'ETH' and
-#           '2T2C' and
-#           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
-#           not 'VHOST' and
-#           not 'MEMIF'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "L2PATCH"
-#  - "L2XCFWD"
-#  - "L2BDMACLRN"
-#  - "FIB_10K"
-#  - "FIB_100K"
-#  - "FIB_1M"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "l2sw-3n-hsw-x710-64b-2t2c-base_and_scale-ndr"
-#    layout: "plot-throughput"
-#
-#-
-#  type: "plot"
-#  title: "VPP Throughput: l2sw-3n-hsw-x710-64b-2t2c-base_and_scale-pdr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x710-64b-2t2c-base_and_scale-pdr"
-#  data: "plot-vpp-throughput-latency-3n-hsw"
-#  filter: "'NIC_Intel-X710' and
-#           '64B' and
-#           ('BASE' or 'SCALE') and
+
+# Packet Throughput - VPP L2 3n-hsw-x520 features-oacl
+- type: "plot"
+  title: "VPP Throughput: l2sw-3n-hsw-x520-64b-1t1c-features-oacl-ndr"
+  algorithm: "plot_performance_box"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x520-64b-1t1c-features-oacl-ndr"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' and
+           '64B' and
+           'NDRPDR' and
+           '1T1C' and
+           'FEATURE' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
+           'OACL' and
+           ('ACL1' or 'ACL50') and
+           ('10K_FLOWS' or '10k_FLOWS') and
+           not 'MACIP' and
+           not 'VHOST' and
+           not 'MEMIF'"
+  parameters:
+  - "throughput"
+  - "parent"
+  - "tags"
+  traces:
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
+  layout:
+    title: "l2sw-3n-hsw-x520-64b-1t1c-features-oacl-ndr"
+    layout: "plot-throughput"
+
+- type: "plot"
+  title: "VPP Throughput: l2sw-3n-hsw-x520-64b-1t1c-features-oacl-pdr"
+  algorithm: "plot_performance_box"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x520-64b-1t1c-features-oacl-pdr"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' and
+           '64B' and
+           'NDRPDR' and
+           '1T1C' and
+           'FEATURE' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
+           'OACL' and
+           ('ACL1' or 'ACL50') and
+           ('10K_FLOWS' or '10k_FLOWS') and
+           not 'MACIP' and
+           not 'VHOST' and
+           not 'MEMIF'"
+  parameters:
+  - "throughput"
+  - "parent"
+  - "tags"
+  traces:
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
+  layout:
+    title: "l2sw-3n-hsw-x520-64b-1t1c-features-oacl-pdr"
+    layout: "plot-throughput"
+
+- type: "plot"
+  title: "VPP Throughput: l2sw-3n-hsw-x520-64b-2t2c-features-oacl-ndr"
+  algorithm: "plot_performance_box"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x520-64b-2t2c-features-oacl-ndr"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' and
+           '64B' and
+           'NDRPDR' and
+           '2T2C' and
+           'FEATURE' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
+           'OACL' and
+           ('ACL1' or 'ACL50') and
+           ('10K_FLOWS' or '10k_FLOWS') and
+           not 'MACIP' and
+           not 'VHOST' and
+           not 'MEMIF'"
+  parameters:
+  - "throughput"
+  - "parent"
+  - "tags"
+  traces:
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
+  layout:
+    title: "l2sw-3n-hsw-x520-64b-2t2c-features-oacl-ndr"
+    layout: "plot-throughput"
+
+- type: "plot"
+  title: "VPP Throughput: l2sw-3n-hsw-x520-64b-2t2c-features-oacl-pdr"
+  algorithm: "plot_performance_box"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x520-64b-2t2c-features-oacl-pdr"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' and
+           '64B' and
+           'NDRPDR' and
+           '2T2C' and
+           'FEATURE' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
+           'OACL' and
+           ('ACL1' or 'ACL50') and
+           ('10K_FLOWS' or '10k_FLOWS') and
+           not 'MACIP' and
+           not 'VHOST' and
+           not 'MEMIF'"
+  parameters:
+  - "throughput"
+  - "parent"
+  - "tags"
+  traces:
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
+  layout:
+    title: "l2sw-3n-hsw-x520-64b-2t2c-features-oacl-pdr"
+    layout: "plot-throughput"
+
+# Packet Throughput - VPP L2 3n-hsw-x520 features-macip
+- type: "plot"
+  title: "VPP Throughput: l2sw-3n-hsw-x520-64b-1t1c-features-macip-ndr"
+  algorithm: "plot_performance_box"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x520-64b-1t1c-features-macip-ndr"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' and
+           '64B' and
+           'NDRPDR' and
+           '1T1C' and
+           'FEATURE' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
+           'MACIP' and
+           ('ACL1' or 'ACL50') and
+           ('10K_FLOWS' or '10k_FLOWS') and
+           not 'VHOST' and
+           not 'MEMIF'"
+  parameters:
+  - "throughput"
+  - "parent"
+  - "tags"
+  traces:
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
+  layout:
+    title: "l2sw-3n-hsw-x520-64b-1t1c-features-macip-ndr"
+    layout: "plot-throughput"
+
+- type: "plot"
+  title: "VPP Throughput: l2sw-3n-hsw-x520-64b-1t1c-features-macip-pdr"
+  algorithm: "plot_performance_box"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x520-64b-1t1c-features-macip-pdr"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' and
+           '64B' and
+           'NDRPDR' and
+           '1T1C' and
+           'FEATURE' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
+           'MACIP' and
+           ('ACL1' or 'ACL50') and
+           ('10K_FLOWS' or '10k_FLOWS') and
+           not 'VHOST' and
+           not 'MEMIF'"
+  parameters:
+  - "throughput"
+  - "parent"
+  - "tags"
+  traces:
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
+  layout:
+    title: "l2sw-3n-hsw-x520-64b-1t1c-features-macip-pdr"
+    layout: "plot-throughput"
+
+- type: "plot"
+  title: "VPP Throughput: l2sw-3n-hsw-x520-64b-2t2c-features-macip-ndr"
+  algorithm: "plot_performance_box"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x520-64b-2t2c-features-macip-ndr"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' and
+           '64B' and
+           'NDRPDR' and
+           '2T2C' and
+           'FEATURE' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
+           'MACIP' and
+           ('ACL1' or 'ACL50') and
+           ('10K_FLOWS' or '10k_FLOWS') and
+           not 'VHOST' and
+           not 'MEMIF'"
+  parameters:
+  - "throughput"
+  - "parent"
+  - "tags"
+  traces:
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
+  layout:
+    title: "l2sw-3n-hsw-x520-64b-2t2c-features-macip-ndr"
+    layout: "plot-throughput"
+
+- type: "plot"
+  title: "VPP Throughput: l2sw-3n-hsw-x520-64b-2t2c-features-macip-pdr"
+  algorithm: "plot_performance_box"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x520-64b-2t2c-features-macip-pdr"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' and
+           '64B' and
+           'NDRPDR' and
+           '2T2C' and
+           'FEATURE' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
+           'MACIP' and
+           ('ACL1' or 'ACL50') and
+           ('10K_FLOWS' or '10k_FLOWS') and
+           not 'VHOST' and
+           not 'MEMIF'"
+  parameters:
+  - "throughput"
+  - "parent"
+  - "tags"
+  traces:
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
+  layout:
+    title: "l2sw-3n-hsw-x520-64b-2t2c-features-macip-pdr"
+    layout: "plot-throughput"
+
+## Packet Throughput - VPP L2 3n-hsw-x710 base and scale
+#-
+#  type: "plot"
+#  title: "VPP Throughput: l2sw-3n-hsw-x710-64b-1t1c-base_and_scale-ndr"
+#  algorithm: "plot_performance_box"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x710-64b-1t1c-base_and_scale-ndr"
+#  data: "plot-vpp-throughput-latency-3n-hsw"
+#  filter: "'NIC_Intel-X710' and
+#           '64B' and
+#           ('BASE' or 'SCALE') and
 #           'NDRPDR' and
 #           'ETH' and
-#           '2T2C' and
+#           '1T1C' and
 #           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
 #           not 'VHOST' and
 #           not 'MEMIF'"
 #    boxpoints: "outliers"
 #    whiskerwidth: 0
 #  layout:
-#    title: "l2sw-3n-hsw-x710-64b-2t2c-base_and_scale-pdr"
+#    title: "l2sw-3n-hsw-x710-64b-1t1c-base_and_scale-ndr"
 #    layout: "plot-throughput"
 #
-## Packet Throughput - VPP L2 3n-hsw-x710 features
 #-
 #  type: "plot"
-#  title: "VPP Throughput: l2sw-3n-hsw-x710-64b-1t1c-features-ndr"
+#  title: "VPP Throughput: l2sw-3n-hsw-x710-64b-1t1c-base_and_scale-pdr"
 #  algorithm: "plot_performance_box"
 #  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x710-64b-1t1c-features-ndr"
+#  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x710-64b-1t1c-base_and_scale-pdr"
 #  data: "plot-vpp-throughput-latency-3n-hsw"
 #  filter: "'NIC_Intel-X710' and
 #           '64B' and
+#           ('BASE' or 'SCALE') and
 #           'NDRPDR' and
+#           'ETH' and
 #           '1T1C' and
-#           (('L2BDMACLRN' and ('L2BDBASE' or 'DOT1Q')) or ('L2XCFWD' and ('L2XCBASE' or 'DOT1Q'))) and
-#           not 'ACL' and
+#           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
 #           not 'VHOST' and
-#           not 'L2OVRLAY' and
 #           not 'MEMIF'"
 #  parameters:
 #  - "throughput"
 #  - "parent"
 #  - "tags"
 #  sort:
-#  - "L2XCBASE"    # l2xcbase
-#  - "L2BDBASE"    # l2bdbase
-#  - "L2XCFWD"     # dot1q-l2xcbase
-#  - "L2BDMACLRN"  # dot1q-l2bdbase
+#  - "L2PATCH"
+#  - "L2XCFWD"
+#  - "L2BDMACLRN"
+#  - "FIB_10K"
+#  - "FIB_100K"
+#  - "FIB_1M"
 #  traces:
 #    hoverinfo: "x+y"
 #    boxpoints: "outliers"
 #    whiskerwidth: 0
 #  layout:
-#    title: "l2sw-3n-hsw-x710-64b-1t1c-features-ndr"
+#    title: "l2sw-3n-hsw-x710-64b-1t1c-base_and_scale-pdr"
 #    layout: "plot-throughput"
 #
 #-
 #  type: "plot"
-#  title: "VPP Throughput: l2sw-3n-hsw-x710-64b-1t1c-features-pdr"
+#  title: "VPP Throughput: l2sw-3n-hsw-x710-64b-2t2c-base_and_scale-ndr"
 #  algorithm: "plot_performance_box"
 #  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x710-64b-1t1c-features-pdr"
+#  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x710-64b-2t2c-base_and_scale-ndr"
 #  data: "plot-vpp-throughput-latency-3n-hsw"
 #  filter: "'NIC_Intel-X710' and
 #           '64B' and
+#           ('BASE' or 'SCALE') and
 #           'NDRPDR' and
-#           '1T1C' and
-#           (('L2BDMACLRN' and ('L2BDBASE' or 'DOT1Q')) or ('L2XCFWD' and ('L2XCBASE' or 'DOT1Q'))) and
-#           not 'ACL' and
+#           'ETH' and
+#           '2T2C' and
+#           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
 #           not 'VHOST' and
-#           not 'L2OVRLAY' and
 #           not 'MEMIF'"
 #  parameters:
 #  - "throughput"
 #  - "parent"
 #  - "tags"
 #  sort:
-#  - "L2XCBASE"    # l2xcbase
-#  - "L2BDBASE"    # l2bdbase
-#  - "L2XCFWD"     # dot1q-l2xcbase
-#  - "L2BDMACLRN"  # dot1q-l2bdbase
+#  - "L2PATCH"
+#  - "L2XCFWD"
+#  - "L2BDMACLRN"
+#  - "FIB_10K"
+#  - "FIB_100K"
+#  - "FIB_1M"
 #  traces:
 #    hoverinfo: "x+y"
 #    boxpoints: "outliers"
 #    whiskerwidth: 0
 #  layout:
-#    title: "l2sw-3n-hsw-x710-64b-1t1c-features-pdr"
+#    title: "l2sw-3n-hsw-x710-64b-2t2c-base_and_scale-ndr"
 #    layout: "plot-throughput"
 #
 #-
 #  type: "plot"
-#  title: "VPP Throughput: l2sw-3n-hsw-x710-64b-2t2c-features-ndr"
+#  title: "VPP Throughput: l2sw-3n-hsw-x710-64b-2t2c-base_and_scale-pdr"
 #  algorithm: "plot_performance_box"
 #  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x710-64b-2t2c-features-ndr"
+#  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x710-64b-2t2c-base_and_scale-pdr"
 #  data: "plot-vpp-throughput-latency-3n-hsw"
 #  filter: "'NIC_Intel-X710' and
 #           '64B' and
+#           ('BASE' or 'SCALE') and
 #           'NDRPDR' and
+#           'ETH' and
 #           '2T2C' and
-#           (('L2BDMACLRN' and ('L2BDBASE' or 'DOT1Q')) or ('L2XCFWD' and ('L2XCBASE' or 'DOT1Q'))) and
-#           not 'ACL' and
+#           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
 #           not 'VHOST' and
-#           not 'L2OVRLAY' and
 #           not 'MEMIF'"
 #  parameters:
 #  - "throughput"
 #  - "parent"
 #  - "tags"
 #  sort:
-#  - "L2XCBASE"    # l2xcbase
-#  - "L2BDBASE"    # l2bdbase
-#  - "L2XCFWD"     # dot1q-l2xcbase
-#  - "L2BDMACLRN"  # dot1q-l2bdbase
+#  - "L2PATCH"
+#  - "L2XCFWD"
+#  - "L2BDMACLRN"
+#  - "FIB_10K"
+#  - "FIB_100K"
+#  - "FIB_1M"
 #  traces:
 #    hoverinfo: "x+y"
 #    boxpoints: "outliers"
 #    whiskerwidth: 0
 #  layout:
-#    title: "l2sw-3n-hsw-x710-64b-2t2c-features-ndr"
+#    title: "l2sw-3n-hsw-x710-64b-2t2c-base_and_scale-pdr"
 #    layout: "plot-throughput"
 #
+## Packet Throughput - VPP L2 3n-hsw-x710 features
 #-
 #  type: "plot"
-#  title: "VPP Throughput: l2sw-3n-hsw-x710-64b-2t2c-features-pdr"
+#  title: "VPP Throughput: l2sw-3n-hsw-x710-64b-1t1c-features-ndr"
 #  algorithm: "plot_performance_box"
 #  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x710-64b-2t2c-features-pdr"
+#  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x710-64b-1t1c-features-ndr"
 #  data: "plot-vpp-throughput-latency-3n-hsw"
 #  filter: "'NIC_Intel-X710' and
 #           '64B' and
 #           'NDRPDR' and
-#           '2T2C' and
+#           '1T1C' and
 #           (('L2BDMACLRN' and ('L2BDBASE' or 'DOT1Q')) or ('L2XCFWD' and ('L2XCBASE' or 'DOT1Q'))) and
 #           not 'ACL' and
 #           not 'VHOST' and
 #    boxpoints: "outliers"
 #    whiskerwidth: 0
 #  layout:
-#    title: "l2sw-3n-hsw-x710-64b-2t2c-features-pdr"
+#    title: "l2sw-3n-hsw-x710-64b-1t1c-features-ndr"
 #    layout: "plot-throughput"
 #
-## Packet Throughput - VPP L2 3n-hsw-xl710 base and scale
 #-
 #  type: "plot"
-#  title: "VPP Throughput: l2sw-3n-hsw-xl710-64b-1t1c-base-ndr"
+#  title: "VPP Throughput: l2sw-3n-hsw-x710-64b-1t1c-features-pdr"
 #  algorithm: "plot_performance_box"
 #  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-xl710-64b-1t1c-base-ndr"
+#  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x710-64b-1t1c-features-pdr"
 #  data: "plot-vpp-throughput-latency-3n-hsw"
-#  filter: "'NIC_Intel-XL710' and
+#  filter: "'NIC_Intel-X710' and
+#           '64B' and
+#           'NDRPDR' and
+#           '1T1C' and
+#           (('L2BDMACLRN' and ('L2BDBASE' or 'DOT1Q')) or ('L2XCFWD' and ('L2XCBASE' or 'DOT1Q'))) and
+#           not 'ACL' and
+#           not 'VHOST' and
+#           not 'L2OVRLAY' and
+#           not 'MEMIF'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+#  sort:
+#  - "L2XCBASE"    # l2xcbase
+#  - "L2BDBASE"    # l2bdbase
+#  - "L2XCFWD"     # dot1q-l2xcbase
+#  - "L2BDMACLRN"  # dot1q-l2bdbase
+#  traces:
+#    hoverinfo: "x+y"
+#    boxpoints: "outliers"
+#    whiskerwidth: 0
+#  layout:
+#    title: "l2sw-3n-hsw-x710-64b-1t1c-features-pdr"
+#    layout: "plot-throughput"
+#
+#-
+#  type: "plot"
+#  title: "VPP Throughput: l2sw-3n-hsw-x710-64b-2t2c-features-ndr"
+#  algorithm: "plot_performance_box"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x710-64b-2t2c-features-ndr"
+#  data: "plot-vpp-throughput-latency-3n-hsw"
+#  filter: "'NIC_Intel-X710' and
+#           '64B' and
+#           'NDRPDR' and
+#           '2T2C' and
+#           (('L2BDMACLRN' and ('L2BDBASE' or 'DOT1Q')) or ('L2XCFWD' and ('L2XCBASE' or 'DOT1Q'))) and
+#           not 'ACL' and
+#           not 'VHOST' and
+#           not 'L2OVRLAY' and
+#           not 'MEMIF'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+#  sort:
+#  - "L2XCBASE"    # l2xcbase
+#  - "L2BDBASE"    # l2bdbase
+#  - "L2XCFWD"     # dot1q-l2xcbase
+#  - "L2BDMACLRN"  # dot1q-l2bdbase
+#  traces:
+#    hoverinfo: "x+y"
+#    boxpoints: "outliers"
+#    whiskerwidth: 0
+#  layout:
+#    title: "l2sw-3n-hsw-x710-64b-2t2c-features-ndr"
+#    layout: "plot-throughput"
+#
+#-
+#  type: "plot"
+#  title: "VPP Throughput: l2sw-3n-hsw-x710-64b-2t2c-features-pdr"
+#  algorithm: "plot_performance_box"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x710-64b-2t2c-features-pdr"
+#  data: "plot-vpp-throughput-latency-3n-hsw"
+#  filter: "'NIC_Intel-X710' and
+#           '64B' and
+#           'NDRPDR' and
+#           '2T2C' and
+#           (('L2BDMACLRN' and ('L2BDBASE' or 'DOT1Q')) or ('L2XCFWD' and ('L2XCBASE' or 'DOT1Q'))) and
+#           not 'ACL' and
+#           not 'VHOST' and
+#           not 'L2OVRLAY' and
+#           not 'MEMIF'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+#  sort:
+#  - "L2XCBASE"    # l2xcbase
+#  - "L2BDBASE"    # l2bdbase
+#  - "L2XCFWD"     # dot1q-l2xcbase
+#  - "L2BDMACLRN"  # dot1q-l2bdbase
+#  traces:
+#    hoverinfo: "x+y"
+#    boxpoints: "outliers"
+#    whiskerwidth: 0
+#  layout:
+#    title: "l2sw-3n-hsw-x710-64b-2t2c-features-pdr"
+#    layout: "plot-throughput"
+#
+## Packet Throughput - VPP L2 3n-hsw-xl710 base and scale
+#-
+#  type: "plot"
+#  title: "VPP Throughput: l2sw-3n-hsw-xl710-64b-1t1c-base-ndr"
+#  algorithm: "plot_performance_box"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-xl710-64b-1t1c-base-ndr"
+#  data: "plot-vpp-throughput-latency-3n-hsw"
+#  filter: "'NIC_Intel-XL710' and
 #           '64B' and
 #           'BASE' and
 #           'NDRPDR' and
 #  layout:
 #    title: "ip4-3n-hsw-x520-64b-2t2c-features-iacl-pdr"
 #    layout: "plot-throughput"
-#
-## Packet Throughput - VPP IPv4 3n-hsw-x520 features oacl
+
+# Packet Throughput - VPP IPv4 3n-hsw-x520 features oacl
+-
+  type: "plot"
+  title: "VPP Throughput: ip4-3n-hsw-x520-64b-1t1c-features-oacl-ndr"
+  algorithm: "plot_performance_box"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-1t1c-features-oacl-ndr"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' and
+           '64B' and
+           'NDRPDR' and
+           '1T1C' and
+           'IP4FWD' and
+           ('OACL' and ('ACL10' or 'ACL50') and '10k_FLOWS' or 'IP4BASE') and
+           not 'IPSEC' and
+           not 'DOT1Q' and
+           not 'VHOST'"
+  parameters:
+  - "throughput"
+  - "parent"
+  - "tags"
+  sort:
+  - "IP4BASE"
+  - "ACL_STATELESS"
+  - "ACL_STATEFUL"
+  - "ACL_STATELESS"
+  - "ACL_STATEFUL"
+  traces:
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
+  layout:
+    title: "ip4-3n-hsw-x520-64b-1t1c-features-oacl-ndr"
+    layout: "plot-throughput"
+
+-
+  type: "plot"
+  title: "VPP Throughput: ip4-3n-hsw-x520-64b-1t1c-features-oacl-pdr"
+  algorithm: "plot_performance_box"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-1t1c-features-oacl-pdr"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' and
+           '64B' and
+           'NDRPDR' and
+           '1T1C' and
+           'IP4FWD' and
+           ('OACL' and ('ACL10' or 'ACL50') and '10k_FLOWS' or 'IP4BASE') and
+           not 'IPSEC' and
+           not 'DOT1Q' and
+           not 'VHOST'"
+  parameters:
+  - "throughput"
+  - "parent"
+  - "tags"
+  sort:
+  - "IP4BASE"
+  - "ACL_STATELESS"
+  - "ACL_STATEFUL"
+  - "ACL_STATELESS"
+  - "ACL_STATEFUL"
+  traces:
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
+  layout:
+    title: "ip4-3n-hsw-x520-64b-1t1c-features-oacl-pdr"
+    layout: "plot-throughput"
+
+-
+  type: "plot"
+  title: "VPP Throughput: ip4-3n-hsw-x520-64b-2t2c-features-oacl-ndr"
+  algorithm: "plot_performance_box"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-2t2c-features-oacl-ndr"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' and
+           '64B' and
+           'NDRPDR' and
+           '2T2C' and
+           'IP4FWD' and
+           ('OACL' and ('ACL10' or 'ACL50') and '10k_FLOWS' or 'IP4BASE') and
+           not 'IPSEC' and
+           not 'DOT1Q' and
+           not 'VHOST'"
+  parameters:
+  - "throughput"
+  - "parent"
+  - "tags"
+  sort:
+  - "IP4BASE"
+  - "ACL_STATELESS"
+  - "ACL_STATEFUL"
+  - "ACL_STATELESS"
+  - "ACL_STATEFUL"
+  traces:
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
+  layout:
+    title: "ip4-3n-hsw-x520-64b-2t2c-features-oacl-ndr"
+    layout: "plot-throughput"
+
+-
+  type: "plot"
+  title: "VPP Throughput: ip4-3n-hsw-x520-64b-2t2c-features-oacl-pdr"
+  algorithm: "plot_performance_box"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-2t2c-features-oacl-pdr"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' and
+           '64B' and
+           'NDRPDR' and
+           '2T2C' and
+           'IP4FWD' and
+           ('OACL' and ('ACL10' or 'ACL50') and '10k_FLOWS' or 'IP4BASE') and
+           not 'IPSEC' and
+           not 'DOT1Q' and
+           not 'VHOST'"
+  parameters:
+  - "throughput"
+  - "parent"
+  - "tags"
+  sort:
+  - "IP4BASE"
+  - "ACL_STATELESS"
+  - "ACL_STATEFUL"
+  - "ACL_STATELESS"
+  - "ACL_STATEFUL"
+  traces:
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
+  layout:
+    title: "ip4-3n-hsw-x520-64b-2t2c-features-oacl-pdr"
+    layout: "plot-throughput"
+
+## Packet Throughput - VPP IPv4 3n-hsw-x710 base and scale
 #-
 #  type: "plot"
-#  title: "VPP Throughput: ip4-3n-hsw-x520-64b-1t1c-features-oacl-ndr"
+#  title: "VPP Throughput: ip4-3n-hsw-x710-64b-1t1c-base_and_scale-ndr"
 #  algorithm: "plot_performance_box"
 #  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-1t1c-features-oacl-ndr"
+#  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-1t1c-base_and_scale-ndr"
 #  data: "plot-vpp-throughput-latency-3n-hsw"
-#  filter: "'NIC_Intel-X520-DA2' and
+#  filter: "'NIC_Intel-X710' and
 #           '64B' and
+#           ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
 #           'NDRPDR' and
 #           '1T1C' and
 #           'IP4FWD' and
-#           ('OACL' and ('ACL10' or 'ACL50') and '10k_FLOWS' or 'IP4BASE') and
 #           not 'IPSEC' and
 #           not 'DOT1Q' and
 #           not 'VHOST'"
 #  - "tags"
 #  sort:
 #  - "IP4BASE"
-#  - "ACL_STATELESS"
-#  - "ACL_STATEFUL"
-#  - "ACL_STATELESS"
-#  - "ACL_STATEFUL"
+#  - "FIB_20K"
+#  - "FIB_200K"
+#  - "FIB_2M"
 #  traces:
 #    hoverinfo: "x+y"
 #    boxpoints: "outliers"
 #    whiskerwidth: 0
 #  layout:
-#    title: "ip4-3n-hsw-x520-64b-1t1c-features-oacl-ndr"
+#    title: "ip4-3n-hsw-x710-64b-1t1c-base_and_scale-ndr"
 #    layout: "plot-throughput"
 #
 #-
 #  type: "plot"
-#  title: "VPP Throughput: ip4-3n-hsw-x520-64b-1t1c-features-oacl-pdr"
+#  title: "VPP Throughput: ip4-3n-hsw-x710-64b-1t1c-base_and_scale-pdr"
 #  algorithm: "plot_performance_box"
 #  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-1t1c-features-oacl-pdr"
+#  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-1t1c-base_and_scale-pdr"
 #  data: "plot-vpp-throughput-latency-3n-hsw"
-#  filter: "'NIC_Intel-X520-DA2' and
+#  filter: "'NIC_Intel-X710' and
 #           '64B' and
+#           ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
 #           'NDRPDR' and
 #           '1T1C' and
 #           'IP4FWD' and
-#           ('OACL' and ('ACL10' or 'ACL50') and '10k_FLOWS' or 'IP4BASE') and
 #           not 'IPSEC' and
 #           not 'DOT1Q' and
 #           not 'VHOST'"
 #  - "tags"
 #  sort:
 #  - "IP4BASE"
-#  - "ACL_STATELESS"
-#  - "ACL_STATEFUL"
-#  - "ACL_STATELESS"
-#  - "ACL_STATEFUL"
+#  - "FIB_20K"
+#  - "FIB_200K"
+#  - "FIB_2M"
 #  traces:
 #    hoverinfo: "x+y"
 #    boxpoints: "outliers"
 #    whiskerwidth: 0
 #  layout:
-#    title: "ip4-3n-hsw-x520-64b-1t1c-features-oacl-pdr"
+#    title: "ip4-3n-hsw-x710-64b-1t1c-base_and_scale-pdr"
 #    layout: "plot-throughput"
 #
 #-
 #  type: "plot"
-#  title: "VPP Throughput: ip4-3n-hsw-x520-64b-2t2c-features-oacl-ndr"
+#  title: "VPP Throughput: ip4-3n-hsw-x710-64b-2t2c-base_and_scale-ndr"
 #  algorithm: "plot_performance_box"
 #  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-2t2c-features-oacl-ndr"
+#  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-2t2c-base_and_scale-ndr"
 #  data: "plot-vpp-throughput-latency-3n-hsw"
-#  filter: "'NIC_Intel-X520-DA2' and
+#  filter: "'NIC_Intel-X710' and
 #           '64B' and
-#           'NDRPDR' and
-#           '2T2C' and
-#           'IP4FWD' and
-#           ('OACL' and ('ACL10' or 'ACL50') and '10k_FLOWS' or 'IP4BASE') and
-#           not 'IPSEC' and
-#           not 'DOT1Q' and
-#           not 'VHOST'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "IP4BASE"
-#  - "ACL_STATELESS"
-#  - "ACL_STATEFUL"
-#  - "ACL_STATELESS"
-#  - "ACL_STATEFUL"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "ip4-3n-hsw-x520-64b-2t2c-features-oacl-ndr"
-#    layout: "plot-throughput"
-#
-#-
-#  type: "plot"
-#  title: "VPP Throughput: ip4-3n-hsw-x520-64b-2t2c-features-oacl-pdr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-2t2c-features-oacl-pdr"
-#  data: "plot-vpp-throughput-latency-3n-hsw"
-#  filter: "'NIC_Intel-X520-DA2' and
-#           '64B' and
-#           'NDRPDR' and
-#           '2T2C' and
-#           'IP4FWD' and
-#           ('OACL' and ('ACL10' or 'ACL50') and '10k_FLOWS' or 'IP4BASE') and
-#           not 'IPSEC' and
-#           not 'DOT1Q' and
-#           not 'VHOST'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "IP4BASE"
-#  - "ACL_STATELESS"
-#  - "ACL_STATEFUL"
-#  - "ACL_STATELESS"
-#  - "ACL_STATEFUL"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "ip4-3n-hsw-x520-64b-2t2c-features-oacl-pdr"
-#    layout: "plot-throughput"
-#
-## Packet Throughput - VPP IPv4 3n-hsw-x710 base and scale
-#-
-#  type: "plot"
-#  title: "VPP Throughput: ip4-3n-hsw-x710-64b-1t1c-base_and_scale-ndr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-1t1c-base_and_scale-ndr"
-#  data: "plot-vpp-throughput-latency-3n-hsw"
-#  filter: "'NIC_Intel-X710' and
-#           '64B' and
-#           ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
-#           'NDRPDR' and
-#           '1T1C' and
-#           'IP4FWD' and
-#           not 'IPSEC' and
-#           not 'DOT1Q' and
-#           not 'VHOST'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "IP4BASE"
-#  - "FIB_20K"
-#  - "FIB_200K"
-#  - "FIB_2M"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "ip4-3n-hsw-x710-64b-1t1c-base_and_scale-ndr"
-#    layout: "plot-throughput"
-#
-#-
-#  type: "plot"
-#  title: "VPP Throughput: ip4-3n-hsw-x710-64b-1t1c-base_and_scale-pdr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-1t1c-base_and_scale-pdr"
-#  data: "plot-vpp-throughput-latency-3n-hsw"
-#  filter: "'NIC_Intel-X710' and
-#           '64B' and
-#           ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
-#           'NDRPDR' and
-#           '1T1C' and
-#           'IP4FWD' and
-#           not 'IPSEC' and
-#           not 'DOT1Q' and
-#           not 'VHOST'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "IP4BASE"
-#  - "FIB_20K"
-#  - "FIB_200K"
-#  - "FIB_2M"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "ip4-3n-hsw-x710-64b-1t1c-base_and_scale-pdr"
-#    layout: "plot-throughput"
-#
-#-
-#  type: "plot"
-#  title: "VPP Throughput: ip4-3n-hsw-x710-64b-2t2c-base_and_scale-ndr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-2t2c-base_and_scale-ndr"
-#  data: "plot-vpp-throughput-latency-3n-hsw"
-#  filter: "'NIC_Intel-X710' and
-#           '64B' and
-#           ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
+#           ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
 #           'NDRPDR' and
 #           '2T2C' and
 #           'IP4FWD' and
 #    title: "ip6tun-3n-hsw-x520-78b-2t2c-base-pdr"
 #    layout: "plot-throughput"
 #
-#################################################################################
-#
-## Packet Throughput - VPP IPSec 3n-hsw-xl710 base
-#-
-#  type: "plot"
-#  title: "VPP Throughput: ipsec-3n-hsw-xl710-64b-1t1c-base-ndr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/ipsec-3n-hsw-xl710-64b-1t1c-base-ndr"
-#  data: "plot-vpp-throughput-latency-3n-hsw"
-#  filter: "'NIC_Intel-XL710' and
-#           '64B' and
-#           'IP4FWD' and
-#           'NDRPDR' and
-#           'BASE' and
-#           '1T1C' and
-#           'IPSECHW' and
-#           ('IPSECTRAN' or 'IPSECTUN') and
-#           not 'VHOST'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "ipsec-3n-hsw-xl710-64b-1t1c-base-ndr"
-#    layout: "plot-throughput"
-#
-#-
-#  type: "plot"
-#  title: "VPP Throughput: ipsec-3n-hsw-xl710-64b-1t1c-base-pdr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/ipsec-3n-hsw-xl710-64b-1t1c-base-pdr"
-#  data: "plot-vpp-throughput-latency-3n-hsw"
-#  filter: "'NIC_Intel-XL710' and
-#           '64B' and
-#           'IP4FWD' and
-#           'NDRPDR' and
-#           'BASE' and
-#           '1T1C' and
-#           'IPSECHW' and
-#           ('IPSECTRAN' or 'IPSECTUN') and
-#           not 'VHOST'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "ipsec-3n-hsw-xl710-64b-1t1c-base-pdr"
-#    layout: "plot-throughput"
-#
-#-
-#  type: "plot"
-#  title: "VPP Throughput: ipsec-3n-hsw-xl710-64b-2t2c-base-ndr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/ipsec-3n-hsw-xl710-64b-2t2c-base-ndr"
-#  data: "plot-vpp-throughput-latency-3n-hsw"
-#  filter: "'NIC_Intel-XL710' and
-#           '64B' and
-#           'IP4FWD' and
-#           'NDRPDR' and
-#           'BASE' and
-#           '2T2C' and
-#           'IPSECHW' and
-#           ('IPSECTRAN' or 'IPSECTUN') and
-#           not 'VHOST'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "ipsec-3n-hsw-xl710-64b-2t2c-base-ndr"
-#    layout: "plot-throughput"
-#
-#-
-#  type: "plot"
-#  title: "VPP Throughput: ipsec-3n-hsw-xl710-64b-2t2c-base-pdr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/ipsec-3n-hsw-xl710-64b-2t2c-base-pdr"
-#  data: "plot-vpp-throughput-latency-3n-hsw"
-#  filter: "'NIC_Intel-XL710' and
-#           '64B' and
-#           'IP4FWD' and
-#           'NDRPDR' and
-#           'BASE' and
-#           '2T2C' and
-#           'IPSECHW' and
-#           ('IPSECTRAN' or 'IPSECTUN') and
-#           not 'VHOST'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "ipsec-3n-hsw-xl710-64b-2t2c-base-pdr"
-#    layout: "plot-throughput"
-#
-## Packet Throughput - VPP IPSec 3n-hsw-xl710 scale
-#-
-#  type: "plot"
-#  title: "VPP Throughput: ipsec-3n-hsw-xl710-64b-1t1c-scale-ndr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/ipsec-3n-hsw-xl710-64b-1t1c-scale-ndr"
-#  data: "plot-vpp-throughput-latency-3n-hsw"
-#  filter: "'NIC_Intel-XL710' and
-#           '64B' and
-#           'IP4FWD' and
-#           'NDRPDR' and
-#           'SCALE' and
-#           '1T1C' and
-#           'IPSECHW' and
-#           ('IPSECTRAN' or 'IPSECTUN') and
-#           not 'VHOST'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "ipsec-3n-hsw-xl710-64b-1t1c-scale-ndr"
-#    layout: "plot-throughput"
-#
-#-
-#  type: "plot"
-#  title: "VPP Throughput: ipsec-3n-hsw-xl710-64b-1t1c-scale-pdr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/ipsec-3n-hsw-xl710-64b-1t1c-scale-pdr"
-#  data: "plot-vpp-throughput-latency-3n-hsw"
-#  filter: "'NIC_Intel-XL710' and
-#           '64B' and
-#           'IP4FWD' and
-#           'NDRPDR' and
-#           'SCALE' and
-#           '1T1C' and
-#           'IPSECHW' and
-#           ('IPSECTRAN' or 'IPSECTUN') and
-#           not 'VHOST'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "ipsec-3n-hsw-xl710-64b-1t1c-scale-pdr"
-#    layout: "plot-throughput"
-#
-#-
-#  type: "plot"
-#  title: "VPP Throughput: ipsec-3n-hsw-xl710-64b-2t2c-scale-ndr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/ipsec-3n-hsw-xl710-64b-2t2c-scale-ndr"
-#  data: "plot-vpp-throughput-latency-3n-hsw"
-#  filter: "'NIC_Intel-XL710' and
-#           '64B' and
-#           'IP4FWD' and
-#           'NDRPDR' and
-#           'SCALE' and
-#           '2T2C' and
-#           'IPSECHW' and
-#           ('IPSECTRAN' or 'IPSECTUN') and
-#           not 'VHOST'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "ipsec-3n-hsw-xl710-64b-2t2c-scale-ndr"
-#    layout: "plot-throughput"
-#
-#-
-#  type: "plot"
-#  title: "VPP Throughput: ipsec-3n-hsw-xl710-64b-2t2c-scale-pdr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/ipsec-3n-hsw-xl710-64b-2t2c-scale-pdr"
-#  data: "plot-vpp-throughput-latency-3n-hsw"
-#  filter: "'NIC_Intel-XL710' and
-#           '64B' and
-#           'IP4FWD' and
-#           'NDRPDR' and
-#           'SCALE' and
-#           '2T2C' and
-#           'IPSECHW' and
-#           ('IPSECTRAN' or 'IPSECTUN') and
-#           not 'VHOST'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "ipsec-3n-hsw-xl710-64b-2t2c-scale-pdr"
-#    layout: "plot-throughput"
-#
-## Packet Throughput - VPP IPSec 3n-hsw-xl710 SW
-#-
-#  type: "plot"
-#  title: "VPP Throughput: ipsec-3n-hsw-xl710-64b-1t1c-sw-ndr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/ipsec-3n-hsw-xl710-64b-1t1c-sw-ndr"
-#  data: "plot-vpp-throughput-latency-3n-hsw"
-#  filter: "'NIC_Intel-XL710' and
-#           '64B' and
-#           'IP4FWD' and
-#           'NDRPDR' and
-#           '1T1C' and
-#           'IPSECSW' and
-#           ('IPSECTRAN' or 'IPSECTUN') and
-#           not 'VHOST'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "ipsec-3n-hsw-xl710-64b-1t1c-sw-ndr"
-#    layout: "plot-throughput"
-#
-#-
-#  type: "plot"
-#  title: "VPP Throughput: ipsec-3n-hsw-xl710-64b-1t1c-sw-pdr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/ipsec-3n-hsw-xl710-64b-1t1c-sw-pdr"
-#  data: "plot-vpp-throughput-latency-3n-hsw"
-#  filter: "'NIC_Intel-XL710' and
-#           '64B' and
-#           'IP4FWD' and
-#           'NDRPDR' and
-#           '1T1C' and
-#           'IPSECSW' and
-#           ('IPSECTRAN' or 'IPSECTUN') and
-#           not 'VHOST'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "ipsec-3n-hsw-xl710-64b-1t1c-sw-pdr"
-#    layout: "plot-throughput"
-#
-#-
-#  type: "plot"
-#  title: "VPP Throughput: ipsec-3n-hsw-xl710-64b-2t2c-sw-ndr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/ipsec-3n-hsw-xl710-64b-2t2c-sw-ndr"
-#  data: "plot-vpp-throughput-latency-3n-hsw"
-#  filter: "'NIC_Intel-XL710' and
-#           '64B' and
-#           'IP4FWD' and
-#           'NDRPDR' and
-#           '2T2C' and
-#           'IPSECSW' and
-#           ('IPSECTRAN' or 'IPSECTUN') and
-#           not 'VHOST'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "ipsec-3n-hsw-xl710-64b-2t2c-sw-ndr"
-#    layout: "plot-throughput"
-#
-#-
-#  type: "plot"
-#  title: "VPP Throughput: ipsec-3n-hsw-xl710-64b-2t2c-sw-pdr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/ipsec-3n-hsw-xl710-64b-2t2c-sw-pdr"
-#  data: "plot-vpp-throughput-latency-3n-hsw"
-#  filter: "'NIC_Intel-XL710' and
-#           '64B' and
-#           'IP4FWD' and
-#           'NDRPDR' and
-#           '2T2C' and
-#           'IPSECSW' and
-#           ('IPSECTRAN' or 'IPSECTUN') and
-#           not 'VHOST'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "ipsec-3n-hsw-xl710-64b-2t2c-sw-pdr"
-#    layout: "plot-throughput"
-#
-#################################################################################
-#
-## Packet Throughput - VPP SRv6 3n-hsw-x520
-#-
-#  type: "plot"
-#  title: "VPP Throughput: srv6-3n-hsw-x520-78b-1t1c-features-ndr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/srv6-3n-hsw-x520-78b-1t1c-features-ndr"
-#  data: "plot-vpp-throughput-latency-3n-hsw"
-#  filter: "'NIC_Intel-X520-DA2' and
-#           '78B' and
-#           'FEATURE' and
-#           'NDRPDR' and
-#           '1T1C' and
-#           'IP6FWD' and
-#           'SRv6'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "srv6-3n-hsw-x520-78b-1t1c-features-ndr"
-#    layout: "plot-throughput"
-#
-#-
-#  type: "plot"
-#  title: "VPP Throughput: srv6-3n-hsw-x520-78b-1t1c-features-pdr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/srv6-3n-hsw-x520-78b-1t1c-features-pdr"
-#  data: "plot-vpp-throughput-latency-3n-hsw"
-#  filter: "'NIC_Intel-X520-DA2' and
-#           '78B' and
-#           'FEATURE' and
-#           'NDRPDR' and
-#           '1T1C' and
-#           'IP6FWD' and
-#           'SRv6'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "srv6-3n-hsw-x520-78b-1t1c-features-pdr"
-#    layout: "plot-throughput"
-#
-#-
-#  type: "plot"
-#  title: "VPP Throughput: srv6-3n-hsw-x520-78b-2t2c-features-ndr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/srv6-3n-hsw-x520-78b-2t2c-features-ndr"
-#  data: "plot-vpp-throughput-latency-3n-hsw"
-#  filter: "'NIC_Intel-X520-DA2' and
-#           '78B' and
-#           'FEATURE' and
-#           'NDRPDR' and
-#           '2T2C' and
-#           'IP6FWD' and
-#           'SRv6'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "srv6-3n-hsw-x520-78b-2t2c-features-ndr"
-#    layout: "plot-throughput"
-#
-#-
-#  type: "plot"
-#  title: "VPP Throughput: srv6-3n-hsw-x520-78b-2t2c-features-pdr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/srv6-3n-hsw-x520-78b-2t2c-features-pdr"
-#  data: "plot-vpp-throughput-latency-3n-hsw"
-#  filter: "'NIC_Intel-X520-DA2' and
-#           '78B' and
-#           'FEATURE' and
-#           'NDRPDR' and
-#           '2T2C' and
-#           'IP6FWD' and
-#           'SRv6'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "srv6-3n-hsw-x520-78b-2t2c-features-pdr"
-#    layout: "plot-throughput"
-#
+################################################################################
+
+# Packet Throughput - VPP IPSec 3n-hsw-xl710 base
+-
+  type: "plot"
+  title: "VPP Throughput: ipsec-3n-hsw-xl710-64b-1t1c-base-ndr"
+  algorithm: "plot_performance_box"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/ipsec-3n-hsw-xl710-64b-1t1c-base-ndr"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-XL710' and
+           '64B' and
+           'IP4FWD' and
+           'NDRPDR' and
+           'BASE' and
+           '1T1C' and
+           'IPSECHW' and
+           ('IPSECTRAN' or 'IPSECTUN') and
+           not 'VHOST'"
+  parameters:
+  - "throughput"
+  - "parent"
+  - "tags"
+  traces:
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
+  layout:
+    title: "ipsec-3n-hsw-xl710-64b-1t1c-base-ndr"
+    layout: "plot-throughput"
+
+-
+  type: "plot"
+  title: "VPP Throughput: ipsec-3n-hsw-xl710-64b-1t1c-base-pdr"
+  algorithm: "plot_performance_box"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/ipsec-3n-hsw-xl710-64b-1t1c-base-pdr"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-XL710' and
+           '64B' and
+           'IP4FWD' and
+           'NDRPDR' and
+           'BASE' and
+           '1T1C' and
+           'IPSECHW' and
+           ('IPSECTRAN' or 'IPSECTUN') and
+           not 'VHOST'"
+  parameters:
+  - "throughput"
+  - "parent"
+  - "tags"
+  traces:
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
+  layout:
+    title: "ipsec-3n-hsw-xl710-64b-1t1c-base-pdr"
+    layout: "plot-throughput"
+
+-
+  type: "plot"
+  title: "VPP Throughput: ipsec-3n-hsw-xl710-64b-2t2c-base-ndr"
+  algorithm: "plot_performance_box"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/ipsec-3n-hsw-xl710-64b-2t2c-base-ndr"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-XL710' and
+           '64B' and
+           'IP4FWD' and
+           'NDRPDR' and
+           'BASE' and
+           '2T2C' and
+           'IPSECHW' and
+           ('IPSECTRAN' or 'IPSECTUN') and
+           not 'VHOST'"
+  parameters:
+  - "throughput"
+  - "parent"
+  - "tags"
+  traces:
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
+  layout:
+    title: "ipsec-3n-hsw-xl710-64b-2t2c-base-ndr"
+    layout: "plot-throughput"
+
+-
+  type: "plot"
+  title: "VPP Throughput: ipsec-3n-hsw-xl710-64b-2t2c-base-pdr"
+  algorithm: "plot_performance_box"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/ipsec-3n-hsw-xl710-64b-2t2c-base-pdr"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-XL710' and
+           '64B' and
+           'IP4FWD' and
+           'NDRPDR' and
+           'BASE' and
+           '2T2C' and
+           'IPSECHW' and
+           ('IPSECTRAN' or 'IPSECTUN') and
+           not 'VHOST'"
+  parameters:
+  - "throughput"
+  - "parent"
+  - "tags"
+  traces:
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
+  layout:
+    title: "ipsec-3n-hsw-xl710-64b-2t2c-base-pdr"
+    layout: "plot-throughput"
+
+# Packet Throughput - VPP IPSec 3n-hsw-xl710 scale
+-
+  type: "plot"
+  title: "VPP Throughput: ipsec-3n-hsw-xl710-64b-1t1c-scale-ndr"
+  algorithm: "plot_performance_box"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/ipsec-3n-hsw-xl710-64b-1t1c-scale-ndr"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-XL710' and
+           '64B' and
+           'IP4FWD' and
+           'NDRPDR' and
+           'SCALE' and
+           '1T1C' and
+           'IPSECHW' and
+           ('IPSECTRAN' or 'IPSECTUN') and
+           not 'VHOST'"
+  parameters:
+  - "throughput"
+  - "parent"
+  - "tags"
+  traces:
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
+  layout:
+    title: "ipsec-3n-hsw-xl710-64b-1t1c-scale-ndr"
+    layout: "plot-throughput"
+
+-
+  type: "plot"
+  title: "VPP Throughput: ipsec-3n-hsw-xl710-64b-1t1c-scale-pdr"
+  algorithm: "plot_performance_box"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/ipsec-3n-hsw-xl710-64b-1t1c-scale-pdr"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-XL710' and
+           '64B' and
+           'IP4FWD' and
+           'NDRPDR' and
+           'SCALE' and
+           '1T1C' and
+           'IPSECHW' and
+           ('IPSECTRAN' or 'IPSECTUN') and
+           not 'VHOST'"
+  parameters:
+  - "throughput"
+  - "parent"
+  - "tags"
+  traces:
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
+  layout:
+    title: "ipsec-3n-hsw-xl710-64b-1t1c-scale-pdr"
+    layout: "plot-throughput"
+
+-
+  type: "plot"
+  title: "VPP Throughput: ipsec-3n-hsw-xl710-64b-2t2c-scale-ndr"
+  algorithm: "plot_performance_box"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/ipsec-3n-hsw-xl710-64b-2t2c-scale-ndr"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-XL710' and
+           '64B' and
+           'IP4FWD' and
+           'NDRPDR' and
+           'SCALE' and
+           '2T2C' and
+           'IPSECHW' and
+           ('IPSECTRAN' or 'IPSECTUN') and
+           not 'VHOST'"
+  parameters:
+  - "throughput"
+  - "parent"
+  - "tags"
+  traces:
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
+  layout:
+    title: "ipsec-3n-hsw-xl710-64b-2t2c-scale-ndr"
+    layout: "plot-throughput"
+
+-
+  type: "plot"
+  title: "VPP Throughput: ipsec-3n-hsw-xl710-64b-2t2c-scale-pdr"
+  algorithm: "plot_performance_box"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/ipsec-3n-hsw-xl710-64b-2t2c-scale-pdr"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-XL710' and
+           '64B' and
+           'IP4FWD' and
+           'NDRPDR' and
+           'SCALE' and
+           '2T2C' and
+           'IPSECHW' and
+           ('IPSECTRAN' or 'IPSECTUN') and
+           not 'VHOST'"
+  parameters:
+  - "throughput"
+  - "parent"
+  - "tags"
+  traces:
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
+  layout:
+    title: "ipsec-3n-hsw-xl710-64b-2t2c-scale-pdr"
+    layout: "plot-throughput"
+
+# Packet Throughput - VPP IPSec 3n-hsw-xl710 SW
+-
+  type: "plot"
+  title: "VPP Throughput: ipsec-3n-hsw-xl710-64b-1t1c-sw-ndr"
+  algorithm: "plot_performance_box"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/ipsec-3n-hsw-xl710-64b-1t1c-sw-ndr"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-XL710' and
+           '64B' and
+           'IP4FWD' and
+           'NDRPDR' and
+           '1T1C' and
+           'IPSECSW' and
+           ('IPSECTRAN' or 'IPSECTUN') and
+           not 'VHOST'"
+  parameters:
+  - "throughput"
+  - "parent"
+  - "tags"
+  traces:
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
+  layout:
+    title: "ipsec-3n-hsw-xl710-64b-1t1c-sw-ndr"
+    layout: "plot-throughput"
+
+-
+  type: "plot"
+  title: "VPP Throughput: ipsec-3n-hsw-xl710-64b-1t1c-sw-pdr"
+  algorithm: "plot_performance_box"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/ipsec-3n-hsw-xl710-64b-1t1c-sw-pdr"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-XL710' and
+           '64B' and
+           'IP4FWD' and
+           'NDRPDR' and
+           '1T1C' and
+           'IPSECSW' and
+           ('IPSECTRAN' or 'IPSECTUN') and
+           not 'VHOST'"
+  parameters:
+  - "throughput"
+  - "parent"
+  - "tags"
+  traces:
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
+  layout:
+    title: "ipsec-3n-hsw-xl710-64b-1t1c-sw-pdr"
+    layout: "plot-throughput"
+
+-
+  type: "plot"
+  title: "VPP Throughput: ipsec-3n-hsw-xl710-64b-2t2c-sw-ndr"
+  algorithm: "plot_performance_box"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/ipsec-3n-hsw-xl710-64b-2t2c-sw-ndr"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-XL710' and
+           '64B' and
+           'IP4FWD' and
+           'NDRPDR' and
+           '2T2C' and
+           'IPSECSW' and
+           ('IPSECTRAN' or 'IPSECTUN') and
+           not 'VHOST'"
+  parameters:
+  - "throughput"
+  - "parent"
+  - "tags"
+  traces:
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
+  layout:
+    title: "ipsec-3n-hsw-xl710-64b-2t2c-sw-ndr"
+    layout: "plot-throughput"
+
+-
+  type: "plot"
+  title: "VPP Throughput: ipsec-3n-hsw-xl710-64b-2t2c-sw-pdr"
+  algorithm: "plot_performance_box"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/ipsec-3n-hsw-xl710-64b-2t2c-sw-pdr"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-XL710' and
+           '64B' and
+           'IP4FWD' and
+           'NDRPDR' and
+           '2T2C' and
+           'IPSECSW' and
+           ('IPSECTRAN' or 'IPSECTUN') and
+           not 'VHOST'"
+  parameters:
+  - "throughput"
+  - "parent"
+  - "tags"
+  traces:
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
+  layout:
+    title: "ipsec-3n-hsw-xl710-64b-2t2c-sw-pdr"
+    layout: "plot-throughput"
+
+################################################################################
+
+# Packet Throughput - VPP SRv6 3n-hsw-x520
+-
+  type: "plot"
+  title: "VPP Throughput: srv6-3n-hsw-x520-78b-1t1c-features-ndr"
+  algorithm: "plot_performance_box"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/srv6-3n-hsw-x520-78b-1t1c-features-ndr"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' and
+           '78B' and
+           'FEATURE' and
+           'NDRPDR' and
+           '1T1C' and
+           'IP6FWD' and
+           'SRv6'"
+  parameters:
+  - "throughput"
+  - "parent"
+  - "tags"
+  traces:
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
+  layout:
+    title: "srv6-3n-hsw-x520-78b-1t1c-features-ndr"
+    layout: "plot-throughput"
+
+-
+  type: "plot"
+  title: "VPP Throughput: srv6-3n-hsw-x520-78b-1t1c-features-pdr"
+  algorithm: "plot_performance_box"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/srv6-3n-hsw-x520-78b-1t1c-features-pdr"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' and
+           '78B' and
+           'FEATURE' and
+           'NDRPDR' and
+           '1T1C' and
+           'IP6FWD' and
+           'SRv6'"
+  parameters:
+  - "throughput"
+  - "parent"
+  - "tags"
+  traces:
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
+  layout:
+    title: "srv6-3n-hsw-x520-78b-1t1c-features-pdr"
+    layout: "plot-throughput"
+
+-
+  type: "plot"
+  title: "VPP Throughput: srv6-3n-hsw-x520-78b-2t2c-features-ndr"
+  algorithm: "plot_performance_box"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/srv6-3n-hsw-x520-78b-2t2c-features-ndr"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' and
+           '78B' and
+           'FEATURE' and
+           'NDRPDR' and
+           '2T2C' and
+           'IP6FWD' and
+           'SRv6'"
+  parameters:
+  - "throughput"
+  - "parent"
+  - "tags"
+  traces:
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
+  layout:
+    title: "srv6-3n-hsw-x520-78b-2t2c-features-ndr"
+    layout: "plot-throughput"
+
+-
+  type: "plot"
+  title: "VPP Throughput: srv6-3n-hsw-x520-78b-2t2c-features-pdr"
+  algorithm: "plot_performance_box"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/srv6-3n-hsw-x520-78b-2t2c-features-pdr"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' and
+           '78B' and
+           'FEATURE' and
+           'NDRPDR' and
+           '2T2C' and
+           'IP6FWD' and
+           'SRv6'"
+  parameters:
+  - "throughput"
+  - "parent"
+  - "tags"
+  traces:
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
+  layout:
+    title: "srv6-3n-hsw-x520-78b-2t2c-features-pdr"
+    layout: "plot-throughput"
+
 #################################################################################
 #
 ## Packet Throughput - VPP vhost ip4 3n-hsw-x520
 #  filter: "'NIC_Intel-XXV710' and
 #           '64B' and
 #           'NDRPDR' and
-#           ('ETH' or 'DOT1Q') and
-#           '2T1C' and
-#           ('L2BDMACLRN' or 'L2XCFWD') and
-#           'VHOST_1024' and
-#           not 'CFS_OPT' and
-#           not 'VXLAN' and
-#           not 'DOT1Q' and
-#           not 'IP4FWD'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-##  sort:
-##  - "1VM"
-##  - "L2XCFWD"
-##  - "1VM"
-##  - "L2BDMACLRN"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "vhost-l2sw-2n-skx-xxv710-64b-2t1c-base-vm-pdr"
-#    layout: "plot-throughput"
-#
-#-
-#  type: "plot"
-#  title: "VPP Throughput: vhost-l2sw-2n-skx-xxv710-64b-4t2c-base-vm-ndr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-xxv710-64b-4t2c-base-vm-ndr"
-#  data: "plot-vpp-throughput-latency-2n-skx"
-#  filter: "'NIC_Intel-XXV710' and
-#           '64B' and
-#           'NDRPDR' and
-#           ('ETH' or 'DOT1Q') and
-#           '4T2C' and
-#           ('L2BDMACLRN' or 'L2XCFWD') and
-#           'VHOST_1024' and
-#           not 'CFS_OPT' and
-#           not 'VXLAN' and
-#           not 'DOT1Q' and
-#           not 'IP4FWD'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-##  sort:
-##  - "1VM"
-##  - "L2XCFWD"
-##  - "1VM"
-##  - "L2BDMACLRN"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "vhost-l2sw-2n-skx-xxv710-64b-4t2c-base-vm-ndr"
-#    layout: "plot-throughput"
-#
-#-
-#  type: "plot"
-#  title: "VPP Throughput: vhost-l2sw-2n-skx-xxv710-64b-4t2c-base-vm-pdr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-xxv710-64b-4t2c-base-vm-pdr"
-#  data: "plot-vpp-throughput-latency-2n-skx"
-#  filter: "'NIC_Intel-XXV710' and
-#           '64B' and
-#           'NDRPDR' and
-#           ('ETH' or 'DOT1Q') and
-#           '4T2C' and
-#           ('L2BDMACLRN' or 'L2XCFWD') and
-#           'VHOST_1024' and
-#           not 'CFS_OPT' and
-#           not 'VXLAN' and
-#           not 'DOT1Q' and
-#           not 'IP4FWD'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-##  sort:
-##  - "1VM"
-##  - "L2XCFWD"
-##  - "1VM"
-##  - "L2BDMACLRN"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "vhost-l2sw-2n-skx-xxv710-64b-4t2c-base-vm-pdr"
-#    layout: "plot-throughput"
-
-################################################################################
-
-## Packet Throughput - VPP VTS 3n-hsw-x520
-#-
-#  type: "plot"
-#  title: "VPP Throughput: vts-3n-hsw-x520-114b-1t1c-ndr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/vts-3n-hsw-x520-114b-1t1c-ndr"
-#  data: "plot-vpp-throughput-latency-3n-hsw"
-#  filter: "'NIC_Intel-X520-DA2' and
-#           '114B' and
-#           'NDRPDR' and
-#           '1T1C' and
-#           'VTS'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "vts-3n-hsw-x520-114b-1t1c-ndr"
-#    layout: "plot-throughput"
-#
-#-
-#  type: "plot"
-#  title: "VPP Throughput: vts-3n-hsw-x520-114b-2t2c-ndr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/vts-3n-hsw-x520-114b-2t2c-ndr"
-#  data: "plot-vpp-throughput-latency-3n-hsw"
-#  filter: "'NIC_Intel-X520-DA2' and
-#           '114B' and
-#           'NDRPDR' and
-#           '2T2C' and
-#           'VTS'"
+#           ('ETH' or 'DOT1Q') and
+#           '2T1C' and
+#           ('L2BDMACLRN' or 'L2XCFWD') and
+#           'VHOST_1024' and
+#           not 'CFS_OPT' and
+#           not 'VXLAN' and
+#           not 'DOT1Q' and
+#           not 'IP4FWD'"
 #  parameters:
 #  - "throughput"
 #  - "parent"
 #  - "tags"
+##  sort:
+##  - "1VM"
+##  - "L2XCFWD"
+##  - "1VM"
+##  - "L2BDMACLRN"
 #  traces:
 #    hoverinfo: "x+y"
 #    boxpoints: "outliers"
 #    whiskerwidth: 0
 #  layout:
-#    title: "vts-3n-hsw-x520-114b-2t2c-ndr"
+#    title: "vhost-l2sw-2n-skx-xxv710-64b-2t1c-base-vm-pdr"
 #    layout: "plot-throughput"
 #
 #-
 #  type: "plot"
-#  title: "VPP Throughput: vts-3n-hsw-x520-114b-1t1c-pdr"
+#  title: "VPP Throughput: vhost-l2sw-2n-skx-xxv710-64b-4t2c-base-vm-ndr"
 #  algorithm: "plot_performance_box"
 #  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/vts-3n-hsw-x520-114b-1t1c-pdr"
-#  data: "plot-vpp-throughput-latency-3n-hsw"
-#  filter: "'NIC_Intel-X520-DA2' and
-#           '114B' and
+#  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-xxv710-64b-4t2c-base-vm-ndr"
+#  data: "plot-vpp-throughput-latency-2n-skx"
+#  filter: "'NIC_Intel-XXV710' and
+#           '64B' and
 #           'NDRPDR' and
-#           '1T1C' and
-#           'VTS'"
+#           ('ETH' or 'DOT1Q') and
+#           '4T2C' and
+#           ('L2BDMACLRN' or 'L2XCFWD') and
+#           'VHOST_1024' and
+#           not 'CFS_OPT' and
+#           not 'VXLAN' and
+#           not 'DOT1Q' and
+#           not 'IP4FWD'"
 #  parameters:
 #  - "throughput"
 #  - "parent"
 #  - "tags"
+##  sort:
+##  - "1VM"
+##  - "L2XCFWD"
+##  - "1VM"
+##  - "L2BDMACLRN"
 #  traces:
 #    hoverinfo: "x+y"
 #    boxpoints: "outliers"
 #    whiskerwidth: 0
 #  layout:
-#    title: "vts-3n-hsw-x520-114b-1t1c-pdr"
+#    title: "vhost-l2sw-2n-skx-xxv710-64b-4t2c-base-vm-ndr"
 #    layout: "plot-throughput"
 #
 #-
 #  type: "plot"
-#  title: "VPP Throughput: vts-3n-hsw-x520-114b-2t2c-pdr"
+#  title: "VPP Throughput: vhost-l2sw-2n-skx-xxv710-64b-4t2c-base-vm-pdr"
 #  algorithm: "plot_performance_box"
 #  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/vts-3n-hsw-x520-114b-2t2c-pdr"
-#  data: "plot-vpp-throughput-latency-3n-hsw"
-#  filter: "'NIC_Intel-X520-DA2' and
-#           '114B' and
+#  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-xxv710-64b-4t2c-base-vm-pdr"
+#  data: "plot-vpp-throughput-latency-2n-skx"
+#  filter: "'NIC_Intel-XXV710' and
+#           '64B' and
 #           'NDRPDR' and
-#           '2T2C' and
-#           'VTS'"
+#           ('ETH' or 'DOT1Q') and
+#           '4T2C' and
+#           ('L2BDMACLRN' or 'L2XCFWD') and
+#           'VHOST_1024' and
+#           not 'CFS_OPT' and
+#           not 'VXLAN' and
+#           not 'DOT1Q' and
+#           not 'IP4FWD'"
 #  parameters:
 #  - "throughput"
 #  - "parent"
 #  - "tags"
+##  sort:
+##  - "1VM"
+##  - "L2XCFWD"
+##  - "1VM"
+##  - "L2BDMACLRN"
 #  traces:
 #    hoverinfo: "x+y"
 #    boxpoints: "outliers"
 #    whiskerwidth: 0
 #  layout:
-#    title: "vts-3n-hsw-x520-114b-2t2c-pdr"
+#    title: "vhost-l2sw-2n-skx-xxv710-64b-4t2c-base-vm-pdr"
 #    layout: "plot-throughput"
 
+###############################################################################
+
+# Packet Throughput - VPP VTS 3n-hsw-x520
+-
+  type: "plot"
+  title: "VPP Throughput: vts-3n-hsw-x520-114b-1t1c-ndr"
+  algorithm: "plot_performance_box"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/vts-3n-hsw-x520-114b-1t1c-ndr"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' and
+           '114B' and
+           'NDRPDR' and
+           '1T1C' and
+           'VTS'"
+  parameters:
+  - "throughput"
+  - "parent"
+  - "tags"
+  traces:
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
+  layout:
+    title: "vts-3n-hsw-x520-114b-1t1c-ndr"
+    layout: "plot-throughput"
+
+-
+  type: "plot"
+  title: "VPP Throughput: vts-3n-hsw-x520-114b-2t2c-ndr"
+  algorithm: "plot_performance_box"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/vts-3n-hsw-x520-114b-2t2c-ndr"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' and
+           '114B' and
+           'NDRPDR' and
+           '2T2C' and
+           'VTS'"
+  parameters:
+  - "throughput"
+  - "parent"
+  - "tags"
+  traces:
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
+  layout:
+    title: "vts-3n-hsw-x520-114b-2t2c-ndr"
+    layout: "plot-throughput"
+
+-
+  type: "plot"
+  title: "VPP Throughput: vts-3n-hsw-x520-114b-1t1c-pdr"
+  algorithm: "plot_performance_box"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/vts-3n-hsw-x520-114b-1t1c-pdr"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' and
+           '114B' and
+           'NDRPDR' and
+           '1T1C' and
+           'VTS'"
+  parameters:
+  - "throughput"
+  - "parent"
+  - "tags"
+  traces:
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
+  layout:
+    title: "vts-3n-hsw-x520-114b-1t1c-pdr"
+    layout: "plot-throughput"
+
+-
+  type: "plot"
+  title: "VPP Throughput: vts-3n-hsw-x520-114b-2t2c-pdr"
+  algorithm: "plot_performance_box"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/vts-3n-hsw-x520-114b-2t2c-pdr"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' and
+           '114B' and
+           'NDRPDR' and
+           '2T2C' and
+           'VTS'"
+  parameters:
+  - "throughput"
+  - "parent"
+  - "tags"
+  traces:
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
+  layout:
+    title: "vts-3n-hsw-x520-114b-2t2c-pdr"
+    layout: "plot-throughput"
+
 ################################################################################
 
 # Packet Throughput - DPDK l3fwd 3n-hsw-x520
 #  layout:
 #    title: "l2sw-3n-hsw-x520-64b-2t2c-features-ndr"
 #    layout: "plot-latency"
-#
+
+# Packet Latency - VPP L2 3n-hsw-x520 features-oacl
+- type: "plot"
+  title: "VPP Latency: l2sw-3n-hsw-x520-64b-1t1c-features-oacl-ndr-lat"
+  algorithm: "plot_latency_error_bars"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x520-64b-1t1c-features-oacl-ndr-lat"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' and
+           '64B' and
+           'NDRPDR' and
+           '1T1C' and
+           'FEATURE' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
+           'OACL' and
+           ('ACL1' or 'ACL50') and
+           ('10K_FLOWS' or '10k_FLOWS') and
+           not 'MACIP' and
+           not 'VHOST' and
+           not 'MEMIF'"
+  parameters:
+  - "latency"
+  - "parent"
+  - "tags"
+  layout:
+    title: "l2sw-3n-hsw-x520-64b-1t1c-features-oacl-ndr"
+    layout: "plot-latency"
+
+- type: "plot"
+  title: "VPP Latency: l2sw-3n-hsw-x520-64b-2t2c-features-oacl-ndr-lat"
+  algorithm: "plot_latency_error_bars"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x520-64b-2t2c-features-oacl-ndr-lat"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' and
+           '64B' and
+           'NDRPDR' and
+           '2T2C' and
+           'FEATURE' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
+           'OACL' and
+           ('ACL1' or 'ACL50') and
+           ('10K_FLOWS' or '10k_FLOWS') and
+           not 'MACIP' and
+           not 'VHOST' and
+           not 'MEMIF'"
+  parameters:
+  - "latency"
+  - "parent"
+  - "tags"
+  layout:
+    title: "l2sw-3n-hsw-x520-64b-2t2c-features-oacl-ndr"
+    layout: "plot-latency"
+
+# Packet Latency - VPP L2 3n-hsw-x520 features-macip
+- type: "plot"
+  title: "VPP Latency: l2sw-3n-hsw-x520-64b-1t1c-features-macip-ndr-lat"
+  algorithm: "plot_latency_error_bars"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x520-64b-1t1c-features-macip-ndr-lat"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' and
+           '64B' and
+           'NDRPDR' and
+           '1T1C' and
+           'FEATURE' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
+           'MACIP' and
+           ('ACL1' or 'ACL50') and
+           ('10K_FLOWS' or '10k_FLOWS') and
+           not 'VHOST' and
+           not 'MEMIF'"
+  parameters:
+  - "latency"
+  - "parent"
+  - "tags"
+  layout:
+    title: "l2sw-3n-hsw-x520-64b-1t1c-features-macip-ndr"
+    layout: "plot-latency"
+
+- type: "plot"
+  title: "VPP Latency: l2sw-3n-hsw-x520-64b-2t2c-features-macip-ndr-lat"
+  algorithm: "plot_latency_error_bars"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x520-64b-2t2c-features-macip-ndr-lat"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' and
+           '64B' and
+           'NDRPDR' and
+           '2T2C' and
+           'FEATURE' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
+           'MACIP' and
+           ('ACL1' or 'ACL50') and
+           ('10K_FLOWS' or '10k_FLOWS') and
+           not 'VHOST' and
+           not 'MEMIF'"
+  parameters:
+  - "latency"
+  - "parent"
+  - "tags"
+  layout:
+    title: "l2sw-3n-hsw-x520-64b-2t2c-features-macip-ndr"
+    layout: "plot-latency"
+
 ## Packet Latency - VPP L2 3n-hsw-x710 base and scale
 #-
 #  type: "plot"
 #  - "SRC_USER_1000"
 #  - "SRC_USER_2000"
 #  layout:
-#    title: "ip4-3n-hsw-x520-64b-2t2c-features-nat44-ndr"
-#    layout: "plot-latency"
-#
-## Packet Latency - VPP IPv4 3n-hsw-x520 features iacl
-#-
-#  type: "plot"
-#  title: "VPP Latency: ip4-3n-hsw-x520-64b-1t1c-features-iacl-ndr-lat"
-#  algorithm: "plot_latency_error_bars"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-1t1c-features-iacl-ndr-lat"
-#  data: "plot-vpp-throughput-latency-3n-hsw"
-#  filter: "'NIC_Intel-X520-DA2' and
-#           '64B' and
-#           'NDRPDR' and
-#           '1T1C' and
-#           'IP4FWD' and
-#           ('IACL' and ('ACL10' or 'ACL50') and '10k_FLOWS' or 'IP4BASE') and
-#           not 'IPSEC' and
-#           not 'DOT1Q' and
-#           not 'VHOST'"
-#  parameters:
-#  - "latency"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "IP4BASE"
-#  - "ACL_STATELESS"
-#  - "ACL_STATEFUL"
-#  - "ACL_STATELESS"
-#  - "ACL_STATEFUL"
-#  layout:
-#    title: "ip4-3n-hsw-x520-64b-1t1c-features-iacl-ndr"
-#    layout: "plot-latency"
-#
-#-
-#  type: "plot"
-#  title: "VPP Latency: ip4-3n-hsw-x520-64b-2t2c-features-iacl-ndr-lat"
-#  algorithm: "plot_latency_error_bars"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-2t2c-features-iacl-ndr-lat"
-#  data: "plot-vpp-throughput-latency-3n-hsw"
-#  filter: "'NIC_Intel-X520-DA2' and
-#           '64B' and
-#           'NDRPDR' and
-#           '2T2C' and
-#           'IP4FWD' and
-#           ('IACL' and ('ACL10' or 'ACL50') and '10k_FLOWS' or 'IP4BASE') and
-#           not 'IPSEC' and
-#           not 'DOT1Q' and
-#           not 'VHOST'"
-#  parameters:
-#  - "latency"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "IP4BASE"
-#  - "ACL_STATELESS"
-#  - "ACL_STATEFUL"
-#  - "ACL_STATELESS"
-#  - "ACL_STATEFUL"
-#  layout:
-#    title: "ip4-3n-hsw-x520-64b-2t2c-features-iacl-ndr"
+#    title: "ip4-3n-hsw-x520-64b-2t2c-features-nat44-ndr"
 #    layout: "plot-latency"
 #
-## Packet Latency - VPP IPv4 3n-hsw-x520 features oacl
+## Packet Latency - VPP IPv4 3n-hsw-x520 features iacl
 #-
 #  type: "plot"
-#  title: "VPP Latency: ip4-3n-hsw-x520-64b-1t1c-features-oacl-ndr-lat"
+#  title: "VPP Latency: ip4-3n-hsw-x520-64b-1t1c-features-iacl-ndr-lat"
 #  algorithm: "plot_latency_error_bars"
 #  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-1t1c-features-oacl-ndr-lat"
+#  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-1t1c-features-iacl-ndr-lat"
 #  data: "plot-vpp-throughput-latency-3n-hsw"
 #  filter: "'NIC_Intel-X520-DA2' and
 #           '64B' and
 #           'NDRPDR' and
 #           '1T1C' and
 #           'IP4FWD' and
-#           ('OACL' and ('ACL10' or 'ACL50') and '10k_FLOWS' or 'IP4BASE') and
+#           ('IACL' and ('ACL10' or 'ACL50') and '10k_FLOWS' or 'IP4BASE') and
 #           not 'IPSEC' and
 #           not 'DOT1Q' and
 #           not 'VHOST'"
 #  - "ACL_STATELESS"
 #  - "ACL_STATEFUL"
 #  layout:
-#    title: "ip4-3n-hsw-x520-64b-1t1c-features-oacl-ndr"
+#    title: "ip4-3n-hsw-x520-64b-1t1c-features-iacl-ndr"
 #    layout: "plot-latency"
 #
 #-
 #  type: "plot"
-#  title: "VPP Latency: ip4-3n-hsw-x520-64b-2t2c-features-oacl-ndr-lat"
+#  title: "VPP Latency: ip4-3n-hsw-x520-64b-2t2c-features-iacl-ndr-lat"
 #  algorithm: "plot_latency_error_bars"
 #  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-2t2c-features-oacl-ndr-lat"
+#  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-2t2c-features-iacl-ndr-lat"
 #  data: "plot-vpp-throughput-latency-3n-hsw"
 #  filter: "'NIC_Intel-X520-DA2' and
 #           '64B' and
 #           'NDRPDR' and
 #           '2T2C' and
 #           'IP4FWD' and
-#           ('OACL' and ('ACL10' or 'ACL50') and '10k_FLOWS' or 'IP4BASE') and
+#           ('IACL' and ('ACL10' or 'ACL50') and '10k_FLOWS' or 'IP4BASE') and
 #           not 'IPSEC' and
 #           not 'DOT1Q' and
 #           not 'VHOST'"
 #  - "ACL_STATELESS"
 #  - "ACL_STATEFUL"
 #  layout:
-#    title: "ip4-3n-hsw-x520-64b-2t2c-features-oacl-ndr"
+#    title: "ip4-3n-hsw-x520-64b-2t2c-features-iacl-ndr"
 #    layout: "plot-latency"
-#
+
+# Packet Latency - VPP IPv4 3n-hsw-x520 features oacl
+-
+  type: "plot"
+  title: "VPP Latency: ip4-3n-hsw-x520-64b-1t1c-features-oacl-ndr-lat"
+  algorithm: "plot_latency_error_bars"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-1t1c-features-oacl-ndr-lat"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' and
+           '64B' and
+           'NDRPDR' and
+           '1T1C' and
+           'IP4FWD' and
+           ('OACL' and ('ACL10' or 'ACL50') and '10k_FLOWS' or 'IP4BASE') and
+           not 'IPSEC' and
+           not 'DOT1Q' and
+           not 'VHOST'"
+  parameters:
+  - "latency"
+  - "parent"
+  - "tags"
+  sort:
+  - "IP4BASE"
+  - "ACL_STATELESS"
+  - "ACL_STATEFUL"
+  - "ACL_STATELESS"
+  - "ACL_STATEFUL"
+  layout:
+    title: "ip4-3n-hsw-x520-64b-1t1c-features-oacl-ndr"
+    layout: "plot-latency"
+
+-
+  type: "plot"
+  title: "VPP Latency: ip4-3n-hsw-x520-64b-2t2c-features-oacl-ndr-lat"
+  algorithm: "plot_latency_error_bars"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-2t2c-features-oacl-ndr-lat"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' and
+           '64B' and
+           'NDRPDR' and
+           '2T2C' and
+           'IP4FWD' and
+           ('OACL' and ('ACL10' or 'ACL50') and '10k_FLOWS' or 'IP4BASE') and
+           not 'IPSEC' and
+           not 'DOT1Q' and
+           not 'VHOST'"
+  parameters:
+  - "latency"
+  - "parent"
+  - "tags"
+  sort:
+  - "IP4BASE"
+  - "ACL_STATELESS"
+  - "ACL_STATEFUL"
+  - "ACL_STATELESS"
+  - "ACL_STATEFUL"
+  layout:
+    title: "ip4-3n-hsw-x520-64b-2t2c-features-oacl-ndr"
+    layout: "plot-latency"
+
 ## Packet Latency - VPP IPv4 3n-hsw-x710 base and scale
 #-
 #  type: "plot"
 ## Packet Latency - VPP IPv6 2n-skx-xxv710
 #-
 #  type: "plot"
-#  title: "VPP Latency: ip6-2n-skx-xxv710-78b-2t1c-base_and_scale-ndr-lat"
-#  algorithm: "plot_latency_error_bars"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/ip6-2n-skx-xxv710-78b-2t1c-base_and_scale-ndr-lat"
-#  data: "plot-vpp-throughput-latency-2n-skx"
-#  filter: "'NIC_Intel-XXV710' and
-#           '78B' and
-#           ('IP6BASE' or 'FIB_20k' or 'FIB_200k' or 'FIB_2M') and
-#           'NDRPDR' and
-#           '2T1C' and
-#           'IP6FWD' and
-#           not 'SRv6' and
-#           not 'IPSEC' and
-#           not 'VHOST'"
-#  parameters:
-#  - "latency"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "IP6BASE"
-#  - "FIB_20k"
-#  - "FIB_200k"
-#  - "FIB_2M"
-#  layout:
-#    title: "ip6-2n-skx-xxv710-78b-2t1c-base_and_scale-ndr"
-#    layout: "plot-latency"
-#
-#-
-#  type: "plot"
-#  title: "VPP Latency: ip6-2n-skx-xxv710-78b-4t2c-base_and_scale-ndr-lat"
-#  algorithm: "plot_latency_error_bars"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/ip6-2n-skx-xxv710-78b-4t2c-base_and_scale-ndr-lat"
-#  data: "plot-vpp-throughput-latency-2n-skx"
-#  filter: "'NIC_Intel-XXV710' and
-#           '78B' and
-#           ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
-#           'NDRPDR' and
-#           '4T2C' and
-#           'IP6FWD' and
-#           not 'SRv6' and
-#           not 'IPSEC' and
-#           not 'VHOST'"
-#  parameters:
-#  - "latency"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "IP6BASE"
-#  - "FIB_20k"
-#  - "FIB_200k"
-#  - "FIB_2M"
-#  layout:
-#    title: "ip6-2n-skx-xxv710-78b-4t2c-base_and_scale-ndr"
-#    layout: "plot-latency"
-
-################################################################################
-
-## Packet Latency - VPP IPv6 tunnels 3n-hsw-x520
-#-
-#  type: "plot"
-#  title: "VPP Latency: ip6tun-3n-hsw-x520-78b-1t1c-base-ndr-lat"
-#  algorithm: "plot_latency_error_bars"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/ip6tun-3n-hsw-x520-78b-1t1c-base-ndr-lat"
-#  data: "plot-vpp-throughput-latency-3n-hsw"
-#  filter: "'NIC_Intel-X520-DA2' and
-#           '78B' and
-#           'ENCAP' and
-#           'NDRPDR' and
-#           '1T1C' and
-#           'LISP' and
-#           not 'VHOST'"
-#  parameters:
-#  - "latency"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "IP4UNRLAY"
-#  - "IP6UNRLAY"
-#  layout:
-#    title: "ip6tun-3n-hsw-x520-78b-1t1c-base-ndr"
-#    layout: "plot-latency"
-#
-#-
-#  type: "plot"
-#  title: "VPP Latency: ip6tun-3n-hsw-x520-78b-2t2c-base-ndr-lat"
-#  algorithm: "plot_latency_error_bars"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/ip6tun-3n-hsw-x520-78b-2t2c-base-ndr-lat"
-#  data: "plot-vpp-throughput-latency-3n-hsw"
-#  filter: "'NIC_Intel-X520-DA2' and
-#           '78B' and
-#           'ENCAP' and
-#           'NDRPDR' and
-#           '2T2C' and
-#           'LISP' and
-#           not 'VHOST'"
-#  parameters:
-#  - "latency"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "IP4UNRLAY"
-#  - "IP6UNRLAY"
-#  layout:
-#    title: "ip6tun-3n-hsw-x520-78b-2t2c-base-ndr"
-#    layout: "plot-latency"
-#
-#################################################################################
-#
-## Packet Latency - VPP IPSec 3n-hsw-xl710 base
-#-
-#  type: "plot"
-#  title: "VPP Latency: ipsec-3n-hsw-xl710-64b-1t1c-base-ndr-lat"
-#  algorithm: "plot_latency_error_bars"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/ipsec-3n-hsw-xl710-64b-1t1c-base-ndr-lat"
-#  data: "plot-vpp-throughput-latency-3n-hsw"
-#  filter: "'NIC_Intel-XL710' and
-#           '64B' and
-#           'IP4FWD' and
-#           'NDRPDR' and
-#           'BASE' and
-#           '1T1C' and
-#           'IPSECHW' and
-#           ('IPSECTRAN' or 'IPSECTUN') and
-#           not 'VHOST'"
-#  parameters:
-#  - "latency"
-#  - "parent"
-#  - "tags"
-#  layout:
-#    title: "ipsec-3n-hsw-xl710-64b-1t1c-base-ndr"
-#    layout: "plot-latency"
-#
-#-
-#  type: "plot"
-#  title: "VPP Latency: ipsec-3n-hsw-xl710-64b-2t2c-base-ndr-lat"
-#  algorithm: "plot_latency_error_bars"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/ipsec-3n-hsw-xl710-64b-2t2c-base-ndr-lat"
-#  data: "plot-vpp-throughput-latency-3n-hsw"
-#  filter: "'NIC_Intel-XL710' and
-#           '64B' and
-#           'IP4FWD' and
-#           'NDRPDR' and
-#           'BASE' and
-#           '2T2C' and
-#           'IPSECHW' and
-#           ('IPSECTRAN' or 'IPSECTUN') and
-#           not 'VHOST'"
-#  parameters:
-#  - "latency"
-#  - "parent"
-#  - "tags"
-#  layout:
-#    title: "ipsec-3n-hsw-xl710-64b-2t2c-base-ndr"
-#    layout: "plot-latency"
-#
-## Packet Latency - VPP IPSec 3n-hsw-xl710 scale
-#-
-#  type: "plot"
-#  title: "VPP Latency: ipsec-3n-hsw-xl710-64b-1t1c-scale-ndr-lat"
-#  algorithm: "plot_latency_error_bars"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/ipsec-3n-hsw-xl710-64b-1t1c-scale-ndr-lat"
-#  data: "plot-vpp-throughput-latency-3n-hsw"
-#  filter: "'NIC_Intel-XL710' and
-#           '64B' and
-#           'IP4FWD' and
-#           'NDRPDR' and
-#           'SCALE' and
-#           '1T1C' and
-#           'IPSECHW' and
-#           ('IPSECTRAN' or 'IPSECTUN') and
-#           not 'VHOST'"
-#  parameters:
-#  - "latency"
-#  - "parent"
-#  - "tags"
-#  layout:
-#    title: "ipsec-3n-hsw-xl710-64b-1t1c-scale-ndr"
-#    layout: "plot-latency"
-#
-#-
-#  type: "plot"
-#  title: "VPP Latency: ipsec-3n-hsw-xl710-64b-2t2c-scale-ndr-lat"
-#  algorithm: "plot_latency_error_bars"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/ipsec-3n-hsw-xl710-64b-2t2c-scale-ndr-lat"
-#  data: "plot-vpp-throughput-latency-3n-hsw"
-#  filter: "'NIC_Intel-XL710' and
-#           '64B' and
-#           'IP4FWD' and
-#           'NDRPDR' and
-#           'SCALE' and
-#           '2T2C' and
-#           'IPSECHW' and
-#           ('IPSECTRAN' or 'IPSECTUN') and
-#           not 'VHOST'"
-#  parameters:
-#  - "latency"
-#  - "parent"
-#  - "tags"
-#  layout:
-#    title: "ipsec-3n-hsw-xl710-64b-2t2c-scale-ndr"
-#    layout: "plot-latency"
-#
-## Packet Latency - VPP IPSec 3n-hsw-xl710 sw
-#-
-#  type: "plot"
-#  title: "VPP Latency: ipsec-3n-hsw-xl710-64b-1t1c-sw-ndr-lat"
-#  algorithm: "plot_latency_error_bars"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/ipsec-3n-hsw-xl710-64b-1t1c-sw-ndr-lat"
-#  data: "plot-vpp-throughput-latency-3n-hsw"
-#  filter: "'NIC_Intel-XL710' and
-#           '64B' and
-#           'IP4FWD' and
+#  title: "VPP Latency: ip6-2n-skx-xxv710-78b-2t1c-base_and_scale-ndr-lat"
+#  algorithm: "plot_latency_error_bars"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/ip6-2n-skx-xxv710-78b-2t1c-base_and_scale-ndr-lat"
+#  data: "plot-vpp-throughput-latency-2n-skx"
+#  filter: "'NIC_Intel-XXV710' and
+#           '78B' and
+#           ('IP6BASE' or 'FIB_20k' or 'FIB_200k' or 'FIB_2M') and
 #           'NDRPDR' and
-#           '1T1C' and
-#           'IPSECSW' and
-#           ('IPSECTRAN' or 'IPSECTUN') and
+#           '2T1C' and
+#           'IP6FWD' and
+#           not 'SRv6' and
+#           not 'IPSEC' and
 #           not 'VHOST'"
 #  parameters:
 #  - "latency"
 #  - "parent"
 #  - "tags"
+#  sort:
+#  - "IP6BASE"
+#  - "FIB_20k"
+#  - "FIB_200k"
+#  - "FIB_2M"
 #  layout:
-#    title: "ipsec-3n-hsw-xl710-64b-1t1c-sw-ndr"
+#    title: "ip6-2n-skx-xxv710-78b-2t1c-base_and_scale-ndr"
 #    layout: "plot-latency"
 #
 #-
 #  type: "plot"
-#  title: "VPP Latency: ipsec-3n-hsw-xl710-64b-2t2c-sw-ndr-lat"
+#  title: "VPP Latency: ip6-2n-skx-xxv710-78b-4t2c-base_and_scale-ndr-lat"
 #  algorithm: "plot_latency_error_bars"
 #  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/ipsec-3n-hsw-xl710-64b-2t2c-sw-ndr-lat"
-#  data: "plot-vpp-throughput-latency-3n-hsw"
-#  filter: "'NIC_Intel-XL710' and
-#           '64B' and
-#           'IP4FWD' and
+#  output-file: "{DIR[STATIC,VPP]}/ip6-2n-skx-xxv710-78b-4t2c-base_and_scale-ndr-lat"
+#  data: "plot-vpp-throughput-latency-2n-skx"
+#  filter: "'NIC_Intel-XXV710' and
+#           '78B' and
+#           ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
 #           'NDRPDR' and
-#           '2T2C' and
-#           'IPSECSW' and
-#           ('IPSECTRAN' or 'IPSECTUN') and
+#           '4T2C' and
+#           'IP6FWD' and
+#           not 'SRv6' and
+#           not 'IPSEC' and
 #           not 'VHOST'"
 #  parameters:
 #  - "latency"
 #  - "parent"
 #  - "tags"
+#  sort:
+#  - "IP6BASE"
+#  - "FIB_20k"
+#  - "FIB_200k"
+#  - "FIB_2M"
 #  layout:
-#    title: "ipsec-3n-hsw-xl710-64b-2t2c-sw-ndr"
+#    title: "ip6-2n-skx-xxv710-78b-4t2c-base_and_scale-ndr"
 #    layout: "plot-latency"
-#
-#################################################################################
-#
-## Packet Latency - VPP SRv6 3n-hsw-x520
+
+################################################################################
+
+## Packet Latency - VPP IPv6 tunnels 3n-hsw-x520
 #-
 #  type: "plot"
-#  title: "VPP Latency: srv6-3n-hsw-x520-78b-1t1c-features-ndr-lat"
+#  title: "VPP Latency: ip6tun-3n-hsw-x520-78b-1t1c-base-ndr-lat"
 #  algorithm: "plot_latency_error_bars"
 #  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/srv6-3n-hsw-x520-78b-1t1c-features-ndr-lat"
+#  output-file: "{DIR[STATIC,VPP]}/ip6tun-3n-hsw-x520-78b-1t1c-base-ndr-lat"
 #  data: "plot-vpp-throughput-latency-3n-hsw"
 #  filter: "'NIC_Intel-X520-DA2' and
 #           '78B' and
-#           'FEATURE' and
+#           'ENCAP' and
 #           'NDRPDR' and
 #           '1T1C' and
-#           'IP6FWD' and
-#           'SRv6'"
+#           'LISP' and
+#           not 'VHOST'"
 #  parameters:
 #  - "latency"
 #  - "parent"
 #  - "tags"
+#  sort:
+#  - "IP4UNRLAY"
+#  - "IP6UNRLAY"
 #  layout:
-#    title: "srv6-3n-hsw-x520-78b-1t1c-features-ndr"
+#    title: "ip6tun-3n-hsw-x520-78b-1t1c-base-ndr"
 #    layout: "plot-latency"
 #
 #-
 #  type: "plot"
-#  title: "VPP Latency: srv6-3n-hsw-x520-78b-2t2c-features-ndr-lat"
+#  title: "VPP Latency: ip6tun-3n-hsw-x520-78b-2t2c-base-ndr-lat"
 #  algorithm: "plot_latency_error_bars"
 #  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/srv6-3n-hsw-x520-78b-2t2c-features-ndr-lat"
+#  output-file: "{DIR[STATIC,VPP]}/ip6tun-3n-hsw-x520-78b-2t2c-base-ndr-lat"
 #  data: "plot-vpp-throughput-latency-3n-hsw"
 #  filter: "'NIC_Intel-X520-DA2' and
 #           '78B' and
-#           'FEATURE' and
+#           'ENCAP' and
 #           'NDRPDR' and
 #           '2T2C' and
-#           'IP6FWD' and
-#           'SRv6'"
+#           'LISP' and
+#           not 'VHOST'"
 #  parameters:
 #  - "latency"
 #  - "parent"
 #  - "tags"
+#  sort:
+#  - "IP4UNRLAY"
+#  - "IP6UNRLAY"
 #  layout:
-#    title: "srv6-3n-hsw-x520-78b-2t2c-features-ndr"
+#    title: "ip6tun-3n-hsw-x520-78b-2t2c-base-ndr"
 #    layout: "plot-latency"
-#
+
+################################################################################
+
+# Packet Latency - VPP IPSec 3n-hsw-xl710 base
+-
+  type: "plot"
+  title: "VPP Latency: ipsec-3n-hsw-xl710-64b-1t1c-base-ndr-lat"
+  algorithm: "plot_latency_error_bars"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/ipsec-3n-hsw-xl710-64b-1t1c-base-ndr-lat"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-XL710' and
+           '64B' and
+           'IP4FWD' and
+           'NDRPDR' and
+           'BASE' and
+           '1T1C' and
+           'IPSECHW' and
+           ('IPSECTRAN' or 'IPSECTUN') and
+           not 'VHOST'"
+  parameters:
+  - "latency"
+  - "parent"
+  - "tags"
+  layout:
+    title: "ipsec-3n-hsw-xl710-64b-1t1c-base-ndr"
+    layout: "plot-latency"
+
+-
+  type: "plot"
+  title: "VPP Latency: ipsec-3n-hsw-xl710-64b-2t2c-base-ndr-lat"
+  algorithm: "plot_latency_error_bars"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/ipsec-3n-hsw-xl710-64b-2t2c-base-ndr-lat"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-XL710' and
+           '64B' and
+           'IP4FWD' and
+           'NDRPDR' and
+           'BASE' and
+           '2T2C' and
+           'IPSECHW' and
+           ('IPSECTRAN' or 'IPSECTUN') and
+           not 'VHOST'"
+  parameters:
+  - "latency"
+  - "parent"
+  - "tags"
+  layout:
+    title: "ipsec-3n-hsw-xl710-64b-2t2c-base-ndr"
+    layout: "plot-latency"
+
+# Packet Latency - VPP IPSec 3n-hsw-xl710 scale
+-
+  type: "plot"
+  title: "VPP Latency: ipsec-3n-hsw-xl710-64b-1t1c-scale-ndr-lat"
+  algorithm: "plot_latency_error_bars"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/ipsec-3n-hsw-xl710-64b-1t1c-scale-ndr-lat"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-XL710' and
+           '64B' and
+           'IP4FWD' and
+           'NDRPDR' and
+           'SCALE' and
+           '1T1C' and
+           'IPSECHW' and
+           ('IPSECTRAN' or 'IPSECTUN') and
+           not 'VHOST'"
+  parameters:
+  - "latency"
+  - "parent"
+  - "tags"
+  layout:
+    title: "ipsec-3n-hsw-xl710-64b-1t1c-scale-ndr"
+    layout: "plot-latency"
+
+-
+  type: "plot"
+  title: "VPP Latency: ipsec-3n-hsw-xl710-64b-2t2c-scale-ndr-lat"
+  algorithm: "plot_latency_error_bars"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/ipsec-3n-hsw-xl710-64b-2t2c-scale-ndr-lat"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-XL710' and
+           '64B' and
+           'IP4FWD' and
+           'NDRPDR' and
+           'SCALE' and
+           '2T2C' and
+           'IPSECHW' and
+           ('IPSECTRAN' or 'IPSECTUN') and
+           not 'VHOST'"
+  parameters:
+  - "latency"
+  - "parent"
+  - "tags"
+  layout:
+    title: "ipsec-3n-hsw-xl710-64b-2t2c-scale-ndr"
+    layout: "plot-latency"
+
+# Packet Latency - VPP IPSec 3n-hsw-xl710 sw
+-
+  type: "plot"
+  title: "VPP Latency: ipsec-3n-hsw-xl710-64b-1t1c-sw-ndr-lat"
+  algorithm: "plot_latency_error_bars"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/ipsec-3n-hsw-xl710-64b-1t1c-sw-ndr-lat"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-XL710' and
+           '64B' and
+           'IP4FWD' and
+           'NDRPDR' and
+           '1T1C' and
+           'IPSECSW' and
+           ('IPSECTRAN' or 'IPSECTUN') and
+           not 'VHOST'"
+  parameters:
+  - "latency"
+  - "parent"
+  - "tags"
+  layout:
+    title: "ipsec-3n-hsw-xl710-64b-1t1c-sw-ndr"
+    layout: "plot-latency"
+
+-
+  type: "plot"
+  title: "VPP Latency: ipsec-3n-hsw-xl710-64b-2t2c-sw-ndr-lat"
+  algorithm: "plot_latency_error_bars"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/ipsec-3n-hsw-xl710-64b-2t2c-sw-ndr-lat"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-XL710' and
+           '64B' and
+           'IP4FWD' and
+           'NDRPDR' and
+           '2T2C' and
+           'IPSECSW' and
+           ('IPSECTRAN' or 'IPSECTUN') and
+           not 'VHOST'"
+  parameters:
+  - "latency"
+  - "parent"
+  - "tags"
+  layout:
+    title: "ipsec-3n-hsw-xl710-64b-2t2c-sw-ndr"
+    layout: "plot-latency"
+
+################################################################################
+
+# Packet Latency - VPP SRv6 3n-hsw-x520
+-
+  type: "plot"
+  title: "VPP Latency: srv6-3n-hsw-x520-78b-1t1c-features-ndr-lat"
+  algorithm: "plot_latency_error_bars"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/srv6-3n-hsw-x520-78b-1t1c-features-ndr-lat"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' and
+           '78B' and
+           'FEATURE' and
+           'NDRPDR' and
+           '1T1C' and
+           'IP6FWD' and
+           'SRv6'"
+  parameters:
+  - "latency"
+  - "parent"
+  - "tags"
+  layout:
+    title: "srv6-3n-hsw-x520-78b-1t1c-features-ndr"
+    layout: "plot-latency"
+
+-
+  type: "plot"
+  title: "VPP Latency: srv6-3n-hsw-x520-78b-2t2c-features-ndr-lat"
+  algorithm: "plot_latency_error_bars"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/srv6-3n-hsw-x520-78b-2t2c-features-ndr-lat"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' and
+           '78B' and
+           'FEATURE' and
+           'NDRPDR' and
+           '2T2C' and
+           'IP6FWD' and
+           'SRv6'"
+  parameters:
+  - "latency"
+  - "parent"
+  - "tags"
+  layout:
+    title: "srv6-3n-hsw-x520-78b-2t2c-features-ndr"
+    layout: "plot-latency"
+
 #################################################################################
 #
 ## Packet Latency - VPP vhost ip4 3n-hsw-x520
 
 ################################################################################
 
-## Packet Latency - VPP VTS 3n-hsw-x520
-#-
-#  type: "plot"
-#  title: "VPP Latency: vts-3n-hsw-x520-114b-1t1c-ndr-lat"
-#  algorithm: "plot_latency_error_bars"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/vts-3n-hsw-x520-114b-1t1c-ndr-lat"
-#  data: "plot-vpp-throughput-latency-3n-hsw"
-#  filter: "'NIC_Intel-X520-DA2' and
-#           '114B' and
-#           'NDRPDR' and
-#           '1T1C' and
-#           'VTS'"
-#  parameters:
-#  - "latency"
-#  - "parent"
-#  - "tags"
-#  layout:
-#    title: "vts-3n-hsw-x520-114b-1t1c-ndr"
-#    layout: "plot-latency"
-#
-#-
-#  type: "plot"
-#  title: "VPP Latency: vts-3n-hsw-x520-114b-2t2c-ndr-lat"
-#  algorithm: "plot_latency_error_bars"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/vts-3n-hsw-x520-114b-2t2c-ndr-lat"
-#  data: "plot-vpp-throughput-latency-3n-hsw"
-#  filter: "'NIC_Intel-X520-DA2' and
-#           '114B' and
-#           'NDRPDR' and
-#           '2T2C' and
-#           'VTS'"
-#  parameters:
-#  - "latency"
-#  - "parent"
-#  - "tags"
-#  layout:
-#    title: "vts-3n-hsw-x520-114b-2t2c-ndr"
-#    layout: "plot-latency"
+# Packet Latency - VPP VTS 3n-hsw-x520
+-
+  type: "plot"
+  title: "VPP Latency: vts-3n-hsw-x520-114b-1t1c-ndr-lat"
+  algorithm: "plot_latency_error_bars"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/vts-3n-hsw-x520-114b-1t1c-ndr-lat"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' and
+           '114B' and
+           'NDRPDR' and
+           '1T1C' and
+           'VTS'"
+  parameters:
+  - "latency"
+  - "parent"
+  - "tags"
+  layout:
+    title: "vts-3n-hsw-x520-114b-1t1c-ndr"
+    layout: "plot-latency"
+
+-
+  type: "plot"
+  title: "VPP Latency: vts-3n-hsw-x520-114b-2t2c-ndr-lat"
+  algorithm: "plot_latency_error_bars"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/vts-3n-hsw-x520-114b-2t2c-ndr-lat"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' and
+           '114B' and
+           'NDRPDR' and
+           '2T2C' and
+           'VTS'"
+  parameters:
+  - "latency"
+  - "parent"
+  - "tags"
+  layout:
+    title: "vts-3n-hsw-x520-114b-2t2c-ndr"
+    layout: "plot-latency"
 
 ################################################################################
 
 #    title: "ip4-3n-hsw-x520-64b-features-iacl-pdr"
 #    layout: "plot-throughput-speedup-analysis"
 #
-## Speedup - VPP IPv4 3n-hsw-x520 features oacl
-#-
-#  type: "plot"
-#  title: "Speedup: ip4-3n-hsw-x520-64b-features-oacl-ndr-tsa"
-#  algorithm: "plot_throughput_speedup_analysis"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-features-oacl-ndr-tsa"
-#  data: "plot-throughput-speedup-analysis-3n-hsw"
-#  filter: "'NIC_Intel-X520-DA2' and
-#           '64B' and
-#           'NDRPDR' and
-#           'IP4FWD' and
-#           ('OACL' and ('ACL10' or 'ACL50') and '10k_FLOWS' or 'IP4BASE') and
-#           not 'IPSEC' and
-#           not 'DOT1Q' and
-#           not 'VHOST'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "IP4BASE"
-#  - "ACL_STATELESS"
-#  - "ACL_STATEFUL"
-#  - "ACL_STATELESS"
-#  - "ACL_STATEFUL"
-#  layout:
-#    title: "ip4-3n-hsw-x520-64b-features-oacl-ndr"
-#    layout: "plot-throughput-speedup-analysis"
-#
-#-
-#  type: "plot"
-#  title: "Speedup: ip4-3n-hsw-x520-64b-features-oacl-pdr-tsa"
-#  algorithm: "plot_throughput_speedup_analysis"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-features-oacl-pdr-tsa"
-#  data: "plot-throughput-speedup-analysis-3n-hsw"
-#  filter: "'NIC_Intel-X520-DA2' and
-#           '64B' and
-#           'NDRPDR' and
-#           'IP4FWD' and
-#           ('OACL' and ('ACL10' or 'ACL50') and '10k_FLOWS' or 'IP4BASE') and
-#           not 'IPSEC' and
-#           not 'DOT1Q' and
-#           not 'VHOST'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "IP4BASE"
-#  - "ACL_STATELESS"
-#  - "ACL_STATEFUL"
-#  - "ACL_STATELESS"
-#  - "ACL_STATEFUL"
-#  layout:
-#    title: "ip4-3n-hsw-x520-64b-features-oacl-pdr"
-#    layout: "plot-throughput-speedup-analysis"
+# Speedup - VPP IPv4 3n-hsw-x520 features oacl
+-
+  type: "plot"
+  title: "Speedup: ip4-3n-hsw-x520-64b-features-oacl-ndr-tsa"
+  algorithm: "plot_throughput_speedup_analysis"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-features-oacl-ndr-tsa"
+  data: "plot-throughput-speedup-analysis-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' and
+           '64B' and
+           'NDRPDR' and
+           'IP4FWD' and
+           ('OACL' and ('ACL10' or 'ACL50') and '10k_FLOWS' or 'IP4BASE') and
+           not 'IPSEC' and
+           not 'DOT1Q' and
+           not 'VHOST'"
+  parameters:
+  - "throughput"
+  - "parent"
+  - "tags"
+  sort:
+  - "IP4BASE"
+  - "ACL_STATELESS"
+  - "ACL_STATEFUL"
+  - "ACL_STATELESS"
+  - "ACL_STATEFUL"
+  layout:
+    title: "ip4-3n-hsw-x520-64b-features-oacl-ndr"
+    layout: "plot-throughput-speedup-analysis"
+
+-
+  type: "plot"
+  title: "Speedup: ip4-3n-hsw-x520-64b-features-oacl-pdr-tsa"
+  algorithm: "plot_throughput_speedup_analysis"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-features-oacl-pdr-tsa"
+  data: "plot-throughput-speedup-analysis-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' and
+           '64B' and
+           'NDRPDR' and
+           'IP4FWD' and
+           ('OACL' and ('ACL10' or 'ACL50') and '10k_FLOWS' or 'IP4BASE') and
+           not 'IPSEC' and
+           not 'DOT1Q' and
+           not 'VHOST'"
+  parameters:
+  - "throughput"
+  - "parent"
+  - "tags"
+  sort:
+  - "IP4BASE"
+  - "ACL_STATELESS"
+  - "ACL_STATEFUL"
+  - "ACL_STATELESS"
+  - "ACL_STATEFUL"
+  layout:
+    title: "ip4-3n-hsw-x520-64b-features-oacl-pdr"
+    layout: "plot-throughput-speedup-analysis"
 #
 ## Speedup - VPP IPv4 3n-hsw-x710 base and scale
 #-
 #  - "parent"
 #  - "tags"
 #  sort:
-#  - "IP4UNRLAY"
-#  - "IP6UNRLAY"
-#  layout:
-#    title: "ip6tun-3n-hsw-x520-78b-base-ndr"
-#    layout: "plot-throughput-speedup-analysis"
-#
-#-
-#  type: "plot"
-#  title: "Speedup: ip6tun-3n-hsw-x520-78b-base-pdr-tsa"
-#  algorithm: "plot_throughput_speedup_analysis"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/ip6tun-3n-hsw-x520-78b-base-pdr-tsa"
-#  data: "plot-throughput-speedup-analysis-3n-hsw"
-#  filter: "'NIC_Intel-X520-DA2' and
-#           '78B' and
-#           'ENCAP' and
-#           'NDRPDR' and
-#           'LISP' and
-#           not 'VHOST'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "IP4UNRLAY"
-#  - "IP6UNRLAY"
-#  layout:
-#    title: "ip6tun-3n-hsw-x520-78b-base-pdr"
-#    layout: "plot-throughput-speedup-analysis"
-#
-#################################################################################
-#
-## Speedup - VPP IPSec 3n-hsw-xl710 base
-#-
-#  type: "plot"
-#  title: "Speedup: ipsec-3n-hsw-xl710-64b-base-ndr-tsa"
-#  algorithm: "plot_throughput_speedup_analysis"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/ipsec-3n-hsw-xl710-64b-base-ndr-tsa"
-#  data: "plot-throughput-speedup-analysis-3n-hsw"
-#  filter: "'NIC_Intel-XL710' and
-#           '64B' and
-#           'IP4FWD' and
-#           'NDRPDR' and
-#           'BASE' and
-#           'IPSECHW' and
-#           ('IPSECTRAN' or 'IPSECTUN') and
-#           not 'VHOST'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  layout:
-#    title: "ipsec-3n-hsw-xl710-64b-base-ndr"
-#    layout: "plot-throughput-speedup-analysis"
-#
-#-
-#  type: "plot"
-#  title: "Speedup: ipsec-3n-hsw-xl710-64b-base-pdr-tsa"
-#  algorithm: "plot_throughput_speedup_analysis"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/ipsec-3n-hsw-xl710-64b-base-pdr-tsa"
-#  data: "plot-throughput-speedup-analysis-3n-hsw"
-#  filter: "'NIC_Intel-XL710' and
-#           '64B' and
-#           'IP4FWD' and
-#           'NDRPDR' and
-#           'BASE' and
-#           'IPSECHW' and
-#           ('IPSECTRAN' or 'IPSECTUN') and
-#           not 'VHOST'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  layout:
-#    title: "ipsec-3n-hsw-xl710-64b-base-pdr"
-#    layout: "plot-throughput-speedup-analysis"
-#
-## Speedup - VPP IPSec 3n-hsw-xl710 scale
-#-
-#  type: "plot"
-#  title: "Speedup: ipsec-3n-hsw-xl710-64b-scale-ndr-tsa"
-#  algorithm: "plot_throughput_speedup_analysis"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/ipsec-3n-hsw-xl710-64b-scale-ndr-tsa"
-#  data: "plot-throughput-speedup-analysis-3n-hsw"
-#  filter: "'NIC_Intel-XL710' and
-#           '64B' and
-#           'IP4FWD' and
-#           'NDRPDR' and
-#           'SCALE' and
-#           'IPSECHW' and
-#           ('IPSECTRAN' or 'IPSECTUN') and
-#           not 'VHOST'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  layout:
-#    title: "ipsec-3n-hsw-xl710-64b-scale-ndr"
-#    layout: "plot-throughput-speedup-analysis"
-#
-#-
-#  type: "plot"
-#  title: "Speedup: ipsec-3n-hsw-xl710-64b-scale-pdr-tsa"
-#  algorithm: "plot_throughput_speedup_analysis"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/ipsec-3n-hsw-xl710-64b-scale-pdr-tsa"
-#  data: "plot-throughput-speedup-analysis-3n-hsw"
-#  filter: "'NIC_Intel-XL710' and
-#           '64B' and
-#           'IP4FWD' and
-#           'NDRPDR' and
-#           'SCALE' and
-#           'IPSECHW' and
-#           ('IPSECTRAN' or 'IPSECTUN') and
-#           not 'VHOST'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  layout:
-#    title: "ipsec-3n-hsw-xl710-64b-scale-pdr"
-#    layout: "plot-throughput-speedup-analysis"
-#
-## Speedup - VPP IPSec 3n-hsw-xl710 sw
-#-
-#  type: "plot"
-#  title: "Speedup: ipsec-3n-hsw-xl710-64b-sw-ndr-tsa"
-#  algorithm: "plot_throughput_speedup_analysis"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/ipsec-3n-hsw-xl710-64b-sw-ndr-tsa"
-#  data: "plot-throughput-speedup-analysis-3n-hsw"
-#  filter: "'NIC_Intel-XL710' and
-#           '64B' and
-#           'IP4FWD' and
-#           'NDRPDR' and
-#           'IPSECSW' and
-#           ('IPSECTRAN' or 'IPSECTUN') and
-#           not 'VHOST'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  layout:
-#    title: "ipsec-3n-hsw-xl710-64b-sw-ndr"
-#    layout: "plot-throughput-speedup-analysis"
-#
-#-
-#  type: "plot"
-#  title: "Speedup: ipsec-3n-hsw-xl710-64b-sw-pdr-tsa"
-#  algorithm: "plot_throughput_speedup_analysis"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/ipsec-3n-hsw-xl710-64b-sw-pdr-tsa"
-#  data: "plot-throughput-speedup-analysis-3n-hsw"
-#  filter: "'NIC_Intel-XL710' and
-#           '64B' and
-#           'IP4FWD' and
-#           'NDRPDR' and
-#           'IPSECSW' and
-#           ('IPSECTRAN' or 'IPSECTUN') and
-#           not 'VHOST'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  layout:
-#    title: "ipsec-3n-hsw-xl710-64b-sw-pdr"
-#    layout: "plot-throughput-speedup-analysis"
-#
-#################################################################################
-#
-## Speedup - VPP SRv6 3n-hsw-x520
-#-
-#  type: "plot"
-#  title: "Speedup: srv6-3n-hsw-x520-78b-features-ndr-tsa"
-#  algorithm: "plot_throughput_speedup_analysis"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/srv6-3n-hsw-x520-78b-features-ndr-tsa"
-#  data: "plot-throughput-speedup-analysis-3n-hsw"
-#  filter: "'NIC_Intel-X520-DA2' and
-#           '78B' and
-#           'FEATURE' and
-#           'NDRPDR' and
-#           'IP6FWD' and
-#           'SRv6'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
+#  - "IP4UNRLAY"
+#  - "IP6UNRLAY"
 #  layout:
-#    title: "srv6-3n-hsw-x520-78b-features-ndr"
+#    title: "ip6tun-3n-hsw-x520-78b-base-ndr"
 #    layout: "plot-throughput-speedup-analysis"
 #
 #-
 #  type: "plot"
-#  title: "Speedup: srv6-3n-hsw-x520-78b-features-pdr-tsa"
+#  title: "Speedup: ip6tun-3n-hsw-x520-78b-base-pdr-tsa"
 #  algorithm: "plot_throughput_speedup_analysis"
 #  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/srv6-3n-hsw-x520-78b-features-pdr-tsa"
+#  output-file: "{DIR[STATIC,VPP]}/ip6tun-3n-hsw-x520-78b-base-pdr-tsa"
 #  data: "plot-throughput-speedup-analysis-3n-hsw"
 #  filter: "'NIC_Intel-X520-DA2' and
 #           '78B' and
-#           'FEATURE' and
+#           'ENCAP' and
 #           'NDRPDR' and
-#           'IP6FWD' and
-#           'SRv6'"
+#           'LISP' and
+#           not 'VHOST'"
 #  parameters:
 #  - "throughput"
 #  - "parent"
 #  - "tags"
+#  sort:
+#  - "IP4UNRLAY"
+#  - "IP6UNRLAY"
 #  layout:
-#    title: "srv6-3n-hsw-x520-78b-features-pdr"
+#    title: "ip6tun-3n-hsw-x520-78b-base-pdr"
 #    layout: "plot-throughput-speedup-analysis"
 #
 #################################################################################
+
+# Speedup - VPP IPSec 3n-hsw-xl710 base
+-
+  type: "plot"
+  title: "Speedup: ipsec-3n-hsw-xl710-64b-base-ndr-tsa"
+  algorithm: "plot_throughput_speedup_analysis"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/ipsec-3n-hsw-xl710-64b-base-ndr-tsa"
+  data: "plot-throughput-speedup-analysis-3n-hsw"
+  filter: "'NIC_Intel-XL710' and
+           '64B' and
+           'IP4FWD' and
+           'NDRPDR' and
+           'BASE' and
+           'IPSECHW' and
+           not 'VHOST'"
+  parameters:
+  - "throughput"
+  - "parent"
+  - "tags"
+  layout:
+    title: "ipsec-3n-hsw-xl710-64b-base-ndr"
+    layout: "plot-throughput-speedup-analysis"
+
+-
+  type: "plot"
+  title: "Speedup: ipsec-3n-hsw-xl710-64b-base-pdr-tsa"
+  algorithm: "plot_throughput_speedup_analysis"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/ipsec-3n-hsw-xl710-64b-base-pdr-tsa"
+  data: "plot-throughput-speedup-analysis-3n-hsw"
+  filter: "'NIC_Intel-XL710' and
+           '64B' and
+           'IP4FWD' and
+           'NDRPDR' and
+           'BASE' and
+           'IPSECHW' and
+           not 'VHOST'"
+  parameters:
+  - "throughput"
+  - "parent"
+  - "tags"
+  layout:
+    title: "ipsec-3n-hsw-xl710-64b-base-pdr"
+    layout: "plot-throughput-speedup-analysis"
+
+# Speedup - VPP IPSec 3n-hsw-xl710 scale
+-
+  type: "plot"
+  title: "Speedup: ipsec-3n-hsw-xl710-64b-scale-ndr-tsa"
+  algorithm: "plot_throughput_speedup_analysis"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/ipsec-3n-hsw-xl710-64b-scale-ndr-tsa"
+  data: "plot-throughput-speedup-analysis-3n-hsw"
+  filter: "'NIC_Intel-XL710' and
+           '64B' and
+           'IP4FWD' and
+           'NDRPDR' and
+           'SCALE' and
+           'IPSECHW' and
+           not 'VHOST'"
+  parameters:
+  - "throughput"
+  - "parent"
+  - "tags"
+  layout:
+    title: "ipsec-3n-hsw-xl710-64b-scale-ndr"
+    layout: "plot-throughput-speedup-analysis"
+
+-
+  type: "plot"
+  title: "Speedup: ipsec-3n-hsw-xl710-64b-scale-pdr-tsa"
+  algorithm: "plot_throughput_speedup_analysis"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/ipsec-3n-hsw-xl710-64b-scale-pdr-tsa"
+  data: "plot-throughput-speedup-analysis-3n-hsw"
+  filter: "'NIC_Intel-XL710' and
+           '64B' and
+           'IP4FWD' and
+           'NDRPDR' and
+           'SCALE' and
+           'IPSECHW' and
+           not 'VHOST'"
+  parameters:
+  - "throughput"
+  - "parent"
+  - "tags"
+  layout:
+    title: "ipsec-3n-hsw-xl710-64b-scale-pdr"
+    layout: "plot-throughput-speedup-analysis"
+
+# Speedup - VPP IPSec 3n-hsw-xl710 sw
+-
+  type: "plot"
+  title: "Speedup: ipsec-3n-hsw-xl710-64b-sw-ndr-tsa"
+  algorithm: "plot_throughput_speedup_analysis"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/ipsec-3n-hsw-xl710-64b-sw-ndr-tsa"
+  data: "plot-throughput-speedup-analysis-3n-hsw"
+  filter: "'NIC_Intel-XL710' and
+           '64B' and
+           'IP4FWD' and
+           'NDRPDR' and
+           'IPSECSW' and
+           not 'VHOST'"
+  parameters:
+  - "throughput"
+  - "parent"
+  - "tags"
+  layout:
+    title: "ipsec-3n-hsw-xl710-64b-sw-ndr"
+    layout: "plot-throughput-speedup-analysis"
+
+-
+  type: "plot"
+  title: "Speedup: ipsec-3n-hsw-xl710-64b-sw-pdr-tsa"
+  algorithm: "plot_throughput_speedup_analysis"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/ipsec-3n-hsw-xl710-64b-sw-pdr-tsa"
+  data: "plot-throughput-speedup-analysis-3n-hsw"
+  filter: "'NIC_Intel-XL710' and
+           '64B' and
+           'IP4FWD' and
+           'NDRPDR' and
+           'IPSECSW' and
+           not 'VHOST'"
+  parameters:
+  - "throughput"
+  - "parent"
+  - "tags"
+  layout:
+    title: "ipsec-3n-hsw-xl710-64b-sw-pdr"
+    layout: "plot-throughput-speedup-analysis"
+
+################################################################################
+
+# Speedup - VPP SRv6 3n-hsw-x520
+-
+  type: "plot"
+  title: "Speedup: srv6-3n-hsw-x520-78b-features-ndr-tsa"
+  algorithm: "plot_throughput_speedup_analysis"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/srv6-3n-hsw-x520-78b-features-ndr-tsa"
+  data: "plot-throughput-speedup-analysis-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' and
+           '78B' and
+           'FEATURE' and
+           'NDRPDR' and
+           'IP6FWD' and
+           'SRv6'"
+  parameters:
+  - "throughput"
+  - "parent"
+  - "tags"
+  layout:
+    title: "srv6-3n-hsw-x520-78b-features-ndr"
+    layout: "plot-throughput-speedup-analysis"
+
+-
+  type: "plot"
+  title: "Speedup: srv6-3n-hsw-x520-78b-features-pdr-tsa"
+  algorithm: "plot_throughput_speedup_analysis"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/srv6-3n-hsw-x520-78b-features-pdr-tsa"
+  data: "plot-throughput-speedup-analysis-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' and
+           '78B' and
+           'FEATURE' and
+           'NDRPDR' and
+           'IP6FWD' and
+           'SRv6'"
+  parameters:
+  - "throughput"
+  - "parent"
+  - "tags"
+  layout:
+    title: "srv6-3n-hsw-x520-78b-features-pdr"
+    layout: "plot-throughput-speedup-analysis"
+
+#################################################################################
 #
 ## Speedup - VPP L2 3n-hsw-x520 base and scale
 #-
 #    title: "l2sw-3n-hsw-xl710-64b-base-pdr"
 #    layout: "plot-throughput-speedup-analysis"
 
+# Speedup - VPP L2 3n-hsw-x520 features-oacl
+- type: "plot"
+  title: "Speedup: l2sw-3n-hsw-x520-64b-features-oacl-ndr-tsa"
+  algorithm: "plot_throughput_speedup_analysis"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x520-64b-features-oacl-ndr-tsa"
+  data: "plot-throughput-speedup-analysis-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' and
+           'NDRPDR' and
+           '64B' and
+           'FEATURE' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
+           'OACL' and
+           ('ACL1' or 'ACL50') and
+           ('10K_FLOWS' or '10k_FLOWS') and
+           not 'MACIP' and
+           not 'VHOST' and
+           not 'MEMIF'"
+  parameters:
+  - "throughput"
+  - "parent"
+  - "tags"
+  layout:
+    title: "l2sw-3n-hsw-x520-64b-features-oacl-ndr"
+    layout: "plot-throughput-speedup-analysis"
+
+- type: "plot"
+  title: "Speedup: l2sw-3n-hsw-x520-64b-features-oacl-pdr-tsa"
+  algorithm: "plot_throughput_speedup_analysis"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x520-64b-features-oacl-pdr-tsa"
+  data: "plot-throughput-speedup-analysis-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' and
+           'NDRPDR' and
+           '64B' and
+           'FEATURE' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
+           'OACL' and
+           ('ACL1' or 'ACL50') and
+           ('10K_FLOWS' or '10k_FLOWS') and
+           not 'MACIP' and
+           not 'VHOST' and
+           not 'MEMIF'"
+  parameters:
+  - "throughput"
+  - "parent"
+  - "tags"
+  layout:
+    title: "l2sw-3n-hsw-x520-64b-features-oacl-pdr"
+    layout: "plot-throughput-speedup-analysis"
+
+# Speedup - VPP L2 3n-hsw-x520 features-macip
+- type: "plot"
+  title: "Speedup: l2sw-3n-hsw-x520-64b-features-macip-ndr-tsa"
+  algorithm: "plot_throughput_speedup_analysis"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x520-64b-features-macip-ndr-tsa"
+  data: "plot-throughput-speedup-analysis-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' and
+           'NDRPDR' and
+           '64B' and
+           'FEATURE' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
+           'MACIP' and
+           ('ACL1' or 'ACL50') and
+           ('10K_FLOWS' or '10k_FLOWS') and
+           not 'VHOST' and
+           not 'MEMIF'"
+  parameters:
+  - "throughput"
+  - "parent"
+  - "tags"
+  layout:
+    title: "l2sw-3n-hsw-x520-64b-features-macip-ndr"
+    layout: "plot-throughput-speedup-analysis"
+
+- type: "plot"
+  title: "Speedup: l2sw-3n-hsw-x520-64b-features-macip-pdr-tsa"
+  algorithm: "plot_throughput_speedup_analysis"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x520-64b-features-macip-pdr-tsa"
+  data: "plot-throughput-speedup-analysis-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' and
+           'NDRPDR' and
+           '64B' and
+           'FEATURE' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
+           'MACIP' and
+           ('ACL1' or 'ACL50') and
+           ('10K_FLOWS' or '10k_FLOWS') and
+           not 'VHOST' and
+           not 'MEMIF'"
+  parameters:
+  - "throughput"
+  - "parent"
+  - "tags"
+  layout:
+    title: "l2sw-3n-hsw-x520-64b-features-macip-pdr"
+    layout: "plot-throughput-speedup-analysis"
+
 # Speedup - VPP L2 3n-skx-x710 base and scale
 -
   type: "plot"
 #    title: "vhost-l2sw-2n-skx-xxv710-64b-base-vm-pdr"
 #    layout: "plot-throughput-speedup-analysis"
 
-################################################################################
+###############################################################################
 
-## Speedup - VPP vts 3n-hsw-x520
-#-
-#  type: "plot"
-#  title: "VPP Speedup: vts-3n-hsw-x520-114b-base_and_scale-ndr-tsa"
-#  algorithm: "plot_throughput_speedup_analysis"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/vts-3n-hsw-x520-114b-base_and_scale-ndr-tsa"
-#  data: "plot-throughput-speedup-analysis-3n-hsw"
-#  filter: "'NIC_Intel-X520-DA2' and
-#           '114B' and
-#           'NDRPDR' and
-#           'VTS'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  layout:
-#    title: "vts-3n-hsw-x520-114b-base_and_scale-ndr"
-#    layout: "plot-throughput-speedup-analysis"
-#
-#-
-#  type: "plot"
-#  title: "VPP Speedup: vts-3n-hsw-x520-114b-base_and_scale-pdr-tsa"
-#  algorithm: "plot_throughput_speedup_analysis"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/vts-3n-hsw-x520-114b-base_and_scale-pdr-tsa"
-#  data: "plot-throughput-speedup-analysis-3n-hsw"
-#  filter: "'NIC_Intel-X520-DA2' and
-#           '114B' and
-#           'NDRPDR' and
-#           'VTS'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  layout:
-#    title: "vts-3n-hsw-x520-114b-base_and_scale-pdr-tsa"
-#    layout: "plot-throughput-speedup-analysis"
+# Speedup - VPP vts 3n-hsw-x520
+-
+  type: "plot"
+  title: "VPP Speedup: vts-3n-hsw-x520-114b-base_and_scale-ndr-tsa"
+  algorithm: "plot_throughput_speedup_analysis"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/vts-3n-hsw-x520-114b-base_and_scale-ndr-tsa"
+  data: "plot-throughput-speedup-analysis-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' and
+           '114B' and
+           'NDRPDR' and
+           'VTS'"
+  parameters:
+  - "throughput"
+  - "parent"
+  - "tags"
+  layout:
+    title: "vts-3n-hsw-x520-114b-base_and_scale-ndr"
+    layout: "plot-throughput-speedup-analysis"
+
+-
+  type: "plot"
+  title: "VPP Speedup: vts-3n-hsw-x520-114b-base_and_scale-pdr-tsa"
+  algorithm: "plot_throughput_speedup_analysis"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/vts-3n-hsw-x520-114b-base_and_scale-pdr-tsa"
+  data: "plot-throughput-speedup-analysis-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' and
+           '114B' and
+           'NDRPDR' and
+           'VTS'"
+  parameters:
+  - "throughput"
+  - "parent"
+  - "tags"
+  layout:
+    title: "vts-3n-hsw-x520-114b-base_and_scale-pdr-tsa"
+    layout: "plot-throughput-speedup-analysis"