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>

12 files changed, 288 insertions, 288 deletions

diff --git a/tests/vpp/perf/srv6/10ge2p1x520-ethip6ip6-ip6base-srv6enc1sid-mrr.robot b/tests/vpp/perf/srv6/10ge2p1x520-ethip6ip6-ip6base-srv6enc1sid-mrr.robot
index f0cd620c94..a780a8c0e2 100644
--- a/tests/vpp/perf/srv6/10ge2p1x520-ethip6ip6-ip6base-srv6enc1sid-mrr.robot
+++ b/tests/vpp/perf/srv6/10ge2p1x520-ethip6ip6-ip6base-srv6enc1sid-mrr.robot
@@ -94,11 +94,11 @@
 | tc01-78B-1t1c-ethip6ip6-ip6base-srv6enc1sid-mrr
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv6 over SRv6 routing config with\
-| | ... | 1 thread, 1 phy core, 1 receive queue per NIC port.
+| | ... | 1 phy core, 1 receive queue per NIC port.
 | | ... | [Ver] Measure MaxReceivedRate for 78B frames using single trial\
 | | ... | throughput test.
 | | ...
-| | [Tags] | 78B | 1T1C | STHREAD
+| | [Tags] | 78B | 1C
 | | ...
 | | [Template] | Check RR for IPv6 routing over SRv6
 | | wt=1 | rxq=1 | framesize=${78}
@@ -106,11 +106,11 @@
 | tc02-1518B-1t1c-ethip6ip6-ip6base-srv6enc1sid-mrr
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv6 over SRv6 routing config with\
-| | ... | 1 thread, 1 phy core, 1 receive queue per NIC port.
+| | ... | 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 IPv6 routing over SRv6
 | | wt=1 | rxq=1 | framesize=${1518}
@@ -118,11 +118,11 @@
 | tc03-9000B-1t1c-ethip6ip6-ip6base-srv6enc1sid-mrr
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv6 over SRv6 routing config with\
-| | ... | 1 thread, 1 phy core, 1 receive queue per NIC port.
+| | ... | 1 phy core, 1 receive queue per NIC port.
 | | ... | [Ver] Measure MaxReceivedRate for 9000B frames using single trial\
 | | ... | throughput test.
 | | ...
-| | [Tags] | 9000B | 1T1C | STHREAD
+| | [Tags] | 9000B | 1C
 | | ...
 | | [Template] | Check RR for IPv6 routing over SRv6
 | | wt=1 | rxq=1 | framesize=${9000}
@@ -130,12 +130,12 @@
 | tc04-IMIX-1t1c-ethip6ip6-ip6base-srv6enc1sid-mrr
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv6 over SRv6 routing config with\
-| | ... | 1 thread, 1 phy core, 1 receive queue per NIC port.
+| | ... | 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 IPv6 routing over SRv6
 | | wt=1 | rxq=1 | framesize=IMIX_v4_1
@@ -143,11 +143,11 @@
 | tc05-78B-2t2c-ethip6ip6-ip6base-srv6enc1sid-mrr
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv6 over SRv6 routing config with\
-| | ... | 2 threads, 2 phy cores, 1 receive queue per NIC port.
+| | ... | 2 phy cores, 1 receive queue per NIC port.
 | | ... | [Ver] Measure MaxReceivedRate for 78B frames using single trial\
 | | ... | throughput test.
 | | ...
-| | [Tags] | 78B | 2T2C | MTHREAD
+| | [Tags] | 78B | 2C
 | | ...
 | | [Template] | Check RR for IPv6 routing over SRv6
 | | wt=2 | rxq=1 | framesize=${78}
@@ -155,11 +155,11 @@
 | tc06-1518B-2t2c-ethip6ip6-ip6base-srv6enc1sid-mrr
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv6 over SRv6 routing config with\
-| | ... | 2 threads, 2 phy cores, 1 receive queue per NIC port.
+| | ... | 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 IPv6 routing over SRv6
 | | wt=2 | rxq=1 | framesize=${1518}
@@ -167,11 +167,11 @@
 | tc07-9000B-2t2c-ethip6ip6-ip6base-srv6enc1sid-mrr
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv6 over SRv6 routing config with\
-| | ... | 2 threads, 2 phy cores, 1 receive queue per NIC port.
+| | ... | 2 phy cores, 1 receive queue per NIC port.
 | | ... | [Ver] Measure MaxReceivedRate for 9000B frames using single trial\
 | | ... | throughput test.
 | | ...
-| | [Tags] | 9000B | 2T2C | MTHREAD
+| | [Tags] | 9000B | 2C
 | | ...
 | | [Template] | Check RR for IPv6 routing over SRv6
 | | wt=2 | rxq=1 | framesize=${9000}
@@ -179,12 +179,12 @@
 | tc08-IMIX-2t2c-ethip6ip6-ip6base-srv6enc1sid-mrr
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv6 over SRv6 routing config with\
-| | ... | 2 threads, 2 phy cores, 1 receive queue per NIC port.
+| | ... | 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 IPv6 routing over SRv6
 | | wt=2 | rxq=1 | framesize=IMIX_v4_1
@@ -192,11 +192,11 @@
 | tc09-78B-4t4c-ethip6ip6-ip6base-srv6enc1sid-mrr
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv6 over SRv6 routing config with\
-| | ... | 4 threads, 4 phy cores, 2 receive queues per NIC port.
+| | ... | 4 phy cores, 2 receive queues per NIC port.
 | | ... | [Ver] Measure MaxReceivedRate for 78B frames using single trial\
 | | ... | throughput test.
 | | ...
-| | [Tags] | 78B | 4T4C | MTHREAD
+| | [Tags] | 78B | 4C
 | | ...
 | | [Template] | Check RR for IPv6 routing over SRv6
 | | wt=4 | rxq=2 | framesize=${78}
@@ -204,11 +204,11 @@
 | tc10-1518B-4t4c-ethip6ip6-ip6base-srv6enc1sid-mrr
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv6 over SRv6 routing config with\
-| | ... | 4 threads, 4 phy cores, 2 receive queues per NIC port.
+| | ... | 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 IPv6 routing over SRv6
 | | wt=4 | rxq=2 | framesize=${1518}
@@ -216,11 +216,11 @@
 | tc11-9000B-4t4c-ethip6ip6-ip6base-srv6enc1sid-mrr
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv6 over SRv6 routing config with\
-| | ... | 4 threads, 4 phy cores, 2 receive queues per NIC port.
+| | ... | 4 phy cores, 2 receive queues per NIC port.
 | | ... | [Ver] Measure MaxReceivedRate for 9000B frames using single trial\
 | | ... | throughput test.
 | | ...
-| | [Tags] | 9000B | 4T4C | MTHREAD
+| | [Tags] | 9000B | 4C
 | | ...
 | | [Template] | Check RR for IPv6 routing over SRv6
 | | wt=4 | rxq=2 | framesize=${9000}
@@ -228,12 +228,12 @@
 | tc12-IMIX-4t4c-ethip6ip6-ip6base-srv6enc1sid-mrr
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv6 over SRv6 routing config with\
-| | ... | 4 threads, 4 phy cores, 2 receive queues per NIC port.
+| | ... | 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 IPv6 routing over SRv6
 | | wt=4 | rxq=2 | framesize=IMIX_v4_1
diff --git a/tests/vpp/perf/srv6/10ge2p1x520-ethip6ip6-ip6base-srv6enc1sid-ndrpdrdisc.robot b/tests/vpp/perf/srv6/10ge2p1x520-ethip6ip6-ip6base-srv6enc1sid-ndrpdrdisc.robot
index 4f9adaccd0..d13c07cc85 100644
--- a/tests/vpp/perf/srv6/10ge2p1x520-ethip6ip6-ip6base-srv6enc1sid-ndrpdrdisc.robot
+++ b/tests/vpp/perf/srv6/10ge2p1x520-ethip6ip6-ip6base-srv6enc1sid-ndrpdrdisc.robot
@@ -108,11 +108,11 @@
 | tc01-78B-1t1c-ethip6ip6-ip6base-srv6enc1sid-ndrdisc
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv6 over SRv6 routing config with\
-| | ... | 1 thread, 1 phy core, 1 receive queue per NIC port.
+| | ... | 1 phy core, 1 receive queue per NIC port.
 | | ... | [Ver] Find NDR for 78 Byte frames using binary search start at 10GE\
 | | ... | linerate, step 50kpps.
 | | ...
-| | [Tags] | 78B | 1T1C | STHREAD | NDRDISC
+| | [Tags] | 78B | 1C | NDRDISC
 | | ...
 | | [Template] | Discover NDR or PDR for IPv6 routing over SRv6
 | | wt=1 | rxq=1 | framesize=${78} | min_rate=${50000} | search_type=NDR
@@ -120,11 +120,11 @@
 | tc02-78B-1t1c-ethip6ip6-ip6base-srv6enc1sid-pdrdisc
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv6 over SRv6 routing config with\
-| | ... | 1 thread, 1 phy core, 1 receive queue per NIC port.
+| | ... | 1 phy core, 1 receive queue per NIC port.
 | | ... | [Ver] Find PDR for 78 Byte frames using binary search start at 10GE\
 | | ... | linerate, step 50kpps, LT=0.5%.
 | | ...
-| | [Tags] | 78B | 1T1C | STHREAD | PDRDISC | SKIP_PATCH
+| | [Tags] | 78B | 1C | PDRDISC | SKIP_PATCH
 | | ...
 | | [Template] | Discover NDR or PDR for IPv6 routing over SRv6
 | | wt=1 | rxq=1 | framesize=${78} | min_rate=${50000} | search_type=PDR
@@ -132,11 +132,11 @@
 | tc03-78B-2t2c-ethip6ip6-ip6base-srv6enc1sid-ndrdisc
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv6 over SRv6 routing config with\
-| | ... | 2 threads, 2 phy cores, 1 receive queue per NIC port.
+| | ... | 2 phy cores, 1 receive queue per NIC port.
 | | ... | [Ver] Find NDR for 78 Byte frames using binary search start at 10GE\
 | | ... | linerate, step 50kpps.
 | | ...
-| | [Tags] | 78B | 2T2C | MTHREAD | NDRDISC
+| | [Tags] | 78B | 2C | NDRDISC
 | | ...
 | | [Template] | Discover NDR or PDR for IPv6 routing over SRv6
 | | wt=2 | rxq=1 | framesize=${78} | min_rate=${50000} | search_type=NDR
@@ -144,11 +144,11 @@
 | tc04-78B-2t2c-ethip6ip6-ip6base-srv6enc1sid-pdrdisc
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv6 over SRv6 routing config with\
-| | ... | 2 threads, 2 phy cores, 1 receive queue per NIC port.
+| | ... | 2 phy cores, 1 receive queue per NIC port.
 | | ... | [Ver] Find PDR for 78 Byte frames using binary search start at 10GE\
 | | ... | linerate, step 50kpps, LT=0.5%.
 | | ...
-| | [Tags] | 78B | 2T2C | MTHREAD | PDRDISC | SKIP_PATCH
+| | [Tags] | 78B | 2C | PDRDISC | SKIP_PATCH
 | | ...
 | | [Template] | Discover NDR or PDR for IPv6 routing over SRv6
 | | wt=2 | rxq=1 | framesize=${78} | min_rate=${50000} | search_type=PDR
@@ -156,11 +156,11 @@
 | tc05-78B-4t4c-ethip6ip6-ip6base-srv6enc1sid-ndrdisc
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv6 over SRv6 routing config with\
-| | ... | 4 threads, 4 phy cores, 2 receive queues per NIC port.
+| | ... | 4 phy cores, 2 receive queues per NIC port.
 | | ... | [Ver] Find NDR for 78 Byte frames using binary search start at 10GE\
 | | ... | linerate, step 50kpps.
 | | ...
-| | [Tags] | 78B | 4T4C | MTHREAD | NDRDISC
+| | [Tags] | 78B | 4C | NDRDISC
 | | ...
 | | [Template] | Discover NDR or PDR for IPv6 routing over SRv6
 | | wt=4 | rxq=2 | framesize=${78} | min_rate=${50000} | search_type=NDR
@@ -168,11 +168,11 @@
 | tc06-78B-4t4c-ethip6ip6-ip6base-srv6enc1sid-pdrdisc
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv6 over SRv6 routing config with\
-| | ... | 4 threads, 4 phy cores, 2 receive queues per NIC port.
+| | ... | 4 phy cores, 2 receive queues per NIC port.
 | | ... | [Ver] Find PDR for 78 Byte frames using binary search start at 10GE\
 | | ... | linerate, step 50kpps, LT=0.5%.
 | | ...
-| | [Tags] | 78B | 4T4C | MTHREAD | PDRDISC | SKIP_PATCH
+| | [Tags] | 78B | 4C | PDRDISC | SKIP_PATCH
 | | ...
 | | [Template] | Discover NDR or PDR for IPv6 routing over SRv6
 | | wt=4 | rxq=2 | framesize=${78} | min_rate=${50000} | search_type=PDR
@@ -180,11 +180,11 @@
 | tc07-1518B-1t1c-ethip6ip6-ip6base-srv6enc1sid-ndrdisc
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv6 over SRv6 routing config with\
-| | ... | 1 thread, 1 phy core, 1 receive queue per NIC port.
+| | ... | 1 phy core, 1 receive queue per NIC port.
 | | ... | [Ver] Find NDR for 1518 Byte frames using binary search start at 10GE\
 | | ... | linerate, step 50kpps.
 | | ...
-| | [Tags] | 1518B | 1T1C | STHREAD | NDRDISC
+| | [Tags] | 1518B | 1C | NDRDISC
 | | ...
 | | [Template] | Discover NDR or PDR for IPv6 routing over SRv6
 | | wt=1 | rxq=1 | framesize=${1518} | min_rate=${50000} | search_type=NDR
@@ -192,11 +192,11 @@
 | tc08-1518B-1t1c-ethip6ip6-ip6base-srv6enc1sid-pdrdisc
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv6 over SRv6 routing config with\
-| | ... | 1 thread, 1 phy core, 1 receive queue per NIC port.
+| | ... | 1 phy core, 1 receive queue per NIC port.
 | | ... | [Ver] Find PDR for 1518 Byte frames using binary search start at 10GE\
 | | ... | linerate, step 50kpps, LT=0.5%.
 | | ...
