leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

perf cs-etm: No-op refactor of synth opt usage

Browse Source 
sample_branches and sample_instructions are already saved in the
synth_opts struct. Other usages like synth_opts.last_branch don't save a
value, so make this more consistent by always going through synth_opts
and not saving duplicate values.

Reviewed-by: Leo Yan <leo.yan@linaro.org>
Signed-off-by: James Clark <james.clark@arm.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: John Garry <john.garry@huawei.com>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Mathieu Poirier <mathieu.poirier@linaro.org>
Cc: Mike Leach <mike.leach@linaro.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Will Deacon <will@kernel.org>
Cc: coresight@lists.linaro.org
Cc: linux-arm-kernel@lists.infradead.org
Link: https://lore.kernel.org/r/20220210200620.1227232-1-james.clark@arm.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
James Clark
2022-02-10 20:06:19 +00:00
committed by Arnaldo Carvalho de Melo
parent 096972f558
commit 0b31ea6613
1 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
tools/perf/util/cs-etm.c
View File

@@ -50,8 +50,6 @@ struct cs_etm_auxtrace {
u8 timeless_decoding; u8 timeless_decoding;
u8 snapshot_mode; u8 snapshot_mode;
u8 data_queued; u8 data_queued;
u8 sample_branches;
u8 sample_instructions;
int num_cpu; int num_cpu;
u64 latest_kernel_timestamp; u64 latest_kernel_timestamp;
@@ -410,8 +408,8 @@ static void cs_etm__packet_swap(struct cs_etm_auxtrace *etm,
{ {
struct cs_etm_packet *tmp; struct cs_etm_packet *tmp;
if (etm->sample_branches || etm->synth_opts.last_branch || if (etm->synth_opts.branches || etm->synth_opts.last_branch ||
etm->sample_instructions) { etm->synth_opts.instructions) {
/* /*
* Swap PACKET with PREV_PACKET: PACKET becomes PREV_PACKET for * Swap PACKET with PREV_PACKET: PACKET becomes PREV_PACKET for
* the next incoming packet. * the next incoming packet.
@@ -1365,7 +1363,6 @@ static int cs_etm__synth_events(struct cs_etm_auxtrace *etm,
err = cs_etm__synth_event(session, &attr, id); err = cs_etm__synth_event(session, &attr, id);
if (err) if (err)
return err; return err;
etm->sample_branches = true;
etm->branches_sample_type = attr.sample_type; etm->branches_sample_type = attr.sample_type;
etm->branches_id = id; etm->branches_id = id;
id += 1; id += 1;
@@ -1389,7 +1386,6 @@ static int cs_etm__synth_events(struct cs_etm_auxtrace *etm,
err = cs_etm__synth_event(session, &attr, id); err = cs_etm__synth_event(session, &attr, id);
if (err) if (err)
return err; return err;
etm->sample_instructions = true;
etm->instructions_sample_type = attr.sample_type; etm->instructions_sample_type = attr.sample_type;
etm->instructions_id = id; etm->instructions_id = id;
id += 1; id += 1;
@@ -1420,7 +1416,7 @@ static int cs_etm__sample(struct cs_etm_queue *etmq,
tidq->prev_packet->last_instr_taken_branch) tidq->prev_packet->last_instr_taken_branch)
cs_etm__update_last_branch_rb(etmq, tidq); cs_etm__update_last_branch_rb(etmq, tidq);
if (etm->sample_instructions && if (etm->synth_opts.instructions &&
tidq->period_instructions >= etm->instructions_sample_period) { tidq->period_instructions >= etm->instructions_sample_period) {
/* /*
* Emit instruction sample periodically * Emit instruction sample periodically
@@ -1503,7 +1499,7 @@ static int cs_etm__sample(struct cs_etm_queue *etmq,
} }
} }
if (etm->sample_branches) { if (etm->synth_opts.branches) {
bool generate_sample = false; bool generate_sample = false;
/* Generate sample for tracing on packet */ /* Generate sample for tracing on packet */
@@ -1582,7 +1578,7 @@ static int cs_etm__flush(struct cs_etm_queue *etmq,
} }
if (etm->sample_branches && if (etm->synth_opts.branches &&
tidq->prev_packet->sample_type == CS_ETM_RANGE) { tidq->prev_packet->sample_type == CS_ETM_RANGE) {
err = cs_etm__synth_branch_sample(etmq, tidq); err = cs_etm__synth_branch_sample(etmq, tidq);
if (err) if (err)