Commit 6ca2a9c6 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:

 * Align the 'Ok'/'FAILED!' test results in 'perf test.

 * Support interrupted syscalls in 'trace'

 * Add an event duration column and filter in 'trace'.

 * There are references to the man pages in some tools, so try to build
   Documentation when installing, warning the user if that is not possible,
   from Borislav Petkov.

 * Give user better message if precise is not supported, from David Ahern.

 * Try to find cross-built objdump path by using the session environment
   information in the perf.data file header, from Irina Tirdea, original
   patch and idea by Namhyung Kim.

 * Diplays more output on features check for make V=1, so that one can figure
   out what is happening by looking at gcc output, etc. From Jiri Olsa.

 * Account the nr_entries in rblist properly, fix by Suzuki K. Poulose.

Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parents ce37f400 af3df2cf

tools/perf/Documentation/Makefile

+29 −2
Original line number Diff line number Diff line 
include ../config/utilities.mak



OUTPUT := ./

ifeq ("$(origin O)", "command line")

  ifneq ($(O),)
@@ -64,6 +66,7 @@ MAKEINFO=makeinfo 
INSTALL_INFO=install-info

DOCBOOK2X_TEXI=docbook2x-texi

DBLATEX=dblatex

XMLTO=xmlto

ifndef PERL_PATH

	PERL_PATH = /usr/bin/perl

endif
@@ -71,6 +74,16 @@ endif 
-include ../config.mak.autogen

-include ../config.mak



_tmp_tool_path := $(call get-executable,$(ASCIIDOC))

ifeq ($(_tmp_tool_path),)

	missing_tools = $(ASCIIDOC)

endif



_tmp_tool_path := $(call get-executable,$(XMLTO))

ifeq ($(_tmp_tool_path),)

	missing_tools += $(XMLTO)

endif



#

# For asciidoc ...

#	-7.1.2,	no extra settings are needed.
@@ -170,7 +183,12 @@ pdf: $(OUTPUT)user-manual.pdf 


install: install-man



install-man: man

check-man-tools:

ifdef missing_tools

	$(error "You need to install $(missing_tools) for man pages")

endif



do-install-man: man

	$(INSTALL) -d -m 755 $(DESTDIR)$(man1dir)

#	$(INSTALL) -d -m 755 $(DESTDIR)$(man5dir)

#	$(INSTALL) -d -m 755 $(DESTDIR)$(man7dir)
@@ -178,6 +196,15 @@ install-man: man 
#	$(INSTALL) -m 644 $(DOC_MAN5) $(DESTDIR)$(man5dir)

#	$(INSTALL) -m 644 $(DOC_MAN7) $(DESTDIR)$(man7dir)



install-man: check-man-tools man



try-install-man:

ifdef missing_tools

	$(warning Please install $(missing_tools) to have the man pages installed)

else

	$(MAKE) do-install-man

endif



install-info: info

	$(INSTALL) -d -m 755 $(DESTDIR)$(infodir)

	$(INSTALL) -m 644 $(OUTPUT)perf.info $(OUTPUT)perfman.info $(DESTDIR)$(infodir)
@@ -246,7 +273,7 @@ $(MAN_HTML): $(OUTPUT)%.html : %.txt 


$(OUTPUT)%.1 $(OUTPUT)%.5 $(OUTPUT)%.7 : $(OUTPUT)%.xml

	$(QUIET_XMLTO)$(RM) $@ && \

	xmlto -o $(OUTPUT) -m $(MANPAGE_XSL) $(XMLTO_EXTRA) man $<

	$(XMLTO) -o $(OUTPUT) -m $(MANPAGE_XSL) $(XMLTO_EXTRA) man $<



$(OUTPUT)%.xml : %.txt

	$(QUIET_ASCIIDOC)$(RM) $@+ $@ && \

tools/perf/Documentation/perf-trace.txt

+3 −0
Original line number Diff line number Diff line
@@ -48,6 +48,9 @@ comma-separated list with no space: 0,1. Ranges of CPUs are specified with -: 0- 
In per-thread mode with inheritance mode on (default), Events are captured only when

the thread executes on the designated CPUs. Default is to monitor all CPUs.



--duration:

	Show only events that had a duration greater than N.M ms.



SEE ALSO

--------

linkperf:perf-record[1], linkperf:perf-script[1]

tools/perf/Makefile

+29 −24
Original line number Diff line number Diff line
@@ -155,15 +155,15 @@ SPARSE_FLAGS = -D__BIG_ENDIAN__ -D__powerpc__ 


-include config/feature-tests.mak



ifeq ($(call try-cc,$(SOURCE_HELLO),$(CFLAGS) -Werror -fstack-protector-all),y)

ifeq ($(call try-cc,$(SOURCE_HELLO),$(CFLAGS) -Werror -fstack-protector-all,-fstack-protector-all),y)

	CFLAGS := $(CFLAGS) -fstack-protector-all

endif



ifeq ($(call try-cc,$(SOURCE_HELLO),$(CFLAGS) -Werror -Wstack-protector),y)

ifeq ($(call try-cc,$(SOURCE_HELLO),$(CFLAGS) -Werror -Wstack-protector,-Wstack-protector),y)

       CFLAGS := $(CFLAGS) -Wstack-protector

endif



ifeq ($(call try-cc,$(SOURCE_HELLO),$(CFLAGS) -Werror -Wvolatile-register-var),y)

ifeq ($(call try-cc,$(SOURCE_HELLO),$(CFLAGS) -Werror -Wvolatile-register-var,-Wvolatile-register-var),y)

       CFLAGS := $(CFLAGS) -Wvolatile-register-var

endif
@@ -172,7 +172,7 @@ endif 
BASIC_CFLAGS = -Iutil/include -Iarch/$(ARCH)/include -I$(OUTPUT)util -I$(TRACE_EVENT_DIR) -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE

BASIC_LDFLAGS =



ifeq ($(call try-cc,$(SOURCE_BIONIC),$(CFLAGS)),y)

ifeq ($(call try-cc,$(SOURCE_BIONIC),$(CFLAGS),bionic),y)

	BIONIC := 1

	EXTLIBS := $(filter-out -lrt,$(EXTLIBS))

	EXTLIBS := $(filter-out -lpthread,$(EXTLIBS))
@@ -426,6 +426,8 @@ LIB_OBJS += $(OUTPUT)ui/helpline.o 
LIB_OBJS += $(OUTPUT)ui/hist.o

LIB_OBJS += $(OUTPUT)ui/stdio/hist.o



LIB_OBJS += $(OUTPUT)arch/common.o



BUILTIN_OBJS += $(OUTPUT)builtin-annotate.o

BUILTIN_OBJS += $(OUTPUT)builtin-bench.o

# Benchmark modules
@@ -477,9 +479,9 @@ ifdef NO_LIBELF 
	NO_LIBUNWIND := 1

else

FLAGS_LIBELF=$(ALL_CFLAGS) $(ALL_LDFLAGS) $(EXTLIBS)

ifneq ($(call try-cc,$(SOURCE_LIBELF),$(FLAGS_LIBELF)),y)

ifneq ($(call try-cc,$(SOURCE_LIBELF),$(FLAGS_LIBELF),libelf),y)

	FLAGS_GLIBC=$(ALL_CFLAGS) $(ALL_LDFLAGS)

	ifeq ($(call try-cc,$(SOURCE_GLIBC),$(FLAGS_GLIBC)),y)

	ifeq ($(call try-cc,$(SOURCE_GLIBC),$(FLAGS_GLIBC),glibc),y)

		LIBC_SUPPORT := 1

	endif

	ifeq ($(BIONIC),1)
@@ -494,7 +496,7 @@ ifneq ($(call try-cc,$(SOURCE_LIBELF),$(FLAGS_LIBELF)),y) 
	endif

