From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 795D5C77B7D for ; Wed, 10 May 2023 15:52:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237496AbjEJPwR (ORCPT ); Wed, 10 May 2023 11:52:17 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33804 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237177AbjEJPwP (ORCPT ); Wed, 10 May 2023 11:52:15 -0400 Received: from mga18.intel.com (mga18.intel.com [134.134.136.126]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D1B371BCF; Wed, 10 May 2023 08:52:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1683733931; x=1715269931; h=message-id:date:mime-version:subject:from:to:references: in-reply-to:content-transfer-encoding; bh=zFgrOcmDSS9zNwzZGl0l0+zqDgvB+lANnaZH3a8LQMM=; b=nxsroYqOE8O4ANeaoL619+jhOXInqKknPWeQ1TrGCAXf/HTmJ0kw1cYQ TrvPomtISEIxImY3z2dZFvc1tNaaJ7HXibbkLLbRgUI/hdzz/KdX2BZ9Z aYst0UUXZaNNtFznEVg57L1f5aXqTpFEOR+2KvMQAd+10NOnvxS0Ly5bQ SV8tBvQuWTg1HpKoZBO15r9WUg9UmHAxBSvZegrF07eLcacNZxhSuNN47 N8Pvzirdx4VfDS7OJ7+qgdEqmqq1ppFsARXE++zjsQve88Dc0uikO8nT9 ZpMgQZ9awm44NfgJOU/6l1e46pwAEnAkPTj5rfKkPbsZ41qv3wf8sDATU Q==; X-IronPort-AV: E=McAfee;i="6600,9927,10706"; a="334714291" X-IronPort-AV: E=Sophos;i="5.99,265,1677571200"; d="scan'208";a="334714291" Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by orsmga106.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 May 2023 08:52:05 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10706"; a="768955152" X-IronPort-AV: E=Sophos;i="5.99,265,1677571200"; d="scan'208";a="768955152" Received: from ahunter6-mobl1.ger.corp.intel.com (HELO [10.0.2.15]) ([10.252.61.254]) by fmsmga004-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 May 2023 08:52:01 -0700 Message-ID: <5267232a-05a4-393b-b68e-da6a4f46d5e8@intel.com> Date: Wed, 10 May 2023 18:51:55 +0300 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Firefox/102.0 Thunderbird/102.11.0 Subject: Re: [PATCH 3/4] perf tools: Add printing perf_event_attr->type symbol in perf_event_attr__fprintf() Content-Language: en-US From: Adrian Hunter To: Yang Jihong , peterz@infradead.org, mingo@redhat.com, acme@kernel.org, mark.rutland@arm.com, alexander.shishkin@linux.intel.com, jolsa@kernel.org, namhyung@kernel.org, irogers@google.com, anshuman.khandual@arm.com, jesussanp@google.com, linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org References: <20230419122912.73746-1-yangjihong1@huawei.com> <20230419122912.73746-4-yangjihong1@huawei.com> <09511964-dea6-f078-b24c-fef6b05f5b79@intel.com> Organization: Intel Finland Oy, Registered Address: PL 281, 00181 Helsinki, Business Identity Code: 0357606 - 4, Domiciled in Helsinki In-Reply-To: <09511964-dea6-f078-b24c-fef6b05f5b79@intel.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 10/05/23 11:32, Adrian Hunter wrote: > On 19/04/23 15:29, Yang Jihong wrote: >> When printing perf_event_attr, always display attr->type and its symbol >> to improve the readability of debugging information. >> >> Before: >> >> # perf --debug verbose=2 record -e cycles,cpu-clock,sched:sched_switch,branch-load-misses,r101 -C 0 true >> >> ------------------------------------------------------------ >> perf_event_attr: >> size 136 >> { sample_period, sample_freq } 4000 >> sample_type IP|TID|TIME|CPU|PERIOD|IDENTIFIER >> read_format ID >> disabled 1 >> inherit 1 >> freq 1 >> sample_id_all 1 >> exclude_guest 1 >> ------------------------------------------------------------ >> sys_perf_event_open: pid -1 cpu 0 group_fd -1 flags 0x8 = 6 >> ------------------------------------------------------------ >> perf_event_attr: >> type 1 >> size 136 >> { sample_period, sample_freq } 4000 >> sample_type IP|TID|TIME|CPU|PERIOD|IDENTIFIER >> read_format ID >> disabled 1 >> inherit 1 >> freq 1 >> sample_id_all 1 >> exclude_guest 1 >> ------------------------------------------------------------ >> sys_perf_event_open: pid -1 cpu 0 group_fd -1 flags 0x8 = 7 >> ------------------------------------------------------------ >> perf_event_attr: >> type 2 >> size 136 >> config 0x131 >> { sample_period, sample_freq } 1 >> sample_type IP|TID|TIME|CPU|PERIOD|RAW|IDENTIFIER >> read_format ID >> disabled 1 >> inherit 1 >> sample_id_all 1 >> exclude_guest 1 >> ------------------------------------------------------------ >> sys_perf_event_open: pid -1 cpu 0 group_fd -1 flags 0x8 = 8 >> ------------------------------------------------------------ >> perf_event_attr: >> type 3 >> size 136 >> config 0x10005 >> { sample_period, sample_freq } 4000 >> sample_type IP|TID|TIME|CPU|PERIOD|IDENTIFIER >> read_format ID >> disabled 1 >> inherit 1 >> freq 1 >> sample_id_all 1 >> exclude_guest 1 >> ------------------------------------------------------------ >> sys_perf_event_open: pid -1 cpu 0 group_fd -1 flags 0x8 = 10 >> ------------------------------------------------------------ >> perf_event_attr: >> type 4 >> size 136 >> config 0x101 >> { sample_period, sample_freq } 4000 >> sample_type IP|TID|TIME|CPU|PERIOD|IDENTIFIER >> read_format ID >> disabled 1 >> inherit 1 >> freq 1 >> sample_id_all 1 >> exclude_guest 1 >> ------------------------------------------------------------ >> sys_perf_event_open: pid -1 cpu 0 group_fd -1 flags 0x8 = 11 >> >> >> After: >> >> # perf --debug verbose=2 record -e cycles,cpu-clock,sched:sched_switch,branch-load-misses,r101 -C 0 true >> >> ------------------------------------------------------------ >> perf_event_attr: >> type 0 (PERF_TYPE_HARDWARE) >> size 136 >> { sample_period, sample_freq } 4000 >> sample_type IP|TID|TIME|CPU|PERIOD|IDENTIFIER >> read_format ID >> disabled 1 >> inherit 1 >> freq 1 >> sample_id_all 1 >> exclude_guest 1 >> ------------------------------------------------------------ >> sys_perf_event_open: pid -1 cpu 0 group_fd -1 flags 0x8 = 6 >> ------------------------------------------------------------ >> perf_event_attr: >> type 1 (PERF_TYPE_SOFTWARE) >> size 136 >> { sample_period, sample_freq } 4000 >> sample_type IP|TID|TIME|CPU|PERIOD|IDENTIFIER >> read_format ID >> disabled 1 >> inherit 1 >> freq 1 >> sample_id_all 1 >> exclude_guest 1 >> ------------------------------------------------------------ >> sys_perf_event_open: pid -1 cpu 0 group_fd -1 flags 0x8 = 7 >> ------------------------------------------------------------ >> perf_event_attr: >> type 2 (PERF_TYPE_TRACEPOINT) >> size 136 >> config 0x131 >> { sample_period, sample_freq } 1 >> sample_type IP|TID|TIME|CPU|PERIOD|RAW|IDENTIFIER >> read_format ID >> disabled 1 >> inherit 1 >> sample_id_all 1 >> exclude_guest 1 >> ------------------------------------------------------------ >> sys_perf_event_open: pid -1 cpu 0 group_fd -1 flags 0x8 = 8 >> ------------------------------------------------------------ >> perf_event_attr: >> type 3 (PERF_TYPE_HW_CACHE) >> size 136 >> config 0x10005 >> { sample_period, sample_freq } 4000 >> sample_type IP|TID|TIME|CPU|PERIOD|IDENTIFIER >> read_format ID >> disabled 1 >> inherit 1 >> freq 1 >> sample_id_all 1 >> exclude_guest 1 >> ------------------------------------------------------------ >> sys_perf_event_open: pid -1 cpu 0 group_fd -1 flags 0x8 = 10 >> ------------------------------------------------------------ >> perf_event_attr: >> type 4 (PERF_TYPE_RAW) >> size 136 >> config 0x101 >> { sample_period, sample_freq } 4000 >> sample_type IP|TID|TIME|CPU|PERIOD|IDENTIFIER >> read_format ID >> disabled 1 >> inherit 1 >> freq 1 >> sample_id_all 1 >> exclude_guest 1 >> ------------------------------------------------------------ >> sys_perf_event_open: pid -1 cpu 0 group_fd -1 flags 0x8 = 11 >> >> >> Signed-off-by: Yang Jihong >> --- >> tools/perf/util/perf_event_attr_fprintf.c | 24 ++++++++++++++++++++++- >> 1 file changed, 23 insertions(+), 1 deletion(-) >> >> diff --git a/tools/perf/util/perf_event_attr_fprintf.c b/tools/perf/util/perf_event_attr_fprintf.c >> index 433029c6afc5..d9d70126d505 100644 >> --- a/tools/perf/util/perf_event_attr_fprintf.c >> +++ b/tools/perf/util/perf_event_attr_fprintf.c >> @@ -71,6 +71,27 @@ static void __p_read_format(char *buf, size_t size, u64 value) >> __p_bits(buf, size, value, bits); >> } >> >> +static void __p_type_id(char *buf, size_t size, u64 value) >> +{ >> + /* sync with enum perf_type_id in perf_event.h */ >> + switch (value) { >> +#define PRINT_ENUM_PERF_TYPE_ID_CASE(x) \ >> + case x: \ >> + snprintf(buf, size, "%"PRIu64" (%s)", value, #x); \ >> + return; >> + PRINT_ENUM_PERF_TYPE_ID_CASE(PERF_TYPE_HARDWARE) >> + PRINT_ENUM_PERF_TYPE_ID_CASE(PERF_TYPE_SOFTWARE) >> + PRINT_ENUM_PERF_TYPE_ID_CASE(PERF_TYPE_TRACEPOINT) >> + PRINT_ENUM_PERF_TYPE_ID_CASE(PERF_TYPE_HW_CACHE) >> + PRINT_ENUM_PERF_TYPE_ID_CASE(PERF_TYPE_RAW) >> + PRINT_ENUM_PERF_TYPE_ID_CASE(PERF_TYPE_BREAKPOINT) >> +#undef PRINT_ENUM_PERF_TYPE_ID_CASE > > These are ABI constants so maybe simpler: > > const char *fixed_types[] = {"HARDWARE", "SOFTWARE", "TRACEPOINT", > "HW_CACHE", "RAW", "BREAKPOINT"}; > > if (value < ARRAY_SIZE(fixed_types)) { > snprintf(buf, size, "%"PRIu64" (PERF_TYPE_%s)", > value, fixed_types[value]); > } else { > snprintf(buf, size, "%"PRIu64, value); > } Although it is really the repeated snprintf that seems unnecessary so maybe use a switch but just to get the stringified name. > >> + default: >> + snprintf(buf, size, "%"PRIu64, value); >> + return; >> + } >> +} >> + >> #define BUF_SIZE 1024 >> >> #define p_hex(val) snprintf(buf, BUF_SIZE, "%#"PRIx64, (uint64_t)(val)) >> @@ -79,6 +100,7 @@ static void __p_read_format(char *buf, size_t size, u64 value) >> #define p_sample_type(val) __p_sample_type(buf, BUF_SIZE, val) >> #define p_branch_sample_type(val) __p_branch_sample_type(buf, BUF_SIZE, val) >> #define p_read_format(val) __p_read_format(buf, BUF_SIZE, val) >> +#define p_type_id(val) __p_type_id(buf, BUF_SIZE, val) >> >> #define PRINT_ATTRn(_n, _f, _p, _a) \ >> do { \ >> @@ -96,7 +118,7 @@ int perf_event_attr__fprintf(FILE *fp, struct perf_event_attr *attr, >> char buf[BUF_SIZE]; >> int ret = 0; >> >> - PRINT_ATTRf(type, p_unsigned); >> + PRINT_ATTRn("type", type, p_type_id, true); >> PRINT_ATTRf(size, p_unsigned); >> PRINT_ATTRf(config, p_hex); >> PRINT_ATTRn("{ sample_period, sample_freq }", sample_period, p_unsigned, false); >