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>

19 files changed, 320 insertions, 320 deletions

diff --git a/tests/vpp/perf/crypto/40ge2p1xl710-ethip4ipsecbasetnl-ip4base-int-aes-gcm-mrr.robot b/tests/vpp/perf/crypto/40ge2p1xl710-ethip4ipsecbasetnl-ip4base-int-aes-gcm-mrr.robot
index dc73146bf9..7164da2fe5 100644
--- a/tests/vpp/perf/crypto/40ge2p1xl710-ethip4ipsecbasetnl-ip4base-int-aes-gcm-mrr.robot
+++ b/tests/vpp/perf/crypto/40ge2p1xl710-ethip4ipsecbasetnl-ip4base-int-aes-gcm-mrr.robot
@@ -107,10 +107,10 @@
 | tc01-64B-1t1c-ethip4ipsecbasetnl-ip4base-int-aes-gcm-mrr
 | | [Documentation]
 | | ... | [Cfg] DUTs run 1 IPsec tunnel AES GCM in each direction, configured\
-| | ... | with 1 thread, 1 phy core, 1 receive queue per NIC port.
+| | ... | 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 IPv4 routing with IPSec HW cryptodev
 | | framesize=${64} | wt=1 | rxq=1
@@ -118,10 +118,10 @@
 | tc02-1518B-1t1c-ethip4ipsecbasetnl-ip4base-int-aes-gcm-mrr
 | | [Documentation]
 | | ... | [Cfg] DUTs run 1 IPsec tunnel AES GCM in each direction, configured\
-| | ... | with 1 thread, 1 phy core, 1 receive queue per NIC port.
+| | ... | 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 IPv4 routing with IPSec HW cryptodev
 | | framesize=${1518} | wt=1 | rxq=1
@@ -132,11 +132,11 @@
 | tc04-IMIX-1t1c-ethip4ipsecbasetnl-ip4base-int-aes-gcm-mrr
 | | [Documentation]
 | | ... | [Cfg] DUTs run 1 IPsec tunnel AES GCM in each direction, configured\
-| | ... | with 1 thread, 1 phy core, 1 receive queue per NIC port.
+| | ... | 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 IPv4 routing with IPSec HW cryptodev
 | | framesize=IMIX_v4_1 | wt=1 | rxq=1
@@ -144,10 +144,10 @@
 | tc05-64B-2t2c-ethip4ipsecbasetnl-ip4base-int-aes-gcm-mrr
 | | [Documentation]
 | | ... | [Cfg] DUTs run 1 IPsec tunnel AES GCM in each direction, configured\
-| | ... | with 2 threads, 2 phy cores, 1 receive queue per NIC port.
+| | ... | 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 IPv4 routing with IPSec HW cryptodev
 | | framesize=${64} | wt=2 | rxq=1
@@ -155,10 +155,10 @@
 | tc06-1518B-2t2c-ethip4ipsecbasetnl-ip4base-int-aes-gcm-mrr
 | | [Documentation]
 | | ... | [Cfg] DUTs run 1 IPsec tunnel AES GCM in each direction, configured\
-| | ... | with 2 threads, 2 phy cores, 1 receive queue per NIC port.
+| | ... | 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 IPv4 routing with IPSec HW cryptodev
 | | framesize=${1518} | wt=2 | rxq=1
@@ -166,11 +166,11 @@
 | tc08-IMIX-2t2c-ethip4ipsecbasetnl-ip4base-int-aes-gcm-mrr
 | | [Documentation]
 | | ... | [Cfg] DUTs run 1 IPsec tunnel AES GCM in each direction, configured\
-| | ... | with 2 threads, 2 phy cores, 1 receive queue per NIC port.
+| | ... | 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 IPv4 routing with IPSec HW cryptodev
 | | framesize=IMIX_v4_1 | wt=2 | rxq=1
@@ -178,10 +178,10 @@
 | tc09-64B-4t4c-ethip4ipsecbasetnl-ip4base-int-aes-gcm-mrr
 | | [Documentation]
 | | ... | [Cfg] DUTs run 1 IPsec tunnel AES GCM in each direction, configured\
-| | ... | with 4 threads, 4 phy cores, 2 receive queues per NIC port.
+| | ... | 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 IPv4 routing with IPSec HW cryptodev
 | | framesize=${64} | wt=4 | rxq=2
@@ -189,10 +189,10 @@
 | tc10-1518B-4t4c-ethip4ipsecbasetnl-ip4base-int-aes-gcm-mrr
 | | [Documentation]
 | | ... | [Cfg] DUTs run 1 IPsec tunnel AES GCM in each direction, configured\
-| | ... | with 4 threads, 4 phy cores, 2 receive queues per NIC port.
+| | ... | 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 IPv4 routing with IPSec HW cryptodev
 | | framesize=${1518} | wt=4 | rxq=2
@@ -200,11 +200,11 @@
 | tc12-IMIX-4t4c-ethip4ipsecbasetnl-ip4base-int-aes-gcm-mrr
 | | [Documentation]
 | | ... | [Cfg] DUTs run 1 IPsec tunnel AES GCM in each direction, configured\
-| | ... | with 4 threads, 4 phy cores, 2 receive queues per NIC port.
+| | ... | 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 IPv4 routing with IPSec HW cryptodev
 | | framesize=IMIX_v4_1 | wt=4 | rxq=2
diff --git a/tests/vpp/perf/crypto/40ge2p1xl710-ethip4ipsecbasetnl-ip4base-int-aes-gcm-ndrpdrdisc.robot b/tests/vpp/perf/crypto/40ge2p1xl710-ethip4ipsecbasetnl-ip4base-int-aes-gcm-ndrpdrdisc.robot
index 1038d12bb3..a2b7e98397 100644
--- a/tests/vpp/perf/crypto/40ge2p1xl710-ethip4ipsecbasetnl-ip4base-int-aes-gcm-ndrpdrdisc.robot
+++ b/tests/vpp/perf/crypto/40ge2p1xl710-ethip4ipsecbasetnl-ip4base-int-aes-gcm-ndrpdrdisc.robot
@@ -124,11 +124,11 @@
 | tc01-64B-1t1c-ethip4ipsecbasetnl-ip4base-int-aes-gcm-ndrdisc
 | | [Documentation]
 | | ... | [Cfg] DUTs run 1 IPsec tunnel AES GCM in each direction, configured\
-| | ... | with 1 thread, 1 phy core, 1 receive queue per NIC port.
+| | ... | with 1 phy core, 1 receive queue per NIC port.
 | | ... | [Ver] Find NDR for 64 Byte frames\
 | | ... | using binary search start at 40GE linerate, step 50kpps.
 | | ...
-| | [Tags] | 64B | 1T1C | STHREAD | NDRDISC
+| | [Tags] | 64B | 1C | NDRDISC
 | | ...
 | | [Template] | Discover NDR or PDR for IPv4 routing with IPSec HW cryptodev
 | | wt=1 | rxq=1 | framesize=${64} | min_rate=${50000} | search_type=NDR
@@ -136,11 +136,11 @@
 | tc02-64B-1t1c-ethip4ipsecbasetnl-ip4base-int-aes-gcm-pdrdisc
 | | [Documentation]
 | | ... | [Cfg] DUTs run 1 IPsec tunnel AES GCM in each direction, configured\
-| | ... | with 1 thread, 1 phy core, 1 receive queue per NIC port.
+| | ... | with 1 phy core, 1 receive queue per NIC port.
 | | ... | [Ver] Find PDR for 64 Byte frames using binary search start at 40GE\
 | | ... | linerate, step 50kpps and loss tolerance of 0.5%.
 | | ...
-| | [Tags] | 64B | 1T1C | STHREAD | PDRDISC | SKIP_PATCH
+| | [Tags] | 64B | 1C | PDRDISC | SKIP_PATCH
 | | ...
 | | [Template] | Discover NDR or PDR for IPv4 routing with IPSec HW cryptodev
 | | wt=1 | rxq=1 | framesize=${64} | min_rate=${50000} | search_type=PDR
@@ -148,11 +148,11 @@
 | tc03-1518B-1t1c-ethip4ipsecbasetnl-ip4base-int-aes-gcm-ndrdisc
 | | [Documentation]
 | | ... | [Cfg] DUTs run 1 IPsec tunnel AES GCM in each direction, configured\
-| | ... | with 1 thread, 1 phy core, 1 receive queue per NIC port.
+| | ... | with 1 phy core, 1 receive queue per NIC port.
 | | ... | [Ver] Find NDR for 1518 Byte frames\
 | | ... | using binary search start at 40GE linerate, step 50kpps.
 | | ...
-| | [Tags] | 1518B | 1T1C | STHREAD | NDRDISC
+| | [Tags] | 1518B | 1C | NDRDISC
 | | ...
 | | [Template] | Discover NDR or PDR for IPv4 routing with IPSec HW cryptodev
 | | wt=1 | rxq=1 | framesize=${1518} | min_rate=${50000} | search_type=NDR
@@ -160,11 +160,11 @@
 | tc04-1518B-1t1c-ethip4ipsecbasetnl-ip4base-int-aes-gcm-pdrdisc
 | | [Documentation]
 | | ... | [Cfg] DUTs run 1 IPsec tunnel AES GCM in each direction, configured\
-| | ... | with 1 thread, 1 phy core, 1 receive queue per NIC port.
+| | ... | with 1 phy core, 1 receive queue per NIC port.
 | | ... | [Ver] Find PDR for 1518 Byte frames using binary search start at 40GE\
 | | ... | linerate, step 50kpps and loss tolerance of 0.5%.
 | | ...
-| | [Tags] | 1518B | 1T1C | STHREAD | PDRDISC | SKIP_PATCH
+| | [Tags] | 1518B | 1C | PDRDISC | SKIP_PATCH
 | | ...
 | | [Template] | Discover NDR or PDR for IPv4 routing with IPSec HW cryptodev
 | | wt=1 | rxq=1 | framesize=${1518} | min_rate=${50000} | search_type=PDR
@@ -172,12 +172,12 @@
 | tc05-IMIX-1t1c-ethip4ipsecbasetnl-ip4base-int-aes-gcm-ndrdisc
 | | [Documentation]
 | | ... | [Cfg] DUTs run 1 IPsec tunnel AES GCM in each direction, configured\
-| | ... | with 1 thread, 1 phy core, 1 receive queue per NIC port.
+| | ... | with 1 phy core, 1 receive queue per NIC port.
 | | ... | [Ver] Find NDR for IMIX_v4_1 frames\
 | | ... | using binary search start at 40GE linerate, step 50kpps.
 | | ... | IMIX_v4_1 = (28x64B; 16x570B; 4x1518B)
 | | ...
-| | [Tags] | IMIX | 1T1C | STHREAD | NDRDISC
+| | [Tags] | IMIX | 1C | NDRDISC
 | | ...
 | | [Template] | Discover NDR or PDR for IPv4 routing with IPSec HW cryptodev
 | | wt=1 | rxq=1 | framesize=IMIX_v4_1 | min_rate=${50000} | search_type=NDR
@@ -185,12 +185,12 @@
 | tc06-IMIX-1t1c-ethip4ipsecbasetnl-ip4base-int-aes-gcm-pdrdisc
 | | [Documentation]
 | | ... | [Cfg] DUTs run 1 IPsec tunnel AES GCM in each direction, configured\
-| | ... | with 1 thread, 1 phy core, 1 receive queue per NIC port.
+| | ... | with 1 phy core, 1 receive queue per NIC port.
 | | ... | [Ver] Find PDR for IMIX_v4_1 frames using binary search start at 40GE\
 | | ... | linerate, step 50kpps and loss tolerance of 0.5%.
 | | ... | IMIX_v4_1 = (28x64B; 16x570B; 4x1518B)
 | | ...
-| | [Tags] | IMIX | 1T1C | STHREAD | PDRDISC | SKIP_PATCH
+| | [Tags] | IMIX | 1C | PDRDISC | SKIP_PATCH
 | | ...
 | | [Template] | Discover NDR or PDR for IPv4 routing with IPSec HW cryptodev
 | | wt=1 | rxq=1 | framesize=IMIX_v4_1 | min_rate=${50000} | search_type=PDR
@@ -198,11 +198,11 @@
 | tc07-64B-2t2c-ethip4ipsecbasetnl-ip4base-int-aes-gcm-ndrdisc
 | | [Documentation]
 | | ... | [Cfg] DUTs run 1 IPsec tunnel AES GCM in each direction, configured\
-| | ... | with 2 thread, 2 phy core, 1 receive queue per NIC port.
+| | ... | with 2 phy core, 1 receive queue per NIC port.
 | | ... | [Ver] Find NDR for 64 Byte frames\
 | | ... | using binary search start at 40GE linerate, step 50kpps.
 | | ...
-| | [Tags] | 64B | 2T2C | MTHREAD | NDRDISC
+| | [Tags] | 64B | 2C | NDRDISC
 | | ...
 | | [Template] | Discover NDR or PDR for IPv4 routing with IPSec HW cryptodev
 | | wt=2 | rxq=1 | framesize=${64} | min_rate=${50000} | search_type=NDR
@@ -210,11 +210,11 @@
 | tc08-64B-2t2c-ethip4ipsecbasetnl-ip4base-int-aes-gcm-pdrdisc
 | | [Documentation]
 | | ... | [Cfg] DUTs run 1 IPsec tunnel AES GCM in each direction, configured\
-| | ... | with 2 thread, 2 phy core, 1 receive queue per NIC port.
+| | ... | with 2 phy core, 1 receive queue per NIC port.
 | | ... | [Ver] Find PDR for 64 Byte frames using binary search start at 40GE\
 | | ... | linerate, step 50kpps and loss tolerance of 0.5%.
 | | ...
-| | [Tags] | 64B | 2T2C | MTHREAD | PDRDISC | SKIP_PATCH
+| | [Tags] | 64B | 2C | PDRDISC | SKIP_PATCH
 | | ...
 | | [Template] | Discover NDR or PDR for IPv4 routing with IPSec HW cryptodev
 | | wt=2 | rxq=1 | framesize=${64} | min_rate=${50000} | search_type=PDR
diff --git a/tests/vpp/perf/crypto/40ge2p1xl710-ethip4ipsecbasetnl-ip4base-int-cbc-sha1-mrr.robot b/tests/vpp/perf/crypto/40ge2p1xl710-ethip4ipsecbasetnl-ip4base-int-cbc-sha1-mrr.robot
index 1ab83404fa..1fd65ebc13 100644
--- a/tests/vpp/perf/crypto/40ge2p1xl710-ethip4ipsecbasetnl-ip4base-int-cbc-sha1-mrr.robot
+++ b/tests/vpp/perf/crypto/40ge2p1xl710-ethip4ipsecbasetnl-ip4base-int-cbc-sha1-mrr.robot
@@ -107,10 +107,10 @@
 | tc01-64B-1t1c-ethip4ipsecbasetnl-ip4base-int-cbc-sha1-mrr
 | | [Documentation]
 | | ... | [Cfg] DUTs run 1 IPsec tunnel CBC-SHA1 in each direction, configured\
-| | ... | with 1 thread, 1 phy core, 1 receive queue per NIC port.
+| | ... | 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 IPv4 routing with IPSec HW cryptodev
 | | framesize=${64} | wt=1 | rxq=1
@@ -118,10 +118,10 @@
 | tc02-1518B-1t1c-ethip4ipsecbasetnl-ip4base-int-cbc-sha1-mrr
 | | [Documentation]
 | | ... | [Cfg] DUTs run 1 IPsec tunnel CBC-SHA1 in each direction, configured\
-| | ... | with 1 thread, 1 phy core, 1 receive queue per NIC port.
+| | ... | 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 IPv4 routing with IPSec HW cryptodev
 | | framesize=${1518} | wt=1 | rxq=1
@@ -132,11 +132,11 @@
 | tc04-IMIX-1t1c-ethip4ipsecbasetnl-ip4base-int-cbc-sha1-mrr
 | | [Documentation]
 | | ... | [Cfg] DUTs run 1 IPsec tunnel CBC-SHA1 in each direction, configured\
-| | ... | with 1 thread, 1 phy core, 1 receive queue per NIC port.
+| | ... | 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 IPv4 routing with IPSec HW cryptodev
 | | framesize=IMIX_v4_1 | wt=1 | rxq=1
@@ -144,10 +144,10 @@
 | tc05-64B-2t2c-ethip4ipsecbasetnl-ip4base-int-cbc-sha1-mrr
 | | [Documentation]
 | | ... | [Cfg] DUTs run 1 IPsec tunnel CBC-SHA1 in each direction, configured\
-| | ... | with 2 threads, 2 phy cores, 1 receive queue per NIC port.
+| | ... | 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 IPv4 routing with IPSec HW cryptodev
 | | framesize=${64} | wt=2 | rxq=1
@@ -155,10 +155,10 @@
 | tc06-1518B-2t2c-ethip4ipsecbasetnl-ip4base-int-cbc-sha1-mrr
 | | [Documentation]
 | | ... | [Cfg] DUTs run 1 IPsec tunnel CBC-SHA1 in each direction, configured\
-| | ... | with 2 threads, 2 phy cores, 1 receive queue per NIC port.
+| | ... | 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 IPv4 routing with IPSec HW cryptodev
 | | framesize=${1518} | wt=2 | rxq=1
@@ -166,11 +166,11 @@
 | tc08-IMIX-2t2c-ethip4ipsecbasetnl-ip4base-int-cbc-sha1-mrr
 | | [Documentation]
 | | ... | [Cfg] DUTs run 1 IPsec tunnel CBC-SHA1 in each direction, configured\
-| | ... | with 2 threads, 2 phy cores, 1 receive queue per NIC port.
+| | ... | 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 IPv4 routing with IPSec HW cryptodev
 | | framesize=IMIX_v4_1 | wt=2 | rxq=1
@@ -178,10 +178,10 @@
 | tc09-64B-4t4c-ethip4ipsecbasetnl-ip4base-int-cbc-sha1-mrr
 | | [Documentation]
 | | ... | [Cfg] DUTs run 1 IPsec tunnel CBC-SHA1 in each direction, configured\
-| | ... | with 4 threads, 4 phy cores, 2 receive queues per NIC port.
+| | ... | 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 IPv4 routing with IPSec HW cryptodev
 | | framesize=${64} | wt=4 | rxq=2
