Re: [PATCH v5 5/7] perf test: Update base-record & system-wide-dummy attr expected values for test-record-C0

[Adrian Hunter]

On 4/08/23 05:07, Yang Jihong wrote:
> 1. Because a dummy sideband event is added to the sampling of specified
>    CPUs. When evlist contains evsel of different sample_type,
>    evlist__config() will change the default PERF_SAMPLE_ID bit to
>    PERF_SAMPLE_IDENTIFICATION bit.
>    The attr sample_type expected value of base-record and system-wide-dummy
>    in test-record-C0 needs to be updated.
> 
> 2. The perf record uses evlist__add_aux_dummy() instead of
>    evlist__add_dummy() to add a dummy event.
>    The expected value of system-wide-dummy attr needs to be updated.
> 
> The perf test result is as follows:
> 
>   # ./perf test list  2>&1 | grep 'Setup struct perf_event_attr'
>    17: Setup struct perf_event_attr
>   # ./perf test 17
>    17: Setup struct perf_event_attr                                    : Ok
> 
> Signed-off-by: Yang Jihong <yangjihong1@xxxxxxxxxx>

Tested-by: Adrian Hunter <adrian.hunter@xxxxxxxxx>

> ---
>  tools/perf/tests/attr/system-wide-dummy | 14 ++++++++------
>  tools/perf/tests/attr/test-record-C0    |  4 ++--
>  2 files changed, 10 insertions(+), 8 deletions(-)
> 
> diff --git a/tools/perf/tests/attr/system-wide-dummy b/tools/perf/tests/attr/system-wide-dummy
> index 2f3e3eb728eb..a1e1d6a263bf 100644
> --- a/tools/perf/tests/attr/system-wide-dummy
> +++ b/tools/perf/tests/attr/system-wide-dummy
> @@ -9,8 +9,10 @@ flags=8
>  type=1
>  size=136
>  config=9
> -sample_period=4000
> -sample_type=455
> +sample_period=1
> +# PERF_SAMPLE_IP | PERF_SAMPLE_TID | PERF_SAMPLE_TIME |
> +# PERF_SAMPLE_CPU | PERF_SAMPLE_IDENTIFIER
> +sample_type=65671
>  read_format=4|20
>  # Event will be enabled right away.
>  disabled=0
> @@ -18,12 +20,12 @@ inherit=1
>  pinned=0
>  exclusive=0
>  exclude_user=0
> -exclude_kernel=0
> -exclude_hv=0
> +exclude_kernel=1
> +exclude_hv=1
>  exclude_idle=0
>  mmap=1
>  comm=1
> -freq=1
> +freq=0
>  inherit_stat=0
>  enable_on_exec=0
>  task=1
> @@ -32,7 +34,7 @@ precise_ip=0
>  mmap_data=0
>  sample_id_all=1
>  exclude_host=0
> -exclude_guest=0
> +exclude_guest=1
>  exclude_callchain_kernel=0
>  exclude_callchain_user=0
>  mmap2=1
> diff --git a/tools/perf/tests/attr/test-record-C0 b/tools/perf/tests/attr/test-record-C0
> index 317730b906dd..198e8429a1bf 100644
> --- a/tools/perf/tests/attr/test-record-C0
> +++ b/tools/perf/tests/attr/test-record-C0
> @@ -10,9 +10,9 @@ cpu=0
>  enable_on_exec=0
>  
>  # PERF_SAMPLE_IP | PERF_SAMPLE_TID | PERF_SAMPLE_TIME |
> -# PERF_SAMPLE_ID | PERF_SAMPLE_PERIOD
> +# PERF_SAMPLE_PERIOD | PERF_SAMPLE_IDENTIFIER
>  # + PERF_SAMPLE_CPU added by -C 0
> -sample_type=455
> +sample_type=65927
>  
>  # Dummy event handles mmaps, comm and task.
>  mmap=0