From patchwork Fri Mar 1 18:47:28 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Rogers X-Patchwork-Id: 209017 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7301:fa17:b0:10a:f01:a869 with SMTP id ju23csp83000dyc; Fri, 1 Mar 2024 10:48:50 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCU3mDQaOnUSkuT9Rv0lFdl02trVsgtfuUXeWSQqxSbRWBZlkog2zQ3gj6BkbnjENoDzRpd7w4eW56H9uakU1/f9iooe0Q== X-Google-Smtp-Source: AGHT+IHbez6Nb5IcHbhtUJ1Zjn7nvekCnWuhFkbteUqBKst9xIbC49ERQycMq5z96x50QTc2mL0s X-Received: by 2002:a05:6830:200a:b0:6e4:7762:bff with SMTP id e10-20020a056830200a00b006e477620bffmr2975167otp.34.1709318930277; Fri, 01 Mar 2024 10:48:50 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1709318930; cv=pass; d=google.com; s=arc-20160816; b=gLbMhOKgBmsiTMsp/eiuO6fFeghROBAUuzbjyImIz/XsmT9UJJN3hj/ViwRYj0OSnk wXQd+zLp/Ew207LYSbonnS6mEQbSAqQ+mfvinPW4ESkCAiRcD1CuJXhx1FnTTx7pKAA+ dVuCGWb2JPBs9VADtYuv5OEt9YZtEC6qYFNzjEA3fCzEA7t1iG8d0ZSSqSJ3ZBWHRHva lyDju9P0g2VjyzcyBRSZexdcLlV8RmTdx+OILiNvD0BH2069LolDGDBJuu5pFernfoRW EEbGhc9Rou9D2iStquVniRCdI2tZrEH/D5YiZ0BtlmGU4Fw+P+S//hYQDR9V+6XO9quq OroQ== 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=f7UsDzYt66DPsayZORzPPicQ8YRzeND3f/RE4XjTOWg=; fh=nszVAuzxoacFZP9MYxm6jRTT+MugTO1Hq6y6yKi0T3o=; b=cX91NClnnxLmEJsUdY/jHcUOGujL6tCv4mX+gc+FlVlvr+4IutAaXR/kqFNUPpDQ16 /BBcuRfn5NxchBU3/8j6iFTTvZNaH3oQFUjjcNh+nE5Kg7NDM6RiYjtaPfkguMdQw2FC Q+PrdaBsLsNHkW6vQPKtu9uv6L0ePCYyn2lNZV+c9is+pF+epPlUCORwg1bK2GzCrycq 2YN7OHbyLuoRixwX53KbFIlKV0ORVBmjdf6Q6ioRrdI0xTgBEzHxih5xCe0ZMtwPbEq0 PlxF0iCpwcoJuqFmZdztvEnxRy7vZLewCotMFVA/WpAJSq4j1wPA5Suh6iWjaCChiPdh rEwA==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@google.com header.s=20230601 header.b=Y1D6q+WK; 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-88940-ouuuleilei=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) smtp.mailfrom="linux-kernel+bounces-88940-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 c16-20020a63ef50000000b005e2c2fc5125si4137927pgk.249.2024.03.01.10.48.50 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 01 Mar 2024 10:48:50 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-88940-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=Y1D6q+WK; 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-88940-ouuuleilei=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) smtp.mailfrom="linux-kernel+bounces-88940-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 175082879C4 for ; Fri, 1 Mar 2024 18:48:50 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id E72A43B795; Fri, 1 Mar 2024 18:47:58 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="Y1D6q+WK" Received: from mail-yw1-f201.google.com (mail-yw1-f201.google.com [209.85.128.201]) (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 A250139AF6 for ; Fri, 1 Mar 2024 18:47:54 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709318876; cv=none; b=f+XwoKmzBpgPvpeaMU5n3gBDf8AqLEXhBOwLii2YA32R3SsILA97ploji/+ya5tVbgTbC/AyqJNoxR2OkitmjJCaFwaAbzEwMoXdqhdQM6pUwITzKOX6+WVlr8xmL6EiHyRPxcAY8NJjCFwRUnqfcO7Fx/wtGD8133CEqQ1HcM0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709318876; c=relaxed/simple; bh=yEm8gDDiOp2kaCb7bjt8yDfO5lzyLygQrwL/+bKOLd4=; h=Date:In-Reply-To:Message-Id:Mime-Version:References:Subject:From: To:Content-Type; b=SF7I/Wmj4WrPkeG3Xd3rhL9KgDCO0j16JwCBqpMwRrP8FK8oXxi/q/1fiMPQXBBnmFfMC4Cs1dR/GTaHy4boVI4tXyHvIqedKjVhoZQ2UdMCMLpiwc8YPN0EHjM2KfJXpBmsGF5jXO81HCm2dcBtUod3VgiIUFKBlXhnXTRISXw= 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=Y1D6q+WK; arc=none smtp.client-ip=209.85.128.201 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-f201.google.com with SMTP id 00721157ae682-6098d88e994so5067677b3.0 for ; Fri, 01 Mar 2024 10:47:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1709318874; x=1709923674; 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=f7UsDzYt66DPsayZORzPPicQ8YRzeND3f/RE4XjTOWg=; b=Y1D6q+WKyJ7+I+ltfXM5u87F7qgTMdnqW18Bhuh+ivJpubUsD3SE1UOaUMRVc8TPiH KQQq38JqzLqcgklJzqpK2Aq7hqfZWEqSD2mNtpPZQt3ixGmO/foTGYCzDGc0OMgOSF2U 6TRIILIGnrBP1/Zz/X0l3U0f6no/Yd8gbQ3IV2QmQbz9cnBeyX9SABeNNHSFPVYbglRU zBU49X0VKwE+gCexNQPE2Y0elZaJUNCVPHFrdSrvuiZo37oNxNbOzF1+uuTmoIL7zIBB EtPK04VEs+MwcTwBQCxa5lsca0eVI0pGLUzoDQFK9rdQbQlDyfKJrtHhWugdnBcReTEO Htug== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709318874; x=1709923674; 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=f7UsDzYt66DPsayZORzPPicQ8YRzeND3f/RE4XjTOWg=; b=Rj4IPQZupkkJh/udza9MQ2S06Y2MjwblrS8xrZH9Isr1UbqzloR73xTLcto5efUSkh MfhYIithOQ9RLhC17vUTVQiT7nIeNeZTx/Za6cWA1LZD5rpcft9OICMKl52/lJWOAtD0 JroOJt9JC1ewDjiF4DcHZGgX8Uqd9zNkGJTJ4/3iwMlNtPJOU1V4zV/xM9kY8ebKXw5t 8ksLW68iWimk1qmUxQwPuOeR6Xv9AsEO4TqXjZmAGTW7DJTiqGFL2F436mUo+rXt9MDT M4mFJbYxKkdB9o2ksDmiJHCLUerzXG9Zl4pusp3Hd2nwPFK9xWCHlI2KBuRa2ta/DqOs OGbQ== X-Forwarded-Encrypted: i=1; AJvYcCUVfiGm2rHSIwiUtowESuf85wdnxnP7e5hIX0FDqIfvFgjQN1YuUErTqhnDXVP6XQI2LaZCOXs353pdu1E3tTXn6qx0mabuHkAduw/u X-Gm-Message-State: AOJu0YwRFKN5hWmEzetpHtADIT00qTPTqNAGSSWIBwB4IA8yr3b5cH+6 sWVgaNpFS8/mXIfXw2oQQhLv3ZoGNuwhpJPcxzvkPS0twxlD1j0lYo7HZBUQxt8valto5TLN2b0 EcIDcbw== X-Received: from irogers.svl.corp.google.com ([2620:15c:2a3:200:af4b:7fc1:b7be:fcb7]) (user=irogers job=sendgmr) by 2002:a05:690c:3702:b0:608:1b39:245c with SMTP id fv2-20020a05690c370200b006081b39245cmr631942ywb.9.1709318873830; Fri, 01 Mar 2024 10:47:53 -0800 (PST) Date: Fri, 1 Mar 2024 10:47:28 -0800 In-Reply-To: <20240301184737.2660108-1-irogers@google.com> Message-Id: <20240301184737.2660108-4-irogers@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20240301184737.2660108-1-irogers@google.com> X-Mailer: git-send-email 2.44.0.278.ge034bb2e1d-goog Subject: [PATCH v2 03/12] perf jevents: Add upc metric for uops per cycle for AMD From: Ian Rogers To: Sandipan Das , Ravi Bangoria , 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: 1792350806788074476 X-GMAIL-MSGID: 1792350806788074476 The metric adjusts for whether or not SMT is on. Signed-off-by: Ian Rogers --- tools/perf/pmu-events/amd_metrics.py | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/tools/perf/pmu-events/amd_metrics.py b/tools/perf/pmu-events/amd_metrics.py index fd3095cb5c1d..ce3d1535483a 100755 --- a/tools/perf/pmu-events/amd_metrics.py +++ b/tools/perf/pmu-events/amd_metrics.py @@ -1,8 +1,8 @@ #!/usr/bin/env python3 # SPDX-License-Identifier: (LGPL-2.1 OR BSD-2-Clause) from metric import (d_ratio, has_event, max, Event, JsonEncodeMetric, - JsonEncodeMetricGroupDescriptions, LoadEvents, Metric, - MetricGroup, Select) + JsonEncodeMetricGroupDescriptions, Literal, LoadEvents, + Metric, MetricGroup, Select) import argparse import json import math @@ -16,9 +16,17 @@ args = parser.parse_args() directory = f"{os.path.dirname(os.path.realpath(__file__))}/arch/x86/{args.model}/" LoadEvents(directory) -all_metrics = MetricGroup("",[]) - +zen_model = int(args.model[6:]) interval_sec = Event("duration_time") +cycles = Event("cycles") +# Number of CPU cycles scaled for SMT. +smt_cycles = Select(cycles / 2, Literal("#smt_on"), cycles) + +def AmdUpc() -> Metric: + ops = Event("ex_ret_ops", "ex_ret_cops") + upc = d_ratio(ops, smt_cycles) + return Metric("upc", "Micro-ops retired per core cycle (higher is better)", + upc, "uops/cycle") def Idle() -> Metric: cyc = Event("msr/mperf/") @@ -50,6 +58,7 @@ def Rapl() -> MetricGroup: description="Processor socket power consumption estimates") all_metrics = MetricGroup("", [ + AmdUpc(), Idle(), Rapl(), ])