regression: slight fix to stl benchmark test

10 files changed, 51 insertions, 39 deletions

diff --git a/scripts/automation/regression/setups/kiwi02/benchmark.yaml b/scripts/automation/regression/setups/kiwi02/benchmark.yaml
index 49d86003..f6ad8e9a 100644
--- a/scripts/automation/regression/setups/kiwi02/benchmark.yaml
+++ b/scripts/automation/regression/setups/kiwi02/benchmark.yaml
@@ -185,10 +185,11 @@ test_CPU_benchmark:
         cpu_util        : 1
         bw_per_core     : 1
 
-      - name            : stl/udp_1pkt_simple.py
-        kwargs          : {packet_len: 9000, packet_count: 1000}
-        cpu_util        : 1
-        bw_per_core     : 1
+# not enough memory + queue full if memory increase
+#      - name            : stl/udp_1pkt_simple.py
+#        kwargs          : {packet_len: 9000, packet_count: 1000}
+#        cpu_util        : 1
+#        bw_per_core     : 1
 
       - name            : stl/imix.py
         cpu_util        : 1
diff --git a/scripts/automation/regression/setups/trex-dan/benchmark.yaml b/scripts/automation/regression/setups/trex-dan/benchmark.yaml
index 255fd1ba..d2af373c 100644
--- a/scripts/automation/regression/setups/trex-dan/benchmark.yaml
+++ b/scripts/automation/regression/setups/trex-dan/benchmark.yaml
@@ -190,10 +190,11 @@ test_CPU_benchmark:
         cpu_util        : 1
         bw_per_core     : 1
 
-      - name            : stl/udp_1pkt_simple.py
-        kwargs          : {packet_len: 9000, packet_count: 1000}
-        cpu_util        : 1
-        bw_per_core     : 1
+# not enough memory + queue full if memory increase
+#      - name            : stl/udp_1pkt_simple.py
+#        kwargs          : {packet_len: 9000, packet_count: 1000}
+#        cpu_util        : 1
+#        bw_per_core     : 1
 
       - name            : stl/imix.py
         cpu_util        : 1
diff --git a/scripts/automation/regression/setups/trex04/benchmark.yaml b/scripts/automation/regression/setups/trex04/benchmark.yaml
index bebaef07..e3a477f5 100644
--- a/scripts/automation/regression/setups/trex04/benchmark.yaml
+++ b/scripts/automation/regression/setups/trex04/benchmark.yaml
@@ -106,10 +106,11 @@ test_CPU_benchmark:
         cpu_util        : 1
         bw_per_core     : 1
 
-      - name            : stl/udp_1pkt_simple.py
-        kwargs          : {packet_len: 9000, packet_count: 1000}
-        cpu_util        : 1
-        bw_per_core     : 1
+# not enough memory + queue full if memory increase
+#      - name            : stl/udp_1pkt_simple.py
+#        kwargs          : {packet_len: 9000, packet_count: 1000}
+#        cpu_util        : 1
+#        bw_per_core     : 1
 
       - name            : stl/imix.py
         cpu_util        : 1
@@ -151,7 +152,7 @@ test_CPU_benchmark:
         bw_per_core     : 1
 
       - name            : stl/pcap.py
-        kwargs          : {ipg_usec: 2, loop_count: 0}
+        kwargs          : {ipg_usec: 4, loop_count: 0}
         cpu_util        : 1
         bw_per_core     : 1
 
diff --git a/scripts/automation/regression/setups/trex08/benchmark.yaml b/scripts/automation/regression/setups/trex08/benchmark.yaml
index 19749848..97db6598 100644
--- a/scripts/automation/regression/setups/trex08/benchmark.yaml
+++ b/scripts/automation/regression/setups/trex08/benchmark.yaml
@@ -114,10 +114,11 @@ test_CPU_benchmark:
         cpu_util        : 1
         bw_per_core     : 1
 
-      - name            : stl/udp_1pkt_simple.py
-        kwargs          : {packet_len: 9000, packet_count: 1000}
-        cpu_util        : 1
-        bw_per_core     : 1
+# not enough memory + queue full if memory increase
+#      - name            : stl/udp_1pkt_simple.py
+#        kwargs          : {packet_len: 9000, packet_count: 1000}
+#        cpu_util        : 1
+#        bw_per_core     : 1
 
       - name            : stl/imix.py
         cpu_util        : 1
diff --git a/scripts/automation/regression/setups/trex09/benchmark.yaml b/scripts/automation/regression/setups/trex09/benchmark.yaml
index b5397a9f..8522f1bf 100644
--- a/scripts/automation/regression/setups/trex09/benchmark.yaml
+++ b/scripts/automation/regression/setups/trex09/benchmark.yaml
@@ -114,10 +114,11 @@ test_CPU_benchmark:
         cpu_util        : 1
         bw_per_core     : 1
 
-      - name            : stl/udp_1pkt_simple.py
-        kwargs          : {packet_len: 9000, packet_count: 1000}
-        cpu_util        : 1
-        bw_per_core     : 1
+# not enough memory + queue full if memory increase
+#      - name            : stl/udp_1pkt_simple.py
+#        kwargs          : {packet_len: 9000, packet_count: 1000}
+#        cpu_util        : 1
+#        bw_per_core     : 1
 
       - name            : stl/imix.py
         cpu_util        : 1
