Received: by 2002:a05:6358:3188:b0:123:57c1:9b43 with SMTP id q8csp479476rwd; Sat, 27 May 2023 00:45:23 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ76pWlyNK5kyAw+O0AmvIDySME6lUaD1v+464vPvi3fUj3JbloCLsI8+OTykTpnJC1jZ4p1 X-Received: by 2002:a05:6a00:158a:b0:645:cfb0:2779 with SMTP id u10-20020a056a00158a00b00645cfb02779mr7191820pfk.26.1685173523250; Sat, 27 May 2023 00:45:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1685173523; cv=none; d=google.com; s=arc-20160816; b=cjaCXiqmru9rlENXIeEyg4S8csnNEdDSEM7bHgAyAwqh5dKy8P5J5H+wfqiKWDgjoI ldpypJvWGME/aX5PTGLbdExNdHi5IoWaGj+CYTpn/VFTJxyqvRyda8ft7EirLp59SqEV UY63tVbqelea/XcqN5t21/6RZ1SbHg7nombs0G1AN9/Dd8AEhVbnYf3SWUwajdIFrPjQ YM9e+IBcUGbs0W1NhpmXCkPbgLP6K2pK8XVEA819B/xaYq5IeQ6tXJFksENcSlZOnYXa bWTJliHMVkuzKaWHRX4YABDuR7qFb6EitQrHRFAvIDZBB9dGxEoZ+xebbmLc8oQD+x5o /WIQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:to:from:subject:references:mime-version :message-id:in-reply-to:date:dkim-signature; bh=6J3cKUGVc8jbchvN9nhXCNUg1ciZv4CLd2svHk2zTKw=; b=lmFlLT6W4zfk23bx6nZrrevpDhmgdpOQZtiAuqlnm1Mbyl8ulwKqdd7OnJQFDCsFrP PN9BFTqUfNbt51UUR9+Uie9O/FT1gCR8Gnbe07bsegDwKg7YGpftkpsBPkU2Nuwdu40W IvuNmwUdoJzbY9WIObotZK4QFa6y9oObgfHSHFpH+XOOv8wspy1qLDdqYsX8JeQp29Yb O4WRcU2dBaFIZ/b6n6fFpZLSYjmik9Zpoil+CeCiON8gmU5TTnx0waPH3JZvnDZuTFZm nvYbyvmHDQeDKptF2JRZIUqSumkkNp9teT/4iFAPDBLC5CfcBM3AG94jiqVn9bQR70Kh JeLA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20221208 header.b=cs4DSiwZ; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id v7-20020a63b947000000b00534874dd5f4si5123256pgo.441.2023.05.27.00.45.09; Sat, 27 May 2023 00:45:23 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@google.com header.s=20221208 header.b=cs4DSiwZ; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232010AbjE0H06 (ORCPT + 99 others); Sat, 27 May 2023 03:26:58 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57788 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237841AbjE0HZA (ORCPT ); Sat, 27 May 2023 03:25:00 -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 E64A110C0 for ; Sat, 27 May 2023 00:24:27 -0700 (PDT) Received: by mail-yb1-xb4a.google.com with SMTP id 3f1490d57ef6-ba8337ade1cso3872191276.2 for ; Sat, 27 May 2023 00:24:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20221208; t=1685172214; x=1687764214; h=to:from:subject:references:mime-version:message-id:in-reply-to:date :from:to:cc:subject:date:message-id:reply-to; bh=6J3cKUGVc8jbchvN9nhXCNUg1ciZv4CLd2svHk2zTKw=; b=cs4DSiwZy/SZo4mMMbq+8YPP1FKdRxt/AiQK6TllEQyD41E4AigkyJW3zpeue2jYoW D8klOO9wXwv8e1n4/FKxVKWe9ss7Rk/uOFNg4sGTmPDi8NpzFjra96jnwJwQtQFv2hyU xmynjwRchyU/LrRLpcPd8zyg6ACdoLbcRETznlJtgsScWGrnbytpbBfgd7xtWZ9duZUb dean2XSF990Ppz4B06o+QSxzRUnvYRIPhYReOrB+O2fgEygZ1EDLjzmsQBW4oJy2ZWt6 lNkQQVWRey76CZw8s8x8zoxm1f+/7v8W2LB2AC05uNSxSuYnGZaREwzux0t8dD/F0Wp7 GNEw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1685172214; x=1687764214; 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=6J3cKUGVc8jbchvN9nhXCNUg1ciZv4CLd2svHk2zTKw=; b=RkttGcbLE6PmaaSiogDXf2Fl0iKRYCNu1i/1P9vqnK1ZEE7+qHlQHz/03uNWgaU6oa o2LmFTK0Rm75ZhngzAOP/lMjRYN7myJSoqUixWYOzX9TSy6Fpz031kBQ32RZVNVUTBAt tzld8A/AFePXE0TVdeCooci0HCvnwRNJWnZ6Fi9I6oGYrS3skUtAHLynUBo//xVE13uQ s/cfGZPMZXyvq851DTt+AHsI5uCGjG9t4I9MI97gSYWYmagzH22QGz5X2QCSb2Vv2hxl AiOYktGpIPoL6Qx0LAPhAmSOXHrwUxYyZaHBElP+XIRm9ktP+1rM2gjmPkf8R6HVeyKm ZjaQ== X-Gm-Message-State: AC+VfDwvooPeTiG0dO7PohEz6DpPOvaiXDpc8K3MwVgbU4iandPaBo1H 7h8d7cDzfeac6EJfxTiQbofJEtRghI68 X-Received: from irogers.svl.corp.google.com ([2620:15c:2d4:203:3b4e:312c:644:a642]) (user=irogers job=sendgmr) by 2002:a25:874a:0:b0:bac:5d2c:844b with SMTP id e10-20020a25874a000000b00bac5d2c844bmr1525420ybn.8.1685172214406; Sat, 27 May 2023 00:23:34 -0700 (PDT) Date: Sat, 27 May 2023 00:22:02 -0700 In-Reply-To: <20230527072210.2900565-1-irogers@google.com> Message-Id: <20230527072210.2900565-27-irogers@google.com> Mime-Version: 1.0 References: <20230527072210.2900565-1-irogers@google.com> X-Mailer: git-send-email 2.41.0.rc0.172.g3f132b7071-goog Subject: [PATCH v5 26/34] 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 Content-Type: text/plain; charset="UTF-8" X-Spam-Status: No, score=-9.6 required=5.0 tests=BAYES_00,DKIMWL_WL_MED, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE,USER_IN_DEF_DKIM_WL autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Find the PMU and then the event off of it. Signed-off-by: Ian Rogers Reviewed-by: Kan Liang --- 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/util/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) 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 = perf_pmu__find("cpu"); + + if (!pmu) + pmu = perf_pmu__find("cpu_core"); + + if (pmu && !pmu_have_event(pmu->name, "mem-loads-aux")) + return false; return leader->core.attr.config == MEM_LOADS_AUX; } -- 2.41.0.rc0.172.g3f132b7071-goog