-| | [Tags] | 1518B | 1T1C | STHREAD | PDRDISC | SKIP_PATCH
+| | [Tags] | 1518B | 1C | PDRDISC | SKIP_PATCH
 | | ...
 | | [Template] | Discover NDR or PDR for IPv6 routing over SRv6
 | | wt=1 | rxq=1 | framesize=${1518} | min_rate=${50000} | search_type=PDR
@@ -204,11 +204,11 @@
 | tc09-1518B-2t2c-ethip6ip6-ip6base-srv6enc1sid-ndrdisc
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv6 over SRv6 routing config with\
-| | ... | 2 threads, 2 phy cores, 1 receive queue per NIC port.
+| | ... | 2 phy cores, 1 receive queue per NIC port.
 | | ... | [Ver] Find NDR for 1518 Byte frames using binary search start at 10GE\
 | | ... | linerate, step 50kpps.
 | | ...
-| | [Tags] | 1518B | 2T2C | MTHREAD | NDRDISC
+| | [Tags] | 1518B | 2C | NDRDISC
 | | ...
 | | [Template] | Discover NDR or PDR for IPv6 routing over SRv6
 | | wt=2 | rxq=1 | framesize=${1518} | min_rate=${50000} | search_type=NDR
@@ -216,11 +216,11 @@
 | tc10-1518B-2t2c-ethip6ip6-ip6base-srv6enc1sid-pdrdisc
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv6 over SRv6 routing config with\
-| | ... | 2 threads, 2 phy cores, 1 receive queue per NIC port.
+| | ... | 2 phy cores, 1 receive queue per NIC port.
 | | ... | [Ver] Find PDR for 1518 Byte frames using binary search start at 10GE\
 | | ... | linerate, step 50kpps, LT=0.5%.
 | | ...
-| | [Tags] | 1518B | 2T2C | MTHREAD | PDRDISC | SKIP_PATCH
+| | [Tags] | 1518B | 2C | PDRDISC | SKIP_PATCH
 | | ...
 | | [Template] | Discover NDR or PDR for IPv6 routing over SRv6
 | | wt=2 | rxq=1 | framesize=${1518} | min_rate=${50000} | search_type=PDR
@@ -228,11 +228,11 @@
 | tc11-1518B-4t4c-ethip6ip6-ip6base-srv6enc1sid-ndrdisc
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv6 over SRv6 routing config with\
-| | ... | 4 threads, 4 phy cores, 2 receive queues per NIC port.
+| | ... | 4 phy cores, 2 receive queues per NIC port.
 | | ... | [Ver] Find NDR for 1518 Byte frames using binary search start at 10GE\
 | | ... | linerate, step 50kpps.
 | | ...
-| | [Tags] | 1518B | 4T4C | MTHREAD | NDRDISC
+| | [Tags] | 1518B | 4C | NDRDISC
 | | ...
 | | [Template] | Discover NDR or PDR for IPv6 routing over SRv6
 | | wt=4 | rxq=2 | framesize=${1518} | min_rate=${50000} | search_type=NDR
@@ -240,11 +240,11 @@
 | tc12-1518B-4t4c-ethip6ip6-ip6base-srv6enc1sid-pdrdisc
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv6 over SRv6 routing config with\
-| | ... | 4 threads, 4 phy cores, 2 receive queues per NIC port.
+| | ... | 4 phy cores, 2 receive queues per NIC port.
 | | ... | [Ver] Find PDR for 1518 Byte frames using binary search start at 10GE\
 | | ... | linerate, step 50kpps, LT=0.5%.
 | | ...
-| | [Tags] | 1518B | 4T4C | MTHREAD | PDRDISC | SKIP_PATCH
+| | [Tags] | 1518B | 4C | PDRDISC | SKIP_PATCH
 | | ...
 | | [Template] | Discover NDR or PDR for IPv6 routing over SRv6
 | | wt=4 | rxq=2 | framesize=${1518} | min_rate=${50000} | search_type=PDR
diff --git a/tests/vpp/perf/srv6/10ge2p1x520-ethip6srhip6-ip6base-srv6enc2sids-mrr.robot b/tests/vpp/perf/srv6/10ge2p1x520-ethip6srhip6-ip6base-srv6enc2sids-mrr.robot
index 38dcf0a0d7..9a64701fd6 100644
--- a/tests/vpp/perf/srv6/10ge2p1x520-ethip6srhip6-ip6base-srv6enc2sids-mrr.robot
+++ b/tests/vpp/perf/srv6/10ge2p1x520-ethip6srhip6-ip6base-srv6enc2sids-mrr.robot
@@ -97,11 +97,11 @@
 | tc01-78B-1t1c-ethip6srhip6-ip6base-srv6enc2sids-mrr
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv6 over SRv6 routing config with\
-| | ... | 1 thread, 1 phy core, 1 receive queue per NIC port.
+| | ... | 1 phy core, 1 receive queue per NIC port.
 | | ... | [Ver] Measure MaxReceivedRate for 78B frames using single trial\
 | | ... | throughput test.
 | | ...
-| | [Tags] | 78B | 1T1C | STHREAD
+| | [Tags] | 78B | 1C
 | | ...
 | | [Template] | Check RR for IPv6 routing over SRv6
 | | wt=1 | rxq=1 | framesize=${78}
@@ -109,11 +109,11 @@
 | tc02-1518B-1t1c-ethip6srhip6-ip6base-srv6enc2sids-mrr
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv6 over SRv6 routing config with\
-| | ... | 1 thread, 1 phy core, 1 receive queue per NIC port.
+| | ... | 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 IPv6 routing over SRv6
 | | wt=1 | rxq=1 | framesize=${1518}
@@ -121,11 +121,11 @@
 | tc03-9000B-1t1c-ethip6srhip6-ip6base-srv6enc2sids-mrr
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv6 over SRv6 routing config with\
-| | ... | 1 thread, 1 phy core, 1 receive queue per NIC port.
+| | ... | 1 phy core, 1 receive queue per NIC port.
 | | ... | [Ver] Measure MaxReceivedRate for 9000B frames using single trial\
 | | ... | throughput test.
 | | ...
-| | [Tags] | 9000B | 1T1C | STHREAD
+| | [Tags] | 9000B | 1C
 | | ...
 | | [Template] | Check RR for IPv6 routing over SRv6
 | | wt=1 | rxq=1 | framesize=${9000}
@@ -133,12 +133,12 @@
 | tc04-IMIX-1t1c-ethip6srhip6-ip6base-srv6enc2sids-mrr
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv6 over SRv6 routing config with\
-| | ... | 1 thread, 1 phy core, 1 receive queue per NIC port.
+| | ... | 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 IPv6 routing over SRv6
 | | wt=1 | rxq=1 | framesize=IMIX_v4_1
@@ -146,11 +146,11 @@
 | tc05-78B-2t2c-ethip6srhip6-ip6base-srv6enc2sids-mrr
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv6 over SRv6 routing config with\
-| | ... | 2 threads, 2 phy cores, 1 receive queue per NIC port.
+| | ... | 2 phy cores, 1 receive queue per NIC port.
 | | ... | [Ver] Measure MaxReceivedRate for 78B frames using single trial\
 | | ... | throughput test.
 | | ...
-| | [Tags] | 78B | 2T2C | MTHREAD
+| | [Tags] | 78B | 2C
 | | ...
 | | [Template] | Check RR for IPv6 routing over SRv6
 | | wt=2 | rxq=1 | framesize=${78}
@@ -158,11 +158,11 @@
 | tc06-1518B-2t2c-ethip6srhip6-ip6base-srv6enc2sids-mrr
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv6 over SRv6 routing config with\
-| | ... | 2 threads, 2 phy cores, 1 receive queue per NIC port.
+| | ... | 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 IPv6 routing over SRv6
 | | wt=2 | rxq=1 | framesize=${1518}
@@ -170,11 +170,11 @@
 | tc07-9000B-2t2c-ethip6srhip6-ip6base-srv6enc2sids-mrr
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv6 over SRv6 routing config with\
-| | ... | 2 threads, 2 phy cores, 1 receive queue per NIC port.
+| | ... | 2 phy cores, 1 receive queue per NIC port.
 | | ... | [Ver] Measure MaxReceivedRate for 9000B frames using single trial\
 | | ... | throughput test.
 | | ...
-| | [Tags] | 9000B | 2T2C | MTHREAD
+| | [Tags] | 9000B | 2C
 | | ...
 | | [Template] | Check RR for IPv6 routing over SRv6
 | | wt=2 | rxq=1 | framesize=${9000}
@@ -182,12 +182,12 @@
 | tc08-IMIX-2t2c-ethip6srhip6-ip6base-srv6enc2sids-mrr
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv6 over SRv6 routing config with\
-| | ... | 2 threads, 2 phy cores, 1 receive queue per NIC port.
+| | ... | 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 IPv6 routing over SRv6
 | | wt=2 | rxq=1 | framesize=IMIX_v4_1
@@ -195,11 +195,11 @@
 | tc09-78B-4t4c-ethip6srhip6-ip6base-srv6enc2sids-mrr
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv6 over SRv6 routing config with\
-| | ... | 4 threads, 4 phy cores, 2 receive queues per NIC port.
+| | ... | 4 phy cores, 2 receive queues per NIC port.
 | | ... | [Ver] Measure MaxReceivedRate for 78B frames using single trial\
 | | ... | throughput test.
 | | ...
-| | [Tags] | 78B | 4T4C | MTHREAD
+| | [Tags] | 78B | 4C
 | | ...
 | | [Template] | Check RR for IPv6 routing over SRv6
 | | wt=4 | rxq=2 | framesize=${78}
@@ -207,11 +207,11 @@
 | tc10-1518B-4t4c-ethip6srhip6-ip6base-srv6enc2sids-mrr
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv6 over SRv6 routing config with\
-| | ... | 4 threads, 4 phy cores, 2 receive queues per NIC port.
+| | ... | 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 IPv6 routing over SRv6
 | | wt=4 | rxq=2 | framesize=${1518}
@@ -219,11 +219,11 @@
 | tc11-9000B-4t4c-ethip6srhip6-ip6base-srv6enc2sids-mrr
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv6 over SRv6 routing config with\
-| | ... | 4 threads, 4 phy cores, 2 receive queues per NIC port.
+| | ... | 4 phy cores, 2 receive queues per NIC port.
 | | ... | [Ver] Measure MaxReceivedRate for 9000B frames using single trial\
 | | ... | throughput test.
 | | ...
-| | [Tags] | 9000B | 4T4C | MTHREAD
+| | [Tags] | 9000B | 4C
 | | ...
 | | [Template] | Check RR for IPv6 routing over SRv6
 | | wt=4 | rxq=2 | framesize=${9000}
@@ -231,12 +231,12 @@
 | tc12-IMIX-4t4c-ethip6srhip6-ip6base-srv6enc2sids-mrr
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv6 over SRv6 routing config with\
-| | ... | 4 threads, 4 phy cores, 2 receive queues per NIC port.
+| | ... | 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 IPv6 routing over SRv6
 | | wt=4 | rxq=2 | framesize=IMIX_v4_1
diff --git a/tests/vpp/perf/srv6/10ge2p1x520-ethip6srhip6-ip6base-srv6enc2sids-ndrpdrdisc.robot b/tests/vpp/perf/srv6/10ge2p1x520-ethip6srhip6-ip6base-srv6enc2sids-ndrpdrdisc.robot
index a9e2e0b9e7..cf57558f2d 100644
--- a/tests/vpp/perf/srv6/10ge2p1x520-ethip6srhip6-ip6base-srv6enc2sids-ndrpdrdisc.robot
+++ b/tests/vpp/perf/srv6/10ge2p1x520-ethip6srhip6-ip6base-srv6enc2sids-ndrpdrdisc.robot
@@ -111,11 +111,11 @@
 | tc01-78B-1t1c-ethip6srhip6-ip6base-srv6enc2sids-ndrdisc
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv6 over SRv6 routing config with\
-| | ... | 1 thread, 1 phy core, 1 receive queue per NIC port.
+| | ... | 1 phy core, 1 receive queue per NIC port.
 | | ... | [Ver] Find NDR for 78 Byte frames using binary search start at 10GE\
 | | ... | linerate, step 50kpps.
 | | ...
-| | [Tags] | 78B | 1T1C | STHREAD | NDRDISC
+| | [Tags] | 78B | 1C | NDRDISC
 | | ...
 | | [Template] | Discover NDR or PDR for IPv6 routing over SRv6
 | | wt=1 | rxq=1 | framesize=${78} | min_rate=${50000} | search_type=NDR
@@ -123,11 +123,11 @@
 | tc02-78B-1t1c-ethip6srhip6-ip6base-srv6enc2sids-pdrdisc
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv6 over SRv6 routing config with\
-| | ... | 1 thread, 1 phy core, 1 receive queue per NIC port.
+| | ... | 1 phy core, 1 receive queue per NIC port.
 | | ... | [Ver] Find PDR for 78 Byte frames using binary search start at 10GE\
 | | ... | linerate, step 50kpps, LT=0.5%.
 | | ...
-| | [Tags] | 78B | 1T1C | STHREAD | PDRDISC | SKIP_PATCH
+| | [Tags] | 78B | 1C | PDRDISC | SKIP_PATCH
 | | ...
 | | [Template] | Discover NDR or PDR for IPv6 routing over SRv6
 | | wt=1 | rxq=1 | framesize=${78} | min_rate=${50000} | search_type=PDR
@@ -135,11 +135,11 @@
 | tc03-78B-2t2c-ethip6srhip6-ip6base-srv6enc2sids-ndrdisc
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv6 over SRv6 routing config with\
-| | ... | 2 threads, 2 phy cores, 1 receive queue per NIC port.
+| | ... | 2 phy cores, 1 receive queue per NIC port.
 | | ... | [Ver] Find NDR for 78 Byte frames using binary search start at 10GE\
 | | ... | linerate, step 50kpps.
 | | ...
-| | [Tags] | 78B | 2T2C | MTHREAD | NDRDISC
+| | [Tags] | 78B | 2C | NDRDISC
 | | ...
 | | [Template] | Discover NDR or PDR for IPv6 routing over SRv6
 | | wt=2 | rxq=1 | framesize=${78} | min_rate=${50000} | search_type=NDR
@@ -147,11 +147,11 @@
 | tc04-78B-2t2c-ethip6srhip6-ip6base-srv6enc2sids-pdrdisc
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv6 over SRv6 routing config with\
-| | ... | 2 threads, 2 phy cores, 1 receive queue per NIC port.
+| | ... | 2 phy cores, 1 receive queue per NIC port.
 | | ... | [Ver] Find PDR for 78 Byte frames using binary search start at 10GE\
 | | ... | linerate, step 50kpps, LT=0.5%.
 | | ...
