SKIP_PATCH for all PDR tests instead of NDR

Main motivation for this change is the latency reporting
for jobs skipping SKIP_PATCH tests.

Change-Id: I529002549247e76309bd405550d48c35a21e1c01
Signed-off-by: pmikus <pmikus@cisco.com>

5 files changed, 130 insertions, 78 deletions

diff --git a/tests/perf/Long_Bridge_Domain_Intel-X520-DA2.robot b/tests/perf/Long_Bridge_Domain_Intel-X520-DA2.robot
index 113547b190..9cdb3a687a 100644
--- a/tests/perf/Long_Bridge_Domain_Intel-X520-DA2.robot
+++ b/tests/perf/Long_Bridge_Domain_Intel-X520-DA2.robot
@@ -322,7 +322,7 @@
 | | ... | [Cfg] DUT runs L2BD switching config with 4 threads, 4 phy cores, \
 | | ... | 2 receive queues per NIC port. [Ver] Find NDR for 64 Byte frames
 | | ... | using binary search start at 10GE linerate, step 100kpps.
-| | [Tags] | 4_THREAD_NOHTT_RXQUEUES_2 | MULTI_THREAD | NDR | SKIP_PATCH
+| | [Tags] | 4_THREAD_NOHTT_RXQUEUES_2 | MULTI_THREAD | NDR
 | | ${framesize}= | Set Variable | 64
 | | ${min_rate}= | Set Variable | 100000
 | | ${max_rate}= | Set Variable | ${10Ge_linerate_pps_64B}
@@ -368,7 +368,7 @@
 | | ... | [Cfg] DUT runs L2BD switching config with 4 threads, 4 phy cores, \
 | | ... | 2 receive queues per NIC port. [Ver] Find NDR for 1518 Byte frames
 | | ... | using binary search start at 10GE linerate, step 10kpps.
-| | [Tags] | 4_THREAD_NOHTT_RXQUEUES_2 | MULTI_THREAD | NDR
+| | [Tags] | 4_THREAD_NOHTT_RXQUEUES_2 | MULTI_THREAD | NDR | SKIP_PATCH
 | | ${framesize}= | Set Variable | 1518
 | | ${min_rate}= | Set Variable | 10000
 | | ${max_rate}= | Set Variable | ${10Ge_linerate_pps_1518B}
diff --git a/tests/perf/Long_Bridge_Domain_Vhost_Intel-X520-DA2.robot b/tests/perf/Long_Bridge_Domain_Vhost_Intel-X520-DA2.robot
index 4f50a69778..b5f52381b2 100644
--- a/tests/perf/Long_Bridge_Domain_Vhost_Intel-X520-DA2.robot
+++ b/tests/perf/Long_Bridge_Domain_Vhost_Intel-X520-DA2.robot
@@ -66,7 +66,7 @@
 | | ... | [Cfg] DUT runs L2BD switching config with 1 thread, 1 phy core, \
 | | ... | 1 receive queue per NIC port. [Ver] Find NDR for 64 Byte frames
 | | ... | using binary search start at 10GE linerate, step 10kpps.
-| | [Tags] | 1_THREAD_NOHTT_RXQUEUES_1 | SINGLE_THREAD | NDR | SKIP_PATCH
+| | [Tags] | 1_THREAD_NOHTT_RXQUEUES_1 | SINGLE_THREAD | NDR
 | | ${framesize}= | Set Variable | 64
 | | ${min_rate}= | Set Variable | 10000
 | | ${max_rate}= | Set Variable | ${10Ge_linerate_pps_64B}
@@ -97,7 +97,7 @@
 | | ... | [Cfg] DUT runs L2BD switching config with 1 thread, 1 phy core, \
 | | ... | 1 receive queue per NIC port. [Ver] Find PDR for 64 Byte frames
 | | ... | using binary search start at 10GE linerate, step 10kpps, LT=0.5%.
-| | [Tags] | 1_THREAD_NOHTT_RXQUEUES_1 | SINGLE_THREAD | PDR
+| | [Tags] | 1_THREAD_NOHTT_RXQUEUES_1 | SINGLE_THREAD | PDR | SKIP_PATCH
 | | ${framesize}= | Set Variable | 64
 | | ${min_rate}= | Set Variable | 10000
 | | ${max_rate}= | Set Variable | ${10Ge_linerate_pps_64B}
@@ -130,7 +130,7 @@
 | | ... | [Cfg] DUT runs L2BD switching config with 1 thread, 1 phy core, \
 | | ... | 1 receive queue per NIC port. [Ver] Find NDR for 1518 Byte frames
 | | ... | using binary search start at 10GE linerate, step 10kpps.
-| | [Tags] | 1_THREAD_NOHTT_RXQUEUES_1 | SINGLE_THREAD | NDR | SKIP_PATCH
+| | [Tags] | 1_THREAD_NOHTT_RXQUEUES_1 | SINGLE_THREAD | NDR
 | | ${framesize}= | Set Variable | 1518
 | | ${min_rate}= | Set Variable | 10000
 | | ${max_rate}= | Set Variable | ${10Ge_linerate_pps_1518B}
@@ -161,7 +161,7 @@
 | | ... | [Cfg] DUT runs L2BD switching config with 1 thread, 1 phy core, \
 | | ... | 1 receive queue per NIC port. [Ver] Find PDR for 1518 Byte frames
 | | ... | using binary search start at 10GE linerate, step 10kpps, LT=0.5%.
-| | [Tags] | 1_THREAD_NOHTT_RXQUEUES_1 | SINGLE_THREAD | PDR
+| | [Tags] | 1_THREAD_NOHTT_RXQUEUES_1 | SINGLE_THREAD | PDR | SKIP_PATCH
 | | ${framesize}= | Set Variable | 1518
 | | ${min_rate}= | Set Variable | 10000
 | | ${max_rate}= | Set Variable | ${10Ge_linerate_pps_1518B}
@@ -195,7 +195,7 @@
 | | ... | 1 receive queue per NIC port. [Ver] Find NDR for IMIX_v4_1 frame size
 | | ... | using binary search start at 10GE linerate, step 5kpps.
 | | ... | IMIX_v4_1 = (28x64B;16x570B;4x1518B)
-| | [Tags] | 1_THREAD_NOHTT_RXQUEUES_1 | SINGLE_THREAD | NDR | SKIP_PATCH
+| | [Tags] | 1_THREAD_NOHTT_RXQUEUES_1 | SINGLE_THREAD | NDR
 | | ${framesize}= | Set Variable | IMIX_v4_1
 | | ${min_rate}= | Set Variable | 5000
 | | ${max_rate}= | Set Variable | ${10Ge_linerate_pps_IMIX_v4_1}
@@ -227,7 +227,7 @@
 | | ... | 1 receive queue per NIC port. [Ver] Find PDR for IMIX_v4_1 frame size
 | | ... | using binary search start at 10GE linerate, step 5kpps, LT=0.5%.
 | | ... | IMIX_v4_1 = (28x64B;16x570B;4x1518B)
-| | [Tags] | 1_THREAD_NOHTT_RXQUEUES_1 | SINGLE_THREAD | PDR
+| | [Tags] | 1_THREAD_NOHTT_RXQUEUES_1 | SINGLE_THREAD | PDR | SKIP_PATCH
 | | ${framesize}= | Set Variable | IMIX_v4_1
 | | ${min_rate}= | Set Variable | 5000
 | | ${max_rate}= | Set Variable | ${10Ge_linerate_pps_IMIX_v4_1}
@@ -259,7 +259,7 @@
 | | ... | [Cfg] DUT runs L2BD switching config with 2 threads, 2 phy cores, \
 | | ... | 1 receive queue per NIC port. [Ver] Find NDR for 64 Byte frames
 | | ... | using binary search start at 10GE linerate, step 10kpps.
-| | [Tags] | 2_THREAD_NOHTT_RXQUEUES_1 | MULTI_THREAD | NDR | SKIP_PATCH
+| | [Tags] | 2_THREAD_NOHTT_RXQUEUES_1 | MULTI_THREAD | NDR
 | | ${framesize}= | Set Variable | 64
 | | ${min_rate}= | Set Variable | 10000
 | | ${max_rate}= | Set Variable | ${10Ge_linerate_pps_64B}
@@ -290,7 +290,7 @@
 | | ... | [Cfg] DUT runs L2BD switching config with 2 threads, 2 phy cores, \
 | | ... | 1 receive queue per NIC port. [Ver] Find PDR for 64 Byte frames
 | | ... | using binary search start at 10GE linerate, step 10kpps, LT=0.5%.
-| | [Tags] | 2_THREAD_NOHTT_RXQUEUES_1 | MULTI_THREAD | PDR
+| | [Tags] | 2_THREAD_NOHTT_RXQUEUES_1 | MULTI_THREAD | PDR | SKIP_PATCH
 | | ${framesize}= | Set Variable | 64
 | | ${min_rate}= | Set Variable | 10000
 | | ${max_rate}= | Set Variable | ${10Ge_linerate_pps_64B}
@@ -453,7 +453,7 @@
 | | ... | [Cfg] DUT runs L2BD switching config with 4 threads, 4 phy cores, \
 | | ... | 2 receive queues per NIC port. [Ver] Find NDR for 64 Byte frames
 | | ... | using binary search start at 10GE linerate, step 10kpps.
