perf tools: Improve handling of hybrid PMUs in perf_event_attr__fprintf
Ian Rogers
reviewerPATCH v2 1/5 perf tools: Improve handling of hybrid PMUs in perf_event_attr__fprintf
Support the PMU name from the legacy hardware and hw_cache PMU extended types. Remove some macros and make variables more intention revealing, rather than just being called "value".
Before:
``` $ perf stat -vv -e instructions true ... ------------------------------------------------------------ perf_event_attr: type 0 (PERF_TYPE_HARDWARE) size 136 config 0xa00000001 sample_type IDENTIFIER read_format TOTAL_TIME_ENABLED|TOTAL_TIME_RUNNING disabled 1 inherit 1 enable_on_exec 1 exclude_guest 1 ------------------------------------------------------------ sys_perf_event_open: pid 181636 cpu -1 group_fd -1 flags 0x8 = 5 ------------------------------------------------------------ perf_event_attr: type 0 (PERF_TYPE_HARDWARE) size 136 config 0x400000001 sample_type IDENTIFIER read_format TOTAL_TIME_ENABLED|TOTAL_TIME_RUNNING disabled 1 inherit 1 enable_on_exec 1 exclude_guest 1 ------------------------------------------------------------ sys_perf_event_open: pid 181636 cpu -1 group_fd -1 flags 0x8 = 6 ... ```
After:
``` $ perf stat -vv -e instructions true ... ------------------------------------------------------------ perf_event_attr: type 0 (PERF_TYPE_HARDWARE) size 136 config 0xa00000001 (cpu_atom/PERF_COUNT_HW_INSTRUCTIONS/) sample_type IDENTIFIER read_format TOTAL_TIME_ENABLED|TOTAL_TIME_RUNNING disabled 1 inherit 1 enable_on_exec 1 ------------------------------------------------------------ sys_perf_event_open: pid 181724 cpu -1 group_fd -1 flags 0x8 = 5 ------------------------------------------------------------ perf_event_attr: type 0 (PERF_TYPE_HARDWARE) size 136 config 0x400000001 (cpu_core/PERF_COUNT_HW_INSTRUCTIONS/) sample_type IDENTIFIER read_format TOTAL_TIME_ENABLED|TOTAL_TIME_RUNNING disabled 1 inherit 1 enable_on_exec 1 ------------------------------------------------------------ sys_perf_event_open: pid 181724 cpu -1 group_fd -1 flags 0x8 = 6 ... ```
--- tools/perf/util/perf_event_attr_fprintf.c | 124 +++++++++++++--------- 1 file changed, 75 insertions(+), 49 deletions(-)
tools/perf/util/perf_event_attr_fprintf.c +75 -49
@@ -79,24 +79,22 @@ static void __p_read_format(char *buf, size_t size, u64 value)#define ENUM_ID_TO_STR_CASE (x) case x: return (#x);static const char *stringify_perf_type_id (struct perf_pmu *pmu,u32 type) { -if (pmu) -return pmu->name; -switch (type) { 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) + case PERF_TYPE_RAW: +return pmu ? pmu->name :"PERF_TYPE_RAW" ;default : -return NULL ; +return pmu ? pmu->name :NULL ; } }static const char *stringify_perf_hw_id (u64 value) { -switch (value) { +switch (value &PERF_HW_EVENT_MASK ) { 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)
@@ -169,79 +167,100 @@ static const char *stringify_perf_sw_id(u64 value) }#undef ENUM_ID_TO_STR_CASE -#define PRINT_ID (_s, _f) \ -do { \ - const char *__s = _s; \ - if (__s == NULL) \ - snprintf(buf, size, _f, value); \ - else \ - snprintf(buf, size, _f" (%s)", value, __s); \ -} while (0) -#define print_id_unsigned (_s) PRINT_ID(_s, "%"PRIu64) -#define print_id_hex (_s) PRINT_ID(_s, "%#"PRIx64) +static void print_id_unsigned (char *buf,size_t size,u64 value,const char *s) +{ +if (s ==NULL ) +snprintf (buf, size,"%" PRIu64, value); +else +snprintf (buf, size,"%" PRIu64" (%s)" , value, s); +} + +static void print_id_hex (char *buf,size_t size,u64 value,const char *s) +{ +if (s ==NULL ) +snprintf (buf, size,"%#" PRIx64, value); +else +snprintf (buf, size,"%#" PRIx64" (%s)" , value, s); +} -static void __p_type_id (struct perf_pmu *pmu,char *buf,size_t size,u64 value) +static void __p_type_id (char *buf,size_t size,struct perf_pmu *pmu,u32 type) { -print_id_unsigned (stringify_perf_type_id (pmu, value)); +print_id_unsigned (buf, size, type,stringify_perf_type_id (pmu, type)); } -static void __p_config_hw_id (char *buf,size_t size,u64 value) +static void __p_config_hw_id (char *buf,size_t size,struct perf_pmu *pmu,u64 config) { -print_id_hex (stringify_perf_hw_id (value)); +const char *name =stringify_perf_hw_id (config); + +if (name ==NULL ) { +if (pmu ==NULL ) { +snprintf (buf, size,"%#" PRIx64, config); + }else { +snprintf (buf, size,"%#" PRIx64" (%s/config=%#" PRIx64"/)" , config, pmu->name, + config); + } + }else { +if (pmu ==NULL ) +snprintf (buf, size,"%#" PRIx64" (%s)" , config, name); +else +snprintf (buf, size,"%#" PRIx64" (%s/%s/)" , config, pmu->name, name); + } } -static void __p_config_sw_id (char *buf,size_t size,u64 value) +static void __p_config_sw_id (char *buf,size_t size,u64 id) { -print_id_hex (stringify_perf_sw_id (value)); +print_id_hex (buf, size, id,stringify_perf_sw_id (id)); } -static void __p_config_hw_cache_id (char *buf,size_t size,u64 value) +static void __p_config_hw_cache_id (char *buf,size_t size,struct perf_pmu *pmu,u64 config) { -const char *hw_cache_str =stringify_perf_hw_cache_id (value &0xff ); +const char *hw_cache_str =stringify_perf_hw_cache_id (config &0xff );const char *hw_cache_op_str = -stringify_perf_hw_cache_op_id ((value &0xff00 ) >>8 ); +stringify_perf_hw_cache_op_id ((config &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); +stringify_perf_hw_cache_op_result_id ((config &0xff0000 ) >>16 ); + +if (hw_cache_str ==NULL || hw_cache_op_str ==NULL || hw_cache_op_result_str ==NULL ) { +if (pmu ==NULL ) { +snprintf (buf, size,"%#" PRIx64, config); + }else { +snprintf (buf, size,"%#" PRIx64" (%s/config=%#" PRIx64"/)" , config, pmu->name, + config); + } }else { -snprintf (buf, size,"%#" PRIx64" (%s | %s | %s)" , value, - hw_cache_op_result_str, hw_cache_op_str, hw_cache_str); +if (pmu ==NULL ) { +snprintf (buf, size,"%#" PRIx64" (%s | %s | %s)" , config, + hw_cache_op_result_str, hw_cache_op_str, hw_cache_str); + }else { +snprintf (buf, size,"%#" PRIx64" (%s/%s | %s | %s/)" , config, pmu->name, + hw_cache_op_result_str, hw_cache_op_str, hw_cache_str); + } } } -static void __p_config_tracepoint_id (char *buf,size_t size,u64 value) +static void __p_config_tracepoint_id (char *buf,size_t size,u64 id) { -char *str =tracepoint_id_to_name (value); +char *str =tracepoint_id_to_name (id); -print_id_hex (str); +print_id_hex (buf, size, id, str);free (str); } -static void __p_config_id (struct perf_pmu *pmu,char *buf,size_t size,u32 type,u64 value) +static void __p_config_id (struct perf_pmu *pmu,char *buf,size_t size,u32 type,u64 config) { -const char *name =perf_pmu__name_from_config (pmu, value); - -if (name) { -print_id_hex (name); -return ; - }switch (type) {case PERF_TYPE_HARDWARE : -return __p_config_hw_id (buf, size, value); +return __p_config_hw_id (buf, size, pmu, config);case PERF_TYPE_SOFTWARE : -return __p_config_sw_id (buf, size, value); +return __p_config_sw_id (buf, size, config);case PERF_TYPE_HW_CACHE : -return __p_config_hw_cache_id (buf, size, value); +return __p_config_hw_cache_id (buf, size, pmu, config);case PERF_TYPE_TRACEPOINT : -return __p_config_tracepoint_id (buf, size, value); +return __p_config_tracepoint_id (buf, size, config);case PERF_TYPE_RAW :case PERF_TYPE_BREAKPOINT :default : -snprintf (buf, size,"%#" PRIx64, value); -return ; +return print_id_hex (buf, size, config,perf_pmu__name_from_config (pmu, config)); } }
@@ -253,7 +272,7 @@ static void __p_config_id(struct perf_pmu *pmu, char *buf, size_t size, u32 type#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(pmu, buf, BUF_SIZE, val) +#define p_type_id (val) __p_type_id(buf, BUF_SIZE, pmu, val)#define p_config_id (val) __p_config_id(pmu, buf, BUF_SIZE, attr->type, val)#define PRINT_ATTRn (_n, _f, _p, _a) \
@@ -273,6 +292,13 @@ int perf_event_attr__fprintf(FILE *fp, struct perf_event_attr *attr,char buf[BUF_SIZE ];int ret =0 ; +if (!pmu && (attr->type ==PERF_TYPE_HARDWARE || attr->type ==PERF_TYPE_HW_CACHE )) { +u32 extended_type = attr->config >>PERF_PMU_TYPE_SHIFT ; + +if (extended_type) + pmu =perf_pmus__find_by_type (extended_type); + } +PRINT_ATTRn ("type" , type, p_type_id, true);PRINT_ATTRf (size, p_unsigned);PRINT_ATTRn ("config" , config, p_config_id, true);
Signature · 1 line
2.49.0.rc0.332.g42c0ae87b1-goog
Ian Rogers
reviewerPATCH v2 2/5 perf x86/topdown: Fix topdown leader sampling test error on hybrid
From: Dapeng Mi <[email protected]>
When running topdown leader smapling test on Intel hybrid platforms, such as LNL/ARL, we see the below error.
Topdown leader sampling test
Topdown leader sampling [Failed topdown events not reordered correctly]
It indciates the below command fails.
perf record -o "${perfdata}" -e "{instructions,slots,topdown-retiring}:S" true
The root cause is that perf tool creats a perf event for each PMU type if it can create.
As for this command, there would be 5 perf events created, cpu_atom/instructions/,cpu_atom/topdown_retiring/, cpu_core/slots/,cpu_core/instructions/,cpu_core/topdown-retiring/
For these 5 events, the 2 cpu_atom events are in a group and the other 3 cpu_core events are in another group.
When arch_topdown_sample_read() traverses all these 5 events, events cpu_atom/instructions/ and cpu_core/slots/ don't have a same group leade, and then return false directly and lead to cpu_core/slots/ event is used to sample and this is not allowed by PMU driver.
It's a overkill to return false directly if "evsel->core.leader !=
leader->core.leader" since there could be multiple groups in the event
list.
Just "continue" instead of "return false" to fix this issue.
--- tools/perf/arch/x86/util/topdown.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/perf/arch/x86/util/topdown.c +1 -1
@@ -81,7 +81,7 @@ bool arch_topdown_sample_read(struct evsel *leader)*/ evlist__for_each_entry (leader->evlist, evsel) {if (evsel->core.leader != leader->core.leader) -return false; +continue ;if (evsel != leader &&arch_is_topdown_metrics (evsel))return true; }
Signature · 1 line
2.49.0.rc0.332.g42c0ae87b1-goog
Ian Rogers
reviewerPATCH v2 3/5 perf parse-events: Corrections to topdown sorting
In reply to Ian RogersIn the case of '{instructions,slots},faults,topdown-retiring' the first event that must be grouped, slots, is ignored causing the topdown-retiring event not to be adjacent to the group it needs to be inserted into. Don't ignore the group members when computing the force_grouped_index.
Make the force_grouped_index be for the leader of the group it is within and always use it first rather than a group leader index so that topdown events may be sorted from one group into another.
As the PMU name comparison applies to moving events in the same group ensure the name ordering is always respected.
Change the group splitting logic to not group if there are no other topdown events and to fix cases where the force group leader wasn't being grouped with the other members of its group.
--- tools/perf/arch/x86/util/evlist.c | 15 ++-- tools/perf/util/parse-events.c | 145 ++++++++++++++++++++---------- 2 files changed, 105 insertions(+), 55 deletions(-)
tools/perf/arch/x86/util/evlist.c +9 -6
@@ -76,12 +76,15 @@ int arch_evlist__cmp(const struct evsel *lhs, const struct evsel *rhs)* topdown metrics events are already in same group with slots * event, do nothing. */ -if (arch_is_topdown_metrics (lhs) && !arch_is_topdown_metrics (rhs) && - lhs->core.leader != rhs->core.leader) -return -1 ; -if (!arch_is_topdown_metrics (lhs) &&arch_is_topdown_metrics (rhs) && - lhs->core.leader != rhs->core.leader) -return 1 ; +if (lhs->core.leader != rhs->core.leader) { +bool lhs_topdown =arch_is_topdown_metrics (lhs); +bool rhs_topdown =arch_is_topdown_metrics (rhs); + +if (lhs_topdown && !rhs_topdown) +return -1 ; +if (!lhs_topdown && rhs_topdown) +return 1 ; + } }/* Retire latency event should not be group leader*/
tools/perf/util/parse-events.c +96 -49
194 lines not on this page · raw message
Signature · 1 line
2.49.0.rc0.332.g42c0ae87b1-goog
Re: [PATCH v2 3/5] perf parse-events: Corrections to topdown sorting
Quoted 244 lines · Ian Rogers
In the case of '{instructions,slots},faults,topdown-retiring' the first event that must be grouped, slots, is ignored causing the topdown-retiring event not to be adjacent to the group it needs to be inserted into. Don't ignore the group members when computing the
force_grouped_index.Make the
force_grouped_indexbe for the leader of the group it is within and always use it first rather than a group leader index so that topdown events may be sorted from one group into another.As the PMU name comparison applies to moving events in the same group ensure the name ordering is always respected.
Change the group splitting logic to not group if there are no other topdown events and to fix cases where the force group leader wasn't being grouped with the other members of its group.
Reported-by Dapeng Mi <[email protected]>Signed-off-by Ian Rogers <[email protected]>--- tools/perf/arch/x86/util/evlist.c | 15 ++-- tools/perf/util/parse-events.c | 145 ++++++++++++++++++++---------- 2 files changed, 105 insertions(+), 55 deletions(-)tools/perf/arch/x86/util/evlist.c +9
-6@@ -76,12 +76,15 @@ int arch_evlist__cmp(const struct evsel *lhs, const struct evsel *rhs)* topdown metrics events are already in same group with slots * event, do nothing. */ -if (arch_is_topdown_metrics (lhs) && !arch_is_topdown_metrics (rhs) && - lhs->core.leader != rhs->core.leader) -return -1 ; -if (!arch_is_topdown_metrics (lhs) &&arch_is_topdown_metrics (rhs) && - lhs->core.leader != rhs->core.leader) -return 1 ; +if (lhs->core.leader != rhs->core.leader) { +bool lhs_topdown =arch_is_topdown_metrics (lhs); +bool rhs_topdown =arch_is_topdown_metrics (rhs); + +if (lhs_topdown && !rhs_topdown) +return -1 ; +if (!lhs_topdown && rhs_topdown) +return 1 ; + } }/* Retire latency event should not be group leader*/ tools/perf/util/parse-events.c +94
-49@@ -1980,48 +1980,55 @@ static int evlist__cmp(void *_fg_idx, const struct list_head *l, const struct liint *force_grouped_idx = _fg_idx;int lhs_sort_idx, rhs_sort_idx, ret;const char *lhs_pmu_name, *rhs_pmu_name; -bool lhs_has_group, rhs_has_group;/* -* First sort by grouping/leader. Read the leader idx only if the evsel -* is part of a group, by default ungrouped events will be sorted -* relative to grouped events based on where the first ungrouped event -* occurs. If both events don't have a group we want to fall-through to -* the arch specific sorting, that can reorder and fix things like -* Intel's topdown events. +* Get the indexes of the 2 events to sort. If the events are +* in groups then the leader's index is used otherwise the +* event's index is used. An index may be forced for events that +* must be in the same group, namely Intel topdown events. */ -if (lhs_core->leader != lhs_core || lhs_core->nr_members >1 ) { - lhs_has_group = true; - lhs_sort_idx = lhs_core->leader->idx; +if (*force_grouped_idx !=-1 &&arch_evsel__must_be_in_group (lhs)) { + lhs_sort_idx = *force_grouped_idx; }else { - lhs_has_group = false; - lhs_sort_idx = *force_grouped_idx !=-1 &&arch_evsel__must_be_in_group (lhs) - ? *force_grouped_idx - : lhs_core->idx; - } -if (rhs_core->leader != rhs_core || rhs_core->nr_members >1 ) { - rhs_has_group = true; - rhs_sort_idx = rhs_core->leader->idx; +bool lhs_has_group = lhs_core->leader != lhs_core || lhs_core->nr_members >1 ; + + lhs_sort_idx = lhs_has_group ? lhs_core->leader->idx : lhs_core->idx; + } +if (*force_grouped_idx !=-1 &&arch_evsel__must_be_in_group (rhs)) { + rhs_sort_idx = *force_grouped_idx; }else { - rhs_has_group = false; - rhs_sort_idx = *force_grouped_idx !=-1 &&arch_evsel__must_be_in_group (rhs) - ? *force_grouped_idx - : rhs_core->idx; +bool rhs_has_group = rhs_core->leader != rhs_core || rhs_core->nr_members >1 ; + + rhs_sort_idx = rhs_has_group ? rhs_core->leader->idx : rhs_core->idx; } +/* If the indices differ then respect the insertion order. */ if (lhs_sort_idx != rhs_sort_idx)return lhs_sort_idx - rhs_sort_idx; -/* Group by PMU if there is a group. Groups can't span PMUs. */ -if (lhs_has_group && rhs_has_group) { - lhs_pmu_name = lhs->group_pmu_name; - rhs_pmu_name = rhs->group_pmu_name; - ret =strcmp (lhs_pmu_name, rhs_pmu_name); -if (ret) -return ret; - } +/* +* Ignoring forcing, lhs_sort_idx == rhs_sort_idx so lhs and rhs should +* be in the same group. Events in the same group need to be ordered by +* their grouping PMU name as the group will be broken to ensure only +* events on the same PMU are programmed together. +* +* With forcing the lhs_sort_idx == rhs_sort_idx shows that one or both +* events are being forced to be at force_group_index. If only one event +* is being forced then the other event is the group leader of the group +* we're trying to force the event into. Ensure for the force grouped +* case that the PMU name ordering is also respected. +*/ + lhs_pmu_name = lhs->group_pmu_name; + rhs_pmu_name = rhs->group_pmu_name; + ret =strcmp (lhs_pmu_name, rhs_pmu_name); +if (ret) +return ret; -/* Architecture specific sorting. */ +/* +* Architecture specific sorting, by default sort events in the same +* group with the same PMU by their insertion index. On Intel topdown +* constraints must be adhered to - slots first, etc. +*/ return arch_evlist__cmp (lhs, rhs); }@@ -2030,9 +2037,11 @@ static int parse_events__sort_events_and_fix_groups(struct list_head *list)int idx =0 , force_grouped_idx =-1 ;struct evsel *pos, *cur_leader =NULL ;struct perf_evsel *cur_leaders_grp =NULL ; -bool idx_changed = false, cur_leader_force_grouped = false; +bool idx_changed = false;int orig_num_leaders =0 , num_leaders =0 ;int ret; +struct evsel *force_grouped_leader =NULL ; +bool last_event_was_forced_leader = false;/* * Compute index to insert ungrouped events at. Place them where the @@ -2055,10 +2064,13 @@ static int parse_events__sort_events_and_fix_groups(struct list_head *list)*/ pos->core.idx = idx++; -/* Remember an index to sort all forced grouped events together to. */ -if (force_grouped_idx ==-1 && pos == pos_leader && pos->core.nr_members <2 && -arch_evsel__must_be_in_group (pos)) - force_grouped_idx = pos->core.idx; +/* +* Remember an index to sort all forced grouped events +* together to. Use the group leader as some events +* must appear first within the group. +*/ +if (force_grouped_idx ==-1 &&arch_evsel__must_be_in_group (pos)) + force_grouped_idx = pos_leader->core.idx; }/* Sort events. */ @@ -2086,31 +2098,66 @@ static int parse_events__sort_events_and_fix_groups(struct list_head *list)* Set the group leader respecting the given groupings and that * groups can't span PMUs. */ -if (!cur_leader) +if (!cur_leader) { cur_leader = pos; + cur_leaders_grp = &pos->core; +if (pos_force_grouped) + force_grouped_leader = pos; + } cur_leader_pmu_name = cur_leader->group_pmu_name; -if ((cur_leaders_grp != pos->core.leader && - (!pos_force_grouped || !cur_leader_force_grouped)) || -strcmp (cur_leader_pmu_name, pos_pmu_name)) { -/* Event is for a different group/PMU than last. */ +if (strcmp (cur_leader_pmu_name, pos_pmu_name)) { +/* PMU changed so the group/leader must change. */ cur_leader = pos; -/* -* Remember the leader's group before it is overwritten, -* so that later events match as being in the same -* group. -*/ cur_leaders_grp = pos->core.leader; +if (pos_force_grouped && force_grouped_leader ==NULL ) + force_grouped_leader = pos; + }else if (cur_leaders_grp != pos->core.leader) { +bool split_even_if_last_leader_was_forced = true; +/* -* Avoid forcing events into groups with events that -* don't need to be in the group. +* Event is for a different group. If the last event was +* the forced group leader then subsequent group events +* and forced events should be in the same group. If +* there are no other forced group events then the +* forced group leader wasn't really being forced into a +* group, it just set arch_evsel__must_be_in_group, and +* we don't want the group to split here. */ - cur_leader_force_grouped = pos_force_grouped; +if (force_grouped_idx !=-1 && last_event_was_forced_leader) { +struct evsel *pos2 = pos; +/* +* Search the whole list as the group leaders +* aren't currently valid. +*/ +list_for_each_entry_continue (pos2, list, core.node) { +if (pos->core.leader == pos2->core.leader && +arch_evsel__must_be_in_group (pos2)) { + split_even_if_last_leader_was_forced = false; +break ; + } + } + } +if (!last_event_was_forced_leader || split_even_if_last_leader_was_forced) { +if (pos_force_grouped) { +if (force_grouped_leader) { + cur_leader = force_grouped_leader; + cur_leaders_grp = force_grouped_leader->core.leader; + }else { + cur_leader = force_grouped_leader = pos; + cur_leaders_grp = &pos->core; + } + }else { + cur_leader = pos; + cur_leaders_grp = pos->core.leader; + }
tools/perf/util/parse-events.c static int parse_events__sort_events_and_fix_groups(struct list_head *list) · line 2163
Quoted 10 lines
tools/perf/util/parse-events.c +2
-0+ } }if (pos_leader != cur_leader) {/* The leader changed so update it. */ evsel__set_leader (pos, cur_leader); } + last_event_was_forced_leader = (force_grouped_leader == pos); }list_for_each_entry (pos, list, core.node) {struct evsel *pos_leader =evsel__leader (pos);
Perf stat and record tests pass on SPR and ARL.
Ian Rogers
reviewerPATCH v2 4/5 perf x86 evlist: Update comments on topdown regrouping
In reply to Ian RogersFrom: Dapeng Mi <[email protected]>
Update to remove comments about groupings not working and with the:
```
perf stat -e "{instructions,slots},{cycles,topdown-retiring}"
```case that now works.
--- tools/perf/arch/x86/util/evlist.c | 27 ++++++--------------------- 1 file changed, 6 insertions(+), 21 deletions(-)
tools/perf/arch/x86/util/evlist.c +6 -21
@@ -39,28 +39,13 @@ int arch_evlist__cmp(const struct evsel *lhs, const struct evsel *rhs)* 26,319,024 slots * 2,427,791 instructions * 2,683,508 topdown-retiring -* -* If slots event and topdown metrics events are not in same group, the -* topdown metrics events must be first event after the slots event group, -* otherwise topdown metrics events can't be regrouped correctly, e.g. -* -* a. perf stat -e "{instructions,slots},cycles,topdown-retiring" -C0 sleep 1 -* WARNING: events were regrouped to match PMUs -* Performance counter stats for 'CPU(s) 0': -* 17,923,134 slots -* 2,154,855 instructions -* 3,015,058 cycles -* <not supported> topdown-retiring -* -* If slots event and topdown metrics events are in two groups, the group which -* has topdown metrics events must contain only the topdown metrics event, -* otherwise topdown metrics event can't be regrouped correctly as well, e.g. -* -* a. perf stat -e "{instructions,slots},{topdown-retiring,cycles}" -C0 sleep 1 +* e. slots event and metrics event are in a group and not adjacent +* perf stat -e "{instructions,slots},cycles,topdown-retiring" -C0 sleep 1 * WARNING: events were regrouped to match PMUs -* Error: -* The sys_perf_event_open() syscall returned with 22 (Invalid argument) for -* event (topdown-retiring) +* 68,433,522 slots +* 8,856,102 topdown-retiring +* 7,791,494 instructions +* 11,469,513 cycles */ if (topdown_sys_has_perf_metrics () && (arch_evsel__must_be_in_group (lhs) ||arch_evsel__must_be_in_group (rhs))) {
Signature · 1 line
2.49.0.rc0.332.g42c0ae87b1-goog
Namhyung Kim
maintainerRe: [PATCH v2 4/5] perf x86 evlist: Update comments on topdown regrouping
Hello,
Quoted 9 lines · Ian Rogers
From: Dapeng Mi <[email protected]>
Update to remove comments about groupings not working and with the:
``` perf stat -e "{instructions,slots},{cycles,topdown-retiring}" ```case that now works.
Signed-off-by Ian Rogers <[email protected]>
Dapeng, can I get your Signed-off-by here?
Thanks,
Namhyung
Quoted 46 lines
--- tools/perf/arch/x86/util/evlist.c | 27 ++++++--------------------- 1 file changed, 6 insertions(+), 21 deletions(-)tools/perf/arch/x86/util/evlist.c +6
-21@@ -39,28 +39,13 @@ int arch_evlist__cmp(const struct evsel *lhs, const struct evsel *rhs)* 26,319,024 slots * 2,427,791 instructions * 2,683,508 topdown-retiring -* -* If slots event and topdown metrics events are not in same group, the -* topdown metrics events must be first event after the slots event group, -* otherwise topdown metrics events can't be regrouped correctly, e.g. -* -* a. perf stat -e "{instructions,slots},cycles,topdown-retiring" -C0 sleep 1 -* WARNING: events were regrouped to match PMUs -* Performance counter stats for 'CPU(s) 0': -* 17,923,134 slots -* 2,154,855 instructions -* 3,015,058 cycles -* <not supported> topdown-retiring -* -* If slots event and topdown metrics events are in two groups, the group which -* has topdown metrics events must contain only the topdown metrics event, -* otherwise topdown metrics event can't be regrouped correctly as well, e.g. -* -* a. perf stat -e "{instructions,slots},{topdown-retiring,cycles}" -C0 sleep 1 +* e. slots event and metrics event are in a group and not adjacent +* perf stat -e "{instructions,slots},cycles,topdown-retiring" -C0 sleep 1 * WARNING: events were regrouped to match PMUs -* Error: -* The sys_perf_event_open() syscall returned with 22 (Invalid argument) for -* event (topdown-retiring) +* 68,433,522 slots +* 8,856,102 topdown-retiring +* 7,791,494 instructions +* 11,469,513 cycles */ if (topdown_sys_has_perf_metrics () && (arch_evsel__must_be_in_group (lhs) ||arch_evsel__must_be_in_group (rhs))) {Signature · 1 line
2.49.0.rc0.332.g42c0ae87b1-goog
Re: [PATCH v2 4/5] perf x86 evlist: Update comments on topdown regrouping
Quoted 40 lines · Namhyung Kim
Hello,
Quoted 9 lines · Ian Rogers
From: Dapeng Mi <[email protected]>
Update to remove comments about groupings not working and with the:
``` perf stat -e "{instructions,slots},{cycles,topdown-retiring}" ```case that now works.
Signed-off-by Ian Rogers <[email protected]>Dapeng, can I get your Signed-off-by here?
Thanks,
NamhyungQuoted 23 lines
--- tools/perf/arch/x86/util/evlist.c | 27 ++++++--------------------- 1 file changed, 6 insertions(+), 21 deletions(-)tools/perf/arch/x86/util/evlist.c +0
-11@@ -39,28 +39,13 @@ int arch_evlist__cmp(const struct evsel *lhs, const struct evsel *rhs)* 26,319,024 slots * 2,427,791 instructions * 2,683,508 topdown-retiring -* -* If slots event and topdown metrics events are not in same group, the -* topdown metrics events must be first event after the slots event group, -* otherwise topdown metrics events can't be regrouped correctly, e.g. -* -* a. perf stat -e "{instructions,slots},cycles,topdown-retiring" -C0 sleep 1 -* WARNING: events were regrouped to match PMUs -* Performance counter stats for 'CPU(s) 0': -* 17,923,134 slots -* 2,154,855 instructions -* 3,015,058 cycles
Quoted 8 lines
tools/perf/arch/x86/util/evlist.c int arch_evlist__cmp(const struct evsel *lhs, const struct evsel *rhs) · line 42
Quoted 8 lines
tools/perf/arch/x86/util/evlist.c +1
-7-* <not supported> topdown-retiring -* -* If slots event and topdown metrics events are in two groups, the group which -* has topdown metrics events must contain only the topdown metrics event, -* otherwise topdown metrics event can't be regrouped correctly as well, e.g. -* -* a. perf stat -e "{instructions,slots},{topdown-retiring,cycles}" -C0 sleep 1 +* e. slots event and metrics event are in a group and not adjacent
Yes, here is my SoB.
BTW, It seems there is a typo and missed the "not" word. It should be "slots event and metrics event are not in a group and not adjacent"
Thanks.
Quoted 15 lines
Quoted 15 lines
tools/perf/arch/x86/util/evlist.c +5
-3+* perf stat -e "{instructions,slots},cycles,topdown-retiring" -C0 sleep 1 * WARNING: events were regrouped to match PMUs -* Error: -* The sys_perf_event_open() syscall returned with 22 (Invalid argument) for -* event (topdown-retiring) +* 68,433,522 slots +* 8,856,102 topdown-retiring +* 7,791,494 instructions +* 11,469,513 cycles */ if (topdown_sys_has_perf_metrics () && (arch_evsel__must_be_in_group (lhs) ||arch_evsel__must_be_in_group (rhs))) {Signature · 1 line
2.49.0.rc0.332.g42c0ae87b1-goog
Namhyung Kim
maintainerRe: [PATCH v2 4/5] perf x86 evlist: Update comments on topdown regrouping
Quoted 53 lines · Dapeng
Quoted 40 lines · Namhyung Kim
Hello,
Quoted 9 lines · Ian Rogers
From: Dapeng Mi <[email protected]>
Update to remove comments about groupings not working and with the:
``` perf stat -e "{instructions,slots},{cycles,topdown-retiring}" ```case that now works.
Signed-off-by Ian Rogers <[email protected]>Dapeng, can I get your Signed-off-by here?
Thanks,
NamhyungQuoted 23 lines
--- tools/perf/arch/x86/util/evlist.c | 27 ++++++--------------------- 1 file changed, 6 insertions(+), 21 deletions(-)tools/perf/arch/x86/util/evlist.c +0
-11@@ -39,28 +39,13 @@ int arch_evlist__cmp(const struct evsel *lhs, const struct evsel *rhs)* 26,319,024 slots * 2,427,791 instructions * 2,683,508 topdown-retiring -* -* If slots event and topdown metrics events are not in same group, the -* topdown metrics events must be first event after the slots event group, -* otherwise topdown metrics events can't be regrouped correctly, e.g. -* -* a. perf stat -e "{instructions,slots},cycles,topdown-retiring" -C0 sleep 1 -* WARNING: events were regrouped to match PMUs -* Performance counter stats for 'CPU(s) 0': -* 17,923,134 slots -* 2,154,855 instructions -* 3,015,058 cycles Quoted 8 lines
tools/perf/arch/x86/util/evlist.c int arch_evlist__cmp(const struct evsel *lhs, const struct evsel *rhs) · line 42
Quoted 8 lines
tools/perf/arch/x86/util/evlist.c +1
-7-* <not supported> topdown-retiring -* -* If slots event and topdown metrics events are in two groups, the group which -* has topdown metrics events must contain only the topdown metrics event, -* otherwise topdown metrics event can't be regrouped correctly as well, e.g. -* -* a. perf stat -e "{instructions,slots},{topdown-retiring,cycles}" -C0 sleep 1 +* e. slots event and metrics event are in a group and not adjacent Yes, here is my SoB.
Quoted 1 line
Signed-off-by Dapeng Mi <[email protected]>
Thanks!
Quoted 3 lines
BTW, It seems there is a typo and missed the "not" word. It should be "slots event and metrics event are not in a group and not adjacent"
Ok, will update.
Thanks,
Namhyung
Quoted 16 lines
Quoted 16 lines
Quoted 16 lines
tools/perf/arch/x86/util/evlist.c +5
-3+* perf stat -e "{instructions,slots},cycles,topdown-retiring" -C0 sleep 1 * WARNING: events were regrouped to match PMUs -* Error: -* The sys_perf_event_open() syscall returned with 22 (Invalid argument) for -* event (topdown-retiring) +* 68,433,522 slots +* 8,856,102 topdown-retiring +* 7,791,494 instructions +* 11,469,513 cycles */ if (topdown_sys_has_perf_metrics () && (arch_evsel__must_be_in_group (lhs) ||arch_evsel__must_be_in_group (rhs))) {Signature · 1 line
2.49.0.rc0.332.g42c0ae87b1-goog
Ian Rogers
reviewerPATCH v2 5/5 perf test stat: Additional topdown grouping tests
In reply to Ian RogersAdd a loop and helper function to avoid repetition, the loop uses arrays so switch the shell to bash. Add additional topdown group tests where a topdown event needs to be moved beyond others and the slots event isn't first in the target group. This replicates issues that occur on hybrid systems where the other events are for the cpu_atom PMU. Test with both PMU and software events. Place the slots event later in the event list.
--- tools/perf/tests/shell/stat.sh | 83 +++++++++++++++++++--------------- 1 file changed, 47 insertions(+), 36 deletions(-)
tools/perf/tests/shell/stat.sh +47 -36
@@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # perf stat tests # SPDX-License-Identifier: GPL-2.0
@@ -67,43 +67,54 @@ test_topdown_groups() { echo "Topdown event group test [Skipped event parsing failed]" return fi - if perf stat -e '{slots,topdown-retiring}' true 2>&1 | grep -E -q "<not supported>" - then - echo "Topdown event group test [Failed events not supported]" - err=1 - return - fi - if perf stat -e 'instructions,topdown-retiring,slots' true 2>&1 | grep -E -q "<not supported>" - then - echo "Topdown event group test [Failed slots not reordered first in no-group case]" - err=1 - return - fi - if perf stat -e '{instructions,topdown-retiring,slots}' true 2>&1 | grep -E -q "<not supported>" - then - echo "Topdown event group test [Failed slots not reordered first in single group case]" - err=1 - return - fi - if perf stat -e '{instructions,slots},topdown-retiring' true 2>&1 | grep -E -q "<not supported>" - then - echo "Topdown event group test [Failed topdown metrics event not move into slots group]" - err=1 - return - fi - if perf stat -e '{instructions,slots},{topdown-retiring}' true 2>&1 | grep -E -q "<not supported>" - then - echo "Topdown event group test [Failed topdown metrics group not merge into slots group]" - err=1 - return - fi - if perf stat -e '{instructions,r400,r8000}' true 2>&1 | grep -E -q "<not supported>" + td_err=0 + do_topdown_group_test() { + events=$1 + failure=$2 + if perf stat -e "$events" true 2>&1 | grep -E -q "<not supported>" + then + echo "Topdown event group test [Failed $failure for '$events']" + td_err=1 + return + fi + } + do_topdown_group_test "{slots,topdown-retiring}" "events not supported" + do_topdown_group_test "{instructions,r400,r8000}" "raw format slots not reordered first" + filler_events=("instructions" "cycles" + "context-switches" "faults") + for ((i = 0; i < ${#filler_events[@]}; i+=2)) + do + filler1=${filler_events[i]} + filler2=${filler_events[i+1]} + do_topdown_group_test "$filler1,topdown-retiring,slots" \ + "slots not reordered first in no-group case" + do_topdown_group_test "slots,$filler1,topdown-retiring" \ + "topdown metrics event not reordered in no-group case" + do_topdown_group_test "{$filler1,topdown-retiring,slots}" \ + "slots not reordered first in single group case" + do_topdown_group_test "{$filler1,slots},topdown-retiring" \ + "topdown metrics event not move into slots group" + do_topdown_group_test "topdown-retiring,{$filler1,slots}" \ + "topdown metrics event not move into slots group last" + do_topdown_group_test "{$filler1,slots},{topdown-retiring}" \ + "topdown metrics group not merge into slots group" + do_topdown_group_test "{topdown-retiring},{$filler1,slots}" \ + "topdown metrics group not merge into slots group last" + do_topdown_group_test "{$filler1,slots},$filler2,topdown-retiring" \ + "non-adjacent topdown metrics group not move into slots group" + do_topdown_group_test "$filler2,topdown-retiring,{$filler1,slots}" \ + "non-adjacent topdown metrics group not move into slots group last" + do_topdown_group_test "{$filler1,slots},{$filler2,topdown-retiring}" \ + "metrics group not merge into slots group" + do_topdown_group_test "{$filler1,topdown-retiring},{$filler2,slots}" \ + "metrics group not merge into slots group last" + done + if test "$td_err" -eq 0 then - echo "Topdown event group test [Failed raw format slots not reordered first]" - err=1 - return + echo "Topdown event group test [Success]" + else + err="$td_err" fi - echo "Topdown event group test [Success]" } test_topdown_weak_groups() {
Signature · 1 line
2.49.0.rc0.332.g42c0ae87b1-goog
Quoted 37 lines · Ian Rogers
Support the PMU name from the legacy hardware and
hw_cachePMU extended types. Remove some macros and make variables more intention revealing, rather than just being called "value".Before:
``` $ perf stat -vv -e instructions true ... ------------------------------------------------------------ perf_event_attr: type 0 (PERF_TYPE_HARDWARE) size 136 config 0xa00000001 sample_type IDENTIFIER read_format TOTAL_TIME_ENABLED|TOTAL_TIME_RUNNING disabled 1 inherit 1 enable_on_exec 1 exclude_guest 1 ------------------------------------------------------------ sys_perf_event_open: pid 181636 cpu -1 group_fd -1 flags 0x8 = 5 ------------------------------------------------------------ perf_event_attr: type 0 (PERF_TYPE_HARDWARE) size 136 config 0x400000001 sample_type IDENTIFIER read_format TOTAL_TIME_ENABLED|TOTAL_TIME_RUNNING disabled 1 inherit 1 enable_on_exec 1 exclude_guest 1 ------------------------------------------------------------ sys_perf_event_open: pid 181636 cpu -1 group_fd -1 flags 0x8 = 6 ... ```
Quoted 1 line
[...]
Applied to perf-tools-next, thanks!
Best regards,
Namhyung