Skip to contentSkip to conversation

perf test: Add skip to --per-thread test

PATCH Superseded Ian Rogers 2 participants 3 messages Apr 29, 2022 – May 3, 2022 perf events

v1 of 3 Superseded Latest is v3 →

lore
Share & tools
lore

Ian Rogers

author reviewer
#0 lore raw

PATCH 1/1 perf test: Add skip to --per-thread test

As reported in:
https://lore.kernel.org/linux-perf-users/[email protected]/
the 'instructions:u' event may not be supported. Add a skip using 'perf stat'.

Switch some code away from pipe to make the failures clearer.

---
 tools/perf/tests/shell/record.sh | 44 +++++++++++++++++++++++++++++---
 1 file changed, 41 insertions(+), 3 deletions(-)
tools/perf/tests/shell/record.sh +41 -3
index cd1cf14259b8..efc0cb07a929 100755
@@ -5,11 +5,43 @@
 set -e
 
 err=0
+perfdata=$(mktemp /tmp/__perf_test.perf.data.XXXXX)
+
+cleanup() {
+  rm -f ${perfdata}
+  rm -f ${perfdata}.old
+  trap - exit term int
+}
+
+trap_cleanup() {
+  cleanup
+  exit 1
+}
+trap trap_cleanup exit term int
+
 test_per_thread() {
   echo "Basic --per-thread mode test"
-  perf record -e instructions:u --per-thread -o- true 2> /dev/null \
-    | perf report -i- -q \
-    | egrep -q true
+  if ! perf stat -e instructions:u --quiet true
+  then
+    echo "Per-thread record [Skipped instructions:u not supported]"
+    if [ $err -ne 1 ]
+    then
+      err=2
+    fi
+    return
+  fi
+  if ! perf record -e instructions:u --per-thread -o ${perfdata} true 2> /dev/null
+  then
+    echo "Per-thread record of instructions:u [Failed]"
+    err=1
+    return
+  fi
+  if ! perf report -i ${perfdata} -q | egrep -q true
+  then
+    echo "Per-thread record [Failed missing output]"
+    err=1
+    return
+  fi
   echo "Basic --per-thread mode test [Success]"
 }
 
@@ -18,6 +50,10 @@ test_register_capture() {
   if ! perf list | egrep -q 'br_inst_retired.near_call'
   then
     echo "Register capture test [Skipped missing instruction]"
+    if [ $err -ne 1 ]
+    then
+      err=2
+    fi
     return
   fi
   if ! perf record --intr-regs=\? 2>&1 | egrep -q 'available registers: AX BX CX DX SI DI BP SP IP FLAGS CS SS R8 R9 R10 R11 R12 R13 R14 R15'
@@ -39,4 +75,6 @@ test_register_capture() {
 
 test_per_thread
 test_register_capture
+
+cleanup
 exit $err
Signature · 1 line
2.36.0.464.gb9c8b46e94-goog
Tested-by on v1 1/1
#1 lore raw
Quoted 76 lines · Ian Rogers

As reported in:
https://lore.kernel.org/linux-perf-users/[email protected]/
the 'instructions:u' event may not be supported. Add a skip using 'perf stat'.

Switch some code away from pipe to make the failures clearer.

---
 tools/perf/tests/shell/record.sh | 44 +++++++++++++++++++++++++++++---
 1 file changed, 41 insertions(+), 3 deletions(-)
tools/perf/tests/shell/record.sh +39 -3
index cd1cf14259b8..efc0cb07a929 100755
@@ -5,11 +5,43 @@
 set -e
 
 err=0
+perfdata=$(mktemp /tmp/__perf_test.perf.data.XXXXX)
+
+cleanup() {
+  rm -f ${perfdata}
+  rm -f ${perfdata}.old
+  trap - exit term int
+}
+
+trap_cleanup() {
+  cleanup
+  exit 1
+}
+trap trap_cleanup exit term int
+
 test_per_thread() {
   echo "Basic --per-thread mode test"
-  perf record -e instructions:u --per-thread -o- true 2> /dev/null \
-    | perf report -i- -q \
-    | egrep -q true
+  if ! perf stat -e instructions:u --quiet true
+  then
+    echo "Per-thread record [Skipped instructions:u not supported]"
+    if [ $err -ne 1 ]
+    then
+      err=2
+    fi
+    return
+  fi
+  if ! perf record -e instructions:u --per-thread -o ${perfdata} true 2> /dev/null
+  then
+    echo "Per-thread record of instructions:u [Failed]"
+    err=1
+    return
+  fi
+  if ! perf report -i ${perfdata} -q | egrep -q true
+  then
+    echo "Per-thread record [Failed missing output]"
+    err=1
+    return
+  fi
   echo "Basic --per-thread mode test [Success]"
 }
 
@@ -18,6 +50,10 @@ test_register_capture() {
   if ! perf list | egrep -q 'br_inst_retired.near_call'
   then
     echo "Register capture test [Skipped missing instruction]"
+    if [ $err -ne 1 ]
+    then
+      err=2
+    fi
     return
   fi
   if ! perf record --intr-regs=\? 2>&1 | egrep -q 'available registers: AX BX CX DX SI DI BP SP IP FLAGS CS SS R8 R9 R10 R11 R12 R13 R14 R15'

tools/perf/tests/shell/record.sh test_register_capture() { · line 80

Quoted 6 lines
tools/perf/tests/shell/record.sh +2 -0
@@ -39,4 +75,6 @@ test_register_capture() {
 
 test_per_thread
 test_register_capture
+
+cleanup
 exit $err

Ian,

thanks very much for looking into this.
I have tested your patch on several configurations and to be perfect, please change this line:

# git diff
tools/perf/tests/shell/record.sh +1 -1
index efc0cb07a929..9cb8494f314d 100755
@@ -21,7 +21,7 @@ trap trap_cleanup exit term int
 
 test_per_thread() {
   echo "Basic --per-thread mode test"
-  if ! perf stat -e instructions:u --quiet true
+  if ! perf record -e instructions:u --quiet true 2> /dev/null
   then
     echo "Per-thread record [Skipped instructions:u not supported]"
     if [ $err -ne 1 ]

#

This runs fine, just use record instead of stat, you use perf record later on anyway.

With this change you have my

Signature · 5 lines
Thomas Richter, Dept 3303, IBM s390 Linux Development, Boeblingen, Germany
--
Vorsitzender des Aufsichtsrats: Gregor Pillen
Geschäftsführung: David Faller
Sitz der Gesellschaft: Böblingen / Registergericht: Amtsgericht Stuttgart, HRB 243294
author reviewer
#2 lore raw
Quoted 106 lines · Thomas Richter
Quoted 76 lines · Ian Rogers

As reported in:
https://lore.kernel.org/linux-perf-users/[email protected]/
the 'instructions:u' event may not be supported. Add a skip using 'perf stat'.

Switch some code away from pipe to make the failures clearer.

---
 tools/perf/tests/shell/record.sh | 44 +++++++++++++++++++++++++++++---
 1 file changed, 41 insertions(+), 3 deletions(-)
tools/perf/tests/shell/record.sh +39 -3
index cd1cf14259b8..efc0cb07a929 100755
@@ -5,11 +5,43 @@
 set -e
 
 err=0
+perfdata=$(mktemp /tmp/__perf_test.perf.data.XXXXX)
+
+cleanup() {
+  rm -f ${perfdata}
+  rm -f ${perfdata}.old
+  trap - exit term int
+}
+
+trap_cleanup() {
+  cleanup
+  exit 1
+}
+trap trap_cleanup exit term int
+
 test_per_thread() {
   echo "Basic --per-thread mode test"
-  perf record -e instructions:u --per-thread -o- true 2> /dev/null \
-    | perf report -i- -q \
-    | egrep -q true
+  if ! perf stat -e instructions:u --quiet true
+  then
+    echo "Per-thread record [Skipped instructions:u not supported]"
+    if [ $err -ne 1 ]
+    then
+      err=2
+    fi
+    return
+  fi
+  if ! perf record -e instructions:u --per-thread -o ${perfdata} true 2> /dev/null
+  then
+    echo "Per-thread record of instructions:u [Failed]"
+    err=1
+    return
+  fi
+  if ! perf report -i ${perfdata} -q | egrep -q true
+  then
+    echo "Per-thread record [Failed missing output]"
+    err=1
+    return
+  fi
   echo "Basic --per-thread mode test [Success]"
 }
 
@@ -18,6 +50,10 @@ test_register_capture() {
   if ! perf list | egrep -q 'br_inst_retired.near_call'
   then
     echo "Register capture test [Skipped missing instruction]"
+    if [ $err -ne 1 ]
+    then
+      err=2
+    fi
     return
   fi
   if ! perf record --intr-regs=\? 2>&1 | egrep -q 'available registers: AX BX CX DX SI DI BP SP IP FLAGS CS SS R8 R9 R10 R11 R12 R13 R14 R15'

tools/perf/tests/shell/record.sh test_register_capture() { · line 80

Quoted 6 lines
tools/perf/tests/shell/record.sh +2 -0
@@ -39,4 +75,6 @@ test_register_capture() {
 
 test_per_thread
 test_register_capture
+
+cleanup
 exit $err

Ian,

thanks very much for looking into this.
I have tested your patch on several configurations and to be perfect, please change this line:

# git diff
tools/perf/tests/shell/record.sh +1 -1
index efc0cb07a929..9cb8494f314d 100755
@@ -21,7 +21,7 @@ trap trap_cleanup exit term int
 
 test_per_thread() {
   echo "Basic --per-thread mode test"
-  if ! perf stat -e instructions:u --quiet true
+  if ! perf record -e instructions:u --quiet true 2> /dev/null
   then
     echo "Per-thread record [Skipped instructions:u not supported]"
     if [ $err -ne 1 ]

#

Quoted 5 lines

This runs fine, just use record instead of stat, you use perf record later on anyway.

With this change you have my

Thanks! Done, but I also add a '-o' in v2 so the perf.data file is cleaned up by the cleanup function.

Ian

Quoted 6 lines

--
Thomas Richter, Dept 3303, IBM s390 Linux Development, Boeblingen, Germany --
Vorsitzender des Aufsichtsrats: Gregor Pillen
Geschäftsführung: David Faller
Sitz der Gesellschaft: Böblingen / Registergericht: Amtsgericht Stuttgart, HRB 243294