Kernel/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-12-29 17:25:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

perf tools: Simplify evsel__add_modifier()

Browse Source 
Since it doesn't set the exclude_guest, no need to special handle the
bit and simply show only if one of host or guest bit is set.  Now the
default event name might not have :H prefix anymore so change the
dlfilter test not to compare the ":" at the end.

Reviewed-by: Ian Rogers <irogers@google.com>
Reviewed-by: James Clark <james.clark@linaro.org>
Reviewed-by: Ravi Bangoria <ravi.bangoria@amd.com>
Acked-by: Kan Liang <kan.liang@linux.intel.com>
Cc: James Clark <james.clark@arm.com>
Cc: Atish Patra <atishp@atishpatra.org>
Cc: Mingwei Zhang <mizhang@google.com>
Cc: Kajol Jain <kjain@linux.ibm.com>
Cc: Thomas Richter <tmricht@linux.ibm.com>
Cc: Palmer Dabbelt <palmer@rivosinc.com>
Link: https://lore.kernel.org/r/20241016062359.264929-4-namhyung@kernel.org
Signed-off-by: Namhyung Kim <namhyung@kernel.org>
This commit is contained in:
Namhyung Kim 2024-10-15 23:23:53 -07:00
parent 35c8d21371
commit d9e0970f77
3 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tools/perf/dlfilters/dlfilter-test-api-v0.c
View File

@ -220,7 +220,7 @@ static int check_sample(struct filter_data *d, const struct perf_dlfilter_sample
CHECK_SAMPLE(raw_callchain_nr); CHECK_SAMPLE(raw_callchain_nr);
CHECK(!sample->raw_callchain); CHECK(!sample->raw_callchain);
#define EVENT_NAME "branches:" #define EVENT_NAME "branches"
CHECK(!strncmp(sample->event, EVENT_NAME, strlen(EVENT_NAME))); CHECK(!strncmp(sample->event, EVENT_NAME, strlen(EVENT_NAME)));
return 0; return 0;

2
tools/perf/dlfilters/dlfilter-test-api-v2.c
View File

@ -235,7 +235,7 @@ static int check_sample(struct filter_data *d, const struct perf_dlfilter_sample
CHECK_SAMPLE(raw_callchain_nr); CHECK_SAMPLE(raw_callchain_nr);
CHECK(!sample->raw_callchain); CHECK(!sample->raw_callchain);
#define EVENT_NAME "branches:" #define EVENT_NAME "branches"
CHECK(!strncmp(sample->event, EVENT_NAME, strlen(EVENT_NAME))); CHECK(!strncmp(sample->event, EVENT_NAME, strlen(EVENT_NAME)));
return 0; return 0;

5
tools/perf/util/evsel.c
View File

@ -638,7 +638,6 @@ static int evsel__add_modifiers(struct evsel *evsel, char *bf, size_t size)
{ {
int colon = 0, r = 0; int colon = 0, r = 0;
struct perf_event_attr *attr = &evsel->core.attr; struct perf_event_attr *attr = &evsel->core.attr;
bool exclude_guest_default = false;
#define MOD_PRINT(context, mod) do { \ #define MOD_PRINT(context, mod) do { \
if (!attr->exclude_##context) { \ if (!attr->exclude_##context) { \
@ -650,17 +649,15 @@ static int evsel__add_modifiers(struct evsel *evsel, char *bf, size_t size)
MOD_PRINT(kernel, 'k'); MOD_PRINT(kernel, 'k');
MOD_PRINT(user, 'u'); MOD_PRINT(user, 'u');
MOD_PRINT(hv, 'h'); MOD_PRINT(hv, 'h');
exclude_guest_default = true;
} }
if (attr->precise_ip) { if (attr->precise_ip) {
if (!colon) if (!colon)
colon = ++r; colon = ++r;
r += scnprintf(bf + r, size - r, "%.*s", attr->precise_ip, "ppp"); r += scnprintf(bf + r, size - r, "%.*s", attr->precise_ip, "ppp");
exclude_guest_default = true;
} }
if (attr->exclude_host || attr->exclude_guest == exclude_guest_default) { if (attr->exclude_host || attr->exclude_guest) {
MOD_PRINT(host, 'H'); MOD_PRINT(host, 'H');
MOD_PRINT(guest, 'G'); MOD_PRINT(guest, 'G');
} }