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 3EED1C77B78 for ; Wed, 26 Apr 2023 07:05:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239825AbjDZHFX (ORCPT ); Wed, 26 Apr 2023 03:05:23 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40160 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239841AbjDZHEx (ORCPT ); Wed, 26 Apr 2023 03:04:53 -0400 Received: from mail-yw1-x1149.google.com (mail-yw1-x1149.google.com [IPv6:2607:f8b0:4864:20::1149]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7C3E3469C for ; Wed, 26 Apr 2023 00:03:44 -0700 (PDT) Received: by mail-yw1-x1149.google.com with SMTP id 00721157ae682-55605fd3e19so108465177b3.1 for ; Wed, 26 Apr 2023 00:03:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20221208; t=1682492613; x=1685084613; h=cc:to:from:subject:references:mime-version:message-id:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=jCecFHyWQNvHuSdHOLhofsJDyWJSs+06+TmI+QyaYN0=; b=gVSbPwm9D++gi16FNhrLrEpbJ4BaXZJo0eStxrpKxGYv1ewUpb7O1ryFcx0Bdpnwtn w3FTA7rf4nK5usLkFfxLN5rpzeT5NhrPB1RwBe8oEjT9foVHO9xl41XuYTFc3ekU9Erg Gx5BjF/recceXW4EOrgjT25VFMF3N1vtfwnQsRYoVifEhhnjjxnwZUHmaJMR5fdUIdbV 9OdZyzC9CPhA62OyTeIIpLSH4H+btZ/thE7SbMXJm6kp1Tw3deTgGFRxtIoE+k0Fj6Lz KQ2bTe/NAkHJIaCmmyBY7+kXLx6D/yRpLsn4LE2oiw2eBYmKv4JrnlDxIt5McOuBTkjd ovuw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1682492613; x=1685084613; 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=jCecFHyWQNvHuSdHOLhofsJDyWJSs+06+TmI+QyaYN0=; b=dSJ5xPl80z4kPra/DR06kW9tmZ0sWmeh639Z4EhQilwMbLMTQboZiGZjMk3Qw5D5M0 9I7ZHV9sVEh3gFBfVc1IhtDOixFhTBMIMluM4oS2umTFAf9qmU04XgU3XxAxq/PkRVZg WBYjs4tN0r1RdhRB991YwqkQRrlg32nR8VunVrc1z+AWuqZOmuo8zNMor2QmqTGs+Cvf hyXvffw5xOr0NSb+kpNGV6kmkjYKSXabkGHkTqI70SWPUqtwjs4lCXqrlfUeK9wF+FHE XT48iv+4bQ3adoakedDcH2JkmCRE2nt8gjyIo53HuyuUVHK8fU2hP3r0zLE7hR5HzthR WJRA== X-Gm-Message-State: AAQBX9faX532P54+ks9Cyrvv0UKFgwuFPN2U1sHwySF57VmcTV7B0PtY E1Ot2y/Be4urIoMvCQsrbHprvVbOfZjC X-Google-Smtp-Source: AKy350av7NFvDj+rflxYfossfIVHE6HTwADYYNuv31cSDOU9VOVUh8RcucpE14qEPxzBHfB0pgVp8mTzmn4E X-Received: from irogers.svl.corp.google.com ([2620:15c:2d4:203:144f:e890:2b29:48d9]) (user=irogers job=sendgmr) by 2002:a81:b725:0:b0:555:f33e:e346 with SMTP id v37-20020a81b725000000b00555f33ee346mr10340975ywh.6.1682492613034; Wed, 26 Apr 2023 00:03:33 -0700 (PDT) Date: Wed, 26 Apr 2023 00:00:29 -0700 In-Reply-To: <20230426070050.1315519-1-irogers@google.com> Message-Id: <20230426070050.1315519-20-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 19/40] perf test x86 hybrid: Don't assume evlist order 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 Switch to a loop rather than depend on evlist order for raw events test. Signed-off-by: Ian Rogers --- tools/perf/arch/x86/tests/hybrid.c | 26 ++++++++++++-------------- 1 file changed, 12 insertions(+), 14 deletions(-) diff --git a/tools/perf/arch/x86/tests/hybrid.c b/tools/perf/arch/x86/tests/hybrid.c index 0f99cfd116ee..66486335652f 100644 --- a/tools/perf/arch/x86/tests/hybrid.c +++ b/tools/perf/arch/x86/tests/hybrid.c @@ -11,6 +11,11 @@ static bool test_config(const struct evsel *evsel, __u64 expected_config) return (evsel->core.attr.config & PERF_HW_EVENT_MASK) == expected_config; } +static bool test_perf_config(const struct perf_evsel *evsel, __u64 expected_config) +{ + return (evsel->attr.config & PERF_HW_EVENT_MASK) == expected_config; +} + static int test__hybrid_hw_event_with_pmu(struct evlist *evlist) { struct evsel *evsel = evlist__first(evlist); @@ -93,22 +98,15 @@ static int test__hybrid_group_modifier1(struct evlist *evlist) static int test__hybrid_raw1(struct evlist *evlist) { - struct evsel *evsel = evlist__first(evlist); + struct perf_evsel *evsel; - if (!perf_pmu__hybrid_mounted("cpu_atom")) { - TEST_ASSERT_VAL("wrong number of entries", 1 == evlist->core.nr_entries); - TEST_ASSERT_VAL("wrong type", PERF_TYPE_RAW == evsel->core.attr.type); - TEST_ASSERT_VAL("wrong config", test_config(evsel, 0x1a)); - return TEST_OK; - } + perf_evlist__for_each_evsel(&evlist->core, evsel) { + struct perf_pmu *pmu = perf_pmu__find_by_type(evsel->attr.type); - TEST_ASSERT_VAL("wrong number of entries", 2 == evlist->core.nr_entries); - TEST_ASSERT_VAL("wrong type", PERF_TYPE_RAW == evsel->core.attr.type); - TEST_ASSERT_VAL("wrong config", test_config(evsel, 0x1a)); - - /* The type of second event is randome value */ - evsel = evsel__next(evsel); - TEST_ASSERT_VAL("wrong config", test_config(evsel, 0x1a)); + TEST_ASSERT_VAL("missing pmu", pmu); + TEST_ASSERT_VAL("unexpected pmu", !strncmp(pmu->name, "cpu_", 4)); + TEST_ASSERT_VAL("wrong config", test_perf_config(evsel, 0x1a)); + } return TEST_OK; } -- 2.40.1.495.gc816e09b53d-goog