CSIT-1142 Change thread perf test TAGs

Due to automatization of SMT detection this change is suppose to
remove static thread/core tags in favor of dynamic one. Leaving the
static tags for number of physical cores to be able to select TCs.

Change-Id: I7f99f605821f363e45c333f46d1dea786693521b
Signed-off-by: Peter Mikus <pmikus@cisco.com>

15 files changed, 392 insertions, 392 deletions

diff --git a/tests/vpp/perf/container_memif/10ge2p1x520-eth-l2bdbasemaclrn-eth-2memif-1lxc-mrr.robot b/tests/vpp/perf/container_memif/10ge2p1x520-eth-l2bdbasemaclrn-eth-2memif-1lxc-mrr.robot
index 56bf177edc..e007ac09b2 100644
--- a/tests/vpp/perf/container_memif/10ge2p1x520-eth-l2bdbasemaclrn-eth-2memif-1lxc-mrr.robot
+++ b/tests/vpp/perf/container_memif/10ge2p1x520-eth-l2bdbasemaclrn-eth-2memif-1lxc-mrr.robot
@@ -93,135 +93,135 @@
 *** Test Cases ***
 | tc01-64B-1t1c-eth-l2bdbasemaclrn-eth-2memif-1lxc-mrr
 | | [Documentation]
-| | ... | [Cfg] DUT runs L2BD switching config with 1 thread, 1 phy core,\
+| | ... | [Cfg] DUT runs L2BD switching config with 1 phy core,\
 | | ... | 1 receive queue per NIC port.
 | | ... | [Ver] Measure MaxReceivedRate for 64B frames using single trial\
 | | ... | throughput test.
 | | ...
-| | [Tags] | 64B | 1T1C | STHREAD
+| | [Tags] | 64B | 1C
 | | [Template] | Check RR for l2bdbasemaclrn-eth-2memif-1lxc
 | | framesize=${64} | wt=1 | rxq=1
 
 | tc02-1518B-1t1c-eth-l2bdbasemaclrn-eth-2memif-1lxc-mrr
 | | [Documentation]
-| | ... | [Cfg] DUT runs L2BD switching config with 1 thread, 1 phy core,\
+| | ... | [Cfg] DUT runs L2BD switching config with 1 phy core,\
 | | ... | 1 receive queue per NIC port.
 | | ... | [Ver] Measure MaxReceivedRate for 1518B frames using single trial\
 | | ... | throughput test.
 | | ...
-| | [Tags] | 1518B | 1T1C | STHREAD
+| | [Tags] | 1518B | 1C
 | | [Template] | Check RR for l2bdbasemaclrn-eth-2memif-1lxc
 | | framesize=${1518} | wt=1 | rxq=1
 
 | tc03-9000B-1t1c-eth-l2bdbasemaclrn-eth-2memif-1lxc-mrr
 | | [Documentation]
-| | ... | [Cfg] DUT runs L2BD switching config with 1 thread, 1 phy core,\
+| | ... | [Cfg] DUT runs L2BD switching config with 1 phy core,\
 | | ... | 1 receive queue per NIC port.
 | | ... | [Ver] Measure MaxReceivedRate for 9000B frames using single trial\
 | | ... | throughput test.
 | | ...
-| | [Tags] | 9000B | 1T1C | STHREAD
+| | [Tags] | 9000B | 1C
 | | [Template] | Check RR for l2bdbasemaclrn-eth-2memif-1lxc
 | | framesize=${9000} | wt=1 | rxq=1
 
 | tc04-IMIX-1t1c-eth-l2bdbasemaclrn-eth-2memif-1lxc-mrr
 | | [Documentation]
-| | ... | [Cfg] DUT runs L2BD switching config with 1 thread, 1 phy core,\
+| | ... | [Cfg] DUT runs L2BD switching config 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 | 1T1C | STHREAD
+| | [Tags] | IMIX | 1C
 | | [Template] | Check RR for l2bdbasemaclrn-eth-2memif-1lxc
 | | framesize=IMIX_v4_1 | wt=1 | rxq=1
 
 | tc05-64B-2t2c-eth-l2bdbasemaclrn-eth-2memif-1lxc-mrr
 | | [Documentation]
-| | ... | [Cfg] DUT runs L2BD switching config with 2 threads, 2 phy cores,\
+| | ... | [Cfg] DUT runs L2BD switching config with 2 phy cores,\
 | | ... | 1 receive queue per NIC port.
 | | ... | [Ver] Measure MaxReceivedRate for 64B frames using single trial\
 | | ... | throughput test.
 | | ...
-| | [Tags] | 64B | 2T2C | MTHREAD
+| | [Tags] | 64B | 2C
 | | [Template] | Check RR for l2bdbasemaclrn-eth-2memif-1lxc
 | | framesize=${64} | wt=2 | rxq=1
 
 | tc06-1518B-2t2c-eth-l2bdbasemaclrn-eth-2memif-1lxc-mrr
 | | [Documentation]
-| | ... | [Cfg] DUT runs L2BD switching config with 2 threads, 1 phy cores,\
+| | ... | [Cfg] DUT runs L2BD switching config with 1 phy cores,\
 | | ... | 1 receive queue per NIC port.
 | | ... | [Ver] Measure MaxReceivedRate for 1518B frames using single trial\
 | | ... | throughput test.
 | | ...
-| | [Tags] | 1518B | 2T2C | MTHREAD
+| | [Tags] | 1518B | 2C
 | | [Template] | Check RR for l2bdbasemaclrn-eth-2memif-1lxc
 | | framesize=${1518} | wt=2 | rxq=1
 
 | tc07-9000B-2t2c-eth-l2bdbasemaclrn-eth-2memif-1lxc-mrr
 | | [Documentation]
-| | ... | [Cfg] DUT runs L2BD switching config with 2 threads, 1 phy cores,\
+| | ... | [Cfg] DUT runs L2BD switching config with 1 phy cores,\
 | | ... | 1 receive queue per NIC port.
 | | ... | [Ver] Measure MaxReceivedRate for 9000B frames using single trial\
 | | ... | throughput test.
 | | ...
-| | [Tags] | 9000B | 2T2C | MTHREAD
+| | [Tags] | 9000B | 2C
 | | [Template] | Check RR for l2bdbasemaclrn-eth-2memif-1lxc
 | | framesize=${9000} | wt=2 | rxq=1
 
 | tc08-IMIX-2t2c-eth-l2bdbasemaclrn-eth-2memif-1lxc-mrr
 | | [Documentation]
-| | ... | [Cfg] DUT runs L2BD switching config with 2 threads, 2 phy cores,\
+| | ... | [Cfg] DUT runs L2BD switching config 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 | 2T2C | MTHREAD
+| | [Tags] | IMIX | 2C
 | | [Template] | Check RR for l2bdbasemaclrn-eth-2memif-1lxc
 | | framesize=IMIX_v4_1 | wt=2 | rxq=1
 
 | tc09-64B-4t4c-eth-l2bdbasemaclrn-eth-2memif-1lxc-mrr
 | | [Documentation]
-| | ... | [Cfg] DUT runs L2BD switching config with 4 threads, 4 phy cores,\
+| | ... | [Cfg] DUT runs L2BD switching config with 4 phy cores,\
 | | ... | 2 receive queues per NIC port.
 | | ... | [Ver] Measure MaxReceivedRate for 64B frames using single trial\
 | | ... | throughput test.
 | | ...
-| | [Tags] | 64B | 4t4c | MTHREAD
+| | [Tags] | 64B | 4C
 | | [Template] | Check RR for l2bdbasemaclrn-eth-2memif-1lxc
 | | framesize=${64} | wt=4 | rxq=2
 
 | tc10-1518B-4t4c-eth-l2bdbasemaclrn-eth-2memif-1lxc-mrr
 | | [Documentation]
-| | ... | [Cfg] DUT runs L2BD switching config with 4 threads, 4 phy cores,\
+| | ... | [Cfg] DUT runs L2BD switching config with 4 phy cores,\
 | | ... | 2 receive queues per NIC port.
 | | ... | [Ver] Measure MaxReceivedRate for 1518B frames using single trial\
 | | ... | throughput test.
 | | ...
-| | [Tags] | 1518B | 4t4c | MTHREAD
+| | [Tags] | 1518B | 4C
 | | [Template] | Check RR for l2bdbasemaclrn-eth-2memif-1lxc
 | | framesize=${1518} | wt=4 | rxq=2
 
 | tc11-9000B-4t4c-eth-l2bdbasemaclrn-eth-2memif-1lxc-mrr
 | | [Documentation]
-| | ... | [Cfg] DUT runs L2BD switching config with 4 threads, 4 phy cores,\
+| | ... | [Cfg] DUT runs L2BD switching config with 4 phy cores,\
 | | ... | 2 receive queues per NIC port.
 | | ... | [Ver] Measure MaxReceivedRate for 9000B frames using single trial\
 | | ... | throughput test.
 | | ...
-| | [Tags] | 9000B | 4t4c | MTHREAD
+| | [Tags] | 9000B | 4C
 | | [Template] | Check RR for l2bdbasemaclrn-eth-2memif-1lxc
 | | framesize=${9000} | wt=4 | rxq=2
 
 | tc12-IMIX-4t4c-eth-l2bdbasemaclrn-eth-2memif-1lxc-mrr
 | | [Documentation]
-| | ... | [Cfg] DUT runs L2BD switching config with 4 threads, 4 phy cores,\
+| | ... | [Cfg] DUT runs L2BD switching config 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 | 4t4c | MTHREAD
+| | [Tags] | IMIX | 4C
 | | [Template] | Check RR for l2bdbasemaclrn-eth-2memif-1lxc
 | | framesize=IMIX_v4_1 | wt=4 | rxq=2
diff --git a/tests/vpp/perf/container_memif/10ge2p1x520-eth-l2bdbasemaclrn-eth-2memif-1lxc-ndrpdrdisc.robot b/tests/vpp/perf/container_memif/10ge2p1x520-eth-l2bdbasemaclrn-eth-2memif-1lxc-ndrpdrdisc.robot
index 5b556d1217..f7488d5679 100644
--- a/tests/vpp/perf/container_memif/10ge2p1x520-eth-l2bdbasemaclrn-eth-2memif-1lxc-ndrpdrdisc.robot
+++ b/tests/vpp/perf/container_memif/10ge2p1x520-eth-l2bdbasemaclrn-eth-2memif-1lxc-ndrpdrdisc.robot
@@ -103,136 +103,136 @@
 *** Test Cases ***
 | tc01-64B-1t1c-eth-l2bdbasemaclrn-eth-2memif-1lxc-ndrdisc
 | | [Documentation]
-| | ... | [Cfg] DUT runs L2BD switching config with 1 thread, 1 phy core,\
+| | ... | [Cfg] DUT runs L2BD switching config with 1 phy core,\
 | | ... | 1 receive queue per NIC port.
 | | ... | [Ver] Find NDR for 64 Byte frames using binary search start at 10GE\
 | | ... | linerate, step 50kpps.
 | | ...
-| | [Tags] | 64B | 1T1C | STHREAD | NDRDISC
+| | [Tags] | 64B | 1C | NDRDISC
 | | [Template] | Discover NDR or PDR for L2 Bridge Domain with Memif
 | | framesize=${64} | min_rate=${50000} | wt=1 | rxq=1 | search_type=NDR
 
 | tc02-64B-1t1c-eth-l2bdbasemaclrn-eth-2memif-1lxc-pdrdisc
 | | [Documentation]
-| | ... | [Cfg] DUT runs L2BD switching config with 1 thread, 1 phy core,\
+| | ... | [Cfg] DUT runs L2BD switching config with 1 phy core,\
 | | ... | 1 receive queue per NIC port.
 | | ... | [Ver] Find PDR for 64 Byte frames using binary search start at 10GE\
 | | ... | linerate, step 50kpps, LT=0.5%.
 | | ...
-| | [Tags] | 64B | 1T1C | STHREAD | PDRDISC
+| | [Tags] | 64B | 1C | PDRDISC
 | | [Template] | Discover NDR or PDR for L2 Bridge Domain with Memif
 | | framesize=${64} | min_rate=${50000} | wt=1 | rxq=1 | search_type=PDR
 
 | tc03-IMIX-1t1c-eth-l2bdbasemaclrn-eth-2memif-1lxc-ndrdisc
 | | [Documentation]
-| | ... | [Cfg] DUT runs L2BD switching config with 1 thread, 1 phy core,\
+| | ... | [Cfg] DUT runs L2BD switching config with 1 phy core,\
 | | ... | 1 receive queue per NIC port.
 | | ... | [Ver] Find NDR for IMIX_v4_1 frames using binary search start at 10GE\
 | | ... | linerate, step 50kpps.
 | | ... | IMIX_v4_1 = (28x64B;16x570B;4x1518B)
 | | ...
-| | [Tags] | IMIX | 1T1C | STHREAD | NDRDISC
+| | [Tags] | IMIX | 1C | NDRDISC
 | | [Template] | Discover NDR or PDR for L2 Bridge Domain with Memif
 | | framesize=IMIX_v4_1 | min_rate=${50000} | wt=1 | rxq=1 | search_type=NDR
 
 | tc04-IMIX-1t1c-eth-l2bdbasemaclrn-eth-2memif-1lxc-pdrdisc
 | | [Documentation]
-| | ... | [Cfg] DUT runs L2BD switching config with 1 thread, 1 phy core,\
+| | ... | [Cfg] DUT runs L2BD switching config with 1 phy core,\
 | | ... | 1 receive queue per NIC port.
 | | ... | [Ver] Find PDR for IMIX_v4_1 frames using binary search start at 10GE\
 | | ... | linerate, step 50kpps, LT=0.5%.
 | | ... | IMIX_v4_1 = (28x64B;16x570B;4x1518B)
 | | ...
-| | [Tags] | IMIX | 1T1C | STHREAD | PDRDISC
+| | [Tags] | IMIX | 1C | PDRDISC
 | | [Template] | Discover NDR or PDR for L2 Bridge Domain with Memif
 | | framesize=IMIX_v4_1 | min_rate=${50000} | wt=1 | rxq=1 | search_type=PDR
 
 | tc05-1518B-1t1c-eth-l2bdbasemaclrn-eth-2memif-1lxc-ndrdisc
 | | [Documentation]
-| | ... | [Cfg] DUT runs L2BD switching config with 1 thread, 1 phy core,\
+| | ... | [Cfg] DUT runs L2BD switching config with 1 phy core,\
 | | ... | 1 receive queue per NIC port.
 | | ... | [Ver] Find NDR for 1518 Byte frames using binary search start at 10GE\
 | | ... | linerate, step 50kpps.
 | | ...
-| | [Tags] | 1518B | 1T1C | STHREAD | NDRDISC
+| | [Tags] | 1518B | 1C | NDRDISC
 | | [Template] | Discover NDR or PDR for L2 Bridge Domain with Memif
 | | framesize=${1518} | min_rate=${50000} | wt=1 | rxq=1 | search_type=NDR
 
 | tc06-1518B-1t1c-eth-l2bdbasemaclrn-eth-2memif-1lxc-pdrdisc
 | | [Documentation]
-| | ... | [Cfg] DUT runs L2BD switching config with 1 thread, 1 phy core,\
+| | ... | [Cfg] DUT runs L2BD switching config with 1 phy core,\
 | | ... | 1 receive queue per NIC port.
 | | ... | [Ver] Find PDR for 1518 Byte frames using binary search start at 10GE\
 | | ... | linerate, step 50kpps, LT=0.5%.
 | | ...
-| | [Tags] | 1518B | 1T1C | STHREAD | PDRDISC
+| | [Tags] | 1518B | 1C | PDRDISC
 | | [Template] | Discover NDR or PDR for L2 Bridge Domain with Memif
 | | framesize=${1518} | min_rate=${50000} | wt=1 | rxq=1 | search_type=PDR
 
 | tc07-64B-2t2c-eth-l2bdbasemaclrn-eth-2memif-1lxc-ndrdisc
 | | [Documentation]
-| | ... | [Cfg] DUT runs L2BD switching config with 2 thread, 2 phy core,\
+| | ... | [Cfg] DUT runs L2BD switching config with 2 phy core,\
 | | ... | 1 receive queue per NIC port.
 | | ... | [Ver] Find NDR for 64 Byte frames using binary search start at 10GE\
 | | ... | linerate, step 50kpps.
 | | ...
-| | [Tags] | 64B | 2T2C | MTHREAD | NDRDISC
+| | [Tags] | 64B | 2C | NDRDISC
 | | [Template] | Discover NDR or PDR for L2 Bridge Domain with Memif
 | | framesize=${64} | min_rate=${50000} | wt=2 | rxq=1 | search_type=NDR
 
 | tc08-64B-2t2c-eth-l2bdbasemaclrn-eth-2memif-1lxc-pdrdisc
 | | [Documentation]
-| | ... | [Cfg] DUT runs L2BD switching config with 2 thread, 2 phy core,\
+| | ... | [Cfg] DUT runs L2BD switching config with 2 phy core,\
 | | ... | 1 receive queue per NIC port.
 | | ... | [Ver] Find PDR for 64 Byte frames using binary search start at 10GE\
 | | ... | linerate, step 50kpps, LT=0.5%.
 | | ...
-| | [Tags] | 64B | 2T2C | MTHREAD | PDRDISC
+| | [Tags] | 64B | 2C | PDRDISC
 | | [Template] | Discover NDR or PDR for L2 Bridge Domain with Memif
 | | framesize=${64} | min_rate=${50000} | wt=2 | rxq=1 | search_type=PDR
 
 | tc09-IMIX-2t2c-eth-l2bdbasemaclrn-eth-2memif-1lxc-ndrdisc
 | | [Documentation]
-| | ... | [Cfg] DUT runs L2BD switching config with 2 thread, 2 phy core,\
+| | ... | [Cfg] DUT runs L2BD switching config with 2 phy core,\
 | | ... | 1 receive queue per NIC port.
 | | ... | [Ver] Find NDR for IMIX_v4_1 frames using binary search start at 10GE\
 | | ... | linerate, step 50kpps.
 | | ... | IMIX_v4_1 = (28x64B;16x570B;4x1518B)
 | | ...
-| | [Tags] | IMIX | 2T2C | MTHREAD | NDRDISC
+| | [Tags] | IMIX | 2C | NDRDISC
 | | [Template] | Discover NDR or PDR for L2 Bridge Domain with Memif
 | | framesize=IMIX_v4_1 | min_rate=${50000} | wt=2 | rxq=1 | search_type=NDR
 
 | tc10-IMIX-2t2c-eth-l2bdbasemaclrn-eth-2memif-1lxc-pdrdisc
 | | [Documentation]
-| | ... | [Cfg] DUT runs L2BD switching config with 2 thread, 1 phy core,\
+| | ... | [Cfg] DUT runs L2BD switching config with 1 phy core,\
 | | ... | 1 receive queue per NIC port.
 | | ... | [Ver] Find PDR for IMIX_v4_1 frames using binary search start at 10GE\
 | | ... | linerate, step 50kpps, LT=0.5%.
 | | ... | IMIX_v4_1 = (28x64B;16x570B;4x1518B)
 | | ...
-| | [Tags] | IMIX | 2T2C | MTHREAD | PDRDISC
+| | [Tags] | IMIX | 2C | PDRDISC
 | | [Template] | Discover NDR or PDR for L2 Bridge Domain with Memif
 | | framesize=IMIX_v4_1 | min_rate=${50000} | wt=2 | rxq=1 | search_type=PDR
 
 | tc11-1518B-2t2c-eth-l2bdbasemaclrn-eth-2memif-1lxc-ndrdisc
 | | [Documentation]
