From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934959AbcATCaj (ORCPT ); Tue, 19 Jan 2016 21:30:39 -0500 Received: from mga11.intel.com ([192.55.52.93]:48260 "EHLO mga11.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933860AbcATC1w (ORCPT ); Tue, 19 Jan 2016 21:27:52 -0500 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.22,319,1449561600"; d="scan'208";a="864345115" From: Andi Kleen To: acme@kernel.org Cc: jolsa@kernel.org, mingo@kernel.org, linux-kernel@vger.kernel.org, eranian@google.com, Andi Kleen Subject: [PATCH 02/12] perf, tools: Parse an .aggr-per-core event attribute Date: Tue, 19 Jan 2016 18:27:34 -0800 Message-Id: <1453256864-24192-3-git-send-email-andi@firstfloor.org> X-Mailer: git-send-email 2.4.3 In-Reply-To: <1453256864-24192-1-git-send-email-andi@firstfloor.org> References: <1453256864-24192-1-git-send-email-andi@firstfloor.org> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Andi Kleen Add the basic code to parse an .aggr-per-core event attribute. The attribute means that the event needs to be measured in per core mode. v2: Support integer values for aggr-per-core Signed-off-by: Andi Kleen --- tools/perf/util/evsel.h | 1 + tools/perf/util/parse-events.c | 1 + tools/perf/util/pmu.c | 24 ++++++++++++++++++++++++ tools/perf/util/pmu.h | 2 ++ 4 files changed, 28 insertions(+) diff --git a/tools/perf/util/evsel.h b/tools/perf/util/evsel.h index 8e75434..160a40f 100644 --- a/tools/perf/util/evsel.h +++ b/tools/perf/util/evsel.h @@ -114,6 +114,7 @@ struct perf_evsel { bool tracking; bool per_pkg; bool precise_max; + int aggr_per_core; /* parse modifier helper */ int exclude_GH; int nr_members; diff --git a/tools/perf/util/parse-events.c b/tools/perf/util/parse-events.c index 4f7b0ef..9dff8c5 100644 --- a/tools/perf/util/parse-events.c +++ b/tools/perf/util/parse-events.c @@ -1027,6 +1027,7 @@ int parse_events_add_pmu(struct parse_events_evlist *data, evsel->unit = info.unit; evsel->scale = info.scale; evsel->per_pkg = info.per_pkg; + evsel->aggr_per_core = info.aggr_per_core; evsel->snapshot = info.snapshot; } diff --git a/tools/perf/util/pmu.c b/tools/perf/util/pmu.c index 0d228d1..304857a 100644 --- a/tools/perf/util/pmu.c +++ b/tools/perf/util/pmu.c @@ -189,6 +189,24 @@ perf_pmu__parse_per_pkg(struct perf_pmu_alias *alias, char *dir, char *name) return 0; } +static void +perf_pmu__parse_aggr_per_core(struct perf_pmu_alias *alias, char *dir, char *name) +{ + char path[PATH_MAX]; + FILE *f; + int flag; + + snprintf(path, PATH_MAX, "%s/%s.aggr-per-core", dir, name); + + f = fopen(path, "r"); + if (f) { + if (fscanf(f, "%d", &flag) == 1) + alias->aggr_per_core = flag; + fclose(f); + } +} + + static int perf_pmu__parse_snapshot(struct perf_pmu_alias *alias, char *dir, char *name) { @@ -238,6 +256,7 @@ static int __perf_pmu__new_alias(struct list_head *list, char *dir, char *name, perf_pmu__parse_scale(alias, dir, name); perf_pmu__parse_per_pkg(alias, dir, name); perf_pmu__parse_snapshot(alias, dir, name); + perf_pmu__parse_aggr_per_core(alias, dir, name); } list_add_tail(&alias->list, list); @@ -272,6 +291,8 @@ static inline bool pmu_alias_info_file(char *name) return true; if (len > 9 && !strcmp(name + len - 9, ".snapshot")) return true; + if (len > 14 && !strcmp(name + len - 14, ".aggr-per-core")) + return true; return false; } @@ -851,6 +872,7 @@ int perf_pmu__check_alias(struct perf_pmu *pmu, struct list_head *head_terms, int ret; info->per_pkg = false; + info->aggr_per_core = 0; /* * Mark unit and scale as not set @@ -874,6 +896,8 @@ int perf_pmu__check_alias(struct perf_pmu *pmu, struct list_head *head_terms, if (alias->per_pkg) info->per_pkg = true; + if (alias->aggr_per_core) + info->aggr_per_core = alias->aggr_per_core; list_del(&term->list); free(term); diff --git a/tools/perf/util/pmu.h b/tools/perf/util/pmu.h index 5d7e844..95e9e64 100644 --- a/tools/perf/util/pmu.h +++ b/tools/perf/util/pmu.h @@ -32,6 +32,7 @@ struct perf_pmu_info { double scale; bool per_pkg; bool snapshot; + int aggr_per_core; }; #define UNIT_MAX_LEN 31 /* max length for event unit name */ @@ -44,6 +45,7 @@ struct perf_pmu_alias { double scale; bool per_pkg; bool snapshot; + bool aggr_per_core; }; struct perf_pmu *perf_pmu__find(const char *name); -- 2.4.3