Re: [PATCH 1/2] perf test: Fix sample-parsing fails on non-x86 platforms

[Arnaldo Carvalho de Melo]

Em Wed, Mar 03, 2021 at 08:01:24AM -0800, kan.liang@xxxxxxxxxxxxxxx escreveu:
> From: Kan Liang <kan.liang@xxxxxxxxxxxxxxx>
> 
> Executing perf test 27 fails on s390:
>  [root@t35lp46 perf]# ./perf test -Fv 27
>  27: Sample parsing
>  --- start ---
>  ---- end ----
>  Sample parsing: FAILED!
>  [root@t35lp46 perf]#
> 
> The commit fbefe9c2f87f ("perf tools: Support arch specific
> PERF_SAMPLE_WEIGHT_STRUCT processing") changes the ins_lat to a
> model-specific variable only for X86, but perf test still verify the
> variable in the generic test.
> 
> Remove the ins_lat check in the generic test. The following patch will
> add it in the X86 specific test.

Thanks, applied both patches.

- Arnaldo

 
> Fixes: fbefe9c2f87f ("perf tools: Support arch specific PERF_SAMPLE_WEIGHT_STRUCT processing")
> Reported-by: Thomas Richter <tmricht@xxxxxxxxxxxxx>
> Tested-by: Thomas Richter <tmricht@xxxxxxxxxxxxx>
> Signed-off-by: Kan Liang <kan.liang@xxxxxxxxxxxxxxx>
> ---
>  tools/perf/tests/sample-parsing.c | 4 ----
>  1 file changed, 4 deletions(-)
> 
> diff --git a/tools/perf/tests/sample-parsing.c b/tools/perf/tests/sample-parsing.c
> index 0dbe3aa..8fd8a4e 100644
> --- a/tools/perf/tests/sample-parsing.c
> +++ b/tools/perf/tests/sample-parsing.c
> @@ -129,9 +129,6 @@ static bool samples_same(const struct perf_sample *s1,
>  	if (type & PERF_SAMPLE_WEIGHT)
>  		COMP(weight);
>  
> -	if (type & PERF_SAMPLE_WEIGHT_STRUCT)
> -		COMP(ins_lat);
> -
>  	if (type & PERF_SAMPLE_DATA_SRC)
>  		COMP(data_src);
>  
> @@ -245,7 +242,6 @@ static int do_test(u64 sample_type, u64 sample_regs, u64 read_format)
>  		.cgroup		= 114,
>  		.data_page_size = 115,
>  		.code_page_size = 116,
> -		.ins_lat        = 117,
>  		.aux_sample	= {
>  			.size	= sizeof(aux_data),
>  			.data	= (void *)aux_data,
> -- 
> 2.7.4
> 

-- 

- Arnaldo