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 79060C77B60 for ; Wed, 26 Apr 2023 07:03:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239706AbjDZHDg (ORCPT ); Wed, 26 Apr 2023 03:03:36 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39302 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239774AbjDZHC5 (ORCPT ); Wed, 26 Apr 2023 03:02:57 -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 38D2D449F for ; Wed, 26 Apr 2023 00:02:16 -0700 (PDT) Received: by mail-yw1-x114a.google.com with SMTP id 00721157ae682-54f8828295dso101565887b3.0 for ; Wed, 26 Apr 2023 00:02:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20221208; t=1682492534; x=1685084534; h=cc:to:from:subject:references:mime-version:message-id:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=/EqV6ROsM4xqPMDxDdZxTjIhMdyygru22Sq7RFV4HJk=; b=a1rQK22SCV68D5GRHhokTQZEsHOGEwQf0pAUVz9tVBZVzw4H4i9keDpVMX/gGYqHey g7VBfmFfr2FAH2eXPshJTgylzg3CSqdOwHXmPY42QbzIiMi4eHNvwlUILbpt/TbFGqWj pU/3gO96SvDr5CONL4ccQVZ4G2B0GaDa4YZMsIe152cE6Ec9oQqUv7sx5ZHB8lUwKWPy E8EpY0PDwTH7MwAhZSZvuF7T3dzNSDFZMW1tqjXieH06BbJHO2bok5V15URMr5KH+ffN 9T3/13G0cv6BSuyN0sNzlXXFj1VZxlDrffNu8Q2vn7s8RyhNCdeaz97N81PiR+lUu8+g IIaQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1682492534; x=1685084534; 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=/EqV6ROsM4xqPMDxDdZxTjIhMdyygru22Sq7RFV4HJk=; b=HEDqoVoVB7sJU/cAYbBj6htCqjBIEVmo6RGa+1xLAzbM7bQ4vk+sU0t4fFIWDA/J7V rB+hmJiIjMWfELOb3548RthAGBABhdUMC072M1vK9c1NduDJn4QeDDUrSTiIApRkOLi9 46BE2QsC3gRXdx4H7FQty5lXhcsxC8BS+JNDZ8JKilptfl+ZjUldPJ/wUYUL2hpmsYvj I1HTcJ5LCO3rtbg5lFAGBzbOwaRKSNJ1A/Xebc+WRQhsC0/aLtGkt1XLjNPHYG3BfGvY hGM35EWxlx90gg7QX9L3M2+P9jDqi1VGZ1k4NZULhTsVEE/dRfN+F3Hp3nuy+GRtiwZn +iMQ== X-Gm-Message-State: AAQBX9fXYuO+V+oNqrO88KHI0UguB6YhkuHT2R9l1tjiTKuFRv3qpWVB /yRJM2BdFfAGA50Cm4e9mi4xO+FtJy5z X-Google-Smtp-Source: AKy350bAbbq7mS5fnaTxFGQL1jHQQFhMjkXz8kZQy9Q5C68pW+ia841ySJKZYGmvvMtpp1Xt1kCeTqL7CTVj X-Received: from irogers.svl.corp.google.com ([2620:15c:2d4:203:144f:e890:2b29:48d9]) (user=irogers job=sendgmr) by 2002:a81:aa4b:0:b0:54f:b95f:8999 with SMTP id z11-20020a81aa4b000000b0054fb95f8999mr9088991ywk.6.1682492534461; Wed, 26 Apr 2023 00:02:14 -0700 (PDT) Date: Wed, 26 Apr 2023 00:00:19 -0700 In-Reply-To: <20230426070050.1315519-1-irogers@google.com> Message-Id: <20230426070050.1315519-10-irogers@google.com> Mime-Version: 1.0 References: <20230426070050.1315519-1-irogers@google.com> X-Mailer: git-send-email 2.40.1.495.gc816e09b53d-goog Subject: [PATCH v1 09/40] perf test: Use valid for PMU tests 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" Precedence: bulk List-ID: X-Mailing-List: linux-perf-users@vger.kernel.org Rather than skip all tests in test__events_pmu if PMU cpu isn't present, use the per-test valid test. This allows the running of software PMU tests on hybrid and arm systems. Signed-off-by: Ian Rogers --- tools/perf/tests/parse-events.c | 27 +++++++++------------------ 1 file changed, 9 insertions(+), 18 deletions(-) diff --git a/tools/perf/tests/parse-events.c b/tools/perf/tests/parse-events.c index 385bbbc4a409..08d6b8a3015d 100644 --- a/tools/perf/tests/parse-events.c +++ b/tools/perf/tests/parse-events.c @@ -1430,6 +1430,11 @@ static int test__checkevent_config_cache(struct evlist *evlist) return TEST_OK; } +static bool test__pmu_cpu_valid(void) +{ + return !!perf_pmu__find("cpu"); +} + static bool test__intel_pt_valid(void) { return !!perf_pmu__find("intel_pt"); @@ -1979,21 +1984,25 @@ static const struct evlist_test test__events[] = { static const struct evlist_test test__events_pmu[] = { { .name = "cpu/config=10,config1,config2=3,period=1000/u", + .valid = test__pmu_cpu_valid, .check = test__checkevent_pmu, /* 0 */ }, { .name = "cpu/config=1,name=krava/u,cpu/config=2/u", + .valid = test__pmu_cpu_valid, .check = test__checkevent_pmu_name, /* 1 */ }, { .name = "cpu/config=1,call-graph=fp,time,period=100000/,cpu/config=2,call-graph=no,time=0,period=2000/", + .valid = test__pmu_cpu_valid, .check = test__checkevent_pmu_partial_time_callgraph, /* 2 */ }, { .name = "cpu/name='COMPLEX_CYCLES_NAME:orig=cycles,desc=chip-clock-ticks',period=0x1,event=0x2/ukp", + .valid = test__pmu_cpu_valid, .check = test__checkevent_complex_name, /* 3 */ }, @@ -2209,21 +2218,6 @@ static int test__terms2(struct test_suite *test __maybe_unused, int subtest __ma return test_terms(test__terms, ARRAY_SIZE(test__terms)); } -static int test_pmu(void) -{ - struct stat st; - char path[PATH_MAX]; - int ret; - - snprintf(path, PATH_MAX, "%s/bus/event_source/devices/cpu/format/", - sysfs__mountpoint()); - - ret = stat(path, &st); - if (ret) - pr_debug("omitting PMU cpu tests\n"); - return !ret; -} - static int test__pmu_events(struct test_suite *test __maybe_unused, int subtest __maybe_unused) { struct perf_pmu *pmu; @@ -2305,9 +2299,6 @@ static int test__pmu_events(struct test_suite *test __maybe_unused, int subtest static int test__pmu_events2(struct test_suite *test __maybe_unused, int subtest __maybe_unused) { - if (!test_pmu()) - return TEST_SKIP; - return test_events(test__events_pmu, ARRAY_SIZE(test__events_pmu)); } -- 2.40.1.495.gc816e09b53d-goog