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>

8 files changed, 208 insertions, 208 deletions

diff --git a/tests/dpdk/perf/10ge2p1x520-eth-l2xcbase-testpmd-mrr.robot b/tests/dpdk/perf/10ge2p1x520-eth-l2xcbase-testpmd-mrr.robot
index 69d617e764..7f942d1494 100644
--- a/tests/dpdk/perf/10ge2p1x520-eth-l2xcbase-testpmd-mrr.robot
+++ b/tests/dpdk/perf/10ge2p1x520-eth-l2xcbase-testpmd-mrr.robot
@@ -72,49 +72,49 @@
 *** Test Cases ***
 | tc01-64B-1t1c-eth-l2xcbase-testpmd-mrr
 | | [Documentation]
-| | ... | [Cfg] DUT runs L2 frame forwarding config with 1 thread, 1 phy core,\
+| | ... | [Cfg] DUT runs L2 frame forwarding 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 eth-l2xcbase-testpmd
 | | framesize=${64} | wt=1 | rxq=1
 
 | tc02-1518B-1t1c-eth-l2xcbase-testpmd-mrr
 | | [Documentation]
-| | ... | [Cfg] DUT runs L2 frame forwarding config with 1 thread, 1 phy core,\
+| | ... | [Cfg] DUT runs L2 frame forwarding 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 eth-l2xcbase-testpmd
 | | framesize=${1518} | wt=1 | rxq=1
 
 | tc03-9000B-1t1c-eth-l2xcbase-testpmd-mrr
 | | [Documentation]
-| | ... | [Cfg] DUT runs L2 frame forwarding config with 1 thread, 1 phy core,\
+| | ... | [Cfg] DUT runs L2 frame forwarding 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 eth-l2xcbase-testpmd
 | | framesize=${9000} | wt=1 | rxq=1
 
 | tc04-IMIX-1t1c-eth-l2xcbase-testpmd-mrr
 | | [Documentation]
-| | ... | [Cfg] DUT runs L2 frame forwarding config with 1 thread, 1 phy core,\
+| | ... | [Cfg] DUT runs L2 frame forwarding 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 eth-l2xcbase-testpmd
 | | framesize=IMIX_v4_1 | wt=1 | rxq=1
@@ -126,7 +126,7 @@
 | | ... | [Ver] Measure MaxReceivedRate for 64B frames using single\
 | | ... | trial throughput test.
 | | ...
-| | [Tags] | 64B | 2T2C | MTHREAD
+| | [Tags] | 64B | 2C
 | | ...
 | | [Template] | Check RR for eth-l2xcbase-testpmd
 | | framesize=${64} | wt=2 | rxq=1
@@ -138,7 +138,7 @@
 | | ... | [Ver] Measure MaxReceivedRate for 1518B frames using single\
 | | ... | trial throughput test.
 | | ...
-| | [Tags] | 1518B | 2T2C | MTHREAD
+| | [Tags] | 1518B | 2C
 | | ...
 | | [Template] | Check RR for eth-l2xcbase-testpmd
 | | framesize=${1518} | wt=2 | rxq=1
@@ -150,7 +150,7 @@
 | | ... | [Ver] Measure MaxReceivedRate for 9000B frames using single\
 | | ... | trial throughput test.
 | | ...
-| | [Tags] | 9000B | 2T2C | MTHREAD
+| | [Tags] | 9000B | 2C
 | | ...
 | | [Template] | Check RR for eth-l2xcbase-testpmd
 | | framesize=${9000} | wt=2 | rxq=1
@@ -163,7 +163,7 @@
 | | ... | trial throughput test.
 | | ... | IMIX_v4_1 = (28x64B; 16x570B; 4x1518B)
 | | ...
-| | [Tags] | IMIX | 2T2C | MTHREAD
+| | [Tags] | IMIX | 2C
 | | ...
 | | [Template] | Check RR for eth-l2xcbase-testpmd
 | | framesize=IMIX_v4_1 | wt=2 | rxq=1
@@ -175,7 +175,7 @@
 | | ... | [Ver] Measure MaxReceivedRate for 64B frames using single\
 | | ... | trial throughput test.
 | | ...
-| | [Tags] | 64B | 4T4C | MTHREAD
+| | [Tags] | 64B | 4C
 | | ...
 | | [Template] | Check RR for eth-l2xcbase-testpmd
 | | framesize=${64} | wt=4 | rxq=2
@@ -187,7 +187,7 @@
 | | ... | [Ver] Measure MaxReceivedRate for 1518B frames using single\
 | | ... | trial throughput test.
 | | ...
-| | [Tags] | 1518B | 4T4C | MTHREAD
+| | [Tags] | 1518B | 4C
 | | ...
 | | [Template] | Check RR for eth-l2xcbase-testpmd
 | | framesize=${1518} | wt=4 | rxq=2
@@ -199,7 +199,7 @@
 | | ... | [Ver] Measure MaxReceivedRate for 9000B frames using single\
 | | ... | trial throughput test.
 | | ...
-| | [Tags] | 9000B | 4T4C | MTHREAD
+| | [Tags] | 9000B | 4C
 | | ...
 | | [Template] | Check RR for eth-l2xcbase-testpmd
 | | framesize=${9000} | wt=4 | rxq=2
@@ -212,7 +212,7 @@
 | | ... | trial throughput test.
 | | ... | IMIX_v4_1 = (28x64B; 16x570B; 4x1518B)
 | | ...
-| | [Tags] | IMIX | 4T4C | MTHREAD
+| | [Tags] | IMIX | 4C
 | | ...
 | | [Template] | Check RR for eth-l2xcbase-testpmd
 | | framesize=IMIX_v4_1 | wt=4 | rxq=2
diff --git a/tests/dpdk/perf/10ge2p1x520-eth-l2xcbase-testpmd-ndrpdrdisc.robot b/tests/dpdk/perf/10ge2p1x520-eth-l2xcbase-testpmd-ndrpdrdisc.robot
index 6077585e61..3194976684 100644
--- a/tests/dpdk/perf/10ge2p1x520-eth-l2xcbase-testpmd-ndrpdrdisc.robot
+++ b/tests/dpdk/perf/10ge2p1x520-eth-l2xcbase-testpmd-ndrpdrdisc.robot
@@ -54,11 +54,11 @@
 *** Test Cases ***
 | tc01-64B-1t1c-eth-l2xcbase-testpmd-ndrdisc
 | | [Documentation]
-| | ... | [Cfg] DUT runs L2 frame forwarding config with 1 thread, 1 phy core,\
+| | ... | [Cfg] DUT runs L2 frame forwarding 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 100kpps.
 | | ...
-| | [Tags] | 64B | 1T1C | STHREAD | NDRDISC
+| | [Tags] | 64B | 1C | NDRDISC
 | | ...
 | | ${framesize}= | Set Variable | ${64}
 | | ${min_rate}= | Set Variable | ${100000}
@@ -73,11 +73,11 @@
 
 | tc02-64B-1t1c-eth-l2xcbase-testpmd-pdrdisc
 | | [Documentation]
-| | ... | [Cfg] DUT runs L2 frame forwarding config with 1 thread, 1 phy core,\
+| | ... | [Cfg] DUT runs L2 frame forwarding 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 100kpps, LT=0.5%.
 | | ...
-| | [Tags] | 64B | 1T1C | STHREAD | PDRDISC | SKIP_PATCH
+| | [Tags] | 64B | 1C | PDRDISC | SKIP_PATCH
 | | ...
 | | ${framesize}= | Set Variable | ${64}
 | | ${min_rate}= | Set Variable | ${100000}
@@ -93,11 +93,11 @@
 
 | tc03-1518B-1t1c-eth-l2xcbase-testpmd-ndrdisc
 | | [Documentation]
-| | ... | [Cfg] DUT runs L2 frame forwarding config with 1 thread, 1 phy core,\
+| | ... | [Cfg] DUT runs L2 frame forwarding 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 10kpps.
 | | ...
-| | [Tags] | 1518B | 1T1C | STHREAD | NDRDISC
+| | [Tags] | 1518B | 1C | NDRDISC
 | | ...
 | | ${framesize}= | Set Variable | ${1518}
 | | ${min_rate}= | Set Variable | ${10000}
@@ -112,11 +112,11 @@
 
 | tc04-1518B-1t1c-eth-l2xcbase-testpmd-pdrdisc
 | | [Documentation]
-| | ... | [Cfg] DUT runs L2 frame forwarding config with 1 thread, 1 phy core,\
+| | ... | [Cfg] DUT runs L2 frame forwarding 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 10kpps, LT=0.5%.
 | | ...
-| | [Tags] | 1518B | 1T1C | STHREAD | PDRDISC | SKIP_PATCH
+| | [Tags] | 1518B | 1C | PDRDISC | SKIP_PATCH
 | | ...
 | | ${framesize}= | Set Variable | ${1518}
 | | ${min_rate}= | Set Variable | ${10000}
@@ -132,11 +132,11 @@
 
 | tc05-9000B-1t1c-eth-l2xcbase-testpmd-ndrdisc
 | | [Documentation]
-| | ... | [Cfg] DUT runs L2 frame forwarding config with 1 thread, 1 phy core,\
+| | ... | [Cfg] DUT runs L2 frame forwarding 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 10kpps.
 | | ...
-| | [Tags] | 9000B | 1T1C | STHREAD | NDRDISC
+| | [Tags] | 9000B | 1C | NDRDISC
 | | ...
 | | ${framesize}= | Set Variable | ${9000}
 | | ${min_rate}= | Set Variable | ${10000}
@@ -151,11 +151,11 @@
 
 | tc06-9000B-1t1c-eth-l2xcbase-testpmd-pdrdisc
 | | [Documentation]
-| | ... | [Cfg] DUT runs L2 frame forwarding config with 1 thread, 1 phy core,\
+| | ... | [Cfg] DUT runs L2 frame forwarding 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 10kpps, LT=0.5%.
 | | ...
-| | [Tags] | 9000B | 1T1C | STHREAD | PDRDISC | SKIP_PATCH
+| | [Tags] | 9000B | 1C | PDRDISC | SKIP_PATCH
 | | ...
 | | ${framesize}= | Set Variable | ${9000}
 | | ${min_rate}= | Set Variable | ${10000}
@@ -171,11 +171,11 @@
 
 | tc07-64B-2t2c-eth-l2xcbase-testpmd-ndrdisc
 | | [Documentation]
-| | ... | [Cfg] DUT runs L2 frame forwarding config with 2 threads, 2 phy\
+| | ... | [Cfg] DUT runs L2 frame forwarding config with 2 phy\
 | | ... | cores, 1 receive queue per NIC port. [Ver] Find NDR for 64 Byte\
 | | ... | frames using binary search start at 10GE linerate, step 100kpps.
 | | ...
-| | [Tags] | 64B | 2T2C | MTHREAD | NDRDISC
+| | [Tags] | 64B | 2C | NDRDISC
 | | ...
 | | ${framesize}= | Set Variable | ${64}
 | | ${min_rate}= | Set Variable | ${100000}
@@ -190,12 +190,12 @@
 
 | tc08-64B-2t2c-eth-l2xcbase-testpmd-pdrdisc
 | | [Documentation]
-| | ... | [Cfg] DUT runs L2 frame forwarding config with 2 threads, 2 phy\
+| | ... | [Cfg] DUT runs L2 frame forwarding config with 2 phy\
 | | ... | cores, 1 receive queue per NIC port. [Ver] Find PDR for 64 Byte\
 | | ... | frames using binary search start at 10GE linerate, step 100kpps,\
 | | ... | LT=0.5%.
 | | ...
-| | [Tags] | 64B | 2T2C | MTHREAD | PDRDISC | SKIP_PATCH
+| | [Tags] | 64B | 2C | PDRDISC | SKIP_PATCH
 | | ...
 | | ${framesize}= | Set Variable | ${64}
 | | ${min_rate}= | Set Variable | ${100000}
@@ -211,11 +211,11 @@
 
 | tc09-1518B-2t2c-eth-l2xcbase-testpmd-ndrdisc
 | | [Documentation]
-| | ... | [Cfg] DUT runs L2 frame forwarding config with 2 threads, 2 phy\
+| | ... | [Cfg] DUT runs L2 frame forwarding config with 2 phy\
 | | ... | cores, 1 receive queue per NIC port. [Ver] Find NDR for 1518 Byte\
 | | ... | frames using binary search start at 10GE linerate, step 10kpps.
 | | ...
-| | [Tags] | 1518B | 2T2C | MTHREAD | NDRDISC | SKIP_PATCH
+| | [Tags] | 1518B | 2C | NDRDISC | SKIP_PATCH
 | | ...
 | | ${framesize}= | Set Variable | ${1518}
 | | ${min_rate}= | Set Variable | ${10000}
@@ -230,12 +230,12 @@
 
 | tc10-1518B-2t2c-eth-l2xcbase-testpmd-pdrdisc
 | | [Documentation]
-| | ... | [Cfg] DUT runs L2 frame forwarding config with 2 threads, 2 phy\
+| | ... | [Cfg] DUT runs L2 frame forwarding config with 2 phy\
 | | ... | cores, 1 receive queue per NIC port. [Ver] Find PDR for 1518 Byte\
 | | ... | frames using binary search start at 10GE linerate, step 10kpps,\
 | | ... | LT=0.5%.
 | | ...
-| | [Tags] | 1518B | 2T2C | MTHREAD | PDRDISC | SKIP_PATCH
+| | [Tags] | 1518B | 2C | PDRDISC | SKIP_PATCH
 | | ...
 | | ${framesize}= | Set Variable | ${1518}
 | | ${min_rate}= | Set Variable | ${10000}
@@ -251,11 +251,11 @@
 
 | tc11-9000B-2t2c-eth-l2xcbase-testpmd-ndrdisc
 | | [Documentation]
-| | ... | [Cfg] DUT runs L2 frame forwarding config with 2 threads, 2 phy\
+| | ... | [Cfg] DUT runs L2 frame forwarding config with 2 phy\
 | | ... | cores, 1 receive queue per NIC port. [Ver] Find NDR for 9000 Byte\
 | | ... | frames using binary search start at 10GE linerate, step 10kpps.
 | | ...
-| | [Tags] | 9000B | 2T2C | MTHREAD | NDRDISC | SKIP_PATCH
+| | [Tags] | 9000B | 2C | NDRDISC | SKIP_PATCH
 | | ...
 | | ${framesize}= | Set Variable | ${9000}
 | | ${min_rate}= | Set Variable | ${10000}
@@ -270,12 +270,12 @@
 
 | tc12-9000B-2t2c-eth-l2xcbase-testpmd-pdrdisc
 | | [Documentation]
-| | ... | [Cfg] DUT runs L2 frame forwarding config with 2 threads, 2 phy\
+| | ... | [Cfg] DUT runs L2 frame forwarding config with 2 phy\
 | | ... | cores, 1 receive queue per NIC port. [Ver] Find PDR for 9000 Byte\
 | | ... | frames using binary search start at 10GE linerate, step 10kpps,\
 | | ... | LT=0.5%.
 | | ...
-| | [Tags] | 9000B | 2T2C | MTHREAD | PDRDISC | SKIP_PATCH
+| | [Tags] | 9000B | 2C | PDRDISC | SKIP_PATCH
 | | ...
 | | ${framesize}= | Set Variable | ${9000}
 | | ${min_rate}= | Set Variable | ${10000}
@@ -291,11 +291,11 @@
 
 | tc13-64B-4t4c-eth-l2xcbase-testpmd-ndrdisc
 | | [Documentation]
-| | ... | [Cfg] DUT runs L2 frame forwarding config with 4 threads, 4 phy\
+| | ... | [Cfg] DUT runs L2 frame forwarding config with 4 phy\
 | | ... | cores, 2 receive queues per NIC port. [Ver] Find NDR for 64 Byte\
 | | ... | frames using binary search start at 10GE linerate, step 100kpps.
 | | ...
-| | [Tags] | 64B | 4T4C | MTHREAD | NDRDISC
+| | [Tags] | 64B | 4C | NDRDISC
 | | ...
 | | ${framesize}= | Set Variable | ${64}
 | | ${min_rate}= | Set Variable | ${100000}
@@ -310,12 +310,12 @@
 
 | tc14-64B-4t4c-eth-l2xcbase-testpmd-pdrdisc
 | | [Documentation]
-| | ... | [Cfg] DUT runs L2 frame forwarding config with 4 threads, 4 phy\
+| | ... | [Cfg] DUT runs L2 frame forwarding config with 4 phy\
 | | ... | cores, 2 receive queues per NIC port. [Ver] Find PDR for 64 Byte\
 | | ... | frames using binary search start at 10GE linerate, step 100kpps,\
 | | ... | LT=0.5%.
 | | ...
-| | [Tags] | 64B | 4T4C | MTHREAD | PDRDISC | SKIP_PATCH
+| | [Tags] | 64B | 4C | PDRDISC | SKIP_PATCH
 | | ...
 | | ${framesize}= | Set Variable | ${64}
 | | ${min_rate}= | Set Variable | ${100000}
@@ -331,11 +331,11 @@
 
 | tc15-1518B-4t4c-eth-l2xcbase-testpmd-ndrdisc
 | | [Documentation]
-| | ... | [Cfg] DUT runs L2 frame forwarding config with 4 threads, 4 phy\
+| | ... | [Cfg] DUT runs L2 frame forwarding config with 4 phy\
 | | ... | cores, 2 receive queues per NIC port. [Ver] Find NDR for 1518 Byte\
 | | ... | frames using binary search start at 10GE linerate, step 10kpps.
 | | ...
-| | [Tags] | 1518B | 4T4C | MTHREAD | NDRDISC | SKIP_PATCH
+| | [Tags] | 1518B | 4C | NDRDISC | SKIP_PATCH
 | | ...
 | | ${framesize}= | Set Variable | ${1518}
 | | ${min_rate}= | Set Variable | ${10000}
@@ -350,12 +350,12 @@
 
 | tc16-1518B-4t4c-eth-l2xcbase-testpmd-pdrdisc
 | | [Documentation]
-| | ... | [Cfg] DUT runs L2 frame forwarding config with 4 threads, 4 phy\
+| | ... | [Cfg] DUT runs L2 frame forwarding config with 4 phy\
 | | ... | cores, 2 receive queues per NIC port. [Ver] Find PDR for 1518 Byte\
 | | ... | frames using binary search start at 10GE linerate, step 10kpps,\
 | | ... | LT=0.5%.
 | | ...
-| | [Tags] | 1518B | 4T4C | MTHREAD | PDRDISC | SKIP_PATCH
+| | [Tags] | 1518B | 4C | PDRDISC | SKIP_PATCH
 | | ...
 | | ${framesize}= | Set Variable | ${1518}
 | | ${min_rate}= | Set Variable | ${10000}
@@ -371,11 +371,11 @@
 
 | tc17-9000B-4t4c-eth-l2xcbase-testpmd-ndrdisc
 | | [Documentation]
-| | ... | [Cfg] DUT runs L2 frame forwarding config with 4 threads, 4 phy\
+| | ... | [Cfg] DUT runs L2 frame forwarding config with 4 phy\
 | | ... | cores, 2 receive queues per NIC port. [Ver] Find NDR for 9000 Byte\
 | | ... | frames using binary search start at 10GE linerate, step 10kpps.
 | | ...
-| | [Tags] | 9000B | 4T4C | MTHREAD | NDRDISC | SKIP_PATCH
+| | [Tags] | 9000B | 4C | NDRDISC | SKIP_PATCH
 | | ...
 | | ${framesize}= | Set Variable | ${9000}
 | | ${min_rate}= | Set Variable | ${10000}
@@ -390,12 +390,12 @@
 
 | tc18-9000B-4t4c-eth-l2xcbase-testpmd-pdrdisc
 | | [Documentation]
-| | ... | [Cfg] DUT runs L2 frame forwarding config with 4 threads, 4 phy\
+| | ... | [Cfg] DUT runs L2 frame forwarding config with 4 phy\
 | | ... | cores, 2 receive queues per NIC port. [Ver] Find PDR for 9000 Byte
 | | ... | frames using binary search start at 10GE linerate, step 5kpps,\
 | | ... | LT=0.5%.
 | | ...
-| | [Tags] | 9000B | 4T4C | MTHREAD | PDRDISC | SKIP_PATCH
+| | [Tags] | 9000B | 4C | PDRDISC | SKIP_PATCH
 | | ...
 | | ${framesize}= | Set Variable | ${9000}
 | | ${min_rate}= | Set Variable | ${10000}
diff --git a/tests/dpdk/perf/10ge2p1x520-ethip4-ip4base-l3fwd-mrr.robot b/tests/dpdk/perf/10ge2p1x520-ethip4-ip4base-l3fwd-mrr.robot
index afc39c4820..5cf6a4412a 100644
--- a/tests/dpdk/perf/10ge2p1x520-ethip4-ip4base-l3fwd-mrr.robot
+++ b/tests/dpdk/perf/10ge2p1x520-ethip4-ip4base-l3fwd-mrr.robot
@@ -71,49 +71,49 @@
 *** Test Cases ***
 | tc01-64B-1t1c-ethip4-ip4base-l3fwd-mrr
 | | [Documentation]
-| | ... | [Cfg] DUT runs L3 IPv4 routing config with 1 thread, 1 phy core,\
+| | ... | [Cfg] DUT runs L3 IPv4 routing 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 ethip4-ip4base-l3fwd
 | | framesize=${64} | wt=1 | rxq=1
 
 | tc02-1518B-1t1c-ethip4-ip4base-l3fwd-mrr
 | | [Documentation]
-| | ... | [Cfg] DUT runs L3 IPv4 routing config with 1 thread, 1 phy core,\
+| | ... | [Cfg] DUT runs L3 IPv4 routing 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 ethip4-ip4base-l3fwd
 | | framesize=${1518} | wt=1 | rxq=1
 
 | tc03-9000B-1t1c-ethip4-ip4base-l3fwd-mrr
 | | [Documentation]
-| | ... | [Cfg] DUT runs L3 IPv4 routing config with 1 thread, 1 phy core,\
+| | ... | [Cfg] DUT runs L3 IPv4 routing 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 ethip4-ip4base-l3fwd
 | | framesize=${9000} | wt=1 | rxq=1
 
 | tc04-IMIX-1t1c-ethip4-ip4base-l3fwd-mrr
 | | [Documentation]
-| | ... | [Cfg] DUT runs L3 IPv4 routing config with 1 thread, 1 phy core,\
+| | ... | [Cfg] DUT runs L3 IPv4 routing 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 ethip4-ip4base-l3fwd
 | | framesize=IMIX_v4_1 | wt=1 | rxq=1
@@ -125,7 +125,7 @@
 | | ... | [Ver] Measure MaxReceivedRate for 64B frames using single\
 | | ... | trial throughput test.
 | | ...
-| | [Tags] | 64B | 2T2C | MTHREAD
+| | [Tags] | 64B | 2C
 | | ...
 | | [Template] | Check RR for ethip4-ip4base-l3fwd
 | | framesize=${64} | wt=2 | rxq=1
@@ -137,7 +137,7 @@
 | | ... | [Ver] Measure MaxReceivedRate for 1518B frames using single\
 | | ... | trial throughput test.
 | | ...
-| | [Tags] | 1518B | 2T2C | MTHREAD
+| | [Tags] | 1518B | 2C
 | | ...
 | | [Template] | Check RR for ethip4-ip4base-l3fwd
 | | framesize=${1518} | wt=2 | rxq=1
@@ -149,7 +149,7 @@
 | | ... | [Ver] Measure MaxReceivedRate for 9000B frames using single\
 | | ... | trial throughput test.
 | | ...
-| | [Tags] | 9000B | 2T2C | MTHREAD
+| | [Tags] | 9000B | 2C
 | | ...
 | | [Template] | Check RR for ethip4-ip4base-l3fwd
 | | framesize=${9000} | wt=2 | rxq=1
@@ -162,7 +162,7 @@
 | | ... | trial throughput test.
 | | ... | IMIX_v4_1 = (28x64B; 16x570B; 4x1518B)
 | | ...
-| | [Tags] | IMIX | 2T2C | MTHREAD
+| | [Tags] | IMIX | 2C
 | | ...
 | | [Template] | Check RR for ethip4-ip4base-l3fwd
 | | framesize=IMIX_v4_1 | wt=2 | rxq=1
@@ -174,7 +174,7 @@
 | | ... | [Ver] Measure MaxReceivedRate for 64B frames using single\
 | | ... | trial throughput test.
 | | ...
-| | [Tags] | 64B | 4T4C | MTHREAD
+| | [Tags] | 64B | 4C
 | | ...
 | | [Template] | Check RR for ethip4-ip4base-l3fwd
 | | framesize=${64} | wt=4 | rxq=2
@@ -186,7 +186,7 @@
 | | ... | [Ver] Measure MaxReceivedRate for 1518B frames using single\
 | | ... | trial throughput test.
 | | ...
-| | [Tags] | 1518B | 4T4C | MTHREAD
+| | [Tags] | 1518B | 4C
 | | ...
 | | [Template] | Check RR for ethip4-ip4base-l3fwd
 | | framesize=${1518} | wt=4 | rxq=2
@@ -198,7 +198,7 @@
 | | ... | [Ver] Measure MaxReceivedRate for 9000B frames using single\
 | | ... | trial throughput test.
 | | ...
-| | [Tags] | 9000B | 4T4C | MTHREAD
+| | [Tags] | 9000B | 4C
 | | ...
 | | [Template] | Check RR for ethip4-ip4base-l3fwd
 | | framesize=${9000} | wt=4 | rxq=2
@@ -211,7 +211,7 @@
 | | ... | trial throughput test.
 | | ... | IMIX_v4_1 = (28x64B; 16x570B; 4x1518B)
 | | ...
-| | [Tags] | IMIX | 4T4C | MTHREAD
+| | [Tags] | IMIX | 4C
 | | ...
 | | [Template] | Check RR for ethip4-ip4base-l3fwd
 | | framesize=IMIX_v4_1 | wt=4 | rxq=2
diff --git a/tests/dpdk/perf/10ge2p1x520-ethip4-ip4base-l3fwd-ndrpdrdisc.robot b/tests/dpdk/perf/10ge2p1x520-ethip4-ip4base-l3fwd-ndrpdrdisc.robot
index b31c8a4e39..d72c4233a4 100644
--- a/tests/dpdk/perf/10ge2p1x520-ethip4-ip4base-l3fwd-ndrpdrdisc.robot
+++ b/tests/dpdk/perf/10ge2p1x520-ethip4-ip4base-l3fwd-ndrpdrdisc.robot
@@ -53,12 +53,12 @@
 *** Test Cases ***
 | tc01-64B-1t1c-ethip4-ip4base-l3fwd-ndrdisc
 | | [Documentation]
-| | ... | [Cfg] DUT runs L3 IPv4 routing config with 1 thread, 1 phy core,\
+| | ... | [Cfg] DUT runs L3 IPv4 routing 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 100kpps.
 | | ...
-| | [Tags] | 64B | 1T1C | STHREAD | NDRDISC
+| | [Tags] | 64B | 1C | NDRDISC
 | | ...
 | | ${framesize}= | Set Variable | ${64}
 | | ${min_rate}= | Set Variable | ${100000}
@@ -73,12 +73,12 @@
 
 | tc02-64B-1t1c-ethip4-ip4base-l3fwd-pdrdisc
 | | [Documentation]
-| | ... | [Cfg] DUT runs L3 IPv4 routing config with 1 thread, 1 phy core,\
+| | ... | [Cfg] DUT runs L3 IPv4 routing 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 100kpps, LT=0.5%.
 | | ...
-| | [Tags] | 64B | 1T1C | STHREAD | PDRDISC | SKIP_PATCH
+| | [Tags] | 64B | 1C | PDRDISC | SKIP_PATCH
 | | ...
 | | ${framesize}= | Set Variable | ${64}
 | | ${min_rate}= | Set Variable | ${100000}
@@ -94,12 +94,12 @@
 
 | tc03-1518B-1t1c-ethip4-ip4base-l3fwd-ndrdisc
 | | [Documentation]
-| | ... | [Cfg] DUT runs L3 IPv4 routing config with 1 thread, 1 phy core,\
+| | ... | [Cfg] DUT runs L3 IPv4 routing 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 10kpps.
 | | ...
-| | [Tags] | 1518B | 1T1C | STHREAD | NDRDISC
+| | [Tags] | 1518B | 1C | NDRDISC
 | | ...
 | | ${framesize}= | Set Variable | ${1518}
 | | ${min_rate}= | Set Variable | ${10000}
@@ -114,12 +114,12 @@
 
 | tc04-1518B-1t1c-ethip4-ip4base-l3fwd-pdrdisc
 | | [Documentation]
-| | ... | [Cfg] DUT runs L3 IPv4 routing config with 1 thread, 1 phy core,\
+| | ... | [Cfg] DUT runs L3 IPv4 routing 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 10kpps, LT=0.5%.
 | | ...
-| | [Tags] | 1518B | 1T1C | STHREAD | PDRDISC | SKIP_PATCH
+| | [Tags] | 1518B | 1C | PDRDISC | SKIP_PATCH
 | | ...
 | | ${framesize}= | Set Variable | ${1518}
 | | ${min_rate}= | Set Variable | ${10000}
@@ -135,12 +135,12 @@
 
 | tc05-9000B-1t1c-ethip4-ip4base-l3fwd-ndrdisc
 | | [Documentation]
-| | ... | [Cfg] DUT runs L3 IPv4 routing config with 1 thread, 1 phy core,\
+| | ... | [Cfg] DUT runs L3 IPv4 routing 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 5kpps.
 | | ...
-| | [Tags] | 9000B | 1T1C | STHREAD | NDRDISC
+| | [Tags] | 9000B | 1C | NDRDISC
 | | ...
 | | ${framesize}= | Set Variable | ${9000}
 | | ${min_rate}= | Set Variable | ${10000}
@@ -155,12 +155,12 @@
 
 | tc06-9000B-1t1c-ethip4-ip4base-l3fwd-pdrdisc
 | | [Documentation]
-| | ... | [Cfg] DUT runs L3 IPv4 routing config with 1 thread, 1 phy core,\
+| | ... | [Cfg] DUT runs L3 IPv4 routing 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 5kpps, LT=0.5%.
 | | ...
-| | [Tags] | 9000B | 1T1C | STHREAD | PDRDISC | SKIP_PATCH
+| | [Tags] | 9000B | 1C | PDRDISC | SKIP_PATCH
 | | ...
 | | ${framesize}= | Set Variable | ${9000}
 | | ${min_rate}= | Set Variable | ${10000}
@@ -176,12 +176,12 @@
 
 | tc07-64B-2t2c-ethip4-ip4base-l3fwd-ndrdisc
 | | [Documentation]
-| | ... | [Cfg] DUT runs L3 IPv4 routing config with 2 threads, 2 phy cores,\
+| | ... | [Cfg] DUT runs L3 IPv4 routing config with 2 phy cores,\
 | | ... | 1 receive queue per NIC port.
 | | ... | [Ver] Find NDR for 64 Byte frames using binary search start\
 | | ... | at 10GE linerate, step 100kpps.
 | | ...
