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;
From:   John Garry <john.g.garry@oracle.com>
To:     acme@kernel.org, irogers@google.com, namhyung@kernel.org,
        jolsa@kernel.org
Cc:     linux-arm-kernel@lists.infradead.org,
        linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org,
        renyu.zj@linux.alibaba.com, shangxiaojing@huawei.com,
        zhangshaokun@hisilicon.com, qiangqing.zhang@nxp.com,
        kjain@linux.ibm.com, kan.liang@linux.intel.com,
        John Garry <john.g.garry@oracle.com>
Subject: [PATCH RFC 2/9] perf metrics: Don't iter sys metrics if we already found a CPU match
Date:   Wed, 28 Jun 2023 10:29:42 +0000
Message-Id: <20230628102949.2598096-3-john.g.garry@oracle.com>
In-Reply-To: <20230628102949.2598096-1-john.g.garry@oracle.com>
References: <20230628102949.2598096-1-john.g.garry@oracle.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?iBwpMwPirNZHYX21wuZGMhUFcpHDjbiaUro6qlwgD8DZFK6DnRFbbPefaYlH?=
 =?us-ascii?Q?6LjfOQz8tbJNzV1PYgPGbd1ylarZzO4NKfZimooYx4kgjU4mEAt4Lpkei/ig?=
 =?us-ascii?Q?OxcBL7od36+EhgQiWWPN15Vxud0ygaeyxSGINocQoTpj0VxDQCrTdjs7khUQ?=
 =?us-ascii?Q?2fFLEEEs3rs7K7aHriEgunD9NK18Z6/PciDrAKBLP8t6JxiwyDwXMPXEejRp?=
 =?us-ascii?Q?KjHpvNjpVpk1ZyMeA2HH0wCgC7nyNjzQ/7KdIPCPiAFmeKFwbHv2FkjCCTzK?=
 =?us-ascii?Q?UWO/jT2Dq87bzZBRYss908sctuGz/AfNXy+zsxTSxV9kA29SOz8VEiBfeLYc?=
 =?us-ascii?Q?CX+5Rjj9qQtW6rBJcKJMF+xZKMcCccz8mW1UZWm9Grn8kFE2oXdiBjrJLBhN?=
 =?us-ascii?Q?kldu8f9qPnAlI6h+FEiqhczgyLZH4SMoSMdz29/QItGgGKtWKqPJ3tq2b2cj?=
 =?us-ascii?Q?rEQhPeSeblIhkSSFNUM4+ZEmAxDh16+YK6HwE/CCmzRsgm/aN7EvmDDDThGd?=
 =?us-ascii?Q?RtZbmCo9X8KJFzPRemAds32UUM/W0NovLHpTR256ZX1vni1O2x3l+EyPH5jg?=
 =?us-ascii?Q?3MhrlqMKbQO0sCQoOompIwx//pQSzZMHJS0EAhr19BgA3zmz9BstYqq8OSCN?=
 =?us-ascii?Q?ObXkyK4gWdEVmWM0Vml+p6kFQmDXhUcn1XH+z32ZurzX1L1dY68VaTFzkv2O?=
 =?us-ascii?Q?F5JcR3E9PyqKyjvOyTlpKpTxt185jGlTAtD0MFiF3MlWKmO6bBiJNMxKxeY/?=
 =?us-ascii?Q?OchE48lQxDH8p2NobsEYX6ZnthsI/lhAxJywrxD604jivVRk6OelLsIsB3BK?=
 =?us-ascii?Q?L/+QiOA9WF/b3wBycCdVd1ijikqBN6rguzZpgWugIV29AMkev/KYWYA6HUzV?=
 =?us-ascii?Q?i878BaGDdjRrF8wyINyisLGaDgkXwfaClO1HYn4E/XNpz8jU9gINt4nq0SFW?=
 =?us-ascii?Q?CykHjrlxZKoHE011/VWLXfzBTvfsemwweybGf5dr/oT3N74rMsUGbDaaXZ80?=
 =?us-ascii?Q?KLmNmWXv0V+znhe7GNE36WDK/CLT0rMO8YF2m0DD/is8c1ixBJdQGpHpF412?=
 =?us-ascii?Q?ediA94N2rQd1X4EVRQh5YyhpQ1VPoK6qoeDRLYdaF63csdvn9YrFIxghJXVh?=
 =?us-ascii?Q?UX/nNaKfHZb5BgytB/lNJZzlbDcKezojKCHrfyswso2egz35tEO59bgcbIzJ?=
 =?us-ascii?Q?ddpLhJtwLv5ST16OBZ67fGSJQlcMTuQ91P8CvLlfo8ElzDRvYoyQ/ekh+6nM?=
 =?us-ascii?Q?EB185Le/o1Q6UEveVQzmscvBOyZop8fTRcRFlXK02Z7b7IDve/4UGD0JpcdN?=
 =?us-ascii?Q?HZuYBiJj5tNn8HHy2At2sxsss44f5fWoAZK3c011z2TgHSMR7QOph0lg1LO+?=
 =?us-ascii?Q?oRqqFDViQA/E+GHFgO33UVb3OAEY1evialqv4V5boo/O1XNYlTWg9aicS4u9?=
 =?us-ascii?Q?goPb8LtuA1xg9lI6bBVLiDtM/mEJb+E/DlusoWyxIMfNgJc9wH/HmZq7o6pW?=
 =?us-ascii?Q?SDaCC8wPWRwqzXlo3+42qO/NmahZ8JEq2nPRZQ0+TRMSk5n/HMJs8XcrPj7J?=
 =?us-ascii?Q?wHehoYiK0KaugIat74VAXlaRQS2y0ejCJlF11SxB7SJq4TB+yZm/phlH4uoj?=
 =?us-ascii?Q?BQ=3D=3D?=
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: =?us-ascii?Q?JZjIas21fSTfSgi3HVCx/FPR6eMihTx7gDO6TamU9MtmcYr3VBUPWDNhGZlu?=
 =?us-ascii?Q?z4MZrZbcZCA9XcxJJcRqB4IF5nc/KRJB98L6GXXGGXZLSNw58Jhbxn8D3hK/?=
 =?us-ascii?Q?SRd/sIEPKd5E29aRFncC7ps15zCEjrAUlNu/fkiUxSa3CDeXeQHjfG9thifn?=
 =?us-ascii?Q?AEFKhwGp/Kj2EAuFOxh0iKph+NrNK8LCyBAfkZNk7JXQrwGn4aKYMSyJ/CJr?=
 =?us-ascii?Q?MIB/pJsPXqUFY6u+W3Gl+Mjhvh5VeVqS0fRLtmBJ8rxi0Dc8n3mk40lcpJfF?=
 =?us-ascii?Q?YBAEMYLDF6jcsGXO3LhjTziE35ZHpPtrlZ//RX5eVGTM0miaD+HtZWbO9c/K?=
 =?us-ascii?Q?y4oNzv0sBnNn9a19BrGZ46jHaxnutWkkGKF9oEor9YaGqr3rQe++KnUcutj9?=
 =?us-ascii?Q?n1zYYPbw+DSVkVd7uDESH/H3KSd/fx4UbRydrKxcT/wfjH5PM6ZNWP3QZn96?=
 =?us-ascii?Q?NTlYwlsE1mA/p7lGrwPFZbxi7ofUDsShekVFCJZHjC3sI+gtNlBljX7MfVLx?=
 =?us-ascii?Q?jBabblxP+8XSlo6xIcsbxgBnwrCmfx/tDJh4aWnhZCcedZchrjBeCxFV3qeP?=
 =?us-ascii?Q?+oHhYLGJSScIwL2uHYLfx3HQCYkNxCDk9Aq1Yrcz9xOjJlml8kW6+FIjEVqH?=
 =?us-ascii?Q?7lAKKNJqrxJMRyQ6UlLK62MxB4+vR+fS2F7yOIidMXV4N50KXdiJE8+m+Ek9?=
 =?us-ascii?Q?sMwsZCvHpHgf0/MqZyOZbQzd/3ecbQmA9rSaeTvP1O5rHkHG3gLhVTE9EuK2?=
 =?us-ascii?Q?/FXNHnKd6x6BxlObg3U2MPBpNOFKgYj+BDOauA8Z6fjNUUpkbitYzeq1WZ5N?=
 =?us-ascii?Q?9nvyho1Y/uGNrryuvCubjoKKyQtnCQuYPbz5qtMMFV4YwXQCWo1TzrQPgbAC?=
 =?us-ascii?Q?5ajMZ7CZyLq/wMafs4DtBYHf4f1kFVpsGrhiLo6cvBsJI7FKqW0s9u8dnnai?=
 =?us-ascii?Q?QXb12Dx6lr1b73c/vdxHjZnWxyA7mUNBTREDasoT7kL/h7ofRi4ppeh96SBr?=
 =?us-ascii?Q?KI8AEfOucNQGImeumgFP11B3jW4lT2UN3TthHLlTyPR3FospoR8nqHFv2CG+?=
 =?us-ascii?Q?pxpPagqgsJfkBRV6+EoDOPvsMcz0LQ=3D=3D?=
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 6048d41f-99e0-40f3-ddd9-08db77c2a878
X-MS-Exchange-CrossTenant-AuthSource: DM6PR10MB4313.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Jun 2023 10:30:13.8111
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: hYSPcY0AcSWNLwmlKg9F5lKScU8zKa1h+ol5yLmBxZuoMzn1HF335/wpucJw+tx/DPivzHUoRQnOdCvjKx9bbw==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA2PR10MB4715
X-Proofpoint-Virus-Version: vendor=baseguard
 engine=ICAP:2.0.254,Aquarius:18.0.957,Hydra:6.0.591,FMLib:17.11.176.26
 definitions=2023-06-28_06,2023-06-27_01,2023-05-22_02
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 adultscore=0 spamscore=0
 mlxlogscore=999 malwarescore=0 phishscore=0 bulkscore=0 suspectscore=0
 mlxscore=0 classifier=spam adjust=0 reason=mlx scancount=1
 engine=8.12.0-2305260000 definitions=main-2306280092