@@ -189,10 +189,10 @@
 | tc10-1518B-4t4c-ethip4ipsecbasetnl-ip4base-int-cbc-sha1-mrr
 | | [Documentation]
 | | ... | [Cfg] DUTs run 1 IPsec tunnel CBC-SHA1 in each direction, configured\
-| | ... | with 4 threads, 4 phy cores, 2 receive queues per NIC port.
+| | ... | 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 IPv4 routing with IPSec HW cryptodev
 | | framesize=${1518} | wt=4 | rxq=2
@@ -200,11 +200,11 @@
 | tc12-IMIX-4t4c-ethip4ipsecbasetnl-ip4base-int-cbc-sha1-mrr
 | | [Documentation]
 | | ... | [Cfg] DUTs run 1 IPsec tunnel CBC-SHA1 in each direction, configured\
-| | ... | with 4 threads, 4 phy cores, 2 receive queues per NIC port.
+| | ... | 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 IPv4 routing with IPSec HW cryptodev
 | | framesize=IMIX_v4_1 | wt=4 | rxq=2
diff --git a/tests/vpp/perf/crypto/40ge2p1xl710-ethip4ipsecbasetnl-ip4base-int-cbc-sha1-ndrpdrdisc.robot b/tests/vpp/perf/crypto/40ge2p1xl710-ethip4ipsecbasetnl-ip4base-int-cbc-sha1-ndrpdrdisc.robot
index ffca342edf..1e52f8c663 100644
--- a/tests/vpp/perf/crypto/40ge2p1xl710-ethip4ipsecbasetnl-ip4base-int-cbc-sha1-ndrpdrdisc.robot
+++ b/tests/vpp/perf/crypto/40ge2p1xl710-ethip4ipsecbasetnl-ip4base-int-cbc-sha1-ndrpdrdisc.robot
@@ -76,11 +76,11 @@
 | tc01-64B-1t1c-ethip4ipsecbasetnl-ip4base-int-cbc-sha1-ndrdisc
 | | [Documentation]
 | | ... | [Cfg] DUTs run 1 IPsec tunnel CBC-SHA1 in each direction, configured\
-| | ... | with 1 thread, 1 phy core, 1 receive queue per NIC port.
+| | ... | with 1 phy core, 1 receive queue per NIC port.
 | | ... | [Ver] Find NDR for 64 Byte frames\
 | | ... | using binary search start at 40GE linerate, step 50kpps.
 | | ...
-| | [Tags] | 64B | 1T1C | STHREAD | NDRDISC
+| | [Tags] | 64B | 1C | NDRDISC
 | | ...
 | | # FIXME: Move repeated lines into a keyword.
 | | ${framesize}= | Set Variable | ${64}
@@ -112,11 +112,11 @@
 | tc02-64B-1t1c-ethip4ipsecbasetnl-ip4base-int-cbc-sha1-pdrdisc
 | | [Documentation]
 | | ... | [Cfg] DUTs run 1 IPsec tunnel CBC-SHA1 in each direction, configured\
-| | ... | with 1 thread, 1 phy core, 1 receive queue per NIC port.
+| | ... | with 1 phy core, 1 receive queue per NIC port.
 | | ... | [Ver] Find PDR for 64 Byte frames using binary search start at 40GE\
 | | ... | linerate, step 50kpps and loss tolerance of 0.5%.
 | | ...
-| | [Tags] | 64B | 1T1C | STHREAD | PDRDISC | SKIP_PATCH
+| | [Tags] | 64B | 1C | PDRDISC | SKIP_PATCH
 | | ...
 | | ${framesize}= | Set Variable | ${64}
 | | ${min_rate}= | Set Variable | ${50000}
@@ -148,11 +148,11 @@
 | tc03-1518B-1t1c-ethip4ipsecbasetnl-ip4base-int-cbc-sha1-ndrdisc
 | | [Documentation]
 | | ... | [Cfg] DUTs run 1 IPsec tunnel CBC-SHA1 in each direction, configured\
-| | ... | with 1 thread, 1 phy core, 1 receive queue per NIC port.
+| | ... | with 1 phy core, 1 receive queue per NIC port.
 | | ... | [Ver] Find NDR for 1518 Byte frames\
 | | ... | using binary search start at 40GE linerate, step 50kpps.
 | | ...
-| | [Tags] | 1518B | 1T1C | STHREAD | NDRDISC
+| | [Tags] | 1518B | 1C | NDRDISC
 | | ...
 | | ${framesize}= | Set Variable | ${1518}
 | | ${min_rate}= | Set Variable | ${50000}
@@ -182,11 +182,11 @@
 | tc04-1518B-1t1c-ethip4ipsecbasetnl-ip4base-int-cbc-sha1-pdrdisc
 | | [Documentation]
 | | ... | [Cfg] DUTs run 1 IPsec tunnel CBC-SHA1 in each direction, configured\
-| | ... | with 1 thread, 1 phy core, 1 receive queue per NIC port.
+| | ... | with 1 phy core, 1 receive queue per NIC port.
 | | ... | [Ver] Find PDR for 1518 Byte frames using binary search start at 40GE\
 | | ... | linerate, step 50kpps and loss tolerance of 0.5%.
 | | ...
-| | [Tags] | 1518B | 1T1C | STHREAD | PDRDISC | SKIP_PATCH
+| | [Tags] | 1518B | 1C | PDRDISC | SKIP_PATCH
 | | ...
 | | ${framesize}= | Set Variable | ${1518}
 | | ${min_rate}= | Set Variable | ${50000}
@@ -217,12 +217,12 @@
 | tc05-IMIX-1t1c-ethip4ipsecbasetnl-ip4base-int-cbc-sha1-ndrdisc
 | | [Documentation]
 | | ... | [Cfg] DUTs run 1 IPsec tunnel CBC-SHA1 in each direction, configured\
-| | ... | with 1 thread, 1 phy core, 1 receive queue per NIC port.
+| | ... | with 1 phy core, 1 receive queue per NIC port.
 | | ... | [Ver] Find NDR for IMIX_v4_1 frames\
 | | ... | using binary search start at 40GE linerate, step 10kpps.
 | | ... | IMIX_v4_1 = (28x64B; 16x570B; 4x1518B)
 | | ...
-| | [Tags] | IMIX | 1T1C | STHREAD | NDRDISC
+| | [Tags] | IMIX | 1C | NDRDISC
 | | ...
 | | ${framesize}= | Set Variable | IMIX_v4_1
 | | ${imix_size}= | Get Frame Size | ${framesize}
@@ -253,12 +253,12 @@
 | tc06-IMIX-1t1c-ethip4ipsecbasetnl-ip4base-int-cbc-sha1-pdrdisc
 | | [Documentation]
 | | ... | [Cfg] DUTs run 1 IPsec tunnel CBC-SHA1 in each direction, configured\
-| | ... | with 1 thread, 1 phy core, 1 receive queue per NIC port.
+| | ... | with 1 phy core, 1 receive queue per NIC port.
 | | ... | [Ver] Find PDR for IMIX_v4_1 frames using binary search start at 40GE\
 | | ... | linerate, step 10kpps and loss tolerance of 0.5%.
 | | ... | IMIX_v4_1 = (28x64B; 16x570B; 4x1518B)
 | | ...
-| | [Tags] | IMIX | 1T1C | STHREAD | PDRDISC | SKIP_PATCH
+| | [Tags] | IMIX | 1C | PDRDISC | SKIP_PATCH
 | | ...
 | | ${framesize}= | Set Variable | IMIX_v4_1
 | | ${imix_size}= | Get Frame Size | ${framesize}
@@ -290,11 +290,11 @@
 | tc07-64B-2t2c-ethip4ipsecbasetnl-ip4base-int-cbc-sha1-ndrdisc
 | | [Documentation]
 | | ... | [Cfg] DUTs run 1 IPsec tunnel CBC-SHA1 in each direction, configured\
-| | ... | with 2 thread, 2 phy core, 1 receive queue per NIC port.
+| | ... | with 2 phy core, 1 receive queue per NIC port.
 | | ... | [Ver] Find NDR for 64 Byte frames\
 | | ... | using binary search start at 40GE linerate, step 50kpps.
 | | ...
-| | [Tags] | 64B | 2T2C | MTHREAD | NDRDISC
+| | [Tags] | 64B | 2C | NDRDISC
 | | ...
 | | ${framesize}= | Set Variable | ${64}
 | | ${min_rate}= | Set Variable | ${50000}
@@ -325,11 +325,11 @@
 | tc08-64B-2t2c-ethip4ipsecbasetnl-ip4base-int-cbc-sha1-pdrdisc
 | | [Documentation]
 | | ... | [Cfg] DUTs run 1 IPsec tunnel CBC-SHA1 in each direction, configured\
-| | ... | with 2 thread, 2 phy core, 1 receive queue per NIC port.
+| | ... | with 2 phy core, 1 receive queue per NIC port.
 | | ... | [Ver] Find PDR for 64 Byte frames using binary search start at 40GE\
 | | ... | linerate, step 50kpps and loss tolerance of 0.5%.
 | | ...
-| | [Tags] | 64B | 2T2C | MTHREAD | PDRDISC | SKIP_PATCH
+| | [Tags] | 64B | 2C | PDRDISC | SKIP_PATCH
 | | ...
 | | ${framesize}= | Set Variable | ${64}
 | | ${min_rate}= | Set Variable | ${50000}
diff --git a/tests/vpp/perf/crypto/40ge2p1xl710-ethip4ipsecbasetnl-ip4base-tnl-aes-gcm-ndrpdrdisc.robot b/tests/vpp/perf/crypto/40ge2p1xl710-ethip4ipsecbasetnl-ip4base-tnl-aes-gcm-ndrpdrdisc.robot
index ed3cfc1471..0498effbeb 100644
--- a/tests/vpp/perf/crypto/40ge2p1xl710-ethip4ipsecbasetnl-ip4base-tnl-aes-gcm-ndrpdrdisc.robot
+++ b/tests/vpp/perf/crypto/40ge2p1xl710-ethip4ipsecbasetnl-ip4base-tnl-aes-gcm-ndrpdrdisc.robot
@@ -76,11 +76,11 @@
 | tc01-64B-1t1c-ethip4ipsecbasetnl-ip4base-tnl-aes-gcm-ndrdisc
 | | [Documentation]
 | | ... | [Cfg] DUTs run 1 IPsec tunnel AES GCM in each direction, configured\
-| | ... | with 1 thread, 1 phy core, 1 receive queue per NIC port.
+| | ... | with 1 phy core, 1 receive queue per NIC port.
 | | ... | [Ver] Find NDR for 64 Byte frames\
 | | ... | using binary search start at 40GE linerate, step 50kpps.
 | | ...
-| | [Tags] | 64B | 1T1C | STHREAD | NDRDISC
+| | [Tags] | 64B | 1C | NDRDISC
 | | ...
 | | # FIXME: Move repeated lines into a keyword.
 | | ${framesize}= | Set Variable | ${64}
@@ -117,11 +117,11 @@
 | tc02-64B-1t1c-ethip4ipsecbasetnl-ip4base-tnl-aes-gcm-pdrdisc
 | | [Documentation]
 | | ... | [Cfg] DUTs run 1 IPsec tunnel AES GCM in each direction, configured\
-| | ... | with 1 thread, 1 phy core, 1 receive queue per NIC port.
+| | ... | with 1 phy core, 1 receive queue per NIC port.
 | | ... | [Ver] Find PDR for 64 Byte frames using binary search start at 40GE\
 | | ... | linerate, step 50kpps and loss tolerance of 0.5%.
 | | ...
-| | [Tags] | 64B | 1T1C | STHREAD | PDRDISC | SKIP_PATCH
+| | [Tags] | 64B | 1C | PDRDISC | SKIP_PATCH
 | | ...
 | | ${framesize}= | Set Variable | ${64}
 | | ${min_rate}= | Set Variable | ${50000}
@@ -158,11 +158,11 @@
 | tc03-1518B-1t1c-ethip4ipsecbasetnl-ip4base-tnl-aes-gcm-ndrdisc
 | | [Documentation]
 | | ... | [Cfg] DUTs run 1 IPsec tunnel AES GCM in each direction, configured\
-| | ... | with 1 thread, 1 phy core, 1 receive queue per NIC port.
+| | ... | with 1 phy core, 1 receive queue per NIC port.
 | | ... | [Ver] Find NDR for 1518 Byte frames\
 | | ... | using binary search start at 40GE linerate, step 50kpps.
 | | ...
-| | [Tags] | 1518B | 1T1C | STHREAD | NDRDISC
+| | [Tags] | 1518B | 1C | NDRDISC
 | | ...
 | | ${framesize}= | Set Variable | ${1518}
 | | ${min_rate}= | Set Variable | ${50000}
@@ -198,11 +198,11 @@
 | tc04-1518B-1t1c-ethip4ipsecbasetnl-ip4base-tnl-aes-gcm-pdrdisc
 | | [Documentation]
 | | ... | [Cfg] DUTs run 1 IPsec tunnel AES GCM in each direction, configured\
-| | ... | with 1 thread, 1 phy core, 1 receive queue per NIC port.
+| | ... | with 1 phy core, 1 receive queue per NIC port.
 | | ... | [Ver] Find PDR for 1518 Byte frames using binary search start at 40GE\
 | | ... | linerate, step 50kpps and loss tolerance of 0.5%.
 | | ...
-| | [Tags] | 1518B | 1T1C | STHREAD | PDRDISC | SKIP_PATCH
+| | [Tags] | 1518B | 1C | PDRDISC | SKIP_PATCH
 | | ...
 | | ${framesize}= | Set Variable | ${1518}
 | | ${min_rate}= | Set Variable | ${50000}
@@ -239,12 +239,12 @@
 | tc05-IMIX-1t1c-ethip4ipsecbasetnl-ip4base-tnl-aes-gcm-ndrdisc
 | | [Documentation]
 | | ... | [Cfg] DUTs run 1 IPsec tunnel AES GCM in each direction, configured\
-| | ... | with 1 thread, 1 phy core, 1 receive queue per NIC port.
+| | ... | with 1 phy core, 1 receive queue per NIC port.
 | | ... | [Ver] Find NDR for IMIX_v4_1 frames\
 | | ... | using binary search start at 40GE linerate, step 10kpps.
 | | ... | IMIX_v4_1 = (28x64B; 16x570B; 4x1518B)
 | | ...
-| | [Tags] | IMIX | 1T1C | STHREAD | NDRDISC
+| | [Tags] | IMIX | 1C | NDRDISC
 | | ...
 | | ${framesize}= | Set Variable | IMIX_v4_1
 | | ${imix_size}= | Get Frame Size | ${framesize}
@@ -281,12 +281,12 @@
 | tc06-IMIX-1t1c-ethip4ipsecbasetnl-ip4base-tnl-aes-gcm-pdrdisc
 | | [Documentation]
 | | ... | [Cfg] DUTs run 1 IPsec tunnel AES GCM in each direction, configured\
-| | ... | with 1 thread, 1 phy core, 1 receive queue per NIC port.
+| | ... | with 1 phy core, 1 receive queue per NIC port.
 | | ... | [Ver] Find PDR for IMIX_v4_1 frames using binary search start at 40GE\
 | | ... | linerate, step 10kpps and loss tolerance of 0.5%.
 | | ... | IMIX_v4_1 = (28x64B; 16x570B; 4x1518B)
 | | ...
-| | [Tags] | IMIX | 1T1C | STHREAD | PDRDISC | SKIP_PATCH
+| | [Tags] | IMIX | 1C | PDRDISC | SKIP_PATCH
 | | ...
 | | ${framesize}= | Set Variable | IMIX_v4_1
 | | ${imix_size}= | Get Frame Size | ${framesize}
@@ -324,11 +324,11 @@
 | tc07-64B-2t2c-ethip4ipsecbasetnl-ip4base-tnl-aes-gcm-ndrdisc
 | | [Documentation]
 | | ... | [Cfg] DUTs run 1 IPsec tunnel AES GCM in each direction, configured\
-| | ... | with 2 thread, 2 phy core, 1 receive queue per NIC port.
+| | ... | with 2 phy core, 1 receive queue per NIC port.
 | | ... | [Ver] Find NDR for 64 Byte frames\
 | | ... | using binary search start at 40GE linerate, step 50kpps.
 | | ...
-| | [Tags] | 64B | 2T2C | MTHREAD | NDRDISC
+| | [Tags] | 64B | 2C | NDRDISC
 | | ...
 | | ${framesize}= | Set Variable | ${64}
 | | ${min_rate}= | Set Variable | ${50000}
@@ -364,11 +364,11 @@
 | tc08-64B-2t2c-ethip4ipsecbasetnl-ip4base-tnl-aes-gcm-pdrdisc
 | | [Documentation]
 | | ... | [Cfg] DUTs run 1 IPsec tunnel AES GCM in each direction, configured\
-| | ... | with 2 thread, 2 phy core, 1 receive queue per NIC port.
+| | ... | with 2 phy core, 1 receive queue per NIC port.
 | | ... | [Ver] Find PDR for 64 Byte frames using binary search start at 40GE\
 | | ... | linerate, step 50kpps and loss tolerance of 0.5%.
 | | ...
-| | [Tags] | 64B | 2T2C | MTHREAD | PDRDISC | SKIP_PATCH
+| | [Tags] | 64B | 2C | PDRDISC | SKIP_PATCH
 | | ...
 | | ${framesize}= | Set Variable | ${64}
 | | ${min_rate}= | Set Variable | ${50000}
diff --git a/tests/vpp/perf/crypto/40ge2p1xl710-ethip4ipsecbasetnl-ip4base-tnl-cbc-sha1-ndrpdrdisc.robot b/tests/vpp/perf/crypto/40ge2p1xl710-ethip4ipsecbasetnl-ip4base-tnl-cbc-sha1-ndrpdrdisc.robot
index 8f1485d59f..cf0342973a 100644
--- a/tests/vpp/perf/crypto/40ge2p1xl710-ethip4ipsecbasetnl-ip4base-tnl-cbc-sha1-ndrpdrdisc.robot
+++ b/tests/vpp/perf/crypto/40ge2p1xl710-ethip4ipsecbasetnl-ip4base-tnl-cbc-sha1-ndrpdrdisc.robot
@@ -76,11 +76,11 @@
 | tc01-64B-1t1c-ethip4ipsecbasetnl-ip4base-tnl-cbc-sha1-ndrdisc
 | | [Documentation]
 | | ... | [Cfg] DUTs run 1 IPsec tunnel CBC-SHA1 in each direction, configured\
