diff mbox series

perf test: update arm64 perf_event_attr tests for --call-graph

Message ID 20220125104435.2737-1-german.gomez@arm.com (mailing list archive)
State Not Applicable
Delegated to: BPF
Headers show
Series perf test: update arm64 perf_event_attr tests for --call-graph | expand

Checks

Context Check Description
netdev/tree_selection success Not a local patch

Commit Message

German Gomez Jan. 25, 2022, 10:44 a.m. UTC 
The struct perf_event_attr is initialised differently in Arm64 when
recording in call-graph fp mode, so update the relevant tests, and add
two extra arm64-only tests.

Fixes: 7248e308a575 ("perf tools: Record ARM64 LR register automatically")
Signed-off-by: German Gomez <german.gomez@arm.com>
---
 tools/perf/tests/attr/README                            | 2 ++
 tools/perf/tests/attr/test-record-graph-default         | 2 ++
 tools/perf/tests/attr/test-record-graph-default-aarch64 | 9 +++++++++
 tools/perf/tests/attr/test-record-graph-fp              | 2 ++
 tools/perf/tests/attr/test-record-graph-fp-aarch64      | 9 +++++++++
 5 files changed, 24 insertions(+)
 create mode 100644 tools/perf/tests/attr/test-record-graph-default-aarch64
 create mode 100644 tools/perf/tests/attr/test-record-graph-fp-aarch64

Comments

German Gomez Feb. 16, 2022, 1:17 p.m. UTC | #1 
Hi,

Friendly ping on this perf-test fix for arm64

I will include some quick test notes:
Before:

$ ./perf test 17 -v
17: Setup struct perf_event_attr
[...]
running './tests/attr/test-record-graph-default'
expected sample_type=295, got 4391
expected sample_regs_user=0, got 1073741824
FAILED './tests/attr/test-record-graph-default' - match failure
test child finished with -1
---- end ----

After:

[...]
running './tests/attr/test-record-graph-default-aarch64'
test limitation 'aarch64'
running './tests/attr/test-record-graph-fp-aarch64'
test limitation 'aarch64'
running './tests/attr/test-record-graph-default'
test limitation '!aarch64'
excluded architecture list ['aarch64']
skipped [aarch64] './tests/attr/test-record-graph-default'
running './tests/attr/test-record-graph-fp'
test limitation '!aarch64'
excluded architecture list ['aarch64']
skipped [aarch64] './tests/attr/test-record-graph-fp'
[...]

Thanks,
German

On 25/01/2022 10:44, German Gomez wrote:
> The struct perf_event_attr is initialised differently in Arm64 when
> recording in call-graph fp mode, so update the relevant tests, and add
> two extra arm64-only tests.
>
> Fixes: 7248e308a575 ("perf tools: Record ARM64 LR register automatically")
> Signed-off-by: German Gomez <german.gomez@arm.com>
> ---
>  tools/perf/tests/attr/README                            | 2 ++
>  tools/perf/tests/attr/test-record-graph-default         | 2 ++
>  tools/perf/tests/attr/test-record-graph-default-aarch64 | 9 +++++++++
>  tools/perf/tests/attr/test-record-graph-fp              | 2 ++
>  tools/perf/tests/attr/test-record-graph-fp-aarch64      | 9 +++++++++
>  5 files changed, 24 insertions(+)
>  create mode 100644 tools/perf/tests/attr/test-record-graph-default-aarch64
>  create mode 100644 tools/perf/tests/attr/test-record-graph-fp-aarch64
>
> diff --git a/tools/perf/tests/attr/README b/tools/perf/tests/attr/README
> index a36f49fb4dbe..1116fc6bf2ac 100644
> --- a/tools/perf/tests/attr/README
> +++ b/tools/perf/tests/attr/README
> @@ -45,8 +45,10 @@ Following tests are defined (with perf commands):
>    perf record -d kill                           (test-record-data)
>    perf record -F 100 kill                       (test-record-freq)
>    perf record -g kill                           (test-record-graph-default)
> +  perf record -g kill                           (test-record-graph-default-aarch64)
>    perf record --call-graph dwarf kill		(test-record-graph-dwarf)
>    perf record --call-graph fp kill              (test-record-graph-fp)
> +  perf record --call-graph fp kill              (test-record-graph-fp-aarch64)
>    perf record --group -e cycles,instructions kill (test-record-group)
>    perf record -e '{cycles,instructions}' kill   (test-record-group1)
>    perf record -e '{cycles/period=1/,instructions/period=2/}:S' kill (test-record-group2)
> diff --git a/tools/perf/tests/attr/test-record-graph-default b/tools/perf/tests/attr/test-record-graph-default
> index 5d8234d50845..f0a18b4ea4f5 100644
> --- a/tools/perf/tests/attr/test-record-graph-default
> +++ b/tools/perf/tests/attr/test-record-graph-default
> @@ -2,6 +2,8 @@
>  command = record
>  args    = --no-bpf-event -g kill >/dev/null 2>&1
>  ret     = 1
> +# arm64 enables registers in the default mode (fp)
> +arch    = !aarch64
>  
>  [event:base-record]
>  sample_type=295
> diff --git a/tools/perf/tests/attr/test-record-graph-default-aarch64 b/tools/perf/tests/attr/test-record-graph-default-aarch64
> new file mode 100644
> index 000000000000..e98d62efb6f7
> --- /dev/null
> +++ b/tools/perf/tests/attr/test-record-graph-default-aarch64
> @@ -0,0 +1,9 @@
> +[config]
> +command = record
> +args    = --no-bpf-event -g kill >/dev/null 2>&1
> +ret     = 1
> +arch    = aarch64
> +
> +[event:base-record]
> +sample_type=4391
> +sample_regs_user=1073741824
> diff --git a/tools/perf/tests/attr/test-record-graph-fp b/tools/perf/tests/attr/test-record-graph-fp
> index 5630521c0b0f..a6e60e839205 100644
> --- a/tools/perf/tests/attr/test-record-graph-fp
> +++ b/tools/perf/tests/attr/test-record-graph-fp
> @@ -2,6 +2,8 @@
>  command = record
>  args    = --no-bpf-event --call-graph fp kill >/dev/null 2>&1
>  ret     = 1
> +# arm64 enables registers in fp mode
> +arch    = !aarch64
>  
>  [event:base-record]
>  sample_type=295
> diff --git a/tools/perf/tests/attr/test-record-graph-fp-aarch64 b/tools/perf/tests/attr/test-record-graph-fp-aarch64
> new file mode 100644
> index 000000000000..cbeea9971285
> --- /dev/null
> +++ b/tools/perf/tests/attr/test-record-graph-fp-aarch64
> @@ -0,0 +1,9 @@
> +[config]
> +command = record
> +args    = --no-bpf-event --call-graph fp kill >/dev/null 2>&1
> +ret     = 1
> +arch    = aarch64
> +
> +[event:base-record]
> +sample_type=4391
> +sample_regs_user=1073741824
Arnaldo Carvalho de Melo Feb. 16, 2022, 1:36 p.m. UTC | #2 
Em Wed, Feb 16, 2022 at 01:17:56PM +0000, German Gomez escreveu:
> Hi,
> 
> Friendly ping on this perf-test fix for arm64

> I will include some quick test notes:

Thanks, adding it to the cset, applying.

- Arnaldo

> Before:
 
