From nobody Thu Sep 18 02:57:52 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 06CBDC4332F for ; Tue, 13 Dec 2022 05:04:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234507AbiLMFEL (ORCPT ); Tue, 13 Dec 2022 00:04:11 -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 ); 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 ; Mon, 12 Dec 2022 21:01:31 -0800 (PST) Received: by mail-pl1-x649.google.com with SMTP id m13-20020a170902f64d00b001899a70c8f1so12301947plg.14 for ; 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-Google-Smtp-Source: AA0mqf5hvvOzFevKbErNXEY+8TZG9ovyRZebB0AcYGaD6tNlLcRATfVWQ68dqrG52wztuEyPBmImvlRNdUIZ 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 To: John Garry , Will Deacon , James Clark , Mike Leach , Leo Yan , Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Mark Rutland , Alexander Shishkin , Jiri Olsa , Namhyung Kim , Adrian Hunter , Kan Liang , Kim Phillips , Florian Fischer , Ravi Bangoria , Xing Zhengjun , Rob Herring , Kang Minchul , linux-arm-kernel@lists.infradead.org, linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org, Sandipan Das , Jing Zhang , linuxppc-dev@lists.ozlabs.org, Kajol Jain Cc: Stephane Eranian , Perry Taylor , Caleb Biggers , Ian Rogers Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" rhs may not be defined, say for source_count, so add a guard. Signed-off-by: Ian Rogers --- 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): =20 def Equals(self, other: Expression) -> bool: if isinstance(other, Function): - return self.fn =3D=3D other.fn and self.lhs.Equals( - other.lhs) and self.rhs.Equals(other.rhs) + result =3D self.fn =3D=3D other.fn and self.lhs.Equals(other.lhs) + if self.rhs: + result =3D result and self.rhs.Equals(other.rhs) + return result return False =20 =20 --=20 2.39.0.rc1.256.g54fd8350bd-goog