From: Robert Foss <robert.f...@collabora.com>
Use the HAS_INTEL automake flag to avoid building benchmarks that won't
compile unless libdrm_intel is available in the build system.
Signed-off-by: Robert Foss <robert.f...@collabora.com>
---
benchmarks/Android.mk | 4 ++++
benchmarks/Makefile.am | 5 ++++-
benchmarks/Makefile.sources | 13 ++++++++-----
3 files changed, 16 insertions(+), 6 deletions(-)
diff --git a/benchmarks/Android.mk b/benchmarks/Android.mk
index 207a177..22ecd2f 100644
--- a/benchmarks/Android.mk
+++ b/benchmarks/Android.mk
@@ -34,4 +34,8 @@ endef
benchmark_list := $(benchmarks_PROGRAMS)
+ifeq ($(HAVE_LIBDRM_INTEL),true)
+ benchmark_list += $(LIBDRM_INTEL_BENCHMARKS)
+endif
+
$(foreach item,$(benchmark_list),$(eval $(call add_benchmark,$(item))))
diff --git a/benchmarks/Makefile.am b/benchmarks/Makefile.am
index 49d2f64..7400dd0 100644
--- a/benchmarks/Makefile.am
+++ b/benchmarks/Makefile.am
@@ -1,6 +1,9 @@
-
include Makefile.sources
+if HAVE_LIBDRM_INTEL
+ benchmarks_PROGRAMS += $(LIBDRM_INTEL_BENCHMARKS)
+endif
+
AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/lib
AM_CFLAGS = $(DRM_CFLAGS) $(CWARNFLAGS) $(CAIRO_CFLAGS) $(LIBUNWIND_CFLAGS) \
$(WERROR_CFLAGS)
diff --git a/benchmarks/Makefile.sources b/benchmarks/Makefile.sources
index bc4f2b5..5804d3b 100644
--- a/benchmarks/Makefile.sources
+++ b/benchmarks/Makefile.sources
@@ -1,10 +1,6 @@
benchmarksdir=$(libexecdir)/intel-gpu-tools/benchmarks
benchmarks_PROGRAMS = \
- intel_upload_blit_large \
- intel_upload_blit_large_gtt \
- intel_upload_blit_large_map \
- intel_upload_blit_small \
gem_blt \
gem_create \
gem_exec_ctx \
@@ -17,6 +13,13 @@ benchmarks_PROGRAMS = \
gem_prw \
gem_set_domain \
gem_syslatency \
- gem_userptr_benchmark \
kms_vblank \
$(NULL)
+
+LIBDRM_INTEL_BENCHMARKS = \
+ intel_upload_blit_large \
+ intel_upload_blit_large_gtt \
+ intel_upload_blit_large_map \
+ intel_upload_blit_small \
+ gem_userptr_benchmark \
+ $(NULL)
--
2.7.4
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
