X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=tests%2Fvpp%2Fperf%2Fvm_vhost%2F10ge2p1x520-dot1q-l2xcbase-eth-2vhostvr1024-1vm-mrr.robot;h=b63780c50388805b8f145f80ecc9f157cf8f02f0;hp=ea1deb9dfe37fd377e0339ba4d83249e2d920117;hb=cc85afad85339d2cc8f035ce63ff21220d8e6b96;hpb=fdf235ec30b409daef533c5258e2bfbe506c49f8

diff --git a/tests/vpp/perf/vm_vhost/10ge2p1x520-dot1q-l2xcbase-eth-2vhostvr1024-1vm-mrr.robot b/tests/vpp/perf/vm_vhost/10ge2p1x520-dot1q-l2xcbase-eth-2vhostvr1024-1vm-mrr.robot
index ea1deb9dfe..b63780c503 100644
--- a/tests/vpp/perf/vm_vhost/10ge2p1x520-dot1q-l2xcbase-eth-2vhostvr1024-1vm-mrr.robot
+++ b/tests/vpp/perf/vm_vhost/10ge2p1x520-dot1q-l2xcbase-eth-2vhostvr1024-1vm-mrr.robot
@@ -50,6 +50,7 @@
 | ... | addresses of the TG node interfaces.
 
 *** Variables ***
+| ${perf_qemu_qsz}= | 1024
 | ${subid}= | 10
 | ${tag_rewrite}= | pop-1
 # Socket names
@@ -58,7 +59,7 @@
 # X520-DA2 bandwidth limit
 | ${s_limit}= | ${10000000000}
 # Traffic profile:
-| ${traffic_profile} | trex-sl-3n-ethip4-ip4src254
+| ${traffic_profile}= | trex-sl-3n-ethip4-ip4src254
 
 *** Keywords ***
 | Check RR for dot1q-l2xcbase-eth-2vhostvr1024-1vm
@@ -78,9 +79,11 @@
 | | ${dut2_vm_refs}= | Create Dictionary
 | | Set Test Variable | ${dut1_vm_refs}
 | | Set Test Variable | ${dut2_vm_refs}
+| | ${jumbo_frames}= | Set Variable If | ${get_framesize} < ${1522}
+| | ... | ${False} | ${True}
 | | ...
 | | Given Add '${wt}' worker threads and '${rxq}' rxqueues in 3-node single-link circular topology
-| | And Add PCI devices to DUTs in 3-node single link topology
+| | And Add PCI devices to all DUTs
 | | And Run Keyword If | ${get_framesize} < ${1522}
 | | ... | Add no multi seg to all DUTs
 | | And Apply startup configuration on all VPP DUTs
@@ -88,12 +91,12 @@
 | | ... | ${sock1} | ${sock2} | ${subid} | ${tag_rewrite}
 | | ${vm1}= | And Configure guest VM with dpdk-testpmd connected via vhost-user
 | | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1
+| | ... | jumbo_frames=${jumbo_frames}
 | | Set To Dictionary | ${dut1_vm_refs} | DUT1_VM1 | ${vm1}
 | | ${vm2}= | And Configure guest VM with dpdk-testpmd connected via vhost-user
 | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
+| | ... | jumbo_frames=${jumbo_frames}
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
-| | Run Keyword Unless | ${qemu_built} | Set Suite Variable | ${qemu_built}
-| | ... | ${True}
 | | Then Traffic should pass with maximum rate | ${perf_trial_duration}
 | | ... | ${max_rate}pps | ${framesize} | ${traffic_profile}
 
@@ -102,7 +105,7 @@
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2XC switching config with 1 thread, 1 phy\
 | | ... | core, 1 receive queue per NIC port.
-| | ... | [Ver] Measure MaxReceivedRate for ${framesize} frames using single\
+| | ... | [Ver] Measure MaxReceivedRate for 64B frames using single\
 | | ... | trial throughput test.
 | | ...
 | | [Tags] | 64B | 1T1C | STHREAD