> $ ./perf test 17 -v
> 17: Setup struct perf_event_attr
> [...]
> running './tests/attr/test-record-graph-default'
> expected sample_type=295, got 4391
> expected sample_regs_user=0, got 1073741824
> FAILED './tests/attr/test-record-graph-default' - match failure
> test child finished with -1
> ---- end ----
> 
> After:
> 
> [...]
> running './tests/attr/test-record-graph-default-aarch64'
> test limitation 'aarch64'
> running './tests/attr/test-record-graph-fp-aarch64'
> test limitation 'aarch64'
> running './tests/attr/test-record-graph-default'
> test limitation '!aarch64'
> excluded architecture list ['aarch64']
> skipped [aarch64] './tests/attr/test-record-graph-default'
> running './tests/attr/test-record-graph-fp'
> test limitation '!aarch64'
> excluded architecture list ['aarch64']
> skipped [aarch64] './tests/attr/test-record-graph-fp'
> [...]
> 
> Thanks,
> German
> 
> On 25/01/2022 10:44, German Gomez wrote:
> > The struct perf_event_attr is initialised differently in Arm64 when
> > recording in call-graph fp mode, so update the relevant tests, and add
> > two extra arm64-only tests.
> >
> > Fixes: 7248e308a575 ("perf tools: Record ARM64 LR register automatically")
> > Signed-off-by: German Gomez <german.gomez@arm.com>
> > ---
> >  tools/perf/tests/attr/README                            | 2 ++
> >  tools/perf/tests/attr/test-record-graph-default         | 2 ++
> >  tools/perf/tests/attr/test-record-graph-default-aarch64 | 9 +++++++++
> >  tools/perf/tests/attr/test-record-graph-fp              | 2 ++
> >  tools/perf/tests/attr/test-record-graph-fp-aarch64      | 9 +++++++++
> >  5 files changed, 24 insertions(+)
> >  create mode 100644 tools/perf/tests/attr/test-record-graph-default-aarch64
> >  create mode 100644 tools/perf/tests/attr/test-record-graph-fp-aarch64
> >
> > diff --git a/tools/perf/tests/attr/README b/tools/perf/tests/attr/README
> > index a36f49fb4dbe..1116fc6bf2ac 100644
> > --- a/tools/perf/tests/attr/README
> > +++ b/tools/perf/tests/attr/README
> > @@ -45,8 +45,10 @@ Following tests are defined (with perf commands):
> >    perf record -d kill                           (test-record-data)
> >    perf record -F 100 kill                       (test-record-freq)
> >    perf record -g kill                           (test-record-graph-default)
> > +  perf record -g kill                           (test-record-graph-default-aarch64)
> >    perf record --call-graph dwarf kill		(test-record-graph-dwarf)
> >    perf record --call-graph fp kill              (test-record-graph-fp)
> > +  perf record --call-graph fp kill              (test-record-graph-fp-aarch64)
> >    perf record --group -e cycles,instructions kill (test-record-group)
> >    perf record -e '{cycles,instructions}' kill   (test-record-group1)
> >    perf record -e '{cycles/period=1/,instructions/period=2/}:S' kill (test-record-group2)
> > diff --git a/tools/perf/tests/attr/test-record-graph-default b/tools/perf/tests/attr/test-record-graph-default
> > index 5d8234d50845..f0a18b4ea4f5 100644
> > --- a/tools/perf/tests/attr/test-record-graph-default
> > +++ b/tools/perf/tests/attr/test-record-graph-default
> > @@ -2,6 +2,8 @@
> >  command = record
> >  args    = --no-bpf-event -g kill >/dev/null 2>&1
> >  ret     = 1
> > +# arm64 enables registers in the default mode (fp)
> > +arch    = !aarch64
> >  
> >  [event:base-record]
> >  sample_type=295
> > diff --git a/tools/perf/tests/attr/test-record-graph-default-aarch64 b/tools/perf/tests/attr/test-record-graph-default-aarch64
> > new file mode 100644
> > index 000000000000..e98d62efb6f7
> > --- /dev/null
> > +++ b/tools/perf/tests/attr/test-record-graph-default-aarch64
> > @@ -0,0 +1,9 @@
> > +[config]
> > +command = record
> > +args    = --no-bpf-event -g kill >/dev/null 2>&1
> > +ret     = 1
> > +arch    = aarch64
> > +
> > +[event:base-record]
> > +sample_type=4391
> > +sample_regs_user=1073741824
> > diff --git a/tools/perf/tests/attr/test-record-graph-fp b/tools/perf/tests/attr/test-record-graph-fp
> > index 5630521c0b0f..a6e60e839205 100644
> > --- a/tools/perf/tests/attr/test-record-graph-fp
> > +++ b/tools/perf/tests/attr/test-record-graph-fp
> > @@ -2,6 +2,8 @@
> >  command = record
> >  args    = --no-bpf-event --call-graph fp kill >/dev/null 2>&1
> >  ret     = 1
> > +# arm64 enables registers in fp mode
> > +arch    = !aarch64
> >  
> >  [event:base-record]
> >  sample_type=295
> > diff --git a/tools/perf/tests/attr/test-record-graph-fp-aarch64 b/tools/perf/tests/attr/test-record-graph-fp-aarch64
> > new file mode 100644
> > index 000000000000..cbeea9971285
> > --- /dev/null
> > +++ b/tools/perf/tests/attr/test-record-graph-fp-aarch64
> > @@ -0,0 +1,9 @@
> > +[config]
> > +command = record
> > +args    = --no-bpf-event --call-graph fp kill >/dev/null 2>&1
> > +ret     = 1
> > +arch    = aarch64
> > +
> > +[event:base-record]
> > +sample_type=4391
> > +sample_regs_user=1073741824
diff mbox series

