X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=docs%2Freport%2Fvpp_performance_tests%2Fpacket_throughput_graphs%2Fl2.rst;h=6966413b78b8f45b3931c8bb87977ac06b967ca4;hb=01b9a636f84ad3b03e2845abd4ebf1a258705b55;hp=46c9500a11ebfbd44e9f7164be2d06879cd3b255;hpb=196ed0599148d6c8ed0e2ca82ad03e129e26428a;p=csit.git

diff --git a/docs/report/vpp_performance_tests/packet_throughput_graphs/l2.rst b/docs/report/vpp_performance_tests/packet_throughput_graphs/l2.rst
index 46c9500a11..6966413b78 100644
--- a/docs/report/vpp_performance_tests/packet_throughput_graphs/l2.rst
+++ b/docs/report/vpp_performance_tests/packet_throughput_graphs/l2.rst
@@ -26,9 +26,24 @@ in the graph below.
             \label{fig:64B-1t1c-l2-sel1-ndrdisc}
     \end{figure}
 
-*Figure 1a. VPP 1thread 1core - NDR Throughput for Phy-to-Phy L2 Ethernet
+*Figure 1. VPP 1thread 1core - NDR Throughput for Phy-to-Phy L2 Ethernet
 Switching (base).*
 
+CSIT source code for the test cases used for above plots can be found in CSIT
+git repository:
+
+.. only:: html
+
+   .. program-output:: cd ../../../../../ && set +x && cd tests/vpp/perf/l2/ && grep -E "64B-1t1c-(eth|dot1q|dot1ad)-(l2xcbase|l2bdbasemaclrn|l2bdscale.*|l2dbscale.*)-(eth.*)*ndrdisc" *
+      :shell:
+
+.. only:: latex
+
+   .. code-block:: bash
+
+      $ grep -E "64B-1t1c-(eth|dot1q|dot1ad)-(l2xcbase|l2bdbasemaclrn|l2bdscale.*|l2dbscale.*)-(eth.*)*ndrdisc" tests/vpp/perf/l2/*
+
+
 .. raw:: html
 
     <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/64B-1t1c-l2-sel2-ndrdisc.html"></iframe>
@@ -42,7 +57,7 @@ Switching (base).*
             \label{fig:64B-1t1c-l2-sel2-ndrdisc}
     \end{figure}
 
-*Figure 1b. VPP 1thread 1core - NDR Throughput for Phy-to-Phy L2 Ethernet
+*Figure 2. VPP 1thread 1core - NDR Throughput for Phy-to-Phy L2 Ethernet
 Switching (feature).*
 
 CSIT source code for the test cases used for above plots can be found in CSIT
@@ -50,7 +65,7 @@ git repository:
 
 .. only:: html
 
-   .. program-output:: cd ../../ && set -x && cd tests/vpp/perf/l2 && grep -E "64B-1t1c-(eth|dot1q|dot1ad)-(l2xcbase|l2bdbasemaclrn)-(iacl50-state(ful|less)-flows10k.*|oacl50-state(ful|less)-flows10k.*|eth.*)*ndrdisc" *
+   .. program-output:: cd ../../../../../ && set +x && cd tests/vpp/perf/l2 && grep -E "64B-1t1c-(eth|dot1q|dot1ad)-(l2xcbase|l2bdbasemaclrn).*-(iacl(10|50)(-state(ful|less)|sl)-(flows10k.*|10kflows.*)|oacl(10|50)-state(ful|less)-flows10k.*)-ndrdisc" *
       :shell:
 
 .. only:: latex
@@ -58,7 +73,7 @@ git repository:
    .. code-block:: bash
 
       $ cd tests/vpp/perf/l2
-      $ grep -E "64B-1t1c-(eth|dot1q|dot1ad)-(l2xcbase|l2bdbasemaclrn)-(iacl50-state(ful|less)-flows10k.*|oacl50-state(ful|less)-flows10k.*|eth.*)*ndrdisc" *
+      $ grep -E "64B-1t1c-(eth|dot1q|dot1ad)-(l2xcbase|l2bdbasemaclrn).*-(iacl(10|50)(-state(ful|less)|sl)-(flows10k.*|10kflows.*)|oacl(10|50)-state(ful|less)-flows10k.*)-ndrdisc" *
 
 VPP NDR 64B packet throughput in 2t2c setup (2thread, 2core) is presented
 in the graph below.
@@ -76,9 +91,24 @@ in the graph below.
             \label{fig:64B-2t2c-l2-sel1-ndrdisc}
     \end{figure}
 
-*Figure 2a. VPP 2threads 2cores - NDR Throughput for Phy-to-Phy L2 Ethernet
+*Figure 3. VPP 2threads 2cores - NDR Throughput for Phy-to-Phy L2 Ethernet
 Switching (base).*
 
+CSIT source code for the test cases used for above plots can be found in CSIT
+git repository:
+
+.. only:: html
+
+   .. program-output:: cd ../../../../../ && set +x && cd tests/vpp/perf/l2/ && grep -E "64B-2t2c-(eth|dot1q|dot1ad)-(l2xcbase|l2bdbasemaclrn|l2bdscale.*|l2dbscale.*)-(eth.*)*ndrdisc" *
+      :shell:
+
+.. only:: latex
+
+   .. code-block:: bash
+
+      $ grep -E "64B-2t2c-(eth|dot1q|dot1ad)-(l2xcbase|l2bdbasemaclrn|l2bdscale.*|l2dbscale.*)-(eth.*)*ndrdisc" tests/vpp/perf/l2/*
+
+
 .. raw:: html
 
     <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/64B-2t2c-l2-sel2-ndrdisc.html"></iframe>
@@ -92,7 +122,7 @@ Switching (base).*
             \label{fig:64B-2t2c-l2-sel2-ndrdisc}
     \end{figure}
 
-*Figure 2b. VPP 2threads 2cores - NDR Throughput for Phy-to-Phy L2 Ethernet
+*Figure 4. VPP 2threads 2cores - NDR Throughput for Phy-to-Phy L2 Ethernet
 Switching (feature).*
 
 CSIT source code for the test cases used for above plots can be found in CSIT
@@ -100,7 +130,7 @@ git repository:
 
 .. only:: html
 
-   .. program-output:: cd ../../ && set -x && cd tests/vpp/perf/l2 && grep -E "64B-2t2c-(eth|dot1q|dot1ad)-(l2xcbase|l2bdbasemaclrn)-(iacl50-state(ful|less)-flows10k.*|oacl50-state(ful|less)-flows10k.*|eth.*)*ndrdisc" *
+   .. program-output:: cd ../../../../../ && set +x && cd tests/vpp/perf/l2 && grep -E "64B-2t2c-(eth|dot1q|dot1ad)-(l2xcbase|l2bdbasemaclrn).*-(iacl(10|50)(-state(ful|less)|sl)-(flows10k.*|10kflows.*)|oacl(10|50)-state(ful|less)-flows10k.*)-ndrdisc" *
       :shell:
 
 .. only:: latex
@@ -108,7 +138,7 @@ git repository:
    .. code-block:: bash
 
       $ cd tests/vpp/perf/l2
-      $ grep -E "64B-2t2c-(eth|dot1q|dot1ad)-(l2xcbase|l2bdbasemaclrn)-(iacl50-state(ful|less)-flows10k.*|oacl50-state(ful|less)-flows10k.*|eth.*)*ndrdisc" *
+      $ grep -E "64B-2t2c-(eth|dot1q|dot1ad)-(l2xcbase|l2bdbasemaclrn).*-(iacl(10|50)(-state(ful|less)|sl)-(flows10k.*|10kflows.*)|oacl(10|50)-state(ful|less)-flows10k.*)-ndrdisc" *
 
 
 PDR Throughput
@@ -130,9 +160,24 @@ in the graph below. PDR measured for 0.5% packet loss ratio.
             \label{fig:64B-1t1c-l2-sel1-pdrdisc}
     \end{figure}
 
-*Figure 3a. VPP 1thread 1core - PDR Throughput for Phy-to-Phy L2 Ethernet
+*Figure 5. VPP 1thread 1core - PDR Throughput for Phy-to-Phy L2 Ethernet
 Switching (base).*
 
+CSIT source code for the test cases used for above plots can be found in CSIT
+git repository:
+
+.. only:: html
+
+   .. program-output:: cd ../../../../../ && set +x && cd tests/vpp/perf/l2/ && grep -E "64B-1t1c-(eth|dot1q|dot1ad)-(l2xcbase|l2bdbasemaclrn|l2bdscale.*|l2dbscale.*)-(eth.*)*pdrdisc" *
+      :shell:
+
+.. only:: latex
+
+   .. code-block:: bash
+
+      $ grep -E "64B-1t1c-(eth|dot1q|dot1ad)-(l2xcbase|l2bdbasemaclrn|l2bdscale.*|l2dbscale.*)-(eth.*)*ndrdisc" tests/vpp/perf/l2/*
+
+
 .. raw:: html
 
     <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/64B-1t1c-l2-sel2-pdrdisc.html"></iframe>
@@ -146,7 +191,7 @@ Switching (base).*
             \label{fig:64B-1t1c-l2-sel2-pdrdisc}
     \end{figure}
 
-*Figure 3b. VPP 1thread 1core - PDR Throughput for Phy-to-Phy L2 Ethernet
+*Figure 6. VPP 1thread 1core - PDR Throughput for Phy-to-Phy L2 Ethernet
 Switching (feature).*
 
 CSIT source code for the test cases used for above plots can be found in CSIT
@@ -154,7 +199,7 @@ git repository:
 
 .. only:: html
 
-   .. program-output:: cd ../../ && set -x && cd tests/vpp/perf/l2 && grep -E "64B-1t1c-(eth|dot1q|dot1ad)-(l2xcbase|l2bdbasemaclrn)-(iacl50-state(ful|less)-flows10k.*|oacl50-state(ful|less)-flows10k.*|eth.*)*pdrdisc" *
+   .. program-output:: cd ../../../../../ && set +x && cd tests/vpp/perf/l2 && grep -E "64B-1t1c-(eth|dot1q|dot1ad)-(l2xcbase|l2bdbasemaclrn).*-(iacl(10|50)(-state(ful|less)|sl)-(flows10k.*|10kflows.*)|oacl(10|50)-state(ful|less)-flows10k.*)-pdrdisc" *
       :shell:
 
 .. only:: latex
@@ -162,7 +207,7 @@ git repository:
    .. code-block:: bash
 
       $ cd tests/vpp/perf/l2
-      $ grep -E "64B-1t1c-(eth|dot1q|dot1ad)-(l2xcbase|l2bdbasemaclrn)-(iacl50-state(ful|less)-flows10k.*|oacl50-state(ful|less)-flows10k.*|eth.*)*pdrdisc" *
+      $ grep -E "64B-1t1c-(eth|dot1q|dot1ad)-(l2xcbase|l2bdbasemaclrn).*-(iacl(10|50)(-state(ful|less)|sl)-(flows10k.*|10kflows.*)|oacl(10|50)-state(ful|less)-flows10k.*)-pdrdisc" *
 
 VPP PDR 64B packet throughput in 2t2c setup (2thread, 2core) is presented
 in the graph below. PDR measured for 0.5% packet loss ratio.
@@ -180,9 +225,24 @@ in the graph below. PDR measured for 0.5% packet loss ratio.
             \label{fig:64B-2t2c-l2-sel1-pdrdisc}
     \end{figure}
 
-*Figure 4a. VPP 2thread 2core - PDR Throughput for Phy-to-Phy L2 Ethernet
+*Figure 7. VPP 2thread 2core - PDR Throughput for Phy-to-Phy L2 Ethernet
 Switching (base).*
 
+CSIT source code for the test cases used for above plots can be found in CSIT
+git repository:
+
+.. only:: html
+
+   .. program-output:: cd ../../../../../ && set +x && cd tests/vpp/perf/l2/ && grep -E "64B-2t2c-(eth|dot1q|dot1ad)-(l2xcbase|l2bdbasemaclrn|l2bdscale.*|l2dbscale.*)-(eth.*)*pdrdisc" *
+      :shell:
+
+.. only:: latex
+
+   .. code-block:: bash
+
+      $ grep -E "64B-2t2c-(eth|dot1q|dot1ad)-(l2xcbase|l2bdbasemaclrn|l2bdscale.*|l2dbscale.*)-(eth.*)*ndrdisc" tests/vpp/perf/l2/*
+
+
 .. raw:: html
 
     <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/64B-2t2c-l2-sel2-pdrdisc.html"></iframe>
@@ -196,5 +256,17 @@ Switching (base).*
             \label{fig:64B-2t2c-l2-sel2-pdrdisc}
     \end{figure}
 
-*Figure 4b. VPP 2thread 2core - PDR Throughput for Phy-to-Phy L2 Ethernet
+*Figure 8. VPP 2thread 2core - PDR Throughput for Phy-to-Phy L2 Ethernet
 Switching (feature).*
+
+.. only:: html
+
+   .. program-output:: cd ../../../../../ && set +x && cd tests/vpp/perf/l2 && grep -E "64B-2t2c-(eth|dot1q|dot1ad)-(l2xcbase|l2bdbasemaclrn).*-(iacl(10|50)(-state(ful|less)|sl)-(flows10k.*|10kflows.*)|oacl(10|50)-state(ful|less)-flows10k.*)-pdrdisc" *
+      :shell:
+
+.. only:: latex
+
+   .. code-block:: bash
+
+      $ cd tests/vpp/perf/l2
+      $ grep -E "64B-2t2c-(eth|dot1q|dot1ad)-(l2xcbase|l2bdbasemaclrn).*-(iacl(10|50)(-state(ful|less)|sl)-(flows10k.*|10kflows.*)|oacl(10|50)-state(ful|less)-flows10k.*)-pdrdisc" *