X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=docs%2Freport%2Fvpp_performance_tests%2Fpacket_throughput_graphs%2Findex.rst;h=186a058177c80aa7fdbef5bec4d3521f4f8ae046;hp=aae566e9e4ea0366d1dace16ad6cb7011bcc447a;hb=9dd388775bc42b334223b3a98909e9ee0e663dc7;hpb=6898a7671b00c5e5c48c58fdfaeb47bb7148d4bb

diff --git a/docs/report/vpp_performance_tests/packet_throughput_graphs/index.rst b/docs/report/vpp_performance_tests/packet_throughput_graphs/index.rst
index aae566e9e4..186a058177 100644
--- a/docs/report/vpp_performance_tests/packet_throughput_graphs/index.rst
+++ b/docs/report/vpp_performance_tests/packet_throughput_graphs/index.rst
@@ -20,7 +20,7 @@ per testbed type in `test_select_list_{testbed_type}.md
 
 Graphs are split into sections as follows:
 
-#. **Level-1: VPP packet path and lookup types**
+#. **Header 1**: VPP packet path and lookup types
 
    - **L2 Ethernet Switching**: L2 bridge-doman, L2 cross-connect and L2 patch
    - **IPv4 Routing**: IPv4 routing with /32 prefixes
@@ -30,49 +30,76 @@ Graphs are split into sections as follows:
    - **KVM VMs vhost-user**: KVM VMs connected over virtio and vhost-user interfaces
    - **LXC/DRC Container Memif**: Linux containers and Docker containers connected over Memif interfaces
    - **IPsec IPv4 Routing**: IPsec encryption/decryption with IPv4 routing
-   - **Virtual Topology System**: VXLAN configurations with L2 bridge-domains
 
-#. **Level-2: testbeds and NIC models**
+#. **Header 2**: testbeds and NIC models
+
+   - section name format:
+
+     - {**testbed_type**}-{**nic_model**}
 
-   - section name format: {**testbed_type**}-{**nic_model**}
    - **testbed_type**:
+
      - 2n-skx: 2-node Xeon Skylake
      - 3n-skx: 3-node Xeon Skylake
-     - 3n-hsw: 3-node Xeon Haswell
+     - 2n-clx: 2-node Xeon Cascade Lake
      - 3n-tsh: 3-node Arm TaiShan
+     - 2n-tx2: 2-node Arm ThunderX2
+     - 2n zn2: 2-node AMD Zen2
      - 2n-dnv: 2-node Atom Denverton
      - 3n-dnv: 3-node Atom Denverton
+     - 2n-aws: 2-node AWS
+     - 3n-aws: 3-node AWS
+     - 2n-icx: 2-node Xeon Icelake
+     - 3n-icx: 3-node Xeon Icelake
+
    - **nic_model**:
+
      - xxv710: xxv710 2p25GE Intel (Fortville)
      - x710: x710 4p10GE Intel (Fortville)
      - xl710: xl710 2p40GE Intel (Fortville)
      - x520: x520 2p10GE Intel (Niantic)
      - x553: x553 2p10GE Intel (Niantic)
+     - cx556a: cx556a-edat 2p100GE Mellanox ConnectX5
+     - e810cq: E810-2CQDA2 2p100GE Intel Columbiaville
 
-#. **Level-3: test group names**
+#. **Header 3**: test group names
+
+   - section name format:
+
+     - {**frame_size**}-{**worker_thread_core_cfg**}-{**vpp_functionality**}-{**vpp_lookup_type**}-{**baseline_scale**}-{**nic_driver**}
 
-   - section name format: {**frame_size**}-{**worker_thread_core_cfg**}-{**vpp_functionality**}-{**vpp_lookup_type**}-{**baseline_scale**}-{**nic_driver**}
    - **frame_size**:
-    - 64b: 64 byte frames, smallest frame size for untagged IPv4 packets
-    - 78b: 78 byte frames, smallest frame size for untagged IPv6 packets
-    - 114b: VXLAN encapsulated L2 frames
-    - imix: a sequence of (7x64B, 4x570, 1x1518) byte frames
+
+     - 64b: 64 byte frames, smallest frame size for untagged IPv4 packets
+     - 78b: 78 byte frames, smallest frame size for untagged IPv6 packets
+     - 114b: VXLAN encapsulated L2 frames
+     - imix: a sequence of (7x64B, 4x570, 1x1518) byte frames
+
    - **worker_thread_core_cfg**:
+
      - 1t1c: 1 worker thread on 1 core, hyper-threading not used
      - 2t1c: 2 worker threads on 1 core, hyper-threading used
+
    - **vpp_functionality** (optional):
+
      - features: including input-acl, output-acl, macip-iacl, nat44
      - srv6: srv6 encap/decap, proxy
      - link-bonding: L2 link aggregation with 1 or 2 bonded links
      - ipsec: IPsec encryption/decryption with different ciphers
      - vts: Virtual Topology System specific tests
+
    - **vpp_lookup_type**:
+
      - l2switching, ip4routing, ip6routing, ip4tunnel, vhost, memif
+
    - **baseline_scale**:
+
      - base: baseline tests with less than 10 forwarding entries
      - scale: scale tests with up to 2 million forwarding entries
      - base-scale: both baseline and scale tests grouped together
+
    - **nic_driver**:
+
      - avf: VPP native avf driver for Intel Fortville NICs
      - i40e: dpdk poll mode driver for Intel Fortville NICs
      - ixgbe: dpdk poll mode driver for Intel Niantic NICs
@@ -108,10 +135,17 @@ Additional information about graph data:
 
 .. note::
 
-    Test results have been generated by
-    `FD.io test executor vpp performance job 3n-hsw`_,
-    `FD.io test executor vpp performance job 3n-skx`_ and
-    `FD.io test executor vpp performance job 2n-skx`_ with RF
+    Test results are stored in
+    `build logs from FD.io vpp performance job 2n-aws`_,
+    `build logs from FD.io vpp performance job 3n-aws`_,
+    `build logs from FD.io vpp performance job 2n-skx`_,
+    `build logs from FD.io vpp performance job 3n-skx`_,
+    `build logs from FD.io vpp performance job 2n-clx`_,
+    `build logs from FD.io vpp performance job 2n-zn2`_,
+    `build logs from FD.io vpp performance job 3n-tsh`_,
+    `build logs from FD.io vpp performance job 2n-tx2`_,
+    `build logs from FD.io vpp performance job 2n-dnv`_ and
+    `build logs from FD.io vpp performance job 3n-dnv`_ with RF
     result files csit-vpp-perf-|srelease|-\*.zip
     `archived here <../../_static/archive/>`_.
     Required per test case data set size is **10**, but for VPP tests
@@ -125,7 +159,7 @@ Additional information about graph data:
     ip6
     srv6
     ip4_tunnels
+    nat44
     vm_vhost
     container_memif
     ipsec
-    vts