diff options
| author | Eugene Syromyatnikov <evgsyr@gmail.com> | 2020-04-13 22:01:01 +0200 |
|---|---|---|
| committer | Dmitry V. Levin <ldv@altlinux.org> | 2020-04-15 13:39:57 +0000 |
| commit | 9d50cf07c56e431a3ee460fd90d2cf352e21098d (patch) | |
| tree | 81426db8f61fe8cd54781fac3facd9d6deff274d | |
| parent | b88ba121e9179d536ff5cd29606b13b52d49dd7d (diff) | |
| download | strace-9d50cf07c56e431a3ee460fd90d2cf352e21098d.tar.gz | |
xlat: add PERF_SAMPLE_BRANCH_HW_INDEX to perf_branch_sample_type
* xlat/perf_branch_sample_type.in (PERF_SAMPLE_BRANCH_HW_INDEX): New
constant, introduced by Linux commit v5.7-rc1~180^2~23.
* tests/perf_event_open.c: Update expected output.
| -rw-r--r-- | tests/perf_event_open.c | 7 | ||||
| -rw-r--r-- | xlat/perf_branch_sample_type.in | 1 |
2 files changed, 5 insertions, 3 deletions
diff --git a/tests/perf_event_open.c b/tests/perf_event_open.c index d09ef53e6..d0d2de801 100644 --- a/tests/perf_event_open.c +++ b/tests/perf_event_open.c @@ -534,7 +534,8 @@ end: "PERF_SAMPLE_BRANCH_CALL|" \ "PERF_SAMPLE_BRANCH_NO_FLAGS|" \ "PERF_SAMPLE_BRANCH_NO_CYCLES|" \ - "PERF_SAMPLE_BRANCH_TYPE_SAVE" + "PERF_SAMPLE_BRANCH_TYPE_SAVE|" \ + "PERF_SAMPLE_BRANCH_HW_INDEX" int main(void) @@ -667,11 +668,11 @@ main(void) static const struct u64_val_str branch_sample_types[] = { { ARG_STR(0) }, { 0x80, "PERF_SAMPLE_BRANCH_ABORT_TX" }, - { 0x1ffff, BRANCH_TYPE_ALL }, + { 0x3ffff, BRANCH_TYPE_ALL }, { ARG_ULL_STR(0xdeadcaffeeec0000) " /* PERF_SAMPLE_BRANCH_??? */" }, { 0xffffffffffffffffULL, - BRANCH_TYPE_ALL "|0xfffffffffffe0000" } + BRANCH_TYPE_ALL "|0xfffffffffffc0000" } }; static const struct s32_val_str clockids[] = { { 11, "CLOCK_TAI" }, diff --git a/xlat/perf_branch_sample_type.in b/xlat/perf_branch_sample_type.in index 9370569de..7ae59a65e 100644 --- a/xlat/perf_branch_sample_type.in +++ b/xlat/perf_branch_sample_type.in @@ -15,3 +15,4 @@ PERF_SAMPLE_BRANCH_CALL 1 << 13 PERF_SAMPLE_BRANCH_NO_FLAGS 1 << 14 PERF_SAMPLE_BRANCH_NO_CYCLES 1 << 15 PERF_SAMPLE_BRANCH_TYPE_SAVE 1 << 16 +PERF_SAMPLE_BRANCH_HW_INDEX 1 << 17 |