-| | ... | with 1 thread, 1 phy core, 1 receive queue per NIC port.
+| | ... | with 1 phy core, 1 receive queue per NIC port.
 | | ... | [Ver] Find NDR for 64 Byte frames\
 | | ... | using binary search start at 40GE linerate, step 50kpps.
 | | ...
-| | [Tags] | 64B | 1T1C | STHREAD | NDRDISC
+| | [Tags] | 64B | 1C | NDRDISC
 | | ...
 | | # FIXME: Move repeated lines into a keyword.
 | | ${framesize}= | Set Variable | ${64}
@@ -117,11 +117,11 @@
 | tc02-64B-1t1c-ethip4ipsecbasetnl-ip4base-tnl-cbc-sha1-pdrdisc
 | | [Documentation]
 | | ... | [Cfg] DUTs run 1 IPsec tunnel CBC-SHA1 in each direction, configured\
-| | ... | with 1 thread, 1 phy core, 1 receive queue per NIC port.
+| | ... | with 1 phy core, 1 receive queue per NIC port.
 | | ... | [Ver] Find PDR for 64 Byte frames using binary search start at 40GE\
 | | ... | linerate, step 50kpps and loss tolerance of 0.5%.
 | | ...
-| | [Tags] | 64B | 1T1C | STHREAD | PDRDISC | SKIP_PATCH
+| | [Tags] | 64B | 1C | PDRDISC | SKIP_PATCH
 | | ...
 | | ${framesize}= | Set Variable | ${64}
 | | ${min_rate}= | Set Variable | ${50000}
@@ -158,11 +158,11 @@
 | tc03-1518B-1t1c-ethip4ipsecbasetnl-ip4base-tnl-cbc-sha1-ndrdisc
 | | [Documentation]
 | | ... | [Cfg] DUTs run 1 IPsec tunnel CBC-SHA1 in each direction, configured\
-| | ... | with 1 thread, 1 phy core, 1 receive queue per NIC port.
+| | ... | with 1 phy core, 1 receive queue per NIC port.
 | | ... | [Ver] Find NDR for 1518 Byte frames\
 | | ... | using binary search start at 40GE linerate, step 50kpps.
 | | ...
-| | [Tags] | 1518B | 1T1C | STHREAD | NDRDISC
+| | [Tags] | 1518B | 1C | NDRDISC
 | | ...
 | | ${framesize}= | Set Variable | ${1518}
 | | ${min_rate}= | Set Variable | ${50000}
@@ -197,11 +197,11 @@
 | tc04-1518B-1t1c-ethip4ipsecbasetnl-ip4base-tnl-cbc-sha1-pdrdisc
 | | [Documentation]
 | | ... | [Cfg] DUTs run 1 IPsec tunnel CBC-SHA1 in each direction, configured\
-| | ... | with 1 thread, 1 phy core, 1 receive queue per NIC port.
+| | ... | with 1 phy core, 1 receive queue per NIC port.
 | | ... | [Ver] Find PDR for 1518 Byte frames using binary search start at 40GE\
 | | ... | linerate, step 50kpps and loss tolerance of 0.5%.
 | | ...
-| | [Tags] | 1518B | 1T1C | STHREAD | PDRDISC | SKIP_PATCH
+| | [Tags] | 1518B | 1C | PDRDISC | SKIP_PATCH
 | | ...
 | | ${framesize}= | Set Variable | ${1518}
 | | ${min_rate}= | Set Variable | ${50000}
@@ -237,12 +237,12 @@
 | tc05-IMIX-1t1c-ethip4ipsecbasetnl-ip4base-tnl-cbc-sha1-ndrdisc
 | | [Documentation]
 | | ... | [Cfg] DUTs run 1 IPsec tunnel CBC-SHA1 in each direction, configured\
-| | ... | with 1 thread, 1 phy core, 1 receive queue per NIC port.
+| | ... | with 1 phy core, 1 receive queue per NIC port.
 | | ... | [Ver] Find NDR for IMIX_v4_1 frames\
 | | ... | using binary search start at 40GE linerate, step 10kpps.
 | | ... | IMIX_v4_1 = (28x64B; 16x570B; 4x1518B)
 | | ...
-| | [Tags] | IMIX | 1T1C | STHREAD | NDRDISC
+| | [Tags] | IMIX | 1C | NDRDISC
 | | ...
 | | ${framesize}= | Set Variable | IMIX_v4_1
 | | ${imix_size}= | Get Frame Size | ${framesize}
@@ -278,12 +278,12 @@
 | tc06-IMIX-1t1c-ethip4ipsecbasetnl-ip4base-tnl-cbc-sha1-pdrdisc
 | | [Documentation]
 | | ... | [Cfg] DUTs run 1 IPsec tunnel CBC-SHA1 in each direction, configured\
-| | ... | with 1 thread, 1 phy core, 1 receive queue per NIC port.
+| | ... | with 1 phy core, 1 receive queue per NIC port.
 | | ... | [Ver] Find PDR for IMIX_v4_1 frames using binary search start at 40GE\
 | | ... | linerate, step 10kpps and loss tolerance of 0.5%.
 | | ... | IMIX_v4_1 = (28x64B; 16x570B; 4x1518B)
 | | ...
-| | [Tags] | IMIX | 1T1C | STHREAD | PDRDISC | SKIP_PATCH
+| | [Tags] | IMIX | 1C | PDRDISC | SKIP_PATCH
 | | ...
 | | ${framesize}= | Set Variable | IMIX_v4_1
 | | ${imix_size}= | Get Frame Size | ${framesize}
@@ -320,11 +320,11 @@
 | tc07-64B-2t2c-ethip4ipsecbasetnl-ip4base-tnl-cbc-sha1-ndrdisc
 | | [Documentation]
 | | ... | [Cfg] DUTs run 1 IPsec tunnel CBC-SHA1 in each direction, configured\
-| | ... | with 2 thread, 2 phy core, 1 receive queue per NIC port.
+| | ... | with 2 phy core, 1 receive queue per NIC port.
 | | ... | [Ver] Find NDR for 64 Byte frames\
 | | ... | using binary search start at 40GE linerate, step 50kpps.
 | | ...
-| | [Tags] | 64B | 2T2C | MTHREAD | NDRDISC
+| | [Tags] | 64B | 2C | NDRDISC
 | | ...
 | | ${framesize}= | Set Variable | ${64}
 | | ${min_rate}= | Set Variable | ${50000}
@@ -360,11 +360,11 @@
 | tc08-64B-2t2c-ethip4ipsecbasetnl-ip4base-tnl-cbc-sha1-pdrdisc
 | | [Documentation]
 | | ... | [Cfg] DUTs run 1 IPsec tunnel CBC-SHA1 in each direction, configured\
-| | ... | with 2 thread, 2 phy core, 1 receive queue per NIC port.
+| | ... | with 2 phy core, 1 receive queue per NIC port.
 | | ... | [Ver] Find PDR for 64 Byte frames using binary search start at 40GE\
 | | ... | linerate, step 50kpps and loss tolerance of 0.5%.
 | | ...
-| | [Tags] | 64B | 2T2C | MTHREAD | PDRDISC | SKIP_PATCH
+| | [Tags] | 64B | 2C | PDRDISC | SKIP_PATCH
 | | ...
 | | ${framesize}= | Set Variable | ${64}
 | | ${min_rate}= | Set Variable | ${50000}
diff --git a/tests/vpp/perf/crypto/40ge2p1xl710-ethip4ipsecbasetnlsw-ip4base-int-aes-gcm-mrr.robot b/tests/vpp/perf/crypto/40ge2p1xl710-ethip4ipsecbasetnlsw-ip4base-int-aes-gcm-mrr.robot
index b9f857be4e..47f7daeeac 100644
--- a/tests/vpp/perf/crypto/40ge2p1xl710-ethip4ipsecbasetnlsw-ip4base-int-aes-gcm-mrr.robot
+++ b/tests/vpp/perf/crypto/40ge2p1xl710-ethip4ipsecbasetnlsw-ip4base-int-aes-gcm-mrr.robot
@@ -109,10 +109,10 @@
 | tc01-64B-1t1c-ethip4ipsecbasetnlsw-ip4base-int-aes-gcm-mrr
 | | [Documentation]
 | | ... | [Cfg] DUTs run 1 IPsec tunnel AES GCM in each direction, configured\
-| | ... | with 1 thread, 1 phy core, 1 receive queue per NIC port.
+| | ... | 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 IPv4 routing with IPSec SW cryptodev
 | | framesize=${64} | wt=1 | rxq=1
@@ -120,10 +120,10 @@
 | tc02-1518B-1t1c-ethip4ipsecbasetnlsw-ip4base-int-aes-gcm-mrr
 | | [Documentation]
 | | ... | [Cfg] DUTs run 1 IPsec tunnel AES GCM in each direction, configured\
-| | ... | with 1 thread, 1 phy core, 1 receive queue per NIC port.
+| | ... | 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 IPv4 routing with IPSec SW cryptodev
 | | framesize=${1518} | wt=1 | rxq=1
@@ -134,11 +134,11 @@
 | tc04-IMIX-1t1c-ethip4ipsecbasetnlsw-ip4base-int-aes-gcm-mrr
 | | [Documentation]
 | | ... | [Cfg] DUTs run 1 IPsec tunnel AES GCM in each direction, configured\
-| | ... | with 1 thread, 1 phy core, 1 receive queue per NIC port.
+| | ... | 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 IPv4 routing with IPSec SW cryptodev
 | | framesize=IMIX_v4_1 | wt=1 | rxq=1
@@ -146,10 +146,10 @@
 | tc05-64B-2t2c-ethip4ipsecbasetnlsw-ip4base-int-aes-gcm-mrr
 | | [Documentation]
 | | ... | [Cfg] DUTs run 1 IPsec tunnel AES GCM in each direction, configured\
-| | ... | with 2 threads, 2 phy cores, 1 receive queue per NIC port.
+| | ... | 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 IPv4 routing with IPSec SW cryptodev
 | | framesize=${64} | wt=2 | rxq=1
@@ -157,10 +157,10 @@
 | tc06-1518B-2t2c-ethip4ipsecbasetnlsw-ip4base-int-aes-gcm-mrr
 | | [Documentation]
 | | ... | [Cfg] DUTs run 1 IPsec tunnel AES GCM in each direction, configured\
-| | ... | with 2 threads, 2 phy cores, 1 receive queue per NIC port.
+| | ... | 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 IPv4 routing with IPSec SW cryptodev
 | | framesize=${1518} | wt=2 | rxq=1
@@ -168,11 +168,11 @@
 | tc08-IMIX-2t2c-ethip4ipsecbasetnlsw-ip4base-int-aes-gcm-mrr
 | | [Documentation]
 | | ... | [Cfg] DUTs run 1 IPsec tunnel AES GCM in each direction, configured\
-| | ... | with 2 threads, 2 phy cores, 1 receive queue per NIC port.
+| | ... | 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 IPv4 routing with IPSec SW cryptodev
 | | framesize=IMIX_v4_1 | wt=2 | rxq=1
@@ -180,10 +180,10 @@
 | tc09-64B-4t4c-ethip4ipsecbasetnlsw-ip4base-int-aes-gcm-mrr
 | | [Documentation]
 | | ... | [Cfg] DUTs run 1 IPsec tunnel AES GCM in each direction, configured\
-| | ... | with 4 threads, 4 phy cores, 2 receive queues per NIC port.
+| | ... | 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 IPv4 routing with IPSec SW cryptodev
 | | framesize=${64} | wt=4 | rxq=2
@@ -191,10 +191,10 @@
 | tc10-1518B-4t4c-ethip4ipsecbasetnlsw-ip4base-int-aes-gcm-mrr
 | | [Documentation]
 | | ... | [Cfg] DUTs run 1 IPsec tunnel AES GCM in each direction, configured\
-| | ... | with 4 threads, 4 phy cores, 2 receive queues per NIC port.
+| | ... | 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 IPv4 routing with IPSec SW cryptodev
 | | framesize=${1518} | wt=4 | rxq=2
@@ -202,11 +202,11 @@
 | tc12-IMIX-4t4c-ethip4ipsecbasetnlsw-ip4base-int-aes-gcm-mrr
 | | [Documentation]
 | | ... | [Cfg] DUTs run 1 IPsec tunnel AES GCM in each direction, configured\
-| | ... | with 4 threads, 4 phy cores, 2 receive queues per NIC port.
+| | ... | 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 IPv4 routing with IPSec SW cryptodev
 | | framesize=IMIX_v4_1 | wt=4 | rxq=2
diff --git a/tests/vpp/perf/crypto/40ge2p1xl710-ethip4ipsecbasetnlsw-ip4base-int-aes-gcm-ndrpdrdisc.robot b/tests/vpp/perf/crypto/40ge2p1xl710-ethip4ipsecbasetnlsw-ip4base-int-aes-gcm-ndrpdrdisc.robot
index 2579bc1e38..a588aa2d24 100644
--- a/tests/vpp/perf/crypto/40ge2p1xl710-ethip4ipsecbasetnlsw-ip4base-int-aes-gcm-ndrpdrdisc.robot
+++ b/tests/vpp/perf/crypto/40ge2p1xl710-ethip4ipsecbasetnlsw-ip4base-int-aes-gcm-ndrpdrdisc.robot
@@ -126,11 +126,11 @@
 | tc01-64B-1t1c-ethip4ipsecbasetnlsw-ip4base-int-aes-gcm-ndrdisc
 | | [Documentation]
 | | ... | [Cfg] DUTs run 1 IPsec tunnel AES GCM in each direction, configured\
-| | ... | with 1 thread, 1 phy core, 1 receive queue per NIC port.
+| | ... | with 1 phy core, 1 receive queue per NIC port.
 | | ... | [Ver] Find NDR for 64 Byte frames\
 | | ... | using binary search start at 40GE linerate, step 50kpps.
 | | ...
-| | [Tags] | 64B | 1T1C | STHREAD | NDRDISC
+| | [Tags] | 64B | 1C | NDRDISC
 | | ...
 | | [Template] | Discover NDR or PDR for IPv4 routing with IPSec SW cryptodev
 | | wt=1 | rxq=1 | framesize=${64} | min_rate=${50000} | search_type=NDR
@@ -138,11 +138,11 @@
 | tc02-64B-1t1c-ethip4ipsecbasetnlsw-ip4base-int-aes-gcm-pdrdisc
 | | [Documentation]
 | | ... | [Cfg] DUTs run 1 IPsec tunnel AES GCM in each direction, configured\
-| | ... | with 1 thread, 1 phy core, 1 receive queue per NIC port.
+| | ... | with 1 phy core, 1 receive queue per NIC port.
 | | ... | [Ver] Find PDR for 64 Byte frames using binary search start at 40GE\
 | | ... | linerate, step 50kpps and loss tolerance of 0.5%.
 | | ...
-| | [Tags] | 64B | 1T1C | STHREAD | PDRDISC | SKIP_PATCH
+| | [Tags] | 64B | 1C | PDRDISC | SKIP_PATCH
 | | ...
 | | [Template] | Discover NDR or PDR for IPv4 routing with IPSec SW cryptodev
 | | wt=1 | rxq=1 | framesize=${64} | min_rate=${50000} | search_type=PDR
@@ -150,11 +150,11 @@
 | tc03-1518B-1t1c-ethip4ipsecbasetnlsw-ip4base-int-aes-gcm-ndrdisc
 | | [Documentation]
 | | ... | [Cfg] DUTs run 1 IPsec tunnel AES GCM in each direction, configured\
-| | ... | with 1 thread, 1 phy core, 1 receive queue per NIC port.
+| | ... | with 1 phy core, 1 receive queue per NIC port.
 | | ... | [Ver] Find NDR for 1518 Byte frames\
 | | ... | using binary search start at 40GE linerate, step 50kpps.
 | | ...
-| | [Tags] | 1518B | 1T1C | STHREAD | NDRDISC
+| | [Tags] | 1518B | 1C | NDRDISC
 | | ...
 | | [Template] | Discover NDR or PDR for IPv4 routing with IPSec SW cryptodev
 | | wt=1 | rxq=1 | framesize=${1518} | min_rate=${50000} | search_type=NDR
@@ -162,11 +162,11 @@
 | tc04-1518B-1t1c-ethip4ipsecbasetnlsw-ip4base-int-aes-gcm-pdrdisc
 | | [Documentation]
 | | ... | [Cfg] DUTs run 1 IPsec tunnel AES GCM in each direction, configured\
-| | ... | with 1 thread, 1 phy core, 1 receive queue per NIC port.
+| | ... | with 1 phy core, 1 receive queue per NIC port.
 | | ... | [Ver] Find PDR for 1518 Byte frames using binary search start at 40GE\
 | | ... | linerate, step 50kpps and loss tolerance of 0.5%.
 | | ...
-| | [Tags] | 1518B | 1T1C | STHREAD | PDRDISC | SKIP_PATCH
+| | [Tags] | 1518B | 1C | PDRDISC | SKIP_PATCH
 | | ...
 | | [Template] | Discover NDR or PDR for IPv4 routing with IPSec SW cryptodev
 | | wt=1 | rxq=1 | framesize=${1518} | min_rate=${50000} | search_type=PDR
@@ -174,12 +174,12 @@
 | tc05-IMIX-1t1c-ethip4ipsecbasetnlsw-ip4base-int-aes-gcm-ndrdisc
 | | [Documentation]
 | | ... | [Cfg] DUTs run 1 IPsec tunnel AES GCM in each direction, configured\
-| | ... | with 1 thread, 1 phy core, 1 receive queue per NIC port.
+| | ... | with 1 phy core, 1 receive queue per NIC port.
 | | ... | [Ver] Find NDR for IMIX_v4_1 frames\
 | | ... | using binary search start at 40GE linerate, step 50kpps.
 | | ... | IMIX_v4_1 = (28x64B; 16x570B; 4x1518B)
 | | ...
-| | [Tags] | IMIX | 1T1C | STHREAD | NDRDISC
+| | [Tags] | IMIX | 1C | NDRDISC
 | | ...
 | | [Template] | Discover NDR or PDR for IPv4 routing with IPSec SW cryptodev
 | | wt=1 | rxq=1 | framesize=IMIX_v4_1 | min_rate=${50000} | search_type=NDR
@@ -187,12 +187,12 @@
 | tc06-IMIX-1t1c-ethip4ipsecbasetnlsw-ip4base-int-aes-gcm-pdrdisc
 | | [Documentation]
 | | ... | [Cfg] DUTs run 1 IPsec tunnel AES GCM in each direction, configured\
-| | ... | with 1 thread, 1 phy core, 1 receive queue per NIC port.
+| | ... | with 1 phy core, 1 receive queue per NIC port.
 | | ... | [Ver] Find PDR for IMIX_v4_1 frames using binary search start at 40GE\
 | | ... | linerate, step 50kpps and loss tolerance of 0.5%.
 | | ... | IMIX_v4_1 = (28x64B; 16x570B; 4x1518B)
 | | ...
-| | [Tags] | IMIX | 1T1C | STHREAD | PDRDISC | SKIP_PATCH
+| | [Tags] | IMIX | 1C | PDRDISC | SKIP_PATCH
 | | ...
 | | [Template] | Discover NDR or PDR for IPv4 routing with IPSec SW cryptodev
 | | wt=1 | rxq=1 | framesize=IMIX_v4_1 | min_rate=${50000} | search_type=PDR
@@ -200,11 +200,11 @@
 | tc07-64B-2t2c-ethip4ipsecbasetnlsw-ip4base-int-aes-gcm-ndrdisc
 | | [Documentation]
 | | ... | [Cfg] DUTs run 1 IPsec tunnel AES GCM in each direction, configured\
-| | ... | with 2 thread, 2 phy core, 1 receive queue per NIC port.
+| | ... | with 2 phy core, 1 receive queue per NIC port.
 | | ... | [Ver] Find NDR for 64 Byte frames\
 | | ... | using binary search start at 40GE linerate, step 50kpps.
 | | ...
-| | [Tags] | 64B | 2T2C | MTHREAD | NDRDISC
+| | [Tags] | 64B | 2C | NDRDISC
 | | ...
 | | [Template] | Discover NDR or PDR for IPv4 routing with IPSec SW cryptodev
 | | wt=2 | rxq=1 | framesize=${64} | min_rate=${50000} | search_type=NDR
@@ -212,11 +212,11 @@
 | tc08-64B-2t2c-ethip4ipsecbasetnlsw-ip4base-int-aes-gcm-pdrdisc
 | | [Documentation]
 | | ... | [Cfg] DUTs run 1 IPsec tunnel AES GCM in each direction, configured\
-| | ... | with 2 thread, 2 phy core, 1 receive queue per NIC port.
+| | ... | with 2 phy core, 1 receive queue per NIC port.
 | | ... | [Ver] Find PDR for 64 Byte frames using binary search start at 40GE\
 | | ... | linerate, step 50kpps and loss tolerance of 0.5%.
 | | ...
-| | [Tags] | 64B | 2T2C | MTHREAD | PDRDISC | SKIP_PATCH
+| | [Tags] | 64B | 2C | PDRDISC | SKIP_PATCH
 | | ...
 | | [Template] | Discover NDR or PDR for IPv4 routing with IPSec SW cryptodev
 | | wt=2 | rxq=1 | framesize=${64} | min_rate=${50000} | search_type=PDR
diff --git a/tests/vpp/perf/crypto/40ge2p1xl710-ethip4ipsecbasetnlsw-ip4base-int-cbc-sha1-mrr.robot b/tests/vpp/perf/crypto/40ge2p1xl710-ethip4ipsecbasetnlsw-ip4base-int-cbc-sha1-mrr.robot
index 6fbdd93eb5..169b0c49cd 100644
--- a/tests/vpp/perf/crypto/40ge2p1xl710-ethip4ipsecbasetnlsw-ip4base-int-cbc-sha1-mrr.robot
+++ b/tests/vpp/perf/crypto/40ge2p1xl710-ethip4ipsecbasetnlsw-ip4base-int-cbc-sha1-mrr.robot
@@ -109,10 +109,10 @@
 | tc01-64B-1t1c-ethip4ipsecbasetnlsw-ip4base-int-cbc-sha1-mrr
 | | [Documentation]
 | | ... | [Cfg] DUTs run 1 IPsec tunnel CBC-SHA1 in each direction, configured\
-| | ... | with 1 thread, 1 phy core, 1 receive queue per NIC port.
+| | ... | 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 IPv4 routing with IPSec SW cryptodev
 | | framesize=${64} | wt=1 | rxq=1
@@ -120,10 +120,10 @@
 | tc02-1518B-1t1c-ethip4ipsecbasetnlsw-ip4base-int-cbc-sha1-mrr
 | | [Documentation]
 | | ... | [Cfg] DUTs run 1 IPsec tunnel CBC-SHA1 in each direction, configured\
-| | ... | with 1 thread, 1 phy core, 1 receive queue per NIC port.
+| | ... | 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 IPv4 routing with IPSec SW cryptodev
 | | framesize=${1518} | wt=1 | rxq=1
@@ -134,11 +134,11 @@
 | tc04-IMIX-1t1c-ethip4ipsecbasetnlsw-ip4base-int-cbc-sha1-mrr
 | | [Documentation]
 | | ... | [Cfg] DUTs run 1 IPsec tunnel CBC-SHA1 in each direction, configured\
-| | ... | with 1 thread, 1 phy core, 1 receive queue per NIC port.
+| | ... | 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 IPv4 routing with IPSec SW cryptodev
 | | framesize=IMIX_v4_1 | wt=1 | rxq=1
@@ -146,10 +146,10 @@
 | tc05-64B-2t2c-ethip4ipsecbasetnlsw-ip4base-int-cbc-sha1-mrr
 | | [Documentation]
 | | ... | [Cfg] DUTs run 1 IPsec tunnel CBC-SHA1 in each direction, configured\
-| | ... | with 2 threads, 2 phy cores, 1 receive queue per NIC port.
+| | ... | 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 IPv4 routing with IPSec SW cryptodev
 | | framesize=${64} | wt=2 | rxq=1
@@ -157,10 +157,10 @@
 | tc06-1518B-2t2c-ethip4ipsecbasetnlsw-ip4base-int-cbc-sha1-mrr
 | | [Documentation]
 | | ... | [Cfg] DUTs run 1 IPsec tunnel CBC-SHA1 in each direction, configured\
-| | ... | with 2 threads, 2 phy cores, 1 receive queue per NIC port.
+| | ... | 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 IPv4 routing with IPSec SW cryptodev
 | | framesize=${1518} | wt=2 | rxq=1
@@ -168,11 +168,11 @@
 | tc08-IMIX-2t2c-ethip4ipsecbasetnlsw-ip4base-int-cbc-sha1-mrr
 | | [Documentation]
 | | ... | [Cfg] DUTs run 1 IPsec tunnel CBC-SHA1 in each direction, configured\
-| | ... | with 2 threads, 2 phy cores, 1 receive queue per NIC port.
+| | ... | 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 IPv4 routing with IPSec SW cryptodev
 | | framesize=IMIX_v4_1 | wt=2 | rxq=1
@@ -180,10 +180,10 @@
 | tc09-64B-4t4c-ethip4ipsecbasetnlsw-ip4base-int-cbc-sha1-mrr
 | | [Documentation]
 | | ... | [Cfg] DUTs run 1 IPsec tunnel CBC-SHA1 in each direction, configured\
-| | ... | with 4 threads, 4 phy cores, 2 receive queues per NIC port.
+| | ... | 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 IPv4 routing with IPSec SW cryptodev
 | | framesize=${64} | wt=4 | rxq=2
@@ -191,10 +191,10 @@
 | tc10-1518B-4t4c-ethip4ipsecbasetnlsw-ip4base-int-cbc-sha1-mrr
 | | [Documentation]
 | | ... | [Cfg] DUTs run 1 IPsec tunnel CBC-SHA1 in each direction, configured\
-| | ... | with 4 threads, 4 phy cores, 2 receive queues per NIC port.
+| | ... | 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 IPv4 routing with IPSec SW cryptodev
 | | framesize=${1518} | wt=4 | rxq=2
@@ -202,11 +202,11 @@
 | tc12-IMIX-4t4c-ethip4ipsecbasetnlsw-ip4base-int-cbc-sha1-mrr
 | | [Documentation]
 | | ... | [Cfg] DUTs run 1 IPsec tunnel CBC-SHA1 in each direction, configured\
-| | ... | with 4 threads, 4 phy cores, 2 receive queues per NIC port.
+| | ... | 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 IPv4 routing with IPSec SW cryptodev
 | | framesize=IMIX_v4_1 | wt=4 | rxq=2
diff --git a/tests/vpp/perf/crypto/40ge2p1xl710-ethip4ipsecbasetnlsw-ip4base-int-cbc-sha1-ndrpdrdisc.robot b/tests/vpp/perf/crypto/40ge2p1xl710-ethip4ipsecbasetnlsw-ip4base-int-cbc-sha1-ndrpdrdisc.robot
index 4fc25f47d8..150aa333b8 100644
--- a/tests/vpp/perf/crypto/40ge2p1xl710-ethip4ipsecbasetnlsw-ip4base-int-cbc-sha1-ndrpdrdisc.robot
+++ b/tests/vpp/perf/crypto/40ge2p1xl710-ethip4ipsecbasetnlsw-ip4base-int-cbc-sha1-ndrpdrdisc.robot
@@ -126,11 +126,11 @@
 | tc01-64B-1t1c-ethip4ipsecbasetnlsw-ip4base-int-cbc-sha1-ndrdisc
 | | [Documentation]
 | | ... | [Cfg] DUTs run 1 IPsec tunnel CBC-SHA1 in each direction, configured\
-| | ... | with 1 thread, 1 phy core, 1 receive queue per NIC port.
+| | ... | with 1 phy core, 1 receive queue per NIC port.
 | | ... | [Ver] Find NDR for 64 Byte frames\
 | | ... | using binary search start at 40GE linerate, step 50kpps.
 | | ...
-| | [Tags] | 64B | 1T1C | STHREAD | NDRDISC
+| | [Tags] | 64B | 1C | NDRDISC
 | | ...
 | | [Template] | Discover NDR or PDR for IPv4 routing with IPSec SW cryptodev
 | | wt=1 | rxq=1 | framesize=${64} | min_rate=${50000} | search_type=NDR
@@ -138,11 +138,11 @@
 | tc02-64B-1t1c-ethip4ipsecbasetnlsw-ip4base-int-cbc-sha1-pdrdisc
 | | [Documentation]
 | | ... | [Cfg] DUTs run 1 IPsec tunnel CBC-SHA1 in each direction, configured\
-| | ... | with 1 thread, 1 phy core, 1 receive queue per NIC port.
+| | ... | with 1 phy core, 1 receive queue per NIC port.
 | | ... | [Ver] Find PDR for 64 Byte frames using binary search start at 40GE\
 | | ... | linerate, step 50kpps and loss tolerance of 0.5%.
 | | ...
-| | [Tags] | 64B | 1T1C | STHREAD | PDRDISC | SKIP_PATCH
+| | [Tags] | 64B | 1C | PDRDISC | SKIP_PATCH
 | | ...
 | | [Template] | Discover NDR or PDR for IPv4 routing with IPSec SW cryptodev
 | | wt=1 | rxq=1 | framesize=${64} | min_rate=${50000} | search_type=PDR
@@ -150,11 +150,11 @@
 | tc03-1518B-1t1c-ethip4ipsecbasetnlsw-ip4base-int-cbc-sha1-ndrdisc
 | | [Documentation]
 | | ... | [Cfg] DUTs run 1 IPsec tunnel CBC-SHA1 in each direction, configured\
-| | ... | with 1 thread, 1 phy core, 1 receive queue per NIC port.
+| | ... | with 1 phy core, 1 receive queue per NIC port.
 | | ... | [Ver] Find NDR for 1518 Byte frames\
 | | ... | using binary search start at 40GE linerate, step 50kpps.
 | | ...
-| | [Tags] | 1518B | 1T1C | STHREAD | NDRDISC
+| | [Tags] | 1518B | 1C | NDRDISC
 | | ...
 | | [Template] | Discover NDR or PDR for IPv4 routing with IPSec SW cryptodev
 | | wt=1 | rxq=1 | framesize=${1518} | min_rate=${50000} | search_type=NDR
@@ -162,11 +162,11 @@
 | tc04-1518B-1t1c-ethip4ipsecbasetnlsw-ip4base-int-cbc-sha1-pdrdisc
 | | [Documentation]
 | | ... | [Cfg] DUTs run 1 IPsec tunnel CBC-SHA1 in each direction, configured\
-| | ... | with 1 thread, 1 phy core, 1 receive queue per NIC port.
+| | ... | with 1 phy core, 1 receive queue per NIC port.
 | | ... | [Ver] Find PDR for 1518 Byte frames using binary search start at 40GE\
 | | ... | linerate, step 50kpps and loss tolerance of 0.5%.
 | | ...
-| | [Tags] | 1518B | 1T1C | STHREAD | PDRDISC | SKIP_PATCH
+| | [Tags] | 1518B | 1C | PDRDISC | SKIP_PATCH
 | | ...
 | | [Template] | Discover NDR or PDR for IPv4 routing with IPSec SW cryptodev
 | | wt=1 | rxq=1 | framesize=${1518} | min_rate=${50000} | search_type=PDR
@@ -174,12 +174,12 @@
 | tc05-IMIX-1t1c-ethip4ipsecbasetnlsw-ip4base-int-cbc-sha1-ndrdisc
 | | [Documentation]
 | | ... | [Cfg] DUTs run 1 IPsec tunnel CBC-SHA1 in each direction, configured\
-| | ... | with 1 thread, 1 phy core, 1 receive queue per NIC port.
+| | ... | with 1 phy core, 1 receive queue per NIC port.
 | | ... | [Ver] Find NDR for IMIX_v4_1 frames\
 | | ... | using binary search start at 40GE linerate, step 50kpps.
 | | ... | IMIX_v4_1 = (28x64B; 16x570B; 4x1518B)
 | | ...
-| | [Tags] | IMIX | 1T1C | STHREAD | NDRDISC
+| | [Tags] | IMIX | 1C | NDRDISC
 | | ...
 | | [Template] | Discover NDR or PDR for IPv4 routing with IPSec SW cryptodev
 | | wt=1 | rxq=1 | framesize=IMIX_v4_1 | min_rate=${50000} | search_type=NDR
@@ -187,12 +187,12 @@
 | tc06-IMIX-1t1c-ethip4ipsecbasetnlsw-ip4base-int-cbc-sha1-pdrdisc
 | | [Documentation]
 | | ... | [Cfg] DUTs run 1 IPsec tunnel CBC-SHA1 in each direction, configured\
-| | ... | with 1 thread, 1 phy core, 1 receive queue per NIC port.
+| | ... | with 1 phy core, 1 receive queue per NIC port.
 | | ... | [Ver] Find PDR for IMIX_v4_1 frames using binary search start at 40GE\
 | | ... | linerate, step 50kpps and loss tolerance of 0.5%.
 | | ... | IMIX_v4_1 = (28x64B; 16x570B; 4x1518B)
 | | ...
-| | [Tags] | IMIX | 1T1C | STHREAD | PDRDISC | SKIP_PATCH
+| | [Tags] | IMIX | 1C | PDRDISC | SKIP_PATCH
 | | ...
 | | [Template] | Discover NDR or PDR for IPv4 routing with IPSec SW cryptodev
 | | wt=1 | rxq=1 | framesize=IMIX_v4_1 | min_rate=${50000} | search_type=PDR
@@ -200,11 +200,11 @@
 | tc07-64B-2t2c-ethip4ipsecbasetnlsw-ip4base-int-cbc-sha1-ndrdisc
 | | [Documentation]
 | | ... | [Cfg] DUTs run 1 IPsec tunnel CBC-SHA1 in each direction, configured\
-| | ... | with 2 thread, 2 phy core, 1 receive queue per NIC port.
+| | ... | with 2 phy core, 1 receive queue per NIC port.
 | | ... | [Ver] Find NDR for 64 Byte frames\
 | | ... | using binary search start at 40GE linerate, step 50kpps.
 | | ...
-| | [Tags] | 64B | 2T2C | MTHREAD | NDRDISC
+| | [Tags] | 64B | 2C | NDRDISC
 | | ...
 | | [Template] | Discover NDR or PDR for IPv4 routing with IPSec SW cryptodev
 | | wt=2 | rxq=1 | framesize=${64} | min_rate=${50000} | search_type=NDR
@@ -212,11 +212,11 @@
 | tc08-64B-2t2c-ethip4ipsecbasetnlsw-ip4base-int-cbc-sha1-pdrdisc
 | | [Documentation]
 | | ... | [Cfg] DUTs run 1 IPsec tunnel CBC-SHA1 in each direction, configured\
-| | ... | with 2 thread, 2 phy core, 1 receive queue per NIC port.
+| | ... | with 2 phy core, 1 receive queue per NIC port.
 | | ... | [Ver] Find PDR for 64 Byte frames using binary search start at 40GE\
 | | ... | linerate, step 50kpps and loss tolerance of 0.5%.
 | | ...
-| | [Tags] | 64B | 2T2C | MTHREAD | PDRDISC | SKIP_PATCH
+| | [Tags] | 64B | 2C | PDRDISC | SKIP_PATCH
 | | ...
 | | [Template] | Discover NDR or PDR for IPv4 routing with IPSec SW cryptodev
 | | wt=2 | rxq=1 | framesize=${64} | min_rate=${50000} | search_type=PDR
diff --git a/tests/vpp/perf/crypto/40ge2p1xl710-ethip4ipsecbasetnlsw-ip4base-tnl-aes-gcm-ndrpdrdisc.robot b/tests/vpp/perf/crypto/40ge2p1xl710-ethip4ipsecbasetnlsw-ip4base-tnl-aes-gcm-ndrpdrdisc.robot
index 7bfadb3da0..7276e2e959 100644
--- a/tests/vpp/perf/crypto/40ge2p1xl710-ethip4ipsecbasetnlsw-ip4base-tnl-aes-gcm-ndrpdrdisc.robot
+++ b/tests/vpp/perf/crypto/40ge2p1xl710-ethip4ipsecbasetnlsw-ip4base-tnl-aes-gcm-ndrpdrdisc.robot
@@ -131,11 +131,11 @@
 | tc01-64B-1t1c-ethip4ipsecbasetnlsw-ip4base-tnl-aes-gcm-ndrdisc
 | | [Documentation]
 | | ... | [Cfg] DUTs run 1 IPsec tunnel AES GCM in each direction, configured\
