Re: Implement lbr-as-callgraph v10

[Jiri Olsa <jolsa@redhat.com>]

On Wed, Nov 19, 2014 at 10:23:23AM +0100, Jiri Olsa wrote:
> On Wed, Nov 19, 2014 at 03:21:39PM +0900, Namhyung Kim wrote:
> > Hi Jiri,
> > 
> > On Tue, 18 Nov 2014 12:00:07 +0100, Jiri Olsa wrote:
> > > On Tue, Nov 18, 2014 at 11:44:16AM +0100, Jiri Olsa wrote:
> > >> On Mon, Nov 17, 2014 at 06:34:57PM -0300, Arnaldo Carvalho de Melo wrote:
> > >> > Em Wed, Nov 12, 2014 at 06:05:18PM -0800, Andi Kleen escreveu:
> > >> > > [Reworks to address all the review feedback. Rebased to latest tree]
> > >> > > [Just a repost after a rebase]
> > >> > > [Even more review feedback and some bugs addressed.]
> > >> > > [Only port to changes in perf/core. No other changes.]
> > >> > > [Rebase to latest perf/core]
> > >> > > [Another rebase. No changes]
> > >> > > 
> > >> > > This patchkit implements lbr-as-callgraphs in per freport,
> > >> > > as an alternative way to present LBR information.
> > >> > 
> > >> > Ok, I have this in my perf/core branch, but I need to test it further,
> > >> > as I couldn't get the output that appears on some of the changelogs.
> > >> > 
> > >> > If you could take a look at
> > >> > 
> > >> > git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux perf/core
> > >> > 
> > >> > To see if I made some mistake, that would be of help,
> > >> > 
> > >> 
> > >> I'm getting compile error for DEBUG=1
> > >
> > > looks like the BUILD_BUG_ON_MSG does not work correctly with -O6 we use
> > 
> > Nope, DEBUG=1 prevents -O6 from applied.  we have below in config/Makefile:
> 
> right.. the other way around ;))
> 
> > 
> >   ifndef DEBUG
> >     DEBUG := 0
> >   endif
> > 
> >   ifeq ($(DEBUG),0)
> >     CFLAGS += -O6
> >   endif
> > 
> > 
> > Looking at include/linux/bug.h, BUILD_BUG_ON is guarded under
> > __OPTIMIZE__ but BUILD_BUG_ON_MSG is not.  What about changing it to
> > BUILD_BUG_ON then?
> 
> sounds gut

hum, acme/perf/core changed and so has the compile error ;-)
we dont overload the <linux/bug.h>, so the kernel one got
included, which is wrong.. attached patch fixes that

jirka


[jolsa@krava perf]$ make JOBS=1
  BUILD:   Doing 'make -j1' parallel build
  CC       perf.o
  CC       builtin-annotate.o
In file included from util/machine.h:5:0,
                 from util/session.h:7,
                 from builtin-annotate.c:29:
/home/jolsa/kernel.org/linux-perf/include/linux/bug.h: In function ‘report_bug’:
/home/jolsa/kernel.org/linux-perf/include/linux/bug.h:105:59: error: unused parameter ‘bug_addr’ [-Werror=unused-parameter]
 static inline enum bug_trap_type report_bug(unsigned long bug_addr,
                                                           ^
/home/jolsa/kernel.org/linux-perf/include/linux/bug.h:106:26: error: unused parameter ‘regs’ [-Werror=unused-parameter]
          struct pt_regs *regs)
                          ^
cc1: all warnings being treated as errors
make[1]: *** [builtin-annotate.o] Error 1
make: *** [all] Error 2


---
diff --git a/tools/perf/util/machine.h b/tools/perf/util/machine.h
index 180d16c19a2b..e8b7779a0a3f 100644
--- a/tools/perf/util/machine.h
+++ b/tools/perf/util/machine.h
@@ -2,7 +2,6 @@
 #define __PERF_MACHINE_H
 
 #include <sys/types.h>
-#include <linux/bug.h>
 #include <linux/rbtree.h>
 #include "map.h"
 #include "dso.h"