Re: [PATCH v1] perf test annotate: Use --percent-limit rather than head to reduce output

[Thomas Richter <tmricht@linux.ibm.com>]

On 6/28/25 03:58, Ian Rogers wrote:
> The annotate test was sped up by Thomas Richter
> <tmricht@linux.ibm.com> in commit
> 658a8805cb60 ("perf test: Speed up test case 70 annotate basic tests")
> by reducing the annotate output using head. This causes flakes on
> hybrid machines where the first event dumped may not have the samples
> for the test within it. Rather than reduce the output using `head`
> switch to `--percent-limit 10` which will stop annotate dumping
> functions that have an overhead of less than 10%, the noploop program
> should be using more.
> 
> Add the missing objdump option for the pipe mode version of the
> objdump with a command test.
> 
> Signed-off-by: Ian Rogers <irogers@google.com>
> ---
>  tools/perf/tests/shell/annotate.sh | 15 ++++++++-------
>  1 file changed, 8 insertions(+), 7 deletions(-)
> 
> diff --git a/tools/perf/tests/shell/annotate.sh b/tools/perf/tests/shell/annotate.sh
> index 16a1ccd06089..689de58e9238 100755
> --- a/tools/perf/tests/shell/annotate.sh
> +++ b/tools/perf/tests/shell/annotate.sh
> @@ -53,21 +53,22 @@ test_basic() {
>    # Generate the annotated output file
>    if [ "x${mode}" == "xBasic" ]
>    then
> -    perf annotate --no-demangle -i "${perfdata}" --stdio 2> /dev/null > "${perfout}"
> +    perf annotate --no-demangle -i "${perfdata}" --stdio --percent-limit 10 2> /dev/null > "${perfout}"
>    else
> -    perf annotate --no-demangle -i - --stdio 2> /dev/null < "${perfdata}" > "${perfout}"
> +    perf annotate --no-demangle -i - --stdio 2> /dev/null --percent-limit 10 < "${perfdata}" > "${perfout}"
>    fi
>  
>    # check if it has the target symbol
> -  if ! head -250 "${perfout}" | grep -q "${testsym}"
> +  if ! grep -q "${testsym}" "${perfout}"
>    then
>      echo "${mode} annotate [Failed: missing target symbol]"
> +    cat "${perfout}"
>      err=1
>      return
>    fi
>  
>    # check if it has the disassembly lines
> -  if ! head -250 "${perfout}" | grep -q "${disasm_regex}"
> +  if ! grep -q "${disasm_regex}" "${perfout}"
>    then
>      echo "${mode} annotate [Failed: missing disasm output from default disassembler]"
>      err=1
> @@ -92,11 +93,11 @@ test_basic() {
>    # check one more with external objdump tool (forced by --objdump option)
>    if [ "x${mode}" == "xBasic" ]
>    then
> -    perf annotate --no-demangle -i "${perfdata}" --objdump=objdump 2> /dev/null > "${perfout}"
> +    perf annotate --no-demangle -i "${perfdata}" --percent-limit 10 --objdump=objdump 2> /dev/null > "${perfout}"
>    else
> -    perf annotate --no-demangle -i - "${testsym}" 2> /dev/null < "${perfdata}" > "${perfout}"
> +    perf annotate --no-demangle -i - "${testsym}" --percent-limit 10 --objdump=objdump 2> /dev/null < "${perfdata}" > "${perfout}"
>    fi
> -  if ! head -250 "${perfout}" | grep -q -m 3 "${disasm_regex}"
> +  if ! grep -q -m 3 "${disasm_regex}" "${perfout}"
>    then
>      echo "${mode} annotate [Failed: missing disasm output from non default disassembler (using --objdump)]"
>      err=1
Works ok on s390

Tested-by: Thomas Richter <tmricht@linux.ibm.com>

-- 
Thomas Richter, Dept 3303, IBM s390 Linux Development, Boeblingen, Germany
--
IBM Deutschland Research & Development GmbH

Vorsitzender des Aufsichtsrats: Wolfgang Wendt

Geschäftsführung: David Faller

Sitz der Gesellschaft: Böblingen / Registergericht: Amtsgericht Stuttgart, HRB 243294