From nobody Sun Sep 14 07:39:08 2025 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 81105C54E94 for ; Thu, 26 Jan 2023 01:21:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229446AbjAZBV3 (ORCPT ); Wed, 25 Jan 2023 20:21:29 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39618 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236492AbjAZBVX (ORCPT ); Wed, 25 Jan 2023 20:21:23 -0500 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 08F5B61D58 for ; Wed, 25 Jan 2023 17:20:50 -0800 (PST) Received: by mail-yb1-xb4a.google.com with SMTP id x188-20020a2531c5000000b00716de19d76bso321332ybx.19 for ; Wed, 25 Jan 2023 17:20:49 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=cc:to:from:subject:references:mime-version:message-id:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=rjltbgFvPXxNxLiYStYE3VCcVG+pja2QaxGJnpw1y/o=; b=VxQifR4eTm/oiq+AtgXObEPg6PbS+FCbU66oTdjhqZ7NOq5U2vhhVAuJG7CJAmTAx4 Lt50WFOtTpTs1TQKLM0aOwhl4/O9QSqsZ7GYnbdd8r+IghyCyr7DL5d6c/hl6Au4KTsM ErRsXqJd/YTXEyZLP90smJmcXZ2wm1RhUX1E2uhwba8PGvyRkWiCtQofEvi/IEOSjYLn WrQqm5BZ6+RZ99ZwhgD8m92fCZeLverYJd/5gsKFa6jFKD1Qm01QpjyXwVbdK1wdSPb8 QXHTuTatMmpI9W2nK87lMLio5oAZirIt7fZGwV+avak9PsioHMSqNPVCTS6ndtiPIQqP D5Qg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=rjltbgFvPXxNxLiYStYE3VCcVG+pja2QaxGJnpw1y/o=; b=eptuxiCuuK6VLr1YPc2zf7jHWnuL2oU+bgT+dY7W2sCFiVQNTVQVxrlbg4kC9RhFa8 4u4qjBkM3MTKHTv61cr0mO9U+vXqxH4h9CewAzQ/dKFCiqYhko1/Jp98SMVbAK6qGN63 DV6Un4jp10LaDRfjUnfPWeabgH8bTQf/Wqs9sMzM+LDPSPl7N3zO5TNQqejA3NCoZUzl FxQzewYIJFnmJBfaH0RuASV0Rj44wR+vvPAFjXFI/IPkChs8LMKo9uj+kaKsuI3PwwUf 0d1XKjvbB1M7uxSfeKyIqcoakotkihNytgLZPoH97d1EQgY3bp7BpZ86+w6pcDCmXxWc RFAA== X-Gm-Message-State: AFqh2kq4h7j/Zc0vBUPUZL/d8D4AJc9I4yP9Bu1/9/UkqbJT0NWR15pS H9Eeev/bjQ1AUftvg1mqsxbaKYfiVScR X-Google-Smtp-Source: AMrXdXsACLfASuysaOm2/S/UHYpvgci8aYMjvrQ5T1As6a7u+QStn1ktC49JQqivsGHwIDxUs3nwQIls/UA1 X-Received: from irogers.svl.corp.google.com ([2620:15c:2d4:203:568d:4d98:b468:b025]) (user=irogers job=sendgmr) by 2002:a81:ec05:0:b0:4fd:413d:204c with SMTP id j5-20020a81ec05000000b004fd413d204cmr2646561ywm.419.1674696041384; Wed, 25 Jan 2023 17:20:41 -0800 (PST) Date: Wed, 25 Jan 2023 17:18:54 -0800 In-Reply-To: <20230126011854.198243-1-irogers@google.com> Message-Id: <20230126011854.198243-13-irogers@google.com> Mime-Version: 1.0 References: <20230126011854.198243-1-irogers@google.com> X-Mailer: git-send-email 2.39.1.456.gfc5497dd1b-goog Subject: [PATCH v4 12/12] perf pmu-events: Fix testing with JEVENTS_ARCH=all From: Ian Rogers To: John Garry , Will Deacon , James Clark , Mike Leach , Leo Yan , Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Mark Rutland , Alexander Shishkin , Jiri Olsa , Namhyung Kim , Adrian Hunter , Kan Liang , Kim Phillips , Florian Fischer , Ravi Bangoria , Xing Zhengjun , Rob Herring , Kang Minchul , linux-arm-kernel@lists.infradead.org, linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org, Sandipan Das , Jing Zhang , linuxppc-dev@lists.ozlabs.org, Kajol Jain Cc: Stephane Eranian , Perry Taylor , Caleb Biggers , Ian Rogers Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" The #slots literal will return NAN when not on ARM64 which causes a perf test failure when not on an ARM64 for a JEVENTS_ARCH=3Dall build: .. 10.4: Parsing of PMU event table metrics with fake PMUs : FAIL= ED! .. Add an is_test boolean so that the failure can be avoided when running as a test. Fixes: acef233b7ca7 ("perf pmu: Add #slots literal support for arm64") Signed-off-by: Ian Rogers --- tools/perf/tests/pmu-events.c | 1 + tools/perf/util/expr.h | 1 + tools/perf/util/expr.l | 8 +++++--- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/tools/perf/tests/pmu-events.c b/tools/perf/tests/pmu-events.c index 962c3c0d53ba..accf44b3d968 100644 --- a/tools/perf/tests/pmu-events.c +++ b/tools/perf/tests/pmu-events.c @@ -950,6 +950,7 @@ static int metric_parse_fake(const char *metric_name, c= onst char *str) pr_debug("expr__ctx_new failed"); return TEST_FAIL; } + ctx->sctx.is_test =3D true; if (expr__find_ids(str, NULL, ctx) < 0) { pr_err("expr__find_ids failed\n"); return -1; diff --git a/tools/perf/util/expr.h b/tools/perf/util/expr.h index 029271540fb0..eaa44b24c555 100644 --- a/tools/perf/util/expr.h +++ b/tools/perf/util/expr.h @@ -9,6 +9,7 @@ struct expr_scanner_ctx { char *user_requested_cpu_list; int runtime; bool system_wide; + bool is_test; }; =20 struct expr_parse_ctx { diff --git a/tools/perf/util/expr.l b/tools/perf/util/expr.l index 0168a9637330..72ff4f3d6d4b 100644 --- a/tools/perf/util/expr.l +++ b/tools/perf/util/expr.l @@ -84,9 +84,11 @@ static int literal(yyscan_t scanner, const struct expr_s= canner_ctx *sctx) YYSTYPE *yylval =3D expr_get_lval(scanner); =20 yylval->num =3D expr__get_literal(expr_get_text(scanner), sctx); - if (isnan(yylval->num)) - return EXPR_ERROR; - + if (isnan(yylval->num)) { + if (!sctx->is_test) + return EXPR_ERROR; + yylval->num =3D 1; + } return LITERAL; } %} --=20 2.39.1.456.gfc5497dd1b-goog