@@ -114,7 +117,7 @@
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2XC switching config with 1 thread, 1 phy\
 | | ... | core, 1 receive queue per NIC port.
-| | ... | [Ver] Measure MaxReceivedRate for ${framesize} frames using single\
+| | ... | [Ver] Measure MaxReceivedRate for 1518B frames using single\
 | | ... | trial throughput test.
 | | ...
 | | [Tags] | 1518B | 1T1C | STHREAD
@@ -122,23 +125,36 @@
 | | [Template] | Check RR for dot1q-l2xcbase-eth-2vhostvr1024-1vm
 | | framesize=${1518} | wt=1 | rxq=1
 
-| tc03-IMIX-1t1c-dot1q-l2xcbase-eth-2vhostvr1024-1vm-mrr
+| tc03-9000B-1t1c-dot1q-l2xcbase-eth-2vhostvr1024-1vm-mrr
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2XC switching config with 1 thread, 1 phy\
 | | ... | core, 1 receive queue per NIC port.
-| | ... | [Ver] Measure MaxReceivedRate for ${framesize} frames using single\
+| | ... | [Ver] Measure MaxReceivedRate for 9000B frames using single\
 | | ... | trial throughput test.
 | | ...
+| | [Tags] | 9000B | 1T1C | STHREAD
+| | ...
+| | [Template] | Check RR for dot1q-l2xcbase-eth-2vhostvr1024-1vm
+| | framesize=${9000} | wt=1 | rxq=1
+
+| tc04-IMIX-1t1c-dot1q-l2xcbase-eth-2vhostvr1024-1vm-mrr
+| | [Documentation]
+| | ... | [Cfg] DUT runs L2XC switching config with 1 thread, 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 | 1T1C | STHREAD
 | | ...
 | | [Template] | Check RR for dot1q-l2xcbase-eth-2vhostvr1024-1vm
 | | framesize=IMIX_v4_1 | wt=1 | rxq=1
 
-| tc04-64B-2t2c-dot1q-l2xcbase-eth-2vhostvr1024-1vm-mrr
+| tc05-64B-2t2c-dot1q-l2xcbase-eth-2vhostvr1024-1vm-mrr
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2XC switching config with 2 threads, 2 phy\
 | | ... | cores, 1 receive queue per NIC port.
-| | ... | [Ver] Measure MaxReceivedRate for ${framesize} frames using single\
+| | ... | [Ver] Measure MaxReceivedRate for 64B frames using single\
 | | ... | trial throughput test.
 | | ...
 | | [Tags] | 64B | 2T2C | MTHREAD
@@ -146,11 +162,11 @@
 | | [Template] | Check RR for dot1q-l2xcbase-eth-2vhostvr1024-1vm
 | | framesize=${64} | wt=2 | rxq=1
 
-| tc05-1518B-2t2c-dot1q-l2xcbase-eth-2vhostvr1024-1vm-mrr
+| tc06-1518B-2t2c-dot1q-l2xcbase-eth-2vhostvr1024-1vm-mrr
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2XC switching config with 2 threads, 2 phy\
 | | ... | cores, 1 receive queue per NIC port.
-| | ... | [Ver] Measure MaxReceivedRate for ${framesize} frames using single\
+| | ... | [Ver] Measure MaxReceivedRate for 1518B frames using single\
 | | ... | trial throughput test.
 | | ...
 | | [Tags] | 1518B | 2T2C | MTHREAD
@@ -158,23 +174,36 @@
 | | [Template] | Check RR for dot1q-l2xcbase-eth-2vhostvr1024-1vm
 | | framesize=${1518} | wt=2 | rxq=1
 
-| tc06-IMIX-2t2c-dot1q-l2xcbase-eth-2vhostvr1024-1vm-mrr
+| tc07-9000B-2t2c-dot1q-l2xcbase-eth-2vhostvr1024-1vm-mrr
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2XC switching config with 2 threads, 2 phy\
 | | ... | cores, 1 receive queue per NIC port.
