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

Pull perf/core clang fixes from Arnaldo Carvalho de Melo:

Changes to make tools/{perf,lib/{bpf,traceevent,api}} build with
CC=clang, to, for instance, take advantage of warnings (Arnaldo Carvalho de Melo):

- Conditionally request some warning options not available on clang

- Set the maximum optimization level to -O3 when using CC=clang, leave
  the previous setting of -O6 otherwise.

- Make it an error to pass a signed value to OPTION_UINTEGER, so that
  we can remove abs(unsigned int) calls in 'perf bench futex'.

- Make sure dprintf() is not defined before using that name in 'perf bench numa'

- Avoid using field after variable sized type, its a GNU extension, use
  equivalent code.

- Fix some bugs where some variables could be used unitialized,
  something not caught by gcc.

- Fix some spots where we were testing struct->array[] members against
  NULL, it will always evaluate to 'true'.

- Add missing parse_events_error() prototype in the bison file.

There are still one problem when trying to build the python support, but
this are the 'size' outputs for 'make -C tools/perf NO_LIBPYTHON' for
gcc and clang builds:

  DW_AT_producer: clang version 4.0.0 (http://llvm.org/git/clang.git f5be8ba13adc4ba1011a7ccd60c844bd60427c1c) (ht

  $ size ~/bin/perf
     text    data     bss     dec     hex     filename
  3447514  831320 23901696  28180530  1ae0032 /home/acme/bin/perf

  DW_AT_producer: GNU C99 6.3.1 20161221 (Red Hat 6.3.1-1) -mtune=generic -march=x86-64 -ggdb3 -O6 -std=gnu99
+-fno-omit-frame-pointer -funwind-tables -fstack-protector-all

  $ size ~/bin/perf
     text    data     bss     dec     hex     filename
  3671662  836480 23902752  28410894  1b1840e /home/acme/bin/perf

Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: Ingo Molnar <mingo@kernel.org>

8 files changed, 47 insertions, 50 deletions

diff --git a/tools/perf/util/evsel.c b/tools/perf/util/evsel.c
index cd2fb42e5dd4..ac59710b79e0 100644
--- a/tools/perf/util/evsel.c
+++ b/tools/perf/util/evsel.c
@@ -1448,8 +1448,8 @@ static bool ignore_missing_thread(struct perf_evsel *evsel,
         return true;
 }
 
-static int __perf_evsel__open(struct perf_evsel *evsel, struct cpu_map *cpus,
-                              struct thread_map *threads)
+int perf_evsel__open(struct perf_evsel *evsel, struct cpu_map *cpus,
+                     struct thread_map *threads)
 {
         int cpu, thread, nthreads;
         unsigned long flags = PERF_FLAG_FD_CLOEXEC;
@@ -1459,6 +1459,30 @@ static int __perf_evsel__open(struct perf_evsel *evsel, struct cpu_map *cpus,
         if (perf_missing_features.write_backward && evsel->attr.write_backward)
                 return -EINVAL;
 
+        if (cpus == NULL) {
+                static struct cpu_map *empty_cpu_map;
+
+                if (empty_cpu_map == NULL) {
+                        empty_cpu_map = cpu_map__dummy_new();
+                        if (empty_cpu_map == NULL)
+                                return -ENOMEM;
+                }
+
+                cpus = empty_cpu_map;
+        }
+
+        if (threads == NULL) {
+                static struct thread_map *empty_thread_map;
+
+                if (empty_thread_map == NULL) {
+                        empty_thread_map = thread_map__new_by_tid(-1);
+                        if (empty_thread_map == NULL)
+                                return -ENOMEM;
+                }
+
+                threads = empty_thread_map;
+        }
+
         if (evsel->system_wide)
                 nthreads = 1;
         else
@@ -1655,46 +1679,16 @@ void perf_evsel__close(struct perf_evsel *evsel, int ncpus, int nthreads)
         perf_evsel__free_fd(evsel);
 }
 
-static struct {
-        struct cpu_map map;
-        int cpus[1];
-} empty_cpu_map = {
-        .map.nr = 1,
-        .cpus   = { -1, },
-};
-
-static struct {
-        struct thread_map map;
-        int threads[1];
-} empty_thread_map = {
-        .map.nr  = 1,
-        .threads = { -1, },
-};
-
-int perf_evsel__open(struct perf_evsel *evsel, struct cpu_map *cpus,
-                     struct thread_map *threads)
-{
-        if (cpus == NULL) {
-                /* Work around old compiler warnings about strict aliasing */
-                cpus = &empty_cpu_map.map;
-        }
-
-        if (threads == NULL)
-                threads = &empty_thread_map.map;
-
-        return __perf_evsel__open(evsel, cpus, threads);
-}
-
 int perf_evsel__open_per_cpu(struct perf_evsel *evsel,
                              struct cpu_map *cpus)
 {
-        return __perf_evsel__open(evsel, cpus, &empty_thread_map.map);
+        return perf_evsel__open(evsel, cpus, NULL);
 }
 
 int perf_evsel__open_per_thread(struct perf_evsel *evsel,
                                 struct thread_map *threads)
 {
-        return __perf_evsel__open(evsel, &empty_cpu_map.map, threads);
+        return perf_evsel__open(evsel, NULL, threads);
 }
 
 static int perf_evsel__parse_id_sample(const struct perf_evsel *evsel,
diff --git a/tools/perf/util/intel-pt-decoder/Build b/tools/perf/util/intel-pt-decoder/Build
index 9b742ea8bfe8..7aca5d6d7e1f 100644
--- a/tools/perf/util/intel-pt-decoder/Build
+++ b/tools/perf/util/intel-pt-decoder/Build
@@ -23,4 +23,8 @@ $(OUTPUT)util/intel-pt-decoder/intel-pt-insn-decoder.o: util/intel-pt-decoder/in
         $(call rule_mkdir)
         $(call if_changed_dep,cc_o_c)
 
-CFLAGS_intel-pt-insn-decoder.o += -I$(OUTPUT)util/intel-pt-decoder -Wno-override-init
+CFLAGS_intel-pt-insn-decoder.o += -I$(OUTPUT)util/intel-pt-decoder
+
+ifneq ($(CC), clang)
+  CFLAGS_intel-pt-insn-decoder.o += -Wno-override-init
+endif
diff --git a/tools/perf/util/machine.c b/tools/perf/util/machine.c
index a1043cf9b89c..71c9720d4973 100644
--- a/tools/perf/util/machine.c
+++ b/tools/perf/util/machine.c
@@ -782,7 +782,7 @@ static u64 machine__get_running_kernel_start(struct machine *machine,
 
 int __machine__create_kernel_maps(struct machine *machine, struct dso *kernel)
 {
-        enum map_type type;
+        int type;
         u64 start = machine__get_running_kernel_start(machine, NULL);
 
         /* In case of renewal the kernel map, destroy previous one */
@@ -813,7 +813,7 @@ int __machine__create_kernel_maps(struct machine *machine, struct dso *kernel)
 
 void machine__destroy_kernel_maps(struct machine *machine)
 {
-        enum map_type type;
+        int type;
 
         for (type = 0; type < MAP__NR_TYPES; ++type) {
                 struct kmap *kmap;
diff --git a/tools/perf/util/parse-events.c b/tools/perf/util/parse-events.c
index 07be0762e53e..281e44af31e2 100644
--- a/tools/perf/util/parse-events.c
+++ b/tools/perf/util/parse-events.c
@@ -2020,17 +2020,14 @@ static bool is_event_supported(u8 type, unsigned config)
                 .config = config,
                 .disabled = 1,
         };
-        struct {
-                struct thread_map map;
-                int threads[1];
-        } tmap = {
-                .map.nr  = 1,
-                .threads = { 0 },
-        };
+        struct thread_map *tmap = thread_map__new_by_tid(0);
+
+        if (tmap == NULL)
+                return false;
 
         evsel = perf_evsel__new(&attr);
         if (evsel) {
-                open_return = perf_evsel__open(evsel, NULL, &tmap.map);
+                open_return = perf_evsel__open(evsel, NULL, tmap);
                 ret = open_return >= 0;
 
                 if (open_return == -EACCES) {
@@ -2042,7 +2039,7 @@ static bool is_event_supported(u8 type, unsigned config)
                          *
                          */
                         evsel->attr.exclude_kernel = 1;
-                        ret = perf_evsel__open(evsel, NULL, &tmap.map) >= 0;
+                        ret = perf_evsel__open(evsel, NULL, tmap) >= 0;
                 }
                 perf_evsel__delete(evsel);
         }
diff --git a/tools/perf/util/parse-events.y b/tools/perf/util/parse-events.y
index 3a5196380609..a14b47ab3879 100644
--- a/tools/perf/util/parse-events.y
+++ b/tools/perf/util/parse-events.y
@@ -17,6 +17,8 @@
 #include "parse-events.h"
 #include "parse-events-bison.h"
 
+void parse_events_error(YYLTYPE *loc, void *data, void *scanner, char const *msg);
+
 #define ABORT_ON(val) \
 do { \
         if (val) \
diff --git a/tools/perf/util/pmu.c b/tools/perf/util/pmu.c
index 82a654dec666..49bfee0e3d9e 100644
--- a/tools/perf/util/pmu.c
+++ b/tools/perf/util/pmu.c
@@ -945,12 +945,12 @@ static int check_info_data(struct perf_pmu_alias *alias,
          * define unit, scale and snapshot, fail
          * if there's more than one.
          */
-        if ((info->unit && alias->unit) ||
+        if ((info->unit && alias->unit[0]) ||
             (info->scale && alias->scale) ||
             (info->snapshot && alias->snapshot))
                 return -EINVAL;
 
-        if (alias->unit)
+        if (alias->unit[0])
                 info->unit = alias->unit;
 
         if (alias->scale)
diff --git a/tools/perf/util/probe-event.c b/tools/perf/util/probe-event.c
index 2c1bca240597..35f5b7b7715c 100644
--- a/tools/perf/util/probe-event.c
+++ b/tools/perf/util/probe-event.c
@@ -2061,7 +2061,7 @@ static int find_perf_probe_point_from_map(struct probe_trace_point *tp,
                                           bool is_kprobe)
 {
         struct symbol *sym = NULL;
-        struct map *map;
+        struct map *map = NULL;
         u64 addr = tp->address;
         int ret = -ENOENT;
 
diff --git a/tools/perf/util/session.c b/tools/perf/util/session.c
index 349c68144e55..4cdbc8f5f14d 100644
--- a/tools/perf/util/session.c
+++ b/tools/perf/util/session.c
@@ -1901,7 +1901,7 @@ int maps__set_kallsyms_ref_reloc_sym(struct map **maps,
                                      const char *symbol_name, u64 addr)
 {
         char *bracket;
-        enum map_type i;
+        int i;
         struct ref_reloc_sym *ref;
 
         ref = zalloc(sizeof(struct ref_reloc_sym));