-| | [Tags] | 4_THREAD_NOHTT_RXQUEUES_2 | MULTI_THREAD | NDR | SKIP_PATCH
+| | [Tags] | 4_THREAD_NOHTT_RXQUEUES_2 | MULTI_THREAD | NDR
 | | ${framesize}= | Set Variable | 64
 | | ${min_rate}= | Set Variable | 10000
 | | ${max_rate}= | Set Variable | ${10Ge_linerate_pps_64B}
@@ -484,7 +484,7 @@
 | | ... | [Cfg] DUT runs L2BD switching config with 4 threads, 4 phy cores, \
 | | ... | 2 receive queues per NIC port. [Ver] Find PDR for 64 Byte frames
 | | ... | using binary search start at 10GE linerate, step 10kpps, LT=0.5%.
-| | [Tags] | 4_THREAD_NOHTT_RXQUEUES_2 | MULTI_THREAD | PDR
+| | [Tags] | 4_THREAD_NOHTT_RXQUEUES_2 | MULTI_THREAD | PDR | SKIP_PATCH
 | | ${framesize}= | Set Variable | 64
 | | ${min_rate}= | Set Variable | 10000
 | | ${max_rate}= | Set Variable | ${10Ge_linerate_pps_64B}
diff --git a/tests/perf/Long_IPv4_Vhost_Intel-X520-DA2.robot b/tests/perf/Long_IPv4_Vhost_Intel-X520-DA2.robot
index 2370780b91..97855b6bd9 100644
--- a/tests/perf/Long_IPv4_Vhost_Intel-X520-DA2.robot
+++ b/tests/perf/Long_IPv4_Vhost_Intel-X520-DA2.robot
@@ -66,7 +66,7 @@
 | | ... | [Cfg] DUT runs IPv4 routing config with 1 thread, 1 phy core, \
 | | ... | 1 receive queue per NIC port. [Ver] Find NDR for 64 Byte frames \
 | | ... | using binary search start at 10GE linerate, step 10kpps.
-| | [Tags] | 1_THREAD_NOHTT_RXQUEUES_1 | SINGLE_THREAD | NDR | SKIP_PATCH
+| | [Tags] | 1_THREAD_NOHTT_RXQUEUES_1 | SINGLE_THREAD | NDR
 | | ${framesize}= | Set Variable | 64
 | | ${min_rate}= | Set Variable | 10000
 | | ${max_rate}= | Set Variable | ${10Ge_linerate_pps_64B}
@@ -99,7 +99,7 @@
 | | ... | [Cfg] DUT runs IPv4 routing config with 1 thread, 1 phy core, \
 | | ... | 1 receive queue per NIC port. [Ver] Find PDR for 64 Byte frames \
 | | ... | using binary search start at 10GE linerate, step 10kpps, LT=0.5%.
-| | [Tags] | 1_THREAD_NOHTT_RXQUEUES_1 | SINGLE_THREAD | PDR
+| | [Tags] | 1_THREAD_NOHTT_RXQUEUES_1 | SINGLE_THREAD | PDR | SKIP_PATCH
 | | ${framesize}= | Set Variable | 64
 | | ${min_rate}= | Set Variable | 10000
 | | ${max_rate}= | Set Variable | ${10Ge_linerate_pps_64B}
@@ -134,7 +134,7 @@
 | | ... | [Cfg] DUT runs IPv4 routing config with 1 thread, 1 phy core, \
 | | ... | 1 receive queue per NIC port. [Ver] Find NDR for 1518 Byte frames \
 | | ... | using binary search start at 10GE linerate, step 10kpps.
-| | [Tags] | 1_THREAD_NOHTT_RXQUEUES_1 | SINGLE_THREAD | NDR | SKIP_PATCH
+| | [Tags] | 1_THREAD_NOHTT_RXQUEUES_1 | SINGLE_THREAD | NDR
 | | ${framesize}= | Set Variable | 1518
 | | ${min_rate}= | Set Variable | 10000
 | | ${max_rate}= | Set Variable | ${10Ge_linerate_pps_1518B}
@@ -167,7 +167,7 @@
 | | ... | [Cfg] DUT runs IPv4 routing config with 1 thread, 1 phy core, \
 | | ... | 1 receive queue per NIC port. [Ver] Find PDR for 1518 Byte frames \
 | | ... | using binary search start at 10GE linerate, step 10kpps, LT=0.5%.
-| | [Tags] | 1_THREAD_NOHTT_RXQUEUES_1 | SINGLE_THREAD | PDR
+| | [Tags] | 1_THREAD_NOHTT_RXQUEUES_1 | SINGLE_THREAD | PDR | SKIP_PATCH
 | | ${framesize}= | Set Variable | 1518
 | | ${min_rate}= | Set Variable | 10000
 | | ${max_rate}= | Set Variable | ${10Ge_linerate_pps_1518B}
@@ -203,7 +203,7 @@
 | | ... | 1 receive queue per NIC port. [Ver] Find NDR for IMIX_v4_1 frame \
 | | ... | size using binary search start at 10GE linerate, step 5kpps.
 | | ... | IMIX_v4_1 = (28x64B;16x570B;4x1518B)
-| | [Tags] | 1_THREAD_NOHTT_RXQUEUES_1 | SINGLE_THREAD | NDR | SKIP_PATCH
+| | [Tags] | 1_THREAD_NOHTT_RXQUEUES_1 | SINGLE_THREAD | NDR
 | | ${framesize}= | Set Variable | IMIX_v4_1
 | | ${min_rate}= | Set Variable | 5000
 | | ${max_rate}= | Set Variable | ${10Ge_linerate_pps_IMIX_v4_1}
@@ -237,7 +237,7 @@
 | | ... | 1 receive queue per NIC port. [Ver] Find PDR for IMIX_v4_1 frame \
 | | ... | size using binary search start at 10GE linerate, step 5kpps, LT=0.5%.
 | | ... | IMIX_v4_1 = (28x64B;16x570B;4x1518B)
-| | [Tags] | 1_THREAD_NOHTT_RXQUEUES_1 | SINGLE_THREAD | PDR
+| | [Tags] | 1_THREAD_NOHTT_RXQUEUES_1 | SINGLE_THREAD | PDR | SKIP_PATCH
 | | ${framesize}= | Set Variable | IMIX_v4_1
 | | ${min_rate}= | Set Variable | 5000
 | | ${max_rate}= | Set Variable | ${10Ge_linerate_pps_IMIX_v4_1}
@@ -271,7 +271,7 @@
 | | ... | [Cfg] DUT runs IPv4 routing config with 2 threads, 2 phy cores, \
 | | ... | 1 receive queue per NIC port. [Ver] Find NDR for 64 Byte frames \
 | | ... | using binary search start at 10GE linerate, step 10kpps.
-| | [Tags] | 2_THREAD_NOHTT_RXQUEUES_1 | MULTI_THREAD | NDR | SKIP_PATCH
+| | [Tags] | 2_THREAD_NOHTT_RXQUEUES_1 | MULTI_THREAD | NDR
 | | ${framesize}= | Set Variable | 64
 | | ${min_rate}= | Set Variable | 10000
 | | ${max_rate}= | Set Variable | ${10Ge_linerate_pps_64B}
@@ -304,7 +304,7 @@
 | | ... | [Cfg] DUT runs IPv4 routing config with 2 threads, 2 phy cores, \
 | | ... | 1 receive queue per NIC port. [Ver] Find PDR for 64 Byte frames \
 | | ... | using binary search start at 10GE linerate, step 10kpps, LT=0.5%.
-| | [Tags] | 2_THREAD_NOHTT_RXQUEUES_1 | MULTI_THREAD | PDR
+| | [Tags] | 2_THREAD_NOHTT_RXQUEUES_1 | MULTI_THREAD | PDR | SKIP_PATCH
 | | ${framesize}= | Set Variable | 64
 | | ${min_rate}= | Set Variable | 10000
 | | ${max_rate}= | Set Variable | ${10Ge_linerate_pps_64B}
@@ -477,7 +477,7 @@
 | | ... | [Cfg] DUT runs IPv4 routing config with 4 threads, 4 phy cores, \
 | | ... | 2 receive queues per NIC port. [Ver] Find NDR for 64 Byte frames \
 | | ... | using binary search start at 10GE linerate, step 10kpps.
-| | [Tags] | 4_THREAD_NOHTT_RXQUEUES_2 | MULTI_THREAD | NDR | SKIP_PATCH
+| | [Tags] | 4_THREAD_NOHTT_RXQUEUES_2 | MULTI_THREAD | NDR
 | | ${framesize}= | Set Variable | 64
 | | ${min_rate}= | Set Variable | 10000
 | | ${max_rate}= | Set Variable | ${10Ge_linerate_pps_64B}
@@ -510,7 +510,7 @@
 | | ... | [Cfg] DUT runs IPv4 routing config with 4 threads, 4 phy cores, \
 | | ... | 2 receive queues per NIC port. [Ver] Find PDR for 64 Byte frames \
 | | ... | using binary search start at 10GE linerate, step 10kpps, LT=0.5%.
