Skip to contentSkip to conversation

tools build: Add test for presence of __get_cpuid() gcc builtin

tip:perf/urgent tip-bot for Arnaldo Carvalho de Melo 1 participant 1 message Sep 18, 2015 perf events

lore
Share & tools
lore
#0 lore raw
Commit-ID:  b0063dbfb031a7c728ed0d9533257e8329292cf1
Gitweb:     http://git.kernel.org/tip/b0063dbfb031a7c728ed0d9533257e8329292cf1
Author:     Arnaldo Carvalho de Melo <[email protected]>
AuthorDate: Thu, 17 Sep 2015 12:54:30 -0300
Committer:  Arnaldo Carvalho de Melo <[email protected]>
CommitDate: Thu, 17 Sep 2015 13:14:35 -0300

tools build: Add test for presence of __get_cpuid() gcc builtin

The auxtrace code needed by Intel PT uses the __get_cpuid() gcc builtin, that is not present in old systems, breaking the build.

Add a test to check for that builtin and disable AUXTRACE in those systems.

[acme@rhel5 linux]$ make NO_LIBPERL=1 -C tools/perf O=/tmp/build/perf install-bin
make: Entering directory `/home/acme/git/linux/tools/perf'
BUILD: Doing 'make -j2' parallel build

Auto-detecting system features:
<SNIP>
... lzma: [ on ]
... get_cpuid: [ OFF ]
<SNIP>
config/Makefile:630: Your gcc lacks the __get_cpuid() builtin, disables support for auxtrace/Intel PT, please install a newer gcc
MKDIR /tmp/build/perf/util/
<SNIP>

This fixes the build on old systems such as RHEL/CentOS 5.11.

Cc Adrian Hunter <[email protected]>
Cc Borislav Petkov <[email protected]>
Cc David Ahern <[email protected]>
Cc Frederic Weisbecker <[email protected]>
Cc Jiri Olsa <[email protected]>
Cc Namhyung Kim <[email protected]>
Cc "Naveen N. Rao" <[email protected]>
Cc Peter Zijlstra <[email protected]>
Cc Srikar Dronamraju <[email protected]>
Cc Stephane Eranian <[email protected]>
Cc Victor Kamensky <[email protected]>
Cc Vinson Lee <[email protected]>
Cc Wang Nan <[email protected]>
---
 tools/build/Makefile.feature         | 6 ++++--
 tools/build/feature/Makefile         | 6 +++++-
 tools/build/feature/test-all.c       | 5 +++++
 tools/build/feature/test-get_cpuid.c | 7 +++++++
 tools/perf/config/Makefile           | 9 +++++++--
 5 files changed, 28 insertions(+), 5 deletions(-)
tools/build/Makefile.feature +4 -2
index 9702420..c8fe6d1 100644
@@ -52,7 +52,8 @@ FEATURE_TESTS ?=			\
 	timerfd				\
 	libdw-dwarf-unwind		\
 	zlib				\
-	lzma
+	lzma				\
+	get_cpuid
 
 FEATURE_DISPLAY ?=			\
 	dwarf				\
@@ -69,7 +70,8 @@ FEATURE_DISPLAY ?=			\
 	libunwind			\
 	libdw-dwarf-unwind		\
 	zlib				\
-	lzma
+	lzma				\
+	get_cpuid
 
 # Set FEATURE_CHECK_(C|LD)FLAGS-all for all FEATURE_TESTS features.
 # If in the future we need per-feature checks/flags for features not
tools/build/feature/Makefile +5 -1
index e13a42b..e43a297 100644
@@ -35,7 +35,8 @@ FILES=					\
 	test-compile-x32.bin		\
 	test-zlib.bin			\
 	test-lzma.bin			\
-	test-bpf.bin
+	test-bpf.bin			\
+	test-get_cpuid.bin
 
 CC := $(CROSS_COMPILE)gcc -MD
 PKG_CONFIG := $(CROSS_COMPILE)pkg-config
@@ -166,6 +167,9 @@ test-zlib.bin:
 test-lzma.bin:
 	$(BUILD) -llzma
 
+test-get_cpuid.bin:
+	$(BUILD)
+
 test-bpf.bin:
 	$(BUILD)
 
tools/build/feature/test-all.c +5 -0
index 7a8cdba..33cf6f2 100644
@@ -121,6 +121,10 @@
 # include "test-lzma.c"
 #undef main
 
+#define main main_test_get_cpuid
+# include "test-get_cpuid.c"
+#undef main
+
 int main(int argc, char *argv[])
 {
 	main_test_libpython();
@@ -148,6 +152,7 @@ int main(int argc, char *argv[])
 	main_test_zlib();
 	main_test_pthread_attr_setaffinity_np();
 	main_test_lzma();
+	main_test_get_cpuid();
 
 	return 0;
 }
tools/build/feature/test-get_cpuid.c new file +7 -0
new file mode 100644
index 0000000..d7a2c40
@@ -0,0 +1,7 @@
+#include <cpuid.h>
+
+int main(void)
+{
+	unsigned int eax = 0, ebx = 0, ecx = 0, edx = 0;
+	return __get_cpuid(0x15, &eax, &ebx, &ecx, &edx);
+}
tools/perf/config/Makefile +7 -2
index 053e65b..38a0853 100644
@@ -626,8 +626,13 @@ ifdef LIBBABELTRACE
 endif
 
 ifndef NO_AUXTRACE
-  $(call detected,CONFIG_AUXTRACE)
-  CFLAGS += -DHAVE_AUXTRACE_SUPPORT
+  ifeq ($(feature-get_cpuid), 0)
+    msg := $(warning Your gcc lacks the __get_cpuid() builtin, disables support for auxtrace/Intel PT, please install a newer gcc);
+    NO_AUXTRACE := 1
+  else
+    $(call detected,CONFIG_AUXTRACE)
+    CFLAGS += -DHAVE_AUXTRACE_SUPPORT
+  endif
 endif
 
 # Among the variables below, these: