From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3BD5FC433B4 for ; Thu, 20 May 2021 07:02:14 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 1802D611BE for ; Thu, 20 May 2021 07:02:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230466AbhETHDd (ORCPT ); Thu, 20 May 2021 03:03:33 -0400 Received: from mga05.intel.com ([192.55.52.43]:53040 "EHLO mga05.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229534AbhETHDa (ORCPT ); Thu, 20 May 2021 03:03:30 -0400 IronPort-SDR: dMiReF2KQHTuzEcT4DyHz5ULeRBgcd3Dd7ZM3vRfDgiAyScLxd2Ulptj6mSht8wyKZUZddvoe5 TohasyCyB2Qw== X-IronPort-AV: E=McAfee;i="6200,9189,9989"; a="286691049" X-IronPort-AV: E=Sophos;i="5.82,313,1613462400"; d="scan'208";a="286691049" Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 20 May 2021 00:02:09 -0700 IronPort-SDR: v9p9x379DP6n7MwZUl6jHK5P2SN5RWvBlrDaAudnUma1aseWCWKTuXbFqPpSdGsR1kPaVncXYN 8zVriNmr/khQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.82,313,1613462400"; d="scan'208";a="543206846" Received: from kbl-ppc.sh.intel.com ([10.239.159.163]) by fmsmga001.fm.intel.com with ESMTP; 20 May 2021 00:02:07 -0700 From: Jin Yao To: acme@kernel.org, jolsa@kernel.org, peterz@infradead.org, mingo@redhat.com, alexander.shishkin@linux.intel.com Cc: Linux-kernel@vger.kernel.org, ak@linux.intel.com, kan.liang@intel.com, yao.jin@intel.com, Jin Yao Subject: [PATCH v1 2/5] perf tools: Support pmu name in perf_mem_events__name Date: Thu, 20 May 2021 15:00:37 +0800 Message-Id: <20210520070040.710-3-yao.jin@linux.intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210520070040.710-1-yao.jin@linux.intel.com> References: <20210520070040.710-1-yao.jin@linux.intel.com> Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The perf_mem_events__name assumes the pmu is "cpu" but it's not true for hybrid platform. For example, for Alderlake, one pmu is "cpu_core". We introduce a new parameter 'pmu_name' in perf_mem_events__name to let the caller specify a pmu name. Signed-off-by: Jin Yao --- tools/perf/arch/arm64/util/mem-events.c | 2 +- tools/perf/arch/powerpc/util/mem-events.c | 2 +- tools/perf/arch/x86/util/mem-events.c | 28 ++++++++++++++--------- tools/perf/builtin-c2c.c | 4 ++-- tools/perf/builtin-mem.c | 4 ++-- tools/perf/util/mem-events.c | 4 ++-- tools/perf/util/mem-events.h | 2 +- 7 files changed, 26 insertions(+), 20 deletions(-) diff --git a/tools/perf/arch/arm64/util/mem-events.c b/tools/perf/arch/arm64/util/mem-events.c index 2a2497372671..be41721b9aa1 100644 --- a/tools/perf/arch/arm64/util/mem-events.c +++ b/tools/perf/arch/arm64/util/mem-events.c @@ -20,7 +20,7 @@ struct perf_mem_event *perf_mem_events__ptr(int i) return &perf_mem_events[i]; } -char *perf_mem_events__name(int i) +char *perf_mem_events__name(int i, char *pmu_name __maybe_unused) { struct perf_mem_event *e = perf_mem_events__ptr(i); diff --git a/tools/perf/arch/powerpc/util/mem-events.c b/tools/perf/arch/powerpc/util/mem-events.c index 07fb5e049488..4120fafe0be4 100644 --- a/tools/perf/arch/powerpc/util/mem-events.c +++ b/tools/perf/arch/powerpc/util/mem-events.c @@ -3,7 +3,7 @@ #include "mem-events.h" /* PowerPC does not support 'ldlat' parameter. */ -char *perf_mem_events__name(int i) +char *perf_mem_events__name(int i, char *pmu_name __maybe_unused) { if (i == PERF_MEM_EVENTS__LOAD) return (char *) "cpu/mem-loads/"; diff --git a/tools/perf/arch/x86/util/mem-events.c b/tools/perf/arch/x86/util/mem-events.c index e79232e3f2a0..e50f9e3a695b 100644 --- a/tools/perf/arch/x86/util/mem-events.c +++ b/tools/perf/arch/x86/util/mem-events.c @@ -4,10 +4,10 @@ #include "mem-events.h" static char mem_loads_name[100]; -static bool mem_loads_name__init; +static char mem_stores_name[100]; #define MEM_LOADS_AUX 0x8203 -#define MEM_LOADS_AUX_NAME "{cpu/mem-loads-aux/,cpu/mem-loads,ldlat=%u/pp}:S" +#define MEM_LOADS_AUX_NAME "{%s/mem-loads-aux/,%s/mem-loads,ldlat=%u/}:P" bool is_mem_loads_aux_event(struct evsel *leader) { @@ -22,28 +22,34 @@ bool is_mem_loads_aux_event(struct evsel *leader) return leader->core.attr.config == MEM_LOADS_AUX; } -char *perf_mem_events__name(int i) +char *perf_mem_events__name(int i, char *pmu_name) { struct perf_mem_event *e = perf_mem_events__ptr(i); if (!e) return NULL; - if (i == PERF_MEM_EVENTS__LOAD) { - if (mem_loads_name__init) - return mem_loads_name; - - mem_loads_name__init = true; + if (!pmu_name) + pmu_name = (char *)"cpu"; - if (pmu_have_event("cpu", "mem-loads-aux")) { + if (i == PERF_MEM_EVENTS__LOAD) { + if (pmu_have_event(pmu_name, "mem-loads-aux")) { scnprintf(mem_loads_name, sizeof(mem_loads_name), - MEM_LOADS_AUX_NAME, perf_mem_events__loads_ldlat); + MEM_LOADS_AUX_NAME, pmu_name, pmu_name, + perf_mem_events__loads_ldlat); } else { scnprintf(mem_loads_name, sizeof(mem_loads_name), - e->name, perf_mem_events__loads_ldlat); + e->name, pmu_name, + perf_mem_events__loads_ldlat); } return mem_loads_name; } + if (i == PERF_MEM_EVENTS__STORE) { + scnprintf(mem_stores_name, sizeof(mem_stores_name), + e->name, pmu_name); + return mem_stores_name; + } + return (char *)e->name; } diff --git a/tools/perf/builtin-c2c.c b/tools/perf/builtin-c2c.c index e3b9d63077ef..a4fd375acdd1 100644 --- a/tools/perf/builtin-c2c.c +++ b/tools/perf/builtin-c2c.c @@ -2971,13 +2971,13 @@ static int perf_c2c__record(int argc, const char **argv) if (!e->supported) { pr_err("failed: event '%s' not supported\n", - perf_mem_events__name(j)); + perf_mem_events__name(j, NULL)); free(rec_argv); return -1; } rec_argv[i++] = "-e"; - rec_argv[i++] = perf_mem_events__name(j); + rec_argv[i++] = perf_mem_events__name(j, NULL); } if (all_user) diff --git a/tools/perf/builtin-mem.c b/tools/perf/builtin-mem.c index cdd2b9f643f6..03795bf49d51 100644 --- a/tools/perf/builtin-mem.c +++ b/tools/perf/builtin-mem.c @@ -135,13 +135,13 @@ static int __cmd_record(int argc, const char **argv, struct perf_mem *mem) if (!e->supported) { pr_err("failed: event '%s' not supported\n", - perf_mem_events__name(j)); + perf_mem_events__name(j, NULL)); free(rec_argv); return -1; } rec_argv[i++] = "-e"; - rec_argv[i++] = perf_mem_events__name(j); + rec_argv[i++] = perf_mem_events__name(j, NULL); } if (all_user) diff --git a/tools/perf/util/mem-events.c b/tools/perf/util/mem-events.c index f93a852ad838..c736eaded06c 100644 --- a/tools/perf/util/mem-events.c +++ b/tools/perf/util/mem-events.c @@ -37,7 +37,7 @@ struct perf_mem_event * __weak perf_mem_events__ptr(int i) return &perf_mem_events[i]; } -char * __weak perf_mem_events__name(int i) +char * __weak perf_mem_events__name(int i, char *pmu_name __maybe_unused) { struct perf_mem_event *e = perf_mem_events__ptr(i); @@ -141,7 +141,7 @@ void perf_mem_events__list(void) fprintf(stderr, "%-13s%-*s%s\n", e->tag ?: "", verbose > 0 ? 25 : 0, - verbose > 0 ? perf_mem_events__name(j) : "", + verbose > 0 ? perf_mem_events__name(j, NULL) : "", e->supported ? ": available" : ""); } } diff --git a/tools/perf/util/mem-events.h b/tools/perf/util/mem-events.h index cacdebd65b8a..a3fa19093fd2 100644 --- a/tools/perf/util/mem-events.h +++ b/tools/perf/util/mem-events.h @@ -38,7 +38,7 @@ extern unsigned int perf_mem_events__loads_ldlat; int perf_mem_events__parse(const char *str); int perf_mem_events__init(void); -char *perf_mem_events__name(int i); +char *perf_mem_events__name(int i, char *pmu_name); struct perf_mem_event *perf_mem_events__ptr(int i); bool is_mem_loads_aux_event(struct evsel *leader); -- 2.17.1