Message ID | 20221213050043.1199380-2-irogers@google.com |
---|---|
State | New |
Headers |
Return-Path: <linux-kernel-owner@vger.kernel.org> Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp2636578wrr; Mon, 12 Dec 2022 21:04:59 -0800 (PST) X-Google-Smtp-Source: AA0mqf68sISuIIaoWboRzDmczsnI6f6a7SKoUxahTvtjuIAX4zR8UTovb8MRmfnUn5NGuGtGMlbI X-Received: by 2002:a17:907:7b88:b0:7c0:c1cc:c68 with SMTP id ne8-20020a1709077b8800b007c0c1cc0c68mr22047948ejc.6.1670907899303; Mon, 12 Dec 2022 21:04:59 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1670907899; cv=none; d=google.com; s=arc-20160816; b=dfPRDQ/3m+3uAwyUCIj6xhm5zKFIuTYCSJHpoGDdcbXZx7YmWHlnSET/1azi/b6DWB oxx7gW/GDacgjPYKUdroHEib2QVAbCS4qRREWfnE9mY1VzvhZMICwLqJBQMeyLyfzyNX QuGSN6WrH1cJe2bBY1sM2JG6HmgJyc5eo1UUbXlEp+eLTFYm6BAvjHHXz7fjA0GaZhr8 xoEkwHRjlmQu7DykVpEpO7mRONNj8LrsgashNkkMupG63T0idFAHcM/D2itrMVu1AHrS PgXWZBfGseNY6y68EWKLf1LXH1C85sNAFQU5NQ7PlGQexuGBmTbqTE1tyv6KuY6r+uYu 9CJA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:from:subject:references:mime-version :message-id:in-reply-to:date:dkim-signature; bh=ZuMMy9JhlpVg2nn8+xv0lc+LSPhmKVJUX8QvXqiK4NY=; b=07ZpXgN311+Jr83v/0JLgBoVX9wd1zncO0ETUoZ3tHjhOi23sjP+zoxDG+qqkCPyH2 zqANIe3zsi6Hce7WcOKIlvO68CQxuQcTwv8ekIuhIh8ow/wY9uOqCKtoW7Q8VJxLHaaP lP+kEBBcrUoIGZNnT8NrdwSjWZQ4rpeTG8ZeZoNXZiWrDhf/MCSJ8nti6jfn4DXi1vpu gDZnxqhmsytc3vpgup2ccxcmu5ysFideu+xLE75V+DVwXZnydFRU65S2j6sd1CAkF8Eu z38InsskSNKCviYLvrQ178aZxmvzCnLQqYTWz7777Wg8uD4oRWw4LDa0sEWXZSqThTeA 8X7w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20210112 header.b=K7HwGifK; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id o6-20020a170906288600b0078e27f2fbe4si6234100ejd.293.2022.12.12.21.04.35; Mon, 12 Dec 2022 21:04:59 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@google.com header.s=20210112 header.b=K7HwGifK; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234318AbiLMFEJ (ORCPT <rfc822;jeantsuru.cumc.mandola@gmail.com> + 99 others); Tue, 13 Dec 2022 00:04:09 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45198 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234448AbiLMFD0 (ORCPT <rfc822;linux-kernel@vger.kernel.org>); Tue, 13 Dec 2022 00:03:26 -0500 Received: from mail-pl1-x649.google.com (mail-pl1-x649.google.com [IPv6:2607:f8b0:4864:20::649]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AD7F1201B2 for <linux-kernel@vger.kernel.org>; Mon, 12 Dec 2022 21:01:31 -0800 (PST) Received: by mail-pl1-x649.google.com with SMTP id m13-20020a170902f64d00b001899a70c8f1so12301947plg.14 for <linux-kernel@vger.kernel.org>; Mon, 12 Dec 2022 21:01:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=cc:to:from:subject:references:mime-version:message-id:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=ZuMMy9JhlpVg2nn8+xv0lc+LSPhmKVJUX8QvXqiK4NY=; b=K7HwGifKageycgoYMSuL41vFu6ZhGRCcITu74LY4LmX1sc3fl9DJan6HW5X6P//2l1 lPsMsUSdkbzMOy98nKuXLhVpvkhkz0ngM1GDc+ZgChWBDyukLgh6FZlAVvh7awbKYiE+ 9HO5w2Ds4ekRxhkntFo+py07FVGrwLFO4zdeOF3RB/10oD1X8YaJiKOI2vwKYsyAwO/c k/5F8MDpuD2y3hHkC6qiT1hrauEipZws87UgdKj/abWMoUcLVSmd3KBqef7OD7j0ihfK 6/V8KoxuzLRCjvzza/1yXEJh/vePWiW+Wwk1PJcBF3rzb8giDyJK8tJ+MjNqPLYBSwfl Q76A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc: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=ZuMMy9JhlpVg2nn8+xv0lc+LSPhmKVJUX8QvXqiK4NY=; b=Z7J3end/n02SWdAPO07w9YLa/w4xMTCk/Tt/pzldvllHtlwn+fDBtB5m4R9e6aJ1mi bZ9WV0hFNoT8F2lFx+RRcv1ejrkVrxvRWo71tuFnN2aToHpr9dCXdPhKlvwRgoEGlDy/ 6OlWEtmydox/AsjNZfIH7CoRMAbRborPCSSEg1V8Cs1Js0uFKGWLmQUCXZRF6sbSj4eI 9tTTXKbBr7Y660zxhXFjyS9gi2vHcozuRUQbbrgKWGSU7AATneslAd8th9luksaUM0B5 EQXUG14otASMlqM7K+pWz1FY60cm9LPKbThBzIgbL2ZE4DgTY3F01/jTbMNY2qMQOUq3 oGkA== X-Gm-Message-State: ANoB5pkntwvaYsQGbR+Vi/sJupA3jpekcpIyG0NHVodI+3Zo11hDeToe Fb49SHb6GEdVd95pVypztxbr1Kv/Rq3V X-Received: from irogers.svl.corp.google.com ([2620:15c:2d4:203:6b9f:864c:28da:e99b]) (user=irogers job=sendgmr) by 2002:aa7:8b4d:0:b0:56c:411f:b699 with SMTP id i13-20020aa78b4d000000b0056c411fb699mr77952723pfd.48.1670907690534; Mon, 12 Dec 2022 21:01:30 -0800 (PST) Date: Mon, 12 Dec 2022 21:00:35 -0800 In-Reply-To: <20221213050043.1199380-1-irogers@google.com> Message-Id: <20221213050043.1199380-2-irogers@google.com> Mime-Version: 1.0 References: <20221213050043.1199380-1-irogers@google.com> X-Mailer: git-send-email 2.39.0.rc1.256.g54fd8350bd-goog Subject: [PATCH v1 1/9] perf jevents metric: Correct Function equality From: Ian Rogers <irogers@google.com> To: John Garry <john.g.garry@oracle.com>, Will Deacon <will@kernel.org>, James Clark <james.clark@arm.com>, Mike Leach <mike.leach@linaro.org>, Leo Yan <leo.yan@linaro.org>, Peter Zijlstra <peterz@infradead.org>, Ingo Molnar <mingo@redhat.com>, Arnaldo Carvalho de Melo <acme@kernel.org>, Mark Rutland <mark.rutland@arm.com>, Alexander Shishkin <alexander.shishkin@linux.intel.com>, Jiri Olsa <jolsa@kernel.org>, Namhyung Kim <namhyung@kernel.org>, Adrian Hunter <adrian.hunter@intel.com>, Kan Liang <kan.liang@linux.intel.com>, Kim Phillips <kim.phillips@amd.com>, Florian Fischer <florian.fischer@muhq.space>, Ravi Bangoria <ravi.bangoria@amd.com>, Xing Zhengjun <zhengjun.xing@linux.intel.com>, Rob Herring <robh@kernel.org>, Kang Minchul <tegongkang@gmail.com>, linux-arm-kernel@lists.infradead.org, linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org, Sandipan Das <sandipan.das@amd.com>, Jing Zhang <renyu.zj@linux.alibaba.com>, linuxppc-dev@lists.ozlabs.org, Kajol Jain <kjain@linux.ibm.com> Cc: Stephane Eranian <eranian@google.com>, Perry Taylor <perry.taylor@intel.com>, Caleb Biggers <caleb.biggers@intel.com>, Ian Rogers <irogers@google.com> Content-Type: text/plain; charset="UTF-8" X-Spam-Status: No, score=-9.6 required=5.0 tests=BAYES_00,DKIMWL_WL_MED, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS,USER_IN_DEF_DKIM_WL autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: <linux-kernel.vger.kernel.org> X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1752073921350488378?= X-GMAIL-MSGID: =?utf-8?q?1752073921350488378?= |
Series |
jevents/pmu-events improvements
|
|
Commit Message
Ian Rogers
Dec. 13, 2022, 5 a.m. UTC
rhs may not be defined, say for source_count, so add a guard.
Signed-off-by: Ian Rogers <irogers@google.com>
---
tools/perf/pmu-events/metric.py | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/tools/perf/pmu-events/metric.py b/tools/perf/pmu-events/metric.py index cc451a265751..1fa3478b9ab0 100644 --- a/tools/perf/pmu-events/metric.py +++ b/tools/perf/pmu-events/metric.py @@ -261,8 +261,10 @@ class Function(Expression): def Equals(self, other: Expression) -> bool: if isinstance(other, Function): - return self.fn == other.fn and self.lhs.Equals( - other.lhs) and self.rhs.Equals(other.rhs) + result = self.fn == other.fn and self.lhs.Equals(other.lhs) + if self.rhs: + result = result and self.rhs.Equals(other.rhs) + return result return False