X-Proofpoint-ORIG-GUID: Ei7PYWfq2AY0PM-jEmehI1gadyAzAQia
X-Proofpoint-GUID: Ei7PYWfq2AY0PM-jEmehI1gadyAzAQia
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

In metricgroup__add_metric() we still iter the sys metrics if we already
found a match from the CPU table, which is pretty pointless, so don't
bother.

Signed-off-by: John Garry <john.g.garry@oracle.com>
---
 tools/perf/util/metricgroup.c | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/tools/perf/util/metricgroup.c b/tools/perf/util/metricgroup.c
index 4389ccd29fe7..8d2ac2513530 100644
--- a/tools/perf/util/metricgroup.c
+++ b/tools/perf/util/metricgroup.c
@@ -1261,6 +1261,12 @@ static int metricgroup__add_metric(const char *pmu, const char *metric_name, con
 
 		has_match = data.has_match;
 	}
+
+	if (has_match) {
+		ret = 0;
+		goto out;
+	}
+
 	{
 		struct metricgroup_iter_data data = {
 			.fn = metricgroup__add_metric_sys_event_iter,
@@ -1279,6 +1285,7 @@ static int metricgroup__add_metric(const char *pmu, const char *metric_name, con
 
 		pmu_for_each_sys_metric(metricgroup__sys_event_iter, &data);
 	}
+
 	/* End of pmu events. */
 	if (!has_match)
 		ret = -EINVAL;
-- 
2.35.3