From patchwork Mon Jun 10 09:59:29 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Garry X-Patchwork-Id: 166297 Delivered-To: patch@linaro.org Received: by 2002:a92:4782:0:0:0:0:0 with SMTP id e2csp826166ilk; Mon, 10 Jun 2019 03:01:20 -0700 (PDT) X-Google-Smtp-Source: APXvYqx3fZR8tMNkttAz+Vw51Sodp9SdrRozV5+PTq+kevlNq+dthjiefYNijwGLMplLJmK/q5Kn X-Received: by 2002:a17:90a:1b0c:: with SMTP id q12mr20610261pjq.76.1560160880164; Mon, 10 Jun 2019 03:01:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1560160880; cv=none; d=google.com; s=arc-20160816; b=esetBDDnNmciCyRnupwlj/6zfAgOkvIpMpBHVdKYpXE3yj4IPS/14b5F5wQqlzJD2i eskm81mwiqkeqX5rH7YpCJ9AB7a92bWc6Nqg+Clf8/SECw4DanyFOOZAvQb167EOaVa6 vbd33YelXDF5xrJbreh1GdMb4r//Uug105hvTkX4gYVvJ2SxlhFP9PBMRIPw5axfFyRg waZCcv3R3Jm1DCXzSz2xKf1GPDWDjDRUDhDOi+cWfRCEFU1Y5loUgm+TCDI6oUUX5wsi eHLximNrIXiFCLk1AZ8Rgn8BN/PqoChq7y7q04NXQcaAsK5nB0/v1Z8xYAlboDpvtmwF 9O6Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from; bh=7JL/hliHBGqkd+2G4xrJ7P3Fa0x2itknXlmJkm78I7A=; b=CJUOuqXe0Y310uFmXxxqBbBRCtCnMSKS1Pigqv0e2/PtJxqmrFjsDlfnEhrYMKTLbH rQrdZns/4sFdrdalYd9HHm4gryBDTZiAUwh4yHkPybn0bvavnjzitXAQoPOjS+v7xcOK 2eqfTGdJiAr/XJiZZKwAR1K12rOCVmzOSVbZdOizo1Z0+yY7MC96HAzudfjGT0rPpBs8 +Jl4GDrIBwx9PEdEbza4T+lfO243aqAo8LTCUW1a9l+XZuJAM1PWvg9NpAwv0N8mQMD0 j0oy5sHpsPrVo8DabodrSUH2pV/wBTEeWv8HQeDaQ92zBjeow9D8FgTJJ44FJ3c/yT5b OjEw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id n11si8762798pgq.498.2019.06.10.03.01.19; Mon, 10 Jun 2019 03:01:20 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2389180AbfFJKBS (ORCPT + 30 others); Mon, 10 Jun 2019 06:01:18 -0400 Received: from szxga06-in.huawei.com ([45.249.212.32]:56598 "EHLO huawei.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S2388056AbfFJKBN (ORCPT ); Mon, 10 Jun 2019 06:01:13 -0400 Received: from DGGEMS402-HUB.china.huawei.com (unknown [172.30.72.58]) by Forcepoint Email with ESMTP id 1ECBB6C34D3F6266CAEF; Mon, 10 Jun 2019 18:01:11 +0800 (CST) Received: from localhost.localdomain (10.67.212.75) by DGGEMS402-HUB.china.huawei.com (10.3.19.202) with Microsoft SMTP Server id 14.3.439.0; Mon, 10 Jun 2019 18:00:52 +0800 From: John Garry To: , , , , , , , , , , , , CC: , , , , , John Garry Subject: [PATCH 2/5] perf pmu: Support more complex PMU event aliasing Date: Mon, 10 Jun 2019 17:59:29 +0800 Message-ID: <1560160772-210844-3-git-send-email-john.garry@huawei.com> X-Mailer: git-send-email 2.8.1 In-Reply-To: <1560160772-210844-1-git-send-email-john.garry@huawei.com> References: <1560160772-210844-1-git-send-email-john.garry@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.67.212.75] X-CFilter-Loop: Reflected Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The jevent "Unit" field is used for uncore PMU alias definition. The form uncore_pmu_example_X is supported, where "X" is a wildcard, to support multiple instances of the same PMU in a system. Unfortunately this format not suitable for all uncore PMUs; take the Hisi DDRC uncore PMU for example, where the name is in the form hisi_scclX_ddrcY. For the current jevent parsing, we would be required to hardcode an uncore alias translation for each possible value of X. This is not scalable. Instead, add support for "Unit" field in the form "hisi_sccl,ddrc", where we can match by hisi_scclX and ddrcY. Tokens in Unit field are delimited by ','. Signed-off-by: John Garry --- tools/perf/util/pmu.c | 45 ++++++++++++++++++++++++++++++++++++++----- 1 file changed, 40 insertions(+), 5 deletions(-) -- 2.17.1 diff --git a/tools/perf/util/pmu.c b/tools/perf/util/pmu.c index 036047f56efa..f00cae750086 100644 --- a/tools/perf/util/pmu.c +++ b/tools/perf/util/pmu.c @@ -700,6 +700,44 @@ struct pmu_events_map *perf_pmu__find_map(struct perf_pmu *pmu) return map; } +static bool pmu_uncore_alias_match(const char *pmu_name, const char *name) +{ + /* + * uncore alias may be from different PMU + * with common prefix + */ + if (!strncmp(pmu_name, name, strlen(pmu_name))) + return true; + + /* match strings with delimiter, ',' */ + while (1) { + const char *delimiter; + char token[256] = {}; + const char *found_token; + int token_len; + + delimiter = strchr(pmu_name, ','); + if (delimiter) { + token_len = delimiter - pmu_name; + } else { + token_len = strlen(pmu_name); + } + + memcpy(token, pmu_name, token_len); + + found_token = strstr(name, token); + if (!found_token) + return false; + + /* No more delimiters, so we must be a match */ + if (!delimiter) + return true; + + pmu_name += token_len + 1; + name = found_token + token_len; + } +} + /* * From the pmu_events_map, find the table of PMU events that corresponds * to the current running CPU. Then, add all PMU events from that table @@ -730,12 +768,9 @@ static void pmu_add_cpu_aliases(struct list_head *head, struct perf_pmu *pmu) break; } - /* - * uncore alias may be from different PMU - * with common prefix - */ + if (pmu_is_uncore(name) && - !strncmp(pname, name, strlen(pname))) + pmu_uncore_alias_match(pname, name)) goto new_alias; if (strcmp(pname, name))