X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=docs%2Freport%2Fvpp_performance_tests%2Ftest_environment.rst;h=f8880b1a1bea56ea106beddc45871910b11ede02;hp=77fe3216e400fe15122ea36221afb4b2d0ccd173;hb=ab0b18bf513bb292b5d24d2eb339c2dddfbcd955;hpb=1261ada9edd22c784a7763d861c5acf87ccd1ae1

diff --git a/docs/report/vpp_performance_tests/test_environment.rst b/docs/report/vpp_performance_tests/test_environment.rst
index 77fe3216e4..f8880b1a1b 100644
--- 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
-
-.. include:: test_environment_sut_conf_1.rst
-
-.. include:: test_environment_sut_conf_2.rst
-
-.. include:: test_environment_sut_conf_3.rst
-
-
-DUT Configuration - 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 changes per test case with different settings for CPU
-cores, rx-queues and no-multi-seg parameter. Startup config is aligned with
-applied test case tag:
-
-Tagged by **1T1C**
-
-::
-
-    ip
-    {
-      heap-size 4G
-    }
-    unix
-    {
-      cli-listen localhost:5002
-      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 2
-      main-core 1
-    }
-    dpdk
-    {
-      dev 0000:0a:00.0
-      dev 0000:0a:00.1
-      no-multi-seg
-      uio-driver uio_pci_generic
-      log-level debug
-      dev default
-      {
-        num-rx-queues 1
-      }
-      socket-mem 1024,1024
-      no-tx-checksum-offload
-    }
-
-Tagged by **2T2C**
-
-::
-
-    ip
-    {
-      heap-size 4G
-    }
-    unix
-    {
-      cli-listen localhost:5002
-      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 2,3
-      main-core 1
-    }
-    dpdk
-    {
-      dev 0000:0a:00.0
-      dev 0000:0a:00.1
-      no-multi-seg
-      uio-driver uio_pci_generic
-      log-level debug
-      dev default
-      {
-        num-rx-queues 1
-      }
-      socket-mem 1024,1024
-      no-tx-checksum-offload
-    }
-
-Tagged by **4T4C**
-
-::
-
-    ip
-    {
-      heap-size 4G
-    }
-    unix
-    {
-      cli-listen localhost:5002
-      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 2,3,4,5
-      main-core 1
-    }
-    dpdk
-    {
-      dev 0000:0a:00.0
-      dev 0000:0a:00.1
-      no-multi-seg
-      uio-driver uio_pci_generic
-      log-level debug
-      dev default
-      {
-        num-rx-queues 1
-      }
-      socket-mem 1024,1024
-      no-tx-checksum-offload
-    }
-
-.. include:: test_environment_tg.rst
+
+.. 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