-| | [Tags] | 78B | 2T2C | MTHREAD | PDRDISC | SKIP_PATCH
+| | [Tags] | 78B | 2C | PDRDISC | SKIP_PATCH
 | | ...
 | | [Template] | Discover NDR or PDR for IPv6 routing over SRv6
 | | wt=2 | rxq=1 | framesize=${78} | min_rate=${50000} | search_type=PDR
@@ -159,11 +159,11 @@
 | tc05-78B-4t4c-ethip6srhip6-ip6base-srv6enc2sids-ndrdisc
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv6 over SRv6 routing config with\
-| | ... | 4 threads, 4 phy cores, 2 receive queues per NIC port.
+| | ... | 4 phy cores, 2 receive queues per NIC port.
 | | ... | [Ver] Find NDR for 78 Byte frames using binary search start at 10GE\
 | | ... | linerate, step 50kpps.
 | | ...
-| | [Tags] | 78B | 4T4C | MTHREAD | NDRDISC
+| | [Tags] | 78B | 4C | NDRDISC
 | | ...
 | | [Template] | Discover NDR or PDR for IPv6 routing over SRv6
 | | wt=4 | rxq=2 | framesize=${78} | min_rate=${50000} | search_type=NDR
@@ -171,11 +171,11 @@
 | tc06-78B-4t4c-ethip6srhip6-ip6base-srv6enc2sids-pdrdisc
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv6 over SRv6 routing config with\
-| | ... | 4 threads, 4 phy cores, 2 receive queues per NIC port.
+| | ... | 4 phy cores, 2 receive queues per NIC port.
 | | ... | [Ver] Find PDR for 78 Byte frames using binary search start at 10GE\
 | | ... | linerate, step 50kpps, LT=0.5%.
 | | ...
-| | [Tags] | 78B | 4T4C | MTHREAD | PDRDISC | SKIP_PATCH
+| | [Tags] | 78B | 4C | PDRDISC | SKIP_PATCH
 | | ...
 | | [Template] | Discover NDR or PDR for IPv6 routing over SRv6
 | | wt=4 | rxq=2 | framesize=${78} | min_rate=${50000} | search_type=PDR
@@ -183,11 +183,11 @@
 | tc07-1518B-1t1c-ethip6srhip6-ip6base-srv6enc2sids-ndrdisc
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv6 over SRv6 routing config with\
-| | ... | 1 thread, 1 phy core, 1 receive queue per NIC port.
+| | ... | 1 phy core, 1 receive queue per NIC port.
 | | ... | [Ver] Find NDR for 1518 Byte frames using binary search start at 10GE\
 | | ... | linerate, step 50kpps.
 | | ...
-| | [Tags] | 1518B | 1T1C | STHREAD | NDRDISC
+| | [Tags] | 1518B | 1C | NDRDISC
 | | ...
 | | [Template] | Discover NDR or PDR for IPv6 routing over SRv6
 | | wt=1 | rxq=1 | framesize=${1518} | min_rate=${50000} | search_type=NDR
@@ -195,11 +195,11 @@
 | tc08-1518B-1t1c-ethip6srhip6-ip6base-srv6enc2sids-pdrdisc
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv6 over SRv6 routing config with\
-| | ... | 1 thread, 1 phy core, 1 receive queue per NIC port.
+| | ... | 1 phy core, 1 receive queue per NIC port.
 | | ... | [Ver] Find PDR for 1518 Byte frames using binary search start at 10GE\
 | | ... | linerate, step 50kpps, LT=0.5%.
 | | ...
-| | [Tags] | 1518B | 1T1C | STHREAD | PDRDISC | SKIP_PATCH
+| | [Tags] | 1518B | 1C | PDRDISC | SKIP_PATCH
 | | ...
 | | [Template] | Discover NDR or PDR for IPv6 routing over SRv6
 | | wt=1 | rxq=1 | framesize=${1518} | min_rate=${50000} | search_type=PDR
@@ -207,11 +207,11 @@
 | tc09-1518B-2t2c-ethip6srhip6-ip6base-srv6enc2sids-ndrdisc
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv6 over SRv6 routing config with\
-| | ... | 2 threads, 2 phy cores, 1 receive queue per NIC port.
+| | ... | 2 phy cores, 1 receive queue per NIC port.
 | | ... | [Ver] Find NDR for 1518 Byte frames using binary search start at 10GE\
 | | ... | linerate, step 50kpps.
 | | ...
-| | [Tags] | 1518B | 2T2C | MTHREAD | NDRDISC
+| | [Tags] | 1518B | 2C | NDRDISC
 | | ...
 | | [Template] | Discover NDR or PDR for IPv6 routing over SRv6
 | | wt=2 | rxq=1 | framesize=${1518} | min_rate=${50000} | search_type=NDR
@@ -219,11 +219,11 @@
 | tc10-1518B-2t2c-ethip6srhip6-ip6base-srv6enc2sids-pdrdisc
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv6 over SRv6 routing config with\
-| | ... | 2 threads, 2 phy cores, 1 receive queue per NIC port.
+| | ... | 2 phy cores, 1 receive queue per NIC port.
 | | ... | [Ver] Find PDR for 1518 Byte frames using binary search start at 10GE\
 | | ... | linerate, step 50kpps, LT=0.5%.
 | | ...
-| | [Tags] | 1518B | 2T2C | MTHREAD | PDRDISC | SKIP_PATCH
+| | [Tags] | 1518B | 2C | PDRDISC | SKIP_PATCH
 | | ...
 | | [Template] | Discover NDR or PDR for IPv6 routing over SRv6
 | | wt=2 | rxq=1 | framesize=${1518} | min_rate=${50000} | search_type=PDR
@@ -231,11 +231,11 @@
 | tc11-1518B-4t4c-ethip6srhip6-ip6base-srv6enc2sids-ndrdisc
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv6 over SRv6 routing config with\
-| | ... | 4 threads, 4 phy cores, 2 receive queues per NIC port.
+| | ... | 4 phy cores, 2 receive queues per NIC port.
 | | ... | [Ver] Find NDR for 1518 Byte frames using binary search start at 10GE\
 | | ... | linerate, step 50kpps.
 | | ...
-| | [Tags] | 1518B | 4T4C | MTHREAD | NDRDISC
+| | [Tags] | 1518B | 4C | NDRDISC
 | | ...
 | | [Template] | Discover NDR or PDR for IPv6 routing over SRv6
 | | wt=4 | rxq=2 | framesize=${1518} | min_rate=${50000} | search_type=NDR
@@ -243,11 +243,11 @@
 | tc12-1518B-4t4c-ethip6srhip6-ip6base-srv6enc2sids-pdrdisc
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv6 over SRv6 routing config with\
-| | ... | 4 threads, 4 phy cores, 2 receive queues per NIC port.
+| | ... | 4 phy cores, 2 receive queues per NIC port.
 | | ... | [Ver] Find PDR for 1518 Byte frames using binary search start at 10GE\
 | | ... | linerate, step 50kpps, LT=0.5%.
 | | ...
-| | [Tags] | 1518B | 4T4C | MTHREAD | PDRDISC | SKIP_PATCH
+| | [Tags] | 1518B | 4C | PDRDISC | SKIP_PATCH
 | | ...
 | | [Template] | Discover NDR or PDR for IPv6 routing over SRv6
 | | wt=4 | rxq=2 | framesize=${1518} | min_rate=${50000} | search_type=PDR
diff --git a/tests/vpp/perf/srv6/10ge2p1x520-ethip6srhip6-ip6base-srv6enc2sids-nodecaps-mrr.robot b/tests/vpp/perf/srv6/10ge2p1x520-ethip6srhip6-ip6base-srv6enc2sids-nodecaps-mrr.robot
index b9404ab021..cbc3a2d936 100644
--- a/tests/vpp/perf/srv6/10ge2p1x520-ethip6srhip6-ip6base-srv6enc2sids-nodecaps-mrr.robot
+++ b/tests/vpp/perf/srv6/10ge2p1x520-ethip6srhip6-ip6base-srv6enc2sids-nodecaps-mrr.robot
@@ -96,11 +96,11 @@
 | tc01-78B-1t1c-ethip6srhip6-ip6base-srv6enc2sids-nodecaps-mrr
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv6 over SRv6 routing config with\
-| | ... | 1 thread, 1 phy core, 1 receive queue per NIC port.
+| | ... | 1 phy core, 1 receive queue per NIC port.
 | | ... | [Ver] Measure MaxReceivedRate for 78B frames using single trial\
 | | ... | throughput test.
 | | ...
-| | [Tags] | 78B | 1T1C | STHREAD
+| | [Tags] | 78B | 1C
 | | ...
 | | [Template] | Check RR for IPv6 routing over SRv6
 | | wt=1 | rxq=1 | framesize=${78}
@@ -108,11 +108,11 @@
 | tc02-1518B-1t1c-ethip6srhip6-ip6base-srv6enc2sids-nodecaps-mrr
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv6 over SRv6 routing config with\
-| | ... | 1 thread, 1 phy core, 1 receive queue per NIC port.
+| | ... | 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 IPv6 routing over SRv6
 | | wt=1 | rxq=1 | framesize=${1518}
@@ -120,11 +120,11 @@
 | tc03-9000B-1t1c-ethip6srhip6-ip6base-srv6enc2sids-nodecaps-mrr
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv6 over SRv6 routing config with\
-| | ... | 1 thread, 1 phy core, 1 receive queue per NIC port.
+| | ... | 1 phy core, 1 receive queue per NIC port.
 | | ... | [Ver] Measure MaxReceivedRate for 9000B frames using single trial\
 | | ... | throughput test.
 | | ...
-| | [Tags] | 9000B | 1T1C | STHREAD
+| | [Tags] | 9000B | 1C
 | | ...
 | | [Template] | Check RR for IPv6 routing over SRv6
 | | wt=1 | rxq=1 | framesize=${9000}
@@ -132,12 +132,12 @@
 | tc04-IMIX-1t1c-ethip6srhip6-ip6base-srv6enc2sids-nodecaps-mrr
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv6 over SRv6 routing config with\
-| | ... | 1 thread, 1 phy core, 1 receive queue per NIC port.
+| | ... | 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 IPv6 routing over SRv6
 | | wt=1 | rxq=1 | framesize=IMIX_v4_1
@@ -145,11 +145,11 @@
 | tc05-78B-2t2c-ethip6srhip6-ip6base-srv6enc2sids-nodecaps-mrr
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv6 over SRv6 routing config with\
-| | ... | 2 threads, 2 phy cores, 1 receive queue per NIC port.
+| | ... | 2 phy cores, 1 receive queue per NIC port.
 | | ... | [Ver] Measure MaxReceivedRate for 78B frames using single trial\
 | | ... | throughput test.
 | | ...
-| | [Tags] | 78B | 2T2C | MTHREAD
+| | [Tags] | 78B | 2C
 | | ...
 | | [Template] | Check RR for IPv6 routing over SRv6
 | | wt=2 | rxq=1 | framesize=${78}
@@ -157,11 +157,11 @@
 | tc06-1518B-2t2c-ethip6srhip6-ip6base-srv6enc2sids-nodecaps-mrr
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv6 over SRv6 routing config with\
-| | ... | 2 threads, 2 phy cores, 1 receive queue per NIC port.
+| | ... | 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 IPv6 routing over SRv6
 | | wt=2 | rxq=1 | framesize=${1518}
@@ -169,11 +169,11 @@
 | tc07-9000B-2t2c-ethip6srhip6-ip6base-srv6enc2sids-nodecaps-mrr
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv6 over SRv6 routing config with\
-| | ... | 2 threads, 2 phy cores, 1 receive queue per NIC port.
+| | ... | 2 phy cores, 1 receive queue per NIC port.
 | | ... | [Ver] Measure MaxReceivedRate for 9000B frames using single trial\
 | | ... | throughput test.
 | | ...
-| | [Tags] | 9000B | 2T2C | MTHREAD
+| | [Tags] | 9000B | 2C
 | | ...
 | | [Template] | Check RR for IPv6 routing over SRv6
 | | wt=2 | rxq=1 | framesize=${9000}
@@ -181,12 +181,12 @@
 | tc08-IMIX-2t2c-ethip6srhip6-ip6base-srv6enc2sids-nodecaps-mrr
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv6 over SRv6 routing config with\
-| | ... | 2 threads, 2 phy cores, 1 receive queue per NIC port.
+| | ... | 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 IPv6 routing over SRv6
 | | wt=2 | rxq=1 | framesize=IMIX_v4_1
@@ -194,11 +194,11 @@
 | tc09-78B-4t4c-ethip6srhip6-ip6base-srv6enc2sids-nodecaps-mrr
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv6 over SRv6 routing config with\
-| | ... | 4 threads, 4 phy cores, 2 receive queues per NIC port.
+| | ... | 4 phy cores, 2 receive queues per NIC port.
 | | ... | [Ver] Measure MaxReceivedRate for 78B frames using single trial\
 | | ... | throughput test.
 | | ...
-| | [Tags] | 78B | 4T4C | MTHREAD
+| | [Tags] | 78B | 4C
 | | ...
 | | [Template] | Check RR for IPv6 routing over SRv6
 | | wt=4 | rxq=2 | framesize=${78}
@@ -206,11 +206,11 @@
 | tc10-1518B-4t4c-ethip6srhip6-ip6base-srv6enc2sids-nodecaps-mrr
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv6 over SRv6 routing config with\
-| | ... | 4 threads, 4 phy cores, 2 receive queues per NIC port.
+| | ... | 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 IPv6 routing over SRv6
 | | wt=4 | rxq=2 | framesize=${1518}
@@ -218,11 +218,11 @@
 | tc11-9000B-4t4c-ethip6srhip6-ip6base-srv6enc2sids-nodecaps-mrr
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv6 over SRv6 routing config with\
-| | ... | 4 threads, 4 phy cores, 2 receive queues per NIC port.
+| | ... | 4 phy cores, 2 receive queues per NIC port.
 | | ... | [Ver] Measure MaxReceivedRate for 9000B frames using single trial\
 | | ... | throughput test.
 | | ...
-| | [Tags] | 9000B | 4T4C | MTHREAD
+| | [Tags] | 9000B | 4C
 | | ...
 | | [Template] | Check RR for IPv6 routing over SRv6
 | | wt=4 | rxq=2 | framesize=${9000}
