1. Patchew
  2. linux
  3. View series

[PATCH] perf/test: Speed up test case perf annotate basic tests

Thomas Richter posted 1 patch 2 months, 1 week ago 
tools/perf/tests/shell/annotate.sh | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
[PATCH] perf/test: Speed up test case perf annotate basic tests
Posted by Thomas Richter 2 months, 1 week ago 
perf test 70 takes a long time. One culprit is the output of command
perf annotate. Per default enabled are
 - demangle symbol names
 - interleave source code with assembly code.
Disable demangle of symbols and abort the annotation
after the first 250 lines.

This speeds up the test case considerable, for example
on s390:

Output before:
 # time  perf test 70
 70: perf annotate basic tests             : Ok
 .....
 real   2m7.467s
 user   1m26.869s
 sys    0m34.086s
 #

 Output after:
 # time perf test 70
 70: perf annotate basic tests             : Ok

 real   0m3.341s
 user   0m1.606s
 sys    0m0.362s
 #

Signed-off-by: Thomas Richter <tmricht@linux.ibm.com>
Suggested-by: Namhyung Kim <namhyung@kernel.org>
Cc: Heiko Carstens <hca@linux.ibm.com>
Cc: Vasily Gorbik <gor@linux.ibm.com>
Cc: Alexander Gordeev <agordeev@linux.ibm.com>
---
 tools/perf/tests/shell/annotate.sh | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/tools/perf/tests/shell/annotate.sh b/tools/perf/tests/shell/annotate.sh