else

	FLAGS_DWARF=$(ALL_CFLAGS) -ldw -lelf $(ALL_LDFLAGS) $(EXTLIBS)

	ifneq ($(call try-cc,$(SOURCE_DWARF),$(FLAGS_DWARF)),y)

	ifneq ($(call try-cc,$(SOURCE_DWARF),$(FLAGS_DWARF),libdw),y)

		msg := $(warning No libdw.h found or old libdw.h found or elfutils is older than 0.138, disables dwarf support. Please install new elfutils-devel/libdw-dev);

		NO_DWARF := 1

	endif # Dwarf support
@@ -510,7 +512,7 @@ ifdef LIBUNWIND_DIR 
endif



FLAGS_UNWIND=$(LIBUNWIND_CFLAGS) $(ALL_CFLAGS) $(LIBUNWIND_LDFLAGS) $(ALL_LDFLAGS) $(EXTLIBS) $(LIBUNWIND_LIBS)

ifneq ($(call try-cc,$(SOURCE_LIBUNWIND),$(FLAGS_UNWIND)),y)

ifneq ($(call try-cc,$(SOURCE_LIBUNWIND),$(FLAGS_UNWIND),libunwind),y)

	msg := $(warning No libunwind found, disabling post unwind support. Please install libunwind-dev[el] >= 0.99);

	NO_LIBUNWIND := 1

endif # Libunwind support
@@ -539,7 +541,7 @@ LIB_OBJS += $(OUTPUT)util/symbol-minimal.o 
else # NO_LIBELF

BASIC_CFLAGS += -DLIBELF_SUPPORT



ifeq ($(call try-cc,$(SOURCE_ELF_MMAP),$(FLAGS_COMMON)),y)

ifeq ($(call try-cc,$(SOURCE_ELF_MMAP),$(FLAGS_COMMON),-DLIBELF_MMAP),y)

	BASIC_CFLAGS += -DLIBELF_MMAP

endif
@@ -565,7 +567,7 @@ endif 


ifndef NO_LIBAUDIT

	FLAGS_LIBAUDIT = $(ALL_CFLAGS) $(ALL_LDFLAGS) -laudit

	ifneq ($(call try-cc,$(SOURCE_LIBAUDIT),$(FLAGS_LIBAUDIT)),y)

	ifneq ($(call try-cc,$(SOURCE_LIBAUDIT),$(FLAGS_LIBAUDIT),libaudit),y)

		msg := $(warning No libaudit.h found, disables 'trace' tool, please install audit-libs-devel or libaudit-dev);

	else

		BASIC_CFLAGS += -DLIBAUDIT_SUPPORT
@@ -576,7 +578,7 @@ endif 


ifndef NO_NEWT

	FLAGS_NEWT=$(ALL_CFLAGS) $(ALL_LDFLAGS) $(EXTLIBS) -lnewt

	ifneq ($(call try-cc,$(SOURCE_NEWT),$(FLAGS_NEWT)),y)

	ifneq ($(call try-cc,$(SOURCE_NEWT),$(FLAGS_NEWT),libnewt),y)

		msg := $(warning newt not found, disables TUI support. Please install newt-devel or libnewt-dev);

	else

		# Fedora has /usr/include/slang/slang.h, but ubuntu /usr/include/slang.h
@@ -605,10 +607,10 @@ endif 


ifndef NO_GTK2

	FLAGS_GTK2=$(ALL_CFLAGS) $(ALL_LDFLAGS) $(EXTLIBS) $(shell pkg-config --libs --cflags gtk+-2.0 2>/dev/null)

	ifneq ($(call try-cc,$(SOURCE_GTK2),$(FLAGS_GTK2)),y)

	ifneq ($(call try-cc,$(SOURCE_GTK2),$(FLAGS_GTK2),gtk2),y)

		msg := $(warning GTK2 not found, disables GTK2 support. Please install gtk2-devel or libgtk2.0-dev);

	else

		ifeq ($(call try-cc,$(SOURCE_GTK2_INFOBAR),$(FLAGS_GTK2)),y)

		ifeq ($(call try-cc,$(SOURCE_GTK2_INFOBAR),$(FLAGS_GTK2),-DHAVE_GTK_INFO_BAR),y)

			BASIC_CFLAGS += -DHAVE_GTK_INFO_BAR

		endif

		BASIC_CFLAGS += -DGTK2_SUPPORT
