From mboxrd@z Thu Jan 1 00:00:00 1970 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 C6DF0C54E94 for ; Thu, 26 Jan 2023 01:19:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230193AbjAZBTT (ORCPT ); Wed, 25 Jan 2023 20:19:19 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36800 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236154AbjAZBTQ (ORCPT ); Wed, 25 Jan 2023 20:19:16 -0500 Received: from mail-yw1-x1149.google.com (mail-yw1-x1149.google.com [IPv6:2607:f8b0:4864:20::1149]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 650E5611F9 for ; Wed, 25 Jan 2023 17:19:15 -0800 (PST) Received: by mail-yw1-x1149.google.com with SMTP id 00721157ae682-434eb7c6fa5so3795317b3.14 for ; Wed, 25 Jan 2023 17:19:15 -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=+u1pVwNx8YIp+mc14zUC+ZcmzjCMVQKlou80yZYqsbw=; b=OuJQEMGcjCRTQw5UQ1ZQzjv+z2xhVN1lULZdKwin2IH1/QyPC8VIC1Gg3jqImYyW9c R8pR8BxKGestrduQkLk3Iht5Xu3z3ZLvfCNomo1mwvWlN+F/Q6M42RsmyMDVGr1/LXQV ybsazzJchbK3NRH1IEx2ErPDiktwoCEIhz3Yco3W1UWbFNzbPyIIeC7wCwUDfjTeCejA Nz/EUS7q/DrycNausmVoWMJqsc1yb40KBpyApgEP62+M+iZ9GHgG0aWHwDVYPVtsjZ+C oxQ5DBv+lx3Jmm+Zh9OS9ln1af2XHtfAE7QlBnJn39mDcV5SpdE3WdLS9z7KGUCNv47v Oauw== 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=+u1pVwNx8YIp+mc14zUC+ZcmzjCMVQKlou80yZYqsbw=; b=Ndv8GH6WcFMRGhrJ0IaPqUA8gT17qBkmyjo8tTxt7k7vfsapdltJsJzVieQxXDPDcg iPUoiQOiVbgAVUWsJGY96dz5y9v8AmEwUSusxrBBzODxs1ZjlwDTSQzVD3arVzO+tRBt Qcsr1CKgfkyf/2gNei3XotONtyyeGZMyhi8vERKyea16ufZJcWSIJowU9pjKdYUpS05d sGJqpPaligAF145cbrgJRTC+sqo0TZy3ddS9Ean2ifAWQBuq2LMg+dBRcatQ6EnledAn veIK+rTVYJ3ZGjbyrm4DkC4bbBenXJoLjGdDiywh2YYlku6JzGFDh4LpvwWst7MwhOs5 zbPw== X-Gm-Message-State: AO0yUKXCOkmCddcNm4X3afV2+qdL+FTjhljVmQ2J7bO8tc/sHUIQFNsM C7GtMT17L9nM8n5/FerYEKpCd28Sihw+ X-Google-Smtp-Source: AK7set9Jn0idMZk3grwkylaxn390n+wWJqHqiG9FwwDRdG90HD+eREktCgKloDte62f3k3u8VVMiomHck39J X-Received: from irogers.svl.corp.google.com ([2620:15c:2d4:203:568d:4d98:b468:b025]) (user=irogers job=sendgmr) by 2002:a0d:f304:0:b0:508:3e6d:8ac1 with SMTP id c4-20020a0df304000000b005083e6d8ac1mr127538ywf.207.1674695954541; Wed, 25 Jan 2023 17:19:14 -0800 (PST) Date: Wed, 25 Jan 2023 17:18:43 -0800 In-Reply-To: <20230126011854.198243-1-irogers@google.com> Message-Id: <20230126011854.198243-2-irogers@google.com> Mime-Version: 1.0 References: <20230126011854.198243-1-irogers@google.com> X-Mailer: git-send-email 2.39.1.456.gfc5497dd1b-goog Subject: [PATCH v4 01/12] 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 Content-Type: text/plain; charset="UTF-8" Precedence: bulk List-ID: X-Mailing-List: linux-perf-users@vger.kernel.org rhs may not be defined, say for source_count, so add a guard. Reviewed-by: Kajol Jain 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 4797ed4fd817..2f2fd220e843 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 -- 2.39.1.456.gfc5497dd1b-goog From mboxrd@z Thu Jan 1 00:00:00 1970 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 lists.ozlabs.org (lists.ozlabs.org [112.213.38.117]) (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 E1619C27C76 for ; Thu, 26 Jan 2023 01:20:58 +0000 (UTC) Received: from boromir.ozlabs.org (localhost [IPv6:::1]) by lists.ozlabs.org (Postfix) with ESMTP id 4P2NFP0W6Tz3fGZ for ; Thu, 26 Jan 2023 12:20:57 +1100 (AEDT) Authentication-Results: lists.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=google.com header.i=@google.com header.a=rsa-sha256 header.s=20210112 header.b=OuJQEMGc; dkim-atps=neutral Authentication-Results: lists.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=flex--irogers.bounces.google.com (client-ip=2607:f8b0:4864:20::1149; helo=mail-yw1-x1149.google.com; envelope-from=3etxrywckdcknwtljwxlttlqj.htrqnszcuuh-ijaqnxyx.teqfgx.twl@flex--irogers.bounces.google.com; receiver=) Authentication-Results: lists.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=google.com header.i=@google.com header.a=rsa-sha256 header.s=20210112 header.b=OuJQEMGc; dkim-atps=neutral Received: from mail-yw1-x1149.google.com (mail-yw1-x1149.google.com [IPv6:2607:f8b0:4864:20::1149]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 4P2NCT0ncdz3cgm for ; Thu, 26 Jan 2023 12:19:16 +1100 (AEDT) Received: by mail-yw1-x1149.google.com with SMTP id 00721157ae682-4bdeb1bbeafso4026517b3.4 for ; Wed, 25 Jan 2023 17:19:16 -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=+u1pVwNx8YIp+mc14zUC+ZcmzjCMVQKlou80yZYqsbw=; b=OuJQEMGcjCRTQw5UQ1ZQzjv+z2xhVN1lULZdKwin2IH1/QyPC8VIC1Gg3jqImYyW9c R8pR8BxKGestrduQkLk3Iht5Xu3z3ZLvfCNomo1mwvWlN+F/Q6M42RsmyMDVGr1/LXQV ybsazzJchbK3NRH1IEx2ErPDiktwoCEIhz3Yco3W1UWbFNzbPyIIeC7wCwUDfjTeCejA Nz/EUS7q/DrycNausmVoWMJqsc1yb40KBpyApgEP62+M+iZ9GHgG0aWHwDVYPVtsjZ+C oxQ5DBv+lx3Jmm+Zh9OS9ln1af2XHtfAE7QlBnJn39mDcV5SpdE3WdLS9z7KGUCNv47v Oauw== 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=+u1pVwNx8YIp+mc14zUC+ZcmzjCMVQKlou80yZYqsbw=; b=oYZihAjytH5WHy3x4WE3Kcy9fZRjs+euTd5dhBdnkBpqboogheLKk2tMVUKja5Qs3X vxfLbCcuk26aht4WAF3RuUU/0ebNCsDsCwZ0s1lO9GD1lmbCOgK7Mtc7Y0xy82XFnh9L O5QKcLDie7a53/DAfAICXZEYwOHHc+SO/Hw5RkhEhTiSWrozhZuJzHyDhWjaTbO089US iAuwm3d/PoqQze4+Z3x8mZrI+dWE64dEkyZblQ8KXMvhRj0tc4L6/C4mbgBuMhg5zE/B XQQFo7iIAlVmN3hmYUmn709wow66UHdZ9v5RBL7ib87mO/NK2aYkiH4Zb8OZYXekU2AA LrDw== X-Gm-Message-State: AO0yUKUU/fwHCjTJq7vPH+OzWFGvyNdUSCf6kx8A1epzoWdHTJZVQj34 RwMnB0hEuCl0IrwXxP+VUQP+MO5ptbQQ X-Google-Smtp-Source: AK7set9Jn0idMZk3grwkylaxn390n+wWJqHqiG9FwwDRdG90HD+eREktCgKloDte62f3k3u8VVMiomHck39J X-Received: from irogers.svl.corp.google.com ([2620:15c:2d4:203:568d:4d98:b468:b025]) (user=irogers job=sendgmr) by 2002:a0d:f304:0:b0:508:3e6d:8ac1 with SMTP id c4-20020a0df304000000b005083e6d8ac1mr127538ywf.207.1674695954541; Wed, 25 Jan 2023 17:19:14 -0800 (PST) Date: Wed, 25 Jan 2023 17:18:43 -0800 In-Reply-To: <20230126011854.198243-1-irogers@google.com> Message-Id: <20230126011854.198243-2-irogers@google.com> Mime-Version: 1.0 References: <20230126011854.198243-1-irogers@google.com> X-Mailer: git-send-email 2.39.1.456.gfc5497dd1b-goog Subject: [PATCH v4 01/12] 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 Content-Type: text/plain; charset="UTF-8" X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Ian Rogers , Perry Taylor , Caleb Biggers , Stephane Eranian Errors-To: linuxppc-dev-bounces+linuxppc-dev=archiver.kernel.org@lists.ozlabs.org Sender: "Linuxppc-dev" rhs may not be defined, say for source_count, so add a guard. Reviewed-by: Kajol Jain 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 4797ed4fd817..2f2fd220e843 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 -- 2.39.1.456.gfc5497dd1b-goog From mboxrd@z Thu Jan 1 00:00:00 1970 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 9D5FCC27C76 for ; Thu, 26 Jan 2023 01:20:28 +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=B34jkUaiQhoadb8h7WnwRvBttgs0+d5kQy9YenPUO+s=; b=4ATaWOnoblDhcFWxyIikT2OdxJ /VxtAKwqvVC0NNTFs829m3txoFf6BaTOTZnWAFUz7lyCIiu2XfI9tZ9+TxltPztK4CrQit7AAEJ1g mlIlIZr96YrwenX7S9P9SP9vxTawPv3xLYI0P1oGTNLI4empmW9StQHaC2KSg79bJwolpBuBGvQ4P EXs4CBezFdXwhF8LTEWTfk3VQp8KoFigku0j/rj+hbKBTNhKdRu9fq1Md2h9KIocI6Q9zjB7iuedo zcQsYpH+Ecak2BZpxlHPF0j2lwjUSRKTHQcNjLtFBcH4NRvLS2o1GtfjClCVOEroDccbnQ9PM8HHC GHkv8Ckw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1pKqvD-009JH4-N2; Thu, 26 Jan 2023 01:19:23 +0000 Received: from mail-yb1-xb49.google.com ([2607:f8b0:4864:20::b49]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1pKqv8-009JFD-FR for linux-arm-kernel@lists.infradead.org; Thu, 26 Jan 2023 01:19:19 +0000 Received: by mail-yb1-xb49.google.com with SMTP id n8-20020a258d08000000b007facaf67acfso406623ybl.0 for ; Wed, 25 Jan 2023 17:19:15 -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=+u1pVwNx8YIp+mc14zUC+ZcmzjCMVQKlou80yZYqsbw=; b=OuJQEMGcjCRTQw5UQ1ZQzjv+z2xhVN1lULZdKwin2IH1/QyPC8VIC1Gg3jqImYyW9c R8pR8BxKGestrduQkLk3Iht5Xu3z3ZLvfCNomo1mwvWlN+F/Q6M42RsmyMDVGr1/LXQV ybsazzJchbK3NRH1IEx2ErPDiktwoCEIhz3Yco3W1UWbFNzbPyIIeC7wCwUDfjTeCejA Nz/EUS7q/DrycNausmVoWMJqsc1yb40KBpyApgEP62+M+iZ9GHgG0aWHwDVYPVtsjZ+C oxQ5DBv+lx3Jmm+Zh9OS9ln1af2XHtfAE7QlBnJn39mDcV5SpdE3WdLS9z7KGUCNv47v Oauw== 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=+u1pVwNx8YIp+mc14zUC+ZcmzjCMVQKlou80yZYqsbw=; b=JaZHW8RZzsAqEHPnIANqdDzpJZWMWShF8n2hFz0iTn7EyZygE/cLF/TGPt7z8GhwOv Orav8DdTjH/pIIR4/JhTrKXWNN6kLb/GL9r5khFFUVIn+0HNYLy1x3vpqi8OtFz6I/pI Jyf8fRv91F8ZEY8A/Xe0CdmKjF2Tad5o0e4sp9Xp0AiZZlvSGpChZnF3CMBgNut+CK2z PdkKw0eEYND4ZwTBbMXoCeVG1IE3jMfoROJmwt2P2/iasOOqznKuz7voARHA3L+fQfPM fmpYQICMnT4EAfKEM9KWJTDi6Kl2hZlw4wNcirvVJKZE58GIlzikcGsA10NAgCqGufSG ge/w== X-Gm-Message-State: AO0yUKWoyZFolzW2mxnYJM6D1eVjs5vAuFaGoM9CEx2JLVochwRVSdjw VOXs/W6CfsmiAlVJC3+13SST/pcNt9Qc X-Google-Smtp-Source: AK7set9Jn0idMZk3grwkylaxn390n+wWJqHqiG9FwwDRdG90HD+eREktCgKloDte62f3k3u8VVMiomHck39J X-Received: from irogers.svl.corp.google.com ([2620:15c:2d4:203:568d:4d98:b468:b025]) (user=irogers job=sendgmr) by 2002:a0d:f304:0:b0:508:3e6d:8ac1 with SMTP id c4-20020a0df304000000b005083e6d8ac1mr127538ywf.207.1674695954541; Wed, 25 Jan 2023 17:19:14 -0800 (PST) Date: Wed, 25 Jan 2023 17:18:43 -0800 In-Reply-To: <20230126011854.198243-1-irogers@google.com> Message-Id: <20230126011854.198243-2-irogers@google.com> Mime-Version: 1.0 References: <20230126011854.198243-1-irogers@google.com> X-Mailer: git-send-email 2.39.1.456.gfc5497dd1b-goog Subject: [PATCH v4 01/12] 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-20230125_171918_540202_91E4CD01 X-CRM114-Status: GOOD ( 12.64 ) 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: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit 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. Reviewed-by: Kajol Jain 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 4797ed4fd817..2f2fd220e843 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 -- 2.39.1.456.gfc5497dd1b-goog _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel