From patchwork Wed Apr 19 12:29:09 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yang Jihong X-Patchwork-Id: 85385 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp355279vqo; Wed, 19 Apr 2023 05:39:46 -0700 (PDT) X-Google-Smtp-Source: AKy350Z913g9UyCSdU3AFoj8T5tMsyoQwDhpU44rsNoqkOXIVeXkups5e+x9OWx0C9LFTwrgBazb X-Received: by 2002:a05:6a00:2e0f:b0:627:f0e1:4fbf with SMTP id fc15-20020a056a002e0f00b00627f0e14fbfmr3934194pfb.33.1681907986662; Wed, 19 Apr 2023 05:39:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1681907986; cv=none; d=google.com; s=arc-20160816; b=yANMsJpYADEJa6ZhPR7Mnm/A7pEXOwNUTlZ28Ayxsp/vywDPC6wT4YLeJ76tlQK+2j b1qlF1FV7OwopddO2pBuLecFe68Dq3JqEzIX8ANm1/L7M8VLboI36Fp5g0dgoLS0fcs+ phKQLzqK2dq7Yz579cEJ/G2dx68S6/8D+jqhEbRDS13uX6NdYeahwRw4YOAYUHdRbPBc OBH+9TUu02nsCO7JzzE2ATC0zB2Ui6J/F3J3cSz5kzS06sbJrliSeq7UYnQkDy/Sxjqc Nm8woEb/M2qhfLiygiJRpfDNRFvIzDGbTu51e1/zIAJEQpGhqdIpQRHjr5cXqEXmj5Sy pFIg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=t1+6OXf1UeFbr6goJqIHll9ahDMBafnbKuGdVP8eD20=; b=VX3l+ituCLjGE2HhAK34a9wPdh9vwcQKtls0fTQEpA6BzqqxSzSWdCoug8fKq1dkUd Ru74LDdoxJmtV0PoGP2L9TSyQt2EvJYkWlIXSjtUSbBGXFaHb9qMb2P7WeIwacGsTQWL pKpMHCrc7VoKdIJWGuwaok1OWVYZIKZ9as2L/sSwsDM1dxXSMQXgrgXmNGdA962GkuYu nvS61jh8skBqlotAzP/MoP6hAdRHrMNloJnfISLx7bgife9dU8jyAaIdFr6zRrDhbvhL Sg98NTsr3KZXyJca8m+1wluGdgwUlsKoGcSlNKeSIdGIuCD2PLgnUr7Vg8gvZ8WV5LNy F9KQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id p30-20020a634f5e000000b00502d6f14309si9757972pgl.809.2023.04.19.05.39.34; Wed, 19 Apr 2023 05:39:46 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232715AbjDSMbW (ORCPT + 99 others); Wed, 19 Apr 2023 08:31:22 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49876 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232459AbjDSMbQ (ORCPT ); Wed, 19 Apr 2023 08:31:16 -0400 Received: from szxga02-in.huawei.com (szxga02-in.huawei.com [45.249.212.188]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id F16717685; Wed, 19 Apr 2023 05:31:13 -0700 (PDT) Received: from kwepemm600003.china.huawei.com (unknown [172.30.72.57]) by szxga02-in.huawei.com (SkyGuard) with ESMTP id 4Q1g5j1dYgzStCN; Wed, 19 Apr 2023 20:27:05 +0800 (CST) Received: from localhost.localdomain (10.67.174.95) by kwepemm600003.china.huawei.com (7.193.23.202) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.23; Wed, 19 Apr 2023 20:31:11 +0800 From: Yang Jihong To: , , , , , , , , , , , , CC: Subject: [PATCH 1/4] perf trace-event-info: Add tracepoint_id_to_name() helper Date: Wed, 19 Apr 2023 12:29:09 +0000 Message-ID: <20230419122912.73746-2-yangjihong1@huawei.com> X-Mailer: git-send-email 2.30.GIT In-Reply-To: <20230419122912.73746-1-yangjihong1@huawei.com> References: <20230419122912.73746-1-yangjihong1@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.67.174.95] X-ClientProxiedBy: dggems703-chm.china.huawei.com (10.3.19.180) To kwepemm600003.china.huawei.com (7.193.23.202) X-CFilter-Loop: Reflected X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1763608349128165002?= X-GMAIL-MSGID: =?utf-8?q?1763608349128165002?= Add tracepoint_id_to_name() helper to search for the trace events directory by given event id and return the corresponding tracepoint. Signed-off-by: Yang Jihong --- tools/perf/util/trace-event-info.c | 13 +++++++++++++ tools/perf/util/trace-event.h | 6 ++++++ 2 files changed, 19 insertions(+) diff --git a/tools/perf/util/trace-event-info.c b/tools/perf/util/trace-event-info.c index c24b3a15e319..79907caaf0ca 100644 --- a/tools/perf/util/trace-event-info.c +++ b/tools/perf/util/trace-event-info.c @@ -466,6 +466,19 @@ static struct tracepoint_path *tracepoint_id_to_path(u64 config) return NULL; } +char *tracepoint_id_to_name(u64 config) +{ + char buf[MAX_EVENT_LENGTH]; + struct tracepoint_path *path = NULL; + + path = tracepoint_id_to_path(config); + if (path == NULL) + return NULL; + + snprintf(buf, sizeof(buf), "%s:%s", path->system, path->name); + return strdup(buf); +} + static struct tracepoint_path *tracepoint_name_to_path(const char *name) { struct tracepoint_path *path = zalloc(sizeof(*path)); diff --git a/tools/perf/util/trace-event.h b/tools/perf/util/trace-event.h index a0cff184b1cd..a69ee29419f3 100644 --- a/tools/perf/util/trace-event.h +++ b/tools/perf/util/trace-event.h @@ -62,6 +62,12 @@ unsigned long long eval_flag(const char *flag); int read_tracing_data(int fd, struct list_head *pattrs); +/* + * Return the tracepoint name in the format "subsystem:event_name", + * callers should free the returned string. + */ +char *tracepoint_id_to_name(u64 config); + struct tracing_data { /* size is only valid if temp is 'true' */ ssize_t size; From patchwork Wed Apr 19 12:29:10 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yang Jihong X-Patchwork-Id: 85394 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp361431vqo; Wed, 19 Apr 2023 05:51:11 -0700 (PDT) X-Google-Smtp-Source: AKy350aQXjAITM4NsOVcbew2q1n67I3qn6Fc8RMwa903LhVNC0M5b4g6jX6QPcDrQmbKAnnQxmwH X-Received: by 2002:a17:90b:4d81:b0:24b:27d8:f5d9 with SMTP id oj1-20020a17090b4d8100b0024b27d8f5d9mr1312080pjb.40.1681908671643; Wed, 19 Apr 2023 05:51:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1681908671; cv=none; d=google.com; s=arc-20160816; b=lLE5O0zadmw5paNmKFmKS+rSh5YLLGtcSZVpdgZ19AyhNuquBfwOBx6m6Lg8nbB27i Dbgz9fP8aRFdK87TyKLSHOiDq4ly6Sp0q1RhdQ4awkAa9imRbXq/w6rXndWpFmZtSUwK stQZyUERbb/Mz4hOgXYlErF4ZoCDnuSPRMK4fTG8va5V7YK5CzNsmYgE3YzaX0NU/jXr KjYv+gDP58Wuew5eXEOluhDXMAAf9uHT8DhBz83IYfLrUJeXaugJkWOxeCx99fajjU6T H521mo47DDwuiWPoxH+4hUwbGgFtK39/oicX+YMfwV8MbYpFzv5/POtPN8EB2bsF6PSb gwqw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=uciQYfZPjlhf35CvTHiwd7Z3cqHbuPLaLSw9CnhyLqo=; b=mzHw3jxoMA4RLFzZW5R2q+AsdgECaCQsJSlow+ASshxrJNAkd5koYt/Xj54kdZo6pe qcY1wIyslywNeR7Z0grsB/sPYDTdn+s3rr4h6/YktoLU2W6mk1luzj8Pp0J7CU4Ip5wI bohoR08xWuVOVJqBctha8hPGwZQLzYbSGifQrzutAAWy7i2f12aoRaVF6+W6zp2uio2o dcOXG8AaHUJZjakXG8eEgn/1or7VLpvejyIMgw3ghvXVwaZyBPBcKJBOOi53FLwTwRHO eYIF+tu1KmJ5EpTHtCOVA8tAZ/FVlEx3KPSj4EVZvIFKi52hnxrlYfUKqmJAk8/PlWGE mVag== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id ob2-20020a17090b390200b002477ddfa2f3si1806441pjb.182.2023.04.19.05.50.56; Wed, 19 Apr 2023 05:51:11 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232912AbjDSMbY (ORCPT + 99 others); Wed, 19 Apr 2023 08:31:24 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49884 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230117AbjDSMbQ (ORCPT ); Wed, 19 Apr 2023 08:31:16 -0400 Received: from szxga02-in.huawei.com (szxga02-in.huawei.com [45.249.212.188]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7AEEA15A05; Wed, 19 Apr 2023 05:31:14 -0700 (PDT) Received: from kwepemm600003.china.huawei.com (unknown [172.30.72.57]) by szxga02-in.huawei.com (SkyGuard) with ESMTP id 4Q1g5j5gBzzSmRS; Wed, 19 Apr 2023 20:27:05 +0800 (CST) Received: from localhost.localdomain (10.67.174.95) by kwepemm600003.china.huawei.com (7.193.23.202) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.23; Wed, 19 Apr 2023 20:31:12 +0800 From: Yang Jihong To: , , , , , , , , , , , , CC: Subject: [PATCH 2/4] perf tools: Extend PRINT_ATTRf to support printing of members with a value of 0 Date: Wed, 19 Apr 2023 12:29:10 +0000 Message-ID: <20230419122912.73746-3-yangjihong1@huawei.com> X-Mailer: git-send-email 2.30.GIT In-Reply-To: <20230419122912.73746-1-yangjihong1@huawei.com> References: <20230419122912.73746-1-yangjihong1@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.67.174.95] X-ClientProxiedBy: dggems703-chm.china.huawei.com (10.3.19.180) To kwepemm600003.china.huawei.com (7.193.23.202) X-CFilter-Loop: Reflected X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1763609067584605551?= X-GMAIL-MSGID: =?utf-8?q?1763609067584605551?= When printing attr, members whose value is 0 will not be printed, we want to print the case where attr->type is 0(PERF_TYPE_HARDWARE), add `_a` param to PRINT_ATTRf macro to always print member when it is true No functional change. Signed-off-by: Yang Jihong --- tools/perf/util/perf_event_attr_fprintf.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/tools/perf/util/perf_event_attr_fprintf.c b/tools/perf/util/perf_event_attr_fprintf.c index 7e5e7b30510d..433029c6afc5 100644 --- a/tools/perf/util/perf_event_attr_fprintf.c +++ b/tools/perf/util/perf_event_attr_fprintf.c @@ -80,15 +80,15 @@ static void __p_read_format(char *buf, size_t size, u64 value) #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 PRINT_ATTRn(_n, _f, _p) \ +#define PRINT_ATTRn(_n, _f, _p, _a) \ do { \ - if (attr->_f) { \ + if (_a || attr->_f) { \ _p(attr->_f); \ ret += attr__fprintf(fp, _n, buf, priv);\ } \ } while (0) -#define PRINT_ATTRf(_f, _p) PRINT_ATTRn(#_f, _f, _p) +#define PRINT_ATTRf(_f, _p) PRINT_ATTRn(#_f, _f, _p, false) int perf_event_attr__fprintf(FILE *fp, struct perf_event_attr *attr, attr__fprintf_f attr__fprintf, void *priv) @@ -99,7 +99,7 @@ int perf_event_attr__fprintf(FILE *fp, struct perf_event_attr *attr, PRINT_ATTRf(type, p_unsigned); PRINT_ATTRf(size, p_unsigned); PRINT_ATTRf(config, p_hex); - PRINT_ATTRn("{ sample_period, sample_freq }", sample_period, p_unsigned); + PRINT_ATTRn("{ sample_period, sample_freq }", sample_period, p_unsigned, false); PRINT_ATTRf(sample_type, p_sample_type); PRINT_ATTRf(read_format, p_read_format); @@ -141,10 +141,10 @@ int perf_event_attr__fprintf(FILE *fp, struct perf_event_attr *attr, PRINT_ATTRf(remove_on_exec, p_unsigned); PRINT_ATTRf(sigtrap, p_unsigned); - PRINT_ATTRn("{ wakeup_events, wakeup_watermark }", wakeup_events, p_unsigned); + PRINT_ATTRn("{ wakeup_events, wakeup_watermark }", wakeup_events, p_unsigned, false); PRINT_ATTRf(bp_type, p_unsigned); - PRINT_ATTRn("{ bp_addr, config1 }", bp_addr, p_hex); - PRINT_ATTRn("{ bp_len, config2 }", bp_len, p_hex); + PRINT_ATTRn("{ bp_addr, config1 }", bp_addr, p_hex, false); + PRINT_ATTRn("{ bp_len, config2 }", bp_len, p_hex, false); PRINT_ATTRf(branch_sample_type, p_branch_sample_type); PRINT_ATTRf(sample_regs_user, p_hex); PRINT_ATTRf(sample_stack_user, p_unsigned); From patchwork Wed Apr 19 12:29:11 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yang Jihong X-Patchwork-Id: 85393 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp361425vqo; Wed, 19 Apr 2023 05:51:11 -0700 (PDT) X-Google-Smtp-Source: AKy350bEaB/oTV8BYcyXFs9ln16wDKMAPRN67rbkpQyMXAlvGscJ53PY5JmGrVPwom1v28DYPGmO X-Received: by 2002:a17:902:8503:b0:19e:500b:517a with SMTP id bj3-20020a170902850300b0019e500b517amr4834626plb.69.1681908671288; Wed, 19 Apr 2023 05:51:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1681908671; cv=none; d=google.com; s=arc-20160816; b=lCVsboTXt0Y7KbtuugE3b8LEBlozcBqkfP+xPYefxyFdgRc39XpQdzCXJKGvx9Ounq VkBjcB/6t4Hct9mrhm7IrHZ30sKXU631+aJHI+Xj6hSI/UFNj4aZLIQTKYJRbV/V6yEk tH5sc/9Q181EEm4ub/gmQYWNU0f9/rULJ+aF6X2jMawuy18LNmOB5QdIW5ntOMW6AWvD HrpPez+ryxqkwYr8Oq4iNfviy75AExvod+GL0ueP3JwKHDNtJ1HtJ7zYYzw8hvZd5egg 6E6bugBjwXb0JLoH33vrGQW2+v9eKNL6ayviHFJEu9cUp0WVNHhT66GMdK3N6Ae6TJiJ F/Pg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=P4YRZPOWZGqufwpZieKg07TWzqR1m6MQ6NsPDHZtOsc=; b=nIuEV+8RYP9S69zKdwrwrVMwZAhXZYM4anjfzHefBep1Ehclfee9UQMek75kQIAqcA IkmjDDHzLcFx1RuZqK0l2haDNofbjAyjU5T/alM3mTvcWUObllfj/6nQMObdGAE6EVz8 y4TBhmGgT31BMU6CVuJptyNy9uqjhZTUdZCAxTAyQ/K4Czu4bxK39K8zYqzdeCOrbPlx 2Z1S5hG+T7kSzSbh7C3S+oEKfmOJ0273zOgNTyMg1H7QaB9tOb8E/nkKgib7han4IWz1 jdsyt4kRiAPOeIjzZv5pejcR7IoWzghATio8Wp3AQj4n75ggCbjA7+xsvWKUQHumQnRr GgIg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id u14-20020a170903124e00b001a1c8afd0e4si16996770plh.635.2023.04.19.05.50.56; Wed, 19 Apr 2023 05:51:11 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233008AbjDSMb1 (ORCPT + 99 others); Wed, 19 Apr 2023 08:31:27 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49948 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232685AbjDSMbS (ORCPT ); Wed, 19 Apr 2023 08:31:18 -0400 Received: from szxga01-in.huawei.com (szxga01-in.huawei.com [45.249.212.187]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BC84813F9C; Wed, 19 Apr 2023 05:31:15 -0700 (PDT) Received: from kwepemm600003.china.huawei.com (unknown [172.30.72.57]) by szxga01-in.huawei.com (SkyGuard) with ESMTP id 4Q1g691PzRzncxX; Wed, 19 Apr 2023 20:27:29 +0800 (CST) Received: from localhost.localdomain (10.67.174.95) by kwepemm600003.china.huawei.com (7.193.23.202) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.23; Wed, 19 Apr 2023 20:31:12 +0800 From: Yang Jihong To: , , , , , , , , , , , , CC: Subject: [PATCH 3/4] perf tools: Add printing perf_event_attr->type symbol in perf_event_attr__fprintf() Date: Wed, 19 Apr 2023 12:29:11 +0000 Message-ID: <20230419122912.73746-4-yangjihong1@huawei.com> X-Mailer: git-send-email 2.30.GIT In-Reply-To: <20230419122912.73746-1-yangjihong1@huawei.com> References: <20230419122912.73746-1-yangjihong1@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.67.174.95] X-ClientProxiedBy: dggems703-chm.china.huawei.com (10.3.19.180) To kwepemm600003.china.huawei.com (7.193.23.202) X-CFilter-Loop: Reflected X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1763609067093261627?= X-GMAIL-MSGID: =?utf-8?q?1763609067093261627?= 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 + 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); From patchwork Wed Apr 19 12:29:12 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yang Jihong X-Patchwork-Id: 85392 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp361389vqo; Wed, 19 Apr 2023 05:51:08 -0700 (PDT) X-Google-Smtp-Source: AKy350ZEoprVreGBxpkL6WhDmp60XUFob5neId8rFnc+CtgRNiIiDlvrqwcVoC9VCek0XFrP94Ok X-Received: by 2002:a05:6a21:998a:b0:f0:718f:8eeb with SMTP id ve10-20020a056a21998a00b000f0718f8eebmr3974328pzb.60.1681908668515; Wed, 19 Apr 2023 05:51:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1681908668; cv=none; d=google.com; s=arc-20160816; b=slth/a6wK2yPT1NTOGE1lTewGMHPwuoErGGOBasA6aPY8UHGrQcx6JpV+fA2UlfKD3 Mn2dXfoGICrvOWILgs532irfVK386P5ETLwQZ4J+mkUKxCYFVBqckdhfWJA25eGcBlLy 8IfDOjWu0cvzGTbyp0sC6XkeSREqJBfosXiRcaWOeaQN+asWJmsWJrs6ZFJvh+evJM4N Qyz+ijJWdfnHGS64G7a6iyJyUAKRpYgJ9fy22iKLhkWSYXl4jAO+QavF+5j/UpK41rkV WWY7uccGjic7YiGFdN9QmUSC2sOiYjRATrKyxXSlatU7Vg/zcriRfAql2Aq97YgLxnYE fhWQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=5E/cDhsRYg0SghFe+MP7M6te9YkjS+gX7ka9X45ZlUM=; b=xkEFVSrdcmg+xd2UDvrLKoglxFTAWvnOkj6T5cVWNIeZvOeDALdssF/v2PL2Qm7xf1 gzPQaN82zFu6w/q5qZ6qe0y8KVB2y6T40uRxuRXOxGWk/EVt8bHB7PTf9RZAFrTHScr2 lRtp0KAiOu7dntAB+u9LKdYKkXz2WNAiy1qNlMggCwbC6QuoaTNZnvQRNleEmeftsEL3 7b0fBnzaAOjnkQgSjvwliR3XQtqmt3fr8ZRuUp9+T73h5djZHkfsM2/QqWuj+S+SASjK UX+q9c51V1Cvhh1e2mJvYqoHi0dQZ3J5AFdXfuiP4QzP3jo6UKajElEnOCRP8/UvYsMR Y7kg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id y192-20020a638ac9000000b005210549d5f2si1263922pgd.816.2023.04.19.05.50.53; Wed, 19 Apr 2023 05:51:08 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233243AbjDSMba (ORCPT + 99 others); Wed, 19 Apr 2023 08:31:30 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49944 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232538AbjDSMbS (ORCPT ); Wed, 19 Apr 2023 08:31:18 -0400 Received: from szxga02-in.huawei.com (szxga02-in.huawei.com [45.249.212.188]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BC4379ECE; Wed, 19 Apr 2023 05:31:15 -0700 (PDT) Received: from kwepemm600003.china.huawei.com (unknown [172.30.72.57]) by szxga02-in.huawei.com (SkyGuard) with ESMTP id 4Q1g5k6ldxzSst9; Wed, 19 Apr 2023 20:27:06 +0800 (CST) Received: from localhost.localdomain (10.67.174.95) by kwepemm600003.china.huawei.com (7.193.23.202) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.23; Wed, 19 Apr 2023 20:31:13 +0800 From: Yang Jihong To: , , , , , , , , , , , , CC: Subject: [PATCH 4/4] perf tools: Add printing perf_event_attr->config symbol in perf_event_attr__fprintf() Date: Wed, 19 Apr 2023 12:29:12 +0000 Message-ID: <20230419122912.73746-5-yangjihong1@huawei.com> X-Mailer: git-send-email 2.30.GIT In-Reply-To: <20230419122912.73746-1-yangjihong1@huawei.com> References: <20230419122912.73746-1-yangjihong1@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.67.174.95] X-ClientProxiedBy: dggems703-chm.china.huawei.com (10.3.19.180) To kwepemm600003.china.huawei.com (7.193.23.202) X-CFilter-Loop: Reflected X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1763609064411945677?= X-GMAIL-MSGID: =?utf-8?q?1763609064411945677?= When printing perf_event_attr, always display attr->config 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 config 0 (PERF_COUNT_HW_CPU_CYCLES) { 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 config 0 (PERF_COUNT_SW_CPU_CLOCK) { 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 (sched:sched_switch) { 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 (PERF_COUNT_HW_CACHE_RESULT_MISS | PERF_COUNT_HW_CACHE_OP_READ | PERF_COUNT_HW_CACHE_BPU) { 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 | 131 +++++++++++++++++++++- 1 file changed, 130 insertions(+), 1 deletion(-) diff --git a/tools/perf/util/perf_event_attr_fprintf.c b/tools/perf/util/perf_event_attr_fprintf.c index d9d70126d505..e2ce4a737ef7 100644 --- a/tools/perf/util/perf_event_attr_fprintf.c +++ b/tools/perf/util/perf_event_attr_fprintf.c @@ -7,6 +7,11 @@ #include #include "util/evsel_fprintf.h" +#ifdef HAVE_LIBTRACEEVENT +#include +#include "trace-event.h" +#endif + struct bit_names { int bit; const char *name; @@ -92,6 +97,129 @@ static void __p_type_id(char *buf, size_t size, u64 value) } } +static void __p_config_hw_cache_id(char *buf, size_t size, u64 value) +{ + const char *hw_cache_str, *hw_cache_op_str, *hw_cache_op_result_str; + +#define ENUM_PERF_HW_CACHE_ID_CASE(x, s) case x: s = (#x); break; +#define ENUM_PERF_HW_CACHE_ID_CASE_DEFAULT(s) default: s = NULL; break; + + /* sync with enum perf_hw_cache_id in perf_event.h */ + switch (value & 0xff) { + ENUM_PERF_HW_CACHE_ID_CASE(PERF_COUNT_HW_CACHE_L1D, hw_cache_str) + ENUM_PERF_HW_CACHE_ID_CASE(PERF_COUNT_HW_CACHE_L1I, hw_cache_str) + ENUM_PERF_HW_CACHE_ID_CASE(PERF_COUNT_HW_CACHE_LL, hw_cache_str) + ENUM_PERF_HW_CACHE_ID_CASE(PERF_COUNT_HW_CACHE_DTLB, hw_cache_str) + ENUM_PERF_HW_CACHE_ID_CASE(PERF_COUNT_HW_CACHE_ITLB, hw_cache_str) + ENUM_PERF_HW_CACHE_ID_CASE(PERF_COUNT_HW_CACHE_BPU, hw_cache_str) + ENUM_PERF_HW_CACHE_ID_CASE(PERF_COUNT_HW_CACHE_NODE, hw_cache_str) + ENUM_PERF_HW_CACHE_ID_CASE_DEFAULT(hw_cache_str) + } + + /* sync with enum perf_hw_cache_op_id in perf_event.h */ + switch ((value & 0xff00) >> 8) { + ENUM_PERF_HW_CACHE_ID_CASE(PERF_COUNT_HW_CACHE_OP_READ, hw_cache_op_str) + ENUM_PERF_HW_CACHE_ID_CASE(PERF_COUNT_HW_CACHE_OP_WRITE, hw_cache_op_str) + ENUM_PERF_HW_CACHE_ID_CASE(PERF_COUNT_HW_CACHE_OP_PREFETCH, hw_cache_op_str) + ENUM_PERF_HW_CACHE_ID_CASE_DEFAULT(hw_cache_op_str) + } + + /* sync with enum perf_hw_cache_op_result_id in perf_event.h */ + switch ((value & 0xff0000) >> 16) { + ENUM_PERF_HW_CACHE_ID_CASE(PERF_COUNT_HW_CACHE_RESULT_ACCESS, hw_cache_op_result_str) + ENUM_PERF_HW_CACHE_ID_CASE(PERF_COUNT_HW_CACHE_RESULT_MISS, hw_cache_op_result_str) + ENUM_PERF_HW_CACHE_ID_CASE_DEFAULT(hw_cache_op_result_str) + } + +#undef ENUM_PERF_HW_CACHE_ID_CASE +#undef ENUM_PERF_HW_CACHE_ID_CASE_DEFULT + + if (hw_cache_str == NULL || hw_cache_op_str == NULL || + hw_cache_op_result_str == NULL) { + snprintf(buf, size, "%#"PRIx64, value); + } else { + snprintf(buf, size, "%#"PRIx64" (%s | %s | %s)", value, + hw_cache_op_result_str, hw_cache_op_str, hw_cache_str); + } +} + +#ifdef HAVE_LIBTRACEEVENT +static void __p_config_tracepoint_id(char *buf, size_t size, u64 value) +{ + char *name = tracepoint_id_to_name(value); + + if (name != NULL) { + snprintf(buf, size, "%#"PRIx64" (%s)", value, name); + free(name); + } else { + snprintf(buf, size, "%#"PRIx64, value); + } +} +#endif + +static void __p_config_id(char *buf, size_t size, u32 type, u64 value) +{ +#define PRINT_ENUM_PERF_CONFIG_ID_CASE(x) \ + case x: \ + snprintf(buf, size, "%#"PRIx64" (%s)", value, #x); \ + return; + +#define PRINT_ENUM_PERF_CONFIG_ID_DEFAULT_CASE \ + default: \ + snprintf(buf, size, "%#"PRIx64, value); \ + return; + + switch (type) { + case PERF_TYPE_HARDWARE: + /* sync with enum perf_hw_cache_id in perf_event.h */ + switch (value & PERF_HW_EVENT_MASK) { + PRINT_ENUM_PERF_CONFIG_ID_CASE(PERF_COUNT_HW_CPU_CYCLES) + PRINT_ENUM_PERF_CONFIG_ID_CASE(PERF_COUNT_HW_INSTRUCTIONS) + PRINT_ENUM_PERF_CONFIG_ID_CASE(PERF_COUNT_HW_CACHE_REFERENCES) + PRINT_ENUM_PERF_CONFIG_ID_CASE(PERF_COUNT_HW_CACHE_MISSES) + PRINT_ENUM_PERF_CONFIG_ID_CASE(PERF_COUNT_HW_BRANCH_INSTRUCTIONS) + PRINT_ENUM_PERF_CONFIG_ID_CASE(PERF_COUNT_HW_BRANCH_MISSES) + PRINT_ENUM_PERF_CONFIG_ID_CASE(PERF_COUNT_HW_BUS_CYCLES) + PRINT_ENUM_PERF_CONFIG_ID_CASE(PERF_COUNT_HW_STALLED_CYCLES_FRONTEND) + PRINT_ENUM_PERF_CONFIG_ID_CASE(PERF_COUNT_HW_STALLED_CYCLES_BACKEND) + PRINT_ENUM_PERF_CONFIG_ID_CASE(PERF_COUNT_HW_REF_CPU_CYCLES) + PRINT_ENUM_PERF_CONFIG_ID_DEFAULT_CASE + } + + case PERF_TYPE_SOFTWARE: + /* sync with enum perf_sw_ids in perf_event.h */ + switch (value) { + PRINT_ENUM_PERF_CONFIG_ID_CASE(PERF_COUNT_SW_CPU_CLOCK) + PRINT_ENUM_PERF_CONFIG_ID_CASE(PERF_COUNT_SW_TASK_CLOCK) + PRINT_ENUM_PERF_CONFIG_ID_CASE(PERF_COUNT_SW_PAGE_FAULTS) + PRINT_ENUM_PERF_CONFIG_ID_CASE(PERF_COUNT_SW_CONTEXT_SWITCHES) + PRINT_ENUM_PERF_CONFIG_ID_CASE(PERF_COUNT_SW_CPU_MIGRATIONS) + PRINT_ENUM_PERF_CONFIG_ID_CASE(PERF_COUNT_SW_PAGE_FAULTS_MIN) + PRINT_ENUM_PERF_CONFIG_ID_CASE(PERF_COUNT_SW_PAGE_FAULTS_MAJ) + PRINT_ENUM_PERF_CONFIG_ID_CASE(PERF_COUNT_SW_ALIGNMENT_FAULTS) + PRINT_ENUM_PERF_CONFIG_ID_CASE(PERF_COUNT_SW_EMULATION_FAULTS) + PRINT_ENUM_PERF_CONFIG_ID_CASE(PERF_COUNT_SW_DUMMY) + PRINT_ENUM_PERF_CONFIG_ID_CASE(PERF_COUNT_SW_BPF_OUTPUT) + PRINT_ENUM_PERF_CONFIG_ID_CASE(PERF_COUNT_SW_CGROUP_SWITCHES) + PRINT_ENUM_PERF_CONFIG_ID_DEFAULT_CASE + } +#undef PRINT_ENUM_PERF_CONFIG_ID_CASE + + case PERF_TYPE_HW_CACHE: + return __p_config_hw_cache_id(buf, size, value); + + case PERF_TYPE_TRACEPOINT: +#ifdef HAVE_LIBTRACEEVENT + return __p_config_tracepoint_id(buf, size, value); +#endif + case PERF_TYPE_RAW: + case PERF_TYPE_BREAKPOINT: + PRINT_ENUM_PERF_CONFIG_ID_DEFAULT_CASE + } + +#undef PRINT_ENUM_PERF_CONFIG_ID_DEFAULT_CASE +} + #define BUF_SIZE 1024 #define p_hex(val) snprintf(buf, BUF_SIZE, "%#"PRIx64, (uint64_t)(val)) @@ -101,6 +229,7 @@ static void __p_type_id(char *buf, size_t size, u64 value) #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 p_config_id(val) __p_config_id(buf, BUF_SIZE, attr->type, val) #define PRINT_ATTRn(_n, _f, _p, _a) \ do { \ @@ -120,7 +249,7 @@ int perf_event_attr__fprintf(FILE *fp, struct perf_event_attr *attr, PRINT_ATTRn("type", type, p_type_id, true); PRINT_ATTRf(size, p_unsigned); - PRINT_ATTRf(config, p_hex); + PRINT_ATTRn("config", config, p_config_id, true); PRINT_ATTRn("{ sample_period, sample_freq }", sample_period, p_unsigned, false); PRINT_ATTRf(sample_type, p_sample_type); PRINT_ATTRf(read_format, p_read_format);