selftests: spectrum-2: Extend and move trace helpers

Allow to specify number of trace hits and move helpers
to the beginning of the file.

Signed-off-by: Jiri Pirko <jiri@mellanox.com>
Signed-off-by: Ido Schimmel <idosch@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/tools/testing/selftests/drivers/net/mlxsw/spectrum-2/tc_flower.sh b/tools/testing/selftests/drivers/net/mlxsw/spectrum-2/tc_flower.sh
index b41d6256b2d0411dfe581784d04433bb08d10dea..ed1ae902f2af8c26ac829023e1dafe6d2ee2e6f3 100755 (executable)
--- a/tools/testing/selftests/drivers/net/mlxsw/spectrum-2/tc_flower.sh
+++ b/tools/testing/selftests/drivers/net/mlxsw/spectrum-2/tc_flower.sh
@@ -38,6 +38,55 @@ h2_destroy()
        simple_if_fini $h2 192.0.2.2/24 198.51.100.2/24
 }
 
+tp_record()
+{
+       local tracepoint=$1
+       local cmd=$2
+
+       perf record -q -e $tracepoint $cmd
+       return $?
+}
+
+tp_record_all()
+{
+       local tracepoint=$1
+       local seconds=$2
+
+       perf record -a -q -e $tracepoint sleep $seconds
+       return $?
+}
+
+__tp_hit_count()
+{
+       local tracepoint=$1
+
+       local perf_output=`perf script -F trace:event,trace`
+       return `echo $perf_output | grep "$tracepoint:" | wc -l`
+}
+
+tp_check_hits()
+{
+       local tracepoint=$1
+       local count=$2
+
+       __tp_hit_count $tracepoint
+       if [[ "$?" -ne "$count" ]]; then
+               return 1
+       fi
+       return 0
+}
+
+tp_check_hits_any()
+{
+       local tracepoint=$1
+
+       __tp_hit_count $tracepoint
+       if [[ "$?" -eq "0" ]]; then
+               return 1
+       fi
+       return 0
+}
+
 single_mask_test()
 {
        # When only a single mask is required, the device uses the master
@@ -325,28 +374,6 @@ ctcam_edge_cases_test()
        ctcam_no_atcam_masks_test
 }
 
-tp_record()
-{
-       local tracepoint=$1
-       local cmd=$2
-
-       perf record -q -e $tracepoint $cmd
-       return $?
-}
-
-tp_check_hits()
-{
-       local tracepoint=$1
-       local count=$2
-
-       perf_output=`perf script -F trace:event,trace`
-       hits=`echo $perf_output | grep "$tracepoint:" | wc -l`
-       if [[ "$count" -ne "$hits" ]]; then
-               return 1
-       fi
-       return 0
-}
-
 delta_simple_test()
 {
        # The first filter will create eRP, the second filter will fit into