From nobody Mon Feb 9 01:45:53 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7CFABC77B73 for ; Mon, 22 May 2023 06:46:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232135AbjEVGqo (ORCPT ); Mon, 22 May 2023 02:46:44 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52280 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232050AbjEVGpr (ORCPT ); Mon, 22 May 2023 02:45:47 -0400 Received: from mail-yb1-xb4a.google.com (mail-yb1-xb4a.google.com [IPv6:2607:f8b0:4864:20::b4a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D71E61723 for ; Sun, 21 May 2023 23:44:37 -0700 (PDT) Received: by mail-yb1-xb4a.google.com with SMTP id 3f1490d57ef6-babb52dbb00so4182992276.1 for ; Sun, 21 May 2023 23:44:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20221208; t=1684737858; x=1687329858; h=to:from:subject:references:mime-version:message-id:in-reply-to:date :from:to:cc:subject:date:message-id:reply-to; bh=d/uSoOkKrLV2P01KOT7/05nAwNtg1NZmOZIVSrGqD1k=; b=Hsaqh04sZH/6Axr8ud/gVY1mROhs8Rgqfgn3Y6WJCmxYCSI7DaGYNAhEuMcZgVnSI4 IQR6K++KxTf6MIelXu6H8ZQLGME/L+HPhjveHZLKnPA191Tl+09GgrGKkqPWt8TmlvHo jeVR+5yWMZzereK4/fMT3bLb2G8m7w8726xoO/zepx/JtlKitnPX+61eYsxkuUrnRVU6 wSJN3wccgS72kCUEAtjLu4A8Oa23qTc8IiMin5sw1NImbyJAqwPLcuLN2veTrRx4MDwF l16tIVZoj/7USrIbJVfBWqY6dDVnkVbZgvW1X/t4ZlhijkBPzzOBVdpYx+gGvPGIzrZ2 j4Aw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684737858; x=1687329858; 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=d/uSoOkKrLV2P01KOT7/05nAwNtg1NZmOZIVSrGqD1k=; b=gwy3YRtQRpDRiiMoFdwgJCC/GzI6Wv511pd9Ud+BnG4Lw0rAf8rusl1HJDGxlOws9o 0YYZuu3KJg5VEyd4QeFsFCPiyYAJ/bSQXcofNBQxiZhcO9SIYwbs4bC9iG+g4eCCjQG3 rvFVamzxRKrfyMexLbNMVTTSTNfKo8oMWWtWI6DdpAPgekOH000D9czhBdiwqh42skws Z9kAAG05rEcOz8GLSRMJTfqNBi5CRFtUBCVsgeBydOHgRsWgykgblUUgIqgNF+m1O6i5 GIh9roNXdIBpH01LPEo+HelxIXamnz6J/d2Vbwln1oY2T6uiEqMWWBxIqov3E434Ipui i0Qw== X-Gm-Message-State: AC+VfDxRzuKrzCyzm4ELzoPE1m4/emLAjCHbxcNOekF8GCfQj8h/S/VO q0tSdwWA2Ompi6fwWJAg6kssS7LyRNvA X-Google-Smtp-Source: ACHHUZ4uNM8OVXJ/aKWdYng9uyMorPPzwcRVbMIZHNe3K1lLGLszwH0/SAAzHzeBkaQpq1TeMKuVgHtITpHE X-Received: from irogers.svl.corp.google.com ([2620:15c:2d4:203:48d9:8c21:e099:7301]) (user=irogers job=sendgmr) by 2002:a25:689:0:b0:ba8:3401:a466 with SMTP id 131-20020a250689000000b00ba83401a466mr3789212ybg.6.1684737858138; Sun, 21 May 2023 23:44:18 -0700 (PDT) Date: Sun, 21 May 2023 23:43:25 -0700 In-Reply-To: <20230522064330.189127-1-irogers@google.com> Message-Id: <20230522064330.189127-19-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 18/23] perf x86 mem: minor refactor to is_mem_loads_aux_event From: Ian Rogers To: Suzuki K Poulose , Mike Leach , Leo Yan , John Garry , Will Deacon , James Clark , Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Mark Rutland , Alexander Shishkin , Jiri Olsa , Namhyung Kim , Ian Rogers , Adrian Hunter , Kajol Jain , Jing Zhang , Kan Liang , Zhengjun Xing , Ravi Bangoria , Madhavan Srinivasan , Athira Rajeev , Ming Wang , Huacai Chen , Sandipan Das , Dmitrii Dolgov <9erthalion6@gmail.com>, Sean Christopherson , Ali Saidi , Rob Herring , Thomas Richter , Kang Minchul , linux-kernel@vger.kernel.org, coresight@lists.linaro.org, linux-arm-kernel@lists.infradead.org, linux-perf-users@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Find the PMU and then the event off of it. Reviewed-by: Kan Liang Signed-off-by: Ian Rogers --- tools/perf/arch/x86/util/mem-events.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/tools/perf/arch/x86/util/mem-events.c b/tools/perf/arch/x86/ut= il/mem-events.c index f683ac702247..02d65e446f46 100644 --- a/tools/perf/arch/x86/util/mem-events.c +++ b/tools/perf/arch/x86/util/mem-events.c @@ -55,13 +55,13 @@ struct perf_mem_event *perf_mem_events__ptr(int i) =20 bool is_mem_loads_aux_event(struct evsel *leader) { - if (perf_pmu__find("cpu")) { - if (!pmu_have_event("cpu", "mem-loads-aux")) - return false; - } else if (perf_pmu__find("cpu_core")) { - if (!pmu_have_event("cpu_core", "mem-loads-aux")) - return false; - } + struct perf_pmu *pmu =3D perf_pmu__find("cpu"); + + if (!pmu) + pmu =3D perf_pmu__find("cpu_core"); + + if (pmu && !pmu_have_event(pmu->name, "mem-loads-aux")) + return false; =20 return leader->core.attr.config =3D=3D MEM_LOADS_AUX; } --=20 2.40.1.698.g37aff9b760-goog