From patchwork Wed Feb 21 07:20:55 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Wang, Weilin" X-Patchwork-Id: 203971 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:693c:2685:b0:108:e6aa:91d0 with SMTP id mn5csp881902dyc; Tue, 20 Feb 2024 23:23:06 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCV/iVI/GQlJlTWj2hTCuzTi8Y5H2HIcmJx9O5bLBV1x/eIczTmwBMIyCYfOEjwnSDyKYLqIr6etDE+Vb6rX7wero8wsKQ== X-Google-Smtp-Source: AGHT+IEqbGsP1f3XkjKOfJaVgJS6scR3I5DYtQD6KQrWJqSJhzgIXIaXLb+KEQazEYDtYlOE0zzm X-Received: by 2002:a05:6871:a913:b0:210:7f85:c208 with SMTP id wn19-20020a056871a91300b002107f85c208mr19021307oab.46.1708500186420; Tue, 20 Feb 2024 23:23:06 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1708500186; cv=pass; d=google.com; s=arc-20160816; b=SIsQkwcbeByolmp+armWegda7E98y0r+0EsIISRgVCUyNeapW+8U2npl7QrPU/wDEN wDOmOlLCLzhk8TWi0pk6/YWeQmHMKbyZ2Z5SOM2vaQLiK7XCCqTUfLe1UXkOF+Ly0W85 6QdElVumdRvr62qZ4529osXBmNx3DEP7/uLcVGXI0JsUpzzv4vnTiO0KAXD/2XR3OJvr lndRIdpPPRiyJPnSbrD5afBA3Yg3inwBMoy7ueHXuIsAu/lQDcRJNMtmeQXO+BHWRPh3 D00dg6/R6f2P/erlKz4iopH5+x2JAVhhzhIgL9zHwl0Ii6twMS3vMYc+F1cJvceHYZR9 YFHA== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=SGsXuEOBGRczyBKrgTLyKrvO0Tv+foMwwCo7QKRdVE4=; fh=D8N1uhCLBRzbbRgEj9aMJ2/kVuNqnMf8W9VxSJOfqPA=; b=kbL2xGp6gMWE5yfqKglHt5Qq+bWn2rQN2yhuiyWa5FVej9fr3SRis7QStx8vU+45MG 0SCuEMhb9nHaVQQzyD+GwwAXSJ70IwAeh/o6b5q+UwYrrPniDfunogBQ1+pjA1wpfmu8 wBiEkn2ovRTG67pgL+oLXMDdRsXX8fsBRBpgfkmH4hJShTyveX2jWIPAvTz9TGY0wKLl KcuNmWWMQLpNDpcddg8vLK+cRlWr/t5uiXOQ/HHBgiGa/YxHLTcaJ9CkqObiEruwUUaV FvM4KLvATPv5mKgEHUpkkjX0U7UiEGVKSrRRkcy5O0NuqnDRAKd2S4F6Je6uDv0fRVC4 1g8g==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=mxLHbQ66; arc=pass (i=1 spf=pass spfdomain=intel.com dkim=pass dkdomain=intel.com dmarc=pass fromdomain=intel.com); spf=pass (google.com: domain of linux-kernel+bounces-74211-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-74211-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org. [2604:1380:45e3:2400::1]) by mx.google.com with ESMTPS id 80-20020a630153000000b005dc89f25fb0si7735621pgb.58.2024.02.20.23.23.06 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 Feb 2024 23:23:06 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-74211-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) client-ip=2604:1380:45e3:2400::1; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=mxLHbQ66; arc=pass (i=1 spf=pass spfdomain=intel.com dkim=pass dkdomain=intel.com dmarc=pass fromdomain=intel.com); spf=pass (google.com: domain of linux-kernel+bounces-74211-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-74211-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sv.mirrors.kernel.org (Postfix) with ESMTPS id 34C24283B67 for ; Wed, 21 Feb 2024 07:23:06 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 8097A3CF69; Wed, 21 Feb 2024 07:21:28 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="mxLHbQ66" Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 2B83F3A8E8; Wed, 21 Feb 2024 07:21:21 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=192.198.163.18 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708500084; cv=none; b=WHnO636iSKI/tTny5g0dPwsJnrYOsAJnchDqTc+gh8+RboGJM5JVuOvh9nWXYYCu4QbSDlG43X95uTFYqUb4kB8QjFqgfKEa5WpgVdCsikv9VCaTojhlg1YiO1DF1yYjphwqyDoCf5Dc2GZV37rw6WsF4XOXG1NRIBUp8oHgqxM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708500084; c=relaxed/simple; bh=v9JpIlTbfilCLtSnEYmK6CXSd5owEWcVt9Imm/BLSs4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=G+zzlY6YmcdukVtV7JOw5L/JjsJWu08eDrg7bjaWzw3N6RrSrV58KEhSq1Y0ADpXkmzxyadr6cwoz2wZK/7goI+gFbapVn0nyF+Ic/52TZa1SU7/DGALglspuedW/9lWH1u4u4t0sC+6NMCpEEmDgR7JYv672dNU59dKL5NTM1s= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com; spf=pass smtp.mailfrom=intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=mxLHbQ66; arc=none smtp.client-ip=192.198.163.18 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=intel.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1708500082; x=1740036082; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=v9JpIlTbfilCLtSnEYmK6CXSd5owEWcVt9Imm/BLSs4=; b=mxLHbQ66mfzc4FWUSN/drAECmB9LxC/+5BqM+LYP0UDr8uEz5GHkGOxf Jw+1RAGLKaIMIxxYCt4tsOIO5ib6+YrypRmoXbyVfvI4B/L0slhHTNEEc iyRsGfPhalUuThfY2de6zv0h0QpSwTpawqT/4DgPdkLAw7I/wac2HHIXd 0tRkTtOn/jQwFbvy57AU0JHQR4MJw43vCklXSarWH+CGtY5gDiKpWYFHt OHluBrPlmhTeJZvwOGnPgI94IFrtoUo/EtgQAYzk5LUoYigsoJMKocthV 7DnZn7Olzba18ThaDgUD2Zb5FnjSym5dmzCqQyxJ5TOleQClQ9hHT8QK4 g==; X-IronPort-AV: E=McAfee;i="6600,9927,10990"; a="2529996" X-IronPort-AV: E=Sophos;i="6.06,175,1705392000"; d="scan'208";a="2529996" Received: from fmviesa010.fm.intel.com ([10.60.135.150]) by fmvoesa112.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 20 Feb 2024 23:21:20 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.06,175,1705392000"; d="scan'208";a="5017433" Received: from fl31ca102ks0602.deacluster.intel.com (HELO gnr-bkc.deacluster.intel.com) ([10.75.133.163]) by fmviesa010.fm.intel.com with ESMTP; 20 Feb 2024 23:21:20 -0800 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 Subject: [RFC PATCH v1 1/5] perf stat: Parse and find tpebs events when parsing metrics to prepare for perf record sampling Date: Wed, 21 Feb 2024 02:20:55 -0500 Message-ID: <20240221072100.412939-2-weilin.wang@intel.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240221072100.412939-1-weilin.wang@intel.com> References: <20240221072100.412939-1-weilin.wang@intel.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1791492291471272809 X-GMAIL-MSGID: 1791492291471272809 From: Weilin Wang Metrics that use tpebs values would use the :retire_latency keyword in formulas. We put all these events into a list and pass the list to perf record to collect their retire latency value. Signed-off-by: Weilin Wang --- tools/perf/builtin-stat.c | 38 +++++++++++++++++++++---- tools/perf/util/metricgroup.c | 52 +++++++++++++++++++++++++++-------- tools/perf/util/metricgroup.h | 10 ++++++- tools/perf/util/stat.h | 2 ++ 4 files changed, 84 insertions(+), 18 deletions(-) diff --git a/tools/perf/builtin-stat.c b/tools/perf/builtin-stat.c index 07b48f6df48e..93a7cba30f12 100644 --- a/tools/perf/builtin-stat.c +++ b/tools/perf/builtin-stat.c @@ -162,6 +162,7 @@ static struct perf_stat_config stat_config = { .ctl_fd = -1, .ctl_fd_ack = -1, .iostat_run = false, + .tpebs_event_size = 0, }; static bool cpus_map_matched(struct evsel *a, struct evsel *b) @@ -686,6 +687,12 @@ static enum counter_recovery stat_handle_error(struct evsel *counter) return COUNTER_FATAL; } +static int __run_perf_record(void) +{ + pr_debug("Prepare perf record for retire_latency\n"); + return 0; +} + static int __run_perf_stat(int argc, const char **argv, int run_idx) { int interval = stat_config.interval; @@ -703,6 +710,15 @@ static int __run_perf_stat(int argc, const char **argv, int run_idx) int err; bool second_pass = false; + //Prepare perf record for sampling event retire_latency before fork and prepare workload + if (stat_config.tpebs_event_size > 0) { + int ret; + + ret = __run_perf_record(); + if (ret) + return ret; + } + if (forks) { if (evlist__prepare_workload(evsel_list, &target, argv, is_pipe, workload_exec_failed_signal) < 0) { perror("failed to prepare workload"); @@ -2061,7 +2077,9 @@ static int add_default_attributes(void) stat_config.metric_no_threshold, stat_config.user_requested_cpu_list, stat_config.system_wide, - &stat_config.metric_events); + &stat_config.metric_events, + &stat_config.tpebs_events, + &stat_config.tpebs_event_size); } if (smi_cost) { @@ -2094,7 +2112,9 @@ static int add_default_attributes(void) stat_config.metric_no_threshold, stat_config.user_requested_cpu_list, stat_config.system_wide, - &stat_config.metric_events); + &stat_config.metric_events, + &stat_config.tpebs_events, + &stat_config.tpebs_event_size); } if (topdown_run) { @@ -2128,7 +2148,9 @@ static int add_default_attributes(void) /*metric_no_threshold=*/true, stat_config.user_requested_cpu_list, stat_config.system_wide, - &stat_config.metric_events) < 0) + &stat_config.metric_events, + &stat_config.tpebs_events, + &stat_config.tpebs_event_size) < 0) return -1; } @@ -2169,7 +2191,9 @@ static int add_default_attributes(void) /*metric_no_threshold=*/true, stat_config.user_requested_cpu_list, stat_config.system_wide, - &stat_config.metric_events) < 0) + &stat_config.metric_events, + /*&stat_config.tpebs_events=*/NULL, + /*stat_config.tpebs_event_size=*/0) < 0) return -1; evlist__for_each_entry(metric_evlist, metric_evsel) { @@ -2689,6 +2713,8 @@ int cmd_stat(int argc, const char **argv) } } + INIT_LIST_HEAD(&stat_config.tpebs_events); + /* * Metric parsing needs to be delayed as metrics may optimize events * knowing the target is system-wide. @@ -2702,7 +2728,9 @@ int cmd_stat(int argc, const char **argv) stat_config.metric_no_threshold, stat_config.user_requested_cpu_list, stat_config.system_wide, - &stat_config.metric_events); + &stat_config.metric_events, + &stat_config.tpebs_events, + &stat_config.tpebs_event_size); zfree(&metrics); } diff --git a/tools/perf/util/metricgroup.c b/tools/perf/util/metricgroup.c index 6231044a491e..6c16e5a0b1fc 100644 --- a/tools/perf/util/metricgroup.c +++ b/tools/perf/util/metricgroup.c @@ -275,7 +275,8 @@ static bool contains_metric_id(struct evsel **metric_events, int num_events, */ static int setup_metric_events(const char *pmu, struct hashmap *ids, struct evlist *metric_evlist, - struct evsel ***out_metric_events) + struct evsel ***out_metric_events, + size_t tpebs_event_size) { struct evsel **metric_events; const char *metric_id; @@ -284,7 +285,7 @@ static int setup_metric_events(const char *pmu, struct hashmap *ids, bool all_pmus = !strcmp(pmu, "all") || perf_pmus__num_core_pmus() == 1 || !is_pmu_core(pmu); *out_metric_events = NULL; - ids_size = hashmap__size(ids); + ids_size = hashmap__size(ids) - tpebs_event_size; metric_events = calloc(sizeof(void *), ids_size + 1); if (!metric_events) @@ -321,6 +322,7 @@ static int setup_metric_events(const char *pmu, struct hashmap *ids, } } if (matched_events < ids_size) { + pr_debug("Error: matched_events = %lu, ids_size = %lu\n", matched_events, ids_size); free(metric_events); return -EINVAL; } @@ -668,7 +670,9 @@ static int decode_all_metric_ids(struct evlist *perf_evlist, const char *modifie static int metricgroup__build_event_string(struct strbuf *events, const struct expr_parse_ctx *ctx, const char *modifier, - bool group_events) + bool group_events, + struct list_head *tpebs_events __maybe_unused, + size_t *tpebs_event_size) { struct hashmap_entry *cur; size_t bkt; @@ -681,9 +685,21 @@ static int metricgroup__build_event_string(struct strbuf *events, hashmap__for_each_entry(ctx->ids, cur, bkt) { const char *sep, *rsep, *id = cur->pkey; enum perf_tool_event ev; + char *p = strstr(id, ":retire_latency"); pr_debug("found event %s\n", id); + if (p) { + struct tpebs_event *new_event = malloc(sizeof(struct tpebs_event)); + *p = '\0'; + new_event->tpebs_name = strdup(id); + *tpebs_event_size += 1; + pr_debug("retire_latency required, tpebs_event_size=%lu, new_event=%s\n", + *tpebs_event_size, new_event->name); + list_add_tail(&new_event->nd, tpebs_events); + continue; + } + /* Always move tool events outside of the group. */ ev = perf_tool_event__from_str(id); if (ev != PERF_TOOL_NONE) { @@ -1447,7 +1463,8 @@ static int build_combined_expr_ctx(const struct list_head *metric_list, static int parse_ids(bool metric_no_merge, struct perf_pmu *fake_pmu, struct expr_parse_ctx *ids, const char *modifier, bool group_events, const bool tool_events[PERF_TOOL_MAX], - struct evlist **out_evlist) + struct evlist **out_evlist, struct list_head *tpebs_events, + size_t *tpebs_event_size) { struct parse_events_error parse_error; struct evlist *parsed_evlist; @@ -1490,7 +1507,7 @@ static int parse_ids(bool metric_no_merge, struct perf_pmu *fake_pmu, } } ret = metricgroup__build_event_string(&events, ids, modifier, - group_events); + group_events, tpebs_events, tpebs_event_size); if (ret) return ret; @@ -1529,7 +1546,9 @@ static int parse_groups(struct evlist *perf_evlist, bool system_wide, struct perf_pmu *fake_pmu, struct rblist *metric_events_list, - const struct pmu_metrics_table *table) + const struct pmu_metrics_table *table, + struct list_head *tpebs_events, + size_t *tpebs_event_size) { struct evlist *combined_evlist = NULL; LIST_HEAD(metric_list); @@ -1561,7 +1580,8 @@ static int parse_groups(struct evlist *perf_evlist, /*modifier=*/NULL, /*group_events=*/false, tool_events, - &combined_evlist); + &combined_evlist, + tpebs_events, tpebs_event_size); } if (combined) expr__ctx_free(combined); @@ -1616,14 +1636,15 @@ static int parse_groups(struct evlist *perf_evlist, } if (!metric_evlist) { ret = parse_ids(metric_no_merge, fake_pmu, m->pctx, m->modifier, - m->group_events, tool_events, &m->evlist); + m->group_events, tool_events, &m->evlist, + tpebs_events, tpebs_event_size); if (ret) goto out; metric_evlist = m->evlist; } ret = setup_metric_events(fake_pmu ? "all" : m->pmu, m->pctx->ids, - metric_evlist, &metric_events); + metric_evlist, &metric_events, *tpebs_event_size); if (ret) { pr_err("Cannot resolve IDs for %s: %s\n", m->metric_name, m->metric_expr); @@ -1690,16 +1711,21 @@ int metricgroup__parse_groups(struct evlist *perf_evlist, bool metric_no_threshold, const char *user_requested_cpu_list, bool system_wide, - struct rblist *metric_events) + struct rblist *metric_events, + struct list_head *tpebs_events, + size_t *tpebs_event_size) { const struct pmu_metrics_table *table = pmu_metrics_table__find(); + pr_debug("Test debugging\n"); + if (!table) return -EINVAL; return parse_groups(perf_evlist, pmu, str, metric_no_group, metric_no_merge, metric_no_threshold, user_requested_cpu_list, system_wide, - /*fake_pmu=*/NULL, metric_events, table); + /*fake_pmu=*/NULL, metric_events, table, tpebs_events, + tpebs_event_size); } int metricgroup__parse_groups_test(struct evlist *evlist, @@ -1713,7 +1739,9 @@ int metricgroup__parse_groups_test(struct evlist *evlist, /*metric_no_threshold=*/false, /*user_requested_cpu_list=*/NULL, /*system_wide=*/false, - &perf_pmu__fake, metric_events, table); + &perf_pmu__fake, metric_events, table, + /*tpebs_events=*/NULL, + /*tpebs_event_size=*/0); } struct metricgroup__has_metric_data { diff --git a/tools/perf/util/metricgroup.h b/tools/perf/util/metricgroup.h index d5325c6ec8e1..7c24ed768ff3 100644 --- a/tools/perf/util/metricgroup.h +++ b/tools/perf/util/metricgroup.h @@ -66,6 +66,12 @@ struct metric_expr { int runtime; }; +struct tpebs_event { + struct list_head nd; + const char *name; + const char *tpebs_name; +}; + struct metric_event *metricgroup__lookup(struct rblist *metric_events, struct evsel *evsel, bool create); @@ -77,7 +83,9 @@ int metricgroup__parse_groups(struct evlist *perf_evlist, bool metric_no_threshold, const char *user_requested_cpu_list, bool system_wide, - struct rblist *metric_events); + struct rblist *metric_events, + struct list_head *tpebs_events, + size_t *tpebs_event_size); int metricgroup__parse_groups_test(struct evlist *evlist, const struct pmu_metrics_table *table, const char *str, diff --git a/tools/perf/util/stat.h b/tools/perf/util/stat.h index 325d0fad1842..9d0186316b29 100644 --- a/tools/perf/util/stat.h +++ b/tools/perf/util/stat.h @@ -109,6 +109,8 @@ struct perf_stat_config { struct cpu_aggr_map *cpus_aggr_map; u64 *walltime_run; struct rblist metric_events; + struct list_head tpebs_events; + size_t tpebs_event_size; int ctl_fd; int ctl_fd_ack; bool ctl_fd_close; From patchwork Wed Feb 21 07:20:56 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Wang, Weilin" X-Patchwork-Id: 203972 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:693c:2685:b0:108:e6aa:91d0 with SMTP id mn5csp881907dyc; Tue, 20 Feb 2024 23:23:07 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCXXgBkHneIaXBXPGfQziVs8cFoTcyvgJoBHM4AsQWiVJOYKLPhO5vZaEuGbr4I1zbBLG4dHLm492MYLLZmDVq++xUpnTA== X-Google-Smtp-Source: AGHT+IEAaP44WoZmczeVgTHyH1CnQFaUqzrrPAN0Q031mOhdHh39Q6p2IHuvSv5vBljSIcFMbjPV X-Received: by 2002:a17:903:1c3:b0:1dc:3261:ab7 with SMTP id e3-20020a17090301c300b001dc32610ab7mr515582plh.49.1708500186950; Tue, 20 Feb 2024 23:23:06 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1708500186; cv=pass; d=google.com; s=arc-20160816; b=Q3vdi+zHjIF9E6gmh1vhQNUvOUrPRzVxn6VZh8aeFIriud+ftBI7aR6epu3ErQFo0x iMJrKtH1KK5YVrlUZHNwt7NbxPTD4/eIBMcpv7fMZHp/y6DhnMDPo628ejCcCOfBKKHV rqa5VauSgfm9o7g3m/R2qs6d42PeagdXAlPuZZvzryLueyzeAksXbcT6O6nLvri1G08L c6AvLh5c4w5q5AWrrmiArqk4s2Wvi5LQxq2gqLGsxvX8275grIoLxtOkoUS4qQ7avJUL 6+PLgR0vW9PJ+4NRlKbeemDbVrsH+Ig+z0MaPa63Hin/77e6fKcppFdATy2fOIK5iUHX YEtQ== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=Fm/9glQuyUM3e0dpRkz+tUlXjMcOd88VZ+VuYOIqbEE=; fh=D8N1uhCLBRzbbRgEj9aMJ2/kVuNqnMf8W9VxSJOfqPA=; b=xt6nOoWGEVpsWzGt/otDlS5hGtM/ZfpKzsgMlg83V6e0egJkgSF2n+CgDqpZCUyCm7 dRACzh4PWE+PsB1CcVmw3yZcVnUeHz3CVe9GL/WoTXDtyJqcyPsFYEzhVfhqp2Qww3QG nlQcbshIYr5aOTnWbu/dEjA0iFOl1LeNRhSWF5AmoR50rZVODr2xbL+217sl7AQHqkX0 SAeLk0Na/Vi8lZYaCLL9VlCQMoRr1jotaPr+nOBPBBXpkZdy03kfXErGg+YNeK5nSSRp DOu9KkfGcvTkN40uZei17ztojOyPMiYTnzzH0iDdRlbBiEt1+bwtfxBpBf9cwlIGDruY 10SQ==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=nW++0F0R; arc=pass (i=1 spf=pass spfdomain=intel.com dkim=pass dkdomain=intel.com dmarc=pass fromdomain=intel.com); spf=pass (google.com: domain of linux-kernel+bounces-74212-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-74212-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org. [2604:1380:45e3:2400::1]) by mx.google.com with ESMTPS id y8-20020a17090264c800b001dbf38fee8asi4779944pli.316.2024.02.20.23.23.06 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 Feb 2024 23:23:06 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-74212-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) client-ip=2604:1380:45e3:2400::1; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=nW++0F0R; arc=pass (i=1 spf=pass spfdomain=intel.com dkim=pass dkdomain=intel.com dmarc=pass fromdomain=intel.com); spf=pass (google.com: domain of linux-kernel+bounces-74212-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-74212-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sv.mirrors.kernel.org (Postfix) with ESMTPS id 9DA92283683 for ; Wed, 21 Feb 2024 07:23:06 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 97F5C3CF75; Wed, 21 Feb 2024 07:21:28 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="nW++0F0R" Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 8D1BD3A8FD; Wed, 21 Feb 2024 07:21:22 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=192.198.163.18 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708500084; cv=none; b=bFXKn+sKf2qD5qLVEBeDO8aQh29XapfCgniTLjmMZOC2SMSXVMtXEhaR3ihm18+ez/ZDEEtCYe1UnhK2Nco9R5ZkxFOenIKJwznRD5JP+dkbuSK5TxUpU0QzH1iNTlVPVV8UWA73OvkyWaXeclSVGKFubzT73wJwJeOvqerxlew= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708500084; c=relaxed/simple; bh=pOzZ0G4n8ay++HXje4bPy3lm9OquWneImnNFwr8Oq7M=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=bYa4VSSKxIq20qCZW41Qg3kAHbQ+QO9Z69S5HoliJyopwtCHnkPF6t7tau1GyabHULzGrOIR+44NA8vWHN72CRMHLwL0KD+vBojcZ4EtWomjmJKtCNcsjhpRkrBeSiX56XVcurUmdwpn8HJ3AHFW1sLxROg/JYUjWdfFHCaVfls= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com; spf=pass smtp.mailfrom=intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=nW++0F0R; arc=none smtp.client-ip=192.198.163.18 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=intel.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1708500082; x=1740036082; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=pOzZ0G4n8ay++HXje4bPy3lm9OquWneImnNFwr8Oq7M=; b=nW++0F0RaILbKouNwqTBCZy8Sw2QPowBJsm1tXJt87JESaGh1QhdeTgl lpicdCEKE8mh9C/FGGk/JEOP0jPw+XmM5XCU721mKxa5VSn3t5214RpxD 0K8Yspfxuq+RvaX7yrMJmQCWGMYNMNyqrRq9IBwvhXfJYXmmXxXOajvlq cRC2hZABRv2zgLX0uYp7LbjJvlQLVLbJvNG+w/VLCvfQ96MfU9oWxJqCq V2XoLN0OlQROZx8l/siMqoXtRRYWIF30hNjRFTb7Nl4rhcpK7HAKp5xwI gEDW357vh1EII4zjq56Kk5p4jAZHqBqFLqAjR55lAlnu+cha8qFt5L22M w==; X-IronPort-AV: E=McAfee;i="6600,9927,10990"; a="2530004" X-IronPort-AV: E=Sophos;i="6.06,175,1705392000"; d="scan'208";a="2530004" Received: from fmviesa010.fm.intel.com ([10.60.135.150]) by fmvoesa112.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 20 Feb 2024 23:21:20 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.06,175,1705392000"; d="scan'208";a="5017437" Received: from fl31ca102ks0602.deacluster.intel.com (HELO gnr-bkc.deacluster.intel.com) ([10.75.133.163]) by fmviesa010.fm.intel.com with ESMTP; 20 Feb 2024 23:21:20 -0800 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 Subject: [RFC PATCH v1 2/5] perf stat: Fork and launch perf record when perf stat needs to get retire latency value for a metric. Date: Wed, 21 Feb 2024 02:20:56 -0500 Message-ID: <20240221072100.412939-3-weilin.wang@intel.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240221072100.412939-1-weilin.wang@intel.com> References: <20240221072100.412939-1-weilin.wang@intel.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1791492291973329227 X-GMAIL-MSGID: 1791492291973329227 From: Weilin Wang Signed-off-by: Weilin Wang --- tools/perf/builtin-stat.c | 179 +++++++++++++++++++++++++++++++++- tools/perf/util/data.c | 4 + tools/perf/util/data.h | 1 + tools/perf/util/metricgroup.c | 11 ++- tools/perf/util/metricgroup.h | 7 ++ tools/perf/util/stat.h | 3 + 6 files changed, 201 insertions(+), 4 deletions(-) diff --git a/tools/perf/builtin-stat.c b/tools/perf/builtin-stat.c index 93a7cba30f12..e03665af9da2 100644 --- a/tools/perf/builtin-stat.c +++ b/tools/perf/builtin-stat.c @@ -94,8 +94,13 @@ #include #include +#include "util/sample.h" +#include +#include + #define DEFAULT_SEPARATOR " " #define FREEZE_ON_SMI_PATH "devices/cpu/freeze_on_smi" +#define PERF_DATA "-" static void print_counters(struct timespec *ts, int argc, const char **argv); @@ -162,7 +167,8 @@ static struct perf_stat_config stat_config = { .ctl_fd = -1, .ctl_fd_ack = -1, .iostat_run = false, - .tpebs_event_size = 0, + .tpebs_event_size = 0, + .tpebs_pid = -1, }; static bool cpus_map_matched(struct evsel *a, struct evsel *b) @@ -687,12 +693,163 @@ static enum counter_recovery stat_handle_error(struct evsel *counter) return COUNTER_FATAL; } -static int __run_perf_record(void) +static int __run_perf_record(const char **record_argv) { + int i = 0; + struct tpebs_event *e; pr_debug("Prepare perf record for retire_latency\n"); + + + record_argv[i++] = "perf"; + record_argv[i++] = "record"; + record_argv[i++] = "-W"; + + if (stat_config.user_requested_cpu_list) { + record_argv[i++] = "-C"; + record_argv[i++] = stat_config.user_requested_cpu_list; + } + + if (stat_config.system_wide) + record_argv[i++] = "-a"; + + list_for_each_entry(e, &stat_config.tpebs_events, nd) { + record_argv[i++] = "-e"; + record_argv[i++] = e->name; + } + + record_argv[i++] = "-o"; + record_argv[i++] = PERF_DATA; + return 0; } +static void prepare_run_command(struct child_process *cmd, + const char **argv) +{ + memset(cmd, 0, sizeof(*cmd)); + cmd->argv = argv; + cmd->out = -1; +} +static int prepare_perf_record(struct child_process *cmd) +{ + const char **record_argv; + + record_argv = calloc(10 + 2 * stat_config.tpebs_event_size, sizeof(char *)); + if (!record_argv) + return -1; + __run_perf_record(record_argv); + + prepare_run_command(cmd, record_argv); + return start_command(cmd); +} + +struct perf_script { + struct perf_tool tool; + struct perf_session *session; + struct evswitch evswitch; + struct perf_cpu_map *cpus; + struct perf_thread_map *threads; + int name_width; +}; + +static void tpebs_data__delete(void) +{ + struct tpebs_retire_lat *r, *rtmp; + struct tpebs_event *e, *etmp; + list_for_each_entry_safe(r, rtmp, &stat_config.tpebs_results, nd) { + list_del_init(&r->nd); + free(r); + } + list_for_each_entry_safe(e, etmp, &stat_config.tpebs_events, nd) { + list_del_init(&e->nd); + free(e); + } +} + +static int process_sample_event(struct perf_tool *tool, + union perf_event *event __maybe_unused, + struct perf_sample *sample, + struct evsel *evsel, + struct machine *machine __maybe_unused) +{ + struct perf_script *script = container_of(tool, struct perf_script, tool); + int ret = 0; + const char *evname; + struct tpebs_retire_lat *t; + + pr_debug("entering function %s\n ", __func__); + evname = evsel__name(evsel); + + pr_debug("[%03d] ", sample->cpu); + pr_debug("%*s: ", script->name_width, evname ?: "[unknown]"); + pr_debug("%16" PRIu16, sample->retire_lat); + pr_debug("\n"); + + // Need to handle per core results? + // We are assuming average retire latency value will be used. Save the number of + // samples and the sum of retire latency value for each event. + list_for_each_entry(t, &stat_config.tpebs_results, nd) { + if (!strcmp(evname, t->name)) { + t->count += 1; + t->sum += sample->retire_lat; + break; + } + } + + return ret; +} + +static int process_feature_event(struct perf_session *session, + union perf_event *event) +{ + if (event->feat.feat_id < HEADER_LAST_FEATURE) + return perf_event__process_feature(session, event); + return 0; +} + +static int __cmd_script(struct child_process *cmd __maybe_unused) +{ + int err = 0; + struct perf_session *session; + struct perf_data data = { + .mode = PERF_DATA_MODE_READ, + .path = PERF_DATA, + .fd = cmd->out, + }; + struct perf_script script = { + .tool = { + .sample = process_sample_event, + .ordered_events = true, + .ordering_requires_timestamps = true, + .feature = process_feature_event, + .attr = perf_event__process_attr, + }, + }; + struct tpebs_event *e; + + list_for_each_entry(e, &stat_config.tpebs_events, nd) { + struct tpebs_retire_lat *new = malloc(sizeof(struct tpebs_retire_lat)); + + if (!new) + return -1; + new->name = strdup(e->name); + new->tpebs_name = strdup(e->tpebs_name); + new->count = 0; + new->sum = 0; + list_add_tail(&new->nd, &stat_config.tpebs_results); + } + + kill(cmd->pid, SIGTERM); + session = perf_session__new(&data, &script.tool); + if (IS_ERR(session)) + return PTR_ERR(session); + script.session = session; + err = perf_session__process_events(session); + perf_session__delete(session); + + return err; +} + static int __run_perf_stat(int argc, const char **argv, int run_idx) { int interval = stat_config.interval; @@ -709,12 +866,14 @@ static int __run_perf_stat(int argc, const char **argv, int run_idx) struct affinity saved_affinity, *affinity = NULL; int err; bool second_pass = false; + struct child_process cmd; //Prepare perf record for sampling event retire_latency before fork and prepare workload if (stat_config.tpebs_event_size > 0) { int ret; - ret = __run_perf_record(); + pr_debug("perf stat pid = %d\n", getpid()); + ret = prepare_perf_record(&cmd); if (ret) return ret; } @@ -924,6 +1083,17 @@ static int __run_perf_stat(int argc, const char **argv, int run_idx) t1 = rdclock(); + if (stat_config.tpebs_event_size > 0) { + int ret; + + pr_debug("pid = %d\n", getpid()); + pr_debug("cmd.pid = %d\n", cmd.pid); + + ret = __cmd_script(&cmd); + close(cmd.out); + pr_debug("%d\n", ret); + } + if (stat_config.walltime_run_table) stat_config.walltime_run[run_idx] = t1 - t0; @@ -2714,6 +2884,7 @@ int cmd_stat(int argc, const char **argv) } INIT_LIST_HEAD(&stat_config.tpebs_events); + INIT_LIST_HEAD(&stat_config.tpebs_results); /* * Metric parsing needs to be delayed as metrics may optimize events @@ -2921,5 +3092,7 @@ int cmd_stat(int argc, const char **argv) metricgroup__rblist_exit(&stat_config.metric_events); evlist__close_control(stat_config.ctl_fd, stat_config.ctl_fd_ack, &stat_config.ctl_fd_close); + tpebs_data__delete(); + return status; } diff --git a/tools/perf/util/data.c b/tools/perf/util/data.c index fc16299c915f..2298ca3b370b 100644 --- a/tools/perf/util/data.c +++ b/tools/perf/util/data.c @@ -173,6 +173,10 @@ static bool check_pipe(struct perf_data *data) int fd = perf_data__is_read(data) ? STDIN_FILENO : STDOUT_FILENO; + if (data->fd > 0) { + fd = data->fd; + } + if (!data->path) { if (!fstat(fd, &st) && S_ISFIFO(st.st_mode)) is_pipe = true; diff --git a/tools/perf/util/data.h b/tools/perf/util/data.h index effcc195d7e9..5554d46ad212 100644 --- a/tools/perf/util/data.h +++ b/tools/perf/util/data.h @@ -28,6 +28,7 @@ struct perf_data_file { struct perf_data { const char *path; + int fd; struct perf_data_file file; bool is_pipe; bool is_dir; diff --git a/tools/perf/util/metricgroup.c b/tools/perf/util/metricgroup.c index 6c16e5a0b1fc..8518e2b3e5be 100644 --- a/tools/perf/util/metricgroup.c +++ b/tools/perf/util/metricgroup.c @@ -691,8 +691,17 @@ static int metricgroup__build_event_string(struct strbuf *events, if (p) { struct tpebs_event *new_event = malloc(sizeof(struct tpebs_event)); - *p = '\0'; + char *name; + new_event->tpebs_name = strdup(id); + *p = '\0'; + name = malloc(strlen(id) + 2); + if (!name) + return -ENOMEM; + + strcpy(name, id); + strcat(name, ":p"); + new_event->name = name; *tpebs_event_size += 1; pr_debug("retire_latency required, tpebs_event_size=%lu, new_event=%s\n", *tpebs_event_size, new_event->name); diff --git a/tools/perf/util/metricgroup.h b/tools/perf/util/metricgroup.h index 7c24ed768ff3..1fa12cc3294e 100644 --- a/tools/perf/util/metricgroup.h +++ b/tools/perf/util/metricgroup.h @@ -71,6 +71,13 @@ struct tpebs_event { const char *name; const char *tpebs_name; }; +struct tpebs_retire_lat { + struct list_head nd; + const char *name; + const char *tpebs_name; + size_t count; + int sum; +}; struct metric_event *metricgroup__lookup(struct rblist *metric_events, struct evsel *evsel, diff --git a/tools/perf/util/stat.h b/tools/perf/util/stat.h index 9d0186316b29..8e180f13aa2d 100644 --- a/tools/perf/util/stat.h +++ b/tools/perf/util/stat.h @@ -111,6 +111,9 @@ struct perf_stat_config { struct rblist metric_events; struct list_head tpebs_events; size_t tpebs_event_size; + struct list_head tpebs_results; + pid_t tpebs_pid; + int tpebs_pipe; int ctl_fd; int ctl_fd_ack; bool ctl_fd_close; From patchwork Wed Feb 21 07:20:57 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Wang, Weilin" X-Patchwork-Id: 203970 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:693c:2685:b0:108:e6aa:91d0 with SMTP id mn5csp881892dyc; Tue, 20 Feb 2024 23:23:03 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCXJr/GzU2uMFBPLnLgeyda7a1AQR94C2Bfv+owXMMZ922+8dfScJFfjfwNlMgpQzk+JRlzBQLF1wW510BXGF2ADioKRaQ== X-Google-Smtp-Source: AGHT+IEe94oyrImsqEMope83M+4phVu/bcGn3Wh4k3fxZ/JM+5FMl1nB7M9n4uEZ/k4YJ7E2hrDV X-Received: by 2002:a37:ef14:0:b0:784:aae1:10de with SMTP id j20-20020a37ef14000000b00784aae110demr17573722qkk.3.1708500183558; Tue, 20 Feb 2024 23:23:03 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1708500183; cv=pass; d=google.com; s=arc-20160816; b=EKKdIZjU+fL8c1GpTBWHpNoyso10Lp8cUlm65Ezj/xylEH0QKMC1tMcTuM5N7bWBAw C70cDLjKrFsytI3gJnA9UiBamy8fCfX8SiUiDpSmZOIiThCcMgN5K0OGhBCHA4yvvEfP VdmOWrwWif7djXVliJnHPhVQ+Db0sZC3sM8EiFhXpK2/tfQozrFX2SvI53IC/B8VHzQW xOgK8u45HL8UW5mS1GQP2yOfb/lpsty9G56jIcylzAjb5nPfD9108wPtFOe7UfICXor4 /3yMOJsXTjCvQlO2tsGeZOE5w+Ws3lz+/awKOUeMkBkSRpCrorw3oRaXrh+68T64urbp H61w== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=TcVwGn170Zo5eAMEm+EjLbHVZtqXibuaZ52KocpxJtk=; fh=D8N1uhCLBRzbbRgEj9aMJ2/kVuNqnMf8W9VxSJOfqPA=; b=JD4O9mRlDfsC9GSQrXh5ox9kNb2FbgQsWMsPyBT5s+V2ZrRhPn/X7gW7yGbKaIcf75 yc37jZJ9trwhSQA1JhKSGUyG3elnznUmEjrGFg+FcCNJDZ7/Y2ikPqLAPgda5bPGPlIh 4wIS9TPJWWKAodZKIL9yUxCIE9oZq8pZS79Ha7kTFABAwhshcyecnE5LbL1AXuxanfMp EiZjx7Q1N9D4l9g+YGWy/HXIxUbU+04cOrArMxQS2n0X4x2uRQaSgH0fmLSMFQwvcvO+ ex/1CWf9Ij2jZXHGyoyir2Y+7+DCFsDDb4NX0UP/VojhxWlqPSW8zyUa3S1MzJvaFNZ0 GP7Q==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=Npx7Ky7F; arc=pass (i=1 spf=pass spfdomain=intel.com dkim=pass dkdomain=intel.com dmarc=pass fromdomain=intel.com); spf=pass (google.com: domain of linux-kernel+bounces-74213-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-74213-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from ny.mirrors.kernel.org (ny.mirrors.kernel.org. [2604:1380:45d1:ec00::1]) by mx.google.com with ESMTPS id j7-20020a05620a0a4700b00787305a1315si10168366qka.309.2024.02.20.23.23.03 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 Feb 2024 23:23:03 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-74213-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) client-ip=2604:1380:45d1:ec00::1; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=Npx7Ky7F; arc=pass (i=1 spf=pass spfdomain=intel.com dkim=pass dkdomain=intel.com dmarc=pass fromdomain=intel.com); spf=pass (google.com: domain of linux-kernel+bounces-74213-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-74213-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ny.mirrors.kernel.org (Postfix) with ESMTPS id 4A96A1C236F0 for ; Wed, 21 Feb 2024 07:23:03 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 71B9E3CF64; Wed, 21 Feb 2024 07:21:28 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="Npx7Ky7F" Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 0E13B3AC1B; Wed, 21 Feb 2024 07:21:22 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=192.198.163.18 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708500084; cv=none; b=jaVkXgMjC71ezH/Hb41mwvm8UT7ypLhtg5sk5BuMZbctJdRCjCwdAsO4BQf6gafdNImhveL0DvVugL6c76RLnibSbfjdXhaNOPmIBKnsJYgCzoks67u/Pf1JW26RL9VIekkB3b/QqyhB9ab9Bb6mQfL6IiHKrY+5NKMCpsdw1dk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708500084; c=relaxed/simple; bh=pBmDQG90CSvCkfKWC4qRQdDiK4qAtYJT4uG6gsEtW/0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=TxpUQS3Qktux386fhFIPfzTlslpAx8LUqnfxY6ePIAreyMlVdBsXkJ47bkinB7LEgl7Jtm8kKjIWMCRZNdHKTvDzQNhCaRbmFqw6eS0qFben8lpPsODX9CsM/Nct6/NRkWWSgNQdu0PlDbymTuLQ12CYp2nevZtuFKXdSg/ap6s= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com; spf=pass smtp.mailfrom=intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=Npx7Ky7F; arc=none smtp.client-ip=192.198.163.18 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=intel.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1708500083; x=1740036083; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=pBmDQG90CSvCkfKWC4qRQdDiK4qAtYJT4uG6gsEtW/0=; b=Npx7Ky7Fb/sCATN7vrkTiWjxIiGflN4jxyinzaaKKLH/hHVH/S/fkvqZ kRhAEUL8CH+QBAHB2s/rWoiagIzJcqpnclIMqSfZs3NLoO940y48Z/1c6 7H/A7D86okzGoTBkFBV/E+gAy9ZSM4j4Y3Znl1dU5fjznJ2psX2gkYfaT 5im1nVbKjX5GXv4P7tmUAwOF3wwjGWOX0KX7oPxWLsGJF7ZTi6hD02AZ4 a4S3uXjKFRnb3gSzUV8HuzXykwrTyludFsA1qNhMKuXEloy4gRSpQNukE YYF/6PoMJqXiaPiOXEwB8g+ogxPATfjJANS8sb7BrITNMFmFPGM2PfAxy g==; X-IronPort-AV: E=McAfee;i="6600,9927,10990"; a="2530010" X-IronPort-AV: E=Sophos;i="6.06,175,1705392000"; d="scan'208";a="2530010" Received: from fmviesa010.fm.intel.com ([10.60.135.150]) by fmvoesa112.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 20 Feb 2024 23:21:21 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.06,175,1705392000"; d="scan'208";a="5017442" Received: from fl31ca102ks0602.deacluster.intel.com (HELO gnr-bkc.deacluster.intel.com) ([10.75.133.163]) by fmviesa010.fm.intel.com with ESMTP; 20 Feb 2024 23:21:20 -0800 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 Subject: [RFC PATCH v1 3/5] perf stat: Add retire latency values into the expr_parse_ctx to prepare for final metric calculation Date: Wed, 21 Feb 2024 02:20:57 -0500 Message-ID: <20240221072100.412939-4-weilin.wang@intel.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240221072100.412939-1-weilin.wang@intel.com> References: <20240221072100.412939-1-weilin.wang@intel.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1791492288363959424 X-GMAIL-MSGID: 1791492288363959424 From: Weilin Wang Retire latency values of events are used in metric formulas. This update adds code to process data from perf record for required retire latency values. Signed-off-by: Weilin Wang --- tools/perf/builtin-stat.c | 1 + tools/perf/util/metricgroup.h | 1 + tools/perf/util/stat-shadow.c | 18 ++++++++++++++++++ 3 files changed, 20 insertions(+) diff --git a/tools/perf/builtin-stat.c b/tools/perf/builtin-stat.c index e03665af9da2..948caab9ea91 100644 --- a/tools/perf/builtin-stat.c +++ b/tools/perf/builtin-stat.c @@ -792,6 +792,7 @@ static int process_sample_event(struct perf_tool *tool, if (!strcmp(evname, t->name)) { t->count += 1; t->sum += sample->retire_lat; + t->val = t->count > 0 ? t->sum/t->count : 0; break; } } diff --git a/tools/perf/util/metricgroup.h b/tools/perf/util/metricgroup.h index 1fa12cc3294e..08af0f447550 100644 --- a/tools/perf/util/metricgroup.h +++ b/tools/perf/util/metricgroup.h @@ -77,6 +77,7 @@ struct tpebs_retire_lat { const char *tpebs_name; size_t count; int sum; + double val; }; struct metric_event *metricgroup__lookup(struct rblist *metric_events, diff --git a/tools/perf/util/stat-shadow.c b/tools/perf/util/stat-shadow.c index 1c5c3eeba4cf..262a6960b461 100644 --- a/tools/perf/util/stat-shadow.c +++ b/tools/perf/util/stat-shadow.c @@ -355,6 +355,19 @@ static void print_nsecs(struct perf_stat_config *config, print_metric(config, ctxp, NULL, NULL, "CPUs utilized", 0); } +static int prepare_retire_lat(struct expr_parse_ctx *pctx, + struct list_head *retire_lats) +{ + int ret = 0; + struct tpebs_retire_lat *t; + list_for_each_entry(t, retire_lats, nd) { + ret = expr__add_id_val(pctx, strdup(t->tpebs_name), t->val); + if (ret < 0) + return ret; + } + return ret; +} + static int prepare_metric(struct evsel **metric_events, struct metric_ref *metric_refs, struct expr_parse_ctx *pctx, @@ -467,6 +480,11 @@ static void generic_metric(struct perf_stat_config *config, pctx->sctx.user_requested_cpu_list = strdup(config->user_requested_cpu_list); pctx->sctx.runtime = runtime; pctx->sctx.system_wide = config->system_wide; + i = prepare_retire_lat(pctx, &config->tpebs_results); + if (i < 0) { + expr__ctx_free(pctx); + return; + } i = prepare_metric(metric_events, metric_refs, pctx, aggr_idx); if (i < 0) { expr__ctx_free(pctx); From patchwork Wed Feb 21 07:20:58 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Wang, Weilin" X-Patchwork-Id: 203973 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:693c:2685:b0:108:e6aa:91d0 with SMTP id mn5csp882152dyc; Tue, 20 Feb 2024 23:23:52 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCVlNXHR6Gxle078r0uBlNaKBIMruKU8BM9DfYk+TELFjbN7NJMqDxMi9G4c67kpDvr5MxY2O6RAy29Mij6ksbZpk6Jjwg== X-Google-Smtp-Source: AGHT+IE23bfdJ6VX8mdTygVC7VBVYpncdvhS3qL/Hki5tMFiV254OJK1OZIz9vgPNiG5LFE4ccBi X-Received: by 2002:a17:906:abcf:b0:a3f:2ffd:c68b with SMTP id kq15-20020a170906abcf00b00a3f2ffdc68bmr837186ejb.6.1708500232615; Tue, 20 Feb 2024 23:23:52 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1708500232; cv=pass; d=google.com; s=arc-20160816; b=KRRtYI09BT4ehSSkpTHh0x9INiwPXVmeP/7a5NEqMOkFqnKxNXO/sJJnHIau7LdD6o 8rCWcNQefyI8mTaE578ADwCd6/ah1O8D7u8ULNtmRcod3f0c7YuKErj5H/MeYsaBpjoh 5z65/fvPVuJqBgQ3+pxSRZot/LTSkpH4tBLOZ10cwjTrymUFaZK6uEMeIxm2daTuP9j+ ZFrxl/nZTE2+ThFpmH8sWLjFuuVPRgcNlinW1apQ5nPiRFQ5PxODkArpiaAr4MD3t02W KU39ySq9j9qCws1kX3iCifhkjB4TsVXNzc2Zp6wPVOs32xDmaXj5H7/xinpeiB3KuGHw CyxA== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=moBihicH4SnfPnDyimp5FktCwtxoGYvEDnGsVo/aFP0=; fh=D8N1uhCLBRzbbRgEj9aMJ2/kVuNqnMf8W9VxSJOfqPA=; b=VLiJyD3LRYxWp5SOog7/Dx+MxEh59aNMjcmhdwS1FDEgCl0wvou9xifg+5+yRczGKo 7PUOwSaHU2P6x2zaZYigUR0Xdc5XLjiTs11czq/m3UcHN7leJNDTSza5KwX6FvgfawF8 mWIxSzvJgguX+JdlLRIa4rtrToMAV1/modn1/1UdC8fgLiMe8x5/ysfqTaYubTvjyNMD vYdmYySuaSiHXopINOgbBYrz9fmgoTqruEQu8vURQbZg9eSxnkNJbI8ls8b7KN7XXZzf fwnyCqJgheFY7SwX25AZVuQ1/G7n1eBniCnYkvBFgSMj3lqURcollngakkj67QKApQz6 OoJw==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=SxYSXL6x; arc=pass (i=1 spf=pass spfdomain=intel.com dkim=pass dkdomain=intel.com dmarc=pass fromdomain=intel.com); spf=pass (google.com: domain of linux-kernel+bounces-74214-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) smtp.mailfrom="linux-kernel+bounces-74214-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from am.mirrors.kernel.org (am.mirrors.kernel.org. [2604:1380:4601:e00::3]) by mx.google.com with ESMTPS id b12-20020a170906150c00b00a3e7787fc6csi2906416ejd.302.2024.02.20.23.23.52 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 Feb 2024 23:23:52 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-74214-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) client-ip=2604:1380:4601:e00::3; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=SxYSXL6x; arc=pass (i=1 spf=pass spfdomain=intel.com dkim=pass dkdomain=intel.com dmarc=pass fromdomain=intel.com); spf=pass (google.com: domain of linux-kernel+bounces-74214-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) smtp.mailfrom="linux-kernel+bounces-74214-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by am.mirrors.kernel.org (Postfix) with ESMTPS id 5B2851F266FC for ; Wed, 21 Feb 2024 07:23:13 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id EAABC3D0A8; Wed, 21 Feb 2024 07:21:28 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="SxYSXL6x" Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 2751F3B29D; Wed, 21 Feb 2024 07:21:24 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=192.198.163.18 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708500086; cv=none; b=I8/kmufpt4Zt2DetuKrk3AilsNZe1lUfyu4B/1vM4H72yCOGvDIU2QI0MJZcOom9PSyUVvl8jajmwlXAxXMQE0nZDoPmDujrEaQPUb0cJnyUXFjmcsePFYAd3R+ExH8cPuYYwQCbCt7+K7C7Ct+zoihUJw1rCnbGCd/16G03R10= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708500086; c=relaxed/simple; bh=afX8u25UFahC0N9Jn9L7ZhMkM9CU7lNwNYRfQNMP8Pc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=VyqmWPV8j7u1edQD3zYehL9GI9asJFSn9QeeZX1fJcEjuKEfqIAJSEQ0omxRekUw3Jz9vzPONWi7+/lN7Heko6tk66wT0M2an015mLjMNrlxGGI+ZI8P1wvf9Tmk9rQTj9A9/3IFZKS2NcrH4SpFxPzqRvhy43yFxKK5N8j9a3o= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com; spf=pass smtp.mailfrom=intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=SxYSXL6x; arc=none smtp.client-ip=192.198.163.18 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=intel.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1708500084; x=1740036084; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=afX8u25UFahC0N9Jn9L7ZhMkM9CU7lNwNYRfQNMP8Pc=; b=SxYSXL6xffiNoLxSn8QblFpJSMMs/u6NxvA+ipvPzixvHybPUiiqdnd0 LR/6W8hB4l84JrohZmqGRFIqzkJt5h5DHGMDxTWQKnzcq5dp0YdvosxrU uG430uQVH7TwvP0vLPB7wqebfT59awM+FvNZWLDziFbuEcjQ0nO3sfp2V mx7D2+qstRWWD/WuFv1ocQew0RzEhMt24REH0OcdtX8ua2aSjx9DUYhkn F6yYyiFRREWIlb1U+VCc/0kCRpBU2iKdJgbtnh2LXN3pExsW5H+2jT62q fKCmdnCkLcnwLGZyhLpVXsEKH8eAQfdF5QHb2YMgC+Rg0dvIqwLPwCixQ w==; X-IronPort-AV: E=McAfee;i="6600,9927,10990"; a="2530017" X-IronPort-AV: E=Sophos;i="6.06,175,1705392000"; d="scan'208";a="2530017" Received: from fmviesa010.fm.intel.com ([10.60.135.150]) by fmvoesa112.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 20 Feb 2024 23:21:21 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.06,175,1705392000"; d="scan'208";a="5017445" Received: from fl31ca102ks0602.deacluster.intel.com (HELO gnr-bkc.deacluster.intel.com) ([10.75.133.163]) by fmviesa010.fm.intel.com with ESMTP; 20 Feb 2024 23:21:21 -0800 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 Subject: [RFC PATCH v1 4/5] perf stat: Create another thread for sample data processing Date: Wed, 21 Feb 2024 02:20:58 -0500 Message-ID: <20240221072100.412939-5-weilin.wang@intel.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240221072100.412939-1-weilin.wang@intel.com> References: <20240221072100.412939-1-weilin.wang@intel.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1791492339701085230 X-GMAIL-MSGID: 1791492339701085230 From: Weilin Wang Another thread is required to synchronize between perf stat and perf record when we pass data through pipe. Signed-off-by: Weilin Wang --- tools/perf/builtin-stat.c | 58 +++++++++++++++++++++++---------------- 1 file changed, 34 insertions(+), 24 deletions(-) diff --git a/tools/perf/builtin-stat.c b/tools/perf/builtin-stat.c index 948caab9ea91..cbbf6cc2ab6b 100644 --- a/tools/perf/builtin-stat.c +++ b/tools/perf/builtin-stat.c @@ -777,7 +777,6 @@ static int process_sample_event(struct perf_tool *tool, const char *evname; struct tpebs_retire_lat *t; - pr_debug("entering function %s\n ", __func__); evname = evsel__name(evsel); pr_debug("[%03d] ", sample->cpu); @@ -808,9 +807,9 @@ static int process_feature_event(struct perf_session *session, return 0; } -static int __cmd_script(struct child_process *cmd __maybe_unused) +static void *__cmd_script(void *arg __maybe_unused) { - int err = 0; + struct child_process *cmd = arg; struct perf_session *session; struct perf_data data = { .mode = PERF_DATA_MODE_READ, @@ -826,29 +825,15 @@ static int __cmd_script(struct child_process *cmd __maybe_unused) .attr = perf_event__process_attr, }, }; - struct tpebs_event *e; - - list_for_each_entry(e, &stat_config.tpebs_events, nd) { - struct tpebs_retire_lat *new = malloc(sizeof(struct tpebs_retire_lat)); - - if (!new) - return -1; - new->name = strdup(e->name); - new->tpebs_name = strdup(e->tpebs_name); - new->count = 0; - new->sum = 0; - list_add_tail(&new->nd, &stat_config.tpebs_results); - } - kill(cmd->pid, SIGTERM); session = perf_session__new(&data, &script.tool); if (IS_ERR(session)) - return PTR_ERR(session); + return NULL; script.session = session; - err = perf_session__process_events(session); + perf_session__process_events(session); perf_session__delete(session); - return err; + return NULL; } static int __run_perf_stat(int argc, const char **argv, int run_idx) @@ -868,15 +853,37 @@ static int __run_perf_stat(int argc, const char **argv, int run_idx) int err; bool second_pass = false; struct child_process cmd; + pthread_t thread_script; //Prepare perf record for sampling event retire_latency before fork and prepare workload if (stat_config.tpebs_event_size > 0) { int ret; + struct tpebs_event *e; pr_debug("perf stat pid = %d\n", getpid()); ret = prepare_perf_record(&cmd); if (ret) return ret; + + list_for_each_entry(e, &stat_config.tpebs_events, nd) { + struct tpebs_retire_lat *new = malloc(sizeof(struct tpebs_retire_lat)); + + if (!new) + return -1; + new->name = strdup(e->name); + new->tpebs_name = strdup(e->tpebs_name); + new->count = 0; + new->sum = 0; + list_add_tail(&new->nd, &stat_config.tpebs_results); + } + + if (pthread_create(&thread_script, NULL, __cmd_script, &cmd)) { + kill(cmd.pid, SIGTERM); + close(cmd.out); + pr_err("Could not create thread to process sample data.\n"); + return -1; + } + sleep(2); } if (forks) { @@ -1087,12 +1094,15 @@ static int __run_perf_stat(int argc, const char **argv, int run_idx) if (stat_config.tpebs_event_size > 0) { int ret; - pr_debug("pid = %d\n", getpid()); - pr_debug("cmd.pid = %d\n", cmd.pid); + pr_debug("Workload finished, finishing record\n"); + pr_debug("Perf stat pid = %d, Perf record pid = %d\n", getpid(), cmd.pid); - ret = __cmd_script(&cmd); + kill(cmd.pid, SIGTERM); + pthread_join(thread_script, NULL); close(cmd.out); - pr_debug("%d\n", ret); + ret = finish_command(&cmd); + if (ret != -ERR_RUN_COMMAND_WAITPID_SIGNAL) + return ret; } if (stat_config.walltime_run_table) From patchwork Wed Feb 21 07:20:59 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Wang, Weilin" X-Patchwork-Id: 203974 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:693c:2685:b0:108:e6aa:91d0 with SMTP id mn5csp882172dyc; Tue, 20 Feb 2024 23:23:57 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCVireJ1o5opfsVp94FktTWJSKqjDjcocns8Ov/8jt9PiIcSzXxARyWiElCbqMTqJWsF+pz6KX+K5I6yokANPzEst00BLw== X-Google-Smtp-Source: AGHT+IHuGZeZsa5v1CkmLuqXh7DhpenFTh7wK4jRIRbjrO1csYaow+2y5MsYGIjXwnMD6rgGNNFM X-Received: by 2002:a17:906:a1cd:b0:a3d:6eb4:9768 with SMTP id bx13-20020a170906a1cd00b00a3d6eb49768mr10709983ejb.46.1708500237073; Tue, 20 Feb 2024 23:23:57 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1708500237; cv=pass; d=google.com; s=arc-20160816; b=k8H4CMHoFGb1Yjb3oKd1CZI0CXQndJE5qwv/DSN/urCaCJ++8ZMMUACH6hPIiVvaIS 50dusiAWri7zM0qmNYozm1Aj4cC7QNKaMkMKvZ5LLplmZs0g6PvrkxcVN+ZcHarOfLEl B9C4IXieZzfNUGLleKO1nMWoDBZoLlQka/sfIPBLzQmTwccurs7LmWcNUeaw3Bnt6NvG KzFKWMoW2zCv7/T7bUdOIYr8O5FgyBC4R9FN15pHdF9CJaFgukZF1LDwwNIYO62tL1kO fryoTjv6CFOIGLd45BZ6CNyb1jd9fxT5g/dgRVLC5sjawfvvDnw485wDtFTsC27i4oKj mhMQ== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=kiNe4FYJxLW+YVishQYnyKSwmnD7Cafm60SAleWvoJc=; fh=D8N1uhCLBRzbbRgEj9aMJ2/kVuNqnMf8W9VxSJOfqPA=; b=fPVPCqiCcYOStHv6TIfzPOx6SZcWylCrF7ijyg3/+O1KGPG9uaeuV1AcolvB7WXS8x kkCW2f+clqlUJ2lB/M9hGbKB6M8ql8w9AWYTsdKIJItHiBkRUeUesEuCPjTnPPi5IKG1 j9YxWBVd7WwRIqmQQ4Ff9FaMqC+CaaO59WZ6WZZt8BJgQY0Lsbu0c1lV3lrXLDAgpxz+ 0H1+entt9vykl5waKmv7G6VnxMmd+g24+9Ez4xULri40V6ppHVpLV4PwDZcl41BshAIP mioMPSRuZFIn3EvOG5wsYFnX/dEytT0Jupo7yY5j8tDJu6hZ0C9Laxvhg0C4S4TzDYlH 6qqw==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b="K6yy5xf/"; arc=pass (i=1 spf=pass spfdomain=intel.com dkim=pass dkdomain=intel.com dmarc=pass fromdomain=intel.com); spf=pass (google.com: domain of linux-kernel+bounces-74215-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) smtp.mailfrom="linux-kernel+bounces-74215-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from am.mirrors.kernel.org (am.mirrors.kernel.org. [2604:1380:4601:e00::3]) by mx.google.com with ESMTPS id b12-20020a170906150c00b00a3e7787fc6csi2906416ejd.302.2024.02.20.23.23.56 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 Feb 2024 23:23:57 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-74215-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) client-ip=2604:1380:4601:e00::3; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b="K6yy5xf/"; arc=pass (i=1 spf=pass spfdomain=intel.com dkim=pass dkdomain=intel.com dmarc=pass fromdomain=intel.com); spf=pass (google.com: domain of linux-kernel+bounces-74215-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) smtp.mailfrom="linux-kernel+bounces-74215-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by am.mirrors.kernel.org (Postfix) with ESMTPS id B98F21F20FDD for ; Wed, 21 Feb 2024 07:23:21 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 8B3EC3D0C0; Wed, 21 Feb 2024 07:21:29 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="K6yy5xf/" Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 765453B787; Wed, 21 Feb 2024 07:21:24 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=192.198.163.18 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708500086; cv=none; b=B/zdQ0BZWHqYf+hPsme+MpA0y6PsX7vnsAP00uiiQaieHfKFBSI7MAB8rdFlWUPqWChNDTKIkYeqVIBL/YUem0p78QH1eU9SYhEfhHhBEZcE08Co8Q7jkHPKXJmMFQMmF+jC60A3OnCQ9+gvZSWokS92usRnmBjNxndmAZyGFug= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708500086; c=relaxed/simple; bh=hLBeLFhgQo2IouZ84oByXRXYMmES2v0SNymnjruz2lg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=b7nN+xULNzTb547BK/FpWXbBLTY5o8sd0Ki42w3EYspQrNc/4NDMBgMnQXKYlqIPpp7R5OaUqcsVKc3gzXVJoJwQ8w/SpX98MRgTxQGLJFfSl/LnLgit0JVw85dFHV1jFo+NzBKa2w/Hh60oeQH5zWmrECV+R/fEQ65HXoweZMM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com; spf=pass smtp.mailfrom=intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=K6yy5xf/; arc=none smtp.client-ip=192.198.163.18 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=intel.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1708500084; x=1740036084; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=hLBeLFhgQo2IouZ84oByXRXYMmES2v0SNymnjruz2lg=; b=K6yy5xf/eTbC4PTlj/3VlC2ohJwuEVV+ED7lO3fdw/ytclsieiVMNxpO CZ8Tt04RQOuUDFFRkt/D/eQJkoHN/rEGhLr3hFxHZuaq9GDX+57iBe5tY FGkkERtKell47Z/LWHzC0B8GUnPARZj9SJmWxuqqFh/tSP68U0R7e2RNm QmLLtyxFJGQh5+XSReMVyrY0EJIy/pTd2YQAs/ipUiYABCfJeROE1b2t2 jYBqADt+xRvhrLCoi/IN0//5Z5/rxrRFYc9bHPjsAjBn+1P+x5M+fIJzT mvBvPUZ4hhmvOc1kp4Y+4ZpbcplQAIwilCzhsW6abhu8Fl6HUaG4Az3Xu A==; X-IronPort-AV: E=McAfee;i="6600,9927,10990"; a="2530020" X-IronPort-AV: E=Sophos;i="6.06,175,1705392000"; d="scan'208";a="2530020" Received: from fmviesa010.fm.intel.com ([10.60.135.150]) by fmvoesa112.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 20 Feb 2024 23:21:22 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.06,175,1705392000"; d="scan'208";a="5017456" Received: from fl31ca102ks0602.deacluster.intel.com (HELO gnr-bkc.deacluster.intel.com) ([10.75.133.163]) by fmviesa010.fm.intel.com with ESMTP; 20 Feb 2024 23:21:21 -0800 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 Subject: [RFC PATCH v1 5/5] perf stat: Add retire latency print functions to print out at the very end of print out Date: Wed, 21 Feb 2024 02:20:59 -0500 Message-ID: <20240221072100.412939-6-weilin.wang@intel.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240221072100.412939-1-weilin.wang@intel.com> References: <20240221072100.412939-1-weilin.wang@intel.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1791492344421989415 X-GMAIL-MSGID: 1791492344421989415 From: Weilin Wang Add print out functions so that users could read retire latency values. Signed-off-by: Weilin Wang --- tools/perf/util/stat-display.c | 65 ++++++++++++++++++++++++++++++++++ 1 file changed, 65 insertions(+) diff --git a/tools/perf/util/stat-display.c b/tools/perf/util/stat-display.c index afe6db8e7bf4..ea0d67d8993e 100644 --- a/tools/perf/util/stat-display.c +++ b/tools/perf/util/stat-display.c @@ -21,6 +21,7 @@ #include "iostat.h" #include "pmu.h" #include "pmus.h" +#include "metricgroup.h" #define CNTR_NOT_SUPPORTED "" #define CNTR_NOT_COUNTED "" @@ -34,6 +35,7 @@ #define COMM_LEN 16 #define PID_LEN 7 #define CPUS_LEN 4 +#define RETIRE_LEN 8 static int aggr_header_lens[] = { [AGGR_CORE] = 18, @@ -415,6 +417,67 @@ static void print_metric_std(struct perf_stat_config *config, fprintf(out, " %-*s", METRIC_LEN - n - 1, unit); } +static void print_retire_lat_std(struct perf_stat_config *config, + struct outstate *os) +{ + FILE *out = os->fh; + bool newline = os->newline; + struct tpebs_retire_lat *t; + struct list_head *retire_lats = &config->tpebs_results; + + list_for_each_entry(t, retire_lats, nd) { + if (newline) + do_new_line_std(config, os); + fprintf(out, "%'*.2f %-*s", COUNTS_LEN, t->val, EVNAME_LEN, t->name); + fprintf(out, "%*ld %*d\n", RETIRE_LEN, t->count, + RETIRE_LEN, t->sum); + } +} + +static void print_retire_lat_csv(struct perf_stat_config *config, + struct outstate *os) +{ + FILE *out = os->fh; + struct tpebs_retire_lat *t; + struct list_head *retire_lats = &config->tpebs_results; + const char *sep = config->csv_sep; + + list_for_each_entry(t, retire_lats, nd) { + fprintf(out, "%f%s%s%s%s%ld%s%d\n", t->val, sep, sep, t->name, sep, + t->count, sep, t->sum); + } +} + +static void print_retire_lat_json(struct perf_stat_config *config, + struct outstate *os) +{ + FILE *out = os->fh; + struct tpebs_retire_lat *t; + struct list_head *retire_lats = &config->tpebs_results; + + fprintf(out, "{"); + list_for_each_entry(t, retire_lats, nd) { + fprintf(out, "\"retire_latency-value\" : \"%f\", ", t->val); + fprintf(out, "\"event-name\" : \"%s\"", t->name); + fprintf(out, "\"sample-counts\" : \"%ld\"", t->count); + fprintf(out, "\"retire_latency-sum\" : \"%d\"", t->sum); + } + fprintf(out, "}"); +} + +static void print_retire_lat(struct perf_stat_config *config, + struct outstate *os) +{ + if (!&config->tpebs_results) + return; + if (config->json_output) + print_retire_lat_json(config, os); + else if (config->csv_output) + print_retire_lat_csv(config, os); + else + print_retire_lat_std(config, os); +} + static void new_line_csv(struct perf_stat_config *config, void *ctx) { struct outstate *os = ctx; @@ -1591,6 +1654,8 @@ void evlist__print_counters(struct evlist *evlist, struct perf_stat_config *conf break; } + print_retire_lat(config, &os); + print_footer(config); fflush(config->output);