From patchwork Tue Dec 13 05:00:35 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Rogers X-Patchwork-Id: 13071717 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id D8B06C4332F for ; Tue, 13 Dec 2022 05:02:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:Cc:To:From:Subject:References: Mime-Version:Message-Id:In-Reply-To:Date:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=vwkQJqn2WZ0UC+VjYm2ktBibZNZdp3RTnOBXBECYHrM=; b=aDH/PvvC64hzpE7z+t93YzcFLE 4HLNnR0zD3KehzffmxBVYv12UKhlUKeUsq4uiUefTMzL+dmCc4qlZCQk/VAcLq/NfW+HJrjNau2Eb lMSUIZEB2zjc6pvs2OpLpgtwkmjneOXabTZJcb49Khk5bbXaTWfdBZxmkvaPWZN25jVhFC7dnQdjn abl7rGtD6m1ZdqPOcgAlyJBwm+PyiLdLCiapGgWCBI2GcF65VBaRXEAUy+adtw9TW6q60MV58XNHw gGy2xCarn+ahMHrImNqKQXH4k4aaHldGLxwvgTr9KPJrgv3qYkgofuKV/ucmi58HhWQViQIZud/FR LXvKJ0lg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1p4xQD-00B5oV-Qn; Tue, 13 Dec 2022 05:01:42 +0000 Received: from mail-pj1-x104a.google.com ([2607:f8b0:4864:20::104a]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1p4xQ5-00B5kC-27 for linux-arm-kernel@lists.infradead.org; Tue, 13 Dec 2022 05:01:34 +0000 Received: by mail-pj1-x104a.google.com with SMTP id mg21-20020a17090b371500b00219767e0175so1243101pjb.1 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=vCqa0OjqCA3BhLStjoj8iqFdZpFFYRfwvBPkd6vUvfvOIhcKLuXy1JPDxmMQ17ckzA JcXvRWbTHMU+olDjOu61HwB2yKOxty0A9nL2qcJkEsPkzNoyzpOPZ1mpyJLSSZz+EcJF xa2eHL9yo5VyfrqlN95EYfbNrn2UGwYj1y2WIjq1JDMpTakHBB0z9T+k/NjlP14Rnwb+ CgdNtM0SBmc2u4blhWAT0v9kEkkMysYCVdbvPOpzT7LVeYQLCITzo2aRzhjvIckESKoX nCjUm4SmOHTTR7Nj12xSJr1tFk9uMc1uJzBNxpnrL978vcETiFq18BXC3lW8NEU8JjZ8 ThaQ== X-Gm-Message-State: ANoB5plwKKUrigLIjmhDqt5sdcs2h2b28YBA8nox7J0IVZMO1B+HufUN /GDREJp0U29TYzyCEDkJz1B/NOywXKtx 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 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20221212_210133_147323_46695FF6 X-CRM114-Status: GOOD ( 12.07 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org 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): 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