diff mbox series

[3/8] perf test: Update arm64 tests to expect ptrauth masks

Message ID 20220704145333.22557-4-andrew.kilroy@arm.com (mailing list archive)
State New, archived
Headers show
Series Perf stack unwinding with pointer authentication | expand

Commit Message

Andrew Kilroy July 4, 2022, 2:53 p.m. UTC 
From: German Gomez <german.gomez@arm.com>

We will request the pointer auth masks in a followup commit, so take the
opportunity to update the relevant tests.

Signed-off-by: German Gomez <german.gomez@arm.com>
Signed-off-by: Andrew Kilroy <andrew.kilroy@arm.com>
---
 tools/perf/tests/attr/README                        |  1 +
 .../tests/attr/test-record-graph-default-aarch64    |  3 ++-
 tools/perf/tests/attr/test-record-graph-dwarf       |  1 +
 .../perf/tests/attr/test-record-graph-dwarf-aarch64 | 13 +++++++++++++
 tools/perf/tests/attr/test-record-graph-fp-aarch64  |  3 ++-
 5 files changed, 19 insertions(+), 2 deletions(-)
 create mode 100644 tools/perf/tests/attr/test-record-graph-dwarf-aarch64
diff mbox series

Patch

diff --git a/tools/perf/tests/attr/README b/tools/perf/tests/attr/README
index eb3f7d4bb324..9d7f4646920f 100644
--- a/tools/perf/tests/attr/README
+++ b/tools/perf/tests/attr/README
@@ -47,6 +47,7 @@  Following tests are defined (with perf commands):
   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 dwarf kill		(test-record-graph-dwarf-aarch64)
   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)
diff --git a/tools/perf/tests/attr/test-record-graph-default-aarch64 b/tools/perf/tests/attr/test-record-graph-default-aarch64
index e98d62efb6f7..948d41c162aa 100644
--- a/tools/perf/tests/attr/test-record-graph-default-aarch64
+++ b/tools/perf/tests/attr/test-record-graph-default-aarch64
@@ -5,5 +5,6 @@  ret     = 1
 arch    = aarch64
 
 [event:base-record]
-sample_type=4391
+# handle both with and without ARM64_PTRAUTH
+sample_type=4391|33558823
 sample_regs_user=1073741824
diff --git a/tools/perf/tests/attr/test-record-graph-dwarf b/tools/perf/tests/attr/test-record-graph-dwarf
index ae92061d611d..619bccd886c4 100644
--- a/tools/perf/tests/attr/test-record-graph-dwarf
+++ b/tools/perf/tests/attr/test-record-graph-dwarf
@@ -2,6 +2,7 @@ 
 command = record
 args    = --no-bpf-event --call-graph dwarf -- kill >/dev/null 2>&1
 ret     = 1
+arch    = !aarch64
 
 [event:base-record]
 sample_type=45359
diff --git a/tools/perf/tests/attr/test-record-graph-dwarf-aarch64 b/tools/perf/tests/attr/test-record-graph-dwarf-aarch64
new file mode 100644
index 000000000000..daec43b39e2e
--- /dev/null
+++ b/tools/perf/tests/attr/test-record-graph-dwarf-aarch64
@@ -0,0 +1,13 @@ 
+[config]
+command = record
+args    = --no-bpf-event --call-graph dwarf -- kill >/dev/null 2>&1
+ret     = 1
+arch    = aarch64
+
+[event:base-record]
+# handle both with and without ARM64_PTRAUTH
+sample_type=45359|33599791
+exclude_callchain_user=1
+sample_stack_user=8192
+sample_regs_user=*
+mmap_data=1
diff --git a/tools/perf/tests/attr/test-record-graph-fp-aarch64 b/tools/perf/tests/attr/test-record-graph-fp-aarch64
index cbeea9971285..bc0880f71e8e 100644
--- a/tools/perf/tests/attr/test-record-graph-fp-aarch64
+++ b/tools/perf/tests/attr/test-record-graph-fp-aarch64
@@ -5,5 +5,6 @@  ret     = 1
 arch    = aarch64
 
 [event:base-record]
-sample_type=4391
+# handle both with and without ARM64_PTRAUTH
+sample_type=4391|33558823
 sample_regs_user=1073741824