-| | [Tags] | 64B | 2T2C | MTHREAD | NDRDISC
+| | [Tags] | 64B | 2C | NDRDISC
 | | ...
 | | ${framesize}= | Set Variable | ${64}
 | | ${min_rate}= | Set Variable | ${100000}
@@ -196,12 +196,12 @@
 
 | tc08-64B-2t2c-ethip4-ip4base-l3fwd-pdrdisc
 | | [Documentation]
-| | ... | [Cfg] DUT runs L3 IPv4 routing config with 2 threads, 2 phy cores,\
+| | ... | [Cfg] DUT runs L3 IPv4 routing config with 2 phy cores,\
 | | ... | 1 receive queue per NIC port.
 | | ... | [Ver] Find PDR for 64 Byte frames using binary search start\
 | | ... | at 10GE linerate, step 100kpps, LT=0.5%.
 | | ...
-| | [Tags] | 64B | 2T2C | MTHREAD | PDRDISC | SKIP_PATCH
+| | [Tags] | 64B | 2C | PDRDISC | SKIP_PATCH
 | | ...
 | | ${framesize}= | Set Variable | ${64}
 | | ${min_rate}= | Set Variable | ${100000}
@@ -217,12 +217,12 @@
 
 | tc09-1518B-2t2c-ethip4-ip4base-l3fwd-ndrdisc
 | | [Documentation]
-| | ... | [Cfg] DUT runs L3 IPv4 routing config with 2 threads, 2 phy cores,\
+| | ... | [Cfg] DUT runs L3 IPv4 routing config with 2 phy cores,\
 | | ... | 1 receive queue per NIC port.
 | | ... | [Ver] Find NDR for 1518 Byte frames using binary search start\
 | | ... | at 10GE linerate, step 10kpps.
 | | ...
-| | [Tags] | 1518B | 2T2C | MTHREAD | NDRDISC
+| | [Tags] | 1518B | 2C | NDRDISC
 | | ...
 | | ${framesize}= | Set Variable | ${1518}
 | | ${min_rate}= | Set Variable | ${10000}
@@ -237,12 +237,12 @@
 
 | tc10-1518B-2t2c-ethip4-ip4base-l3fwd-pdrdisc
 | | [Documentation]
-| | ... | [Cfg] DUT runs L3 IPv4 routing config with 2 threads, 2 phy cores,\
+| | ... | [Cfg] DUT runs L3 IPv4 routing config with 2 phy cores,\
 | | ... | 1 receive queue per NIC port.
 | | ... | [Ver] Find PDR for 1518 Byte frames using binary search start\
 | | ... | at 10GE linerate, step 10kpps, LT=0.5%.
 | | ...
-| | [Tags] | 1518B | 2T2C | MTHREAD | PDRDISC | SKIP_PATCH
+| | [Tags] | 1518B | 2C | PDRDISC | SKIP_PATCH
 | | ...
 | | ${framesize}= | Set Variable | ${1518}
 | | ${min_rate}= | Set Variable | ${10000}
@@ -258,12 +258,12 @@
 
 | tc11-9000B-2t2c-ethip4-ip4base-l3fwd-ndrdisc
 | | [Documentation]
-| | ... | [Cfg] DUT runs L3 IPv4 routing config with 2 threads, 2 phy cores,\
+| | ... | [Cfg] DUT runs L3 IPv4 routing config with 2 phy cores,\
 | | ... | 1 receive queue per NIC port.
 | | ... | [Ver] Find NDR for 9000 Byte frames using binary search start\
 | | ... | at 10GE linerate, step 5kpps.
 | | ...
-| | [Tags] | 9000B | 2T2C | MTHREAD | NDRDISC
+| | [Tags] | 9000B | 2C | NDRDISC
 | | ...
 | | ${framesize}= | Set Variable | ${9000}
 | | ${min_rate}= | Set Variable | ${10000}
@@ -278,12 +278,12 @@
 
 | tc12-9000B-2t2c-ethip4-ip4base-l3fwd-pdrdisc
 | | [Documentation]
-| | ... | [Cfg] DUT runs L3 IPv4 routing config with 2 threads, 2 phy cores,\
+| | ... | [Cfg] DUT runs L3 IPv4 routing config with 2 phy cores,\
 | | ... | 1 receive queue per NIC port.
 | | ... | [Ver] Find PDR for 9000 Byte frames using binary search start\
 | | ... | at 10GE linerate, step 5kpps, LT=0.5%.
 | | ...
-| | [Tags] | 9000B | 2T2C | MTHREAD | PDRDISC | SKIP_PATCH
+| | [Tags] | 9000B | 2C | PDRDISC | SKIP_PATCH
 | | ...
 | | ${framesize}= | Set Variable | ${9000}
 | | ${min_rate}= | Set Variable | ${10000}
@@ -299,12 +299,12 @@
 
 | tc13-64B-4t4c-ethip4-ip4base-l3fwd-ndrdisc
 | | [Documentation]
-| | ... | [Cfg] DUT runs L3 IPv4 routing config with 4 threads, 4 phy cores,\
+| | ... | [Cfg] DUT runs L3 IPv4 routing config with 4 phy cores,\
 | | ... | 2 receive queues per NIC port.
 | | ... | [Ver] Find NDR for 64 Byte frames using binary search start\
 | | ... | at 10GE linerate, step 100kpps.
 | | ...
-| | [Tags] | 64B | 4T4C | MTHREAD | NDRDISC
+| | [Tags] | 64B | 4C | NDRDISC
 | | ...
 | | ${framesize}= | Set Variable | ${64}
 | | ${min_rate}= | Set Variable | ${100000}
@@ -319,12 +319,12 @@
 
 | tc14-64B-4t4c-ethip4-ip4base-l3fwd-pdrdisc
 | | [Documentation]
-| | ... | [Cfg] DUT runs L3 IPv4 routing config with 4 threads, 4 phy cores,\
+| | ... | [Cfg] DUT runs L3 IPv4 routing config with 4 phy cores,\
 | | ... | 2 receive queues per NIC port.
 | | ... | [Ver] Find PDR for 64 Byte frames using binary search start\
 | | ... | at 10GE linerate, step 100kpps, LT=0.5%.
 | | ...
-| | [Tags] | 64B | 4T4C | MTHREAD | PDRDISC | SKIP_PATCH
+| | [Tags] | 64B | 4C | PDRDISC | SKIP_PATCH
 | | ...
 | | ${framesize}= | Set Variable | ${64}
 | | ${min_rate}= | Set Variable | ${100000}
@@ -340,12 +340,12 @@
 
 | tc15-1518B-4t4c-ethip4-ip4base-l3fwd-ndrdisc
 | | [Documentation]
-| | ... | [Cfg] DUT runs L3 IPv4 routing config with 4 threads, 4 phy cores,\
+| | ... | [Cfg] DUT runs L3 IPv4 routing config with 4 phy cores,\
 | | ... | 2 receive queues per NIC port.
 | | ... | [Ver] Find NDR for 1518 Byte frames using binary search start\
 | | ... | at 10GE linerate, step 10kpps.
 | | ...
-| | [Tags] | 1518B | 4T4C | MTHREAD | NDRDISC | SKIP_PATCH
+| | [Tags] | 1518B | 4C | NDRDISC | SKIP_PATCH
 | | ...
 | | ${framesize}= | Set Variable | ${1518}
 | | ${min_rate}= | Set Variable | ${10000}
@@ -360,12 +360,12 @@
 
 | tc16-1518B-4t4c-ethip4-ip4base-l3fwd-pdrdisc
 | | [Documentation]
-| | ... | [Cfg] DUT runs L3 IPv4 routing config with 4 threads, 4 phy cores,\
+| | ... | [Cfg] DUT runs L3 IPv4 routing config with 4 phy cores,\
 | | ... | 2 receive queues per NIC port.
 | | ... | [Ver] Find PDR for 1518 Byte frames using binary search start\
 | | ... | at 10GE linerate, step 10kpps, LT=0.5%.
 | | ...
-| | [Tags] | 1518B | 4T4C | MTHREAD | PDRDISC | SKIP_PATCH
+| | [Tags] | 1518B | 4C | PDRDISC | SKIP_PATCH
 | | ...
 | | ${framesize}= | Set Variable | ${1518}
 | | ${min_rate}= | Set Variable | ${10000}
@@ -381,12 +381,12 @@
 
 | tc17-9000B-4t4c-ethip4-ip4base-l3fwd-ndrdisc
 | | [Documentation]
-| | ... | [Cfg] DUT runs L3 IPv4 routing config with 4 threads, 4 phy cores,\
+| | ... | [Cfg] DUT runs L3 IPv4 routing config with 4 phy cores,\
 | | ... | 2 receive queues per NIC port.
 | | ... | [Ver] Find NDR for 9000 Byte frames using binary search start\
 | | ... | at 10GE linerate, step 5kpps.
 | | ...
-| | [Tags] | 9000B | 4T4C | MTHREAD | NDRDISC | SKIP_PATCH
+| | [Tags] | 9000B | 4C | NDRDISC | SKIP_PATCH
 | | ...
 | | ${framesize}= | Set Variable | ${9000}
 | | ${min_rate}= | Set Variable | ${10000}
@@ -401,12 +401,12 @@
 
 | tc18-9000B-4t4c-ethip4-ip4base-l3fwd-pdrdisc
 | | [Documentation]
-| | ... | [Cfg] DUT runs L3 IPv4 routing config with 4 threads, 4 phy cores,\
+| | ... | [Cfg] DUT runs L3 IPv4 routing config with 4 phy cores,\
 | | ... | 2 receive queues per NIC port.
 | | ... | [Ver] Find PDR for 9000 Byte frames using binary search start\
 | | ... | at 10GE linerate, step 5kpps, LT=0.5%.
 | | ...
-| | [Tags] | 9000B | 4T4C | MTHREAD | PDRDISC | SKIP_PATCH
+| | [Tags] | 9000B | 4C | PDRDISC | SKIP_PATCH
 | | ...
 | | ${framesize}= | Set Variable | ${9000}
 | | ${min_rate}= | Set Variable | ${10000}
diff --git a/tests/dpdk/perf/10ge2p1x710-eth-l2xcbase-testpmd-mrr.robot b/tests/dpdk/perf/10ge2p1x710-eth-l2xcbase-testpmd-mrr.robot
index 14e3fe378e..4adfcca1a0 100644
--- a/tests/dpdk/perf/10ge2p1x710-eth-l2xcbase-testpmd-mrr.robot
+++ b/tests/dpdk/perf/10ge2p1x710-eth-l2xcbase-testpmd-mrr.robot
@@ -72,49 +72,49 @@
 *** Test Cases ***
 | tc01-64B-1t1c-eth-l2xcbase-testpmd-mrr
 | | [Documentation]
-| | ... | [Cfg] DUT runs L2 frame forwarding config with 1 thread, 1 phy core,\
+| | ... | [Cfg] DUT runs L2 frame forwarding 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 eth-l2xcbase-testpmd
 | | framesize=${64} | wt=1 | rxq=1
 
 | tc02-1518B-1t1c-eth-l2xcbase-testpmd-mrr
 | | [Documentation]
-| | ... | [Cfg] DUT runs L2 frame forwarding config with 1 thread, 1 phy core,\
+| | ... | [Cfg] DUT runs L2 frame forwarding 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 eth-l2xcbase-testpmd
 | | framesize=${1518} | wt=1 | rxq=1
 
 | tc03-9000B-1t1c-eth-l2xcbase-testpmd-mrr
 | | [Documentation]
-| | ... | [Cfg] DUT runs L2 frame forwarding config with 1 thread, 1 phy core,\
+| | ... | [Cfg] DUT runs L2 frame forwarding 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 eth-l2xcbase-testpmd
 | | framesize=${9000} | wt=1 | rxq=1
 
 | tc04-IMIX-1t1c-eth-l2xcbase-testpmd-mrr
 | | [Documentation]
-| | ... | [Cfg] DUT runs L2 frame forwarding config with 1 thread, 1 phy core,\
+| | ... | [Cfg] DUT runs L2 frame forwarding 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 eth-l2xcbase-testpmd
 | | framesize=IMIX_v4_1 | wt=1 | rxq=1
@@ -126,7 +126,7 @@
 | | ... | [Ver] Measure MaxReceivedRate for 64B frames using single\
 | | ... | trial throughput test.
 | | ...
-| | [Tags] | 64B | 2T2C | MTHREAD
+| | [Tags] | 64B | 2C
 | | ...
 | | [Template] | Check RR for eth-l2xcbase-testpmd
 | | framesize=${64} | wt=2 | rxq=1
@@ -138,7 +138,7 @@
 | | ... | [Ver] Measure MaxReceivedRate for 1518B frames using single\
 | | ... | trial throughput test.
 | | ...
-| | [Tags] | 1518B | 2T2C | MTHREAD
+| | [Tags] | 1518B | 2C
 | | ...
 | | [Template] | Check RR for eth-l2xcbase-testpmd
 | | framesize=${1518} | wt=2 | rxq=1
@@ -150,7 +150,7 @@
 | | ... | [Ver] Measure MaxReceivedRate for 9000B frames using single\
 | | ... | trial throughput test.
 | | ...
-| | [Tags] | 9000B | 2T2C | MTHREAD
+| | [Tags] | 9000B | 2C
 | | ...
 | | [Template] | Check RR for eth-l2xcbase-testpmd
 | | framesize=${9000} | wt=2 | rxq=1
@@ -163,7 +163,7 @@
 | | ... | trial throughput test.
 | | ... | IMIX_v4_1 = (28x64B; 16x570B; 4x1518B)
 | | ...
-| | [Tags] | IMIX | 2T2C | MTHREAD
+| | [Tags] | IMIX | 2C
 | | ...
 | | [Template] | Check RR for eth-l2xcbase-testpmd
 | | framesize=IMIX_v4_1 | wt=2 | rxq=1
@@ -175,7 +175,7 @@
 | | ... | [Ver] Measure MaxReceivedRate for 64B frames using single\
 | | ... | trial throughput test.
 | | ...
-| | [Tags] | 64B | 4T4C | MTHREAD
+| | [Tags] | 64B | 4C
 | | ...
 | | [Template] | Check RR for eth-l2xcbase-testpmd
 | | framesize=${64} | wt=4 | rxq=2
@@ -187,7 +187,7 @@
 | | ... | [Ver] Measure MaxReceivedRate for 1518B frames using single\
 | | ... | trial throughput test.
 | | ...
-| | [Tags] | 1518B | 4T4C | MTHREAD
+| | [Tags] | 1518B | 4C
 | | ...
 | | [Template] | Check RR for eth-l2xcbase-testpmd
 | | framesize=${1518} | wt=4 | rxq=2
@@ -199,7 +199,7 @@
 | | ... | [Ver] Measure MaxReceivedRate for 9000B frames using single\
 | | ... | trial throughput test.
 | | ...
-| | [Tags] | 9000B | 4T4C | MTHREAD
+| | [Tags] | 9000B | 4C
 | | ...
 | | [Template] | Check RR for eth-l2xcbase-testpmd
 | | framesize=${9000} | wt=4 | rxq=2
@@ -212,7 +212,7 @@
 | | ... | trial throughput test.
 | | ... | IMIX_v4_1 = (28x64B; 16x570B; 4x1518B)
 | | ...
-| | [Tags] | IMIX | 4T4C | MTHREAD
+| | [Tags] | IMIX | 4C
 | | ...
 | | [Template] | Check RR for eth-l2xcbase-testpmd
 | | framesize=IMIX_v4_1 | wt=4 | rxq=2
diff --git a/tests/dpdk/perf/10ge2p1x710-eth-l2xcbase-testpmd-ndrpdrdisc.robot b/tests/dpdk/perf/10ge2p1x710-eth-l2xcbase-testpmd-ndrpdrdisc.robot
index 290d6568e0..06ec4b62f8 100644
--- a/tests/dpdk/perf/10ge2p1x710-eth-l2xcbase-testpmd-ndrpdrdisc.robot
+++ b/tests/dpdk/perf/10ge2p1x710-eth-l2xcbase-testpmd-ndrpdrdisc.robot
@@ -54,12 +54,12 @@
 *** Test Cases ***
 | tc01-64B-1t1c-eth-l2xcbase-testpmd-ndrdisc
 | | [Documentation]
-| | ... | [Cfg] DUT runs L2 frame forwarding config with 1 thread, 1 phy core,\
+| | ... | [Cfg] DUT runs L2 frame forwarding 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 100kpps.
 | | ...
-| | [Tags] | 64B | 1T1C | STHREAD | NDRDISC
+| | [Tags] | 64B | 1C | NDRDISC
 | | ...
 | | ${framesize}= | Set Variable | ${64}
 | | ${min_rate}= | Set Variable | ${100000}
@@ -74,12 +74,12 @@
 
 | tc02-64B-1t1c-eth-l2xcbase-testpmd-pdrdisc
 | | [Documentation]
-| | ... | [Cfg] DUT runs L2 frame forwarding config with 1 thread, 1 phy core,\
+| | ... | [Cfg] DUT runs L2 frame forwarding 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 100kpps, LT=0.5%.
 | | ...
-| | [Tags] | 64B | 1T1C | STHREAD | PDRDISC | SKIP_PATCH
+| | [Tags] | 64B | 1C | PDRDISC | SKIP_PATCH
 | | ...
 | | ${framesize}= | Set Variable | ${64}
 | | ${min_rate}= | Set Variable | ${100000}
@@ -95,12 +95,12 @@
 
 | tc03-1518B-1t1c-eth-l2xcbase-testpmd-ndrdisc
 | | [Documentation]
-| | ... | [Cfg] DUT runs L2 frame forwarding config with 1 thread, 1 phy core,\
+| | ... | [Cfg] DUT runs L2 frame forwarding 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 10kpps.
 | | ...
-| | [Tags] | 1518B | 1T1C | STHREAD | NDRDISC
+| | [Tags] | 1518B | 1C | NDRDISC
 | | ...
 | | ${framesize}= | Set Variable | ${1518}
 | | ${min_rate}= | Set Variable | ${10000}
@@ -115,12 +115,12 @@
 
 | tc04-1518B-1t1c-eth-l2xcbase-testpmd-pdrdisc
 | | [Documentation]
-| | ... | [Cfg] DUT runs L2 frame forwarding config with 1 thread, 1 phy core,\
+| | ... | [Cfg] DUT runs L2 frame forwarding 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 10kpps, LT=0.5%.
 | | ...
-| | [Tags] | 1518B | 1T1C | STHREAD | PDRDISC | SKIP_PATCH
+| | [Tags] | 1518B | 1C | PDRDISC | SKIP_PATCH
 | | ...
 | | ${framesize}= | Set Variable | ${1518}
 | | ${min_rate}= | Set Variable | ${10000}
@@ -136,12 +136,12 @@
 
 | tc05-9000B-1t1c-eth-l2xcbase-testpmd-ndrdisc
 | | [Documentation]
-| | ... | [Cfg] DUT runs L2 frame forwarding config with 1 thread, 1 phy core,\
+| | ... | [Cfg] DUT runs L2 frame forwarding 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 10kpps.
 | | ...
-| | [Tags] | 9000B | 1T1C | STHREAD | NDRDISC
+| | [Tags] | 9000B | 1C | NDRDISC
 | | ...
 | | ${framesize}= | Set Variable | ${9000}
 | | ${min_rate}= | Set Variable | ${10000}
@@ -156,12 +156,12 @@
 
 | tc06-9000B-1t1c-eth-l2xcbase-testpmd-pdrdisc
 | | [Documentation]
-| | ... | [Cfg] DUT runs L2 frame forwarding config with 1 thread, 1 phy core,\
+| | ... | [Cfg] DUT runs L2 frame forwarding 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 10kpps, LT=0.5%.
 | | ...
-| | [Tags] | 9000B | 1T1C | STHREAD | PDRDISC | SKIP_PATCH
+| | [Tags] | 9000B | 1C | PDRDISC | SKIP_PATCH
 | | ...
 | | ${framesize}= | Set Variable | ${9000}
 | | ${min_rate}= | Set Variable | ${10000}
@@ -177,12 +177,12 @@
 
 | tc07-64B-2t2c-eth-l2xcbase-testpmd-ndrdisc
 | | [Documentation]
-| | ... | [Cfg] DUT runs L2 frame forwarding config with 2 threads, 2 phy\
+| | ... | [Cfg] DUT runs L2 frame forwarding config with 2 phy\
 | | ... | cores, 1 receive queue per NIC port.
 | | ... | [Ver] Find NDR for 64 Byte frames using binary search start at 10GE\
 | | ... | linerate, step 100kpps.
 | | ...
-| | [Tags] | 64B | 2T2C | MTHREAD | NDRDISC
+| | [Tags] | 64B | 2C | NDRDISC
 | | ...
 | | ${framesize}= | Set Variable | ${64}
 | | ${min_rate}= | Set Variable | ${100000}