-| | ... | with 1 thread, 1 phy core, 1 receive queue per NIC port.
+| | ... | with 1 phy core, 1 receive queue per NIC port.
 | | ... | [Ver] Find NDR for 64 Byte frames\
 | | ... | using binary search start at 40GE linerate, step 50kpps.
 | | ...
-| | [Tags] | 64B | 1T1C | STHREAD | NDRDISC
+| | [Tags] | 64B | 1C | NDRDISC
 | | ...
 | | [Template] | Discover NDR or PDR for IPv4 routing with IPSec SW cryptodev
 | | wt=1 | rxq=1 | framesize=${64} | min_rate=${50000} | search_type=NDR
@@ -143,11 +143,11 @@
 | tc02-64B-1t1c-ethip4ipsecbasetnlsw-ip4base-tnl-aes-gcm-pdrdisc
 | | [Documentation]
 | | ... | [Cfg] DUTs run 1 IPsec tunnel AES GCM in each direction, configured\
-| | ... | with 1 thread, 1 phy core, 1 receive queue per NIC port.
+| | ... | with 1 phy core, 1 receive queue per NIC port.
 | | ... | [Ver] Find PDR for 64 Byte frames using binary search start at 40GE\
 | | ... | linerate, step 50kpps and loss tolerance of 0.5%.
 | | ...
-| | [Tags] | 64B | 1T1C | STHREAD | PDRDISC | SKIP_PATCH
+| | [Tags] | 64B | 1C | PDRDISC | SKIP_PATCH
 | | ...
 | | [Template] | Discover NDR or PDR for IPv4 routing with IPSec SW cryptodev
 | | wt=1 | rxq=1 | framesize=${64} | min_rate=${50000} | search_type=PDR
@@ -155,11 +155,11 @@
 | tc03-1518B-1t1c-ethip4ipsecbasetnlsw-ip4base-tnl-aes-gcm-ndrdisc
 | | [Documentation]
 | | ... | [Cfg] DUTs run 1 IPsec tunnel AES GCM in each direction, configured\
-| | ... | with 1 thread, 1 phy core, 1 receive queue per NIC port.
+| | ... | with 1 phy core, 1 receive queue per NIC port.
 | | ... | [Ver] Find NDR for 1518 Byte frames\
 | | ... | using binary search start at 40GE linerate, step 50kpps.
 | | ...
-| | [Tags] | 1518B | 1T1C | STHREAD | NDRDISC
+| | [Tags] | 1518B | 1C | NDRDISC
 | | ...
 | | [Template] | Discover NDR or PDR for IPv4 routing with IPSec SW cryptodev
 | | wt=1 | rxq=1 | framesize=${1518} | min_rate=${50000} | search_type=NDR
@@ -167,11 +167,11 @@
 | tc04-1518B-1t1c-ethip4ipsecbasetnlsw-ip4base-tnl-aes-gcm-pdrdisc
 | | [Documentation]
 | | ... | [Cfg] DUTs run 1 IPsec tunnel AES GCM in each direction, configured\
-| | ... | with 1 thread, 1 phy core, 1 receive queue per NIC port.
+| | ... | with 1 phy core, 1 receive queue per NIC port.
 | | ... | [Ver] Find PDR for 1518 Byte frames using binary search start at 40GE\
 | | ... | linerate, step 50kpps and loss tolerance of 0.5%.
 | | ...
-| | [Tags] | 1518B | 1T1C | STHREAD | PDRDISC | SKIP_PATCH
+| | [Tags] | 1518B | 1C | PDRDISC | SKIP_PATCH
 | | ...
 | | [Template] | Discover NDR or PDR for IPv4 routing with IPSec SW cryptodev
 | | wt=1 | rxq=1 | framesize=${1518} | min_rate=${50000} | search_type=PDR
@@ -179,12 +179,12 @@
 | tc05-IMIX-1t1c-ethip4ipsecbasetnlsw-ip4base-tnl-aes-gcm-ndrdisc
 | | [Documentation]
 | | ... | [Cfg] DUTs run 1 IPsec tunnel AES GCM in each direction, configured\
-| | ... | with 1 thread, 1 phy core, 1 receive queue per NIC port.
+| | ... | with 1 phy core, 1 receive queue per NIC port.
 | | ... | [Ver] Find NDR for IMIX_v4_1 frames\
 | | ... | using binary search start at 40GE linerate, step 50kpps.
 | | ... | IMIX_v4_1 = (28x64B; 16x570B; 4x1518B)
 | | ...
-| | [Tags] | IMIX | 1T1C | STHREAD | NDRDISC
+| | [Tags] | IMIX | 1C | NDRDISC
 | | ...
 | | [Template] | Discover NDR or PDR for IPv4 routing with IPSec SW cryptodev
 | | wt=1 | rxq=1 | framesize=IMIX_v4_1 | min_rate=${50000} | search_type=NDR
@@ -192,12 +192,12 @@
 | tc06-IMIX-1t1c-ethip4ipsecbasetnlsw-ip4base-tnl-aes-gcm-pdrdisc
 | | [Documentation]
 | | ... | [Cfg] DUTs run 1 IPsec tunnel AES GCM in each direction, configured\
-| | ... | with 1 thread, 1 phy core, 1 receive queue per NIC port.
+| | ... | with 1 phy core, 1 receive queue per NIC port.
 | | ... | [Ver] Find PDR for IMIX_v4_1 frames using binary search start at 40GE\
 | | ... | linerate, step 50kpps and loss tolerance of 0.5%.
 | | ... | IMIX_v4_1 = (28x64B; 16x570B; 4x1518B)
 | | ...
-| | [Tags] | IMIX | 1T1C | STHREAD | PDRDISC | SKIP_PATCH
+| | [Tags] | IMIX | 1C | PDRDISC | SKIP_PATCH
 | | ...
 | | [Template] | Discover NDR or PDR for IPv4 routing with IPSec SW cryptodev
 | | wt=1 | rxq=1 | framesize=IMIX_v4_1 | min_rate=${50000} | search_type=PDR
@@ -205,11 +205,11 @@
 | tc07-64B-2t2c-ethip4ipsecbasetnlsw-ip4base-tnl-aes-gcm-ndrdisc
 | | [Documentation]
 | | ... | [Cfg] DUTs run 1 IPsec tunnel AES GCM in each direction, configured\
-| | ... | with 2 thread, 2 phy core, 1 receive queue per NIC port.
+| | ... | with 2 phy core, 1 receive queue per NIC port.
 | | ... | [Ver] Find NDR for 64 Byte frames\
 | | ... | using binary search start at 40GE linerate, step 50kpps.
 | | ...
-| | [Tags] | 64B | 2T2C | MTHREAD | NDRDISC
+| | [Tags] | 64B | 2C | NDRDISC
 | | ...
 | | [Template] | Discover NDR or PDR for IPv4 routing with IPSec SW cryptodev
 | | wt=2 | rxq=1 | framesize=${64} | min_rate=${50000} | search_type=NDR
@@ -217,11 +217,11 @@
 | tc08-64B-2t2c-ethip4ipsecbasetnlsw-ip4base-tnl-aes-gcm-pdrdisc
 | | [Documentation]
 | | ... | [Cfg] DUTs run 1 IPsec tunnel AES GCM in each direction, configured\
-| | ... | with 2 thread, 2 phy core, 1 receive queue per NIC port.
+| | ... | with 2 phy core, 1 receive queue per NIC port.
 | | ... | [Ver] Find PDR for 64 Byte frames using binary search start at 40GE\
 | | ... | linerate, step 50kpps and loss tolerance of 0.5%.
 | | ...
-| | [Tags] | 64B | 2T2C | MTHREAD | PDRDISC | SKIP_PATCH
+| | [Tags] | 64B | 2C | PDRDISC | SKIP_PATCH
 | | ...
 | | [Template] | Discover NDR or PDR for IPv4 routing with IPSec SW cryptodev
 | | wt=2 | rxq=1 | framesize=${64} | min_rate=${50000} | search_type=PDR
diff --git a/tests/vpp/perf/crypto/40ge2p1xl710-ethip4ipsecbasetnlsw-ip4base-tnl-cbc-sha1-ndrpdrdisc.robot b/tests/vpp/perf/crypto/40ge2p1xl710-ethip4ipsecbasetnlsw-ip4base-tnl-cbc-sha1-ndrpdrdisc.robot
index 116b7f35bc..2447fbf992 100644
--- a/tests/vpp/perf/crypto/40ge2p1xl710-ethip4ipsecbasetnlsw-ip4base-tnl-cbc-sha1-ndrpdrdisc.robot
+++ b/tests/vpp/perf/crypto/40ge2p1xl710-ethip4ipsecbasetnlsw-ip4base-tnl-cbc-sha1-ndrpdrdisc.robot
@@ -131,11 +131,11 @@
 | tc01-64B-1t1c-ethip4ipsecbasetnlsw-ip4base-tnl-cbc-sha1-ndrdisc
 | | [Documentation]
 | | ... | [Cfg] DUTs run 1 IPsec tunnel CBC-SHA1 in each direction, configured\
-| | ... | with 1 thread, 1 phy core, 1 receive queue per NIC port.
+| | ... | with 1 phy core, 1 receive queue per NIC port.
 | | ... | [Ver] Find NDR for 64 Byte frames\
 | | ... | using binary search start at 40GE linerate, step 50kpps.
 | | ...
-| | [Tags] | 64B | 1T1C | STHREAD | NDRDISC
+| | [Tags] | 64B | 1C | NDRDISC
 | | ...
 | | [Template] | Discover NDR or PDR for IPv4 routing with IPSec SW cryptodev
 | | wt=1 | rxq=1 | framesize=${64} | min_rate=${50000} | search_type=NDR
@@ -143,11 +143,11 @@
 | tc02-64B-1t1c-ethip4ipsecbasetnlsw-ip4base-tnl-cbc-sha1-pdrdisc
 | | [Documentation]
 | | ... | [Cfg] DUTs run 1 IPsec tunnel CBC-SHA1 in each direction, configured\
-| | ... | with 1 thread, 1 phy core, 1 receive queue per NIC port.
+| | ... | with 1 phy core, 1 receive queue per NIC port.
 | | ... | [Ver] Find PDR for 64 Byte frames using binary search start at 40GE\
 | | ... | linerate, step 50kpps and loss tolerance of 0.5%.
 | | ...
-| | [Tags] | 64B | 1T1C | STHREAD | PDRDISC | SKIP_PATCH
+| | [Tags] | 64B | 1C | PDRDISC | SKIP_PATCH
 | | ...
 | | [Template] | Discover NDR or PDR for IPv4 routing with IPSec SW cryptodev
 | | wt=1 | rxq=1 | framesize=${64} | min_rate=${50000} | search_type=PDR
@@ -155,11 +155,11 @@
 | tc03-1518B-1t1c-ethip4ipsecbasetnlsw-ip4base-tnl-cbc-sha1-ndrdisc
 | | [Documentation]
 | | ... | [Cfg] DUTs run 1 IPsec tunnel CBC-SHA1 in each direction, configured\
-| | ... | with 1 thread, 1 phy core, 1 receive queue per NIC port.
+| | ... | with 1 phy core, 1 receive queue per NIC port.
 | | ... | [Ver] Find NDR for 1518 Byte frames\
 | | ... | using binary search start at 40GE linerate, step 50kpps.
 | | ...
-| | [Tags] | 1518B | 1T1C | STHREAD | NDRDISC
+| | [Tags] | 1518B | 1C | NDRDISC
 | | ...
 | | [Template] | Discover NDR or PDR for IPv4 routing with IPSec SW cryptodev
 | | wt=1 | rxq=1 | framesize=${1518} | min_rate=${50000} | search_type=NDR
@@ -167,11 +167,11 @@
 | tc04-1518B-1t1c-ethip4ipsecbasetnlsw-ip4base-tnl-cbc-sha1-pdrdisc
 | | [Documentation]
 | | ... | [Cfg] DUTs run 1 IPsec tunnel CBC-SHA1 in each direction, configured\
-| | ... | with 1 thread, 1 phy core, 1 receive queue per NIC port.
+| | ... | with 1 phy core, 1 receive queue per NIC port.
 | | ... | [Ver] Find PDR for 1518 Byte frames using binary search start at 40GE\
 | | ... | linerate, step 50kpps and loss tolerance of 0.5%.
 | | ...
-| | [Tags] | 1518B | 1T1C | STHREAD | PDRDISC | SKIP_PATCH
+| | [Tags] | 1518B | 1C | PDRDISC | SKIP_PATCH
 | | ...
 | | [Template] | Discover NDR or PDR for IPv4 routing with IPSec SW cryptodev
 | | wt=1 | rxq=1 | framesize=${1518} | min_rate=${50000} | search_type=PDR
@@ -179,12 +179,12 @@
 | tc05-IMIX-1t1c-ethip4ipsecbasetnlsw-ip4base-tnl-cbc-sha1-ndrdisc
 | | [Documentation]
 | | ... | [Cfg] DUTs run 1 IPsec tunnel CBC-SHA1 in each direction, configured\
-| | ... | with 1 thread, 1 phy core, 1 receive queue per NIC port.
+| | ... | with 1 phy core, 1 receive queue per NIC port.
 | | ... | [Ver] Find NDR for IMIX_v4_1 frames\
 | | ... | using binary search start at 40GE linerate, step 50kpps.
 | | ... | IMIX_v4_1 = (28x64B; 16x570B; 4x1518B)
 | | ...
-| | [Tags] | IMIX | 1T1C | STHREAD | NDRDISC
+| | [Tags] | IMIX | 1C | NDRDISC
 | | ...
 | | [Template] | Discover NDR or PDR for IPv4 routing with IPSec SW cryptodev
 | | wt=1 | rxq=1 | framesize=IMIX_v4_1 | min_rate=${50000} | search_type=NDR
@@ -192,12 +192,12 @@
 | tc06-IMIX-1t1c-ethip4ipsecbasetnlsw-ip4base-tnl-cbc-sha1-pdrdisc
 | | [Documentation]
 | | ... | [Cfg] DUTs run 1 IPsec tunnel CBC-SHA1 in each direction, configured\
-| | ... | with 1 thread, 1 phy core, 1 receive queue per NIC port.
+| | ... | with 1 phy core, 1 receive queue per NIC port.
 | | ... | [Ver] Find PDR for IMIX_v4_1 frames using binary search start at 40GE\
 | | ... | linerate, step 50kpps and loss tolerance of 0.5%.
 | | ... | IMIX_v4_1 = (28x64B; 16x570B; 4x1518B)
 | | ...
-| | [Tags] | IMIX | 1T1C | STHREAD | PDRDISC | SKIP_PATCH
+| | [Tags] | IMIX | 1C | PDRDISC | SKIP_PATCH
 | | ...
 | | [Template] | Discover NDR or PDR for IPv4 routing with IPSec SW cryptodev
 | | wt=1 | rxq=1 | framesize=IMIX_v4_1 | min_rate=${50000} | search_type=PDR
@@ -205,11 +205,11 @@
 | tc07-64B-2t2c-ethip4ipsecbasetnlsw-ip4base-tnl-cbc-sha1-ndrdisc
 | | [Documentation]
 | | ... | [Cfg] DUTs run 1 IPsec tunnel CBC-SHA1 in each direction, configured\
-| | ... | with 2 thread, 2 phy core, 1 receive queue per NIC port.
+| | ... | with 2 phy core, 1 receive queue per NIC port.
 | | ... | [Ver] Find NDR for 64 Byte frames\
 | | ... | using binary search start at 40GE linerate, step 50kpps.
 | | ...
-| | [Tags] | 64B | 2T2C | MTHREAD | NDRDISC
+| | [Tags] | 64B | 2C | NDRDISC
 | | ...
 | | [Template] | Discover NDR or PDR for IPv4 routing with IPSec SW cryptodev
 | | wt=2 | rxq=1 | framesize=${64} | min_rate=${50000} | search_type=NDR
@@ -217,11 +217,11 @@
 | tc08-64B-2t2c-ethip4ipsecbasetnlsw-ip4base-tnl-cbc-sha1-pdrdisc
 | | [Documentation]
 | | ... | [Cfg] DUTs run 1 IPsec tunnel CBC-SHA1 in each direction, configured\
-| | ... | with 2 thread, 2 phy core, 1 receive queue per NIC port.
+| | ... | with 2 phy core, 1 receive queue per NIC port.
 | | ... | [Ver] Find PDR for 64 Byte frames using binary search start at 40GE\
 | | ... | linerate, step 50kpps and loss tolerance of 0.5%.
 | | ...
-| | [Tags] | 64B | 2T2C | MTHREAD | PDRDISC | SKIP_PATCH
+| | [Tags] | 64B | 2C | PDRDISC | SKIP_PATCH
 | | ...
 | | [Template] | Discover NDR or PDR for IPv4 routing with IPSec SW cryptodev
 | | wt=2 | rxq=1 | framesize=${64} | min_rate=${50000} | search_type=PDR
diff --git a/tests/vpp/perf/crypto/40ge2p1xl710-ethip4ipsecscale1000tnl-ip4base-int-aes-gcm-mrr.robot b/tests/vpp/perf/crypto/40ge2p1xl710-ethip4ipsecscale1000tnl-ip4base-int-aes-gcm-mrr.robot
index 19d55bca92..4ff7de3757 100644
--- a/tests/vpp/perf/crypto/40ge2p1xl710-ethip4ipsecscale1000tnl-ip4base-int-aes-gcm-mrr.robot
+++ b/tests/vpp/perf/crypto/40ge2p1xl710-ethip4ipsecscale1000tnl-ip4base-int-aes-gcm-mrr.robot
@@ -107,10 +107,10 @@
 | tc01-64B-1t1c-ethip4ipsecscale1000tnl-ip4base-int-aes-gcm-mrr
 | | [Documentation]
 | | ... | [Cfg] DUTs run 1000 IPsec tunnels AES GCM in each direction,\
-| | ... | configured with 1 thread, 1 phy core, 1 receive queue per NIC port.
+| | ... | configured 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 IPv4 routing with IPSec HW cryptodev
 | | framesize=${64} | wt=1 | rxq=1
