rls1807: updated environment sections for all functional tests.

[csit.git] / docs / report / vpp_performance_tests / test_environment.rst

diff --git a/docs/report/vpp_performance_tests/test_environment.rst b/docs/report/vpp_performance_tests/test_environment.rst
index 77fe321..f8880b1 100644 (file)
--- a/docs/report/vpp_performance_tests/test_environment.rst
+++ b/docs/report/vpp_performance_tests/test_environment.rst
@@ -1,186 +1,104 @@
-.. include:: test_environment_intro.rst\r
-\r
-.. include:: test_environment_sut_conf_1.rst\r
-\r
-.. include:: test_environment_sut_conf_2.rst\r
-\r
-.. include:: test_environment_sut_conf_3.rst\r
-\r
-\r
-DUT Configuration - VPP\r
------------------------\r
-\r
-**VPP Version**\r
-\r
-|vpp-release|\r
-\r
-**VPP Compile Parameters**\r
-\r
-`FD.io VPP compile job`_\r
-\r
-**VPP Install Parameters**\r
-\r
-::\r
-\r
-    $ dpkg -i --force-all vpp*\r
-\r
-**VPP Startup Configuration**\r
-\r
-VPP startup configuration changes per test case with different settings for CPU\r
-cores, rx-queues and no-multi-seg parameter. Startup config is aligned with\r
-applied test case tag:\r
-\r
-Tagged by **1T1C**\r
-\r
-::\r
-\r
-    ip\r
-    {\r
-      heap-size 4G\r
-    }\r
-    unix\r
-    {\r
-      cli-listen localhost:5002\r
-      log /tmp/vpe.log\r
-      nodaemon\r
-    }\r
-    ip6\r
-    {\r
-      heap-size 4G\r
-      hash-buckets 2000000\r
-    }\r
-    heapsize 4G\r
-    plugins\r
-    {\r
-      plugin default\r
-      {\r
-        disable\r
-      }\r
-      plugin dpdk_plugin.so\r
-      {\r
-        enable\r
-      }\r
-    }\r
-    cpu\r
-    {\r
-      corelist-workers 2\r
-      main-core 1\r
-    }\r
-    dpdk\r
-    {\r
-      dev 0000:0a:00.0\r
-      dev 0000:0a:00.1\r
-      no-multi-seg\r
-      uio-driver uio_pci_generic\r
-      log-level debug\r
-      dev default\r
-      {\r
-        num-rx-queues 1\r
-      }\r
-      socket-mem 1024,1024\r
-      no-tx-checksum-offload\r
-    }\r
-\r
-Tagged by **2T2C**\r
-\r
-::\r
-\r
-    ip\r
-    {\r
-      heap-size 4G\r
-    }\r
-    unix\r
-    {\r
-      cli-listen localhost:5002\r
-      log /tmp/vpe.log\r
-      nodaemon\r
-    }\r
-    ip6\r
-    {\r
-      heap-size 4G\r
-      hash-buckets 2000000\r
-    }\r
-    heapsize 4G\r
-    plugins\r
-    {\r
-      plugin default\r
-      {\r
-        disable\r
-      }\r
-      plugin dpdk_plugin.so\r
-      {\r
-        enable\r
-      }\r
-    }\r
-    cpu\r
-    {\r
-      corelist-workers 2,3\r
-      main-core 1\r
-    }\r
-    dpdk\r
-    {\r
-      dev 0000:0a:00.0\r
-      dev 0000:0a:00.1\r
-      no-multi-seg\r
-      uio-driver uio_pci_generic\r
-      log-level debug\r
-      dev default\r
-      {\r
-        num-rx-queues 1\r
-      }\r
-      socket-mem 1024,1024\r
-      no-tx-checksum-offload\r
-    }\r
-\r
-Tagged by **4T4C**\r
-\r
-::\r
-\r
-    ip\r
-    {\r
-      heap-size 4G\r
-    }\r
-    unix\r
-    {\r
-      cli-listen localhost:5002\r
-      log /tmp/vpe.log\r
-      nodaemon\r
-    }\r
-    ip6\r
-    {\r
-      heap-size 4G\r
-      hash-buckets 2000000\r
-    }\r
-    heapsize 4G\r
-    plugins\r
-    {\r
-      plugin default\r
-      {\r
-        disable\r
-      }\r
-      plugin dpdk_plugin.so\r
-      {\r
-        enable\r
-      }\r
-    }\r
-    cpu\r
-    {\r
-      corelist-workers 2,3,4,5\r
-      main-core 1\r
-    }\r
-    dpdk\r
-    {\r
-      dev 0000:0a:00.0\r
-      dev 0000:0a:00.1\r
-      no-multi-seg\r
-      uio-driver uio_pci_generic\r
-      log-level debug\r
-      dev default\r
-      {\r
-        num-rx-queues 1\r
-      }\r
-      socket-mem 1024,1024\r
-      no-tx-checksum-offload\r
-    }\r
-\r
-.. include:: test_environment_tg.rst\r
+
+.. raw:: latex
+
+    \clearpage
+
+.. include:: ../introduction/test_environment_intro.rst
+
+.. include:: ../introduction/test_environment_sut_calib_hsw.rst
+
+.. include:: ../introduction/test_environment_sut_calib_skx.rst
+
+.. include:: ../introduction/test_environment_sut_conf_1.rst
+
+.. include:: ../introduction/test_environment_sut_conf_2.rst
+
+.. include:: ../introduction/test_environment_sut_conf_3.rst
+
+
+DUT Settings - VPP
+------------------
+
+VPP Version
+~~~~~~~~~~~
+
+|vpp-release|
+
+VPP Compile Parameters
+~~~~~~~~~~~~~~~~~~~~~~
+
+`FD.io VPP compile job`_
+
+VPP Install Parameters
+~~~~~~~~~~~~~~~~~~~~~~
+
+::
+
+    $ dpkg -i --force-all vpp*
+
+VPP Startup Configuration
+~~~~~~~~~~~~~~~~~~~~~~~~~
+
+VPP startup configuration vary per test case, with different settings
+for `$$CORELIST_WORKERS`, `$$NUM_RX_QUEUES`, `$$UIO_DRIVER`, `$$NUM-
+MBUFS` and `$$NO_MULTI_SEG` parameter. Default template is provided
+below:
+
+::
+
+    ip
+    {
+      heap-size 4G
+    }
+    statseg
+    {
+      size 4G
+    }
+    unix
+    {
+      cli-listen /run/vpp/cli.sock
+      log /tmp/vpe.log
+      nodaemon
+    }
+    ip6
+    {
+      heap-size 4G
+      hash-buckets 2000000
+    }
+    heapsize 4G
+    plugins
+    {
+      plugin default
+      {
+        disable
+      }
+      plugin dpdk_plugin.so
+      {
+        enable
+      }
+    }
+    cpu
+    {
+      corelist-workers $$CORELIST_WORKERS
+      main-core 1
+    }
+    dpdk
+    {
+      num-mbufs $$NUM-MBUFS
+      uio-driver $$UIO_DRIVER
+      $$NO_MULTI_SEG
+      log-level debug
+      dev default
+      {
+        num-rx-queues $$NUM_RX_QUEUES
+      }
+      socket-mem 1024,1024
+      no-tx-checksum-offload
+      dev $$DEV_1
+      dev $$DEV_2
+    }
+
+Description of VPP startup settings used in CSIT is provided in
+:ref:`performance_test_methodology`.
+
+.. include:: ../introduction/test_environment_tg.rst