From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 490DF196C8C; Thu, 6 Jun 2024 14:09:15 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1717682955; cv=none; b=UpxLt4d+gXakc03le7s6YUM6/MtlnnQu7wRweUb4OMosFNeRodGqwJYZVvp623ITcGxfxjiyB5dVJoklszi9MPqTS0+EMeRrs5KbS2kL17Ig1wCaQW1/Ux1BWmsbypHw/YgpBHvJqSfx3SFD0LhypeR4ArJPVaz+EAJBrBBxB5w= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1717682955; c=relaxed/simple; bh=qG26IAVIZndYwmsYgXsm2y9jdLl0B2fXEBrh4Su04Sc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=bvljPbcstAszKLvFxUPctZADJXZS0xEbNHS+bMbEj9nZdOpdZJoDEEyqsUmPlKFS5roe6L2RY5nR/w7vRwF7w4yaRKfbKVbIbfPM0tXf3ZqjpDMEWebAzZSQCppyIjwIHuaOxLp3iFTEMBAHmZdXBbOUKVaFAOiOm0XMEXRhi3E= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=y2x51vOO; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="y2x51vOO" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 25FFEC2BD10; Thu, 6 Jun 2024 14:09:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1717682955; bh=qG26IAVIZndYwmsYgXsm2y9jdLl0B2fXEBrh4Su04Sc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=y2x51vOOsHbvDyIB5ulrgSyQOLmL0gv25ju7okrJpBDvHrDxXH3wRbBuCZUbIlNSE nL9XEbhxWJpPO5HhGPHZZ/cLJaGfR4c5rjx8bj8R6W9vB65MTKp5kSAsBEDzbQQfql q0Z7fnrW0KXyiAF4J7REAL7r8AGDFztk3M+0AH6E= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Ian Rogers , Adrian Hunter , Alexander Shishkin , Ingo Molnar , Jiri Olsa , Kaige Ye , Kan Liang , K Prateek Nayak , Mark Rutland , Namhyung Kim , Peter Zijlstra , Yicong Yang , Arnaldo Carvalho de Melo , Sasha Levin Subject: [PATCH 6.9 121/374] perf stat: Dont display metric header for non-leader uncore events Date: Thu, 6 Jun 2024 16:01:40 +0200 Message-ID: <20240606131655.975640705@linuxfoundation.org> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240606131651.683718371@linuxfoundation.org> References: <20240606131651.683718371@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.9-stable review patch. If anyone has any objections, please let me know. ------------------ From: Ian Rogers [ Upstream commit 193a9e30207f54777ff42d0d8be8389edc522277 ] On an Intel tigerlake laptop a metric like: { "BriefDescription": "Test", "MetricExpr": "imc_free_running@data_read@ + imc_free_running@data_write@", "MetricGroup": "Test", "MetricName": "Test", "ScaleUnit": "6.103515625e-5MiB" }, Will have 4 events: uncore_imc_free_running_0/data_read/ uncore_imc_free_running_0/data_write/ uncore_imc_free_running_1/data_read/ uncore_imc_free_running_1/data_write/ If aggregration is disabled with metric-only 2 column headers are needed: $ perf stat -M test --metric-only -A -a sleep 1 Performance counter stats for 'system wide': MiB Test MiB Test CPU0 1821.0 1820.5 But when not, the counts aggregated in the metric leader and only 1 column should be shown: $ perf stat -M test --metric-only -a sleep 1 Performance counter stats for 'system wide': MiB Test 5909.4 1.001258915 seconds time elapsed Achieve this by skipping events that aren't metric leaders when printing column headers and aggregation isn't disabled. The bug is long standing, the fixes tag is set to a refactor as that is as far back as is reasonable to backport. Fixes: 088519f318be3a41 ("perf stat: Move the display functions to stat-display.c") Signed-off-by: Ian Rogers Cc: Adrian Hunter Cc: Alexander Shishkin Cc: Ingo Molnar Cc: Jiri Olsa Cc: Kaige Ye Cc: Kan Liang Cc: K Prateek Nayak Cc: Mark Rutland Cc: Namhyung Kim Cc: Peter Zijlstra Cc: Yicong Yang Link: https://lore.kernel.org/r/20240510051309.2452468-1-irogers@google.com Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: Sasha Levin --- tools/perf/util/stat-display.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tools/perf/util/stat-display.c b/tools/perf/util/stat-display.c index bfc1d705f4371..91d2f7f65df74 100644 --- a/tools/perf/util/stat-display.c +++ b/tools/perf/util/stat-display.c @@ -1223,6 +1223,9 @@ static void print_metric_headers(struct perf_stat_config *config, /* Print metrics headers only */ evlist__for_each_entry(evlist, counter) { + if (config->aggr_mode != AGGR_NONE && counter->metric_leader != counter) + continue; + os.evsel = counter; perf_stat__print_shadow_stats(config, counter, 0, -- 2.43.0