From nobody Mon Feb 9 01:46:40 2026 Received: from mail-yw1-f202.google.com (mail-yw1-f202.google.com [209.85.128.202]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B3E411AAC9 for ; Fri, 9 Feb 2024 20:50:19 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.202 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707511821; cv=none; b=oafDeDKtYxILWfnAUtpqeimL9s5W/Z2pETKV+jMMpedm6fitj2zr/8+CljbzzOn7KB3OSJZJgycAItdsUSVlLQDdUkChvDW5EMcyQhOTUKSfDvVKj4tdLy71TvE2SMRnrZs9y5o0MlqR2ZOEoGHxIEknDTFqcj1C0b8Cqv/GnfU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707511821; c=relaxed/simple; bh=v4L2Yvy+TPTB2iQqHtTEg47KRn3FjqMxg156ChWAFME=; h=Date:In-Reply-To:Message-Id:Mime-Version:References:Subject:From: To:Content-Type; b=dxUJLFhdKn7e5DKVovvUECQ4lRR8X8eRNJv6H5L/ePNFQ3OTw7LfJGZJi7op4YfMlryJQjh2zLrgXTZzXJCv1D3M9RPiWucHnKOmJtczkkbktWBpiuQ6l1+PJDsETka1ty5O8WWaVOmfw4NaVp4GLzEPd3yjoQqQOqkVLppd+G0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--irogers.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=0iyt/ez/; arc=none smtp.client-ip=209.85.128.202 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--irogers.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="0iyt/ez/" Received: by mail-yw1-f202.google.com with SMTP id 00721157ae682-5ffee6fcdc1so25337397b3.2 for ; Fri, 09 Feb 2024 12:50:19 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1707511819; x=1708116619; darn=vger.kernel.org; h=to:from:subject:references:mime-version:message-id:in-reply-to:date :from:to:cc:subject:date:message-id:reply-to; bh=gknoLaUB2sz5KFXkBLXORn9pUeJlqgUBUUSyFz57kQs=; b=0iyt/ez/4MjLd32489GYk3uUVOgqHjeKF5X618nVPzfmlb+NkyBI0PkQmB+g4+GupH +XIOM6NebXMjQZRRD7y/tEyWAp/WzB+lYzqdNJiN9k7S6UJIPck/zqBSNPgBdYOJrUVl 35vgmLWgKjnE5Fx/NzXsS7PuopUgDYEwZdtrHrLDTMozkWXUpVPb03k0dKeW2dLtVfgH iHqH4Y1mAEA/UvflvjQoCWxI5/vDg93hPtQS/+krEBOZVoNNgUhj3RVsXxwsjVBWoSJx 4G6EmQGl3cY6RIYvGwITZBL+RLUfNAzXdTHDcwZnOf4b4a9CjlxGpCZZOAvPc4AaXh9l rMeg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1707511819; x=1708116619; h=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=gknoLaUB2sz5KFXkBLXORn9pUeJlqgUBUUSyFz57kQs=; b=f8INl2b6fyA9yllgdQ80Yh8rWLQIz8U+aYPZGNR+Egkqh8h9vLZCCOYBAMC//TB7Hx QzoJWvwKbm2yurwg8YKY49GP8K64lMDszgzp6Hjt2R5EvrgPYHYvZY6C4endzmkO0Ib6 2fb+2zHRruWg1dWwzN1y9Gt6zinzX67cHwDmxihwtmtYrscuc9hQBnw2QxQEN9jkPRRa MVQQnX3uSgrrQ819pMSTBqp759s3WtfYorLA9CezYgK4AxMQ7IAoKr2RGrAnKrXv4kFs A+s09hUKRKJ5Oa6vbAIUSLVM5XC0kDp20jqWBAG2JnH/AGHTyEmQ8YlM8mcaZ57imTN3 sWlw== X-Forwarded-Encrypted: i=1; AJvYcCUZ7AL+68apXInm4npFhcwu9g+lZNQOsEXeYLo0VGhtbxLeTbwLfAqNclQl/mIJIi2Pa/f7nYjM/Ks8bd9VX6oLjga9x6bryVr+Mlwi X-Gm-Message-State: AOJu0YwzpaFww9DLqWL4NZoCyNJQfiMlMzF9Q03c8iDbAv63aQtq79Nx Y9Rx2uDN8ufnROmjTcQ3pIErWycVNkbVUtXMrazFhjT/NLdvhuVLiDA/nFcSusaXXJQyLD8Vwwt avVcZWQ== X-Google-Smtp-Source: AGHT+IGEWg8J1iOGAYwp5/i/iMbjcwAa2gGukyNU06noyL1m3zapgRwM6609RJcQllvTA2fSM0tl40LH6ykJ X-Received: from irogers.svl.corp.google.com ([2620:15c:2a3:200:877:241d:8c35:1c5b]) (user=irogers job=sendgmr) by 2002:a05:6902:2201:b0:dc6:d890:1a97 with SMTP id dm1-20020a056902220100b00dc6d8901a97mr5150ybb.9.1707511818829; Fri, 09 Feb 2024 12:50:18 -0800 (PST) Date: Fri, 9 Feb 2024 12:49:47 -0800 In-Reply-To: <20240209204947.3873294-1-irogers@google.com> Message-Id: <20240209204947.3873294-5-irogers@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20240209204947.3873294-1-irogers@google.com> X-Mailer: git-send-email 2.43.0.687.g38aa6559b0-goog Subject: [PATCH v1 4/4] perf metric: Don't remove scale from counts From: Ian Rogers To: Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Namhyung Kim , Mark Rutland , Alexander Shishkin , Jiri Olsa , Ian Rogers , Adrian Hunter , John Garry , Kan Liang , James Clark , K Prateek Nayak , Kaige Ye , linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Counts were switched from the scaled saved value form to the aggregated count to avoid double accounting. When this happened the removing of scaling for a count should have been removed, however, it wasn't and this wasn't observed as it normally doesn't matter because a counter's scale is 1. A problem was observed with RAPL events that are scaled. Fixes: 37cc8ad77cf8 ("perf metric: Directly use counts rather than saved_va= lue") Signed-off-by: Ian Rogers --- tools/perf/util/stat-shadow.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/tools/perf/util/stat-shadow.c b/tools/perf/util/stat-shadow.c index e31426167852..cf573ff3fa84 100644 --- a/tools/perf/util/stat-shadow.c +++ b/tools/perf/util/stat-shadow.c @@ -414,12 +414,7 @@ static int prepare_metric(struct evsel **metric_events, val =3D NAN; source_count =3D 0; } else { - /* - * If an event was scaled during stat gathering, - * reverse the scale before computing the - * metric. - */ - val =3D aggr->counts.val * (1.0 / metric_events[i]->scale); + val =3D aggr->counts.val; source_count =3D evsel__source_count(metric_events[i]); } } --=20 2.43.0.687.g38aa6559b0-goog