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 17:07:57 +03:00
|
|
|
// SPDX-License-Identifier: GPL-2.0
|
2009-11-17 18:20:09 +03:00
|
|
|
/*
|
|
|
|
* mem-memcpy.c
|
|
|
|
*
|
2015-10-19 11:04:17 +03:00
|
|
|
* Simple memcpy() and memset() benchmarks
|
2009-11-17 18:20:09 +03:00
|
|
|
*
|
|
|
|
* Written by Hitoshi Mitake <mitake@dcl.info.waseda.ac.jp>
|
|
|
|
*/
|
|
|
|
|
2016-04-26 19:27:23 +03:00
|
|
|
#include "debug.h"
|
2019-08-29 20:59:50 +03:00
|
|
|
#include "../perf-sys.h"
|
2015-12-15 18:39:39 +03:00
|
|
|
#include <subcmd/parse-options.h>
|
2009-11-17 18:20:09 +03:00
|
|
|
#include "../util/header.h"
|
2014-07-01 00:28:47 +04:00
|
|
|
#include "../util/cloexec.h"
|
2017-04-17 22:51:59 +03:00
|
|
|
#include "../util/string2.h"
|
2009-11-17 18:20:09 +03:00
|
|
|
#include "bench.h"
|
2010-11-25 10:04:52 +03:00
|
|
|
#include "mem-memcpy-arch.h"
|
2014-12-02 18:50:40 +03:00
|
|
|
#include "mem-memset-arch.h"
|
2009-11-17 18:20:09 +03:00
|
|
|
|
|
|
|
#include <stdio.h>
|
|
|
|
#include <stdlib.h>
|
|
|
|
#include <string.h>
|
2019-08-29 20:59:50 +03:00
|
|
|
#include <unistd.h>
|
2009-11-17 18:20:09 +03:00
|
|
|
#include <sys/time.h>
|
|
|
|
#include <errno.h>
|
2016-08-08 20:59:21 +03:00
|
|
|
#include <linux/time64.h>
|
2019-07-04 17:32:27 +03:00
|
|
|
#include <linux/zalloc.h>
|
2009-11-17 18:20:09 +03:00
|
|
|
|
|
|
|
#define K 1024
|
|
|
|
|
2015-10-19 11:04:25 +03:00
|
|
|
static const char *size_str = "1MB";
|
2015-10-19 11:04:29 +03:00
|
|
|
static const char *function_str = "all";
|
2015-10-19 11:04:28 +03:00
|
|
|
static int nr_loops = 1;
|
2015-10-19 11:04:23 +03:00
|
|
|
static bool use_cycles;
|
|
|
|
static int cycles_fd;
|
2009-11-17 18:20:09 +03:00
|
|
|
|
|
|
|
static const struct option options[] = {
|
2015-10-19 11:04:28 +03:00
|
|
|
OPT_STRING('s', "size", &size_str, "1MB",
|
2015-10-19 11:04:25 +03:00
|
|
|
"Specify the size of the memory buffers. "
|
2015-10-19 11:04:26 +03:00
|
|
|
"Available units: B, KB, MB, GB and TB (case insensitive)"),
|
|
|
|
|
2015-10-19 11:04:29 +03:00
|
|
|
OPT_STRING('f', "function", &function_str, "all",
|
|
|
|
"Specify the function to run, \"all\" runs all available functions, \"help\" lists them"),
|
2015-10-19 11:04:26 +03:00
|
|
|
|
2015-10-19 11:04:28 +03:00
|
|
|
OPT_INTEGER('l', "nr_loops", &nr_loops,
|
|
|
|
"Specify the number of loops to run. (default: 1)"),
|
2015-10-19 11:04:26 +03:00
|
|
|
|
2015-10-19 11:04:23 +03:00
|
|
|
OPT_BOOLEAN('c', "cycles", &use_cycles,
|
|
|
|
"Use a cycles event instead of gettimeofday() to measure performance"),
|
2015-10-19 11:04:26 +03:00
|
|
|
|
2009-11-17 18:20:09 +03:00
|
|
|
OPT_END()
|
|
|
|
};
|
|
|
|
|
2010-11-25 10:04:52 +03:00
|
|
|
typedef void *(*memcpy_t)(void *, const void *, size_t);
|
2014-12-02 18:50:40 +03:00
|
|
|
typedef void *(*memset_t)(void *, int, size_t);
|
2010-11-25 10:04:52 +03:00
|
|
|
|
2015-10-19 11:04:29 +03:00
|
|
|
struct function {
|
2009-11-17 18:20:09 +03:00
|
|
|
const char *name;
|
|
|
|
const char *desc;
|
2014-12-02 18:50:39 +03:00
|
|
|
union {
|
|
|
|
memcpy_t memcpy;
|
2014-12-02 18:50:40 +03:00
|
|
|
memset_t memset;
|
2014-12-02 18:50:39 +03:00
|
|
|
} fn;
|
2009-11-17 18:20:09 +03:00
|
|
|
};
|
|
|
|
|
2012-07-02 17:46:17 +04:00
|
|
|
static struct perf_event_attr cycle_attr = {
|
2009-11-20 06:37:17 +03:00
|
|
|
.type = PERF_TYPE_HARDWARE,
|
|
|
|
.config = PERF_COUNT_HW_CPU_CYCLES
|
2009-11-17 18:20:09 +03:00
|
|
|
};
|
|
|
|
|
2016-04-26 19:27:23 +03:00
|
|
|
static int init_cycles(void)
|
2009-11-17 18:20:09 +03:00
|
|
|
{
|
2015-10-19 11:04:23 +03:00
|
|
|
cycles_fd = sys_perf_event_open(&cycle_attr, getpid(), -1, -1, perf_event_open_cloexec_flag());
|
2009-11-20 06:37:17 +03:00
|
|
|
|
2016-04-26 19:27:23 +03:00
|
|
|
if (cycles_fd < 0 && errno == ENOSYS) {
|
|
|
|
pr_debug("No CONFIG_PERF_EVENTS=y kernel support configured?\n");
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
return cycles_fd;
|
2009-11-17 18:20:09 +03:00
|
|
|
}
|
|
|
|
|
2015-10-19 11:04:23 +03:00
|
|
|
static u64 get_cycles(void)
|
2009-11-17 18:20:09 +03:00
|
|
|
{
|
|
|
|
int ret;
|
|
|
|
u64 clk;
|
|
|
|
|
2015-10-19 11:04:23 +03:00
|
|
|
ret = read(cycles_fd, &clk, sizeof(u64));
|
2009-11-17 18:20:09 +03:00
|
|
|
BUG_ON(ret != sizeof(u64));
|
|
|
|
|
|
|
|
return clk;
|
|
|
|
}
|
|
|
|
|
|
|
|
static double timeval2double(struct timeval *ts)
|
|
|
|
{
|
2016-08-08 20:59:21 +03:00
|
|
|
return (double)ts->tv_sec + (double)ts->tv_usec / (double)USEC_PER_SEC;
|
2009-11-17 18:20:09 +03:00
|
|
|
}
|
|
|
|
|
2015-10-19 11:04:21 +03:00
|
|
|
#define print_bps(x) do { \
|
|
|
|
if (x < K) \
|
2015-10-19 11:04:26 +03:00
|
|
|
printf(" %14lf bytes/sec\n", x); \
|
2015-10-19 11:04:21 +03:00
|
|
|
else if (x < K * K) \
|
2015-10-19 11:04:26 +03:00
|
|
|
printf(" %14lfd KB/sec\n", x / K); \
|
2015-10-19 11:04:21 +03:00
|
|
|
else if (x < K * K * K) \
|
2015-10-19 11:04:26 +03:00
|
|
|
printf(" %14lf MB/sec\n", x / K / K); \
|
2015-10-19 11:04:21 +03:00
|
|
|
else \
|
2015-10-19 11:04:26 +03:00
|
|
|
printf(" %14lf GB/sec\n", x / K / K / K); \
|
2010-11-25 10:04:52 +03:00
|
|
|
} while (0)
|
|
|
|
|
2014-12-02 18:50:39 +03:00
|
|
|
struct bench_mem_info {
|
2015-10-19 11:04:29 +03:00
|
|
|
const struct function *functions;
|
2016-10-14 23:52:18 +03:00
|
|
|
u64 (*do_cycles)(const struct function *r, size_t size, void *src, void *dst);
|
|
|
|
double (*do_gettimeofday)(const struct function *r, size_t size, void *src, void *dst);
|
2014-12-02 18:50:39 +03:00
|
|
|
const char *const *usage;
|
2016-10-14 23:52:18 +03:00
|
|
|
bool alloc_src;
|
2014-12-02 18:50:39 +03:00
|
|
|
};
|
|
|
|
|
2015-10-19 11:04:29 +03:00
|
|
|
static void __bench_mem_function(struct bench_mem_info *info, int r_idx, size_t size, double size_total)
|
2009-11-17 18:20:09 +03:00
|
|
|
{
|
2015-10-19 11:04:29 +03:00
|
|
|
const struct function *r = &info->functions[r_idx];
|
2015-10-19 11:04:21 +03:00
|
|
|
double result_bps = 0.0;
|
2015-10-19 11:04:23 +03:00
|
|
|
u64 result_cycles = 0;
|
2016-10-14 23:52:18 +03:00
|
|
|
void *src = NULL, *dst = zalloc(size);
|
2010-11-25 10:04:52 +03:00
|
|
|
|
2015-10-19 11:04:29 +03:00
|
|
|
printf("# function '%s' (%s)\n", r->name, r->desc);
|
2009-11-17 18:20:09 +03:00
|
|
|
|
2016-10-14 23:52:18 +03:00
|
|
|
if (dst == NULL)
|
|
|
|
goto out_alloc_failed;
|
|
|
|
|
|
|
|
if (info->alloc_src) {
|
|
|
|
src = zalloc(size);
|
|
|
|
if (src == NULL)
|
|
|
|
goto out_alloc_failed;
|
|
|
|
}
|
|
|
|
|
2010-11-25 10:04:52 +03:00
|
|
|
if (bench_format == BENCH_FORMAT_DEFAULT)
|
2015-10-19 11:04:26 +03:00
|
|
|
printf("# Copying %s bytes ...\n\n", size_str);
|
2009-11-17 18:20:09 +03:00
|
|
|
|
2015-10-19 11:04:23 +03:00
|
|
|
if (use_cycles) {
|
2016-10-14 23:52:18 +03:00
|
|
|
result_cycles = info->do_cycles(r, size, src, dst);
|
2009-11-17 18:20:09 +03:00
|
|
|
} else {
|
2016-10-14 23:52:18 +03:00
|
|
|
result_bps = info->do_gettimeofday(r, size, src, dst);
|
2009-11-17 18:20:09 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
switch (bench_format) {
|
|
|
|
case BENCH_FORMAT_DEFAULT:
|
2015-10-19 11:04:23 +03:00
|
|
|
if (use_cycles) {
|
2015-10-19 11:04:26 +03:00
|
|
|
printf(" %14lf cycles/byte\n", (double)result_cycles/size_total);
|
2010-11-25 10:04:52 +03:00
|
|
|
} else {
|
2015-10-19 11:04:21 +03:00
|
|
|
print_bps(result_bps);
|
2009-11-17 18:20:09 +03:00
|
|
|
}
|
|
|
|
break;
|
2015-10-19 11:04:21 +03:00
|
|
|
|
2009-11-17 18:20:09 +03:00
|
|
|
case BENCH_FORMAT_SIMPLE:
|
2015-10-19 11:04:23 +03:00
|
|
|
if (use_cycles) {
|
2015-10-19 11:04:25 +03:00
|
|
|
printf("%lf\n", (double)result_cycles/size_total);
|
2010-11-25 10:04:52 +03:00
|
|
|
} else {
|
2015-10-19 11:04:21 +03:00
|
|
|
printf("%lf\n", result_bps);
|
2010-11-25 10:04:52 +03:00
|
|
|
}
|
2009-11-17 18:20:09 +03:00
|
|
|
break;
|
2015-10-19 11:04:21 +03:00
|
|
|
|
2009-11-17 18:20:09 +03:00
|
|
|
default:
|
2015-10-19 11:04:21 +03:00
|
|
|
BUG_ON(1);
|
2009-11-17 18:20:09 +03:00
|
|
|
break;
|
|
|
|
}
|
2016-10-14 23:52:18 +03:00
|
|
|
|
|
|
|
out_free:
|
|
|
|
free(src);
|
|
|
|
free(dst);
|
|
|
|
return;
|
|
|
|
out_alloc_failed:
|
|
|
|
printf("# Memory allocation failed - maybe size (%s) is too large?\n", size_str);
|
|
|
|
goto out_free;
|
2015-02-26 20:51:37 +03:00
|
|
|
}
|
|
|
|
|
2015-10-19 11:04:19 +03:00
|
|
|
static int bench_mem_common(int argc, const char **argv, struct bench_mem_info *info)
|
2015-02-26 20:51:37 +03:00
|
|
|
{
|
|
|
|
int i;
|
2015-10-19 11:04:25 +03:00
|
|
|
size_t size;
|
|
|
|
double size_total;
|
2015-02-26 20:51:37 +03:00
|
|
|
|
2015-10-19 11:04:17 +03:00
|
|
|
argc = parse_options(argc, argv, options, info->usage, 0);
|
2015-02-26 20:51:37 +03:00
|
|
|
|
2016-04-26 19:27:23 +03:00
|
|
|
if (use_cycles) {
|
|
|
|
i = init_cycles();
|
|
|
|
if (i < 0) {
|
|
|
|
fprintf(stderr, "Failed to open cycles counter\n");
|
|
|
|
return i;
|
|
|
|
}
|
|
|
|
}
|
2015-02-26 20:51:37 +03:00
|
|
|
|
2015-10-19 11:04:25 +03:00
|
|
|
size = (size_t)perf_atoll((char *)size_str);
|
2015-10-19 11:04:28 +03:00
|
|
|
size_total = (double)size * nr_loops;
|
2015-02-26 20:51:37 +03:00
|
|
|
|
2015-10-19 11:04:25 +03:00
|
|
|
if ((s64)size <= 0) {
|
|
|
|
fprintf(stderr, "Invalid size:%s\n", size_str);
|
2015-02-26 20:51:37 +03:00
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
2015-10-19 11:04:29 +03:00
|
|
|
if (!strncmp(function_str, "all", 3)) {
|
|
|
|
for (i = 0; info->functions[i].name; i++)
|
|
|
|
__bench_mem_function(info, i, size, size_total);
|
2015-02-26 21:02:43 +03:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2015-10-19 11:04:29 +03:00
|
|
|
for (i = 0; info->functions[i].name; i++) {
|
|
|
|
if (!strcmp(info->functions[i].name, function_str))
|
2015-02-26 20:51:37 +03:00
|
|
|
break;
|
|
|
|
}
|
2015-10-19 11:04:29 +03:00
|
|
|
if (!info->functions[i].name) {
|
|
|
|
if (strcmp(function_str, "help") && strcmp(function_str, "h"))
|
|
|
|
printf("Unknown function: %s\n", function_str);
|
|
|
|
printf("Available functions:\n");
|
|
|
|
for (i = 0; info->functions[i].name; i++) {
|
2015-02-26 20:51:37 +03:00
|
|
|
printf("\t%s ... %s\n",
|
2015-10-19 11:04:29 +03:00
|
|
|
info->functions[i].name, info->functions[i].desc);
|
2015-02-26 20:51:37 +03:00
|
|
|
}
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
2015-10-19 11:04:29 +03:00
|
|
|
__bench_mem_function(info, i, size, size_total);
|
2009-11-17 18:20:09 +03:00
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
2014-12-02 18:50:39 +03:00
|
|
|
|
perf bench mem: Always memset source before memcpy
For memcpy, the source pages are memset to zero only when --cycles is
used. This leads to wildly different results with or without --cycles,
since all sources pages are likely to be mapped to the same zero page
without explicit writes.
Before this fix:
$ export cmd="./perf stat -e LLC-loads -- ./perf bench \
mem memcpy -s 1024MB -l 100 -f default"
$ $cmd
2,935,826 LLC-loads
3.821677452 seconds time elapsed
$ $cmd --cycles
217,533,436 LLC-loads
8.616725985 seconds time elapsed
After this fix:
$ $cmd
214,459,686 LLC-loads
8.674301124 seconds time elapsed
$ $cmd --cycles
214,758,651 LLC-loads
8.644480006 seconds time elapsed
Fixes: 47b5757bac03c338 ("perf bench mem: Move boilerplate memory allocation to the infrastructure")
Signed-off-by: Vincent Whitchurch <vincent.whitchurch@axis.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: kernel@axis.com
Link: http://lore.kernel.org/lkml/20200810133404.30829-1-vincent.whitchurch@axis.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2020-08-10 16:34:04 +03:00
|
|
|
static void memcpy_prefault(memcpy_t fn, size_t size, void *src, void *dst)
|
2014-12-02 18:50:39 +03:00
|
|
|
{
|
2016-10-14 23:52:18 +03:00
|
|
|
/* Make sure to always prefault zero pages even if MMAP_THRESH is crossed: */
|
|
|
|
memset(src, 0, size);
|
2014-12-02 18:50:39 +03:00
|
|
|
|
2015-10-19 11:04:21 +03:00
|
|
|
/*
|
|
|
|
* We prefault the freshly allocated memory range here,
|
|
|
|
* to not measure page fault overhead:
|
|
|
|
*/
|
2015-10-19 11:04:25 +03:00
|
|
|
fn(dst, src, size);
|
perf bench mem: Always memset source before memcpy
For memcpy, the source pages are memset to zero only when --cycles is
used. This leads to wildly different results with or without --cycles,
since all sources pages are likely to be mapped to the same zero page
without explicit writes.
Before this fix:
$ export cmd="./perf stat -e LLC-loads -- ./perf bench \
mem memcpy -s 1024MB -l 100 -f default"
$ $cmd
2,935,826 LLC-loads
3.821677452 seconds time elapsed
$ $cmd --cycles
217,533,436 LLC-loads
8.616725985 seconds time elapsed
After this fix:
$ $cmd
214,459,686 LLC-loads
8.674301124 seconds time elapsed
$ $cmd --cycles
214,758,651 LLC-loads
8.644480006 seconds time elapsed
Fixes: 47b5757bac03c338 ("perf bench mem: Move boilerplate memory allocation to the infrastructure")
Signed-off-by: Vincent Whitchurch <vincent.whitchurch@axis.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: kernel@axis.com
Link: http://lore.kernel.org/lkml/20200810133404.30829-1-vincent.whitchurch@axis.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2020-08-10 16:34:04 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
static u64 do_memcpy_cycles(const struct function *r, size_t size, void *src, void *dst)
|
|
|
|
{
|
|
|
|
u64 cycle_start = 0ULL, cycle_end = 0ULL;
|
|
|
|
memcpy_t fn = r->fn.memcpy;
|
|
|
|
int i;
|
|
|
|
|
|
|
|
memcpy_prefault(fn, size, src, dst);
|
2014-12-02 18:50:39 +03:00
|
|
|
|
2015-10-19 11:04:23 +03:00
|
|
|
cycle_start = get_cycles();
|
2015-10-19 11:04:28 +03:00
|
|
|
for (i = 0; i < nr_loops; ++i)
|
2015-10-19 11:04:25 +03:00
|
|
|
fn(dst, src, size);
|
2015-10-19 11:04:23 +03:00
|
|
|
cycle_end = get_cycles();
|
2014-12-02 18:50:39 +03:00
|
|
|
|
|
|
|
return cycle_end - cycle_start;
|
|
|
|
}
|
|
|
|
|
2016-10-14 23:52:18 +03:00
|
|
|
static double do_memcpy_gettimeofday(const struct function *r, size_t size, void *src, void *dst)
|
2014-12-02 18:50:39 +03:00
|
|
|
{
|
|
|
|
struct timeval tv_start, tv_end, tv_diff;
|
|
|
|
memcpy_t fn = r->fn.memcpy;
|
|
|
|
int i;
|
|
|
|
|
perf bench mem: Always memset source before memcpy
For memcpy, the source pages are memset to zero only when --cycles is
used. This leads to wildly different results with or without --cycles,
since all sources pages are likely to be mapped to the same zero page
without explicit writes.
Before this fix:
$ export cmd="./perf stat -e LLC-loads -- ./perf bench \
mem memcpy -s 1024MB -l 100 -f default"
$ $cmd
2,935,826 LLC-loads
3.821677452 seconds time elapsed
$ $cmd --cycles
217,533,436 LLC-loads
8.616725985 seconds time elapsed
After this fix:
$ $cmd
214,459,686 LLC-loads
8.674301124 seconds time elapsed
$ $cmd --cycles
214,758,651 LLC-loads
8.644480006 seconds time elapsed
Fixes: 47b5757bac03c338 ("perf bench mem: Move boilerplate memory allocation to the infrastructure")
Signed-off-by: Vincent Whitchurch <vincent.whitchurch@axis.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: kernel@axis.com
Link: http://lore.kernel.org/lkml/20200810133404.30829-1-vincent.whitchurch@axis.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2020-08-10 16:34:04 +03:00
|
|
|
memcpy_prefault(fn, size, src, dst);
|
2014-12-02 18:50:39 +03:00
|
|
|
|
|
|
|
BUG_ON(gettimeofday(&tv_start, NULL));
|
2015-10-19 11:04:28 +03:00
|
|
|
for (i = 0; i < nr_loops; ++i)
|
2015-10-19 11:04:25 +03:00
|
|
|
fn(dst, src, size);
|
2014-12-02 18:50:39 +03:00
|
|
|
BUG_ON(gettimeofday(&tv_end, NULL));
|
|
|
|
|
|
|
|
timersub(&tv_end, &tv_start, &tv_diff);
|
|
|
|
|
2015-10-19 11:04:28 +03:00
|
|
|
return (double)(((double)size * nr_loops) / timeval2double(&tv_diff));
|
2014-12-02 18:50:39 +03:00
|
|
|
}
|
|
|
|
|
2015-10-19 11:04:29 +03:00
|
|
|
struct function memcpy_functions[] = {
|
2015-10-19 11:04:27 +03:00
|
|
|
{ .name = "default",
|
|
|
|
.desc = "Default memcpy() provided by glibc",
|
|
|
|
.fn.memcpy = memcpy },
|
|
|
|
|
|
|
|
#ifdef HAVE_ARCH_X86_64_SUPPORT
|
|
|
|
# define MEMCPY_FN(_fn, _name, _desc) {.name = _name, .desc = _desc, .fn.memcpy = _fn},
|
|
|
|
# include "mem-memcpy-x86-64-asm-def.h"
|
|
|
|
# undef MEMCPY_FN
|
|
|
|
#endif
|
|
|
|
|
2015-10-20 00:17:25 +03:00
|
|
|
{ .name = NULL, }
|
2015-10-19 11:04:27 +03:00
|
|
|
};
|
|
|
|
|
|
|
|
static const char * const bench_mem_memcpy_usage[] = {
|
|
|
|
"perf bench mem memcpy <options>",
|
|
|
|
NULL
|
|
|
|
};
|
|
|
|
|
2017-03-27 17:47:20 +03:00
|
|
|
int bench_mem_memcpy(int argc, const char **argv)
|
2014-12-02 18:50:39 +03:00
|
|
|
{
|
|
|
|
struct bench_mem_info info = {
|
2015-10-19 11:04:29 +03:00
|
|
|
.functions = memcpy_functions,
|
2015-10-19 11:04:23 +03:00
|
|
|
.do_cycles = do_memcpy_cycles,
|
2015-10-19 11:04:17 +03:00
|
|
|
.do_gettimeofday = do_memcpy_gettimeofday,
|
|
|
|
.usage = bench_mem_memcpy_usage,
|
2016-10-14 23:52:18 +03:00
|
|
|
.alloc_src = true,
|
2014-12-02 18:50:39 +03:00
|
|
|
};
|
|
|
|
|
2015-10-19 11:04:19 +03:00
|
|
|
return bench_mem_common(argc, argv, &info);
|
2014-12-02 18:50:39 +03:00
|
|
|
}
|
2014-12-02 18:50:40 +03:00
|
|
|
|
2016-10-14 23:52:18 +03:00
|
|
|
static u64 do_memset_cycles(const struct function *r, size_t size, void *src __maybe_unused, void *dst)
|
2014-12-02 18:50:40 +03:00
|
|
|
{
|
|
|
|
u64 cycle_start = 0ULL, cycle_end = 0ULL;
|
|
|
|
memset_t fn = r->fn.memset;
|
|
|
|
int i;
|
|
|
|
|
2015-10-19 11:04:21 +03:00
|
|
|
/*
|
|
|
|
* We prefault the freshly allocated memory range here,
|
|
|
|
* to not measure page fault overhead:
|
|
|
|
*/
|
2015-10-19 11:04:25 +03:00
|
|
|
fn(dst, -1, size);
|
2014-12-02 18:50:40 +03:00
|
|
|
|
2015-10-19 11:04:23 +03:00
|
|
|
cycle_start = get_cycles();
|
2015-10-19 11:04:28 +03:00
|
|
|
for (i = 0; i < nr_loops; ++i)
|
2015-10-19 11:04:25 +03:00
|
|
|
fn(dst, i, size);
|
2015-10-19 11:04:23 +03:00
|
|
|
cycle_end = get_cycles();
|
2014-12-02 18:50:40 +03:00
|
|
|
|
|
|
|
return cycle_end - cycle_start;
|
|
|
|
}
|
|
|
|
|
2016-10-14 23:52:18 +03:00
|
|
|
static double do_memset_gettimeofday(const struct function *r, size_t size, void *src __maybe_unused, void *dst)
|
2014-12-02 18:50:40 +03:00
|
|
|
{
|
|
|
|
struct timeval tv_start, tv_end, tv_diff;
|
|
|
|
memset_t fn = r->fn.memset;
|
|
|
|
int i;
|
|
|
|
|
2015-10-19 11:04:21 +03:00
|
|
|
/*
|
|
|
|
* We prefault the freshly allocated memory range here,
|
|
|
|
* to not measure page fault overhead:
|
|
|
|
*/
|
2015-10-19 11:04:25 +03:00
|
|
|
fn(dst, -1, size);
|
2014-12-02 18:50:40 +03:00
|
|
|
|
|
|
|
BUG_ON(gettimeofday(&tv_start, NULL));
|
2015-10-19 11:04:28 +03:00
|
|
|
for (i = 0; i < nr_loops; ++i)
|
2015-10-19 11:04:25 +03:00
|
|
|
fn(dst, i, size);
|
2014-12-02 18:50:40 +03:00
|
|
|
BUG_ON(gettimeofday(&tv_end, NULL));
|
|
|
|
|
|
|
|
timersub(&tv_end, &tv_start, &tv_diff);
|
|
|
|
|
2015-10-19 11:04:28 +03:00
|
|
|
return (double)(((double)size * nr_loops) / timeval2double(&tv_diff));
|
2014-12-02 18:50:40 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
static const char * const bench_mem_memset_usage[] = {
|
|
|
|
"perf bench mem memset <options>",
|
|
|
|
NULL
|
|
|
|
};
|
|
|
|
|
2015-10-19 11:04:29 +03:00
|
|
|
static const struct function memset_functions[] = {
|
2015-10-19 11:04:17 +03:00
|
|
|
{ .name = "default",
|
|
|
|
.desc = "Default memset() provided by glibc",
|
|
|
|
.fn.memset = memset },
|
2014-12-02 18:50:40 +03:00
|
|
|
|
2015-10-19 11:04:17 +03:00
|
|
|
#ifdef HAVE_ARCH_X86_64_SUPPORT
|
|
|
|
# define MEMSET_FN(_fn, _name, _desc) { .name = _name, .desc = _desc, .fn.memset = _fn },
|
|
|
|
# include "mem-memset-x86-64-asm-def.h"
|
|
|
|
# undef MEMSET_FN
|
2014-12-02 18:50:40 +03:00
|
|
|
#endif
|
|
|
|
|
2015-10-20 00:17:25 +03:00
|
|
|
{ .name = NULL, }
|
2014-12-02 18:50:40 +03:00
|
|
|
};
|
|
|
|
|
2017-03-27 17:47:20 +03:00
|
|
|
int bench_mem_memset(int argc, const char **argv)
|
2014-12-02 18:50:40 +03:00
|
|
|
{
|
|
|
|
struct bench_mem_info info = {
|
2015-10-19 11:04:29 +03:00
|
|
|
.functions = memset_functions,
|
2015-10-19 11:04:23 +03:00
|
|
|
.do_cycles = do_memset_cycles,
|
2015-10-19 11:04:17 +03:00
|
|
|
.do_gettimeofday = do_memset_gettimeofday,
|
|
|
|
.usage = bench_mem_memset_usage,
|
2014-12-02 18:50:40 +03:00
|
|
|
};
|
|
|
|
|
2015-10-19 11:04:19 +03:00
|
|
|
return bench_mem_common(argc, argv, &info);
|
2014-12-02 18:50:40 +03:00
|
|
|
}
|