-| | [Tags] | 4_THREAD_NOHTT_RXQUEUES_2 | MULTI_THREAD | PDR
+| | [Tags] | 4_THREAD_NOHTT_RXQUEUES_2 | MULTI_THREAD | PDR | SKIP_PATCH
 | | ${framesize}= | Set Variable | 64
 | | ${min_rate}= | Set Variable | 10000
 | | ${max_rate}= | Set Variable | ${10Ge_linerate_pps_64B}
diff --git a/tests/perf/Long_Lisp_Intel-X520-DA2.robot b/tests/perf/Long_Lisp_Intel-X520-DA2.robot
index 2ff8a582ab..2daaefd6b3 100644
--- a/tests/perf/Long_Lisp_Intel-X520-DA2.robot
+++ b/tests/perf/Long_Lisp_Intel-X520-DA2.robot
@@ -57,7 +57,7 @@
 | | ... | port.
 | | ... | [Ver] Find NDR for 64 Byte frames using binary search start
 | | ... | at 10GE linerate, step 100kpps.
-| | [Tags] | 1_THREAD_NOHTT_RXQUEUES_1 | SINGLE_THREAD | NDR | LISP_IPv4 | SKIP_PATCH
+| | [Tags] | 1_THREAD_NOHTT_RXQUEUES_1 | SINGLE_THREAD | NDR | LISP_IPv4
 | | ${framesize}= | Set Variable | 64
 | | ${min_rate}= | Set Variable | 100000
 | | ${max_rate}= | Set Variable | ${10Ge_lisp_linerate_pps_72B}
@@ -89,6 +89,7 @@
 | | ... | [Ver] Find PDR for 64 Byte frames using binary search start
 | | ... | at 10GE linerate, step 100kpps, LT=0.5%.
 | | [Tags] | 1_THREAD_NOHTT_RXQUEUES_1 | SINGLE_THREAD | PDR | LISP_IPv4
+| | ...    | SKIP_PATCH
 | | ${framesize}= | Set Variable | 64
 | | ${min_rate}= | Set Variable | 100000
 | | ${max_rate}= | Set Variable | ${10Ge_lisp_linerate_pps_72B}
@@ -121,7 +122,7 @@
 | | ... | port.
 | | ... | [Ver] Find NDR for 1480 Byte frames using binary search start
 | | ... | at 10GE linerate, step 10kpps.
-| | [Tags] | 1_THREAD_NOHTT_RXQUEUES_1 | SINGLE_THREAD | NDR | LISP_IPv4 | SKIP_PATCH
+| | [Tags] | 1_THREAD_NOHTT_RXQUEUES_1 | SINGLE_THREAD | NDR | LISP_IPv4
 | | ${framesize}= | Set Variable | 1480
 | | ${min_rate}= | Set Variable | 10000
 | | ${max_rate}= | Set Variable | ${10Ge_lisp_linerate_pps_1488B}
@@ -152,6 +153,7 @@
 | | ... | port. [Ver] Find PDR for 1480 Byte frames using binary search start
 | | ... | at 10GE linerate, step 10kpps, LT=0.5%.
 | | [Tags] | 1_THREAD_NOHTT_RXQUEUES_1 | SINGLE_THREAD | PDR | LISP_IPv4
+| | ...    | SKIP_PATCH
 | | ${framesize}= | Set Variable | 1480
 | | ${min_rate}= | Set Variable | 10000
 | | ${max_rate}= | Set Variable | ${10Ge_lisp_linerate_pps_1488B}
@@ -184,7 +186,7 @@
 | | ... | port.
 | | ... | [Ver] Find NDR for 9000 Byte frames using binary search start
 | | ... | at 10GE linerate, step 5kpps.
-| | [Tags] | 1_THREAD_NOHTT_RXQUEUES_1 | SINGLE_THREAD | NDR | LISP_IPv4 | SKIP_PATCH
+| | [Tags] | 1_THREAD_NOHTT_RXQUEUES_1 | SINGLE_THREAD | NDR | LISP_IPv4
 | | ${framesize}= | Set Variable | 9000
 | | ${min_rate}= | Set Variable | 5000
 | | ${max_rate}= | Set Variable | ${10Ge_lisp_linerate_pps_9008B}
@@ -215,6 +217,7 @@
 | | ... | [Ver] Find PDR for 9000 Byte frames using binary search start
 | | ... | at 10GE linerate, step 5kpps, LT=0.5%.
 | | [Tags] | 1_THREAD_NOHTT_RXQUEUES_1 | SINGLE_THREAD | PDR | LISP_IPv4
+| | ...    | SKIP_PATCH
 | | ${framesize}= | Set Variable | 9000
 | | ${min_rate}= | Set Variable | 5000
 | | ${max_rate}= | Set Variable | ${10Ge_lisp_linerate_pps_9008B}
@@ -246,7 +249,7 @@
 | | ... | port.
 | | ... | [Ver] Find NDR for 64 Byte frames using binary search start
 | | ... | at 10GE linerate, step 100kpps.
-| | [Tags] | 2_THREAD_NOHTT_RXQUEUES_1 | MULTI_THREAD | NDR | LISP_IPv4 | SKIP_PATCH
+| | [Tags] | 2_THREAD_NOHTT_RXQUEUES_1 | MULTI_THREAD | NDR | LISP_IPv4
 | | ${framesize}= | Set Variable | 64
 | | ${min_rate}= | Set Variable | 100000
 | | ${max_rate}= | Set Variable | ${10Ge_lisp_linerate_pps_72B}
@@ -278,6 +281,7 @@
 | | ... | [Ver] Find PDR for 64 Byte frames using binary search start
 | | ... | at 10GE linerate, step 100kpps, LT=0.5%.
 | | [Tags] | 2_THREAD_NOHTT_RXQUEUES_1 | MULTI_THREAD | PDR | LISP_IPv4
+| | ...    | SKIP_PATCH
 | | ${framesize}= | Set Variable | 64
 | | ${min_rate}= | Set Variable | 100000
 | | ${max_rate}= | Set Variable | ${10Ge_lisp_linerate_pps_72B}
@@ -310,7 +314,8 @@
 | | ... | port.
 | | ... | [Ver] Find NDR for 1480 Byte frames using binary search start
 | | ... | at 10GE linerate, step 10kpps.
-| | [Tags] | 2_THREAD_NOHTT_RXQUEUES_1 | MULTI_THREAD | NDR | LISP_IPv4 | SKIP_PATCH
+| | [Tags] | 2_THREAD_NOHTT_RXQUEUES_1 | MULTI_THREAD | NDR | LISP_IPv4
+| | ...    | SKIP_PATCH
 | | ${framesize}= | Set Variable | 1480
 | | ${min_rate}= | Set Variable | 10000
 | | ${max_rate}= | Set Variable | ${10Ge_lisp_linerate_pps_1488B}
@@ -341,7 +346,8 @@
 | | ... | port.
 | | ... | [Ver] Find PDR for 1480 Byte frames using binary search start
 | | ... | at 10GE linerate, step 10kpps, LT=0.5%.
-| | [Tags] | 2_THREAD_NOHTT_RXQUEUES_1 | MULTI_THREAD | PDR | LISP_IPv4 | SKIP_PATCH
+| | [Tags] | 2_THREAD_NOHTT_RXQUEUES_1 | MULTI_THREAD | PDR | LISP_IPv4
+| | ...    | SKIP_PATCH
 | | ${framesize}= | Set Variable | 1480
 | | ${min_rate}= | Set Variable | 10000
 | | ${max_rate}= | Set Variable | ${10Ge_lisp_linerate_pps_1488B}
@@ -374,7 +380,8 @@
 | | ... | port.
 | | ... | [Ver] Find NDR for 9000 Byte frames using binary search start
 | | ... | at 10GE linerate, step 5kpps.
-| | [Tags] | 2_THREAD_NOHTT_RXQUEUES_1 | MULTI_THREAD | NDR | LISP_IPv4 | SKIP_PATCH
+| | [Tags] | 2_THREAD_NOHTT_RXQUEUES_1 | MULTI_THREAD | NDR | LISP_IPv4
+| | ...    | SKIP_PATCH
 | | ${framesize}= | Set Variable | 9000
 | | ${min_rate}= | Set Variable | 5000
 | | ${max_rate}= | Set Variable | ${10Ge_lisp_linerate_pps_9008B}
@@ -404,7 +411,8 @@
 | | ... | port.
 | | ... | [Ver] Find PDR for 9000 Byte frames using binary search start
 | | ... | at 10GE linerate, step 5kpps, LT=0.5%.
-| | [Tags] | 2_THREAD_NOHTT_RXQUEUES_1 | MULTI_THREAD | PDR | LISP_IPv4 | SKIP_PATCH
+| | [Tags] | 2_THREAD_NOHTT_RXQUEUES_1 | MULTI_THREAD | PDR | LISP_IPv4
+| | ...    | SKIP_PATCH
 | | ${framesize}= | Set Variable | 9000
 | | ${min_rate}= | Set Variable | 5000
 | | ${max_rate}= | Set Variable | ${10Ge_lisp_linerate_pps_9008B}
@@ -436,7 +444,7 @@
 | | ... | port.
 | | ... | [Ver] Find NDR for 64 Byte frames using binary search start
 | | ... | at 10GE linerate, step 100kpps.
