From nobody Fri Sep 5 08:09:22 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 9EE00C433FE for ; Tue, 4 Oct 2022 02:16:40 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229724AbiJDCQi (ORCPT ); Mon, 3 Oct 2022 22:16:38 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42888 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229563AbiJDCQb (ORCPT ); Mon, 3 Oct 2022 22:16:31 -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 E29943DF28 for ; Mon, 3 Oct 2022 19:16:28 -0700 (PDT) Received: by mail-yb1-xb49.google.com with SMTP id a2-20020a5b0002000000b006b48689da76so11885250ybp.16 for ; Mon, 03 Oct 2022 19:16:28 -0700 (PDT) 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; bh=HP8sEZI7Emeer8Gpo0u0RqVNXzqW3axisWvdt479D+w=; b=Ml6u7c4iPGaHKe5dlAcqKCA1eGbQy9o/sYmC4JFc5Qg02T7C56XjCqtT4kZE3VTWp5 mjVE+m0SOuw7GPHkIkOpMjVLaa1J0VjO3a+9yBLLtwhPF5v00PN8CgDb3sWVxJEUPvy9 twFjchFCGM2unnAQAQYilIWWnlUbZpYJpUz/F71smURaekVWp1bjmuzl5IrE3UDeSgkH 7vKHoS0g8ukgq47WHm+V/K8/QmMvIUgMAEymY0zEYLp6vtrktY0mamX9aqZAOTYvSEVn KfonLjaFN07joo0ITcCVOpndM26ZU8CheihPcYhUGSL5bn00aN/GNyxKWV2j7/dgZAC8 W9hg== 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; bh=HP8sEZI7Emeer8Gpo0u0RqVNXzqW3axisWvdt479D+w=; b=oSZdwpKXj/94bgDxNEaL68/i4Dlz7x/cKrzO2YeZ473uP7kTNJ7+jIYo4bHcfNK+Gy nFpnsG3UpN7I5RxgLrEzjjlOGs/olcZfd1pmSdBCagay1V0XRKBkvaJQaIcKxGCSAcUH b5R5+1NQNDI2FoSJ2AOW+IvRYrrEsMKJ/dx1I4h8Leys2HCwRjId5b+ngU4h0kB1sW7v G2jkpWWD6Tqz3tTOC5uvwWcaAgNhZbVtXyovrBKShn7ODiCgPCUnCngEUXrAIXkim4Tb z3HrGI4bguGPgcaiA3Ffa5Dwfd1ya5UL8/7fWC4QzuEI/Vh9bZgtkwMJOCKySqaCwj0Q 51kA== X-Gm-Message-State: ACrzQf1DKsTvrkabouOX/Elb0PDWwhV72qLkYgCdYHXq99heaIhbIPAB 8J9acqDRfbNJIYT2TC98yubcGct1juMm X-Google-Smtp-Source: AMsMyM7D+Nxaya/Kh39uYN9rJ3+UvaGMx8vYBJ4Z6REA17LIajsE5bi0vIHv1AnyP7Ng0TD5d8fuD9D0+xIT X-Received: from irogers.svl.corp.google.com ([2620:15c:2d4:203:a86d:8afd:70b1:9b0c]) (user=irogers job=sendgmr) by 2002:a25:8a10:0:b0:6ae:af0d:65e5 with SMTP id g16-20020a258a10000000b006aeaf0d65e5mr23142640ybl.610.1664849787739; Mon, 03 Oct 2022 19:16:27 -0700 (PDT) Date: Mon, 3 Oct 2022 19:15:53 -0700 In-Reply-To: <20221004021612.325521-1-irogers@google.com> Message-Id: <20221004021612.325521-5-irogers@google.com> Mime-Version: 1.0 References: <20221004021612.325521-1-irogers@google.com> X-Mailer: git-send-email 2.38.0.rc1.362.ged0d419d3c-goog Subject: [PATCH v3 04/23] perf metrics: Don't scale counts going into metrics From: Ian Rogers To: Zhengjun Xing , Kan Liang , Andi Kleen , perry.taylor@intel.com, caleb.biggers@intel.com, kshipra.bopardikar@intel.com, samantha.alt@intel.com, ahmad.yasin@intel.com, Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Mark Rutland , Alexander Shishkin , Jiri Olsa , Namhyung Kim , John Garry , James Clark , Kajol Jain , Thomas Richter , Miaoqian Lin , Florian Fischer , linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Stephane Eranian , 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" Counts are scaled prior to going into saved_value, reverse the scaling so that metrics don't double scale values. Signed-off-by: Ian Rogers --- tools/perf/util/stat-shadow.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/tools/perf/util/stat-shadow.c b/tools/perf/util/stat-shadow.c index 9e1eddeff21b..b5cedd37588f 100644 --- a/tools/perf/util/stat-shadow.c +++ b/tools/perf/util/stat-shadow.c @@ -865,11 +865,16 @@ static int prepare_metric(struct evsel **metric_event= s, if (!v) break; stats =3D &v->stats; - scale =3D 1.0; + /* + * If an event was scaled during stat gathering, reverse + * the scale before computing the metric. + */ + scale =3D 1.0 / metric_events[i]->scale; + source_count =3D evsel__source_count(metric_events[i]); =20 if (v->metric_other) - metric_total =3D v->metric_total; + metric_total =3D v->metric_total * scale; } n =3D strdup(evsel__metric_id(metric_events[i])); if (!n) --=20 2.38.0.rc1.362.ged0d419d3c-goog