public inbox for intel-gfx@lists.freedesktop.org
 help / color / mirror / Atom feed
From: robert.foss@collabora.com
To: daniel.vetter@ffwll.ch, daniel.stone@collabora.com,
	marius.c.vlad@intel.com, tomeu.vizoso@collabora.com,
	emil.l.velikov@gmail.com, chris@chris-wilson.co.uk
Cc: intel-gfx@lists.freedesktop.org
Subject: [PACTH i-g-t v4 04/13] benchmarks/Makefile: Don't build benchmarks that depend on libdrm_intel.
Date: Thu, 23 Jun 2016 05:34:19 -0400	[thread overview]
Message-ID: <1466674468-3001-5-git-send-email-robert.foss@collabora.com> (raw)
In-Reply-To: <1466674468-3001-1-git-send-email-robert.foss@collabora.com>

From: Robert Foss <robert.foss@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.foss@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

  parent reply	other threads:[~2016-06-23  9:34 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-06-23  9:34 [PACTH i-g-t v4 00/13] Remove compile time depencencies on libdrm_intel robert.foss
2016-06-23  9:34 ` [PACTH i-g-t v4 01/13] configure.ac: Test for libdrm_intel and build for it if present robert.foss
2016-06-23  9:34 ` [PACTH i-g-t v4 02/13] configure.ac: Harmonize HAVE_XXX flag for all drm platforms to HAVE_LIBDRM_XXX robert.foss
2016-06-23  9:34 ` [PACTH i-g-t v4 03/13] Enable HAVE_LIBDRM_INTEL unconditionally for Android robert.foss
2016-06-23  9:34 ` robert.foss [this message]
2016-06-23  9:34 ` [PACTH i-g-t v4 05/13] tools/Makefile: Don't build tools that depend on libdrm_intel robert.foss
2016-06-23  9:34 ` [PACTH i-g-t v4 06/13] tools/Makefile: Format whitespace robert.foss
2016-06-23  9:34 ` [PACTH i-g-t v4 07/13] demos/Makefile: Don't build tools that depend on libdrm_intel robert.foss
2016-06-23  9:34 ` [PACTH i-g-t v4 08/13] lib/stubs: Add stubs for intel_bufmgr robert.foss
2016-06-23  9:34 ` [PACTH i-g-t v4 09/13] demos/Makefile: Replace automake specific name of listing in Makfile.sources robert.foss
2016-06-23  9:34 ` [PACTH i-g-t v4 10/13] benchmarks/Makefile: " robert.foss
2016-06-23  9:34 ` [PACTH i-g-t v4 11/13] tools/Makefile: Replace automake specific name of listings " robert.foss
2016-06-23  9:34 ` [PACTH i-g-t v4 12/13] lib/tests/Makefile: Replace automake specific names of listings in Makefile.sources robert.foss
2016-06-23  9:34 ` [PACTH i-g-t v4 13/13] lib/Makefile: " robert.foss
2016-06-29 10:42 ` [PACTH i-g-t v4 00/13] Remove compile time depencencies on libdrm_intel Emil Velikov
2016-06-30  7:59   ` Robert Foss

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1466674468-3001-5-git-send-email-robert.foss@collabora.com \
    --to=robert.foss@collabora.com \
    --cc=chris@chris-wilson.co.uk \
    --cc=daniel.stone@collabora.com \
    --cc=daniel.vetter@ffwll.ch \
    --cc=emil.l.velikov@gmail.com \
    --cc=intel-gfx@lists.freedesktop.org \
    --cc=marius.c.vlad@intel.com \
    --cc=tomeu.vizoso@collabora.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox