Skip to contentSkip to conversation

perf powerpc: Skip callchain code must include util/debug.h

PATCH Applied Anton Blanchard 4 participants 5 messages Aug 25, 2014 – Sep 19, 2014 perf events

lore
Share & tools
lore

Anton Blanchard

author
#0 lore raw

PATCH 1/2 perf powerpc: Skip callchain code must include util/debug.h

Fix a compile error, the prototype for pr_debug could not be found.

Signed-off-by Anton Blanchard <[email protected]>

---

tools/perf/arch/powerpc/util/skip-callchain-idx.c +1 -0
Index: b/tools/perf/arch/powerpc/util/skip-callchain-idx.c
===================================================================
@@ -15,6 +15,7 @@
 
 #include "util/thread.h"
 #include "util/callchain.h"
+#include "util/debug.h"
 
 /*
  * When saving the callchain on Power, the kernel conservatively saves
author
#1 lore raw

PATCH 2/2 perf powerpc: Fix build issue when DWARF support is disabled

The powerpc skip callchain code uses DWARF, so we must disable it if DWARF is disabled.

Signed-off-by Anton Blanchard <[email protected]>

---

tools/perf/arch/powerpc/Makefile +1 -1
Index: b/tools/perf/arch/powerpc/Makefile
===================================================================
@@ -1,6 +1,6 @@
 ifndef NO_DWARF
 PERF_HAVE_DWARF_REGS := 1
 LIB_OBJS += $(OUTPUT)arch/$(ARCH)/util/dwarf-regs.o
+LIB_OBJS += $(OUTPUT)arch/$(ARCH)/util/skip-callchain-idx.o
 endif
 LIB_OBJS += $(OUTPUT)arch/$(ARCH)/util/header.o
-LIB_OBJS += $(OUTPUT)arch/$(ARCH)/util/skip-callchain-idx.o
tools/perf/config/Makefile +6 -4
Index: b/tools/perf/config/Makefile
===================================================================
@@ -48,10 +48,6 @@ ifneq ($(ARCH),$(filter $(ARCH),x86 arm)
   NO_LIBDW_DWARF_UNWIND := 1
 endif
 
-ifeq ($(ARCH),powerpc)
-  CFLAGS += -DHAVE_SKIP_CALLCHAIN_IDX
-endif
-
 ifeq ($(LIBUNWIND_LIBS),)
   NO_LIBUNWIND := 1
 else

@@ -355,6 +351,12 @@ ifndef NO_LIBELF
   endif # NO_DWARF
 endif # NO_LIBELF
 
+ifeq ($(ARCH),powerpc)
+  ifndef NO_DWARF
+    CFLAGS += -DHAVE_SKIP_CALLCHAIN_IDX
+  endif
+endif
+
 ifndef NO_LIBUNWIND
   ifneq ($(feature-libunwind), 1)
     msg := $(warning No libunwind found. Please install libunwind-dev[el] >= 1.1 and/or set LIBUNWIND_DIR);
Applied
#2 lore raw

Re: [PATCH 2/2] perf powerpc: Fix build issue when DWARF support is disabled

Em Mon, Aug 25, 2014 at 06:25:06PM +1000, Anton Blanchard escreveu:

Quoted 4 lines

The powerpc skip callchain code uses DWARF, so we must disable it if DWARF is disabled.

Signed-off-by Anton Blanchard <[email protected]>

Thanks, applied.

- Arnaldo

Quoted 41 lines

Index: b/tools/perf/arch/powerpc/Makefile
===================================================================

tools/perf/arch/powerpc/Makefile +1 -1
@@ -1,6 +1,6 @@
 ifndef NO_DWARF
 PERF_HAVE_DWARF_REGS := 1
 LIB_OBJS += $(OUTPUT)arch/$(ARCH)/util/dwarf-regs.o
+LIB_OBJS += $(OUTPUT)arch/$(ARCH)/util/skip-callchain-idx.o
 endif
 LIB_OBJS += $(OUTPUT)arch/$(ARCH)/util/header.o
-LIB_OBJS += $(OUTPUT)arch/$(ARCH)/util/skip-callchain-idx.o

Index: b/tools/perf/config/Makefile
===================================================================

tools/perf/config/Makefile +6 -4
@@ -48,10 +48,6 @@ ifneq ($(ARCH),$(filter $(ARCH),x86 arm)
   NO_LIBDW_DWARF_UNWIND := 1
 endif
 
-ifeq ($(ARCH),powerpc)
-  CFLAGS += -DHAVE_SKIP_CALLCHAIN_IDX
-endif
-
 ifeq ($(LIBUNWIND_LIBS),)
   NO_LIBUNWIND := 1
 else

@@ -355,6 +351,12 @@ ifndef NO_LIBELF
   endif # NO_DWARF
 endif # NO_LIBELF
 
+ifeq ($(ARCH),powerpc)
+  ifndef NO_DWARF
+    CFLAGS += -DHAVE_SKIP_CALLCHAIN_IDX
+  endif
+endif
+
 ifndef NO_LIBUNWIND
   ifneq ($(feature-libunwind), 1)
     msg := $(warning No libunwind found. Please install libunwind-dev[el] >= 1.1 and/or set LIBUNWIND_DIR);
merge bot
#3 lore raw

[tip:perf/core] perf tools powerpc: Fix build issue when DWARF support is disabled

In reply to Anton Blanchard
perf tools powerpc: Fix build issue when DWARF support is disabled
Commit-ID:  65ccb4faae872b63dd8f5fbc83d0195e3dfabf0d
Gitweb:     http://git.kernel.org/tip/65ccb4faae872b63dd8f5fbc83d0195e3dfabf0d
Author:     Anton Blanchard <[email protected]>
AuthorDate: Mon, 25 Aug 2014 18:25:06 +1000
Committer:  Arnaldo Carvalho de Melo <[email protected]>
CommitDate: Wed, 17 Sep 2014 17:08:07 -0300

perf tools powerpc: Fix build issue when DWARF support is disabled

The powerpc skip callchain code uses DWARF, so we must disable it if DWARF is disabled.

Signed-off-by Anton Blanchard <[email protected]>
Cc Ingo Molnar <[email protected]>
Cc Michael Ellerman <[email protected]>
Cc Paul Mackerras <[email protected]>
Cc Peter Zijlstra <[email protected]>
Cc Sukadev Bhattiprolu <[email protected]>
Link http://lkml.kernel.org/r/20140825182506.2be6512d@kryten open here
Signed-off-by Arnaldo Carvalho de Melo <[email protected]>
---
 tools/perf/arch/powerpc/Makefile |  2 +-
 tools/perf/config/Makefile       | 10 ++++++----
 2 files changed, 7 insertions(+), 5 deletions(-)
tools/perf/arch/powerpc/Makefile +1 -1
index b92219b..6f7782b 100644
@@ -1,6 +1,6 @@
 ifndef NO_DWARF
 PERF_HAVE_DWARF_REGS := 1
 LIB_OBJS += $(OUTPUT)arch/$(ARCH)/util/dwarf-regs.o
+LIB_OBJS += $(OUTPUT)arch/$(ARCH)/util/skip-callchain-idx.o
 endif
 LIB_OBJS += $(OUTPUT)arch/$(ARCH)/util/header.o
-LIB_OBJS += $(OUTPUT)arch/$(ARCH)/util/skip-callchain-idx.o
tools/perf/config/Makefile +6 -4
index 75d4c23..98c9fd1 100644
@@ -48,10 +48,6 @@ ifneq ($(ARCH),$(filter $(ARCH),x86 arm))
   NO_LIBDW_DWARF_UNWIND := 1
 endif
 
-ifeq ($(ARCH),powerpc)
-  CFLAGS += -DHAVE_SKIP_CALLCHAIN_IDX
-endif
-
 ifeq ($(LIBUNWIND_LIBS),)
   NO_LIBUNWIND := 1
 else

@@ -378,6 +374,12 @@ ifndef NO_LIBELF
   endif # NO_DWARF
 endif # NO_LIBELF
 
+ifeq ($(ARCH),powerpc)
+  ifndef NO_DWARF
+    CFLAGS += -DHAVE_SKIP_CALLCHAIN_IDX
+  endif
+endif
+
 ifndef NO_LIBUNWIND
   ifneq ($(feature-libunwind), 1)
     msg := $(warning No libunwind found. Please install libunwind-dev[el] >= 1.1 and/or set LIBUNWIND_DIR);
#4 lore raw
In reply to Anton Blanchard

Anton Blanchard [[email protected]] wrote:
| Fix a compile error, the prototype for pr_debug could not be found. |
Arnaldo pushed this patch to Ingo recently.

	https://lkml.org/lkml/2014/8/22/393
| Signed-off-by: Anton Blanchard <[email protected]>
| ---
| 
| Index: b/tools/perf/arch/powerpc/util/skip-callchain-idx.c
| ===================================================================
| --- a/tools/perf/arch/powerpc/util/skip-callchain-idx.c
| +++ b/tools/perf/arch/powerpc/util/skip-callchain-idx.c
| @@ -15,6 +15,7 @@
| 
|  #include "util/thread.h"
|  #include "util/callchain.h"
| +#include "util/debug.h"
| 
|  /*
|   * When saving the callchain on Power, the kernel conservatively saves