-| | [Tags] | 4_THREAD_NOHTT_RXQUEUES_2 | MULTI_THREAD | NDR | LISP_IPv4 | SKIP_PATCH
+| | [Tags] | 4_THREAD_NOHTT_RXQUEUES_2 | MULTI_THREAD | NDR | LISP_IPv4
 | | ${framesize}= | Set Variable | 64
 | | ${min_rate}= | Set Variable | 100000
 | | ${max_rate}= | Set Variable | ${10Ge_lisp_linerate_pps_72B}
@@ -468,6 +476,7 @@
 | | ... | [Ver] Find PDR for 64 Byte frames using binary search start
 | | ... | at 10GE linerate, step 100kpps, LT=0.5%.
 | | [Tags] | 4_THREAD_NOHTT_RXQUEUES_2 | MULTI_THREAD | PDR | LISP_IPv4
+| | ...    | SKIP_PATCH
 | | ${framesize}= | Set Variable | 64
 | | ${min_rate}= | Set Variable | 100000
 | | ${max_rate}= | Set Variable | ${10Ge_lisp_linerate_pps_72B}
@@ -500,7 +509,8 @@
 | | ... | port.
 | | ... | [Ver] Find NDR for 1480 Byte frames using binary search start
 | | ... | at 10GE linerate, step 10kpps.
-| | [Tags] | 4_THREAD_NOHTT_RXQUEUES_2 | MULTI_THREAD | NDR | LISP_IPv4 | SKIP_PATCH
+| | [Tags] | 4_THREAD_NOHTT_RXQUEUES_2 | MULTI_THREAD | NDR | LISP_IPv4
+| | ...    | SKIP_PATCH
 | | ${framesize}= | Set Variable | 1480
 | | ${min_rate}= | Set Variable | 10000
 | | ${max_rate}= | Set Variable | ${10Ge_lisp_linerate_pps_1488B}
@@ -531,7 +541,8 @@
 | | ... | port.
 | | ... | [Ver] Find PDR for 1480 Byte frames using binary search start
 | | ... | at 10GE linerate, step 10kpps, LT=0.5%.
-| | [Tags] | 4_THREAD_NOHTT_RXQUEUES_2 | MULTI_THREAD | PDR | LISP_IPv4 | SKIP_PATCH
+| | [Tags] | 4_THREAD_NOHTT_RXQUEUES_2 | MULTI_THREAD | PDR | LISP_IPv4
+| | ...    | SKIP_PATCH
 | | ${framesize}= | Set Variable | 1480
 | | ${min_rate}= | Set Variable | 10000
 | | ${max_rate}= | Set Variable | ${10Ge_lisp_linerate_pps_1488B}
@@ -563,7 +574,8 @@
 | | ... | port.
 | | ... | [Ver] Find NDR for 9000 Byte frames using binary search start
 | | ... | at 10GE linerate, step 5kpps.
-| | [Tags] | 4_THREAD_NOHTT_RXQUEUES_2 | MULTI_THREAD | NDR | LISP_IPv4 | SKIP_PATCH
+| | [Tags] | 4_THREAD_NOHTT_RXQUEUES_2 | MULTI_THREAD | NDR | LISP_IPv4
+| | ...    | SKIP_PATCH
 | | ${framesize}= | Set Variable | 9000
 | | ${min_rate}= | Set Variable | 5000
 | | ${max_rate}= | Set Variable | ${10Ge_lisp_linerate_pps_9008B}
@@ -593,7 +605,8 @@
 | | ... | port.
 | | ... | [Ver] Find PDR for 9000 Byte frames using binary search start
 | | ... | at 10GE linerate, step 5kpps, LT=0.5%.
-| | [Tags] | 4_THREAD_NOHTT_RXQUEUES_2 | MULTI_THREAD | PDR | LISP_IPv4 | SKIP_PATCH
+| | [Tags] | 4_THREAD_NOHTT_RXQUEUES_2 | MULTI_THREAD | PDR | LISP_IPv4
+| | ...    | SKIP_PATCH
 | | ${framesize}= | Set Variable | 9000
 | | ${min_rate}= | Set Variable | 5000
 | | ${max_rate}= | Set Variable | ${10Ge_lisp_linerate_pps_9008B}
@@ -625,7 +638,7 @@
 | | ... | port.
 | | ... | [Ver] Find NDR for 78 Byte frames using binary search start
 | | ... | at 10GE linerate, step 100kpps.
-| | [Tags] | 1_THREAD_NOHTT_RXQUEUES_1 | SINGLE_THREAD | NDR | LISP_IPv6 | SKIP_PATCH
+| | [Tags] | 1_THREAD_NOHTT_RXQUEUES_1 | SINGLE_THREAD | NDR | LISP_IPv6
 | | ${framesize}= | Set Variable | 78
 | | ${min_rate}= | Set Variable | 100000
 | | ${max_rate}= | Set Variable | ${10Ge_lisp_linerate_pps_86B}
@@ -657,6 +670,7 @@
 | | ... | [Ver] Find PDR for 78 Byte frames using binary search start
 | | ... | at 10GE linerate, step 100kpps, LT=0.5%.
 | | [Tags] | 1_THREAD_NOHTT_RXQUEUES_1 | SINGLE_THREAD | PDR | LISP_IPv6
+| | ...    | SKIP_PATCH
 | | ${framesize}= | Set Variable | 78
 | | ${min_rate}= | Set Variable | 100000
 | | ${max_rate}= | Set Variable | ${10Ge_lisp_linerate_pps_86B}
@@ -689,7 +703,7 @@
 | | ... | port.
 | | ... | [Ver] Find NDR for 1460 Byte frames using binary search start
 | | ... | at 10GE linerate, step 10kpps.
-| | [Tags] | 1_THREAD_NOHTT_RXQUEUES_1 | SINGLE_THREAD | NDR | LISP_IPv6 | SKIP_PATCH
+| | [Tags] | 1_THREAD_NOHTT_RXQUEUES_1 | SINGLE_THREAD | NDR | LISP_IPv6
 | | ${framesize}= | Set Variable | 1460
 | | ${min_rate}= | Set Variable | 10000
 | | ${max_rate}= | Set Variable | ${10Ge_lisp_linerate_pps_1488B}
@@ -721,6 +735,7 @@
 | | ... | [Ver] Find PDR for 1460 Byte frames using binary search start
 | | ... | at 10GE linerate, step 10kpps, LT=0.5%.
 | | [Tags] | 1_THREAD_NOHTT_RXQUEUES_1 | SINGLE_THREAD | PDR | LISP_IPv6
+| | ...    | SKIP_PATCH
 | | ${framesize}= | Set Variable | 1460
 | | ${min_rate}= | Set Variable | 10000
 | | ${max_rate}= | Set Variable | ${10Ge_lisp_linerate_pps_1488B}
@@ -753,7 +768,7 @@
 | | ... | port.
 | | ... | [Ver] Find NDR for 9000 Byte frames using binary search start
 | | ... | at 10GE linerate, step 5kpps.
-| | [Tags] | 1_THREAD_NOHTT_RXQUEUES_1 | SINGLE_THREAD | NDR | LISP_IPv6 | SKIP_PATCH
+| | [Tags] | 1_THREAD_NOHTT_RXQUEUES_1 | SINGLE_THREAD | NDR | LISP_IPv6
 | | ${framesize}= | Set Variable | 9000
 | | ${min_rate}= | Set Variable | 5000
 | | ${max_rate}= | Set Variable | ${10Ge_lisp_linerate_pps_9008B}
@@ -784,6 +799,7 @@
 | | ... | [Ver] Find PDR for 9000 Byte frames using binary search start
 | | ... | at 10GE linerate, step 5kpps, LT=0.5%.
 | | [Tags] | 1_THREAD_NOHTT_RXQUEUES_1 | SINGLE_THREAD | PDR | LISP_IPv6
+| | ...    | SKIP_PATCH
 | | ${framesize}= | Set Variable | 9000
 | | ${min_rate}= | Set Variable | 5000
 | | ${max_rate}= | Set Variable | ${10Ge_lisp_linerate_pps_9008B}
@@ -815,7 +831,7 @@
 | | ... | port.
 | | ... | [Ver] Find NDR for 78 Byte frames using binary search start
 | | ... | at 10GE linerate, step 100kpps.
-| | [Tags] | 2_THREAD_NOHTT_RXQUEUES_1 | MULTI_THREAD | NDR | LISP_IPv6 | SKIP_PATCH
+| | [Tags] | 2_THREAD_NOHTT_RXQUEUES_1 | MULTI_THREAD | NDR | LISP_IPv6
 | | ${framesize}= | Set Variable | 78
 | | ${min_rate}= | Set Variable | 100000
 | | ${max_rate}= | Set Variable | ${10Ge_lisp_linerate_pps_86B}
@@ -847,6 +863,7 @@
 | | ... | [Ver] Find PDR for 78 Byte frames using binary search start
 | | ... | at 10GE linerate, step 100kpps, LT=0.5%.
 | | [Tags] | 2_THREAD_NOHTT_RXQUEUES_1 | MULTI_THREAD | PDR | LISP_IPv6
+| | ...    | SKIP_PATCH
 | | ${framesize}= | Set Variable | 78
 | | ${min_rate}= | Set Variable | 100000
 | | ${max_rate}= | Set Variable | ${10Ge_lisp_linerate_pps_86B}
@@ -879,7 +896,8 @@
 | | ... | port.
 | | ... | [Ver] Find NDR for 1460 Byte frames using binary search start
 | | ... | at 10GE linerate, step 10kpps.
-| | [Tags] | 2_THREAD_NOHTT_RXQUEUES_1 | MULTI_THREAD | NDR | LISP_IPv6 | SKIP_PATCH
+| | [Tags] | 2_THREAD_NOHTT_RXQUEUES_1 | MULTI_THREAD | NDR | LISP_IPv6
+| | ...    | SKIP_PATCH
 | | ${framesize}= | Set Variable | 1460
 | | ${min_rate}= | Set Variable | 10000
 | | ${max_rate}= | Set Variable | ${10Ge_lisp_linerate_pps_1488B}
@@ -910,7 +928,8 @@
 | | ... | port.
 | | ... | [Ver] Find PDR for 1460 Byte frames using binary search start
 | | ... | at 10GE linerate, step 10kpps, LT=0.5%.
-| | [Tags] | 2_THREAD_NOHTT_RXQUEUES_1 | MULTI_THREAD | PDR | LISP_IPv6 | SKIP_PATCH
+| | [Tags] | 2_THREAD_NOHTT_RXQUEUES_1 | MULTI_THREAD | PDR | LISP_IPv6
+| | ...    | SKIP_PATCH
 | | ${framesize}= | Set Variable | 1460
 | | ${min_rate}= | Set Variable | 10000
 | | ${max_rate}= | Set Variable | ${10Ge_lisp_linerate_pps_1488B}
@@ -943,7 +962,8 @@
 | | ... | port.
 | | ... | [Ver] Find NDR for 9000 Byte frames using binary search start
 | | ... | at 10GE linerate, step 5kpps.
-| | [Tags] | 2_THREAD_NOHTT_RXQUEUES_1 | MULTI_THREAD | NDR | LISP_IPv6 | SKIP_PATCH
+| | [Tags] | 2_THREAD_NOHTT_RXQUEUES_1 | MULTI_THREAD | NDR | LISP_IPv6
+| | ...    | SKIP_PATCH
 | | ${framesize}= | Set Variable | 9000
 | | ${min_rate}= | Set Variable | 5000
 | | ${max_rate}= | Set Variable | ${10Ge_lisp_linerate_pps_9008B}
@@ -973,7 +993,8 @@
 | | ... | port.
 | | ... | [Ver] Find PDR for 9000 Byte frames using binary search start
 | | ... | at 10GE linerate, step 5kpps.
-| | [Tags] | 2_THREAD_NOHTT_RXQUEUES_1 | MULTI_THREAD | PDR | LISP_IPv6 | SKIP_PATCH
+| | [Tags] | 2_THREAD_NOHTT_RXQUEUES_1 | MULTI_THREAD | PDR | LISP_IPv6
+| | ...    | SKIP_PATCH
 | | ${framesize}= | Set Variable | 9000
 | | ${min_rate}= | Set Variable | 5000
 | | ${max_rate}= | Set Variable | ${10Ge_lisp_linerate_pps_9008B}
@@ -1005,7 +1026,7 @@
 | | ... | port.
 | | ... | [Ver] Find NDR for 78 Byte frames using binary search start
 | | ... | at 10GE linerate, step 100kpps.
-| | [Tags] | 4_THREAD_NOHTT_RXQUEUES_2 | MULTI_THREAD | NDR | LISP_IPv6 | SKIP_PATCH
+| | [Tags] | 4_THREAD_NOHTT_RXQUEUES_2 | MULTI_THREAD | NDR | LISP_IPv6
 | | ${framesize}= | Set Variable | 78
 | | ${min_rate}= | Set Variable | 100000
 | | ${max_rate}= | Set Variable | ${10Ge_lisp_linerate_pps_86B}
@@ -1037,6 +1058,7 @@
 | | ... | [Ver] Find PDR for 78 Byte frames using binary search start
 | | ... | at 10GE linerate, step 100kpps, LT=0.5%.
 | | [Tags] | 4_THREAD_NOHTT_RXQUEUES_2 | MULTI_THREAD | PDR | LISP_IPv6
+| | ...    | SKIP_PATCH
 | | ${framesize}= | Set Variable | 78
 | | ${min_rate}= | Set Variable | 100000
 | | ${max_rate}= | Set Variable | ${10Ge_lisp_linerate_pps_86B}
@@ -1069,7 +1091,8 @@
 | | ... | port.
 | | ... | [Ver] Find NDR for 1460 Byte frames using binary search start
 | | ... | at 10GE linerate, step 100kpps.
-| | [Tags] | 4_THREAD_NOHTT_RXQUEUES_2 | MULTI_THREAD | NDR | LISP_IPv6 | SKIP_PATCH
+| | [Tags] | 4_THREAD_NOHTT_RXQUEUES_2 | MULTI_THREAD | NDR | LISP_IPv6
+| | ...    | SKIP_PATCH
 | | ${framesize}= | Set Variable | 1460
 | | ${min_rate}= | Set Variable | 10000
 | | ${max_rate}= | Set Variable | ${10Ge_lisp_linerate_pps_1488B}
@@ -1100,7 +1123,8 @@
 | | ... | port.
 | | ... | [Ver] Find PDR for 1460 Byte frames using binary search start
 | | ... | at 10GE linerate, step 10kpps, LT=0.5%.
-| | [Tags] | 4_THREAD_NOHTT_RXQUEUES_2 | MULTI_THREAD | PDR | LISP_IPv6 | SKIP_PATCH
+| | [Tags] | 4_THREAD_NOHTT_RXQUEUES_2 | MULTI_THREAD | PDR | LISP_IPv6
+| | ...    | SKIP_PATCH
 | | ${framesize}= | Set Variable | 1460
 | | ${min_rate}= | Set Variable | 10000
 | | ${max_rate}= | Set Variable | ${10Ge_lisp_linerate_pps_1488B}
@@ -1133,7 +1157,8 @@
 | | ... | port.
 | | ... | [Ver] Find NDR for 9000 Byte frames using binary search start
 | | ... | at 10GE linerate, step 5kpps.
-| | [Tags] | 4_THREAD_NOHTT_RXQUEUES_2 | MULTI_THREAD | NDR | LISP_IPv6 | SKIP_PATCH
+| | [Tags] | 4_THREAD_NOHTT_RXQUEUES_2 | MULTI_THREAD | NDR | LISP_IPv6
+| | ...    | SKIP_PATCH
 | | ${framesize}= | Set Variable | 9000
 | | ${min_rate}= | Set Variable | 5000
 | | ${max_rate}= | Set Variable | ${10Ge_lisp_linerate_pps_9008B}
@@ -1163,7 +1188,8 @@
 | | ... | port.
 | | ... | [Ver] Find PDR for 9000 Byte frames using binary search start
 | | ... | at 10GE linerate, step 5kpps, LT=0.5%.
-| | [Tags] | 4_THREAD_NOHTT_RXQUEUES_2 | MULTI_THREAD | PDR | LISP_IPv6 | SKIP_PATCH
+| | [Tags] | 4_THREAD_NOHTT_RXQUEUES_2 | MULTI_THREAD | PDR | LISP_IPv6
+| | ...    | SKIP_PATCH
 | | ${framesize}= | Set Variable | 9000
 | | ${min_rate}= | Set Variable | 5000
 | | ${max_rate}= | Set Variable | ${10Ge_lisp_linerate_pps_9008B}
@@ -1195,7 +1221,7 @@
 | | ... | port.
 | | ... | [Ver] Find NDR for 64 Byte frames using binary search start
 | | ... | at 10GE linerate, step 100kpps.
-| | [Tags] | 1_THREAD_NOHTT_RXQUEUES_1 | SINGLE_THREAD | NDR | LISP_IPv4oIPv6 | SKIP_PATCH
+| | [Tags] | 1_THREAD_NOHTT_RXQUEUES_1 | SINGLE_THREAD | NDR | LISP_IPv4oIPv6
 | | ${framesize}= | Set Variable | 64
 | | ${min_rate}= | Set Variable | 100000
 | | ${max_rate}= | Set Variable | ${10Ge_lisp_iph_linerate_pps_112B}
@@ -1227,6 +1253,7 @@
 | | ... | [Ver] Find PDR for 64 Byte frames using binary search start
 | | ... | at 10GE linerate, step 100kpps, LT=0.5%.
 | | [Tags] | 1_THREAD_NOHTT_RXQUEUES_1 | SINGLE_THREAD | PDR | LISP_IPv4oIPv6
+| | ...    | SKIP_PATCH
 | | ${framesize}= | Set Variable | 64
 | | ${min_rate}= | Set Variable | 100000
 | | ${max_rate}= | Set Variable | ${10Ge_lisp_iph_linerate_pps_112B}
@@ -1259,7 +1286,7 @@
 | | ... | port.
 | | ... | [Ver] Find NDR for 1460 Byte frames using binary search start
 | | ... | at 10GE linerate, step 100kpps.
-| | [Tags] | 1_THREAD_NOHTT_RXQUEUES_1 | SINGLE_THREAD | NDR | LISP_IPv4oIPv6 | SKIP_PATCH
+| | [Tags] | 1_THREAD_NOHTT_RXQUEUES_1 | SINGLE_THREAD | NDR | LISP_IPv4oIPv6
 | | ${framesize}= | Set Variable | 1460
 | | ${min_rate}= | Set Variable | 10000
 | | ${max_rate}= | Set Variable | ${10Ge_lisp_iph_linerate_pps_1508B}
