Commit fb4605ba authored by Andi Kleen's avatar Andi Kleen Committed by Arnaldo Carvalho de Melo

perf stat: Check for frontend stalled for metrics

Add an extra check for frontend stalled in the metrics.  This avoids an
extra column for the --metric-only case when the CPU does not support
frontend stalled.

v2: Add separate init function
Signed-off-by: default avatarAndi Kleen <ak@linux.intel.com>
Acked-by: default avatarJiri Olsa <jolsa@kernel.org>
Link: http://lkml.kernel.org/r/1456858672-21594-8-git-send-email-andi@firstfloor.orgSigned-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 1b69317d
...@@ -1966,6 +1966,7 @@ int cmd_stat(int argc, const char **argv, const char *prefix __maybe_unused) ...@@ -1966,6 +1966,7 @@ int cmd_stat(int argc, const char **argv, const char *prefix __maybe_unused)
argc = parse_options_subcommand(argc, argv, stat_options, stat_subcommands, argc = parse_options_subcommand(argc, argv, stat_options, stat_subcommands,
(const char **) stat_usage, (const char **) stat_usage,
PARSE_OPT_STOP_AT_NON_OPTION); PARSE_OPT_STOP_AT_NON_OPTION);
perf_stat__init_shadow_stats();
if (csv_sep) { if (csv_sep) {
csv_output = true; csv_output = true;
......
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
#include "evsel.h" #include "evsel.h"
#include "stat.h" #include "stat.h"
#include "color.h" #include "color.h"
#include "pmu.h"
enum { enum {
CTX_BIT_USER = 1 << 0, CTX_BIT_USER = 1 << 0,
...@@ -35,9 +36,15 @@ static struct stats runtime_dtlb_cache_stats[NUM_CTX][MAX_NR_CPUS]; ...@@ -35,9 +36,15 @@ static struct stats runtime_dtlb_cache_stats[NUM_CTX][MAX_NR_CPUS];
static struct stats runtime_cycles_in_tx_stats[NUM_CTX][MAX_NR_CPUS]; static struct stats runtime_cycles_in_tx_stats[NUM_CTX][MAX_NR_CPUS];
static struct stats runtime_transaction_stats[NUM_CTX][MAX_NR_CPUS]; static struct stats runtime_transaction_stats[NUM_CTX][MAX_NR_CPUS];
static struct stats runtime_elision_stats[NUM_CTX][MAX_NR_CPUS]; static struct stats runtime_elision_stats[NUM_CTX][MAX_NR_CPUS];
static bool have_frontend_stalled;
struct stats walltime_nsecs_stats; struct stats walltime_nsecs_stats;
void perf_stat__init_shadow_stats(void)
{
have_frontend_stalled = pmu_have_event("cpu", "stalled-cycles-frontend");
}
static int evsel_context(struct perf_evsel *evsel) static int evsel_context(struct perf_evsel *evsel)
{ {
int ctx = 0; int ctx = 0;
...@@ -323,7 +330,7 @@ void perf_stat__print_shadow_stats(struct perf_evsel *evsel, ...@@ -323,7 +330,7 @@ void perf_stat__print_shadow_stats(struct perf_evsel *evsel,
print_metric(ctxp, NULL, "%7.2f ", print_metric(ctxp, NULL, "%7.2f ",
"stalled cycles per insn", "stalled cycles per insn",
ratio); ratio);
} else { } else if (have_frontend_stalled) {
print_metric(ctxp, NULL, NULL, print_metric(ctxp, NULL, NULL,
"stalled cycles per insn", 0); "stalled cycles per insn", 0);
} }
......
...@@ -72,6 +72,7 @@ typedef void (*print_metric_t)(void *ctx, const char *color, const char *unit, ...@@ -72,6 +72,7 @@ typedef void (*print_metric_t)(void *ctx, const char *color, const char *unit,
const char *fmt, double val); const char *fmt, double val);
typedef void (*new_line_t )(void *ctx); typedef void (*new_line_t )(void *ctx);
void perf_stat__init_shadow_stats(void);
void perf_stat__reset_shadow_stats(void); void perf_stat__reset_shadow_stats(void);
void perf_stat__update_shadow_stats(struct perf_evsel *counter, u64 *count, void perf_stat__update_shadow_stats(struct perf_evsel *counter, u64 *count,
int cpu); int cpu);
......
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