-| | ... | [Cfg] DUT runs L2BD switching config with 2 thread, 1 phy core,\
+| | ... | [Cfg] DUT runs L2BD switching config with 1 phy core,\
 | | ... | 1 receive queue per NIC port.
 | | ... | [Ver] Find NDR for 1518 Byte frames using binary search start at 10GE\
 | | ... | linerate, step 50kpps.
 | | ...
-| | [Tags] | 1518B | 2T2C | MTHREAD | NDRDISC
+| | [Tags] | 1518B | 2C | NDRDISC
 | | [Template] | Discover NDR or PDR for L2 Bridge Domain with Memif
 | | framesize=${1518} | min_rate=${50000} | wt=2 | rxq=1 | search_type=NDR
 
 | tc12-1518B-2t2c-eth-l2bdbasemaclrn-eth-2memif-1lxc-pdrdisc
 | | [Documentation]
-| | ... | [Cfg] DUT runs L2BD switching config with 2 thread, 1 phy core,\
+| | ... | [Cfg] DUT runs L2BD switching config with 1 phy core,\
 | | ... | 1 receive queue per NIC port.
 | | ... | [Ver] Find PDR for 1518 Byte frames using binary search start at 10GE\
 | | ... | linerate, step 50kpps, LT=0.5%.
 | | ...
-| | [Tags] | 1518B | 2T2C | MTHREAD | PDRDISC
+| | [Tags] | 1518B | 2C | PDRDISC
 | | [Template] | Discover NDR or PDR for L2 Bridge Domain with Memif
 | | framesize=${1518} | min_rate=${50000} | wt=2 | rxq=1 | search_type=PDR
diff --git a/tests/vpp/perf/container_memif/10ge2p1x520-eth-l2xcbase-eth-1memif-1dcr-mrr.robot b/tests/vpp/perf/container_memif/10ge2p1x520-eth-l2xcbase-eth-1memif-1dcr-mrr.robot
index 9377cbff5d..d0c70f0c6d 100644
--- a/tests/vpp/perf/container_memif/10ge2p1x520-eth-l2xcbase-eth-1memif-1dcr-mrr.robot
+++ b/tests/vpp/perf/container_memif/10ge2p1x520-eth-l2xcbase-eth-1memif-1dcr-mrr.robot
@@ -98,123 +98,123 @@
 *** Test Cases ***

 | tc01-64B-1t1c-eth-l2xcbase-eth-1memif-1dcr-mrr

 | | [Documentation]

-| | ... | [Cfg] DUT runs L2XC switching config with 1 thread, 1 phy core,\

+| | ... | [Cfg] DUT runs L2XC switching config with 1 phy core,\

 | | ... | 1 receive queue per NIC port.

 | | ... | [Ver] Measure MaxReceivedRate for 64B frames using single trial\

 | | ... | throughput test.

 | | ...

-| | [Tags] | 64B | 1T1C | STHREAD | THIS

+| | [Tags] | 64B | 1C | THIS

 | | framesize=${64} | wt=1 | rxq=1

 

 | tc02-1518B-1t1c-eth-l2xcbase-eth-1memif-1dcr-mrr

 | | [Documentation]

-| | ... | [Cfg] DUT runs L2XC switching config with 1 thread, 1 phy core,\

+| | ... | [Cfg] DUT runs L2XC switching config with 1 phy core,\

 | | ... | 1 receive queue per NIC port.

 | | ... | [Ver] Measure MaxReceivedRate for 1518B frames using single trial\

 | | ... | throughput test.

 | | ...

-| | [Tags] | 1518B | 1T1C | STHREAD

+| | [Tags] | 1518B | 1C

 | | framesize=${1518} | wt=1 | rxq=1

 

 | tc03-9000B-1t1c-eth-l2xcbase-eth-1memif-1dcr-mrr

 | | [Documentation]

-| | ... | [Cfg] DUT runs L2XC switching config with 1 thread, 1 phy core,\

+| | ... | [Cfg] DUT runs L2XC switching config with 1 phy core,\

 | | ... | 1 receive queue per NIC port.

 | | ... | [Ver] Measure MaxReceivedRate for 9000B frames using single trial\

 | | ... | throughput test.

 | | ...

-| | [Tags] | 9000B | 1T1C | STHREAD

+| | [Tags] | 9000B | 1C

 | | framesize=${9000} | wt=1 | rxq=1

 

 | tc04-IMIX-1t1c-eth-l2xcbase-eth-1memif-1dcr-mrr

 | | [Documentation]

-| | ... | [Cfg] DUT runs L2XC switching config with 1 thread, 1 phy core,\

+| | ... | [Cfg] DUT runs L2XC switching config 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 | 1T1C | STHREAD

+| | [Tags] | IMIX | 1C

 | | framesize=IMIX_v4_1 | wt=1 | rxq=1

 

 | tc05-64B-2t2c-eth-l2xcbase-eth-1memif-1dcr-mrr

 | | [Documentation]

-| | ... | [Cfg] DUT runs L2XC switching config with 2 threads, 2 phy cores,\

+| | ... | [Cfg] DUT runs L2XC switching config with 2 phy cores,\

 | | ... | 1 receive queue per NIC port.

 | | ... | [Ver] Measure MaxReceivedRate for 64B frames using single trial\

 | | ... | throughput test.

 | | ...

-| | [Tags] | 64B | 2T2C | MTHREAD

+| | [Tags] | 64B | 2C

 | | framesize=${64} | wt=2 | rxq=1

 

 | tc06-1518B-2t2c-eth-l2xcbase-eth-1memif-1dcr-mrr

 | | [Documentation]

-| | ... | [Cfg] DUT runs L2XC switching config with 2 threads, 1 phy cores,\

+| | ... | [Cfg] DUT runs L2XC switching config with 1 phy cores,\

 | | ... | 1 receive queue per NIC port.

 | | ... | [Ver] Measure MaxReceivedRate for 1518B frames using single trial\

 | | ... | throughput test.

 | | ...

-| | [Tags] | 1518B | 2T2C | MTHREAD

+| | [Tags] | 1518B | 2C

 | | framesize=${1518} | wt=2 | rxq=1

 

 | tc07-9000B-2t2c-eth-l2xcbase-eth-1memif-1dcr-mrr

 | | [Documentation]

-| | ... | [Cfg] DUT runs L2XC switching config with 2 threads, 1 phy cores,\

+| | ... | [Cfg] DUT runs L2XC switching config with 1 phy cores,\

 | | ... | 1 receive queue per NIC port.

 | | ... | [Ver] Measure MaxReceivedRate for 9000B frames using single trial\

 | | ... | throughput test.

 | | ...

-| | [Tags] | 9000B | 2T2C | MTHREAD

+| | [Tags] | 9000B | 2C

 | | framesize=${9000} | wt=2 | rxq=1

 

 | tc08-IMIX-2t2c-eth-l2xcbase-eth-1memif-1dcr-mrr

 | | [Documentation]

-| | ... | [Cfg] DUT runs L2XC switching config with 2 threads, 2 phy cores,\

+| | ... | [Cfg] DUT runs L2XC switching config 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 | 2T2C | MTHREAD

+| | [Tags] | IMIX | 2C

 | | framesize=IMIX_v4_1 | wt=2 | rxq=1

 

 | tc09-64B-4t4c-eth-l2xcbase-eth-1memif-1dcr-mrr

 | | [Documentation]

-| | ... | [Cfg] DUT runs L2XC switching config with 4 threads, 4 phy cores,\

+| | ... | [Cfg] DUT runs L2XC switching config with 4 phy cores,\

 | | ... | 2 receive queues per NIC port.

 | | ... | [Ver] Measure MaxReceivedRate for 64B frames using single trial\

 | | ... | throughput test.

 | | ...

-| | [Tags] | 64B | 4T4C | MTHREAD

+| | [Tags] | 64B | 4C

 | | framesize=${64} | wt=4 | rxq=2

 

 | tc10-1518B-4t4c-eth-l2xcbase-eth-1memif-1dcr-mrr

 | | [Documentation]

-| | ... | [Cfg] DUT runs L2XC switching config with 4 threads, 4 phy cores,\

+| | ... | [Cfg] DUT runs L2XC switching config with 4 phy cores,\

 | | ... | 2 receive queues per NIC port.

 | | ... | [Ver] Measure MaxReceivedRate for 1518B frames using single trial\

 | | ... | throughput test.

 | | ...

-| | [Tags] | 1518B | 4T4C | MTHREAD

+| | [Tags] | 1518B | 4C

 | | framesize=${1518} | wt=4 | rxq=2

 

 | tc11-9000B-4t4c-eth-l2xcbase-eth-1memif-1dcr-mrr

 | | [Documentation]

-| | ... | [Cfg] DUT runs L2XC switching config with 4 threads, 4 phy cores,\

+| | ... | [Cfg] DUT runs L2XC switching config with 4 phy cores,\

 | | ... | 2 receive queues per NIC port.

 | | ... | [Ver] Measure MaxReceivedRate for 9000B frames using single trial\

 | | ... | throughput test.

 | | ...

-| | [Tags] | 9000B | 4T4C | MTHREAD

+| | [Tags] | 9000B | 4C

 | | framesize=${9000} | wt=4 | rxq=2

 

 | tc12-IMIX-4t4c-eth-l2xcbase-eth-1memif-1dcr-mrr

 | | [Documentation]

-| | ... | [Cfg] DUT runs L2XC switching config with 4 threads, 4 phy cores,\

+| | ... | [Cfg] DUT runs L2XC switching config 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 | 4T4C | MTHREAD

+| | [Tags] | IMIX | 4C

 | | framesize=IMIX_v4_1 | wt=4 | rxq=2

diff --git a/tests/vpp/perf/container_memif/10ge2p1x520-eth-l2xcbase-eth-1memif-1dcr-ndrpdrdisc.robot b/tests/vpp/perf/container_memif/10ge2p1x520-eth-l2xcbase-eth-1memif-1dcr-ndrpdrdisc.robot
index c2ac8e4839..6fab3c9397 100644
--- a/tests/vpp/perf/container_memif/10ge2p1x520-eth-l2xcbase-eth-1memif-1dcr-ndrpdrdisc.robot
+++ b/tests/vpp/perf/container_memif/10ge2p1x520-eth-l2xcbase-eth-1memif-1dcr-ndrpdrdisc.robot
@@ -116,166 +116,166 @@
 *** Test Cases ***

 | tc01-64B-1t1c-eth-l2xcbase-eth-1memif-1dcr-ndrdisc

 | | [Documentation]

-| | ... | [Cfg] DUT runs L2XC switching config with 1 thread, 1 phy core,\

+| | ... | [Cfg] DUT runs L2XC switching config with 1 phy core,\

 | | ... | 1 receive queue per NIC port.

 | | ... | [Ver] Find NDR for 64 Byte frames using binary search start at 10GE\

 | | ... | linerate, step 50kpps.

 | | ...

-| | [Tags] | 64B | 1T1C | STHREAD | NDRDISC

+| | [Tags] | 64B | 1C | NDRDISC

 | | framesize=${64} | wt=1 | rxq=1 | search_type=NDR

 

 | tc02-64B-1t1c-eth-l2xcbase-eth-1memif-1dcr-pdrdisc

 | | [Documentation]

-| | ... | [Cfg] DUT runs L2XC switching config with 1 thread, 1 phy core,\

+| | ... | [Cfg] DUT runs L2XC switching config with 1 phy core,\

 | | ... | 1 receive queue per NIC port.

 | | ... | [Ver] Find PDR for 64 Byte frames using binary search start at 10GE\

 | | ... | linerate, step 50kpps, LT=0.5%.

 | | ...

-| | [Tags] | 64B | 1T1C | STHREAD | PDRDISC

+| | [Tags] | 64B | 1C | PDRDISC

 | | framesize=${64} | wt=1 | rxq=1 | search_type=PDR

 

 | tc03-1518B-1t1c-eth-l2xcbase-eth-1memif-1dcr-ndrdisc

 | | [Documentation]

-| | ... | [Cfg] DUT runs L2XC switching config with 1 thread, 1 phy core,\

+| | ... | [Cfg] DUT runs L2XC switching config with 1 phy core,\

 | | ... | 1 receive queue per NIC port.

 | | ... | [Ver] Find NDR for 1518 Byte frames using binary search start at 10GE\

 | | ... | linerate, step 50kpps.

 | | ...

-| | [Tags] | 1518B | 1T1C | STHREAD | NDRDISC

+| | [Tags] | 1518B | 1C | NDRDISC

 | | framesize=${1518} | wt=1 | rxq=1 | search_type=NDR

 

 | tc04-1518B-1t1c-eth-l2xcbase-eth-1memif-1dcr-pdrdisc

 | | [Documentation]

-| | ... | [Cfg] DUT runs L2XC switching config with 1 thread, 1 phy core,\

+| | ... | [Cfg] DUT runs L2XC switching config with 1 phy core,\

 | | ... | 1 receive queue per NIC port.

 | | ... | [Ver] Find PDR for 1518 Byte frames using binary search start at 10GE\

 | | ... | linerate, step 50kpps, LT=0.5%.

 | | ...

-| | [Tags] | 1518B | 1T1C | STHREAD | PDRDISC

+| | [Tags] | 1518B | 1C | PDRDISC

 | | framesize=${1518} | wt=1 | rxq=1 | search_type=PDR

 

 | tc05-9000B-1t1c-eth-l2xcbase-eth-1memif-1dcr-ndrdisc

 | | [Documentation]

-| | ... | [Cfg] DUT runs L2XC switching config with 1 thread, 1 phy core,\

+| | ... | [Cfg] DUT runs L2XC switching config with 1 phy core,\

 | | ... | 1 receive queue per NIC port.

 | | ... | [Ver] Find NDR for 9000 Byte frames using binary search start at 10GE\

 | | ... | linerate, step 50kpps.

 | | ...

-| | [Tags] | 9000B | 1T1C | STHREAD | NDRDISC

+| | [Tags] | 9000B | 1C | NDRDISC

 | | framesize=${9000} | wt=1 | rxq=1 | search_type=NDR

 

 | tc06-9000B-1t1c-eth-l2xcbase-eth-1memif-1dcr-pdrdisc

 | | [Documentation]

-| | ... | [Cfg] DUT runs L2XC switching config with 1 thread, 1 phy core,\

+| | ... | [Cfg] DUT runs L2XC switching config with 1 phy core,\

 | | ... | 1 receive queue per NIC port.

 | | ... | [Ver] Find PDR for 9000 Byte frames using binary search start at 10GE\

 | | ... | linerate, step 50kpps, LT=0.5%.

 | | ...

-| | [Tags] | 9000B | 1T1C | STHREAD | PDRDISC

+| | [Tags] | 9000B | 1C | PDRDISC

 | | framesize=${9000} | wt=1 | rxq=1 | search_type=PDR

 

 | tc07-IMIX-1t1c-eth-l2xcbase-eth-1memif-1dcr-ndrdisc

 | | [Documentation]

-| | ... | [Cfg] DUT runs L2XC switching config with 1 thread, 1 phy core,\

+| | ... | [Cfg] DUT runs L2XC switching config with 1 phy core,\

 | | ... | 1 receive queue per NIC port.

 | | ... | [Ver] Find NDR for IMIX_v4_1 frames using binary search start at 10GE\

 | | ... | linerate, step 50kpps.

 | | ... | IMIX_v4_1 = (28x64B;16x570B;4x1518B)

 | | ...

-| | [Tags] | IMIX | 1T1C | STHREAD | NDRDISC

+| | [Tags] | IMIX | 1C | NDRDISC

 | | framesize=IMIX_v4_1 | wt=1 | rxq=1 | search_type=NDR

 

 | tc08-IMIX-1t1c-eth-l2xcbase-eth-1memif-1dcr-pdrdisc

 | | [Documentation]

-| | ... | [Cfg] DUT runs L2XC switching config with 1 thread, 1 phy core,\

+| | ... | [Cfg] DUT runs L2XC switching config with 1 phy core,\

 | | ... | 1 receive queue per NIC port.

 | | ... | [Ver] Find PDR for IMIX_v4_1 frames using binary search start at 10GE\

 | | ... | linerate, step 50kpps, LT=0.5%.

 | | ... | IMIX_v4_1 = (28x64B;16x570B;4x1518B)

 | | ...

-| | [Tags] | IMIX | 1T1C | STHREAD | PDRDISC

+| | [Tags] | IMIX | 1C | PDRDISC

 | | framesize=IMIX_v4_1 | wt=1 | rxq=1 | search_type=PDR

 

 | tc09-64B-2t2c-eth-l2xcbase-eth-1memif-1dcr-ndrdisc

 | | [Documentation]

-| | ... | [Cfg] DUT runs L2XC switching config with 2 thread, 2 phy core,\

+| | ... | [Cfg] DUT runs L2XC switching config with 2 phy core,\

 | | ... | 1 receive queue per NIC port.

 | | ... | [Ver] Find NDR for 64 Byte frames using binary search start at 10GE\

 | | ... | linerate, step 50kpps.

 | | ...

-| | [Tags] | 64B | 2T2C | MTHREAD | NDRDISC

+| | [Tags] | 64B | 2C | NDRDISC

 | | framesize=${64} | wt=2 | rxq=1 | search_type=NDR

 

 | tc10-64B-2t2c-eth-l2xcbase-eth-1memif-1dcr-pdrdisc

 | | [Documentation]

-| | ... | [Cfg] DUT runs L2XC switching config with 2 thread, 2 phy core,\

+| | ... | [Cfg] DUT runs L2XC switching config with 2 phy core,\

 | | ... | 1 receive queue per NIC port.

 | | ... | [Ver] Find PDR for 64 Byte frames using binary search start at 10GE\

 | | ... | linerate, step 50kpps, LT=0.5%.

 | | ...

-| | [Tags] | 64B | 1T1C | MTHREAD | PDRDISC

+| | [Tags] | 64B | 1C | PDRDISC

 | | framesize=${64} | wt=2 | rxq=1 | search_type=PDR

 

 | tc11-1518B-2t2c-eth-l2xcbase-eth-1memif-1dcr-ndrdisc

 | | [Documentation]

-| | ... | [Cfg] DUT runs L2XC switching config with 2 thread, 2 phy core,\

+| | ... | [Cfg] DUT runs L2XC switching config with 2 phy core,\

 | | ... | 1 receive queue per NIC port.

 | | ... | [Ver] Find NDR for 1518 Byte frames using binary search start at 10GE\

 | | ... | linerate, step 50kpps.

 | | ...

-| | [Tags] | 1518B | 2T2C | MTHREAD | NDRDISC

+| | [Tags] | 1518B | 2C | NDRDISC

 | | framesize=${1518} | wt=2 | rxq=1 | search_type=NDR

 

 | tc12-1518B-2t2c-eth-l2xcbase-eth-1memif-1dcr-pdrdisc

 | | [Documentation]

-| | ... | [Cfg] DUT runs L2XC switching config with 2 thread, 2 phy core,\

+| | ... | [Cfg] DUT runs L2XC switching config with 2 phy core,\

 | | ... | 1 receive queue per NIC port.

 | | ... | [Ver] Find PDR for 1518 Byte frames using binary search start at 10GE\

 | | ... | linerate, step 50kpps, LT=0.5%.

 | | ...

-| | [Tags] | 1518B | 2T2C | MTHREAD | PDRDISC

+| | [Tags] | 1518B | 2C | PDRDISC

 | | framesize=${1518} | wt=2 | rxq=1 | search_type=PDR

 

 | tc13-9000B-2t2c-eth-l2xcbase-eth-1memif-1dcr-ndrdisc

 | | [Documentation]

-| | ... | [Cfg] DUT runs L2XC switching config with 2 thread, 2 phy core,\

+| | ... | [Cfg] DUT runs L2XC switching config with 2 phy core,\

 | | ... | 1 receive queue per NIC port.

 | | ... | [Ver] Find NDR for 9000 Byte frames using binary search start at 10GE\

 | | ... | linerate, step 50kpps.

 | | ...

-| | [Tags] | 9000B | 2T2C | MTHREAD | NDRDISC

+| | [Tags] | 9000B | 2C | NDRDISC

 | | framesize=${9000} | wt=2 | rxq=1 | search_type=NDR

 

 | tc14-9000B-2t2c-eth-l2xcbase-eth-1memif-1dcr-pdrdisc

 | | [Documentation]

-| | ... | [Cfg] DUT runs L2XC switching config with 2 thread, 2 phy core,\

+| | ... | [Cfg] DUT runs L2XC switching config with 2 phy core,\

 | | ... | 1 receive queue per NIC port.

 | | ... | [Ver] Find PDR for 9000 Byte frames using binary search start at 10GE\

 | | ... | linerate, step 50kpps, LT=0.5%.

 | | ...

-| | [Tags] | 9000B | 2T2C | MTHREAD | PDRDISC

+| | [Tags] | 9000B | 2C | PDRDISC

 | | framesize=${9000} | wt=2 | rxq=1 | search_type=PDR

 

 | tc15-IMIX-2t2c-eth-l2xcbase-eth-1memif-1dcr-ndrdisc

 | | [Documentation]

-| | ... | [Cfg] DUT runs L2XC switching config with 2 thread, 2 phy core,\

+| | ... | [Cfg] DUT runs L2XC switching config with 2 phy core,\

 | | ... | 1 receive queue per NIC port.

 | | ... | [Ver] Find NDR for IMIX_v4_1 frames using binary search start at 10GE\

 | | ... | linerate, step 50kpps.

 | | ... | IMIX_v4_1 = (28x64B;16x570B;4x1518B)

 | | ...

-| | [Tags] | IMIX | 2T2C | MTHREAD | NDRDISC

+| | [Tags] | IMIX | 2C | NDRDISC

 | | framesize=IMIX_v4_1 | wt=2 | rxq=1 | search_type=NDR

 

 | tc16-IMIX-2t2c-eth-l2xcbase-eth-1memif-1dcr-pdrdisc

 | | [Documentation]

-| | ... | [Cfg] DUT runs L2XC switching config with 2 thread, 2 phy core,\

+| | ... | [Cfg] DUT runs L2XC switching config with 2 phy core,\

 | | ... | 1 receive queue per NIC port.

 | | ... | [Ver] Find PDR for IMIX_v4_1 frames using binary search start at 10GE\

 | | ... | linerate, step 50kpps, LT=0.5%.

 | | ... | IMIX_v4_1 = (28x64B;16x570B;4x1518B)

 | | ...

-| | [Tags] | IMIX | 2T2C | MTHREAD | PDRDISC

+| | [Tags] | IMIX | 2C | PDRDISC

 | | framesize=IMIX_v4_1 | wt=2 | rxq=1 | search_type=PDR

 

 | tc17-64B-4t4c-eth-l2xcbase-eth-1memif-1dcr-ndrdisc

@@ -285,7 +285,7 @@
 | | ... | [Ver] Find NDR for 64 Byte frames using binary search start at 10GE\

 | | ... | linerate, step 50kpps.

 | | ...

-| | [Tags] | 64B | 4T4C | MTHREAD | NDRDISC

+| | [Tags] | 64B | 4C | NDRDISC

 | | framesize=${64} |  wt=4 | rxq=2 | search_type=NDR

 

 | tc18-64B-4t4c-eth-l2xcbase-eth-1memif-1dcr-pdrdisc

@@ -295,7 +295,7 @@
 | | ... | [Ver] Find PDR for 64 Byte frames using binary search start at 10GE\

 | | ... | linerate, step 50kpps, LT=0.5%.

 | | ...

-| | [Tags] | 64B | 4T4C | MTHREAD | PDRDISC

+| | [Tags] | 64B | 4C | PDRDISC

 | | framesize=${64} |  wt=4 | rxq=2 | search_type=PDR

 

 | tc19-1518B-4t4c-eth-l2xcbase-eth-1memif-1dcr-ndrdisc

@@ -305,7 +305,7 @@
 | | ... | [Ver] Find NDR for 1518 Byte frames using binary search start at 10GE\

 | | ... | linerate, step 50kpps.

 | | ...

-| | [Tags] | 1518B | 4T4C | MTHREAD | NDRDISC

+| | [Tags] | 1518B | 4C | NDRDISC

 | | framesize=${1518} |  wt=4 | rxq=2| search_type=NDR

 

 | tc20-1518B-4t4c-eth-l2xcbase-eth-1memif-1dcr-pdrdisc

@@ -315,7 +315,7 @@
 | | ... | [Ver] Find PDR for 1518 Byte frames using binary search start at 10GE\

 | | ... | linerate, step 50kpps, LT=0.5%.

 | | ...

-| | [Tags] | 1518B | 4T4C | MTHREAD | PDRDISC

+| | [Tags] | 1518B | 4C | PDRDISC

 | | framesize=${1518} |  wt=4 | rxq=2 | search_type=PDR

 

 | tc21-9000B-4t4c-eth-l2xcbase-eth-1memif-1dcr-ndrdisc

@@ -325,7 +325,7 @@
 | | ... | [Ver] Find NDR for 9000 Byte frames using binary search start at 10GE\

 | | ... | linerate, step 50kpps.

 | | ...

-| | [Tags] | 9000B | 4T4C | MTHREAD | NDRDISC

+| | [Tags] | 9000B | 4C | NDRDISC

 | | framesize=${9000} |  wt=4 | rxq=2 | search_type=NDR

 

 | tc22-9000B-4t4c-eth-l2xcbase-eth-1memif-1dcr-pdrdisc

@@ -335,7 +335,7 @@
 | | ... | [Ver] Find PDR for 9000 Byte frames using binary search start at 10GE\

 | | ... | linerate, step 50kpps, LT=0.5%.

 | | ...

-| | [Tags] | 9000B | 4T4C | MTHREAD | PDRDISC

+| | [Tags] | 9000B | 4C | PDRDISC

 | | framesize=${9000} |  wt=4 | rxq=2 | search_type=PDR

 

 | tc23-IMIX-4t4c-eth-l2xcbase-eth-1memif-1dcr-ndrdisc

@@ -346,7 +346,7 @@
 | | ... | linerate, step 50kpps.

 | | ... | IMIX_v4_1 = (28x64B;16x570B;4x1518B)

 | | ...

-| | [Tags] | IMIX | 4T4C | MTHREAD | NDRDISC

+| | [Tags] | IMIX | 4C | NDRDISC

 | | framesize=IMIX_v4_1 |  wt=4 | rxq=2 | search_type=NDR

 

 | tc24-IMIX-4t4c-eth-l2xcbase-eth-1memif-1dcr-pdrdisc

@@ -357,5 +357,5 @@
 | | ... | linerate, step 50kpps, LT=0.5%.

 | | ... | IMIX_v4_1 = (28x64B;16x570B;4x1518B)

 | | ...

-| | [Tags] | IMIX | 4T4C | MTHREAD | PDRDISC

+| | [Tags] | IMIX | 4C | PDRDISC

 | | framesize=IMIX_v4_1 | wt=4 | rxq=2 | search_type=PDR

diff --git a/tests/vpp/perf/container_memif/10ge2p1x520-eth-l2xcbase-eth-2memif-1dcr-mrr.robot b/tests/vpp/perf/container_memif/10ge2p1x520-eth-l2xcbase-eth-2memif-1dcr-mrr.robot
index 57faef7098..cd650aaf25 100644
--- a/tests/vpp/perf/container_memif/10ge2p1x520-eth-l2xcbase-eth-2memif-1dcr-mrr.robot
+++ b/tests/vpp/perf/container_memif/10ge2p1x520-eth-l2xcbase-eth-2memif-1dcr-mrr.robot
@@ -93,135 +93,135 @@
 *** Test Cases ***
 | tc01-64B-1t1c-eth-l2xcbase-eth-2memif-1dcr-mrr
 | | [Documentation]
-| | ... | [Cfg] DUT runs L2XC switching config with 1 thread, 1 phy core,\
+| | ... | [Cfg] DUT runs L2XC switching config with 1 phy core,\
 | | ... | 1 receive queue per NIC port.
 | | ... | [Ver] Measure MaxReceivedRate for 64B frames using single trial\
 | | ... | throughput test.
 | | ...
-| | [Tags] | 64B | 1T1C | STHREAD
+| | [Tags] | 64B | 1C
 | | [Template] | Check RR for l2xcbase-eth-2memif-1dcr
 | | framesize=${64} | wt=1 | rxq=1
 
 | tc02-1518B-1t1c-eth-l2xcbase-eth-2memif-1dcr-mrr
 | | [Documentation]
-| | ... | [Cfg] DUT runs L2XC switching config with 1 thread, 1 phy core,\
+| | ... | [Cfg] DUT runs L2XC switching config with 1 phy core,\
 | | ... | 1 receive queue per NIC port.
 | | ... | [Ver] Measure MaxReceivedRate for 1518B frames using single trial\
 | | ... | throughput test.
 | | ...
-| | [Tags] | 1518B | 1T1C | STHREAD
+| | [Tags] | 1518B | 1C
 | | [Template] | Check RR for l2xcbase-eth-2memif-1dcr
 | | framesize=${1518} | wt=1 | rxq=1
 
 | tc03-9000B-1t1c-eth-l2xcbase-eth-2memif-1dcr-mrr
 | | [Documentation]
-| | ... | [Cfg] DUT runs L2XC switching config with 1 thread, 1 phy core,\
+| | ... | [Cfg] DUT runs L2XC switching config with 1 phy core,\
 | | ... | 1 receive queue per NIC port.
 | | ... | [Ver] Measure MaxReceivedRate for 9000B frames using single trial\
 | | ... | throughput test.
 | | ...
-| | [Tags] | 9000B | 1T1C | STHREAD
+| | [Tags] | 9000B | 1C
 | | [Template] | Check RR for l2xcbase-eth-2memif-1dcr
 | | framesize=${9000} | wt=1 | rxq=1
 
 | tc04-IMIX-1t1c-eth-l2xcbase-eth-2memif-1dcr-mrr
 | | [Documentation]
-| | ... | [Cfg] DUT runs L2XC switching config with 1 thread, 1 phy core,\
+| | ... | [Cfg] DUT runs L2XC switching config 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 | 1T1C | STHREAD
+| | [Tags] | IMIX | 1C
 | | [Template] | Check RR for l2xcbase-eth-2memif-1dcr
 | | framesize=IMIX_v4_1 | wt=1 | rxq=1
 
 | tc05-64B-2t2c-eth-l2xcbase-eth-2memif-1dcr-mrr
 | | [Documentation]
-| | ... | [Cfg] DUT runs L2XC switching config with 2 threads, 2 phy cores,\
+| | ... | [Cfg] DUT runs L2XC switching config with 2 phy cores,\
 | | ... | 1 receive queue per NIC port.
 | | ... | [Ver] Measure MaxReceivedRate for 64B frames using single trial\
 | | ... | throughput test.
 | | ...
-| | [Tags] | 64B | 2T2C | MTHREAD
+| | [Tags] | 64B | 2C
 | | [Template] | Check RR for l2xcbase-eth-2memif-1dcr
 | | framesize=${64} | wt=2 | rxq=1
 
 | tc06-1518B-2t2c-eth-l2xcbase-eth-2memif-1dcr-mrr
 | | [Documentation]
-| | ... | [Cfg] DUT runs L2XC switching config with 2 threads, 1 phy cores,\
+| | ... | [Cfg] DUT runs L2XC switching config with 1 phy cores,\
 | | ... | 1 receive queue per NIC port.
 | | ... | [Ver] Measure MaxReceivedRate for 1518B frames using single trial\
 | | ... | throughput test.
 | | ...
-| | [Tags] | 1518B | 2T2C | MTHREAD
+| | [Tags] | 1518B | 2C
 | | [Template] | Check RR for l2xcbase-eth-2memif-1dcr
 | | framesize=${1518} | wt=2 | rxq=1
 
 | tc07-9000B-2t2c-eth-l2xcbase-eth-2memif-1dcr-mrr
 | | [Documentation]
-| | ... | [Cfg] DUT runs L2XC switching config with 2 threads, 1 phy cores,\
+| | ... | [Cfg] DUT runs L2XC switching config with 1 phy cores,\
 | | ... | 1 receive queue per NIC port.
 | | ... | [Ver] Measure MaxReceivedRate for 9000B frames using single trial\
 | | ... | throughput test.
 | | ...
-| | [Tags] | 9000B | 2T2C | MTHREAD
+| | [Tags] | 9000B | 2C
 | | [Template] | Check RR for l2xcbase-eth-2memif-1dcr
 | | framesize=${9000} | wt=2 | rxq=1
 
 | tc08-IMIX-2t2c-eth-l2xcbase-eth-2memif-1dcr-mrr
 | | [Documentation]
-| | ... | [Cfg] DUT runs L2XC switching config with 2 threads, 2 phy cores,\
+| | ... | [Cfg] DUT runs L2XC switching config 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 | 2T2C | MTHREAD
+| | [Tags] | IMIX | 2C
 | | [Template] | Check RR for l2xcbase-eth-2memif-1dcr
 | | framesize=IMIX_v4_1 | wt=2 | rxq=1
 
 | tc09-64B-4t4c-eth-l2xcbase-eth-2memif-1dcr-mrr
 | | [Documentation]
-| | ... | [Cfg] DUT runs L2XC switching config with 4 threads, 4 phy cores,\
+| | ... | [Cfg] DUT runs L2XC switching config with 4 phy cores,\
 | | ... | 2 receive queues per NIC port.
 | | ... | [Ver] Measure MaxReceivedRate for 64B frames using single trial\
 | | ... | throughput test.
 | | ...
-| | [Tags] | 64B | 4T4C | MTHREAD
+| | [Tags] | 64B | 4C
 | | [Template] | Check RR for l2xcbase-eth-2memif-1dcr
 | | framesize=${64} | wt=4 | rxq=2
 
 | tc10-1518B-4t4c-eth-l2xcbase-eth-2memif-1dcr-mrr
 | | [Documentation]
-| | ... | [Cfg] DUT runs L2XC switching config with 4 threads, 4 phy cores,\
+| | ... | [Cfg] DUT runs L2XC switching config with 4 phy cores,\
 | | ... | 2 receive queues per NIC port.
 | | ... | [Ver] Measure MaxReceivedRate for 1518B frames using single trial\
 | | ... | throughput test.
 | | ...
-| | [Tags] | 1518B | 4T4C | MTHREAD
+| | [Tags] | 1518B | 4C
 | | [Template] | Check RR for l2xcbase-eth-2memif-1dcr
 | | framesize=${1518} | wt=4 | rxq=2
 
 | tc11-9000B-4t4c-eth-l2xcbase-eth-2memif-1dcr-mrr
 | | [Documentation]
-| | ... | [Cfg] DUT runs L2XC switching config with 4 threads, 4 phy cores,\
+| | ... | [Cfg] DUT runs L2XC switching config with 4 phy cores,\
 | | ... | 2 receive queues per NIC port.
 | | ... | [Ver] Measure MaxReceivedRate for 9000B frames using single trial\
 | | ... | throughput test.
 | | ...
-| | [Tags] | 9000B | 4T4C | MTHREAD
+| | [Tags] | 9000B | 4C
 | | [Template] | Check RR for l2xcbase-eth-2memif-1dcr
 | | framesize=${9000} | wt=4 | rxq=2
 
 | tc12-IMIX-4t4c-eth-l2xcbase-eth-2memif-1dcr-mrr
 | | [Documentation]
-| | ... | [Cfg] DUT runs L2XC switching config with 4 threads, 4 phy cores,\
+| | ... | [Cfg] DUT runs L2XC switching config 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 | 4T4C | MTHREAD
+| | [Tags] | IMIX | 4C
 | | [Template] | Check RR for l2xcbase-eth-2memif-1dcr
 | | framesize=IMIX_v4_1 | wt=4 | rxq=2
diff --git a/tests/vpp/perf/container_memif/10ge2p1x520-eth-l2xcbase-eth-2memif-1drc-ndrpdrdisc.robot b/tests/vpp/perf/container_memif/10ge2p1x520-eth-l2xcbase-eth-2memif-1drc-ndrpdrdisc.robot
index 461e7b5405..cd1adabf84 100644
--- a/tests/vpp/perf/container_memif/10ge2p1x520-eth-l2xcbase-eth-2memif-1drc-ndrpdrdisc.robot
+++ b/tests/vpp/perf/container_memif/10ge2p1x520-eth-l2xcbase-eth-2memif-1drc-ndrpdrdisc.robot
@@ -103,136 +103,136 @@
 *** Test Cases ***
 | tc01-64B-1t1c-eth-l2xcbase-eth-2memif-1dcr-ndrdisc
 | | [Documentation]
-| | ... | [Cfg] DUT runs L2XC switching config with 1 thread, 1 phy core,\
+| | ... | [Cfg] DUT runs L2XC switching config with 1 phy core,\
 | | ... | 1 receive queue per NIC port.
 | | ... | [Ver] Find NDR for 64 Byte frames using binary search start at 10GE\
 | | ... | linerate, step 50kpps.
 | | ...
-| | [Tags] | 64B | 1T1C | STHREAD | NDRDISC
+| | [Tags] | 64B | 1C | NDRDISC
 | | [Template] | L2 Cross Connect over Memif Binary Search
 | | framesize=${64} | min_rate=${50000} | wt=1 | rxq=1 | search_type=NDR
 
 | tc02-64B-1t1c-eth-l2xcbase-eth-2memif-1dcr-pdrdisc
 | | [Documentation]
-| | ... | [Cfg] DUT runs L2XC switching config with 1 thread, 1 phy core,\
+| | ... | [Cfg] DUT runs L2XC switching config with 1 phy core,\
 | | ... | 1 receive queue per NIC port.
 | | ... | [Ver] Find PDR for 64 Byte frames using binary search start at 10GE\
 | | ... | linerate, step 50kpps, LT=0.5%.
 | | ...
-| | [Tags] | 64B | 1T1C | STHREAD | PDRDISC
+| | [Tags] | 64B | 1C | PDRDISC
 | | [Template] | L2 Cross Connect over Memif Binary Search
 | | framesize=${64} | min_rate=${50000} | wt=1 | rxq=1 | search_type=PDR
 
 | tc03-IMIX-1t1c-eth-l2xcbase-eth-2memif-1dcr-ndrdisc
 | | [Documentation]
-| | ... | [Cfg] DUT runs L2XC switching config with 1 thread, 1 phy core,\
+| | ... | [Cfg] DUT runs L2XC switching config with 1 phy core,\
 | | ... | 1 receive queue per NIC port.
 | | ... | [Ver] Find NDR for IMIX_v4_1 frames using binary search start at 10GE\
 | | ... | linerate, step 50kpps.
 | | ... | IMIX_v4_1 = (28x64B;16x570B;4x1518B)
 | | ...
-| | [Tags] | IMIX | 1T1C | STHREAD | NDRDISC
+| | [Tags] | IMIX | 1C | NDRDISC
 | | [Template] | L2 Cross Connect over Memif Binary Search
 | | framesize=IMIX_v4_1 | min_rate=${50000} | wt=1 | rxq=1 | search_type=NDR
 
 | tc04-IMIX-1t1c-eth-l2xcbase-eth-2memif-1dcr-pdrdisc
 | | [Documentation]
