forked from Minki/linux
02d8dabc50
Per-pkg events need to be captured once per processor socket. The code in check_per_pkg() ensures only one value per processor package is used. However there is a problem with this function in case the first CPU of the package does not measure anything for the per-pkg event, but other CPUs do. Consider the following: $ create cgroup FOO; echo $$ >FOO/tasks; taskset -c 1 noploop & $ perf stat -a -I 1000 -e intel_cqm/llc_occupancy/ -G FOO sleep 100 1.00000 <not counted> Bytes intel_cqm/llc_occupancy/ FOO The reason for this is that CPU0 in the cgroup has nothing running on it. Yet check_per_plg() will mark socket0 as processed and no other event value will be considered for the socket. This patch fixes the problem by having check_per_pkg() only consider events which actually ran. Signed-off-by: Stephane Eranian <eranian@google.com> Cc: Adrian Hunter <adrian.hunter@intel.com> Cc: Andi Kleen <ak@linux.intel.com> Cc: David Ahern <dsahern@gmail.com> Cc: Jiri Olsa <jolsa@redhat.com> Cc: Kan Liang <kan.liang@intel.com> Cc: Namhyung Kim <namhyung@kernel.org> Cc: Peter Zijlstra <peterz@infradead.org> Link: http://lkml.kernel.org/r/1441286620-10117-1-git-send-email-eranian@google.com Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
343 lines
7.3 KiB
C
343 lines
7.3 KiB
C
#include <math.h>
|
|
#include "stat.h"
|
|
#include "evlist.h"
|
|
#include "evsel.h"
|
|
#include "thread_map.h"
|
|
|
|
void update_stats(struct stats *stats, u64 val)
|
|
{
|
|
double delta;
|
|
|
|
stats->n++;
|
|
delta = val - stats->mean;
|
|
stats->mean += delta / stats->n;
|
|
stats->M2 += delta*(val - stats->mean);
|
|
|
|
if (val > stats->max)
|
|
stats->max = val;
|
|
|
|
if (val < stats->min)
|
|
stats->min = val;
|
|
}
|
|
|
|
double avg_stats(struct stats *stats)
|
|
{
|
|
return stats->mean;
|
|
}
|
|
|
|
/*
|
|
* http://en.wikipedia.org/wiki/Algorithms_for_calculating_variance
|
|
*
|
|
* (\Sum n_i^2) - ((\Sum n_i)^2)/n
|
|
* s^2 = -------------------------------
|
|
* n - 1
|
|
*
|
|
* http://en.wikipedia.org/wiki/Stddev
|
|
*
|
|
* The std dev of the mean is related to the std dev by:
|
|
*
|
|
* s
|
|
* s_mean = -------
|
|
* sqrt(n)
|
|
*
|
|
*/
|
|
double stddev_stats(struct stats *stats)
|
|
{
|
|
double variance, variance_mean;
|
|
|
|
if (stats->n < 2)
|
|
return 0.0;
|
|
|
|
variance = stats->M2 / (stats->n - 1);
|
|
variance_mean = variance / stats->n;
|
|
|
|
return sqrt(variance_mean);
|
|
}
|
|
|
|
double rel_stddev_stats(double stddev, double avg)
|
|
{
|
|
double pct = 0.0;
|
|
|
|
if (avg)
|
|
pct = 100.0 * stddev/avg;
|
|
|
|
return pct;
|
|
}
|
|
|
|
bool __perf_evsel_stat__is(struct perf_evsel *evsel,
|
|
enum perf_stat_evsel_id id)
|
|
{
|
|
struct perf_stat *ps = evsel->priv;
|
|
|
|
return ps->id == id;
|
|
}
|
|
|
|
#define ID(id, name) [PERF_STAT_EVSEL_ID__##id] = #name
|
|
static const char *id_str[PERF_STAT_EVSEL_ID__MAX] = {
|
|
ID(NONE, x),
|
|
ID(CYCLES_IN_TX, cpu/cycles-t/),
|
|
ID(TRANSACTION_START, cpu/tx-start/),
|
|
ID(ELISION_START, cpu/el-start/),
|
|
ID(CYCLES_IN_TX_CP, cpu/cycles-ct/),
|
|
};
|
|
#undef ID
|
|
|
|
void perf_stat_evsel_id_init(struct perf_evsel *evsel)
|
|
{
|
|
struct perf_stat *ps = evsel->priv;
|
|
int i;
|
|
|
|
/* ps->id is 0 hence PERF_STAT_EVSEL_ID__NONE by default */
|
|
|
|
for (i = 0; i < PERF_STAT_EVSEL_ID__MAX; i++) {
|
|
if (!strcmp(perf_evsel__name(evsel), id_str[i])) {
|
|
ps->id = i;
|
|
break;
|
|
}
|
|
}
|
|
}
|
|
|
|
void perf_evsel__reset_stat_priv(struct perf_evsel *evsel)
|
|
{
|
|
int i;
|
|
struct perf_stat *ps = evsel->priv;
|
|
|
|
for (i = 0; i < 3; i++)
|
|
init_stats(&ps->res_stats[i]);
|
|
|
|
perf_stat_evsel_id_init(evsel);
|
|
}
|
|
|
|
int perf_evsel__alloc_stat_priv(struct perf_evsel *evsel)
|
|
{
|
|
evsel->priv = zalloc(sizeof(struct perf_stat));
|
|
if (evsel->priv == NULL)
|
|
return -ENOMEM;
|
|
perf_evsel__reset_stat_priv(evsel);
|
|
return 0;
|
|
}
|
|
|
|
void perf_evsel__free_stat_priv(struct perf_evsel *evsel)
|
|
{
|
|
zfree(&evsel->priv);
|
|
}
|
|
|
|
int perf_evsel__alloc_prev_raw_counts(struct perf_evsel *evsel,
|
|
int ncpus, int nthreads)
|
|
{
|
|
struct perf_counts *counts;
|
|
|
|
counts = perf_counts__new(ncpus, nthreads);
|
|
if (counts)
|
|
evsel->prev_raw_counts = counts;
|
|
|
|
return counts ? 0 : -ENOMEM;
|
|
}
|
|
|
|
void perf_evsel__free_prev_raw_counts(struct perf_evsel *evsel)
|
|
{
|
|
perf_counts__delete(evsel->prev_raw_counts);
|
|
evsel->prev_raw_counts = NULL;
|
|
}
|
|
|
|
int perf_evsel__alloc_stats(struct perf_evsel *evsel, bool alloc_raw)
|
|
{
|
|
int ncpus = perf_evsel__nr_cpus(evsel);
|
|
int nthreads = thread_map__nr(evsel->threads);
|
|
|
|
if (perf_evsel__alloc_stat_priv(evsel) < 0 ||
|
|
perf_evsel__alloc_counts(evsel, ncpus, nthreads) < 0 ||
|
|
(alloc_raw && perf_evsel__alloc_prev_raw_counts(evsel, ncpus, nthreads) < 0))
|
|
return -ENOMEM;
|
|
|
|
return 0;
|
|
}
|
|
|
|
int perf_evlist__alloc_stats(struct perf_evlist *evlist, bool alloc_raw)
|
|
{
|
|
struct perf_evsel *evsel;
|
|
|
|
evlist__for_each(evlist, evsel) {
|
|
if (perf_evsel__alloc_stats(evsel, alloc_raw))
|
|
goto out_free;
|
|
}
|
|
|
|
return 0;
|
|
|
|
out_free:
|
|
perf_evlist__free_stats(evlist);
|
|
return -1;
|
|
}
|
|
|
|
void perf_evlist__free_stats(struct perf_evlist *evlist)
|
|
{
|
|
struct perf_evsel *evsel;
|
|
|
|
evlist__for_each(evlist, evsel) {
|
|
perf_evsel__free_stat_priv(evsel);
|
|
perf_evsel__free_counts(evsel);
|
|
perf_evsel__free_prev_raw_counts(evsel);
|
|
}
|
|
}
|
|
|
|
void perf_evlist__reset_stats(struct perf_evlist *evlist)
|
|
{
|
|
struct perf_evsel *evsel;
|
|
|
|
evlist__for_each(evlist, evsel) {
|
|
perf_evsel__reset_stat_priv(evsel);
|
|
perf_evsel__reset_counts(evsel);
|
|
}
|
|
}
|
|
|
|
static void zero_per_pkg(struct perf_evsel *counter)
|
|
{
|
|
if (counter->per_pkg_mask)
|
|
memset(counter->per_pkg_mask, 0, MAX_NR_CPUS);
|
|
}
|
|
|
|
static int check_per_pkg(struct perf_evsel *counter,
|
|
struct perf_counts_values *vals, int cpu, bool *skip)
|
|
{
|
|
unsigned long *mask = counter->per_pkg_mask;
|
|
struct cpu_map *cpus = perf_evsel__cpus(counter);
|
|
int s;
|
|
|
|
*skip = false;
|
|
|
|
if (!counter->per_pkg)
|
|
return 0;
|
|
|
|
if (cpu_map__empty(cpus))
|
|
return 0;
|
|
|
|
if (!mask) {
|
|
mask = zalloc(MAX_NR_CPUS);
|
|
if (!mask)
|
|
return -ENOMEM;
|
|
|
|
counter->per_pkg_mask = mask;
|
|
}
|
|
|
|
/*
|
|
* we do not consider an event that has not run as a good
|
|
* instance to mark a package as used (skip=1). Otherwise
|
|
* we may run into a situation where the first CPU in a package
|
|
* is not running anything, yet the second is, and this function
|
|
* would mark the package as used after the first CPU and would
|
|
* not read the values from the second CPU.
|
|
*/
|
|
if (!(vals->run && vals->ena))
|
|
return 0;
|
|
|
|
s = cpu_map__get_socket(cpus, cpu);
|
|
if (s < 0)
|
|
return -1;
|
|
|
|
*skip = test_and_set_bit(s, mask) == 1;
|
|
return 0;
|
|
}
|
|
|
|
static int
|
|
process_counter_values(struct perf_stat_config *config, struct perf_evsel *evsel,
|
|
int cpu, int thread,
|
|
struct perf_counts_values *count)
|
|
{
|
|
struct perf_counts_values *aggr = &evsel->counts->aggr;
|
|
static struct perf_counts_values zero;
|
|
bool skip = false;
|
|
|
|
if (check_per_pkg(evsel, count, cpu, &skip)) {
|
|
pr_err("failed to read per-pkg counter\n");
|
|
return -1;
|
|
}
|
|
|
|
if (skip)
|
|
count = &zero;
|
|
|
|
switch (config->aggr_mode) {
|
|
case AGGR_THREAD:
|
|
case AGGR_CORE:
|
|
case AGGR_SOCKET:
|
|
case AGGR_NONE:
|
|
if (!evsel->snapshot)
|
|
perf_evsel__compute_deltas(evsel, cpu, thread, count);
|
|
perf_counts_values__scale(count, config->scale, NULL);
|
|
if (config->aggr_mode == AGGR_NONE)
|
|
perf_stat__update_shadow_stats(evsel, count->values, cpu);
|
|
break;
|
|
case AGGR_GLOBAL:
|
|
aggr->val += count->val;
|
|
if (config->scale) {
|
|
aggr->ena += count->ena;
|
|
aggr->run += count->run;
|
|
}
|
|
default:
|
|
break;
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
static int process_counter_maps(struct perf_stat_config *config,
|
|
struct perf_evsel *counter)
|
|
{
|
|
int nthreads = thread_map__nr(counter->threads);
|
|
int ncpus = perf_evsel__nr_cpus(counter);
|
|
int cpu, thread;
|
|
|
|
if (counter->system_wide)
|
|
nthreads = 1;
|
|
|
|
for (thread = 0; thread < nthreads; thread++) {
|
|
for (cpu = 0; cpu < ncpus; cpu++) {
|
|
if (process_counter_values(config, counter, cpu, thread,
|
|
perf_counts(counter->counts, cpu, thread)))
|
|
return -1;
|
|
}
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
int perf_stat_process_counter(struct perf_stat_config *config,
|
|
struct perf_evsel *counter)
|
|
{
|
|
struct perf_counts_values *aggr = &counter->counts->aggr;
|
|
struct perf_stat *ps = counter->priv;
|
|
u64 *count = counter->counts->aggr.values;
|
|
int i, ret;
|
|
|
|
aggr->val = aggr->ena = aggr->run = 0;
|
|
init_stats(ps->res_stats);
|
|
|
|
if (counter->per_pkg)
|
|
zero_per_pkg(counter);
|
|
|
|
ret = process_counter_maps(config, counter);
|
|
if (ret)
|
|
return ret;
|
|
|
|
if (config->aggr_mode != AGGR_GLOBAL)
|
|
return 0;
|
|
|
|
if (!counter->snapshot)
|
|
perf_evsel__compute_deltas(counter, -1, -1, aggr);
|
|
perf_counts_values__scale(aggr, config->scale, &counter->counts->scaled);
|
|
|
|
for (i = 0; i < 3; i++)
|
|
update_stats(&ps->res_stats[i], count[i]);
|
|
|
|
if (verbose) {
|
|
fprintf(config->output, "%s: %" PRIu64 " %" PRIu64 " %" PRIu64 "\n",
|
|
perf_evsel__name(counter), count[0], count[1], count[2]);
|
|
}
|
|
|
|
/*
|
|
* Save the full runtime - to allow normalization during printout:
|
|
*/
|
|
perf_stat__update_shadow_stats(counter, count, 0);
|
|
|
|
return 0;
|
|
}
|