@@ -118,10 +118,10 @@
 | tc02-1518B-1t1c-ethip4ipsecscale1000tnl-ip4base-int-aes-gcm-mrr
 | | [Documentation]
 | | ... | [Cfg] DUTs run 1000 IPsec tunnels AES GCM in each direction,\
-| | ... | configured with 1 thread, 1 phy core, 1 receive queue per NIC port.
+| | ... | configured 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 IPv4 routing with IPSec HW cryptodev
 | | framesize=${1518} | wt=1 | rxq=1
@@ -132,11 +132,11 @@
 | tc04-IMIX-1t1c-ethip4ipsecscale1000tnl-ip4base-int-aes-gcm-mrr
 | | [Documentation]
 | | ... | [Cfg] DUTs run 1000 IPsec tunnels AES GCM in each direction,\
-| | ... | configured with 1 thread, 1 phy core, 1 receive queue per NIC port.
+| | ... | configured with 1 phy core, 1 receive queue per NIC port.
 | | ... | [Ver] Measure MaxReceivedRate for IMIX_v4_1 frames using single\
 | | ... | trial throughput test.
 | | ... | IMIX_v4_1 = (28x64B; 16x570B; 4x1518B)
-| | [Tags] | IMIX | 1T1C | STHREAD
+| | [Tags] | IMIX | 1C
 | | ...
 | | [Template] | Check RR for IPv4 routing with IPSec HW cryptodev
 | | framesize=IMIX_v4_1 | wt=1 | rxq=1
@@ -144,10 +144,10 @@
 | tc05-64B-2t2c-ethip4ipsecscale1000tnl-ip4base-int-aes-gcm-mrr
 | | [Documentation]
 | | ... | [Cfg] DUTs run 1000 IPsec tunnels AES GCM in each direction,\
-| | ... | configured with 2 threads, 2 phy cores, 1 receive queue per NIC port.
+| | ... | configured 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 IPv4 routing with IPSec HW cryptodev
 | | framesize=${64} | wt=2 | rxq=1
@@ -155,10 +155,10 @@
 | tc06-1518B-2t2c-ethip4ipsecscale1000tnl-ip4base-int-aes-gcm-mrr
 | | [Documentation]
 | | ... | [Cfg] DUTs run 1000 IPsec tunnels AES GCM in each direction,\
-| | ... | configured with 2 threads, 2 phy cores, 1 receive queue per NIC port.
+| | ... | configured 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 IPv4 routing with IPSec HW cryptodev
 | | framesize=${1518} | wt=2 | rxq=1
@@ -166,11 +166,11 @@
 | tc08-IMIX-2t2c-ethip4ipsecscale1000tnl-ip4base-int-aes-gcm-mrr
 | | [Documentation]
 | | ... | [Cfg] DUTs run 1000 IPsec tunnels AES GCM in each direction,\
-| | ... | configured with 2 threads, 2 phy cores, 1 receive queue per NIC port.
+| | ... | configured with 2 phy cores, 1 receive queue per NIC port.
 | | ... | [Ver] Measure MaxReceivedRate for IMIX_v4_1 frames using single\
 | | ... | trial throughput test.
 | | ... | IMIX_v4_1 = (28x64B; 16x570B; 4x1518B)
-| | [Tags] | IMIX | 2T2C | MTHREAD
+| | [Tags] | IMIX | 2C
 | | ...
 | | [Template] | Check RR for IPv4 routing with IPSec HW cryptodev
 | | framesize=IMIX_v4_1 | wt=2 | rxq=1
@@ -178,10 +178,10 @@
 | tc09-64B-4t4c-ethip4ipsecscale1000tnl-ip4base-int-aes-gcm-mrr
 | | [Documentation]
 | | ... | [Cfg] DUTs run 1000 IPsec tunnels AES GCM in each direction,\
-| | ... | configured with 4 threads, 4 phy cores, 2 receive queues per NIC port.
+| | ... | configured 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 IPv4 routing with IPSec HW cryptodev
 | | framesize=${64} | wt=4 | rxq=2
@@ -189,10 +189,10 @@
 | tc10-1518B-4t4c-ethip4ipsecscale1000tnl-ip4base-int-aes-gcm-mrr
 | | [Documentation]
 | | ... | [Cfg] DUTs run 1000 IPsec tunnels AES GCM in each direction,\
-| | ... | configured with 4 threads, 4 phy cores, 2 receive queues per NIC port.
+| | ... | configured 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 IPv4 routing with IPSec HW cryptodev
 | | framesize=${1518} | wt=4 | rxq=2
@@ -200,11 +200,11 @@
 | tc12-IMIX-4t4c-ethip4ipsecscale1000tnl-ip4base-int-aes-gcm-mrr
 | | [Documentation]
 | | ... | [Cfg] DUTs run 1000 IPsec tunnels AES GCM in each direction,\
-| | ... | configured with 4 threads, 4 phy cores, 2 receive queues per NIC port.
+| | ... | configured with 4 phy cores, 2 receive queues per NIC port.
 | | ... | [Ver] Measure MaxReceivedRate for IMIX_v4_1 frames using single\
 | | ... | trial throughput test.
 | | ... | IMIX_v4_1 = (28x64B; 16x570B; 4x1518B)
-| | [Tags] | IMIX | 4T4C | MTHREAD
+| | [Tags] | IMIX | 4C
 | | ...
 | | [Template] | Check RR for IPv4 routing with IPSec HW cryptodev
 | | framesize=IMIX_v4_1 | wt=4 | rxq=2
diff --git a/tests/vpp/perf/crypto/40ge2p1xl710-ethip4ipsecscale1000tnl-ip4base-int-aes-gcm-ndrpdrdisc.robot b/tests/vpp/perf/crypto/40ge2p1xl710-ethip4ipsecscale1000tnl-ip4base-int-aes-gcm-ndrpdrdisc.robot
index f42017ce77..5488e9bb11 100644
--- a/tests/vpp/perf/crypto/40ge2p1xl710-ethip4ipsecscale1000tnl-ip4base-int-aes-gcm-ndrpdrdisc.robot
+++ b/tests/vpp/perf/crypto/40ge2p1xl710-ethip4ipsecscale1000tnl-ip4base-int-aes-gcm-ndrpdrdisc.robot
@@ -76,11 +76,11 @@
 | tc01-64B-1t1c-ethip4ipsecscale1000tnl-ip4base-int-aes-gcm-ndrdisc
 | | [Documentation]
 | | ... | [Cfg] DUTs run 1000 IPsec tunnels AES GCM in each direction,\
-| | ... | configured with 1 thread, 1 phy core, 1 receive queue per NIC port.
+| | ... | configured with 1 phy core, 1 receive queue per NIC port.
 | | ... | [Ver] Find NDR for 64 Byte frames\
 | | ... | using binary search start at 40GE linerate, step 50kpps.
 | | ...
-| | [Tags] | 64B | 1T1C | STHREAD | NDRDISC
+| | [Tags] | 64B | 1C | NDRDISC
 | | ...
 | | # FIXME: Move repeated lines into a keyword.
 | | ${framesize}= | Set Variable | ${64}
@@ -112,11 +112,11 @@
 | tc02-64B-1t1c-ethip4ipsecscale1000tnl-ip4base-int-aes-gcm-pdrdisc
 | | [Documentation]
 | | ... | [Cfg] DUTs run 1000 IPsec tunnels AES GCM in each direction,\
-| | ... | configured with 1 thread, 1 phy core, 1 receive queue per NIC port.
+| | ... | configured with 1 phy core, 1 receive queue per NIC port.
 | | ... | [Ver] Find PDR for 64 Byte frames using binary search start at 40GE\
 | | ... | linerate, step 50kpps and loss tolerance of 0.5%.
 | | ...
-| | [Tags] | 64B | 1T1C | STHREAD | PDRDISC | SKIP_PATCH
+| | [Tags] | 64B | 1C | PDRDISC | SKIP_PATCH
 | | ...
 | | ${framesize}= | Set Variable | ${64}
 | | ${min_rate}= | Set Variable | ${50000}
@@ -148,11 +148,11 @@
 | tc03-1518B-1t1c-ethip4ipsecscale1000tnl-ip4base-int-aes-gcm-ndrdisc
 | | [Documentation]
 | | ... | [Cfg] DUTs run 1000 IPsec tunnels AES GCM in each direction,\
-| | ... | configured with 1 thread, 1 phy core, 1 receive queue per NIC port.
+| | ... | configured with 1 phy core, 1 receive queue per NIC port.
 | | ... | [Ver] Find NDR for 1518 Byte frames\
 | | ... | using binary search start at 40GE linerate, step 50kpps.
 | | ...
-| | [Tags] | 1518B | 1T1C | STHREAD | NDRDISC
+| | [Tags] | 1518B | 1C | NDRDISC
 | | ...
 | | ${framesize}= | Set Variable | ${1518}
 | | ${min_rate}= | Set Variable | ${50000}
@@ -183,11 +183,11 @@
 | tc04-1518B-1t1c-ethip4ipsecscale1000tnl-ip4base-int-aes-gcm-pdrdisc
 | | [Documentation]
 | | ... | [Cfg] DUTs run 1000 IPsec tunnel AES GCM in each direction,\
-| | ... | configured with 1 thread, 1 phy core, 1 receive queue per NIC port.
+| | ... | configured with 1 phy core, 1 receive queue per NIC port.
 | | ... | [Ver] Find PDR for 1518 Byte frames using binary search start at 40GE\
 | | ... | linerate, step 50kpps and loss tolerance of 0.5%.
 | | ...
-| | [Tags] | 1518B | 1T1C | STHREAD | PDRDISC | SKIP_PATCH
+| | [Tags] | 1518B | 1C | PDRDISC | SKIP_PATCH
 | | ...
 | | ${framesize}= | Set Variable | ${1518}
 | | ${min_rate}= | Set Variable | ${50000}
@@ -219,12 +219,12 @@
 | tc05-IMIX-1t1c-ethip4ipsecscale1000tnl-ip4base-int-aes-gcm-ndrdisc
 | | [Documentation]
 | | ... | [Cfg] DUTs run 1000 IPsec tunnels AES GCM in each direction,\
-| | ... | configured with 1 thread, 1 phy core, 1 receive queue per NIC port.
+| | ... | configured with 1 phy core, 1 receive queue per NIC port.
 | | ... | [Ver] Find NDR for IMIX_v4_1 frames\
 | | ... | using binary search start at 40GE linerate, step 50kpps.
 | | ... | IMIX_v4_1 = (28x64B; 16x570B; 4x1518B)
 | | ...
-| | [Tags] | IMIX | 1T1C | STHREAD | NDRDISC
+| | [Tags] | IMIX | 1C | NDRDISC
 | | ...
 | | ${framesize}= | Set Variable | IMIX_v4_1
 | | ${imix_size}= | Get Frame Size | ${framesize}
@@ -256,12 +256,12 @@
 | tc06-IMIX-1t1c-ethip4ipsecscale1000tnl-ip4base-int-aes-gcm-pdrdisc
 | | [Documentation]
 | | ... | [Cfg] DUTs run 1000 IPsec tunnels AES GCM in each direction,\
-| | ... | configured with 1 thread, 1 phy core, 1 receive queue per NIC port.
+| | ... | configured with 1 phy core, 1 receive queue per NIC port.
 | | ... | [Ver] Find PDR for IMIX_v4_1 frames using binary search start at 40GE\
 | | ... | linerate, step 50kpps and loss tolerance of 0.5%.
 | | ... | IMIX_v4_1 = (28x64B; 16x570B; 4x1518B)
 | | ...
-| | [Tags] | IMIX | 1T1C | STHREAD | PDRDISC | SKIP_PATCH
+| | [Tags] | IMIX | 1C | PDRDISC | SKIP_PATCH
 | | ...
 | | ${framesize}= | Set Variable | IMIX_v4_1
 | | ${imix_size}= | Get Frame Size | ${framesize}
@@ -294,11 +294,11 @@
 | tc07-64B-2t2c-ethip4ipsecscale1000tnl-ip4base-int-aes-gcm-ndrdisc
 | | [Documentation]
 | | ... | [Cfg] DUTs run 1000 IPsec tunnels AES GCM in each direction,\
-| | ... | configured with 2 thread, 2 phy core, 1 receive queue per NIC port.
+| | ... | configured with 2 phy core, 1 receive queue per NIC port.
 | | ... | [Ver] Find NDR for 64 Byte frames\
 | | ... | using binary search start at 40GE linerate, step 50kpps.
 | | ...
-| | [Tags] | 64B | 2T2C | MTHREAD | NDRDISC
+| | [Tags] | 64B | 2C | NDRDISC
 | | ...
 | | ${framesize}= | Set Variable | ${64}
 | | ${min_rate}= | Set Variable | ${50000}
@@ -329,11 +329,11 @@
 | tc08-64B-2t2c-ethip4ipsecscale1000tnl-ip4base-int-aes-gcm-pdrdisc
 | | [Documentation]
 | | ... | [Cfg] DUTs run 1000 IPsec tunnels AES GCM in each direction,\
-| | ... | configured with 2 thread, 2 phy core, 1 receive queue per NIC port.
+| | ... | configured with 2 phy core, 1 receive queue per NIC port.
 | | ... | [Ver] Find PDR for 64 Byte frames using binary search start at 40GE\
 | | ... | linerate, step 50kpps and loss tolerance of 0.5%.
 | | ...
-| | [Tags] | 64B | 2T2C | MTHREAD | PDRDISC | SKIP_PATCH
+| | [Tags] | 64B | 2C | PDRDISC | SKIP_PATCH
 | | ...
 | | ${framesize}= | Set Variable | ${64}
 | | ${min_rate}= | Set Variable | ${50000}
diff --git a/tests/vpp/perf/crypto/40ge2p1xl710-ethip4ipsecscale1000tnl-ip4base-int-cbc-sha1-mrr.robot b/tests/vpp/perf/crypto/40ge2p1xl710-ethip4ipsecscale1000tnl-ip4base-int-cbc-sha1-mrr.robot
index 55076dc261..ff7d3c5bd5 100644
--- a/tests/vpp/perf/crypto/40ge2p1xl710-ethip4ipsecscale1000tnl-ip4base-int-cbc-sha1-mrr.robot
+++ b/tests/vpp/perf/crypto/40ge2p1xl710-ethip4ipsecscale1000tnl-ip4base-int-cbc-sha1-mrr.robot
@@ -107,10 +107,10 @@
 | tc01-64B-1t1c-ethip4ipsecscale1000tnl-ip4base-int-cbc-sha1-mrr
 | | [Documentation]
 | | ... | [Cfg] DUTs run 1000 IPsec tunnels CBC-SHA1 in each direction,\
-| | ... | configured with 1 thread, 1 phy core, 1 receive queue per NIC port.
+| | ... | configured 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 IPv4 routing with IPSec HW cryptodev
 | | framesize=${64} | wt=1 | rxq=1
@@ -118,10 +118,10 @@
 | tc02-1518B-1t1c-ethip4ipsecscale1000tnl-ip4base-int-cbc-sha1-mrr
 | | [Documentation]
 | | ... | [Cfg] DUTs run 1000 IPsec tunnels CBC-SHA1 in each direction,\
-| | ... | configured with 1 thread, 1 phy core, 1 receive queue per NIC port.
+| | ... | configured 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 IPv4 routing with IPSec HW cryptodev
 | | framesize=${1518} | wt=1 | rxq=1
@@ -132,11 +132,11 @@
 | tc04-IMIX-1t1c-ethip4ipsecscale1000tnl-ip4base-int-cbc-sha1-mrr
 | | [Documentation]
 | | ... | [Cfg] DUTs run 1000 IPsec tunnels CBC-SHA1 in each direction,\
-| | ... | configured with 1 thread, 1 phy core, 1 receive queue per NIC port.
+| | ... | configured with 1 phy core, 1 receive queue per NIC port.
 | | ... | [Ver] Measure MaxReceivedRate for IMIX_v4_1 frames using single\
 | | ... | trial throughput test.
 | | ... | IMIX_v4_1 = (28x64B; 16x570B; 4x1518B)
-| | [Tags] | IMIX | 1T1C | STHREAD
+| | [Tags] | IMIX | 1C
 | | ...
 | | [Template] | Check RR for IPv4 routing with IPSec HW cryptodev
 | | framesize=IMIX_v4_1 | wt=1 | rxq=1
@@ -144,10 +144,10 @@
 | tc05-64B-2t2c-ethip4ipsecscale1000tnl-ip4base-int-cbc-sha1-mrr
 | | [Documentation]
 | | ... | [Cfg] DUTs run 1000 IPsec tunnels CBC-SHA1 in each direction,\
-| | ... | configured with 2 threads, 2 phy cores, 1 receive queue per NIC port.
+| | ... | configured 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 IPv4 routing with IPSec HW cryptodev
 | | framesize=${64} | wt=2 | rxq=1
@@ -155,10 +155,10 @@
 | tc06-1518B-2t2c-ethip4ipsecscale1000tnl-ip4base-int-cbc-sha1-mrr
 | | [Documentation]
 | | ... | [Cfg] DUTs run 1000 IPsec tunnels CBC-SHA1 in each direction,\
-| | ... | configured with 2 threads, 2 phy cores, 1 receive queue per NIC port.
+| | ... | configured 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 IPv4 routing with IPSec HW cryptodev
 | | framesize=${1518} | wt=2 | rxq=1
@@ -166,11 +166,11 @@
 | tc08-IMIX-2t2c-ethip4ipsecscale1000tnl-ip4base-int-cbc-sha1-mrr
 | | [Documentation]
 | | ... | [Cfg] DUTs run 1000 IPsec tunnels CBC-SHA1 in each direction,\
-| | ... | configured with 2 threads, 2 phy cores, 1 receive queue per NIC port.
+| | ... | configured with 2 phy cores, 1 receive queue per NIC port.
 | | ... | [Ver] Measure MaxReceivedRate for IMIX_v4_1 frames using single\
 | | ... | trial throughput test.
 | | ... | IMIX_v4_1 = (28x64B; 16x570B; 4x1518B)
-| | [Tags] | IMIX | 2T2C | MTHREAD
+| | [Tags] | IMIX | 2C
 | | ...
 | | [Template] | Check RR for IPv4 routing with IPSec HW cryptodev
 | | framesize=IMIX_v4_1 | wt=2 | rxq=1
