From patchwork Fri Mar 1 18:49:42 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Rogers X-Patchwork-Id: 209028 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7301:fa17:b0:10a:f01:a869 with SMTP id ju23csp85592dyc; Fri, 1 Mar 2024 10:54:02 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCUrpjP9cICrVlnU3AgKBf2yTz1S4ruP6AM6J0e5UCzHS7boPNITsFvXTmHFbMNsa3BCkaidDOOHK7t+OP85HbYcRR2JYw== X-Google-Smtp-Source: AGHT+IHO6e7Ts4DfdZ0lujgKuIzz6sx5SwEIOGGX8+OSVL7d6PRzNrgUyrIKlhNyHVEnNFYZfp97 X-Received: by 2002:a17:902:ecd2:b0:1dc:c9f4:2dab with SMTP id a18-20020a170902ecd200b001dcc9f42dabmr3095939plh.1.1709319242314; Fri, 01 Mar 2024 10:54:02 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1709319242; cv=pass; d=google.com; s=arc-20160816; b=aZbWCi9QF24bFDiuxNy0L84SywomAJF9TUa0iEE8PWbaQMUZuojtxDwR4fnjMFJ3xl dwK514sOp1JuzhV9OnnmorWDIymv/YeXilcJzVEI1ADyRQILKlDyg3wI0qnyxBrmWhPw 6UjGLto7wL3xb8LbocsucE0wMDGHY4xHXzjyFU+l1zG7WO8F0nw2F9XN7RUYPabB8yLj +08D2Ap+NGkSwMWn5Qx8sv2SBcdw30deQ2EKFymw66aHEFpLZ/4eA96YlltBXptyI0p8 bZJ8ciETPyl2uokweF+mdZjOrBzHxMononqk8GJiNlHN3obEZ2Y//wuWLAXsFmPzi8iS pghA== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=to:from:subject:references:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:message-id:in-reply-to:date :dkim-signature; bh=/6sZaREfZSp3hmPC0ObvAD1D5+ZR7J7opouN89RfYyQ=; fh=D55R/hdgJAIr6og00B/MLyVo6bYiZvQZpmbYCOAt7g8=; b=ypoNppo3SlI9U00tEKCcibqbgN8WW/0KwzFTQpVo3ugv98PKfw+qAciOCOem5Ebv/E Z/1jr7I7SDgCj3ylLVBJYQLEEnnokUc5RMVCaadlxaAIyNTcItTSSsW74Xju76cUFoz2 yen7KHPnXQj7GwBTHNb6xhSiSgQmcAjym7HbqeJR9VxsqXxPFXT7DVTnb6voWLaBuk3s TBMU/4DO1I7coNL0nctmORsrO4pGPGrSzDALDjaSv3WDsFT7u1jEbOu0HYRJ9RMeqeEA 6bZF3sYt5rgUfTTY6YNMw5GS+Nx5wKdbugeis0QAiDvOEnmtQqecnS6K2w3VMHgWI4Ia CS+w==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@google.com header.s=20230601 header.b=wr2U2aC9; arc=pass (i=1 spf=pass spfdomain=flex--irogers.bounces.google.com dkim=pass dkdomain=google.com dmarc=pass fromdomain=google.com); spf=pass (google.com: domain of linux-kernel+bounces-88952-ouuuleilei=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) smtp.mailfrom="linux-kernel+bounces-88952-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org. [139.178.88.99]) by mx.google.com with ESMTPS id lk4-20020a17090308c400b001db7062086dsi4264126plb.484.2024.03.01.10.54.02 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 01 Mar 2024 10:54:02 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-88952-ouuuleilei=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) client-ip=139.178.88.99; Authentication-Results: mx.google.com; dkim=pass header.i=@google.com header.s=20230601 header.b=wr2U2aC9; arc=pass (i=1 spf=pass spfdomain=flex--irogers.bounces.google.com dkim=pass dkdomain=google.com dmarc=pass fromdomain=google.com); spf=pass (google.com: domain of linux-kernel+bounces-88952-ouuuleilei=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) smtp.mailfrom="linux-kernel+bounces-88952-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sv.mirrors.kernel.org (Postfix) with ESMTPS id 1A076289AF9 for ; Fri, 1 Mar 2024 18:52:23 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 7947E3C48C; Fri, 1 Mar 2024 18:49:59 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="wr2U2aC9" 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 D59483BB2E for ; Fri, 1 Mar 2024 18:49:54 +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=1709318996; cv=none; b=fdQ6MZ3xc494a6Yf5XC5dNZ+yVBBRL4azUX2r2mX6aZQd3A4LJcm7yAlSvZGvjcrdzKiIWvFc333ZhS8Le1OPj1ZYM0GqD2+/3yGiS7gAKlRZ8v1XfqfC3bhUCMOcDQ6Di7DaIlAXYBu1Kd2egQVbyiVtEs306wzcKvyB4Oo7x8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709318996; c=relaxed/simple; bh=kRC2xm7uMHGebNB7a/TgeH2yuQp/mFiIM0iKAPFJjpE=; h=Date:In-Reply-To:Message-Id:Mime-Version:References:Subject:From: To:Content-Type; b=JiP4+kRebyVcfu5e3FwzeO/uQ7UC7D+0c0Cm5k1rNPrwPkj1mZOVtgPZ/OIanSg3u0U2HJ3riXEtqeATpnnAS5mXSOGPtQ/m216p54yIZMQWLM/VmIqK4LCZCHLVZB8Dd8VYC4ZoT4d/JcxVPkI4KIB1UYyoicYDnuxhS5VQUq4= 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=wr2U2aC9; 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 Received: by mail-yw1-f202.google.com with SMTP id 00721157ae682-608ad239f8fso39541667b3.0 for ; Fri, 01 Mar 2024 10:49:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1709318994; x=1709923794; 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=/6sZaREfZSp3hmPC0ObvAD1D5+ZR7J7opouN89RfYyQ=; b=wr2U2aC9wuRXZguRjvyPgcxVnlP86sKVJp5IVKfB5oOzHIB8ZjNFpKVkhYnT0ATjZA iZqKDDI35+gbm58/NXI4zGe5yhB+mHc1rciRZ6EwTKcffV5NSY+rtE+pPywbaVb67vJU iXEXF6XSNK9FgOQL8Sy1g5+JaxZ//kXyPJ94GxoATTSDCfOWH9bHjieXYbAcaG1tMFHN x+MsRG07rWRSw60S+vVsXK+A0Wx7O6E2YicqWuqSICR9oh/DRH3sMTmV+lNaPKP0SaSt Fs/vKNq1WsNHJU7zyRE3pp8rn9FAXoKwf3GmWupYzhN2zctv1knEEa6PCIoEEbz3eIA0 YDkg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709318994; x=1709923794; 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=/6sZaREfZSp3hmPC0ObvAD1D5+ZR7J7opouN89RfYyQ=; b=o5O4zvx7tFGe+gK7ueT6XcxlUI0I5ZMNV9bMmnHLHWcaDufB/D5ZOOpNMAXK0wYKMr cTAPDMK9Vaaje3PzCzE3VSCm9PcH9uxqSZE7mxXzmrFVatiOxCJppjFOM2BmprR0QaB0 JXWy/leIWOOxj7cwvj+tZDi5UyqNDosd6/5YAxJoTEa308YoyZM90WtU4Z7htoq5sjAw dTZ52AlbSWaPlR3U3THtPaikF8c3I9WfmxoI/irGwBwudXUKn7QoiqCE8p8qg4zvMh+8 rxwt1jjhV+yO2prRW4zFwDRmI0e9nY+BRiacoSDyJkU2dgFuNdHkQ65uafxvVcmgQf+e mj9g== X-Forwarded-Encrypted: i=1; AJvYcCVYmLBg76p5Vh3NJG82w+QCRp3lqytjLTR5eZcpT9GnfNszaudpEwLncDD145/MIcHccqEGTCLdpqABBo4IUwlEn3i5yXiX0DzdXPZm X-Gm-Message-State: AOJu0YwbmKTitJzrgWeQY06cz1Jk1mcoKZSjnQzojElM93cmZC6LzXHN IaPihIgbHYzywHlTz/9Je2P7Zdt3ePrMgiA9i/YnfONO1u8QiEB6gTJAvOplrhfSPMVeIS2wyf3 KNI7LmQ== X-Received: from irogers.svl.corp.google.com ([2620:15c:2a3:200:af4b:7fc1:b7be:fcb7]) (user=irogers job=sendgmr) by 2002:a81:4c05:0:b0:608:d045:6eff with SMTP id z5-20020a814c05000000b00608d0456effmr526031ywa.2.1709318994053; Fri, 01 Mar 2024 10:49:54 -0800 (PST) Date: Fri, 1 Mar 2024 10:49:42 -0800 In-Reply-To: <20240301184942.2660478-1-irogers@google.com> Message-Id: <20240301184942.2660478-3-irogers@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20240301184942.2660478-1-irogers@google.com> X-Mailer: git-send-email 2.44.0.278.ge034bb2e1d-goog Subject: [PATCH v2 2/2] perf jevents: Add cycles breakdown metric for arm64/AMD/Intel 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 , Jing Zhang , Thomas Richter , James Clark , linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, Stephane Eranian X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1792351133799272726 X-GMAIL-MSGID: 1792351133799272726 Breakdown cycles to user, kernel and guest. Add a common_metrics.py file for such metrics. Signed-off-by: Ian Rogers --- tools/perf/pmu-events/amd_metrics.py | 3 +++ tools/perf/pmu-events/arm64_metrics.py | 2 ++ tools/perf/pmu-events/common_metrics.py | 18 ++++++++++++++++++ tools/perf/pmu-events/intel_metrics.py | 2 ++ 4 files changed, 25 insertions(+) create mode 100644 tools/perf/pmu-events/common_metrics.py diff --git a/tools/perf/pmu-events/amd_metrics.py b/tools/perf/pmu-events/amd_metrics.py index 377ce413d051..5a1f10ecff4d 100755 --- a/tools/perf/pmu-events/amd_metrics.py +++ b/tools/perf/pmu-events/amd_metrics.py @@ -4,6 +4,7 @@ from metric import (d_ratio, has_event, max, Event, JsonEncodeMetric, JsonEncodeMetricGroupDescriptions, Literal, LoadEvents, Metric, MetricGroup, Select) import argparse +from common_metrics import Cycles import json import math import os @@ -572,6 +573,7 @@ def AmdUpc() -> Metric: return Metric("upc", "Micro-ops retired per core cycle (higher is better)", upc, "uops/cycle") + def Idle() -> Metric: cyc = Event("msr/mperf/") tsc = Event("msr/tsc/") @@ -628,6 +630,7 @@ all_metrics = MetricGroup("", [ AmdHwpf(), AmdSwpf(), AmdUpc(), + Cycles(), Idle(), Rapl(), UncoreL3(), diff --git a/tools/perf/pmu-events/arm64_metrics.py b/tools/perf/pmu-events/arm64_metrics.py index 0dcf5236ea1f..516b3fa08600 100755 --- a/tools/perf/pmu-events/arm64_metrics.py +++ b/tools/perf/pmu-events/arm64_metrics.py @@ -3,6 +3,7 @@ from metric import (d_ratio, Event, JsonEncodeMetric, JsonEncodeMetricGroupDescriptions, LoadEvents, Metric, MetricGroup) import argparse +from common_metrics import Cycles import json import os from typing import Optional @@ -154,6 +155,7 @@ def Arm64Topdown() -> MetricGroup: all_metrics = MetricGroup("",[ Arm64Topdown(), + Cycles(), ]) if args.metricgroups: diff --git a/tools/perf/pmu-events/common_metrics.py b/tools/perf/pmu-events/common_metrics.py new file mode 100644 index 000000000000..74c58f9ab020 --- /dev/null +++ b/tools/perf/pmu-events/common_metrics.py @@ -0,0 +1,18 @@ +# SPDX-License-Identifier: (LGPL-2.1 OR BSD-2-Clause) +from metric import (d_ratio, Event, Metric, MetricGroup) + +def Cycles() -> MetricGroup: + cyc_k = Event("cycles:kHh") + cyc_g = Event("cycles:G") + cyc_u = Event("cycles:uH") + cyc = cyc_k + cyc_g + cyc_u + + return MetricGroup("cycles", [ + Metric("cycles_total", "Total number of cycles", cyc, "cycles"), + Metric("cycles_user", "User cycles as a percentage of all cycles", + d_ratio(cyc_u, cyc), "100%"), + Metric("cycles_kernel", "Kernel cycles as a percentage of all cycles", + d_ratio(cyc_k, cyc), "100%"), + Metric("cycles_guest", "Hypervisor guest cycles as a percentage of all cycles", + d_ratio(cyc_g, cyc), "100%"), + ], description = "cycles breakdown per privilege level (users, kernel, guest)") diff --git a/tools/perf/pmu-events/intel_metrics.py b/tools/perf/pmu-events/intel_metrics.py index 5775ae8a87b4..1a34e2f7a590 100755 --- a/tools/perf/pmu-events/intel_metrics.py +++ b/tools/perf/pmu-events/intel_metrics.py @@ -4,6 +4,7 @@ from metric import (d_ratio, has_event, max, CheckPmu, Event, JsonEncodeMetric, JsonEncodeMetricGroupDescriptions, Literal, LoadEvents, Metric, MetricConstraint, MetricGroup, MetricRef, Select) import argparse +from common_metrics import Cycles import json import math import os @@ -1012,6 +1013,7 @@ def UncoreUpiBw() -> Optional[MetricGroup]: all_metrics = MetricGroup("", [ + Cycles(), Idle(), Rapl(), Smi(),