Commit 0a7c700d authored by Adrian Hunter's avatar Adrian Hunter Committed by Arnaldo Carvalho de Melo

perf intel-pt: Add decoder support for CBR events

Add decoder support for informing the tools of changes to the core-to-bus
ratio (CBR).
Signed-off-by: default avatarAdrian Hunter <adrian.hunter@intel.com>
Cc: Andi Kleen <ak@linux.intel.com>
Link: http://lkml.kernel.org/r/1495786658-18063-16-git-send-email-adrian.hunter@intel.comSigned-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 26fb2fb1
...@@ -141,6 +141,7 @@ struct intel_pt_decoder { ...@@ -141,6 +141,7 @@ struct intel_pt_decoder {
int pkt_len; int pkt_len;
int last_packet_type; int last_packet_type;
unsigned int cbr; unsigned int cbr;
unsigned int cbr_seen;
unsigned int max_non_turbo_ratio; unsigned int max_non_turbo_ratio;
double max_non_turbo_ratio_fp; double max_non_turbo_ratio_fp;
double cbr_cyc_to_tsc; double cbr_cyc_to_tsc;
...@@ -167,6 +168,7 @@ struct intel_pt_decoder { ...@@ -167,6 +168,7 @@ struct intel_pt_decoder {
uint64_t fup_ptw_payload; uint64_t fup_ptw_payload;
uint64_t fup_mwait_payload; uint64_t fup_mwait_payload;
uint64_t fup_pwre_payload; uint64_t fup_pwre_payload;
uint64_t cbr_payload;
uint64_t timestamp_insn_cnt; uint64_t timestamp_insn_cnt;
uint64_t sample_insn_cnt; uint64_t sample_insn_cnt;
uint64_t stuck_ip; uint64_t stuck_ip;
...@@ -1446,6 +1448,8 @@ static void intel_pt_calc_cbr(struct intel_pt_decoder *decoder) ...@@ -1446,6 +1448,8 @@ static void intel_pt_calc_cbr(struct intel_pt_decoder *decoder)
{ {
unsigned int cbr = decoder->packet.payload & 0xff; unsigned int cbr = decoder->packet.payload & 0xff;
decoder->cbr_payload = decoder->packet.payload;
if (decoder->cbr == cbr) if (decoder->cbr == cbr)
return; return;
...@@ -1806,6 +1810,16 @@ static int intel_pt_walk_trace(struct intel_pt_decoder *decoder) ...@@ -1806,6 +1810,16 @@ static int intel_pt_walk_trace(struct intel_pt_decoder *decoder)
case INTEL_PT_CBR: case INTEL_PT_CBR:
intel_pt_calc_cbr(decoder); intel_pt_calc_cbr(decoder);
if (!decoder->branch_enable &&
decoder->cbr != decoder->cbr_seen) {
decoder->cbr_seen = decoder->cbr;
decoder->state.type = INTEL_PT_CBR_CHG;
decoder->state.from_ip = decoder->ip;
decoder->state.to_ip = 0;
decoder->state.cbr_payload =
decoder->packet.payload;
return 0;
}
break; break;
case INTEL_PT_MODE_EXEC: case INTEL_PT_MODE_EXEC:
...@@ -2343,6 +2357,11 @@ const struct intel_pt_state *intel_pt_decode(struct intel_pt_decoder *decoder) ...@@ -2343,6 +2357,11 @@ const struct intel_pt_state *intel_pt_decode(struct intel_pt_decoder *decoder)
decoder->sample_insn_cnt = decoder->timestamp_insn_cnt; decoder->sample_insn_cnt = decoder->timestamp_insn_cnt;
} else { } else {
decoder->state.err = 0; decoder->state.err = 0;
if (decoder->cbr != decoder->cbr_seen && decoder->state.type) {
decoder->cbr_seen = decoder->cbr;
decoder->state.type |= INTEL_PT_CBR_CHG;
decoder->state.cbr_payload = decoder->cbr_payload;
}
if (intel_pt_sample_time(decoder->pkt_state)) { if (intel_pt_sample_time(decoder->pkt_state)) {
decoder->sample_timestamp = decoder->timestamp; decoder->sample_timestamp = decoder->timestamp;
decoder->sample_insn_cnt = decoder->timestamp_insn_cnt; decoder->sample_insn_cnt = decoder->timestamp_insn_cnt;
......
...@@ -36,6 +36,7 @@ enum intel_pt_sample_type { ...@@ -36,6 +36,7 @@ enum intel_pt_sample_type {
INTEL_PT_PWR_ENTRY = 1 << 5, INTEL_PT_PWR_ENTRY = 1 << 5,
INTEL_PT_EX_STOP = 1 << 6, INTEL_PT_EX_STOP = 1 << 6,
INTEL_PT_PWR_EXIT = 1 << 7, INTEL_PT_PWR_EXIT = 1 << 7,
INTEL_PT_CBR_CHG = 1 << 8,
}; };
enum intel_pt_period_type { enum intel_pt_period_type {
...@@ -73,6 +74,7 @@ struct intel_pt_state { ...@@ -73,6 +74,7 @@ struct intel_pt_state {
uint64_t mwait_payload; uint64_t mwait_payload;
uint64_t pwre_payload; uint64_t pwre_payload;
uint64_t pwrx_payload; uint64_t pwrx_payload;
uint64_t cbr_payload;
uint32_t flags; uint32_t flags;
enum intel_pt_insn_op insn_op; enum intel_pt_insn_op insn_op;
int insn_len; int insn_len;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment