Commit d3e104bb authored by Ian Rogers's avatar Ian Rogers Committed by Arnaldo Carvalho de Melo

perf tests stat+csv_output: Switch CSV separator to @

Commas may appear in events like:

  cpu/INT_MISC.RECOVERY_CYCLES,cmask=1,edge/

which causes the commachecker to see more fields than expected. Use @ as
the CSV separator to avoid this.
Signed-off-by: default avatarIan Rogers <irogers@google.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Athira Rajeev <atrajeev@linux.vnet.ibm.com>
Cc: Claire Jensen <cjense@google.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Sumanth Korikkar <sumanthk@linux.ibm.com>
Cc: Thomas Richter <tmricht@linux.ibm.com>
Link: https://lore.kernel.org/r/20230223071818.329671-1-irogers@google.comSigned-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent ce9f1c05
...@@ -7,6 +7,7 @@ ...@@ -7,6 +7,7 @@
set -e set -e
skip_test=0 skip_test=0
csv_sep=@
function commachecker() function commachecker()
{ {
...@@ -34,7 +35,7 @@ function commachecker() ...@@ -34,7 +35,7 @@ function commachecker()
[ "$x" = "Failed" ] && continue [ "$x" = "Failed" ] && continue
# Count the number of commas # Count the number of commas
x=$(echo $line | tr -d -c ',') x=$(echo $line | tr -d -c $csv_sep)
cnt="${#x}" cnt="${#x}"
# echo $line $cnt # echo $line $cnt
[[ ! "$cnt" =~ $exp ]] && { [[ ! "$cnt" =~ $exp ]] && {
...@@ -54,7 +55,7 @@ function ParanoidAndNotRoot() ...@@ -54,7 +55,7 @@ function ParanoidAndNotRoot()
check_no_args() check_no_args()
{ {
echo -n "Checking CSV output: no args " echo -n "Checking CSV output: no args "
perf stat -x, true 2>&1 | commachecker --no-args perf stat -x$csv_sep true 2>&1 | commachecker --no-args
echo "[Success]" echo "[Success]"
} }
...@@ -66,7 +67,7 @@ check_system_wide() ...@@ -66,7 +67,7 @@ check_system_wide()
echo "[Skip] paranoid and not root" echo "[Skip] paranoid and not root"
return return
fi fi
perf stat -x, -a true 2>&1 | commachecker --system-wide perf stat -x$csv_sep -a true 2>&1 | commachecker --system-wide
echo "[Success]" echo "[Success]"
} }
...@@ -79,14 +80,14 @@ check_system_wide_no_aggr() ...@@ -79,14 +80,14 @@ check_system_wide_no_aggr()
return return
fi fi
echo -n "Checking CSV output: system wide no aggregation " echo -n "Checking CSV output: system wide no aggregation "
perf stat -x, -A -a --no-merge true 2>&1 | commachecker --system-wide-no-aggr perf stat -x$csv_sep -A -a --no-merge true 2>&1 | commachecker --system-wide-no-aggr
echo "[Success]" echo "[Success]"
} }
check_interval() check_interval()
{ {
echo -n "Checking CSV output: interval " echo -n "Checking CSV output: interval "
perf stat -x, -I 1000 true 2>&1 | commachecker --interval perf stat -x$csv_sep -I 1000 true 2>&1 | commachecker --interval
echo "[Success]" echo "[Success]"
} }
...@@ -94,7 +95,7 @@ check_interval() ...@@ -94,7 +95,7 @@ check_interval()
check_event() check_event()
{ {
echo -n "Checking CSV output: event " echo -n "Checking CSV output: event "
perf stat -x, -e cpu-clock true 2>&1 | commachecker --event perf stat -x$csv_sep -e cpu-clock true 2>&1 | commachecker --event
echo "[Success]" echo "[Success]"
} }
...@@ -106,7 +107,7 @@ check_per_core() ...@@ -106,7 +107,7 @@ check_per_core()
echo "[Skip] paranoid and not root" echo "[Skip] paranoid and not root"
return return
fi fi
perf stat -x, --per-core -a true 2>&1 | commachecker --per-core perf stat -x$csv_sep --per-core -a true 2>&1 | commachecker --per-core
echo "[Success]" echo "[Success]"
} }
...@@ -118,7 +119,7 @@ check_per_thread() ...@@ -118,7 +119,7 @@ check_per_thread()
echo "[Skip] paranoid and not root" echo "[Skip] paranoid and not root"
return return
fi fi
perf stat -x, --per-thread -a true 2>&1 | commachecker --per-thread perf stat -x$csv_sep --per-thread -a true 2>&1 | commachecker --per-thread
echo "[Success]" echo "[Success]"
} }
...@@ -130,7 +131,7 @@ check_per_die() ...@@ -130,7 +131,7 @@ check_per_die()
echo "[Skip] paranoid and not root" echo "[Skip] paranoid and not root"
return return
fi fi
perf stat -x, --per-die -a true 2>&1 | commachecker --per-die perf stat -x$csv_sep --per-die -a true 2>&1 | commachecker --per-die
echo "[Success]" echo "[Success]"
} }
...@@ -142,7 +143,7 @@ check_per_node() ...@@ -142,7 +143,7 @@ check_per_node()
echo "[Skip] paranoid and not root" echo "[Skip] paranoid and not root"
return return
fi fi
perf stat -x, --per-node -a true 2>&1 | commachecker --per-node perf stat -x$csv_sep --per-node -a true 2>&1 | commachecker --per-node
echo "[Success]" echo "[Success]"
} }
...@@ -154,7 +155,7 @@ check_per_socket() ...@@ -154,7 +155,7 @@ check_per_socket()
echo "[Skip] paranoid and not root" echo "[Skip] paranoid and not root"
return return
fi fi
perf stat -x, --per-socket -a true 2>&1 | commachecker --per-socket perf stat -x$csv_sep --per-socket -a true 2>&1 | commachecker --per-socket
echo "[Success]" echo "[Success]"
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment