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 D41BDCCA473 for ; Fri, 22 Jul 2022 22:32:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236838AbiGVWcz (ORCPT ); Fri, 22 Jul 2022 18:32:55 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52884 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236792AbiGVWcy (ORCPT ); Fri, 22 Jul 2022 18:32:54 -0400 Received: from mail-yb1-xb49.google.com (mail-yb1-xb49.google.com [IPv6:2607:f8b0:4864:20::b49]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E9B54A6FBF for ; Fri, 22 Jul 2022 15:32:53 -0700 (PDT) Received: by mail-yb1-xb49.google.com with SMTP id s6-20020a25c206000000b0066ebb148de6so4622155ybf.15 for ; Fri, 22 Jul 2022 15:32:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=date:in-reply-to:message-id:mime-version:references:subject:from:to :cc; bh=JzNZf8+4+AkLiixfXHUf0Tr6YoyJNaYpbyf1w4wer88=; b=HXPy3Q7C5JFeD8geWVrtDOj5m6jzJnHuooELgwjqkoEsM6EpZlzGFOVPo3skzttWlr cJIB67AwmO/WGtRlA/FMWxH+BK+c5D+DgOePQaQZSuUY+yWjtgLB7KaOe9E+Fwqpzy20 DLkYKAH1mf4XQ6OeECdDAu0CqxqxwFrFJ1uwS9eaJwioqAKgz1n4pJuhc8OIfxnNuAxO 4bzQ7Om4x7Z/yve2h5KXPdofNZYLkt69gE8YtMNBY70mUKv8YOBRgtHC/3VJFOPuBmLc ShJnpd2AXE0MX8Qu1aG7wTrWiHjV9fi3jUvgmvr31uNjr3KRHcUTm7xopWVzW2YLPbef LNWQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=JzNZf8+4+AkLiixfXHUf0Tr6YoyJNaYpbyf1w4wer88=; b=42jMKCD8heQSBY0sdY2CPxGdTUOjLYD4VcVdlTeqR0Ttms1NjpG5jJMGECJEnbjZto nd84t02YR+Imb9vHYf55VV9nkE/56ixr/1LMRYoxOO5pzHWpYEaxvMbbXlaZYAVdved2 dlUiET9k0s7pTtR5xqIWpY87etQM1Hxft7i8CL81U13snB8re7Iw6r5GQEzADuvcauxn mFajuCm5sniFFW0SCKlE9B6f3dzT6ysC+biUMYHNPbaeruOnpnWbJ95l7EdxwsK32ziZ 6QAh9kGWWAArFcpHDtwt2ss5Qe3N/Oy/IDbjsTRp2m4vN0xx24e4oCCt95HBWAm9kN8H y+rA== X-Gm-Message-State: AJIora/nYNufRsH9X+B10AUbMwgd3vfasjtNphwYy+In9CvFvDCrxeOD oEhFeJuZzNrnGWGkPNK+sO5cDz05aFP/ X-Google-Smtp-Source: AGRyM1sruwnZKnwPtWtUp67BF9nG0vn8EGplXYGSTiGzRcjThQ4rRs1uXZWCqLqnEtEJOLMHCXDfsGB61dKk X-Received: from irogers.svl.corp.google.com ([2620:15c:2d4:203:7543:ead8:55fa:3980]) (user=irogers job=sendgmr) by 2002:a0d:da02:0:b0:31c:a0e9:4165 with SMTP id c2-20020a0dda02000000b0031ca0e94165mr1717253ywe.439.1658529173232; Fri, 22 Jul 2022 15:32:53 -0700 (PDT) Date: Fri, 22 Jul 2022 15:32:10 -0700 In-Reply-To: <20220722223240.1618013-1-irogers@google.com> Message-Id: <20220722223240.1618013-2-irogers@google.com> Mime-Version: 1.0 References: <20220722223240.1618013-1-irogers@google.com> X-Mailer: git-send-email 2.37.1.359.gd136c6c3e2-goog Subject: [PATCH v1 01/31] perf test: Avoid sysfs state affecting fake events From: Ian Rogers To: perry.taylor@intel.com, caleb.biggers@intel.com, kshipra.bopardikar@intel.com, Kan Liang , Zhengjun Xing , Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Mark Rutland , Alexander Shishkin , Jiri Olsa , Namhyung Kim , Maxime Coquelin , Alexandre Torgue , Andi Kleen , James Clark , John Garry , linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, Sedat Dilek Cc: Stephane Eranian , Ian Rogers Content-Type: text/plain; charset="UTF-8" Precedence: bulk List-ID: X-Mailing-List: linux-perf-users@vger.kernel.org Icelake has a slots event, on my Skylakex I have CPU events in sysfs of topdown-slots-issued and topdown-total-slots. Legacy event parsing would try to use '-' to separate parts of an event and so perf_pmu__parse_init sets 'slots' to be a PMU_EVENT_SYMBOL_SUFFIX2. As such parsing the slots event for a fake PMU fails as a PMU_EVENT_SYMBOL_SUFFIX2 isn't made into the PE_PMU_EVENT_FAKE token. Resolve this issue by test initializing the PMU parsing state before every parse. This must be done every parse as the state is removes after each parse_events. Signed-off-by: Ian Rogers --- tools/perf/tests/pmu-events.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/tools/perf/tests/pmu-events.c b/tools/perf/tests/pmu-events.c index 478b33825790..263cbb67c861 100644 --- a/tools/perf/tests/pmu-events.c +++ b/tools/perf/tests/pmu-events.c @@ -812,6 +812,15 @@ static int check_parse_id(const char *id, struct parse_events_error *error, for (cur = strchr(dup, '@') ; cur; cur = strchr(++cur, '@')) *cur = '/'; + if (fake_pmu) { + /* + * Every call to __parse_events will try to initialize the PMU + * state from sysfs and then clean it up at the end. Reset the + * PMU events to the test state so that we don't pick up + * erroneous prefixes and suffixes. + */ + perf_pmu__test_parse_init(); + } ret = __parse_events(evlist, dup, error, fake_pmu); free(dup); -- 2.37.1.359.gd136c6c3e2-goog