perf test: Fix attr tests for PERF_FORMAT_LOST

Since PERF_FORMAT_LOST was added, the default read format has that bit
set, so add it to the tests. Keep the old value as well so that the test
still passes on older kernels.

This fixes the following failure:

  expected read_format=0|4, got 20
  FAILED './tests/attr/test-record-C0' - match failure

Fixes: 85b425f31c8866e0 ("perf record: Set PERF_FORMAT_LOST by default")
Signed-off-by: James Clark <james.clark@arm.com>
Acked-by: Namhyung Kim <namhyung@kernel.org>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: https://lore.kernel.org/r/20221012094633.21669-2-james.clark@arm.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
James Clark 2022-10-12 10:46:32 +01:00 committed by Arnaldo Carvalho de Melo
parent f77811a0f6
commit e28039667c
6 changed files with 11 additions and 11 deletions

View File

@ -9,7 +9,7 @@ size=128
config=0
sample_period=*
sample_type=263
read_format=0|4
read_format=0|4|20
disabled=1
inherit=1
pinned=0

View File

@ -11,7 +11,7 @@ size=128
config=9
sample_period=4000
sample_type=455
read_format=4
read_format=4|20
# Event will be enabled right away.
disabled=0
inherit=1

View File

@ -7,14 +7,14 @@ ret = 1
fd=1
group_fd=-1
sample_type=327
read_format=4
read_format=4|20
[event-2:base-record]
fd=2
group_fd=1
config=1
sample_type=327
read_format=4
read_format=4|20
mmap=0
comm=0
task=0

View File

@ -7,7 +7,7 @@ ret = 1
fd=1
group_fd=-1
sample_type=343
read_format=12
read_format=12|28
inherit=0
[event-2:base-record]
@ -21,8 +21,8 @@ config=3
# default | PERF_SAMPLE_READ
sample_type=343
# PERF_FORMAT_ID | PERF_FORMAT_GROUP
read_format=12
# PERF_FORMAT_ID | PERF_FORMAT_GROUP | PERF_FORMAT_LOST
read_format=12|28
task=0
mmap=0
comm=0

View File

@ -7,7 +7,7 @@ ret = 1
fd=1
group_fd=-1
sample_type=327
read_format=4
read_format=4|20
[event-2:base-record]
fd=2
@ -15,7 +15,7 @@ group_fd=1
type=0
config=1
sample_type=327
read_format=4
read_format=4|20
mmap=0
comm=0
task=0

View File

@ -9,7 +9,7 @@ group_fd=-1
config=0|1
sample_period=1234000
sample_type=87
read_format=12
read_format=12|28
inherit=0
freq=0
@ -19,7 +19,7 @@ group_fd=1
config=0|1
sample_period=6789000
sample_type=87
read_format=12
read_format=12|28
disabled=0
inherit=0
mmap=0