Received: by 2002:a05:6358:9144:b0:117:f937:c515 with SMTP id r4csp3034566rwr; Fri, 28 Apr 2023 22:38:32 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5bgT3l5qiG0rifBJDS607i/3Ozw1EcbAUgioX8mdZjB+QvmFGycw/HE+KJuiAg7ZmfTsiK X-Received: by 2002:a05:6a20:748a:b0:f1:c0a1:8035 with SMTP id p10-20020a056a20748a00b000f1c0a18035mr9908022pzd.0.1682746711764; Fri, 28 Apr 2023 22:38:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1682746711; cv=none; d=google.com; s=arc-20160816; b=OlQaJI9NrtvY1jCpzQ+mEHr8ycN24UsAbxrhh5WG1ZsO0g3vvnNJMdC9SCP0k4ZVKp xT9jJNzw1K//mb9gQamCcqAPgKKsP/B0FLTV3Hw252fGaSlUex/E+gx0bgb26GJXN2FB DiQK9Pg+tLsQ3BtJizDhJfkXuhpAyjWxxrSSQTI7ByoD6NV+zW6FLYgjsIzAEtU0Xsps FmP8WAi6ryknOgFcHUDYcESwZgCZF49QTY6eCNT6TDwnF3YCKUi4flC7hoWZkhO+qjjZ fin5gyn9/Etj3k7WUWHG8PcFMtG14iZsj/nZ2NzaC83uDolpsq3PeXsq5G2klXvtELss 8cvw== 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=m0dr9db51Jq/RsQdl+jWHc6lduK3C41zW9xfdl5Qlv8=; b=wRp4/SFJUAN2T3wF+fx/YwjT2ynF+fC5qPuHwnQ0UHvz1duO/eZdu5U+5zIleICW3H Lxd+RcyTo93ap+XVFcXT+mkkQ77gORhdXgwhs6MVA0DbXMlpbKwYufW8clY1THVO7z65 855Ca+esmqMwjWphODr+h8XGDonmOl/LJ9ntX1DEr6H36dAZdSAEpoD+/M+tFHS+QJFG HLDxTdq0iEH+1Vi9Q4/e4Oc0PhlbV0Lxdq9gW5KHcsNn66bEjm2tu9SHmCACkxfmyOGc 2LtRRqcoyzPcQESCjt1zIleJ/voVSBtrb5tEAkGBwHHjiaQ/Jm0BLV6MUY/KjSfEJEF3 mYPg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20221208 header.b=IF32jJtl; 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 d24-20020a63ed18000000b00528ca114e67si1705204pgi.898.2023.04.28.22.38.18; Fri, 28 Apr 2023 22:38:31 -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=IF32jJtl; 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 S1347243AbjD2Fhn (ORCPT + 99 others); Sat, 29 Apr 2023 01:37:43 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39156 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1347242AbjD2Fhi (ORCPT ); Sat, 29 Apr 2023 01:37:38 -0400 Received: from mail-pj1-x1049.google.com (mail-pj1-x1049.google.com [IPv6:2607:f8b0:4864:20::1049]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0801D40D1 for ; Fri, 28 Apr 2023 22:37:03 -0700 (PDT) Received: by mail-pj1-x1049.google.com with SMTP id 98e67ed59e1d1-24b27b7f627so324695a91.1 for ; Fri, 28 Apr 2023 22:37:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20221208; t=1682746618; x=1685338618; h=cc:to:from:subject:references:mime-version:message-id:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=m0dr9db51Jq/RsQdl+jWHc6lduK3C41zW9xfdl5Qlv8=; b=IF32jJtlKt0mk4VFHHYiUoKdPwSbXXo5THaU6vN6gcZwZdOO9fqvBctRSkjOXbmk8y foL7NH9qqPTewZii7QQyaOT0sG6ifb5sCGsN5HyMFLSgMll429tDb/VGalOs24AKQ9jO L8a6qC2XHUl22iuGzo4VcGoyI856HYfxO47DHiFu66SIZyzVr0tHBNuQtPGzxePIN1tk DfIAgOVmtVem73q6IVcNMU6fRXPGvxgqwQXP86PSuPrno/zY13opEhmlSdo1lWG4LZcX ulbtRs8tLWET9R7eh60Wkq3/NRen+417PJVRWRntKrP/fjsii9an5JBSBgpVNQL1EUPv nYrw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1682746618; x=1685338618; 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=m0dr9db51Jq/RsQdl+jWHc6lduK3C41zW9xfdl5Qlv8=; b=WtZvtydHwvomxOc4kAlucYuwpbw2/9i+NJv9/5HcrbWbp5Dmf/B2p9ld2oNtnPgI/e 6HZ8QKqjjxXEPTRnb5PM4w24RePhn+2C86RUdFW38xQhG5lft9YCMBSC0ytcPBGAHhp5 8Ra0+me3iAE7Y2RI7ZIcl1T2COBkSiQNoj31Ouz+y22Ssw4vayBH4EKaT87Uvs2Kqzan 7CKrv1XgNvzyGBxW72T2pyd1f9jweXN7TwGyy46oWaMCLYOAH6+fmZ0lLnNBEyTyH6Vt /eRLr7/KBkXlre1l7ogY5HCOs7Y1USdqVKF7YEt6ZZcdb4gZj/UTJULXZigWKK97+IGg lugw== X-Gm-Message-State: AC+VfDztBVotEhZnHixoyY97etZnH7qJqcQNvJ3fBX3M90oBNwkX9Rda IwV2b4oK1Y6rLR43XBMrL1uaV2ucUgLB X-Received: from irogers.svl.corp.google.com ([2620:15c:2d4:203:c563:7e28:fb7c:bce3]) (user=irogers job=sendgmr) by 2002:a17:90a:73cb:b0:24d:df34:a8f5 with SMTP id n11-20020a17090a73cb00b0024ddf34a8f5mr66928pjk.5.1682746618680; Fri, 28 Apr 2023 22:36:58 -0700 (PDT) Date: Fri, 28 Apr 2023 22:34:32 -0700 In-Reply-To: <20230429053506.1962559-1-irogers@google.com> Message-Id: <20230429053506.1962559-13-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 12/46] perf test: Test more sysfs 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,URIBL_BLOCKED, 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 Parse events for all PMUs, and not just cpu, in test "Parsing of all PMU events from sysfs". Signed-off-by: Ian Rogers --- tools/perf/tests/parse-events.c | 121 +++++++++++++++++--------------- 1 file changed, 65 insertions(+), 56 deletions(-) diff --git a/tools/perf/tests/parse-events.c b/tools/perf/tests/parse-events.c index 8068cfd89b84..35b35a5c795c 100644 --- a/tools/perf/tests/parse-events.c +++ b/tools/perf/tests/parse-events.c @@ -7,6 +7,7 @@ #include "debug.h" #include "pmu.h" #include "pmu-hybrid.h" +#include "pmus.h" #include #include #include "fncache.h" @@ -2225,74 +2226,82 @@ static int test_pmu(void) static int test__pmu_events(struct test_suite *test __maybe_unused, int subtest __maybe_unused) { - struct stat st; - char path[PATH_MAX]; - struct dirent *ent; - DIR *dir; - int ret; + struct perf_pmu *pmu; + int ret = TEST_OK; - if (!test_pmu()) - return TEST_SKIP; + perf_pmus__for_each_pmu(pmu) { + struct stat st; + char path[PATH_MAX]; + struct dirent *ent; + DIR *dir; + int err; - snprintf(path, PATH_MAX, "%s/bus/event_source/devices/cpu/events/", - sysfs__mountpoint()); + snprintf(path, PATH_MAX, "%s/bus/event_source/devices/%s/events/", + sysfs__mountpoint(), pmu->name); - ret = stat(path, &st); - if (ret) { - pr_debug("omitting PMU cpu events tests: %s\n", path); - return TEST_OK; - } + err = stat(path, &st); + if (err) { + pr_debug("skipping PMU %s events tests: %s\n", pmu->name, path); + ret = combine_test_results(ret, TEST_SKIP); + continue; + } - dir = opendir(path); - if (!dir) { - pr_debug("can't open pmu event dir: %s\n", path); - return TEST_FAIL; - } + dir = opendir(path); + if (!dir) { + pr_debug("can't open pmu event dir: %s\n", path); + ret = combine_test_results(ret, TEST_SKIP); + continue; + } - ret = TEST_OK; - while ((ent = readdir(dir))) { - struct evlist_test e = { .name = NULL, }; - char name[2 * NAME_MAX + 1 + 12 + 3]; - int test_ret; + while ((ent = readdir(dir))) { + struct evlist_test e = { .name = NULL, }; + char name[2 * NAME_MAX + 1 + 12 + 3]; + int test_ret; - /* Names containing . are special and cannot be used directly */ - if (strchr(ent->d_name, '.')) - continue; + /* Names containing . are special and cannot be used directly */ + if (strchr(ent->d_name, '.')) + continue; - snprintf(name, sizeof(name), "cpu/event=%s/u", ent->d_name); + snprintf(name, sizeof(name), "%s/event=%s/u", pmu->name, ent->d_name); - e.name = name; - e.check = test__checkevent_pmu_events; + e.name = name; + e.check = test__checkevent_pmu_events; - test_ret = test_event(&e); - if (test_ret != TEST_OK) { - pr_debug("Test PMU event failed for '%s'", name); - ret = combine_test_results(ret, test_ret); - } - /* - * Names containing '-' are recognized as prefixes and suffixes - * due to '-' being a legacy PMU separator. This fails when the - * prefix or suffix collides with an existing legacy token. For - * example, branch-brs has a prefix (branch) that collides with - * a PE_NAME_CACHE_TYPE token causing a parse error as a suffix - * isn't expected after this. As event names in the config - * slashes are allowed a '-' in the name we check this works - * above. - */ - if (strchr(ent->d_name, '-')) - continue; + test_ret = test_event(&e); + if (test_ret != TEST_OK) { + pr_debug("Test PMU event failed for '%s'", name); + ret = combine_test_results(ret, test_ret); + } - snprintf(name, sizeof(name), "%s:u,cpu/event=%s/u", ent->d_name, ent->d_name); - e.name = name; - e.check = test__checkevent_pmu_events_mix; - test_ret = test_event(&e); - if (test_ret != TEST_OK) { - pr_debug("Test PMU event failed for '%s'", name); - ret = combine_test_results(ret, test_ret); + if (!is_pmu_core(pmu->name)) + continue; + + /* + * Names containing '-' are recognized as prefixes and suffixes + * due to '-' being a legacy PMU separator. This fails when the + * prefix or suffix collides with an existing legacy token. For + * example, branch-brs has a prefix (branch) that collides with + * a PE_NAME_CACHE_TYPE token causing a parse error as a suffix + * isn't expected after this. As event names in the config + * slashes are allowed a '-' in the name we check this works + * above. + */ + if (strchr(ent->d_name, '-')) + continue; + + snprintf(name, sizeof(name), "%s:u,%s/event=%s/u", + ent->d_name, pmu->name, ent->d_name); + e.name = name; + e.check = test__checkevent_pmu_events_mix; + test_ret = test_event(&e); + if (test_ret != TEST_OK) { + pr_debug("Test PMU event failed for '%s'", name); + ret = combine_test_results(ret, test_ret); + } } - } - closedir(dir); + closedir(dir); + } return ret; } -- 2.40.1.495.gc816e09b53d-goog