From patchwork Thu Apr 20 12:07:53 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Jin, Yao" X-Patchwork-Id: 752624 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3w7lvd6DMkz9s0m for ; Thu, 20 Apr 2017 14:17:33 +1000 (AEST) Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 3w7lvd5LfCzDqLm for ; Thu, 20 Apr 2017 14:17:33 +1000 (AEST) X-Original-To: linuxppc-dev@lists.ozlabs.org Delivered-To: linuxppc-dev@lists.ozlabs.org Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 3w7llB4nnYzDqJX for ; Thu, 20 Apr 2017 14:10:14 +1000 (AEST) Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by orsmga103.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 19 Apr 2017 21:10:13 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.37,223,1488873600"; d="scan'208";a="251285256" Received: from skl.sh.intel.com ([10.239.161.125]) by fmsmga004.fm.intel.com with ESMTP; 19 Apr 2017 21:10:12 -0700 From: Jin Yao To: acme@kernel.org, jolsa@kernel.org, peterz@infradead.org, mingo@redhat.com, alexander.shishkin@linux.intel.com Subject: [PATCH v6 5/7] perf util: Create branch.c/.h for common branch functions Date: Thu, 20 Apr 2017 20:07:53 +0800 Message-Id: <1492690075-17243-6-git-send-email-yao.jin@linux.intel.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1492690075-17243-1-git-send-email-yao.jin@linux.intel.com> References: <1492690075-17243-1-git-send-email-yao.jin@linux.intel.com> X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: ak@linux.intel.com, kan.liang@intel.com, linuxppc-dev@lists.ozlabs.org, Linux-kernel@vger.kernel.org, Jin Yao , yao.jin@intel.com Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Sender: "Linuxppc-dev" Create new util/branch.c and util/branch.h to contain the common branch functions. Such as: branch_type_count(): Count the numbers of branch types branch_type_name() : Return the name of branch type branch_type_stat_display(): Display branch type statistics info branch_type_str(): Construct the branch type string. The branch type is saved in branch_flags. Change log ---------- v6: Move that multiline conditional code inside {} brackets. Move branch_type_stat_display() from builtin-report.c to branch.c. Move branch_type_str() from callchain.c to branch.c. v5: It's a new patch in v5 patch series. Signed-off-by: Jin Yao --- tools/perf/util/Build | 1 + tools/perf/util/branch.c | 168 +++++++++++++++++++++++++++++++++++++++++++++++ tools/perf/util/branch.h | 25 +++++++ tools/perf/util/event.h | 3 +- 4 files changed, 196 insertions(+), 1 deletion(-) create mode 100644 tools/perf/util/branch.c create mode 100644 tools/perf/util/branch.h diff --git a/tools/perf/util/Build b/tools/perf/util/Build index f0b9e5d..391bf85 100644 --- a/tools/perf/util/Build +++ b/tools/perf/util/Build @@ -91,6 +91,7 @@ libperf-y += vsprintf.o libperf-y += drv_configs.o libperf-y += time-utils.o libperf-y += expr-bison.o +libperf-y += branch.o libperf-$(CONFIG_LIBBPF) += bpf-loader.o libperf-$(CONFIG_BPF_PROLOGUE) += bpf-prologue.o diff --git a/tools/perf/util/branch.c b/tools/perf/util/branch.c new file mode 100644 index 0000000..4aa56ad --- /dev/null +++ b/tools/perf/util/branch.c @@ -0,0 +1,168 @@ +#include "perf.h" +#include "util/util.h" +#include "util/debug.h" +#include "util/branch.h" + +static bool cross_area(u64 addr1, u64 addr2, int size) +{ + u64 align1, align2; + + align1 = addr1 & ~(size - 1); + align2 = addr2 & ~(size - 1); + + return (align1 != align2) ? true : false; +} + +#define AREA_4K 4096 +#define AREA_2M (2 * 1024 * 1024) + +void branch_type_count(struct branch_type_stat *stat, + struct branch_flags *flags, + u64 from, u64 to) +{ + if (flags->type == PERF_BR_NONE || from == 0) + return; + + stat->counts[flags->type]++; + + if (flags->type == PERF_BR_JCC) { + if (to > from) + stat->jcc_fwd++; + else + stat->jcc_bwd++; + } + + if (cross_area(from, to, AREA_2M)) + stat->cross_2m++; + else if (cross_area(from, to, AREA_4K)) + stat->cross_4k++; +} + +const char *branch_type_name(int type) +{ + const char *branch_names[PERF_BR_MAX] = { + "N/A", + "JCC", + "JMP", + "IND_JMP", + "CALL", + "IND_CALL", + "RET", + "SYSCALL", + "SYSRET", + "IRQ", + "INT", + "IRET", + "FAR_BRANCH", + }; + + if (type >= 0 && type < PERF_BR_MAX) + return branch_names[type]; + + return NULL; +} + +void branch_type_stat_display(FILE *fp, struct branch_type_stat *stat) +{ + u64 total = 0; + int i; + + for (i = 0; i < PERF_BR_MAX; i++) + total += stat->counts[i]; + + if (total == 0) + return; + + fprintf(fp, "\n#"); + fprintf(fp, "\n# Branch Statistics:"); + fprintf(fp, "\n#"); + + if (stat->jcc_fwd > 0) { + fprintf(fp, "\n%12s: %5.1f%%", + "JCC forward", + 100.0 * (double)stat->jcc_fwd / (double)total); + } + + if (stat->jcc_bwd > 0) { + fprintf(fp, "\n%12s: %5.1f%%", + "JCC backward", + 100.0 * (double)stat->jcc_bwd / (double)total); + } + + if (stat->cross_4k > 0) { + fprintf(fp, "\n%12s: %5.1f%%", + "CROSS_4K", + 100.0 * (double)stat->cross_4k / (double)total); + } + + if (stat->cross_2m > 0) { + fprintf(fp, "\n%12s: %5.1f%%", + "CROSS_2M", + 100.0 * (double)stat->cross_2m / (double)total); + } + + for (i = 0; i < PERF_BR_MAX; i++) { + if (stat->counts[i] > 0) + fprintf(fp, "\n%12s: %5.1f%%", + branch_type_name(i), + 100.0 * + (double)stat->counts[i] / (double)total); + } +} + +static int count_str_printf(int index, const char *str, + char *bf, int bfsize) +{ + int printed; + + printed = scnprintf(bf, bfsize, + "%s%s", + (index) ? " " : " (", str); + + return printed; +} + +int branch_type_str(struct branch_type_stat *stat, + char *bf, int bfsize) +{ + int i, j = 0, printed = 0; + u64 total = 0; + + for (i = 0; i < PERF_BR_MAX; i++) + total += stat->counts[i]; + + if (total == 0) + return 0; + + if (stat->jcc_fwd > 0) { + printed += count_str_printf(j++, "JCC forward", + bf + printed, bfsize - printed); + } + + if (stat->jcc_bwd > 0) { + printed += count_str_printf(j++, "JCC backward", + bf + printed, bfsize - printed); + } + + for (i = 0; i < PERF_BR_MAX; i++) { + if (i == PERF_BR_JCC) + continue; + + if (stat->counts[i] > 0) { + printed += count_str_printf(j++, branch_type_name(i), + bf + printed, bfsize - printed); + } + } + + if (stat->cross_4k > 0) { + printed += count_str_printf(j++, "CROSS_4K", + bf + printed, bfsize - printed); + } + + if (stat->cross_2m > 0) { + printed += count_str_printf(j++, "CROSS_2M", + bf + printed, bfsize - printed); + } + + return printed; +} diff --git a/tools/perf/util/branch.h b/tools/perf/util/branch.h new file mode 100644 index 0000000..4fb3d50 --- /dev/null +++ b/tools/perf/util/branch.h @@ -0,0 +1,25 @@ +#ifndef _PERF_BRANCH_H +#define _PERF_BRANCH_H 1 + +#include +#include "../perf.h" + +struct branch_type_stat { + u64 counts[PERF_BR_MAX]; + u64 jcc_fwd; + u64 jcc_bwd; + u64 cross_4k; + u64 cross_2m; +}; + +struct branch_flags; + +void branch_type_count(struct branch_type_stat *stat, + struct branch_flags *flags, + u64 from, u64 to); + +const char *branch_type_name(int type); +void branch_type_stat_display(FILE *fp, struct branch_type_stat *stat); +int branch_type_str(struct branch_type_stat *stat, char *bf, int bfsize); + +#endif /* _PERF_BRANCH_H */ diff --git a/tools/perf/util/event.h b/tools/perf/util/event.h index eb7a7b2..26b4c2e 100644 --- a/tools/perf/util/event.h +++ b/tools/perf/util/event.h @@ -142,7 +142,8 @@ struct branch_flags { u64 in_tx:1; u64 abort:1; u64 cycles:16; - u64 reserved:44; + u64 type:4; + u64 reserved:40; }; struct branch_entry {