diff options
| author |   Peter Mikus <pmikus@cisco.com> | 2018-07-10 06:10:41 +0000 |
|---|---|---|
| committer | Peter Mikus <pmikus@cisco.com> | 2018-07-13 09:11:04 +0000 |
| commit | ad71afc5baa8008bd5d4ea26f51a71eefe3fbe62 (patch) | |
| tree | 3b1c24ab540b5f57ee4b3592368191bc1f227cc7 /tests/vpp/perf/crypto | |
| parent | 338b195c0d7274b921eb18944d27ed1b4cb3739f (diff) | |
Refactor perf test cases
- Refactor Performance TCs due to changes in Hyperthreading and RXQ allocations.
- Simplify the structure of suite to avoid large refactors in future.
Change-Id: Ifb1b9719391f26745f075a900bd9fb39b6cb809c
Signed-off-by: Peter Mikus <pmikus@cisco.com>
Diffstat (limited to 'tests/vpp/perf/crypto')
19 files changed, 377 insertions, 1023 deletions
diff --git a/tests/vpp/perf/crypto/40ge2p1xl710-ethip4ipsecbasetnl-ip4base-int-aes-gcm-mrr.robot b/tests/vpp/perf/crypto/40ge2p1xl710-ethip4ipsecbasetnl-ip4base-int-aes-gcm-mrr.robot index 3386ff400d..54bd64b423 100644 --- a/tests/vpp/perf/crypto/40ge2p1xl710-ethip4ipsecbasetnl-ip4base-int-aes-gcm-mrr.robot +++ b/tests/vpp/perf/crypto/40ge2p1xl710-ethip4ipsecbasetnl-ip4base-int-aes-gcm-mrr.robot @@ -23,8 +23,11 @@ | Suite Teardown | Tear down 3-node performance topology | ... | Test Setup | Set up performance test +| ... | Test Teardown | Tear down performance mrr test | ... +| Test Template | Local template +| ... | Documentation | *Raw results IPv4 IPsec tunnel mode performance test suite.* | ... | ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology @@ -66,16 +69,21 @@ | ${traffic_profile}= | trex-sl-3n-ethip4-ip4dst${n_tunnels} *** Keywords *** -| Check RR for IPv4 routing with IPSec HW cryptodev +| Local template | | [Documentation] -| | ... | [Cfg] DUT runs IPSec tunneling AES GCM config with ${wt} thread(s),\ -| | ... | ${wt} phy core(s), ${rxq} receive queue(s) per NIC port. -| | ... | [Ver] Measure MaxReceivedRate for ${framesize} frames using single\ +| | ... | [Cfg] DUT runs IPSec tunneling AES GCM config. +| | ... | Each DUT uses ${phy_cores} physical core(s) for worker threads. +| | ... | [Ver] Measure MaxReceivedRate for ${framesize}B frames using single\ | | ... | trial throughput test. | | ... -| | [Arguments] | ${framesize} | ${wt} | ${rxq} +| | ... | *Arguments:* +| | ... | - framesize - Framesize in Bytes in integer or string (IMIX_v4_1). +| | ... | Type: integer, string +| | ... | - phy_cores - Number of physical cores. Type: integer +| | ... | - rxq - Number of RX queues, default value: ${None}. Type: integer +| | ... +| | [Arguments] | ${framesize} | ${phy_cores} | ${rxq}=${None} | | ... -| | # Test Variables required for test teardown | | Set Test Variable | ${framesize} | | ${get_framesize}= | Get Frame Size | ${framesize} | | ${max_rate}= | Calculate pps | ${s_24.5G} @@ -85,11 +93,11 @@ | | ${encr_alg}= | Crypto Alg AES GCM 128 | | ${auth_alg}= | Integ Alg AES GCM 128 | | ... -| | Given Add '${wt}' worker threads and '${rxq}' rxqueues in 3-node single-link circular topology +| | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq} | | And Add PCI devices to all DUTs -| | And Run Keyword If | ${get_framesize} < ${1522} +| | And Run Keyword If | ${get_framesize} + ${ipsec_overhead} < ${1522} | | ... | Add no multi seg to all DUTs -| | And Add cryptodev to all DUTs | ${${wt}} +| | And Add cryptodev to all DUTs | ${${phy_cores}} | | And Add DPDK dev default RXD to all DUTs | 2048 | | And Add DPDK dev default TXD to all DUTs | 2048 | | And Apply startup configuration on all VPP DUTs @@ -105,106 +113,37 @@ *** Test Cases *** | tc01-64B-1t1c-ethip4ipsecbasetnl-ip4base-int-aes-gcm-mrr -| | [Documentation] -| | ... | [Cfg] DUTs run 1 IPsec tunnel AES GCM in each direction, configured\ -| | ... | with 1 phy core, 1 receive queue per NIC port. -| | ... | [Ver] Measure MaxReceivedRate for 64B frames using single trial\ -| | ... | throughput test. | | [Tags] | 64B | 1C -| | ... -| | [Template] | Check RR for IPv4 routing with IPSec HW cryptodev -| | framesize=${64} | wt=1 | rxq=1 +| | framesize=${64} | phy_cores=${1} | tc02-1518B-1t1c-ethip4ipsecbasetnl-ip4base-int-aes-gcm-mrr -| | [Documentation] -| | ... | [Cfg] DUTs run 1 IPsec tunnel AES GCM in each direction, configured\ -| | ... | with 1 phy core, 1 receive queue per NIC port. -| | ... | [Ver] Measure MaxReceivedRate for 1518B frames using single\ -| | ... | trial throughput test. | | [Tags] | 1518B | 1C -| | ... -| | [Template] | Check RR for IPv4 routing with IPSec HW cryptodev -| | framesize=${1518} | wt=1 | rxq=1 - -# TODO: Add check to make test fail if rx=0. -# TODO: Add 9000B test cases when they start passing. +| | framesize=${1518} | phy_cores=${1} | tc04-IMIX-1t1c-ethip4ipsecbasetnl-ip4base-int-aes-gcm-mrr -| | [Documentation] -| | ... | [Cfg] DUTs run 1 IPsec tunnel AES GCM in each direction, configured\ -| | ... | with 1 phy core, 1 receive queue per NIC port. -| | ... | [Ver] Measure MaxReceivedRate for IMIX_v4_1 frames using single\ -| | ... | trial throughput test. -| | ... | IMIX_v4_1 = (28x64B; 16x570B; 4x1518B) | | [Tags] | IMIX | 1C -| | ... -| | [Template] | Check RR for IPv4 routing with IPSec HW cryptodev -| | framesize=IMIX_v4_1 | wt=1 | rxq=1 +| | framesize=IMIX_v4_1 | phy_cores=${1} | tc05-64B-2t2c-ethip4ipsecbasetnl-ip4base-int-aes-gcm-mrr -| | [Documentation] -| | ... | [Cfg] DUTs run 1 IPsec tunnel AES GCM in each direction, configured\ -| | ... | with 2 phy cores, 1 receive queue per NIC port. -| | ... | [Ver] Measure MaxReceivedRate for 64B frames using single trial\ -| | ... | throughput test. | | [Tags] | 64B | 2C -| | ... -| | [Template] | Check RR for IPv4 routing with IPSec HW cryptodev -| | framesize=${64} | wt=2 | rxq=1 +| | framesize=${64} | phy_cores=${2} | tc06-1518B-2t2c-ethip4ipsecbasetnl-ip4base-int-aes-gcm-mrr -| | [Documentation] -| | ... | [Cfg] DUTs run 1 IPsec tunnel AES GCM in each direction, configured\ -| | ... | with 2 phy cores, 1 receive queue per NIC port. -| | ... | [Ver] Measure MaxReceivedRate for 1518B frames using single\ -| | ... | trial throughput test. | | [Tags] | 1518B | 2C -| | ... -| | [Template] | Check RR for IPv4 routing with IPSec HW cryptodev -| | framesize=${1518} | wt=2 | rxq=1 +| | framesize=${1518} | phy_cores=${2} | tc08-IMIX-2t2c-ethip4ipsecbasetnl-ip4base-int-aes-gcm-mrr -| | [Documentation] -| | ... | [Cfg] DUTs run 1 IPsec tunnel AES GCM in each direction, configured\ -| | ... | with 2 phy cores, 1 receive queue per NIC port. -| | ... | [Ver] Measure MaxReceivedRate for IMIX_v4_1 frames using single\ -| | ... | trial throughput test. -| | ... | IMIX_v4_1 = (28x64B; 16x570B; 4x1518B) | | [Tags] | IMIX | 2C -| | ... -| | [Template] | Check RR for IPv4 routing with IPSec HW cryptodev -| | framesize=IMIX_v4_1 | wt=2 | rxq=1 +| | framesize=IMIX_v4_1 | phy_cores=${2} | tc09-64B-4t4c-ethip4ipsecbasetnl-ip4base-int-aes-gcm-mrr -| | [Documentation] -| | ... | [Cfg] DUTs run 1 IPsec tunnel AES GCM in each direction, configured\ -| | ... | with 4 phy cores, 2 receive queues per NIC port. -| | ... | [Ver] Measure MaxReceivedRate for 64B frames using single trial\ -| | ... | throughput test. | | [Tags] | 64B | 4C -| | ... -| | [Template] | Check RR for IPv4 routing with IPSec HW cryptodev -| | framesize=${64} | wt=4 | rxq=2 +| | framesize=${64} | phy_cores=${4} | tc10-1518B-4t4c-ethip4ipsecbasetnl-ip4base-int-aes-gcm-mrr -| | [Documentation] -| | ... | [Cfg] DUTs run 1 IPsec tunnel AES GCM in each direction, configured\ -| | ... | with 4 phy cores, 2 receive queues per NIC port. -| | ... | [Ver] Measure MaxReceivedRate for 1518B frames using single\ -| | ... | trial throughput test. | | [Tags] | 1518B | 4C -| | ... -| | [Template] | Check RR for IPv4 routing with IPSec HW cryptodev -| | framesize=${1518} | wt=4 | rxq=2 +| | framesize=${1518} | phy_cores=${4} | tc12-IMIX-4t4c-ethip4ipsecbasetnl-ip4base-int-aes-gcm-mrr -| | [Documentation] -| | ... | [Cfg] DUTs run 1 IPsec tunnel AES GCM in each direction, configured\ -| | ... | with 4 phy cores, 2 receive queues per NIC port. -| | ... | [Ver] Measure MaxReceivedRate for IMIX_v4_1 frames using single\ -| | ... | trial throughput test. -| | ... | IMIX_v4_1 = (28x64B; 16x570B; 4x1518B) | | [Tags] | IMIX | 4C -| | ... -| | [Template] | Check RR for IPv4 routing with IPSec HW cryptodev -| | framesize=IMIX_v4_1 | wt=4 | rxq=2 +| | framesize=IMIX_v4_1 | phy_cores=${4} diff --git a/tests/vpp/perf/crypto/40ge2p1xl710-ethip4ipsecbasetnl-ip4base-int-aes-gcm-ndrpdrdisc.robot b/tests/vpp/perf/crypto/40ge2p1xl710-ethip4ipsecbasetnl-ip4base-int-aes-gcm-ndrpdrdisc.robot index a2b7e98397..fba7baf651 100644 --- a/tests/vpp/perf/crypto/40ge2p1xl710-ethip4ipsecbasetnl-ip4base-int-aes-gcm-ndrpdrdisc.robot +++ b/tests/vpp/perf/crypto/40ge2p1xl710-ethip4ipsecbasetnl-ip4base-int-aes-gcm-ndrpdrdisc.robot @@ -28,6 +28,8 @@ | Test Teardown | Tear down performance discovery test | ${min_rate}pps | ... | ${framesize} | ${traffic_profile} | ... +| Test Template | Local template +| ... | Documentation | *IPv4 IPsec tunnel mode performance test suite.* | ... | ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology @@ -73,16 +75,25 @@ | ${traffic_profile}= | trex-sl-3n-ethip4-ip4dst${n_tunnels} *** Keywords *** -| Discover NDR or PDR for IPv4 routing with IPSec HW cryptodev +| Local template | | [Documentation] -| | ... | [Cfg] DUT runs IPSec tunneling AES GCM config with ${wt} thread(s),\ -| | ... | ${wt} phy core(s), ${rxq} receive queue(s) per NIC port. -| | ... | [Ver] Measure NDR or PDR for ${framesize} by bisecting between\ -| | ... | ${min_rate} and computed max rate, using trial loss rate measurements. -| | ... -| | [Arguments] | ${wt} | ${rxq} | ${framesize} | ${min_rate} | ${search_type} +| | ... | [Cfg] DUT runs IPSec tunneling AES GCM config. +| | ... | Each DUT uses ${phy_cores} physical core(s) for worker threads. +| | ... | [Ver] Find ${search_type} for ${framesize}B frames using binary search\ +| | ... | start at linerate, step ${min_rate}pps. +| | ... +| | ... | *Arguments:* +| | ... | - framesize - Framesize in Bytes in integer or string (IMIX_v4_1). +| | ... | Type: integer, string +| | ... | - phy_cores - Number of physical cores. Type: integer +| | ... | - search_type - NDR or PDR. Type: string +| | ... | - rxq - Number of RX queues, default value: ${None}. Type: integer +| | ... | - min_rate - Min rate for binary search, default value: ${50000}. +| | ... | Type: integer +| | ... +| | [Arguments] | ${framesize} | ${phy_cores} | ${search_type} +| | ... | ${rxq}=${None} | ${min_rate}=${50000} | | ... -| | # Test Variables required for test teardown | | Set Test Variable | ${framesize} | | Set Test Variable | ${min_rate} | | ${get_framesize}= | Get Frame Size | ${framesize} @@ -96,10 +107,11 @@ | | ${encr_alg}= | Crypto Alg AES GCM 128 | | ${auth_alg}= | Integ Alg AES GCM 128 | | ... -| | Given Add '${wt}' worker threads and '${rxq}' rxqueues in 3-node single-link circular topology +| | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq} | | And Add PCI devices to all DUTs -| | And Add no multi seg to all DUTs -| | And Add cryptodev to all DUTs | ${${wt}} +| | And Run Keyword If | ${get_framesize} + ${ipsec_overhead_gcm} < ${1522} +| | ... | Add no multi seg to all DUTs +| | And Add cryptodev to all DUTs | ${${phy_cores}} | | And Add DPDK dev default RXD to all DUTs | 2048 | | And Add DPDK dev default TXD to all DUTs | 2048 | | And Apply startup configuration on all VPP DUTs @@ -122,99 +134,33 @@ *** Test Cases *** | tc01-64B-1t1c-ethip4ipsecbasetnl-ip4base-int-aes-gcm-ndrdisc -| | [Documentation] -| | ... | [Cfg] DUTs run 1 IPsec tunnel AES GCM in each direction, configured\ -| | ... | with 1 phy core, 1 receive queue per NIC port. -| | ... | [Ver] Find NDR for 64 Byte frames\ -| | ... | using binary search start at 40GE linerate, step 50kpps. -| | ... | | [Tags] | 64B | 1C | NDRDISC -| | ... -| | [Template] | Discover NDR or PDR for IPv4 routing with IPSec HW cryptodev -| | wt=1 | rxq=1 | framesize=${64} | min_rate=${50000} | search_type=NDR +| | framesize=${64} | phy_cores=${1} | search_type=NDR | tc02-64B-1t1c-ethip4ipsecbasetnl-ip4base-int-aes-gcm-pdrdisc -| | [Documentation] -| | ... | [Cfg] DUTs run 1 IPsec tunnel AES GCM in each direction, configured\ -| | ... | with 1 phy core, 1 receive queue per NIC port. -| | ... | [Ver] Find PDR for 64 Byte frames using binary search start at 40GE\ -| | ... | linerate, step 50kpps and loss tolerance of 0.5%. -| | ... | | [Tags] | 64B | 1C | PDRDISC | SKIP_PATCH -| | ... -| | [Template] | Discover NDR or PDR for IPv4 routing with IPSec HW cryptodev -| | wt=1 | rxq=1 | framesize=${64} | min_rate=${50000} | search_type=PDR +| | framesize=${64} | phy_cores=${1} | search_type=PDR | tc03-1518B-1t1c-ethip4ipsecbasetnl-ip4base-int-aes-gcm-ndrdisc -| | [Documentation] -| | ... | [Cfg] DUTs run 1 IPsec tunnel AES GCM in each direction, configured\ -| | ... | with 1 phy core, 1 receive queue per NIC port. -| | ... | [Ver] Find NDR for 1518 Byte frames\ -| | ... | using binary search start at 40GE linerate, step 50kpps. -| | ... | | [Tags] | 1518B | 1C | NDRDISC -| | ... -| | [Template] | Discover NDR or PDR for IPv4 routing with IPSec HW cryptodev -| | wt=1 | rxq=1 | framesize=${1518} | min_rate=${50000} | search_type=NDR +| | framesize=${1518} | phy_cores=${1} | search_type=NDR | tc04-1518B-1t1c-ethip4ipsecbasetnl-ip4base-int-aes-gcm-pdrdisc -| | [Documentation] -| | ... | [Cfg] DUTs run 1 IPsec tunnel AES GCM in each direction, configured\ -| | ... | with 1 phy core, 1 receive queue per NIC port. -| | ... | [Ver] Find PDR for 1518 Byte frames using binary search start at 40GE\ -| | ... | linerate, step 50kpps and loss tolerance of 0.5%. -| | ... | | [Tags] | 1518B | 1C | PDRDISC | SKIP_PATCH -| | ... -| | [Template] | Discover NDR or PDR for IPv4 routing with IPSec HW cryptodev -| | wt=1 | rxq=1 | framesize=${1518} | min_rate=${50000} | search_type=PDR +| | framesize=${1518} | phy_cores=${1} | search_type=PDR | tc05-IMIX-1t1c-ethip4ipsecbasetnl-ip4base-int-aes-gcm-ndrdisc -| | [Documentation] -| | ... | [Cfg] DUTs run 1 IPsec tunnel AES GCM in each direction, configured\ -| | ... | with 1 phy core, 1 receive queue per NIC port. -| | ... | [Ver] Find NDR for IMIX_v4_1 frames\ -| | ... | using binary search start at 40GE linerate, step 50kpps. -| | ... | IMIX_v4_1 = (28x64B; 16x570B; 4x1518B) -| | ... | | [Tags] | IMIX | 1C | NDRDISC -| | ... -| | [Template] | Discover NDR or PDR for IPv4 routing with IPSec HW cryptodev -| | wt=1 | rxq=1 | framesize=IMIX_v4_1 | min_rate=${50000} | search_type=NDR +| | framesize=IMIX_v4_1 | phy_cores=${1} | search_type=NDR | tc06-IMIX-1t1c-ethip4ipsecbasetnl-ip4base-int-aes-gcm-pdrdisc -| | [Documentation] -| | ... | [Cfg] DUTs run 1 IPsec tunnel AES GCM in each direction, configured\ -| | ... | with 1 phy core, 1 receive queue per NIC port. -| | ... | [Ver] Find PDR for IMIX_v4_1 frames using binary search start at 40GE\ -| | ... | linerate, step 50kpps and loss tolerance of 0.5%. -| | ... | IMIX_v4_1 = (28x64B; 16x570B; 4x1518B) -| | ... | | [Tags] | IMIX | 1C | PDRDISC | SKIP_PATCH -| | ... -| | [Template] | Discover NDR or PDR for IPv4 routing with IPSec HW cryptodev -| | wt=1 | rxq=1 | framesize=IMIX_v4_1 | min_rate=${50000} | search_type=PDR +| | framesize=IMIX_v4_1 | phy_cores=${1} | search_type=PDR | tc07-64B-2t2c-ethip4ipsecbasetnl-ip4base-int-aes-gcm-ndrdisc -| | [Documentation] -| | ... | [Cfg] DUTs run 1 IPsec tunnel AES GCM in each direction, configured\ -| | ... | with 2 phy core, 1 receive queue per NIC port. -| | ... | [Ver] Find NDR for 64 Byte frames\ -| | ... | using binary search start at 40GE linerate, step 50kpps. -| | ... | | [Tags] | 64B | 2C | NDRDISC -| | ... -| | [Template] | Discover NDR or PDR for IPv4 routing with IPSec HW cryptodev -| | wt=2 | rxq=1 | framesize=${64} | min_rate=${50000} | search_type=NDR +| | framesize=${64} | phy_cores=${2} | search_type=NDR | tc08-64B-2t2c-ethip4ipsecbasetnl-ip4base-int-aes-gcm-pdrdisc -| | [Documentation] -| | ... | [Cfg] DUTs run 1 IPsec tunnel AES GCM in each direction, configured\ -| | ... | with 2 phy core, 1 receive queue per NIC port. -| | ... | [Ver] Find PDR for 64 Byte frames using binary search start at 40GE\ -| | ... | linerate, step 50kpps and loss tolerance of 0.5%. -| | ... | | [Tags] | 64B | 2C | PDRDISC | SKIP_PATCH -| | ... -| | [Template] | Discover NDR or PDR for IPv4 routing with IPSec HW cryptodev -| | wt=2 | rxq=1 | framesize=${64} | min_rate=${50000} | search_type=PDR +| | framesize=${64} | phy_cores=${2} | search_type=PDR diff --git a/tests/vpp/perf/crypto/40ge2p1xl710-ethip4ipsecbasetnl-ip4base-int-cbc-sha1-mrr.robot b/tests/vpp/perf/crypto/40ge2p1xl710-ethip4ipsecbasetnl-ip4base-int-cbc-sha1-mrr.robot index 3525bb372e..7f6218ea12 100644 --- a/tests/vpp/perf/crypto/40ge2p1xl710-ethip4ipsecbasetnl-ip4base-int-cbc-sha1-mrr.robot +++ b/tests/vpp/perf/crypto/40ge2p1xl710-ethip4ipsecbasetnl-ip4base-int-cbc-sha1-mrr.robot @@ -23,8 +23,11 @@ | Suite Teardown | Tear down 3-node performance topology | ... | Test Setup | Set up performance test +| ... | Test Teardown | Tear down performance mrr test | ... +| Test Template | Local template +| ... | Documentation | *Raw results IPv4 IPsec tunnel mode performance test suite.* | ... | ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology @@ -66,16 +69,21 @@ | ${traffic_profile}= | trex-sl-3n-ethip4-ip4dst${n_tunnels} *** Keywords *** -| Check RR for IPv4 routing with IPSec HW cryptodev +| Local template | | [Documentation] -| | ... | [Cfg] DUT runs IPSec tunneling CBC-SHA1 config with ${wt} thread(s),\ -| | ... | ${wt} phy core(s), ${rxq} receive queue(s) per NIC port. -| | ... | [Ver] Measure MaxReceivedRate for ${framesize} frames using single\ +| | ... | [Cfg] DUT runs IPSec tunneling CBC-SHA1 config. +| | ... | Each DUT uses ${phy_cores} physical core(s) for worker threads. +| | ... | [Ver] Measure MaxReceivedRate for ${framesize}B frames using single\ | | ... | trial throughput test. | | ... -| | [Arguments] | ${framesize} | ${wt} | ${rxq} +| | ... | *Arguments:* +| | ... | - framesize - Framesize in Bytes in integer or string (IMIX_v4_1). +| | ... | Type: integer, string +| | ... | - phy_cores - Number of physical cores. Type: integer +| | ... | - rxq - Number of RX queues, default value: ${None}. Type: integer +| | ... +| | [Arguments] | ${framesize} | ${phy_cores} | ${rxq}=${None} | | ... -| | # Test Variables required for test teardown | | Set Test Variable | ${framesize} | | ${get_framesize}= | Get Frame Size | ${framesize} | | ${max_rate}= | Calculate pps | ${s_24.5G} @@ -85,11 +93,11 @@ | | ${encr_alg}= | Crypto Alg AES CBC 128 | | ${auth_alg}= | Integ Alg SHA1 96 | | ... -| | Given Add '${wt}' worker threads and '${rxq}' rxqueues in 3-node single-link circular topology +| | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq} | | And Add PCI devices to all DUTs -| | And Run Keyword If | ${get_framesize} < ${1522} +| | And Run Keyword If | ${get_framesize} + ${ipsec_overhead} < ${1522} | | ... | Add no multi seg to all DUTs -| | And Add cryptodev to all DUTs | ${${wt}} +| | And Add cryptodev to all DUTs | ${${phy_cores}} | | And Add DPDK dev default RXD to all DUTs | 2048 | | And Add DPDK dev default TXD to all DUTs | 2048 | | And Apply startup configuration on all VPP DUTs @@ -105,106 +113,37 @@ *** Test Cases *** | tc01-64B-1t1c-ethip4ipsecbasetnl-ip4base-int-cbc-sha1-mrr -| | [Documentation] -| | ... | [Cfg] DUTs run 1 IPsec tunnel CBC-SHA1 in each direction, configured\ -| | ... | with 1 phy core, 1 receive queue per NIC port. -| | ... | [Ver] Measure MaxReceivedRate for 64B frames using single trial\ -| | ... | throughput test. | | [Tags] | 64B | 1C -| | ... -| | [Template] | Check RR for IPv4 routing with IPSec HW cryptodev -| | framesize=${64} | wt=1 | rxq=1 +| | framesize=${64} | phy_cores=${1} | tc02-1518B-1t1c-ethip4ipsecbasetnl-ip4base-int-cbc-sha1-mrr -| | [Documentation] -| | ... | [Cfg] DUTs run 1 IPsec tunnel CBC-SHA1 in each direction, configured\ -| | ... | with 1 phy core, 1 receive queue per NIC port. -| | ... | [Ver] Measure MaxReceivedRate for 1518B frames using single\ -| | ... | trial throughput test. | | [Tags] | 1518B | 1C -| | ... -| | [Template] | Check RR for IPv4 routing with IPSec HW cryptodev -| | framesize=${1518} | wt=1 | rxq=1 - -# TODO: Add check to make test fail if rx=0. -# TODO: Add 9000B test cases when they start passing. +| | framesize=${1518} | phy_cores=${1} | tc04-IMIX-1t1c-ethip4ipsecbasetnl-ip4base-int-cbc-sha1-mrr -| | [Documentation] -| | ... | [Cfg] DUTs run 1 IPsec tunnel CBC-SHA1 in each direction, configured\ -| | ... | with 1 phy core, 1 receive queue per NIC port. -| | ... | [Ver] Measure MaxReceivedRate for IMIX_v4_1 frames using single\ -| | ... | trial throughput test. -| | ... | IMIX_v4_1 = (28x64B; 16x570B; 4x1518B) | | [Tags] | IMIX | 1C -| | ... -| | [Template] | Check RR for IPv4 routing with IPSec HW cryptodev -| | framesize=IMIX_v4_1 | wt=1 | rxq=1 +| | framesize=IMIX_v4_1 | phy_cores=${1} | tc05-64B-2t2c-ethip4ipsecbasetnl-ip4base-int-cbc-sha1-mrr -| | [Documentation] -| | ... | [Cfg] DUTs run 1 IPsec tunnel CBC-SHA1 in each direction, configured\ -| | ... | with 2 phy cores, 1 receive queue per NIC port. -| | ... | [Ver] Measure MaxReceivedRate for 64B frames using single trial\ -| | ... | throughput test. | | [Tags] | 64B | 2C -| | ... -| | [Template] | Check RR for IPv4 routing with IPSec HW cryptodev -| | framesize=${64} | wt=2 | rxq=1 +| | framesize=${64} | phy_cores=${2} | tc06-1518B-2t2c-ethip4ipsecbasetnl-ip4base-int-cbc-sha1-mrr -| | [Documentation] -| | ... | [Cfg] DUTs run 1 IPsec tunnel CBC-SHA1 in each direction, configured\ -| | ... | with 2 phy cores, 1 receive queue per NIC port. -| | ... | [Ver] Measure MaxReceivedRate for 1518B frames using single\ -| | ... | trial throughput test. | | [Tags] | 1518B | 2C -| | ... -| | [Template] | Check RR for IPv4 routing with IPSec HW cryptodev -| | framesize=${1518} | wt=2 | rxq=1 +| | framesize=${1518} | phy_cores=${2} | tc08-IMIX-2t2c-ethip4ipsecbasetnl-ip4base-int-cbc-sha1-mrr -| | [Documentation] -| | ... | [Cfg] DUTs run 1 IPsec tunnel CBC-SHA1 in each direction, configured\ -| | ... | with 2 phy cores, 1 receive queue per NIC port. -| | ... | [Ver] Measure MaxReceivedRate for IMIX_v4_1 frames using single\ -| | ... | trial throughput test. -| | ... | IMIX_v4_1 = (28x64B; 16x570B; 4x1518B) | | [Tags] | IMIX | 2C -| | ... -| | [Template] | Check RR for IPv4 routing with IPSec HW cryptodev -| | framesize=IMIX_v4_1 | wt=2 | rxq=1 +| | framesize=IMIX_v4_1 | phy_cores=${2} | tc09-64B-4t4c-ethip4ipsecbasetnl-ip4base-int-cbc-sha1-mrr -| | [Documentation] -| | ... | [Cfg] DUTs run 1 IPsec tunnel CBC-SHA1 in each direction, configured\ -| | ... | with 4 phy cores, 2 receive queues per NIC port. -| | ... | [Ver] Measure MaxReceivedRate for 64B frames using single trial\ -| | ... | throughput test. | | [Tags] | 64B | 4C -| | ... -| | [Template] | Check RR for IPv4 routing with IPSec HW cryptodev -| | framesize=${64} | wt=4 | rxq=2 +| | framesize=${64} | phy_cores=${4} | tc10-1518B-4t4c-ethip4ipsecbasetnl-ip4base-int-cbc-sha1-mrr -| | [Documentation] -| | ... | [Cfg] DUTs run 1 IPsec tunnel CBC-SHA1 in each direction, configured\ -| | ... | with 4 phy cores, 2 receive queues per NIC port. -| | ... | [Ver] Measure MaxReceivedRate for 1518B frames using single\ -| | ... | trial throughput test. | | [Tags] | 1518B | 4C -| | ... -| | [Template] | Check RR for IPv4 routing with IPSec HW cryptodev -| | framesize=${1518} | wt=4 | rxq=2 +| | framesize=${1518} | phy_cores=${4} | tc12-IMIX-4t4c-ethip4ipsecbasetnl-ip4base-int-cbc-sha1-mrr -| | [Documentation] -| | ... | [Cfg] DUTs run 1 IPsec tunnel CBC-SHA1 in each direction, configured\ -| | ... | with 4 phy cores, 2 receive queues per NIC port. -| | ... | [Ver] Measure MaxReceivedRate for IMIX_v4_1 frames using single\ -| | ... | trial throughput test. -| | ... | IMIX_v4_1 = (28x64B; 16x570B; 4x1518B) | | [Tags] | IMIX | 4C -| | ... -| | [Template] | Check RR for IPv4 routing with IPSec HW cryptodev -| | framesize=IMIX_v4_1 | wt=4 | rxq=2 +| | framesize=IMIX_v4_1 | phy_cores=${4} diff --git a/tests/vpp/perf/crypto/40ge2p1xl710-ethip4ipsecbasetnl-ip4base-int-cbc-sha1-ndrpdrdisc.robot b/tests/vpp/perf/crypto/40ge2p1xl710-ethip4ipsecbasetnl-ip4base-int-cbc-sha1-ndrpdrdisc.robot index 1e52f8c663..221f5b8b54 100644 --- a/tests/vpp/perf/crypto/40ge2p1xl710-ethip4ipsecbasetnl-ip4base-int-cbc-sha1-ndrpdrdisc.robot +++ b/tests/vpp/perf/crypto/40ge2p1xl710-ethip4ipsecbasetnl-ip4base-int-cbc-sha1-ndrpdrdisc.robot @@ -82,7 +82,6 @@ | | ... | | [Tags] | 64B | 1C | NDRDISC | | ... -| | # FIXME: Move repeated lines into a keyword. | | ${framesize}= | Set Variable | ${64} | | ${min_rate}= | Set Variable | ${50000} | | ${max_rate}= | Set Variable | ${s_18.75Mpps} @@ -91,7 +90,7 @@ | | ${threshold}= | Set Variable | ${min_rate} | | ${encr_alg}= | Crypto Alg AES CBC 128 | | ${auth_alg}= | Integ Alg SHA1 96 -| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | Given Add worker threads and rxqueues to all DUTs | 1 | | And Add PCI devices to all DUTs | | And Add no multi seg to all DUTs | | And Add cryptodev to all DUTs | ${1} @@ -126,7 +125,7 @@ | | ${threshold}= | Set Variable | ${min_rate} | | ${encr_alg}= | Crypto Alg AES CBC 128 | | ${auth_alg}= | Integ Alg SHA1 96 -| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | Given Add worker threads and rxqueues to all DUTs | 1 | | And Add PCI devices to all DUTs | | And Add no multi seg to all DUTs | | And Add cryptodev to all DUTs | ${1} @@ -162,7 +161,7 @@ | | ${threshold}= | Set Variable | ${min_rate} | | ${encr_alg}= | Crypto Alg AES CBC 128 | | ${auth_alg}= | Integ Alg SHA1 96 -| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | Given Add worker threads and rxqueues to all DUTs | 1 | | And Add PCI devices to all DUTs | | And Add cryptodev to all DUTs | ${1} | | And Add DPDK dev default RXD to all DUTs | 2048 @@ -196,7 +195,7 @@ | | ${threshold}= | Set Variable | ${min_rate} | | ${encr_alg}= | Crypto Alg AES CBC 128 | | ${auth_alg}= | Integ Alg SHA1 96 -| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | Given Add worker threads and rxqueues to all DUTs | 1 | | And Add PCI devices to all DUTs | | And Add cryptodev to all DUTs | ${1} | | And Add DPDK dev default RXD to all DUTs | 2048 @@ -233,7 +232,7 @@ | | ${threshold}= | Set Variable | ${min_rate} | | ${encr_alg}= | Crypto Alg AES CBC 128 | | ${auth_alg}= | Integ Alg SHA1 96 -| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | Given Add worker threads and rxqueues to all DUTs | 1 | | And Add PCI devices to all DUTs | | And Add cryptodev to all DUTs | ${1} | | And Add DPDK dev default RXD to all DUTs | 2048 @@ -269,7 +268,7 @@ | | ${threshold}= | Set Variable | ${min_rate} | | ${encr_alg}= | Crypto Alg AES CBC 128 | | ${auth_alg}= | Integ Alg SHA1 96 -| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | Given Add worker threads and rxqueues to all DUTs | 1 | | And Add PCI devices to all DUTs | | And Add cryptodev to all DUTs | ${1} | | And Add DPDK dev default RXD to all DUTs | 2048 @@ -304,7 +303,7 @@ | | ${threshold}= | Set Variable | ${min_rate} | | ${encr_alg}= | Crypto Alg AES CBC 128 | | ${auth_alg}= | Integ Alg SHA1 96 -| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | Given Add worker threads and rxqueues to all DUTs | 2 | | And Add PCI devices to all DUTs | | And Add no multi seg to all DUTs | | And Add cryptodev to all DUTs | ${2} @@ -339,7 +338,7 @@ | | ${threshold}= | Set Variable | ${min_rate} | | ${encr_alg}= | Crypto Alg AES CBC 128 | | ${auth_alg}= | Integ Alg SHA1 96 -| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | Given Add worker threads and rxqueues to all DUTs | 2 | | And Add PCI devices to all DUTs | | And Add no multi seg to all DUTs | | And Add cryptodev to all DUTs | ${2} diff --git a/tests/vpp/perf/crypto/40ge2p1xl710-ethip4ipsecbasetnl-ip4base-tnl-aes-gcm-ndrpdrdisc.robot b/tests/vpp/perf/crypto/40ge2p1xl710-ethip4ipsecbasetnl-ip4base-tnl-aes-gcm-ndrpdrdisc.robot index 0498effbeb..0733a43b8c 100644 --- a/tests/vpp/perf/crypto/40ge2p1xl710-ethip4ipsecbasetnl-ip4base-tnl-aes-gcm-ndrpdrdisc.robot +++ b/tests/vpp/perf/crypto/40ge2p1xl710-ethip4ipsecbasetnl-ip4base-tnl-aes-gcm-ndrpdrdisc.robot @@ -82,7 +82,6 @@ | | ... | | [Tags] | 64B | 1C | NDRDISC | | ... -| | # FIXME: Move repeated lines into a keyword. | | ${framesize}= | Set Variable | ${64} | | ${min_rate}= | Set Variable | ${50000} | | ${max_rate}= | Set Variable | ${s_18.75Mpps} @@ -91,7 +90,7 @@ | | ${threshold}= | Set Variable | ${min_rate} | | ${encr_alg}= | Crypto Alg AES GCM 128 | | ${auth_alg}= | Integ Alg AES GCM 128 -| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | Given Add worker threads and rxqueues to all DUTs | 1 | | And Add PCI devices to all DUTs | | And Add no multi seg to all DUTs | | And Add cryptodev to all DUTs | ${1} @@ -131,7 +130,7 @@ | | ${threshold}= | Set Variable | ${min_rate} | | ${encr_alg}= | Crypto Alg AES GCM 128 | | ${auth_alg}= | Integ Alg AES GCM 128 -| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | Given Add worker threads and rxqueues to all DUTs | 1 | | And Add PCI devices to all DUTs | | And Add no multi seg to all DUTs | | And Add cryptodev to all DUTs | ${1} @@ -173,7 +172,7 @@ | | ${threshold}= | Set Variable | ${min_rate} | | ${encr_alg}= | Crypto Alg AES GCM 128 | | ${auth_alg}= | Integ Alg AES GCM 128 -| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | Given Add worker threads and rxqueues to all DUTs | 1 | | And Add PCI devices to all DUTs | | And Add cryptodev to all DUTs | ${1} | | And Add DPDK dev default RXD to all DUTs | 2048 @@ -213,7 +212,7 @@ | | ${threshold}= | Set Variable | ${min_rate} | | ${encr_alg}= | Crypto Alg AES GCM 128 | | ${auth_alg}= | Integ Alg AES GCM 128 -| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | Given Add worker threads and rxqueues to all DUTs | 1 | | And Add PCI devices to all DUTs | | And Add cryptodev to all DUTs | ${1} | | And Add DPDK dev default RXD to all DUTs | 2048 @@ -256,7 +255,7 @@ | | ${threshold}= | Set Variable | ${min_rate} | | ${encr_alg}= | Crypto Alg AES GCM 128 | | ${auth_alg}= | Integ Alg AES GCM 128 -| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | Given Add worker threads and rxqueues to all DUTs | 1 | | And Add PCI devices to all DUTs | | And Add cryptodev to all DUTs | ${1} | | And Add DPDK dev default RXD to all DUTs | 2048 @@ -298,7 +297,7 @@ | | ${threshold}= | Set Variable | ${min_rate} | | ${encr_alg}= | Crypto Alg AES GCM 128 | | ${auth_alg}= | Integ Alg AES GCM 128 -| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | Given Add worker threads and rxqueues to all DUTs | 1 | | And Add PCI devices to all DUTs | | And Add cryptodev to all DUTs | ${1} | | And Add DPDK dev default RXD to all DUTs | 2048 @@ -338,7 +337,7 @@ | | ${threshold}= | Set Variable | ${min_rate} | | ${encr_alg}= | Crypto Alg AES GCM 128 | | ${auth_alg}= | Integ Alg AES GCM 128 -| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | Given Add worker threads and rxqueues to all DUTs | 2 | | And Add PCI devices to all DUTs | | And Add no multi seg to all DUTs | | And Add cryptodev to all DUTs | ${2} @@ -378,7 +377,7 @@ | | ${threshold}= | Set Variable | ${min_rate} | | ${encr_alg}= | Crypto Alg AES GCM 128 | | ${auth_alg}= | Integ Alg AES GCM 128 -| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | Given Add worker threads and rxqueues to all DUTs | 2 | | And Add PCI devices to all DUTs | | And Add no multi seg to all DUTs | | And Add cryptodev to all DUTs | ${2} diff --git a/tests/vpp/perf/crypto/40ge2p1xl710-ethip4ipsecbasetnl-ip4base-tnl-cbc-sha1-ndrpdrdisc.robot b/tests/vpp/perf/crypto/40ge2p1xl710-ethip4ipsecbasetnl-ip4base-tnl-cbc-sha1-ndrpdrdisc.robot index cf0342973a..2df4bd7dad 100644 --- a/tests/vpp/perf/crypto/40ge2p1xl710-ethip4ipsecbasetnl-ip4base-tnl-cbc-sha1-ndrpdrdisc.robot +++ b/tests/vpp/perf/crypto/40ge2p1xl710-ethip4ipsecbasetnl-ip4base-tnl-cbc-sha1-ndrpdrdisc.robot @@ -82,7 +82,6 @@ | | ... | | [Tags] | 64B | 1C | NDRDISC | | ... -| | # FIXME: Move repeated lines into a keyword. | | ${framesize}= | Set Variable | ${64} | | ${min_rate}= | Set Variable | ${50000} | | ${max_rate}= | Set Variable | ${s_18.75Mpps} @@ -91,7 +90,7 @@ | | ${threshold}= | Set Variable | ${min_rate} | | ${encr_alg}= | Crypto Alg AES CBC 128 | | ${auth_alg}= | Integ Alg SHA1 96 -| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | Given Add worker threads and rxqueues to all DUTs | 1 | | And Add PCI devices to all DUTs | | And Add no multi seg to all DUTs | | And Add cryptodev to all DUTs | ${1} @@ -131,7 +130,7 @@ | | ${threshold}= | Set Variable | ${min_rate} | | ${encr_alg}= | Crypto Alg AES CBC 128 | | ${auth_alg}= | Integ Alg SHA1 96 -| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | Given Add worker threads and rxqueues to all DUTs | 1 | | And Add PCI devices to all DUTs | | And Add no multi seg to all DUTs | | And Add cryptodev to all DUTs | ${1} @@ -172,7 +171,7 @@ | | ${threshold}= | Set Variable | ${min_rate} | | ${encr_alg}= | Crypto Alg AES CBC 128 | | ${auth_alg}= | Integ Alg SHA1 96 -| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | Given Add worker threads and rxqueues to all DUTs | 1 | | And Add PCI devices to all DUTs | | And Add cryptodev to all DUTs | ${1} | | And Add DPDK dev default RXD to all DUTs | 2048 @@ -211,7 +210,7 @@ | | ${threshold}= | Set Variable | ${min_rate} | | ${encr_alg}= | Crypto Alg AES CBC 128 | | ${auth_alg}= | Integ Alg SHA1 96 -| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | Given Add worker threads and rxqueues to all DUTs | 1 | | And Add PCI devices to all DUTs | | And Add cryptodev to all DUTs | ${1} | | And Add DPDK dev default RXD to all DUTs | 2048 @@ -253,7 +252,7 @@ | | ${threshold}= | Set Variable | ${min_rate} | | ${encr_alg}= | Crypto Alg AES CBC 128 | | ${auth_alg}= | Integ Alg SHA1 96 -| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | Given Add worker threads and rxqueues to all DUTs | 1 | | And Add PCI devices to all DUTs | | And Add cryptodev to all DUTs | ${1} | | And Add DPDK dev default RXD to all DUTs | 2048 @@ -294,7 +293,7 @@ | | ${threshold}= | Set Variable | ${min_rate} | | ${encr_alg}= | Crypto Alg AES CBC 128 | | ${auth_alg}= | Integ Alg SHA1 96 -| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | Given Add worker threads and rxqueues to all DUTs | 1 | | And Add PCI devices to all DUTs | | And Add cryptodev to all DUTs | ${1} | | And Add DPDK dev default RXD to all DUTs | 2048 @@ -334,7 +333,7 @@ | | ${threshold}= | Set Variable | ${min_rate} | | ${encr_alg}= | Crypto Alg AES CBC 128 | | ${auth_alg}= | Integ Alg SHA1 96 -| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | Given Add worker threads and rxqueues to all DUTs | 2 | | And Add PCI devices to all DUTs | | And Add no multi seg to all DUTs | | And Add cryptodev to all DUTs | ${2} @@ -374,7 +373,7 @@ | | ${threshold}= | Set Variable | ${min_rate} | | ${encr_alg}= | Crypto Alg AES CBC 128 | | ${auth_alg}= | Integ Alg SHA1 96 -| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | Given Add worker threads and rxqueues to all DUTs | 2 | | And Add PCI devices to all DUTs | | And Add no multi seg to all DUTs | | And Add cryptodev to all DUTs | ${2} diff --git a/tests/vpp/perf/crypto/40ge2p1xl710-ethip4ipsecbasetnlsw-ip4base-int-aes-gcm-mrr.robot b/tests/vpp/perf/crypto/40ge2p1xl710-ethip4ipsecbasetnlsw-ip4base-int-aes-gcm-mrr.robot index 521df05adf..6a6ce849ea 100644 --- a/tests/vpp/perf/crypto/40ge2p1xl710-ethip4ipsecbasetnlsw-ip4base-int-aes-gcm-mrr.robot +++ b/tests/vpp/perf/crypto/40ge2p1xl710-ethip4ipsecbasetnlsw-ip4base-int-aes-gcm-mrr.robot @@ -23,8 +23,11 @@ | Suite Teardown | Tear down 3-node performance topology | ... | Test Setup | Set up performance test +| ... | Test Teardown | Tear down performance mrr test | ... +| Test Template | Local template +| ... | Documentation | *Raw results IPv4 IPsec tunnel mode performance test suite.* | ... | ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology @@ -67,16 +70,21 @@ | ${traffic_profile}= | trex-sl-3n-ethip4-ip4dst${n_tunnels} *** Keywords *** -| Check RR for IPv4 routing with IPSec SW cryptodev +| Local template | | [Documentation] -| | ... | [Cfg] DUT runs IPSec tunneling AES GCM config with ${wt} thread(s),\ -| | ... | ${wt} phy core(s), ${rxq} receive queue(s) per NIC port. -| | ... | [Ver] Measure MaxReceivedRate for ${framesize} frames using single\ +| | ... | [Cfg] DUT runs IPSec tunneling AES GCM config. +| | ... | Each DUT uses ${phy_cores} physical core(s) for worker threads. +| | ... | [Ver] Measure MaxReceivedRate for ${framesize}B frames using single\ | | ... | trial throughput test. | | ... -| | [Arguments] | ${framesize} | ${wt} | ${rxq} +| | ... | *Arguments:* +| | ... | - framesize - Framesize in Bytes in integer or string (IMIX_v4_1). +| | ... | Type: integer, string +| | ... | - phy_cores - Number of physical cores. Type: integer +| | ... | - rxq - Number of RX queues, default value: ${None}. Type: integer +| | ... +| | [Arguments] | ${framesize} | ${phy_cores} | ${rxq}=${None} | | ... -| | # Test Variables required for test teardown | | Set Test Variable | ${framesize} | | ${get_framesize}= | Get Frame Size | ${framesize} | | ${max_rate}= | Calculate pps | ${s_24.5G} @@ -86,12 +94,12 @@ | | ${encr_alg}= | Crypto Alg AES GCM 128 | | ${auth_alg}= | Integ Alg AES GCM 128 | | ... -| | Given Add '${wt}' worker threads and '${rxq}' rxqueues in 3-node single-link circular topology +| | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq} | | And Add PCI devices to all DUTs -| | And Run Keyword If | ${get_framesize} < ${1522} +| | And Run Keyword If | ${get_framesize} + ${ipsec_overhead} < ${1522} | | ... | Add no multi seg to all DUTs | | And Add DPDK SW cryptodev on DUTs in 3-node single-link circular topology -| | ... | aesni_gcm | ${${wt}} +| | ... | aesni_gcm | ${${phy_cores}} | | And Add DPDK dev default RXD to all DUTs | 2048 | | And Add DPDK dev default TXD to all DUTs | 2048 | | And Apply startup configuration on all VPP DUTs @@ -107,106 +115,36 @@ *** Test Cases *** | tc01-64B-1t1c-ethip4ipsecbasetnlsw-ip4base-int-aes-gcm-mrr -| | [Documentation] -| | ... | [Cfg] DUTs run 1 IPsec tunnel AES GCM in each direction, configured\ -| | ... | with 1 phy core, 1 receive queue per NIC port. -| | ... | [Ver] Measure MaxReceivedRate for 64B frames using single trial\ -| | ... | throughput test. | | [Tags] | 64B | 1C -| | ... -| | [Template] | Check RR for IPv4 routing with IPSec SW cryptodev -| | framesize=${64} | wt=1 | rxq=1 +| | framesize=${64} | phy_cores=${1} | tc02-1518B-1t1c-ethip4ipsecbasetnlsw-ip4base-int-aes-gcm-mrr -| | [Documentation] -| | ... | [Cfg] DUTs run 1 IPsec tunnel AES GCM in each direction, configured\ -| | ... | with 1 phy core, 1 receive queue per NIC port. -| | ... | [Ver] Measure MaxReceivedRate for 1518B frames using single\ -| | ... | trial throughput test. | | [Tags] | 1518B | 1C -| | ... -| | [Template] | Check RR for IPv4 routing with IPSec SW cryptodev -| | framesize=${1518} | wt=1 | rxq=1 - -# TODO: Add check to make test fail if rx=0. -# TODO: Add 9000B test cases when they start passing. +| | framesize=${1518} | phy_cores=${1} | tc04-IMIX-1t1c-ethip4ipsecbasetnlsw-ip4base-int-aes-gcm-mrr -| | [Documentation] -| | ... | [Cfg] DUTs run 1 IPsec tunnel AES GCM in each direction, configured\ -| | ... | with 1 phy core, 1 receive queue per NIC port. -| | ... | [Ver] Measure MaxReceivedRate for IMIX_v4_1 frames using single\ -| | ... | trial throughput test. -| | ... | IMIX_v4_1 = (28x64B; 16x570B; 4x1518B) | | [Tags] | IMIX | 1C -| | ... -| | [Template] | Check RR for IPv4 routing with IPSec SW cryptodev -| | framesize=IMIX_v4_1 | wt=1 | rxq=1 +| | framesize=IMIX_v4_1 | phy_cores=${1} | tc05-64B-2t2c-ethip4ipsecbasetnlsw-ip4base-int-aes-gcm-mrr -| | [Documentation] -| | ... | [Cfg] DUTs run 1 IPsec tunnel AES GCM in each direction, configured\ -| | ... | with 2 phy cores, 1 receive queue per NIC port. -| | ... | [Ver] Measure MaxReceivedRate for 64B frames using single trial\ -| | ... | throughput test. | | [Tags] | 64B | 2C -| | ... -| | [Template] | Check RR for IPv4 routing with IPSec SW cryptodev -| | framesize=${64} | wt=2 | rxq=1 +| | framesize=${64} | phy_cores=${2} | tc06-1518B-2t2c-ethip4ipsecbasetnlsw-ip4base-int-aes-gcm-mrr -| | [Documentation] -| | ... | [Cfg] DUTs run 1 IPsec tunnel AES GCM in each direction, configured\ -| | ... | with 2 phy cores, 1 receive queue per NIC port. -| | ... | [Ver] Measure MaxReceivedRate for 1518B frames using single\ -| | ... | trial throughput test. | | [Tags] | 1518B | 2C -| | ... -| | [Template] | Check RR for IPv4 routing with IPSec SW cryptodev -| | framesize=${1518} | wt=2 | rxq=1 +| | framesize=${1518} | phy_cores=${2} | tc08-IMIX-2t2c-ethip4ipsecbasetnlsw-ip4base-int-aes-gcm-mrr -| | [Documentation] -| | ... | [Cfg] DUTs run 1 IPsec tunnel AES GCM in each direction, configured\ -| | ... | with 2 phy cores, 1 receive queue per NIC port. -| | ... | [Ver] Measure MaxReceivedRate for IMIX_v4_1 frames using single\ -| | ... | trial throughput test. -| | ... | IMIX_v4_1 = (28x64B; 16x570B; 4x1518B) | | [Tags] | IMIX | 2C -| | ... -| | [Template] | Check RR for IPv4 routing with IPSec SW cryptodev -| | framesize=IMIX_v4_1 | wt=2 | rxq=1 +| | framesize=IMIX_v4_1 | phy_cores=${2} | tc09-64B-4t4c-ethip4ipsecbasetnlsw-ip4base-int-aes-gcm-mrr -| | [Documentation] -| | ... | [Cfg] DUTs run 1 IPsec tunnel AES GCM in each direction, configured\ -| | ... | with 4 phy cores, 2 receive queues per NIC port. -| | ... | [Ver] Measure MaxReceivedRate for 64B frames using single trial\ -| | ... | throughput test. | | [Tags] | 64B | 4C -| | ... -| | [Template] | Check RR for IPv4 routing with IPSec SW cryptodev -| | framesize=${64} | wt=4 | rxq=2 +| | framesize=${64} | phy_cores=${4} | tc10-1518B-4t4c-ethip4ipsecbasetnlsw-ip4base-int-aes-gcm-mrr -| | [Documentation] -| | ... | [Cfg] DUTs run 1 IPsec tunnel AES GCM in each direction, configured\ -| | ... | with 4 phy cores, 2 receive queues per NIC port. -| | ... | [Ver] Measure MaxReceivedRate for 1518B frames using single\ -| | ... | trial throughput test. -| | [Tags] | 1518B | 4C -| | ... -| | [Template] | Check RR for IPv4 routing with IPSec SW cryptodev -| | framesize=${1518} | wt=4 | rxq=2 +| | framesize=${1518} | phy_cores=${4} | tc12-IMIX-4t4c-ethip4ipsecbasetnlsw-ip4base-int-aes-gcm-mrr -| | [Documentation] -| | ... | [Cfg] DUTs run 1 IPsec tunnel AES GCM in each direction, configured\ -| | ... | with 4 phy cores, 2 receive queues per NIC port. -| | ... | [Ver] Measure MaxReceivedRate for IMIX_v4_1 frames using single\ -| | ... | trial throughput test. -| | ... | IMIX_v4_1 = (28x64B; 16x570B; 4x1518B) | | [Tags] | IMIX | 4C -| | ... -| | [Template] | Check RR for IPv4 routing with IPSec SW cryptodev -| | framesize=IMIX_v4_1 | wt=4 | rxq=2 +| | framesize=IMIX_v4_1 | phy_cores=${4} diff --git a/tests/vpp/perf/crypto/40ge2p1xl710-ethip4ipsecbasetnlsw-ip4base-int-aes-gcm-ndrpdrdisc.robot b/tests/vpp/perf/crypto/40ge2p1xl710-ethip4ipsecbasetnlsw-ip4base-int-aes-gcm-ndrpdrdisc.robot index a588aa2d24..78c3881077 100644 --- a/tests/vpp/perf/crypto/40ge2p1xl710-ethip4ipsecbasetnlsw-ip4base-int-aes-gcm-ndrpdrdisc.robot +++ b/tests/vpp/perf/crypto/40ge2p1xl710-ethip4ipsecbasetnlsw-ip4base-int-aes-gcm-ndrpdrdisc.robot @@ -28,6 +28,8 @@ | Test Teardown | Tear down performance discovery test | ${min_rate}pps | ... | ${framesize} | ${traffic_profile} | ... +| Test Template | Local template +| ... | Documentation | *IPv4 IPsec tunnel mode performance test suite.* | ... | ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology @@ -74,16 +76,24 @@ | ${traffic_profile}= | trex-sl-3n-ethip4-ip4dst${n_tunnels} *** Keywords *** -| Discover NDR or PDR for IPv4 routing with IPSec SW cryptodev +| Local template | | [Documentation] -| | ... | [Cfg] DUT runs IPSec tunneling AES GCM config with ${wt} thread(s),\ -| | ... | ${wt} phy core(s), ${rxq} receive queue(s) per NIC port. -| | ... | [Ver] Measure NDR or PDR for ${framesize} by bisecting between\ -| | ... | ${min_rate} and computed max rate, using trial loss rate measurements. -| | ... -| | [Arguments] | ${wt} | ${rxq} | ${framesize} | ${min_rate} | ${search_type} -| | ... -| | # Test Variables required for test teardown +| | ... | [Cfg] DUT runs IPSec tunneling AES GCM config. +| | ... | Each DUT uses ${phy_cores} physical core(s) for worker threads. +| | ... | [Ver] Find ${search_type} for ${framesize}B frames using binary search\ +| | ... | start at linerate, step ${min_rate}pps. +| | ... +| | ... | *Arguments:* +| | ... | - framesize - Framesize in Bytes in integer or string (IMIX_v4_1). +| | ... | Type: integer, string +| | ... | - phy_cores - Number of physical cores. Type: integer +| | ... | - search_type - NDR or PDR. Type: string +| | ... | - rxq - Number of RX queues, default value: ${None}. Type: integer +| | ... | - min_rate - Min rate for binary search, default value: ${50000}. +| | ... | Type: integer +| | ... +| | [Arguments] | ${framesize} | ${phy_cores} | ${search_type} +| | ... | ${rxq}=${None} | ${min_rate}=${50000} | | Set Test Variable | ${framesize} | | Set Test Variable | ${min_rate} | | ${get_framesize}= | Get Frame Size | ${framesize} @@ -97,11 +107,12 @@ | | ${encr_alg}= | Crypto Alg AES GCM 128 | | ${auth_alg}= | Integ Alg AES GCM 128 | | ... -| | Given Add '${wt}' worker threads and '${rxq}' rxqueues in 3-node single-link circular topology +| | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq} | | And Add PCI devices to all DUTs -| | And Add no multi seg to all DUTs +| | And Run Keyword If | ${get_framesize} + ${ipsec_overhead_gcm} < ${1522} +| | ... | Add no multi seg to all DUTs | | And Add DPDK SW cryptodev on DUTs in 3-node single-link circular topology -| | ... | aesni_gcm | ${${wt}} +| | ... | aesni_gcm | ${${phy_cores}} | | And Add DPDK dev default RXD to all DUTs | 2048 | | And Add DPDK dev default TXD to all DUTs | 2048 | | And Apply startup configuration on all VPP DUTs @@ -124,99 +135,33 @@ *** Test Cases *** | tc01-64B-1t1c-ethip4ipsecbasetnlsw-ip4base-int-aes-gcm-ndrdisc -| | [Documentation] -| | ... | [Cfg] DUTs run 1 IPsec tunnel AES GCM in each direction, configured\ -| | ... | with 1 phy core, 1 receive queue per NIC port. -| | ... | [Ver] Find NDR for 64 Byte frames\ -| | ... | using binary search start at 40GE linerate, step 50kpps. -| | ... | | [Tags] | 64B | 1C | NDRDISC -| | ... -| | [Template] | Discover NDR or PDR for IPv4 routing with IPSec SW cryptodev -| | wt=1 | rxq=1 | framesize=${64} | min_rate=${50000} | search_type=NDR +| | framesize=${64} | phy_cores=${1} | search_type=NDR | tc02-64B-1t1c-ethip4ipsecbasetnlsw-ip4base-int-aes-gcm-pdrdisc -| | [Documentation] -| | ... | [Cfg] DUTs run 1 IPsec tunnel AES GCM in each direction, configured\ -| | ... | with 1 phy core, 1 receive queue per NIC port. -| | ... | [Ver] Find PDR for 64 Byte frames using binary search start at 40GE\ -| | ... | linerate, step 50kpps and loss tolerance of 0.5%. -| | ... | | [Tags] | 64B | 1C | PDRDISC | SKIP_PATCH -| | ... -| | [Template] | Discover NDR or PDR for IPv4 routing with IPSec SW cryptodev -| | wt=1 | rxq=1 | framesize=${64} | min_rate=${50000} | search_type=PDR +| | framesize=${64} | phy_cores=${1} | search_type=PDR | tc03-1518B-1t1c-ethip4ipsecbasetnlsw-ip4base-int-aes-gcm-ndrdisc -| | [Documentation] -| | ... | [Cfg] DUTs run 1 IPsec tunnel AES GCM in each direction, configured\ -| | ... | with 1 phy core, 1 receive queue per NIC port. -| | ... | [Ver] Find NDR for 1518 Byte frames\ -| | ... | using binary search start at 40GE linerate, step 50kpps. -| | ... | | [Tags] | 1518B | 1C | NDRDISC -| | ... -| | [Template] | Discover NDR or PDR for IPv4 routing with IPSec SW cryptodev -| | wt=1 | rxq=1 | framesize=${1518} | min_rate=${50000} | search_type=NDR +| | framesize=${1518} | phy_cores=${1} | search_type=NDR | tc04-1518B-1t1c-ethip4ipsecbasetnlsw-ip4base-int-aes-gcm-pdrdisc -| | [Documentation] -| | ... | [Cfg] DUTs run 1 IPsec tunnel AES GCM in each direction, configured\ -| | ... | with 1 phy core, 1 receive queue per NIC port. -| | ... | [Ver] Find PDR for 1518 Byte frames using binary search start at 40GE\ -| | ... | linerate, step 50kpps and loss tolerance of 0.5%. -| | ... | | [Tags] | 1518B | 1C | PDRDISC | SKIP_PATCH -| | ... -| | [Template] | Discover NDR or PDR for IPv4 routing with IPSec SW cryptodev -| | wt=1 | rxq=1 | framesize=${1518} | min_rate=${50000} | search_type=PDR +| | framesize=${1518} | phy_cores=${1} | search_type=PDR | tc05-IMIX-1t1c-ethip4ipsecbasetnlsw-ip4base-int-aes-gcm-ndrdisc -| | [Documentation] -| | ... | [Cfg] DUTs run 1 IPsec tunnel AES GCM in each direction, configured\ -| | ... | with 1 phy core, 1 receive queue per NIC port. -| | ... | [Ver] Find NDR for IMIX_v4_1 frames\ -| | ... | using binary search start at 40GE linerate, step 50kpps. -| | ... | IMIX_v4_1 = (28x64B; 16x570B; 4x1518B) -| | ... | | [Tags] | IMIX | 1C | NDRDISC -| | ... -| | [Template] | Discover NDR or PDR for IPv4 routing with IPSec SW cryptodev -| | wt=1 | rxq=1 | framesize=IMIX_v4_1 | min_rate=${50000} | search_type=NDR +| | framesize=IMIX_v4_1 | phy_cores=${1} | search_type=NDR | tc06-IMIX-1t1c-ethip4ipsecbasetnlsw-ip4base-int-aes-gcm-pdrdisc -| | [Documentation] -| | ... | [Cfg] DUTs run 1 IPsec tunnel AES GCM in each direction, configured\ -| | ... | with 1 phy core, 1 receive queue per NIC port. -| | ... | [Ver] Find PDR for IMIX_v4_1 frames using binary search start at 40GE\ -| | ... | linerate, step 50kpps and loss tolerance of 0.5%. -| | ... | IMIX_v4_1 = (28x64B; 16x570B; 4x1518B) -| | ... | | [Tags] | IMIX | 1C | PDRDISC | SKIP_PATCH -| | ... -| | [Template] | Discover NDR or PDR for IPv4 routing with IPSec SW cryptodev -| | wt=1 | rxq=1 | framesize=IMIX_v4_1 | min_rate=${50000} | search_type=PDR +| | framesize=IMIX_v4_1 | phy_cores=${1} | search_type=PDR | tc07-64B-2t2c-ethip4ipsecbasetnlsw-ip4base-int-aes-gcm-ndrdisc -| | [Documentation] -| | ... | [Cfg] DUTs run 1 IPsec tunnel AES GCM in each direction, configured\ -| | ... | with 2 phy core, 1 receive queue per NIC port. -| | ... | [Ver] Find NDR for 64 Byte frames\ -| | ... | using binary search start at 40GE linerate, step 50kpps. -| | ... | | [Tags] | 64B | 2C | NDRDISC -| | ... -| | [Template] | Discover NDR or PDR for IPv4 routing with IPSec SW cryptodev -| | wt=2 | rxq=1 | framesize=${64} | min_rate=${50000} | search_type=NDR +| | framesize=${64} | phy_cores=${2} | search_type=NDR | tc08-64B-2t2c-ethip4ipsecbasetnlsw-ip4base-int-aes-gcm-pdrdisc -| | [Documentation] -| | ... | [Cfg] DUTs run 1 IPsec tunnel AES GCM in each direction, configured\ -| | ... | with 2 phy core, 1 receive queue per NIC port. -| | ... | [Ver] Find PDR for 64 Byte frames using binary search start at 40GE\ -| | ... | linerate, step 50kpps and loss tolerance of 0.5%. -| | ... | | [Tags] | 64B | 2C | PDRDISC | SKIP_PATCH -| | ... -| | [Template] | Discover NDR or PDR for IPv4 routing with IPSec SW cryptodev -| | wt=2 | rxq=1 | framesize=${64} | min_rate=${50000} | search_type=PDR +| | framesize=${64} | phy_cores=${2} | search_type=PDR diff --git a/tests/vpp/perf/crypto/40ge2p1xl710-ethip4ipsecbasetnlsw-ip4base-int-cbc-sha1-mrr.robot b/tests/vpp/perf/crypto/40ge2p1xl710-ethip4ipsecbasetnlsw-ip4base-int-cbc-sha1-mrr.robot index 9a9f465b96..22a736b3b2 100644 --- a/tests/vpp/perf/crypto/40ge2p1xl710-ethip4ipsecbasetnlsw-ip4base-int-cbc-sha1-mrr.robot +++ b/tests/vpp/perf/crypto/40ge2p1xl710-ethip4ipsecbasetnlsw-ip4base-int-cbc-sha1-mrr.robot @@ -23,8 +23,11 @@ | Suite Teardown | Tear down 3-node performance topology | ... | Test Setup | Set up performance test +| ... | Test Teardown | Tear down performance mrr test | ... +| Test Template | Local template +| ... | Documentation | *Raw results IPv4 IPsec tunnel mode performance test suite.* | ... | ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology @@ -67,16 +70,21 @@ | ${traffic_profile}= | trex-sl-3n-ethip4-ip4dst${n_tunnels} *** Keywords *** -| Check RR for IPv4 routing with IPSec SW cryptodev +| Local template | | [Documentation] -| | ... | [Cfg] DUT runs IPSec tunneling CBC-SHA1 config with ${wt} thread(s),\ -| | ... | ${wt} phy core(s), ${rxq} receive queue(s) per NIC port. -| | ... | [Ver] Measure MaxReceivedRate for ${framesize} frames using single\ +| | ... | [Cfg] DUT runs IPSec tunneling CBC-SHA1 config. +| | ... | Each DUT uses ${phy_cores} physical core(s) for worker threads. +| | ... | [Ver] Measure MaxReceivedRate for ${framesize}B frames using single\ | | ... | trial throughput test. | | ... -| | [Arguments] | ${framesize} | ${wt} | ${rxq} +| | ... | *Arguments:* +| | ... | - framesize - Framesize in Bytes in integer or string (IMIX_v4_1). +| | ... | Type: integer, string +| | ... | - phy_cores - Number of physical cores. Type: integer +| | ... | - rxq - Number of RX queues, default value: ${None}. Type: integer +| | ... +| | [Arguments] | ${framesize} | ${phy_cores} | ${rxq}=${None} | | ... -| | # Test Variables required for test teardown | | Set Test Variable | ${framesize} | | ${get_framesize}= | Get Frame Size | ${framesize} | | ${max_rate}= | Calculate pps | ${s_24.5G} @@ -86,12 +94,12 @@ | | ${encr_alg}= | Crypto Alg AES CBC 128 | | ${auth_alg}= | Integ Alg SHA1 96 | | ... -| | Given Add '${wt}' worker threads and '${rxq}' rxqueues in 3-node single-link circular topology +| | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq} | | And Add PCI devices to all DUTs -| | And Run Keyword If | ${get_framesize} < ${1522} +| | And Run Keyword If | ${get_framesize} + ${ipsec_overhead} < ${1522} | | ... | Add no multi seg to all DUTs | | And Add DPDK SW cryptodev on DUTs in 3-node single-link circular topology -| | ... | aesni_mb | ${${wt}} +| | ... | aesni_mb | ${${phy_cores}} | | And Add DPDK dev default RXD to all DUTs | 2048 | | And Add DPDK dev default TXD to all DUTs | 2048 | | And Apply startup configuration on all VPP DUTs @@ -107,106 +115,37 @@ *** Test Cases *** | tc01-64B-1t1c-ethip4ipsecbasetnlsw-ip4base-int-cbc-sha1-mrr -| | [Documentation] -| | ... | [Cfg] DUTs run 1 IPsec tunnel CBC-SHA1 in each direction, configured\ -| | ... | with 1 phy core, 1 receive queue per NIC port. -| | ... | [Ver] Measure MaxReceivedRate for 64B frames using single trial\ -| | ... | throughput test. | | [Tags] | 64B | 1C -| | ... -| | [Template] | Check RR for IPv4 routing with IPSec SW cryptodev -| | framesize=${64} | wt=1 | rxq=1 +| | framesize=${64} | phy_cores=${1} | tc02-1518B-1t1c-ethip4ipsecbasetnlsw-ip4base-int-cbc-sha1-mrr -| | [Documentation] -| | ... | [Cfg] DUTs run 1 IPsec tunnel CBC-SHA1 in each direction, configured\ -| | ... | with 1 phy core, 1 receive queue per NIC port. -| | ... | [Ver] Measure MaxReceivedRate for 1518B frames using single\ -| | ... | trial throughput test. | | [Tags] | 1518B | 1C -| | ... -| | [Template] | Check RR for IPv4 routing with IPSec SW cryptodev -| | framesize=${1518} | wt=1 | rxq=1 - -# TODO: Add check to make test fail if rx=0. -# TODO: Add 9000B test cases when they start passing. +| | framesize=${1518} | phy_cores=${1} | tc04-IMIX-1t1c-ethip4ipsecbasetnlsw-ip4base-int-cbc-sha1-mrr -| | [Documentation] -| | ... | [Cfg] DUTs run 1 IPsec tunnel CBC-SHA1 in each direction, configured\ -| | ... | with 1 phy core, 1 receive queue per NIC port. -| | ... | [Ver] Measure MaxReceivedRate for IMIX_v4_1 frames using single\ -| | ... | trial throughput test. -| | ... | IMIX_v4_1 = (28x64B; 16x570B; 4x1518B) | | [Tags] | IMIX | 1C -| | ... -| | [Template] | Check RR for IPv4 routing with IPSec SW cryptodev -| | framesize=IMIX_v4_1 | wt=1 | rxq=1 +| | framesize=IMIX_v4_1 | phy_cores=${1} | tc05-64B-2t2c-ethip4ipsecbasetnlsw-ip4base-int-cbc-sha1-mrr -| | [Documentation] -| | ... | [Cfg] DUTs run 1 IPsec tunnel CBC-SHA1 in each direction, configured\ -| | ... | with 2 phy cores, 1 receive queue per NIC port. -| | ... | [Ver] Measure MaxReceivedRate for 64B frames using single trial\ -| | ... | throughput test. | | [Tags] | 64B | 2C -| | ... -| | [Template] | Check RR for IPv4 routing with IPSec SW cryptodev -| | framesize=${64} | wt=2 | rxq=1 +| | framesize=${64} | phy_cores=${2} | tc06-1518B-2t2c-ethip4ipsecbasetnlsw-ip4base-int-cbc-sha1-mrr -| | [Documentation] -| | ... | [Cfg] DUTs run 1 IPsec tunnel CBC-SHA1 in each direction, configured\ -| | ... | with 2 phy cores, 1 receive queue per NIC port. -| | ... | [Ver] Measure MaxReceivedRate for 1518B frames using single\ -| | ... | trial throughput test. | | [Tags] | 1518B | 2C -| | ... -| | [Template] | Check RR for IPv4 routing with IPSec SW cryptodev -| | framesize=${1518} | wt=2 | rxq=1 +| | framesize=${1518} | phy_cores=${2} | tc08-IMIX-2t2c-ethip4ipsecbasetnlsw-ip4base-int-cbc-sha1-mrr -| | [Documentation] -| | ... | [Cfg] DUTs run 1 IPsec tunnel CBC-SHA1 in each direction, configured\ -| | ... | with 2 phy cores, 1 receive queue per NIC port. -| | ... | [Ver] Measure MaxReceivedRate for IMIX_v4_1 frames using single\ -| | ... | trial throughput test. -| | ... | IMIX_v4_1 = (28x64B; 16x570B; 4x1518B) | | [Tags] | IMIX | 2C -| | ... -| | [Template] | Check RR for IPv4 routing with IPSec SW cryptodev -| | framesize=IMIX_v4_1 | wt=2 | rxq=1 +| | framesize=IMIX_v4_1 | phy_cores=${2} | tc09-64B-4t4c-ethip4ipsecbasetnlsw-ip4base-int-cbc-sha1-mrr -| | [Documentation] -| | ... | [Cfg] DUTs run 1 IPsec tunnel CBC-SHA1 in each direction, configured\ -| | ... | with 4 phy cores, 2 receive queues per NIC port. -| | ... | [Ver] Measure MaxReceivedRate for 64B frames using single trial\ -| | ... | throughput test. | | [Tags] | 64B | 4C -| | ... -| | [Template] | Check RR for IPv4 routing with IPSec SW cryptodev -| | framesize=${64} | wt=4 | rxq=2 +| | framesize=${64} | phy_cores=${4} | tc10-1518B-4t4c-ethip4ipsecbasetnlsw-ip4base-int-cbc-sha1-mrr -| | [Documentation] -| | ... | [Cfg] DUTs run 1 IPsec tunnel CBC-SHA1 in each direction, configured\ -| | ... | with 4 phy cores, 2 receive queues per NIC port. -| | ... | [Ver] Measure MaxReceivedRate for 1518B frames using single\ -| | ... | trial throughput test. | | [Tags] | 1518B | 4C -| | ... -| | [Template] | Check RR for IPv4 routing with IPSec SW cryptodev -| | framesize=${1518} | wt=4 | rxq=2 +| | framesize=${1518} | phy_cores=${4} | tc12-IMIX-4t4c-ethip4ipsecbasetnlsw-ip4base-int-cbc-sha1-mrr -| | [Documentation] -| | ... | [Cfg] DUTs run 1 IPsec tunnel CBC-SHA1 in each direction, configured\ -| | ... | with 4 phy cores, 2 receive queues per NIC port. -| | ... | [Ver] Measure MaxReceivedRate for IMIX_v4_1 frames using single\ -| | ... | trial throughput test. -| | ... | IMIX_v4_1 = (28x64B; 16x570B; 4x1518B) | | [Tags] | IMIX | 4C -| | ... -| | [Template] | Check RR for IPv4 routing with IPSec SW cryptodev -| | framesize=IMIX_v4_1 | wt=4 | rxq=2 +| | framesize=IMIX_v4_1 | phy_cores=${4} diff --git a/tests/vpp/perf/crypto/40ge2p1xl710-ethip4ipsecbasetnlsw-ip4base-int-cbc-sha1-ndrpdrdisc.robot b/tests/vpp/perf/crypto/40ge2p1xl710-ethip4ipsecbasetnlsw-ip4base-int-cbc-sha1-ndrpdrdisc.robot index 150aa333b8..b380afc4b1 100644 --- a/tests/vpp/perf/crypto/40ge2p1xl710-ethip4ipsecbasetnlsw-ip4base-int-cbc-sha1-ndrpdrdisc.robot +++ b/tests/vpp/perf/crypto/40ge2p1xl710-ethip4ipsecbasetnlsw-ip4base-int-cbc-sha1-ndrpdrdisc.robot @@ -28,6 +28,8 @@ | Test Teardown | Tear down performance discovery test | ${min_rate}pps | ... | ${framesize} | ${traffic_profile} | ... +| Test Template | Local template +| ... | Documentation | *IPv4 IPsec tunnel mode performance test suite.* | ... | ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology @@ -74,16 +76,25 @@ | ${traffic_profile}= | trex-sl-3n-ethip4-ip4dst${n_tunnels} *** Keywords *** -| Discover NDR or PDR for IPv4 routing with IPSec SW cryptodev +| Local template | | [Documentation] -| | ... | [Cfg] DUT runs IPSec tunneling CBC-SHA1 config with ${wt} thread(s),\ -| | ... | ${wt} phy core(s), ${rxq} receive queue(s) per NIC port. -| | ... | [Ver] Measure NDR or PDR for ${framesize} by bisecting between\ -| | ... | ${min_rate} and computed max rate, using trial loss rate measurements. -| | ... -| | [Arguments] | ${wt} | ${rxq} | ${framesize} | ${min_rate} | ${search_type} +| | ... | [Cfg] DUT runs IPSec tunneling CBC-SHA1 config. +| | ... | Each DUT uses ${phy_cores} physical core(s) for worker threads. +| | ... | [Ver] Find ${search_type} for ${framesize}B frames using binary search\ +| | ... | start at linerate, step ${min_rate}pps. +| | ... +| | ... | *Arguments:* +| | ... | - framesize - Framesize in Bytes in integer or string (IMIX_v4_1). +| | ... | Type: integer, string +| | ... | - phy_cores - Number of physical cores. Type: integer +| | ... | - search_type - NDR or PDR. Type: string +| | ... | - rxq - Number of RX queues, default value: ${None}. Type: integer +| | ... | - min_rate - Min rate for binary search, default value: ${50000}. +| | ... | Type: integer +| | ... +| | [Arguments] | ${framesize} | ${phy_cores} | ${search_type} +| | ... | ${rxq}=${None} | ${min_rate}=${50000} | | ... -| | # Test Variables required for test teardown | | Set Test Variable | ${framesize} | | Set Test Variable | ${min_rate} | | ${get_framesize}= | Get Frame Size | ${framesize} @@ -97,11 +108,12 @@ | | ${encr_alg}= | Crypto Alg AES CBC 128 | | ${auth_alg}= | Integ Alg SHA1 96 | | ... -| | Given Add '${wt}' worker threads and '${rxq}' rxqueues in 3-node single-link circular topology +| | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq} | | And Add PCI devices to all DUTs -| | And Add no multi seg to all DUTs +| | And Run Keyword If | ${get_framesize} + ${ipsec_overhead_gcm} < ${1522} +| | ... | Add no multi seg to all DUTs | | And Add DPDK SW cryptodev on DUTs in 3-node single-link circular topology -| | ... | aesni_mb | ${${wt}} +| | ... | aesni_mb | ${${phy_cores}} | | And Add DPDK dev default RXD to all DUTs | 2048 | | And Add DPDK dev default TXD to all DUTs | 2048 | | And Apply startup configuration on all VPP DUTs @@ -124,99 +136,33 @@ *** Test Cases *** | tc01-64B-1t1c-ethip4ipsecbasetnlsw-ip4base-int-cbc-sha1-ndrdisc -| | [Documentation] -| | ... | [Cfg] DUTs run 1 IPsec tunnel CBC-SHA1 in each direction, configured\ -| | ... | with 1 phy core, 1 receive queue per NIC port. -| | ... | [Ver] Find NDR for 64 Byte frames\ -| | ... | using binary search start at 40GE linerate, step 50kpps. -| | ... | | [Tags] | 64B | 1C | NDRDISC -| | ... -| | [Template] | Discover NDR or PDR for IPv4 routing with IPSec SW cryptodev -| | wt=1 | rxq=1 | framesize=${64} | min_rate=${50000} | search_type=NDR +| | framesize=${64} | phy_cores=${1} | search_type=NDR | tc02-64B-1t1c-ethip4ipsecbasetnlsw-ip4base-int-cbc-sha1-pdrdisc -| | [Documentation] -| | ... | [Cfg] DUTs run 1 IPsec tunnel CBC-SHA1 in each direction, configured\ -| | ... | with 1 phy core, 1 receive queue per NIC port. -| | ... | [Ver] Find PDR for 64 Byte frames using binary search start at 40GE\ -| | ... | linerate, step 50kpps and loss tolerance of 0.5%. -| | ... | | [Tags] | 64B | 1C | PDRDISC | SKIP_PATCH -| | ... -| | [Template] | Discover NDR or PDR for IPv4 routing with IPSec SW cryptodev -| | wt=1 | rxq=1 | framesize=${64} | min_rate=${50000} | search_type=PDR +| | framesize=${64} | phy_cores=${1} | search_type=PDR | tc03-1518B-1t1c-ethip4ipsecbasetnlsw-ip4base-int-cbc-sha1-ndrdisc -| | [Documentation] -| | ... | [Cfg] DUTs run 1 IPsec tunnel CBC-SHA1 in each direction, configured\ -| | ... | with 1 phy core, 1 receive queue per NIC port. -| | ... | [Ver] Find NDR for 1518 Byte frames\ -| | ... | using binary search start at 40GE linerate, step 50kpps. -| | ... | | [Tags] | 1518B | 1C | NDRDISC -| | ... -| | [Template] | Discover NDR or PDR for IPv4 routing with IPSec SW cryptodev -| | wt=1 | rxq=1 | framesize=${1518} | min_rate=${50000} | search_type=NDR +| | framesize=${1518} | phy_cores=${1} | search_type=NDR | tc04-1518B-1t1c-ethip4ipsecbasetnlsw-ip4base-int-cbc-sha1-pdrdisc -| | [Documentation] -| | ... | [Cfg] DUTs run 1 IPsec tunnel CBC-SHA1 in each direction, configured\ -| | ... | with 1 phy core, 1 receive queue per NIC port. -| | ... | [Ver] Find PDR for 1518 Byte frames using binary search start at 40GE\ -| | ... | linerate, step 50kpps and loss tolerance of 0.5%. -| | ... | | [Tags] | 1518B | 1C | PDRDISC | SKIP_PATCH -| | ... -| | [Template] | Discover NDR or PDR for IPv4 routing with IPSec SW cryptodev -| | wt=1 | rxq=1 | framesize=${1518} | min_rate=${50000} | search_type=PDR +| | framesize=${1518} | phy_cores=${1} | search_type=PDR | tc05-IMIX-1t1c-ethip4ipsecbasetnlsw-ip4base-int-cbc-sha1-ndrdisc -| | [Documentation] -| | ... | [Cfg] DUTs run 1 IPsec tunnel CBC-SHA1 in each direction, configured\ -| | ... | with 1 phy core, 1 receive queue per NIC port. -| | ... | [Ver] Find NDR for IMIX_v4_1 frames\ -| | ... | using binary search start at 40GE linerate, step 50kpps. -| | ... | IMIX_v4_1 = (28x64B; 16x570B; 4x1518B) -| | ... | | [Tags] | IMIX | 1C | NDRDISC -| | ... -| | [Template] | Discover NDR or PDR for IPv4 routing with IPSec SW cryptodev -| | wt=1 | rxq=1 | framesize=IMIX_v4_1 | min_rate=${50000} | search_type=NDR +| | framesize=IMIX_v4_1 | phy_cores=${1} | search_type=NDR | tc06-IMIX-1t1c-ethip4ipsecbasetnlsw-ip4base-int-cbc-sha1-pdrdisc -| | [Documentation] -| | ... | [Cfg] DUTs run 1 IPsec tunnel CBC-SHA1 in each direction, configured\ -| | ... | with 1 phy core, 1 receive queue per NIC port. -| | ... | [Ver] Find PDR for IMIX_v4_1 frames using binary search start at 40GE\ -| | ... | linerate, step 50kpps and loss tolerance of 0.5%. -| | ... | IMIX_v4_1 = (28x64B; 16x570B; 4x1518B) -| | ... | | [Tags] | IMIX | 1C | PDRDISC | SKIP_PATCH -| | ... -| | [Template] | Discover NDR or PDR for IPv4 routing with IPSec SW cryptodev -| | wt=1 | rxq=1 | framesize=IMIX_v4_1 | min_rate=${50000} | search_type=PDR +| | framesize=IMIX_v4_1 | phy_cores=${1} | search_type=PDR | tc07-64B-2t2c-ethip4ipsecbasetnlsw-ip4base-int-cbc-sha1-ndrdisc -| | [Documentation] -| | ... | [Cfg] DUTs run 1 IPsec tunnel CBC-SHA1 in each direction, configured\ -| | ... | with 2 phy core, 1 receive queue per NIC port. -| | ... | [Ver] Find NDR for 64 Byte frames\ -| | ... | using binary search start at 40GE linerate, step 50kpps. -| | ... | | [Tags] | 64B | 2C | NDRDISC -| | ... -| | [Template] | Discover NDR or PDR for IPv4 routing with IPSec SW cryptodev -| | wt=2 | rxq=1 | framesize=${64} | min_rate=${50000} | search_type=NDR +| | framesize=${64} | phy_cores=${2} | search_type=NDR | tc08-64B-2t2c-ethip4ipsecbasetnlsw-ip4base-int-cbc-sha1-pdrdisc -| | [Documentation] -| | ... | [Cfg] DUTs run 1 IPsec tunnel CBC-SHA1 in each direction, configured\ -| | ... | with 2 phy core, 1 receive queue per NIC port. -| | ... | [Ver] Find PDR for 64 Byte frames using binary search start at 40GE\ -| | ... | linerate, step 50kpps and loss tolerance of 0.5%. -| | ... | | [Tags] | 64B | 2C | PDRDISC | SKIP_PATCH -| | ... -| | [Template] | Discover NDR or PDR for IPv4 routing with IPSec SW cryptodev -| | wt=2 | rxq=1 | framesize=${64} | min_rate=${50000} | search_type=PDR +| | framesize=${64} | phy_cores=${2} | search_type=PDR diff --git a/tests/vpp/perf/crypto/40ge2p1xl710-ethip4ipsecbasetnlsw-ip4base-tnl-aes-gcm-ndrpdrdisc.robot b/tests/vpp/perf/crypto/40ge2p1xl710-ethip4ipsecbasetnlsw-ip4base-tnl-aes-gcm-ndrpdrdisc.robot index 7276e2e959..74669e74c2 100644 --- a/tests/vpp/perf/crypto/40ge2p1xl710-ethip4ipsecbasetnlsw-ip4base-tnl-aes-gcm-ndrpdrdisc.robot +++ b/tests/vpp/perf/crypto/40ge2p1xl710-ethip4ipsecbasetnlsw-ip4base-tnl-aes-gcm-ndrpdrdisc.robot @@ -28,6 +28,8 @@ | Test Teardown | Tear down performance discovery test | ${min_rate}pps | ... | ${framesize} | ${traffic_profile} | ... +| Test Template | Local template +| ... | Documentation | *IPv4 IPsec tunnel mode performance test suite.* | ... | ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology @@ -74,16 +76,25 @@ | ${traffic_profile}= | trex-sl-3n-ethip4-ip4dst${n_tunnels} *** Keywords *** -| Discover NDR or PDR for IPv4 routing with IPSec SW cryptodev +| Local template | | [Documentation] -| | ... | [Cfg] DUT runs IPSec tunneling AES GCM config with ${wt} thread(s),\ -| | ... | ${wt} phy core(s), ${rxq} receive queue(s) per NIC port. -| | ... | [Ver] Measure NDR or PDR for ${framesize} by bisecting between\ -| | ... | ${min_rate} and computed max rate, using trial loss rate measurements. -| | ... -| | [Arguments] | ${wt} | ${rxq} | ${framesize} | ${min_rate} | ${search_type} +| | ... | [Cfg] DUT runs IPSec tunneling AES GCM config. +| | ... | Each DUT uses ${phy_cores} physical core(s) for worker threads. +| | ... | [Ver] Find ${search_type} for ${framesize}B frames using binary search\ +| | ... | start at linerate, step ${min_rate}pps. +| | ... +| | ... | *Arguments:* +| | ... | - framesize - Framesize in Bytes in integer or string (IMIX_v4_1). +| | ... | Type: integer, string +| | ... | - phy_cores - Number of physical cores. Type: integer +| | ... | - search_type - NDR or PDR. Type: string +| | ... | - rxq - Number of RX queues, default value: ${None}. Type: integer +| | ... | - min_rate - Min rate for binary search, default value: ${50000}. +| | ... | Type: integer +| | ... +| | [Arguments] | ${framesize} | ${phy_cores} | ${search_type} +| | ... | ${rxq}=${None} | ${min_rate}=${50000} | | ... -| | # Test Variables required for test teardown | | Set Test Variable | ${framesize} | | Set Test Variable | ${min_rate} | | ${get_framesize}= | Get Frame Size | ${framesize} @@ -97,11 +108,12 @@ | | ${encr_alg}= | Crypto Alg AES GCM 128 | | ${auth_alg}= | Integ Alg AES GCM 128 | | ... -| | Given Add '${wt}' worker threads and '${rxq}' rxqueues in 3-node single-link circular topology +| | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq} | | And Add PCI devices to all DUTs -| | And Add no multi seg to all DUTs +| | And Run Keyword If | ${get_framesize} + ${ipsec_overhead_gcm} < ${1522} +| | ... | Add no multi seg to all DUTs | | And Add DPDK SW cryptodev on DUTs in 3-node single-link circular topology -| | ... | aesni_gcm | ${${wt}} +| | ... | aesni_gcm | ${${phy_cores}} | | And Add DPDK dev default RXD to all DUTs | 2048 | | And Add DPDK dev default TXD to all DUTs | 2048 | | And Apply startup configuration on all VPP DUTs @@ -129,99 +141,33 @@ *** Test Cases *** | tc01-64B-1t1c-ethip4ipsecbasetnlsw-ip4base-tnl-aes-gcm-ndrdisc -| | [Documentation] -| | ... | [Cfg] DUTs run 1 IPsec tunnel AES GCM in each direction, configured\ -| | ... | with 1 phy core, 1 receive queue per NIC port. -| | ... | [Ver] Find NDR for 64 Byte frames\ -| | ... | using binary search start at 40GE linerate, step 50kpps. -| | ... | | [Tags] | 64B | 1C | NDRDISC -| | ... -| | [Template] | Discover NDR or PDR for IPv4 routing with IPSec SW cryptodev -| | wt=1 | rxq=1 | framesize=${64} | min_rate=${50000} | search_type=NDR +| | framesize=${64} | phy_cores=${1} | search_type=NDR | tc02-64B-1t1c-ethip4ipsecbasetnlsw-ip4base-tnl-aes-gcm-pdrdisc -| | [Documentation] -| | ... | [Cfg] DUTs run 1 IPsec tunnel AES GCM in each direction, configured\ -| | ... | with 1 phy core, 1 receive queue per NIC port. -| | ... | [Ver] Find PDR for 64 Byte frames using binary search start at 40GE\ -| | ... | linerate, step 50kpps and loss tolerance of 0.5%. -| | ... | | [Tags] | 64B | 1C | PDRDISC | SKIP_PATCH -| | ... -| | [Template] | Discover NDR or PDR for IPv4 routing with IPSec SW cryptodev -| | wt=1 | rxq=1 | framesize=${64} | min_rate=${50000} | search_type=PDR +| | framesize=${64} | phy_cores=${1} | search_type=PDR | tc03-1518B-1t1c-ethip4ipsecbasetnlsw-ip4base-tnl-aes-gcm-ndrdisc -| | [Documentation] -| | ... | [Cfg] DUTs run 1 IPsec tunnel AES GCM in each direction, configured\ -| | ... | with 1 phy core, 1 receive queue per NIC port. -| | ... | [Ver] Find NDR for 1518 Byte frames\ -| | ... | using binary search start at 40GE linerate, step 50kpps. -| | ... | | [Tags] | 1518B | 1C | NDRDISC -| | ... -| | [Template] | Discover NDR or PDR for IPv4 routing with IPSec SW cryptodev -| | wt=1 | rxq=1 | framesize=${1518} | min_rate=${50000} | search_type=NDR +| | framesize=${1518} | phy_cores=${1} | search_type=NDR | tc04-1518B-1t1c-ethip4ipsecbasetnlsw-ip4base-tnl-aes-gcm-pdrdisc -| | [Documentation] -| | ... | [Cfg] DUTs run 1 IPsec tunnel AES GCM in each direction, configured\ -| | ... | with 1 phy core, 1 receive queue per NIC port. -| | ... | [Ver] Find PDR for 1518 Byte frames using binary search start at 40GE\ -| | ... | linerate, step 50kpps and loss tolerance of 0.5%. -| | ... | | [Tags] | 1518B | 1C | PDRDISC | SKIP_PATCH -| | ... -| | [Template] | Discover NDR or PDR for IPv4 routing with IPSec SW cryptodev -| | wt=1 | rxq=1 | framesize=${1518} | min_rate=${50000} | search_type=PDR +| | framesize=${1518} | phy_cores=${1} | search_type=PDR | tc05-IMIX-1t1c-ethip4ipsecbasetnlsw-ip4base-tnl-aes-gcm-ndrdisc -| | [Documentation] -| | ... | [Cfg] DUTs run 1 IPsec tunnel AES GCM in each direction, configured\ -| | ... | with 1 phy core, 1 receive queue per NIC port. -| | ... | [Ver] Find NDR for IMIX_v4_1 frames\ -| | ... | using binary search start at 40GE linerate, step 50kpps. -| | ... | IMIX_v4_1 = (28x64B; 16x570B; 4x1518B) -| | ... | | [Tags] | IMIX | 1C | NDRDISC -| | ... -| | [Template] | Discover NDR or PDR for IPv4 routing with IPSec SW cryptodev -| | wt=1 | rxq=1 | framesize=IMIX_v4_1 | min_rate=${50000} | search_type=NDR +| | framesize=IMIX_v4_1 | phy_cores=${1} | search_type=NDR | tc06-IMIX-1t1c-ethip4ipsecbasetnlsw-ip4base-tnl-aes-gcm-pdrdisc -| | [Documentation] -| | ... | [Cfg] DUTs run 1 IPsec tunnel AES GCM in each direction, configured\ -| | ... | with 1 phy core, 1 receive queue per NIC port. -| | ... | [Ver] Find PDR for IMIX_v4_1 frames using binary search start at 40GE\ -| | ... | linerate, step 50kpps and loss tolerance of 0.5%. -| | ... | IMIX_v4_1 = (28x64B; 16x570B; 4x1518B) -| | ... | | [Tags] | IMIX | 1C | PDRDISC | SKIP_PATCH -| | ... -| | [Template] | Discover NDR or PDR for IPv4 routing with IPSec SW cryptodev -| | wt=1 | rxq=1 | framesize=IMIX_v4_1 | min_rate=${50000} | search_type=PDR +| | framesize=IMIX_v4_1 | phy_cores=${1} | search_type=PDR | tc07-64B-2t2c-ethip4ipsecbasetnlsw-ip4base-tnl-aes-gcm-ndrdisc -| | [Documentation] -| | ... | [Cfg] DUTs run 1 IPsec tunnel AES GCM in each direction, configured\ -| | ... | with 2 phy core, 1 receive queue per NIC port. -| | ... | [Ver] Find NDR for 64 Byte frames\ -| | ... | using binary search start at 40GE linerate, step 50kpps. -| | ... | | [Tags] | 64B | 2C | NDRDISC -| | ... -| | [Template] | Discover NDR or PDR for IPv4 routing with IPSec SW cryptodev -| | wt=2 | rxq=1 | framesize=${64} | min_rate=${50000} | search_type=NDR +| | framesize=${64} | phy_cores=${2} | search_type=NDR | tc08-64B-2t2c-ethip4ipsecbasetnlsw-ip4base-tnl-aes-gcm-pdrdisc -| | [Documentation] -| | ... | [Cfg] DUTs run 1 IPsec tunnel AES GCM in each direction, configured\ -| | ... | with 2 phy core, 1 receive queue per NIC port. -| | ... | [Ver] Find PDR for 64 Byte frames using binary search start at 40GE\ -| | ... | linerate, step 50kpps and loss tolerance of 0.5%. -| | ... | | [Tags] | 64B | 2C | PDRDISC | SKIP_PATCH -| | ... -| | [Template] | Discover NDR or PDR for IPv4 routing with IPSec SW cryptodev -| | wt=2 | rxq=1 | framesize=${64} | min_rate=${50000} | search_type=PDR +| | framesize=${64} | phy_cores=${2} | search_type=PDR diff --git a/tests/vpp/perf/crypto/40ge2p1xl710-ethip4ipsecbasetnlsw-ip4base-tnl-cbc-sha1-ndrpdrdisc.robot b/tests/vpp/perf/crypto/40ge2p1xl710-ethip4ipsecbasetnlsw-ip4base-tnl-cbc-sha1-ndrpdrdisc.robot index 2447fbf992..f8d695323f 100644 --- a/tests/vpp/perf/crypto/40ge2p1xl710-ethip4ipsecbasetnlsw-ip4base-tnl-cbc-sha1-ndrpdrdisc.robot +++ b/tests/vpp/perf/crypto/40ge2p1xl710-ethip4ipsecbasetnlsw-ip4base-tnl-cbc-sha1-ndrpdrdisc.robot @@ -28,6 +28,8 @@ | Test Teardown | Tear down performance discovery test | ${min_rate}pps | ... | ${framesize} | ${traffic_profile} | ... +| Test Template | Local template +| ... | Documentation | *IPv4 IPsec tunnel mode performance test suite.* | ... | ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology @@ -74,16 +76,25 @@ | ${traffic_profile}= | trex-sl-3n-ethip4-ip4dst${n_tunnels} *** Keywords *** -| Discover NDR or PDR for IPv4 routing with IPSec SW cryptodev +| Local template | | [Documentation] -| | ... | [Cfg] DUT runs IPSec tunneling CBC-SHA1 config with ${wt} thread(s),\ -| | ... | ${wt} phy core(s), ${rxq} receive queue(s) per NIC port. -| | ... | [Ver] Measure NDR or PDR for ${framesize} by bisecting between\ -| | ... | ${min_rate} and computed max rate, using trial loss rate measurements. -| | ... -| | [Arguments] | ${wt} | ${rxq} | ${framesize} | ${min_rate} | ${search_type} +| | ... | [Cfg] DUT runs IPSec tunneling CBC-SHA1 config. +| | ... | Each DUT uses ${phy_cores} physical core(s) for worker threads. +| | ... | [Ver] Find ${search_type} for ${framesize}B frames using binary search\ +| | ... | start at linerate, step ${min_rate}pps. +| | ... +| | ... | *Arguments:* +| | ... | - framesize - Framesize in Bytes in integer or string (IMIX_v4_1). +| | ... | Type: integer, string +| | ... | - phy_cores - Number of physical cores. Type: integer +| | ... | - search_type - NDR or PDR. Type: string +| | ... | - rxq - Number of RX queues, default value: ${None}. Type: integer +| | ... | - min_rate - Min rate for binary search, default value: ${50000}. +| | ... | Type: integer +| | ... +| | [Arguments] | ${phy_cores} | ${framesize} | ${search_type} +| | ... | ${rxq}=${None} | ${min_rate}=${50000} | | ... -| | # Test Variables required for test teardown | | Set Test Variable | ${framesize} | | Set Test Variable | ${min_rate} | | ${get_framesize}= | Get Frame Size | ${framesize} @@ -97,11 +108,12 @@ | | ${encr_alg}= | Crypto Alg AES CBC 128 | | ${auth_alg}= | Integ Alg SHA1 96 | | ... -| | Given Add '${wt}' worker threads and '${rxq}' rxqueues in 3-node single-link circular topology +| | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq} | | And Add PCI devices to all DUTs -| | And Add no multi seg to all DUTs +| | And Run Keyword If | ${get_framesize} + ${ipsec_overhead_gcm} < ${1522} +| | ... | Add no multi seg to all DUTs | | And Add DPDK SW cryptodev on DUTs in 3-node single-link circular topology -| | ... | aesni_mb | ${${wt}} +| | ... | aesni_mb | ${${phy_cores}} | | And Add DPDK dev default RXD to all DUTs | 2048 | | And Add DPDK dev default TXD to all DUTs | 2048 | | And Apply startup configuration on all VPP DUTs @@ -129,99 +141,33 @@ *** Test Cases *** | tc01-64B-1t1c-ethip4ipsecbasetnlsw-ip4base-tnl-cbc-sha1-ndrdisc -| | [Documentation] -| | ... | [Cfg] DUTs run 1 IPsec tunnel CBC-SHA1 in each direction, configured\ -| | ... | with 1 phy core, 1 receive queue per NIC port. -| | ... | [Ver] Find NDR for 64 Byte frames\ -| | ... | using binary search start at 40GE linerate, step 50kpps. -| | ... | | [Tags] | 64B | 1C | NDRDISC -| | ... -| | [Template] | Discover NDR or PDR for IPv4 routing with IPSec SW cryptodev -| | wt=1 | rxq=1 | framesize=${64} | min_rate=${50000} | search_type=NDR +| | phy_cores=${1} | framesize=${64} | search_type=NDR | tc02-64B-1t1c-ethip4ipsecbasetnlsw-ip4base-tnl-cbc-sha1-pdrdisc -| | [Documentation] -| | ... | [Cfg] DUTs run 1 IPsec tunnel CBC-SHA1 in each direction, configured\ -| | ... | with 1 phy core, 1 receive queue per NIC port. -| | ... | [Ver] Find PDR for 64 Byte frames using binary search start at 40GE\ -| | ... | linerate, step 50kpps and loss tolerance of 0.5%. -| | ... | | [Tags] | 64B | 1C | PDRDISC | SKIP_PATCH -| | ... -| | [Template] | Discover NDR or PDR for IPv4 routing with IPSec SW cryptodev -| | wt=1 | rxq=1 | framesize=${64} | min_rate=${50000} | search_type=PDR +| | phy_cores=${1} | framesize=${64} | search_type=PDR | tc03-1518B-1t1c-ethip4ipsecbasetnlsw-ip4base-tnl-cbc-sha1-ndrdisc -| | [Documentation] -| | ... | [Cfg] DUTs run 1 IPsec tunnel CBC-SHA1 in each direction, configured\ -| | ... | with 1 phy core, 1 receive queue per NIC port. -| | ... | [Ver] Find NDR for 1518 Byte frames\ -| | ... | using binary search start at 40GE linerate, step 50kpps. -| | ... | | [Tags] | 1518B | 1C | NDRDISC -| | ... -| | [Template] | Discover NDR or PDR for IPv4 routing with IPSec SW cryptodev -| | wt=1 | rxq=1 | framesize=${1518} | min_rate=${50000} | search_type=NDR +| | phy_cores=${1} | framesize=${1518} | search_type=NDR | tc04-1518B-1t1c-ethip4ipsecbasetnlsw-ip4base-tnl-cbc-sha1-pdrdisc -| | [Documentation] -| | ... | [Cfg] DUTs run 1 IPsec tunnel CBC-SHA1 in each direction, configured\ -| | ... | with 1 phy core, 1 receive queue per NIC port. -| | ... | [Ver] Find PDR for 1518 Byte frames using binary search start at 40GE\ -| | ... | linerate, step 50kpps and loss tolerance of 0.5%. -| | ... | | [Tags] | 1518B | 1C | PDRDISC | SKIP_PATCH -| | ... -| | [Template] | Discover NDR or PDR for IPv4 routing with IPSec SW cryptodev -| | wt=1 | rxq=1 | framesize=${1518} | min_rate=${50000} | search_type=PDR +| | phy_cores=${1} | framesize=${1518} | search_type=PDR | tc05-IMIX-1t1c-ethip4ipsecbasetnlsw-ip4base-tnl-cbc-sha1-ndrdisc -| | [Documentation] -| | ... | [Cfg] DUTs run 1 IPsec tunnel CBC-SHA1 in each direction, configured\ -| | ... | with 1 phy core, 1 receive queue per NIC port. -| | ... | [Ver] Find NDR for IMIX_v4_1 frames\ -| | ... | using binary search start at 40GE linerate, step 50kpps. -| | ... | IMIX_v4_1 = (28x64B; 16x570B; 4x1518B) -| | ... | | [Tags] | IMIX | 1C | NDRDISC -| | ... -| | [Template] | Discover NDR or PDR for IPv4 routing with IPSec SW cryptodev -| | wt=1 | rxq=1 | framesize=IMIX_v4_1 | min_rate=${50000} | search_type=NDR +| | phy_cores=${1} | framesize=IMIX_v4_1 | search_type=NDR | tc06-IMIX-1t1c-ethip4ipsecbasetnlsw-ip4base-tnl-cbc-sha1-pdrdisc -| | [Documentation] -| | ... | [Cfg] DUTs run 1 IPsec tunnel CBC-SHA1 in each direction, configured\ -| | ... | with 1 phy core, 1 receive queue per NIC port. -| | ... | [Ver] Find PDR for IMIX_v4_1 frames using binary search start at 40GE\ -| | ... | linerate, step 50kpps and loss tolerance of 0.5%. -| | ... | IMIX_v4_1 = (28x64B; 16x570B; 4x1518B) -| | ... | | [Tags] | IMIX | 1C | PDRDISC | SKIP_PATCH -| | ... -| | [Template] | Discover NDR or PDR for IPv4 routing with IPSec SW cryptodev -| | wt=1 | rxq=1 | framesize=IMIX_v4_1 | min_rate=${50000} | search_type=PDR +| | phy_cores=${1} | framesize=IMIX_v4_1 | search_type=PDR | tc07-64B-2t2c-ethip4ipsecbasetnlsw-ip4base-tnl-cbc-sha1-ndrdisc -| | [Documentation] -| | ... | [Cfg] DUTs run 1 IPsec tunnel CBC-SHA1 in each direction, configured\ -| | ... | with 2 phy core, 1 receive queue per NIC port. -| | ... | [Ver] Find NDR for 64 Byte frames\ -| | ... | using binary search start at 40GE linerate, step 50kpps. -| | ... | | [Tags] | 64B | 2C | NDRDISC -| | ... -| | [Template] | Discover NDR or PDR for IPv4 routing with IPSec SW cryptodev -| | wt=2 | rxq=1 | framesize=${64} | min_rate=${50000} | search_type=NDR +| | phy_cores=${2} | framesize=${64} | search_type=NDR | tc08-64B-2t2c-ethip4ipsecbasetnlsw-ip4base-tnl-cbc-sha1-pdrdisc -| | [Documentation] -| | ... | [Cfg] DUTs run 1 IPsec tunnel CBC-SHA1 in each direction, configured\ -| | ... | with 2 phy core, 1 receive queue per NIC port. -| | ... | [Ver] Find PDR for 64 Byte frames using binary search start at 40GE\ -| | ... | linerate, step 50kpps and loss tolerance of 0.5%. -| | ... | | [Tags] | 64B | 2C | PDRDISC | SKIP_PATCH -| | ... -| | [Template] | Discover NDR or PDR for IPv4 routing with IPSec SW cryptodev -| | wt=2 | rxq=1 | framesize=${64} | min_rate=${50000} | search_type=PDR +| | phy_cores=${2} | framesize=${64} | search_type=PDR diff --git a/tests/vpp/perf/crypto/40ge2p1xl710-ethip4ipsecscale1000tnl-ip4base-int-aes-gcm-mrr.robot b/tests/vpp/perf/crypto/40ge2p1xl710-ethip4ipsecscale1000tnl-ip4base-int-aes-gcm-mrr.robot index 9bdb1c586c..d671121c4a 100644 --- a/tests/vpp/perf/crypto/40ge2p1xl710-ethip4ipsecscale1000tnl-ip4base-int-aes-gcm-mrr.robot +++ b/tests/vpp/perf/crypto/40ge2p1xl710-ethip4ipsecscale1000tnl-ip4base-int-aes-gcm-mrr.robot @@ -23,8 +23,11 @@ | Suite Teardown | Tear down 3-node performance topology | ... | Test Setup | Set up performance test +| ... | Test Teardown | Tear down performance mrr test | ... +| Test Template | Local template +| ... | Documentation | *Raw results IPv4 IPsec tunnel mode performance test suite.* | ... | ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology @@ -66,16 +69,21 @@ | ${traffic_profile}= | trex-sl-3n-ethip4-ip4dst${n_tunnels} *** Keywords *** -| Check RR for IPv4 routing with IPSec HW cryptodev +| Local template | | [Documentation] -| | ... | [Cfg] DUT runs IPSec tunneling AES GCM config with ${wt} thread(s),\ -| | ... | ${wt} phy core(s), ${rxq} receive queue(s) per NIC port. -| | ... | [Ver] Measure MaxReceivedRate for ${framesize} frames using single\ +| | ... | [Cfg] DUT runs IPSec tunneling AES GCM config. +| | ... | Each DUT uses ${phy_cores} physical core(s) for worker threads. +| | ... | [Ver] Measure MaxReceivedRate for ${framesize}B frames using single\ | | ... | trial throughput test. | | ... -| | [Arguments] | ${framesize} | ${wt} | ${rxq} +| | ... | *Arguments:* +| | ... | - framesize - Framesize in Bytes in integer or string (IMIX_v4_1). +| | ... | Type: integer, string +| | ... | - phy_cores - Number of physical cores. Type: integer +| | ... | - rxq - Number of RX queues, default value: ${None}. Type: integer +| | ... +| | [Arguments] | ${framesize} | ${phy_cores} | ${rxq}=${None} | | ... -| | # Test Variables required for test teardown | | Set Test Variable | ${framesize} | | ${get_framesize}= | Get Frame Size | ${framesize} | | ${max_rate}= | Calculate pps | ${s_24.5G} @@ -85,11 +93,11 @@ | | ${encr_alg}= | Crypto Alg AES GCM 128 | | ${auth_alg}= | Integ Alg AES GCM 128 | | ... -| | Given Add '${wt}' worker threads and '${rxq}' rxqueues in 3-node single-link circular topology +| | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq} | | And Add PCI devices to all DUTs -| | And Run Keyword If | ${get_framesize} < ${1522} +| | And Run Keyword If | ${get_framesize} + ${ipsec_overhead} < ${1522} | | ... | Add no multi seg to all DUTs -| | And Add cryptodev to all DUTs | ${${wt}} +| | And Add cryptodev to all DUTs | ${${phy_cores}} | | And Add DPDK dev default RXD to all DUTs | 2048 | | And Add DPDK dev default TXD to all DUTs | 2048 | | And Apply startup configuration on all VPP DUTs @@ -105,106 +113,37 @@ *** Test Cases *** | tc01-64B-1t1c-ethip4ipsecscale1000tnl-ip4base-int-aes-gcm-mrr -| | [Documentation] -| | ... | [Cfg] DUTs run 1000 IPsec tunnels AES GCM in each direction,\ -| | ... | configured with 1 phy core, 1 receive queue per NIC port. -| | ... | [Ver] Measure MaxReceivedRate for 64B frames using single trial\ -| | ... | throughput test. | | [Tags] | 64B | 1C -| | ... -| | [Template] | Check RR for IPv4 routing with IPSec HW cryptodev -| | framesize=${64} | wt=1 | rxq=1 +| | framesize=${64} | phy_cores=${1} | tc02-1518B-1t1c-ethip4ipsecscale1000tnl-ip4base-int-aes-gcm-mrr -| | [Documentation] -| | ... | [Cfg] DUTs run 1000 IPsec tunnels AES GCM in each direction,\ -| | ... | configured with 1 phy core, 1 receive queue per NIC port. -| | ... | [Ver] Measure MaxReceivedRate for 1518B frames using single\ -| | ... | trial throughput test. | | [Tags] | 1518B | 1C -| | ... -| | [Template] | Check RR for IPv4 routing with IPSec HW cryptodev -| | framesize=${1518} | wt=1 | rxq=1 - -# TODO: Add check to make test fail if rx=0. -# TODO: Add 9000B test cases when they start passing. +| | framesize=${1518} | phy_cores=${1} | tc04-IMIX-1t1c-ethip4ipsecscale1000tnl-ip4base-int-aes-gcm-mrr -| | [Documentation] -| | ... | [Cfg] DUTs run 1000 IPsec tunnels AES GCM in each direction,\ -| | ... | configured with 1 phy core, 1 receive queue per NIC port. -| | ... | [Ver] Measure MaxReceivedRate for IMIX_v4_1 frames using single\ -| | ... | trial throughput test. -| | ... | IMIX_v4_1 = (28x64B; 16x570B; 4x1518B) | | [Tags] | IMIX | 1C -| | ... -| | [Template] | Check RR for IPv4 routing with IPSec HW cryptodev -| | framesize=IMIX_v4_1 | wt=1 | rxq=1 +| | framesize=IMIX_v4_1 | phy_cores=${1} | tc05-64B-2t2c-ethip4ipsecscale1000tnl-ip4base-int-aes-gcm-mrr -| | [Documentation] -| | ... | [Cfg] DUTs run 1000 IPsec tunnels AES GCM in each direction,\ -| | ... | configured with 2 phy cores, 1 receive queue per NIC port. -| | ... | [Ver] Measure MaxReceivedRate for 64B frames using single trial\ -| | ... | throughput test. | | [Tags] | 64B | 2C -| | ... -| | [Template] | Check RR for IPv4 routing with IPSec HW cryptodev -| | framesize=${64} | wt=2 | rxq=1 +| | framesize=${64} | phy_cores=${2} | tc06-1518B-2t2c-ethip4ipsecscale1000tnl-ip4base-int-aes-gcm-mrr -| | [Documentation] -| | ... | [Cfg] DUTs run 1000 IPsec tunnels AES GCM in each direction,\ -| | ... | configured with 2 phy cores, 1 receive queue per NIC port. -| | ... | [Ver] Measure MaxReceivedRate for 1518B frames using single\ -| | ... | trial throughput test. | | [Tags] | 1518B | 2C -| | ... -| | [Template] | Check RR for IPv4 routing with IPSec HW cryptodev -| | framesize=${1518} | wt=2 | rxq=1 +| | framesize=${1518} | phy_cores=${2} | tc08-IMIX-2t2c-ethip4ipsecscale1000tnl-ip4base-int-aes-gcm-mrr -| | [Documentation] -| | ... | [Cfg] DUTs run 1000 IPsec tunnels AES GCM in each direction,\ -| | ... | configured with 2 phy cores, 1 receive queue per NIC port. -| | ... | [Ver] Measure MaxReceivedRate for IMIX_v4_1 frames using single\ -| | ... | trial throughput test. -| | ... | IMIX_v4_1 = (28x64B; 16x570B; 4x1518B) | | [Tags] | IMIX | 2C -| | ... -| | [Template] | Check RR for IPv4 routing with IPSec HW cryptodev -| | framesize=IMIX_v4_1 | wt=2 | rxq=1 +| | framesize=IMIX_v4_1 | phy_cores=${2} | tc09-64B-4t4c-ethip4ipsecscale1000tnl-ip4base-int-aes-gcm-mrr -| | [Documentation] -| | ... | [Cfg] DUTs run 1000 IPsec tunnels AES GCM in each direction,\ -| | ... | configured with 4 phy cores, 2 receive queues per NIC port. -| | ... | [Ver] Measure MaxReceivedRate for 64B frames using single trial\ -| | ... | throughput test. | | [Tags] | 64B | 4C -| | ... -| | [Template] | Check RR for IPv4 routing with IPSec HW cryptodev -| | framesize=${64} | wt=4 | rxq=2 +| | framesize=${64} | phy_cores=${4} | tc10-1518B-4t4c-ethip4ipsecscale1000tnl-ip4base-int-aes-gcm-mrr -| | [Documentation] -| | ... | [Cfg] DUTs run 1000 IPsec tunnels AES GCM in each direction,\ -| | ... | configured with 4 phy cores, 2 receive queues per NIC port. -| | ... | [Ver] Measure MaxReceivedRate for 1518B frames using single\ -| | ... | trial throughput test. | | [Tags] | 1518B | 4C -| | ... -| | [Template] | Check RR for IPv4 routing with IPSec HW cryptodev -| | framesize=${1518} | wt=4 | rxq=2 +| | framesize=${1518} | phy_cores=${4} | tc12-IMIX-4t4c-ethip4ipsecscale1000tnl-ip4base-int-aes-gcm-mrr -| | [Documentation] -| | ... | [Cfg] DUTs run 1000 IPsec tunnels AES GCM in each direction,\ -| | ... | configured with 4 phy cores, 2 receive queues per NIC port. -| | ... | [Ver] Measure MaxReceivedRate for IMIX_v4_1 frames using single\ -| | ... | trial throughput test. -| | ... | IMIX_v4_1 = (28x64B; 16x570B; 4x1518B) | | [Tags] | IMIX | 4C -| | ... -| | [Template] | Check RR for IPv4 routing with IPSec HW cryptodev -| | framesize=IMIX_v4_1 | wt=4 | rxq=2 +| | framesize=IMIX_v4_1 | phy_cores=${4} diff --git a/tests/vpp/perf/crypto/40ge2p1xl710-ethip4ipsecscale1000tnl-ip4base-int-aes-gcm-ndrpdrdisc.robot b/tests/vpp/perf/crypto/40ge2p1xl710-ethip4ipsecscale1000tnl-ip4base-int-aes-gcm-ndrpdrdisc.robot index 5488e9bb11..e3455578e2 100644 --- a/tests/vpp/perf/crypto/40ge2p1xl710-ethip4ipsecscale1000tnl-ip4base-int-aes-gcm-ndrpdrdisc.robot +++ b/tests/vpp/perf/crypto/40ge2p1xl710-ethip4ipsecscale1000tnl-ip4base-int-aes-gcm-ndrpdrdisc.robot @@ -82,7 +82,6 @@ | | ... | | [Tags] | 64B | 1C | NDRDISC | | ... -| | # FIXME: Move repeated lines into a keyword. | | ${framesize}= | Set Variable | ${64} | | ${min_rate}= | Set Variable | ${50000} | | ${max_rate}= | Set Variable | ${s_18.75Mpps} @@ -91,7 +90,7 @@ | | ${threshold}= | Set Variable | ${min_rate} | | ${encr_alg}= | Crypto Alg AES GCM 128 | | ${auth_alg}= | Integ Alg AES GCM 128 -| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | Given Add worker threads and rxqueues to all DUTs | 1 | | And Add PCI devices to all DUTs | | And Add no multi seg to all DUTs | | And Add cryptodev to all DUTs | ${1} @@ -126,7 +125,7 @@ | | ${threshold}= | Set Variable | ${min_rate} | | ${encr_alg}= | Crypto Alg AES GCM 128 | | ${auth_alg}= | Integ Alg AES GCM 128 -| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | Given Add worker threads and rxqueues to all DUTs | 1 | | And Add PCI devices to all DUTs | | And Add no multi seg to all DUTs | | And Add cryptodev to all DUTs | ${1} @@ -163,7 +162,7 @@ | | ${threshold}= | Set Variable | ${min_rate} | | ${encr_alg}= | Crypto Alg AES GCM 128 | | ${auth_alg}= | Integ Alg AES GCM 128 -| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | Given Add worker threads and rxqueues to all DUTs | 1 | | And Add PCI devices to all DUTs | | And Add cryptodev to all DUTs | ${1} | | And Add DPDK dev default RXD to all DUTs | 2048 @@ -198,7 +197,7 @@ | | ${threshold}= | Set Variable | ${min_rate} | | ${encr_alg}= | Crypto Alg AES GCM 128 | | ${auth_alg}= | Integ Alg AES GCM 128 -| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | Given Add worker threads and rxqueues to all DUTs | 1 | | And Add PCI devices to all DUTs | | And Add cryptodev to all DUTs | ${1} | | And Add DPDK dev default RXD to all DUTs | 2048 @@ -236,7 +235,7 @@ | | ${threshold}= | Set Variable | ${min_rate} | | ${encr_alg}= | Crypto Alg AES GCM 128 | | ${auth_alg}= | Integ Alg AES GCM 128 -| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | Given Add worker threads and rxqueues to all DUTs | 1 | | And Add PCI devices to all DUTs | | And Add cryptodev to all DUTs | ${1} | | And Add DPDK dev default RXD to all DUTs | 2048 @@ -273,7 +272,7 @@ | | ${threshold}= | Set Variable | ${min_rate} | | ${encr_alg}= | Crypto Alg AES GCM 128 | | ${auth_alg}= | Integ Alg AES GCM 128 -| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | Given Add worker threads and rxqueues to all DUTs | 1 | | And Add PCI devices to all DUTs | | And Add cryptodev to all DUTs | ${1} | | And Add DPDK dev default RXD to all DUTs | 2048 @@ -308,7 +307,7 @@ | | ${threshold}= | Set Variable | ${min_rate} | | ${encr_alg}= | Crypto Alg AES GCM 128 | | ${auth_alg}= | Integ Alg AES GCM 128 -| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | Given Add worker threads and rxqueues to all DUTs | 2 | | And Add PCI devices to all DUTs | | And Add no multi seg to all DUTs | | And Add cryptodev to all DUTs | ${2} @@ -343,7 +342,7 @@ | | ${threshold}= | Set Variable | ${min_rate} | | ${encr_alg}= | Crypto Alg AES GCM 128 | | ${auth_alg}= | Integ Alg AES GCM 128 -| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | Given Add worker threads and rxqueues to all DUTs | 2 | | And Add PCI devices to all DUTs | | And Add no multi seg to all DUTs | | And Add cryptodev to all DUTs | ${2} diff --git a/tests/vpp/perf/crypto/40ge2p1xl710-ethip4ipsecscale1000tnl-ip4base-int-cbc-sha1-mrr.robot b/tests/vpp/perf/crypto/40ge2p1xl710-ethip4ipsecscale1000tnl-ip4base-int-cbc-sha1-mrr.robot index f68e27d66b..3561b9a96d 100644 --- a/tests/vpp/perf/crypto/40ge2p1xl710-ethip4ipsecscale1000tnl-ip4base-int-cbc-sha1-mrr.robot +++ b/tests/vpp/perf/crypto/40ge2p1xl710-ethip4ipsecscale1000tnl-ip4base-int-cbc-sha1-mrr.robot @@ -23,8 +23,11 @@ | Suite Teardown | Tear down 3-node performance topology | ... | Test Setup | Set up performance test +| ... | Test Teardown | Tear down performance mrr test | ... +| Test Template | Local template +| ... | Documentation | *Raw results IPv4 IPsec tunnel mode performance test suite.* | ... | ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology @@ -66,16 +69,21 @@ | ${traffic_profile}= | trex-sl-3n-ethip4-ip4dst${n_tunnels} *** Keywords *** -| Check RR for IPv4 routing with IPSec HW cryptodev +| Local template | | [Documentation] -| | ... | [Cfg] DUT runs IPSec tunneling CBC-SHA1 config with ${wt} thread(s),\ -| | ... | ${wt} phy core(s), ${rxq} receive queue(s) per NIC port. -| | ... | [Ver] Measure MaxReceivedRate for ${framesize} frames using single\ +| | ... | [Cfg] DUT runs IPSec tunneling CBC-SHA1 config. +| | ... | Each DUT uses ${phy_cores} physical core(s) for worker threads. +| | ... | [Ver] Measure MaxReceivedRate for ${framesize}B frames using single\ | | ... | trial throughput test. | | ... -| | [Arguments] | ${framesize} | ${wt} | ${rxq} +| | ... | *Arguments:* +| | ... | - framesize - Framesize in Bytes in integer or string (IMIX_v4_1). +| | ... | Type: integer, string +| | ... | - phy_cores - Number of physical cores. Type: integer +| | ... | - rxq - Number of RX queues, default value: ${None}. Type: integer +| | ... +| | [Arguments] | ${framesize} | ${phy_cores} | ${rxq}=${None} | | ... -| | # Test Variables required for test teardown | | Set Test Variable | ${framesize} | | ${get_framesize}= | Get Frame Size | ${framesize} | | ${max_rate}= | Calculate pps | ${s_24.5G} @@ -85,11 +93,11 @@ | | ${encr_alg}= | Crypto Alg AES CBC 128 | | ${auth_alg}= | Integ Alg SHA1 96 | | ... -| | Given Add '${wt}' worker threads and '${rxq}' rxqueues in 3-node single-link circular topology +| | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq} | | And Add PCI devices to all DUTs -| | And Run Keyword If | ${get_framesize} < ${1522} +| | And Run Keyword If | ${get_framesize} + ${ipsec_overhead} < ${1522} | | ... | Add no multi seg to all DUTs -| | And Add cryptodev to all DUTs | ${${wt}} +| | And Add cryptodev to all DUTs | ${${phy_cores}} | | And Add DPDK dev default RXD to all DUTs | 2048 | | And Add DPDK dev default TXD to all DUTs | 2048 | | And Apply startup configuration on all VPP DUTs @@ -105,106 +113,37 @@ *** Test Cases *** | tc01-64B-1t1c-ethip4ipsecscale1000tnl-ip4base-int-cbc-sha1-mrr -| | [Documentation] -| | ... | [Cfg] DUTs run 1000 IPsec tunnels CBC-SHA1 in each direction,\ -| | ... | configured with 1 phy core, 1 receive queue per NIC port. -| | ... | [Ver] Measure MaxReceivedRate for 64B frames using single trial\ -| | ... | throughput test. | | [Tags] | 64B | 1C -| | ... -| | [Template] | Check RR for IPv4 routing with IPSec HW cryptodev -| | framesize=${64} | wt=1 | rxq=1 +| | framesize=${64} | phy_cores=${1} | tc02-1518B-1t1c-ethip4ipsecscale1000tnl-ip4base-int-cbc-sha1-mrr -| | [Documentation] -| | ... | [Cfg] DUTs run 1000 IPsec tunnels CBC-SHA1 in each direction,\ -| | ... | configured with 1 phy core, 1 receive queue per NIC port. -| | ... | [Ver] Measure MaxReceivedRate for 1518B frames using single\ -| | ... | trial throughput test. | | [Tags] | 1518B | 1C -| | ... -| | [Template] | Check RR for IPv4 routing with IPSec HW cryptodev -| | framesize=${1518} | wt=1 | rxq=1 - -# TODO: Add check to make test fail if rx=0. -# TODO: Add 9000B test cases when they start passing. +| | framesize=${1518} | phy_cores=${1} | tc04-IMIX-1t1c-ethip4ipsecscale1000tnl-ip4base-int-cbc-sha1-mrr -| | [Documentation] -| | ... | [Cfg] DUTs run 1000 IPsec tunnels CBC-SHA1 in each direction,\ -| | ... | configured with 1 phy core, 1 receive queue per NIC port. -| | ... | [Ver] Measure MaxReceivedRate for IMIX_v4_1 frames using single\ -| | ... | trial throughput test. -| | ... | IMIX_v4_1 = (28x64B; 16x570B; 4x1518B) | | [Tags] | IMIX | 1C -| | ... -| | [Template] | Check RR for IPv4 routing with IPSec HW cryptodev -| | framesize=IMIX_v4_1 | wt=1 | rxq=1 +| | framesize=IMIX_v4_1 | phy_cores=${1} | tc05-64B-2t2c-ethip4ipsecscale1000tnl-ip4base-int-cbc-sha1-mrr -| | [Documentation] -| | ... | [Cfg] DUTs run 1000 IPsec tunnels CBC-SHA1 in each direction,\ -| | ... | configured with 2 phy cores, 1 receive queue per NIC port. -| | ... | [Ver] Measure MaxReceivedRate for 64B frames using single trial\ -| | ... | throughput test. | | [Tags] | 64B | 2C -| | ... -| | [Template] | Check RR for IPv4 routing with IPSec HW cryptodev -| | framesize=${64} | wt=2 | rxq=1 +| | framesize=${64} | phy_cores=${2} | tc06-1518B-2t2c-ethip4ipsecscale1000tnl-ip4base-int-cbc-sha1-mrr -| | [Documentation] -| | ... | [Cfg] DUTs run 1000 IPsec tunnels CBC-SHA1 in each direction,\ -| | ... | configured with 2 phy cores, 1 receive queue per NIC port. -| | ... | [Ver] Measure MaxReceivedRate for 1518B frames using single\ -| | ... | trial throughput test. | | [Tags] | 1518B | 2C -| | ... -| | [Template] | Check RR for IPv4 routing with IPSec HW cryptodev -| | framesize=${1518} | wt=2 | rxq=1 +| | framesize=${1518} | phy_cores=${2} | tc08-IMIX-2t2c-ethip4ipsecscale1000tnl-ip4base-int-cbc-sha1-mrr -| | [Documentation] -| | ... | [Cfg] DUTs run 1000 IPsec tunnels CBC-SHA1 in each direction,\ -| | ... | configured with 2 phy cores, 1 receive queue per NIC port. -| | ... | [Ver] Measure MaxReceivedRate for IMIX_v4_1 frames using single\ -| | ... | trial throughput test. -| | ... | IMIX_v4_1 = (28x64B; 16x570B; 4x1518B) | | [Tags] | IMIX | 2C -| | ... -| | [Template] | Check RR for IPv4 routing with IPSec HW cryptodev -| | framesize=IMIX_v4_1 | wt=2 | rxq=1 +| | framesize=IMIX_v4_1 | phy_cores=${2} | tc09-64B-4t4c-ethip4ipsecscale1000tnl-ip4base-int-cbc-sha1-mrr -| | [Documentation] -| | ... | [Cfg] DUTs run 1000 IPsec tunnels CBC-SHA1 in each direction,\ -| | ... | configured with 4 phy cores, 2 receive queues per NIC port. -| | ... | [Ver] Measure MaxReceivedRate for 64B frames using single trial\ -| | ... | throughput test. | | [Tags] | 64B | 4C -| | ... -| | [Template] | Check RR for IPv4 routing with IPSec HW cryptodev -| | framesize=${64} | wt=4 | rxq=2 +| | framesize=${64} | phy_cores=${4} | tc10-1518B-4t4c-ethip4ipsecscale1000tnl-ip4base-int-cbc-sha1-mrr -| | [Documentation] -| | ... | [Cfg] DUTs run 1000 IPsec tunnels CBC-SHA1 in each direction,\ -| | ... | configured with 4 phy cores, 2 receive queues per NIC port. -| | ... | [Ver] Measure MaxReceivedRate for 1518B frames using single\ -| | ... | trial throughput test. | | [Tags] | 1518B | 4C -| | ... -| | [Template] | Check RR for IPv4 routing with IPSec HW cryptodev -| | framesize=${1518} | wt=4 | rxq=2 +| | framesize=${1518} | phy_cores=${4} | tc12-IMIX-4t4c-ethip4ipsecscale1000tnl-ip4base-int-cbc-sha1-mrr -| | [Documentation] -| | ... | [Cfg] DUTs run 1000 IPsec tunnels CBC-SHA1 in each direction,\ -| | ... | configured with 4 phy cores, 2 receive queues per NIC port. -| | ... | [Ver] Measure MaxReceivedRate for IMIX_v4_1 frames using single\ -| | ... | trial throughput test. -| | ... | IMIX_v4_1 = (28x64B; 16x570B; 4x1518B) | | [Tags] | IMIX | 4C -| | ... -| | [Template] | Check RR for IPv4 routing with IPSec HW cryptodev -| | framesize=IMIX_v4_1 | wt=4 | rxq=2 +| | framesize=IMIX_v4_1 | phy_cores=${4} diff --git a/tests/vpp/perf/crypto/40ge2p1xl710-ethip4ipsecscale1000tnl-ip4base-int-cbc-sha1-ndrpdrdisc.robot b/tests/vpp/perf/crypto/40ge2p1xl710-ethip4ipsecscale1000tnl-ip4base-int-cbc-sha1-ndrpdrdisc.robot index 312c9c5e84..9a3048cd67 100644 --- a/tests/vpp/perf/crypto/40ge2p1xl710-ethip4ipsecscale1000tnl-ip4base-int-cbc-sha1-ndrpdrdisc.robot +++ b/tests/vpp/perf/crypto/40ge2p1xl710-ethip4ipsecscale1000tnl-ip4base-int-cbc-sha1-ndrpdrdisc.robot @@ -82,7 +82,6 @@ | | ... | | [Tags] | 64B | 1C | NDRDISC | | ... -| | # FIXME: Move repeated lines into a keyword. | | ${framesize}= | Set Variable | ${64} | | ${min_rate}= | Set Variable | ${50000} | | ${max_rate}= | Set Variable | ${s_18.75Mpps} @@ -91,7 +90,7 @@ | | ${threshold}= | Set Variable | ${min_rate} | | ${encr_alg}= | Crypto Alg AES CBC 128 | | ${auth_alg}= | Integ Alg SHA1 96 -| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | Given Add worker threads and rxqueues to all DUTs | 1 | | And Add PCI devices to all DUTs | | And Add no multi seg to all DUTs | | And Add cryptodev to all DUTs | ${1} @@ -126,7 +125,7 @@ | | ${threshold}= | Set Variable | ${min_rate} | | ${encr_alg}= | Crypto Alg AES CBC 128 | | ${auth_alg}= | Integ Alg SHA1 96 -| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | Given Add worker threads and rxqueues to all DUTs | 1 | | And Add PCI devices to all DUTs | | And Add no multi seg to all DUTs | | And Add cryptodev to all DUTs | ${1} @@ -162,7 +161,7 @@ | | ${threshold}= | Set Variable | ${min_rate} | | ${encr_alg}= | Crypto Alg AES CBC 128 | | ${auth_alg}= | Integ Alg SHA1 96 -| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | Given Add worker threads and rxqueues to all DUTs | 1 | | And Add PCI devices to all DUTs | | And Add cryptodev to all DUTs | ${1} | | And Add DPDK dev default RXD to all DUTs | 2048 @@ -196,7 +195,7 @@ | | ${threshold}= | Set Variable | ${min_rate} | | ${encr_alg}= | Crypto Alg AES CBC 128 | | ${auth_alg}= | Integ Alg SHA1 96 -| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | Given Add worker threads and rxqueues to all DUTs | 1 | | And Add PCI devices to all DUTs | | And Add cryptodev to all DUTs | ${1} | | And Add DPDK dev default RXD to all DUTs | 2048 @@ -233,7 +232,7 @@ | | ${threshold}= | Set Variable | ${min_rate} | | ${encr_alg}= | Crypto Alg AES CBC 128 | | ${auth_alg}= | Integ Alg SHA1 96 -| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | Given Add worker threads and rxqueues to all DUTs | 1 | | And Add PCI devices to all DUTs | | And Add cryptodev to all DUTs | ${1} | | And Add DPDK dev default RXD to all DUTs | 2048 @@ -269,7 +268,7 @@ | | ${threshold}= | Set Variable | ${min_rate} | | ${encr_alg}= | Crypto Alg AES CBC 128 | | ${auth_alg}= | Integ Alg SHA1 96 -| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | Given Add worker threads and rxqueues to all DUTs | 1 | | And Add PCI devices to all DUTs | | And Add cryptodev to all DUTs | ${1} | | And Add DPDK dev default RXD to all DUTs | 2048 @@ -304,7 +303,7 @@ | | ${threshold}= | Set Variable | ${min_rate} | | ${encr_alg}= | Crypto Alg AES CBC 128 | | ${auth_alg}= | Integ Alg SHA1 96 -| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | Given Add worker threads and rxqueues to all DUTs | 2 | | And Add PCI devices to all DUTs | | And Add no multi seg to all DUTs | | And Add cryptodev to all DUTs | ${2} @@ -339,7 +338,7 @@ | | ${threshold}= | Set Variable | ${min_rate} | | ${encr_alg}= | Crypto Alg AES CBC 128 | | ${auth_alg}= | Integ Alg SHA1 96 -| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | Given Add worker threads and rxqueues to all DUTs | 2 | | And Add PCI devices to all DUTs | | And Add no multi seg to all DUTs | | And Add cryptodev to all DUTs | ${2} diff --git a/tests/vpp/perf/crypto/40ge2p1xl710-ethip4ipsecscale1000tnl-ip4base-tnl-aes-gcm-ndrpdrdisc.robot b/tests/vpp/perf/crypto/40ge2p1xl710-ethip4ipsecscale1000tnl-ip4base-tnl-aes-gcm-ndrpdrdisc.robot index 473f85c39e..002228820f 100644 --- a/tests/vpp/perf/crypto/40ge2p1xl710-ethip4ipsecscale1000tnl-ip4base-tnl-aes-gcm-ndrpdrdisc.robot +++ b/tests/vpp/perf/crypto/40ge2p1xl710-ethip4ipsecscale1000tnl-ip4base-tnl-aes-gcm-ndrpdrdisc.robot @@ -82,7 +82,6 @@ | | ... | | [Tags] | 64B | 1C | NDRDISC | | ... -| | # FIXME: Move repeated lines into a keyword. | | ${framesize}= | Set Variable | ${64} | | ${min_rate}= | Set Variable | ${50000} | | ${max_rate}= | Set Variable | ${s_18.75Mpps} @@ -91,7 +90,7 @@ | | ${threshold}= | Set Variable | ${min_rate} | | ${encr_alg}= | Crypto Alg AES GCM 128 | | ${auth_alg}= | Integ Alg AES GCM 128 -| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | Given Add worker threads and rxqueues to all DUTs | 1 | | And Add PCI devices to all DUTs | | And Add no multi seg to all DUTs | | And Add cryptodev to all DUTs | ${1} @@ -131,7 +130,7 @@ | | ${threshold}= | Set Variable | ${min_rate} | | ${encr_alg}= | Crypto Alg AES GCM 128 | | ${auth_alg}= | Integ Alg AES GCM 128 -| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | Given Add worker threads and rxqueues to all DUTs | 1 | | And Add PCI devices to all DUTs | | And Add no multi seg to all DUTs | | And Add cryptodev to all DUTs | ${1} @@ -173,7 +172,7 @@ | | ${threshold}= | Set Variable | ${min_rate} | | ${encr_alg}= | Crypto Alg AES GCM 128 | | ${auth_alg}= | Integ Alg AES GCM 128 -| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | Given Add worker threads and rxqueues to all DUTs | 1 | | And Add PCI devices to all DUTs | | And Add cryptodev to all DUTs | ${1} | | And Add DPDK dev default RXD to all DUTs | 2048 @@ -213,7 +212,7 @@ | | ${threshold}= | Set Variable | ${min_rate} | | ${encr_alg}= | Crypto Alg AES GCM 128 | | ${auth_alg}= | Integ Alg AES GCM 128 -| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | Given Add worker threads and rxqueues to all DUTs | 1 | | And Add PCI devices to all DUTs | | And Add cryptodev to all DUTs | ${1} | | And Add DPDK dev default RXD to all DUTs | 2048 @@ -256,7 +255,7 @@ | | ${threshold}= | Set Variable | ${min_rate} | | ${encr_alg}= | Crypto Alg AES GCM 128 | | ${auth_alg}= | Integ Alg AES GCM 128 -| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | Given Add worker threads and rxqueues to all DUTs | 1 | | And Add PCI devices to all DUTs | | And Add cryptodev to all DUTs | ${1} | | And Add DPDK dev default RXD to all DUTs | 2048 @@ -298,7 +297,7 @@ | | ${threshold}= | Set Variable | ${min_rate} | | ${encr_alg}= | Crypto Alg AES GCM 128 | | ${auth_alg}= | Integ Alg AES GCM 128 -| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | Given Add worker threads and rxqueues to all DUTs | 1 | | And Add PCI devices to all DUTs | | And Add cryptodev to all DUTs | ${1} | | And Add DPDK dev default RXD to all DUTs | 2048 @@ -338,7 +337,7 @@ | | ${threshold}= | Set Variable | ${min_rate} | | ${encr_alg}= | Crypto Alg AES GCM 128 | | ${auth_alg}= | Integ Alg AES GCM 128 -| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | Given Add worker threads and rxqueues to all DUTs | 2 | | And Add PCI devices to all DUTs | | And Add no multi seg to all DUTs | | And Add cryptodev to all DUTs | ${2} @@ -378,7 +377,7 @@ | | ${threshold}= | Set Variable | ${min_rate} | | ${encr_alg}= | Crypto Alg AES GCM 128 | | ${auth_alg}= | Integ Alg AES GCM 128 -| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | Given Add worker threads and rxqueues to all DUTs | 2 | | And Add PCI devices to all DUTs | | And Add no multi seg to all DUTs | | And Add cryptodev to all DUTs | ${2} diff --git a/tests/vpp/perf/crypto/40ge2p1xl710-ethip4ipsecscale1000tnl-ip4base-tnl-cbc-sha1-ndrpdrdisc.robot b/tests/vpp/perf/crypto/40ge2p1xl710-ethip4ipsecscale1000tnl-ip4base-tnl-cbc-sha1-ndrpdrdisc.robot index 476bf83165..1cf1f866fb 100644 --- a/tests/vpp/perf/crypto/40ge2p1xl710-ethip4ipsecscale1000tnl-ip4base-tnl-cbc-sha1-ndrpdrdisc.robot +++ b/tests/vpp/perf/crypto/40ge2p1xl710-ethip4ipsecscale1000tnl-ip4base-tnl-cbc-sha1-ndrpdrdisc.robot @@ -82,7 +82,6 @@ | | ... | | [Tags] | 64B | 1C | NDRDISC | | ... -| | # FIXME: Move repeated lines into a keyword. | | ${framesize}= | Set Variable | ${64} | | ${min_rate}= | Set Variable | ${50000} | | ${max_rate}= | Set Variable | ${s_18.75Mpps} @@ -91,7 +90,7 @@ | | ${threshold}= | Set Variable | ${min_rate} | | ${encr_alg}= | Crypto Alg AES CBC 128 | | ${auth_alg}= | Integ Alg SHA1 96 -| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | Given Add worker threads and rxqueues to all DUTs | 1 | | And Add PCI devices to all DUTs | | And Add no multi seg to all DUTs | | And Add cryptodev to all DUTs | ${1} @@ -131,7 +130,7 @@ | | ${threshold}= | Set Variable | ${min_rate} | | ${encr_alg}= | Crypto Alg AES CBC 128 | | ${auth_alg}= | Integ Alg SHA1 96 -| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | Given Add worker threads and rxqueues to all DUTs | 1 | | And Add PCI devices to all DUTs | | And Add no multi seg to all DUTs | | And Add cryptodev to all DUTs | ${1} @@ -172,7 +171,7 @@ | | ${threshold}= | Set Variable | ${min_rate} | | ${encr_alg}= | Crypto Alg AES CBC 128 | | ${auth_alg}= | Integ Alg SHA1 96 -| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | Given Add worker threads and rxqueues to all DUTs | 1 | | And Add PCI devices to all DUTs | | And Add cryptodev to all DUTs | ${1} | | And Add DPDK dev default RXD to all DUTs | 2048 @@ -211,7 +210,7 @@ | | ${threshold}= | Set Variable | ${min_rate} | | ${encr_alg}= | Crypto Alg AES CBC 128 | | ${auth_alg}= | Integ Alg SHA1 96 -| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | Given Add worker threads and rxqueues to all DUTs | 1 | | And Add PCI devices to all DUTs | | And Add cryptodev to all DUTs | ${1} | | And Add DPDK dev default RXD to all DUTs | 2048 @@ -253,7 +252,7 @@ | | ${threshold}= | Set Variable | ${min_rate} | | ${encr_alg}= | Crypto Alg AES CBC 128 | | ${auth_alg}= | Integ Alg SHA1 96 -| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | Given Add worker threads and rxqueues to all DUTs | 1 | | And Add PCI devices to all DUTs | | And Add cryptodev to all DUTs | ${1} | | And Add DPDK dev default RXD to all DUTs | 2048 @@ -294,7 +293,7 @@ | | ${threshold}= | Set Variable | ${min_rate} | | ${encr_alg}= | Crypto Alg AES CBC 128 | | ${auth_alg}= | Integ Alg SHA1 96 -| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | Given Add worker threads and rxqueues to all DUTs | 1 | | And Add PCI devices to all DUTs | | And Add cryptodev to all DUTs | ${1} | | And Add DPDK dev default RXD to all DUTs | 2048 @@ -334,7 +333,7 @@ | | ${threshold}= | Set Variable | ${min_rate} | | ${encr_alg}= | Crypto Alg AES CBC 128 | | ${auth_alg}= | Integ Alg SHA1 96 -| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | Given Add worker threads and rxqueues to all DUTs | 2 | | And Add PCI devices to all DUTs | | And Add no multi seg to all DUTs | | And Add cryptodev to all DUTs | ${2} @@ -374,7 +373,7 @@ | | ${threshold}= | Set Variable | ${min_rate} | | ${encr_alg}= | Crypto Alg AES CBC 128 | | ${auth_alg}= | Integ Alg SHA1 96 -| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | Given Add worker threads and rxqueues to all DUTs | 2 | | And Add PCI devices to all DUTs | | And Add no multi seg to all DUTs | | And Add cryptodev to all DUTs | ${2} diff --git a/tests/vpp/perf/crypto/40ge2p1xl710-ethip4ipsectptlispgpe-ip4base-cbc-sha1-ndrpdrdisc.robot b/tests/vpp/perf/crypto/40ge2p1xl710-ethip4ipsectptlispgpe-ip4base-cbc-sha1-ndrpdrdisc.robot index e9c29350a5..5bb5fe3ba2 100644 --- a/tests/vpp/perf/crypto/40ge2p1xl710-ethip4ipsectptlispgpe-ip4base-cbc-sha1-ndrpdrdisc.robot +++ b/tests/vpp/perf/crypto/40ge2p1xl710-ethip4ipsectptlispgpe-ip4base-cbc-sha1-ndrpdrdisc.robot @@ -81,7 +81,6 @@ | | ... | | [Tags] | 64B | 1C | NDRDISC | | ... -| | # FIXME: Move repeated lines into a keyword. | | ${framesize}= | Set Variable | ${64} | | ${min_rate}= | Set Variable | ${50000} | | ${max_rate}= | Set Variable | ${s_18.75Mpps} @@ -90,7 +89,7 @@ | | ${threshold}= | Set Variable | ${min_rate} | | ${encr_alg}= | Crypto Alg AES CBC 128 | | ${auth_alg}= | Integ Alg SHA1 96 -| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | Given Add worker threads and rxqueues to all DUTs | 1 | | And Add PCI devices to all DUTs | | And Add no multi seg to all DUTs | | And Add cryptodev to all DUTs | ${1} @@ -122,7 +121,7 @@ | | ${threshold}= | Set Variable | ${min_rate} | | ${encr_alg}= | Crypto Alg AES CBC 128 | | ${auth_alg}= | Integ Alg SHA1 96 -| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | Given Add worker threads and rxqueues to all DUTs | 1 | | And Add PCI devices to all DUTs | | And Add no multi seg to all DUTs | | And Add cryptodev to all DUTs | ${1} @@ -155,7 +154,7 @@ | | ${threshold}= | Set Variable | ${min_rate} | | ${encr_alg}= | Crypto Alg AES CBC 128 | | ${auth_alg}= | Integ Alg SHA1 96 -| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | Given Add worker threads and rxqueues to all DUTs | 1 | | And Add PCI devices to all DUTs | | And Add cryptodev to all DUTs | ${1} | | And Add DPDK dev default RXD to all DUTs | 2048 @@ -186,7 +185,7 @@ | | ${threshold}= | Set Variable | ${min_rate} | | ${encr_alg}= | Crypto Alg AES CBC 128 | | ${auth_alg}= | Integ Alg SHA1 96 -| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | Given Add worker threads and rxqueues to all DUTs | 1 | | And Add PCI devices to all DUTs | | And Add cryptodev to all DUTs | ${1} | | And Add DPDK dev default RXD to all DUTs | 2048 @@ -219,7 +218,7 @@ | | ${threshold}= | Set Variable | ${min_rate} | | ${encr_alg}= | Crypto Alg AES CBC 128 | | ${auth_alg}= | Integ Alg SHA1 96 -| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | Given Add worker threads and rxqueues to all DUTs | 1 | | And Add PCI devices to all DUTs | | And Add cryptodev to all DUTs | ${1} | | And Add DPDK dev default RXD to all DUTs | 2048 @@ -251,7 +250,7 @@ | | ${threshold}= | Set Variable | ${min_rate} | | ${encr_alg}= | Crypto Alg AES CBC 128 | | ${auth_alg}= | Integ Alg SHA1 96 -| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | Given Add worker threads and rxqueues to all DUTs | 1 | | And Add PCI devices to all DUTs | | And Add cryptodev to all DUTs | ${1} | | And Add DPDK dev default RXD to all DUTs | 2048 @@ -283,7 +282,7 @@ | | ${threshold}= | Set Variable | ${min_rate} | | ${encr_alg}= | Crypto Alg AES CBC 128 | | ${auth_alg}= | Integ Alg SHA1 96 -| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | Given Add worker threads and rxqueues to all DUTs | 2 | | And Add PCI devices to all DUTs | | And Add no multi seg to all DUTs | | And Add cryptodev to all DUTs | ${2} @@ -315,7 +314,7 @@ | | ${threshold}= | Set Variable | ${min_rate} | | ${encr_alg}= | Crypto Alg AES CBC 128 | | ${auth_alg}= | Integ Alg SHA1 96 -| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | Given Add worker threads and rxqueues to all DUTs | 2 | | And Add PCI devices to all DUTs | | And Add no multi seg to all DUTs | | And Add cryptodev to all DUTs | ${2} @@ -348,7 +347,7 @@ | | ${threshold}= | Set Variable | ${min_rate} | | ${encr_alg}= | Crypto Alg AES CBC 128 | | ${auth_alg}= | Integ Alg SHA1 96 -| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology +| | Given Add worker threads and rxqueues to all DUTs | 4 | | And Add PCI devices to all DUTs | | And Add no multi seg to all DUTs | | And Add cryptodev to all DUTs | ${4} @@ -380,7 +379,7 @@ | | ${threshold}= | Set Variable | ${min_rate} | | ${encr_alg}= | Crypto Alg AES CBC 128 | | ${auth_alg}= | Integ Alg SHA1 96 -| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology +| | Given Add worker threads and rxqueues to all DUTs | 4 | | And Add PCI devices to all DUTs | | And Add no multi seg to all DUTs | | And Add cryptodev to all DUTs | ${4} |