@@ -1291,6 +1318,7 @@
 | | ... | [Ver] Find PDR for 1460 Byte frames using binary search start
 | | ... | at 10GE linerate, step 10kpps, LT=0.5%.
 | | [Tags] | 1_THREAD_NOHTT_RXQUEUES_1 | SINGLE_THREAD | PDR | LISP_IPv4oIPv6
+| | ...    | SKIP_PATCH
 | | ${framesize}= | Set Variable | 1460
 | | ${min_rate}= | Set Variable | 10000
 | | ${max_rate}= | Set Variable | ${10Ge_lisp_iph_linerate_pps_1508B}
@@ -1323,7 +1351,7 @@
 | | ... | port.
 | | ... | [Ver] Find NDR for 9000 Byte frames using binary search start
 | | ... | at 10GE linerate, step 5kpps.
-| | [Tags] | 1_THREAD_NOHTT_RXQUEUES_1 | SINGLE_THREAD | NDR | LISP_IPv4oIPv6 | SKIP_PATCH
+| | [Tags] | 1_THREAD_NOHTT_RXQUEUES_1 | SINGLE_THREAD | NDR | LISP_IPv4oIPv6
 | | ${framesize}= | Set Variable | 9000
 | | ${min_rate}= | Set Variable | 5000
 | | ${max_rate}= | Set Variable | ${10Ge_lisp_iph_linerate_pps_9048B}
@@ -1354,6 +1382,7 @@
 | | ... | [Ver] Find PDR for 9000 Byte frames using binary search start
 | | ... | at 10GE linerate, step 5kpps, LT=0.5%.
 | | [Tags] | 1_THREAD_NOHTT_RXQUEUES_1 | SINGLE_THREAD | PDR | LISP_IPv4oIPv6
+| | ...    | SKIP_PATCH
 | | ${framesize}= | Set Variable | 9000
 | | ${min_rate}= | Set Variable | 5000
 | | ${max_rate}= | Set Variable | ${10Ge_lisp_iph_linerate_pps_9048B}
@@ -1385,7 +1414,7 @@
 | | ... | port.
 | | ... | [Ver] Find NDR for 64 Byte frames using binary search start
 | | ... | at 10GE linerate, step 100kpps.
-| | [Tags] | 2_THREAD_NOHTT_RXQUEUES_1 | MULTI_THREAD | NDR | LISP_IPv4oIPv6 | SKIP_PATCH
+| | [Tags] | 2_THREAD_NOHTT_RXQUEUES_1 | MULTI_THREAD | NDR | LISP_IPv4oIPv6
 | | ${framesize}= | Set Variable | 64
 | | ${min_rate}= | Set Variable | 100000
 | | ${max_rate}= | Set Variable | ${10Ge_lisp_iph_linerate_pps_112B}
@@ -1417,6 +1446,7 @@
 | | ... | [Ver] Find PDR for 64 Byte frames using binary search start
 | | ... | at 10GE linerate, step 100kpps.
 | | [Tags] | 2_THREAD_NOHTT_RXQUEUES_1 | MULTI_THREAD | PDR | LISP_IPv4oIPv6
+| | ...    | SKIP_PATCH
 | | ${framesize}= | Set Variable | 64
 | | ${min_rate}= | Set Variable | 100000
 | | ${max_rate}= | Set Variable | ${10Ge_lisp_iph_linerate_pps_112B}
@@ -1449,7 +1479,8 @@
 | | ... | port.
 | | ... | [Ver] Find NDR for 1460 Byte frames using binary search start
 | | ... | at 10GE linerate, step 10kpps.
-| | [Tags] | 2_THREAD_NOHTT_RXQUEUES_1 | MULTI_THREAD | NDR | LISP_IPv4oIPv6 | SKIP_PATCH
+| | [Tags] | 2_THREAD_NOHTT_RXQUEUES_1 | MULTI_THREAD | NDR | LISP_IPv4oIPv6
+| | ...    | SKIP_PATCH
 | | ${framesize}= | Set Variable | 1460
 | | ${min_rate}= | Set Variable | 10000
 | | ${max_rate}= | Set Variable | ${10Ge_lisp_iph_linerate_pps_1508B}
@@ -1480,7 +1511,8 @@
 | | ... | port.
 | | ... | [Ver] Find PDR for 1460 Byte frames using binary search start
 | | ... | at 10GE linerate, step 10kpps, LT=0.5%.
-| | [Tags] | 2_THREAD_NOHTT_RXQUEUES_1 | MULTI_THREAD | PDR | LISP_IPv4oIPv6 | SKIP_PATCH
+| | [Tags] | 2_THREAD_NOHTT_RXQUEUES_1 | MULTI_THREAD | PDR | LISP_IPv4oIPv6
+| | ...    | SKIP_PATCH
 | | ${framesize}= | Set Variable | 1460
 | | ${min_rate}= | Set Variable | 10000
 | | ${max_rate}= | Set Variable | ${10Ge_lisp_iph_linerate_pps_1508B}
@@ -1513,7 +1545,8 @@
 | | ... | port.
 | | ... | [Ver] Find NDR for 9000 Byte frames using binary search start
 | | ... | at 10GE linerate, step 5kpps.
-| | [Tags] | 2_THREAD_NOHTT_RXQUEUES_1 | MULTI_THREAD | NDR | LISP_IPv4oIPv6 | SKIP_PATCH
+| | [Tags] | 2_THREAD_NOHTT_RXQUEUES_1 | MULTI_THREAD | NDR | LISP_IPv4oIPv6
+| | ...    | SKIP_PATCH
 | | ${framesize}= | Set Variable | 9000
 | | ${min_rate}= | Set Variable | 5000
 | | ${max_rate}= | Set Variable | ${10Ge_lisp_iph_linerate_pps_9048B}
@@ -1543,7 +1576,8 @@
 | | ... | port.
 | | ... | [Ver] Find PDR for 9000 Byte frames using binary search start
 | | ... | at 10GE linerate, step 5kpps, LT=0.5%.
-| | [Tags] | 2_THREAD_NOHTT_RXQUEUES_1 | MULTI_THREAD | PDR | LISP_IPv4oIPv6 | SKIP_PATCH
+| | [Tags] | 2_THREAD_NOHTT_RXQUEUES_1 | MULTI_THREAD | PDR | LISP_IPv4oIPv6
+| | ...    | SKIP_PATCH
 | | ${framesize}= | Set Variable | 9000
 | | ${min_rate}= | Set Variable | 5000
 | | ${max_rate}= | Set Variable | ${10Ge_lisp_iph_linerate_pps_9048B}
@@ -1575,7 +1609,7 @@
 | | ... | port.
 | | ... | [Ver] Find NDR for 64 Byte frames using binary search start
 | | ... | at 10GE linerate, step 100kpps.
-| | [Tags] | 4_THREAD_NOHTT_RXQUEUES_2 | MULTI_THREAD | NDR | LISP_IPv4oIPv6 | SKIP_PATCH
+| | [Tags] | 4_THREAD_NOHTT_RXQUEUES_2 | MULTI_THREAD | NDR | LISP_IPv4oIPv6
 | | ${framesize}= | Set Variable | 64
 | | ${min_rate}= | Set Variable | 100000
 | | ${max_rate}= | Set Variable | ${10Ge_lisp_iph_linerate_pps_112B}
@@ -1607,6 +1641,7 @@
 | | ... | [Ver] Find PDR for 64 Byte frames using binary search start
 | | ... | at 10GE linerate, step 100kpps, LT=0.5%.
 | | [Tags] | 4_THREAD_NOHTT_RXQUEUES_2 | MULTI_THREAD | PDR | LISP_IPv4oIPv6
+| | ...    | SKIP_PATCH
 | | ${framesize}= | Set Variable | 64
 | | ${min_rate}= | Set Variable | 100000
 | | ${max_rate}= | Set Variable | ${10Ge_lisp_iph_linerate_pps_112B}
@@ -1639,7 +1674,8 @@
 | | ... | port.
 | | ... | [Ver] Find NDR for 1460 Byte frames using binary search start
 | | ... | at 10GE linerate, step 10kpps.
-| | [Tags] | 4_THREAD_NOHTT_RXQUEUES_2 | MULTI_THREAD | NDR | LISP_IPv4oIPv6 | SKIP_PATCH
+| | [Tags] | 4_THREAD_NOHTT_RXQUEUES_2 | MULTI_THREAD | NDR | LISP_IPv4oIPv6
+| | ...    | SKIP_PATCH
 | | ${framesize}= | Set Variable | 1460
 | | ${min_rate}= | Set Variable | 10000
 | | ${max_rate}= | Set Variable | ${10Ge_lisp_iph_linerate_pps_1508B}
@@ -1670,7 +1706,8 @@
 | | ... | port.
 | | ... | [Ver] Find PDR for 1460 Byte frames using binary search starlt
 | | ... | at 10GE linerate, step 10kpps, LT=0.5%.