@@ -178,10 +178,10 @@
 | tc09-64B-4t4c-ethip4ipsecscale1000tnl-ip4base-int-cbc-sha1-mrr
 | | [Documentation]
 | | ... | [Cfg] DUTs run 1000 IPsec tunnels CBC-SHA1 in each direction,\
-| | ... | configured with 4 threads, 4 phy cores, 2 receive queues per NIC port.
+| | ... | configured 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 IPv4 routing with IPSec HW cryptodev
 | | framesize=${64} | wt=4 | rxq=2
@@ -189,10 +189,10 @@
 | tc10-1518B-4t4c-ethip4ipsecscale1000tnl-ip4base-int-cbc-sha1-mrr
 | | [Documentation]
 | | ... | [Cfg] DUTs run 1000 IPsec tunnels CBC-SHA1 in each direction,\
-| | ... | configured with 4 threads, 4 phy cores, 2 receive queues per NIC port.
+| | ... | configured 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 IPv4 routing with IPSec HW cryptodev
 | | framesize=${1518} | wt=4 | rxq=2
@@ -200,11 +200,11 @@
 | tc12-IMIX-4t4c-ethip4ipsecscale1000tnl-ip4base-int-cbc-sha1-mrr
 | | [Documentation]
 | | ... | [Cfg] DUTs run 1000 IPsec tunnels CBC-SHA1 in each direction,\
-| | ... | configured with 4 threads, 4 phy cores, 2 receive queues per NIC port.
+| | ... | configured with 4 phy cores, 2 receive queues per NIC port.
 | | ... | [Ver] Measure MaxReceivedRate for IMIX_v4_1 frames using single\
 | | ... | trial throughput test.
 | | ... | IMIX_v4_1 = (28x64B; 16x570B; 4x1518B)
-| | [Tags] | IMIX | 4T4C | MTHREAD
+| | [Tags] | IMIX | 4C
 | | ...
 | | [Template] | Check RR for IPv4 routing with IPSec HW cryptodev
 | | framesize=IMIX_v4_1 | wt=4 | rxq=2
diff --git a/tests/vpp/perf/crypto/40ge2p1xl710-ethip4ipsecscale1000tnl-ip4base-int-cbc-sha1-ndrpdrdisc.robot b/tests/vpp/perf/crypto/40ge2p1xl710-ethip4ipsecscale1000tnl-ip4base-int-cbc-sha1-ndrpdrdisc.robot
index b459f40048..312c9c5e84 100644
--- a/tests/vpp/perf/crypto/40ge2p1xl710-ethip4ipsecscale1000tnl-ip4base-int-cbc-sha1-ndrpdrdisc.robot
+++ b/tests/vpp/perf/crypto/40ge2p1xl710-ethip4ipsecscale1000tnl-ip4base-int-cbc-sha1-ndrpdrdisc.robot
@@ -76,11 +76,11 @@
 | tc01-64B-1t1c-ethip4ipsecscale1000tnl-ip4base-int-cbc-sha1-ndrdisc
 | | [Documentation]
 | | ... | [Cfg] DUTs run 1000 IPsec tunnels CBC-SHA1 in each direction,\
-| | ... | configured with 1 thread, 1 phy core, 1 receive queue per NIC port.
+| | ... | configured with 1 phy core, 1 receive queue per NIC port.
 | | ... | [Ver] Find NDR for 64 Byte frames\
 | | ... | using binary search start at 40GE linerate, step 50kpps.
 | | ...
-| | [Tags] | 64B | 1T1C | STHREAD | NDRDISC
+| | [Tags] | 64B | 1C | NDRDISC
 | | ...
 | | # FIXME: Move repeated lines into a keyword.
 | | ${framesize}= | Set Variable | ${64}
@@ -112,11 +112,11 @@
 | tc02-64B-1t1c-ethip4ipsecscale1000tnl-ip4base-int-cbc-sha1-pdrdisc
 | | [Documentation]
 | | ... | [Cfg] DUTs run 1000 IPsec tunnels CBC-SHA1 in each direction,\
-| | ... | configured with 1 thread, 1 phy core, 1 receive queue per NIC port.
+| | ... | configured with 1 phy core, 1 receive queue per NIC port.
 | | ... | [Ver] Find PDR for 64 Byte frames using binary search start at 40GE\
 | | ... | linerate, step 50kpps and loss tolerance of 0.5%.
 | | ...
-| | [Tags] | 64B | 1T1C | STHREAD | PDRDISC | SKIP_PATCH
+| | [Tags] | 64B | 1C | PDRDISC | SKIP_PATCH
 | | ...
 | | ${framesize}= | Set Variable | ${64}
 | | ${min_rate}= | Set Variable | ${50000}
@@ -148,11 +148,11 @@
 | tc03-1518B-1t1c-ethip4ipsecscale1000tnl-ip4base-int-cbc-sha1-ndrdisc
 | | [Documentation]
 | | ... | [Cfg] DUTs run 1000 IPsec tunnels CBC-SHA1 in each direction,\
-| | ... | configured with 1 thread, 1 phy core, 1 receive queue per NIC port.
+| | ... | configured with 1 phy core, 1 receive queue per NIC port.
 | | ... | [Ver] Find NDR for 1518 Byte frames\
 | | ... | using binary search start at 40GE linerate, step 50kpps.
 | | ...
-| | [Tags] | 1518B | 1T1C | STHREAD | NDRDISC
+| | [Tags] | 1518B | 1C | NDRDISC
 | | ...
 | | ${framesize}= | Set Variable | ${1518}
 | | ${min_rate}= | Set Variable | ${50000}
@@ -182,11 +182,11 @@
 | tc04-1518B-1t1c-ethip4ipsecscale1000tnl-ip4base-int-cbc-sha1-pdrdisc
 | | [Documentation]
 | | ... | [Cfg] DUTs run 1000 IPsec tunnel CBC-SHA1 in each direction,\
-| | ... | configured with 1 thread, 1 phy core, 1 receive queue per NIC port.
+| | ... | configured with 1 phy core, 1 receive queue per NIC port.
 | | ... | [Ver] Find PDR for 1518 Byte frames using binary search start at 40GE\
 | | ... | linerate, step 50kpps and loss tolerance of 0.5%.
 | | ...
-| | [Tags] | 1518B | 1T1C | STHREAD | PDRDISC | SKIP_PATCH
+| | [Tags] | 1518B | 1C | PDRDISC | SKIP_PATCH
 | | ...
 | | ${framesize}= | Set Variable | ${1518}
 | | ${min_rate}= | Set Variable | ${50000}
@@ -217,12 +217,12 @@
 | tc05-IMIX-1t1c-ethip4ipsecscale1000tnl-ip4base-int-cbc-sha1-ndrdisc
 | | [Documentation]
 | | ... | [Cfg] DUTs run 1000 IPsec tunnels CBC-SHA1 in each direction,\
-| | ... | configured with 1 thread, 1 phy core, 1 receive queue per NIC port.
+| | ... | configured with 1 phy core, 1 receive queue per NIC port.
 | | ... | [Ver] Find NDR for IMIX_v4_1 frames\
 | | ... | using binary search start at 40GE linerate, step 50kpps.
 | | ... | IMIX_v4_1 = (28x64B; 16x570B; 4x1518B)
 | | ...
-| | [Tags] | IMIX | 1T1C | STHREAD | NDRDISC
+| | [Tags] | IMIX | 1C | NDRDISC
 | | ...
 | | ${framesize}= | Set Variable | IMIX_v4_1
 | | ${imix_size}= | Get Frame Size | ${framesize}
@@ -253,12 +253,12 @@
 | tc06-IMIX-1t1c-ethip4ipsecscale1000tnl-ip4base-int-cbc-sha1-pdrdisc
 | | [Documentation]
 | | ... | [Cfg] DUTs run 1000 IPsec tunnels CBC-SHA1 in each direction,\
-| | ... | configured with 1 thread, 1 phy core, 1 receive queue per NIC port.
+| | ... | configured with 1 phy core, 1 receive queue per NIC port.
 | | ... | [Ver] Find PDR for IMIX_v4_1 frames using binary search start at 40GE\
 | | ... | linerate, step 50kpps and loss tolerance of 0.5%.
 | | ... | IMIX_v4_1 = (28x64B; 16x570B; 4x1518B)
 | | ...
-| | [Tags] | IMIX | 1T1C | STHREAD | PDRDISC | SKIP_PATCH
+| | [Tags] | IMIX | 1C | PDRDISC | SKIP_PATCH
 | | ...
 | | ${framesize}= | Set Variable | IMIX_v4_1
 | | ${imix_size}= | Get Frame Size | ${framesize}
@@ -290,11 +290,11 @@
 | tc07-64B-2t2c-ethip4ipsecscale1000tnl-ip4base-int-cbc-sha1-ndrdisc
 | | [Documentation]
 | | ... | [Cfg] DUTs run 1000 IPsec tunnels CBC-SHA1 in each direction,\
-| | ... | configured with 2 thread, 2 phy core, 1 receive queue per NIC port.
+| | ... | configured with 2 phy core, 1 receive queue per NIC port.
 | | ... | [Ver] Find NDR for 64 Byte frames\
 | | ... | using binary search start at 40GE linerate, step 50kpps.
 | | ...
-| | [Tags] | 64B | 2T2C | MTHREAD | NDRDISC
+| | [Tags] | 64B | 2C | NDRDISC
 | | ...
 | | ${framesize}= | Set Variable | ${64}
 | | ${min_rate}= | Set Variable | ${50000}
@@ -325,11 +325,11 @@
 | tc08-64B-2t2c-ethip4ipsecscale1000tnl-ip4base-int-cbc-sha1-pdrdisc
 | | [Documentation]
 | | ... | [Cfg] DUTs run 1000 IPsec tunnels CBC-SHA1 in each direction,\
-| | ... | configured with 2 thread, 2 phy core, 1 receive queue per NIC port.
+| | ... | configured with 2 phy core, 1 receive queue per NIC port.
 | | ... | [Ver] Find PDR for 64 Byte frames using binary search start at 40GE\
 | | ... | linerate, step 50kpps and loss tolerance of 0.5%.
 | | ...
-| | [Tags] | 64B | 2T2C | MTHREAD | PDRDISC | SKIP_PATCH
+| | [Tags] | 64B | 2C | PDRDISC | SKIP_PATCH
 | | ...
 | | ${framesize}= | Set Variable | ${64}
 | | ${min_rate}= | Set Variable | ${50000}
diff --git a/tests/vpp/perf/crypto/40ge2p1xl710-ethip4ipsecscale1000tnl-ip4base-tnl-aes-gcm-ndrpdrdisc.robot b/tests/vpp/perf/crypto/40ge2p1xl710-ethip4ipsecscale1000tnl-ip4base-tnl-aes-gcm-ndrpdrdisc.robot
index c631497bb5..473f85c39e 100644
--- a/tests/vpp/perf/crypto/40ge2p1xl710-ethip4ipsecscale1000tnl-ip4base-tnl-aes-gcm-ndrpdrdisc.robot
+++ b/tests/vpp/perf/crypto/40ge2p1xl710-ethip4ipsecscale1000tnl-ip4base-tnl-aes-gcm-ndrpdrdisc.robot
@@ -76,11 +76,11 @@
 | tc01-64B-1t1c-ethip4ipsecscale1000tnl-ip4base-tnl-aes-gcm-ndrdisc
 | | [Documentation]
 | | ... | [Cfg] DUTs run 1000 IPsec tunnels AES GCM in each direction,\
-| | ... | configured with 1 thread, 1 phy core, 1 receive queue per NIC port.
+| | ... | configured with 1 phy core, 1 receive queue per NIC port.
 | | ... | [Ver] Find NDR for 64 Byte frames\
 | | ... | using binary search start at 40GE linerate, step 50kpps.
 | | ...
-| | [Tags] | 64B | 1T1C | STHREAD | NDRDISC
+| | [Tags] | 64B | 1C | NDRDISC
 | | ...
 | | # FIXME: Move repeated lines into a keyword.
 | | ${framesize}= | Set Variable | ${64}
@@ -117,11 +117,11 @@
 | tc02-64B-1t1c-ethip4ipsecscale1000tnl-ip4base-tnl-aes-gcm-pdrdisc
 | | [Documentation]
 | | ... | [Cfg] DUTs run 1000 IPsec tunnels AES GCM in each direction,\
-| | ... | configured with 1 thread, 1 phy core, 1 receive queue per NIC port.
+| | ... | configured with 1 phy core, 1 receive queue per NIC port.
 | | ... | [Ver] Find PDR for 64 Byte frames using binary search start at 40GE\
 | | ... | linerate, step 50kpps and loss tolerance of 0.5%.
 | | ...
-| | [Tags] | 64B | 1T1C | STHREAD | PDRDISC | SKIP_PATCH
+| | [Tags] | 64B | 1C | PDRDISC | SKIP_PATCH
 | | ...
 | | ${framesize}= | Set Variable | ${64}
 | | ${min_rate}= | Set Variable | ${50000}
@@ -158,11 +158,11 @@
 | tc03-1518B-1t1c-ethip4ipsecscale1000tnl-ip4base-tnl-aes-gcm-ndrdisc
 | | [Documentation]
 | | ... | [Cfg] DUTs run 1000 IPsec tunnels AES GCM in each direction,\
-| | ... | configured with 1 thread, 1 phy core, 1 receive queue per NIC port.
+| | ... | configured with 1 phy core, 1 receive queue per NIC port.
 | | ... | [Ver] Find NDR for 1518 Byte frames\
 | | ... | using binary search start at 40GE linerate, step 50kpps.
 | | ...
-| | [Tags] | 1518B | 1T1C | STHREAD | NDRDISC
+| | [Tags] | 1518B | 1C | NDRDISC
 | | ...
 | | ${framesize}= | Set Variable | ${1518}
 | | ${min_rate}= | Set Variable | ${50000}
@@ -198,11 +198,11 @@
 | tc04-1518B-1t1c-ethip4ipsecscale1000tnl-ip4base-tnl-aes-gcm-pdrdisc
 | | [Documentation]
 | | ... | [Cfg] DUTs run 1000 IPsec tunnel AES GCM in each direction,\
-| | ... | configured with 1 thread, 1 phy core, 1 receive queue per NIC port.
+| | ... | configured with 1 phy core, 1 receive queue per NIC port.
 | | ... | [Ver] Find PDR for 1518 Byte frames using binary search start at 40GE\
 | | ... | linerate, step 50kpps and loss tolerance of 0.5%.
 | | ...
-| | [Tags] | 1518B | 1T1C | STHREAD | PDRDISC | SKIP_PATCH
+| | [Tags] | 1518B | 1C | PDRDISC | SKIP_PATCH
 | | ...
 | | ${framesize}= | Set Variable | ${1518}
 | | ${min_rate}= | Set Variable | ${50000}
@@ -239,12 +239,12 @@
 | tc05-IMIX-1t1c-ethip4ipsecscale1000tnl-ip4base-tnl-aes-gcm-ndrdisc
 | | [Documentation]
 | | ... | [Cfg] DUTs run 1000 IPsec tunnels AES GCM in each direction,\
-| | ... | configured with 1 thread, 1 phy core, 1 receive queue per NIC port.
+| | ... | configured with 1 phy core, 1 receive queue per NIC port.
 | | ... | [Ver] Find NDR for IMIX_v4_1 frames\
 | | ... | using binary search start at 40GE linerate, step 50kpps.
 | | ... | IMIX_v4_1 = (28x64B; 16x570B; 4x1518B)
 | | ...
-| | [Tags] | IMIX | 1T1C | STHREAD | NDRDISC
+| | [Tags] | IMIX | 1C | NDRDISC
 | | ...
 | | ${framesize}= | Set Variable | IMIX_v4_1
 | | ${imix_size}= | Get Frame Size | ${framesize}
@@ -281,12 +281,12 @@
 | tc06-IMIX-1t1c-ethip4ipsecscale1000tnl-ip4base-tnl-aes-gcm-pdrdisc
 | | [Documentation]
 | | ... | [Cfg] DUTs run 1000 IPsec tunnels AES GCM in each direction,\
-| | ... | configured with 1 thread, 1 phy core, 1 receive queue per NIC port.
+| | ... | configured with 1 phy core, 1 receive queue per NIC port.
 | | ... | [Ver] Find PDR for IMIX_v4_1 frames using binary search start at 40GE\
 | | ... | linerate, step 50kpps and loss tolerance of 0.5%.
 | | ... | IMIX_v4_1 = (28x64B; 16x570B; 4x1518B)
 | | ...
-| | [Tags] | IMIX | 1T1C | STHREAD | PDRDISC | SKIP_PATCH
+| | [Tags] | IMIX | 1C | PDRDISC | SKIP_PATCH
 | | ...
 | | ${framesize}= | Set Variable | IMIX_v4_1
 | | ${imix_size}= | Get Frame Size | ${framesize}
@@ -324,11 +324,11 @@
 | tc07-64B-2t2c-ethip4ipsecscale1000tnl-ip4base-tnl-aes-gcm-ndrdisc
 | | [Documentation]
 | | ... | [Cfg] DUTs run 1000 IPsec tunnels AES GCM in each direction,\
-| | ... | configured with 2 thread, 2 phy core, 1 receive queue per NIC port.
+| | ... | configured with 2 phy core, 1 receive queue per NIC port.
 | | ... | [Ver] Find NDR for 64 Byte frames\
 | | ... | using binary search start at 40GE linerate, step 50kpps.
 | | ...
-| | [Tags] | 64B | 2T2C | MTHREAD | NDRDISC
+| | [Tags] | 64B | 2C | NDRDISC
 | | ...
 | | ${framesize}= | Set Variable | ${64}
 | | ${min_rate}= | Set Variable | ${50000}
@@ -364,11 +364,11 @@
 | tc08-64B-2t2c-ethip4ipsecscale1000tnl-ip4base-tnl-aes-gcm-pdrdisc
 | | [Documentation]
 | | ... | [Cfg] DUTs run 1000 IPsec tunnels AES GCM in each direction,\
-| | ... | configured with 2 thread, 2 phy core, 1 receive queue per NIC port.
+| | ... | configured with 2 phy core, 1 receive queue per NIC port.
 | | ... | [Ver] Find PDR for 64 Byte frames using binary search start at 40GE\
 | | ... | linerate, step 50kpps and loss tolerance of 0.5%.
 | | ...
