From patchwork Wed Feb 28 17:56:07 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Rogers X-Patchwork-Id: 207940 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:a81b:b0:108:e6aa:91d0 with SMTP id bq27csp3510265dyb; Wed, 28 Feb 2024 09:57:24 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCVp2TDweW5NPJys9lna6OT1ebJxkrBAVCU00LJ5Zr8rgiV420XmyNtxsalXOuH3V/HX3J+e6l6IbHPmg7baQfuR4C8NgQ== X-Google-Smtp-Source: AGHT+IF1tCYT7RligeYUxoX8ANVi4zOyidB2Z54u+SmIgZ7C0oiB1kZAWeCuFhtNXn4SB7tx9zsl X-Received: by 2002:a17:902:ee45:b0:1dc:4a90:b87d with SMTP id 5-20020a170902ee4500b001dc4a90b87dmr161129plo.66.1709143043901; Wed, 28 Feb 2024 09:57:23 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1709143043; cv=pass; d=google.com; s=arc-20160816; b=OaGeWfjDPvrvu0sBO5EI7CwdTYH7ijla5iEzBHbDAaOzFBezPyugKTiCyqrZq0YbBN rEThN3o9dB9AphjXUVnN2Q/1EsJ6VYXufLieRhy0r8xQVZgNoCL33HbA3VK1dbhxfcqI P1W4oucZWYim+lt+5JUbu/hw2hFodcQ0rtdjWMCuSMPq4CDdyYl4nemU2XP7l+PHstbT bwb38tp94hIMlX0UouzXEzlToYHS5ot5okd6mXqlNlzn4e+5aUpiuf1vOKa2CNxb5Xt8 HoHdJ2lD555g7u4Lhe21zL+hWF4cYECirxtFvtlRkCk9h75iqBc7hozMbQ5W7AF3Gwoe 6oiw== 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=KxFo9HXrMBHPfRGQr1WhtYDEqITe1Fw0obEsjgP5vwk=; fh=rMDnLf+d5WE0kI3O4sWwDNG1w7odMsznhjeytavN6eU=; b=LSAZGor18cJDzyN3jw0YEGmEXwz+rTQgzmesykxf67ZEeY7CddQrorQ+81f7xYdb2i MTPLBXUMvYm7111cE40BhTpNNMmjatLViNXlgA3Ns7lvVRg0099eJle25KzDup/HHUCV EjsuZdSQJLrMTHULgTvqCaWCNHmJ7B4GGAkBpOkAieVM6oQR5hi83HB3BCFriVJl2QvX dxEW6GUiqY6VvnKL1qdauSdvOTodoLqvpRGr5j8Ve6Ke/6+gsfMQqvuuCfGQQEcvrjnU kZewaVmf4wUqu2jU34RsL2hyBV51Uyu65LLLyGaf3eMbkWaSuA2zNoikEvhcZRAjzvYh K7bA==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@google.com header.s=20230601 header.b=EEQMlXMe; 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-85477-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-85477-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. [2604:1380:45e3:2400::1]) by mx.google.com with ESMTPS id e15-20020a17090301cf00b001dbcfa705e1si3846745plh.162.2024.02.28.09.57.23 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 28 Feb 2024 09:57:23 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-85477-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) client-ip=2604:1380:45e3:2400::1; Authentication-Results: mx.google.com; dkim=pass header.i=@google.com header.s=20230601 header.b=EEQMlXMe; 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-85477-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-85477-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 B3E40284B1A for ; Wed, 28 Feb 2024 17:57:23 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 908B8161B73; Wed, 28 Feb 2024 17:56:46 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="EEQMlXMe" 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 3F8B815F306 for ; Wed, 28 Feb 2024 17:56:42 +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=1709143003; cv=none; b=DyOwwtFnjYMPjZWYXuEy5Hu7Umv07n/pqBJCUBQS3EdsSi2Vb8Xt/f/P2gsWTxWlNRLoNOmTjMrAZ9Exq5dnrNlV0V7A2jNvxqJi3I12oY3AET4GrRSpLcjeGj2M9osvYRmABe6/PfvzQxGEr7lOZxMrJPgblBVt6TmpeonPnHM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709143003; c=relaxed/simple; bh=hLfRLYYEBDGHVllbq1W2MRKFt2uEVseZ3ckqP7HQcJs=; h=Date:In-Reply-To:Message-Id:Mime-Version:References:Subject:From: To:Content-Type; b=VDWSiCrc0f1+skUb1EOONgIY+6Wgdbpz1vtB/8ykXxIjrBjoFlYunRqKpxsfP/zqsmZn5cURE0kmBNNA/BLlLq5eyzNoI3V7EwCVT5QC1gz0WfUeRipfxerfgaTmgBIZ0TDK1j2LRrciBQcDIXptO+CrtsqsJLJ3mONogYzvQkw= 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=EEQMlXMe; 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-60948e99cd4so320757b3.1 for ; Wed, 28 Feb 2024 09:56:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1709143001; x=1709747801; 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=KxFo9HXrMBHPfRGQr1WhtYDEqITe1Fw0obEsjgP5vwk=; b=EEQMlXMehu2kkINHdKC4Nd90tvMYxa42cvHMTpxCitmdYviHQUgpN+hq4ZFrc6hL5p qQ8RN9xKRkNh1YwK0hg+cSJhqznjAdT/m2SFIEkF050SETIOeHcqkzjZsdDNdQ52BB+x 120WcQK22Nmbi1m31nlqNCcj1rGAY6DWb/s1pUtVUnX0s/SLIrRZhfeI2/OIXzKZcNGD RlS28cgdukAFdY6OSS6+cS4ahgtI2kP2kwiGH5XquVCN1iGxyU3GVNgmsLBto6KYNvxf zZxJAgd35Xm92L8Qsty0WO8KJHtJbF+8o5W6fPY8uIb85jJYOxZw90/S9bPf+Dyzcluh j3QQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709143001; x=1709747801; 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=KxFo9HXrMBHPfRGQr1WhtYDEqITe1Fw0obEsjgP5vwk=; b=BodullDRj8Z1uoLtcpbP9K0XtCQS3E3B1OpMwkYwLsPeaQOo/H3wkZCC9gbX0Pspdj RnQfuItbCE6Af6kTMkPjUU3qMBFObasyomxj4Uh102JuCe7WIHWmkKvesH/5FCmaIl/W QPkGu7CeVdD7NPa6A7GUzW4DOeoxTzvGi9vK3E5a1WcMJNf4S91a9ZMKucYVD1XiVIjC 9EADDNsMnw3so/J5oX3dJxsFIE6tqTTdhhTZ6SZpqgkj5E7Yyq+3KHyUe5QLwRt9uF/m xOi0j3M5ZH1CbeO/2+kbpscrL07RDT/PgWYE1rS1pMiQuxA3a5OFTChNOYz0OVMwK0i3 maAA== X-Forwarded-Encrypted: i=1; AJvYcCW/c7JI0niju7XhgDQ5pXMUM5YJuqAkm5CtZP4nwyECXVz3C8l3dvC3gvTblO1TOtsfMBcr95yPR5l9uUQUwAFsFlWCmxwCjqSDWliy X-Gm-Message-State: AOJu0YwqemKSN6+edO30RgduOUkRokrkXdLRXRaG1RzjkKfOnae5KrxZ A0e0Qt6zR4KYzR3xsNJNLizfphTYd6M9gaHcnGG6Yu/tuAbSyWIbE4dFWlcirGyA7YH+z3UK7Sq NFGtoTA== X-Received: from irogers.svl.corp.google.com ([2620:15c:2a3:200:77dc:144c:334e:e2dd]) (user=irogers job=sendgmr) by 2002:a05:6902:120a:b0:dc2:2ace:860 with SMTP id s10-20020a056902120a00b00dc22ace0860mr115ybu.2.1709143001286; Wed, 28 Feb 2024 09:56:41 -0800 (PST) Date: Wed, 28 Feb 2024 09:56:07 -0800 In-Reply-To: <20240228175617.4049201-1-irogers@google.com> Message-Id: <20240228175617.4049201-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: <20240228175617.4049201-1-irogers@google.com> X-Mailer: git-send-email 2.44.0.278.ge034bb2e1d-goog Subject: [PATCH v1 02/12] perf jevents: Update metric constraint support 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, Andi Kleen , Kajol Jain , Sandipan Das , Ravi Bangoria , Perry Taylor , Samantha Alt , Caleb Biggers , Weilin Wang , Edward Baker , Stephane Eranian X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1792166376431820827 X-GMAIL-MSGID: 1792166376431820827 Previous metric constraints were binary, either none or don't group when the NMI watchdog is present. Update to match the definitions in 'enum metric_event_groups' in pmu-events.h. Signed-off-by: Ian Rogers --- tools/perf/pmu-events/metric.py | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/tools/perf/pmu-events/metric.py b/tools/perf/pmu-events/metric.py index 92acd89ed97a..8a718dd4b1fe 100644 --- a/tools/perf/pmu-events/metric.py +++ b/tools/perf/pmu-events/metric.py @@ -4,8 +4,14 @@ import ast import decimal import json import re +from enum import Enum from typing import Dict, List, Optional, Set, Tuple, Union +class MetricConstraint(Enum): + GROUPED_EVENTS = 0 + NO_GROUP_EVENTS = 1 + NO_GROUP_EVENTS_NMI = 2 + NO_GROUP_EVENTS_SMT = 3 class Expression: """Abstract base class of elements in a metric expression.""" @@ -423,14 +429,14 @@ class Metric: groups: Set[str] expr: Expression scale_unit: str - constraint: bool + constraint: MetricConstraint def __init__(self, name: str, description: str, expr: Expression, scale_unit: str, - constraint: bool = False): + constraint: MetricConstraint = MetricConstraint.GROUPED_EVENTS): self.name = name self.description = description self.expr = expr.Simplify() @@ -464,8 +470,8 @@ class Metric: 'MetricExpr': self.expr.ToPerfJson(), 'ScaleUnit': self.scale_unit } - if self.constraint: - result['MetricConstraint'] = 'NO_NMI_WATCHDOG' + if self.constraint != MetricConstraint.GROUPED_EVENTS: + result['MetricConstraint'] = self.constraint.name return result