X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=docs%2Freport%2Fdpdk_performance_tests%2Ftest_environment.rst;h=ccedca07952329d41bd586496443c6df83163747;hp=204792015feeb56732c93d492835c049f9c5c208;hb=c5e04c68e8361be8c7deac912a4d676492099629;hpb=61ef529d33efd51acd1b1986c325d25a9d7ba705

diff --git a/docs/report/dpdk_performance_tests/test_environment.rst b/docs/report/dpdk_performance_tests/test_environment.rst
index 204792015f..ccedca0795 100644
--- a/docs/report/dpdk_performance_tests/test_environment.rst
+++ b/docs/report/dpdk_performance_tests/test_environment.rst
@@ -1,68 +1,53 @@
-.. include:: ../vpp_performance_tests/test_environment_intro.rst
 
-.. include:: ../vpp_performance_tests/test_environment_sut_conf_1.rst
+.. raw:: latex
 
-.. include:: ../vpp_performance_tests/test_environment_sut_conf_3.rst
+    \clearpage
 
+.. include:: ../introduction/test_environment_intro.rst
 
-DUT Configuration - DPDK
-------------------------
+.. include:: ../introduction/test_environment_sut_calib_hsw.rst
 
-**DPDK Version**
+.. include:: ../introduction/test_environment_sut_calib_skx.rst
 
-|dpdk-release|
-
-**DPDK Compile Parameters**
-
-.. code-block:: bash
-
-    make install T=x86_64-native-linuxapp-gcc -j
-
-**Testpmd Startup Configuration**
-
-Testpmd startup configuration changes per test case with different settings for CPU
-cores, rx-queues. Startup config is aligned with applied test case tag:
-
-Tagged by **1T1C**
+.. include:: ../introduction/test_environment_sut_conf_1.rst
 
-.. code-block:: bash
-
-    testpmd -c 0x3 -n 4 -- --numa --nb-ports=2 --portmask=0x3 --nb-cores=1 --max-pkt-len=9000 --txqflags=0 --forward-mode=io --rxq=1 --txq=1 --burst=64 --rxd=1024 --txd=1024 --disable-link-check --auto-start
 
-Tagged by **2T2C**
+DUT Settings - DPDK
+-------------------
 
-.. code-block:: bash
+DPDK Version
+~~~~~~~~~~~~
 
-    testpmd -c 0x403 -n 4 -- --numa --nb-ports=2 --portmask=0x3 --nb-cores=2 --max-pkt-len=9000 --txqflags=0 --forward-mode=io --rxq=1 --txq=1 --burst=64 --rxd=1024 --txd=1024 --disable-link-check --auto-start
+|dpdk-release|
 
-Tagged by **4T4C**
+DPDK Compile Parameters
+~~~~~~~~~~~~~~~~~~~~~~~
 
 .. code-block:: bash
 
-    testpmd -c 0xc07 -n 4 -- --numa --nb-ports=2 --portmask=0x3 --nb-cores=4 --max-pkt-len=9000 --txqflags=0 --forward-mode=io --rxq=2 --txq=2 --burst=64 --rxd=1024 --txd=1024 --disable-link-check --auto-start
+    make install T=<arch>-native-linuxapp-gcc -j
 
-**L3FWD Startup Configuration**
+Testpmd Startup Configuration
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-L3FWD startup configuration changes per test case with different settings for CPU
-cores, rx-queues. Startup config is aligned with applied test case tag:
-
-Tagged by **1T1C**
+Testpmd startup configuration changes per test case with different
+settings for `$$CORES`, `$$RXQ` and max-pkt-len parameter if test is
+sending jumbo frames. Startup command template:
 
 .. code-block:: bash
 
-    l3fwd -l 1 -n 4 -- -P -L -p 0x3 --config='${port_config}' --enable-jumbo --max-pkt-len=9000 --eth-dest=0,${adj_mac0} --eth-dest=1,${adj_mac1} --parse-ptype
-
-Tagged by **2T2C**
-
-.. code-block:: bash
+    testpmd -c $$CORE_MASK -n 4 -- --numa --nb-ports=2 --portmask=0x3 --nb-cores=$$CORES [--max-pkt-len=9000] --txqflags=0 --forward-mode=io --rxq=$$RXQ --txq=$$TXQ --burst=64 --rxd=1024 --txd=1024 --disable-link-check --auto-start
 
-    l3fwd -l 1,2 -n 4 -- -P -L -p 0x3 --config='${port_config}' --enable-jumbo --max-pkt-len=9000 --eth-dest=0,${adj_mac0} --eth-dest=1,${adj_mac1} --parse-ptype
+L3FWD Startup Configuration
+~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-Tagged by **4T4C**
+L3FWD startup configuration changes per test case with different
+settings for `$$CORES` and enable-jumbo parameter if test is sending
+jumbo frames. Startup command template:
 
 .. code-block:: bash
 
-    l3fwd -l 1,2,3,4 -n 4 -- -P -L -p 0x3 --config='${port_config}' --enable-jumbo --max-pkt-len=9000 --eth-dest=0,${adj_mac0} --eth-dest=1,${adj_mac1} --parse-ptype
+    l3fwd -l $$CORE_LIST -n 4 -- -P -L -p 0x3 --config='${port_config}' [--enable-jumbo --max-pkt-len=9000] --eth-dest=0,${adj_mac0} --eth-dest=1,${adj_mac1} --parse-ptype
 
 
-.. include:: ../vpp_performance_tests/test_environment_tg.rst
+.. include:: ../introduction/test_environment_tg.rst