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 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 0304CC7EE23 for ; Sat, 27 May 2023 07:40:49 +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=w4S1TgrIO0QFottc3tqvPQ/LU0nZAlUDLxBUuq0irjg=; b=GalO2JIJ6RkojS PLAq4zdDqM+fHApX4v+fM1um9MOHZhynh3R/klUdjxVCKDr5I2grj4Uy8aH9qECRkzbey48GXQ1rJ cbcwC5j6ZHK7+2PuuS3jbaQkOjAr9PZEiK5hOIR8Wn3mbmhCtqBE4foQx8aB/U1Mfud9LlrTc9Af9 5MIQAvwzQFnWZqE154gD5ZI2PIpdexxXEpKjThLW+nj8B+3JtMGYRYdOtqYzjSVTjWHojTJZYHXHM 9p0rudVQI5aU+gF0GFoqkHIE/oUWYByfB95CJdK5sEA7SXW19OIUiS724WunJvx2w3+7uAJkqwTY2 eW9DwOgWOjv4nQd5VLPw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1q2oXF-0059UY-0B; Sat, 27 May 2023 07:40:21 +0000 Received: from desiato.infradead.org ([2001:8b0:10b:1:d65d:64ff:fe57:4e05]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1q2oX6-0059SQ-1w for linux-arm-kernel@bombadil.infradead.org; Sat, 27 May 2023 07:40:12 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=desiato.20200630; h=Content-Type:To:From:Subject: References:Mime-Version:Message-Id:In-Reply-To:Date:Sender:Reply-To:Cc: Content-Transfer-Encoding:Content-ID:Content-Description; bh=6J3cKUGVc8jbchvN9nhXCNUg1ciZv4CLd2svHk2zTKw=; b=VHKpkAUVI5f96z2N6ic+FBNM16 rXkYh5DUsFbq1zL0DWutHvyBiS4Qhvy95zRegGwJhYzWIG4YBKu/+Ayx/HofsrMWoxbagOQ4zjpYG mU/XrD90aorLKFnbBMzD+Yide+CV+Gs6O81o5TMzrNBkPyjmTnQohEhQYTG7XkFxzJDErYQrNmWp5 CriGItLI3oLlY9rVDYa6KMD+IblNX/qltFx7g4XaxAHHvjmUEIVSOS6pkyrz3SNB7V905D59eKRg0 xmAYYNtzu2IZNMdCMlVgiGqcio1QvTiGzdSqZsiCmi9vxw5rWo15AN9NUp+ffOeXhrzpeYp5erMBO B5DaA2CQ==; Received: from mail-yb1-xb4a.google.com ([2607:f8b0:4864:20::b4a]) by desiato.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1q2oH4-009Lkd-1D for linux-arm-kernel@lists.infradead.org; Sat, 27 May 2023 07:25:42 +0000 Received: by mail-yb1-xb4a.google.com with SMTP id 3f1490d57ef6-bacfa4eefd2so3922926276.0 for ; Sat, 27 May 2023 00:23:37 -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=NIaNk3TuVRLwj8+lXhrYc09+2xlR4t40lpy+W2ICJ0e3PE2uopT+uHJAzNUb+JB4zv Bd9zNwjXME/JFlo2WARRnCBTUcn9fq6fHrRo2vMJwHsxL/TYYWK1At5hdPcDeUD0Jp+O nfcZ61xgGuH4xRBYZGoeJgIodau+4f1RrXJuo2UafaFRKhzrjpKkz8ze7wsn/TKxMmNk Iaw40waLebYFKH3Ae4UtUApqRFwMcao4CrgGvVYs28FoCcBK+dXBbyp9GpYQtx0Y40xy 6TtapPFuDOAjDx3w6lCzn/wXMBPnSfWierUYKzuzxOJ9PwtiVpF4teu+SReWjlLnZNBW s/cw== X-Gm-Message-State: AC+VfDwmqQL9eQXFguLyZGAnDuhS4+k2+yPp71VKN/yZUIs7vR2CadLI r0J9icQsr2Kbu59Flfi+OLnj9r27OSrR X-Google-Smtp-Source: ACHHUZ6tm975fx26tmdU5t4NLuKHgLuu93YXgPPk2egS/sqJ5ulj++qnrblI9Sfo7fDeNySUb6Ebv8C7zu3W 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 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230527_082405_193658_00376235 X-CRM114-Status: GOOD ( 12.13 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.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 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel