Received: by 2002:a05:6358:9144:b0:117:f937:c515 with SMTP id r4csp3069544rwr; Fri, 28 Apr 2023 23:31:23 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6SeY0Fyxby54vbQ5jt0Htncef7idaHUKlUYvzXa1AOvi73mIrvlrgXV8q45fndYz0hmUlS X-Received: by 2002:a05:6a00:4c11:b0:641:23df:e929 with SMTP id ea17-20020a056a004c1100b0064123dfe929mr8339219pfb.2.1682749883280; Fri, 28 Apr 2023 23:31:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1682749883; cv=none; d=google.com; s=arc-20160816; b=Ca0Y2IILNnTFxwzJVjDtFZqlxsM9Osxx1hYiP7T1QuVjZHfDQ0sB2iZWZBGoO7qSoe GB88MuQWsttOIDFIAO9Sh0+9rQeMerzDobI7WxiunC8FqzuIfy/sPUe/EctNP80+UFqK DC30K9e8GQwzmF8hvGsbJhQewsFKyctwlZBkn8Ppl45tqYz0rLpybDRbJGOOE5XQUdqh eq0qEnGuz2koHE42ERhuQuogQH0FHotlWctGrrG/pIwWtW5bsOEj1ZzH3hxJ/UIwLasa IA9Y9rGMt6fMZI8+SAJSwtVvP33G0H3LC16sm5RqZHG1jcFx+9xiXB9z8E5rLmAcLS3w 56aw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:from:subject:references:mime-version :message-id:in-reply-to:date:dkim-signature; bh=Z5la9qJcqL6gBH6h4UORwyXdD/ZlzmqtItJD5+R0Siw=; b=Te/6a0ofmsGwBG4OZiRJrzAEAdA4ubSCn3Rck00Q0qAE7pPhqLjznAuKmMkQHtox9u zrU+mmeNCDDBffCzSGTWsyJRLXPu97+D4TBNLImLYaWRGFNqSB3qvU6qGukTWerc/YKi 4cqhlsIQn2a1RIS5tRvDajsiREzEMslBCNzMSUZYbjruQ4XRjC+o3UFai40xLSpKdylD 5PkgiwSalYTefHBkcvOM7BbEG5KQzAgqUgwyWamN5ykwe5QaWMgA8zbCvIIQgO/jLV6i rVYH+81v78VCuLxK1ljvISERX7kt4QRfl88YyVU/OP0RGy/uUHGEeLHeaa1+ttqj2NVA /Hjg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20221208 header.b=eHOhS+G5; 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 g9-20020aa79f09000000b005cd3a233e3asi23378953pfr.346.2023.04.28.23.31.08; Fri, 28 Apr 2023 23:31: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=eHOhS+G5; 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 S1347481AbjD2Fmq (ORCPT + 99 others); Sat, 29 Apr 2023 01:42:46 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45154 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1347469AbjD2FmJ (ORCPT ); Sat, 29 Apr 2023 01:42:09 -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 428B04C26 for ; Fri, 28 Apr 2023 22:41:41 -0700 (PDT) Received: by mail-yb1-xb4a.google.com with SMTP id 3f1490d57ef6-b9a6f15287eso16042842276.1 for ; Fri, 28 Apr 2023 22:41:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20221208; t=1682746845; x=1685338845; h=cc:to:from:subject:references:mime-version:message-id:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=Z5la9qJcqL6gBH6h4UORwyXdD/ZlzmqtItJD5+R0Siw=; b=eHOhS+G5jYvCl5A+qGW3eI/Xv+82F/OH4nLYlPnw7usG0kftQAz8zDgw64A5svCLQV /tH4adN56n7hdlgBPugJvOwEeBxu75aiPZi7ipKvksGECRxJrXYObK8A+Dy+/oEdQAvc svrEVmBlqXeiaw7Bagc+dXLXQoMczuUpGL6NcpS57xoy/FzejPYdNnbDlG0V9mMtsayI XggRxpxMc7aN7tkCAzZXdmWxYaEc2nqThZnGQBVF0GWhX+0U0Dk8+uAqyInL3PKDw4V4 lbQjAJ0x0aCMb9mYmwO149qelVkoIgJ5lMEg39cvg1vtP7wXfUM36ZZC+jEIXQzA+yrY rR0Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1682746845; x=1685338845; h=cc: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=Z5la9qJcqL6gBH6h4UORwyXdD/ZlzmqtItJD5+R0Siw=; b=N/ZkQUrh/Qr05czjpmuxSBmONhD5voUfx++FoqKwR2mOCyyY26m3PmKhobeV3HCRHe H/LG7c7Bgk5lz/ZLX6QbHDyVqb9030RjuDHuO/aOZMVsw31+ubkjfOQtQhyuPrzxfPvU 0bCtVAJT8uS/zxxLJnei08TX6nvXrPqe0XPdhXQ2FIbPsPt5T+Zrnr/POFBrEujx/rFx avH2xPRUgDoOwRct+3z/cbuuv8pYH2NUsy6KbgnsOixBROhR84iYXnfmogOEWHFu3dFL 0/gK1SwqV1jJzDh2gVNT5+HLourKKCKGRreHzdo1c5Mkvh4dEPj0aioUBlMzrw39+PVV gFTg== X-Gm-Message-State: AC+VfDz9MfxE0VfT2t7y6YOy+RhM1ZIp3PuZz8LsC5uYy34cdxh0na0E jQPRsWwgIpihxeFyB+Rhww5ZgKp0wUvX X-Received: from irogers.svl.corp.google.com ([2620:15c:2d4:203:c563:7e28:fb7c:bce3]) (user=irogers job=sendgmr) by 2002:a81:c709:0:b0:559:e0fa:7c82 with SMTP id m9-20020a81c709000000b00559e0fa7c82mr623763ywi.0.1682746845448; Fri, 28 Apr 2023 22:40:45 -0700 (PDT) Date: Fri, 28 Apr 2023 22:34:59 -0700 In-Reply-To: <20230429053506.1962559-1-irogers@google.com> Message-Id: <20230429053506.1962559-40-irogers@google.com> Mime-Version: 1.0 References: <20230429053506.1962559-1-irogers@google.com> X-Mailer: git-send-email 2.40.1.495.gc816e09b53d-goog Subject: [PATCH v3 39/46] perf parse-events: Don't reorder atom cpu events From: Ian Rogers To: Arnaldo Carvalho de Melo , Kan Liang , Ahmad Yasin , Peter Zijlstra , Ingo Molnar , Stephane Eranian , Andi Kleen , Perry Taylor , Samantha Alt , Caleb Biggers , Weilin Wang , Edward Baker , Mark Rutland , Alexander Shishkin , Jiri Olsa , Namhyung Kim , Adrian Hunter , Florian Fischer , Rob Herring , Zhengjun Xing , John Garry , Kajol Jain , Sumanth Korikkar , Thomas Richter , Tiezhu Yang , Ravi Bangoria , Leo Yan , Yang Jihong , James Clark , Suzuki Poulouse , Kang Minchul , Athira Rajeev , linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Ian Rogers 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 On hybrid systems the topdown events don't share a fixed counter on the atom core, so they don't require the sorting the perf metric supporting PMUs do. Signed-off-by: Ian Rogers --- tools/perf/arch/x86/util/evlist.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/perf/arch/x86/util/evlist.c b/tools/perf/arch/x86/util/evlist.c index d4193479a364..1b6065841fb0 100644 --- a/tools/perf/arch/x86/util/evlist.c +++ b/tools/perf/arch/x86/util/evlist.c @@ -6,6 +6,7 @@ #include "util/event.h" #include "util/pmu-hybrid.h" #include "topdown.h" +#include "evsel.h" static int ___evlist__add_default_attrs(struct evlist *evlist, struct perf_event_attr *attrs, @@ -67,8 +68,7 @@ int arch_evlist__add_default_attrs(struct evlist *evlist, int arch_evlist__cmp(const struct evsel *lhs, const struct evsel *rhs) { - if (topdown_sys_has_perf_metrics() && - (!lhs->pmu_name || !strncmp(lhs->pmu_name, "cpu", 3))) { + if (topdown_sys_has_perf_metrics() && evsel__sys_has_perf_metrics(lhs)) { /* Ensure the topdown slots comes first. */ if (strcasestr(lhs->name, "slots")) return -1; -- 2.40.1.495.gc816e09b53d-goog