License cleanup: add SPDX GPL-2.0 license identifier to files with no license
Many source files in the tree are missing licensing information, which
makes it harder for compliance tools to determine the correct license.
By default all files without license information are under the default
license of the kernel, which is GPL version 2.
Update the files which contain no license information with the 'GPL-2.0'
SPDX license identifier. The SPDX identifier is a legally binding
shorthand, which can be used instead of the full boiler plate text.
This patch is based on work done by Thomas Gleixner and Kate Stewart and
Philippe Ombredanne.
How this work was done:
Patches were generated and checked against linux-4.14-rc6 for a subset of
the use cases:
- file had no licensing information it it.
- file was a */uapi/* one with no licensing information in it,
- file was a */uapi/* one with existing licensing information,
Further patches will be generated in subsequent months to fix up cases
where non-standard license headers were used, and references to license
had to be inferred by heuristics based on keywords.
The analysis to determine which SPDX License Identifier to be applied to
a file was done in a spreadsheet of side by side results from of the
output of two independent scanners (ScanCode & Windriver) producing SPDX
tag:value files created by Philippe Ombredanne. Philippe prepared the
base worksheet, and did an initial spot review of a few 1000 files.
The 4.13 kernel was the starting point of the analysis with 60,537 files
assessed. Kate Stewart did a file by file comparison of the scanner
results in the spreadsheet to determine which SPDX license identifier(s)
to be applied to the file. She confirmed any determination that was not
immediately clear with lawyers working with the Linux Foundation.
Criteria used to select files for SPDX license identifier tagging was:
- Files considered eligible had to be source code files.
- Make and config files were included as candidates if they contained >5
lines of source
- File already had some variant of a license header in it (even if <5
lines).
All documentation files were explicitly excluded.
The following heuristics were used to determine which SPDX license
identifiers to apply.
- when both scanners couldn't find any license traces, file was
considered to have no license information in it, and the top level
COPYING file license applied.
For non */uapi/* files that summary was:
SPDX license identifier # files
---------------------------------------------------|-------
GPL-2.0 11139
and resulted in the first patch in this series.
If that file was a */uapi/* path one, it was "GPL-2.0 WITH
Linux-syscall-note" otherwise it was "GPL-2.0". Results of that was:
SPDX license identifier # files
---------------------------------------------------|-------
GPL-2.0 WITH Linux-syscall-note 930
and resulted in the second patch in this series.
- if a file had some form of licensing information in it, and was one
of the */uapi/* ones, it was denoted with the Linux-syscall-note if
any GPL family license was found in the file or had no licensing in
it (per prior point). Results summary:
SPDX license identifier # files
---------------------------------------------------|------
GPL-2.0 WITH Linux-syscall-note 270
GPL-2.0+ WITH Linux-syscall-note 169
((GPL-2.0 WITH Linux-syscall-note) OR BSD-2-Clause) 21
((GPL-2.0 WITH Linux-syscall-note) OR BSD-3-Clause) 17
LGPL-2.1+ WITH Linux-syscall-note 15
GPL-1.0+ WITH Linux-syscall-note 14
((GPL-2.0+ WITH Linux-syscall-note) OR BSD-3-Clause) 5
LGPL-2.0+ WITH Linux-syscall-note 4
LGPL-2.1 WITH Linux-syscall-note 3
((GPL-2.0 WITH Linux-syscall-note) OR MIT) 3
((GPL-2.0 WITH Linux-syscall-note) AND MIT) 1
and that resulted in the third patch in this series.
- when the two scanners agreed on the detected license(s), that became
the concluded license(s).
- when there was disagreement between the two scanners (one detected a
license but the other didn't, or they both detected different
licenses) a manual inspection of the file occurred.
- In most cases a manual inspection of the information in the file
resulted in a clear resolution of the license that should apply (and
which scanner probably needed to revisit its heuristics).
- When it was not immediately clear, the license identifier was
confirmed with lawyers working with the Linux Foundation.
- If there was any question as to the appropriate license identifier,
the file was flagged for further research and to be revisited later
in time.
In total, over 70 hours of logged manual review was done on the
spreadsheet to determine the SPDX license identifiers to apply to the
source files by Kate, Philippe, Thomas and, in some cases, confirmation
by lawyers working with the Linux Foundation.
Kate also obtained a third independent scan of the 4.13 code base from
FOSSology, and compared selected files where the other two scanners
disagreed against that SPDX file, to see if there was new insights. The
Windriver scanner is based on an older version of FOSSology in part, so
they are related.
Thomas did random spot checks in about 500 files from the spreadsheets
for the uapi headers and agreed with SPDX license identifier in the
files he inspected. For the non-uapi files Thomas did random spot checks
in about 15000 files.
In initial set of patches against 4.14-rc6, 3 files were found to have
copy/paste license identifier errors, and have been fixed to reflect the
correct identifier.
Additionally Philippe spent 10 hours this week doing a detailed manual
inspection and review of the 12,461 patched files from the initial patch
version early this week with:
- a full scancode scan run, collecting the matched texts, detected
license ids and scores
- reviewing anything where there was a license detected (about 500+
files) to ensure that the applied SPDX license was correct
- reviewing anything where there was no detection but the patch license
was not GPL-2.0 WITH Linux-syscall-note to ensure that the applied
SPDX license was correct
This produced a worksheet with 20 files needing minor correction. This
worksheet was then exported into 3 different .csv files for the
different types of files to be modified.
These .csv files were then reviewed by Greg. Thomas wrote a script to
parse the csv files and add the proper SPDX tag to the file, in the
format that the file expected. This script was further refined by Greg
based on the output to detect more types of files automatically and to
distinguish between header and source .c files (which need different
comment types.) Finally Greg ran the script using the .csv files to
generate the patches.
Reviewed-by: Kate Stewart <kstewart@linuxfoundation.org>
Reviewed-by: Philippe Ombredanne <pombredanne@nexb.com>
Reviewed-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2017-11-01 21:07:57 +07:00
|
|
|
// SPDX-License-Identifier: GPL-2.0
|
2017-04-18 20:46:11 +07:00
|
|
|
#include <errno.h>
|
2017-04-18 01:23:08 +07:00
|
|
|
#include <inttypes.h>
|
2012-09-17 15:31:14 +07:00
|
|
|
#include <math.h>
|
2019-08-22 00:02:05 +07:00
|
|
|
#include "counts.h"
|
2012-09-17 15:31:14 +07:00
|
|
|
#include "stat.h"
|
2019-08-23 01:40:29 +07:00
|
|
|
#include "target.h"
|
2015-06-26 16:29:16 +07:00
|
|
|
#include "evlist.h"
|
2015-06-04 20:50:55 +07:00
|
|
|
#include "evsel.h"
|
2015-06-26 16:29:16 +07:00
|
|
|
#include "thread_map.h"
|
2019-07-04 21:32:27 +07:00
|
|
|
#include <linux/zalloc.h>
|
2012-09-17 15:31:14 +07:00
|
|
|
|
|
|
|
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);
|
2013-08-03 03:05:40 +07:00
|
|
|
|
|
|
|
if (val > stats->max)
|
|
|
|
stats->max = val;
|
|
|
|
|
|
|
|
if (val < stats->min)
|
|
|
|
stats->min = val;
|
2012-09-17 15:31:14 +07:00
|
|
|
}
|
|
|
|
|
|
|
|
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;
|
|
|
|
|
2013-05-26 07:24:48 +07:00
|
|
|
if (stats->n < 2)
|
2012-09-17 15:31:14 +07:00
|
|
|
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;
|
|
|
|
}
|
2015-06-04 20:50:55 +07:00
|
|
|
|
2019-07-21 18:23:51 +07:00
|
|
|
bool __perf_evsel_stat__is(struct evsel *evsel,
|
2015-06-04 20:50:55 +07:00
|
|
|
enum perf_stat_evsel_id id)
|
|
|
|
{
|
2017-10-27 00:22:34 +07:00
|
|
|
struct perf_stat_evsel *ps = evsel->stats;
|
2015-06-04 20:50:55 +07:00
|
|
|
|
|
|
|
return ps->id == id;
|
|
|
|
}
|
|
|
|
|
|
|
|
#define ID(id, name) [PERF_STAT_EVSEL_ID__##id] = #name
|
|
|
|
static const char *id_str[PERF_STAT_EVSEL_ID__MAX] = {
|
2015-06-03 21:25:52 +07:00
|
|
|
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/),
|
2016-05-25 02:52:37 +07:00
|
|
|
ID(TOPDOWN_TOTAL_SLOTS, topdown-total-slots),
|
|
|
|
ID(TOPDOWN_SLOTS_ISSUED, topdown-slots-issued),
|
|
|
|
ID(TOPDOWN_SLOTS_RETIRED, topdown-slots-retired),
|
|
|
|
ID(TOPDOWN_FETCH_BUBBLES, topdown-fetch-bubbles),
|
|
|
|
ID(TOPDOWN_RECOVERY_BUBBLES, topdown-recovery-bubbles),
|
2017-05-27 02:05:38 +07:00
|
|
|
ID(SMI_NUM, msr/smi/),
|
|
|
|
ID(APERF, msr/aperf/),
|
2015-06-04 20:50:55 +07:00
|
|
|
};
|
|
|
|
#undef ID
|
|
|
|
|
2019-07-21 18:23:51 +07:00
|
|
|
static void perf_stat_evsel_id_init(struct evsel *evsel)
|
2015-06-04 20:50:55 +07:00
|
|
|
{
|
2017-10-27 00:22:34 +07:00
|
|
|
struct perf_stat_evsel *ps = evsel->stats;
|
2015-06-04 20:50:55 +07:00
|
|
|
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;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2015-06-14 15:19:26 +07:00
|
|
|
|
2019-07-21 18:23:51 +07:00
|
|
|
static void perf_evsel__reset_stat_priv(struct evsel *evsel)
|
2015-06-26 16:29:14 +07:00
|
|
|
{
|
|
|
|
int i;
|
2017-10-27 00:22:34 +07:00
|
|
|
struct perf_stat_evsel *ps = evsel->stats;
|
2015-06-26 16:29:14 +07:00
|
|
|
|
|
|
|
for (i = 0; i < 3; i++)
|
|
|
|
init_stats(&ps->res_stats[i]);
|
|
|
|
|
|
|
|
perf_stat_evsel_id_init(evsel);
|
|
|
|
}
|
|
|
|
|
2019-07-21 18:23:51 +07:00
|
|
|
static int perf_evsel__alloc_stat_priv(struct evsel *evsel)
|
2015-06-26 16:29:14 +07:00
|
|
|
{
|
2017-10-27 00:22:34 +07:00
|
|
|
evsel->stats = zalloc(sizeof(struct perf_stat_evsel));
|
|
|
|
if (evsel->stats == NULL)
|
2015-06-26 16:29:14 +07:00
|
|
|
return -ENOMEM;
|
|
|
|
perf_evsel__reset_stat_priv(evsel);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2019-07-21 18:23:51 +07:00
|
|
|
static void perf_evsel__free_stat_priv(struct evsel *evsel)
|
2015-06-26 16:29:14 +07:00
|
|
|
{
|
2017-10-27 00:22:34 +07:00
|
|
|
struct perf_stat_evsel *ps = evsel->stats;
|
2017-07-26 19:02:05 +07:00
|
|
|
|
|
|
|
if (ps)
|
2019-07-04 22:06:20 +07:00
|
|
|
zfree(&ps->group_data);
|
2017-10-27 00:22:34 +07:00
|
|
|
zfree(&evsel->stats);
|
2015-06-26 16:29:14 +07:00
|
|
|
}
|
2015-06-26 16:29:15 +07:00
|
|
|
|
2019-07-21 18:23:51 +07:00
|
|
|
static int perf_evsel__alloc_prev_raw_counts(struct evsel *evsel,
|
2016-01-20 18:56:35 +07:00
|
|
|
int ncpus, int nthreads)
|
2015-06-26 16:29:15 +07:00
|
|
|
{
|
|
|
|
struct perf_counts *counts;
|
|
|
|
|
|
|
|
counts = perf_counts__new(ncpus, nthreads);
|
|
|
|
if (counts)
|
|
|
|
evsel->prev_raw_counts = counts;
|
|
|
|
|
|
|
|
return counts ? 0 : -ENOMEM;
|
|
|
|
}
|
|
|
|
|
2019-07-21 18:23:51 +07:00
|
|
|
static void perf_evsel__free_prev_raw_counts(struct evsel *evsel)
|
2015-06-26 16:29:15 +07:00
|
|
|
{
|
|
|
|
perf_counts__delete(evsel->prev_raw_counts);
|
|
|
|
evsel->prev_raw_counts = NULL;
|
|
|
|
}
|
2015-06-26 16:29:16 +07:00
|
|
|
|
2019-07-21 18:23:51 +07:00
|
|
|
static int perf_evsel__alloc_stats(struct evsel *evsel, bool alloc_raw)
|
2015-06-26 16:29:17 +07:00
|
|
|
{
|
|
|
|
int ncpus = perf_evsel__nr_cpus(evsel);
|
2019-08-22 18:11:41 +07:00
|
|
|
int nthreads = perf_thread_map__nr(evsel->core.threads);
|
2015-06-26 16:29:17 +07:00
|
|
|
|
|
|
|
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;
|
|
|
|
}
|
|
|
|
|
2019-07-21 18:23:52 +07:00
|
|
|
int perf_evlist__alloc_stats(struct evlist *evlist, bool alloc_raw)
|
2015-06-26 16:29:16 +07:00
|
|
|
{
|
2019-07-21 18:23:51 +07:00
|
|
|
struct evsel *evsel;
|
2015-06-26 16:29:16 +07:00
|
|
|
|
2016-06-23 21:26:15 +07:00
|
|
|
evlist__for_each_entry(evlist, evsel) {
|
2015-06-26 16:29:17 +07:00
|
|
|
if (perf_evsel__alloc_stats(evsel, alloc_raw))
|
2015-06-26 16:29:16 +07:00
|
|
|
goto out_free;
|
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
out_free:
|
|
|
|
perf_evlist__free_stats(evlist);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
2019-07-21 18:23:52 +07:00
|
|
|
void perf_evlist__free_stats(struct evlist *evlist)
|
2015-06-26 16:29:16 +07:00
|
|
|
{
|
2019-07-21 18:23:51 +07:00
|
|
|
struct evsel *evsel;
|
2015-06-26 16:29:16 +07:00
|
|
|
|
2016-06-23 21:26:15 +07:00
|
|
|
evlist__for_each_entry(evlist, evsel) {
|
2015-06-26 16:29:16 +07:00
|
|
|
perf_evsel__free_stat_priv(evsel);
|
|
|
|
perf_evsel__free_counts(evsel);
|
|
|
|
perf_evsel__free_prev_raw_counts(evsel);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2019-07-21 18:23:52 +07:00
|
|
|
void perf_evlist__reset_stats(struct evlist *evlist)
|
2015-06-26 16:29:16 +07:00
|
|
|
{
|
2019-07-21 18:23:51 +07:00
|
|
|
struct evsel *evsel;
|
2015-06-26 16:29:16 +07:00
|
|
|
|
2016-06-23 21:26:15 +07:00
|
|
|
evlist__for_each_entry(evlist, evsel) {
|
2015-06-26 16:29:16 +07:00
|
|
|
perf_evsel__reset_stat_priv(evsel);
|
|
|
|
perf_evsel__reset_counts(evsel);
|
|
|
|
}
|
|
|
|
}
|
2015-07-21 19:31:27 +07:00
|
|
|
|
2019-07-21 18:23:51 +07:00
|
|
|
static void zero_per_pkg(struct evsel *counter)
|
2015-07-21 19:31:27 +07:00
|
|
|
{
|
|
|
|
if (counter->per_pkg_mask)
|
|
|
|
memset(counter->per_pkg_mask, 0, MAX_NR_CPUS);
|
|
|
|
}
|
|
|
|
|
2019-07-21 18:23:51 +07:00
|
|
|
static int check_per_pkg(struct evsel *counter,
|
2015-09-03 20:23:40 +07:00
|
|
|
struct perf_counts_values *vals, int cpu, bool *skip)
|
2015-07-21 19:31:27 +07:00
|
|
|
{
|
|
|
|
unsigned long *mask = counter->per_pkg_mask;
|
2019-07-21 18:24:05 +07:00
|
|
|
struct perf_cpu_map *cpus = evsel__cpus(counter);
|
2015-07-21 19:31:27 +07:00
|
|
|
int s;
|
|
|
|
|
|
|
|
*skip = false;
|
|
|
|
|
|
|
|
if (!counter->per_pkg)
|
|
|
|
return 0;
|
|
|
|
|
2019-08-22 18:11:39 +07:00
|
|
|
if (perf_cpu_map__empty(cpus))
|
2015-07-21 19:31:27 +07:00
|
|
|
return 0;
|
|
|
|
|
|
|
|
if (!mask) {
|
|
|
|
mask = zalloc(MAX_NR_CPUS);
|
|
|
|
if (!mask)
|
|
|
|
return -ENOMEM;
|
|
|
|
|
|
|
|
counter->per_pkg_mask = mask;
|
|
|
|
}
|
|
|
|
|
2015-09-03 20:23:40 +07:00
|
|
|
/*
|
|
|
|
* 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;
|
|
|
|
|
2015-10-16 17:41:15 +07:00
|
|
|
s = cpu_map__get_socket(cpus, cpu, NULL);
|
2015-07-21 19:31:27 +07:00
|
|
|
if (s < 0)
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
*skip = test_and_set_bit(s, mask) == 1;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
2019-07-21 18:23:51 +07:00
|
|
|
process_counter_values(struct perf_stat_config *config, struct evsel *evsel,
|
2015-07-21 19:31:27 +07:00
|
|
|
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;
|
|
|
|
|
2015-09-03 20:23:40 +07:00
|
|
|
if (check_per_pkg(evsel, count, cpu, &skip)) {
|
2015-07-21 19:31:27 +07:00
|
|
|
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:
|
2019-06-05 05:50:42 +07:00
|
|
|
case AGGR_DIE:
|
2015-07-21 19:31:27 +07:00
|
|
|
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);
|
perf stat: Support 'percore' event qualifier
With this patch, we can use the 'percore' event qualifier in perf-stat.
root@skl:/tmp# perf stat -e cpu/event=0,umask=0x3,percore=1/,cpu/event=0,umask=0x3/ -a -A -I1000
1.000773050 S0-C0 98,352,832 cpu/event=0,umask=0x3,percore=1/ (50.01%)
1.000773050 S0-C1 103,763,057 cpu/event=0,umask=0x3,percore=1/ (50.02%)
1.000773050 S0-C2 196,776,995 cpu/event=0,umask=0x3,percore=1/ (50.02%)
1.000773050 S0-C3 176,493,779 cpu/event=0,umask=0x3,percore=1/ (50.02%)
1.000773050 CPU0 47,699,641 cpu/event=0,umask=0x3/ (50.02%)
1.000773050 CPU1 49,052,451 cpu/event=0,umask=0x3/ (49.98%)
1.000773050 CPU2 102,771,422 cpu/event=0,umask=0x3/ (49.98%)
1.000773050 CPU3 100,784,662 cpu/event=0,umask=0x3/ (49.98%)
1.000773050 CPU4 43,171,342 cpu/event=0,umask=0x3/ (49.98%)
1.000773050 CPU5 54,152,158 cpu/event=0,umask=0x3/ (49.98%)
1.000773050 CPU6 93,618,410 cpu/event=0,umask=0x3/ (49.98%)
1.000773050 CPU7 74,477,589 cpu/event=0,umask=0x3/ (49.99%)
In this example, we count the event 'ref-cycles' per-core and per-CPU in
one perf stat command-line. From the output, we can see:
S0-C0 = CPU0 + CPU4
S0-C1 = CPU1 + CPU5
S0-C2 = CPU2 + CPU6
S0-C3 = CPU3 + CPU7
So the result is expected (tiny difference is ignored).
Note that, the 'percore' event qualifier needs to use with option '-A'.
Signed-off-by: Jin Yao <yao.jin@linux.intel.com>
Tested-by: Ravi Bangoria <ravi.bangoria@linux.ibm.com>
Acked-by: Jiri Olsa <jolsa@kernel.org>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: Jin Yao <yao.jin@intel.com>
Cc: Kan Liang <kan.liang@linux.intel.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: http://lkml.kernel.org/r/1555077590-27664-4-git-send-email-yao.jin@linux.intel.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2019-04-12 20:59:49 +07:00
|
|
|
if ((config->aggr_mode == AGGR_NONE) && (!evsel->percore)) {
|
|
|
|
perf_stat__update_shadow_stats(evsel, count->val,
|
|
|
|
cpu, &rt_stat);
|
|
|
|
}
|
|
|
|
|
2017-12-05 21:03:08 +07:00
|
|
|
if (config->aggr_mode == AGGR_THREAD) {
|
|
|
|
if (config->stats)
|
|
|
|
perf_stat__update_shadow_stats(evsel,
|
|
|
|
count->val, 0, &config->stats[thread]);
|
|
|
|
else
|
|
|
|
perf_stat__update_shadow_stats(evsel,
|
|
|
|
count->val, 0, &rt_stat);
|
|
|
|
}
|
2015-07-21 19:31:27 +07:00
|
|
|
break;
|
|
|
|
case AGGR_GLOBAL:
|
|
|
|
aggr->val += count->val;
|
2019-03-15 05:50:01 +07:00
|
|
|
aggr->ena += count->ena;
|
|
|
|
aggr->run += count->run;
|
2015-10-16 17:41:04 +07:00
|
|
|
case AGGR_UNSET:
|
2015-07-21 19:31:27 +07:00
|
|
|
default:
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int process_counter_maps(struct perf_stat_config *config,
|
2019-07-21 18:23:51 +07:00
|
|
|
struct evsel *counter)
|
2015-07-21 19:31:27 +07:00
|
|
|
{
|
2019-08-22 18:11:41 +07:00
|
|
|
int nthreads = perf_thread_map__nr(counter->core.threads);
|
2015-07-21 19:31:27 +07:00
|
|
|
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,
|
2019-07-21 18:23:51 +07:00
|
|
|
struct evsel *counter)
|
2015-07-21 19:31:27 +07:00
|
|
|
{
|
|
|
|
struct perf_counts_values *aggr = &counter->counts->aggr;
|
2017-10-27 00:22:34 +07:00
|
|
|
struct perf_stat_evsel *ps = counter->stats;
|
2015-07-21 19:31:27 +07:00
|
|
|
u64 *count = counter->counts->aggr.values;
|
|
|
|
int i, ret;
|
|
|
|
|
|
|
|
aggr->val = aggr->ena = aggr->run = 0;
|
|
|
|
|
perf stat: Fix interval output values
We broke interval data displays with commit:
3f416f22d1e2 ("perf stat: Do not clean event's private stats")
This commit removed stats cleaning, which is important for '-r' option
to carry counters data over the whole run. But it's necessary to clean
it for interval mode, otherwise the displayed value is avg of all
previous values.
Before:
$ perf stat -e cycles -a -I 1000 record
# time counts unit events
1.000240796 75,216,287 cycles
2.000512791 107,823,524 cycles
$ perf stat report
# time counts unit events
1.000240796 75,216,287 cycles
2.000512791 91,519,906 cycles
Now:
$ perf stat report
# time counts unit events
1.000240796 75,216,287 cycles
2.000512791 107,823,524 cycles
Notice the second value being bigger (91,.. < 107,..).
This could be easily verified by using perf script which displays raw
stat data:
$ perf script
CPU THREAD VAL ENA RUN TIME EVENT
0 -1 23855779 1000209530 1000209530 1000240796 cycles
1 -1 33340397 1000224964 1000224964 1000240796 cycles
2 -1 15835415 1000226695 1000226695 1000240796 cycles
3 -1 2184696 1000228245 1000228245 1000240796 cycles
0 -1 97014312 2000514533 2000514533 2000512791 cycles
1 -1 46121497 2000543795 2000543795 2000512791 cycles
2 -1 32269530 2000543566 2000543566 2000512791 cycles
3 -1 7634472 2000544108 2000544108 2000512791 cycles
The sum of the first 4 values is the first interval aggregated value:
23855779 + 33340397 + 15835415 + 2184696 = 75,216,287
The sum of the second 4 values minus first value is the second interval
aggregated value:
97014312 + 46121497 + 32269530 + 7634472 - 75216287 = 107,823,524
Signed-off-by: Jiri Olsa <jolsa@kernel.org>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Stephane Eranian <eranian@google.com>
Link: http://lkml.kernel.org/r/1454485436-20639-1-git-send-email-jolsa@kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2016-02-03 14:43:56 +07:00
|
|
|
/*
|
|
|
|
* We calculate counter's data every interval,
|
|
|
|
* and the display code shows ps->res_stats
|
|
|
|
* avg value. We need to zero the stats for
|
|
|
|
* interval mode, otherwise overall avg running
|
|
|
|
* averages will be shown for each interval.
|
|
|
|
*/
|
|
|
|
if (config->interval)
|
|
|
|
init_stats(ps->res_stats);
|
|
|
|
|
2015-07-21 19:31:27 +07:00
|
|
|
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]);
|
|
|
|
|
2017-02-17 15:17:38 +07:00
|
|
|
if (verbose > 0) {
|
2015-07-21 19:31:27 +07:00
|
|
|
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:
|
|
|
|
*/
|
2017-12-05 21:03:04 +07:00
|
|
|
perf_stat__update_shadow_stats(counter, *count, 0, &rt_stat);
|
2015-07-21 19:31:27 +07:00
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
2015-10-25 21:51:32 +07:00
|
|
|
|
2018-09-13 19:54:03 +07:00
|
|
|
int perf_event__process_stat_event(struct perf_session *session,
|
|
|
|
union perf_event *event)
|
2015-10-25 21:51:32 +07:00
|
|
|
{
|
|
|
|
struct perf_counts_values count;
|
|
|
|
struct stat_event *st = &event->stat;
|
2019-07-21 18:23:51 +07:00
|
|
|
struct evsel *counter;
|
2015-10-25 21:51:32 +07:00
|
|
|
|
|
|
|
count.val = st->val;
|
|
|
|
count.ena = st->ena;
|
|
|
|
count.run = st->run;
|
|
|
|
|
|
|
|
counter = perf_evlist__id2evsel(session->evlist, st->id);
|
|
|
|
if (!counter) {
|
|
|
|
pr_err("Failed to resolve counter for stat event.\n");
|
|
|
|
return -EINVAL;
|
|
|
|
}
|
|
|
|
|
|
|
|
*perf_counts(counter->counts, st->cpu, st->thread) = count;
|
|
|
|
counter->supported = true;
|
|
|
|
return 0;
|
|
|
|
}
|
2015-10-25 21:51:35 +07:00
|
|
|
|
|
|
|
size_t perf_event__fprintf_stat(union perf_event *event, FILE *fp)
|
|
|
|
{
|
|
|
|
struct stat_event *st = (struct stat_event *) event;
|
|
|
|
size_t ret;
|
|
|
|
|
2019-08-28 20:57:10 +07:00
|
|
|
ret = fprintf(fp, "\n... id %" PRI_lu64 ", cpu %d, thread %d\n",
|
2015-10-25 21:51:35 +07:00
|
|
|
st->id, st->cpu, st->thread);
|
2019-08-28 20:57:10 +07:00
|
|
|
ret += fprintf(fp, "... value %" PRI_lu64 ", enabled %" PRI_lu64 ", running %" PRI_lu64 "\n",
|
2015-10-25 21:51:35 +07:00
|
|
|
st->val, st->ena, st->run);
|
|
|
|
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
size_t perf_event__fprintf_stat_round(union perf_event *event, FILE *fp)
|
|
|
|
{
|
|
|
|
struct stat_round_event *rd = (struct stat_round_event *)event;
|
|
|
|
size_t ret;
|
|
|
|
|
|
|
|
ret = fprintf(fp, "\n... time %" PRIu64 ", type %s\n", rd->time,
|
|
|
|
rd->type == PERF_STAT_ROUND_TYPE__FINAL ? "FINAL" : "INTERVAL");
|
|
|
|
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
size_t perf_event__fprintf_stat_config(union perf_event *event, FILE *fp)
|
|
|
|
{
|
|
|
|
struct perf_stat_config sc;
|
|
|
|
size_t ret;
|
|
|
|
|
|
|
|
perf_event__read_stat_config(&sc, &event->stat_config);
|
|
|
|
|
|
|
|
ret = fprintf(fp, "\n");
|
|
|
|
ret += fprintf(fp, "... aggr_mode %d\n", sc.aggr_mode);
|
|
|
|
ret += fprintf(fp, "... scale %d\n", sc.scale);
|
|
|
|
ret += fprintf(fp, "... interval %u\n", sc.interval);
|
|
|
|
|
|
|
|
return ret;
|
|
|
|
}
|
2018-08-30 13:32:17 +07:00
|
|
|
|
2019-07-21 18:23:51 +07:00
|
|
|
int create_perf_stat_counter(struct evsel *evsel,
|
2018-08-30 13:32:17 +07:00
|
|
|
struct perf_stat_config *config,
|
|
|
|
struct target *target)
|
|
|
|
{
|
2019-07-21 18:24:29 +07:00
|
|
|
struct perf_event_attr *attr = &evsel->core.attr;
|
2019-07-21 18:23:51 +07:00
|
|
|
struct evsel *leader = evsel->leader;
|
2018-08-30 13:32:17 +07:00
|
|
|
|
2019-03-15 05:50:01 +07:00
|
|
|
attr->read_format = PERF_FORMAT_TOTAL_TIME_ENABLED |
|
|
|
|
PERF_FORMAT_TOTAL_TIME_RUNNING;
|
2018-08-30 13:32:17 +07:00
|
|
|
|
|
|
|
/*
|
|
|
|
* The event is part of non trivial group, let's enable
|
|
|
|
* the group read (for leader) and ID retrieval for all
|
|
|
|
* members.
|
|
|
|
*/
|
2019-07-21 18:24:46 +07:00
|
|
|
if (leader->core.nr_members > 1)
|
2018-08-30 13:32:17 +07:00
|
|
|
attr->read_format |= PERF_FORMAT_ID|PERF_FORMAT_GROUP;
|
|
|
|
|
|
|
|
attr->inherit = !config->no_inherit;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Some events get initialized with sample_(period/type) set,
|
|
|
|
* like tracepoints. Clear it up for counting.
|
|
|
|
*/
|
|
|
|
attr->sample_period = 0;
|
|
|
|
|
|
|
|
if (config->identifier)
|
|
|
|
attr->sample_type = PERF_SAMPLE_IDENTIFIER;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Disabling all counters initially, they will be enabled
|
|
|
|
* either manually by us or by kernel via enable_on_exec
|
|
|
|
* set later.
|
|
|
|
*/
|
|
|
|
if (perf_evsel__is_group_leader(evsel)) {
|
|
|
|
attr->disabled = 1;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* In case of initial_delay we enable tracee
|
|
|
|
* events manually.
|
|
|
|
*/
|
|
|
|
if (target__none(target) && !config->initial_delay)
|
|
|
|
attr->enable_on_exec = 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (target__has_cpu(target) && !target__has_per_thread(target))
|
2019-07-21 18:24:05 +07:00
|
|
|
return perf_evsel__open_per_cpu(evsel, evsel__cpus(evsel));
|
2018-08-30 13:32:17 +07:00
|
|
|
|
2019-07-21 18:24:39 +07:00
|
|
|
return perf_evsel__open_per_thread(evsel, evsel->core.threads);
|
2018-08-30 13:32:17 +07:00
|
|
|
}
|
2018-08-30 13:32:23 +07:00
|
|
|
|
|
|
|
int perf_stat_synthesize_config(struct perf_stat_config *config,
|
|
|
|
struct perf_tool *tool,
|
2019-07-21 18:23:52 +07:00
|
|
|
struct evlist *evlist,
|
2018-08-30 13:32:23 +07:00
|
|
|
perf_event__handler_t process,
|
|
|
|
bool attrs)
|
|
|
|
{
|
|
|
|
int err;
|
|
|
|
|
|
|
|
if (attrs) {
|
|
|
|
err = perf_event__synthesize_attrs(tool, evlist, process);
|
|
|
|
if (err < 0) {
|
|
|
|
pr_err("Couldn't synthesize attrs.\n");
|
|
|
|
return err;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
err = perf_event__synthesize_extra_attr(tool, evlist, process,
|
|
|
|
attrs);
|
|
|
|
|
2019-07-21 18:24:42 +07:00
|
|
|
err = perf_event__synthesize_thread_map2(tool, evlist->core.threads,
|
2018-08-30 13:32:23 +07:00
|
|
|
process, NULL);
|
|
|
|
if (err < 0) {
|
|
|
|
pr_err("Couldn't synthesize thread map.\n");
|
|
|
|
return err;
|
|
|
|
}
|
|
|
|
|
2019-07-21 18:24:41 +07:00
|
|
|
err = perf_event__synthesize_cpu_map(tool, evlist->core.cpus,
|
2018-08-30 13:32:23 +07:00
|
|
|
process, NULL);
|
|
|
|
if (err < 0) {
|
|
|
|
pr_err("Couldn't synthesize thread map.\n");
|
|
|
|
return err;
|
|
|
|
}
|
|
|
|
|
|
|
|
err = perf_event__synthesize_stat_config(tool, config, process, NULL);
|
|
|
|
if (err < 0) {
|
|
|
|
pr_err("Couldn't synthesize config.\n");
|
|
|
|
return err;
|
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|