@@ -230,12 +230,12 @@
 | tc12-IMIX-4t4c-ethip6srhip6-ip6base-srv6enc2sids-nodecaps-mrr
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv6 over SRv6 routing config with\
-| | ... | 4 threads, 4 phy cores, 2 receive queues per NIC port.
+| | ... | 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 IPv6 routing over SRv6
 | | wt=4 | rxq=2 | framesize=IMIX_v4_1
diff --git a/tests/vpp/perf/srv6/10ge2p1x520-ethip6srhip6-ip6base-srv6enc2sids-nodecaps-ndrpdrdisc.robot b/tests/vpp/perf/srv6/10ge2p1x520-ethip6srhip6-ip6base-srv6enc2sids-nodecaps-ndrpdrdisc.robot
index 16f33f6e7e..80d1c7383f 100644
--- a/tests/vpp/perf/srv6/10ge2p1x520-ethip6srhip6-ip6base-srv6enc2sids-nodecaps-ndrpdrdisc.robot
+++ b/tests/vpp/perf/srv6/10ge2p1x520-ethip6srhip6-ip6base-srv6enc2sids-nodecaps-ndrpdrdisc.robot
@@ -110,11 +110,11 @@
 | tc01-78B-1t1c-ethip6srhip6-ip6base-srv6enc2sids-nodecaps-ndrdisc
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv6 over SRv6 routing config with\
-| | ... | 1 thread, 1 phy core, 1 receive queue per NIC port.
+| | ... | 1 phy core, 1 receive queue per NIC port.
 | | ... | [Ver] Find NDR for 78 Byte frames using binary search start at 10GE\
 | | ... | linerate, step 50kpps.
 | | ...
-| | [Tags] | 78B | 1T1C | STHREAD | NDRDISC
+| | [Tags] | 78B | 1C | NDRDISC
 | | ...
 | | [Template] | Discover NDR or PDR for IPv6 routing over SRv6
 | | wt=1 | rxq=1 | framesize=${78} | min_rate=${50000} | search_type=NDR
@@ -122,11 +122,11 @@
 | tc02-78B-1t1c-ethip6srhip6-ip6base-srv6enc2sids-nodecaps-pdrdisc
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv6 over SRv6 routing config with\
-| | ... | 1 thread, 1 phy core, 1 receive queue per NIC port.
+| | ... | 1 phy core, 1 receive queue per NIC port.
 | | ... | [Ver] Find PDR for 78 Byte frames using binary search start at 10GE\
 | | ... | linerate, step 50kpps, LT=0.5%.
 | | ...
-| | [Tags] | 78B | 1T1C | STHREAD | PDRDISC | SKIP_PATCH
+| | [Tags] | 78B | 1C | PDRDISC | SKIP_PATCH
 | | ...
 | | [Template] | Discover NDR or PDR for IPv6 routing over SRv6
 | | wt=1 | rxq=1 | framesize=${78} | min_rate=${50000} | search_type=PDR
@@ -134,11 +134,11 @@
 | tc03-78B-2t2c-ethip6srhip6-ip6base-srv6enc2sids-nodecaps-ndrdisc
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv6 over SRv6 routing config with\
-| | ... | 2 threads, 2 phy cores, 1 receive queue per NIC port.
+| | ... | 2 phy cores, 1 receive queue per NIC port.
 | | ... | [Ver] Find NDR for 78 Byte frames using binary search start at 10GE\
 | | ... | linerate, step 50kpps.
 | | ...
-| | [Tags] | 78B | 2T2C | MTHREAD | NDRDISC
+| | [Tags] | 78B | 2C | NDRDISC
 | | ...
 | | [Template] | Discover NDR or PDR for IPv6 routing over SRv6
 | | wt=2 | rxq=1 | framesize=${78} | min_rate=${50000} | search_type=NDR
@@ -146,11 +146,11 @@
 | tc04-78B-2t2c-ethip6srhip6-ip6base-srv6enc2sids-nodecaps-pdrdisc
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv6 over SRv6 routing config with\
-| | ... | 2 threads, 2 phy cores, 1 receive queue per NIC port.
+| | ... | 2 phy cores, 1 receive queue per NIC port.
 | | ... | [Ver] Find PDR for 78 Byte frames using binary search start at 10GE\
 | | ... | linerate, step 50kpps, LT=0.5%.
 | | ...
-| | [Tags] | 78B | 2T2C | MTHREAD | PDRDISC | SKIP_PATCH
+| | [Tags] | 78B | 2C | PDRDISC | SKIP_PATCH
 | | ...
 | | [Template] | Discover NDR or PDR for IPv6 routing over SRv6
 | | wt=2 | rxq=1 | framesize=${78} | min_rate=${50000} | search_type=PDR
@@ -158,11 +158,11 @@
 | tc05-78B-4t4c-ethip6srhip6-ip6base-srv6enc2sids-nodecaps-ndrdisc
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv6 over SRv6 routing config with\
-| | ... | 4 threads, 4 phy cores, 2 receive queues per NIC port.
+| | ... | 4 phy cores, 2 receive queues per NIC port.
 | | ... | [Ver] Find NDR for 78 Byte frames using binary search start at 10GE\
 | | ... | linerate, step 50kpps.
 | | ...
-| | [Tags] | 78B | 4T4C | MTHREAD | NDRDISC
+| | [Tags] | 78B | 4C | NDRDISC
 | | ...
 | | [Template] | Discover NDR or PDR for IPv6 routing over SRv6
 | | wt=4 | rxq=2 | framesize=${78} | min_rate=${50000} | search_type=NDR
@@ -170,11 +170,11 @@
 | tc06-78B-4t4c-ethip6srhip6-ip6base-srv6enc2sids-nodecaps-pdrdisc
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv6 over SRv6 routing config with\
-| | ... | 4 threads, 4 phy cores, 2 receive queues per NIC port.
+| | ... | 4 phy cores, 2 receive queues per NIC port.
 | | ... | [Ver] Find PDR for 78 Byte frames using binary search start at 10GE\
 | | ... | linerate, step 50kpps, LT=0.5%.
 | | ...
-| | [Tags] | 78B | 4T4C | MTHREAD | PDRDISC | SKIP_PATCH
+| | [Tags] | 78B | 4C | PDRDISC | SKIP_PATCH
 | | ...
 | | [Template] | Discover NDR or PDR for IPv6 routing over SRv6
 | | wt=4 | rxq=2 | framesize=${78} | min_rate=${50000} | search_type=PDR
@@ -182,11 +182,11 @@
 | tc07-1518B-1t1c-ethip6srhip6-ip6base-srv6enc2sids-nodecaps-ndrdisc
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv6 over SRv6 routing config with\
-| | ... | 1 thread, 1 phy core, 1 receive queue per NIC port.
+| | ... | 1 phy core, 1 receive queue per NIC port.
 | | ... | [Ver] Find NDR for 1518 Byte frames using binary search start at 10GE\
 | | ... | linerate, step 50kpps.
 | | ...
-| | [Tags] | 1518B | 1T1C | STHREAD | NDRDISC
+| | [Tags] | 1518B | 1C | NDRDISC
 | | ...
 | | [Template] | Discover NDR or PDR for IPv6 routing over SRv6
 | | wt=1 | rxq=1 | framesize=${1518} | min_rate=${50000} | search_type=NDR
@@ -194,11 +194,11 @@
 | tc08-1518B-1t1c-ethip6srhip6-ip6base-srv6enc2sids-nodecaps-pdrdisc
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv6 over SRv6 routing config with\
-| | ... | 1 thread, 1 phy core, 1 receive queue per NIC port.
+| | ... | 1 phy core, 1 receive queue per NIC port.
 | | ... | [Ver] Find PDR for 1518 Byte frames using binary search start at 10GE\
 | | ... | linerate, step 50kpps, LT=0.5%.
 | | ...
-| | [Tags] | 1518B | 1T1C | STHREAD | PDRDISC | SKIP_PATCH
+| | [Tags] | 1518B | 1C | PDRDISC | SKIP_PATCH
 | | ...
 | | [Template] | Discover NDR or PDR for IPv6 routing over SRv6
 | | wt=1 | rxq=1 | framesize=${1518} | min_rate=${50000} | search_type=PDR
@@ -206,11 +206,11 @@
 | tc09-1518B-2t2c-ethip6srhip6-ip6base-srv6enc2sids-nodecaps-ndrdisc
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv6 over SRv6 routing config with\
-| | ... | 2 threads, 2 phy cores, 1 receive queue per NIC port.
+| | ... | 2 phy cores, 1 receive queue per NIC port.
 | | ... | [Ver] Find NDR for 1518 Byte frames using binary search start at 10GE\
 | | ... | linerate, step 50kpps.
 | | ...
-| | [Tags] | 1518B | 2T2C | MTHREAD | NDRDISC
+| | [Tags] | 1518B | 2C | NDRDISC
 | | ...
 | | [Template] | Discover NDR or PDR for IPv6 routing over SRv6
 | | wt=2 | rxq=1 | framesize=${1518} | min_rate=${50000} | search_type=NDR
@@ -218,11 +218,11 @@
 | tc10-1518B-2t2c-ethip6srhip6-ip6base-srv6enc2sids-nodecaps-pdrdisc
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv6 over SRv6 routing config with\
-| | ... | 2 threads, 2 phy cores, 1 receive queue per NIC port.
+| | ... | 2 phy cores, 1 receive queue per NIC port.
 | | ... | [Ver] Find PDR for 1518 Byte frames using binary search start at 10GE\
 | | ... | linerate, step 50kpps, LT=0.5%.
 | | ...
-| | [Tags] | 1518B | 2T2C | MTHREAD | PDRDISC | SKIP_PATCH
+| | [Tags] | 1518B | 2C | PDRDISC | SKIP_PATCH
 | | ...
 | | [Template] | Discover NDR or PDR for IPv6 routing over SRv6
 | | wt=2 | rxq=1 | framesize=${1518} | min_rate=${50000} | search_type=PDR
@@ -230,11 +230,11 @@
 | tc11-1518B-4t4c-ethip6srhip6-ip6base-srv6enc2sids-nodecaps-ndrdisc
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv6 over SRv6 routing config with\
-| | ... | 4 threads, 4 phy cores, 2 receive queues per NIC port.
+| | ... | 4 phy cores, 2 receive queues per NIC port.
 | | ... | [Ver] Find NDR for 1518 Byte frames using binary search start at 10GE\
 | | ... | linerate, step 50kpps.
 | | ...
-| | [Tags] | 1518B | 4T4C | MTHREAD | NDRDISC
+| | [Tags] | 1518B | 4C | NDRDISC
 | | ...
 | | [Template] | Discover NDR or PDR for IPv6 routing over SRv6
 | | wt=4 | rxq=2 | framesize=${1518} | min_rate=${50000} | search_type=NDR
@@ -242,11 +242,11 @@
 | tc12-1518B-4t4c-ethip6srhip6-ip6base-srv6enc2sids-nodecaps-pdrdisc
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv6 over SRv6 routing config with\
-| | ... | 4 threads, 4 phy cores, 2 receive queues per NIC port.
+| | ... | 4 phy cores, 2 receive queues per NIC port.
 | | ... | [Ver] Find PDR for 1518 Byte frames using binary search start at 10GE\
 | | ... | linerate, step 50kpps, LT=0.5%.
 | | ...
-| | [Tags] | 1518B | 4T4C | MTHREAD | PDRDISC | SKIP_PATCH
+| | [Tags] | 1518B | 4C | PDRDISC | SKIP_PATCH
 | | ...
 | | [Template] | Discover NDR or PDR for IPv6 routing over SRv6
 | | wt=4 | rxq=2 | framesize=${1518} | min_rate=${50000} | search_type=PDR
diff --git a/tests/vpp/perf/srv6/10ge2p1x520-ethip6srhip6-ip6base-srv6proxy-dyn-mrr.robot b/tests/vpp/perf/srv6/10ge2p1x520-ethip6srhip6-ip6base-srv6proxy-dyn-mrr.robot
index c56f8fd801..733b8d955a 100644
--- a/tests/vpp/perf/srv6/10ge2p1x520-ethip6srhip6-ip6base-srv6proxy-dyn-mrr.robot
+++ b/tests/vpp/perf/srv6/10ge2p1x520-ethip6srhip6-ip6base-srv6proxy-dyn-mrr.robot
@@ -122,11 +122,11 @@
 | tc01-78B-1t1c-ethip6srhip6-ip6base-srv6proxy-dyn-mrr
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv6 over SRv6 routing with dynamic SRv6 proxy config\
-| | ... | 1 thread, 1 phy core, 1 receive queue per NIC port.
+| | ... | 1 phy core, 1 receive queue per NIC port.
 | | ... | [Ver] Measure MaxReceivedRate for 78B frames using single trial\
 | | ... | throughput test.
 | | ...
-| | [Tags] | 78B | 1T1C | STHREAD
+| | [Tags] | 78B | 1C
 | | ...
 | | [Template] | Check RR for IPv6 routing over SRv6 with endpoint to SR-unaware Service Function via dynamic proxy behaviour
 | | wt=1 | rxq=1 | framesize=${78}
@@ -134,11 +134,11 @@
 | tc02-1518B-1t1c-ethip6srhip6-ip6base-srv6proxy-dyn-mrr
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv6 over SRv6 routing with dynamic SRv6 proxy config\
-| | ... | 1 thread, 1 phy core, 1 receive queue per NIC port.
+| | ... | 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 IPv6 routing over SRv6 with endpoint to SR-unaware Service Function via dynamic proxy behaviour
 | | wt=1 | rxq=1 | framesize=${1518}
@@ -146,11 +146,11 @@
 | tc03-9000B-1t1c-ethip6srhip6-ip6base-srv6proxy-dyn-mrr
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv6 over SRv6 routing with dynamic SRv6 proxy config\
-| | ... | 1 thread, 1 phy core, 1 receive queue per NIC port.
+| | ... | 1 phy core, 1 receive queue per NIC port.
 | | ... | [Ver] Measure MaxReceivedRate for 9000B frames using single trial\
 | | ... | throughput test.
 | | ...
-| | [Tags] | 9000B | 1T1C | STHREAD
+| | [Tags] | 9000B | 1C
 | | ...
 | | [Template] | Check RR for IPv6 routing over SRv6 with endpoint to SR-unaware Service Function via dynamic proxy behaviour
 | | wt=1 | rxq=1 | framesize=${9000}
