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=9f34685c48bc9ad6f4bd300eb513922f7bec366e;hp=2257b96b1ce6ff908925fbf66bcba39b4bc8ea70;hb=bf0fa247e2e95c14bc76dae43a0df26be410d931;hpb=03f07968114e4a10f2373c67ea938b2384bd110f

diff --git a/docs/report/dpdk_performance_tests/test_environment.rst b/docs/report/dpdk_performance_tests/test_environment.rst
index 2257b96b1c..9f34685c48 100644
--- a/docs/report/dpdk_performance_tests/test_environment.rst
+++ b/docs/report/dpdk_performance_tests/test_environment.rst
@@ -3,45 +3,64 @@
 
     \clearpage
 
+.. _dpdk_test_environment:
+
 .. include:: ../introduction/test_environment_intro.rst
 
 .. include:: ../introduction/test_environment_sut_conf_1.rst
 
-.. include:: ../introduction/test_environment_sut_conf_3.rst
-
 
-DUT Configuration - DPDK
-------------------------
+DUT Settings - DPDK
+-------------------
 
-**DPDK Version**
+DPDK Version
+~~~~~~~~~~~~
 
 |dpdk-release|
 
-**DPDK Compile Parameters**
+DPDK Compile Parameters
+~~~~~~~~~~~~~~~~~~~~~~~
 
 .. code-block:: bash
 
-    make install T=x86_64-native-linuxapp-gcc -j
+    make install T=<arch>-<machine>-linuxapp-gcc -j
 
-**Testpmd Startup Configuration**
+Testpmd Startup Configuration
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 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:
+`$$INT`, `$$CORES`, `$$RXQ`, `$$RXD` and max-pkt-len parameter if test is
+sending jumbo frames. Startup command template:
 
 .. 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
+    testpmd -v -l $$CORE_LIST -w $$INT1 -w $$INT2 --master-lcore 0 --in-memory -- --forward-mode=io --burst=64 --txd=$$TXD --rxd=$$RXD --txq=$$TXQ --rxq=$$RXQ --tx-offloads=0x0 --numa --auto-start --total-num-mbufs=16384 --nb-ports=2 --portmask=0x3 --disable-link-check --max-pkt-len=$$PKT_LEN [--mbuf-size=16384] --nb-cores=$$CORES
 
-**L3FWD Startup Configuration**
+L3FWD Startup Configuration
+~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 L3FWD startup configuration changes per test case with different settings for
-`$$CORES` and enable-jumbo parameter if test is sending jumbo frames.
+`$$INT`, `$$CORES` and enable-jumbo parameter if test is sending jumbo frames.
 Startup command template:
 
 .. code-block:: bash
 
-    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
-
+    l3fwd -v -l $$CORE_LIST -w $$INT1 -w $$INT2 --master-lcore 0 --in-memory -- --parse-ptype --eth-dest="0,${adj_mac0}" --eth-dest="1,${adj_mac1}" --config="${port_config}" [--enable-jumbo] -P -L -p 0x3
 
 .. include:: ../introduction/test_environment_tg.rst
+
+.. include:: ../introduction/test_environment_pre_test_server_calib.rst
+
+.. include:: ../introduction/test_environment_sut_calib_skx.rst
+
+.. include:: ../introduction/test_environment_sut_calib_clx.rst
+
+.. include:: ../introduction/test_environment_sut_calib_hsw.rst
+
+.. include:: ../introduction/test_environment_sut_calib_dnv.rst
+
+.. include:: ../introduction/test_environment_sut_calib_alt.rst
+
+.. include:: ../introduction/test_environment_sut_calib_tsh.rst
+
+.. include:: ../introduction/test_environment_sut_calib_tx2.rst