Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 06c654ca authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge tag 'perf-core-for-mingo' of... 

Merge tag 'perf-core-for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux

 into perf/core

Pull perf/core improvements and fixes from Arnaldo Carvalho de Melo:

User visible changes:

  * Add --repeat global option to 'perf bench' to be used in benchmarks
    such as the existing 'futex' one, that was modified to use it instead
    of a local option. (Davidlohr Bueso)

  * Fix fd -> pathname resolution in 'trace', be it using /proc or
    a vfs_getname probe point. (Arnaldo Carvalho de Melo)

  * Add suggestion of how to set perf_event_paranoid sysctl, to help
    non-root users trying tools like 'trace' to get a working environment.
    (Arnaldo Carvalho de Melo)

Fixes:

  * Fix memory leak in the 'sched-messaging' perf bench test. (Davidlohr Bueso)

  * The -o and -n 'perf bench mem' options are mutually exclusive, emit error
    when both are specified. (Davidlohr Bueso)

  * Fix scrollbar refresh row index in the ui browser, problem exposed now
    that headers will be added and will be allowed to be switched on/off.
    (Jiri Olsa)

Cleanups:

  * Remove needless reassignments in 'trace' (Arnaldo Carvalho de Melo)

  * Cache the is_exit syscall test in 'trace) (Arnaldo Carvalho de Melo)

  * No need to reimplement err() in 'perf bench sched-messaging', drop barf().
    (Davidlohr Bueso).

  * Remove ev_name argument from perf_evsel__hists_browse, can be obtained
    from the other parameters. (Jiri Olsa)

Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents 98d350cf ecdac968

tools/perf/Documentation/perf-bench.txt

+4 −0
Original line number Diff line number Diff line
@@ -16,6 +16,10 @@ This 'perf bench' command is a general framework for benchmark suites. 


COMMON OPTIONS

--------------

-r::

--repeat=::

Specify amount of times to repeat the run (default 10).



-f::

--format=::

Specify format style.

tools/perf/bench/bench.h

+1 −0
Original line number Diff line number Diff line
@@ -43,5 +43,6 @@ extern int bench_futex_requeue(int argc, const char **argv, const char *prefix); 
#define BENCH_FORMAT_UNKNOWN		-1



extern int bench_format;

extern unsigned int bench_repeat;



#endif

tools/perf/bench/futex-requeue.c

+1 −9
Original line number Diff line number Diff line
@@ -29,13 +29,6 @@ static u_int32_t futex1 = 0, futex2 = 0; 
 */

static unsigned int nrequeue = 1;



/*

 * There can be significant variance from run to run,

 * the more repeats, the more exact the overall avg and

 * the better idea of the futex latency.

 */

static unsigned int repeat = 10;



static pthread_t *worker;

static bool done = 0, silent = 0;

static pthread_mutex_t thread_lock;
@@ -46,7 +39,6 @@ static unsigned int ncpus, threads_starting, nthreads = 0; 
static const struct option options[] = {

	OPT_UINTEGER('t', "threads",  &nthreads, "Specify amount of threads"),

	OPT_UINTEGER('q', "nrequeue", &nrequeue, "Specify amount of threads to requeue at once"),

	OPT_UINTEGER('r', "repeat",   &repeat,   "Specify amount of times to repeat the run"),

	OPT_BOOLEAN( 's', "silent",   &silent,   "Silent mode: do not display data/details"),

	OPT_END()

};
@@ -146,7 +138,7 @@ int bench_futex_requeue(int argc, const char **argv, 
	pthread_cond_init(&thread_parent, NULL);

	pthread_cond_init(&thread_worker, NULL);



	for (j = 0; j < repeat && !done; j++) {

	for (j = 0; j < bench_repeat && !done; j++) {

		unsigned int nrequeued = 0;

		struct timeval start, end, runtime;

tools/perf/bench/futex-wake.c

+2 −10
Original line number Diff line number Diff line
@@ -30,15 +30,8 @@ static u_int32_t futex1 = 0; 
 */

static unsigned int nwakes = 1;



/*

 * There can be significant variance from run to run,

 * the more repeats, the more exact the overall avg and

 * the better idea of the futex latency.

 */

static unsigned int repeat = 10;



pthread_t *worker;

static bool done = 0, silent = 0;

static bool done = false, silent = false;

static pthread_mutex_t thread_lock;

static pthread_cond_t thread_parent, thread_worker;

static struct stats waketime_stats, wakeup_stats;
@@ -47,7 +40,6 @@ static unsigned int ncpus, threads_starting, nthreads = 0; 
static const struct option options[] = {

	OPT_UINTEGER('t', "threads", &nthreads, "Specify amount of threads"),

	OPT_UINTEGER('w', "nwakes",  &nwakes,   "Specify amount of threads to wake at once"),

	OPT_UINTEGER('r', "repeat",  &repeat,   "Specify amount of times to repeat the run"),

	OPT_BOOLEAN( 's', "silent",  &silent,   "Silent mode: do not display data/details"),

	OPT_END()

};
@@ -149,7 +141,7 @@ int bench_futex_wake(int argc, const char **argv, 
	pthread_cond_init(&thread_parent, NULL);

	pthread_cond_init(&thread_worker, NULL);



	for (j = 0; j < repeat && !done; j++) {

	for (j = 0; j < bench_repeat && !done; j++) {

		unsigned int nwoken = 0;

		struct timeval start, end, runtime;

tools/perf/bench/mem-memcpy.c

+5 −0
Original line number Diff line number Diff line
@@ -189,6 +189,11 @@ int bench_mem_memcpy(int argc, const char **argv, 
	argc = parse_options(argc, argv, options,

			     bench_mem_memcpy_usage, 0);



	if (no_prefault && only_prefault) {

		fprintf(stderr, "Invalid options: -o and -n are mutually exclusive\n");

		return 1;

	}



	if (use_cycle)

		init_cycle();