diff options
Diffstat (limited to 'tools')
-rw-r--r-- | tools/perf/config/Makefile | 7 | ||||
-rw-r--r-- | tools/perf/config/feature-checks/Makefile | 7 | ||||
-rw-r--r-- | tools/perf/config/feature-checks/test-libnuma.c | 8 |
3 files changed, 18 insertions, 4 deletions
diff --git a/tools/perf/config/Makefile b/tools/perf/config/Makefile index daefe2dfacad..f39fc224b52e 100644 --- a/tools/perf/config/Makefile +++ b/tools/perf/config/Makefile | |||
@@ -101,7 +101,9 @@ $(info Testing features:) | |||
101 | $(shell make -i -j -C config/feature-checks >/dev/null 2>&1) | 101 | $(shell make -i -j -C config/feature-checks >/dev/null 2>&1) |
102 | $(info done) | 102 | $(info done) |
103 | 103 | ||
104 | FEATURE_TESTS = hello | 104 | FEATURE_TESTS = \ |
105 | hello \ | ||
106 | libnuma | ||
105 | 107 | ||
106 | $(foreach test,$(FEATURE_TESTS),$(call feature_check,$(test),$(test))) | 108 | $(foreach test,$(FEATURE_TESTS),$(call feature_check,$(test),$(test))) |
107 | 109 | ||
@@ -434,8 +436,7 @@ ifndef NO_BACKTRACE | |||
434 | endif | 436 | endif |
435 | 437 | ||
436 | ifndef NO_LIBNUMA | 438 | ifndef NO_LIBNUMA |
437 | FLAGS_LIBNUMA = $(CFLAGS) $(LDFLAGS) -lnuma | 439 | ifeq ($(feature-libnuma), 0) |
438 | ifneq ($(call try-cc,$(SOURCE_LIBNUMA),$(FLAGS_LIBNUMA),libnuma),y) | ||
439 | msg := $(warning No numa.h found, disables 'perf bench numa mem' benchmark, please install numa-libs-devel or libnuma-dev); | 440 | msg := $(warning No numa.h found, disables 'perf bench numa mem' benchmark, please install numa-libs-devel or libnuma-dev); |
440 | NO_LIBNUMA := 1 | 441 | NO_LIBNUMA := 1 |
441 | else | 442 | else |
diff --git a/tools/perf/config/feature-checks/Makefile b/tools/perf/config/feature-checks/Makefile index 4708ccadfc54..6a42ad24d64f 100644 --- a/tools/perf/config/feature-checks/Makefile +++ b/tools/perf/config/feature-checks/Makefile | |||
@@ -1,5 +1,7 @@ | |||
1 | 1 | ||
2 | FILES=test-hello | 2 | FILES= \ |
3 | test-hello \ | ||
4 | test-libnuma | ||
3 | 5 | ||
4 | CC := $(CC) -MD | 6 | CC := $(CC) -MD |
5 | 7 | ||
@@ -12,6 +14,9 @@ BUILD = $(CC) -o $(OUTPUT)$@ $@.c | |||
12 | test-hello: | 14 | test-hello: |
13 | $(BUILD) | 15 | $(BUILD) |
14 | 16 | ||
17 | test-libnuma: | ||
18 | $(BUILD) -lnuma | ||
19 | |||
15 | -include *.d */*.d | 20 | -include *.d */*.d |
16 | 21 | ||
17 | ############################### | 22 | ############################### |
diff --git a/tools/perf/config/feature-checks/test-libnuma.c b/tools/perf/config/feature-checks/test-libnuma.c new file mode 100644 index 000000000000..70510a923e5a --- /dev/null +++ b/tools/perf/config/feature-checks/test-libnuma.c | |||
@@ -0,0 +1,8 @@ | |||
1 | #include <numa.h> | ||
2 | #include <numaif.h> | ||
3 | |||
4 | int main(void) | ||
5 | { | ||
6 | numa_available(); | ||
7 | return 0; | ||
8 | } | ||