@@ -635,7 +637,7 @@ else 
	PERL_EMBED_CCOPTS = `perl -MExtUtils::Embed -e ccopts 2>/dev/null`

	FLAGS_PERL_EMBED=$(PERL_EMBED_CCOPTS) $(PERL_EMBED_LDOPTS)



	ifneq ($(call try-cc,$(SOURCE_PERL_EMBED),$(FLAGS_PERL_EMBED)),y)

	ifneq ($(call try-cc,$(SOURCE_PERL_EMBED),$(FLAGS_PERL_EMBED),perl),y)

		BASIC_CFLAGS += -DNO_LIBPERL

	else

               ALL_LDFLAGS += $(PERL_EMBED_LDFLAGS)
@@ -689,11 +691,11 @@ else 
      PYTHON_EMBED_CCOPTS := $(shell $(PYTHON_CONFIG_SQ) --cflags 2>/dev/null)

      FLAGS_PYTHON_EMBED := $(PYTHON_EMBED_CCOPTS) $(PYTHON_EMBED_LDOPTS)



      ifneq ($(call try-cc,$(SOURCE_PYTHON_EMBED),$(FLAGS_PYTHON_EMBED)),y)

      ifneq ($(call try-cc,$(SOURCE_PYTHON_EMBED),$(FLAGS_PYTHON_EMBED),python),y)

        $(call disable-python,Python.h (for Python 2.x))

      else



        ifneq ($(call try-cc,$(SOURCE_PYTHON_VERSION),$(FLAGS_PYTHON_EMBED)),y)

        ifneq ($(call try-cc,$(SOURCE_PYTHON_VERSION),$(FLAGS_PYTHON_EMBED),python version),y)

          $(warning Python 3 is not yet supported; please set)

          $(warning PYTHON and/or PYTHON_CONFIG appropriately.)

          $(warning If you also have Python 2 installed, then)
@@ -727,22 +729,22 @@ else 
		BASIC_CFLAGS += -DHAVE_CPLUS_DEMANGLE

        else

		FLAGS_BFD=$(ALL_CFLAGS) $(ALL_LDFLAGS) $(EXTLIBS) -DPACKAGE='perf' -lbfd

		has_bfd := $(call try-cc,$(SOURCE_BFD),$(FLAGS_BFD))

		has_bfd := $(call try-cc,$(SOURCE_BFD),$(FLAGS_BFD),libbfd)

		ifeq ($(has_bfd),y)

			EXTLIBS += -lbfd

		else

			FLAGS_BFD_IBERTY=$(FLAGS_BFD) -liberty

			has_bfd_iberty := $(call try-cc,$(SOURCE_BFD),$(FLAGS_BFD_IBERTY))

			has_bfd_iberty := $(call try-cc,$(SOURCE_BFD),$(FLAGS_BFD_IBERTY),liberty)

			ifeq ($(has_bfd_iberty),y)

				EXTLIBS += -lbfd -liberty

			else

				FLAGS_BFD_IBERTY_Z=$(FLAGS_BFD_IBERTY) -lz

				has_bfd_iberty_z := $(call try-cc,$(SOURCE_BFD),$(FLAGS_BFD_IBERTY_Z))

				has_bfd_iberty_z := $(call try-cc,$(SOURCE_BFD),$(FLAGS_BFD_IBERTY_Z),libz)

				ifeq ($(has_bfd_iberty_z),y)

					EXTLIBS += -lbfd -liberty -lz

				else

					FLAGS_CPLUS_DEMANGLE=$(ALL_CFLAGS) $(ALL_LDFLAGS) $(EXTLIBS) -liberty

					has_cplus_demangle := $(call try-cc,$(SOURCE_CPLUS_DEMANGLE),$(FLAGS_CPLUS_DEMANGLE))

					has_cplus_demangle := $(call try-cc,$(SOURCE_CPLUS_DEMANGLE),$(FLAGS_CPLUS_DEMANGLE),demangle)

					ifeq ($(has_cplus_demangle),y)

						EXTLIBS += -liberty

						BASIC_CFLAGS += -DHAVE_CPLUS_DEMANGLE
