From: Andi Kleen <andi@firstfloor.org>
To: acme@kernel.org
Cc: jolsa@kernel.org, linux-kernel@vger.kernel.org,
Andi Kleen <ak@linux.intel.com>
Subject: [PATCH v2 05/10] tools, perf, script: Set user_set/wildcard_set for +- fields in -F
Date: Fri, 31 Aug 2018 15:02:01 -0700 [thread overview]
Message-ID: <20180831220206.28351-6-andi@firstfloor.org> (raw)
In-Reply-To: <20180831220206.28351-1-andi@firstfloor.org>
From: Andi Kleen <ak@linux.intel.com>
The branch target output relies on the user_set flag to determine
if the branch target should be implicitely printed. When
modifying the fields with + or - also set user_set,
so that ADDR can be removed. We also need to set wildcard_set
to make the initial sanity check pass.
Before:
% perf script --itrace=cr -F +callindent,-ip,-sym,-symoff,-addr
swapper 0 [000] 3377.917072: 1 branches: pt_config => ffffffff81010486 ([kernel.kallsyms])
swapper 0 [000] 3377.917072: 1 branches: pt_config => ffffffff8101063e ([kernel.kallsyms])
swapper 0 [000] 3377.917072: 1 branches: pt_event_add => ffffffff8115e687 ([kernel.kallsyms])
swapper 0 [000] 3377.917072: 1 branches: perf_pmu_enable => ffffffff811579b0 ([kernel.kallsyms])
swapper 0 [000] 3377.917072: 1 branches: perf_pmu_nop_void => ffffffff8115e72b ([kernel.kallsyms])
swapper 0 [000] 3377.917072: 1 branches: event_sched_in.isra.107 => ffffffff8115e7a5 ([kernel.kallsyms])
swapper 0 [000] 3377.917072: 1 branches: __x86_indirect_thunk_rax => ffffffff81a03000 ([kernel.kallsyms])
swapper 0 [000] 3377.917072: 1 branches: perf_pmu_nop_int => ffffffff8115e7fb ([kernel.kallsyms])
swapper 0 [000] 3377.917072: 1 branches: group_sched_in => ffffffff811583a8 ([kernel.kallsyms])
swapper 0 [000] 3377.917072: 1 branches: event_filter_match => ffffffff81153e10 ([kernel.kallsyms])
swapper 0 [000] 3377.917072: 1 branches: event_filter_match => ffffffff811583d4 ([kernel.kallsyms])
swapper 0 [000] 3377.917072: 1 branches: group_sched_in => ffffffff8115e738 ([kernel.kallsyms])
swapper 0 [000] 3377.917072: 1 branches: __x86_indirect_thunk_rax => ffffffff81a03000 ([kernel.kallsyms])
After:
% perf script --itrace=cr -F +callindent,-ip,-sym,-symoff,-addr
swapper 0 [000] 3377.917072: 1 branches: pt_config
swapper 0 [000] 3377.917072: 1 branches: pt_config
swapper 0 [000] 3377.917072: 1 branches: pt_event_add
swapper 0 [000] 3377.917072: 1 branches: perf_pmu_enable
swapper 0 [000] 3377.917072: 1 branches: perf_pmu_nop_void
swapper 0 [000] 3377.917072: 1 branches: event_sched_in.isra.107
swapper 0 [000] 3377.917072: 1 branches: __x86_indirect_thunk_rax
swapper 0 [000] 3377.917072: 1 branches: perf_pmu_nop_int
swapper 0 [000] 3377.917072: 1 branches: group_sched_in
swapper 0 [000] 3377.917072: 1 branches: event_filter_match
swapper 0 [000] 3377.917072: 1 branches: event_filter_match
swapper 0 [000] 3377.917072: 1 branches: group_sched_in
v2: Use correct index for fallback case
Signed-off-by: Andi Kleen <ak@linux.intel.com>
---
tools/perf/builtin-script.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/tools/perf/builtin-script.c b/tools/perf/builtin-script.c
index bae960c56763..d7d454d10074 100644
--- a/tools/perf/builtin-script.c
+++ b/tools/perf/builtin-script.c
@@ -2490,6 +2490,8 @@ static int parse_output_fields(const struct option *opt __maybe_unused,
output[j].fields &= ~all_output_options[i].field;
else
output[j].fields |= all_output_options[i].field;
+ output[j].user_set = true;
+ output[j].wildcard_set = true;
}
}
} else {
@@ -2500,7 +2502,8 @@ static int parse_output_fields(const struct option *opt __maybe_unused,
rc = -EINVAL;
goto out;
}
- output[type].fields |= all_output_options[i].field;
+ output[type].user_set = true;
+ output[type].wildcard_set = true;
}
}
--
2.17.1
next prev parent reply other threads:[~2018-08-31 22:02 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-08-31 22:01 Make perf script easier to use for itrace Andi Kleen
2018-08-31 22:01 ` [PATCH v2 01/10] perf tools: Report itrace options in help Andi Kleen
2018-08-31 22:01 ` [PATCH v2 02/10] tools, pager: Support overwriting the pager Andi Kleen
2018-08-31 22:01 ` [PATCH v2 03/10] tools, perf, script: Add --insn-trace for instruction decoding Andi Kleen
2018-08-31 22:02 ` [PATCH v2 04/10] perf, tools, script: Allow sym and dso without ip, addr Andi Kleen
2018-09-03 7:15 ` Jiri Olsa
2018-09-03 16:12 ` Andi Kleen
2018-08-31 22:02 ` Andi Kleen [this message]
2018-08-31 22:02 ` [PATCH v2 06/10] perf, tools, script: Implement - for typed fields Andi Kleen
2018-09-03 7:17 ` Jiri Olsa
2018-08-31 22:02 ` [PATCH v2 07/10] perf, tools, script: Print DSO for callindent Andi Kleen
2018-08-31 22:02 ` [PATCH v2 08/10] perf, tools, script: Make itrace script default to all calls Andi Kleen
2018-08-31 22:02 ` [PATCH v2 09/10] tools, perf, script: Add --call-trace and --call-ret-trace Andi Kleen
2018-08-31 22:02 ` [PATCH v2 10/10] tools, perf, script: Implement --graph-function Andi Kleen
2018-09-03 7:51 ` Jiri Olsa
2018-09-03 15:44 ` Andi Kleen
2018-08-31 22:54 ` Make perf script easier to use for itrace Kim Phillips
2018-09-03 7:31 ` Jiri Olsa
2018-09-03 15:50 ` Andi Kleen
2018-09-03 7:52 ` Jiri Olsa
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180831220206.28351-6-andi@firstfloor.org \
--to=andi@firstfloor.org \
--cc=acme@kernel.org \
--cc=ak@linux.intel.com \
--cc=jolsa@kernel.org \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).