-| | ... | [Ver] Measure MaxReceivedRate for ${framesize} frames using single\
+| | ... | [Ver] Measure MaxReceivedRate for 9000B frames using single\
 | | ... | trial throughput test.
 | | ...
+| | [Tags] | 9000B | 2T2C | MTHREAD
+| | ...
+| | [Template] | Check RR for dot1q-l2xcbase-eth-2vhostvr1024-1vm
+| | framesize=${9000} | wt=2 | rxq=1
+
+| tc08-IMIX-2t2c-dot1q-l2xcbase-eth-2vhostvr1024-1vm-mrr
+| | [Documentation]
+| | ... | [Cfg] DUT runs L2XC switching config with 2 threads, 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 | 2T2C | MTHREAD
 | | ...
 | | [Template] | Check RR for dot1q-l2xcbase-eth-2vhostvr1024-1vm
 | | framesize=IMIX_v4_1 | wt=2 | rxq=1
 
-| tc07-64B-4t4c-dot1q-l2xcbase-eth-2vhostvr1024-1vm-mrr
+| tc09-64B-4t4c-dot1q-l2xcbase-eth-2vhostvr1024-1vm-mrr
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2XC switching config with 4 threads, 4 phy\
 | | ... | cores, 2 receive queues per NIC port.
-| | ... | [Ver] Measure MaxReceivedRate for ${framesize} frames using single\
+| | ... | [Ver] Measure MaxReceivedRate for 64B frames using single\
 | | ... | trial throughput test.
 | | ...
 | | [Tags] | 64B | 4T4C | MTHREAD
@@ -182,11 +211,11 @@
 | | [Template] | Check RR for dot1q-l2xcbase-eth-2vhostvr1024-1vm
 | | framesize=${64} | wt=4 | rxq=2
 
-| tc08-1518B-4t4c-dot1q-l2xcbase-eth-2vhostvr1024-1vm-mrr
+| tc10-1518B-4t4c-dot1q-l2xcbase-eth-2vhostvr1024-1vm-mrr
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2XC switching config with 4 threads, 4 phy\
 | | ... | cores, 2 receive queues per NIC port.
-| | ... | [Ver] Measure MaxReceivedRate for ${framesize} frames using single\
+| | ... | [Ver] Measure MaxReceivedRate for 1518B frames using single\
 | | ... | trial throughput test.
 | | ...
 | | [Tags] | 1518B | 4T4C | MTHREAD
@@ -194,12 +223,25 @@
 | | [Template] | Check RR for dot1q-l2xcbase-eth-2vhostvr1024-1vm
 | | framesize=${1518} | wt=4 | rxq=2
 
-| tc09-IMIX-4t4c-dot1q-l2xcbase-eth-2vhostvr1024-1vm-mrr
+| tc11-9000B-4t4c-dot1q-l2xcbase-eth-2vhostvr1024-1vm-mrr
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2XC switching config with 4 threads, 4 phy\
 | | ... | cores, 2 receive queues per NIC port.
-| | ... | [Ver] Measure MaxReceivedRate for ${framesize} frames using single\
+| | ... | [Ver] Measure MaxReceivedRate for 9000B frames using single\
+| | ... | trial throughput test.
+| | ...
+| | [Tags] | 9000B | 4T4C | MTHREAD
+| | ...
+| | [Template] | Check RR for dot1q-l2xcbase-eth-2vhostvr1024-1vm
+| | framesize=${9000} | wt=4 | rxq=2
+
+| tc12-IMIX-4t4c-dot1q-l2xcbase-eth-2vhostvr1024-1vm-mrr
+| | [Documentation]
+| | ... | [Cfg] DUT runs L2XC switching config with 4 threads, 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 | 4T4C | MTHREAD
 | | ...