@@ -764,19 +766,19 @@ ifeq ($(NO_PERF_REGS),0) 
endif



ifndef NO_STRLCPY

	ifeq ($(call try-cc,$(SOURCE_STRLCPY),),y)

	ifeq ($(call try-cc,$(SOURCE_STRLCPY),,-DHAVE_STRLCPY),y)

		BASIC_CFLAGS += -DHAVE_STRLCPY

	endif

endif



ifndef NO_ON_EXIT

	ifeq ($(call try-cc,$(SOURCE_ON_EXIT),),y)

	ifeq ($(call try-cc,$(SOURCE_ON_EXIT),,-DHAVE_ON_EXIT),y)

		BASIC_CFLAGS += -DHAVE_ON_EXIT

	endif

endif



ifndef NO_BACKTRACE

       ifeq ($(call try-cc,$(SOURCE_BACKTRACE),),y)

       ifeq ($(call try-cc,$(SOURCE_BACKTRACE),,-DBACKTRACE_SUPPORT),y)

               BASIC_CFLAGS += -DBACKTRACE_SUPPORT

       endif

endif
@@ -1039,7 +1041,7 @@ perfexec_instdir = $(prefix)/$(perfexecdir) 
endif

perfexec_instdir_SQ = $(subst ','\'',$(perfexec_instdir))



install: all