Patch

diff --git a/tools/perf/tests/attr/README b/tools/perf/tests/attr/README
index a36f49fb4dbe..1116fc6bf2ac 100644
--- a/tools/perf/tests/attr/README
+++ b/tools/perf/tests/attr/README
@@ -45,8 +45,10 @@  Following tests are defined (with perf commands):
   perf record -d kill                           (test-record-data)
   perf record -F 100 kill                       (test-record-freq)
   perf record -g kill                           (test-record-graph-default)
+  perf record -g kill                           (test-record-graph-default-aarch64)
   perf record --call-graph dwarf kill		(test-record-graph-dwarf)
   perf record --call-graph fp kill              (test-record-graph-fp)
+  perf record --call-graph fp kill              (test-record-graph-fp-aarch64)
   perf record --group -e cycles,instructions kill (test-record-group)
   perf record -e '{cycles,instructions}' kill   (test-record-group1)
   perf record -e '{cycles/period=1/,instructions/period=2/}:S' kill (test-record-group2)
diff --git a/tools/perf/tests/attr/test-record-graph-default b/tools/perf/tests/attr/test-record-graph-default
index 5d8234d50845..f0a18b4ea4f5 100644
--- a/tools/perf/tests/attr/test-record-graph-default
+++ b/tools/perf/tests/attr/test-record-graph-default
@@ -2,6 +2,8 @@ 
 command = record
 args    = --no-bpf-event -g kill >/dev/null 2>&1
 ret     = 1
+# arm64 enables registers in the default mode (fp)
+arch    = !aarch64
 
 [event:base-record]
 sample_type=295
diff --git a/tools/perf/tests/attr/test-record-graph-default-aarch64 b/tools/perf/tests/attr/test-record-graph-default-aarch64
new file mode 100644
index 000000000000..e98d62efb6f7
--- /dev/null
+++ b/tools/perf/tests/attr/test-record-graph-default-aarch64
@@ -0,0 +1,9 @@ 
+[config]
+command = record
+args    = --no-bpf-event -g kill >/dev/null 2>&1
+ret     = 1
+arch    = aarch64
+
+[event:base-record]
+sample_type=4391
+sample_regs_user=1073741824
diff --git a/tools/perf/tests/attr/test-record-graph-fp b/tools/perf/tests/attr/test-record-graph-fp
index 5630521c0b0f..a6e60e839205 100644
--- a/tools/perf/tests/attr/test-record-graph-fp
+++ b/tools/perf/tests/attr/test-record-graph-fp
@@ -2,6 +2,8 @@ 
 command = record
 args    = --no-bpf-event --call-graph fp kill >/dev/null 2>&1
 ret     = 1
+# arm64 enables registers in fp mode
+arch    = !aarch64
 
 [event:base-record]
 sample_type=295
diff --git a/tools/perf/tests/attr/test-record-graph-fp-aarch64 b/tools/perf/tests/attr/test-record-graph-fp-aarch64
new file mode 100644
index 000000000000..cbeea9971285
--- /dev/null
+++ b/tools/perf/tests/attr/test-record-graph-fp-aarch64
@@ -0,0 +1,9 @@ 
+[config]
+command = record
+args    = --no-bpf-event --call-graph fp kill >/dev/null 2>&1
+ret     = 1
+arch    = aarch64
+
+[event:base-record]
+sample_type=4391
+sample_regs_user=1073741824