-| | [Tags] | 4_THREAD_NOHTT_RXQUEUES_2 | MULTI_THREAD | PDR | LISP_IPv4oIPv6 | SKIP_PATCH
+| | [Tags] | 4_THREAD_NOHTT_RXQUEUES_2 | MULTI_THREAD | PDR | LISP_IPv4oIPv6
+| | ...    | SKIP_PATCH
 | | ${framesize}= | Set Variable | 1460
 | | ${min_rate}= | Set Variable | 10000
 | | ${max_rate}= | Set Variable | ${10Ge_lisp_iph_linerate_pps_1508B}
@@ -1702,7 +1739,8 @@
 | | ... | port.
 | | ... | [Ver] Find NDR for 9000 Byte frames using binary search start
 | | ... | at 10GE linerate, step 5kpps.
-| | [Tags] | 4_THREAD_NOHTT_RXQUEUES_2 | MULTI_THREAD | NDR | LISP_IPv4oIPv6 | SKIP_PATCH
+| | [Tags] | 4_THREAD_NOHTT_RXQUEUES_2 | MULTI_THREAD | NDR | LISP_IPv4oIPv6
+| | ...    | SKIP_PATCH
 | | ${framesize}= | Set Variable | 9000
 | | ${min_rate}= | Set Variable | 5000
 | | ${max_rate}= | Set Variable | ${10Ge_lisp_iph_linerate_pps_9048B}
@@ -1732,7 +1770,8 @@
 | | ... | port.
 | | ... | [Ver] Find PDR for 9000 Byte frames using binary search start
 | | ... | at 10GE linerate, step 5kpps, LT=0.5%.
-| | [Tags] | 4_THREAD_NOHTT_RXQUEUES_2 | MULTI_THREAD | PDR | LISP_IPv4oIPv6 | SKIP_PATCH
+| | [Tags] | 4_THREAD_NOHTT_RXQUEUES_2 | MULTI_THREAD | PDR | LISP_IPv4oIPv6
+| | ...    | SKIP_PATCH
 | | ${framesize}= | Set Variable | 9000
 | | ${min_rate}= | Set Variable | 5000
 | | ${max_rate}= | Set Variable | ${10Ge_lisp_iph_linerate_pps_9048B}
@@ -1764,7 +1803,7 @@
 | | ... | port.
 | | ... | [Ver] Find NDR for 78 Byte frames using binary search start
 | | ... | at 10GE linerate, step 100kpps.
-| | [Tags] | 1_THREAD_NOHTT_RXQUEUES_1 | SINGLE_THREAD | NDR | LISP_IPv6oIPv4 | SKIP_PATCH
+| | [Tags] | 1_THREAD_NOHTT_RXQUEUES_1 | SINGLE_THREAD | NDR | LISP_IPv6oIPv4
 | | ${framesize}= | Set Variable | 78
 | | ${min_rate}= | Set Variable | 100000
 | | ${max_rate}= | Set Variable | ${10Ge_lisp_iph_linerate_pps_126B}
@@ -1796,6 +1835,7 @@
 | | ... | [Ver] Find PDR for 78 Byte frames using binary search start
 | | ... | at 10GE linerate, step 100kpps, LT=0.5%.
 | | [Tags] | 1_THREAD_NOHTT_RXQUEUES_1 | SINGLE_THREAD | PDR | LISP_IPv6IPv4
+| | ...    | SKIP_PATCH
 | | ${framesize}= | Set Variable | 78
 | | ${min_rate}= | Set Variable | 100000
 | | ${max_rate}= | Set Variable | ${10Ge_lisp_iph_linerate_pps_126B}
@@ -1828,7 +1868,7 @@
 | | ... | port.
 | | ... | [Ver] Find NDR for 1460 Byte frames using binary search start
 | | ... | at 10GE linerate, step 10kpps.
-| | [Tags] | 1_THREAD_NOHTT_RXQUEUES_1 | SINGLE_THREAD | NDR | LISP_IPv6oIPv4 | SKIP_PATCH
+| | [Tags] | 1_THREAD_NOHTT_RXQUEUES_1 | SINGLE_THREAD | NDR | LISP_IPv6oIPv4
 | | ${framesize}= | Set Variable | 1460
 | | ${min_rate}= | Set Variable | 10000
 | | ${max_rate}= | Set Variable | ${10Ge_lisp_iph_linerate_pps_1508B}
@@ -1860,6 +1900,7 @@
 | | ... | [Ver] Find PDR for 1460 Byte frames using binary search start
 | | ... | at 10GE linerate, step 10kpps, LT=0.5%.
 | | [Tags] | 1_THREAD_NOHTT_RXQUEUES_1 | SINGLE_THREAD | PDR | LISP_IPv6oIPv4
+| | ...    | SKIP_PATCH
 | | ${framesize}= | Set Variable | 1460
 | | ${min_rate}= | Set Variable | 10000
 | | ${max_rate}= | Set Variable | ${10Ge_lisp_iph_linerate_pps_1508B}
@@ -1892,7 +1933,7 @@
 | | ... | port.
 | | ... | [Ver] Find NDR for 9000 Byte frames using binary search start
 | | ... | at 10GE linerate, step 5kpps.
-| | [Tags] | 1_THREAD_NOHTT_RXQUEUES_1 | SINGLE_THREAD | NDR | LISP_IPv6oIPv4 | SKIP_PATCH
+| | [Tags] | 1_THREAD_NOHTT_RXQUEUES_1 | SINGLE_THREAD | NDR | LISP_IPv6oIPv4
 | | ${framesize}= | Set Variable | 9000
 | | ${min_rate}= | Set Variable | 5000
 | | ${max_rate}= | Set Variable | ${10Ge_lisp_iph_linerate_pps_9048B}
@@ -1923,6 +1964,7 @@
 | | ... | [Ver] Find PDR for 9000 Byte frames using binary search start
 | | ... | at 10GE linerate, step 5kpps, LT=0.5%.
 | | [Tags] | 1_THREAD_NOHTT_RXQUEUES_1 | SINGLE_THREAD | PDR | LISP_IPv6oIPv4
+| | ...    | SKIP_PATCH
 | | ${framesize}= | Set Variable | 9000
 | | ${min_rate}= | Set Variable | 5000
 | | ${max_rate}= | Set Variable | ${10Ge_lisp_iph_linerate_pps_9048B}
@@ -1954,7 +1996,7 @@
 | | ... | port.
 | | ... | [Ver] Find NDR for 78 Byte frames using binary search start
 | | ... | at 10GE linerate, step 100kpps.
-| | [Tags] | 2_THREAD_NOHTT_RXQUEUES_1 | MULTI_THREAD | NDR | LISP_IPv6oIPv4 | SKIP_PATCH
+| | [Tags] | 2_THREAD_NOHTT_RXQUEUES_1 | MULTI_THREAD | NDR | LISP_IPv6oIPv4
 | | ${framesize}= | Set Variable | 78
 | | ${min_rate}= | Set Variable | 100000
 | | ${max_rate}= | Set Variable | ${10Ge_lisp_iph_linerate_pps_126B}
@@ -1986,6 +2028,7 @@
 | | ... | [Ver] Find PDR for 78 Byte frames using binary search start
 | | ... | at 10GE linerate, step 100kpps, LT=0.5%.
 | | [Tags] | 2_THREAD_NOHTT_RXQUEUES_1 | MULTI_THREAD | PDR | LISP_IPv6oIPv4
+| | ...    | SKIP_PATCH
 | | ${framesize}= | Set Variable | 78
 | | ${min_rate}= | Set Variable | 100000
 | | ${max_rate}= | Set Variable | ${10Ge_lisp_iph_linerate_pps_126B}
@@ -2018,7 +2061,8 @@
 | | ... | port.
 | | ... | [Ver] Find NDR for 1460 Byte frames using binary search start
 | | ... | at 10GE linerate, step 10kpps.
-| | [Tags] | 2_THREAD_NOHTT_RXQUEUES_1 | MULTI_THREAD | NDR | LISP_IPv6oIPv4 | SKIP_PATCH
+| | [Tags] | 2_THREAD_NOHTT_RXQUEUES_1 | MULTI_THREAD | NDR | LISP_IPv6oIPv4
+| | ...    | SKIP_PATCH
 | | ${framesize}= | Set Variable | 1460
 | | ${min_rate}= | Set Variable | 10000
 | | ${max_rate}= | Set Variable | ${10Ge_lisp_iph_linerate_pps_1508B}
@@ -2049,7 +2093,8 @@
 | | ... | port.
 | | ... | [Ver] Find PDR for 1460 Byte frames using binary search start
 | | ... | at 10GE linerate, step 10kpps, LT=0.5%.
-| | [Tags] | 2_THREAD_NOHTT_RXQUEUES_1 | MULTI_THREAD | PDR | LISP_IPv6oIPv4 | SKIP_PATCH
+| | [Tags] | 2_THREAD_NOHTT_RXQUEUES_1 | MULTI_THREAD | PDR | LISP_IPv6oIPv4
+| | ...    | SKIP_PATCH
 | | ${framesize}= | Set Variable | 1460
 | | ${min_rate}= | Set Variable | 10000
 | | ${max_rate}= | Set Variable | ${10Ge_lisp_iph_linerate_pps_1508B}
@@ -2082,7 +2127,8 @@
 | | ... | port.
 | | ... | [Ver] Find NDR for 9000 Byte frames using binary search start
 | | ... | at 10GE linerate, step 10kpps.