@@ -158,12 +158,12 @@
 | tc04-IMIX-1t1c-ethip6srhip6-ip6base-srv6proxy-dyn-mrr
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv6 over SRv6 routing with dynamic SRv6 proxy config\
-| | ... | 1 thread, 1 phy core, 1 receive queue per NIC port.
+| | ... | 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 IPv6 routing over SRv6 with endpoint to SR-unaware Service Function via dynamic proxy behaviour
 | | wt=1 | rxq=1 | framesize=IMIX_v4_1
@@ -171,11 +171,11 @@
 | tc05-78B-2t2c-ethip6srhip6-ip6base-srv6proxy-dyn-mrr
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv6 over SRv6 routing with dynamic SRv6 proxy config\
-| | ... | 2 threads, 2 phy cores, 1 receive queue per NIC port.
+| | ... | 2 phy cores, 1 receive queue per NIC port.
 | | ... | [Ver] Measure MaxReceivedRate for 78B frames using single trial\
 | | ... | throughput test.
 | | ...
-| | [Tags] | 78B | 2T2C | MTHREAD
+| | [Tags] | 78B | 2C
 | | ...
 | | [Template] | Check RR for IPv6 routing over SRv6 with endpoint to SR-unaware Service Function via dynamic proxy behaviour
 | | wt=2 | rxq=1 | framesize=${78}
@@ -183,11 +183,11 @@
 | tc06-1518B-2t2c-ethip6srhip6-ip6base-srv6proxy-dyn-mrr
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv6 over SRv6 routing with dynamic SRv6 proxy config\
-| | ... | 2 threads, 2 phy cores, 1 receive queue per NIC port.
+| | ... | 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 IPv6 routing over SRv6 with endpoint to SR-unaware Service Function via dynamic proxy behaviour
 | | wt=2 | rxq=1 | framesize=${1518}
@@ -195,11 +195,11 @@
 | tc07-9000B-2t2c-ethip6srhip6-ip6base-srv6proxy-dyn-mrr
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv6 over SRv6 routing with dynamic SRv6 proxy config\
-| | ... | 2 threads, 2 phy cores, 1 receive queue per NIC port.
+| | ... | 2 phy cores, 1 receive queue per NIC port.
 | | ... | [Ver] Measure MaxReceivedRate for 9000B frames using single trial\
 | | ... | throughput test.
 | | ...
-| | [Tags] | 9000B | 2T2C | MTHREAD
+| | [Tags] | 9000B | 2C
 | | ...
 | | [Template] | Check RR for IPv6 routing over SRv6 with endpoint to SR-unaware Service Function via dynamic proxy behaviour
 | | wt=2 | rxq=1 | framesize=${9000}
@@ -207,12 +207,12 @@
 | tc08-IMIX-2t2c-ethip6srhip6-ip6base-srv6proxy-dyn-mrr
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv6 over SRv6 routing with dynamic SRv6 proxy config\
-| | ... | 2 threads, 2 phy cores, 1 receive queue per NIC port.
+| | ... | 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 IPv6 routing over SRv6 with endpoint to SR-unaware Service Function via dynamic proxy behaviour
 | | wt=2 | rxq=1 | framesize=IMIX_v4_1
@@ -220,11 +220,11 @@
 | tc09-78B-4t4c-ethip6srhip6-ip6base-srv6proxy-dyn-mrr
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv6 over SRv6 routing with dynamic SRv6 proxy config\
-| | ... | 4 threads, 4 phy cores, 2 receive queues per NIC port.
+| | ... | 4 phy cores, 2 receive queues per NIC port.
 | | ... | [Ver] Measure MaxReceivedRate for 78B frames using single trial\
 | | ... | throughput test.
 | | ...
-| | [Tags] | 78B | 4T4C | MTHREAD
+| | [Tags] | 78B | 4C
 | | ...
 | | [Template] | Check RR for IPv6 routing over SRv6 with endpoint to SR-unaware Service Function via dynamic proxy behaviour
 | | wt=4 | rxq=2 | framesize=${78}
@@ -232,11 +232,11 @@
 | tc10-1518B-4t4c-ethip6srhip6-ip6base-srv6proxy-dyn-mrr
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv6 over SRv6 routing with dynamic SRv6 proxy config\
-| | ... | 4 threads, 4 phy cores, 2 receive queues per NIC port.
+| | ... | 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 IPv6 routing over SRv6 with endpoint to SR-unaware Service Function via dynamic proxy behaviour
 | | wt=4 | rxq=2 | framesize=${1518}
@@ -244,11 +244,11 @@
 | tc11-9000B-4t4c-ethip6srhip6-ip6base-srv6proxy-dyn-mrr
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv6 over SRv6 routing with dynamic SRv6 proxy config\
-| | ... | 4 threads, 4 phy cores, 2 receive queues per NIC port.
+| | ... | 4 phy cores, 2 receive queues per NIC port.
 | | ... | [Ver] Measure MaxReceivedRate for 9000B frames using single trial\
 | | ... | throughput test.
 | | ...
-| | [Tags] | 9000B | 4T4C | MTHREAD
+| | [Tags] | 9000B | 4C
 | | ...
 | | [Template] | Check RR for IPv6 routing over SRv6 with endpoint to SR-unaware Service Function via dynamic proxy behaviour
 | | wt=4 | rxq=2 | framesize=${9000}
@@ -256,12 +256,12 @@
 | tc12-IMIX-4t4c-ethip6srhip6-ip6base-srv6proxy-dyn-mrr
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv6 over SRv6 routing with dynamic SRv6 proxy config\
-| | ... | 4 threads, 4 phy cores, 2 receive queues per NIC port.
+| | ... | 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 IPv6 routing over SRv6 with endpoint to SR-unaware Service Function via dynamic proxy behaviour
 | | wt=4 | rxq=2 | framesize=IMIX_v4_1
diff --git a/tests/vpp/perf/srv6/10ge2p1x520-ethip6srhip6-ip6base-srv6proxy-dyn-ndrpdrdisc.robot b/tests/vpp/perf/srv6/10ge2p1x520-ethip6srhip6-ip6base-srv6proxy-dyn-ndrpdrdisc.robot
index ac34dad136..2356103766 100644
--- a/tests/vpp/perf/srv6/10ge2p1x520-ethip6srhip6-ip6base-srv6proxy-dyn-ndrpdrdisc.robot
+++ b/tests/vpp/perf/srv6/10ge2p1x520-ethip6srhip6-ip6base-srv6proxy-dyn-ndrpdrdisc.robot
@@ -136,11 +136,11 @@
 | tc01-78B-1t1c-ethip6srhip6-ip6base-srv6proxy-dyn-ndrdisc
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv6 over SRv6 routing with dynamic SRv6 proxy config\
-| | ... | 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 78 Byte frames using binary search start at 10GE\
 | | ... | linerate, step 50kpps.
 | | ...
-| | [Tags] | 78B | 1T1C | STHREAD | NDRDISC
+| | [Tags] | 78B | 1C | NDRDISC
 | | ...
 | | [Template] | Discover NDR or PDR for IPv6 routing over SRv6 with endpoint to SR-unaware Service Function via dynamic proxy behaviour
 | | wt=1 | rxq=1 | framesize=${78} | min_rate=${50000} | search_type=NDR
@@ -148,11 +148,11 @@
 | tc02-78B-1t1c-ethip6srhip6-ip6base-srv6proxy-dyn-pdrdisc
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv6 over SRv6 routing with dynamic SRv6 proxy config\
-| | ... | 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 78 Byte frames using binary search start at 10GE\
 | | ... | linerate, step 50kpps, LT=0.5%.
 | | ...
-| | [Tags] | 78B | 1T1C | STHREAD | PDRDISC | SKIP_PATCH
+| | [Tags] | 78B | 1C | PDRDISC | SKIP_PATCH
 | | ...
 | | [Template] | Discover NDR or PDR for IPv6 routing over SRv6 with endpoint to SR-unaware Service Function via dynamic proxy behaviour
 | | wt=1 | rxq=1 | framesize=${78} | min_rate=${50000} | search_type=PDR
@@ -160,11 +160,11 @@
 | tc03-78B-2t2c-ethip6srhip6-ip6base-srv6proxy-dyn-ndrdisc
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv6 over SRv6 routing with dynamic SRv6 proxy config\
-| | ... | with 2 threads, 2 phy cores, 1 receive queue per NIC port.
+| | ... | with 2 phy cores, 1 receive queue per NIC port.
 | | ... | [Ver] Find NDR for 78 Byte frames using binary search start at 10GE\
 | | ... | linerate, step 50kpps.
 | | ...
-| | [Tags] | 78B | 2T2C | MTHREAD | NDRDISC
+| | [Tags] | 78B | 2C | NDRDISC
 | | ...
 | | [Template] | Discover NDR or PDR for IPv6 routing over SRv6 with endpoint to SR-unaware Service Function via dynamic proxy behaviour
 | | wt=2 | rxq=1 | framesize=${78} | min_rate=${50000} | search_type=NDR
@@ -172,11 +172,11 @@
 | tc04-78B-2t2c-ethip6srhip6-ip6base-srv6proxy-dyn-pdrdisc
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv6 over SRv6 routing with dynamic SRv6 proxy config\
-| | ... | with 2 threads, 2 phy cores, 1 receive queue per NIC port.
+| | ... | with 2 phy cores, 1 receive queue per NIC port.
 | | ... | [Ver] Find PDR for 78 Byte frames using binary search start at 10GE\
 | | ... | linerate, step 50kpps, LT=0.5%.
 | | ...
-| | [Tags] | 78B | 2T2C | MTHREAD | PDRDISC | SKIP_PATCH
+| | [Tags] | 78B | 2C | PDRDISC | SKIP_PATCH
 | | ...
 | | [Template] | Discover NDR or PDR for IPv6 routing over SRv6 with endpoint to SR-unaware Service Function via dynamic proxy behaviour
 | | wt=2 | rxq=1 | framesize=${78} | min_rate=${50000} | search_type=PDR
@@ -184,11 +184,11 @@
 | tc05-78B-4t4c-ethip6srhip6-ip6base-srv6proxy-dyn-ndrdisc
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv6 over SRv6 routing with dynamic SRv6 proxy config\
-| | ... | with 4 threads, 4 phy cores, 2 receive queues per NIC port.
+| | ... | with 4 phy cores, 2 receive queues per NIC port.
 | | ... | [Ver] Find NDR for 78 Byte frames using binary search start at 10GE\
 | | ... | linerate, step 50kpps.
 | | ...
-| | [Tags] | 78B | 4T4C | MTHREAD | NDRDISC
+| | [Tags] | 78B | 4C | NDRDISC
 | | ...
 | | [Template] | Discover NDR or PDR for IPv6 routing over SRv6 with endpoint to SR-unaware Service Function via dynamic proxy behaviour
 | | wt=4 | rxq=2 | framesize=${78} | min_rate=${50000} | search_type=NDR
@@ -196,11 +196,11 @@
 | tc06-78B-4t4c-ethip6srhip6-ip6base-srv6proxy-dyn-pdrdisc
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv6 over SRv6 routing with dynamic SRv6 proxy config\
-| | ... | with 4 threads, 4 phy cores, 2 receive queues per NIC port.
+| | ... | with 4 phy cores, 2 receive queues per NIC port.
 | | ... | [Ver] Find PDR for 78 Byte frames using binary search start at 10GE\
 | | ... | linerate, step 50kpps, LT=0.5%.
 | | ...
-| | [Tags] | 78B | 4T4C | MTHREAD | PDRDISC | SKIP_PATCH
+| | [Tags] | 78B | 4C | PDRDISC | SKIP_PATCH
 | | ...
 | | [Template] | Discover NDR or PDR for IPv6 routing over SRv6 with endpoint to SR-unaware Service Function via dynamic proxy behaviour
 | | wt=4 | rxq=2 | framesize=${78} | min_rate=${50000} | search_type=PDR
@@ -208,11 +208,11 @@
 | tc07-1518B-1t1c-ethip6srhip6-ip6base-srv6proxy-dyn-ndrdisc
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv6 over SRv6 routing with dynamic SRv6 proxy config\
-| | ... | 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 10GE\
 | | ... | linerate, step 50kpps.
 | | ...
-| | [Tags] | 1518B | 1T1C | STHREAD | NDRDISC
+| | [Tags] | 1518B | 1C | NDRDISC
 | | ...
 | | [Template] | Discover NDR or PDR for IPv6 routing over SRv6 with endpoint to SR-unaware Service Function via dynamic proxy behaviour
 | | wt=1 | rxq=1 | framesize=${1518} | min_rate=${50000} | search_type=NDR
@@ -220,11 +220,11 @@
 | tc08-1518B-1t1c-ethip6srhip6-ip6base-srv6proxy-dyn-pdrdisc
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv6 over SRv6 routing with dynamic SRv6 proxy config\
-| | ... | 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 10GE\
 | | ... | linerate, step 50kpps, LT=0.5%.
 | | ...
-| | [Tags] | 1518B | 1T1C | STHREAD | PDRDISC | SKIP_PATCH
+| | [Tags] | 1518B | 1C | PDRDISC | SKIP_PATCH
 | | ...
 | | [Template] | Discover NDR or PDR for IPv6 routing over SRv6 with endpoint to SR-unaware Service Function via dynamic proxy behaviour
 | | wt=1 | rxq=1 | framesize=${1518} | min_rate=${50000} | search_type=PDR
@@ -232,11 +232,11 @@
 | tc09-1518B-2t2c-ethip6srhip6-ip6base-srv6proxy-dyn-ndrdisc
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv6 over SRv6 routing with dynamic SRv6 proxy config\
-| | ... | with 2 threads, 2 phy cores, 1 receive queue per NIC port.
+| | ... | with 2 phy cores, 1 receive queue per NIC port.
 | | ... | [Ver] Find NDR for 1518 Byte frames using binary search start at 10GE\
 | | ... | linerate, step 50kpps.
 | | ...
-| | [Tags] | 1518B | 2T2C | MTHREAD | NDRDISC
+| | [Tags] | 1518B | 2C | NDRDISC
 | | ...
 | | [Template] | Discover NDR or PDR for IPv6 routing over SRv6 with endpoint to SR-unaware Service Function via dynamic proxy behaviour
 | | wt=2 | rxq=1 | framesize=${1518} | min_rate=${50000} | search_type=NDR
@@ -244,11 +244,11 @@
 | tc10-1518B-2t2c-ethip6srhip6-ip6base-srv6proxy-dyn-pdrdisc
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv6 over SRv6 routing with dynamic SRv6 proxy config\
-| | ... | with 2 threads, 2 phy cores, 1 receive queue per NIC port.
+| | ... | with 2 phy cores, 1 receive queue per NIC port.
 | | ... | [Ver] Find PDR for 1518 Byte frames using binary search start at 10GE\
 | | ... | linerate, step 50kpps, LT=0.5%.
 | | ...
-| | [Tags] | 1518B | 2T2C | MTHREAD | PDRDISC | SKIP_PATCH
+| | [Tags] | 1518B | 2C | PDRDISC | SKIP_PATCH
 | | ...
 | | [Template] | Discover NDR or PDR for IPv6 routing over SRv6 with endpoint to SR-unaware Service Function via dynamic proxy behaviour
 | | wt=2 | rxq=1 | framesize=${1518} | min_rate=${50000} | search_type=PDR
@@ -256,11 +256,11 @@
 | tc11-1518B-4t4c-ethip6srhip6-ip6base-srv6proxy-dyn-ndrdisc
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv6 over SRv6 routing with dynamic SRv6 proxy config\
-| | ... | with 4 threads, 4 phy cores, 2 receive queues per NIC port.
+| | ... | with 4 phy cores, 2 receive queues per NIC port.
 | | ... | [Ver] Find NDR for 1518 Byte frames using binary search start at 10GE\
 | | ... | linerate, step 50kpps.
 | | ...
-| | [Tags] | 1518B | 4T4C | MTHREAD | NDRDISC
+| | [Tags] | 1518B | 4C | NDRDISC
 | | ...
 | | [Template] | Discover NDR or PDR for IPv6 routing over SRv6 with endpoint to SR-unaware Service Function via dynamic proxy behaviour
 | | wt=4 | rxq=2 | framesize=${1518} | min_rate=${50000} | search_type=NDR
@@ -268,11 +268,11 @@
 | tc12-1518B-4t4c-ethip6srhip6-ip6base-srv6proxy-dyn-pdrdisc
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv6 over SRv6 routing with dynamic SRv6 proxy config\
-| | ... | with 4 threads, 4 phy cores, 2 receive queues per NIC port.
+| | ... | with 4 phy cores, 2 receive queues per NIC port.
 | | ... | [Ver] Find PDR for 1518 Byte frames using binary search start at 10GE\
 | | ... | linerate, step 50kpps, LT=0.5%.
 | | ...
-| | [Tags] | 1518B | 4T4C | MTHREAD | PDRDISC | SKIP_PATCH
+| | [Tags] | 1518B | 4C | PDRDISC | SKIP_PATCH
 | | ...
 | | [Template] | Discover NDR or PDR for IPv6 routing over SRv6 with endpoint to SR-unaware Service Function via dynamic proxy behaviour
 | | wt=4 | rxq=2 | framesize=${1518} | min_rate=${50000} | search_type=PDR
diff --git a/tests/vpp/perf/srv6/10ge2p1x520-ethip6srhip6-ip6base-srv6proxy-masq-mrr.robot b/tests/vpp/perf/srv6/10ge2p1x520-ethip6srhip6-ip6base-srv6proxy-masq-mrr.robot
index f57b71e192..48cd6dc9b3 100644
--- a/tests/vpp/perf/srv6/10ge2p1x520-ethip6srhip6-ip6base-srv6proxy-masq-mrr.robot
+++ b/tests/vpp/perf/srv6/10ge2p1x520-ethip6srhip6-ip6base-srv6proxy-masq-mrr.robot
@@ -122,11 +122,11 @@
 | tc01-78B-1t1c-ethip6srhip6-ip6base-srv6proxy-masq-mrr
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv6 over SRv6 routing with masquerading SRv6 proxy\
-| | ... | 1 thread, 1 phy core, 1 receive queue per NIC port.
+| | ... | 1 phy core, 1 receive queue per NIC port.
 | | ... | [Ver] Measure MaxReceivedRate for 78B frames using single trial\
 | | ... | throughput test.
 | | ...
-| | [Tags] | 78B | 1T1C | STHREAD
+| | [Tags] | 78B | 1C
 | | ...
 | | [Template] | Check RR for IPv6 routing over SRv6 with endpoint to SR-unaware Service Function via masquerading proxy behaviour
 | | wt=1 | rxq=1 | framesize=${78}
@@ -134,11 +134,11 @@
 | tc02-1518B-1t1c-ethip6srhip6-ip6base-srv6proxy-masq-mrr
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv6 over SRv6 routing with masquerading SRv6 proxy\
-| | ... | 1 thread, 1 phy core, 1 receive queue per NIC port.
+| | ... | 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 IPv6 routing over SRv6 with endpoint to SR-unaware Service Function via masquerading proxy behaviour
 | | wt=1 | rxq=1 | framesize=${1518}
@@ -146,11 +146,11 @@
 | tc03-9000B-1t1c-ethip6srhip6-ip6base-srv6proxy-masq-mrr
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv6 over SRv6 routing with masquerading SRv6 proxy\
-| | ... | 1 thread, 1 phy core, 1 receive queue per NIC port.
+| | ... | 1 phy core, 1 receive queue per NIC port.
 | | ... | [Ver] Measure MaxReceivedRate for 9000B frames using single trial\
 | | ... | throughput test.
 | | ...
-| | [Tags] | 9000B | 1T1C | STHREAD
+| | [Tags] | 9000B | 1C
 | | ...
 | | [Template] | Check RR for IPv6 routing over SRv6 with endpoint to SR-unaware Service Function via masquerading proxy behaviour
 | | wt=1 | rxq=1 | framesize=${9000}
@@ -158,12 +158,12 @@
 | tc04-IMIX-1t1c-ethip6srhip6-ip6base-srv6proxy-masq-mrr
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv6 over SRv6 routing with masquerading SRv6 proxy\
-| | ... | 1 thread, 1 phy core, 1 receive queue per NIC port.
+| | ... | 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 IPv6 routing over SRv6 with endpoint to SR-unaware Service Function via masquerading proxy behaviour
 | | wt=1 | rxq=1 | framesize=IMIX_v4_1
@@ -171,11 +171,11 @@
 | tc05-78B-2t2c-ethip6srhip6-ip6base-srv6proxy-masq-mrr
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv6 over SRv6 routing with masquerading SRv6 proxy\
-| | ... | 2 threads, 2 phy cores, 1 receive queue per NIC port.
+| | ... | 2 phy cores, 1 receive queue per NIC port.
 | | ... | [Ver] Measure MaxReceivedRate for 78B frames using single trial\
 | | ... | throughput test.
 | | ...
-| | [Tags] | 78B | 2T2C | MTHREAD
+| | [Tags] | 78B | 2C
 | | ...
 | | [Template] | Check RR for IPv6 routing over SRv6 with endpoint to SR-unaware Service Function via masquerading proxy behaviour
 | | wt=2 | rxq=1 | framesize=${78}
@@ -183,11 +183,11 @@
 | tc06-1518B-2t2c-ethip6srhip6-ip6base-srv6proxy-masq-mrr
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv6 over SRv6 routing with masquerading SRv6 proxy\
-| | ... | 2 threads, 2 phy cores, 1 receive queue per NIC port.
+| | ... | 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 IPv6 routing over SRv6 with endpoint to SR-unaware Service Function via masquerading proxy behaviour
 | | wt=2 | rxq=1 | framesize=${1518}
@@ -195,11 +195,11 @@
 | tc07-9000B-2t2c-ethip6srhip6-ip6base-srv6proxy-masq-mrr
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv6 over SRv6 routing with masquerading SRv6 proxy\
-| | ... | 2 threads, 2 phy cores, 1 receive queue per NIC port.
+| | ... | 2 phy cores, 1 receive queue per NIC port.
 | | ... | [Ver] Measure MaxReceivedRate for 9000B frames using single trial\
 | | ... | throughput test.
 | | ...
-| | [Tags] | 9000B | 2T2C | MTHREAD
+| | [Tags] | 9000B | 2C
 | | ...
 | | [Template] | Check RR for IPv6 routing over SRv6 with endpoint to SR-unaware Service Function via masquerading proxy behaviour
 | | wt=2 | rxq=1 | framesize=${9000}
@@ -207,12 +207,12 @@
 | tc08-IMIX-2t2c-ethip6srhip6-ip6base-srv6proxy-masq-mrr
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv6 over SRv6 routing with masquerading SRv6 proxy\
-| | ... | 2 threads, 2 phy cores, 1 receive queue per NIC port.
+| | ... | 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 IPv6 routing over SRv6 with endpoint to SR-unaware Service Function via masquerading proxy behaviour
 | | wt=2 | rxq=1 | framesize=IMIX_v4_1
@@ -220,11 +220,11 @@
 | tc09-78B-4t4c-ethip6srhip6-ip6base-srv6proxy-masq-mrr
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv6 over SRv6 routing with masquerading SRv6 proxy\
-| | ... | 4 threads, 4 phy cores, 2 receive queues per NIC port.
+| | ... | 4 phy cores, 2 receive queues per NIC port.
 | | ... | [Ver] Measure MaxReceivedRate for 78B frames using single trial\
 | | ... | throughput test.
 | | ...
-| | [Tags] | 78B | 4T4C | MTHREAD
+| | [Tags] | 78B | 4C
 | | ...
 | | [Template] | Check RR for IPv6 routing over SRv6 with endpoint to SR-unaware Service Function via masquerading proxy behaviour
 | | wt=4 | rxq=2 | framesize=${78}
@@ -232,11 +232,11 @@
 | tc10-1518B-4t4c-ethip6srhip6-ip6base-srv6proxy-masq-mrr
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv6 over SRv6 routing with masquerading SRv6 proxy\
-| | ... | 4 threads, 4 phy cores, 2 receive queues per NIC port.
+| | ... | 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 IPv6 routing over SRv6 with endpoint to SR-unaware Service Function via masquerading proxy behaviour
 | | wt=4 | rxq=2 | framesize=${1518}
@@ -244,11 +244,11 @@
 | tc11-9000B-4t4c-ethip6srhip6-ip6base-srv6proxy-masq-mrr
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv6 over SRv6 routing with masquerading SRv6 proxy\
-| | ... | 4 threads, 4 phy cores, 2 receive queues per NIC port.
+| | ... | 4 phy cores, 2 receive queues per NIC port.
 | | ... | [Ver] Measure MaxReceivedRate for 9000B frames using single trial\
 | | ... | throughput test.
 | | ...
-| | [Tags] | 9000B | 4T4C | MTHREAD
+| | [Tags] | 9000B | 4C
 | | ...
 | | [Template] | Check RR for IPv6 routing over SRv6 with endpoint to SR-unaware Service Function via masquerading proxy behaviour
 | | wt=4 | rxq=2 | framesize=${9000}
@@ -256,12 +256,12 @@
 | tc12-IMIX-4t4c-ethip6srhip6-ip6base-srv6proxy-masq-mrr
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv6 over SRv6 routing with masquerading SRv6 proxy\
-| | ... | 4 threads, 4 phy cores, 2 receive queues per NIC port.
+| | ... | 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 IPv6 routing over SRv6 with endpoint to SR-unaware Service Function via masquerading proxy behaviour
 | | wt=4 | rxq=2 | framesize=IMIX_v4_1
diff --git a/tests/vpp/perf/srv6/10ge2p1x520-ethip6srhip6-ip6base-srv6proxy-masq-ndrpdrdisc.robot b/tests/vpp/perf/srv6/10ge2p1x520-ethip6srhip6-ip6base-srv6proxy-masq-ndrpdrdisc.robot
index 96e1f0e089..42be3f9f3f 100644
--- a/tests/vpp/perf/srv6/10ge2p1x520-ethip6srhip6-ip6base-srv6proxy-masq-ndrpdrdisc.robot
+++ b/tests/vpp/perf/srv6/10ge2p1x520-ethip6srhip6-ip6base-srv6proxy-masq-ndrpdrdisc.robot
@@ -136,11 +136,11 @@
 | tc01-78B-1t1c-ethip6srhip6-ip6base-srv6proxy-masq-ndrdisc
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv6 over SRv6 routing with masquerading SRv6 proxy\
-| | ... | config with 1 thread, 1 phy core, 1 receive queue per NIC port.
+| | ... | config with 1 phy core, 1 receive queue per NIC port.
 | | ... | [Ver] Find NDR for 78 Byte frames using binary search start at 10GE\
 | | ... | linerate, step 50kpps.
 | | ...
-| | [Tags] | 78B | 1T1C | STHREAD | NDRDISC
+| | [Tags] | 78B | 1C | NDRDISC
 | | ...
 | | [Template] | Discover NDR or PDR for IPv6 routing over SRv6 with endpoint to SR-unaware Service Function via masquerading proxy behaviour
 | | wt=1 | rxq=1 | framesize=${78} | min_rate=${50000} | search_type=NDR
@@ -148,11 +148,11 @@
 | tc02-78B-1t1c-ethip6srhip6-ip6base-srv6proxy-masq-pdrdisc
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv6 over SRv6 routing with masquerading SRv6 proxy\
-| | ... | config with 1 thread, 1 phy core, 1 receive queue per NIC port.
+| | ... | config with 1 phy core, 1 receive queue per NIC port.
 | | ... | [Ver] Find PDR for 78 Byte frames using binary search start at 10GE\
 | | ... | linerate, step 50kpps, LT=0.5%.
 | | ...
-| | [Tags] | 78B | 1T1C | STHREAD | PDRDISC | SKIP_PATCH
+| | [Tags] | 78B | 1C | PDRDISC | SKIP_PATCH
 | | ...
 | | [Template] | Discover NDR or PDR for IPv6 routing over SRv6 with endpoint to SR-unaware Service Function via masquerading proxy behaviour
 | | wt=1 | rxq=1 | framesize=${78} | min_rate=${50000} | search_type=PDR
@@ -160,11 +160,11 @@
 | tc03-78B-2t2c-ethip6srhip6-ip6base-srv6proxy-masq-ndrdisc
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv6 over SRv6 routing with masquerading SRv6 proxy\
-| | ... | config with 2 threads, 2 phy cores, 1 receive queue per NIC port.
+| | ... | config with 2 phy cores, 1 receive queue per NIC port.
 | | ... | [Ver] Find NDR for 78 Byte frames using binary search start at 10GE\
 | | ... | linerate, step 50kpps.
 | | ...
