X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=docs%2Freport%2Fdpdk_performance_tests%2Ftest_environment.rst;h=1c86c5a29e629550d4890e4c9e3d93a2c1a2139f;hb=refs%2Fchanges%2F36%2F37336%2F3;hp=03013a4981bb528d05466d196465961b83272ad4;hpb=be32ae19e41a86df336d775e314462c6d0bf965c;p=csit.git

diff --git a/docs/report/dpdk_performance_tests/test_environment.rst b/docs/report/dpdk_performance_tests/test_environment.rst
index 03013a4981..1c86c5a29e 100644
--- a/docs/report/dpdk_performance_tests/test_environment.rst
+++ b/docs/report/dpdk_performance_tests/test_environment.rst
@@ -5,19 +5,9 @@
 
 .. _dpdk_test_environment:
 
-.. include:: ../introduction/test_environment_intro.rst
+.. include:: ../introduction/environment/intro.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_tsh.rst
-
-.. include:: ../introduction/test_environment_sut_conf_1.rst
+.. include:: ../introduction/environment/sut_conf_1.rst
 
 
 DUT Settings - DPDK
@@ -33,29 +23,54 @@ DPDK Compile Parameters
 
 .. code-block:: bash
 
-    make install T=<arch>-native-linuxapp-gcc -j
+    make install T=<arch>-<machine>-linuxapp-gcc -j
 
 Testpmd Startup Configuration
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-Testpmd startup configuration changes per test case with different
-settings for `$$CORES`, `$$RXQ` and max-pkt-len parameter if test is
+Testpmd startup configuration changes per test case with different settings for
+`$$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 changes per test case with different
-settings for `$$CORES` and enable-jumbo parameter if test is sending
-jumbo frames. Startup command template:
+L3FWD startup configuration changes per test case with different settings for
+`$$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/environment/tg.rst
+
+.. include:: ../introduction/environment/pre_test_server_calib.rst
+
+.. include:: ../introduction/environment/sut_calib_icx.rst
+.. include:: ../introduction/environment/sut_meltspec_icx.rst
+
+.. include:: ../introduction/environment/sut_calib_clx.rst
+.. include:: ../introduction/environment/sut_meltspec_clx.rst
+
+.. include:: ../introduction/environment/sut_calib_zn2.rst
+.. include:: ../introduction/environment/sut_meltspec_zn2.rst
+
+.. include:: ../introduction/environment/sut_calib_dnv.rst
+.. include:: ../introduction/environment/sut_meltspec_dnv.rst
+
+.. include:: ../introduction/environment/sut_calib_snr.rst
+.. include:: ../introduction/environment/sut_meltspec_snr.rst
+
+.. include:: ../introduction/environment/sut_calib_alt.rst
+.. include:: ../introduction/environment/sut_meltspec_alt.rst
 
+.. include:: ../introduction/environment/sut_calib_tsh.rst
+.. include:: ../introduction/environment/sut_meltspec_tsh.rst
 
-.. include:: ../introduction/test_environment_tg.rst
+.. include:: ../introduction/environment/sut_calib_tx2.rst
+.. include:: ../introduction/environment/sut_meltspec_tx2.rst