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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id DDFEBC7EE2C for ; Fri, 25 Aug 2023 13:53:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S245300AbjHYNxU (ORCPT ); Fri, 25 Aug 2023 09:53:20 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58330 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S245294AbjHYNww (ORCPT ); Fri, 25 Aug 2023 09:52:52 -0400 Received: from mail-yw1-x114a.google.com (mail-yw1-x114a.google.com [IPv6:2607:f8b0:4864:20::114a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8C5C71BF2 for ; Fri, 25 Aug 2023 06:52:49 -0700 (PDT) Received: by mail-yw1-x114a.google.com with SMTP id 00721157ae682-59222a14ee1so14230697b3.1 for ; Fri, 25 Aug 2023 06:52:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20221208; t=1692971568; x=1693576368; h=to:from:subject:references:mime-version:message-id:in-reply-to:date :from:to:cc:subject:date:message-id:reply-to; bh=yz2521idZC7Ay4NTiFNMcjkHoMtrhiUpIqFT4nzfTmE=; b=0AunxMJ5JrYhSEA4cgoez5aff329p2u0qUTtTGSRLq2SplQPZl2c8/enaLOBTyHLjQ r7b/rLOpzys+paR7Y85n34cQY447OQirzrG61h7t+1gKseD2n3fLhbZv8QYQyYg8xR5X UeYnPG75D+Orx0IjkwexKnDEqMb42KW0X+3IBMBItUEryxtFP1AEysK+wEhMN+c5MuNo c+uw3dekv1kdWXPIwuwQpZWvyaVK+NQ4wB6C0KwjBU8XGtf83dJuJZDZ5ZXXrnXeZv3c KpUKJu+NSKvNb+udKQknHihvsPrl4HF+YbCWVhBwDjp08V+RShz7No7roR/8bivvNL8l tThg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692971568; x=1693576368; 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=yz2521idZC7Ay4NTiFNMcjkHoMtrhiUpIqFT4nzfTmE=; b=h6VU2hsYVArlB/cwGx1arx6uier0k/RbO8YtfSaKfHI9Tg4hEqH1mZHoe2sYAWm1ht uo0OGRBVmV73lWlaqumhZJdfKfOI4s9Vf7KtMD+Asog1Ts3pOPM0kSv7OWtfmD44y6bF 42w/P35+qixwi67ZB6BeYNcslMXctmLYHOyyLe2Rp8slZBMxdeSCvzJYTBbfO55eh1Hr nag7m/GCsxxAF4Sklq+3vnZaxHcpVkbyylqQFoXyTXlKxoXFIV1KGyf7Uh6nlV8bsqkh pkg63udQYaLy/hiiaavDcnVG/U6Riwgqc67Yazb0c2DsiLh2Pp95vK2NO9WY37E/3KQx V2/g== X-Gm-Message-State: AOJu0YyXvkEKOScW7gGYXK1wqdB1nFQoEpY6NAZ6NFbzF0n1WrigZOaN fBHXFEqVAl3wdg8cgVt+WKREhNSA2DJF X-Google-Smtp-Source: AGHT+IEavhrzVUBgSbd5oQVfaTjO5xw1qWaeWKlO9hFpJKmupPzNQ5GTmZmCQT8IarmYwGat9m9gadAI34QI X-Received: from irogers.svl.corp.google.com ([2620:15c:2a3:200:449e:d47b:bc6b:cb6b]) (user=irogers job=sendgmr) by 2002:a81:7647:0:b0:586:4eae:b943 with SMTP id j7-20020a817647000000b005864eaeb943mr526627ywk.8.1692971568776; Fri, 25 Aug 2023 06:52:48 -0700 (PDT) Date: Fri, 25 Aug 2023 06:52:36 -0700 In-Reply-To: <20230825135237.921058-1-irogers@google.com> Message-Id: <20230825135237.921058-2-irogers@google.com> Mime-Version: 1.0 References: <20230825135237.921058-1-irogers@google.com> X-Mailer: git-send-email 2.42.0.rc2.253.gd59a3bf2b4-goog Subject: [PATCH v5 1/2] perf pmus: Sort pmus by name then suffix From: Ian Rogers To: Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Mark Rutland , Alexander Shishkin , Jiri Olsa , Namhyung Kim , Ian Rogers , Adrian Hunter , Kan Liang , Ravi Bangoria , Kajol Jain , John Garry , linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org Content-Type: text/plain; charset="UTF-8" Precedence: bulk List-ID: X-Mailing-List: linux-perf-users@vger.kernel.org Sort PMUs by name. If two PMUs have the same name but differ by suffix, sort the suffixes numerically. For example, "breakpoint" comes before "cpu", "uncore_imc_free_running_0" comes before "uncore_imc_free_running_1". Suffixes need to be treated specially as otherwise they will be ordered like 0, 1, 10, 11, .., 2, 20, 21, .., etc. Only PMUs starting 'uncore_' are considered to have a potential suffix. Sorting of PMUs is done so that later patches can skip duplicate uncore PMUs that differ only by there suffix. Signed-off-by: Ian Rogers --- tools/perf/util/pmus.c | 48 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) diff --git a/tools/perf/util/pmus.c b/tools/perf/util/pmus.c index 4dd5912617ff..b1f6a64693fe 100644 --- a/tools/perf/util/pmus.c +++ b/tools/perf/util/pmus.c @@ -1,8 +1,10 @@ // SPDX-License-Identifier: GPL-2.0 #include +#include #include #include #include +#include #include #include #include @@ -33,6 +35,31 @@ static LIST_HEAD(other_pmus); static bool read_sysfs_core_pmus; static bool read_sysfs_all_pmus; +static int pmu_name_len_no_suffix(const char *str, unsigned long *num) +{ + int orig_len, len; + + orig_len = len = strlen(str); + + /* Non-uncore PMUs have their full length, for example, i915. */ + if (strncmp(str, "uncore_", 7)) + return len; + + /* + * Count trailing digits and '_', if '_{num}' suffix isn't present use + * the full length. + */ + while (len > 0 && isdigit(str[len - 1])) + len--; + + if (len > 0 && len != orig_len && str[len - 1] == '_') { + if (num) + *num = strtoul(&str[len], NULL, 10); + return len - 1; + } + return orig_len; +} + void perf_pmus__destroy(void) { struct perf_pmu *pmu, *tmp; @@ -122,6 +149,25 @@ static struct perf_pmu *perf_pmu__find2(int dirfd, const char *name) return perf_pmu__lookup(core_pmu ? &core_pmus : &other_pmus, dirfd, name); } +static int pmus_cmp(void *priv __maybe_unused, + const struct list_head *lhs, const struct list_head *rhs) +{ + unsigned long lhs_num, rhs_num; + struct perf_pmu *lhs_pmu = container_of(lhs, struct perf_pmu, list); + struct perf_pmu *rhs_pmu = container_of(rhs, struct perf_pmu, list); + const char *lhs_pmu_name = lhs_pmu->name ?: ""; + const char *rhs_pmu_name = rhs_pmu->name ?: ""; + int lhs_pmu_name_len = pmu_name_len_no_suffix(lhs_pmu_name, &lhs_num); + int rhs_pmu_name_len = pmu_name_len_no_suffix(rhs_pmu_name, &rhs_num); + int ret = strncmp(lhs_pmu_name, rhs_pmu_name, + lhs_pmu_name_len < rhs_pmu_name_len ? lhs_pmu_name_len : rhs_pmu_name_len); + + if (lhs_pmu_name_len != rhs_pmu_name_len || ret != 0 || lhs_pmu_name_len == 0) + return ret; + + return lhs_num < rhs_num ? -1 : (lhs_num > rhs_num ? 1 : 0); +} + /* Add all pmus in sysfs to pmu list: */ static void pmu_read_sysfs(bool core_only) { @@ -156,6 +202,8 @@ static void pmu_read_sysfs(bool core_only) if (!perf_pmu__create_placeholder_core_pmu(&core_pmus)) pr_err("Failure to set up any core PMUs\n"); } + list_sort(NULL, &core_pmus, pmus_cmp); + list_sort(NULL, &other_pmus, pmus_cmp); if (!list_empty(&core_pmus)) { read_sysfs_core_pmus = true; if (!core_only) -- 2.42.0.rc2.253.gd59a3bf2b4-goog