-| | [Tags] | 78B | 2T2C | MTHREAD | NDRDISC
+| | [Tags] | 78B | 2C | NDRDISC
 | | ...
 | | [Template] | Discover NDR or PDR for IPv6 routing over SRv6 with endpoint to SR-unaware Service Function via masquerading proxy behaviour
 | | wt=2 | rxq=1 | framesize=${78} | min_rate=${50000} | search_type=NDR
@@ -172,11 +172,11 @@
 | tc04-78B-2t2c-ethip6srhip6-ip6base-srv6proxy-masq-pdrdisc
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv6 over SRv6 routing with masquerading SRv6 proxy\
-| | ... | config with 2 threads, 2 phy cores, 1 receive queue per NIC port.
+| | ... | config with 2 phy cores, 1 receive queue per NIC port.
 | | ... | [Ver] Find PDR for 78 Byte frames using binary search start at 10GE\
 | | ... | linerate, step 50kpps, LT=0.5%.
 | | ...
-| | [Tags] | 78B | 2T2C | MTHREAD | PDRDISC | SKIP_PATCH
+| | [Tags] | 78B | 2C | PDRDISC | SKIP_PATCH
 | | ...
 | | [Template] | Discover NDR or PDR for IPv6 routing over SRv6 with endpoint to SR-unaware Service Function via masquerading proxy behaviour
 | | wt=2 | rxq=1 | framesize=${78} | min_rate=${50000} | search_type=PDR
@@ -184,11 +184,11 @@
 | tc05-78B-4t4c-ethip6srhip6-ip6base-srv6proxy-masq-ndrdisc
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv6 over SRv6 routing with masquerading SRv6 proxy\
-| | ... | config with 4 threads, 4 phy cores, 2 receive queues per NIC port.
+| | ... | config with 4 phy cores, 2 receive queues per NIC port.
 | | ... | [Ver] Find NDR for 78 Byte frames using binary search start at 10GE\
 | | ... | linerate, step 50kpps.
 | | ...
-| | [Tags] | 78B | 4T4C | MTHREAD | NDRDISC
+| | [Tags] | 78B | 4C | NDRDISC
 | | ...
 | | [Template] | Discover NDR or PDR for IPv6 routing over SRv6 with endpoint to SR-unaware Service Function via masquerading proxy behaviour
 | | wt=4 | rxq=2 | framesize=${78} | min_rate=${50000} | search_type=NDR
@@ -196,11 +196,11 @@
 | tc06-78B-4t4c-ethip6srhip6-ip6base-srv6proxy-masq-pdrdisc
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv6 over SRv6 routing with masquerading SRv6 proxy\
-| | ... | config with 4 threads, 4 phy cores, 2 receive queues per NIC port.
+| | ... | config with 4 phy cores, 2 receive queues per NIC port.
 | | ... | [Ver] Find PDR for 78 Byte frames using binary search start at 10GE\
 | | ... | linerate, step 50kpps, LT=0.5%.
 | | ...
-| | [Tags] | 78B | 4T4C | MTHREAD | PDRDISC | SKIP_PATCH
+| | [Tags] | 78B | 4C | PDRDISC | SKIP_PATCH
 | | ...
 | | [Template] | Discover NDR or PDR for IPv6 routing over SRv6 with endpoint to SR-unaware Service Function via masquerading proxy behaviour
 | | wt=4 | rxq=2 | framesize=${78} | min_rate=${50000} | search_type=PDR
@@ -208,11 +208,11 @@
 | tc07-1518B-1t1c-ethip6srhip6-ip6base-srv6proxy-masq-ndrdisc
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv6 over SRv6 routing with masquerading SRv6 proxy\
-| | ... | config with 1 thread, 1 phy core, 1 receive queue per NIC port.
+| | ... | config with 1 phy core, 1 receive queue per NIC port.
 | | ... | [Ver] Find NDR for 1518 Byte frames using binary search start at 10GE\
 | | ... | linerate, step 50kpps.
 | | ...
-| | [Tags] | 1518B | 1T1C | STHREAD | NDRDISC
+| | [Tags] | 1518B | 1C | NDRDISC
 | | ...
 | | [Template] | Discover NDR or PDR for IPv6 routing over SRv6 with endpoint to SR-unaware Service Function via masquerading proxy behaviour
 | | wt=1 | rxq=1 | framesize=${1518} | min_rate=${50000} | search_type=NDR
@@ -220,11 +220,11 @@
 | tc08-1518B-1t1c-ethip6srhip6-ip6base-srv6proxy-masq-pdrdisc
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv6 over SRv6 routing with masquerading SRv6 proxy\
-| | ... | config with 1 thread, 1 phy core, 1 receive queue per NIC port.
+| | ... | config with 1 phy core, 1 receive queue per NIC port.
 | | ... | [Ver] Find PDR for 1518 Byte frames using binary search start at 10GE\
 | | ... | linerate, step 50kpps, LT=0.5%.
 | | ...
-| | [Tags] | 1518B | 1T1C | STHREAD | PDRDISC | SKIP_PATCH
+| | [Tags] | 1518B | 1C | PDRDISC | SKIP_PATCH
 | | ...
 | | [Template] | Discover NDR or PDR for IPv6 routing over SRv6 with endpoint to SR-unaware Service Function via masquerading proxy behaviour
 | | wt=1 | rxq=1 | framesize=${1518} | min_rate=${50000} | search_type=PDR
@@ -232,11 +232,11 @@
 | tc09-1518B-2t2c-ethip6srhip6-ip6base-srv6proxy-masq-ndrdisc
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv6 over SRv6 routing with masquerading SRv6 proxy\
-| | ... | config with 2 threads, 2 phy cores, 1 receive queue per NIC port.
+| | ... | config with 2 phy cores, 1 receive queue per NIC port.
 | | ... | [Ver] Find NDR for 1518 Byte frames using binary search start at 10GE\
 | | ... | linerate, step 50kpps.
 | | ...
-| | [Tags] | 1518B | 2T2C | MTHREAD | NDRDISC
+| | [Tags] | 1518B | 2C | NDRDISC
 | | ...
 | | [Template] | Discover NDR or PDR for IPv6 routing over SRv6 with endpoint to SR-unaware Service Function via masquerading proxy behaviour
 | | wt=2 | rxq=1 | framesize=${1518} | min_rate=${50000} | search_type=NDR
@@ -244,11 +244,11 @@
 | tc10-1518B-2t2c-ethip6srhip6-ip6base-srv6proxy-masq-pdrdisc
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv6 over SRv6 routing with masquerading SRv6 proxy\
-| | ... | config with 2 threads, 2 phy cores, 1 receive queue per NIC port.
+| | ... | config with 2 phy cores, 1 receive queue per NIC port.
 | | ... | [Ver] Find PDR for 1518 Byte frames using binary search start at 10GE\
 | | ... | linerate, step 50kpps, LT=0.5%.
 | | ...
-| | [Tags] | 1518B | 2T2C | MTHREAD | PDRDISC | SKIP_PATCH
+| | [Tags] | 1518B | 2C | PDRDISC | SKIP_PATCH
 | | ...
 | | [Template] | Discover NDR or PDR for IPv6 routing over SRv6 with endpoint to SR-unaware Service Function via masquerading proxy behaviour
 | | wt=2 | rxq=1 | framesize=${1518} | min_rate=${50000} | search_type=PDR
@@ -256,11 +256,11 @@
 | tc11-1518B-4t4c-ethip6srhip6-ip6base-srv6proxy-masq-ndrdisc
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv6 over SRv6 routing with masquerading SRv6 proxy\
-| | ... | config with 4 threads, 4 phy cores, 2 receive queues per NIC port.
+| | ... | config with 4 phy cores, 2 receive queues per NIC port.
 | | ... | [Ver] Find NDR for 1518 Byte frames using binary search start at 10GE\
 | | ... | linerate, step 50kpps.
 | | ...
-| | [Tags] | 1518B | 4T4C | MTHREAD | NDRDISC
+| | [Tags] | 1518B | 4C | NDRDISC
 | | ...
 | | [Template] | Discover NDR or PDR for IPv6 routing over SRv6 with endpoint to SR-unaware Service Function via masquerading proxy behaviour
 | | wt=4 | rxq=2 | framesize=${1518} | min_rate=${50000} | search_type=NDR
@@ -268,11 +268,11 @@
 | tc12-1518B-4t4c-ethip6srhip6-ip6base-srv6proxy-masq-pdrdisc
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv6 over SRv6 routing with masquerading SRv6 proxy\
-| | ... | config with 4 threads, 4 phy cores, 2 receive queues per NIC port.
+| | ... | config with 4 phy cores, 2 receive queues per NIC port.
 | | ... | [Ver] Find PDR for 1518 Byte frames using binary search start at 10GE\
 | | ... | linerate, step 50kpps, LT=0.5%.
 | | ...
-| | [Tags] | 1518B | 4T4C | MTHREAD | PDRDISC | SKIP_PATCH
+| | [Tags] | 1518B | 4C | PDRDISC | SKIP_PATCH
 | | ...
 | | [Template] | Discover NDR or PDR for IPv6 routing over SRv6 with endpoint to SR-unaware Service Function via masquerading proxy behaviour
 | | wt=4 | rxq=2 | framesize=${1518} | min_rate=${50000} | search_type=PDR
diff --git a/tests/vpp/perf/srv6/10ge2p1x520-ethip6srhip6-ip6base-srv6proxy-stat-mrr.robot b/tests/vpp/perf/srv6/10ge2p1x520-ethip6srhip6-ip6base-srv6proxy-stat-mrr.robot
index 437e26c35b..d1d40f7121 100644
--- a/tests/vpp/perf/srv6/10ge2p1x520-ethip6srhip6-ip6base-srv6proxy-stat-mrr.robot
+++ b/tests/vpp/perf/srv6/10ge2p1x520-ethip6srhip6-ip6base-srv6proxy-stat-mrr.robot
@@ -122,11 +122,11 @@
 | tc01-78B-1t1c-ethip6srhip6-ip6base-srv6proxy-stat-mrr
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv6 over SRv6 routing with static SRv6 proxy config\
-| | ... | 1 thread, 1 phy core, 1 receive queue per NIC port.
+| | ... | 1 phy core, 1 receive queue per NIC port.
 | | ... | [Ver] Measure MaxReceivedRate for 78B frames using single trial\
 | | ... | throughput test.
 | | ...
-| | [Tags] | 78B | 1T1C | STHREAD
+| | [Tags] | 78B | 1C
 | | ...
 | | [Template] | Check RR for IPv6 routing over SRv6 with endpoint to SR-unaware Service Function via static proxy behaviour
 | | wt=1 | rxq=1 | framesize=${78}
@@ -134,11 +134,11 @@
 | tc02-1518B-1t1c-ethip6srhip6-ip6base-srv6proxy-stat-mrr
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv6 over SRv6 routing with static SRv6 proxy config\
-| | ... | 1 thread, 1 phy core, 1 receive queue per NIC port.
+| | ... | 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 IPv6 routing over SRv6 with endpoint to SR-unaware Service Function via static proxy behaviour
 | | wt=1 | rxq=1 | framesize=${1518}
@@ -146,11 +146,11 @@
 | tc03-9000B-1t1c-ethip6srhip6-ip6base-srv6proxy-stat-mrr
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv6 over SRv6 routing with static SRv6 proxy config\
-| | ... | 1 thread, 1 phy core, 1 receive queue per NIC port.
+| | ... | 1 phy core, 1 receive queue per NIC port.
 | | ... | [Ver] Measure MaxReceivedRate for 9000B frames using single trial\
 | | ... | throughput test.
 | | ...
-| | [Tags] | 9000B | 1T1C | STHREAD
+| | [Tags] | 9000B | 1C
 | | ...
 | | [Template] | Check RR for IPv6 routing over SRv6 with endpoint to SR-unaware Service Function via static proxy behaviour
 | | wt=1 | rxq=1 | framesize=${9000}
@@ -158,12 +158,12 @@
 | tc04-IMIX-1t1c-ethip6srhip6-ip6base-srv6proxy-stat-mrr
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv6 over SRv6 routing with static SRv6 proxy config\
-| | ... | 1 thread, 1 phy core, 1 receive queue per NIC port.
+| | ... | 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 IPv6 routing over SRv6 with endpoint to SR-unaware Service Function via static proxy behaviour
 | | wt=1 | rxq=1 | framesize=IMIX_v4_1
@@ -171,11 +171,11 @@
 | tc05-78B-2t2c-ethip6srhip6-ip6base-srv6proxy-stat-mrr
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv6 over SRv6 routing with static SRv6 proxy config\
-| | ... | 2 threads, 2 phy cores, 1 receive queue per NIC port.
+| | ... | 2 phy cores, 1 receive queue per NIC port.
 | | ... | [Ver] Measure MaxReceivedRate for 78B frames using single trial\
 | | ... | throughput test.
 | | ...
-| | [Tags] | 78B | 2T2C | MTHREAD
+| | [Tags] | 78B | 2C
 | | ...
 | | [Template] | Check RR for IPv6 routing over SRv6 with endpoint to SR-unaware Service Function via static proxy behaviour
 | | wt=2 | rxq=1 | framesize=${78}
@@ -183,11 +183,11 @@
 | tc06-1518B-2t2c-ethip6srhip6-ip6base-srv6proxy-stat-mrr
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv6 over SRv6 routing with static SRv6 proxy config\
-| | ... | 2 threads, 2 phy cores, 1 receive queue per NIC port.
+| | ... | 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 IPv6 routing over SRv6 with endpoint to SR-unaware Service Function via static proxy behaviour
 | | wt=2 | rxq=1 | framesize=${1518}
@@ -195,11 +195,11 @@
 | tc07-9000B-2t2c-ethip6srhip6-ip6base-srv6proxy-stat-mrr
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv6 over SRv6 routing with static SRv6 proxy config\
-| | ... | 2 threads, 2 phy cores, 1 receive queue per NIC port.
+| | ... | 2 phy cores, 1 receive queue per NIC port.
 | | ... | [Ver] Measure MaxReceivedRate for 9000B frames using single trial\
 | | ... | throughput test.
 | | ...
-| | [Tags] | 9000B | 2T2C | MTHREAD
+| | [Tags] | 9000B | 2C
 | | ...
 | | [Template] | Check RR for IPv6 routing over SRv6 with endpoint to SR-unaware Service Function via static proxy behaviour
 | | wt=2 | rxq=1 | framesize=${9000}
