perf tools: Move arch setup into seprate Makefile
PATCH 1/2 perf tools: Move arch setup into seprate Makefile
From: "[email protected]" <[email protected]>
I need to use arch related setup in the tests/make, so moving arch setup into Makefile.arch.
--- tools/perf/config/Makefile | 52 ++++++++++++++--------------------------- tools/perf/config/Makefile.arch | 22 +++++++++++++++++ 2 files changed, 40 insertions(+), 34 deletions(-) create mode 100644 tools/perf/config/Makefile.arch
tools/perf/config/Makefile +18 -34
@@ -1,28 +1,26 @@ -uname_M := $(shell uname -m 2>/dev/null || echo not) -ARCH ?= $(shell echo $(uname_M) | sed -e s/i.86/i386/ -e s/sun4u/sparc64/ \ - -e s/arm.*/arm/ -e s/sa110/arm/ \ - -e s/s390x/s390/ -e s/parisc64/parisc/ \ - -e s/ppc.*/powerpc/ -e s/mips.*/mips/ \ - -e s/sh[234].*/sh/ -e s/aarch64.*/arm64/ ) -NO_PERF_REGS := 1 -CFLAGS := $(EXTRA_CFLAGS) $(EXTRA_WARNINGS) +ifeq ($(src-perf),) +src-perf := $(srctree)/tools/perf +endif -# Additional ARCH settings for x86 -ifeq ($(ARCH),i386) - override ARCH := x86 - NO_PERF_REGS := 0 - LIBUNWIND_LIBS = -lunwind -lunwind-x86 +ifeq ($(obj-perf),) +obj-perf := $(OUTPUT) endif -ifeq ($(ARCH),x86_64) - override ARCH := x86 - IS_X86_64 := 0 - ifeq (, $(findstring m32,$(CFLAGS))) - IS_X86_64 := $(shell echo __x86_64__ | ${CC} -E -x c - | tail -n 1) - endif +ifneq ($(obj-perf),) +obj-perf := $(abspath $(obj-perf))/ +endif + +LIB_INCLUDE := $(srctree)/tools/lib/ +CFLAGS := $(EXTRA_CFLAGS) $(EXTRA_WARNINGS) + +include $(src-perf)/config/Makefile.arch + +NO_PERF_REGS := 1 + +# Additional ARCH settings for x86 +ifeq ($(ARCH),x86) ifeq (${IS_X86_64}, 1) - RAW_ARCH := x86_64 CFLAGS += -DHAVE_ARCH_X86_64_SUPPORT ARCH_INCLUDE = ../../arch/x86/lib/memcpy_64.S ../../arch/x86/lib/memset_64.S LIBUNWIND_LIBS = -lunwind -lunwind-x86_64
@@ -64,20 +62,6 @@ ifeq ($(NO_PERF_REGS),0) CFLAGS += -DHAVE_PERF_REGS_SUPPORT endif -ifeq ($(src-perf),) -src-perf := $(srctree)/tools/perf -endif - -ifeq ($(obj-perf),) -obj-perf := $(OUTPUT) -endif - -ifneq ($(obj-perf),) -obj-perf := $(abspath $(obj-perf))/ -endif - -LIB_INCLUDE := $(srctree)/tools/lib/ - # include ARCH specific config -include $(src-perf)/arch/$(ARCH)/Makefile
tools/perf/config/Makefile.arch new file +22 -0
@@ -0,0 +1,22 @@ + +uname_M := $(shell uname -m 2>/dev/null || echo not) + +ARCH ?= $(shell echo $(uname_M) | sed -e s/i.86/i386/ -e s/sun4u/sparc64/ \ + -e s/arm.*/arm/ -e s/sa110/arm/ \ + -e s/s390x/s390/ -e s/parisc64/parisc/ \ + -e s/ppc.*/powerpc/ -e s/mips.*/mips/ \ + -e s/sh[234].*/sh/ -e s/aarch64.*/arm64/ ) + +# Additional ARCH settings for x86 +ifeq ($(ARCH),i386) + override ARCH := x86 +endif + +ifeq ($(ARCH),x86_64) + override ARCH := x86 + IS_X86_64 := 0 + ifeq (, $(findstring m32,$(CFLAGS))) + IS_X86_64 := $(shell echo __x86_64__ | ${CC} -E -x c - | tail -n 1) + RAW_ARCH := x86_64 + endif +endif
Signature · 1 line
1.8.3.1
PATCH 2/2 perf tests: Fix installation tests path setup
From: "[email protected]" <[email protected]>
Currently installation tests work only over x86_64, adding arch check to make it work over i386 as well.
NOTE looks like x86 is the only arch running tests, we need some IS_(32/64) flag to make this generic.
--- tools/perf/tests/make | 30 ++++++++++++++++++++---------- 1 file changed, 20 insertions(+), 10 deletions(-)
tools/perf/tests/make +20 -10
@@ -1,6 +1,16 @@ PERF := . MK := Makefile +include config/Makefile.arch + +# FIXME looks like x86 is the only arch running tests ;-) +# we need some IS_(32/64) flag to make this generic +ifeq ($(IS_X86_64),1) +lib = lib64 +else +lib = lib +endif + has = $(shell which $1 2>/dev/null) # standard single make variable specified
@@ -118,16 +128,16 @@ installed_files_bin := bin/perf installed_files_bin += etc/bash_completion.d/perf installed_files_bin += libexec/perf-core/perf-archive -installed_files_plugins := lib64/traceevent/plugins/plugin_cfg80211.so -installed_files_plugins += lib64/traceevent/plugins/plugin_scsi.so -installed_files_plugins += lib64/traceevent/plugins/plugin_xen.so -installed_files_plugins += lib64/traceevent/plugins/plugin_function.so -installed_files_plugins += lib64/traceevent/plugins/plugin_sched_switch.so -installed_files_plugins += lib64/traceevent/plugins/plugin_mac80211.so -installed_files_plugins += lib64/traceevent/plugins/plugin_kvm.so -installed_files_plugins += lib64/traceevent/plugins/plugin_kmem.so -installed_files_plugins += lib64/traceevent/plugins/plugin_hrtimer.so -installed_files_plugins += lib64/traceevent/plugins/plugin_jbd2.so +installed_files_plugins := $(lib)/traceevent/plugins/plugin_cfg80211.so +installed_files_plugins += $(lib)/traceevent/plugins/plugin_scsi.so +installed_files_plugins += $(lib)/traceevent/plugins/plugin_xen.so +installed_files_plugins += $(lib)/traceevent/plugins/plugin_function.so +installed_files_plugins += $(lib)/traceevent/plugins/plugin_sched_switch.so +installed_files_plugins += $(lib)/traceevent/plugins/plugin_mac80211.so +installed_files_plugins += $(lib)/traceevent/plugins/plugin_kvm.so +installed_files_plugins += $(lib)/traceevent/plugins/plugin_kmem.so +installed_files_plugins += $(lib)/traceevent/plugins/plugin_hrtimer.so +installed_files_plugins += $(lib)/traceevent/plugins/plugin_jbd2.so installed_files_all := $(installed_files_bin) installed_files_all += $(installed_files_plugins)
Signature · 1 line
1.8.3.1
tip-bot for Jiri Olsa
merge bot[tip:perf/core] perf tests: Fix installation tests path setup
perf tests: Fix installation tests path setup
Commit-ID: f7c64474242701eb24f6fe96f8df0389a2b800f7 Gitweb: http://git.kernel.org/tip/f7c64474242701eb24f6fe96f8df0389a2b800f7 Author: Jiri Olsa <[email protected]> AuthorDate: Fri, 3 Jan 2014 15:32:33 +0100 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Mon, 13 Jan 2014 10:06:23 -0300
perf tests: Fix installation tests path setup
Currently installation tests work only over x86_64, adding arch check to make it work over i386 as well.
NOTE looks like x86 is the only arch running tests, we need some IS_(32/64) flag to make this generic.
--- tools/perf/tests/make | 30 ++++++++++++++++++++---------- 1 file changed, 20 insertions(+), 10 deletions(-)
tools/perf/tests/make +20 -10
@@ -1,6 +1,16 @@ PERF := . MK := Makefile +include config/Makefile.arch + +# FIXME looks like x86 is the only arch running tests ;-) +# we need some IS_(32/64) flag to make this generic +ifeq ($(IS_X86_64),1) +lib = lib64 +else +lib = lib +endif + has = $(shell which $1 2>/dev/null) # standard single make variable specified
@@ -118,16 +128,16 @@ installed_files_bin := bin/perf installed_files_bin += etc/bash_completion.d/perf installed_files_bin += libexec/perf-core/perf-archive -installed_files_plugins := lib64/traceevent/plugins/plugin_cfg80211.so -installed_files_plugins += lib64/traceevent/plugins/plugin_scsi.so -installed_files_plugins += lib64/traceevent/plugins/plugin_xen.so -installed_files_plugins += lib64/traceevent/plugins/plugin_function.so -installed_files_plugins += lib64/traceevent/plugins/plugin_sched_switch.so -installed_files_plugins += lib64/traceevent/plugins/plugin_mac80211.so -installed_files_plugins += lib64/traceevent/plugins/plugin_kvm.so -installed_files_plugins += lib64/traceevent/plugins/plugin_kmem.so -installed_files_plugins += lib64/traceevent/plugins/plugin_hrtimer.so -installed_files_plugins += lib64/traceevent/plugins/plugin_jbd2.so +installed_files_plugins := $(lib)/traceevent/plugins/plugin_cfg80211.so +installed_files_plugins += $(lib)/traceevent/plugins/plugin_scsi.so +installed_files_plugins += $(lib)/traceevent/plugins/plugin_xen.so +installed_files_plugins += $(lib)/traceevent/plugins/plugin_function.so +installed_files_plugins += $(lib)/traceevent/plugins/plugin_sched_switch.so +installed_files_plugins += $(lib)/traceevent/plugins/plugin_mac80211.so +installed_files_plugins += $(lib)/traceevent/plugins/plugin_kvm.so +installed_files_plugins += $(lib)/traceevent/plugins/plugin_kmem.so +installed_files_plugins += $(lib)/traceevent/plugins/plugin_hrtimer.so +installed_files_plugins += $(lib)/traceevent/plugins/plugin_jbd2.so installed_files_all := $(installed_files_bin) installed_files_all += $(installed_files_plugins)
tip-bot for Jiri Olsa
merge botperf tools: Move arch setup into seprate Makefile
Commit-ID: a6cf5f39236c2ea6008a2f5cb908c3181c123096 Gitweb: http://git.kernel.org/tip/a6cf5f39236c2ea6008a2f5cb908c3181c123096 Author: Jiri Olsa <[email protected]> AuthorDate: Fri, 3 Jan 2014 15:32:32 +0100 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Mon, 13 Jan 2014 10:06:22 -0300
perf tools: Move arch setup into seprate Makefile
I need to use arch related setup in the tests/make, so moving arch setup into Makefile.arch.
--- tools/perf/config/Makefile | 52 ++++++++++++++--------------------------- tools/perf/config/Makefile.arch | 22 +++++++++++++++++ 2 files changed, 40 insertions(+), 34 deletions(-)
tools/perf/config/Makefile +18 -34
@@ -1,28 +1,26 @@ -uname_M := $(shell uname -m 2>/dev/null || echo not) -ARCH ?= $(shell echo $(uname_M) | sed -e s/i.86/i386/ -e s/sun4u/sparc64/ \ - -e s/arm.*/arm/ -e s/sa110/arm/ \ - -e s/s390x/s390/ -e s/parisc64/parisc/ \ - -e s/ppc.*/powerpc/ -e s/mips.*/mips/ \ - -e s/sh[234].*/sh/ -e s/aarch64.*/arm64/ ) -NO_PERF_REGS := 1 -CFLAGS := $(EXTRA_CFLAGS) $(EXTRA_WARNINGS) +ifeq ($(src-perf),) +src-perf := $(srctree)/tools/perf +endif -# Additional ARCH settings for x86 -ifeq ($(ARCH),i386) - override ARCH := x86 - NO_PERF_REGS := 0 - LIBUNWIND_LIBS = -lunwind -lunwind-x86 +ifeq ($(obj-perf),) +obj-perf := $(OUTPUT) endif -ifeq ($(ARCH),x86_64) - override ARCH := x86 - IS_X86_64 := 0 - ifeq (, $(findstring m32,$(CFLAGS))) - IS_X86_64 := $(shell echo __x86_64__ | ${CC} -E -x c - | tail -n 1) - endif +ifneq ($(obj-perf),) +obj-perf := $(abspath $(obj-perf))/ +endif + +LIB_INCLUDE := $(srctree)/tools/lib/ +CFLAGS := $(EXTRA_CFLAGS) $(EXTRA_WARNINGS) + +include $(src-perf)/config/Makefile.arch + +NO_PERF_REGS := 1 + +# Additional ARCH settings for x86 +ifeq ($(ARCH),x86) ifeq (${IS_X86_64}, 1) - RAW_ARCH := x86_64 CFLAGS += -DHAVE_ARCH_X86_64_SUPPORT ARCH_INCLUDE = ../../arch/x86/lib/memcpy_64.S ../../arch/x86/lib/memset_64.S LIBUNWIND_LIBS = -lunwind -lunwind-x86_64
@@ -64,20 +62,6 @@ ifeq ($(NO_PERF_REGS),0) CFLAGS += -DHAVE_PERF_REGS_SUPPORT endif -ifeq ($(src-perf),) -src-perf := $(srctree)/tools/perf -endif - -ifeq ($(obj-perf),) -obj-perf := $(OUTPUT) -endif - -ifneq ($(obj-perf),) -obj-perf := $(abspath $(obj-perf))/ -endif - -LIB_INCLUDE := $(srctree)/tools/lib/ - # include ARCH specific config -include $(src-perf)/arch/$(ARCH)/Makefile
tools/perf/config/Makefile.arch new file +22 -0
@@ -0,0 +1,22 @@ + +uname_M := $(shell uname -m 2>/dev/null || echo not) + +ARCH ?= $(shell echo $(uname_M) | sed -e s/i.86/i386/ -e s/sun4u/sparc64/ \ + -e s/arm.*/arm/ -e s/sa110/arm/ \ + -e s/s390x/s390/ -e s/parisc64/parisc/ \ + -e s/ppc.*/powerpc/ -e s/mips.*/mips/ \ + -e s/sh[234].*/sh/ -e s/aarch64.*/arm64/ ) + +# Additional ARCH settings for x86 +ifeq ($(ARCH),i386) + override ARCH := x86 +endif + +ifeq ($(ARCH),x86_64) + override ARCH := x86 + IS_X86_64 := 0 + ifeq (, $(findstring m32,$(CFLAGS))) + IS_X86_64 := $(shell echo __x86_64__ | ${CC} -E -x c - | tail -n 1) + RAW_ARCH := x86_64 + endif +endif