From nobody Thu Feb 12 19:04:02 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 AEBE414F127; Fri, 7 Jun 2024 20:29:20 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1717792160; cv=none; b=dPs3G6o9FF2LM5wi43ufbw623P3+iq90DYsBpMn8LkGQ3Jfz8lLypwvTuBTrQpKggq7K60sYZC254j3TpK5RlxUu1OY94e8QA2SVgXnrlUEBa8AtvleEEMQ/r4xmbJ7kSPijGFN32wjYeUFzGadhlah95loX1cP7yRFFwaZ2Bnc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1717792160; c=relaxed/simple; bh=VsiNqIhkLvF1K2yGWVtMozFdl46cM8yH7o/l5Y+/L6s=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=XzuqjP1wK2HCCyX40RqPPkQRkkY0it75vLDeCOXJ09lmGmskf3C5Lpl103utcGc7oaN7nSk91AfKsLEfk0nJk7nhVOtTpybdJRvaY+NHlJFUCVPfwcjunX3Jz7/HM8UTBhidVMOzlgnEE26aSdcAEx2wufWzAFim4k9dAZG4pdM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=kXMobQdL; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="kXMobQdL" Received: by smtp.kernel.org (Postfix) with ESMTPSA id D3CB7C4AF09; Fri, 7 Jun 2024 20:29:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1717792160; bh=VsiNqIhkLvF1K2yGWVtMozFdl46cM8yH7o/l5Y+/L6s=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=kXMobQdLxCcLzMpRhuwUjLeLbIMbou46BAU63fVDtMQrnNupXjoVxJeZDkDy/7C/w Jo4qfix+25T+oYeiduJfFSrf9MoapFvMWWGEvUk0FDJVh+u875bxIe2AeodXDDx5ke aPQ1faosV6c79jie3TVRVhbpsB6Advdm2AspyyncVLW1HmJ3uohGJdNqp6HY0DlIRb Vek1Xz8/NsvpqH2SPfcupZzKU4Tija0Y4R/icrlJUaWa2t9L8pzVJhz/HQ7SM6j7H4 ILc4jkzecTAs5pDNSAbLB11ZG1P2TbYxqCJau3ip3wDZDsJexh0r3sfxjOyD6JRbgu bJru86eQq5fRA== From: Namhyung Kim To: Arnaldo Carvalho de Melo , Ian Rogers , Kan Liang Cc: Jiri Olsa , Adrian Hunter , Peter Zijlstra , Ingo Molnar , LKML , linux-perf-users@vger.kernel.org, Arnaldo Carvalho de Melo Subject: [PATCH 1/4] perf hist: Factor out __hpp__fmt_print() Date: Fri, 7 Jun 2024 13:29:15 -0700 Message-ID: <20240607202918.2357459-2-namhyung@kernel.org> X-Mailer: git-send-email 2.45.2.505.gda0bf45e8d-goog In-Reply-To: <20240607202918.2357459-1-namhyung@kernel.org> References: <20240607202918.2357459-1-namhyung@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Split the logic to print the histogram values according to the format string. This was used in 3 different places so it's better to move out the logic into a function. Tested-by: Arnaldo Carvalho de Melo Signed-off-by: Namhyung Kim --- tools/perf/ui/hist.c | 83 +++++++++++++++++++------------------------- 1 file changed, 36 insertions(+), 47 deletions(-) diff --git a/tools/perf/ui/hist.c b/tools/perf/ui/hist.c index 685ba2a54fd8..e30fcb1e87e7 100644 --- a/tools/perf/ui/hist.c +++ b/tools/perf/ui/hist.c @@ -23,35 +23,42 @@ __ret; \ }) =20 -static int __hpp__fmt(struct perf_hpp *hpp, struct hist_entry *he, - hpp_field_fn get_field, const char *fmt, int len, - hpp_snprint_fn print_fn, enum perf_hpp_fmt_type fmtype) +static int __hpp__fmt_print(struct perf_hpp *hpp, struct hists *hists, u64= val, + int nr_samples, const char *fmt, int len, + hpp_snprint_fn print_fn, enum perf_hpp_fmt_type fmtype) { - int ret; - struct hists *hists =3D he->hists; - struct evsel *evsel =3D hists_to_evsel(hists); - char *buf =3D hpp->buf; - size_t size =3D hpp->size; - if (fmtype =3D=3D PERF_HPP_FMT_TYPE__PERCENT) { double percent =3D 0.0; u64 total =3D hists__total_period(hists); =20 if (total) - percent =3D 100.0 * get_field(he) / total; + percent =3D 100.0 * val / total; =20 - ret =3D hpp__call_print_fn(hpp, print_fn, fmt, len, percent); - } else if (fmtype =3D=3D PERF_HPP_FMT_TYPE__AVERAGE) { - double average =3D 0; + return hpp__call_print_fn(hpp, print_fn, fmt, len, percent); + } =20 - if (he->stat.nr_events) - average =3D 1.0 * get_field(he) / he->stat.nr_events; + if (fmtype =3D=3D PERF_HPP_FMT_TYPE__AVERAGE) { + double avg =3D nr_samples ? (1.0 * val / nr_samples) : 0; =20 - ret =3D hpp__call_print_fn(hpp, print_fn, fmt, len, average); - } else { - ret =3D hpp__call_print_fn(hpp, print_fn, fmt, len, get_field(he)); + return hpp__call_print_fn(hpp, print_fn, fmt, len, avg); } =20 + return hpp__call_print_fn(hpp, print_fn, fmt, len, val); +} + +static int __hpp__fmt(struct perf_hpp *hpp, struct hist_entry *he, + hpp_field_fn get_field, const char *fmt, int len, + hpp_snprint_fn print_fn, enum perf_hpp_fmt_type fmtype) +{ + int ret; + struct hists *hists =3D he->hists; + struct evsel *evsel =3D hists_to_evsel(hists); + char *buf =3D hpp->buf; + size_t size =3D hpp->size; + + ret =3D __hpp__fmt_print(hpp, hists, get_field(he), he->stat.nr_events, + fmt, len, print_fn, fmtype); + if (evsel__is_group_event(evsel)) { int prev_idx, idx_delta; struct hist_entry *pair; @@ -72,30 +79,16 @@ static int __hpp__fmt(struct perf_hpp *hpp, struct hist= _entry *he, =20 while (idx_delta--) { /* - * zero-fill group members in the middle which - * have no sample + * zero-fill group members in the middle which have + * no samples, pair->hists is not correct but it's + * fine since the value is 0. */ - if (fmtype !=3D PERF_HPP_FMT_TYPE__RAW) { - ret +=3D hpp__call_print_fn(hpp, print_fn, - fmt, len, 0.0); - } else { - ret +=3D hpp__call_print_fn(hpp, print_fn, - fmt, len, 0ULL); - } + ret +=3D __hpp__fmt_print(hpp, pair->hists, 0, 0, + fmt, len, print_fn, fmtype); } =20 - if (fmtype =3D=3D PERF_HPP_FMT_TYPE__PERCENT) { - ret +=3D hpp__call_print_fn(hpp, print_fn, fmt, len, - 100.0 * period / total); - } else if (fmtype =3D=3D PERF_HPP_FMT_TYPE__AVERAGE) { - double avg =3D nr_samples ? (period / nr_samples) : 0; - - ret +=3D hpp__call_print_fn(hpp, print_fn, fmt, - len, avg); - } else { - ret +=3D hpp__call_print_fn(hpp, print_fn, fmt, - len, period); - } + ret +=3D __hpp__fmt_print(hpp, pair->hists, period, nr_samples, + fmt, len, print_fn, fmtype); =20 prev_idx =3D evsel__group_idx(evsel); } @@ -104,15 +97,11 @@ static int __hpp__fmt(struct perf_hpp *hpp, struct his= t_entry *he, =20 while (idx_delta--) { /* - * zero-fill group members at last which have no sample + * zero-fill group members at last which have no sample. + * the hists is not correct but it's fine like above. */ - if (fmtype !=3D PERF_HPP_FMT_TYPE__RAW) { - ret +=3D hpp__call_print_fn(hpp, print_fn, - fmt, len, 0.0); - } else { - ret +=3D hpp__call_print_fn(hpp, print_fn, - fmt, len, 0ULL); - } + ret +=3D __hpp__fmt_print(hpp, evsel__hists(evsel), 0, 0, + fmt, len, print_fn, fmtype); } } =20 --=20 2.45.2.505.gda0bf45e8d-goog From nobody Thu Feb 12 19:04:02 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 E720814F9E6; Fri, 7 Jun 2024 20:29:20 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1717792161; cv=none; b=qdoTv2/WM8f648iC26/bLFidC+8HbQBj+5oHBLbDk9CAxYFeoyGLpoBw20EH8Yuq9VB1Axzwnc9ovuqIIjdDvCGhFXtGdikzCnqe2UbA6nJhIzb3IkL/ClehZxpB6Swtm7W3vry+alh7F+2ykWZooItnKZXNGJ7Za1TOV6cSZ1Y= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1717792161; c=relaxed/simple; bh=xXti8bLSkXlSV64cAc0cnIOYVS1QeNw8TsTY2C0Saao=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=uFpgtVlGLvBVPRSRkqffJwjfKCvKiADWdjWSkcCJM9FJczD66cDZEAphN2wzzZg4yyXYz0YHMgP9j5frdNV9kTPkyv66cT6RNZIuIuTo3e3n99/wLVv0/NS4oSwBDE7EY5S1w3g6P2x32nwpsaXZr9zA7wphB/uO+M2KQHz5KKk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=iVK5dgGy; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="iVK5dgGy" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 5DC54C32781; Fri, 7 Jun 2024 20:29:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1717792160; bh=xXti8bLSkXlSV64cAc0cnIOYVS1QeNw8TsTY2C0Saao=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=iVK5dgGypnZXiwuPVfKv978Ag9qXUdW7nSmBok7TFN0yB+V+ITPvNdr0rOGfXk+3q hmuP8DTb4bg/wVDPg5f66qsYkKwqJkMsdlibswjXrPMUrpOxl02i52+z8+UQa1qJuV G58Wm/oaP2ZpqsVbp067MvU0+cbrZvmv09ThU5Aao27UAcYzhDB2ka2uhU4qQiUQ1s ydrOhU/BeNaUm64zrYgGGC582ccDEU+AQ6//2HuMpL/nKV/3JKavRWFoRt05dLO3ru z+c5BsNiAm+cnRXNGG3MBHXWYp7UF5dgFwKOtqIQDmblJ+GC2Usg7NHp+LHu0vQ2j/ VPoC82kDGVKtw== From: Namhyung Kim To: Arnaldo Carvalho de Melo , Ian Rogers , Kan Liang Cc: Jiri Olsa , Adrian Hunter , Peter Zijlstra , Ingo Molnar , LKML , linux-perf-users@vger.kernel.org, Arnaldo Carvalho de Melo Subject: [PATCH 2/4] perf hist: Simplify __hpp_fmt() using hpp_fmt_data Date: Fri, 7 Jun 2024 13:29:16 -0700 Message-ID: <20240607202918.2357459-3-namhyung@kernel.org> X-Mailer: git-send-email 2.45.2.505.gda0bf45e8d-goog In-Reply-To: <20240607202918.2357459-1-namhyung@kernel.org> References: <20240607202918.2357459-1-namhyung@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" The struct hpp_fmt_data is to keep the values for each group members so it doesn't need to check the event index in the group. Tested-by: Arnaldo Carvalho de Melo Signed-off-by: Namhyung Kim --- tools/perf/ui/hist.c | 75 +++++++++++++++++++++----------------------- 1 file changed, 36 insertions(+), 39 deletions(-) diff --git a/tools/perf/ui/hist.c b/tools/perf/ui/hist.c index e30fcb1e87e7..7e863cd92781 100644 --- a/tools/perf/ui/hist.c +++ b/tools/perf/ui/hist.c @@ -46,65 +46,62 @@ static int __hpp__fmt_print(struct perf_hpp *hpp, struc= t hists *hists, u64 val, return hpp__call_print_fn(hpp, print_fn, fmt, len, val); } =20 +struct hpp_fmt_value { + struct hists *hists; + u64 val; + int samples; +}; + static int __hpp__fmt(struct perf_hpp *hpp, struct hist_entry *he, hpp_field_fn get_field, const char *fmt, int len, hpp_snprint_fn print_fn, enum perf_hpp_fmt_type fmtype) { - int ret; + int ret =3D 0; struct hists *hists =3D he->hists; struct evsel *evsel =3D hists_to_evsel(hists); + struct evsel *pos; char *buf =3D hpp->buf; size_t size =3D hpp->size; + int i, nr_members =3D 1; + struct hpp_fmt_value *values; + + if (evsel__is_group_event(evsel)) + nr_members =3D evsel->core.nr_members; + + values =3D calloc(nr_members, sizeof(*values)); + if (values =3D=3D NULL) + return 0; + + i =3D 0; + for_each_group_evsel(pos, evsel) + values[i++].hists =3D evsel__hists(pos); =20 - ret =3D __hpp__fmt_print(hpp, hists, get_field(he), he->stat.nr_events, - fmt, len, print_fn, fmtype); + values[0].val =3D get_field(he); + values[0].samples =3D he->stat.nr_events; =20 if (evsel__is_group_event(evsel)) { - int prev_idx, idx_delta; struct hist_entry *pair; - int nr_members =3D evsel->core.nr_members; - - prev_idx =3D evsel__group_idx(evsel); =20 list_for_each_entry(pair, &he->pairs.head, pairs.node) { - u64 period =3D get_field(pair); - u64 total =3D hists__total_period(pair->hists); - int nr_samples =3D pair->stat.nr_events; - - if (!total) - continue; + for (i =3D 0; i < nr_members; i++) { + if (values[i].hists !=3D pair->hists) + continue; =20 - evsel =3D hists_to_evsel(pair->hists); - idx_delta =3D evsel__group_idx(evsel) - prev_idx - 1; - - while (idx_delta--) { - /* - * zero-fill group members in the middle which have - * no samples, pair->hists is not correct but it's - * fine since the value is 0. - */ - ret +=3D __hpp__fmt_print(hpp, pair->hists, 0, 0, - fmt, len, print_fn, fmtype); + values[i].val =3D get_field(pair); + values[i].samples =3D pair->stat.nr_events; + break; } - - ret +=3D __hpp__fmt_print(hpp, pair->hists, period, nr_samples, - fmt, len, print_fn, fmtype); - - prev_idx =3D evsel__group_idx(evsel); } + } =20 - idx_delta =3D nr_members - prev_idx - 1; - - while (idx_delta--) { - /* - * zero-fill group members at last which have no sample. - * the hists is not correct but it's fine like above. - */ - ret +=3D __hpp__fmt_print(hpp, evsel__hists(evsel), 0, 0, - fmt, len, print_fn, fmtype); - } + for (i =3D 0; i < nr_members; i++) { + ret +=3D __hpp__fmt_print(hpp, values[i].hists, values[i].val, + values[i].samples, fmt, len, + print_fn, fmtype); } =20 + free(values); + /* * Restore original buf and size as it's where caller expects * the result will be saved. --=20 2.45.2.505.gda0bf45e8d-goog From nobody Thu Feb 12 19:04:02 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 96CEB154429; Fri, 7 Jun 2024 20:29:21 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1717792161; cv=none; b=lVyuN7ycOEBGhoZ/2Qc/9pBIuC2w+EM8LIfWAXIUyFU7GM/6PJSOnXmnan4F9Daq3oMNQE/CgPNot8ZEsh4CvCUGAGpuGM+I2By+RLrFVcnTw5DiKsDKHGdtfrzAlkr9ECNWFZA79lk3b+ErC92bX16Q1FMOsW637DXJw37D2S4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1717792161; c=relaxed/simple; bh=flcmlgF7FOvJbK8GX4v+2Pmn4oZIQjxIgvZ7GXLJMlQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=hfdghj0PSgU1kO3a5bWHjSsnuQzwQUVuAmjwmLi8zbW0ICkqpGc9YdspuujeWz06ACr9WtkVDpPx9WumZdu4eOlxO41WwH27N6rHgKwKrbij1O46MYLSLJpoyzgv+wbjuO5JULQ8updQf+B5YTFyxSlKuYurcIYk1YGgd5SldYQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=QLinowvC; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="QLinowvC" Received: by smtp.kernel.org (Postfix) with ESMTPSA id D8A9BC32782; Fri, 7 Jun 2024 20:29:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1717792161; bh=flcmlgF7FOvJbK8GX4v+2Pmn4oZIQjxIgvZ7GXLJMlQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=QLinowvCaCCM9oPsHnspwGifQ7WLIYR+TwOrKGxOsnaZWYrsEb0yU7/xH0mJhoWNA 5SB9lwlKfBPB6zjFBJC6RdIP14DPRi2lqxzvVeSkaOtzTKjhoMLO7ZRbxTrd5jxGdT 65Ayz0U1M4iQ0vRJMk3nNXtrgQ4+be9ac4h+ruymlMCLimpG2bL0pQ7sr1PMgSKStw GUJ5/noapnpTHPhVVfo4WNMbT7nXz/obmoMp/kWerldma0YS8KlBdBaP95gDiDYy90 huPxwPjRPEpUwycTSDIcBe9lAY6SHz/vxuKdYPr/45WCuYJCozKWyEig7uCzKu4j/n g3oRIzmcbfD1Q== From: Namhyung Kim To: Arnaldo Carvalho de Melo , Ian Rogers , Kan Liang Cc: Jiri Olsa , Adrian Hunter , Peter Zijlstra , Ingo Molnar , LKML , linux-perf-users@vger.kernel.org, Arnaldo Carvalho de Melo Subject: [PATCH 3/4] perf hist: Add symbol_conf.skip_empty Date: Fri, 7 Jun 2024 13:29:17 -0700 Message-ID: <20240607202918.2357459-4-namhyung@kernel.org> X-Mailer: git-send-email 2.45.2.505.gda0bf45e8d-goog In-Reply-To: <20240607202918.2357459-1-namhyung@kernel.org> References: <20240607202918.2357459-1-namhyung@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Add the skip_empty flag to symbol_conf and set the value from the report command to preserve the existing behavior. This makes the code simpler and will be needed other code which is hard to add a new argument. Tested-by: Arnaldo Carvalho de Melo Signed-off-by: Namhyung Kim --- tools/perf/builtin-annotate.c | 4 ++-- tools/perf/builtin-report.c | 12 ++++++------ tools/perf/ui/stdio/hist.c | 5 ++--- tools/perf/util/events_stats.h | 3 +-- tools/perf/util/hist.c | 6 +++--- tools/perf/util/hist.h | 3 +-- tools/perf/util/session.c | 5 ++--- tools/perf/util/session.h | 3 +-- tools/perf/util/symbol_conf.h | 3 ++- 9 files changed, 20 insertions(+), 24 deletions(-) diff --git a/tools/perf/builtin-annotate.c b/tools/perf/builtin-annotate.c index 50d2fb222d48..b10b7f005658 100644 --- a/tools/perf/builtin-annotate.c +++ b/tools/perf/builtin-annotate.c @@ -571,8 +571,8 @@ static int __cmd_annotate(struct perf_annotate *ann) goto out; =20 if (dump_trace) { - perf_session__fprintf_nr_events(session, stdout, false); - evlist__fprintf_nr_events(session->evlist, stdout, false); + perf_session__fprintf_nr_events(session, stdout); + evlist__fprintf_nr_events(session->evlist, stdout); goto out; } =20 diff --git a/tools/perf/builtin-report.c b/tools/perf/builtin-report.c index 69618fb0110b..9718770facb5 100644 --- a/tools/perf/builtin-report.c +++ b/tools/perf/builtin-report.c @@ -810,8 +810,8 @@ static int stats_print(struct report *rep) { struct perf_session *session =3D rep->session; =20 - perf_session__fprintf_nr_events(session, stdout, rep->skip_empty); - evlist__fprintf_nr_events(session->evlist, stdout, rep->skip_empty); + perf_session__fprintf_nr_events(session, stdout); + evlist__fprintf_nr_events(session->evlist, stdout); return 0; } =20 @@ -1089,10 +1089,8 @@ static int __cmd_report(struct report *rep) perf_session__fprintf_dsos(session, stdout); =20 if (dump_trace) { - perf_session__fprintf_nr_events(session, stdout, - rep->skip_empty); - evlist__fprintf_nr_events(session->evlist, stdout, - rep->skip_empty); + perf_session__fprintf_nr_events(session, stdout); + evlist__fprintf_nr_events(session->evlist, stdout); return 0; } } @@ -1562,6 +1560,8 @@ int cmd_report(int argc, const char **argv) data.path =3D input_name; data.force =3D symbol_conf.force; =20 + symbol_conf.skip_empty =3D report.skip_empty; + repeat: session =3D perf_session__new(&data, &report.tool); if (IS_ERR(session)) { diff --git a/tools/perf/ui/stdio/hist.c b/tools/perf/ui/stdio/hist.c index b849caace398..9372e8904d22 100644 --- a/tools/perf/ui/stdio/hist.c +++ b/tools/perf/ui/stdio/hist.c @@ -897,8 +897,7 @@ size_t hists__fprintf(struct hists *hists, bool show_he= ader, int max_rows, return ret; } =20 -size_t events_stats__fprintf(struct events_stats *stats, FILE *fp, - bool skip_empty) +size_t events_stats__fprintf(struct events_stats *stats, FILE *fp) { int i; size_t ret =3D 0; @@ -910,7 +909,7 @@ size_t events_stats__fprintf(struct events_stats *stats= , FILE *fp, name =3D perf_event__name(i); if (!strcmp(name, "UNKNOWN")) continue; - if (skip_empty && !stats->nr_events[i]) + if (symbol_conf.skip_empty && !stats->nr_events[i]) continue; =20 if (i && total) { diff --git a/tools/perf/util/events_stats.h b/tools/perf/util/events_stats.h index 8fecc9fbaecc..f43e5b1a366a 100644 --- a/tools/perf/util/events_stats.h +++ b/tools/perf/util/events_stats.h @@ -52,7 +52,6 @@ struct hists_stats { =20 void events_stats__inc(struct events_stats *stats, u32 type); =20 -size_t events_stats__fprintf(struct events_stats *stats, FILE *fp, - bool skip_empty); +size_t events_stats__fprintf(struct events_stats *stats, FILE *fp); =20 #endif /* __PERF_EVENTS_STATS_ */ diff --git a/tools/perf/util/hist.c b/tools/perf/util/hist.c index 2e9e193179dd..f028f113c4fd 100644 --- a/tools/perf/util/hist.c +++ b/tools/perf/util/hist.c @@ -2706,8 +2706,7 @@ void hist__account_cycles(struct branch_stack *bs, st= ruct addr_location *al, } } =20 -size_t evlist__fprintf_nr_events(struct evlist *evlist, FILE *fp, - bool skip_empty) +size_t evlist__fprintf_nr_events(struct evlist *evlist, FILE *fp) { struct evsel *pos; size_t ret =3D 0; @@ -2715,7 +2714,8 @@ size_t evlist__fprintf_nr_events(struct evlist *evlis= t, FILE *fp, evlist__for_each_entry(evlist, pos) { struct hists *hists =3D evsel__hists(pos); =20 - if (skip_empty && !hists->stats.nr_samples && !hists->stats.nr_lost_samp= les) + if (symbol_conf.skip_empty && !hists->stats.nr_samples && + !hists->stats.nr_lost_samples) continue; =20 ret +=3D fprintf(fp, "%s stats:\n", evsel__name(pos)); diff --git a/tools/perf/util/hist.h b/tools/perf/util/hist.h index 8fb3bdd29188..5273f5c37050 100644 --- a/tools/perf/util/hist.h +++ b/tools/perf/util/hist.h @@ -375,8 +375,7 @@ void hists__inc_nr_lost_samples(struct hists *hists, u3= 2 lost); size_t hists__fprintf(struct hists *hists, bool show_header, int max_rows, int max_cols, float min_pcnt, FILE *fp, bool ignore_callchains); -size_t evlist__fprintf_nr_events(struct evlist *evlist, FILE *fp, - bool skip_empty); +size_t evlist__fprintf_nr_events(struct evlist *evlist, FILE *fp); =20 void hists__filter_by_dso(struct hists *hists); void hists__filter_by_thread(struct hists *hists); diff --git a/tools/perf/util/session.c b/tools/perf/util/session.c index a10343b9dcd4..0ec92d47373c 100644 --- a/tools/perf/util/session.c +++ b/tools/perf/util/session.c @@ -2696,8 +2696,7 @@ size_t perf_session__fprintf_dsos_buildid(struct perf= _session *session, FILE *fp return machines__fprintf_dsos_buildid(&session->machines, fp, skip, parm); } =20 -size_t perf_session__fprintf_nr_events(struct perf_session *session, FILE = *fp, - bool skip_empty) +size_t perf_session__fprintf_nr_events(struct perf_session *session, FILE = *fp) { size_t ret; const char *msg =3D ""; @@ -2707,7 +2706,7 @@ size_t perf_session__fprintf_nr_events(struct perf_se= ssion *session, FILE *fp, =20 ret =3D fprintf(fp, "\nAggregated stats:%s\n", msg); =20 - ret +=3D events_stats__fprintf(&session->evlist->stats, fp, skip_empty); + ret +=3D events_stats__fprintf(&session->evlist->stats, fp); return ret; } =20 diff --git a/tools/perf/util/session.h b/tools/perf/util/session.h index 3b0256e977a6..4c29dc86956f 100644 --- a/tools/perf/util/session.h +++ b/tools/perf/util/session.h @@ -130,8 +130,7 @@ size_t perf_session__fprintf_dsos(struct perf_session *= session, FILE *fp); size_t perf_session__fprintf_dsos_buildid(struct perf_session *session, FI= LE *fp, bool (fn)(struct dso *dso, int parm), int parm); =20 -size_t perf_session__fprintf_nr_events(struct perf_session *session, FILE = *fp, - bool skip_empty); +size_t perf_session__fprintf_nr_events(struct perf_session *session, FILE = *fp); =20 void perf_session__dump_kmaps(struct perf_session *session); =20 diff --git a/tools/perf/util/symbol_conf.h b/tools/perf/util/symbol_conf.h index c114bbceef40..657cfa5af43c 100644 --- a/tools/perf/util/symbol_conf.h +++ b/tools/perf/util/symbol_conf.h @@ -46,7 +46,8 @@ struct symbol_conf { lazy_load_kernel_maps, keep_exited_threads, annotate_data_member, - annotate_data_sample; + annotate_data_sample, + skip_empty; const char *vmlinux_name, *kallsyms_name, *source_prefix, --=20 2.45.2.505.gda0bf45e8d-goog From nobody Thu Feb 12 19:04:02 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 2BAA21552EF; Fri, 7 Jun 2024 20:29:21 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1717792162; cv=none; b=A3D7mIjjpzBX785rYPBZslvvtWSGdpZEwNkY4REZVmsoxDyQyFUZx51wYhJ+bwLPLMpUfSp7kfBQr5ylhxYdZyp2qYChAOoYCTvPJC+zLLtNuBMjJ9t8FI6kmgwhnWNhoCgWuVwNZSC++J20nHUwJFNEAJArPMBlxT0HEQLO1Wo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1717792162; c=relaxed/simple; bh=Bdv1T3V+QVoamQb/wjWYwDu3U6qdpHhyUU9S4KSBk3g=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=TDf61lMMVPsDBIHRuXBE+KC9g4uedh+76QV+2ndnJqzKdnG1Q458ooxMc7E07/nlRUtYbvlzLEU81HBYqfzFscEKA+m8K6Sg0HCx1KrZXqvHr82egLTlj0Qm8BrvX5hnoo3clXw0px1I30RpiSddtTQLOy9EfZQRHrcrPMbj3OY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=ky9ue0y+; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="ky9ue0y+" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 60982C4AF0F; Fri, 7 Jun 2024 20:29:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1717792161; bh=Bdv1T3V+QVoamQb/wjWYwDu3U6qdpHhyUU9S4KSBk3g=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ky9ue0y+/xNybgFOEj5pGu0kOmr7vYGQrZQBMDpDR5oWSotHdAojnDD9Nfu1TzIUa WLbq0nlyvnSpZY7NXuwXiMtNnAg926Dm7Ge3wgd1/cB/Ie8885mkgVPrhA3HmZrT6s 4NS4tAIlzCepbJtzqLhpczQwr3kEreT8R6wM+/YsDQ5QF8gdMT+hMBx5/dYykDOErZ 3MMpO7Vaw0uM3/g4n9egvEEHkf9JOj2ZLpU58uCp461qsvEx4kOeuHuNgzxy/7aIKp nK4yR5Nl+BXMJog7sY6NFEO3Qr3I6jyucwbNHFQfD3mPExW8ClVSlWmEM9HReuuZHP sbz9Hml6g18og== From: Namhyung Kim To: Arnaldo Carvalho de Melo , Ian Rogers , Kan Liang Cc: Jiri Olsa , Adrian Hunter , Peter Zijlstra , Ingo Molnar , LKML , linux-perf-users@vger.kernel.org, Arnaldo Carvalho de Melo Subject: [PATCH 4/4] perf hist: Honor symbol_conf.skip_empty Date: Fri, 7 Jun 2024 13:29:18 -0700 Message-ID: <20240607202918.2357459-5-namhyung@kernel.org> X-Mailer: git-send-email 2.45.2.505.gda0bf45e8d-goog In-Reply-To: <20240607202918.2357459-1-namhyung@kernel.org> References: <20240607202918.2357459-1-namhyung@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" So that it can skip events with no sample according to the config value. This can omit the dummy event in the output of perf report --group. An example output: $ sudo perf mem record -a sleep 1 $ sudo perf report --group Before) # # Samples: 232 of events 'cpu/mem-loads,ldlat=3D30/P, cpu/mem-stores/P, = dummy:u' # Event count (approx.): 3089861 # # Overhead Command Shared Object Symbol # ........................ ........... ................. .............= ........................ # 9.29% 0.00% 0.00% swapper [kernel.kallsyms] [k] update_bl= ocked_averages 5.26% 0.15% 0.00% swapper [kernel.kallsyms] [k] __update_= load_avg_se 4.15% 0.00% 0.00% perf-exec [kernel.kallsyms] [k] slab_upda= te_freelist.isra.0 3.87% 0.00% 0.00% perf-exec [kernel.kallsyms] [k] memcg_sla= b_post_alloc_hook 3.79% 0.17% 0.00% swapper [kernel.kallsyms] [k] enqueue_t= ask_fair 3.63% 0.00% 0.00% sleep [kernel.kallsyms] [k] next_upto= date_page 2.86% 0.00% 0.00% swapper [kernel.kallsyms] [k] __update_= load_avg_cfs_rq 2.78% 0.00% 0.00% swapper [kernel.kallsyms] [k] __schedule 2.34% 0.00% 0.00% swapper [kernel.kallsyms] [k] intel_idle 2.32% 0.97% 0.00% swapper [kernel.kallsyms] [k] psi_group= _change After) # # Samples: 232 of events 'cpu/mem-loads,ldlat=3D30/P, cpu/mem-stores/P' # Event count (approx.): 3089861 # # Overhead Command Shared Object Symbol # ................ ........... ................. .....................= ................ # 9.29% 0.00% swapper [kernel.kallsyms] [k] update_blocked_av= erages 5.26% 0.15% swapper [kernel.kallsyms] [k] __update_load_avg= _se 4.15% 0.00% perf-exec [kernel.kallsyms] [k] slab_update_freel= ist.isra.0 3.87% 0.00% perf-exec [kernel.kallsyms] [k] memcg_slab_post_a= lloc_hook 3.79% 0.17% swapper [kernel.kallsyms] [k] enqueue_task_fair 3.63% 0.00% sleep [kernel.kallsyms] [k] next_uptodate_page 2.86% 0.00% swapper [kernel.kallsyms] [k] __update_load_avg= _cfs_rq 2.78% 0.00% swapper [kernel.kallsyms] [k] __schedule 2.34% 0.00% swapper [kernel.kallsyms] [k] intel_idle 2.32% 0.97% swapper [kernel.kallsyms] [k] psi_group_change Now it doesn't have a column for the dummy event. Tested-by: Arnaldo Carvalho de Melo Signed-off-by: Namhyung Kim --- tools/perf/ui/hist.c | 18 ++++++++++++++++-- tools/perf/util/evsel.c | 13 ++++++++++--- tools/perf/util/python.c | 3 +++ 3 files changed, 29 insertions(+), 5 deletions(-) diff --git a/tools/perf/ui/hist.c b/tools/perf/ui/hist.c index 7e863cd92781..5d1f04f66a5a 100644 --- a/tools/perf/ui/hist.c +++ b/tools/perf/ui/hist.c @@ -95,6 +95,10 @@ static int __hpp__fmt(struct perf_hpp *hpp, struct hist_= entry *he, } =20 for (i =3D 0; i < nr_members; i++) { + if (symbol_conf.skip_empty && + values[i].hists->stats.nr_samples =3D=3D 0) + continue; + ret +=3D __hpp__fmt_print(hpp, values[i].hists, values[i].val, values[i].samples, fmt, len, print_fn, fmtype); @@ -296,8 +300,18 @@ static int hpp__width_fn(struct perf_hpp_fmt *fmt, int len =3D fmt->user_len ?: fmt->len; struct evsel *evsel =3D hists_to_evsel(hists); =20 - if (symbol_conf.event_group) - len =3D max(len, evsel->core.nr_members * fmt->len); + if (symbol_conf.event_group) { + int nr =3D 0; + struct evsel *pos; + + for_each_group_evsel(pos, evsel) { + if (!symbol_conf.skip_empty || + evsel__hists(pos)->stats.nr_samples) + nr++; + } + + len =3D max(len, nr * fmt->len); + } =20 if (len < (int)strlen(fmt->name)) len =3D strlen(fmt->name); diff --git a/tools/perf/util/evsel.c b/tools/perf/util/evsel.c index 4f818ab6b662..befb80c272d2 100644 --- a/tools/perf/util/evsel.c +++ b/tools/perf/util/evsel.c @@ -53,6 +53,7 @@ #include "../perf-sys.h" #include "util/parse-branch-options.h" #include "util/bpf-filter.h" +#include "util/hist.h" #include #include #include @@ -830,16 +831,22 @@ const char *evsel__group_name(struct evsel *evsel) int evsel__group_desc(struct evsel *evsel, char *buf, size_t size) { int ret =3D 0; + bool first =3D true; struct evsel *pos; const char *group_name =3D evsel__group_name(evsel); =20 if (!evsel->forced_leader) ret =3D scnprintf(buf, size, "%s { ", group_name); =20 - ret +=3D scnprintf(buf + ret, size - ret, "%s", evsel__name(evsel)); + for_each_group_evsel(pos, evsel) { + if (symbol_conf.skip_empty && + evsel__hists(pos)->stats.nr_samples =3D=3D 0) + continue; =20 - for_each_group_member(pos, evsel) - ret +=3D scnprintf(buf + ret, size - ret, ", %s", evsel__name(pos)); + ret +=3D scnprintf(buf + ret, size - ret, "%s%s", + first ? "" : ", ", evsel__name(pos)); + first =3D false; + } =20 if (!evsel->forced_leader) ret +=3D scnprintf(buf + ret, size - ret, " }"); diff --git a/tools/perf/util/python.c b/tools/perf/util/python.c index 0aeb97c11c03..88f98f2772fb 100644 --- a/tools/perf/util/python.c +++ b/tools/perf/util/python.c @@ -23,6 +23,7 @@ #include "util/env.h" #include "util/pmu.h" #include "util/pmus.h" +#include "util/symbol_conf.h" #include #include "util.h" =20 @@ -50,6 +51,8 @@ #define Py_TYPE(ob) (((PyObject*)(ob))->ob_type) #endif =20 +struct symbol_conf symbol_conf; + /* * Avoid bringing in event parsing. */ --=20 2.45.2.505.gda0bf45e8d-goog