Commit a8146d66 authored by Kan Liang's avatar Kan Liang Committed by Arnaldo Carvalho de Melo
Browse files

perf test: Fix sample-parsing failure on non-x86 platforms 



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 fbefe9c2 ("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.

Fixes: fbefe9c2 ("perf tools: Support arch specific PERF_SAMPLE_WEIGHT_STRUCT processing")
Reported-by: default avatarThomas Richter <tmricht@linux.ibm.com>
Signed-off-by: default avatarKan Liang <kan.liang@linux.intel.com>
Tested-by: default avatarThomas Richter <tmricht@linux.ibm.com>
Cc: Athira Jajeev <atrajeev@linux.vnet.ibm.com>
Cc: Heiko Carstens <heiko.carstens@de.ibm.com>
Cc: Sumanth Korikkar <sumanthk@linux.ibm.com>
Cc: Sven Schnelle <svens@linux.ibm.com>
Cc: Vasily Gorbik <gor@linux.ibm.com>
Link: http://lore.kernel.org/lkml/1614787285-104151-1-git-send-email-kan.liang@linux.intel.com


Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent ec4d0a76

tools/perf/tests/sample-parsing.c

+0 −4
Original line number Diff line number Diff line
@@ -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,