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=694bbc9904b68455c724eca5e9758d805110b1fb;hp=204792015feeb56732c93d492835c049f9c5c208;hb=0ec89ddbaf81cbcafce7d91ac71e1ab85ca2f913;hpb=61ef529d33efd51acd1b1986c325d25a9d7ba705

diff --git a/docs/report/dpdk_performance_tests/test_environment.rst b/docs/report/dpdk_performance_tests/test_environment.rst
index 204792015f..694bbc9904 100644
--- a/docs/report/dpdk_performance_tests/test_environment.rst
+++ b/docs/report/dpdk_performance_tests/test_environment.rst
@@ -1,68 +1,68 @@
-.. 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
 
+.. _dpdk_test_environment:
 
-DUT Configuration - DPDK
-------------------------
+.. include:: ../introduction/test_environment_intro.rst
 
-**DPDK Version**
+.. include:: ../introduction/test_environment_sut_conf_1.rst
 
-|dpdk-release|
-
-**DPDK Compile Parameters**
-
-.. code-block:: bash
 
-    make install T=x86_64-native-linuxapp-gcc -j
+DUT Settings - DPDK
+-------------------
 
-**Testpmd Startup Configuration**
+DPDK Version
+~~~~~~~~~~~~
 
-Testpmd startup configuration changes per test case with different settings for CPU
-cores, rx-queues. Startup config is aligned with applied test case tag:
+|dpdk-release|
 
-Tagged by **1T1C**
+DPDK Compile Parameters
+~~~~~~~~~~~~~~~~~~~~~~~
 
 .. 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**
+    make install T=<arch>-<machine>-linuxapp-gcc -j
 
-.. code-block:: bash
+Testpmd Startup Configuration
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-    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
-
-Tagged by **4T4C**
+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 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
-
-**L3FWD Startup Configuration**
+    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 changes per test case with different settings for CPU
-cores, rx-queues. Startup config is aligned with applied test case tag:
+L3FWD Startup Configuration
+~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-Tagged by **1T1C**
+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 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
+    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
 
-Tagged by **2T2C**
+.. include:: ../introduction/test_environment_tg.rst
 
-.. code-block:: bash
+.. include:: ../introduction/test_environment_pre_test_server_calib.rst
 
-    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
+.. include:: ../introduction/test_environment_sut_calib_icx.rst
 
-Tagged by **4T4C**
+.. include:: ../introduction/test_environment_sut_calib_skx.rst
 
-.. code-block:: bash
+.. include:: ../introduction/test_environment_sut_calib_clx.rst
+
+.. include:: ../introduction/test_environment_sut_calib_hsw.rst
+
+.. include:: ../introduction/test_environment_sut_calib_dnv.rst
 
-    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
+.. include:: ../introduction/test_environment_sut_calib_alt.rst
 
+.. include:: ../introduction/test_environment_sut_calib_tsh.rst
 
-.. include:: ../vpp_performance_tests/test_environment_tg.rst
+.. include:: ../introduction/test_environment_sut_calib_tx2.rst