-| | ... | [Cfg] DUT runs L2XC switching config with 1 thread, 1 phy core,\
+| | ... | [Cfg] DUT runs L2XC switching config with 1 phy core,\
 | | ... | 1 receive queue per NIC port.
 | | ... | [Ver] Find PDR for IMIX_v4_1 frames using binary search start at 10GE\
 | | ... | linerate, step 50kpps, LT=0.5%.
 | | ... | IMIX_v4_1 = (28x64B;16x570B;4x1518B)
 | | ...
-| | [Tags] | IMIX | 1T1C | STHREAD | PDRDISC
+| | [Tags] | IMIX | 1C | PDRDISC
 | | [Template] | L2 Cross Connect over Memif Binary Search
 | | framesize=IMIX_v4_1 | min_rate=${50000} | wt=1 | rxq=1 | search_type=PDR
 
 | tc05-1518B-1t1c-eth-l2xcbase-eth-2memif-1dcr-ndrdisc
 | | [Documentation]
-| | ... | [Cfg] DUT runs L2XC switching config with 1 thread, 1 phy core,\
+| | ... | [Cfg] DUT runs L2XC switching config with 1 phy core,\
 | | ... | 1 receive queue per NIC port.
 | | ... | [Ver] Find NDR for 1518 Byte frames using binary search start at 10GE\
 | | ... | linerate, step 50kpps.
 | | ...
-| | [Tags] | 1518B | 1T1C | STHREAD | NDRDISC
+| | [Tags] | 1518B | 1C | NDRDISC
 | | [Template] | L2 Cross Connect over Memif Binary Search
 | | framesize=${1518} | min_rate=${50000} | wt=1 | rxq=1 | search_type=NDR
 
 | tc06-1518B-1t1c-eth-l2xcbase-eth-2memif-1dcr-pdrdisc
 | | [Documentation]
-| | ... | [Cfg] DUT runs L2XC switching config with 1 thread, 1 phy core,\
+| | ... | [Cfg] DUT runs L2XC switching config with 1 phy core,\
 | | ... | 1 receive queue per NIC port.
 | | ... | [Ver] Find PDR for 1518 Byte frames using binary search start at 10GE\
 | | ... | linerate, step 50kpps, LT=0.5%.
 | | ...
-| | [Tags] | 1518B | 1T1C | STHREAD | PDRDISC
+| | [Tags] | 1518B | 1C | PDRDISC
 | | [Template] | L2 Cross Connect over Memif Binary Search
 | | framesize=${1518} | min_rate=${50000} | wt=1 | rxq=1 | search_type=PDR
 
 | tc07-64B-2t2c-eth-l2xcbase-eth-2memif-1dcr-ndrdisc
 | | [Documentation]
-| | ... | [Cfg] DUT runs L2XC switching config with 2 thread, 2 phy core,\
+| | ... | [Cfg] DUT runs L2XC switching config with 2 phy core,\
 | | ... | 1 receive queue per NIC port.
 | | ... | [Ver] Find NDR for 64 Byte frames using binary search start at 10GE\
 | | ... | linerate, step 50kpps.
 | | ...
-| | [Tags] | 64B | 2T2C | MTHREAD | NDRDISC
+| | [Tags] | 64B | 2C | NDRDISC
 | | [Template] | L2 Cross Connect over Memif Binary Search
 | | framesize=${64} | min_rate=${50000} | wt=2 | rxq=1 | search_type=NDR
 
 | tc08-64B-2t2c-eth-l2xcbase-eth-2memif-1dcr-pdrdisc
 | | [Documentation]
-| | ... | [Cfg] DUT runs L2XC switching config with 2 thread, 2 phy core,\
+| | ... | [Cfg] DUT runs L2XC switching config with 2 phy core,\
 | | ... | 1 receive queue per NIC port.
 | | ... | [Ver] Find PDR for 64 Byte frames using binary search start at 10GE\
 | | ... | linerate, step 50kpps, LT=0.5%.
 | | ...
-| | [Tags] | 64B | 2T2C | MTHREAD | PDRDISC
+| | [Tags] | 64B | 2C | PDRDISC
 | | [Template] | L2 Cross Connect over Memif Binary Search
 | | framesize=${64} | min_rate=${50000} | wt=2 | rxq=1 | search_type=PDR
 
 | tc09-IMIX-2t2c-eth-l2xcbase-eth-2memif-1dcr-ndrdisc
 | | [Documentation]
-| | ... | [Cfg] DUT runs L2XC switching config with 2 thread, 2 phy core,\
+| | ... | [Cfg] DUT runs L2XC switching config with 2 phy core,\
 | | ... | 1 receive queue per NIC port.
 | | ... | [Ver] Find NDR for IMIX_v4_1 frames using binary search start at 10GE\
 | | ... | linerate, step 50kpps.
 | | ... | IMIX_v4_1 = (28x64B;16x570B;4x1518B)
 | | ...
-| | [Tags] | IMIX | 2T2C | MTHREAD | NDRDISC
+| | [Tags] | IMIX | 2C | NDRDISC
 | | [Template] | L2 Cross Connect over Memif Binary Search
 | | framesize=IMIX_v4_1 | min_rate=${50000} | wt=2 | rxq=1 | search_type=NDR
 
 | tc10-IMIX-2t2c-eth-l2xcbase-eth-2memif-1dcr-pdrdisc
 | | [Documentation]
-| | ... | [Cfg] DUT runs L2XC switching config with 2 thread, 1 phy core,\
+| | ... | [Cfg] DUT runs L2XC switching config with 1 phy core,\
 | | ... | 1 receive queue per NIC port.
 | | ... | [Ver] Find PDR for IMIX_v4_1 frames using binary search start at 10GE\
 | | ... | linerate, step 50kpps, LT=0.5%.
 | | ... | IMIX_v4_1 = (28x64B;16x570B;4x1518B)
 | | ...
-| | [Tags] | IMIX | 2T2C | MTHREAD | PDRDISC
+| | [Tags] | IMIX | 2C | PDRDISC
 | | [Template] | L2 Cross Connect over Memif Binary Search
 | | framesize=IMIX_v4_1 | min_rate=${50000} | wt=2 | rxq=1 | search_type=PDR
 
 | tc11-1518B-2t2c-eth-l2xcbase-eth-2memif-1dcr-ndrdisc
 | | [Documentation]
-| | ... | [Cfg] DUT runs L2XC switching config with 2 thread, 1 phy core,\
+| | ... | [Cfg] DUT runs L2XC switching config with 1 phy core,\
 | | ... | 1 receive queue per NIC port.
 | | ... | [Ver] Find NDR for 1518 Byte frames using binary search start at 10GE\
 | | ... | linerate, step 50kpps.
 | | ...
-| | [Tags] | 1518B | 2T2C | MTHREAD | NDRDISC
+| | [Tags] | 1518B | 2C | NDRDISC
 | | [Template] | L2 Cross Connect over Memif Binary Search
 | | framesize=${1518} | min_rate=${50000} | wt=2 | rxq=1 | search_type=NDR
 
 | tc12-1518B-2t2c-eth-l2xcbase-eth-2memif-1dcr-pdrdisc
 | | [Documentation]
-| | ... | [Cfg] DUT runs L2XC switching config with 2 thread, 1 phy core,\
+| | ... | [Cfg] DUT runs L2XC switching config with 1 phy core,\
 | | ... | 1 receive queue per NIC port.
 | | ... | [Ver] Find PDR for 1518 Byte frames using binary search start at 10GE\
 | | ... | linerate, step 50kpps, LT=0.5%.
 | | ...
-| | [Tags] | 1518B | 2T2C | MTHREAD | PDRDISC
+| | [Tags] | 1518B | 2C | PDRDISC
 | | [Template] | L2 Cross Connect over Memif Binary Search
 | | framesize=${1518} | min_rate=${50000} | wt=2 | rxq=1 | search_type=PDR
diff --git a/tests/vpp/perf/container_memif/10ge2p1x520-eth-l2xcbase-eth-2memif-1lxc-mrr.robot b/tests/vpp/perf/container_memif/10ge2p1x520-eth-l2xcbase-eth-2memif-1lxc-mrr.robot
index 4a2567107a..bc3cda8980 100644
--- a/tests/vpp/perf/container_memif/10ge2p1x520-eth-l2xcbase-eth-2memif-1lxc-mrr.robot
+++ b/tests/vpp/perf/container_memif/10ge2p1x520-eth-l2xcbase-eth-2memif-1lxc-mrr.robot
@@ -92,135 +92,135 @@
 *** Test Cases ***
 | tc01-64B-1t1c-eth-l2xcbase-eth-2memif-1lxc-mrr
 | | [Documentation]
-| | ... | [Cfg] DUT runs L2XC switching config with 1 thread, 1 phy core,\
+| | ... | [Cfg] DUT runs L2XC switching config with 1 phy core,\
 | | ... | 1 receive queue per NIC port.
 | | ... | [Ver] Measure MaxReceivedRate for 64B frames using single trial\
 | | ... | throughput test.
 | | ...
-| | [Tags] | 64B | 1T1C | STHREAD
+| | [Tags] | 64B | 1C
 | | [Template] | Check RR for l2xcbase-eth-2memif-1lxc
 | | framesize=${64} | wt=1 | rxq=1
 
 | tc02-1518B-1t1c-eth-l2xcbase-eth-2memif-1lxc-mrr
 | | [Documentation]
-| | ... | [Cfg] DUT runs L2XC switching config with 1 thread, 1 phy core,\
+| | ... | [Cfg] DUT runs L2XC switching config with 1 phy core,\
 | | ... | 1 receive queue per NIC port.
 | | ... | [Ver] Measure MaxReceivedRate for 1518B frames using single trial\
 | | ... | throughput test.
 | | ...
-| | [Tags] | 1518B | 1T1C | STHREAD
+| | [Tags] | 1518B | 1C
 | | [Template] | Check RR for l2xcbase-eth-2memif-1lxc
 | | framesize=${1518} | wt=1 | rxq=1
 
 | tc03-9000B-1t1c-eth-l2xcbase-eth-2memif-1lxc-mrr
 | | [Documentation]
-| | ... | [Cfg] DUT runs L2XC switching config with 1 thread, 1 phy core,\
+| | ... | [Cfg] DUT runs L2XC switching config with 1 phy core,\
 | | ... | 1 receive queue per NIC port.
 | | ... | [Ver] Measure MaxReceivedRate for 9000B frames using single trial\
 | | ... | throughput test.
 | | ...
-| | [Tags] | 9000B | 1T1C | STHREAD
+| | [Tags] | 9000B | 1C
 | | [Template] | Check RR for l2xcbase-eth-2memif-1lxc
 | | framesize=${9000} | wt=1 | rxq=1
 
 | tc04-IMIX-1t1c-eth-l2xcbase-eth-2memif-1lxc-mrr
 | | [Documentation]
-| | ... | [Cfg] DUT runs L2XC switching config with 1 thread, 1 phy core,\
+| | ... | [Cfg] DUT runs L2XC switching config 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 | 1T1C | STHREAD
+| | [Tags] | IMIX | 1C
 | | [Template] | Check RR for l2xcbase-eth-2memif-1lxc
 | | framesize=IMIX_v4_1 | wt=1 | rxq=1
 
 | tc05-64B-2t2c-eth-l2xcbase-eth-2memif-1lxc-mrr
 | | [Documentation]
-| | ... | [Cfg] DUT runs L2XC switching config with 2 threads, 2 phy cores,\
+| | ... | [Cfg] DUT runs L2XC switching config with 2 phy cores,\
 | | ... | 1 receive queue per NIC port.
 | | ... | [Ver] Measure MaxReceivedRate for 64B frames using single trial\
 | | ... | throughput test.
 | | ...
-| | [Tags] | 64B | 2T2C | MTHREAD
+| | [Tags] | 64B | 2C
 | | [Template] | Check RR for l2xcbase-eth-2memif-1lxc
 | | framesize=${64} | wt=2 | rxq=1
 
 | tc06-1518B-2t2c-eth-l2xcbase-eth-2memif-1lxc-mrr
 | | [Documentation]
-| | ... | [Cfg] DUT runs L2XC switching config with 2 threads, 2 phy cores,\
+| | ... | [Cfg] DUT runs L2XC switching config with 2 phy cores,\
 | | ... | 1 receive queue per NIC port.
 | | ... | [Ver] Measure MaxReceivedRate for 1518B frames using single trial\
 | | ... | throughput test.
 | | ...
-| | [Tags] | 1518B | 2T2C | MTHREAD
+| | [Tags] | 1518B | 2C
 | | [Template] | Check RR for l2xcbase-eth-2memif-1lxc
 | | framesize=${1518} | wt=2 | rxq=1
 
 | tc07-9000B-2t2c-eth-l2xcbase-eth-2memif-1lxc-mrr
 | | [Documentation]
-| | ... | [Cfg] DUT runs L2XC switching config with 2 threads, 2 phy cores,\
+| | ... | [Cfg] DUT runs L2XC switching config with 2 phy cores,\
 | | ... | 1 receive queue per NIC port.
 | | ... | [Ver] Measure MaxReceivedRate for 9000B frames using single trial\
 | | ... | throughput test.
 | | ...
-| | [Tags] | 9000B | 2T2C | MTHREAD
+| | [Tags] | 9000B | 2C
 | | [Template] | Check RR for l2xcbase-eth-2memif-1lxc
 | | framesize=${9000} | wt=2 | rxq=1
 
 | tc08-IMIX-2t2c-eth-l2xcbase-eth-2memif-1lxc-mrr
 | | [Documentation]
-| | ... | [Cfg] DUT runs L2XC switching config with 2 threads, 2 phy cores,\
+| | ... | [Cfg] DUT runs L2XC switching config 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 | 2T2C | MTHREAD
+| | [Tags] | IMIX | 2C
 | | [Template] | Check RR for l2xcbase-eth-2memif-1lxc
 | | framesize=IMIX_v4_1 | wt=2 | rxq=1
 
 | tc09-64B-4t4c-eth-l2xcbase-eth-2memif-1lxc-mrr
 | | [Documentation]
-| | ... | [Cfg] DUT runs L2XC switching config with 4 threads, 4 phy cores,\
+| | ... | [Cfg] DUT runs L2XC switching config with 4 phy cores,\
 | | ... | 2 receive queues per NIC port.
 | | ... | [Ver] Measure MaxReceivedRate for 64B frames using single trial\
 | | ... | throughput test.
 | | ...
-| | [Tags] | 64B | 4T4C | MTHREAD
+| | [Tags] | 64B | 4C
 | | [Template] | Check RR for l2xcbase-eth-2memif-1lxc
 | | framesize=${64} | wt=4 | rxq=2
 
 | tc10-1518B-4t4c-eth-l2xcbase-eth-2memif-1lxc-mrr
 | | [Documentation]
-| | ... | [Cfg] DUT runs L2XC switching config with 4 threads, 4 phy cores,\
+| | ... | [Cfg] DUT runs L2XC switching config with 4 phy cores,\
 | | ... | 2 receive queues per NIC port.
 | | ... | [Ver] Measure MaxReceivedRate for 1518B frames using single trial\
 | | ... | throughput test.
 | | ...
-| | [Tags] | 1518B | 4T4C | MTHREAD
+| | [Tags] | 1518B | 4C
 | | [Template] | Check RR for l2xcbase-eth-2memif-1lxc
 | | framesize=${1518} | wt=4 | rxq=2
 
 | tc11-9000B-4t4c-eth-l2xcbase-eth-2memif-1lxc-mrr
 | | [Documentation]
-| | ... | [Cfg] DUT runs L2XC switching config with 4 threads, 4 phy cores,\
+| | ... | [Cfg] DUT runs L2XC switching config with 4 phy cores,\
 | | ... | 2 receive queues per NIC port.
 | | ... | [Ver] Measure MaxReceivedRate for 9000B frames using single trial\
 | | ... | throughput test.
 | | ...
-| | [Tags] | 9000B | 4T4C | MTHREAD
+| | [Tags] | 9000B | 4C
 | | [Template] | Check RR for l2xcbase-eth-2memif-1lxc
 | | framesize=${9000} | wt=4 | rxq=2
 
 | tc12-IMIX-4t4c-eth-l2xcbase-eth-2memif-1lxc-mrr
 | | [Documentation]
-| | ... | [Cfg] DUT runs L2XC switching config with 4 threads, 4 phy cores,\
+| | ... | [Cfg] DUT runs L2XC switching config 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 | 4T4C | MTHREAD
+| | [Tags] | IMIX | 4C
 | | [Template] | Check RR for l2xcbase-eth-2memif-1lxc
 | | framesize=IMIX_v4_1 | wt=4 | rxq=2
diff --git a/tests/vpp/perf/container_memif/10ge2p1x520-eth-l2xcbase-eth-2memif-1lxc-ndrpdrdisc.robot b/tests/vpp/perf/container_memif/10ge2p1x520-eth-l2xcbase-eth-2memif-1lxc-ndrpdrdisc.robot
index 2551e069c9..046f5a8514 100644
--- a/tests/vpp/perf/container_memif/10ge2p1x520-eth-l2xcbase-eth-2memif-1lxc-ndrpdrdisc.robot
+++ b/tests/vpp/perf/container_memif/10ge2p1x520-eth-l2xcbase-eth-2memif-1lxc-ndrpdrdisc.robot
@@ -102,136 +102,136 @@
 *** Test Cases ***
 | tc01-64B-1t1c-eth-l2xcbase-eth-2memif-1lxc-ndrdisc
 | | [Documentation]
-| | ... | [Cfg] DUT runs L2XC switching config with 1 thread, 1 phy core,\
+| | ... | [Cfg] DUT runs L2XC switching config with 1 phy core,\
 | | ... | 1 receive queue per NIC port.
 | | ... | [Ver] Find NDR for 64 Byte frames using binary search start at 10GE\
 | | ... | linerate, step 50kpps.
 | | ...
-| | [Tags] | 64B | 1T1C | STHREAD | NDRDISC
+| | [Tags] | 64B | 1C | NDRDISC
 | | [Template] | L2 Cross Connect over Memif Binary Search
 | | framesize=${64} | min_rate=${50000} | wt=1 | rxq=1 | search_type=NDR
 
 | tc02-64B-1t1c-eth-l2xcbase-eth-2memif-1lxc-pdrdisc
 | | [Documentation]
-| | ... | [Cfg] DUT runs L2XC switching config with 1 thread, 1 phy core,\
+| | ... | [Cfg] DUT runs L2XC switching config with 1 phy core,\
 | | ... | 1 receive queue per NIC port.
 | | ... | [Ver] Find PDR for 64 Byte frames using binary search start at 10GE\
 | | ... | linerate, step 50kpps, LT=0.5%.
 | | ...
-| | [Tags] | 64B | 1T1C | STHREAD | PDRDISC
+| | [Tags] | 64B | 1C | PDRDISC
 | | [Template] | L2 Cross Connect over Memif Binary Search
 | | framesize=${64} | min_rate=${50000} | wt=1 | rxq=1 | search_type=PDR
 
 | tc03-IMIX-1t1c-eth-l2xcbase-eth-2memif-1lxc-ndrdisc
 | | [Documentation]
-| | ... | [Cfg] DUT runs L2XC switching config with 1 thread, 1 phy core,\
+| | ... | [Cfg] DUT runs L2XC switching config with 1 phy core,\
 | | ... | 1 receive queue per NIC port.
 | | ... | [Ver] Find NDR for IMIX_v4_1 frames using binary search start at 10GE\
 | | ... | linerate, step 50kpps.
 | | ... | IMIX_v4_1 = (28x64B;16x570B;4x1518B)
 | | ...