@@ -207,12 +207,12 @@
 | tc08-IMIX-2t2c-ethip6srhip6-ip6base-srv6proxy-stat-mrr
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv6 over SRv6 routing with static SRv6 proxy config\
-| | ... | 2 threads, 2 phy cores, 1 receive queue per NIC port.
+| | ... | 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 IPv6 routing over SRv6 with endpoint to SR-unaware Service Function via static proxy behaviour
 | | wt=2 | rxq=1 | framesize=IMIX_v4_1
@@ -220,11 +220,11 @@
 | tc09-78B-4t4c-ethip6srhip6-ip6base-srv6proxy-stat-mrr
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv6 over SRv6 routing with static SRv6 proxy config\
-| | ... | 4 threads, 4 phy cores, 2 receive queues per NIC port.
+| | ... | 4 phy cores, 2 receive queues per NIC port.
 | | ... | [Ver] Measure MaxReceivedRate for 78B frames using single trial\
 | | ... | throughput test.
 | | ...
-| | [Tags] | 78B | 4T4C | MTHREAD
+| | [Tags] | 78B | 4C
 | | ...
 | | [Template] | Check RR for IPv6 routing over SRv6 with endpoint to SR-unaware Service Function via static proxy behaviour
 | | wt=4 | rxq=2 | framesize=${78}
@@ -232,11 +232,11 @@
 | tc10-1518B-4t4c-ethip6srhip6-ip6base-srv6proxy-stat-mrr
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv6 over SRv6 routing with static SRv6 proxy config\
-| | ... | 4 threads, 4 phy cores, 2 receive queues per NIC port.
+| | ... | 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 IPv6 routing over SRv6 with endpoint to SR-unaware Service Function via static proxy behaviour
 | | wt=4 | rxq=2 | framesize=${1518}
@@ -244,11 +244,11 @@
 | tc11-9000B-4t4c-ethip6srhip6-ip6base-srv6proxy-stat-mrr
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv6 over SRv6 routing with static SRv6 proxy config\
-| | ... | 4 threads, 4 phy cores, 2 receive queues per NIC port.
+| | ... | 4 phy cores, 2 receive queues per NIC port.
 | | ... | [Ver] Measure MaxReceivedRate for 9000B frames using single trial\
 | | ... | throughput test.
 | | ...
-| | [Tags] | 9000B | 4T4C | MTHREAD
+| | [Tags] | 9000B | 4C
 | | ...
 | | [Template] | Check RR for IPv6 routing over SRv6 with endpoint to SR-unaware Service Function via static proxy behaviour
 | | wt=4 | rxq=2 | framesize=${9000}
@@ -256,12 +256,12 @@
 | tc12-IMIX-4t4c-ethip6srhip6-ip6base-srv6proxy-stat-mrr
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv6 over SRv6 routing with static SRv6 proxy config\
-| | ... | 4 threads, 4 phy cores, 2 receive queues per NIC port.
+| | ... | 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 IPv6 routing over SRv6 with endpoint to SR-unaware Service Function via static proxy behaviour
 | | wt=4 | rxq=2 | framesize=IMIX_v4_1
diff --git a/tests/vpp/perf/srv6/10ge2p1x520-ethip6srhip6-ip6base-srv6proxy-stat-ndrpdrdisc.robot b/tests/vpp/perf/srv6/10ge2p1x520-ethip6srhip6-ip6base-srv6proxy-stat-ndrpdrdisc.robot
index 1081bfc0e5..5d42cd2555 100644
--- a/tests/vpp/perf/srv6/10ge2p1x520-ethip6srhip6-ip6base-srv6proxy-stat-ndrpdrdisc.robot
+++ b/tests/vpp/perf/srv6/10ge2p1x520-ethip6srhip6-ip6base-srv6proxy-stat-ndrpdrdisc.robot
@@ -136,11 +136,11 @@
 | tc01-78B-1t1c-ethip6srhip6-ip6base-srv6proxy-stat-ndrdisc
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv6 over SRv6 routing with static SRv6 proxy config\
-| | ... | 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 78 Byte frames using binary search start at 10GE\
 | | ... | linerate, step 50kpps.
 | | ...
-| | [Tags] | 78B | 1T1C | STHREAD | NDRDISC
+| | [Tags] | 78B | 1C | NDRDISC
 | | ...
 | | [Template] | Discover NDR or PDR for IPv6 routing over SRv6 with endpoint to SR-unaware Service Function via static proxy behaviour
 | | wt=1 | rxq=1 | framesize=${78} | min_rate=${50000} | search_type=NDR
@@ -148,11 +148,11 @@
 | tc02-78B-1t1c-ethip6srhip6-ip6base-srv6proxy-stat-pdrdisc
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv6 over SRv6 routing with static SRv6 proxy config\
-| | ... | 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 78 Byte frames using binary search start at 10GE\
 | | ... | linerate, step 50kpps, LT=0.5%.
 | | ...
-| | [Tags] | 78B | 1T1C | STHREAD | PDRDISC | SKIP_PATCH
+| | [Tags] | 78B | 1C | PDRDISC | SKIP_PATCH
 | | ...
 | | [Template] | Discover NDR or PDR for IPv6 routing over SRv6 with endpoint to SR-unaware Service Function via static proxy behaviour
 | | wt=1 | rxq=1 | framesize=${78} | min_rate=${50000} | search_type=PDR
@@ -160,11 +160,11 @@
 | tc03-78B-2t2c-ethip6srhip6-ip6base-srv6proxy-stat-ndrdisc
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv6 over SRv6 routing with static SRv6 proxy config\
-| | ... | with 2 threads, 2 phy cores, 1 receive queue per NIC port.
+| | ... | with 2 phy cores, 1 receive queue per NIC port.
 | | ... | [Ver] Find NDR for 78 Byte frames using binary search start at 10GE\
 | | ... | linerate, step 50kpps.
 | | ...
-| | [Tags] | 78B | 2T2C | MTHREAD | NDRDISC
+| | [Tags] | 78B | 2C | NDRDISC
 | | ...
 | | [Template] | Discover NDR or PDR for IPv6 routing over SRv6 with endpoint to SR-unaware Service Function via static proxy behaviour
 | | wt=2 | rxq=1 | framesize=${78} | min_rate=${50000} | search_type=NDR
@@ -172,11 +172,11 @@
 | tc04-78B-2t2c-ethip6srhip6-ip6base-srv6proxy-stat-pdrdisc
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv6 over SRv6 routing with static SRv6 proxy config\
-| | ... | with 2 threads, 2 phy cores, 1 receive queue per NIC port.
+| | ... | with 2 phy cores, 1 receive queue per NIC port.
 | | ... | [Ver] Find PDR for 78 Byte frames using binary search start at 10GE\
 | | ... | linerate, step 50kpps, LT=0.5%.
 | | ...
-| | [Tags] | 78B | 2T2C | MTHREAD | PDRDISC | SKIP_PATCH
+| | [Tags] | 78B | 2C | PDRDISC | SKIP_PATCH
 | | ...
 | | [Template] | Discover NDR or PDR for IPv6 routing over SRv6 with endpoint to SR-unaware Service Function via static proxy behaviour
 | | wt=2 | rxq=1 | framesize=${78} | min_rate=${50000} | search_type=PDR
@@ -184,11 +184,11 @@
 | tc05-78B-4t4c-ethip6srhip6-ip6base-srv6proxy-stat-ndrdisc
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv6 over SRv6 routing with static SRv6 proxy config\
-| | ... | with 4 threads, 4 phy cores, 2 receive queues per NIC port.
+| | ... | with 4 phy cores, 2 receive queues per NIC port.
 | | ... | [Ver] Find NDR for 78 Byte frames using binary search start at 10GE\
 | | ... | linerate, step 50kpps.
 | | ...
-| | [Tags] | 78B | 4T4C | MTHREAD | NDRDISC
+| | [Tags] | 78B | 4C | NDRDISC
 | | ...
 | | [Template] | Discover NDR or PDR for IPv6 routing over SRv6 with endpoint to SR-unaware Service Function via static proxy behaviour
 | | wt=4 | rxq=2 | framesize=${78} | min_rate=${50000} | search_type=NDR
@@ -196,11 +196,11 @@
 | tc06-78B-4t4c-ethip6srhip6-ip6base-srv6proxy-stat-pdrdisc
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv6 over SRv6 routing with static SRv6 proxy config\
-| | ... | with 4 threads, 4 phy cores, 2 receive queues per NIC port.
+| | ... | with 4 phy cores, 2 receive queues per NIC port.
 | | ... | [Ver] Find PDR for 78 Byte frames using binary search start at 10GE\
 | | ... | linerate, step 50kpps, LT=0.5%.
 | | ...
-| | [Tags] | 78B | 4T4C | MTHREAD | PDRDISC | SKIP_PATCH
+| | [Tags] | 78B | 4C | PDRDISC | SKIP_PATCH
 | | ...
 | | [Template] | Discover NDR or PDR for IPv6 routing over SRv6 with endpoint to SR-unaware Service Function via static proxy behaviour
 | | wt=4 | rxq=2 | framesize=${78} | min_rate=${50000} | search_type=PDR
@@ -208,11 +208,11 @@
 | tc07-1518B-1t1c-ethip6srhip6-ip6base-srv6proxy-stat-ndrdisc
 | | [Documentation]
 | | ... | [[Cfg] DUT runs IPv6 over SRv6 routing with static SRv6 proxy config\
-| | ... | 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 10GE\
 | | ... | linerate, step 50kpps.
 | | ...
-| | [Tags] | 1518B | 1T1C | STHREAD | NDRDISC
+| | [Tags] | 1518B | 1C | NDRDISC
 | | ...
 | | [Template] | Discover NDR or PDR for IPv6 routing over SRv6 with endpoint to SR-unaware Service Function via static proxy behaviour
 | | wt=1 | rxq=1 | framesize=${1518} | min_rate=${50000} | search_type=NDR
@@ -220,11 +220,11 @@
 | tc08-1518B-1t1c-ethip6srhip6-ip6base-srv6proxy-stat-pdrdisc
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv6 over SRv6 routing with static SRv6 proxy config\
-| | ... | 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 10GE\
 | | ... | linerate, step 50kpps, LT=0.5%.
 | | ...
-| | [Tags] | 1518B | 1T1C | STHREAD | PDRDISC | SKIP_PATCH
+| | [Tags] | 1518B | 1C | PDRDISC | SKIP_PATCH
 | | ...
 | | [Template] | Discover NDR or PDR for IPv6 routing over SRv6 with endpoint to SR-unaware Service Function via static proxy behaviour
 | | wt=1 | rxq=1 | framesize=${1518} | min_rate=${50000} | search_type=PDR
@@ -232,11 +232,11 @@
 | tc09-1518B-2t2c-ethip6srhip6-ip6base-srv6proxy-stat-ndrdisc
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv6 over SRv6 routing with static SRv6 proxy config\
-| | ... | with 2 threads, 2 phy cores, 1 receive queue per NIC port.
+| | ... | with 2 phy cores, 1 receive queue per NIC port.
 | | ... | [Ver] Find NDR for 1518 Byte frames using binary search start at 10GE\
 | | ... | linerate, step 50kpps.
 | | ...
-| | [Tags] | 1518B | 2T2C | MTHREAD | NDRDISC
+| | [Tags] | 1518B | 2C | NDRDISC
 | | ...
 | | [Template] | Discover NDR or PDR for IPv6 routing over SRv6 with endpoint to SR-unaware Service Function via static proxy behaviour
 | | wt=2 | rxq=1 | framesize=${1518} | min_rate=${50000} | search_type=NDR
@@ -244,11 +244,11 @@
 | tc10-1518B-2t2c-ethip6srhip6-ip6base-srv6proxy-stat-pdrdisc
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv6 over SRv6 routing with static SRv6 proxy config\
-| | ... | with 2 threads, 2 phy cores, 1 receive queue per NIC port.
+| | ... | with 2 phy cores, 1 receive queue per NIC port.
 | | ... | [Ver] Find PDR for 1518 Byte frames using binary search start at 10GE\
 | | ... | linerate, step 50kpps, LT=0.5%.
 | | ...
-| | [Tags] | 1518B | 2T2C | MTHREAD | PDRDISC | SKIP_PATCH
+| | [Tags] | 1518B | 2C | PDRDISC | SKIP_PATCH
 | | ...
 | | [Template] | Discover NDR or PDR for IPv6 routing over SRv6 with endpoint to SR-unaware Service Function via static proxy behaviour
 | | wt=2 | rxq=1 | framesize=${1518} | min_rate=${50000} | search_type=PDR
@@ -256,11 +256,11 @@
 | tc11-1518B-4t4c-ethip6srhip6-ip6base-srv6proxy-stat-ndrdisc
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv6 over SRv6 routing with static SRv6 proxy config\
-| | ... | with 4 threads, 4 phy cores, 2 receive queues per NIC port.
+| | ... | with 4 phy cores, 2 receive queues per NIC port.
 | | ... | [Ver] Find NDR for 1518 Byte frames using binary search start at 10GE\
 | | ... | linerate, step 50kpps.
 | | ...
-| | [Tags] | 1518B | 4T4C | MTHREAD | NDRDISC
+| | [Tags] | 1518B | 4C | NDRDISC
 | | ...
 | | [Template] | Discover NDR or PDR for IPv6 routing over SRv6 with endpoint to SR-unaware Service Function via static proxy behaviour
 | | wt=4 | rxq=2 | framesize=${1518} | min_rate=${50000} | search_type=NDR
@@ -268,11 +268,11 @@
 | tc12-1518B-4t4c-ethip6srhip6-ip6base-srv6proxy-stat-pdrdisc
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv6 over SRv6 routing with static SRv6 proxy config\
-| | ... | with 4 threads, 4 phy cores, 2 receive queues per NIC port.
+| | ... | with 4 phy cores, 2 receive queues per NIC port.
 | | ... | [Ver] Find PDR for 1518 Byte frames using binary search start at 10GE\
 | | ... | linerate, step 50kpps, LT=0.5%.
 | | ...
-| | [Tags] | 1518B | 4T4C | MTHREAD | PDRDISC | SKIP_PATCH
+| | [Tags] | 1518B | 4C | PDRDISC | SKIP_PATCH
 | | ...
 | | [Template] | Discover NDR or PDR for IPv6 routing over SRv6 with endpoint to SR-unaware Service Function via static proxy behaviour
 | | wt=4 | rxq=2 | framesize=${1518} | min_rate=${50000} | search_type=PDR