install: all try-install-man

	$(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(bindir_SQ)'

	$(INSTALL) $(OUTPUT)perf '$(DESTDIR_SQ)$(bindir_SQ)'

	$(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(perfexec_instdir_SQ)/scripts/perl/Perf-Trace-Util/lib/Perf/Trace'
@@ -1065,6 +1067,9 @@ install-doc: 
install-man:

	$(MAKE) -C Documentation install-man



try-install-man:

	$(MAKE) -C Documentation try-install-man



install-html:

	$(MAKE) -C Documentation install-html

tools/perf/arch/common.c

0 → 100644
+178 −0
Original line number Diff line number Diff line 
#include <stdio.h>

#include <sys/utsname.h>

#include "common.h"

#include "../util/debug.h"



const char *const arm_triplets[] = {

	"arm-eabi-",

	"arm-linux-androideabi-",

	"arm-unknown-linux-",

	"arm-unknown-linux-gnu-",

	"arm-unknown-linux-gnueabi-",

	NULL

};



const char *const powerpc_triplets[] = {

	"powerpc-unknown-linux-gnu-",

	"powerpc64-unknown-linux-gnu-",

	NULL

};



const char *const s390_triplets[] = {

	"s390-ibm-linux-",

	NULL

};



const char *const sh_triplets[] = {

	"sh-unknown-linux-gnu-",

	"sh64-unknown-linux-gnu-",

	NULL

};



const char *const sparc_triplets[] = {

	"sparc-unknown-linux-gnu-",

	"sparc64-unknown-linux-gnu-",

	NULL

};



const char *const x86_triplets[] = {

	"x86_64-pc-linux-gnu-",

	"x86_64-unknown-linux-gnu-",

	"i686-pc-linux-gnu-",

	"i586-pc-linux-gnu-",

	"i486-pc-linux-gnu-",

	"i386-pc-linux-gnu-",

	"i686-linux-android-",

	"i686-android-linux-",

	NULL

};



const char *const mips_triplets[] = {

	"mips-unknown-linux-gnu-",

	"mipsel-linux-android-",

	NULL

};



static bool lookup_path(char *name)

{

	bool found = false;

	char *path, *tmp;

	char buf[PATH_MAX];

	char *env = getenv("PATH");



	if (!env)

		return false;



	env = strdup(env);

	if (!env)

		return false;



	path = strtok_r(env, ":", &tmp);

	while (path) {

		scnprintf(buf, sizeof(buf), "%s/%s", path, name);

		if (access(buf, F_OK) == 0) {

			found = true;

			break;

		}

		path = strtok_r(NULL, ":", &tmp);

	}

	free(env);

	return found;

}



static int lookup_triplets(const char *const *triplets, const char *name)

{

	int i;

	char buf[PATH_MAX];



	for (i = 0; triplets[i] != NULL; i++) {

		scnprintf(buf, sizeof(buf), "%s%s", triplets[i], name);

		if (lookup_path(buf))

			return i;

	}

	return -1;

}



static int perf_session_env__lookup_binutils_path(struct perf_session_env *env,

						  const char *name,

						  const char **path)

{

	int idx;

	char *arch, *cross_env;

	struct utsname uts;

	const char *const *path_list;

	char *buf = NULL;



	if (uname(&uts) < 0)

		goto out;



	/*

	 * We don't need to try to find objdump path for native system.

	 * Just use default binutils path (e.g.: "objdump").

	 */

	if (!strcmp(uts.machine, env->arch))

		goto out;



	cross_env = getenv("CROSS_COMPILE");

	if (cross_env) {

		if (asprintf(&buf, "%s%s", cross_env, name) < 0)

			goto out_error;

		if (buf[0] == '/') {

			if (access(buf, F_OK) == 0)

				goto out;

			goto out_error;

		}

		if (lookup_path(buf))

			goto out;

		free(buf);

	}



	arch = env->arch;



	if (!strcmp(arch, "arm"))

		path_list = arm_triplets;

	else if (!strcmp(arch, "powerpc"))

		path_list = powerpc_triplets;

	else if (!strcmp(arch, "sh"))

		path_list = sh_triplets;

	else if (!strcmp(arch, "s390"))

		path_list = s390_triplets;

	else if (!strcmp(arch, "sparc"))

		path_list = sparc_triplets;

	else if (!strcmp(arch, "x86") || !strcmp(arch, "i386") ||

		 !strcmp(arch, "i486") || !strcmp(arch, "i586") ||

		 !strcmp(arch, "i686"))

		path_list = x86_triplets;

	else if (!strcmp(arch, "mips"))

		path_list = mips_triplets;

	else {

		ui__error("binutils for %s not supported.\n", arch);

		goto out_error;

	}



	idx = lookup_triplets(path_list, name);

	if (idx < 0) {

		ui__error("Please install %s for %s.\n"

			  "You can add it to PATH, set CROSS_COMPILE or "

			  "override the default using --%s.\n",

			  name, arch, name);

		goto out_error;

	}



	if (asprintf(&buf, "%s%s", path_list[idx], name) < 0)

		goto out_error;



out:

	*path = buf;

	return 0;

out_error:

	free(buf);

	*path = NULL;

	return -1;

}



int perf_session_env__lookup_objdump(struct perf_session_env *env)

{

	return perf_session_env__lookup_binutils_path(env, "objdump",

						      &objdump_path);

}

tools/perf/arch/common.h

0 → 100644
+10 −0
Original line number Diff line number Diff line 
#ifndef ARCH_PERF_COMMON_H

#define ARCH_PERF_COMMON_H



#include "../util/session.h"



extern const char *objdump_path;



int perf_session_env__lookup_objdump(struct perf_session_env *env);



#endif /* ARCH_PERF_COMMON_H */

CRA Git | Maintained and supported by SUSTech CRA and CCSE