Received: by 2002:a05:6358:3188:b0:123:57c1:9b43 with SMTP id q8csp477915rwd; Sat, 27 May 2023 00:43:06 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5CkKMhMdZQwesETx9jdsrIXS6CEnCkg7S85eSGNoOj4wBSyJFB0be4hrmjBd20PgC0on3n X-Received: by 2002:a17:902:d504:b0:1ae:72fc:a625 with SMTP id b4-20020a170902d50400b001ae72fca625mr6043022plg.37.1685173385761; Sat, 27 May 2023 00:43:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1685173385; cv=none; d=google.com; s=arc-20160816; b=Ci2ML/jzBQ1600Lw00PACf3kiZVJLsxWOItN9GXOIkG9hCRA3Ovd9X3p+d1cBWfL2b fxHwplXKnLBJhTXhD6XhB96M3FPOPUhcuVBIIVjvQeWkSi45J8bSHT07xGd1oTpKqfJd ln++omeeh+Ub1v4jQy65egGdR+KvUHVFRo8TicDH8lkWhBFIAxlPlygHlocz/3bMY1Jl 1XG1+TMGudPoHoQmcVExZHSWgt5stVcWUXwoIJyTrP/q5YIVym+EZkqQOZ0CwGrZoCSq UpNcX/iwo23OS9WwdsIxdijXOAicHNLzojp+hXlxt2y2LAm5NSbRrLFOeR6zFWg9EEbQ E+cQ== 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=xV00wr0m01A6RSOkoZkdtOocxHuwovS7qVF3tDIwPhQ=; b=pXPZu8/A779sTDl2ustaiUJxw+U/tX6gcSce498lt0Y/434S0S5FYOeUAfUDZOsqvP agWifjl/73/FJc9ckMbG4LyAGZEMCo4rv0JSpVGJjlPkiDMAqzzbEAwey9NmtoVTIfPc g0CgbmM9eNXPtVMMhPrELa5cugEXCUHOlwc/PPoCYLUeRXnvFaTeD+eAP3Do9b8OdTB2 EbVXZ3w7vLC88U0iJP5+ymP014g46p/oHgypvkmh99HMmN1zIlV5Mf3D5BV6rSNxrjRM uW+/faXM74T+AtOCuFeydZTawEm+8et98EK59rUSEFM2c/2C0chmSQJA3ySCDnEMRFut ZxsA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20221208 header.b=rK8JvQoJ; 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 bi12-20020a170902bf0c00b001a81741ef8dsi5634956plb.54.2023.05.27.00.42.51; Sat, 27 May 2023 00:43:05 -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=rK8JvQoJ; 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 S232438AbjE0HZ1 (ORCPT + 99 others); Sat, 27 May 2023 03:25:27 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57064 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232132AbjE0HY1 (ORCPT ); Sat, 27 May 2023 03:24:27 -0400 Received: from mail-yb1-xb49.google.com (mail-yb1-xb49.google.com [IPv6:2607:f8b0:4864:20::b49]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 90998E58 for ; Sat, 27 May 2023 00:24:03 -0700 (PDT) Received: by mail-yb1-xb49.google.com with SMTP id 3f1490d57ef6-ba83a9779f3so3299731276.1 for ; Sat, 27 May 2023 00:24:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20221208; t=1685172205; x=1687764205; h=to:from:subject:references:mime-version:message-id:in-reply-to:date :from:to:cc:subject:date:message-id:reply-to; bh=xV00wr0m01A6RSOkoZkdtOocxHuwovS7qVF3tDIwPhQ=; b=rK8JvQoJKZgwKm6DboQJ93FRgY5M8ICQejv0IU3Tq4c8na4T8hwI/bL6+HiKno3OsL hQgr7XewnMGnBGftqrpCAbjk0gGya0+7ukosSu7sOwYahsFpIROyTRMq+mKrMZISql+i PoNPv+nt5DqxN8UbwgHpIRkxS0y6+Xs7tQEAUDgRKTZZ+w4iqqyFFnGkBMMx78nFW5px Tl8GlelqGP/NY4D/06naW8NtPMSJ3paV0+LP3CL5HDZB47kpduX5zc309esfB7csngR+ cHsqCI/4yCjM3ZyMO2dCpvB2+qr267BZVldojts+Tu82AJhBie8g/ml5rTfMcLMFwPZq DvMw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1685172205; x=1687764205; 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=xV00wr0m01A6RSOkoZkdtOocxHuwovS7qVF3tDIwPhQ=; b=dpfJZ/4Xc4ViDwDg2kLAw9vbcV8N6ca+AVvndTBXr4j9Zp9AvYN1tuWRG58OSUQHrF RxFRm8+yPuR3tBVMdvimB/qgjbhm1zMLhU1R/q5LRVKCXSpMTg+EhQnbAgvhWbQZYokK 3jbcKjAHeLJy0+rVC5ZCreYCmgd5ZDHPMZcCryGYDoYPmxxHzEAXA+ZCAQtEZHkGiAMA IegSQHUdzl2K5p3Cyhg6JsuDZPFPPK2DplIG85F+7WMLS1ycQTJw2HsrImM/nYEwvXGb Qcdk5RL1yJtzb6tYDUhe7N7MYilhFeGMbD3FvajZQodGcEGZNJvFQ4b64Q1Tk2W+25Ro hicw== X-Gm-Message-State: AC+VfDzKmpeHA8UZcNw2CKR2Wojw3ORtvEhsp9l7yd3WsGKrRcSVApRf LBUbgUr7dS5wK6SNTpFnv2+yFZrWl86R X-Received: from irogers.svl.corp.google.com ([2620:15c:2d4:203:3b4e:312c:644:a642]) (user=irogers job=sendgmr) by 2002:a25:9706:0:b0:ba8:1e83:af32 with SMTP id d6-20020a259706000000b00ba81e83af32mr2333617ybo.1.1685172205108; Sat, 27 May 2023 00:23:25 -0700 (PDT) Date: Sat, 27 May 2023 00:21:58 -0700 In-Reply-To: <20230527072210.2900565-1-irogers@google.com> Message-Id: <20230527072210.2900565-23-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 22/34] perf stat: Avoid hybrid PMU list 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=unavailable 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 perf_pmu__is_hybrid implicitly uses the hybrid PMU list. Instead return false if hybrid isn't present, if it is then see if any evsel's PMUs are core. Signed-off-by: Ian Rogers Reviewed-by: Kan Liang --- tools/perf/util/stat-display.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/tools/perf/util/stat-display.c b/tools/perf/util/stat-display.c index 4cce7d3c5e52..a3e184e0b5ba 100644 --- a/tools/perf/util/stat-display.c +++ b/tools/perf/util/stat-display.c @@ -19,7 +19,7 @@ #include #include "util.h" #include "iostat.h" -#include "pmu-hybrid.h" +#include "pmu.h" #define CNTR_NOT_SUPPORTED "" #define CNTR_NOT_COUNTED "" @@ -695,11 +695,12 @@ static bool evlist__has_hybrid(struct evlist *evlist) { struct evsel *evsel; + if (!perf_pmu__has_hybrid()) + return false; + evlist__for_each_entry(evlist, evsel) { - if (evsel->pmu_name && - perf_pmu__is_hybrid(evsel->pmu_name)) { + if (evsel->core.is_pmu_core) return true; - } } return false; -- 2.41.0.rc0.172.g3f132b7071-goog