From patchwork Sat Oct 14 01:51:56 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Wang, Weilin" X-Patchwork-Id: 152875 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2908:b0:403:3b70:6f57 with SMTP id ib8csp2255961vqb; Fri, 13 Oct 2023 18:53:14 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGxVoZ4K+C3W4O47hyMKGNsXFoGD5TzwaQ6D5cw5d956nSAyG+k+c9JzC4FcznnYHH4zDVp X-Received: by 2002:a92:d9c4:0:b0:349:4e1f:e9a0 with SMTP id n4-20020a92d9c4000000b003494e1fe9a0mr28361432ilq.2.1697248394401; Fri, 13 Oct 2023 18:53:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1697248394; cv=none; d=google.com; s=arc-20160816; b=QZn5uJ/WGQY/ZFV6aI5Ey2tCA2PGOfIWZwi9oaV42OHIDhHQf1+nzEs1SBmPoeabxL gwvbOWy80pS0I+i/EBzhfYW/JIEAz5OVkkS178apL6DsVBeQJqGoJ4W8HlDwWQYtqn4/ ZX6K8jRee6XRQb3pPc2ee+wLjEAUCz/qgPhuHRIuGJEtuwv97bGpKQiuW1ghBhMSclhm mFHpqBnBuMl5QpbArElbG1b9zL05Dn3ZAnHAra95M4Qx7oaTgaJi9l8CrObpIdxhlGQ+ Rw9iMojkbZ+Ne14UxKF4J38jWcWDk5sxpZQ3HHXf87ViMXae7jCq1Wzb5J+XC69J4AbE yWRw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=dH2gExivMUfdshv8285WhuABJXLAlwG0Ju6iMJ9BCeY=; fh=fjecWn2tsXHKF5pPtw+gI2dQE/iSXdFsWSc8KUP/zmc=; b=rSc2oeI+Hxs4piHB8pmnUIdms24irvGG8eixEG/dPReMKmxCDuVXuUqQ+0kGQU6NYB f3KUFkH95Gn8d+7xwrAtT+Wo5tYinDLKfQhvI7qP1Mg2BI4072z05iSLtrj+WJTD5LMJ juNHvuKybpog5IEJeT8c9tOxY+WJWBD8stJFVHm7rvsjGKS7sHUsoz/K0hn+jichPFMm RBU2vnwo29bBOmKIfAxFsK7yIGBL1lU5yyDP5foZq2ehwWCEkXX259PO0Bl1UuJ0Ytx6 aM8dXm+H95jEX1mDKjo2W9a+pCOthXeudRsm+7JyyCvNMxHHfIiyOk9Yk+larO8JFc88 crhA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=Aoh5PiuJ; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from snail.vger.email (snail.vger.email. [2620:137:e000::3:7]) by mx.google.com with ESMTPS id fo23-20020a056a00601700b0069fe19ca863si14957743pfb.284.2023.10.13.18.53.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 13 Oct 2023 18:53:14 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) client-ip=2620:137:e000::3:7; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=Aoh5PiuJ; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by snail.vger.email (Postfix) with ESMTP id B7F2E8350FCA; Fri, 13 Oct 2023 18:53:13 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232941AbjJNBxE (ORCPT + 20 others); Fri, 13 Oct 2023 21:53:04 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54842 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232848AbjJNBwy (ORCPT ); Fri, 13 Oct 2023 21:52:54 -0400 Received: from mgamail.intel.com (mgamail.intel.com [134.134.136.65]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BC8CB1AB; Fri, 13 Oct 2023 18:52:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1697248361; x=1728784361; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=gaGdzh8ex8r2NhcHlw9ObYcqe0ntMpFyi4DBKEczGrI=; b=Aoh5PiuJD4zjpYWrmY/Vpv/dGCSg7AxixUFgu/h0OyAu/R8JE9CVPI/1 eABJlafvyJqPncI1Gfcgz7VrgEJ3OnCzY529IgABT3bg/lh2PkVB0aW5f UYUHQWYbeDie29wfr/kFJfxuJLxHH1kmZsoATBLMNglZiVEYlXDfL9//+ Suow9kDXU9dxcEfLOso9MpA3NYd4UvOjBfXDdWKbmusbgeBMzm3hgrVb9 2ykyjgIww2KE/h/MzoyWQ5RzVSXR5znAYXxp0PWYTmpQvSV1jfNisEYGC GpOu6EPlQAGD9KbkFRa1yltquZz6043vPYbtHP0im6tI9UzeRxFm+RrfH Q==; X-IronPort-AV: E=McAfee;i="6600,9927,10862"; a="389154743" X-IronPort-AV: E=Sophos;i="6.03,223,1694761200"; d="scan'208";a="389154743" Received: from orsmga006.jf.intel.com ([10.7.209.51]) by orsmga103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 13 Oct 2023 18:52:21 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10862"; a="731565689" X-IronPort-AV: E=Sophos;i="6.03,223,1694761200"; d="scan'208";a="731565689" Received: from b49691a75598.jf.intel.com ([10.54.34.22]) by orsmga006.jf.intel.com with ESMTP; 13 Oct 2023 18:52:20 -0700 From: weilin.wang@intel.com To: weilin.wang@intel.com, Ian Rogers , Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Alexander Shishkin , Jiri Olsa , Namhyung Kim , Adrian Hunter , Kan Liang Cc: linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org, Perry Taylor , Samantha Alt , Caleb Biggers , Mark Rutland , Yang Jihong Subject: [RFC PATCH v2 11/17] perf stat: Add function to handle special events in hardware-grouping Date: Fri, 13 Oct 2023 18:51:56 -0700 Message-Id: <20231014015202.1175377-12-weilin.wang@intel.com> X-Mailer: git-send-email 2.39.3 In-Reply-To: <20231014015202.1175377-1-weilin.wang@intel.com> References: <20231014015202.1175377-1-weilin.wang@intel.com> MIME-Version: 1.0 X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_LOW, SPF_HELO_NONE,SPF_NONE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Fri, 13 Oct 2023 18:53:13 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1779693932287203149 X-GMAIL-MSGID: 1779693932287203149 From: Weilin Wang There are some special events like topdown events and TSC that are not decribed in pmu-event JSON files. Add support to handle this type of events. This should be considered as a temporary solution because including these events in JSON files would be a better solution. Signed-off-by: Weilin Wang --- tools/perf/util/metricgroup.c | 25 +++++++++++++++++++++++-- tools/perf/util/metricgroup.h | 15 +++++++++++++++ 2 files changed, 38 insertions(+), 2 deletions(-) diff --git a/tools/perf/util/metricgroup.c b/tools/perf/util/metricgroup.c index dccd16a58..fd92e9283 100644 --- a/tools/perf/util/metricgroup.c +++ b/tools/perf/util/metricgroup.c @@ -2023,6 +2023,15 @@ static int create_grouping(struct list_head *pmu_info_list, return ret; }; +static bool is_special_event(const char *id) +{ + for (int i = 0; i < SPECIAL_EVENT_MAX; i++) { + if (!strncmp(id, special_event_names[i], strlen(special_event_names[i]))) + return true; + } + return false; +} + /** * hw_aware_build_grouping - Build event groupings by reading counter * requirement of the events and counter available on the system from @@ -2047,7 +2056,17 @@ static int hw_aware_build_grouping(struct expr_parse_ctx *ctx __maybe_unused, hashmap__for_each_entry(ctx->ids, cur, bkt) { const char *id = cur->pkey; - pr_debug("found event %s\n", id); + if (is_special_event(id)) { + struct metricgroup__event_info *event; + + event = event_info__new(id, "default_core", "0", + /*free_counter=*/true); + if (!event) + goto err_out; + + list_add(&event->nd, &event_info_list); + continue; + } ret = get_metricgroup_events(id, etable, &event_info_list); if (ret) goto err_out; @@ -2519,8 +2538,10 @@ int metricgroup__parse_groups(struct evlist *perf_evlist, ret = hw_aware_parse_groups(perf_evlist, pmu, str, metric_no_threshold, user_requested_cpu_list, system_wide, /*fake_pmu=*/NULL, metric_events, table); - if (!ret) + if (!ret) { + pr_info("Hardware aware grouping completed\n"); return 0; + } } return parse_groups(perf_evlist, pmu, str, metric_no_group, metric_no_merge, diff --git a/tools/perf/util/metricgroup.h b/tools/perf/util/metricgroup.h index 51596e4b4..37fdf8c5b 100644 --- a/tools/perf/util/metricgroup.h +++ b/tools/perf/util/metricgroup.h @@ -79,6 +79,21 @@ struct metric_expr { #define TRANSFER_FIRST_BYTE(pos) (7 - pos) #define TRANSFER_SEC_BYTE(pos) (23 - pos) +/* Special events that are not described in pmu-event JSON files. + * topdown-* and TSC use dedicated registers, set as free + * counter for grouping purpose + */ +enum special_events { + TOPDOWN = 0, + TSC = 1, + SPECIAL_EVENT_MAX, +}; + +static const char *const special_event_names[SPECIAL_EVENT_MAX] = { + "topdown-", + "TSC", +}; + /** * An event used in a metric. This info is for metric grouping. */