-| | [Tags] | IMIX | 1T1C | STHREAD | NDRDISC
+| | [Tags] | IMIX | 1C | NDRDISC
 | | [Template] | L2 Cross Connect over Memif Binary Search
 | | framesize=IMIX_v4_1 | min_rate=${50000} | wt=1 | rxq=1 | search_type=NDR
 
 | tc04-IMIX-1t1c-eth-l2xcbase-eth-2memif-1lxc-pdrdisc
 | | [Documentation]
-| | ... | [Cfg] DUT runs L2XC switching config with 1 thread, 1 phy core,\
+| | ... | [Cfg] DUT runs L2XC switching config with 1 phy core,\
 | | ... | 1 receive queue per NIC port.
 | | ... | [Ver] Find PDR for IMIX_v4_1 frames using binary search start at 10GE\
 | | ... | linerate, step 50kpps, LT=0.5%.
 | | ... | IMIX_v4_1 = (28x64B;16x570B;4x1518B)
 | | ...
-| | [Tags] | IMIX | 1T1C | STHREAD | PDRDISC
+| | [Tags] | IMIX | 1C | PDRDISC
 | | [Template] | L2 Cross Connect over Memif Binary Search
 | | framesize=IMIX_v4_1 | min_rate=${50000} | wt=1 | rxq=1 | search_type=PDR
 
 | tc05-1518B-1t1c-eth-l2xcbase-eth-2memif-1lxc-ndrdisc
 | | [Documentation]
-| | ... | [Cfg] DUT runs L2XC switching config with 1 thread, 1 phy core,\
+| | ... | [Cfg] DUT runs L2XC switching config with 1 phy core,\
 | | ... | 1 receive queue per NIC port.
 | | ... | [Ver] Find NDR for 1518 Byte frames using binary search start at 10GE\
 | | ... | linerate, step 50kpps.
 | | ...
-| | [Tags] | 1518B | 1T1C | STHREAD | NDRDISC
+| | [Tags] | 1518B | 1C | NDRDISC
 | | [Template] | L2 Cross Connect over Memif Binary Search
 | | framesize=${1518} | min_rate=${50000} | wt=1 | rxq=1 | search_type=NDR
 
 | tc06-1518B-1t1c-eth-l2xcbase-eth-2memif-1lxc-pdrdisc
 | | [Documentation]
-| | ... | [Cfg] DUT runs L2XC switching config with 1 thread, 1 phy core,\
+| | ... | [Cfg] DUT runs L2XC switching config with 1 phy core,\
 | | ... | 1 receive queue per NIC port.
 | | ... | [Ver] Find PDR for 1518 Byte frames using binary search start at 10GE\
 | | ... | linerate, step 50kpps, LT=0.5%.
 | | ...
-| | [Tags] | 1518B | 1T1C | STHREAD | PDRDISC
+| | [Tags] | 1518B | 1C | PDRDISC
 | | [Template] | L2 Cross Connect over Memif Binary Search
 | | framesize=${1518} | min_rate=${50000} | wt=1 | rxq=1 | search_type=PDR
 
 | tc07-64B-2t2c-eth-l2xcbase-eth-2memif-1lxc-ndrdisc
 | | [Documentation]
-| | ... | [Cfg] DUT runs L2XC switching config with 2 thread, 2 phy core,\
+| | ... | [Cfg] DUT runs L2XC switching config with 2 phy core,\
 | | ... | 1 receive queue per NIC port.
 | | ... | [Ver] Find NDR for 64 Byte frames using binary search start at 10GE\
 | | ... | linerate, step 50kpps.
 | | ...
-| | [Tags] | 64B | 2T2C | MTHREAD | NDRDISC
+| | [Tags] | 64B | 2C | NDRDISC
 | | [Template] | L2 Cross Connect over Memif Binary Search
 | | framesize=${64} | min_rate=${50000} | wt=2 | rxq=1 | search_type=NDR
 
 | tc08-64B-2t2c-eth-l2xcbase-eth-2memif-1lxc-pdrdisc
 | | [Documentation]
-| | ... | [Cfg] DUT runs L2XC switching config with 2 thread, 2 phy core,\
+| | ... | [Cfg] DUT runs L2XC switching config with 2 phy core,\
 | | ... | 1 receive queue per NIC port.
 | | ... | [Ver] Find PDR for 64 Byte frames using binary search start at 10GE\
 | | ... | linerate, step 50kpps, LT=0.5%.
 | | ...
-| | [Tags] | 64B | 2T2C | MTHREAD | PDRDISC
+| | [Tags] | 64B | 2C | PDRDISC
 | | [Template] | L2 Cross Connect over Memif Binary Search
 | | framesize=${64} | min_rate=${50000} | wt=2 | rxq=1 | search_type=PDR
 
 | tc09-IMIX-2t2c-eth-l2xcbase-eth-2memif-1lxc-ndrdisc
 | | [Documentation]
-| | ... | [Cfg] DUT runs L2XC switching config with 2 thread, 2 phy core,\
+| | ... | [Cfg] DUT runs L2XC switching config with 2 phy core,\
 | | ... | 1 receive queue per NIC port.
 | | ... | [Ver] Find NDR for IMIX_v4_1 frames using binary search start at 10GE\
 | | ... | linerate, step 50kpps.
 | | ... | IMIX_v4_1 = (28x64B;16x570B;4x1518B)
 | | ...
-| | [Tags] | IMIX | 2T2C | MTHREAD | NDRDISC
+| | [Tags] | IMIX | 2C | NDRDISC
 | | [Template] | L2 Cross Connect over Memif Binary Search
 | | framesize=IMIX_v4_1 | min_rate=${50000} | wt=2 | rxq=1 | search_type=NDR
 
 | tc10-IMIX-2t2c-eth-l2xcbase-eth-2memif-1lxc-pdrdisc
 | | [Documentation]
-| | ... | [Cfg] DUT runs L2XC switching config with 2 thread, 1 phy core,\
+| | ... | [Cfg] DUT runs L2XC switching config with 1 phy core,\
 | | ... | 1 receive queue per NIC port.
 | | ... | [Ver] Find PDR for IMIX_v4_1 frames using binary search start at 10GE\
 | | ... | linerate, step 50kpps, LT=0.5%.
 | | ... | IMIX_v4_1 = (28x64B;16x570B;4x1518B)
 | | ...
-| | [Tags] | IMIX | 2T2C | MTHREAD | PDRDISC
+| | [Tags] | IMIX | 2C | PDRDISC
 | | [Template] | L2 Cross Connect over Memif Binary Search
 | | framesize=IMIX_v4_1 | min_rate=${50000} | wt=2 | rxq=1 | search_type=PDR
 
 | tc11-1518B-2t2c-eth-l2xcbase-eth-2memif-1lxc-ndrdisc
 | | [Documentation]
-| | ... | [Cfg] DUT runs L2XC switching config with 2 thread, 1 phy core,\
+| | ... | [Cfg] DUT runs L2XC switching config with 1 phy core,\
 | | ... | 1 receive queue per NIC port.
 | | ... | [Ver] Find NDR for 1518 Byte frames using binary search start at 10GE\
 | | ... | linerate, step 50kpps.
 | | ...
-| | [Tags] | 1518B | 2T2C | MTHREAD | NDRDISC
+| | [Tags] | 1518B | 2C | NDRDISC
 | | [Template] | L2 Cross Connect over Memif Binary Search
 | | framesize=${1518} | min_rate=${50000} | wt=2 | rxq=1 | search_type=NDR
 
 | tc12-1518B-2t2c-eth-l2xcbase-eth-2memif-1lxc-pdrdisc
 | | [Documentation]
-| | ... | [Cfg] DUT runs L2XC switching config with 2 thread, 1 phy core,\
+| | ... | [Cfg] DUT runs L2XC switching config with 1 phy core,\
 | | ... | 1 receive queue per NIC port.
 | | ... | [Ver] Find PDR for 1518 Byte frames using binary search start at 10GE\
 | | ... | linerate, step 50kpps, LT=0.5%.
 | | ...
-| | [Tags] | 1518B | 2T2C | MTHREAD | PDRDISC
+| | [Tags] | 1518B | 2C | PDRDISC
 | | [Template] | L2 Cross Connect over Memif Binary Search
 | | framesize=${1518} | min_rate=${50000} | wt=2 | rxq=1 | search_type=PDR
diff --git a/tests/vpp/perf/container_memif/10ge2p1x710-eth-l2bdbasemaclrn-eth-2memif-1lxc-mrr.robot b/tests/vpp/perf/container_memif/10ge2p1x710-eth-l2bdbasemaclrn-eth-2memif-1lxc-mrr.robot
index 328bdbd10d..cd94a2f9f5 100644
--- a/tests/vpp/perf/container_memif/10ge2p1x710-eth-l2bdbasemaclrn-eth-2memif-1lxc-mrr.robot
+++ b/tests/vpp/perf/container_memif/10ge2p1x710-eth-l2bdbasemaclrn-eth-2memif-1lxc-mrr.robot
@@ -93,135 +93,135 @@
 *** Test Cases ***
 | tc01-64B-1t1c-eth-l2bdbasemaclrn-eth-2memif-1lxc-mrr
 | | [Documentation]
-| | ... | [Cfg] DUT runs L2BD switching config with 1 thread, 1 phy core,\
+| | ... | [Cfg] DUT runs L2BD switching config with 1 phy core,\
 | | ... | 1 receive queue per NIC port.
 | | ... | [Ver] Measure MaxReceivedRate for 64B frames using single trial\
 | | ... | throughput test.
 | | ...
-| | [Tags] | 64B | 1T1C | STHREAD
+| | [Tags] | 64B | 1C
 | | [Template] | Check RR for l2bdbasemaclrn-eth-2memif-1lxc
 | | framesize=${64} | wt=1 | rxq=1
 
 | tc02-1518B-1t1c-eth-l2bdbasemaclrn-eth-2memif-1lxc-mrr
 | | [Documentation]
-| | ... | [Cfg] DUT runs L2BD switching config with 1 thread, 1 phy core,\
+| | ... | [Cfg] DUT runs L2BD switching config with 1 phy core,\
 | | ... | 1 receive queue per NIC port.
 | | ... | [Ver] Measure MaxReceivedRate for 1518B frames using single trial\
 | | ... | throughput test.
 | | ...
-| | [Tags] | 1518B | 1T1C | STHREAD
+| | [Tags] | 1518B | 1C
 | | [Template] | Check RR for l2bdbasemaclrn-eth-2memif-1lxc
 | | framesize=${1518} | wt=1 | rxq=1
 
 | tc03-9000B-1t1c-eth-l2bdbasemaclrn-eth-2memif-1lxc-mrr
 | | [Documentation]
-| | ... | [Cfg] DUT runs L2BD switching config with 1 thread, 1 phy core,\
+| | ... | [Cfg] DUT runs L2BD switching config with 1 phy core,\
 | | ... | 1 receive queue per NIC port.
 | | ... | [Ver] Measure MaxReceivedRate for 9000B frames using single trial\
 | | ... | throughput test.
 | | ...
-| | [Tags] | 9000B | 1T1C | STHREAD
+| | [Tags] | 9000B | 1C
 | | [Template] | Check RR for l2bdbasemaclrn-eth-2memif-1lxc
 | | framesize=${9000} | wt=1 | rxq=1
 
 | tc04-IMIX-1t1c-eth-l2bdbasemaclrn-eth-2memif-1lxc-mrr
 | | [Documentation]
-| | ... | [Cfg] DUT runs L2BD switching config with 1 thread, 1 phy core,\
+| | ... | [Cfg] DUT runs L2BD switching config 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 | 1T1C | STHREAD
+| | [Tags] | IMIX | 1C
 | | [Template] | Check RR for l2bdbasemaclrn-eth-2memif-1lxc
 | | framesize=IMIX_v4_1 | wt=1 | rxq=1
 
 | tc05-64B-2t2c-eth-l2bdbasemaclrn-eth-2memif-1lxc-mrr
 | | [Documentation]
-| | ... | [Cfg] DUT runs L2BD switching config with 2 threads, 2 phy cores,\
+| | ... | [Cfg] DUT runs L2BD switching config with 2 phy cores,\
 | | ... | 1 receive queue per NIC port.
 | | ... | [Ver] Measure MaxReceivedRate for 64B frames using single trial\
 | | ... | throughput test.
 | | ...
-| | [Tags] | 64B | 2T2C | MTHREAD
+| | [Tags] | 64B | 2C
 | | [Template] | Check RR for l2bdbasemaclrn-eth-2memif-1lxc
 | | framesize=${64} | wt=2 | rxq=1
 
 | tc06-1518B-2t2c-eth-l2bdbasemaclrn-eth-2memif-1lxc-mrr
 | | [Documentation]
-| | ... | [Cfg] DUT runs L2BD switching config with 2 threads, 1 phy cores,\
+| | ... | [Cfg] DUT runs L2BD switching config with 1 phy cores,\
 | | ... | 1 receive queue per NIC port.
 | | ... | [Ver] Measure MaxReceivedRate for 1518B frames using single trial\
 | | ... | throughput test.
 | | ...
-| | [Tags] | 1518B | 2T2C | MTHREAD
+| | [Tags] | 1518B | 2C
 | | [Template] | Check RR for l2bdbasemaclrn-eth-2memif-1lxc
 | | framesize=${1518} | wt=2 | rxq=1
 
 | tc07-9000B-2t2c-eth-l2bdbasemaclrn-eth-2memif-1lxc-mrr
 | | [Documentation]
-| | ... | [Cfg] DUT runs L2BD switching config with 2 threads, 1 phy cores,\
+| | ... | [Cfg] DUT runs L2BD switching config with 1 phy cores,\
 | | ... | 1 receive queue per NIC port.
 | | ... | [Ver] Measure MaxReceivedRate for 9000B frames using single trial\
 | | ... | throughput test.
 | | ...
-| | [Tags] | 9000B | 2T2C | MTHREAD
+| | [Tags] | 9000B | 2C
 | | [Template] | Check RR for l2bdbasemaclrn-eth-2memif-1lxc
 | | framesize=${9000} | wt=2 | rxq=1
 
 | tc08-IMIX-2t2c-eth-l2bdbasemaclrn-eth-2memif-1lxc-mrr
 | | [Documentation]
-| | ... | [Cfg] DUT runs L2BD switching config with 2 threads, 2 phy cores,\
+| | ... | [Cfg] DUT runs L2BD switching config 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 | 2T2C | MTHREAD
+| | [Tags] | IMIX | 2C
 | | [Template] | Check RR for l2bdbasemaclrn-eth-2memif-1lxc
 | | framesize=IMIX_v4_1 | wt=2 | rxq=1
 
 | tc09-64B-4t4c-eth-l2bdbasemaclrn-eth-2memif-1lxc-mrr
 | | [Documentation]
-| | ... | [Cfg] DUT runs L2BD switching config with 4 threads, 4 phy cores,\
+| | ... | [Cfg] DUT runs L2BD switching config with 4 phy cores,\
 | | ... | 2 receive queues per NIC port.
 | | ... | [Ver] Measure MaxReceivedRate for 64B frames using single trial\
 | | ... | throughput test.
 | | ...
-| | [Tags] | 64B | 4t4c | MTHREAD
+| | [Tags] | 64B | 4C
 | | [Template] | Check RR for l2bdbasemaclrn-eth-2memif-1lxc
 | | framesize=${64} | wt=4 | rxq=2
 
 | tc10-1518B-4t4c-eth-l2bdbasemaclrn-eth-2memif-1lxc-mrr
 | | [Documentation]
-| | ... | [Cfg] DUT runs L2BD switching config with 4 threads, 4 phy cores,\
+| | ... | [Cfg] DUT runs L2BD switching config with 4 phy cores,\
 | | ... | 2 receive queues per NIC port.
 | | ... | [Ver] Measure MaxReceivedRate for 1518B frames using single trial\
 | | ... | throughput test.
 | | ...
-| | [Tags] | 1518B | 4t4c | MTHREAD
+| | [Tags] | 1518B | 4C
 | | [Template] | Check RR for l2bdbasemaclrn-eth-2memif-1lxc
 | | framesize=${1518} | wt=4 | rxq=2
 
 | tc11-9000B-4t4c-eth-l2bdbasemaclrn-eth-2memif-1lxc-mrr
 | | [Documentation]
-| | ... | [Cfg] DUT runs L2BD switching config with 4 threads, 4 phy cores,\
+| | ... | [Cfg] DUT runs L2BD switching config with 4 phy cores,\
 | | ... | 2 receive queues per NIC port.
 | | ... | [Ver] Measure MaxReceivedRate for 9000B frames using single trial\
 | | ... | throughput test.
 | | ...
-| | [Tags] | 9000B | 4t4c | MTHREAD
+| | [Tags] | 9000B | 4C
 | | [Template] | Check RR for l2bdbasemaclrn-eth-2memif-1lxc
 | | framesize=${9000} | wt=4 | rxq=2
 
 | tc12-IMIX-4t4c-eth-l2bdbasemaclrn-eth-2memif-1lxc-mrr
 | | [Documentation]
-| | ... | [Cfg] DUT runs L2BD switching config with 4 threads, 4 phy cores,\
+| | ... | [Cfg] DUT runs L2BD switching config 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 | 4t4c | MTHREAD
+| | [Tags] | IMIX | 4C
 | | [Template] | Check RR for l2bdbasemaclrn-eth-2memif-1lxc
 | | framesize=IMIX_v4_1 | wt=4 | rxq=2
diff --git a/tests/vpp/perf/container_memif/10ge2p1x710-eth-l2xcbase-eth-1memif-1dcr-mrr.robot b/tests/vpp/perf/container_memif/10ge2p1x710-eth-l2xcbase-eth-1memif-1dcr-mrr.robot
index 23b1136aa7..044d05a45d 100644
--- a/tests/vpp/perf/container_memif/10ge2p1x710-eth-l2xcbase-eth-1memif-1dcr-mrr.robot
+++ b/tests/vpp/perf/container_memif/10ge2p1x710-eth-l2xcbase-eth-1memif-1dcr-mrr.robot
@@ -97,123 +97,123 @@
 *** Test Cases ***

 | tc01-64B-1t1c-eth-l2xcbase-eth-1memif-1dcr-mrr

 | | [Documentation]

-| | ... | [Cfg] DUT runs L2XC switching config with 1 thread, 1 phy core,\

+| | ... | [Cfg] DUT runs L2XC switching config with 1 phy core,\

 | | ... | 1 receive queue per NIC port.

 | | ... | [Ver] Measure MaxReceivedRate for 64B frames using single trial\

 | | ... | throughput test.

 | | ...

-| | [Tags] | 64B | 1T1C | STHREAD

+| | [Tags] | 64B | 1C

 | | framesize=${64} | wt=1 | rxq=1

 

 | tc02-1518B-1t1c-eth-l2xcbase-eth-1memif-1dcr-mrr

 | | [Documentation]

-| | ... | [Cfg] DUT runs L2XC switching config with 1 thread, 1 phy core,\

+| | ... | [Cfg] DUT runs L2XC switching config with 1 phy core,\

 | | ... | 1 receive queue per NIC port.

 | | ... | [Ver] Measure MaxReceivedRate for 1518B frames using single trial\

 | | ... | throughput test.

 | | ...

-| | [Tags] | 1518B | 1T1C | STHREAD

+| | [Tags] | 1518B | 1C

 | | framesize=${1518} | wt=1 | rxq=1

 

 | tc03-9000B-1t1c-eth-l2xcbase-eth-1memif-1dcr-mrr

 | | [Documentation]

-| | ... | [Cfg] DUT runs L2XC switching config with 1 thread, 1 phy core,\

+| | ... | [Cfg] DUT runs L2XC switching config with 1 phy core,\

 | | ... | 1 receive queue per NIC port.

 | | ... | [Ver] Measure MaxReceivedRate for 9000B frames using single trial\

 | | ... | throughput test.

 | | ...

-| | [Tags] | 9000B | 1T1C | STHREAD

+| | [Tags] | 9000B | 1C

 | | framesize=${9000} | wt=1 | rxq=1

 

 | tc04-IMIX-1t1c-eth-l2xcbase-eth-1memif-1dcr-mrr

 | | [Documentation]

-| | ... | [Cfg] DUT runs L2XC switching config with 1 thread, 1 phy core,\

+| | ... | [Cfg] DUT runs L2XC switching config 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 | 1T1C | STHREAD

+| | [Tags] | IMIX | 1C

 | | framesize=IMIX_v4_1 | wt=1 | rxq=1

 

 | tc05-64B-2t2c-eth-l2xcbase-eth-1memif-1dcr-mrr

 | | [Documentation]

-| | ... | [Cfg] DUT runs L2XC switching config with 2 threads, 2 phy cores,\

+| | ... | [Cfg] DUT runs L2XC switching config with 2 phy cores,\

 | | ... | 1 receive queue per NIC port.

 | | ... | [Ver] Measure MaxReceivedRate for 64B frames using single trial\

 | | ... | throughput test.

 | | ...

-| | [Tags] | 64B | 2T2C | MTHREAD

+| | [Tags] | 64B | 2C

 | | framesize=${64} | wt=2 | rxq=1

 

 | tc06-1518B-2t2c-eth-l2xcbase-eth-1memif-1dcr-mrr

 | | [Documentation]

-| | ... | [Cfg] DUT runs L2XC switching config with 2 threads, 1 phy cores,\

+| | ... | [Cfg] DUT runs L2XC switching config with 1 phy cores,\

 | | ... | 1 receive queue per NIC port.

 | | ... | [Ver] Measure MaxReceivedRate for 1518B frames using single trial\

 | | ... | throughput test.

 | | ...

-| | [Tags] | 1518B | 2T2C | MTHREAD

+| | [Tags] | 1518B | 2C

 | | framesize=${1518} | wt=2 | rxq=1

 

 | tc07-9000B-2t2c-eth-l2xcbase-eth-1memif-1dcr-mrr

 | | [Documentation]

-| | ... | [Cfg] DUT runs L2XC switching config with 2 threads, 1 phy cores,\

+| | ... | [Cfg] DUT runs L2XC switching config with 1 phy cores,\

 | | ... | 1 receive queue per NIC port.

 | | ... | [Ver] Measure MaxReceivedRate for 9000B frames using single trial\

 | | ... | throughput test.

 | | ...

-| | [Tags] | 9000B | 2T2C | MTHREAD

+| | [Tags] | 9000B | 2C

 | | framesize=${9000} | wt=2 | rxq=1

 

 | tc08-IMIX-2t2c-eth-l2xcbase-eth-1memif-1dcr-mrr

 | | [Documentation]

-| | ... | [Cfg] DUT runs L2XC switching config with 2 threads, 2 phy cores,\

+| | ... | [Cfg] DUT runs L2XC switching config 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 | 2T2C | MTHREAD

+| | [Tags] | IMIX | 2C

 | | framesize=IMIX_v4_1 | wt=2 | rxq=1

 

 | tc09-64B-4t4c-eth-l2xcbase-eth-1memif-1dcr-mrr

 | | [Documentation]

-| | ... | [Cfg] DUT runs L2XC switching config with 4 threads, 4 phy cores,\

+| | ... | [Cfg] DUT runs L2XC switching config with 4 phy cores,\

 | | ... | 2 receive queues per NIC port.

 | | ... | [Ver] Measure MaxReceivedRate for 64B frames using single trial\

 | | ... | throughput test.

 | | ...

-| | [Tags] | 64B | 4T4C | MTHREAD

+| | [Tags] | 64B | 4C

 | | framesize=${64} | wt=4 | rxq=2

 

 | tc10-1518B-4t4c-eth-l2xcbase-eth-1memif-1dcr-mrr

 | | [Documentation]

-| | ... | [Cfg] DUT runs L2XC switching config with 4 threads, 4 phy cores,\

+| | ... | [Cfg] DUT runs L2XC switching config with 4 phy cores,\

 | | ... | 2 receive queues per NIC port.

 | | ... | [Ver] Measure MaxReceivedRate for 1518B frames using single trial\

 | | ... | throughput test.

 | | ...

-| | [Tags] | 1518B | 4T4C | MTHREAD

+| | [Tags] | 1518B | 4C

 | | framesize=${1518} | wt=4 | rxq=2

 

 | tc11-9000B-4t4c-eth-l2xcbase-eth-1memif-1dcr-mrr

 | | [Documentation]

-| | ... | [Cfg] DUT runs L2XC switching config with 4 threads, 4 phy cores,\

+| | ... | [Cfg] DUT runs L2XC switching config with 4 phy cores,\

 | | ... | 2 receive queues per NIC port.

 | | ... | [Ver] Measure MaxReceivedRate for 9000B frames using single trial\

 | | ... | throughput test.

 | | ...

-| | [Tags] | 9000B | 4T4C | MTHREAD

+| | [Tags] | 9000B | 4C

 | | framesize=${9000} | wt=4 | rxq=2

 

 | tc12-IMIX-4t4c-eth-l2xcbase-eth-1memif-1dcr-mrr

 | | [Documentation]

-| | ... | [Cfg] DUT runs L2XC switching config with 4 threads, 4 phy cores,\

+| | ... | [Cfg] DUT runs L2XC switching config 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 | 4T4C | MTHREAD

+| | [Tags] | IMIX | 4C

 | | framesize=IMIX_v4_1 | wt=4 | rxq=2

diff --git a/tests/vpp/perf/container_memif/10ge2p1x710-eth-l2xcbase-eth-1memif-1dcr-ndrpdrdisc.robot b/tests/vpp/perf/container_memif/10ge2p1x710-eth-l2xcbase-eth-1memif-1dcr-ndrpdrdisc.robot
index 5753844ef5..37c8fd8664 100644
--- a/tests/vpp/perf/container_memif/10ge2p1x710-eth-l2xcbase-eth-1memif-1dcr-ndrpdrdisc.robot
+++ b/tests/vpp/perf/container_memif/10ge2p1x710-eth-l2xcbase-eth-1memif-1dcr-ndrpdrdisc.robot
@@ -115,166 +115,166 @@
 *** Test Cases ***

 | tc01-64B-1t1c-eth-l2xcbase-eth-1memif-1dcr-ndrdisc

 | | [Documentation]

-| | ... | [Cfg] DUT runs L2XC switching config with 1 thread, 1 phy core,\

+| | ... | [Cfg] DUT runs L2XC switching config with 1 phy core,\

 | | ... | 1 receive queue per NIC port.

 | | ... | [Ver] Find NDR for 64 Byte frames using binary search start at 10GE\

 | | ... | linerate, step 50kpps.

 | | ...

-| | [Tags] | 64B | 1T1C | STHREAD | NDRDISC

+| | [Tags] | 64B | 1C | NDRDISC

 | | framesize=${64} | wt=1 | rxq=1 | search_type=NDR

 

 | tc02-64B-1t1c-eth-l2xcbase-eth-1memif-1dcr-pdrdisc

 | | [Documentation]

-| | ... | [Cfg] DUT runs L2XC switching config with 1 thread, 1 phy core,\

+| | ... | [Cfg] DUT runs L2XC switching config with 1 phy core,\

 | | ... | 1 receive queue per NIC port.

 | | ... | [Ver] Find PDR for 64 Byte frames using binary search start at 10GE\

 | | ... | linerate, step 50kpps, LT=0.5%.

 | | ...

-| | [Tags] | 64B | 1T1C | STHREAD | PDRDISC

+| | [Tags] | 64B | 1C | PDRDISC

 | | framesize=${64} | wt=1 | rxq=1 | search_type=PDR

 

 | tc03-1518B-1t1c-eth-l2xcbase-eth-1memif-1dcr-ndrdisc

 | | [Documentation]

-| | ... | [Cfg] DUT runs L2XC switching config with 1 thread, 1 phy core,\

+| | ... | [Cfg] DUT runs L2XC switching config with 1 phy core,\

 | | ... | 1 receive queue per NIC port.

 | | ... | [Ver] Find NDR for 1518 Byte frames using binary search start at 10GE\

 | | ... | linerate, step 50kpps.

 | | ...

-| | [Tags] | 1518B | 1T1C | STHREAD | NDRDISC

+| | [Tags] | 1518B | 1C | NDRDISC

 | | framesize=${1518} | wt=1 | rxq=1 | search_type=NDR

 

 | tc04-1518B-1t1c-eth-l2xcbase-eth-1memif-1dcr-pdrdisc

 | | [Documentation]

-| | ... | [Cfg] DUT runs L2XC switching config with 1 thread, 1 phy core,\

+| | ... | [Cfg] DUT runs L2XC switching config with 1 phy core,\

 | | ... | 1 receive queue per NIC port.

 | | ... | [Ver] Find PDR for 1518 Byte frames using binary search start at 10GE\

 | | ... | linerate, step 50kpps, LT=0.5%.

 | | ...

-| | [Tags] | 1518B | 1T1C | STHREAD | PDRDISC

+| | [Tags] | 1518B | 1C | PDRDISC

 | | framesize=${1518} | wt=1 | rxq=1 | search_type=PDR

 

 | tc05-9000B-1t1c-eth-l2xcbase-eth-1memif-1dcr-ndrdisc

 | | [Documentation]

-| | ... | [Cfg] DUT runs L2XC switching config with 1 thread, 1 phy core,\

+| | ... | [Cfg] DUT runs L2XC switching config with 1 phy core,\

 | | ... | 1 receive queue per NIC port.

 | | ... | [Ver] Find NDR for 9000 Byte frames using binary search start at 10GE\

 | | ... | linerate, step 50kpps.

 | | ...

-| | [Tags] | 9000B | 1T1C | STHREAD | NDRDISC

+| | [Tags] | 9000B | 1C | NDRDISC

 | | framesize=${9000} | wt=1 | rxq=1 | search_type=NDR

 

 | tc06-9000B-1t1c-eth-l2xcbase-eth-1memif-1dcr-pdrdisc

 | | [Documentation]

-| | ... | [Cfg] DUT runs L2XC switching config with 1 thread, 1 phy core,\

+| | ... | [Cfg] DUT runs L2XC switching config with 1 phy core,\

 | | ... | 1 receive queue per NIC port.

 | | ... | [Ver] Find PDR for 9000 Byte frames using binary search start at 10GE\

 | | ... | linerate, step 50kpps, LT=0.5%.

 | | ...

-| | [Tags] | 9000B | 1T1C | STHREAD | PDRDISC

+| | [Tags] | 9000B | 1C | PDRDISC

 | | framesize=${9000} | wt=1 | rxq=1 | search_type=PDR

 

 | tc07-IMIX-1t1c-eth-l2xcbase-eth-1memif-1dcr-ndrdisc

 | | [Documentation]

-| | ... | [Cfg] DUT runs L2XC switching config with 1 thread, 1 phy core,\

+| | ... | [Cfg] DUT runs L2XC switching config with 1 phy core,\

 | | ... | 1 receive queue per NIC port.

 | | ... | [Ver] Find NDR for IMIX_v4_1 frames using binary search start at 10GE\

 | | ... | linerate, step 50kpps.

 | | ... | IMIX_v4_1 = (28x64B;16x570B;4x1518B)

 | | ...

-| | [Tags] | IMIX | 1T1C | STHREAD | NDRDISC

+| | [Tags] | IMIX | 1C | NDRDISC

 | | framesize=IMIX_v4_1 | wt=1 | rxq=1 | search_type=NDR

 

 | tc08-IMIX-1t1c-eth-l2xcbase-eth-1memif-1dcr-pdrdisc

 | | [Documentation]

-| | ... | [Cfg] DUT runs L2XC switching config with 1 thread, 1 phy core,\

+| | ... | [Cfg] DUT runs L2XC switching config with 1 phy core,\

 | | ... | 1 receive queue per NIC port.

 | | ... | [Ver] Find PDR for IMIX_v4_1 frames using binary search start at 10GE\

 | | ... | linerate, step 50kpps, LT=0.5%.

 | | ... | IMIX_v4_1 = (28x64B;16x570B;4x1518B)

 | | ...

-| | [Tags] | IMIX | 1T1C | STHREAD | PDRDISC

+| | [Tags] | IMIX | 1C | PDRDISC

 | | framesize=IMIX_v4_1 | wt=1 | rxq=1 | search_type=PDR

 

 | tc09-64B-2t2c-eth-l2xcbase-eth-1memif-1dcr-ndrdisc

 | | [Documentation]

-| | ... | [Cfg] DUT runs L2XC switching config with 2 thread, 2 phy core,\

+| | ... | [Cfg] DUT runs L2XC switching config with 2 phy core,\

 | | ... | 1 receive queue per NIC port.

 | | ... | [Ver] Find NDR for 64 Byte frames using binary search start at 10GE\

 | | ... | linerate, step 50kpps.

 | | ...

-| | [Tags] | 64B | 2T2C | MTHREAD | NDRDISC

+| | [Tags] | 64B | 2C | NDRDISC

 | | framesize=${64} | wt=2 | rxq=1 | search_type=NDR

 

 | tc10-64B-2t2c-eth-l2xcbase-eth-1memif-1dcr-pdrdisc

 | | [Documentation]

-| | ... | [Cfg] DUT runs L2XC switching config with 2 thread, 2 phy core,\

+| | ... | [Cfg] DUT runs L2XC switching config with 2 phy core,\

 | | ... | 1 receive queue per NIC port.

 | | ... | [Ver] Find PDR for 64 Byte frames using binary search start at 10GE\

 | | ... | linerate, step 50kpps, LT=0.5%.

 | | ...

-| | [Tags] | 64B | 1T1C | MTHREAD | PDRDISC

+| | [Tags] | 64B | 1C | PDRDISC

 | | framesize=${64} | wt=2 | rxq=1 | search_type=PDR

 

 | tc11-1518B-2t2c-eth-l2xcbase-eth-1memif-1dcr-ndrdisc

 | | [Documentation]

-| | ... | [Cfg] DUT runs L2XC switching config with 2 thread, 2 phy core,\

+| | ... | [Cfg] DUT runs L2XC switching config with 2 phy core,\

 | | ... | 1 receive queue per NIC port.

 | | ... | [Ver] Find NDR for 1518 Byte frames using binary search start at 10GE\

 | | ... | linerate, step 50kpps.

 | | ...

-| | [Tags] | 1518B | 2T2C | MTHREAD | NDRDISC

+| | [Tags] | 1518B | 2C | NDRDISC

 | | framesize=${1518} | wt=2 | rxq=1 | search_type=NDR

 

 | tc12-1518B-2t2c-eth-l2xcbase-eth-1memif-1dcr-pdrdisc

 | | [Documentation]

-| | ... | [Cfg] DUT runs L2XC switching config with 2 thread, 2 phy core,\

+| | ... | [Cfg] DUT runs L2XC switching config with 2 phy core,\

 | | ... | 1 receive queue per NIC port.

 | | ... | [Ver] Find PDR for 1518 Byte frames using binary search start at 10GE\

 | | ... | linerate, step 50kpps, LT=0.5%.

 | | ...

-| | [Tags] | 1518B | 2T2C | MTHREAD | PDRDISC

+| | [Tags] | 1518B | 2C | PDRDISC

 | | framesize=${1518} | wt=2 | rxq=1 | search_type=PDR

 

 | tc13-9000B-2t2c-eth-l2xcbase-eth-1memif-1dcr-ndrdisc

 | | [Documentation]

-| | ... | [Cfg] DUT runs L2XC switching config with 2 thread, 2 phy core,\

+| | ... | [Cfg] DUT runs L2XC switching config with 2 phy core,\

 | | ... | 1 receive queue per NIC port.

 | | ... | [Ver] Find NDR for 9000 Byte frames using binary search start at 10GE\

 | | ... | linerate, step 50kpps.

 | | ...

-| | [Tags] | 9000B | 2T2C | MTHREAD | NDRDISC

+| | [Tags] | 9000B | 2C | NDRDISC

 | | framesize=${9000} | wt=2 | rxq=1 | search_type=NDR

 

 | tc14-9000B-2t2c-eth-l2xcbase-eth-1memif-1dcr-pdrdisc

 | | [Documentation]

-| | ... | [Cfg] DUT runs L2XC switching config with 2 thread, 2 phy core,\

+| | ... | [Cfg] DUT runs L2XC switching config with 2 phy core,\

 | | ... | 1 receive queue per NIC port.

 | | ... | [Ver] Find PDR for 9000 Byte frames using binary search start at 10GE\

 | | ... | linerate, step 50kpps, LT=0.5%.

 | | ...

-| | [Tags] | 9000B | 2T2C | MTHREAD | PDRDISC

+| | [Tags] | 9000B | 2C | PDRDISC

 | | framesize=${9000} | wt=2 | rxq=1 | search_type=PDR

 

 | tc15-IMIX-2t2c-eth-l2xcbase-eth-1memif-1dcr-ndrdisc

 | | [Documentation]

-| | ... | [Cfg] DUT runs L2XC switching config with 2 thread, 2 phy core,\

+| | ... | [Cfg] DUT runs L2XC switching config with 2 phy core,\

 | | ... | 1 receive queue per NIC port.

 | | ... | [Ver] Find NDR for IMIX_v4_1 frames using binary search start at 10GE\

 | | ... | linerate, step 50kpps.

 | | ... | IMIX_v4_1 = (28x64B;16x570B;4x1518B)

 | | ...

-| | [Tags] | IMIX | 2T2C | MTHREAD | NDRDISC

+| | [Tags] | IMIX | 2C | NDRDISC

 | | framesize=IMIX_v4_1 | wt=2 | rxq=1 | search_type=NDR

 

 | tc16-IMIX-2t2c-eth-l2xcbase-eth-1memif-1dcr-pdrdisc

 | | [Documentation]

-| | ... | [Cfg] DUT runs L2XC switching config with 2 thread, 2 phy core,\

+| | ... | [Cfg] DUT runs L2XC switching config with 2 phy core,\

 | | ... | 1 receive queue per NIC port.

 | | ... | [Ver] Find PDR for IMIX_v4_1 frames using binary search start at 10GE\

 | | ... | linerate, step 50kpps, LT=0.5%.

 | | ... | IMIX_v4_1 = (28x64B;16x570B;4x1518B)

 | | ...

-| | [Tags] | IMIX | 2T2C | MTHREAD | PDRDISC

+| | [Tags] | IMIX | 2C | PDRDISC

 | | framesize=IMIX_v4_1 | wt=2 | rxq=1 | search_type=PDR

 

 | tc17-64B-4t4c-eth-l2xcbase-eth-1memif-1dcr-ndrdisc

@@ -284,7 +284,7 @@
 | | ... | [Ver] Find NDR for 64 Byte frames using binary search start at 10GE\

 | | ... | linerate, step 50kpps.

 | | ...

-| | [Tags] | 64B | 4T4C | MTHREAD | NDRDISC

+| | [Tags] | 64B | 4C | NDRDISC

 | | framesize=${64} |  wt=4 | rxq=2 | search_type=NDR

 

 | tc18-64B-4t4c-eth-l2xcbase-eth-1memif-1dcr-pdrdisc

@@ -294,7 +294,7 @@
 | | ... | [Ver] Find PDR for 64 Byte frames using binary search start at 10GE\

 | | ... | linerate, step 50kpps, LT=0.5%.

 | | ...

