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 C724FC4167B for ; Thu, 15 Dec 2022 06:48:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229684AbiLOGsV (ORCPT ); Thu, 15 Dec 2022 01:48:21 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47070 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229580AbiLOGsP (ORCPT ); Thu, 15 Dec 2022 01:48:15 -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 037295C0E3 for ; Wed, 14 Dec 2022 22:48:15 -0800 (PST) Received: by mail-yb1-xb4a.google.com with SMTP id r7-20020a25c107000000b006ff55ac0ee7so2607743ybf.15 for ; Wed, 14 Dec 2022 22:48:14 -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=xuUtjr5keE4Mx0YV4hQdh4hNFeDESLw77jscKu2CoiM=; b=GEnpJQtlsZpw6NLVnvIBmIHsHDx+p6RULDeC/EcVcDgLV2/2p90+FG2YlMWaRea5Co 2d20WQCEk47gD6g/m7kLqm1UEYQ6bccY72F9Fb9v5oraS9FnEAzymvvXDQ5J+Ca4vM2o 4QwJato9O0KtmPipcH+GQjG2DkZeXxTf9hs5+Mz9YsU/gdPwyV5F8hpKeiMIdlHScisJ g9gOAZlpCBwui0Tgc4ti3QWs6ib1odbtZf0SdBuvnsuMIRoz5b+w4QiolhR4TARx/LLM bIehm+KxboUKQtv2i9v6clt+e8CgvucKODSFGywAOdRQLa19Jqj7FsK+4KeYxv8jDE9c htkg== 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=xuUtjr5keE4Mx0YV4hQdh4hNFeDESLw77jscKu2CoiM=; b=s/qeNV9mrCm7Om/CKQmUAYcHjoPuOvCSeYSUklV9YMjEYppZTD69W2iv8yy29YiU+o k1B4Dn8GIoirUlOkf3zz15yh91JJ7QlvSrdshp6so1mmHM8BEcQFgBoaxo0+1Ie5ffD4 kRJ+Xh4B1LW6gkjHl+ikYM5qyq9aRhh7/PrBBWyanWi1l8FkcZucMJ5+LnMJF8KcpcJY RqPW9agjdGTR7OfS4PZqAkhgP6C9/0h/jWfKMcsRZtIIgtzzgMLEizhNeFMKt+H4kKpl GNveZivgOhLdk8/xADclkH1sMjwxganGeN3YDME7VPHMQIViu4EGA0I8ZHegeT8MoJ6O 4d0Q== X-Gm-Message-State: ANoB5pl2Vut2Dn3CGXt6O0f8KtSJ15DndNWhUahous5+n/uV8mlOHHsr vIc5TLGmFYOfYQPyN3c2iRrMVwGEUXOl X-Google-Smtp-Source: AA0mqf7OhL1VF2ITBiOTY3cwlpDgR7yE/LOv8GsT53STm3YLOWnWIuq7il6n0tTYVo642JjxhIrzKNw5jy+8 X-Received: from irogers.svl.corp.google.com ([2620:15c:2d4:203:c7dc:d96f:4f9:f59d]) (user=irogers job=sendgmr) by 2002:a25:ab73:0:b0:6f3:7b95:353 with SMTP id u106-20020a25ab73000000b006f37b950353mr60929460ybi.394.1671086894259; Wed, 14 Dec 2022 22:48:14 -0800 (PST) Date: Wed, 14 Dec 2022 22:47:24 -0800 In-Reply-To: <20221215064755.1620246-1-irogers@google.com> Message-Id: <20221215064755.1620246-2-irogers@google.com> Mime-Version: 1.0 References: <20221215064755.1620246-1-irogers@google.com> X-Mailer: git-send-email 2.39.0.314.g84b9a713c41-goog Subject: [PATCH v1 01/32] perf test pmu-events: Fake PMU metric workaround From: Ian Rogers To: Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Mark Rutland , Alexander Shishkin , Jiri Olsa , Namhyung Kim , Adrian Hunter , Kan Liang , Xing Zhengjun , linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org Cc: John Garry , Stephane Eranian , Perry Taylor , Caleb Biggers , Ian Rogers Content-Type: text/plain; charset="UTF-8" Precedence: bulk List-ID: X-Mailing-List: linux-perf-users@vger.kernel.org We test metrics with fake events with fake values. The fake values may yield division by zero and so we count both up and down to try to avoid this. Unfortunately this isn't sufficient for some metrics and so don't fail the test for them. Add the metric name to debug output. Signed-off-by: Ian Rogers --- tools/perf/tests/pmu-events.c | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/tools/perf/tests/pmu-events.c b/tools/perf/tests/pmu-events.c index f7b9dbbad97f..a29dd6af8d33 100644 --- a/tools/perf/tests/pmu-events.c +++ b/tools/perf/tests/pmu-events.c @@ -959,7 +959,7 @@ static struct test_metric metrics[] = { { "(imx8_ddr0@read\\-cycles@ + imx8_ddr0@write\\-cycles@)", }, }; -static int metric_parse_fake(const char *str) +static int metric_parse_fake(const char *metric_name, const char *str) { struct expr_parse_ctx *ctx; struct hashmap_entry *cur; @@ -968,7 +968,7 @@ static int metric_parse_fake(const char *str) size_t bkt; int i; - pr_debug("parsing '%s'\n", str); + pr_debug("parsing '%s': '%s'\n", metric_name, str); ctx = expr__ctx_new(); if (!ctx) { @@ -1006,8 +1006,13 @@ static int metric_parse_fake(const char *str) hashmap__for_each_entry(ctx->ids, cur, bkt) expr__add_id_val(ctx, strdup(cur->key), i--); if (expr__parse(&result, ctx, str)) { - pr_err("expr__parse failed\n"); - ret = -1; + pr_err("expr__parse failed for %s\n", metric_name); + /* The following have hard to avoid divide by zero. */ + if (!strcmp(metric_name, "tma_clears_resteers") || + !strcmp(metric_name, "tma_mispredicts_resteers")) + ret = 0; + else + ret = -1; } } @@ -1023,7 +1028,7 @@ static int test__parsing_fake_callback(const struct pmu_event *pe, if (!pe->metric_expr) return 0; - return metric_parse_fake(pe->metric_expr); + return metric_parse_fake(pe->metric_name, pe->metric_expr); } /* @@ -1037,7 +1042,7 @@ static int test__parsing_fake(struct test_suite *test __maybe_unused, int err = 0; for (size_t i = 0; i < ARRAY_SIZE(metrics); i++) { - err = metric_parse_fake(metrics[i].str); + err = metric_parse_fake("", metrics[i].str); if (err) return err; } -- 2.39.0.314.g84b9a713c41-goog