-| | [Tags] | 2_THREAD_NOHTT_RXQUEUES_1 | MULTI_THREAD | NDR | LISP_IPv6oIPv4 | SKIP_PATCH
+| | [Tags] | 2_THREAD_NOHTT_RXQUEUES_1 | MULTI_THREAD | NDR | LISP_IPv6oIPv4
+| | ...    | SKIP_PATCH
 | | ${framesize}= | Set Variable | 9000
 | | ${min_rate}= | Set Variable | 5000
 | | ${max_rate}= | Set Variable | ${10Ge_lisp_iph_linerate_pps_9048B}
@@ -2112,7 +2158,8 @@
 | | ... | port.
 | | ... | [Ver] Find PDR for 9000 Byte frames using binary search start
 | | ... | at 10GE linerate, step 5kpps, LT=0.5%.
-| | [Tags] | 2_THREAD_NOHTT_RXQUEUES_1 | MULTI_THREAD | PDR | LISP_IPv6oIPv4 | SKIP_PATCH
+| | [Tags] | 2_THREAD_NOHTT_RXQUEUES_1 | MULTI_THREAD | PDR | LISP_IPv6oIPv4
+| | ...    | SKIP_PATCH
 | | ${framesize}= | Set Variable | 9000
 | | ${min_rate}= | Set Variable | 5000
 | | ${max_rate}= | Set Variable | ${10Ge_lisp_iph_linerate_pps_9048B}
@@ -2144,7 +2191,7 @@
 | | ... | port.
 | | ... | [Ver] Find NDR for 78 Byte frames using binary search start
 | | ... | at 10GE linerate, step 100kpps.
-| | [Tags] | 4_THREAD_NOHTT_RXQUEUES_2 | MULTI_THREAD | NDR | LISP_IPv6oIPv4 | SKIP_PATCH
+| | [Tags] | 4_THREAD_NOHTT_RXQUEUES_2 | MULTI_THREAD | NDR | LISP_IPv6oIPv4
 | | ${framesize}= | Set Variable | 78
 | | ${min_rate}= | Set Variable | 100000
 | | ${max_rate}= | Set Variable | ${10Ge_lisp_iph_linerate_pps_126B}
@@ -2176,6 +2223,7 @@
 | | ... | [Ver] Find PDR for 78 Byte frames using binary search start
 | | ... | at 10GE linerate, step 100kpps, LT=0.5%.
 | | [Tags] | 4_THREAD_NOHTT_RXQUEUES_2 | MULTI_THREAD | PDR | LISP_IPv6oIPv4
+| | ...    | SKIP_PATCH
 | | ${framesize}= | Set Variable | 78
 | | ${min_rate}= | Set Variable | 100000
 | | ${max_rate}= | Set Variable | ${10Ge_lisp_iph_linerate_pps_126B}
@@ -2208,7 +2256,8 @@
 | | ... | port.
 | | ... | [Ver] Find NDR for 1460 Byte frames using binary search start
 | | ... | at 10GE linerate, step 10kpps.
-| | [Tags] | 4_THREAD_NOHTT_RXQUEUES_2 | MULTI_THREAD | NDR | LISP_IPv6oIPv4 | SKIP_PATCH
+| | [Tags] | 4_THREAD_NOHTT_RXQUEUES_2 | MULTI_THREAD | NDR | LISP_IPv6oIPv4
+| | ...    | SKIP_PATCH
 | | ${framesize}= | Set Variable | 1460
 | | ${min_rate}= | Set Variable | 10000
 | | ${max_rate}= | Set Variable | ${10Ge_lisp_iph_linerate_pps_1508B}
@@ -2239,7 +2288,8 @@
 | | ... | port.
 | | ... | [Ver] Find PDR for 1460 Byte frames using binary search start
 | | ... | at 10GE linerate, step 10kpps, LT=0.5%.
-| | [Tags] | 4_THREAD_NOHTT_RXQUEUES_2 | MULTI_THREAD | PDR | LISP_IPv6oIPv4 | SKIP_PATCH
+| | [Tags] | 4_THREAD_NOHTT_RXQUEUES_2 | MULTI_THREAD | PDR | LISP_IPv6oIPv4
+| | ...    | SKIP_PATCH
 | | ${framesize}= | Set Variable | 1460
 | | ${min_rate}= | Set Variable | 10000
 | | ${max_rate}= | Set Variable | ${10Ge_lisp_iph_linerate_pps_1508B}
@@ -2272,7 +2322,8 @@
 | | ... | port.
 | | ... | [Ver] Find NDR for 9000 Byte frames using binary search start
 | | ... | at 10GE linerate, step 5kpps.
-| | [Tags] | 4_THREAD_NOHTT_RXQUEUES_2 | MULTI_THREAD | NDR | LISP_IPv6oIPv4 | SKIP_PATCH
+| | [Tags] | 4_THREAD_NOHTT_RXQUEUES_2 | MULTI_THREAD | NDR | LISP_IPv6oIPv4
+| | ...    | SKIP_PATCH
 | | ${framesize}= | Set Variable | 9000
 | | ${min_rate}= | Set Variable | 5000
 | | ${max_rate}= | Set Variable | ${10Ge_lisp_iph_linerate_pps_9048B}
@@ -2302,7 +2353,8 @@
 | | ... | port.
 | | ... | [Ver] Find PDR for 9000 Byte frames using binary search start
 | | ... | at 10GE linerate, step 5kpps, LT=0.5%.
-| | [Tags] | 4_THREAD_NOHTT_RXQUEUES_2 | MULTI_THREAD | PDR | LISP_IPv6oIPv4 | SKIP_PATCH
+| | [Tags] | 4_THREAD_NOHTT_RXQUEUES_2 | MULTI_THREAD | PDR | LISP_IPv6oIPv4
+| | ...    | SKIP_PATCH
 | | ${framesize}= | Set Variable | 9000
 | | ${min_rate}= | Set Variable | 5000
 | | ${max_rate}= | Set Variable | ${10Ge_lisp_iph_linerate_pps_9048B}
diff --git a/tests/perf/Long_Xconnect_Intel-XL710.robot b/tests/perf/Long_Xconnect_Intel-XL710.robot
index d39fde9f2d..70514c5197 100644
--- a/tests/perf/Long_Xconnect_Intel-XL710.robot
+++ b/tests/perf/Long_Xconnect_Intel-XL710.robot
@@ -122,7 +122,7 @@
 | | ... | [Cfg] DUT runs L2XC switching config with 2 threads, 2 phy cores, \
 | | ... | 1 receive queue per NIC port. [Ver] Find NDR for 1518 Byte frames
 | | ... | using binary search start at 10GE linerate, step 10kpps.
-| | [Tags] | 2_THREAD_NOHTT_RXQUEUES_1 | MULTI_THREAD | NDR
+| | [Tags] | 2_THREAD_NOHTT_RXQUEUES_1 | MULTI_THREAD | NDR | SKIP_PATCH
 | | ${framesize}= | Set Variable | 1518
 | | ${min_rate}= | Set Variable | 10000
 | | ${max_rate}= | Calculate pps | ${s_24.5G} | ${framesize}
@@ -166,7 +166,7 @@
 | | ... | [Cfg] DUT runs L2XC switching config with 4 threads, 4 phy cores, \
 | | ... | 2 receive queues per NIC port. [Ver] Find NDR for 1518 Byte frames
 | | ... | using binary search start at 10GE linerate, step 10kpps.
-| | [Tags] | 4_THREAD_NOHTT_RXQUEUES_2 | MULTI_THREAD | NDR
+| | [Tags] | 4_THREAD_NOHTT_RXQUEUES_2 | MULTI_THREAD | NDR | SKIP_PATCH
 | | ${framesize}= | Set Variable | 1518
 | | ${min_rate}= | Set Variable | 10000
 | | ${max_rate}= | Calculate pps | ${s_24.5G} | ${framesize}
@@ -212,7 +212,7 @@
 | | ... | 1 receive queue per NIC port. [Ver] Find NDR for IMIX_v4_1 frame size
 | | ... | using binary search start at 10GE linerate, step 100kpps.
 | | ... | IMIX_v4_1 = (28x64B;16x570B;4x1518B)
-| | [Tags] | 2_THREAD_NOHTT_RXQUEUES_1 | MULTI_THREAD | NDR
+| | [Tags] | 2_THREAD_NOHTT_RXQUEUES_1 | MULTI_THREAD | NDR | SKIP_PATCH
 | | ${framesize}= | Set Variable | IMIX_v4_1
 | | ${min_rate}= | Set Variable | 100000
 | | ${max_rate}= | Calculate pps | ${s_24.5G} | ${353.83333}
@@ -235,7 +235,7 @@
 | | ... | 2 receive queue per NIC port. [Ver] Find NDR for IMIX_v4_1 frame size
 | | ... | using binary search start at 10GE linerate, step 100kpps.
 | | ... | IMIX_v4_1 = (28x64B;16x570B;4x1518B)
-| | [Tags] | 4_THREAD_NOHTT_RXQUEUES_2 | MULTI_THREAD | NDR
+| | [Tags] | 4_THREAD_NOHTT_RXQUEUES_2 | MULTI_THREAD | NDR | SKIP_PATCH
 | | ${framesize}= | Set Variable | IMIX_v4_1
 | | ${min_rate}= | Set Variable | 100000
 | | ${max_rate}= | Calculate pps | ${s_24.5G} | ${353.83333}