-| | [Tags] | 64B | 4T4C | MTHREAD | PDRDISC

+| | [Tags] | 64B | 4C | PDRDISC

 | | framesize=${64} |  wt=4 | rxq=2 | search_type=PDR

 

 | tc19-1518B-4t4c-eth-l2xcbase-eth-1memif-1dcr-ndrdisc

@@ -304,7 +304,7 @@
 | | ... | [Ver] Find NDR for 1518 Byte frames using binary search start at 10GE\

 | | ... | linerate, step 50kpps.

 | | ...

-| | [Tags] | 1518B | 4T4C | MTHREAD | NDRDISC

+| | [Tags] | 1518B | 4C | NDRDISC

 | | framesize=${1518} |  wt=4 | rxq=2 | search_type=NDR

 

 | tc20-1518B-4t4c-eth-l2xcbase-eth-1memif-1dcr-pdrdisc

@@ -314,7 +314,7 @@
 | | ... | [Ver] Find PDR for 1518 Byte frames using binary search start at 10GE\

 | | ... | linerate, step 50kpps, LT=0.5%.

 | | ...

-| | [Tags] | 1518B | 4T4C | MTHREAD | PDRDISC

+| | [Tags] | 1518B | 4C | PDRDISC

 | | framesize=${1518} |  wt=4 | rxq=2 | search_type=PDR

 

 | tc21-9000B-4t4c-eth-l2xcbase-eth-1memif-1dcr-ndrdisc

@@ -324,7 +324,7 @@
 | | ... | [Ver] Find NDR for 9000 Byte frames using binary search start at 10GE\

 | | ... | linerate, step 50kpps.

 | | ...

-| | [Tags] | 9000B | 4T4C | MTHREAD | NDRDISC

+| | [Tags] | 9000B | 4C | NDRDISC

 | | framesize=${9000} |  wt=4 | rxq=2 | search_type=NDR

 

 | tc22-9000B-4t4c-eth-l2xcbase-eth-1memif-1dcr-pdrdisc

@@ -334,7 +334,7 @@
 | | ... | [Ver] Find PDR for 9000 Byte frames using binary search start at 10GE\

 | | ... | linerate, step 50kpps, LT=0.5%.

 | | ...

-| | [Tags] | 9000B | 4T4C | MTHREAD | PDRDISC

+| | [Tags] | 9000B | 4C | PDRDISC

 | | framesize=${9000} |  wt=4 | rxq=2 | search_type=PDR

 

 | tc23-IMIX-4t4c-eth-l2xcbase-eth-1memif-1dcr-ndrdisc

@@ -345,7 +345,7 @@
 | | ... | linerate, step 50kpps.

 | | ... | IMIX_v4_1 = (28x64B;16x570B;4x1518B)

 | | ...

-| | [Tags] | IMIX | 4T4C | MTHREAD | NDRDISC

+| | [Tags] | IMIX | 4C | NDRDISC

 | | framesize=IMIX_v4_1 |  wt=4 | rxq=2 | search_type=NDR

 

 | tc24-IMIX-4t4c-eth-l2xcbase-eth-1memif-1dcr-pdrdisc

@@ -356,5 +356,5 @@
 | | ... | linerate, step 50kpps, LT=0.5%.

 | | ... | IMIX_v4_1 = (28x64B;16x570B;4x1518B)

 | | ...

-| | [Tags] | IMIX | 4T4C | MTHREAD | PDRDISC

+| | [Tags] | IMIX | 4C | PDRDISC

 | | framesize=IMIX_v4_1 | wt=4 | rxq=2 | search_type=PDR

diff --git a/tests/vpp/perf/container_memif/10ge2p1x710-eth-l2xcbase-eth-2memif-1dcr-mrr.robot b/tests/vpp/perf/container_memif/10ge2p1x710-eth-l2xcbase-eth-2memif-1dcr-mrr.robot
index d049eb43e8..aa35b4c958 100644
--- a/tests/vpp/perf/container_memif/10ge2p1x710-eth-l2xcbase-eth-2memif-1dcr-mrr.robot
+++ b/tests/vpp/perf/container_memif/10ge2p1x710-eth-l2xcbase-eth-2memif-1dcr-mrr.robot
@@ -93,135 +93,135 @@
 *** Test Cases ***
 | tc01-64B-1t1c-eth-l2xcbase-eth-2memif-1dcr-mrr
 | | [Documentation]
-| | ... | [Cfg] DUT runs L2XC switching config with 1 thread, 1 phy core,\
+| | ... | [Cfg] DUT runs L2XC switching config with 1 phy core,\
 | | ... | 1 receive queue per NIC port.
 | | ... | [Ver] Measure MaxReceivedRate for 64B frames using single trial\
 | | ... | throughput test.
 | | ...
-| | [Tags] | 64B | 1T1C | STHREAD
+| | [Tags] | 64B | 1C
 | | [Template] | Check RR for l2xcbase-eth-2memif-1dcr
 | | framesize=${64} | wt=1 | rxq=1
 
 | tc02-1518B-1t1c-eth-l2xcbase-eth-2memif-1dcr-mrr
 | | [Documentation]
-| | ... | [Cfg] DUT runs L2XC switching config with 1 thread, 1 phy core,\
+| | ... | [Cfg] DUT runs L2XC switching config with 1 phy core,\
 | | ... | 1 receive queue per NIC port.
 | | ... | [Ver] Measure MaxReceivedRate for 1518B frames using single trial\
 | | ... | throughput test.
 | | ...
-| | [Tags] | 1518B | 1T1C | STHREAD
+| | [Tags] | 1518B | 1C
 | | [Template] | Check RR for l2xcbase-eth-2memif-1dcr
 | | framesize=${1518} | wt=1 | rxq=1
 
 | tc03-9000B-1t1c-eth-l2xcbase-eth-2memif-1dcr-mrr
 | | [Documentation]
-| | ... | [Cfg] DUT runs L2XC switching config with 1 thread, 1 phy core,\
+| | ... | [Cfg] DUT runs L2XC switching config with 1 phy core,\
 | | ... | 1 receive queue per NIC port.
 | | ... | [Ver] Measure MaxReceivedRate for 9000B frames using single trial\
 | | ... | throughput test.
 | | ...
-| | [Tags] | 9000B | 1T1C | STHREAD
+| | [Tags] | 9000B | 1C
 | | [Template] | Check RR for l2xcbase-eth-2memif-1dcr
 | | framesize=${9000} | wt=1 | rxq=1
 
 | tc04-IMIX-1t1c-eth-l2xcbase-eth-2memif-1dcr-mrr
 | | [Documentation]
-| | ... | [Cfg] DUT runs L2XC switching config with 1 thread, 1 phy core,\
+| | ... | [Cfg] DUT runs L2XC switching config 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 | 1T1C | STHREAD
+| | [Tags] | IMIX | 1C
 | | [Template] | Check RR for l2xcbase-eth-2memif-1dcr
 | | framesize=IMIX_v4_1 | wt=1 | rxq=1
 
 | tc05-64B-2t2c-eth-l2xcbase-eth-2memif-1dcr-mrr
 | | [Documentation]
-| | ... | [Cfg] DUT runs L2XC switching config with 2 threads, 2 phy cores,\
+| | ... | [Cfg] DUT runs L2XC switching config with 2 phy cores,\
 | | ... | 1 receive queue per NIC port.
 | | ... | [Ver] Measure MaxReceivedRate for 64B frames using single trial\
 | | ... | throughput test.
 | | ...
-| | [Tags] | 64B | 2T2C | MTHREAD
+| | [Tags] | 64B | 2C
 | | [Template] | Check RR for l2xcbase-eth-2memif-1dcr
 | | framesize=${64} | wt=2 | rxq=1
 
 | tc06-1518B-2t2c-eth-l2xcbase-eth-2memif-1dcr-mrr
 | | [Documentation]
-| | ... | [Cfg] DUT runs L2XC switching config with 2 threads, 1 phy cores,\
+| | ... | [Cfg] DUT runs L2XC switching config with 1 phy cores,\
 | | ... | 1 receive queue per NIC port.
 | | ... | [Ver] Measure MaxReceivedRate for 1518B frames using single trial\
 | | ... | throughput test.
 | | ...
-| | [Tags] | 1518B | 2T2C | MTHREAD
+| | [Tags] | 1518B | 2C
 | | [Template] | Check RR for l2xcbase-eth-2memif-1dcr
 | | framesize=${1518} | wt=2 | rxq=1
 
 | tc07-9000B-2t2c-eth-l2xcbase-eth-2memif-1dcr-mrr
 | | [Documentation]
-| | ... | [Cfg] DUT runs L2XC switching config with 2 threads, 1 phy cores,\
+| | ... | [Cfg] DUT runs L2XC switching config with 1 phy cores,\
 | | ... | 1 receive queue per NIC port.
 | | ... | [Ver] Measure MaxReceivedRate for 9000B frames using single trial\
 | | ... | throughput test.
 | | ...
-| | [Tags] | 9000B | 2T2C | MTHREAD
+| | [Tags] | 9000B | 2C
 | | [Template] | Check RR for l2xcbase-eth-2memif-1dcr
 | | framesize=${9000} | wt=2 | rxq=1
 
 | tc08-IMIX-2t2c-eth-l2xcbase-eth-2memif-1dcr-mrr
 | | [Documentation]
-| | ... | [Cfg] DUT runs L2XC switching config with 2 threads, 2 phy cores,\
+| | ... | [Cfg] DUT runs L2XC switching config 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 | 2T2C | MTHREAD
+| | [Tags] | IMIX | 2C
 | | [Template] | Check RR for l2xcbase-eth-2memif-1dcr
 | | framesize=IMIX_v4_1 | wt=2 | rxq=1
 
 | tc09-64B-4t4c-eth-l2xcbase-eth-2memif-1dcr-mrr
 | | [Documentation]
-| | ... | [Cfg] DUT runs L2XC switching config with 4 threads, 4 phy cores,\
+| | ... | [Cfg] DUT runs L2XC switching config with 4 phy cores,\
 | | ... | 2 receive queues per NIC port.
 | | ... | [Ver] Measure MaxReceivedRate for 64B frames using single trial\
 | | ... | throughput test.
 | | ...
-| | [Tags] | 64B | 4T4C | MTHREAD
+| | [Tags] | 64B | 4C
 | | [Template] | Check RR for l2xcbase-eth-2memif-1dcr
 | | framesize=${64} | wt=4 | rxq=2
 
 | tc10-1518B-4t4c-eth-l2xcbase-eth-2memif-1dcr-mrr
 | | [Documentation]
-| | ... | [Cfg] DUT runs L2XC switching config with 4 threads, 4 phy cores,\
+| | ... | [Cfg] DUT runs L2XC switching config with 4 phy cores,\
 | | ... | 2 receive queues per NIC port.
 | | ... | [Ver] Measure MaxReceivedRate for 1518B frames using single trial\
 | | ... | throughput test.
 | | ...
-| | [Tags] | 1518B | 4T4C | MTHREAD
+| | [Tags] | 1518B | 4C
 | | [Template] | Check RR for l2xcbase-eth-2memif-1dcr
 | | framesize=${1518} | wt=4 | rxq=2
 
 | tc11-9000B-4t4c-eth-l2xcbase-eth-2memif-1dcr-mrr
 | | [Documentation]
-| | ... | [Cfg] DUT runs L2XC switching config with 4 threads, 4 phy cores,\
+| | ... | [Cfg] DUT runs L2XC switching config with 4 phy cores,\
 | | ... | 2 receive queues per NIC port.
 | | ... | [Ver] Measure MaxReceivedRate for 9000B frames using single trial\
 | | ... | throughput test.
 | | ...
-| | [Tags] | 9000B | 4T4C | MTHREAD
+| | [Tags] | 9000B | 4C
 | | [Template] | Check RR for l2xcbase-eth-2memif-1dcr
 | | framesize=${9000} | wt=4 | rxq=2
 
 | tc12-IMIX-4t4c-eth-l2xcbase-eth-2memif-1dcr-mrr
 | | [Documentation]
-| | ... | [Cfg] DUT runs L2XC switching config with 4 threads, 4 phy cores,\
+| | ... | [Cfg] DUT runs L2XC switching config 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 | 4T4C | MTHREAD
+| | [Tags] | IMIX | 4C
 | | [Template] | Check RR for l2xcbase-eth-2memif-1dcr
 | | framesize=IMIX_v4_1 | wt=4 | rxq=2
diff --git a/tests/vpp/perf/container_memif/10ge2p1x710-eth-l2xcbase-eth-2memif-1lxc-mrr.robot b/tests/vpp/perf/container_memif/10ge2p1x710-eth-l2xcbase-eth-2memif-1lxc-mrr.robot
index aad22a7660..0a95636f35 100644
--- a/tests/vpp/perf/container_memif/10ge2p1x710-eth-l2xcbase-eth-2memif-1lxc-mrr.robot
+++ b/tests/vpp/perf/container_memif/10ge2p1x710-eth-l2xcbase-eth-2memif-1lxc-mrr.robot
@@ -92,135 +92,135 @@
 *** Test Cases ***
 | tc01-64B-1t1c-eth-l2xcbase-eth-2memif-1lxc-mrr
 | | [Documentation]
-| | ... | [Cfg] DUT runs L2XC switching config with 1 thread, 1 phy core,\
+| | ... | [Cfg] DUT runs L2XC switching config with 1 phy core,\
 | | ... | 1 receive queue per NIC port.
 | | ... | [Ver] Measure MaxReceivedRate for 64B frames using single trial\
 | | ... | throughput test.
 | | ...
-| | [Tags] | 64B | 1T1C | STHREAD
+| | [Tags] | 64B | 1C
 | | [Template] | Check RR for l2xcbase-eth-2memif-1lxc
 | | framesize=${64} | wt=1 | rxq=1
 
 | tc02-1518B-1t1c-eth-l2xcbase-eth-2memif-1lxc-mrr
 | | [Documentation]
-| | ... | [Cfg] DUT runs L2XC switching config with 1 thread, 1 phy core,\
+| | ... | [Cfg] DUT runs L2XC switching config with 1 phy core,\
 | | ... | 1 receive queue per NIC port.
 | | ... | [Ver] Measure MaxReceivedRate for 1518B frames using single trial\
 | | ... | throughput test.
 | | ...
-| | [Tags] | 1518B | 1T1C | STHREAD
+| | [Tags] | 1518B | 1C
 | | [Template] | Check RR for l2xcbase-eth-2memif-1lxc
 | | framesize=${1518} | wt=1 | rxq=1
 
 | tc03-9000B-1t1c-eth-l2xcbase-eth-2memif-1lxc-mrr
 | | [Documentation]
-| | ... | [Cfg] DUT runs L2XC switching config with 1 thread, 1 phy core,\
+| | ... | [Cfg] DUT runs L2XC switching config with 1 phy core,\
 | | ... | 1 receive queue per NIC port.
 | | ... | [Ver] Measure MaxReceivedRate for 9000B frames using single trial\
 | | ... | throughput test.
 | | ...
-| | [Tags] | 9000B | 1T1C | STHREAD
+| | [Tags] | 9000B | 1C
 | | [Template] | Check RR for l2xcbase-eth-2memif-1lxc
 | | framesize=${9000} | wt=1 | rxq=1
 
 | tc04-IMIX-1t1c-eth-l2xcbase-eth-2memif-1lxc-mrr
 | | [Documentation]
-| | ... | [Cfg] DUT runs L2XC switching config with 1 thread, 1 phy core,\
+| | ... | [Cfg] DUT runs L2XC switching config 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 | 1T1C | STHREAD
+| | [Tags] | IMIX | 1C
 | | [Template] | Check RR for l2xcbase-eth-2memif-1lxc
 | | framesize=IMIX_v4_1 | wt=1 | rxq=1
 
 | tc05-64B-2t2c-eth-l2xcbase-eth-2memif-1lxc-mrr
 | | [Documentation]
-| | ... | [Cfg] DUT runs L2XC switching config with 2 threads, 2 phy cores,\
+| | ... | [Cfg] DUT runs L2XC switching config with 2 phy cores,\
 | | ... | 1 receive queue per NIC port.
 | | ... | [Ver] Measure MaxReceivedRate for 64B frames using single trial\
 | | ... | throughput test.
 | | ...
-| | [Tags] | 64B | 2T2C | MTHREAD
+| | [Tags] | 64B | 2C
 | | [Template] | Check RR for l2xcbase-eth-2memif-1lxc
 | | framesize=${64} | wt=2 | rxq=1
 
 | tc06-1518B-2t2c-eth-l2xcbase-eth-2memif-1lxc-mrr
 | | [Documentation]
-| | ... | [Cfg] DUT runs L2XC switching config with 2 threads, 2 phy cores,\
+| | ... | [Cfg] DUT runs L2XC switching config with 2 phy cores,\
 | | ... | 1 receive queue per NIC port.
 | | ... | [Ver] Measure MaxReceivedRate for 1518B frames using single trial\
 | | ... | throughput test.
 | | ...
-| | [Tags] | 1518B | 2T2C | MTHREAD
+| | [Tags] | 1518B | 2C
 | | [Template] | Check RR for l2xcbase-eth-2memif-1lxc
 | | framesize=${1518} | wt=2 | rxq=1
 
 | tc07-9000B-2t2c-eth-l2xcbase-eth-2memif-1lxc-mrr
 | | [Documentation]
-| | ... | [Cfg] DUT runs L2XC switching config with 2 threads, 2 phy cores,\
+| | ... | [Cfg] DUT runs L2XC switching config with 2 phy cores,\
 | | ... | 1 receive queue per NIC port.
 | | ... | [Ver] Measure MaxReceivedRate for 9000B frames using single trial\
 | | ... | throughput test.
 | | ...
-| | [Tags] | 9000B | 2T2C | MTHREAD
+| | [Tags] | 9000B | 2C
 | | [Template] | Check RR for l2xcbase-eth-2memif-1lxc
 | | framesize=${9000} | wt=2 | rxq=1
 
 | tc08-IMIX-2t2c-eth-l2xcbase-eth-2memif-1lxc-mrr
 | | [Documentation]
-| | ... | [Cfg] DUT runs L2XC switching config with 2 threads, 2 phy cores,\
+| | ... | [Cfg] DUT runs L2XC switching config 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 | 2T2C | MTHREAD
+| | [Tags] | IMIX | 2C
 | | [Template] | Check RR for l2xcbase-eth-2memif-1lxc
 | | framesize=IMIX_v4_1 | wt=2 | rxq=1
 
 | tc09-64B-4t4c-eth-l2xcbase-eth-2memif-1lxc-mrr
 | | [Documentation]
-| | ... | [Cfg] DUT runs L2XC switching config with 4 threads, 4 phy cores,\
+| | ... | [Cfg] DUT runs L2XC switching config with 4 phy cores,\
 | | ... | 2 receive queues per NIC port.
 | | ... | [Ver] Measure MaxReceivedRate for 64B frames using single trial\
 | | ... | throughput test.
 | | ...
-| | [Tags] | 64B | 4T4C | MTHREAD
+| | [Tags] | 64B | 4C
 | | [Template] | Check RR for l2xcbase-eth-2memif-1lxc
 | | framesize=${64} | wt=4 | rxq=2
 
 | tc10-1518B-4t4c-eth-l2xcbase-eth-2memif-1lxc-mrr
 | | [Documentation]
-| | ... | [Cfg] DUT runs L2XC switching config with 4 threads, 4 phy cores,\
+| | ... | [Cfg] DUT runs L2XC switching config with 4 phy cores,\
 | | ... | 2 receive queues per NIC port.
 | | ... | [Ver] Measure MaxReceivedRate for 1518B frames using single trial\
 | | ... | throughput test.
 | | ...
