Message ID | 20230522064330.189127-14-irogers@google.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show
Return-Path: <linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org> X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 08CAEC7EE2A for <linux-arm-kernel@archiver.kernel.org>; Mon, 22 May 2023 07:45:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:To:From:Subject:References:Mime-Version :Message-Id:In-Reply-To:Date:Reply-To:Cc:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=EvQrG/ODxAXTlclmKZMnv6iKYhkOdDfyCiTFQj2DCOE=; b=fgdMK8FtBFRASc PG5ioA/sysqk4+omQTyLDHwFEBP+S08UK6GrX87BNcdWkhsnreLojcwL88cH/08b6I2N0LQ+WbYBn g5Vxv8F9128pNE65TgNx019L+5GmNmrBD092mZF8wqKMLs9RmU0ULHK4qoTvG8Wq2t0+ms607AGKt qOgACwzPSt1zGI+zlWhwmRa8tqaOfD8iDyGrDRFM6INWYJ+AVeZlg3hqDprFS8ff0uNQ1g9oudhQV hnfl8+QJab49gBkEcvGIleuStxwk1lsoRBEn+bSW2+J1x1+YHERueoc0I7eYYLjfRatM2spMa0Wtu Ry6uM5nvtREMA42rNcsw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1q10EH-005fJP-0U; Mon, 22 May 2023 07:45:17 +0000 Received: from mail-yw1-x114a.google.com ([2607:f8b0:4864:20::114a]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1q0zH4-005X4A-1q for linux-arm-kernel@lists.infradead.org; Mon, 22 May 2023 06:44:07 +0000 Received: by mail-yw1-x114a.google.com with SMTP id 00721157ae682-561abf855afso65928617b3.2 for <linux-arm-kernel@lists.infradead.org>; Sun, 21 May 2023 23:44:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20221208; t=1684737845; x=1687329845; h=to:from:subject:references:mime-version:message-id:in-reply-to:date :from:to:cc:subject:date:message-id:reply-to; bh=LP27CftfdHYnLweWt0lX22v4lNIGIpmQh1ljDLrV4jA=; b=MhqwCJBtPyT5b02ahng0nI7ganYJvCeSMOskyson56OnoKeJ481W1TYdZWj1JoQ95r wuDPYIkhk/NZwXe0CTxVQKbfv+gqsM0j26sRc+OeTdtmHigaxZV6fk/yseq3N0YnQHX9 0KnUlv9Zqv7SggUA1BhxajbxFcxpcDkcYZFIZq04EHtQcg185xnzwBc/fT7tb7tebere 9XsVoFpw5B5enV926TymTvp6irXOwGEGnbP/Kg9xFJlCyTIF+gVlxrZ8Am7aD97VN0BW Na+J7IgiziND4KB+K5rXmzS+kHNRU8d9qu5XJW/oHj2sBTxSLuqP4ed7kGE29lS3EXiw 3/pA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684737845; x=1687329845; h=to:from:subject:references:mime-version:message-id:in-reply-to:date :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=LP27CftfdHYnLweWt0lX22v4lNIGIpmQh1ljDLrV4jA=; b=BD8kQxp95JvS68tNcG3wwhiQn/uBEd4+iOrpcf1iuNEERXYaInPmIfnJcI5LMrVy3H hc/DVEd53SH158Nk4CkVGPH4xEMjomjLmb3fqg0LufOfZoiWqOhiLuszCo3/sgpHD26o /AfxAfylDdkG23fzpuD9kLgKxfHZjT9bFPFpFeBPxvuZgvROEKecblUxHMuW+8zAo+Cp nh9fxu5Rg2kHJfmqpO1niCH5U3p1C7kLn1QkLKa8lj5iJGmiHuP/fWMeFoHnGP7/F6cc 4zZXyEj2iw7sofxGsaElwBcUQUAdRvhyWkXI0610iikQqo74xn5lvjalOnFmSLmOCJ2y zX2A== X-Gm-Message-State: AC+VfDyEDQ0N6P3YjVJh+5eImfNmQgv3HMimSCGx3ty/0EMXqPeS2o6W lmm6tIK8b+25+KbE6tjutS5OhIvkyCr4 X-Google-Smtp-Source: ACHHUZ6D6GJ/kDIQ4pJeBPj2fMGgwl7DniHm6drdApF9GQl/cS7AHqn9R8+z1PDzPpRbQhZDI9VADrzkzCRy X-Received: from irogers.svl.corp.google.com ([2620:15c:2d4:203:48d9:8c21:e099:7301]) (user=irogers job=sendgmr) by 2002:a5b:e85:0:b0:ba8:97f8:620f with SMTP id z5-20020a5b0e85000000b00ba897f8620fmr5949030ybr.8.1684737845479; Sun, 21 May 2023 23:44:05 -0700 (PDT) Date: Sun, 21 May 2023 23:43:20 -0700 In-Reply-To: <20230522064330.189127-1-irogers@google.com> Message-Id: <20230522064330.189127-14-irogers@google.com> Mime-Version: 1.0 References: <20230522064330.189127-1-irogers@google.com> X-Mailer: git-send-email 2.40.1.698.g37aff9b760-goog Subject: [PATCH v2 13/23] perf metrics: Remove perf_pmu__is_hybrid use From: Ian Rogers <irogers@google.com> To: Suzuki K Poulose <suzuki.poulose@arm.com>, Mike Leach <mike.leach@linaro.org>, Leo Yan <leo.yan@linaro.org>, John Garry <john.g.garry@oracle.com>, Will Deacon <will@kernel.org>, James Clark <james.clark@arm.com>, Peter Zijlstra <peterz@infradead.org>, Ingo Molnar <mingo@redhat.com>, Arnaldo Carvalho de Melo <acme@kernel.org>, Mark Rutland <mark.rutland@arm.com>, Alexander Shishkin <alexander.shishkin@linux.intel.com>, Jiri Olsa <jolsa@kernel.org>, Namhyung Kim <namhyung@kernel.org>, Ian Rogers <irogers@google.com>, Adrian Hunter <adrian.hunter@intel.com>, Kajol Jain <kjain@linux.ibm.com>, Jing Zhang <renyu.zj@linux.alibaba.com>, Kan Liang <kan.liang@linux.intel.com>, Zhengjun Xing <zhengjun.xing@linux.intel.com>, Ravi Bangoria <ravi.bangoria@amd.com>, Madhavan Srinivasan <maddy@linux.ibm.com>, Athira Rajeev <atrajeev@linux.vnet.ibm.com>, Ming Wang <wangming01@loongson.cn>, Huacai Chen <chenhuacai@kernel.org>, Sandipan Das <sandipan.das@amd.com>, Dmitrii Dolgov <9erthalion6@gmail.com>, Sean Christopherson <seanjc@google.com>, Ali Saidi <alisaidi@amazon.com>, Rob Herring <robh@kernel.org>, Thomas Richter <tmricht@linux.ibm.com>, Kang Minchul <tegongkang@gmail.com>, linux-kernel@vger.kernel.org, coresight@lists.linaro.org, linux-arm-kernel@lists.infradead.org, linux-perf-users@vger.kernel.org X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230521_234406_612408_CDA24397 X-CRM114-Status: GOOD ( 13.86 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: <linux-arm-kernel.lists.infradead.org> List-Unsubscribe: <http://lists.infradead.org/mailman/options/linux-arm-kernel>, <mailto:linux-arm-kernel-request@lists.infradead.org?subject=unsubscribe> List-Archive: <http://lists.infradead.org/pipermail/linux-arm-kernel/> List-Post: <mailto:linux-arm-kernel@lists.infradead.org> List-Help: <mailto:linux-arm-kernel-request@lists.infradead.org?subject=help> List-Subscribe: <http://lists.infradead.org/mailman/listinfo/linux-arm-kernel>, <mailto:linux-arm-kernel-request@lists.infradead.org?subject=subscribe> Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" <linux-arm-kernel-bounces@lists.infradead.org> Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org |
Series |
PMU refactoring and improvements
|
expand
|
diff --git a/tools/perf/util/metricgroup.c b/tools/perf/util/metricgroup.c index 7de721e9d895..72583f62eda8 100644 --- a/tools/perf/util/metricgroup.c +++ b/tools/perf/util/metricgroup.c @@ -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; /*
Switch from perf_pmu__is_hybrid to avoid implicitly using the hybrid PMU list. Signed-off-by: Ian Rogers <irogers@google.com> --- tools/perf/util/metricgroup.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)