@@ -197,12 +197,12 @@
 
 | tc08-64B-2t2c-eth-l2xcbase-testpmd-pdrdisc
 | | [Documentation]
-| | ... | [Cfg] DUT runs L2 frame forwarding config with 2 threads, 2 phy\
+| | ... | [Cfg] DUT runs L2 frame forwarding config with 2 phy\
 | | ... | cores, 1 receive queue per NIC port.
 | | ... | [Ver] Find PDR for 64 Byte frames using binary search start at 10GE\
 | | ... | linerate, step 100kpps, LT=0.5%.
 | | ...
-| | [Tags] | 64B | 2T2C | MTHREAD | PDRDISC | SKIP_PATCH
+| | [Tags] | 64B | 2C | PDRDISC | SKIP_PATCH
 | | ...
 | | ${framesize}= | Set Variable | ${64}
 | | ${min_rate}= | Set Variable | ${100000}
@@ -218,12 +218,12 @@
 
 | tc09-1518B-2t2c-eth-l2xcbase-testpmd-ndrdisc
 | | [Documentation]
-| | ... | [Cfg] DUT runs L2 frame forwarding config with 2 threads, 2 phy\
+| | ... | [Cfg] DUT runs L2 frame forwarding config with 2 phy\
 | | ... | cores, 1 receive queue per NIC port.
 | | ... | [Ver] Find NDR for 1518 Byte frames using binary search start at 10GE\
 | | ... | linerate, step 10kpps.
 | | ...
-| | [Tags] | 1518B | 2T2C | MTHREAD | NDRDISC | SKIP_PATCH
+| | [Tags] | 1518B | 2C | NDRDISC | SKIP_PATCH
 | | ...
 | | ${framesize}= | Set Variable | ${1518}
 | | ${min_rate}= | Set Variable | ${10000}
@@ -238,12 +238,12 @@
 
 | tc10-1518B-2t2c-eth-l2xcbase-testpmd-pdrdisc
 | | [Documentation]
-| | ... | [Cfg] DUT runs L2 frame forwarding config with 2 threads, 2 phy\
+| | ... | [Cfg] DUT runs L2 frame forwarding config with 2 phy\
 | | ... | cores, 1 receive queue per NIC port.
 | | ... | [Ver] Find PDR for 1518 Byte frames using binary search start at 10GE\
 | | ... | linerate, step 10kpps, LT=0.5%.
 | | ...
-| | [Tags] | 1518B | 2T2C | MTHREAD | PDRDISC | SKIP_PATCH
+| | [Tags] | 1518B | 2C | PDRDISC | SKIP_PATCH
 | | ...
 | | ${framesize}= | Set Variable | ${1518}
 | | ${min_rate}= | Set Variable | ${10000}
@@ -259,12 +259,12 @@
 
 | tc11-9000B-2t2c-eth-l2xcbase-testpmd-ndrdisc
 | | [Documentation]
-| | ... | [Cfg] DUT runs L2 frame forwarding config with 2 threads, 2 phy\
+| | ... | [Cfg] DUT runs L2 frame forwarding config with 2 phy\
 | | ... | cores, 1 receive queue per NIC port.
 | | ... | [Ver] Find NDR for 9000 Byte frames using binary search start at 10GE\
 | | ... | linerate, step 10kpps.
 | | ...
-| | [Tags] | 9000B | 2T2C | MTHREAD | NDRDISC | SKIP_PATCH
+| | [Tags] | 9000B | 2C | NDRDISC | SKIP_PATCH
 | | ...
 | | ${framesize}= | Set Variable | ${9000}
 | | ${min_rate}= | Set Variable | ${10000}
@@ -279,12 +279,12 @@
 
 | tc12-9000B-2t2c-eth-l2xcbase-testpmd-pdrdisc
 | | [Documentation]
-| | ... | [Cfg] DUT runs L2 frame forwarding config with 2 threads, 2 phy\
+| | ... | [Cfg] DUT runs L2 frame forwarding config with 2 phy\
 | | ... | cores, 1 receive queue per NIC port.
 | | ... | [Ver] Find PDR for 9000 Byte frames using binary search start at 10GE\
 | | ... | linerate, step 10kpps, LT=0.5%.
 | | ...
-| | [Tags] | 9000B | 2T2C | MTHREAD | PDRDISC | SKIP_PATCH
+| | [Tags] | 9000B | 2C | PDRDISC | SKIP_PATCH
 | | ...
 | | ${framesize}= | Set Variable | ${9000}
 | | ${min_rate}= | Set Variable | ${10000}
@@ -300,12 +300,12 @@
 
 | tc13-64B-4t4c-eth-l2xcbase-testpmd-ndrdisc
 | | [Documentation]
-| | ... | [Cfg] DUT runs L2 frame forwarding config with 4 threads, 4 phy\
+| | ... | [Cfg] DUT runs L2 frame forwarding config with 4 phy\
 | | ... | cores, 2 receive queues per NIC port.
 | | ... | [Ver] Find NDR for 64 Byte frames using binary search start at 10GE\
 | | ... | linerate, step 100kpps.
 | | ...
-| | [Tags] | 64B | 4T4C | MTHREAD | NDRDISC
+| | [Tags] | 64B | 4C | NDRDISC
 | | ...
 | | ${framesize}= | Set Variable | ${64}
 | | ${min_rate}= | Set Variable | ${100000}
@@ -320,12 +320,12 @@
 
 | tc14-64B-4t4c-eth-l2xcbase-testpmd-pdrdisc
 | | [Documentation]
-| | ... | [Cfg] DUT runs L2 frame forwarding config with 4 threads, 4 phy\
+| | ... | [Cfg] DUT runs L2 frame forwarding config with 4 phy\
 | | ... | cores, 2 receive queues per NIC port.
 | | ... | [Ver] Find PDR for 64 Byte frames using binary search start at 10GE\
 | | ... | linerate, step 100kpps, LT=0.5%.
 | | ...
-| | [Tags] | 64B | 4T4C | MTHREAD | PDRDISC | SKIP_PATCH
+| | [Tags] | 64B | 4C | PDRDISC | SKIP_PATCH
 | | ...
 | | ${framesize}= | Set Variable | ${64}
 | | ${min_rate}= | Set Variable | ${100000}
@@ -341,12 +341,12 @@
 
 | tc15-1518B-4t4c-eth-l2xcbase-testpmd-ndrdisc
 | | [Documentation]
-| | ... | [Cfg] DUT runs L2 frame forwarding config with 4 threads, 4 phy\
+| | ... | [Cfg] DUT runs L2 frame forwarding config with 4 phy\
 | | ... | cores, 2 receive queues per NIC port.
 | | ... | [Ver] Find NDR for 1518 Byte frames using binary search start at 10GE\
 | | ... | linerate, step 10kpps.
 | | ...
-| | [Tags] | 1518B | 4T4C | MTHREAD | NDRDISC | SKIP_PATCH
+| | [Tags] | 1518B | 4C | NDRDISC | SKIP_PATCH
 | | ...
 | | ${framesize}= | Set Variable | ${1518}
 | | ${min_rate}= | Set Variable | ${10000}
@@ -361,12 +361,12 @@
 
 | tc16-1518B-4t4c-eth-l2xcbase-testpmd-pdrdisc
 | | [Documentation]
-| | ... | [Cfg] DUT runs L2 frame forwarding config with 4 threads, 4 phy\
+| | ... | [Cfg] DUT runs L2 frame forwarding config with 4 phy\
 | | ... | cores, 2 receive queues per NIC port.
 | | ... | [Ver] Find PDR for 1518 Byte frames using binary search start at 10GE\
 | | ... | linerate, step 10kpps, LT=0.5%.
 | | ...
-| | [Tags] | 1518B | 4T4C | MTHREAD | PDRDISC | SKIP_PATCH
+| | [Tags] | 1518B | 4C | PDRDISC | SKIP_PATCH
 | | ...
 | | ${framesize}= | Set Variable | ${1518}
 | | ${min_rate}= | Set Variable | ${10000}
@@ -382,12 +382,12 @@
 
 | tc17-9000B-4t4c-eth-l2xcbase-testpmd-ndrdisc
 | | [Documentation]
-| | ... | [Cfg] DUT runs L2 frame forwarding config with 4 threads, 4 phy\
+| | ... | [Cfg] DUT runs L2 frame forwarding config with 4 phy\
 | | ... | cores, 2 receive queues per NIC port.
 | | ... | [Ver] Find NDR for 9000 Byte frames using binary search start at 10GE\
 | | ... | linerate, step 10kpps.
 | | ...
-| | [Tags] | 9000B | 4T4C | MTHREAD | NDRDISC | SKIP_PATCH
+| | [Tags] | 9000B | 4C | NDRDISC | SKIP_PATCH
 | | ...
 | | ${framesize}= | Set Variable | ${9000}
 | | ${min_rate}= | Set Variable | ${10000}
@@ -402,12 +402,12 @@
 
 | tc18-9000B-4t4c-eth-l2xcbase-testpmd-pdrdisc
 | | [Documentation]
-| | ... | [Cfg] DUT runs L2 frame forwarding config with 4 threads, 4 phy\
+| | ... | [Cfg] DUT runs L2 frame forwarding config with 4 phy\
 | | ... | cores, 2 receive queues per NIC port.
 | | ... | [Ver] Find PDR for 9000 Byte frames using binary search start at 10GE\
 | | ... | linerate, step 5kpps, LT=0.5%.
 | | ...
-| | [Tags] | 9000B | 4T4C | MTHREAD | PDRDISC | SKIP_PATCH
+| | [Tags] | 9000B | 4C | PDRDISC | SKIP_PATCH
 | | ...
 | | ${framesize}= | Set Variable | ${9000}
 | | ${min_rate}= | Set Variable | ${10000}
diff --git a/tests/dpdk/perf/40ge2p1xl710-eth-l2xcbase-testpmd-mrr.robot b/tests/dpdk/perf/40ge2p1xl710-eth-l2xcbase-testpmd-mrr.robot
index d5ad503715..ec7cf1128b 100644
--- a/tests/dpdk/perf/40ge2p1xl710-eth-l2xcbase-testpmd-mrr.robot
+++ b/tests/dpdk/perf/40ge2p1xl710-eth-l2xcbase-testpmd-mrr.robot
@@ -76,49 +76,49 @@
 *** Test Cases ***
 | tc01-64B-1t1c-eth-l2xcbase-testpmd-mrr
 | | [Documentation]