diff --git a/scripts/automation/regression/setups/trex12/benchmark.yaml b/scripts/automation/regression/setups/trex12/benchmark.yaml
index 5a30214c..084b57de 100644
--- a/scripts/automation/regression/setups/trex12/benchmark.yaml
+++ b/scripts/automation/regression/setups/trex12/benchmark.yaml
@@ -121,10 +121,11 @@ test_CPU_benchmark:
         cpu_util        : 1
         bw_per_core     : 1
 
-      - name            : stl/udp_1pkt_simple.py
-        kwargs          : {packet_len: 9000, packet_count: 1000}
-        cpu_util        : 1
-        bw_per_core     : 1
+# not enough memory + queue full if memory increase
+#      - name            : stl/udp_1pkt_simple.py
+#        kwargs          : {packet_len: 9000, packet_count: 1000}
+#        cpu_util        : 1
+#        bw_per_core     : 1
 
       - name            : stl/imix.py
         cpu_util        : 1
diff --git a/scripts/automation/regression/setups/trex14/benchmark.yaml b/scripts/automation/regression/setups/trex14/benchmark.yaml
index 5857cd2c..a63abc61 100644
--- a/scripts/automation/regression/setups/trex14/benchmark.yaml
+++ b/scripts/automation/regression/setups/trex14/benchmark.yaml
@@ -184,10 +184,11 @@ test_CPU_benchmark:
         cpu_util        : 1
         bw_per_core     : 1
 
-      - name            : stl/udp_1pkt_simple.py
-        kwargs          : {packet_len: 9000, packet_count: 1000}
-        cpu_util        : 1
-        bw_per_core     : 1
+# not enough memory + queue full if memory increase
+#      - name            : stl/udp_1pkt_simple.py
+#        kwargs          : {packet_len: 9000, packet_count: 1000}
+#        cpu_util        : 1
+#        bw_per_core     : 1
 
       - name            : stl/imix.py
         cpu_util        : 1
diff --git a/scripts/automation/regression/setups/trex17/benchmark.yaml b/scripts/automation/regression/setups/trex17/benchmark.yaml
index 1d792fe5..219a01ed 100644
--- a/scripts/automation/regression/setups/trex17/benchmark.yaml
+++ b/scripts/automation/regression/setups/trex17/benchmark.yaml
@@ -94,10 +94,11 @@ test_CPU_benchmark:
         cpu_util        : 1
         bw_per_core     : 1
 
-      - name            : stl/udp_1pkt_simple.py
-        kwargs          : {packet_len: 9000, packet_count: 1000}
-        cpu_util        : 1
-        bw_per_core     : 1
+# not enough memory + queue full if memory increase
+#      - name            : stl/udp_1pkt_simple.py
+#        kwargs          : {packet_len: 9000, packet_count: 1000}
+#        cpu_util        : 1
+#        bw_per_core     : 1
 
       - name            : stl/imix.py
         cpu_util        : 1
diff --git a/scripts/automation/regression/setups/trex25/benchmark.yaml b/scripts/automation/regression/setups/trex25/benchmark.yaml
index 6a0021de..756c1501 100644
--- a/scripts/automation/regression/setups/trex25/benchmark.yaml
+++ b/scripts/automation/regression/setups/trex25/benchmark.yaml
@@ -189,10 +189,11 @@ test_CPU_benchmark:
         cpu_util        : 1
         bw_per_core     : 1
 
-      - name            : stl/udp_1pkt_simple.py
-        kwargs          : {packet_len: 9000, packet_count: 1000}
-        cpu_util        : 1
-        bw_per_core     : 1
+# not enough memory + queue full if memory increase
+#      - name            : stl/udp_1pkt_simple.py
+#        kwargs          : {packet_len: 9000, packet_count: 1000}
+#        cpu_util        : 1
+#        bw_per_core     : 1
 
       - name            : stl/imix.py
         cpu_util        : 1
diff --git a/scripts/automation/regression/stateless_tests/stl_benchmark_test.py b/scripts/automation/regression/stateless_tests/stl_benchmark_test.py
index d4cf4a05..258717dc 100755
--- a/scripts/automation/regression/stateless_tests/stl_benchmark_test.py
+++ b/scripts/automation/regression/stateless_tests/stl_benchmark_test.py
@@ -41,8 +41,11 @@ class STLBenchmark_Test(CStlGeneral_Test):
                 raise Exception('CPU util is zero, last values: %s' % cpu_utils)
             if not stats['global']['tx_bps']:
                 raise Exception('TX bps is zero: %s' % stats['global']['tx_bps'])
-
-            bw_per_core = 100 * stats['global']['tx_bps'] / cpu_utils[-1] / 1e6
+            bw_per_core = 2 * 2 * 100 * stats['global']['tx_bps'] / (cpu_utils[-1] * self.stl_trex.get_port_count() * 1e6)
             print('Done (%ss), CPU util: %4g, bw_per_core: %6sMb/core' % (int(time() - start_time), cpu_utils[-1], int(bw_per_core)))
             # TODO: add check of benchmark based on results from regression
 
+        self.stl_trex.reset()
+        self.stl_trex.clear_stats()
+
+