-| | [Tags] | 64B | 2T2C | MTHREAD | PDRDISC | SKIP_PATCH
+| | [Tags] | 64B | 2C | PDRDISC | SKIP_PATCH
 | | ...
 | | ${framesize}= | Set Variable | ${64}
 | | ${min_rate}= | Set Variable | ${50000}
diff --git a/tests/vpp/perf/crypto/40ge2p1xl710-ethip4ipsecscale1000tnl-ip4base-tnl-cbc-sha1-ndrpdrdisc.robot b/tests/vpp/perf/crypto/40ge2p1xl710-ethip4ipsecscale1000tnl-ip4base-tnl-cbc-sha1-ndrpdrdisc.robot
index 6d9e639f8a..476bf83165 100644
--- a/tests/vpp/perf/crypto/40ge2p1xl710-ethip4ipsecscale1000tnl-ip4base-tnl-cbc-sha1-ndrpdrdisc.robot
+++ b/tests/vpp/perf/crypto/40ge2p1xl710-ethip4ipsecscale1000tnl-ip4base-tnl-cbc-sha1-ndrpdrdisc.robot
@@ -76,11 +76,11 @@
 | tc01-64B-1t1c-ethip4ipsecscale1000tnl-ip4base-tnl-cbc-sha1-ndrdisc
 | | [Documentation]
 | | ... | [Cfg] DUTs run 1000 IPsec tunnels CBC-SHA1 in each direction,\
-| | ... | configured with 1 thread, 1 phy core, 1 receive queue per NIC port.
+| | ... | configured with 1 phy core, 1 receive queue per NIC port.
 | | ... | [Ver] Find NDR for 64 Byte frames\
 | | ... | using binary search start at 40GE linerate, step 50kpps.
 | | ...
-| | [Tags] | 64B | 1T1C | STHREAD | NDRDISC
+| | [Tags] | 64B | 1C | NDRDISC
 | | ...
 | | # FIXME: Move repeated lines into a keyword.
 | | ${framesize}= | Set Variable | ${64}
@@ -117,11 +117,11 @@
 | tc02-64B-1t1c-ethip4ipsecscale1000tnl-ip4base-tnl-cbc-sha1-pdrdisc
 | | [Documentation]
 | | ... | [Cfg] DUTs run 1000 IPsec tunnels CBC-SHA1 in each direction,\
-| | ... | configured with 1 thread, 1 phy core, 1 receive queue per NIC port.
+| | ... | configured with 1 phy core, 1 receive queue per NIC port.
 | | ... | [Ver] Find PDR for 64 Byte frames using binary search start at 40GE\
 | | ... | linerate, step 50kpps and loss tolerance of 0.5%.
 | | ...
-| | [Tags] | 64B | 1T1C | STHREAD | PDRDISC | SKIP_PATCH
+| | [Tags] | 64B | 1C | PDRDISC | SKIP_PATCH
 | | ...
 | | ${framesize}= | Set Variable | ${64}
 | | ${min_rate}= | Set Variable | ${50000}
@@ -158,11 +158,11 @@
 | tc03-1518B-1t1c-ethip4ipsecscale1000tnl-ip4base-tnl-cbc-sha1-ndrdisc
 | | [Documentation]
 | | ... | [Cfg] DUTs run 1000 IPsec tunnels CBC-SHA1 in each direction,\
-| | ... | configured with 1 thread, 1 phy core, 1 receive queue per NIC port.
+| | ... | configured with 1 phy core, 1 receive queue per NIC port.
 | | ... | [Ver] Find NDR for 1518 Byte frames\
 | | ... | using binary search start at 40GE linerate, step 50kpps.
 | | ...
-| | [Tags] | 1518B | 1T1C | STHREAD | NDRDISC
+| | [Tags] | 1518B | 1C | NDRDISC
 | | ...
 | | ${framesize}= | Set Variable | ${1518}
 | | ${min_rate}= | Set Variable | ${50000}
@@ -197,11 +197,11 @@
 | tc04-1518B-1t1c-ethip4ipsecscale1000tnl-ip4base-tnl-cbc-sha1-pdrdisc
 | | [Documentation]
 | | ... | [Cfg] DUTs run 1000 IPsec tunnel CBC-SHA1 in each direction,\
-| | ... | configured with 1 thread, 1 phy core, 1 receive queue per NIC port.
+| | ... | configured with 1 phy core, 1 receive queue per NIC port.
 | | ... | [Ver] Find PDR for 1518 Byte frames using binary search start at 40GE\
 | | ... | linerate, step 50kpps and loss tolerance of 0.5%.
 | | ...
-| | [Tags] | 1518B | 1T1C | STHREAD | PDRDISC | SKIP_PATCH
+| | [Tags] | 1518B | 1C | PDRDISC | SKIP_PATCH
 | | ...
 | | ${framesize}= | Set Variable | ${1518}
 | | ${min_rate}= | Set Variable | ${50000}
@@ -237,12 +237,12 @@
 | tc05-IMIX-1t1c-ethip4ipsecscale1000tnl-ip4base-tnl-cbc-sha1-ndrdisc
 | | [Documentation]
 | | ... | [Cfg] DUTs run 1000 IPsec tunnels CBC-SHA1 in each direction,\
-| | ... | configured with 1 thread, 1 phy core, 1 receive queue per NIC port.
+| | ... | configured with 1 phy core, 1 receive queue per NIC port.
 | | ... | [Ver] Find NDR for IMIX_v4_1 frames\
 | | ... | using binary search start at 40GE linerate, step 50kpps.
 | | ... | IMIX_v4_1 = (28x64B; 16x570B; 4x1518B)
 | | ...
-| | [Tags] | IMIX | 1T1C | STHREAD | NDRDISC
+| | [Tags] | IMIX | 1C | NDRDISC
 | | ...
 | | ${framesize}= | Set Variable | IMIX_v4_1
 | | ${imix_size}= | Get Frame Size | ${framesize}
@@ -278,12 +278,12 @@
 | tc06-IMIX-1t1c-ethip4ipsecscale1000tnl-ip4base-tnl-cbc-sha1-pdrdisc
 | | [Documentation]
 | | ... | [Cfg] DUTs run 1000 IPsec tunnels CBC-SHA1 in each direction,\
-| | ... | configured with 1 thread, 1 phy core, 1 receive queue per NIC port.
+| | ... | configured with 1 phy core, 1 receive queue per NIC port.
 | | ... | [Ver] Find PDR for IMIX_v4_1 frames using binary search start at 40GE\
 | | ... | linerate, step 50kpps and loss tolerance of 0.5%.
 | | ... | IMIX_v4_1 = (28x64B; 16x570B; 4x1518B)
 | | ...
-| | [Tags] | IMIX | 1T1C | STHREAD | PDRDISC | SKIP_PATCH
+| | [Tags] | IMIX | 1C | PDRDISC | SKIP_PATCH
 | | ...
 | | ${framesize}= | Set Variable | IMIX_v4_1
 | | ${imix_size}= | Get Frame Size | ${framesize}
@@ -320,11 +320,11 @@
 | tc07-64B-2t2c-ethip4ipsecscale1000tnl-ip4base-tnl-cbc-sha1-ndrdisc
 | | [Documentation]
 | | ... | [Cfg] DUTs run 1000 IPsec tunnels CBC-SHA1 in each direction,\
-| | ... | configured with 2 thread, 2 phy core, 1 receive queue per NIC port.
+| | ... | configured with 2 phy core, 1 receive queue per NIC port.
 | | ... | [Ver] Find NDR for 64 Byte frames\
 | | ... | using binary search start at 40GE linerate, step 50kpps.
 | | ...
-| | [Tags] | 64B | 2T2C | MTHREAD | NDRDISC
+| | [Tags] | 64B | 2C | NDRDISC
 | | ...
 | | ${framesize}= | Set Variable | ${64}
 | | ${min_rate}= | Set Variable | ${50000}
@@ -360,11 +360,11 @@
 | tc08-64B-2t2c-ethip4ipsecscale1000tnl-ip4base-tnl-cbc-sha1-pdrdisc
 | | [Documentation]
 | | ... | [Cfg] DUTs run 1000 IPsec tunnels CBC-SHA1 in each direction,\
-| | ... | configured with 2 thread, 2 phy core, 1 receive queue per NIC port.
+| | ... | configured with 2 phy core, 1 receive queue per NIC port.
 | | ... | [Ver] Find PDR for 64 Byte frames using binary search start at 40GE\
 | | ... | linerate, step 50kpps and loss tolerance of 0.5%.
 | | ...
-| | [Tags] | 64B | 2T2C | MTHREAD | PDRDISC | SKIP_PATCH
+| | [Tags] | 64B | 2C | PDRDISC | SKIP_PATCH
 | | ...
 | | ${framesize}= | Set Variable | ${64}
 | | ${min_rate}= | Set Variable | ${50000}
diff --git a/tests/vpp/perf/crypto/40ge2p1xl710-ethip4ipsectptlispgpe-ip4base-cbc-sha1-ndrpdrdisc.robot b/tests/vpp/perf/crypto/40ge2p1xl710-ethip4ipsectptlispgpe-ip4base-cbc-sha1-ndrpdrdisc.robot
index 91b18faf6b..e9c29350a5 100644
--- a/tests/vpp/perf/crypto/40ge2p1xl710-ethip4ipsectptlispgpe-ip4base-cbc-sha1-ndrpdrdisc.robot
+++ b/tests/vpp/perf/crypto/40ge2p1xl710-ethip4ipsectptlispgpe-ip4base-cbc-sha1-ndrpdrdisc.robot
@@ -74,12 +74,12 @@
 | tc01-64B-1t1c-ethip4ipsectptlispgpe-ip4base-cbc-sha1-ndrdisc
 | | [Documentation]
 | | ... | [Cfg] Each DUT is configured with LISP and IPsec in each direction.\
-| | ... | IPsec is in transport mode. DUTs are configured with 1 thread, 1 phy\
+| | ... | IPsec is in transport mode. DUTs are configured with 1 phy\
 | | ... | core, 1 receive queue per NIC port.
 | | ... | [Ver] Find NDR for 64 Byte frames using binary search start at 40GE\
 | | ... | linerate, step 50kpps.
 | | ...
-| | [Tags] | 64B | 1T1C | STHREAD | NDRDISC
+| | [Tags] | 64B | 1C | NDRDISC
 | | ...
 | | # FIXME: Move repeated lines into a keyword.
 | | ${framesize}= | Set Variable | ${64}
@@ -107,12 +107,12 @@
 | tc02-64B-1t1c-ethip4ipsectptlispgpe-ip4base-cbc-sha1-pdrdisc
 | | [Documentation]
 | | ... | [Cfg] Each DUT is configured with LISP and IPsec in each direction.\
-| | ... | IPsec is in transport mode. DUTs are configured with 1 thread, 1 phy\
+| | ... | IPsec is in transport mode. DUTs are configured with 1 phy\
 | | ... | core, 1 receive queue per NIC port.
 | | ... | [Ver] Find NDR for 64 Byte frames using binary search start at 40GE\
 | | ... | linerate, step 50kpps, LT=0.5%.
 | | ...
-| | [Tags] | 64B | 1T1C | STHREAD | PDRDISC | SKIP_PATCH
+| | [Tags] | 64B | 1C | PDRDISC | SKIP_PATCH
 | | ...
 | | ${framesize}= | Set Variable | ${64}
 | | ${min_rate}= | Set Variable | ${50000}
@@ -140,12 +140,12 @@
 | tc03-1518B-1t1c-ethip4ipsectptlispgpe-ip4base-cbc-sha1-ndrdisc
 | | [Documentation]
 | | ... | [Cfg] Each DUT is configured with LISP and IPsec in each direction.\
-| | ... | IPsec is in transport mode. DUTs are configured with 1 thread, 1 phy\
+| | ... | IPsec is in transport mode. DUTs are configured with 1 phy\
 | | ... | core, 1 receive queue per NIC port.
 | | ... | [Ver] Find NDR for 1518 Byte frames using binary search start at 40GE\
 | | ... | linerate, step 50kpps.
 | | ...
-| | [Tags] | 1518B | 1T1C | STHREAD | NDRDISC
+| | [Tags] | 1518B | 1C | NDRDISC
 | | ...
 | | ${framesize}= | Set Variable | ${1518}
 | | ${min_rate}= | Set Variable | ${50000}
@@ -171,12 +171,12 @@
 | tc04-1518B-1t1c-ethip4ipsectptlispgpe-ip4base-cbc-sha1-pdrdisc
 | | [Documentation]
 | | ... | [Cfg] Each DUT is configured with LISP and IPsec in each direction.\
-| | ... | IPsec is in transport mode. DUTs are configured with 1 thread, 1 phy\
+| | ... | IPsec is in transport mode. DUTs are configured with 1 phy\
 | | ... | core, 1 receive queue per NIC port.
 | | ... | [Ver] Find NDR for 1518 Byte frames using binary search start at 40GE\
 | | ... | linerate, step 50kpps, LT=0.5%.
 | | ...
-| | [Tags] | 1518B | 1T1C | STHREAD | PDRDISC | SKIP_PATCH
+| | [Tags] | 1518B | 1C | PDRDISC | SKIP_PATCH
 | | ...
 | | ${framesize}= | Set Variable | ${1518}
 | | ${min_rate}= | Set Variable | ${50000}
@@ -203,12 +203,12 @@
 | tc05-IMIX-1t1c-ethip4ipsectptlispgpe-ip4base-cbc-sha1-ndrdisc
 | | [Documentation]
 | | ... | [Cfg] Each DUT is configured with LISP and IPsec in each direction.\
-| | ... | IPsec is in transport mode. DUTs are configured with 1 thread, 1 phy\
+| | ... | IPsec is in transport mode. DUTs are configured with 1 phy\
 | | ... | core, 1 receive queue per NIC port.
 | | ... | [Ver] Find NDR for IMIX_v4_1 frames using binary search start at 40GE\
 | | ... | linerate, step 50kpps.
 | | ...
-| | [Tags] | IMIX | 1T1C | STHREAD | NDRDISC
+| | [Tags] | IMIX | 1C | NDRDISC
 | | ...
 | | ${framesize}= | Set Variable | IMIX_v4_1
 | | ${imix_size}= | Get Frame Size | ${framesize}
@@ -235,12 +235,12 @@
 | tc06-IMIX-1t1c-ethip4ipsectptlispgpe-ip4base-cbc-sha1-pdrdisc
 | | [Documentation]
 | | ... | [Cfg] Each DUT is configured with LISP and IPsec in each direction.\
-| | ... | IPsec is in transport mode. DUTs are configured with 1 thread, 1 phy\
+| | ... | IPsec is in transport mode. DUTs are configured with 1 phy\
 | | ... | core, 1 receive queue per NIC port.
 | | ... | [Ver] Find NDR for IMIX_v4_1 frames using binary search start at 40GE\
 | | ... | linerate, step 50kpps, LT=0.5%.
 | | ...
-| | [Tags] | IMIX | 1T1C | STHREAD | PDRDISC | SKIP_PATCH
+| | [Tags] | IMIX | 1C | PDRDISC | SKIP_PATCH
 | | ...
 | | ${framesize}= | Set Variable | IMIX_v4_1
 | | ${imix_size}= | Get Frame Size | ${framesize}
@@ -268,12 +268,12 @@
 | tc07-64B-2t2c-ethip4ipsectptlispgpe-ip4base-cbc-sha1-ndrdisc
 | | [Documentation]
 | | ... | [Cfg] Each DUT is configured with LISP and IPsec in each direction.\
-| | ... | IPsec is in transport mode. DUTs are configured with 2 threads, 2 phy\
+| | ... | IPsec is in transport mode. DUTs are configured 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 50kpps.
 | | ...
-| | [Tags] | 64B | 2T2C | MTHREAD | NDRDISC
+| | [Tags] | 64B | 2C | NDRDISC
 | | ...
 | | ${framesize}= | Set Variable | ${64}
 | | ${min_rate}= | Set Variable | ${50000}
@@ -300,12 +300,12 @@
 | tc08-64B-2t2c-ethip4ipsectptlispgpe-ip4base-cbc-sha1-pdrdisc
 | | [Documentation]
 | | ... | [Cfg] Each DUT is configured with LISP and IPsec in each direction.\
-| | ... | IPsec is in transport mode. DUTs are configured with 2 threads, 2 phy\
+| | ... | IPsec is in transport mode. DUTs are configured 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 50kpps, LT=0.5%.
 | | ...
-| | [Tags] | 64B | 2T2C | MTHREAD | PDRDISC | SKIP_PATCH
+| | [Tags] | 64B | 2C | PDRDISC | SKIP_PATCH
 | | ...
 | | ${framesize}= | Set Variable | ${64}
 | | ${min_rate}= | Set Variable | ${50000}
@@ -333,12 +333,12 @@
 | tc13-64B-4t4c-ethip4ipsectptlispgpe-ip4base-cbc-sha1-ndrdisc
 | | [Documentation]
 | | ... | [Cfg] Each DUT is configured with LISP and IPsec in each direction.\
-| | ... | IPsec is in transport mode. DUTs are configured with 4 threads, 4 phy\
+| | ... | IPsec is in transport mode. DUTs are configured 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 50kpps.
 | | ...
-| | [Tags] | 64B | 4T4C | MTHREAD | NDRDISC
+| | [Tags] | 64B | 4C | NDRDISC
 | | ...
 | | ${framesize}= | Set Variable | ${64}
 | | ${min_rate}= | Set Variable | ${50000}
@@ -365,12 +365,12 @@
 | tc14-64B-4t4c-ethip4ipsectptlispgpe-ip4base-cbc-sha1-pdrdisc
 | | [Documentation]
 | | ... | [Cfg] Each DUT is configured with LISP and IPsec in each direction.\
-| | ... | IPsec is in transport mode. DUTs are configured with 4 threads, 4 phy\
+| | ... | IPsec is in transport mode. DUTs are configured 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 50kpps, LT=0.5%.
 | | ...
-| | [Tags] | 64B | 4T4C | MTHREAD | PDRDISC | SKIP_PATCH
+| | [Tags] | 64B | 4C | PDRDISC | SKIP_PATCH
 | | ...
 | | ${framesize}= | Set Variable | ${64}
 | | ${min_rate}= | Set Variable | ${50000}