xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'perf/urgent' into perf/core

Browse Source 
To pick fixes that missed v5.9.

Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
Arnaldo Carvalho de Melo
2020-10-13 13:02:20 -03:00
parent a41c32105c bef69bd7cf
commit dbaa1b3d9a
4 changed files with 65 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

75
tools/perf/util/metricgroup.c
View File

@@ -150,6 +150,18 @@ static void expr_ids__exit(struct expr_ids *ids)
free(ids->id[i].id);
}
static bool contains_event(struct evsel **metric_events, int num_events,
const char *event_name)
{
int i;
for (i = 0; i < num_events; i++) {
if (!strcmp(metric_events[i]->name, event_name))
return true;
}
return false;
}
/**
* Find a group of events in perf_evlist that correspond to those from a parsed
* metric expression. Note, as find_evsel_group is called in the same order as
@@ -180,7 +192,11 @@ static struct evsel *find_evsel_group(struct evlist *perf_evlist,
int i = 0, matched_events = 0, events_to_match;
const int idnum = (int)hashmap__size(&pctx->ids);
/* duration_time is grouped separately. */
/*
* duration_time is always grouped separately, when events are grouped
* (ie has_constraint is false) then ignore it in the matching loop and
* add it to metric_events at the end.
*/
if (!has_constraint &&
hashmap__find(&pctx->ids, "duration_time", (void **)&val_ptr))
events_to_match = idnum - 1;
@@ -207,23 +223,20 @@ static struct evsel *find_evsel_group(struct evlist *perf_evlist,
sizeof(struct evsel *) * idnum);
current_leader = ev->leader;
}
if (hashmap__find(&pctx->ids, ev->name, (void **)&val_ptr)) {
if (has_constraint) {
/*
* Events aren't grouped, ensure the same event
* isn't matched from two groups.
*/
for (i = 0; i < matched_events; i++) {
if (!strcmp(ev->name,
metric_events[i]->name)) {
break;
}
}
if (i != matched_events)
continue;
}
/*
* Check for duplicate events with the same name. For example,
* uncore_imc/cas_count_read/ will turn into 6 events per socket
* on skylakex. Only the first such event is placed in
* metric_events. If events aren't grouped then this also
* ensures that the same event in different sibling groups
* aren't both added to metric_events.
*/
if (contains_event(metric_events, matched_events, ev->name))
continue;
/* Does this event belong to the parse context? */
if (hashmap__find(&pctx->ids, ev->name, (void **)&val_ptr))
metric_events[matched_events++] = ev;
}
if (matched_events == events_to_match)
break;
}
@@ -239,7 +252,7 @@ static struct evsel *find_evsel_group(struct evlist *perf_evlist,
}
if (matched_events != idnum) {
/* Not whole match */
/* Not a whole match */
return NULL;
}
@@ -247,8 +260,32 @@ static struct evsel *find_evsel_group(struct evlist *perf_evlist,
for (i = 0; i < idnum; i++) {
ev = metric_events[i];
ev->metric_leader = ev;
/* Don't free the used events. */
set_bit(ev->idx, evlist_used);
/*
* The metric leader points to the identically named event in
* metric_events.
*/
ev->metric_leader = ev;
/*
* Mark two events with identical names in the same group (or
* globally) as being in use as uncore events may be duplicated
* for each pmu. Set the metric leader of such events to be the
* event that appears in metric_events.
*/
evlist__for_each_entry_continue(perf_evlist, ev) {
/*
* If events are grouped then the search can terminate
* when then group is left.
*/
if (!has_constraint &&
ev->leader != metric_events[i]->leader)
break;
if (!strcmp(metric_events[i]->name, ev->name)) {
set_bit(ev->idx, evlist_used);
ev->metric_leader = metric_events[i];
}
}
}
return metric_events[0];