mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2026-04-29 02:19:54 -04:00
perf metrics: Remove perf_pmu__is_hybrid use
Switch from perf_pmu__is_hybrid to avoid implicitly using the hybrid PMU list. Reviewed-by: Kan Liang <kan.liang@linux.intel.com> Signed-off-by: Ian Rogers <irogers@google.com> Cc: Adrian Hunter <adrian.hunter@intel.com> Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com> Cc: Ali Saidi <alisaidi@amazon.com> Cc: Athira Rajeev <atrajeev@linux.vnet.ibm.com> Cc: Dmitrii Dolgov <9erthalion6@gmail.com> Cc: Huacai Chen <chenhuacai@kernel.org> Cc: Ingo Molnar <mingo@redhat.com> Cc: James Clark <james.clark@arm.com> Cc: Jing Zhang <renyu.zj@linux.alibaba.com> Cc: Jiri Olsa <jolsa@kernel.org> Cc: John Garry <john.g.garry@oracle.com> Cc: Kajol Jain <kjain@linux.ibm.com> Cc: Kang Minchul <tegongkang@gmail.com> Cc: Leo Yan <leo.yan@linaro.org> Cc: Madhavan Srinivasan <maddy@linux.ibm.com> Cc: Mark Rutland <mark.rutland@arm.com> Cc: Mike Leach <mike.leach@linaro.org> Cc: Ming Wang <wangming01@loongson.cn> Cc: Namhyung Kim <namhyung@kernel.org> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Ravi Bangoria <ravi.bangoria@amd.com> Cc: Rob Herring <robh@kernel.org> Cc: Sandipan Das <sandipan.das@amd.com> Cc: Sean Christopherson <seanjc@google.com> Cc: Suzuki Poulouse <suzuki.poulose@arm.com> Cc: Thomas Richter <tmricht@linux.ibm.com> Cc: Will Deacon <will@kernel.org> Cc: Xing Zhengjun <zhengjun.xing@linux.intel.com> Cc: coresight@lists.linaro.org Cc: linux-arm-kernel@lists.infradead.org Link: https://lore.kernel.org/r/20230527072210.2900565-22-irogers@google.com Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
committed by
Arnaldo Carvalho de Melo
parent
178ddf3bad
commit
ec6a4a8bd3
@@ -11,7 +11,6 @@
|
||||
#include "evsel.h"
|
||||
#include "strbuf.h"
|
||||
#include "pmu.h"
|
||||
#include "pmu-hybrid.h"
|
||||
#include "print-events.h"
|
||||
#include "smt.h"
|
||||
#include "expr.h"
|
||||
@@ -274,7 +273,7 @@ static int setup_metric_events(const char *pmu, struct hashmap *ids,
|
||||
const char *metric_id;
|
||||
struct evsel *ev;
|
||||
size_t ids_size, matched_events, i;
|
||||
bool all_pmus = !strcmp(pmu, "all") || !perf_pmu__is_hybrid(pmu);
|
||||
bool all_pmus = !strcmp(pmu, "all") || !perf_pmu__has_hybrid() || !is_pmu_hybrid(pmu);
|
||||
|
||||
*out_metric_events = NULL;
|
||||
ids_size = hashmap__size(ids);
|
||||
@@ -288,8 +287,7 @@ static int setup_metric_events(const char *pmu, struct hashmap *ids,
|
||||
struct expr_id_data *val_ptr;
|
||||
|
||||
/* Don't match events for the wrong hybrid PMU. */
|
||||
if (!all_pmus && ev->pmu_name &&
|
||||
perf_pmu__is_hybrid(ev->pmu_name) &&
|
||||
if (!all_pmus && ev->pmu_name && evsel__is_hybrid(ev) &&
|
||||
strcmp(ev->pmu_name, pmu))
|
||||
continue;
|
||||
/*
|
||||
|
||||
Reference in New Issue
Block a user