Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755135AbbGQDsk (ORCPT ); Thu, 16 Jul 2015 23:48:40 -0400 Received: from mga11.intel.com ([192.55.52.93]:12897 "EHLO mga11.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754223AbbGQDsf (ORCPT ); Thu, 16 Jul 2015 23:48:35 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.15,492,1432623600"; d="scan'208";a="607841828" From: kan.liang@intel.com To: a.p.zijlstra@chello.nl Cc: mingo@redhat.com, acme@kernel.org, eranian@google.com, ak@linux.intel.com, mark.rutland@arm.com, adrian.hunter@intel.com, dsahern@gmail.com, jolsa@kernel.org, namhyung@kernel.org, linux-kernel@vger.kernel.org, Kan Liang Subject: [PATCH 6/9] perf,tools: Dump per-sample freq in report -D Date: Thu, 16 Jul 2015 16:33:48 -0400 Message-Id: <1437078831-10152-7-git-send-email-kan.liang@intel.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1437078831-10152-1-git-send-email-kan.liang@intel.com> References: <1437078831-10152-1-git-send-email-kan.liang@intel.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 4955 Lines: 145 From: Kan Liang The group read results of TSC/ASTATE/MSTATE event can be used to calculate the frequency during each sampling period. Show it in report -D. Here is an example: $ perf record -e '{ref-cycles,core_misc/tsc/,core_misc/power-mperf/,core_misc/power-aperf/}:S' --running-time -a ~/tchain_edit Here is one sample from perf report -D 18 506413677835 0x3f1d8 [0x90]: PERF_RECORD_SAMPLE(IP, 0x1): 8/8: 0xffffffff810cba6d period: 62219 addr: 0 ... sample_read: ...... time enabled 000000000025a464 ...... time running 000000000025a464 .... group nr 4 ..... id 00000000000001a0, value 000000000008a605 ..... id 00000000000001e2, value 0000000000565ac5 ..... id 0000000000000222, value 0000000000079bc8 ..... id 0000000000000262, value 0000000000068d69 ..... TSC_MHz 2294 ..... AVG_MHz 174 ..... Bzy_MHz 2663 Signed-off-by: Kan Liang --- tools/perf/util/session.c | 40 +++++++++++++++++++++++++++++++++++----- tools/perf/util/session.h | 4 ++++ 2 files changed, 39 insertions(+), 5 deletions(-) diff --git a/tools/perf/util/session.c b/tools/perf/util/session.c index ed9dc25..6a142d8 100644 --- a/tools/perf/util/session.c +++ b/tools/perf/util/session.c @@ -851,8 +851,14 @@ static void perf_evlist__print_tstamp(struct perf_evlist *evlist, printf("%" PRIu64 " ", sample->time); } -static void sample_read__printf(struct perf_sample *sample, u64 read_format) +static void sample_read__printf(struct perf_evlist *evlist, + struct perf_sample *sample, + u64 read_format) { + struct perf_evsel *evsel; + struct perf_sample_id *sid; + u64 tsc = 0, aperf = 0, mperf = 0; + printf("... sample_read:\n"); if (read_format & PERF_FORMAT_TOTAL_TIME_ENABLED) @@ -875,10 +881,33 @@ static void sample_read__printf(struct perf_sample *sample, u64 read_format) printf("..... id %016" PRIx64 ", value %016" PRIx64 "\n", value->id, value->value); + + if (read_format & PERF_FORMAT_TOTAL_TIME_RUNNING) { + sid = perf_evlist__id2sid(evlist, value->id); + evsel = sid->evsel; + if ((evsel != NULL) && + (evsel->attr.type == PERF_TYPE_CORE_MISC_FREE)) { + if (evsel->attr.config == PERF_POWER_APERF) + aperf = value->value; + if (evsel->attr.config == PERF_POWER_MPERF) + mperf = value->value; + if (evsel->attr.config == PERF_TSC) + tsc = value->value; + } + } } } else printf("..... id %016" PRIx64 ", value %016" PRIx64 "\n", sample->read.one.id, sample->read.one.value); + + if (read_format & PERF_FORMAT_TOTAL_TIME_RUNNING) { + if (tsc > 0) + printf("..... TSC_MHz %lu\n", (1000 * tsc) / sample->read.time_running); + if (aperf > 0) + printf("..... AVG_MHz %lu\n", (1000 * aperf) / sample->read.time_running); + if ((tsc > 0) && (aperf > 0) && (mperf > 0)) + printf("..... Bzy_MHz %lu\n", (1000 * tsc / aperf * mperf) / sample->read.time_running); + } } static void dump_event(struct perf_evlist *evlist, union perf_event *event, @@ -899,8 +928,8 @@ static void dump_event(struct perf_evlist *evlist, union perf_event *event, event->header.size, perf_event__name(event->header.type)); } -static void dump_sample(struct perf_evsel *evsel, union perf_event *event, - struct perf_sample *sample) +static void dump_sample(struct perf_evlist *evlist, struct perf_evsel *evsel, + union perf_event *event, struct perf_sample *sample) { u64 sample_type; @@ -938,7 +967,7 @@ static void dump_sample(struct perf_evsel *evsel, union perf_event *event, printf("... transaction: %" PRIx64 "\n", sample->transaction); if (sample_type & PERF_SAMPLE_READ) - sample_read__printf(sample, evsel->attr.read_format); + sample_read__printf(evlist, sample, evsel->attr.read_format); } static struct machine *machines__find_for_cpumode(struct machines *machines, @@ -1053,11 +1082,12 @@ static int machines__deliver_event(struct machines *machines, switch (event->header.type) { case PERF_RECORD_SAMPLE: - dump_sample(evsel, event, sample); if (evsel == NULL) { ++evlist->stats.nr_unknown_id; return 0; } + dump_sample(evlist, evsel, event, sample); + if (machine == NULL) { ++evlist->stats.nr_unprocessable_samples; return 0; diff --git a/tools/perf/util/session.h b/tools/perf/util/session.h index b44afc7..220cfb3 100644 --- a/tools/perf/util/session.h +++ b/tools/perf/util/session.h @@ -42,6 +42,10 @@ struct perf_session { #define PRINT_IP_OPT_ONELINE (1<<4) #define PRINT_IP_OPT_SRCLINE (1<<5) +#define PERF_POWER_APERF 1 +#define PERF_POWER_MPERF 2 +#define PERF_TSC 5 + struct perf_tool; struct perf_session *perf_session__new(struct perf_data_file *file, -- 1.8.3.1 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/