tools: Adopt noinline from kernel sources
tip-bot for Arnaldo Carvalho de Melo
merge botCommit-ID: 9dd4ca470e03334f95cc96529ba090921aac8eab Gitweb: http://git.kernel.org/tip/9dd4ca470e03334f95cc96529ba090921aac8eab Author: Arnaldo Carvalho de Melo <[email protected]> AuthorDate: Fri, 16 Jun 2017 11:39:15 -0300 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Mon, 19 Jun 2017 15:27:06 -0300
tools: Adopt noinline from kernel sources
To have a more compact way to ask the compiler not to inline a function and to make tools/ source code look like kernel code.
Cc Adrian Hunter <[email protected]>
Cc David Ahern <[email protected]>
Cc Jiri Olsa <[email protected]>
Cc Namhyung Kim <[email protected]>
Cc Wang Nan <[email protected]>
Signed-off-by Arnaldo Carvalho de Melo <[email protected]>
--- tools/include/linux/compiler-gcc.h | 2 ++ tools/include/linux/compiler.h | 4 ++++ tools/perf/tests/bp_signal.c | 3 +-- tools/perf/tests/bp_signal_overflow.c | 3 +-- tools/perf/tests/dwarf-unwind.c | 15 +++++---------- 5 files changed, 13 insertions(+), 14 deletions(-)
tools/include/linux/compiler-gcc.h +2 -0
@@ -20,6 +20,8 @@/* &a[0] degrades to a pointer: a different type from an array */ #define __must_be_array (a) BUILD_BUG_ON_ZERO(__same_type((a), &(a)[0])) +#define noinline __attribute__((noinline)) +#define __noreturn __attribute__((noreturn))#define __printf (a, b) __attribute__((format(printf, a, b)))
tools/include/linux/compiler.h +4 -0
@@ -17,6 +17,10 @@# define __always_inline inline __attribute__((always_inline))#endif +#ifndef noinline +#define noinline +#endif +/* Are two types/vars the same type (ignoring qualifiers)? */ #ifndef __same_type# define __same_type (a, b) __builtin_types_compatible_p(typeof(a), typeof(b))
tools/perf/tests/bp_signal.c +1 -2
@@ -62,8 +62,7 @@ static void __test_function(volatile long *ptr) }#endif -__attribute__ ((noinline)) -static int test_function (void ) +static noinline int test_function(void) {__test_function (&the_var); the_var++;
tools/perf/tests/bp_signal_overflow.c +1 -2
@@ -28,8 +28,7 @@static int overflows; -__attribute__ ((noinline)) -static int test_function (void ) +static noinline int test_function(void) {return time (NULL ); }
tools/perf/tests/dwarf-unwind.c +5 -10
@@ -76,8 +76,7 @@ static int unwind_entry(struct unwind_entry *entry, void *arg)return strcmp ((const char *) symbol, funcs[idx]); } -__attribute__ ((noinline)) -static int unwind_thread (struct thread *thread) +static noinline int unwind_thread(struct thread *thread) {struct perf_sample sample;unsigned long cnt =0 ;
@@ -108,8 +107,7 @@ static int unwind_thread(struct thread *thread)static int global_unwind_retval = -INT_MAX ; -__attribute__ ((noinline)) -static int compare (void *p1,void *p2) +static noinline int compare(void *p1, void *p2) {/* Any possible value should be 'thread' */ struct thread *thread = *(struct thread **)p1;
@@ -128,8 +126,7 @@ static int compare(void *p1, void *p2)return p1 - p2; } -__attribute__ ((noinline)) -static int krava_3 (struct thread *thread) +static noinline int krava_3(struct thread *thread) {struct thread *array[2 ] = {thread, thread};void *fp = &bsearch;
@@ -147,14 +144,12 @@ static int krava_3(struct thread *thread)return global_unwind_retval; } -__attribute__ ((noinline)) -static int krava_2 (struct thread *thread) +static noinline int krava_2(struct thread *thread) {return krava_3 (thread); } -__attribute__ ((noinline)) -static int krava_1 (struct thread *thread) +static noinline int krava_1(struct thread *thread) {return krava_2 (thread); }