-| | ... | [Cfg] DUT runs L2 frame forwarding config with 1 thread, 1 phy core,\
+| | ... | [Cfg] DUT runs L2 frame forwarding 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 eth-l2xcbase-testpmd
 | | framesize=${64} | wt=1 | rxq=1
 
 | tc02-1518B-1t1c-eth-l2xcbase-testpmd-mrr
 | | [Documentation]
-| | ... | [Cfg] DUT runs L2 frame forwarding config with 1 thread, 1 phy core,\
+| | ... | [Cfg] DUT runs L2 frame forwarding 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 eth-l2xcbase-testpmd
 | | framesize=${1518} | wt=1 | rxq=1
 
 | tc03-9000B-1t1c-eth-l2xcbase-testpmd-mrr
 | | [Documentation]
-| | ... | [Cfg] DUT runs L2 frame forwarding config with 1 thread, 1 phy core,\
+| | ... | [Cfg] DUT runs L2 frame forwarding 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 eth-l2xcbase-testpmd
 | | framesize=${9000} | wt=1 | rxq=1
 
 | tc04-IMIX-1t1c-eth-l2xcbase-testpmd-mrr
 | | [Documentation]
-| | ... | [Cfg] DUT runs L2 frame forwarding config with 1 thread, 1 phy core,\
+| | ... | [Cfg] DUT runs L2 frame forwarding 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 eth-l2xcbase-testpmd
 | | framesize=IMIX_v4_1 | wt=1 | rxq=1
@@ -130,7 +130,7 @@
 | | ... | [Ver] Measure MaxReceivedRate for 64B frames using single\
 | | ... | trial throughput test.
 | | ...
-| | [Tags] | 64B | 2T2C | MTHREAD
+| | [Tags] | 64B | 2C
 | | ...
 | | [Template] | Check RR for eth-l2xcbase-testpmd
 | | framesize=${64} | wt=2 | rxq=1
@@ -142,7 +142,7 @@
 | | ... | [Ver] Measure MaxReceivedRate for 1518B frames using single\
 | | ... | trial throughput test.
 | | ...
-| | [Tags] | 1518B | 2T2C | MTHREAD
+| | [Tags] | 1518B | 2C
 | | ...
 | | [Template] | Check RR for eth-l2xcbase-testpmd
 | | framesize=${1518} | wt=2 | rxq=1
@@ -154,7 +154,7 @@
 | | ... | [Ver] Measure MaxReceivedRate for 9000B frames using single\
 | | ... | trial throughput test.
 | | ...
-| | [Tags] | 9000B | 2T2C | MTHREAD
+| | [Tags] | 9000B | 2C
 | | ...
 | | [Template] | Check RR for eth-l2xcbase-testpmd
 | | framesize=${9000} | wt=2 | rxq=1
@@ -167,7 +167,7 @@
 | | ... | trial throughput test.
 | | ... | IMIX_v4_1 = (28x64B; 16x570B; 4x1518B)
 | | ...
-| | [Tags] | IMIX | 2T2C | MTHREAD
+| | [Tags] | IMIX | 2C
 | | ...
 | | [Template] | Check RR for eth-l2xcbase-testpmd
 | | framesize=IMIX_v4_1 | wt=2 | rxq=1
@@ -179,7 +179,7 @@
 | | ... | [Ver] Measure MaxReceivedRate for 64B frames using single\
 | | ... | trial throughput test.
 | | ...
-| | [Tags] | 64B | 4T4C | MTHREAD
+| | [Tags] | 64B | 4C
 | | ...
 | | [Template] | Check RR for eth-l2xcbase-testpmd
 | | framesize=${64} | wt=4 | rxq=2
@@ -191,7 +191,7 @@
 | | ... | [Ver] Measure MaxReceivedRate for 1518B frames using single\
 | | ... | trial throughput test.
 | | ...
-| | [Tags] | 1518B | 4T4C | MTHREAD
+| | [Tags] | 1518B | 4C
 | | ...
 | | [Template] | Check RR for eth-l2xcbase-testpmd
 | | framesize=${1518} | wt=4 | rxq=2
@@ -203,7 +203,7 @@
 | | ... | [Ver] Measure MaxReceivedRate for 9000B frames using single\
 | | ... | trial throughput test.
 | | ...
-| | [Tags] | 9000B | 4T4C | MTHREAD
+| | [Tags] | 9000B | 4C
 | | ...
 | | [Template] | Check RR for eth-l2xcbase-testpmd
 | | framesize=${9000} | wt=4 | rxq=2
@@ -216,7 +216,7 @@
 | | ... | trial throughput test.
 | | ... | IMIX_v4_1 = (28x64B; 16x570B; 4x1518B)
 | | ...
-| | [Tags] | IMIX | 4T4C | MTHREAD
+| | [Tags] | IMIX | 4C
 | | ...
 | | [Template] | Check RR for eth-l2xcbase-testpmd
 | | framesize=IMIX_v4_1 | wt=4 | rxq=2
diff --git a/tests/dpdk/perf/40ge2p1xl710-eth-l2xcbase-testpmd-ndrpdrdisc.robot b/tests/dpdk/perf/40ge2p1xl710-eth-l2xcbase-testpmd-ndrpdrdisc.robot
index 14306bf6e9..52d178b83e 100644
--- a/tests/dpdk/perf/40ge2p1xl710-eth-l2xcbase-testpmd-ndrpdrdisc.robot
+++ b/tests/dpdk/perf/40ge2p1xl710-eth-l2xcbase-testpmd-ndrpdrdisc.robot
@@ -56,12 +56,12 @@
 *** Test Cases ***
 | tc01-64B-1t1c-eth-l2xcbase-testpmd-ndrdisc
 | | [Documentation]
-| | ... | [Cfg] DUT runs L2 frame forwarding config with 1 thread, 1 phy core,\
+| | ... | [Cfg] DUT runs L2 frame forwarding config with 1 phy core,\
 | | ... | 1 receive queue per NIC port.
 | | ... | [Ver] Find NDR for 64 Byte frames using binary search start at 40GE\
 | | ... | linerate, step 100kpps.
 | | ...
-| | [Tags] | 64B | 1T1C | STHREAD | NDRDISC
+| | [Tags] | 64B | 1C | NDRDISC
 | | ...
 | | ${framesize}= | Set Variable | ${64}
 | | ${min_rate}= | Set Variable | ${100000}
@@ -76,12 +76,12 @@
 
 | tc02-64B-1t1c-eth-l2xcbase-testpmd-pdrdisc
 | | [Documentation]
-| | ... | [Cfg] DUT runs L2 frame forwarding config with 1 thread, 1 phy core,\
+| | ... | [Cfg] DUT runs L2 frame forwarding config with 1 phy core,\
 | | ... | 1 receive queue per NIC port.
 | | ... | [Ver] Find PDR for 64 Byte frames using binary search start at 40GE\
 | | ... | linerate, step 100kpps, LT=0.5%.
 | | ...
-| | [Tags] | 64B | 1T1C | STHREAD | PDRDISC | SKIP_PATCH
+| | [Tags] | 64B | 1C | PDRDISC | SKIP_PATCH
 | | ...
 | | ${framesize}= | Set Variable | ${64}
 | | ${min_rate}= | Set Variable | ${100000}
@@ -97,12 +97,12 @@
 
 | tc03-1518B-1t1c-eth-l2xcbase-testpmd-ndrdisc
 | | [Documentation]
-| | ... | [Cfg] DUT runs L2 frame forwarding config with 1 thread, 1 phy core,\
+| | ... | [Cfg] DUT runs L2 frame forwarding config with 1 phy core,\
 | | ... | 1 receive queue per NIC port.
 | | ... | [Ver] Find NDR for 1518 Byte frames using binary search start at 40GE\
 | | ... | linerate, step 10kpps.
 | | ...
-| | [Tags] | 1518B | 1T1C | STHREAD | NDRDISC
+| | [Tags] | 1518B | 1C | NDRDISC
 | | ...
 | | ${framesize}= | Set Variable | ${1518}
 | | ${min_rate}= | Set Variable | ${10000}
@@ -117,12 +117,12 @@
 
 | tc04-1518B-1t1c-eth-l2xcbase-testpmd-pdrdisc
 | | [Documentation]
-| | ... | [Cfg] DUT runs L2 frame forwarding config with 1 thread, 1 phy core,\
+| | ... | [Cfg] DUT runs L2 frame forwarding config with 1 phy core,\
 | | ... | 1 receive queue per NIC port.
 | | ... | [Ver] Find PDR for 1518 Byte frames using binary search start at 40GE\
 | | ... | linerate, step 10kpps, LT=0.5%.
 | | ...
-| | [Tags] | 1518B | 1T1C | STHREAD | PDRDISC | SKIP_PATCH
+| | [Tags] | 1518B | 1C | PDRDISC | SKIP_PATCH
 | | ...
 | | ${framesize}= | Set Variable | ${1518}
 | | ${min_rate}= | Set Variable | ${10000}
@@ -138,12 +138,12 @@
 
 | tc05-9000B-1t1c-eth-l2xcbase-testpmd-ndrdisc
 | | [Documentation]
-| | ... | [Cfg] DUT runs L2 frame forwarding config with 1 thread, 1 phy core,\
+| | ... | [Cfg] DUT runs L2 frame forwarding config with 1 phy core,\
 | | ... | 1 receive queue per NIC port.
 | | ... | [Ver] Find NDR for 9000 Byte frames using binary search start at 40GE\
 | | ... | linerate, step 10kpps.
 | | ...
-| | [Tags] | 9000B | 1T1C | STHREAD | NDRDISC
+| | [Tags] | 9000B | 1C | NDRDISC
 | | ...
 | | ${framesize}= | Set Variable | ${9000}
 | | ${min_rate}= | Set Variable | ${10000}
@@ -158,12 +158,12 @@
 
 | tc06-9000B-1t1c-eth-l2xcbase-testpmd-pdrdisc
 | | [Documentation]
-| | ... | [Cfg] DUT runs L2 frame forwarding config with 1 thread, 1 phy core,\
+| | ... | [Cfg] DUT runs L2 frame forwarding config with 1 phy core,\
 | | ... | 1 receive queue per NIC port.
 | | ... | [Ver] Find PDR for 9000 Byte frames using binary search start at 40GE\
 | | ... | linerate, step 10kpps, LT=0.5%.
 | | ...
-| | [Tags] | 9000B | 1T1C | STHREAD | PDRDISC | SKIP_PATCH
+| | [Tags] | 9000B | 1C | PDRDISC | SKIP_PATCH
 | | ...
 | | ${framesize}= | Set Variable | ${9000}
 | | ${min_rate}= | Set Variable | ${10000}
@@ -179,12 +179,12 @@
 
 | tc07-64B-2t2c-eth-l2xcbase-testpmd-ndrdisc
 | | [Documentation]
-| | ... | [Cfg] DUT runs L2 frame forwarding config with 2 threads, 2 phy\
+| | ... | [Cfg] DUT runs L2 frame forwarding config with 2 phy\
 | | ... | cores, 1 receive queue per NIC port.
 | | ... | [Ver] Find NDR for 64 Byte frames using binary search start at 40GE\
 | | ... | linerate, step 100kpps.
 | | ...
-| | [Tags] | 64B | 2T2C | MTHREAD | NDRDISC
+| | [Tags] | 64B | 2C | NDRDISC
 | | ...
 | | ${framesize}= | Set Variable | ${64}
 | | ${min_rate}= | Set Variable | ${100000}
@@ -199,12 +199,12 @@
 
 | tc08-64B-2t2c-eth-l2xcbase-testpmd-pdrdisc
 | | [Documentation]
-| | ... | [Cfg] DUT runs L2 frame forwarding config with 2 threads, 2 phy\
+| | ... | [Cfg] DUT runs L2 frame forwarding config with 2 phy\
 | | ... | cores, 1 receive queue per NIC port.
 | | ... | [Ver] Find PDR for 64 Byte frames using binary search start at 40GE\
 | | ... | linerate, step 100kpps, LT=0.5%.
 | | ...
-| | [Tags] | 64B | 2T2C | MTHREAD | PDRDISC | SKIP_PATCH
+| | [Tags] | 64B | 2C | PDRDISC | SKIP_PATCH
 | | ...
 | | ${framesize}= | Set Variable | ${64}
 | | ${min_rate}= | Set Variable | ${100000}
@@ -220,12 +220,12 @@
 
 | tc09-1518B-2t2c-eth-l2xcbase-testpmd-ndrdisc
 | | [Documentation]
-| | ... | [Cfg] DUT runs L2 frame forwarding config with 2 threads, 2 phy\
+| | ... | [Cfg] DUT runs L2 frame forwarding config with 2 phy\
 | | ... | cores, 1 receive queue per NIC port.
 | | ... | [Ver] Find NDR for 1518 Byte frames using binary search start at 40GE\
 | | ... | linerate, step 10kpps.
 | | ...
-| | [Tags] | 1518B | 2T2C | MTHREAD | NDRDISC | SKIP_PATCH
+| | [Tags] | 1518B | 2C | NDRDISC | SKIP_PATCH
 | | ...
 | | ${framesize}= | Set Variable | ${1518}
 | | ${min_rate}= | Set Variable | ${10000}
@@ -240,12 +240,12 @@
 
 | tc10-1518B-2t2c-eth-l2xcbase-testpmd-pdrdisc
 | | [Documentation]
-| | ... | [Cfg] DUT runs L2 frame forwarding config with 2 threads, 2 phy\
+| | ... | [Cfg] DUT runs L2 frame forwarding config with 2 phy\
 | | ... | cores, 1 receive queue per NIC port.
 | | ... | [Ver] Find PDR for 1518 Byte frames using binary search start at 40GE\
 | | ... | linerate, step 10kpps, LT=0.5%.
 | | ...
-| | [Tags] | 1518B | 2T2C | MTHREAD | PDRDISC | SKIP_PATCH
+| | [Tags] | 1518B | 2C | PDRDISC | SKIP_PATCH
 | | ...
 | | ${framesize}= | Set Variable | ${1518}
 | | ${min_rate}= | Set Variable | ${10000}
@@ -261,12 +261,12 @@
 
 | tc11-9000B-2t2c-eth-l2xcbase-testpmd-ndrdisc
 | | [Documentation]
-| | ... | [Cfg] DUT runs L2 frame forwarding config with 2 threads, 2 phy\
+| | ... | [Cfg] DUT runs L2 frame forwarding config with 2 phy\
 | | ... | cores, 1 receive queue per NIC port.
 | | ... | [Ver] Find NDR for 9000 Byte frames using binary search start at 40GE\
 | | ... | linerate, step 10kpps.
 | | ...
-| | [Tags] | 9000B | 2T2C | MTHREAD | NDRDISC | SKIP_PATCH
+| | [Tags] | 9000B | 2C | NDRDISC | SKIP_PATCH
 | | ...
 | | ${framesize}= | Set Variable | ${9000}
 | | ${min_rate}= | Set Variable | ${10000}
@@ -281,12 +281,12 @@
 
 | tc12-9000B-2t2c-eth-l2xcbase-testpmd-pdrdisc
 | | [Documentation]
-| | ... | [Cfg] DUT runs L2 frame forwarding config with 2 threads, 2 phy\
+| | ... | [Cfg] DUT runs L2 frame forwarding config with 2 phy\
 | | ... | cores, 1 receive queue per NIC port.
 | | ... | [Ver] Find PDR for 9000 Byte frames using binary search start at 40GE\
 | | ... | linerate, step 10kpps, LT=0.5%.
 | | ...
-| | [Tags] | 9000B | 2T2C | MTHREAD | PDRDISC | SKIP_PATCH
+| | [Tags] | 9000B | 2C | PDRDISC | SKIP_PATCH
 | | ...
 | | ${framesize}= | Set Variable | ${9000}
 | | ${min_rate}= | Set Variable | ${10000}
@@ -302,12 +302,12 @@
 
 | tc13-64B-4t4c-eth-l2xcbase-testpmd-ndrdisc
 | | [Documentation]
-| | ... | [Cfg] DUT runs L2 frame forwarding config with 4 threads, 4 phy\
+| | ... | [Cfg] DUT runs L2 frame forwarding config with 4 phy\
 | | ... | cores, 2 receive queues per NIC port.
 | | ... | [Ver] Find NDR for 64 Byte frames using binary search start at 40GE\
 | | ... | linerate, step 100kpps.
 | | ...
-| | [Tags] | 64B | 4T4C | MTHREAD | NDRDISC
+| | [Tags] | 64B | 4C | NDRDISC
 | | ...
 | | ${framesize}= | Set Variable | ${64}
 | | ${min_rate}= | Set Variable | ${100000}
@@ -322,12 +322,12 @@
 
 | tc14-64B-4t4c-eth-l2xcbase-testpmd-pdrdisc
 | | [Documentation]
-| | ... | [Cfg] DUT runs L2 frame forwarding config with 4 threads, 4 phy\
+| | ... | [Cfg] DUT runs L2 frame forwarding config with 4 phy\
 | | ... | cores, 2 receive queues per NIC port.
 | | ... | [Ver] Find PDR for 64 Byte frames using binary search start at 40GE\
 | | ... | linerate, step 100kpps, LT=0.5%.
 | | ...
-| | [Tags] | 64B | 4T4C | MTHREAD | PDRDISC | SKIP_PATCH
+| | [Tags] | 64B | 4C | PDRDISC | SKIP_PATCH
 | | ...
 | | ${framesize}= | Set Variable | ${64}
 | | ${min_rate}= | Set Variable | ${100000}
@@ -343,12 +343,12 @@
 
 | tc15-1518B-4t4c-eth-l2xcbase-testpmd-ndrdisc
 | | [Documentation]
-| | ... | [Cfg] DUT runs L2 frame forwarding config with 4 threads, 4 phy\
+| | ... | [Cfg] DUT runs L2 frame forwarding config with 4 phy\
 | | ... | cores, 2 receive queues per NIC port.
 | | ... | [Ver] Find NDR for 1518 Byte frames using binary search start at 40GE\
 | | ... | linerate, step 10kpps.
 | | ...
-| | [Tags] | 1518B | 4T4C | MTHREAD | NDRDISC | SKIP_PATCH
+| | [Tags] | 1518B | 4C | NDRDISC | SKIP_PATCH
 | | ...
 | | ${framesize}= | Set Variable | ${1518}
 | | ${min_rate}= | Set Variable | ${10000}
@@ -363,12 +363,12 @@
 
 | tc16-1518B-4t4c-eth-l2xcbase-testpmd-pdrdisc
 | | [Documentation]
-| | ... | [Cfg] DUT runs L2 frame forwarding config with 4 threads, 4 phy\
+| | ... | [Cfg] DUT runs L2 frame forwarding config with 4 phy\
 | | ... | cores, 2 receive queues per NIC port.
 | | ... | [Ver] Find PDR for 1518 Byte frames using binary search start at 40GE\
 | | ... | linerate, step 10kpps, LT=0.5%.
 | | ...
-| | [Tags] | 1518B | 4T4C | MTHREAD | PDRDISC | SKIP_PATCH
+| | [Tags] | 1518B | 4C | PDRDISC | SKIP_PATCH
 | | ...
 | | ${framesize}= | Set Variable | ${1518}
 | | ${min_rate}= | Set Variable | ${10000}
@@ -384,12 +384,12 @@
 
 | tc17-9000B-4t4c-eth-l2xcbase-testpmd-ndrdisc
 | | [Documentation]
-| | ... | [Cfg] DUT runs L2 frame forwarding config with 4 threads, 4 phy\
+| | ... | [Cfg] DUT runs L2 frame forwarding config with 4 phy\
 | | ... | cores, 2 receive queues per NIC port.
 | | ... | [Ver] Find NDR for 9000 Byte frames using binary search start at 40GE\
 | | ... | linerate, step 10kpps.
 | | ...
-| | [Tags] | 9000B | 4T4C | MTHREAD | NDRDISC | SKIP_PATCH
+| | [Tags] | 9000B | 4C | NDRDISC | SKIP_PATCH
 | | ...
 | | ${framesize}= | Set Variable | ${9000}
 | | ${min_rate}= | Set Variable | ${10000}
@@ -404,12 +404,12 @@
 
 | tc18-9000B-4t4c-eth-l2xcbase-testpmd-pdrdisc
 | | [Documentation]
-| | ... | [Cfg] DUT runs L2 frame forwarding config with 4 threads, 4 phy\
+| | ... | [Cfg] DUT runs L2 frame forwarding config with 4 phy\
 | | ... | cores, 2 receive queues per NIC port.
 | | ... | [Ver] Find PDR for 9000 Byte frames using binary search start at 40GE\
 | | ... | linerate, step 5kpps, LT=0.5%.
 | | ...
-| | [Tags] | 9000B | 4T4C | MTHREAD | PDRDISC | SKIP_PATCH
+| | [Tags] | 9000B | 4C | PDRDISC | SKIP_PATCH
 | | ...
 | | ${framesize}= | Set Variable | ${9000}
 | | ${min_rate}= | Set Variable | ${10000}