-| | [Tags] | 1518B | 4T4C | MTHREAD
+| | [Tags] | 1518B | 4C
 | | [Template] | Check RR for l2xcbase-eth-2memif-1lxc
 | | framesize=${1518} | wt=4 | rxq=2
 
 | tc11-9000B-4t4c-eth-l2xcbase-eth-2memif-1lxc-mrr
 | | [Documentation]
-| | ... | [Cfg] DUT runs L2XC switching config with 4 threads, 4 phy cores,\
+| | ... | [Cfg] DUT runs L2XC switching config with 4 phy cores,\
 | | ... | 2 receive queues per NIC port.
 | | ... | [Ver] Measure MaxReceivedRate for 9000B frames using single trial\
 | | ... | throughput test.
 | | ...
-| | [Tags] | 9000B | 4T4C | MTHREAD
+| | [Tags] | 9000B | 4C
 | | [Template] | Check RR for l2xcbase-eth-2memif-1lxc
 | | framesize=${9000} | wt=4 | rxq=2
 
 | tc12-IMIX-4t4c-eth-l2xcbase-eth-2memif-1lxc-mrr
 | | [Documentation]
-| | ... | [Cfg] DUT runs L2XC switching config with 4 threads, 4 phy cores,\
+| | ... | [Cfg] DUT runs L2XC switching config 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 | 4T4C | MTHREAD
+| | [Tags] | IMIX | 4C
 | | [Template] | Check RR for l2xcbase-eth-2memif-1lxc
 | | framesize=IMIX_v4_1 | wt=4 | rxq=2
diff --git a/tests/vpp/perf/container_memif/40ge2p1xl710-eth-l2bdbasemaclrn-eth-2memif-1lxc-mrr.robot b/tests/vpp/perf/container_memif/40ge2p1xl710-eth-l2bdbasemaclrn-eth-2memif-1lxc-mrr.robot
index 5254753965..b39d27f635 100644
--- a/tests/vpp/perf/container_memif/40ge2p1xl710-eth-l2bdbasemaclrn-eth-2memif-1lxc-mrr.robot
+++ b/tests/vpp/perf/container_memif/40ge2p1xl710-eth-l2bdbasemaclrn-eth-2memif-1lxc-mrr.robot
@@ -97,135 +97,135 @@
 *** Test Cases ***
 | tc01-64B-1t1c-eth-l2bdbasemaclrn-eth-2memif-1lxc-mrr
 | | [Documentation]
-| | ... | [Cfg] DUT runs L2BD switching config with 1 thread, 1 phy core,\
+| | ... | [Cfg] DUT runs L2BD switching config with 1 phy core,\
 | | ... | 1 receive queue per NIC port.
 | | ... | [Ver] Measure MaxReceivedRate for 64B frames using single trial\
 | | ... | throughput test.
 | | ...
-| | [Tags] | 64B | 1T1C | STHREAD
+| | [Tags] | 64B | 1C
 | | [Template] | Check RR for l2bdbasemaclrn-eth-2memif-1lxc
 | | framesize=${64} | wt=1 | rxq=1
 
 | tc02-1518B-1t1c-eth-l2bdbasemaclrn-eth-2memif-1lxc-mrr
 | | [Documentation]
-| | ... | [Cfg] DUT runs L2BD switching config with 1 thread, 1 phy core,\
+| | ... | [Cfg] DUT runs L2BD switching config with 1 phy core,\
 | | ... | 1 receive queue per NIC port.
 | | ... | [Ver] Measure MaxReceivedRate for 1518B frames using single trial\
 | | ... | throughput test.
 | | ...
-| | [Tags] | 1518B | 1T1C | STHREAD
+| | [Tags] | 1518B | 1C
 | | [Template] | Check RR for l2bdbasemaclrn-eth-2memif-1lxc
 | | framesize=${1518} | wt=1 | rxq=1
 
 | tc03-9000B-1t1c-eth-l2bdbasemaclrn-eth-2memif-1lxc-mrr
 | | [Documentation]
-| | ... | [Cfg] DUT runs L2BD switching config with 1 thread, 1 phy core,\
+| | ... | [Cfg] DUT runs L2BD switching config with 1 phy core,\
 | | ... | 1 receive queue per NIC port.
 | | ... | [Ver] Measure MaxReceivedRate for 9000B frames using single trial\
 | | ... | throughput test.
 | | ...
-| | [Tags] | 9000B | 1T1C | STHREAD
+| | [Tags] | 9000B | 1C
 | | [Template] | Check RR for l2bdbasemaclrn-eth-2memif-1lxc
 | | framesize=${9000} | wt=1 | rxq=1
 
 | tc04-IMIX-1t1c-eth-l2bdbasemaclrn-eth-2memif-1lxc-mrr
 | | [Documentation]
-| | ... | [Cfg] DUT runs L2BD switching config with 1 thread, 1 phy core,\
+| | ... | [Cfg] DUT runs L2BD switching config 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 | 1T1C | STHREAD
+| | [Tags] | IMIX | 1C
 | | [Template] | Check RR for l2bdbasemaclrn-eth-2memif-1lxc
 | | framesize=IMIX_v4_1 | wt=1 | rxq=1
 
 | tc05-64B-2t2c-eth-l2bdbasemaclrn-eth-2memif-1lxc-mrr
 | | [Documentation]
-| | ... | [Cfg] DUT runs L2BD switching config with 2 threads, 2 phy cores,\
+| | ... | [Cfg] DUT runs L2BD switching config with 2 phy cores,\
 | | ... | 1 receive queue per NIC port.
 | | ... | [Ver] Measure MaxReceivedRate for 64B frames using single trial\
 | | ... | throughput test.
 | | ...
-| | [Tags] | 64B | 2T2C | MTHREAD
+| | [Tags] | 64B | 2C
 | | [Template] | Check RR for l2bdbasemaclrn-eth-2memif-1lxc
 | | framesize=${64} | wt=2 | rxq=1
 
 | tc06-1518B-2t2c-eth-l2bdbasemaclrn-eth-2memif-1lxc-mrr
 | | [Documentation]
-| | ... | [Cfg] DUT runs L2BD switching config with 2 threads, 2 phy cores,\
+| | ... | [Cfg] DUT runs L2BD switching config with 2 phy cores,\
 | | ... | 1 receive queue per NIC port.
 | | ... | [Ver] Measure MaxReceivedRate for 1518B frames using single trial\
 | | ... | throughput test.
 | | ...
-| | [Tags] | 1518B | 2T2C | MTHREAD
+| | [Tags] | 1518B | 2C
 | | [Template] | Check RR for l2bdbasemaclrn-eth-2memif-1lxc
 | | framesize=${1518} | wt=2 | rxq=1
 
 | tc07-9000B-2t2c-eth-l2bdbasemaclrn-eth-2memif-1lxc-mrr
 | | [Documentation]
-| | ... | [Cfg] DUT runs L2BD switching config with 2 threads, 2 phy cores,\
+| | ... | [Cfg] DUT runs L2BD switching config with 2 phy cores,\
 | | ... | 1 receive queue per NIC port.
 | | ... | [Ver] Measure MaxReceivedRate for 9000B frames using single trial\
 | | ... | throughput test.
 | | ...
-| | [Tags] | 9000B | 2T2C | MTHREAD
+| | [Tags] | 9000B | 2C
 | | [Template] | Check RR for l2bdbasemaclrn-eth-2memif-1lxc
 | | framesize=${9000} | wt=2 | rxq=1
 
 | tc08-IMIX-2t2c-eth-l2bdbasemaclrn-eth-2memif-1lxc-mrr
 | | [Documentation]
-| | ... | [Cfg] DUT runs L2BD switching config with 2 threads, 2 phy cores,\
+| | ... | [Cfg] DUT runs L2BD switching config 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 | 2T2C | MTHREAD
+| | [Tags] | IMIX | 2C
 | | [Template] | Check RR for l2bdbasemaclrn-eth-2memif-1lxc
 | | framesize=IMIX_v4_1 | wt=2 | rxq=1
 
 | tc09-64B-4t4c-eth-l2bdbasemaclrn-eth-2memif-1lxc-mrr
 | | [Documentation]
-| | ... | [Cfg] DUT runs L2BD switching config with 4 threads, 4 phy cores,\
+| | ... | [Cfg] DUT runs L2BD switching config with 4 phy cores,\
 | | ... | 2 receive queues per NIC port.
 | | ... | [Ver] Measure MaxReceivedRate for 64B frames using single trial\
 | | ... | throughput test.
 | | ...
-| | [Tags] | 64B | 4T4C | MTHREAD
+| | [Tags] | 64B | 4C
 | | [Template] | Check RR for l2bdbasemaclrn-eth-2memif-1lxc
 | | framesize=${64} | wt=4 | rxq=2
 
 | tc10-1518B-4t4c-eth-l2bdbasemaclrn-eth-2memif-1lxc-mrr
 | | [Documentation]
-| | ... | [Cfg] DUT runs L2BD switching config with 4 threads, 4 phy cores,\
+| | ... | [Cfg] DUT runs L2BD switching config with 4 phy cores,\
 | | ... | 2 receive queues per NIC port.
 | | ... | [Ver] Measure MaxReceivedRate for 1518B frames using single trial\
 | | ... | throughput test.
 | | ...
-| | [Tags] | 1518B | 4T4C | MTHREAD
+| | [Tags] | 1518B | 4C
 | | [Template] | Check RR for l2bdbasemaclrn-eth-2memif-1lxc
 | | framesize=${1518} | wt=4 | rxq=2
 
 | tc11-9000B-4t4c-eth-l2bdbasemaclrn-eth-2memif-1lxc-mrr
 | | [Documentation]
-| | ... | [Cfg] DUT runs L2BD switching config with 4 threads, 4 phy cores,\
+| | ... | [Cfg] DUT runs L2BD switching config with 4 phy cores,\
 | | ... | 2 receive queues per NIC port.
 | | ... | [Ver] Measure MaxReceivedRate for 9000B frames using single trial\
 | | ... | throughput test.
 | | ...
-| | [Tags] | 9000B | 4T4C | MTHREAD
+| | [Tags] | 9000B | 4C
 | | [Template] | Check RR for l2bdbasemaclrn-eth-2memif-1lxc
 | | framesize=${9000} | wt=4 | rxq=2
 
 | tc12-IMIX-4t4c-eth-l2bdbasemaclrn-eth-2memif-1lxc-mrr
 | | [Documentation]
-| | ... | [Cfg] DUT runs L2BD switching config with 4 threads, 4 phy cores,\
+| | ... | [Cfg] DUT runs L2BD switching config 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 | 4T4C | MTHREAD
+| | [Tags] | IMIX | 4C
 | | [Template] | Check RR for l2bdbasemaclrn-eth-2memif-1lxc
 | | framesize=IMIX_v4_1 | wt=4 | rxq=2
diff --git a/tests/vpp/perf/container_memif/40ge2p1xl710-eth-l2xcbase-eth-2memif-1lxc-mrr.robot b/tests/vpp/perf/container_memif/40ge2p1xl710-eth-l2xcbase-eth-2memif-1lxc-mrr.robot
index 2e02556435..325adba3ff 100644
--- a/tests/vpp/perf/container_memif/40ge2p1xl710-eth-l2xcbase-eth-2memif-1lxc-mrr.robot
+++ b/tests/vpp/perf/container_memif/40ge2p1xl710-eth-l2xcbase-eth-2memif-1lxc-mrr.robot
@@ -96,135 +96,135 @@
 *** Test Cases ***
 | tc01-64B-1t1c-eth-l2xcbase-eth-2memif-1lxc-mrr
 | | [Documentation]
-| | ... | [Cfg] DUT runs L2XC switching config with 1 thread, 1 phy core,\
+| | ... | [Cfg] DUT runs L2XC switching config with 1 phy core,\
 | | ... | 1 receive queue per NIC port.
 | | ... | [Ver] Measure MaxReceivedRate for 64B frames using single trial\
 | | ... | throughput test.
 | | ...
-| | [Tags] | 64B | 1T1C | STHREAD
+| | [Tags] | 64B | 1C
 | | [Template] | Check RR for l2xcbase-eth-2memif-1lxc
 | | framesize=${64} | wt=1 | rxq=1
 
 | tc02-1518B-1t1c-eth-l2xcbase-eth-2memif-1lxc-mrr
 | | [Documentation]
-| | ... | [Cfg] DUT runs L2XC switching config with 1 thread, 1 phy core,\
+| | ... | [Cfg] DUT runs L2XC switching config with 1 phy core,\
 | | ... | 1 receive queue per NIC port.
 | | ... | [Ver] Measure MaxReceivedRate for 1518B frames using single trial\
 | | ... | throughput test.
 | | ...
-| | [Tags] | 1518B | 1T1C | STHREAD
+| | [Tags] | 1518B | 1C
 | | [Template] | Check RR for l2xcbase-eth-2memif-1lxc
 | | framesize=${1518} | wt=1 | rxq=1
 
 | tc03-9000B-1t1c-eth-l2xcbase-eth-2memif-1lxc-mrr
 | | [Documentation]
-| | ... | [Cfg] DUT runs L2XC switching config with 1 thread, 1 phy core,\
+| | ... | [Cfg] DUT runs L2XC switching config with 1 phy core,\
 | | ... | 1 receive queue per NIC port.
 | | ... | [Ver] Measure MaxReceivedRate for 9000B frames using single trial\
 | | ... | throughput test.
 | | ...
-| | [Tags] | 9000B | 1T1C | STHREAD
+| | [Tags] | 9000B | 1C
 | | [Template] | Check RR for l2xcbase-eth-2memif-1lxc
 | | framesize=${9000} | wt=1 | rxq=1
 
 | tc04-IMIX-1t1c-eth-l2xcbase-eth-2memif-1lxc-mrr
 | | [Documentation]
-| | ... | [Cfg] DUT runs L2XC switching config with 1 thread, 1 phy core,\
+| | ... | [Cfg] DUT runs L2XC switching config 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 | 1T1C | STHREAD
+| | [Tags] | IMIX | 1C
 | | [Template] | Check RR for l2xcbase-eth-2memif-1lxc
 | | framesize=IMIX_v4_1 | wt=1 | rxq=1
 
 | tc05-64B-2t2c-eth-l2xcbase-eth-2memif-1lxc-mrr
 | | [Documentation]
-| | ... | [Cfg] DUT runs L2XC switching config with 2 threads, 2 phy cores,\
+| | ... | [Cfg] DUT runs L2XC switching config with 2 phy cores,\
 | | ... | 1 receive queue per NIC port.
 | | ... | [Ver] Measure MaxReceivedRate for 64B frames using single trial\
 | | ... | throughput test.
 | | ...
-| | [Tags] | 64B | 2T2C | MTHREAD
+| | [Tags] | 64B | 2C
 | | [Template] | Check RR for l2xcbase-eth-2memif-1lxc
 | | framesize=${64} | wt=2 | rxq=1
 
 | tc06-1518B-2t2c-eth-l2xcbase-eth-2memif-1lxc-mrr
 | | [Documentation]
-| | ... | [Cfg] DUT runs L2XC switching config with 2 threads, 2 phy cores,\
+| | ... | [Cfg] DUT runs L2XC switching config with 2 phy cores,\
 | | ... | 1 receive queue per NIC port.
 | | ... | [Ver] Measure MaxReceivedRate for 1518B frames using single trial\
 | | ... | throughput test.
 | | ...
-| | [Tags] | 1518B | 2T2C | MTHREAD
+| | [Tags] | 1518B | 2C
 | | [Template] | Check RR for l2xcbase-eth-2memif-1lxc
 | | framesize=${1518} | wt=2 | rxq=1
 
 | tc07-9000B-2t2c-eth-l2xcbase-eth-2memif-1lxc-mrr
 | | [Documentation]
-| | ... | [Cfg] DUT runs L2XC switching config with 2 threads, 2 phy cores,\
+| | ... | [Cfg] DUT runs L2XC switching config with 2 phy cores,\
 | | ... | 1 receive queue per NIC port.
 | | ... | [Ver] Measure MaxReceivedRate for 9000B frames using single trial\
 | | ... | throughput test.
 | | ...
-| | [Tags] | 9000B | 2T2C | MTHREAD
+| | [Tags] | 9000B | 2C
 | | [Template] | Check RR for l2xcbase-eth-2memif-1lxc
 | | framesize=${9000} | wt=2 | rxq=1
 
 | tc08-IMIX-2t2c-eth-l2xcbase-eth-2memif-1lxc-mrr
 | | [Documentation]
-| | ... | [Cfg] DUT runs L2XC switching config with 2 threads, 2 phy cores,\
+| | ... | [Cfg] DUT runs L2XC switching config 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 | 2T2C | MTHREAD
+| | [Tags] | IMIX | 2C
 | | [Template] | Check RR for l2xcbase-eth-2memif-1lxc
 | | framesize=IMIX_v4_1 | wt=2 | rxq=1
 
 | tc09-64B-4t4c-eth-l2xcbase-eth-2memif-1lxc-mrr
 | | [Documentation]
-| | ... | [Cfg] DUT runs L2XC switching config with 4 threads, 4 phy cores,\
+| | ... | [Cfg] DUT runs L2XC switching config with 4 phy cores,\
 | | ... | 2 receive queues per NIC port.
 | | ... | [Ver] Measure MaxReceivedRate for 64B frames using single trial\
 | | ... | throughput test.
 | | ...
-| | [Tags] | 64B | 4T4C | MTHREAD
+| | [Tags] | 64B | 4C
 | | [Template] | Check RR for l2xcbase-eth-2memif-1lxc
 | | framesize=${64} | wt=4 | rxq=2
 
 | tc10-1518B-4t4c-eth-l2xcbase-eth-2memif-1lxc-mrr
 | | [Documentation]
-| | ... | [Cfg] DUT runs L2XC switching config with 4 threads, 4 phy cores,\
+| | ... | [Cfg] DUT runs L2XC switching config with 4 phy cores,\
 | | ... | 2 receive queues per NIC port.
 | | ... | [Ver] Measure MaxReceivedRate for 1518B frames using single trial\
 | | ... | throughput test.
 | | ...
-| | [Tags] | 1518B | 4T4C | MTHREAD
+| | [Tags] | 1518B | 4C
 | | [Template] | Check RR for l2xcbase-eth-2memif-1lxc
 | | framesize=${1518} | wt=4 | rxq=2
 
 | tc11-9000B-4t4c-eth-l2xcbase-eth-2memif-1lxc-mrr
 | | [Documentation]
-| | ... | [Cfg] DUT runs L2XC switching config with 4 threads, 4 phy cores,\
+| | ... | [Cfg] DUT runs L2XC switching config with 4 phy cores,\
 | | ... | 2 receive queues per NIC port.
 | | ... | [Ver] Measure MaxReceivedRate for 9000B frames using single trial\
 | | ... | throughput test.
 | | ...
-| | [Tags] | 9000B | 4T4C | MTHREAD
+| | [Tags] | 9000B | 4C
 | | [Template] | Check RR for l2xcbase-eth-2memif-1lxc
 | | framesize=${9000} | wt=4 | rxq=2
 
 | tc12-IMIX-4t4c-eth-l2xcbase-eth-2memif-1lxc-mrr
 | | [Documentation]
-| | ... | [Cfg] DUT runs L2XC switching config with 4 threads, 4 phy cores,\
+| | ... | [Cfg] DUT runs L2XC switching config 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 | 4T4C | MTHREAD
+| | [Tags] | IMIX | 4C
 | | [Template] | Check RR for l2xcbase-eth-2memif-1lxc
 | | framesize=IMIX_v4_1 | wt=4 | rxq=2