* [PATCH v2 0/4] perf tools: Add printing perf_event_attr `config` and `id` symbol in perf_event_attr__fprintf()
@ 2023-05-11 7:51 Yang Jihong
2023-05-11 7:51 ` [PATCH v2 1/4] perf trace-event-info: Add tracepoint_id_to_name() helper Yang Jihong
` (3 more replies)
0 siblings, 4 replies; 14+ messages in thread
From: Yang Jihong @ 2023-05-11 7:51 UTC (permalink / raw)
To: peterz, mingo, acme, mark.rutland, alexander.shishkin, jolsa,
namhyung, irogers, adrian.hunter, anshuman.khandual, jesussanp,
linux-perf-users, linux-kernel
Cc: yangjihong1
Add printing perf_event_attr `config` and `id` symbol to improve the readability of debugging information.
Before:
# perf --debug verbose=2 record -e cycles,cpu-clock,sched:sched_switch,branch-load-misses,r101,mem:0x0 -C 0 true
<SNIP>
------------------------------------------------------------
perf_event_attr:
size 136
{ sample_period, sample_freq } 4000
sample_type IP|TID|TIME|CPU|PERIOD|IDENTIFIER
read_format ID
disabled 1
inherit 1
freq 1
sample_id_all 1
exclude_guest 1
------------------------------------------------------------
sys_perf_event_open: pid -1 cpu 0 group_fd -1 flags 0x8 = 5
------------------------------------------------------------
perf_event_attr:
type 1
size 136
{ sample_period, sample_freq } 4000
sample_type IP|TID|TIME|CPU|PERIOD|IDENTIFIER
read_format ID
disabled 1
inherit 1
freq 1
sample_id_all 1
exclude_guest 1
------------------------------------------------------------
sys_perf_event_open: pid -1 cpu 0 group_fd -1 flags 0x8 = 6
------------------------------------------------------------
perf_event_attr:
type 2
size 136
config 0x143
{ sample_period, sample_freq } 1
sample_type IP|TID|TIME|CPU|PERIOD|RAW|IDENTIFIER
read_format ID
disabled 1
inherit 1
sample_id_all 1
exclude_guest 1
------------------------------------------------------------
sys_perf_event_open: pid -1 cpu 0 group_fd -1 flags 0x8 = 7
------------------------------------------------------------
perf_event_attr:
type 3
size 136
config 0x10005
{ sample_period, sample_freq } 4000
sample_type IP|TID|TIME|CPU|PERIOD|IDENTIFIER
read_format ID
disabled 1
inherit 1
freq 1
sample_id_all 1
exclude_guest 1
------------------------------------------------------------
sys_perf_event_open: pid -1 cpu 0 group_fd -1 flags 0x8 = 9
------------------------------------------------------------
perf_event_attr:
type 4
size 136
config 0x101
{ sample_period, sample_freq } 4000
sample_type IP|TID|TIME|CPU|PERIOD|IDENTIFIER
read_format ID
disabled 1
inherit 1
freq 1
sample_id_all 1
exclude_guest 1
------------------------------------------------------------
sys_perf_event_open: pid -1 cpu 0 group_fd -1 flags 0x8 = 10
------------------------------------------------------------
perf_event_attr:
type 5
size 136
{ sample_period, sample_freq } 1
sample_type IP|TID|TIME|CPU|IDENTIFIER
read_format ID
disabled 1
inherit 1
sample_id_all 1
exclude_guest 1
bp_type 3
{ bp_len, config2 } 0x4
------------------------------------------------------------
<SNIP>
After:
# perf --debug verbose=2 record -e cycles,cpu-clock,sched:sched_switch,branch-load-misses,r101,mem:0x0 -C 0 true
<SNIP>
------------------------------------------------------------
perf_event_attr:
type 0 (PERF_TYPE_HARDWARE)
size 136
config 0 (PERF_COUNT_HW_CPU_CYCLES)
{ sample_period, sample_freq } 4000
sample_type IP|TID|TIME|CPU|PERIOD|IDENTIFIER
read_format ID
disabled 1
inherit 1
freq 1
sample_id_all 1
exclude_guest 1
------------------------------------------------------------
sys_perf_event_open: pid -1 cpu 0 group_fd -1 flags 0x8 = 5
------------------------------------------------------------
perf_event_attr:
type 1 (PERF_TYPE_SOFTWARE)
size 136
config 0 (PERF_COUNT_SW_CPU_CLOCK)
{ sample_period, sample_freq } 4000
sample_type IP|TID|TIME|CPU|PERIOD|IDENTIFIER
read_format ID
disabled 1
inherit 1
freq 1
sample_id_all 1
exclude_guest 1
------------------------------------------------------------
sys_perf_event_open: pid -1 cpu 0 group_fd -1 flags 0x8 = 6
------------------------------------------------------------
perf_event_attr:
type 2 (PERF_TYPE_TRACEPOINT)
size 136
config 0x143 (sched:sched_switch)
{ sample_period, sample_freq } 1
sample_type IP|TID|TIME|CPU|PERIOD|RAW|IDENTIFIER
read_format ID
disabled 1
inherit 1
sample_id_all 1
exclude_guest 1
------------------------------------------------------------
sys_perf_event_open: pid -1 cpu 0 group_fd -1 flags 0x8 = 7
------------------------------------------------------------
perf_event_attr:
type 3 (PERF_TYPE_HW_CACHE)
size 136
config 0x10005 (PERF_COUNT_HW_CACHE_RESULT_MISS | PERF_COUNT_HW_CACHE_OP_READ | PERF_COUNT_HW_CACHE_BPU)
{ sample_period, sample_freq } 4000
sample_type IP|TID|TIME|CPU|PERIOD|IDENTIFIER
read_format ID
disabled 1
inherit 1
freq 1
sample_id_all 1
exclude_guest 1
------------------------------------------------------------
sys_perf_event_open: pid -1 cpu 0 group_fd -1 flags 0x8 = 9
------------------------------------------------------------
perf_event_attr:
type 4 (PERF_TYPE_RAW)
size 136
config 0x101
{ sample_period, sample_freq } 4000
sample_type IP|TID|TIME|CPU|PERIOD|IDENTIFIER
read_format ID
disabled 1
inherit 1
freq 1
sample_id_all 1
exclude_guest 1
------------------------------------------------------------
sys_perf_event_open: pid -1 cpu 0 group_fd -1 flags 0x8 = 10
------------------------------------------------------------
perf_event_attr:
type 5 (PERF_TYPE_BREAKPOINT)
size 136
config 0
{ sample_period, sample_freq } 1
sample_type IP|TID|TIME|CPU|IDENTIFIER
read_format ID
disabled 1
inherit 1
sample_id_all 1
exclude_guest 1
bp_type 3
{ bp_len, config2 } 0x4
------------------------------------------------------------
sys_perf_event_open: pid -1 cpu 0 group_fd -1 flags 0x8 = 11
------------------------------------------------------------
perf_event_attr:
type 1 (PERF_TYPE_SOFTWARE)
size 136
config 9 (PERF_COUNT_SW_DUMMY)
{ sample_period, sample_freq } 4000
sample_type IP|TID|TIME|CPU|PERIOD|IDENTIFIER
read_format ID
inherit 1
mmap 1
comm 1
freq 1
task 1
sample_id_all 1
mmap2 1
comm_exec 1
ksymbol 1
bpf_event 1
------------------------------------------------------------
sys_perf_event_open: pid -1 cpu 0 group_fd -1 flags 0x8 = 12
<SNIP>
Yang Jihong (4):
perf trace-event-info: Add tracepoint_id_to_name() helper
perf tools: Extend PRINT_ATTRf to support printing of members with a
value of 0
perf tools: Add printing perf_event_attr type symbol in
perf_event_attr__fprintf()
perf tools: Add printing perf_event_attr config symbol in
perf_event_attr__fprintf()
tools/perf/util/perf_event_attr_fprintf.c | 203 +++++++++++++++++++++-
tools/perf/util/trace-event-info.c | 11 ++
tools/perf/util/trace-event.h | 6 +
3 files changed, 211 insertions(+), 9 deletions(-)
--
Changes since v1:
- Modify initialization of path in tracepoint_id_to_path().
- Replace snprintf&strdup with asprintf.
- Use switch/case to get stringified name for type and id.
2.30.GIT
^ permalink raw reply [flat|nested] 14+ messages in thread
* [PATCH v2 1/4] perf trace-event-info: Add tracepoint_id_to_name() helper
2023-05-11 7:51 [PATCH v2 0/4] perf tools: Add printing perf_event_attr `config` and `id` symbol in perf_event_attr__fprintf() Yang Jihong
@ 2023-05-11 7:51 ` Yang Jihong
2023-05-12 10:33 ` Adrian Hunter
2023-05-11 7:51 ` [PATCH v2 2/4] perf tools: Extend PRINT_ATTRf to support printing of members with a value of 0 Yang Jihong
` (2 subsequent siblings)
3 siblings, 1 reply; 14+ messages in thread
From: Yang Jihong @ 2023-05-11 7:51 UTC (permalink / raw)
To: peterz, mingo, acme, mark.rutland, alexander.shishkin, jolsa,
namhyung, irogers, adrian.hunter, anshuman.khandual, jesussanp,
linux-perf-users, linux-kernel
Cc: yangjihong1
Add tracepoint_id_to_name() helper to search for the trace events directory
by given event id and return the corresponding tracepoint.
Signed-off-by: Yang Jihong <yangjihong1@huawei.com>
---
tools/perf/util/trace-event-info.c | 11 +++++++++++
tools/perf/util/trace-event.h | 6 ++++++
2 files changed, 17 insertions(+)
diff --git a/tools/perf/util/trace-event-info.c b/tools/perf/util/trace-event-info.c
index c24b3a15e319..a5c65cb02a28 100644
--- a/tools/perf/util/trace-event-info.c
+++ b/tools/perf/util/trace-event-info.c
@@ -466,6 +466,17 @@ static struct tracepoint_path *tracepoint_id_to_path(u64 config)
return NULL;
}
+char *tracepoint_id_to_name(u64 config)
+{
+ char *buf = NULL;
+ struct tracepoint_path *path = tracepoint_id_to_path(config);
+
+ if ((path != NULL) && (asprintf(&buf, "%s:%s", path->system, path->name) > 0))
+ return buf;
+
+ return NULL;
+}
+
static struct tracepoint_path *tracepoint_name_to_path(const char *name)
{
struct tracepoint_path *path = zalloc(sizeof(*path));
diff --git a/tools/perf/util/trace-event.h b/tools/perf/util/trace-event.h
index a0cff184b1cd..a69ee29419f3 100644
--- a/tools/perf/util/trace-event.h
+++ b/tools/perf/util/trace-event.h
@@ -62,6 +62,12 @@ unsigned long long eval_flag(const char *flag);
int read_tracing_data(int fd, struct list_head *pattrs);
+/*
+ * Return the tracepoint name in the format "subsystem:event_name",
+ * callers should free the returned string.
+ */
+char *tracepoint_id_to_name(u64 config);
+
struct tracing_data {
/* size is only valid if temp is 'true' */
ssize_t size;
--
2.30.GIT
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [PATCH v2 2/4] perf tools: Extend PRINT_ATTRf to support printing of members with a value of 0
2023-05-11 7:51 [PATCH v2 0/4] perf tools: Add printing perf_event_attr `config` and `id` symbol in perf_event_attr__fprintf() Yang Jihong
2023-05-11 7:51 ` [PATCH v2 1/4] perf trace-event-info: Add tracepoint_id_to_name() helper Yang Jihong
@ 2023-05-11 7:51 ` Yang Jihong
2023-05-11 7:51 ` [PATCH v2 3/4] perf tools: Add printing perf_event_attr type symbol in perf_event_attr__fprintf() Yang Jihong
2023-05-11 7:51 ` [PATCH v2 4/4] perf tools: Add printing perf_event_attr config " Yang Jihong
3 siblings, 0 replies; 14+ messages in thread
From: Yang Jihong @ 2023-05-11 7:51 UTC (permalink / raw)
To: peterz, mingo, acme, mark.rutland, alexander.shishkin, jolsa,
namhyung, irogers, adrian.hunter, anshuman.khandual, jesussanp,
linux-perf-users, linux-kernel
Cc: yangjihong1
When printing attr, members whose value is 0 will not be printed, we want
to print the case where attr->type is 0(PERF_TYPE_HARDWARE), add `_a`
param to PRINT_ATTRf macro to always print member when it is true
No functional change.
Signed-off-by: Yang Jihong <yangjihong1@huawei.com>
---
tools/perf/util/perf_event_attr_fprintf.c | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/tools/perf/util/perf_event_attr_fprintf.c b/tools/perf/util/perf_event_attr_fprintf.c
index 7e5e7b30510d..433029c6afc5 100644
--- a/tools/perf/util/perf_event_attr_fprintf.c
+++ b/tools/perf/util/perf_event_attr_fprintf.c
@@ -80,15 +80,15 @@ static void __p_read_format(char *buf, size_t size, u64 value)
#define p_branch_sample_type(val) __p_branch_sample_type(buf, BUF_SIZE, val)
#define p_read_format(val) __p_read_format(buf, BUF_SIZE, val)
-#define PRINT_ATTRn(_n, _f, _p) \
+#define PRINT_ATTRn(_n, _f, _p, _a) \
do { \
- if (attr->_f) { \
+ if (_a || attr->_f) { \
_p(attr->_f); \
ret += attr__fprintf(fp, _n, buf, priv);\
} \
} while (0)
-#define PRINT_ATTRf(_f, _p) PRINT_ATTRn(#_f, _f, _p)
+#define PRINT_ATTRf(_f, _p) PRINT_ATTRn(#_f, _f, _p, false)
int perf_event_attr__fprintf(FILE *fp, struct perf_event_attr *attr,
attr__fprintf_f attr__fprintf, void *priv)
@@ -99,7 +99,7 @@ int perf_event_attr__fprintf(FILE *fp, struct perf_event_attr *attr,
PRINT_ATTRf(type, p_unsigned);
PRINT_ATTRf(size, p_unsigned);
PRINT_ATTRf(config, p_hex);
- PRINT_ATTRn("{ sample_period, sample_freq }", sample_period, p_unsigned);
+ PRINT_ATTRn("{ sample_period, sample_freq }", sample_period, p_unsigned, false);
PRINT_ATTRf(sample_type, p_sample_type);
PRINT_ATTRf(read_format, p_read_format);
@@ -141,10 +141,10 @@ int perf_event_attr__fprintf(FILE *fp, struct perf_event_attr *attr,
PRINT_ATTRf(remove_on_exec, p_unsigned);
PRINT_ATTRf(sigtrap, p_unsigned);
- PRINT_ATTRn("{ wakeup_events, wakeup_watermark }", wakeup_events, p_unsigned);
+ PRINT_ATTRn("{ wakeup_events, wakeup_watermark }", wakeup_events, p_unsigned, false);
PRINT_ATTRf(bp_type, p_unsigned);
- PRINT_ATTRn("{ bp_addr, config1 }", bp_addr, p_hex);
- PRINT_ATTRn("{ bp_len, config2 }", bp_len, p_hex);
+ PRINT_ATTRn("{ bp_addr, config1 }", bp_addr, p_hex, false);
+ PRINT_ATTRn("{ bp_len, config2 }", bp_len, p_hex, false);
PRINT_ATTRf(branch_sample_type, p_branch_sample_type);
PRINT_ATTRf(sample_regs_user, p_hex);
PRINT_ATTRf(sample_stack_user, p_unsigned);
--
2.30.GIT
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [PATCH v2 3/4] perf tools: Add printing perf_event_attr type symbol in perf_event_attr__fprintf()
2023-05-11 7:51 [PATCH v2 0/4] perf tools: Add printing perf_event_attr `config` and `id` symbol in perf_event_attr__fprintf() Yang Jihong
2023-05-11 7:51 ` [PATCH v2 1/4] perf trace-event-info: Add tracepoint_id_to_name() helper Yang Jihong
2023-05-11 7:51 ` [PATCH v2 2/4] perf tools: Extend PRINT_ATTRf to support printing of members with a value of 0 Yang Jihong
@ 2023-05-11 7:51 ` Yang Jihong
2023-05-12 10:34 ` Adrian Hunter
2023-05-11 7:51 ` [PATCH v2 4/4] perf tools: Add printing perf_event_attr config " Yang Jihong
3 siblings, 1 reply; 14+ messages in thread
From: Yang Jihong @ 2023-05-11 7:51 UTC (permalink / raw)
To: peterz, mingo, acme, mark.rutland, alexander.shishkin, jolsa,
namhyung, irogers, adrian.hunter, anshuman.khandual, jesussanp,
linux-perf-users, linux-kernel
Cc: yangjihong1
When printing perf_event_attr, always display perf_event_attr type and its symbol
to improve the readability of debugging information.
Before:
# perf --debug verbose=2 record -e cycles,cpu-clock,sched:sched_switch,branch-load-misses,r101,mem:0x0 -C 0 true
<SNIP>
------------------------------------------------------------
perf_event_attr:
size 136
{ sample_period, sample_freq } 4000
sample_type IP|TID|TIME|CPU|PERIOD|IDENTIFIER
read_format ID
disabled 1
inherit 1
freq 1
sample_id_all 1
exclude_guest 1
------------------------------------------------------------
sys_perf_event_open: pid -1 cpu 0 group_fd -1 flags 0x8 = 5
------------------------------------------------------------
perf_event_attr:
type 1
size 136
{ sample_period, sample_freq } 4000
sample_type IP|TID|TIME|CPU|PERIOD|IDENTIFIER
read_format ID
disabled 1
inherit 1
freq 1
sample_id_all 1
exclude_guest 1
------------------------------------------------------------
sys_perf_event_open: pid -1 cpu 0 group_fd -1 flags 0x8 = 6
------------------------------------------------------------
perf_event_attr:
type 2
size 136
config 0x143
{ sample_period, sample_freq } 1
sample_type IP|TID|TIME|CPU|PERIOD|RAW|IDENTIFIER
read_format ID
disabled 1
inherit 1
sample_id_all 1
exclude_guest 1
------------------------------------------------------------
sys_perf_event_open: pid -1 cpu 0 group_fd -1 flags 0x8 = 7
------------------------------------------------------------
perf_event_attr:
type 3
size 136
config 0x10005
{ sample_period, sample_freq } 4000
sample_type IP|TID|TIME|CPU|PERIOD|IDENTIFIER
read_format ID
disabled 1
inherit 1
freq 1
sample_id_all 1
exclude_guest 1
------------------------------------------------------------
sys_perf_event_open: pid -1 cpu 0 group_fd -1 flags 0x8 = 9
------------------------------------------------------------
perf_event_attr:
type 4
size 136
config 0x101
{ sample_period, sample_freq } 4000
sample_type IP|TID|TIME|CPU|PERIOD|IDENTIFIER
read_format ID
disabled 1
inherit 1
freq 1
sample_id_all 1
exclude_guest 1
------------------------------------------------------------
sys_perf_event_open: pid -1 cpu 0 group_fd -1 flags 0x8 = 10
------------------------------------------------------------
perf_event_attr:
type 5
size 136
{ sample_period, sample_freq } 1
sample_type IP|TID|TIME|CPU|IDENTIFIER
read_format ID
disabled 1
inherit 1
sample_id_all 1
exclude_guest 1
bp_type 3
{ bp_len, config2 } 0x4
------------------------------------------------------------
<SNIP>
After:
# perf --debug verbose=2 record -e cycles,cpu-clock,sched:sched_switch,branch-load-misses,r101,mem:0x0 -C 0 true
<SNIP>
------------------------------------------------------------
perf_event_attr:
type 0 (PERF_TYPE_HARDWARE)
size 136
{ sample_period, sample_freq } 4000
sample_type IP|TID|TIME|CPU|PERIOD|IDENTIFIER
read_format ID
disabled 1
inherit 1
freq 1
sample_id_all 1
exclude_guest 1
------------------------------------------------------------
sys_perf_event_open: pid -1 cpu 0 group_fd -1 flags 0x8 = 5
------------------------------------------------------------
perf_event_attr:
type 1 (PERF_TYPE_SOFTWARE)
size 136
{ sample_period, sample_freq } 4000
sample_type IP|TID|TIME|CPU|PERIOD|IDENTIFIER
read_format ID
disabled 1
inherit 1
freq 1
sample_id_all 1
exclude_guest 1
------------------------------------------------------------
sys_perf_event_open: pid -1 cpu 0 group_fd -1 flags 0x8 = 6
------------------------------------------------------------
perf_event_attr:
type 2 (PERF_TYPE_TRACEPOINT)
size 136
config 0x143
{ sample_period, sample_freq } 1
sample_type IP|TID|TIME|CPU|PERIOD|RAW|IDENTIFIER
read_format ID
disabled 1
inherit 1
sample_id_all 1
exclude_guest 1
------------------------------------------------------------
sys_perf_event_open: pid -1 cpu 0 group_fd -1 flags 0x8 = 7
------------------------------------------------------------
perf_event_attr:
type 3 (PERF_TYPE_HW_CACHE)
size 136
config 0x10005
{ sample_period, sample_freq } 4000
sample_type IP|TID|TIME|CPU|PERIOD|IDENTIFIER
read_format ID
disabled 1
inherit 1
freq 1
sample_id_all 1
exclude_guest 1
------------------------------------------------------------
sys_perf_event_open: pid -1 cpu 0 group_fd -1 flags 0x8 = 9
------------------------------------------------------------
perf_event_attr:
type 4 (PERF_TYPE_RAW)
size 136
config 0x101
{ sample_period, sample_freq } 4000
sample_type IP|TID|TIME|CPU|PERIOD|IDENTIFIER
read_format ID
disabled 1
inherit 1
freq 1
sample_id_all 1
exclude_guest 1
------------------------------------------------------------
sys_perf_event_open: pid -1 cpu 0 group_fd -1 flags 0x8 = 10
------------------------------------------------------------
perf_event_attr:
type 5 (PERF_TYPE_BREAKPOINT)
size 136
{ sample_period, sample_freq } 1
sample_type IP|TID|TIME|CPU|IDENTIFIER
read_format ID
disabled 1
inherit 1
sample_id_all 1
exclude_guest 1
bp_type 3
{ bp_len, config2 } 0x4
------------------------------------------------------------
<SNIP>
Signed-off-by: Yang Jihong <yangjihong1@huawei.com>
---
tools/perf/util/perf_event_attr_fprintf.c | 30 ++++++++++++++++++++++-
1 file changed, 29 insertions(+), 1 deletion(-)
diff --git a/tools/perf/util/perf_event_attr_fprintf.c b/tools/perf/util/perf_event_attr_fprintf.c
index 433029c6afc5..cd0905d8cb7a 100644
--- a/tools/perf/util/perf_event_attr_fprintf.c
+++ b/tools/perf/util/perf_event_attr_fprintf.c
@@ -71,6 +71,33 @@ static void __p_read_format(char *buf, size_t size, u64 value)
__p_bits(buf, size, value, bits);
}
+#define ENUM_ID_TO_STR_CASE(x) case x: return (#x);
+static const char *stringify_perf_type_id(u64 value)
+{
+ /* sync with enum perf_type_id in perf_event.h */
+ switch (value) {
+ ENUM_ID_TO_STR_CASE(PERF_TYPE_HARDWARE)
+ ENUM_ID_TO_STR_CASE(PERF_TYPE_SOFTWARE)
+ ENUM_ID_TO_STR_CASE(PERF_TYPE_TRACEPOINT)
+ ENUM_ID_TO_STR_CASE(PERF_TYPE_HW_CACHE)
+ ENUM_ID_TO_STR_CASE(PERF_TYPE_RAW)
+ ENUM_ID_TO_STR_CASE(PERF_TYPE_BREAKPOINT)
+ default:
+ return NULL;
+ }
+}
+#undef ENUM_ID_TO_STR_CASE
+
+static void __p_type_id(char *buf, size_t size, u64 value)
+{
+ const char *str = stringify_perf_type_id(value);
+
+ if (str == NULL)
+ snprintf(buf, size, "%"PRIu64, value);
+ else
+ snprintf(buf, size, "%"PRIu64" (%s)", value, str);
+}
+
#define BUF_SIZE 1024
#define p_hex(val) snprintf(buf, BUF_SIZE, "%#"PRIx64, (uint64_t)(val))
@@ -79,6 +106,7 @@ static void __p_read_format(char *buf, size_t size, u64 value)
#define p_sample_type(val) __p_sample_type(buf, BUF_SIZE, val)
#define p_branch_sample_type(val) __p_branch_sample_type(buf, BUF_SIZE, val)
#define p_read_format(val) __p_read_format(buf, BUF_SIZE, val)
+#define p_type_id(val) __p_type_id(buf, BUF_SIZE, val)
#define PRINT_ATTRn(_n, _f, _p, _a) \
do { \
@@ -96,7 +124,7 @@ int perf_event_attr__fprintf(FILE *fp, struct perf_event_attr *attr,
char buf[BUF_SIZE];
int ret = 0;
- PRINT_ATTRf(type, p_unsigned);
+ PRINT_ATTRn("type", type, p_type_id, true);
PRINT_ATTRf(size, p_unsigned);
PRINT_ATTRf(config, p_hex);
PRINT_ATTRn("{ sample_period, sample_freq }", sample_period, p_unsigned, false);
--
2.30.GIT
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [PATCH v2 4/4] perf tools: Add printing perf_event_attr config symbol in perf_event_attr__fprintf()
2023-05-11 7:51 [PATCH v2 0/4] perf tools: Add printing perf_event_attr `config` and `id` symbol in perf_event_attr__fprintf() Yang Jihong
` (2 preceding siblings ...)
2023-05-11 7:51 ` [PATCH v2 3/4] perf tools: Add printing perf_event_attr type symbol in perf_event_attr__fprintf() Yang Jihong
@ 2023-05-11 7:51 ` Yang Jihong
2023-05-12 10:34 ` Adrian Hunter
3 siblings, 1 reply; 14+ messages in thread
From: Yang Jihong @ 2023-05-11 7:51 UTC (permalink / raw)
To: peterz, mingo, acme, mark.rutland, alexander.shishkin, jolsa,
namhyung, irogers, adrian.hunter, anshuman.khandual, jesussanp,
linux-perf-users, linux-kernel
Cc: yangjihong1
When printing perf_event_attr, always display perf_event_attr config and its symbol
to improve the readability of debugging information.
Before:
# perf --debug verbose=2 record -e cycles,cpu-clock,sched:sched_switch,branch-load-misses,r101,mem:0x0 -C 0 true
<SNIP>
------------------------------------------------------------
perf_event_attr:
size 136
{ sample_period, sample_freq } 4000
sample_type IP|TID|TIME|CPU|PERIOD|IDENTIFIER
read_format ID
disabled 1
inherit 1
freq 1
sample_id_all 1
exclude_guest 1
------------------------------------------------------------
sys_perf_event_open: pid -1 cpu 0 group_fd -1 flags 0x8 = 5
------------------------------------------------------------
perf_event_attr:
type 1
size 136
{ sample_period, sample_freq } 4000
sample_type IP|TID|TIME|CPU|PERIOD|IDENTIFIER
read_format ID
disabled 1
inherit 1
freq 1
sample_id_all 1
exclude_guest 1
------------------------------------------------------------
sys_perf_event_open: pid -1 cpu 0 group_fd -1 flags 0x8 = 6
------------------------------------------------------------
perf_event_attr:
type 2
size 136
config 0x143
{ sample_period, sample_freq } 1
sample_type IP|TID|TIME|CPU|PERIOD|RAW|IDENTIFIER
read_format ID
disabled 1
inherit 1
sample_id_all 1
exclude_guest 1
------------------------------------------------------------
sys_perf_event_open: pid -1 cpu 0 group_fd -1 flags 0x8 = 7
------------------------------------------------------------
perf_event_attr:
type 3
size 136
config 0x10005
{ sample_period, sample_freq } 4000
sample_type IP|TID|TIME|CPU|PERIOD|IDENTIFIER
read_format ID
disabled 1
inherit 1
freq 1
sample_id_all 1
exclude_guest 1
------------------------------------------------------------
sys_perf_event_open: pid -1 cpu 0 group_fd -1 flags 0x8 = 9
------------------------------------------------------------
perf_event_attr:
type 4
size 136
config 0x101
{ sample_period, sample_freq } 4000
sample_type IP|TID|TIME|CPU|PERIOD|IDENTIFIER
read_format ID
disabled 1
inherit 1
freq 1
sample_id_all 1
exclude_guest 1
------------------------------------------------------------
sys_perf_event_open: pid -1 cpu 0 group_fd -1 flags 0x8 = 10
------------------------------------------------------------
perf_event_attr:
type 5
size 136
{ sample_period, sample_freq } 1
sample_type IP|TID|TIME|CPU|IDENTIFIER
read_format ID
disabled 1
inherit 1
sample_id_all 1
exclude_guest 1
bp_type 3
{ bp_len, config2 } 0x4
------------------------------------------------------------
<SNIP>
After:
# perf --debug verbose=2 record -e cycles,cpu-clock,sched:sched_switch,branch-load-misses,r101,mem:0x0 -C 0 true
<SNIP>
------------------------------------------------------------
perf_event_attr:
type 0 (PERF_TYPE_HARDWARE)
size 136
config 0 (PERF_COUNT_HW_CPU_CYCLES)
{ sample_period, sample_freq } 4000
sample_type IP|TID|TIME|CPU|PERIOD|IDENTIFIER
read_format ID
disabled 1
inherit 1
freq 1
sample_id_all 1
exclude_guest 1
------------------------------------------------------------
sys_perf_event_open: pid -1 cpu 0 group_fd -1 flags 0x8 = 5
------------------------------------------------------------
perf_event_attr:
type 1 (PERF_TYPE_SOFTWARE)
size 136
config 0 (PERF_COUNT_SW_CPU_CLOCK)
{ sample_period, sample_freq } 4000
sample_type IP|TID|TIME|CPU|PERIOD|IDENTIFIER
read_format ID
disabled 1
inherit 1
freq 1
sample_id_all 1
exclude_guest 1
------------------------------------------------------------
sys_perf_event_open: pid -1 cpu 0 group_fd -1 flags 0x8 = 6
------------------------------------------------------------
perf_event_attr:
type 2 (PERF_TYPE_TRACEPOINT)
size 136
config 0x143 (sched:sched_switch)
{ sample_period, sample_freq } 1
sample_type IP|TID|TIME|CPU|PERIOD|RAW|IDENTIFIER
read_format ID
disabled 1
inherit 1
sample_id_all 1
exclude_guest 1
------------------------------------------------------------
sys_perf_event_open: pid -1 cpu 0 group_fd -1 flags 0x8 = 7
------------------------------------------------------------
perf_event_attr:
type 3 (PERF_TYPE_HW_CACHE)
size 136
config 0x10005 (PERF_COUNT_HW_CACHE_RESULT_MISS | PERF_COUNT_HW_CACHE_OP_READ | PERF_COUNT_HW_CACHE_BPU)
{ sample_period, sample_freq } 4000
sample_type IP|TID|TIME|CPU|PERIOD|IDENTIFIER
read_format ID
disabled 1
inherit 1
freq 1
sample_id_all 1
exclude_guest 1
------------------------------------------------------------
sys_perf_event_open: pid -1 cpu 0 group_fd -1 flags 0x8 = 9
------------------------------------------------------------
perf_event_attr:
type 4 (PERF_TYPE_RAW)
size 136
config 0x101
{ sample_period, sample_freq } 4000
sample_type IP|TID|TIME|CPU|PERIOD|IDENTIFIER
read_format ID
disabled 1
inherit 1
freq 1
sample_id_all 1
exclude_guest 1
------------------------------------------------------------
sys_perf_event_open: pid -1 cpu 0 group_fd -1 flags 0x8 = 10
------------------------------------------------------------
perf_event_attr:
type 5 (PERF_TYPE_BREAKPOINT)
size 136
config 0
{ sample_period, sample_freq } 1
sample_type IP|TID|TIME|CPU|IDENTIFIER
read_format ID
disabled 1
inherit 1
sample_id_all 1
exclude_guest 1
bp_type 3
{ bp_len, config2 } 0x4
------------------------------------------------------------
sys_perf_event_open: pid -1 cpu 0 group_fd -1 flags 0x8 = 11
------------------------------------------------------------
perf_event_attr:
type 1 (PERF_TYPE_SOFTWARE)
size 136
config 9 (PERF_COUNT_SW_DUMMY)
{ sample_period, sample_freq } 4000
sample_type IP|TID|TIME|CPU|PERIOD|IDENTIFIER
read_format ID
inherit 1
mmap 1
comm 1
freq 1
task 1
sample_id_all 1
mmap2 1
comm_exec 1
ksymbol 1
bpf_event 1
------------------------------------------------------------
sys_perf_event_open: pid -1 cpu 0 group_fd -1 flags 0x8 = 12
<SNIP>
Signed-off-by: Yang Jihong <yangjihong1@huawei.com>
---
tools/perf/util/perf_event_attr_fprintf.c | 159 +++++++++++++++++++++-
1 file changed, 158 insertions(+), 1 deletion(-)
diff --git a/tools/perf/util/perf_event_attr_fprintf.c b/tools/perf/util/perf_event_attr_fprintf.c
index cd0905d8cb7a..7730f0d7c28a 100644
--- a/tools/perf/util/perf_event_attr_fprintf.c
+++ b/tools/perf/util/perf_event_attr_fprintf.c
@@ -7,6 +7,11 @@
#include <linux/perf_event.h>
#include "util/evsel_fprintf.h"
+#ifdef HAVE_LIBTRACEEVENT
+#include <stdlib.h> // for free
+#include "trace-event.h"
+#endif
+
struct bit_names {
int bit;
const char *name;
@@ -86,6 +91,85 @@ static const char *stringify_perf_type_id(u64 value)
return NULL;
}
}
+
+static const char *stringify_perf_hw_id(u64 value)
+{
+ /* sync with enum perf_hw_id in perf_event.h */
+ switch (value) {
+ ENUM_ID_TO_STR_CASE(PERF_COUNT_HW_CPU_CYCLES)
+ ENUM_ID_TO_STR_CASE(PERF_COUNT_HW_INSTRUCTIONS)
+ ENUM_ID_TO_STR_CASE(PERF_COUNT_HW_CACHE_REFERENCES)
+ ENUM_ID_TO_STR_CASE(PERF_COUNT_HW_CACHE_MISSES)
+ ENUM_ID_TO_STR_CASE(PERF_COUNT_HW_BRANCH_INSTRUCTIONS)
+ ENUM_ID_TO_STR_CASE(PERF_COUNT_HW_BRANCH_MISSES)
+ ENUM_ID_TO_STR_CASE(PERF_COUNT_HW_BUS_CYCLES)
+ ENUM_ID_TO_STR_CASE(PERF_COUNT_HW_STALLED_CYCLES_FRONTEND)
+ ENUM_ID_TO_STR_CASE(PERF_COUNT_HW_STALLED_CYCLES_BACKEND)
+ ENUM_ID_TO_STR_CASE(PERF_COUNT_HW_REF_CPU_CYCLES)
+ default:
+ return NULL;
+ }
+}
+
+static const char *stringify_perf_hw_cache_id(u64 value)
+{
+ /* sync with enum perf_hw_cache_id in perf_event.h */
+ switch (value) {
+ ENUM_ID_TO_STR_CASE(PERF_COUNT_HW_CACHE_L1D)
+ ENUM_ID_TO_STR_CASE(PERF_COUNT_HW_CACHE_L1I)
+ ENUM_ID_TO_STR_CASE(PERF_COUNT_HW_CACHE_LL)
+ ENUM_ID_TO_STR_CASE(PERF_COUNT_HW_CACHE_DTLB)
+ ENUM_ID_TO_STR_CASE(PERF_COUNT_HW_CACHE_ITLB)
+ ENUM_ID_TO_STR_CASE(PERF_COUNT_HW_CACHE_BPU)
+ ENUM_ID_TO_STR_CASE(PERF_COUNT_HW_CACHE_NODE)
+ default:
+ return NULL;
+ }
+}
+
+static const char *stringify_perf_hw_cache_op_id(u64 value)
+{
+ /* sync with enum perf_hw_cache_op_id in perf_event.h */
+ switch (value) {
+ ENUM_ID_TO_STR_CASE(PERF_COUNT_HW_CACHE_OP_READ)
+ ENUM_ID_TO_STR_CASE(PERF_COUNT_HW_CACHE_OP_WRITE)
+ ENUM_ID_TO_STR_CASE(PERF_COUNT_HW_CACHE_OP_PREFETCH)
+ default:
+ return NULL;
+ }
+}
+
+static const char *stringify_perf_hw_cache_op_result_id(u64 value)
+{
+ /* sync with enum perf_hw_cache_op_result_id in perf_event.h */
+ switch (value) {
+ ENUM_ID_TO_STR_CASE(PERF_COUNT_HW_CACHE_RESULT_ACCESS)
+ ENUM_ID_TO_STR_CASE(PERF_COUNT_HW_CACHE_RESULT_MISS)
+ default:
+ return NULL;
+ }
+}
+
+static const char *stringify_perf_sw_id(u64 value)
+{
+ /* sync with enum perf_sw_ids in perf_event.h */
+ switch (value) {
+ ENUM_ID_TO_STR_CASE(PERF_COUNT_SW_CPU_CLOCK)
+ ENUM_ID_TO_STR_CASE(PERF_COUNT_SW_TASK_CLOCK)
+ ENUM_ID_TO_STR_CASE(PERF_COUNT_SW_PAGE_FAULTS)
+ ENUM_ID_TO_STR_CASE(PERF_COUNT_SW_CONTEXT_SWITCHES)
+ ENUM_ID_TO_STR_CASE(PERF_COUNT_SW_CPU_MIGRATIONS)
+ ENUM_ID_TO_STR_CASE(PERF_COUNT_SW_PAGE_FAULTS_MIN)
+ ENUM_ID_TO_STR_CASE(PERF_COUNT_SW_PAGE_FAULTS_MAJ)
+ ENUM_ID_TO_STR_CASE(PERF_COUNT_SW_ALIGNMENT_FAULTS)
+ ENUM_ID_TO_STR_CASE(PERF_COUNT_SW_EMULATION_FAULTS)
+ ENUM_ID_TO_STR_CASE(PERF_COUNT_SW_DUMMY)
+ ENUM_ID_TO_STR_CASE(PERF_COUNT_SW_BPF_OUTPUT)
+ ENUM_ID_TO_STR_CASE(PERF_COUNT_SW_CGROUP_SWITCHES)
+ default:
+ return NULL;
+ }
+}
#undef ENUM_ID_TO_STR_CASE
static void __p_type_id(char *buf, size_t size, u64 value)
@@ -98,6 +182,78 @@ static void __p_type_id(char *buf, size_t size, u64 value)
snprintf(buf, size, "%"PRIu64" (%s)", value, str);
}
+static void __p_config_hw_id(char *buf, size_t size, u64 value)
+{
+ const char *str = stringify_perf_hw_id(value);
+
+ if (str == NULL)
+ snprintf(buf, size, "%"PRIx64, value);
+ else
+ snprintf(buf, size, "%"PRIx64" (%s)", value, str);
+}
+
+static void __p_config_sw_id(char *buf, size_t size, u64 value)
+{
+ const char *str = stringify_perf_sw_id(value);
+
+ if (str == NULL)
+ snprintf(buf, size, "%"PRIx64, value);
+ else
+ snprintf(buf, size, "%"PRIx64" (%s)", value, str);
+}
+
+static void __p_config_hw_cache_id(char *buf, size_t size, u64 value)
+{
+ const char *hw_cache_str = stringify_perf_hw_cache_id(value & 0xff);
+ const char *hw_cache_op_str =
+ stringify_perf_hw_cache_op_id((value & 0xff00) >> 8);
+ const char *hw_cache_op_result_str =
+ stringify_perf_hw_cache_op_result_id((value & 0xff0000) >> 16);
+
+ if (hw_cache_str == NULL || hw_cache_op_str == NULL ||
+ hw_cache_op_result_str == NULL) {
+ snprintf(buf, size, "%#"PRIx64, value);
+ } else {
+ snprintf(buf, size, "%#"PRIx64" (%s | %s | %s)", value,
+ hw_cache_op_result_str, hw_cache_op_str, hw_cache_str);
+ }
+}
+
+#ifdef HAVE_LIBTRACEEVENT
+static void __p_config_tracepoint_id(char *buf, size_t size, u64 value)
+{
+ char *str = tracepoint_id_to_name(value);
+
+ if (str != NULL) {
+ snprintf(buf, size, "%#"PRIx64" (%s)", value, str);
+ free(str);
+ } else {
+ snprintf(buf, size, "%#"PRIx64, value);
+ }
+}
+#endif
+
+static void __p_config_id(char *buf, size_t size, u32 type, u64 value)
+{
+ switch (type) {
+ case PERF_TYPE_HARDWARE:
+ return __p_config_hw_id(buf, size, value);
+ case PERF_TYPE_SOFTWARE:
+ return __p_config_sw_id(buf, size, value);
+ case PERF_TYPE_HW_CACHE:
+ return __p_config_hw_cache_id(buf, size, value);
+ case PERF_TYPE_TRACEPOINT:
+#ifdef HAVE_LIBTRACEEVENT
+ return __p_config_tracepoint_id(buf, size, value);
+#endif
+ case PERF_TYPE_RAW:
+ case PERF_TYPE_BREAKPOINT:
+ default:
+ snprintf(buf, size, "%#"PRIx64, value);
+ return;
+ }
+}
+
#define BUF_SIZE 1024
#define p_hex(val) snprintf(buf, BUF_SIZE, "%#"PRIx64, (uint64_t)(val))
@@ -107,6 +263,7 @@ static void __p_type_id(char *buf, size_t size, u64 value)
#define p_branch_sample_type(val) __p_branch_sample_type(buf, BUF_SIZE, val)
#define p_read_format(val) __p_read_format(buf, BUF_SIZE, val)
#define p_type_id(val) __p_type_id(buf, BUF_SIZE, val)
+#define p_config_id(val) __p_config_id(buf, BUF_SIZE, attr->type, val)
#define PRINT_ATTRn(_n, _f, _p, _a) \
do { \
@@ -126,7 +283,7 @@ int perf_event_attr__fprintf(FILE *fp, struct perf_event_attr *attr,
PRINT_ATTRn("type", type, p_type_id, true);
PRINT_ATTRf(size, p_unsigned);
- PRINT_ATTRf(config, p_hex);
+ PRINT_ATTRn("config", config, p_config_id, true);
PRINT_ATTRn("{ sample_period, sample_freq }", sample_period, p_unsigned, false);
PRINT_ATTRf(sample_type, p_sample_type);
PRINT_ATTRf(read_format, p_read_format);
--
2.30.GIT
^ permalink raw reply related [flat|nested] 14+ messages in thread
* Re: [PATCH v2 1/4] perf trace-event-info: Add tracepoint_id_to_name() helper
2023-05-11 7:51 ` [PATCH v2 1/4] perf trace-event-info: Add tracepoint_id_to_name() helper Yang Jihong
@ 2023-05-12 10:33 ` Adrian Hunter
2023-05-15 8:42 ` Yang Jihong
0 siblings, 1 reply; 14+ messages in thread
From: Adrian Hunter @ 2023-05-12 10:33 UTC (permalink / raw)
To: Yang Jihong, peterz, mingo, acme, mark.rutland,
alexander.shishkin, jolsa, namhyung, irogers, anshuman.khandual,
jesussanp, linux-perf-users, linux-kernel
On 11/05/23 10:51, Yang Jihong wrote:
> Add tracepoint_id_to_name() helper to search for the trace events directory
> by given event id and return the corresponding tracepoint.
>
> Signed-off-by: Yang Jihong <yangjihong1@huawei.com>
> ---
> tools/perf/util/trace-event-info.c | 11 +++++++++++
> tools/perf/util/trace-event.h | 6 ++++++
> 2 files changed, 17 insertions(+)
>
> diff --git a/tools/perf/util/trace-event-info.c b/tools/perf/util/trace-event-info.c
> index c24b3a15e319..a5c65cb02a28 100644
> --- a/tools/perf/util/trace-event-info.c
> +++ b/tools/perf/util/trace-event-info.c
> @@ -466,6 +466,17 @@ static struct tracepoint_path *tracepoint_id_to_path(u64 config)
> return NULL;
> }
>
> +char *tracepoint_id_to_name(u64 config)
> +{
> + char *buf = NULL;
> + struct tracepoint_path *path = tracepoint_id_to_path(config);
It is considered slightly nicer to put local declarations
in descending order of line length. i.e.
struct tracepoint_path *path = tracepoint_id_to_path(config);
char *buf = NULL;
> +
> + if ((path != NULL) && (asprintf(&buf, "%s:%s", path->system, path->name) > 0))
The parentheses are unnecessary and kernel style tends to avoid "!= NULL"
i.e.
if (path && asprintf(&buf, "%s:%s", path->system, path->name) > 0)
> + return buf;
> +
> + return NULL;
> +}
> +
> static struct tracepoint_path *tracepoint_name_to_path(const char *name)
> {
> struct tracepoint_path *path = zalloc(sizeof(*path));
> diff --git a/tools/perf/util/trace-event.h b/tools/perf/util/trace-event.h
> index a0cff184b1cd..a69ee29419f3 100644
> --- a/tools/perf/util/trace-event.h
> +++ b/tools/perf/util/trace-event.h
> @@ -62,6 +62,12 @@ unsigned long long eval_flag(const char *flag);
>
> int read_tracing_data(int fd, struct list_head *pattrs);
>
> +/*
> + * Return the tracepoint name in the format "subsystem:event_name",
> + * callers should free the returned string.
> + */
> +char *tracepoint_id_to_name(u64 config);
> +
> struct tracing_data {
> /* size is only valid if temp is 'true' */
> ssize_t size;
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH v2 3/4] perf tools: Add printing perf_event_attr type symbol in perf_event_attr__fprintf()
2023-05-11 7:51 ` [PATCH v2 3/4] perf tools: Add printing perf_event_attr type symbol in perf_event_attr__fprintf() Yang Jihong
@ 2023-05-12 10:34 ` Adrian Hunter
2023-05-15 8:48 ` Yang Jihong
0 siblings, 1 reply; 14+ messages in thread
From: Adrian Hunter @ 2023-05-12 10:34 UTC (permalink / raw)
To: Yang Jihong, peterz, mingo, acme, mark.rutland,
alexander.shishkin, jolsa, namhyung, irogers, anshuman.khandual,
jesussanp, linux-perf-users, linux-kernel
On 11/05/23 10:51, Yang Jihong wrote:
> When printing perf_event_attr, always display perf_event_attr type and its symbol
> to improve the readability of debugging information.
>
> Before:
>
> # perf --debug verbose=2 record -e cycles,cpu-clock,sched:sched_switch,branch-load-misses,r101,mem:0x0 -C 0 true
> <SNIP>
> ------------------------------------------------------------
> perf_event_attr:
> size 136
> { sample_period, sample_freq } 4000
> sample_type IP|TID|TIME|CPU|PERIOD|IDENTIFIER
> read_format ID
> disabled 1
> inherit 1
> freq 1
> sample_id_all 1
> exclude_guest 1
> ------------------------------------------------------------
> sys_perf_event_open: pid -1 cpu 0 group_fd -1 flags 0x8 = 5
> ------------------------------------------------------------
> perf_event_attr:
> type 1
> size 136
> { sample_period, sample_freq } 4000
> sample_type IP|TID|TIME|CPU|PERIOD|IDENTIFIER
> read_format ID
> disabled 1
> inherit 1
> freq 1
> sample_id_all 1
> exclude_guest 1
> ------------------------------------------------------------
> sys_perf_event_open: pid -1 cpu 0 group_fd -1 flags 0x8 = 6
> ------------------------------------------------------------
> perf_event_attr:
> type 2
> size 136
> config 0x143
> { sample_period, sample_freq } 1
> sample_type IP|TID|TIME|CPU|PERIOD|RAW|IDENTIFIER
> read_format ID
> disabled 1
> inherit 1
> sample_id_all 1
> exclude_guest 1
> ------------------------------------------------------------
> sys_perf_event_open: pid -1 cpu 0 group_fd -1 flags 0x8 = 7
> ------------------------------------------------------------
> perf_event_attr:
> type 3
> size 136
> config 0x10005
> { sample_period, sample_freq } 4000
> sample_type IP|TID|TIME|CPU|PERIOD|IDENTIFIER
> read_format ID
> disabled 1
> inherit 1
> freq 1
> sample_id_all 1
> exclude_guest 1
> ------------------------------------------------------------
> sys_perf_event_open: pid -1 cpu 0 group_fd -1 flags 0x8 = 9
> ------------------------------------------------------------
> perf_event_attr:
> type 4
> size 136
> config 0x101
> { sample_period, sample_freq } 4000
> sample_type IP|TID|TIME|CPU|PERIOD|IDENTIFIER
> read_format ID
> disabled 1
> inherit 1
> freq 1
> sample_id_all 1
> exclude_guest 1
> ------------------------------------------------------------
> sys_perf_event_open: pid -1 cpu 0 group_fd -1 flags 0x8 = 10
> ------------------------------------------------------------
> perf_event_attr:
> type 5
> size 136
> { sample_period, sample_freq } 1
> sample_type IP|TID|TIME|CPU|IDENTIFIER
> read_format ID
> disabled 1
> inherit 1
> sample_id_all 1
> exclude_guest 1
> bp_type 3
> { bp_len, config2 } 0x4
> ------------------------------------------------------------
> <SNIP>
>
> After:
>
> # perf --debug verbose=2 record -e cycles,cpu-clock,sched:sched_switch,branch-load-misses,r101,mem:0x0 -C 0 true
> <SNIP>
> ------------------------------------------------------------
> perf_event_attr:
> type 0 (PERF_TYPE_HARDWARE)
> size 136
> { sample_period, sample_freq } 4000
> sample_type IP|TID|TIME|CPU|PERIOD|IDENTIFIER
> read_format ID
> disabled 1
> inherit 1
> freq 1
> sample_id_all 1
> exclude_guest 1
> ------------------------------------------------------------
> sys_perf_event_open: pid -1 cpu 0 group_fd -1 flags 0x8 = 5
> ------------------------------------------------------------
> perf_event_attr:
> type 1 (PERF_TYPE_SOFTWARE)
> size 136
> { sample_period, sample_freq } 4000
> sample_type IP|TID|TIME|CPU|PERIOD|IDENTIFIER
> read_format ID
> disabled 1
> inherit 1
> freq 1
> sample_id_all 1
> exclude_guest 1
> ------------------------------------------------------------
> sys_perf_event_open: pid -1 cpu 0 group_fd -1 flags 0x8 = 6
> ------------------------------------------------------------
> perf_event_attr:
> type 2 (PERF_TYPE_TRACEPOINT)
> size 136
> config 0x143
> { sample_period, sample_freq } 1
> sample_type IP|TID|TIME|CPU|PERIOD|RAW|IDENTIFIER
> read_format ID
> disabled 1
> inherit 1
> sample_id_all 1
> exclude_guest 1
> ------------------------------------------------------------
> sys_perf_event_open: pid -1 cpu 0 group_fd -1 flags 0x8 = 7
> ------------------------------------------------------------
> perf_event_attr:
> type 3 (PERF_TYPE_HW_CACHE)
> size 136
> config 0x10005
> { sample_period, sample_freq } 4000
> sample_type IP|TID|TIME|CPU|PERIOD|IDENTIFIER
> read_format ID
> disabled 1
> inherit 1
> freq 1
> sample_id_all 1
> exclude_guest 1
> ------------------------------------------------------------
> sys_perf_event_open: pid -1 cpu 0 group_fd -1 flags 0x8 = 9
> ------------------------------------------------------------
> perf_event_attr:
> type 4 (PERF_TYPE_RAW)
> size 136
> config 0x101
> { sample_period, sample_freq } 4000
> sample_type IP|TID|TIME|CPU|PERIOD|IDENTIFIER
> read_format ID
> disabled 1
> inherit 1
> freq 1
> sample_id_all 1
> exclude_guest 1
> ------------------------------------------------------------
> sys_perf_event_open: pid -1 cpu 0 group_fd -1 flags 0x8 = 10
> ------------------------------------------------------------
> perf_event_attr:
> type 5 (PERF_TYPE_BREAKPOINT)
> size 136
> { sample_period, sample_freq } 1
> sample_type IP|TID|TIME|CPU|IDENTIFIER
> read_format ID
> disabled 1
> inherit 1
> sample_id_all 1
> exclude_guest 1
> bp_type 3
> { bp_len, config2 } 0x4
> ------------------------------------------------------------
> <SNIP>
>
> Signed-off-by: Yang Jihong <yangjihong1@huawei.com>
> ---
> tools/perf/util/perf_event_attr_fprintf.c | 30 ++++++++++++++++++++++-
> 1 file changed, 29 insertions(+), 1 deletion(-)
>
> diff --git a/tools/perf/util/perf_event_attr_fprintf.c b/tools/perf/util/perf_event_attr_fprintf.c
> index 433029c6afc5..cd0905d8cb7a 100644
> --- a/tools/perf/util/perf_event_attr_fprintf.c
> +++ b/tools/perf/util/perf_event_attr_fprintf.c
> @@ -71,6 +71,33 @@ static void __p_read_format(char *buf, size_t size, u64 value)
> __p_bits(buf, size, value, bits);
> }
>
> +#define ENUM_ID_TO_STR_CASE(x) case x: return (#x);
> +static const char *stringify_perf_type_id(u64 value)
> +{
> + /* sync with enum perf_type_id in perf_event.h */
Everything in this file syncs with perf_event.h, so the comment
does not seem very useful.
> + switch (value) {
> + ENUM_ID_TO_STR_CASE(PERF_TYPE_HARDWARE)
> + ENUM_ID_TO_STR_CASE(PERF_TYPE_SOFTWARE)
> + ENUM_ID_TO_STR_CASE(PERF_TYPE_TRACEPOINT)
> + ENUM_ID_TO_STR_CASE(PERF_TYPE_HW_CACHE)
> + ENUM_ID_TO_STR_CASE(PERF_TYPE_RAW)
> + ENUM_ID_TO_STR_CASE(PERF_TYPE_BREAKPOINT)
> + default:
> + return NULL;
> + }
> +}
> +#undef ENUM_ID_TO_STR_CASE
> +
> +static void __p_type_id(char *buf, size_t size, u64 value)
> +{
> + const char *str = stringify_perf_type_id(value);
> +
> + if (str == NULL)
> + snprintf(buf, size, "%"PRIu64, value);
> + else
> + snprintf(buf, size, "%"PRIu64" (%s)", value, str);
These 4 lines end up getting used again about 3 times in the next
patch, so might as well be a separate function e.g.
print_id(buf, size, value, stringify_perf_type_id(value));
where:
static void print_id(char *buf, size_t size, u64 value, const char *str)
{
if (str == NULL)
snprintf(buf, size, "%"PRIu64, value);
else
snprintf(buf, size, "%"PRIu64" (%s)", value, str);
}
> +}
> +
> #define BUF_SIZE 1024
>
> #define p_hex(val) snprintf(buf, BUF_SIZE, "%#"PRIx64, (uint64_t)(val))
> @@ -79,6 +106,7 @@ static void __p_read_format(char *buf, size_t size, u64 value)
> #define p_sample_type(val) __p_sample_type(buf, BUF_SIZE, val)
> #define p_branch_sample_type(val) __p_branch_sample_type(buf, BUF_SIZE, val)
> #define p_read_format(val) __p_read_format(buf, BUF_SIZE, val)
> +#define p_type_id(val) __p_type_id(buf, BUF_SIZE, val)
>
> #define PRINT_ATTRn(_n, _f, _p, _a) \
> do { \
> @@ -96,7 +124,7 @@ int perf_event_attr__fprintf(FILE *fp, struct perf_event_attr *attr,
> char buf[BUF_SIZE];
> int ret = 0;
>
> - PRINT_ATTRf(type, p_unsigned);
> + PRINT_ATTRn("type", type, p_type_id, true);
> PRINT_ATTRf(size, p_unsigned);
> PRINT_ATTRf(config, p_hex);
> PRINT_ATTRn("{ sample_period, sample_freq }", sample_period, p_unsigned, false);
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH v2 4/4] perf tools: Add printing perf_event_attr config symbol in perf_event_attr__fprintf()
2023-05-11 7:51 ` [PATCH v2 4/4] perf tools: Add printing perf_event_attr config " Yang Jihong
@ 2023-05-12 10:34 ` Adrian Hunter
2023-05-15 8:52 ` Yang Jihong
0 siblings, 1 reply; 14+ messages in thread
From: Adrian Hunter @ 2023-05-12 10:34 UTC (permalink / raw)
To: Yang Jihong, peterz, mingo, acme, mark.rutland,
alexander.shishkin, jolsa, namhyung, irogers, anshuman.khandual,
jesussanp, linux-perf-users, linux-kernel
On 11/05/23 10:51, Yang Jihong wrote:
> When printing perf_event_attr, always display perf_event_attr config and its symbol
> to improve the readability of debugging information.
>
> Before:
>
> # perf --debug verbose=2 record -e cycles,cpu-clock,sched:sched_switch,branch-load-misses,r101,mem:0x0 -C 0 true
> <SNIP>
> ------------------------------------------------------------
> perf_event_attr:
> size 136
> { sample_period, sample_freq } 4000
> sample_type IP|TID|TIME|CPU|PERIOD|IDENTIFIER
> read_format ID
> disabled 1
> inherit 1
> freq 1
> sample_id_all 1
> exclude_guest 1
> ------------------------------------------------------------
> sys_perf_event_open: pid -1 cpu 0 group_fd -1 flags 0x8 = 5
> ------------------------------------------------------------
> perf_event_attr:
> type 1
> size 136
> { sample_period, sample_freq } 4000
> sample_type IP|TID|TIME|CPU|PERIOD|IDENTIFIER
> read_format ID
> disabled 1
> inherit 1
> freq 1
> sample_id_all 1
> exclude_guest 1
> ------------------------------------------------------------
> sys_perf_event_open: pid -1 cpu 0 group_fd -1 flags 0x8 = 6
> ------------------------------------------------------------
> perf_event_attr:
> type 2
> size 136
> config 0x143
> { sample_period, sample_freq } 1
> sample_type IP|TID|TIME|CPU|PERIOD|RAW|IDENTIFIER
> read_format ID
> disabled 1
> inherit 1
> sample_id_all 1
> exclude_guest 1
> ------------------------------------------------------------
> sys_perf_event_open: pid -1 cpu 0 group_fd -1 flags 0x8 = 7
> ------------------------------------------------------------
> perf_event_attr:
> type 3
> size 136
> config 0x10005
> { sample_period, sample_freq } 4000
> sample_type IP|TID|TIME|CPU|PERIOD|IDENTIFIER
> read_format ID
> disabled 1
> inherit 1
> freq 1
> sample_id_all 1
> exclude_guest 1
> ------------------------------------------------------------
> sys_perf_event_open: pid -1 cpu 0 group_fd -1 flags 0x8 = 9
> ------------------------------------------------------------
> perf_event_attr:
> type 4
> size 136
> config 0x101
> { sample_period, sample_freq } 4000
> sample_type IP|TID|TIME|CPU|PERIOD|IDENTIFIER
> read_format ID
> disabled 1
> inherit 1
> freq 1
> sample_id_all 1
> exclude_guest 1
> ------------------------------------------------------------
> sys_perf_event_open: pid -1 cpu 0 group_fd -1 flags 0x8 = 10
> ------------------------------------------------------------
> perf_event_attr:
> type 5
> size 136
> { sample_period, sample_freq } 1
> sample_type IP|TID|TIME|CPU|IDENTIFIER
> read_format ID
> disabled 1
> inherit 1
> sample_id_all 1
> exclude_guest 1
> bp_type 3
> { bp_len, config2 } 0x4
> ------------------------------------------------------------
> <SNIP>
>
> After:
>
> # perf --debug verbose=2 record -e cycles,cpu-clock,sched:sched_switch,branch-load-misses,r101,mem:0x0 -C 0 true
> <SNIP>
> ------------------------------------------------------------
> perf_event_attr:
> type 0 (PERF_TYPE_HARDWARE)
> size 136
> config 0 (PERF_COUNT_HW_CPU_CYCLES)
> { sample_period, sample_freq } 4000
> sample_type IP|TID|TIME|CPU|PERIOD|IDENTIFIER
> read_format ID
> disabled 1
> inherit 1
> freq 1
> sample_id_all 1
> exclude_guest 1
> ------------------------------------------------------------
> sys_perf_event_open: pid -1 cpu 0 group_fd -1 flags 0x8 = 5
> ------------------------------------------------------------
> perf_event_attr:
> type 1 (PERF_TYPE_SOFTWARE)
> size 136
> config 0 (PERF_COUNT_SW_CPU_CLOCK)
> { sample_period, sample_freq } 4000
> sample_type IP|TID|TIME|CPU|PERIOD|IDENTIFIER
> read_format ID
> disabled 1
> inherit 1
> freq 1
> sample_id_all 1
> exclude_guest 1
> ------------------------------------------------------------
> sys_perf_event_open: pid -1 cpu 0 group_fd -1 flags 0x8 = 6
> ------------------------------------------------------------
> perf_event_attr:
> type 2 (PERF_TYPE_TRACEPOINT)
> size 136
> config 0x143 (sched:sched_switch)
> { sample_period, sample_freq } 1
> sample_type IP|TID|TIME|CPU|PERIOD|RAW|IDENTIFIER
> read_format ID
> disabled 1
> inherit 1
> sample_id_all 1
> exclude_guest 1
> ------------------------------------------------------------
> sys_perf_event_open: pid -1 cpu 0 group_fd -1 flags 0x8 = 7
> ------------------------------------------------------------
> perf_event_attr:
> type 3 (PERF_TYPE_HW_CACHE)
> size 136
> config 0x10005 (PERF_COUNT_HW_CACHE_RESULT_MISS | PERF_COUNT_HW_CACHE_OP_READ | PERF_COUNT_HW_CACHE_BPU)
> { sample_period, sample_freq } 4000
> sample_type IP|TID|TIME|CPU|PERIOD|IDENTIFIER
> read_format ID
> disabled 1
> inherit 1
> freq 1
> sample_id_all 1
> exclude_guest 1
> ------------------------------------------------------------
> sys_perf_event_open: pid -1 cpu 0 group_fd -1 flags 0x8 = 9
> ------------------------------------------------------------
> perf_event_attr:
> type 4 (PERF_TYPE_RAW)
> size 136
> config 0x101
> { sample_period, sample_freq } 4000
> sample_type IP|TID|TIME|CPU|PERIOD|IDENTIFIER
> read_format ID
> disabled 1
> inherit 1
> freq 1
> sample_id_all 1
> exclude_guest 1
> ------------------------------------------------------------
> sys_perf_event_open: pid -1 cpu 0 group_fd -1 flags 0x8 = 10
> ------------------------------------------------------------
> perf_event_attr:
> type 5 (PERF_TYPE_BREAKPOINT)
> size 136
> config 0
> { sample_period, sample_freq } 1
> sample_type IP|TID|TIME|CPU|IDENTIFIER
> read_format ID
> disabled 1
> inherit 1
> sample_id_all 1
> exclude_guest 1
> bp_type 3
> { bp_len, config2 } 0x4
> ------------------------------------------------------------
> sys_perf_event_open: pid -1 cpu 0 group_fd -1 flags 0x8 = 11
> ------------------------------------------------------------
> perf_event_attr:
> type 1 (PERF_TYPE_SOFTWARE)
> size 136
> config 9 (PERF_COUNT_SW_DUMMY)
> { sample_period, sample_freq } 4000
> sample_type IP|TID|TIME|CPU|PERIOD|IDENTIFIER
> read_format ID
> inherit 1
> mmap 1
> comm 1
> freq 1
> task 1
> sample_id_all 1
> mmap2 1
> comm_exec 1
> ksymbol 1
> bpf_event 1
> ------------------------------------------------------------
> sys_perf_event_open: pid -1 cpu 0 group_fd -1 flags 0x8 = 12
> <SNIP>
>
> Signed-off-by: Yang Jihong <yangjihong1@huawei.com>
> ---
> tools/perf/util/perf_event_attr_fprintf.c | 159 +++++++++++++++++++++-
> 1 file changed, 158 insertions(+), 1 deletion(-)
>
> diff --git a/tools/perf/util/perf_event_attr_fprintf.c b/tools/perf/util/perf_event_attr_fprintf.c
> index cd0905d8cb7a..7730f0d7c28a 100644
> --- a/tools/perf/util/perf_event_attr_fprintf.c
> +++ b/tools/perf/util/perf_event_attr_fprintf.c
> @@ -7,6 +7,11 @@
> #include <linux/perf_event.h>
> #include "util/evsel_fprintf.h"
>
> +#ifdef HAVE_LIBTRACEEVENT
> +#include <stdlib.h> // for free
stdlib has too much ordinary stuff for the "// for free" comment
to be interesting, and it is very unlikely to be updated if another
dependency on stdlib were added.
> +#include "trace-event.h"
> +#endif
No where else is "#ifdef HAVE_LIBTRACEEVENT" put around
"#include "trace-event.h"
> +
> struct bit_names {
> int bit;
> const char *name;
> @@ -86,6 +91,85 @@ static const char *stringify_perf_type_id(u64 value)
> return NULL;
> }
> }
> +
> +static const char *stringify_perf_hw_id(u64 value)
> +{
> + /* sync with enum perf_hw_id in perf_event.h */
As with patch 3, this comment and same ones below could be left out
> + switch (value) {
> + ENUM_ID_TO_STR_CASE(PERF_COUNT_HW_CPU_CYCLES)
> + ENUM_ID_TO_STR_CASE(PERF_COUNT_HW_INSTRUCTIONS)
> + ENUM_ID_TO_STR_CASE(PERF_COUNT_HW_CACHE_REFERENCES)
> + ENUM_ID_TO_STR_CASE(PERF_COUNT_HW_CACHE_MISSES)
> + ENUM_ID_TO_STR_CASE(PERF_COUNT_HW_BRANCH_INSTRUCTIONS)
> + ENUM_ID_TO_STR_CASE(PERF_COUNT_HW_BRANCH_MISSES)
> + ENUM_ID_TO_STR_CASE(PERF_COUNT_HW_BUS_CYCLES)
> + ENUM_ID_TO_STR_CASE(PERF_COUNT_HW_STALLED_CYCLES_FRONTEND)
> + ENUM_ID_TO_STR_CASE(PERF_COUNT_HW_STALLED_CYCLES_BACKEND)
> + ENUM_ID_TO_STR_CASE(PERF_COUNT_HW_REF_CPU_CYCLES)
> + default:
> + return NULL;
> + }
> +}
> +
> +static const char *stringify_perf_hw_cache_id(u64 value)
> +{
> + /* sync with enum perf_hw_cache_id in perf_event.h */
> + switch (value) {
> + ENUM_ID_TO_STR_CASE(PERF_COUNT_HW_CACHE_L1D)
> + ENUM_ID_TO_STR_CASE(PERF_COUNT_HW_CACHE_L1I)
> + ENUM_ID_TO_STR_CASE(PERF_COUNT_HW_CACHE_LL)
> + ENUM_ID_TO_STR_CASE(PERF_COUNT_HW_CACHE_DTLB)
> + ENUM_ID_TO_STR_CASE(PERF_COUNT_HW_CACHE_ITLB)
> + ENUM_ID_TO_STR_CASE(PERF_COUNT_HW_CACHE_BPU)
> + ENUM_ID_TO_STR_CASE(PERF_COUNT_HW_CACHE_NODE)
> + default:
> + return NULL;
> + }
> +}
> +
> +static const char *stringify_perf_hw_cache_op_id(u64 value)
> +{
> + /* sync with enum perf_hw_cache_op_id in perf_event.h */
> + switch (value) {
> + ENUM_ID_TO_STR_CASE(PERF_COUNT_HW_CACHE_OP_READ)
> + ENUM_ID_TO_STR_CASE(PERF_COUNT_HW_CACHE_OP_WRITE)
> + ENUM_ID_TO_STR_CASE(PERF_COUNT_HW_CACHE_OP_PREFETCH)
> + default:
> + return NULL;
> + }
> +}
> +
> +static const char *stringify_perf_hw_cache_op_result_id(u64 value)
> +{
> + /* sync with enum perf_hw_cache_op_result_id in perf_event.h */
> + switch (value) {
> + ENUM_ID_TO_STR_CASE(PERF_COUNT_HW_CACHE_RESULT_ACCESS)
> + ENUM_ID_TO_STR_CASE(PERF_COUNT_HW_CACHE_RESULT_MISS)
> + default:
> + return NULL;
> + }
> +}
> +
> +static const char *stringify_perf_sw_id(u64 value)
> +{
> + /* sync with enum perf_sw_ids in perf_event.h */
> + switch (value) {
> + ENUM_ID_TO_STR_CASE(PERF_COUNT_SW_CPU_CLOCK)
> + ENUM_ID_TO_STR_CASE(PERF_COUNT_SW_TASK_CLOCK)
> + ENUM_ID_TO_STR_CASE(PERF_COUNT_SW_PAGE_FAULTS)
> + ENUM_ID_TO_STR_CASE(PERF_COUNT_SW_CONTEXT_SWITCHES)
> + ENUM_ID_TO_STR_CASE(PERF_COUNT_SW_CPU_MIGRATIONS)
> + ENUM_ID_TO_STR_CASE(PERF_COUNT_SW_PAGE_FAULTS_MIN)
> + ENUM_ID_TO_STR_CASE(PERF_COUNT_SW_PAGE_FAULTS_MAJ)
> + ENUM_ID_TO_STR_CASE(PERF_COUNT_SW_ALIGNMENT_FAULTS)
> + ENUM_ID_TO_STR_CASE(PERF_COUNT_SW_EMULATION_FAULTS)
> + ENUM_ID_TO_STR_CASE(PERF_COUNT_SW_DUMMY)
> + ENUM_ID_TO_STR_CASE(PERF_COUNT_SW_BPF_OUTPUT)
> + ENUM_ID_TO_STR_CASE(PERF_COUNT_SW_CGROUP_SWITCHES)
> + default:
> + return NULL;
> + }
> +}
> #undef ENUM_ID_TO_STR_CASE
>
> static void __p_type_id(char *buf, size_t size, u64 value)
> @@ -98,6 +182,78 @@ static void __p_type_id(char *buf, size_t size, u64 value)
> snprintf(buf, size, "%"PRIu64" (%s)", value, str);
> }
>
> +static void __p_config_hw_id(char *buf, size_t size, u64 value)
> +{
> + const char *str = stringify_perf_hw_id(value);
> +
> + if (str == NULL)
> + snprintf(buf, size, "%"PRIx64, value);
> + else
> + snprintf(buf, size, "%"PRIx64" (%s)", value, str);
This could use the print_id() or equivalent helper mentioned in patch 3
> +}
> +
> +static void __p_config_sw_id(char *buf, size_t size, u64 value)
> +{
> + const char *str = stringify_perf_sw_id(value);
> +
> + if (str == NULL)
> + snprintf(buf, size, "%"PRIx64, value);
> + else
> + snprintf(buf, size, "%"PRIx64" (%s)", value, str);
Ditto
> +}
> +
> +static void __p_config_hw_cache_id(char *buf, size_t size, u64 value)
> +{
> + const char *hw_cache_str = stringify_perf_hw_cache_id(value & 0xff);
> + const char *hw_cache_op_str =
> + stringify_perf_hw_cache_op_id((value & 0xff00) >> 8);
> + const char *hw_cache_op_result_str =
> + stringify_perf_hw_cache_op_result_id((value & 0xff0000) >> 16);
> +
> + if (hw_cache_str == NULL || hw_cache_op_str == NULL ||
> + hw_cache_op_result_str == NULL) {
> + snprintf(buf, size, "%#"PRIx64, value);
> + } else {
> + snprintf(buf, size, "%#"PRIx64" (%s | %s | %s)", value,
> + hw_cache_op_result_str, hw_cache_op_str, hw_cache_str);
> + }
> +}
> +
> +#ifdef HAVE_LIBTRACEEVENT
> +static void __p_config_tracepoint_id(char *buf, size_t size, u64 value)
> +{
> + char *str = tracepoint_id_to_name(value);
> +
> + if (str != NULL) {
> + snprintf(buf, size, "%#"PRIx64" (%s)", value, str);
> + free(str);
> + } else {
> + snprintf(buf, size, "%#"PRIx64, value);
> + }
Ditto
Note, can just call free() on 'str' whether or not it is NULL.
> +}
> +#endif
> +
> +static void __p_config_id(char *buf, size_t size, u32 type, u64 value)
> +{
> + switch (type) {
> + case PERF_TYPE_HARDWARE:
> + return __p_config_hw_id(buf, size, value);
> + case PERF_TYPE_SOFTWARE:
> + return __p_config_sw_id(buf, size, value);
> + case PERF_TYPE_HW_CACHE:
> + return __p_config_hw_cache_id(buf, size, value);
> + case PERF_TYPE_TRACEPOINT:
> +#ifdef HAVE_LIBTRACEEVENT
> + return __p_config_tracepoint_id(buf, size, value);
> +#endif
> + case PERF_TYPE_RAW:
> + case PERF_TYPE_BREAKPOINT:
> + default:
> + snprintf(buf, size, "%#"PRIx64, value);
> + return;
> + }
> +}
> +
> #define BUF_SIZE 1024
>
> #define p_hex(val) snprintf(buf, BUF_SIZE, "%#"PRIx64, (uint64_t)(val))
> @@ -107,6 +263,7 @@ static void __p_type_id(char *buf, size_t size, u64 value)
> #define p_branch_sample_type(val) __p_branch_sample_type(buf, BUF_SIZE, val)
> #define p_read_format(val) __p_read_format(buf, BUF_SIZE, val)
> #define p_type_id(val) __p_type_id(buf, BUF_SIZE, val)
> +#define p_config_id(val) __p_config_id(buf, BUF_SIZE, attr->type, val)
>
> #define PRINT_ATTRn(_n, _f, _p, _a) \
> do { \
> @@ -126,7 +283,7 @@ int perf_event_attr__fprintf(FILE *fp, struct perf_event_attr *attr,
>
> PRINT_ATTRn("type", type, p_type_id, true);
> PRINT_ATTRf(size, p_unsigned);
> - PRINT_ATTRf(config, p_hex);
> + PRINT_ATTRn("config", config, p_config_id, true);
> PRINT_ATTRn("{ sample_period, sample_freq }", sample_period, p_unsigned, false);
> PRINT_ATTRf(sample_type, p_sample_type);
> PRINT_ATTRf(read_format, p_read_format);
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH v2 1/4] perf trace-event-info: Add tracepoint_id_to_name() helper
2023-05-12 10:33 ` Adrian Hunter
@ 2023-05-15 8:42 ` Yang Jihong
0 siblings, 0 replies; 14+ messages in thread
From: Yang Jihong @ 2023-05-15 8:42 UTC (permalink / raw)
To: Adrian Hunter, peterz, mingo, acme, mark.rutland,
alexander.shishkin, jolsa, namhyung, irogers, anshuman.khandual,
jesussanp, linux-perf-users, linux-kernel
Hello,
On 2023/5/12 18:33, Adrian Hunter wrote:
> On 11/05/23 10:51, Yang Jihong wrote:
>> Add tracepoint_id_to_name() helper to search for the trace events directory
>> by given event id and return the corresponding tracepoint.
>>
>> Signed-off-by: Yang Jihong <yangjihong1@huawei.com>
>> ---
>> tools/perf/util/trace-event-info.c | 11 +++++++++++
>> tools/perf/util/trace-event.h | 6 ++++++
>> 2 files changed, 17 insertions(+)
>>
>> diff --git a/tools/perf/util/trace-event-info.c b/tools/perf/util/trace-event-info.c
>> index c24b3a15e319..a5c65cb02a28 100644
>> --- a/tools/perf/util/trace-event-info.c
>> +++ b/tools/perf/util/trace-event-info.c
>> @@ -466,6 +466,17 @@ static struct tracepoint_path *tracepoint_id_to_path(u64 config)
>> return NULL;
>> }
>>
>> +char *tracepoint_id_to_name(u64 config)
>> +{
>> + char *buf = NULL;
>> + struct tracepoint_path *path = tracepoint_id_to_path(config);
>
> It is considered slightly nicer to put local declarations
> in descending order of line length. i.e.
OK, will fix in v3.
>
> struct tracepoint_path *path = tracepoint_id_to_path(config);
> char *buf = NULL;
>
>> +
>> + if ((path != NULL) && (asprintf(&buf, "%s:%s", path->system, path->name) > 0))
>
> The parentheses are unnecessary and kernel style tends to avoid "!= NULL"
> i.e.
OK, will fix in v3.
Thanks,
Yang
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH v2 3/4] perf tools: Add printing perf_event_attr type symbol in perf_event_attr__fprintf()
2023-05-12 10:34 ` Adrian Hunter
@ 2023-05-15 8:48 ` Yang Jihong
2023-05-15 8:56 ` Adrian Hunter
0 siblings, 1 reply; 14+ messages in thread
From: Yang Jihong @ 2023-05-15 8:48 UTC (permalink / raw)
To: Adrian Hunter, peterz, mingo, acme, mark.rutland,
alexander.shishkin, jolsa, namhyung, irogers, anshuman.khandual,
jesussanp, linux-perf-users, linux-kernel
Hello,
On 2023/5/12 18:34, Adrian Hunter wrote:
> On 11/05/23 10:51, Yang Jihong wrote:
>> When printing perf_event_attr, always display perf_event_attr type and its symbol
>> to improve the readability of debugging information.
>>
>> Before:
>>
>> # perf --debug verbose=2 record -e cycles,cpu-clock,sched:sched_switch,branch-load-misses,r101,mem:0x0 -C 0 true
>> <SNIP>
>> ------------------------------------------------------------
>> perf_event_attr:
>> size 136
>> { sample_period, sample_freq } 4000
>> sample_type IP|TID|TIME|CPU|PERIOD|IDENTIFIER
>> read_format ID
>> disabled 1
>> inherit 1
>> freq 1
>> sample_id_all 1
>> exclude_guest 1
>> ------------------------------------------------------------
>> sys_perf_event_open: pid -1 cpu 0 group_fd -1 flags 0x8 = 5
>> ------------------------------------------------------------
>> perf_event_attr:
>> type 1
>> size 136
>> { sample_period, sample_freq } 4000
>> sample_type IP|TID|TIME|CPU|PERIOD|IDENTIFIER
>> read_format ID
>> disabled 1
>> inherit 1
>> freq 1
>> sample_id_all 1
>> exclude_guest 1
>> ------------------------------------------------------------
>> sys_perf_event_open: pid -1 cpu 0 group_fd -1 flags 0x8 = 6
>> ------------------------------------------------------------
>> perf_event_attr:
>> type 2
>> size 136
>> config 0x143
>> { sample_period, sample_freq } 1
>> sample_type IP|TID|TIME|CPU|PERIOD|RAW|IDENTIFIER
>> read_format ID
>> disabled 1
>> inherit 1
>> sample_id_all 1
>> exclude_guest 1
>> ------------------------------------------------------------
>> sys_perf_event_open: pid -1 cpu 0 group_fd -1 flags 0x8 = 7
>> ------------------------------------------------------------
>> perf_event_attr:
>> type 3
>> size 136
>> config 0x10005
>> { sample_period, sample_freq } 4000
>> sample_type IP|TID|TIME|CPU|PERIOD|IDENTIFIER
>> read_format ID
>> disabled 1
>> inherit 1
>> freq 1
>> sample_id_all 1
>> exclude_guest 1
>> ------------------------------------------------------------
>> sys_perf_event_open: pid -1 cpu 0 group_fd -1 flags 0x8 = 9
>> ------------------------------------------------------------
>> perf_event_attr:
>> type 4
>> size 136
>> config 0x101
>> { sample_period, sample_freq } 4000
>> sample_type IP|TID|TIME|CPU|PERIOD|IDENTIFIER
>> read_format ID
>> disabled 1
>> inherit 1
>> freq 1
>> sample_id_all 1
>> exclude_guest 1
>> ------------------------------------------------------------
>> sys_perf_event_open: pid -1 cpu 0 group_fd -1 flags 0x8 = 10
>> ------------------------------------------------------------
>> perf_event_attr:
>> type 5
>> size 136
>> { sample_period, sample_freq } 1
>> sample_type IP|TID|TIME|CPU|IDENTIFIER
>> read_format ID
>> disabled 1
>> inherit 1
>> sample_id_all 1
>> exclude_guest 1
>> bp_type 3
>> { bp_len, config2 } 0x4
>> ------------------------------------------------------------
>> <SNIP>
>>
>> After:
>>
>> # perf --debug verbose=2 record -e cycles,cpu-clock,sched:sched_switch,branch-load-misses,r101,mem:0x0 -C 0 true
>> <SNIP>
>> ------------------------------------------------------------
>> perf_event_attr:
>> type 0 (PERF_TYPE_HARDWARE)
>> size 136
>> { sample_period, sample_freq } 4000
>> sample_type IP|TID|TIME|CPU|PERIOD|IDENTIFIER
>> read_format ID
>> disabled 1
>> inherit 1
>> freq 1
>> sample_id_all 1
>> exclude_guest 1
>> ------------------------------------------------------------
>> sys_perf_event_open: pid -1 cpu 0 group_fd -1 flags 0x8 = 5
>> ------------------------------------------------------------
>> perf_event_attr:
>> type 1 (PERF_TYPE_SOFTWARE)
>> size 136
>> { sample_period, sample_freq } 4000
>> sample_type IP|TID|TIME|CPU|PERIOD|IDENTIFIER
>> read_format ID
>> disabled 1
>> inherit 1
>> freq 1
>> sample_id_all 1
>> exclude_guest 1
>> ------------------------------------------------------------
>> sys_perf_event_open: pid -1 cpu 0 group_fd -1 flags 0x8 = 6
>> ------------------------------------------------------------
>> perf_event_attr:
>> type 2 (PERF_TYPE_TRACEPOINT)
>> size 136
>> config 0x143
>> { sample_period, sample_freq } 1
>> sample_type IP|TID|TIME|CPU|PERIOD|RAW|IDENTIFIER
>> read_format ID
>> disabled 1
>> inherit 1
>> sample_id_all 1
>> exclude_guest 1
>> ------------------------------------------------------------
>> sys_perf_event_open: pid -1 cpu 0 group_fd -1 flags 0x8 = 7
>> ------------------------------------------------------------
>> perf_event_attr:
>> type 3 (PERF_TYPE_HW_CACHE)
>> size 136
>> config 0x10005
>> { sample_period, sample_freq } 4000
>> sample_type IP|TID|TIME|CPU|PERIOD|IDENTIFIER
>> read_format ID
>> disabled 1
>> inherit 1
>> freq 1
>> sample_id_all 1
>> exclude_guest 1
>> ------------------------------------------------------------
>> sys_perf_event_open: pid -1 cpu 0 group_fd -1 flags 0x8 = 9
>> ------------------------------------------------------------
>> perf_event_attr:
>> type 4 (PERF_TYPE_RAW)
>> size 136
>> config 0x101
>> { sample_period, sample_freq } 4000
>> sample_type IP|TID|TIME|CPU|PERIOD|IDENTIFIER
>> read_format ID
>> disabled 1
>> inherit 1
>> freq 1
>> sample_id_all 1
>> exclude_guest 1
>> ------------------------------------------------------------
>> sys_perf_event_open: pid -1 cpu 0 group_fd -1 flags 0x8 = 10
>> ------------------------------------------------------------
>> perf_event_attr:
>> type 5 (PERF_TYPE_BREAKPOINT)
>> size 136
>> { sample_period, sample_freq } 1
>> sample_type IP|TID|TIME|CPU|IDENTIFIER
>> read_format ID
>> disabled 1
>> inherit 1
>> sample_id_all 1
>> exclude_guest 1
>> bp_type 3
>> { bp_len, config2 } 0x4
>> ------------------------------------------------------------
>> <SNIP>
>>
>> Signed-off-by: Yang Jihong <yangjihong1@huawei.com>
>> ---
>> tools/perf/util/perf_event_attr_fprintf.c | 30 ++++++++++++++++++++++-
>> 1 file changed, 29 insertions(+), 1 deletion(-)
>>
>> diff --git a/tools/perf/util/perf_event_attr_fprintf.c b/tools/perf/util/perf_event_attr_fprintf.c
>> index 433029c6afc5..cd0905d8cb7a 100644
>> --- a/tools/perf/util/perf_event_attr_fprintf.c
>> +++ b/tools/perf/util/perf_event_attr_fprintf.c
>> @@ -71,6 +71,33 @@ static void __p_read_format(char *buf, size_t size, u64 value)
>> __p_bits(buf, size, value, bits);
>> }
>>
>> +#define ENUM_ID_TO_STR_CASE(x) case x: return (#x);
>> +static const char *stringify_perf_type_id(u64 value)
>> +{
>> + /* sync with enum perf_type_id in perf_event.h */
>
> Everything in this file syncs with perf_event.h, so the comment
> does not seem very useful.
OK, will fix in v3.
>
>> + switch (value) {
>> + ENUM_ID_TO_STR_CASE(PERF_TYPE_HARDWARE)
>> + ENUM_ID_TO_STR_CASE(PERF_TYPE_SOFTWARE)
>> + ENUM_ID_TO_STR_CASE(PERF_TYPE_TRACEPOINT)
>> + ENUM_ID_TO_STR_CASE(PERF_TYPE_HW_CACHE)
>> + ENUM_ID_TO_STR_CASE(PERF_TYPE_RAW)
>> + ENUM_ID_TO_STR_CASE(PERF_TYPE_BREAKPOINT)
>> + default:
>> + return NULL;
>> + }
>> +}
>> +#undef ENUM_ID_TO_STR_CASE
>> +
>> +static void __p_type_id(char *buf, size_t size, u64 value)
>> +{
>> + const char *str = stringify_perf_type_id(value);
>> +
>> + if (str == NULL)
>> + snprintf(buf, size, "%"PRIu64, value);
>> + else
>> + snprintf(buf, size, "%"PRIu64" (%s)", value, str);
>
> These 4 lines end up getting used again about 3 times in the next
> patch, so might as well be a separate function e.g.
>
> print_id(buf, size, value, stringify_perf_type_id(value));
>
> where:
>
> static void print_id(char *buf, size_t size, u64 value, const char *str)
> {
> if (str == NULL)
> snprintf(buf, size, "%"PRIu64, value);
> else
> snprintf(buf, size, "%"PRIu64" (%s)", value, str);
> }
>
OK, will add print_id() helper in v3.
If print_id() helper is also used to print config id, is printed in the
decimal format. In the past, it is printed in the hexadecimal format，
there may be some changes here.
Before:
config 0x143
After:
config 323 (sched:sched_switch)
>> +}
>> +
>> #define BUF_SIZE 1024
>>
>> #define p_hex(val) snprintf(buf, BUF_SIZE, "%#"PRIx64, (uint64_t)(val))
>> @@ -79,6 +106,7 @@ static void __p_read_format(char *buf, size_t size, u64 value)
>> #define p_sample_type(val) __p_sample_type(buf, BUF_SIZE, val)
>> #define p_branch_sample_type(val) __p_branch_sample_type(buf, BUF_SIZE, val)
>> #define p_read_format(val) __p_read_format(buf, BUF_SIZE, val)
>> +#define p_type_id(val) __p_type_id(buf, BUF_SIZE, val)
>>
>> #define PRINT_ATTRn(_n, _f, _p, _a) \
>> do { \
>> @@ -96,7 +124,7 @@ int perf_event_attr__fprintf(FILE *fp, struct perf_event_attr *attr,
>> char buf[BUF_SIZE];
>> int ret = 0;
>>
>> - PRINT_ATTRf(type, p_unsigned);
>> + PRINT_ATTRn("type", type, p_type_id, true);
>> PRINT_ATTRf(size, p_unsigned);
>> PRINT_ATTRf(config, p_hex);
>> PRINT_ATTRn("{ sample_period, sample_freq }", sample_period, p_unsigned, false);
>
> .
>
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH v2 4/4] perf tools: Add printing perf_event_attr config symbol in perf_event_attr__fprintf()
2023-05-12 10:34 ` Adrian Hunter
@ 2023-05-15 8:52 ` Yang Jihong
0 siblings, 0 replies; 14+ messages in thread
From: Yang Jihong @ 2023-05-15 8:52 UTC (permalink / raw)
To: Adrian Hunter, peterz, mingo, acme, mark.rutland,
alexander.shishkin, jolsa, namhyung, irogers, anshuman.khandual,
jesussanp, linux-perf-users, linux-kernel
Hello,
On 2023/5/12 18:34, Adrian Hunter wrote:
> On 11/05/23 10:51, Yang Jihong wrote:
>> When printing perf_event_attr, always display perf_event_attr config and its symbol
>> to improve the readability of debugging information.
>>
>> Before:
>>
>> # perf --debug verbose=2 record -e cycles,cpu-clock,sched:sched_switch,branch-load-misses,r101,mem:0x0 -C 0 true
>> <SNIP>
>> ------------------------------------------------------------
>> perf_event_attr:
>> size 136
>> { sample_period, sample_freq } 4000
>> sample_type IP|TID|TIME|CPU|PERIOD|IDENTIFIER
>> read_format ID
>> disabled 1
>> inherit 1
>> freq 1
>> sample_id_all 1
>> exclude_guest 1
>> ------------------------------------------------------------
>> sys_perf_event_open: pid -1 cpu 0 group_fd -1 flags 0x8 = 5
>> ------------------------------------------------------------
>> perf_event_attr:
>> type 1
>> size 136
>> { sample_period, sample_freq } 4000
>> sample_type IP|TID|TIME|CPU|PERIOD|IDENTIFIER
>> read_format ID
>> disabled 1
>> inherit 1
>> freq 1
>> sample_id_all 1
>> exclude_guest 1
>> ------------------------------------------------------------
>> sys_perf_event_open: pid -1 cpu 0 group_fd -1 flags 0x8 = 6
>> ------------------------------------------------------------
>> perf_event_attr:
>> type 2
>> size 136
>> config 0x143
>> { sample_period, sample_freq } 1
>> sample_type IP|TID|TIME|CPU|PERIOD|RAW|IDENTIFIER
>> read_format ID
>> disabled 1
>> inherit 1
>> sample_id_all 1
>> exclude_guest 1
>> ------------------------------------------------------------
>> sys_perf_event_open: pid -1 cpu 0 group_fd -1 flags 0x8 = 7
>> ------------------------------------------------------------
>> perf_event_attr:
>> type 3
>> size 136
>> config 0x10005
>> { sample_period, sample_freq } 4000
>> sample_type IP|TID|TIME|CPU|PERIOD|IDENTIFIER
>> read_format ID
>> disabled 1
>> inherit 1
>> freq 1
>> sample_id_all 1
>> exclude_guest 1
>> ------------------------------------------------------------
>> sys_perf_event_open: pid -1 cpu 0 group_fd -1 flags 0x8 = 9
>> ------------------------------------------------------------
>> perf_event_attr:
>> type 4
>> size 136
>> config 0x101
>> { sample_period, sample_freq } 4000
>> sample_type IP|TID|TIME|CPU|PERIOD|IDENTIFIER
>> read_format ID
>> disabled 1
>> inherit 1
>> freq 1
>> sample_id_all 1
>> exclude_guest 1
>> ------------------------------------------------------------
>> sys_perf_event_open: pid -1 cpu 0 group_fd -1 flags 0x8 = 10
>> ------------------------------------------------------------
>> perf_event_attr:
>> type 5
>> size 136
>> { sample_period, sample_freq } 1
>> sample_type IP|TID|TIME|CPU|IDENTIFIER
>> read_format ID
>> disabled 1
>> inherit 1
>> sample_id_all 1
>> exclude_guest 1
>> bp_type 3
>> { bp_len, config2 } 0x4
>> ------------------------------------------------------------
>> <SNIP>
>>
>> After:
>>
>> # perf --debug verbose=2 record -e cycles,cpu-clock,sched:sched_switch,branch-load-misses,r101,mem:0x0 -C 0 true
>> <SNIP>
>> ------------------------------------------------------------
>> perf_event_attr:
>> type 0 (PERF_TYPE_HARDWARE)
>> size 136
>> config 0 (PERF_COUNT_HW_CPU_CYCLES)
>> { sample_period, sample_freq } 4000
>> sample_type IP|TID|TIME|CPU|PERIOD|IDENTIFIER
>> read_format ID
>> disabled 1
>> inherit 1
>> freq 1
>> sample_id_all 1
>> exclude_guest 1
>> ------------------------------------------------------------
>> sys_perf_event_open: pid -1 cpu 0 group_fd -1 flags 0x8 = 5
>> ------------------------------------------------------------
>> perf_event_attr:
>> type 1 (PERF_TYPE_SOFTWARE)
>> size 136
>> config 0 (PERF_COUNT_SW_CPU_CLOCK)
>> { sample_period, sample_freq } 4000
>> sample_type IP|TID|TIME|CPU|PERIOD|IDENTIFIER
>> read_format ID
>> disabled 1
>> inherit 1
>> freq 1
>> sample_id_all 1
>> exclude_guest 1
>> ------------------------------------------------------------
>> sys_perf_event_open: pid -1 cpu 0 group_fd -1 flags 0x8 = 6
>> ------------------------------------------------------------
>> perf_event_attr:
>> type 2 (PERF_TYPE_TRACEPOINT)
>> size 136
>> config 0x143 (sched:sched_switch)
>> { sample_period, sample_freq } 1
>> sample_type IP|TID|TIME|CPU|PERIOD|RAW|IDENTIFIER
>> read_format ID
>> disabled 1
>> inherit 1
>> sample_id_all 1
>> exclude_guest 1
>> ------------------------------------------------------------
>> sys_perf_event_open: pid -1 cpu 0 group_fd -1 flags 0x8 = 7
>> ------------------------------------------------------------
>> perf_event_attr:
>> type 3 (PERF_TYPE_HW_CACHE)
>> size 136
>> config 0x10005 (PERF_COUNT_HW_CACHE_RESULT_MISS | PERF_COUNT_HW_CACHE_OP_READ | PERF_COUNT_HW_CACHE_BPU)
>> { sample_period, sample_freq } 4000
>> sample_type IP|TID|TIME|CPU|PERIOD|IDENTIFIER
>> read_format ID
>> disabled 1
>> inherit 1
>> freq 1
>> sample_id_all 1
>> exclude_guest 1
>> ------------------------------------------------------------
>> sys_perf_event_open: pid -1 cpu 0 group_fd -1 flags 0x8 = 9
>> ------------------------------------------------------------
>> perf_event_attr:
>> type 4 (PERF_TYPE_RAW)
>> size 136
>> config 0x101
>> { sample_period, sample_freq } 4000
>> sample_type IP|TID|TIME|CPU|PERIOD|IDENTIFIER
>> read_format ID
>> disabled 1
>> inherit 1
>> freq 1
>> sample_id_all 1
>> exclude_guest 1
>> ------------------------------------------------------------
>> sys_perf_event_open: pid -1 cpu 0 group_fd -1 flags 0x8 = 10
>> ------------------------------------------------------------
>> perf_event_attr:
>> type 5 (PERF_TYPE_BREAKPOINT)
>> size 136
>> config 0
>> { sample_period, sample_freq } 1
>> sample_type IP|TID|TIME|CPU|IDENTIFIER
>> read_format ID
>> disabled 1
>> inherit 1
>> sample_id_all 1
>> exclude_guest 1
>> bp_type 3
>> { bp_len, config2 } 0x4
>> ------------------------------------------------------------
>> sys_perf_event_open: pid -1 cpu 0 group_fd -1 flags 0x8 = 11
>> ------------------------------------------------------------
>> perf_event_attr:
>> type 1 (PERF_TYPE_SOFTWARE)
>> size 136
>> config 9 (PERF_COUNT_SW_DUMMY)
>> { sample_period, sample_freq } 4000
>> sample_type IP|TID|TIME|CPU|PERIOD|IDENTIFIER
>> read_format ID
>> inherit 1
>> mmap 1
>> comm 1
>> freq 1
>> task 1
>> sample_id_all 1
>> mmap2 1
>> comm_exec 1
>> ksymbol 1
>> bpf_event 1
>> ------------------------------------------------------------
>> sys_perf_event_open: pid -1 cpu 0 group_fd -1 flags 0x8 = 12
>> <SNIP>
>>
>> Signed-off-by: Yang Jihong <yangjihong1@huawei.com>
>> ---
>> tools/perf/util/perf_event_attr_fprintf.c | 159 +++++++++++++++++++++-
>> 1 file changed, 158 insertions(+), 1 deletion(-)
>>
>> diff --git a/tools/perf/util/perf_event_attr_fprintf.c b/tools/perf/util/perf_event_attr_fprintf.c
>> index cd0905d8cb7a..7730f0d7c28a 100644
>> --- a/tools/perf/util/perf_event_attr_fprintf.c
>> +++ b/tools/perf/util/perf_event_attr_fprintf.c
>> @@ -7,6 +7,11 @@
>> #include <linux/perf_event.h>
>> #include "util/evsel_fprintf.h"
>>
>> +#ifdef HAVE_LIBTRACEEVENT
>> +#include <stdlib.h> // for free
>
> stdlib has too much ordinary stuff for the "// for free" comment
> to be interesting, and it is very unlikely to be updated if another
> dependency on stdlib were added.
>
>> +#include "trace-event.h"
>> +#endif
>
> No where else is "#ifdef HAVE_LIBTRACEEVENT" put around
> "#include "trace-event.h"
>
OK, will remove "// for free" and "#ifdef HAVE_LIBTRACEEVENT" in v3.
>> +
>> struct bit_names {
>> int bit;
>> const char *name;
>> @@ -86,6 +91,85 @@ static const char *stringify_perf_type_id(u64 value)
>> return NULL;
>> }
>> }
>> +
>> +static const char *stringify_perf_hw_id(u64 value)
>> +{
>> + /* sync with enum perf_hw_id in perf_event.h */
>
> As with patch 3, this comment and same ones below could be left out
OK, will remove in v3.
>
>> + switch (value) {
>> + ENUM_ID_TO_STR_CASE(PERF_COUNT_HW_CPU_CYCLES)
>> + ENUM_ID_TO_STR_CASE(PERF_COUNT_HW_INSTRUCTIONS)
>> + ENUM_ID_TO_STR_CASE(PERF_COUNT_HW_CACHE_REFERENCES)
>> + ENUM_ID_TO_STR_CASE(PERF_COUNT_HW_CACHE_MISSES)
>> + ENUM_ID_TO_STR_CASE(PERF_COUNT_HW_BRANCH_INSTRUCTIONS)
>> + ENUM_ID_TO_STR_CASE(PERF_COUNT_HW_BRANCH_MISSES)
>> + ENUM_ID_TO_STR_CASE(PERF_COUNT_HW_BUS_CYCLES)
>> + ENUM_ID_TO_STR_CASE(PERF_COUNT_HW_STALLED_CYCLES_FRONTEND)
>> + ENUM_ID_TO_STR_CASE(PERF_COUNT_HW_STALLED_CYCLES_BACKEND)
>> + ENUM_ID_TO_STR_CASE(PERF_COUNT_HW_REF_CPU_CYCLES)
>> + default:
>> + return NULL;
>> + }
>> +}
>> +
>> +static const char *stringify_perf_hw_cache_id(u64 value)
>> +{
>> + /* sync with enum perf_hw_cache_id in perf_event.h */
>> + switch (value) {
>> + ENUM_ID_TO_STR_CASE(PERF_COUNT_HW_CACHE_L1D)
>> + ENUM_ID_TO_STR_CASE(PERF_COUNT_HW_CACHE_L1I)
>> + ENUM_ID_TO_STR_CASE(PERF_COUNT_HW_CACHE_LL)
>> + ENUM_ID_TO_STR_CASE(PERF_COUNT_HW_CACHE_DTLB)
>> + ENUM_ID_TO_STR_CASE(PERF_COUNT_HW_CACHE_ITLB)
>> + ENUM_ID_TO_STR_CASE(PERF_COUNT_HW_CACHE_BPU)
>> + ENUM_ID_TO_STR_CASE(PERF_COUNT_HW_CACHE_NODE)
>> + default:
>> + return NULL;
>> + }
>> +}
>> +
>> +static const char *stringify_perf_hw_cache_op_id(u64 value)
>> +{
>> + /* sync with enum perf_hw_cache_op_id in perf_event.h */
>> + switch (value) {
>> + ENUM_ID_TO_STR_CASE(PERF_COUNT_HW_CACHE_OP_READ)
>> + ENUM_ID_TO_STR_CASE(PERF_COUNT_HW_CACHE_OP_WRITE)
>> + ENUM_ID_TO_STR_CASE(PERF_COUNT_HW_CACHE_OP_PREFETCH)
>> + default:
>> + return NULL;
>> + }
>> +}
>> +
>> +static const char *stringify_perf_hw_cache_op_result_id(u64 value)
>> +{
>> + /* sync with enum perf_hw_cache_op_result_id in perf_event.h */
>> + switch (value) {
>> + ENUM_ID_TO_STR_CASE(PERF_COUNT_HW_CACHE_RESULT_ACCESS)
>> + ENUM_ID_TO_STR_CASE(PERF_COUNT_HW_CACHE_RESULT_MISS)
>> + default:
>> + return NULL;
>> + }
>> +}
>> +
>> +static const char *stringify_perf_sw_id(u64 value)
>> +{
>> + /* sync with enum perf_sw_ids in perf_event.h */
>> + switch (value) {
>> + ENUM_ID_TO_STR_CASE(PERF_COUNT_SW_CPU_CLOCK)
>> + ENUM_ID_TO_STR_CASE(PERF_COUNT_SW_TASK_CLOCK)
>> + ENUM_ID_TO_STR_CASE(PERF_COUNT_SW_PAGE_FAULTS)
>> + ENUM_ID_TO_STR_CASE(PERF_COUNT_SW_CONTEXT_SWITCHES)
>> + ENUM_ID_TO_STR_CASE(PERF_COUNT_SW_CPU_MIGRATIONS)
>> + ENUM_ID_TO_STR_CASE(PERF_COUNT_SW_PAGE_FAULTS_MIN)
>> + ENUM_ID_TO_STR_CASE(PERF_COUNT_SW_PAGE_FAULTS_MAJ)
>> + ENUM_ID_TO_STR_CASE(PERF_COUNT_SW_ALIGNMENT_FAULTS)
>> + ENUM_ID_TO_STR_CASE(PERF_COUNT_SW_EMULATION_FAULTS)
>> + ENUM_ID_TO_STR_CASE(PERF_COUNT_SW_DUMMY)
>> + ENUM_ID_TO_STR_CASE(PERF_COUNT_SW_BPF_OUTPUT)
>> + ENUM_ID_TO_STR_CASE(PERF_COUNT_SW_CGROUP_SWITCHES)
>> + default:
>> + return NULL;
>> + }
>> +}
>> #undef ENUM_ID_TO_STR_CASE
>>
>> static void __p_type_id(char *buf, size_t size, u64 value)
>> @@ -98,6 +182,78 @@ static void __p_type_id(char *buf, size_t size, u64 value)
>> snprintf(buf, size, "%"PRIu64" (%s)", value, str);
>> }
>>
>> +static void __p_config_hw_id(char *buf, size_t size, u64 value)
>> +{
>> + const char *str = stringify_perf_hw_id(value);
>> +
>> + if (str == NULL)
>> + snprintf(buf, size, "%"PRIx64, value);
>> + else
>> + snprintf(buf, size, "%"PRIx64" (%s)", value, str);
>
> This could use the print_id() or equivalent helper mentioned in patch 3
OK, will fix in v3.
>
>> +}
>> +
>> +static void __p_config_sw_id(char *buf, size_t size, u64 value)
>> +{
>> + const char *str = stringify_perf_sw_id(value);
>> +
>> + if (str == NULL)
>> + snprintf(buf, size, "%"PRIx64, value);
>> + else
>> + snprintf(buf, size, "%"PRIx64" (%s)", value, str);
>
> Ditto
OK, ditto
>
>> +}
>> +
>> +static void __p_config_hw_cache_id(char *buf, size_t size, u64 value)
>> +{
>> + const char *hw_cache_str = stringify_perf_hw_cache_id(value & 0xff);
>> + const char *hw_cache_op_str =
>> + stringify_perf_hw_cache_op_id((value & 0xff00) >> 8);
>> + const char *hw_cache_op_result_str =
>> + stringify_perf_hw_cache_op_result_id((value & 0xff0000) >> 16);
>> +
>> + if (hw_cache_str == NULL || hw_cache_op_str == NULL ||
>> + hw_cache_op_result_str == NULL) {
>> + snprintf(buf, size, "%#"PRIx64, value);
>> + } else {
>> + snprintf(buf, size, "%#"PRIx64" (%s | %s | %s)", value,
>> + hw_cache_op_result_str, hw_cache_op_str, hw_cache_str);
>> + }
>> +}
>> +
>> +#ifdef HAVE_LIBTRACEEVENT
>> +static void __p_config_tracepoint_id(char *buf, size_t size, u64 value)
>> +{
>> + char *str = tracepoint_id_to_name(value);
>> +
>> + if (str != NULL) {
>> + snprintf(buf, size, "%#"PRIx64" (%s)", value, str);
>> + free(str);
>> + } else {
>> + snprintf(buf, size, "%#"PRIx64, value);
>> + }
>
> Ditto
>
> Note, can just call free() on 'str' whether or not it is NULL.
>
OK, ditto
Thanks for such a detailed suggestion.
Thanks,
Yang
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH v2 3/4] perf tools: Add printing perf_event_attr type symbol in perf_event_attr__fprintf()
2023-05-15 8:48 ` Yang Jihong
@ 2023-05-15 8:56 ` Adrian Hunter
2023-05-15 9:23 ` Yang Jihong
2023-05-16 7:01 ` Yang Jihong
0 siblings, 2 replies; 14+ messages in thread
From: Adrian Hunter @ 2023-05-15 8:56 UTC (permalink / raw)
To: Yang Jihong, peterz, mingo, acme, mark.rutland,
alexander.shishkin, jolsa, namhyung, irogers, anshuman.khandual,
jesussanp, linux-perf-users, linux-kernel
On 15/05/23 11:48, Yang Jihong wrote:
> Hello,
>
> On 2023/5/12 18:34, Adrian Hunter wrote:
>> On 11/05/23 10:51, Yang Jihong wrote:
>>> When printing perf_event_attr, always display perf_event_attr type and its symbol
>>> to improve the readability of debugging information.
>>>
>>> Before:
>>>
>>> # perf --debug verbose=2 record -e cycles,cpu-clock,sched:sched_switch,branch-load-misses,r101,mem:0x0 -C 0 true
>>> <SNIP>
>>> ------------------------------------------------------------
>>> perf_event_attr:
>>> size 136
>>> { sample_period, sample_freq } 4000
>>> sample_type IP|TID|TIME|CPU|PERIOD|IDENTIFIER
>>> read_format ID
>>> disabled 1
>>> inherit 1
>>> freq 1
>>> sample_id_all 1
>>> exclude_guest 1
>>> ------------------------------------------------------------
>>> sys_perf_event_open: pid -1 cpu 0 group_fd -1 flags 0x8 = 5
>>> ------------------------------------------------------------
>>> perf_event_attr:
>>> type 1
>>> size 136
>>> { sample_period, sample_freq } 4000
>>> sample_type IP|TID|TIME|CPU|PERIOD|IDENTIFIER
>>> read_format ID
>>> disabled 1
>>> inherit 1
>>> freq 1
>>> sample_id_all 1
>>> exclude_guest 1
>>> ------------------------------------------------------------
>>> sys_perf_event_open: pid -1 cpu 0 group_fd -1 flags 0x8 = 6
>>> ------------------------------------------------------------
>>> perf_event_attr:
>>> type 2
>>> size 136
>>> config 0x143
>>> { sample_period, sample_freq } 1
>>> sample_type IP|TID|TIME|CPU|PERIOD|RAW|IDENTIFIER
>>> read_format ID
>>> disabled 1
>>> inherit 1
>>> sample_id_all 1
>>> exclude_guest 1
>>> ------------------------------------------------------------
>>> sys_perf_event_open: pid -1 cpu 0 group_fd -1 flags 0x8 = 7
>>> ------------------------------------------------------------
>>> perf_event_attr:
>>> type 3
>>> size 136
>>> config 0x10005
>>> { sample_period, sample_freq } 4000
>>> sample_type IP|TID|TIME|CPU|PERIOD|IDENTIFIER
>>> read_format ID
>>> disabled 1
>>> inherit 1
>>> freq 1
>>> sample_id_all 1
>>> exclude_guest 1
>>> ------------------------------------------------------------
>>> sys_perf_event_open: pid -1 cpu 0 group_fd -1 flags 0x8 = 9
>>> ------------------------------------------------------------
>>> perf_event_attr:
>>> type 4
>>> size 136
>>> config 0x101
>>> { sample_period, sample_freq } 4000
>>> sample_type IP|TID|TIME|CPU|PERIOD|IDENTIFIER
>>> read_format ID
>>> disabled 1
>>> inherit 1
>>> freq 1
>>> sample_id_all 1
>>> exclude_guest 1
>>> ------------------------------------------------------------
>>> sys_perf_event_open: pid -1 cpu 0 group_fd -1 flags 0x8 = 10
>>> ------------------------------------------------------------
>>> perf_event_attr:
>>> type 5
>>> size 136
>>> { sample_period, sample_freq } 1
>>> sample_type IP|TID|TIME|CPU|IDENTIFIER
>>> read_format ID
>>> disabled 1
>>> inherit 1
>>> sample_id_all 1
>>> exclude_guest 1
>>> bp_type 3
>>> { bp_len, config2 } 0x4
>>> ------------------------------------------------------------
>>> <SNIP>
>>>
>>> After:
>>>
>>> # perf --debug verbose=2 record -e cycles,cpu-clock,sched:sched_switch,branch-load-misses,r101,mem:0x0 -C 0 true
>>> <SNIP>
>>> ------------------------------------------------------------
>>> perf_event_attr:
>>> type 0 (PERF_TYPE_HARDWARE)
>>> size 136
>>> { sample_period, sample_freq } 4000
>>> sample_type IP|TID|TIME|CPU|PERIOD|IDENTIFIER
>>> read_format ID
>>> disabled 1
>>> inherit 1
>>> freq 1
>>> sample_id_all 1
>>> exclude_guest 1
>>> ------------------------------------------------------------
>>> sys_perf_event_open: pid -1 cpu 0 group_fd -1 flags 0x8 = 5
>>> ------------------------------------------------------------
>>> perf_event_attr:
>>> type 1 (PERF_TYPE_SOFTWARE)
>>> size 136
>>> { sample_period, sample_freq } 4000
>>> sample_type IP|TID|TIME|CPU|PERIOD|IDENTIFIER
>>> read_format ID
>>> disabled 1
>>> inherit 1
>>> freq 1
>>> sample_id_all 1
>>> exclude_guest 1
>>> ------------------------------------------------------------
>>> sys_perf_event_open: pid -1 cpu 0 group_fd -1 flags 0x8 = 6
>>> ------------------------------------------------------------
>>> perf_event_attr:
>>> type 2 (PERF_TYPE_TRACEPOINT)
>>> size 136
>>> config 0x143
>>> { sample_period, sample_freq } 1
>>> sample_type IP|TID|TIME|CPU|PERIOD|RAW|IDENTIFIER
>>> read_format ID
>>> disabled 1
>>> inherit 1
>>> sample_id_all 1
>>> exclude_guest 1
>>> ------------------------------------------------------------
>>> sys_perf_event_open: pid -1 cpu 0 group_fd -1 flags 0x8 = 7
>>> ------------------------------------------------------------
>>> perf_event_attr:
>>> type 3 (PERF_TYPE_HW_CACHE)
>>> size 136
>>> config 0x10005
>>> { sample_period, sample_freq } 4000
>>> sample_type IP|TID|TIME|CPU|PERIOD|IDENTIFIER
>>> read_format ID
>>> disabled 1
>>> inherit 1
>>> freq 1
>>> sample_id_all 1
>>> exclude_guest 1
>>> ------------------------------------------------------------
>>> sys_perf_event_open: pid -1 cpu 0 group_fd -1 flags 0x8 = 9
>>> ------------------------------------------------------------
>>> perf_event_attr:
>>> type 4 (PERF_TYPE_RAW)
>>> size 136
>>> config 0x101
>>> { sample_period, sample_freq } 4000
>>> sample_type IP|TID|TIME|CPU|PERIOD|IDENTIFIER
>>> read_format ID
>>> disabled 1
>>> inherit 1
>>> freq 1
>>> sample_id_all 1
>>> exclude_guest 1
>>> ------------------------------------------------------------
>>> sys_perf_event_open: pid -1 cpu 0 group_fd -1 flags 0x8 = 10
>>> ------------------------------------------------------------
>>> perf_event_attr:
>>> type 5 (PERF_TYPE_BREAKPOINT)
>>> size 136
>>> { sample_period, sample_freq } 1
>>> sample_type IP|TID|TIME|CPU|IDENTIFIER
>>> read_format ID
>>> disabled 1
>>> inherit 1
>>> sample_id_all 1
>>> exclude_guest 1
>>> bp_type 3
>>> { bp_len, config2 } 0x4
>>> ------------------------------------------------------------
>>> <SNIP>
>>>
>>> Signed-off-by: Yang Jihong <yangjihong1@huawei.com>
>>> ---
>>> tools/perf/util/perf_event_attr_fprintf.c | 30 ++++++++++++++++++++++-
>>> 1 file changed, 29 insertions(+), 1 deletion(-)
>>>
>>> diff --git a/tools/perf/util/perf_event_attr_fprintf.c b/tools/perf/util/perf_event_attr_fprintf.c
>>> index 433029c6afc5..cd0905d8cb7a 100644
>>> --- a/tools/perf/util/perf_event_attr_fprintf.c
>>> +++ b/tools/perf/util/perf_event_attr_fprintf.c
>>> @@ -71,6 +71,33 @@ static void __p_read_format(char *buf, size_t size, u64 value)
>>> __p_bits(buf, size, value, bits);
>>> }
>>> +#define ENUM_ID_TO_STR_CASE(x) case x: return (#x);
>>> +static const char *stringify_perf_type_id(u64 value)
>>> +{
>>> + /* sync with enum perf_type_id in perf_event.h */
>>
>> Everything in this file syncs with perf_event.h, so the comment
>> does not seem very useful.
> OK, will fix in v3.
>>
>>> + switch (value) {
>>> + ENUM_ID_TO_STR_CASE(PERF_TYPE_HARDWARE)
>>> + ENUM_ID_TO_STR_CASE(PERF_TYPE_SOFTWARE)
>>> + ENUM_ID_TO_STR_CASE(PERF_TYPE_TRACEPOINT)
>>> + ENUM_ID_TO_STR_CASE(PERF_TYPE_HW_CACHE)
>>> + ENUM_ID_TO_STR_CASE(PERF_TYPE_RAW)
>>> + ENUM_ID_TO_STR_CASE(PERF_TYPE_BREAKPOINT)
>>> + default:
>>> + return NULL;
>>> + }
>>> +}
>>> +#undef ENUM_ID_TO_STR_CASE
>>> +
>>> +static void __p_type_id(char *buf, size_t size, u64 value)
>>> +{
>>> + const char *str = stringify_perf_type_id(value);
>>> +
>>> + if (str == NULL)
>>> + snprintf(buf, size, "%"PRIu64, value);
>>> + else
>>> + snprintf(buf, size, "%"PRIu64" (%s)", value, str);
>>
>> These 4 lines end up getting used again about 3 times in the next
>> patch, so might as well be a separate function e.g.
>>
>> print_id(buf, size, value, stringify_perf_type_id(value));
>>
>> where:
>>
>> static void print_id(char *buf, size_t size, u64 value, const char *str)
>> {
>> if (str == NULL)
>> snprintf(buf, size, "%"PRIu64, value);
>> else
>> snprintf(buf, size, "%"PRIu64" (%s)", value, str);
>> }
>>
> OK, will add print_id() helper in v3.
> If print_id() helper is also used to print config id, is printed in the decimal format. In the past, it is printed in the hexadecimal format，
> there may be some changes here.
>
> Before:
> config 0x143
>
> After:
> config 323 (sched:sched_switch)
Right I didn't notice the difference. Best keep print_id() just for the hex cases.
>
>>> +}
>>> +
>>> #define BUF_SIZE 1024
>>> #define p_hex(val) snprintf(buf, BUF_SIZE, "%#"PRIx64, (uint64_t)(val))
>>> @@ -79,6 +106,7 @@ static void __p_read_format(char *buf, size_t size, u64 value)
>>> #define p_sample_type(val) __p_sample_type(buf, BUF_SIZE, val)
>>> #define p_branch_sample_type(val) __p_branch_sample_type(buf, BUF_SIZE, val)
>>> #define p_read_format(val) __p_read_format(buf, BUF_SIZE, val)
>>> +#define p_type_id(val) __p_type_id(buf, BUF_SIZE, val)
>>> #define PRINT_ATTRn(_n, _f, _p, _a) \
>>> do { \
>>> @@ -96,7 +124,7 @@ int perf_event_attr__fprintf(FILE *fp, struct perf_event_attr *attr,
>>> char buf[BUF_SIZE];
>>> int ret = 0;
>>> - PRINT_ATTRf(type, p_unsigned);
>>> + PRINT_ATTRn("type", type, p_type_id, true);
>>> PRINT_ATTRf(size, p_unsigned);
>>> PRINT_ATTRf(config, p_hex);
>>> PRINT_ATTRn("{ sample_period, sample_freq }", sample_period, p_unsigned, false);
>>
>> .
>>
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH v2 3/4] perf tools: Add printing perf_event_attr type symbol in perf_event_attr__fprintf()
2023-05-15 8:56 ` Adrian Hunter
@ 2023-05-15 9:23 ` Yang Jihong
2023-05-16 7:01 ` Yang Jihong
1 sibling, 0 replies; 14+ messages in thread
From: Yang Jihong @ 2023-05-15 9:23 UTC (permalink / raw)
To: Adrian Hunter, peterz, mingo, acme, mark.rutland,
alexander.shishkin, jolsa, namhyung, irogers, anshuman.khandual,
jesussanp, linux-perf-users, linux-kernel
Hello,
On 2023/5/15 16:56, Adrian Hunter wrote:
> On 15/05/23 11:48, Yang Jihong wrote:
>> Hello,
>>
>> On 2023/5/12 18:34, Adrian Hunter wrote:
>>> On 11/05/23 10:51, Yang Jihong wrote:
>>>> When printing perf_event_attr, always display perf_event_attr type and its symbol
>>>> to improve the readability of debugging information.
>>>>
>>>> Before:
>>>>
>>>> # perf --debug verbose=2 record -e cycles,cpu-clock,sched:sched_switch,branch-load-misses,r101,mem:0x0 -C 0 true
>>>> <SNIP>
>>>> ------------------------------------------------------------
>>>> perf_event_attr:
>>>> size 136
>>>> { sample_period, sample_freq } 4000
>>>> sample_type IP|TID|TIME|CPU|PERIOD|IDENTIFIER
>>>> read_format ID
>>>> disabled 1
>>>> inherit 1
>>>> freq 1
>>>> sample_id_all 1
>>>> exclude_guest 1
>>>> ------------------------------------------------------------
>>>> sys_perf_event_open: pid -1 cpu 0 group_fd -1 flags 0x8 = 5
>>>> ------------------------------------------------------------
>>>> perf_event_attr:
>>>> type 1
>>>> size 136
>>>> { sample_period, sample_freq } 4000
>>>> sample_type IP|TID|TIME|CPU|PERIOD|IDENTIFIER
>>>> read_format ID
>>>> disabled 1
>>>> inherit 1
>>>> freq 1
>>>> sample_id_all 1
>>>> exclude_guest 1
>>>> ------------------------------------------------------------
>>>> sys_perf_event_open: pid -1 cpu 0 group_fd -1 flags 0x8 = 6
>>>> ------------------------------------------------------------
>>>> perf_event_attr:
>>>> type 2
>>>> size 136
>>>> config 0x143
>>>> { sample_period, sample_freq } 1
>>>> sample_type IP|TID|TIME|CPU|PERIOD|RAW|IDENTIFIER
>>>> read_format ID
>>>> disabled 1
>>>> inherit 1
>>>> sample_id_all 1
>>>> exclude_guest 1
>>>> ------------------------------------------------------------
>>>> sys_perf_event_open: pid -1 cpu 0 group_fd -1 flags 0x8 = 7
>>>> ------------------------------------------------------------
>>>> perf_event_attr:
>>>> type 3
>>>> size 136
>>>> config 0x10005
>>>> { sample_period, sample_freq } 4000
>>>> sample_type IP|TID|TIME|CPU|PERIOD|IDENTIFIER
>>>> read_format ID
>>>> disabled 1
>>>> inherit 1
>>>> freq 1
>>>> sample_id_all 1
>>>> exclude_guest 1
>>>> ------------------------------------------------------------
>>>> sys_perf_event_open: pid -1 cpu 0 group_fd -1 flags 0x8 = 9
>>>> ------------------------------------------------------------
>>>> perf_event_attr:
>>>> type 4
>>>> size 136
>>>> config 0x101
>>>> { sample_period, sample_freq } 4000
>>>> sample_type IP|TID|TIME|CPU|PERIOD|IDENTIFIER
>>>> read_format ID
>>>> disabled 1
>>>> inherit 1
>>>> freq 1
>>>> sample_id_all 1
>>>> exclude_guest 1
>>>> ------------------------------------------------------------
>>>> sys_perf_event_open: pid -1 cpu 0 group_fd -1 flags 0x8 = 10
>>>> ------------------------------------------------------------
>>>> perf_event_attr:
>>>> type 5
>>>> size 136
>>>> { sample_period, sample_freq } 1
>>>> sample_type IP|TID|TIME|CPU|IDENTIFIER
>>>> read_format ID
>>>> disabled 1
>>>> inherit 1
>>>> sample_id_all 1
>>>> exclude_guest 1
>>>> bp_type 3
>>>> { bp_len, config2 } 0x4
>>>> ------------------------------------------------------------
>>>> <SNIP>
>>>>
>>>> After:
>>>>
>>>> # perf --debug verbose=2 record -e cycles,cpu-clock,sched:sched_switch,branch-load-misses,r101,mem:0x0 -C 0 true
>>>> <SNIP>
>>>> ------------------------------------------------------------
>>>> perf_event_attr:
>>>> type 0 (PERF_TYPE_HARDWARE)
>>>> size 136
>>>> { sample_period, sample_freq } 4000
>>>> sample_type IP|TID|TIME|CPU|PERIOD|IDENTIFIER
>>>> read_format ID
>>>> disabled 1
>>>> inherit 1
>>>> freq 1
>>>> sample_id_all 1
>>>> exclude_guest 1
>>>> ------------------------------------------------------------
>>>> sys_perf_event_open: pid -1 cpu 0 group_fd -1 flags 0x8 = 5
>>>> ------------------------------------------------------------
>>>> perf_event_attr:
>>>> type 1 (PERF_TYPE_SOFTWARE)
>>>> size 136
>>>> { sample_period, sample_freq } 4000
>>>> sample_type IP|TID|TIME|CPU|PERIOD|IDENTIFIER
>>>> read_format ID
>>>> disabled 1
>>>> inherit 1
>>>> freq 1
>>>> sample_id_all 1
>>>> exclude_guest 1
>>>> ------------------------------------------------------------
>>>> sys_perf_event_open: pid -1 cpu 0 group_fd -1 flags 0x8 = 6
>>>> ------------------------------------------------------------
>>>> perf_event_attr:
>>>> type 2 (PERF_TYPE_TRACEPOINT)
>>>> size 136
>>>> config 0x143
>>>> { sample_period, sample_freq } 1
>>>> sample_type IP|TID|TIME|CPU|PERIOD|RAW|IDENTIFIER
>>>> read_format ID
>>>> disabled 1
>>>> inherit 1
>>>> sample_id_all 1
>>>> exclude_guest 1
>>>> ------------------------------------------------------------
>>>> sys_perf_event_open: pid -1 cpu 0 group_fd -1 flags 0x8 = 7
>>>> ------------------------------------------------------------
>>>> perf_event_attr:
>>>> type 3 (PERF_TYPE_HW_CACHE)
>>>> size 136
>>>> config 0x10005
>>>> { sample_period, sample_freq } 4000
>>>> sample_type IP|TID|TIME|CPU|PERIOD|IDENTIFIER
>>>> read_format ID
>>>> disabled 1
>>>> inherit 1
>>>> freq 1
>>>> sample_id_all 1
>>>> exclude_guest 1
>>>> ------------------------------------------------------------
>>>> sys_perf_event_open: pid -1 cpu 0 group_fd -1 flags 0x8 = 9
>>>> ------------------------------------------------------------
>>>> perf_event_attr:
>>>> type 4 (PERF_TYPE_RAW)
>>>> size 136
>>>> config 0x101
>>>> { sample_period, sample_freq } 4000
>>>> sample_type IP|TID|TIME|CPU|PERIOD|IDENTIFIER
>>>> read_format ID
>>>> disabled 1
>>>> inherit 1
>>>> freq 1
>>>> sample_id_all 1
>>>> exclude_guest 1
>>>> ------------------------------------------------------------
>>>> sys_perf_event_open: pid -1 cpu 0 group_fd -1 flags 0x8 = 10
>>>> ------------------------------------------------------------
>>>> perf_event_attr:
>>>> type 5 (PERF_TYPE_BREAKPOINT)
>>>> size 136
>>>> { sample_period, sample_freq } 1
>>>> sample_type IP|TID|TIME|CPU|IDENTIFIER
>>>> read_format ID
>>>> disabled 1
>>>> inherit 1
>>>> sample_id_all 1
>>>> exclude_guest 1
>>>> bp_type 3
>>>> { bp_len, config2 } 0x4
>>>> ------------------------------------------------------------
>>>> <SNIP>
>>>>
>>>> Signed-off-by: Yang Jihong <yangjihong1@huawei.com>
>>>> ---
>>>> tools/perf/util/perf_event_attr_fprintf.c | 30 ++++++++++++++++++++++-
>>>> 1 file changed, 29 insertions(+), 1 deletion(-)
>>>>
>>>> diff --git a/tools/perf/util/perf_event_attr_fprintf.c b/tools/perf/util/perf_event_attr_fprintf.c
>>>> index 433029c6afc5..cd0905d8cb7a 100644
>>>> --- a/tools/perf/util/perf_event_attr_fprintf.c
>>>> +++ b/tools/perf/util/perf_event_attr_fprintf.c
>>>> @@ -71,6 +71,33 @@ static void __p_read_format(char *buf, size_t size, u64 value)
>>>> __p_bits(buf, size, value, bits);
>>>> }
>>>> +#define ENUM_ID_TO_STR_CASE(x) case x: return (#x);
>>>> +static const char *stringify_perf_type_id(u64 value)
>>>> +{
>>>> + /* sync with enum perf_type_id in perf_event.h */
>>>
>>> Everything in this file syncs with perf_event.h, so the comment
>>> does not seem very useful.
>> OK, will fix in v3.
>>>
>>>> + switch (value) {
>>>> + ENUM_ID_TO_STR_CASE(PERF_TYPE_HARDWARE)
>>>> + ENUM_ID_TO_STR_CASE(PERF_TYPE_SOFTWARE)
>>>> + ENUM_ID_TO_STR_CASE(PERF_TYPE_TRACEPOINT)
>>>> + ENUM_ID_TO_STR_CASE(PERF_TYPE_HW_CACHE)
>>>> + ENUM_ID_TO_STR_CASE(PERF_TYPE_RAW)
>>>> + ENUM_ID_TO_STR_CASE(PERF_TYPE_BREAKPOINT)
>>>> + default:
>>>> + return NULL;
>>>> + }
>>>> +}
>>>> +#undef ENUM_ID_TO_STR_CASE
>>>> +
>>>> +static void __p_type_id(char *buf, size_t size, u64 value)
>>>> +{
>>>> + const char *str = stringify_perf_type_id(value);
>>>> +
>>>> + if (str == NULL)
>>>> + snprintf(buf, size, "%"PRIu64, value);
>>>> + else
>>>> + snprintf(buf, size, "%"PRIu64" (%s)", value, str);
>>>
>>> These 4 lines end up getting used again about 3 times in the next
>>> patch, so might as well be a separate function e.g.
>>>
>>> print_id(buf, size, value, stringify_perf_type_id(value));
>>>
>>> where:
>>>
>>> static void print_id(char *buf, size_t size, u64 value, const char *str)
>>> {
>>> if (str == NULL)
>>> snprintf(buf, size, "%"PRIu64, value);
>>> else
>>> snprintf(buf, size, "%"PRIu64" (%s)", value, str);
>>> }
>>>
>> OK, will add print_id() helper in v3.
>> If print_id() helper is also used to print config id, is printed in the decimal format. In the past, it is printed in the hexadecimal format，
>> there may be some changes here.
>>
>> Before:
>> config 0x143
>>
>> After:
>> config 323 (sched:sched_switch)
>
> Right I didn't notice the difference. Best keep print_id() just for the hex cases.
>
Emm...，Is the type id also printed in hexadecimal format?
static void print_id(char *buf, size_t size, u64 value, const char *str)
{
if (str == NULL)
snprintf(buf, size, "%#"PRIx64, value);
else
snprintf(buf, size, "%#"PRIx64" (%s)", value, str);
}
Output:
perf_event_attr:
type 0x2 (PERF_TYPE_TRACEPOINT)
size 136
config 0x124 (sched:sched_switch)
Because v3 has just been sent out, if need to modify it according to
this, I'll send v4.
Thanks,
Yang
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH v2 3/4] perf tools: Add printing perf_event_attr type symbol in perf_event_attr__fprintf()
2023-05-15 8:56 ` Adrian Hunter
2023-05-15 9:23 ` Yang Jihong
@ 2023-05-16 7:01 ` Yang Jihong
1 sibling, 0 replies; 14+ messages in thread
From: Yang Jihong @ 2023-05-16 7:01 UTC (permalink / raw)
To: Adrian Hunter, peterz, mingo, acme, mark.rutland,
alexander.shishkin, jolsa, namhyung, irogers, anshuman.khandual,
jesussanp, linux-perf-users, linux-kernel
Hello,
On 2023/5/15 16:56, Adrian Hunter wrote:
> On 15/05/23 11:48, Yang Jihong wrote:
>> Hello,
>>
>> On 2023/5/12 18:34, Adrian Hunter wrote:
>>> On 11/05/23 10:51, Yang Jihong wrote:
>>>> When printing perf_event_attr, always display perf_event_attr type and its symbol
>>>> to improve the readability of debugging information.
>>>>
>>>> Before:
>>>>
>>>> # perf --debug verbose=2 record -e cycles,cpu-clock,sched:sched_switch,branch-load-misses,r101,mem:0x0 -C 0 true
>>>> <SNIP>
>>>> ------------------------------------------------------------
>>>> perf_event_attr:
>>>> size 136
>>>> { sample_period, sample_freq } 4000
>>>> sample_type IP|TID|TIME|CPU|PERIOD|IDENTIFIER
>>>> read_format ID
>>>> disabled 1
>>>> inherit 1
>>>> freq 1
>>>> sample_id_all 1
>>>> exclude_guest 1
>>>> ------------------------------------------------------------
>>>> sys_perf_event_open: pid -1 cpu 0 group_fd -1 flags 0x8 = 5
>>>> ------------------------------------------------------------
>>>> perf_event_attr:
>>>> type 1
>>>> size 136
>>>> { sample_period, sample_freq } 4000
>>>> sample_type IP|TID|TIME|CPU|PERIOD|IDENTIFIER
>>>> read_format ID
>>>> disabled 1
>>>> inherit 1
>>>> freq 1
>>>> sample_id_all 1
>>>> exclude_guest 1
>>>> ------------------------------------------------------------
>>>> sys_perf_event_open: pid -1 cpu 0 group_fd -1 flags 0x8 = 6
>>>> ------------------------------------------------------------
>>>> perf_event_attr:
>>>> type 2
>>>> size 136
>>>> config 0x143
>>>> { sample_period, sample_freq } 1
>>>> sample_type IP|TID|TIME|CPU|PERIOD|RAW|IDENTIFIER
>>>> read_format ID
>>>> disabled 1
>>>> inherit 1
>>>> sample_id_all 1
>>>> exclude_guest 1
>>>> ------------------------------------------------------------
>>>> sys_perf_event_open: pid -1 cpu 0 group_fd -1 flags 0x8 = 7
>>>> ------------------------------------------------------------
>>>> perf_event_attr:
>>>> type 3
>>>> size 136
>>>> config 0x10005
>>>> { sample_period, sample_freq } 4000
>>>> sample_type IP|TID|TIME|CPU|PERIOD|IDENTIFIER
>>>> read_format ID
>>>> disabled 1
>>>> inherit 1
>>>> freq 1
>>>> sample_id_all 1
>>>> exclude_guest 1
>>>> ------------------------------------------------------------
>>>> sys_perf_event_open: pid -1 cpu 0 group_fd -1 flags 0x8 = 9
>>>> ------------------------------------------------------------
>>>> perf_event_attr:
>>>> type 4
>>>> size 136
>>>> config 0x101
>>>> { sample_period, sample_freq } 4000
>>>> sample_type IP|TID|TIME|CPU|PERIOD|IDENTIFIER
>>>> read_format ID
>>>> disabled 1
>>>> inherit 1
>>>> freq 1
>>>> sample_id_all 1
>>>> exclude_guest 1
>>>> ------------------------------------------------------------
>>>> sys_perf_event_open: pid -1 cpu 0 group_fd -1 flags 0x8 = 10
>>>> ------------------------------------------------------------
>>>> perf_event_attr:
>>>> type 5
>>>> size 136
>>>> { sample_period, sample_freq } 1
>>>> sample_type IP|TID|TIME|CPU|IDENTIFIER
>>>> read_format ID
>>>> disabled 1
>>>> inherit 1
>>>> sample_id_all 1
>>>> exclude_guest 1
>>>> bp_type 3
>>>> { bp_len, config2 } 0x4
>>>> ------------------------------------------------------------
>>>> <SNIP>
>>>>
>>>> After:
>>>>
>>>> # perf --debug verbose=2 record -e cycles,cpu-clock,sched:sched_switch,branch-load-misses,r101,mem:0x0 -C 0 true
>>>> <SNIP>
>>>> ------------------------------------------------------------
>>>> perf_event_attr:
>>>> type 0 (PERF_TYPE_HARDWARE)
>>>> size 136
>>>> { sample_period, sample_freq } 4000
>>>> sample_type IP|TID|TIME|CPU|PERIOD|IDENTIFIER
>>>> read_format ID
>>>> disabled 1
>>>> inherit 1
>>>> freq 1
>>>> sample_id_all 1
>>>> exclude_guest 1
>>>> ------------------------------------------------------------
>>>> sys_perf_event_open: pid -1 cpu 0 group_fd -1 flags 0x8 = 5
>>>> ------------------------------------------------------------
>>>> perf_event_attr:
>>>> type 1 (PERF_TYPE_SOFTWARE)
>>>> size 136
>>>> { sample_period, sample_freq } 4000
>>>> sample_type IP|TID|TIME|CPU|PERIOD|IDENTIFIER
>>>> read_format ID
>>>> disabled 1
>>>> inherit 1
>>>> freq 1
>>>> sample_id_all 1
>>>> exclude_guest 1
>>>> ------------------------------------------------------------
>>>> sys_perf_event_open: pid -1 cpu 0 group_fd -1 flags 0x8 = 6
>>>> ------------------------------------------------------------
>>>> perf_event_attr:
>>>> type 2 (PERF_TYPE_TRACEPOINT)
>>>> size 136
>>>> config 0x143
>>>> { sample_period, sample_freq } 1
>>>> sample_type IP|TID|TIME|CPU|PERIOD|RAW|IDENTIFIER
>>>> read_format ID
>>>> disabled 1
>>>> inherit 1
>>>> sample_id_all 1
>>>> exclude_guest 1
>>>> ------------------------------------------------------------
>>>> sys_perf_event_open: pid -1 cpu 0 group_fd -1 flags 0x8 = 7
>>>> ------------------------------------------------------------
>>>> perf_event_attr:
>>>> type 3 (PERF_TYPE_HW_CACHE)
>>>> size 136
>>>> config 0x10005
>>>> { sample_period, sample_freq } 4000
>>>> sample_type IP|TID|TIME|CPU|PERIOD|IDENTIFIER
>>>> read_format ID
>>>> disabled 1
>>>> inherit 1
>>>> freq 1
>>>> sample_id_all 1
>>>> exclude_guest 1
>>>> ------------------------------------------------------------
>>>> sys_perf_event_open: pid -1 cpu 0 group_fd -1 flags 0x8 = 9
>>>> ------------------------------------------------------------
>>>> perf_event_attr:
>>>> type 4 (PERF_TYPE_RAW)
>>>> size 136
>>>> config 0x101
>>>> { sample_period, sample_freq } 4000
>>>> sample_type IP|TID|TIME|CPU|PERIOD|IDENTIFIER
>>>> read_format ID
>>>> disabled 1
>>>> inherit 1
>>>> freq 1
>>>> sample_id_all 1
>>>> exclude_guest 1
>>>> ------------------------------------------------------------
>>>> sys_perf_event_open: pid -1 cpu 0 group_fd -1 flags 0x8 = 10
>>>> ------------------------------------------------------------
>>>> perf_event_attr:
>>>> type 5 (PERF_TYPE_BREAKPOINT)
>>>> size 136
>>>> { sample_period, sample_freq } 1
>>>> sample_type IP|TID|TIME|CPU|IDENTIFIER
>>>> read_format ID
>>>> disabled 1
>>>> inherit 1
>>>> sample_id_all 1
>>>> exclude_guest 1
>>>> bp_type 3
>>>> { bp_len, config2 } 0x4
>>>> ------------------------------------------------------------
>>>> <SNIP>
>>>>
>>>> Signed-off-by: Yang Jihong <yangjihong1@huawei.com>
>>>> ---
>>>> tools/perf/util/perf_event_attr_fprintf.c | 30 ++++++++++++++++++++++-
>>>> 1 file changed, 29 insertions(+), 1 deletion(-)
>>>>
>>>> diff --git a/tools/perf/util/perf_event_attr_fprintf.c b/tools/perf/util/perf_event_attr_fprintf.c
>>>> index 433029c6afc5..cd0905d8cb7a 100644
>>>> --- a/tools/perf/util/perf_event_attr_fprintf.c
>>>> +++ b/tools/perf/util/perf_event_attr_fprintf.c
>>>> @@ -71,6 +71,33 @@ static void __p_read_format(char *buf, size_t size, u64 value)
>>>> __p_bits(buf, size, value, bits);
>>>> }
>>>> +#define ENUM_ID_TO_STR_CASE(x) case x: return (#x);
>>>> +static const char *stringify_perf_type_id(u64 value)
>>>> +{
>>>> + /* sync with enum perf_type_id in perf_event.h */
>>>
>>> Everything in this file syncs with perf_event.h, so the comment
>>> does not seem very useful.
>> OK, will fix in v3.
>>>
>>>> + switch (value) {
>>>> + ENUM_ID_TO_STR_CASE(PERF_TYPE_HARDWARE)
>>>> + ENUM_ID_TO_STR_CASE(PERF_TYPE_SOFTWARE)
>>>> + ENUM_ID_TO_STR_CASE(PERF_TYPE_TRACEPOINT)
>>>> + ENUM_ID_TO_STR_CASE(PERF_TYPE_HW_CACHE)
>>>> + ENUM_ID_TO_STR_CASE(PERF_TYPE_RAW)
>>>> + ENUM_ID_TO_STR_CASE(PERF_TYPE_BREAKPOINT)
>>>> + default:
>>>> + return NULL;
>>>> + }
>>>> +}
>>>> +#undef ENUM_ID_TO_STR_CASE
>>>> +
>>>> +static void __p_type_id(char *buf, size_t size, u64 value)
>>>> +{
>>>> + const char *str = stringify_perf_type_id(value);
>>>> +
>>>> + if (str == NULL)
>>>> + snprintf(buf, size, "%"PRIu64, value);
>>>> + else
>>>> + snprintf(buf, size, "%"PRIu64" (%s)", value, str);
>>>
>>> These 4 lines end up getting used again about 3 times in the next
>>> patch, so might as well be a separate function e.g.
>>>
>>> print_id(buf, size, value, stringify_perf_type_id(value));
>>>
>>> where:
>>>
>>> static void print_id(char *buf, size_t size, u64 value, const char *str)
>>> {
>>> if (str == NULL)
>>> snprintf(buf, size, "%"PRIu64, value);
>>> else
>>> snprintf(buf, size, "%"PRIu64" (%s)", value, str);
>>> }
>>>
>> OK, will add print_id() helper in v3.
>> If print_id() helper is also used to print config id, is printed in the decimal format. In the past, it is printed in the hexadecimal format，
>> there may be some changes here.
>>
>> Before:
>> config 0x143
>>
>> After:
>> config 323 (sched:sched_switch)
>
> Right I didn't notice the difference. Best keep print_id() just for the hex cases.
>
v4 has been sent, print_id() helper is changed to a macro function to
support printing of both 'hex' and 'unsigned' formats.
Please see if it's OK.
Thanks,
Yang
^ permalink raw reply [flat|nested] 14+ messages in thread
end of thread, other threads:[~2023-05-16 7:01 UTC | newest]
Thread overview: 14+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-05-11 7:51 [PATCH v2 0/4] perf tools: Add printing perf_event_attr `config` and `id` symbol in perf_event_attr__fprintf() Yang Jihong
2023-05-11 7:51 ` [PATCH v2 1/4] perf trace-event-info: Add tracepoint_id_to_name() helper Yang Jihong
2023-05-12 10:33 ` Adrian Hunter
2023-05-15 8:42 ` Yang Jihong
2023-05-11 7:51 ` [PATCH v2 2/4] perf tools: Extend PRINT_ATTRf to support printing of members with a value of 0 Yang Jihong
2023-05-11 7:51 ` [PATCH v2 3/4] perf tools: Add printing perf_event_attr type symbol in perf_event_attr__fprintf() Yang Jihong
2023-05-12 10:34 ` Adrian Hunter
2023-05-15 8:48 ` Yang Jihong
2023-05-15 8:56 ` Adrian Hunter
2023-05-15 9:23 ` Yang Jihong
2023-05-16 7:01 ` Yang Jihong
2023-05-11 7:51 ` [PATCH v2 4/4] perf tools: Add printing perf_event_attr config " Yang Jihong
2023-05-12 10:34 ` Adrian Hunter
2023-05-15 8:52 ` Yang Jihong
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).