index b072d9b97387..b28cd95b1d83 100755
--- a/tools/perf/tests/shell/annotate.sh
+++ b/tools/perf/tests/shell/annotate.sh
@@ -43,7 +43,7 @@ test_basic() {
   fi
 
   # Generate the annotated output file
-  perf annotate -i "${perfdata}" --stdio 2> /dev/null > "${perfout}"
+  perf annotate --no-demangle -i "${perfdata}" --stdio 2> /dev/null | head -250 > "${perfout}"
 
   # check if it has the target symbol
   if ! grep "${testsym}" "${perfout}"
@@ -62,8 +62,8 @@ test_basic() {
   fi
 
   # check again with a target symbol name
-  if ! perf annotate -i "${perfdata}" "${testsym}" 2> /dev/null | \
-	  grep -m 3 "${disasm_regex}"
+  if ! perf annotate --no-demangle -i "${perfdata}" "${testsym}" 2> /dev/null | \
+	  head -250 | grep -m 3 "${disasm_regex}"
   then
     echo "Basic annotate [Failed: missing disasm output when specifying the target symbol]"
     err=1
@@ -71,8 +71,8 @@ test_basic() {
   fi
 
   # check one more with external objdump tool (forced by --objdump option)
-  if ! perf annotate -i "${perfdata}" --objdump=objdump 2> /dev/null | \
-	  grep -m 3 "${disasm_regex}"
+  if ! perf annotate --no-demangle -i "${perfdata}" --objdump=objdump 2> /dev/null | \
+	  head -250 | grep -m 3 "${disasm_regex}"
   then
     echo "Basic annotate [Failed: missing disasm output from non default disassembler (using --objdump)]"
     err=1
-- 
2.46.0
Re: [PATCH] perf/test: Speed up test case perf annotate basic tests
Posted by Namhyung Kim 2 months ago 
On Tue, 17 Sep 2024 10:57:06 +0200, Thomas Richter wrote:

> perf test 70 takes a long time. One culprit is the output of command
> perf annotate. Per default enabled are
>  - demangle symbol names
>  - interleave source code with assembly code.
> Disable demangle of symbols and abort the annotation
> after the first 250 lines.
> 
> [...]

Applied to perf-tools-next, thanks!

Best regards,
Namhyung
Re: [PATCH] perf/test: Speed up test case perf annotate basic tests
Posted by James Clark 2 months, 1 week ago 

On 17/09/2024 09:57, Thomas Richter wrote:
> perf test 70 takes a long time. One culprit is the output of command
> perf annotate. Per default enabled are
>   - demangle symbol names
>   - interleave source code with assembly code.
> Disable demangle of symbols and abort the annotation
> after the first 250 lines.
> 
> This speeds up the test case considerable, for example
> on s390:
> 
> Output before:
>   # time  perf test 70
>   70: perf annotate basic tests             : Ok
>   .....
>   real   2m7.467s
>   user   1m26.869s
>   sys    0m34.086s
>   #
> 
>   Output after:
>   # time perf test 70
>   70: perf annotate basic tests             : Ok
> 
>   real   0m3.341s
>   user   0m1.606s
>   sys    0m0.362s
>   #
> 

Interesting that there is such a big difference, I only measured 4s vs 
14s without the patch.

Either way it's slightly faster now:

Reviewed-by: James Clark <james.clark@linaro.org>
Re: [PATCH] perf/test: Speed up test case perf annotate basic tests
Posted by James Clark 2 months, 1 week ago 

On 17/09/2024 09:57, Thomas Richter wrote:
> perf test 70 takes a long time. One culprit is the output of command
> perf annotate. Per default enabled are
>   - demangle symbol names
>   - interleave source code with assembly code.
> Disable demangle of symbols and abort the annotation
> after the first 250 lines.
> 
> This speeds up the test case considerable, for example
> on s390:
> 
> Output before:
>   # time  perf test 70
>   70: perf annotate basic tests             : Ok
>   .....
>   real   2m7.467s
>   user   1m26.869s
>   sys    0m34.086s
>   #
> 
>   Output after:
>   # time perf test 70
>   70: perf annotate basic tests             : Ok
> 
>   real   0m3.341s
>   user   0m1.606s
>   sys    0m0.362s
>   #
> 
> Signed-off-by: Thomas Richter <tmricht@linux.ibm.com>
> Suggested-by: Namhyung Kim <namhyung@kernel.org>
> Cc: Heiko Carstens <hca@linux.ibm.com>
> Cc: Vasily Gorbik <gor@linux.ibm.com>
> Cc: Alexander Gordeev <agordeev@linux.ibm.com>
> ---
>   tools/perf/tests/shell/annotate.sh | 10 +++++-----
>   1 file changed, 5 insertions(+), 5 deletions(-)
> 
> diff --git a/tools/perf/tests/shell/annotate.sh b/tools/perf/tests/shell/annotate.sh
> index b072d9b97387..b28cd95b1d83 100755
> --- a/tools/perf/tests/shell/annotate.sh
> +++ b/tools/perf/tests/shell/annotate.sh
> @@ -43,7 +43,7 @@ test_basic() {
>     fi
>   
>     # Generate the annotated output file
> -  perf annotate -i "${perfdata}" --stdio 2> /dev/null > "${perfout}"
> +  perf annotate --no-demangle -i "${perfdata}" --stdio 2> /dev/null | head -250 > "${perfout}"
>   
>     # check if it has the target symbol
>     if ! grep "${testsym}" "${perfout}"
> @@ -62,8 +62,8 @@ test_basic() {
>     fi
>   
>     # check again with a target symbol name
> -  if ! perf annotate -i "${perfdata}" "${testsym}" 2> /dev/null | \
> -	  grep -m 3 "${disasm_regex}"
> +  if ! perf annotate --no-demangle -i "${perfdata}" "${testsym}" 2> /dev/null | \
> +	  head -250 | grep -m 3 "${disasm_regex}"
>     then
>       echo "Basic annotate [Failed: missing disasm output when specifying the target symbol]"
>       err=1
> @@ -71,8 +71,8 @@ test_basic() {
>     fi
>   
>     # check one more with external objdump tool (forced by --objdump option)
> -  if ! perf annotate -i "${perfdata}" --objdump=objdump 2> /dev/null | \
> -	  grep -m 3 "${disasm_regex}"
> +  if ! perf annotate --no-demangle -i "${perfdata}" --objdump=objdump 2> /dev/null | \
> +	  head -250 | grep -m 3 "${disasm_regex}"
>     then
>       echo "Basic annotate [Failed: missing disasm output from non default disassembler (using --objdump)]"
>       err=1

Patchew 2.1-devel-b67e4c2

© 2016 - 2024 Red Hat, Inc.