Skip to contentSkip to conversation

Remove compile time depencencies on libdrm_intel.

PATCH Superseded [email protected] 2 participants 16 messages Jun 23, 2016 – Jun 30, 2016 Library code

v4 of 5 Superseded Latest is v5 →

lore
Share & tools
lore
#0 lore raw

v4 cover Remove compile time depencencies on libdrm_intel.

From: Robert Foss <[email protected]>

Hey,

I've been looking at the possibilty of removing the compile time depency on libdrm_intel. There are two technical solutions to this problem as far as I can see; stubs and conditional compilation.

This series uses the stubbing approach.

Changes since v1:
- Replaced the automake flags HAVE_VC4/NOUVEAU/INTEL with HAVE_LIBDRM_XXX.
- Move conditionals from Makefile.sources to Arduino.mk/Makefile.am.
- Removed duplicated i915_drm.h symbols from intel_drm_stubs.h.
- Replaced igt_require with igt_require_f to communicate stubs being the cause of failure.
- Rename intel_drm_stubs to intel_bufmgr.
- Moved intel_bufmgr to lib/stubs/drm.
- Remove header inclusion changes in favor for inclusion of stubs in lib/stubs/drm using build scripts.
- Rebased on trunk.

Changes since v2:
- Removed conditional compilation from intel_bufmgr.h.
- Enable HAVE_LIBDRM_INTEL on android platforms.
- Remove unnecessary whitespace.
- Remove unnecessary inclusion of C files.
- De-duplicated intel_bufmgr.c error string.
- Changed Makefile.sources variable names to be non-automake specific

Changes since v3:
- Added signoff to two commits.
- Changed automake if not statement.
- Removed accidental space character.
- Copied in new copy of intel_bufmgr.h
- Improved wording of lib/stubs/drm/README.

Robert Foss (13):
configure.ac: Test for libdrm_intel and build for it if present. configure.ac: Harmonize HAVE_XXX flag for all drm platforms to
HAVE_LIBDRM_XXX.
Enable HAVE_LIBDRM_INTEL unconditionally for Android. benchmarks/Makefile: Don't build benchmarks that depend on
libdrm_intel.
tools/Makefile: Don't build tools that depend on libdrm_intel. tools/Makefile: Format whitespace.
demos/Makefile: Don't build tools that depend on libdrm_intel. lib/stubs: Add stubs for intel_bufmgr.
demos/Makefile: Replace automake specific name of listing in
Makfile.sources
benchmarks/Makefile: Replace automake specific name of listing in
Makfile.sources
tools/Makefile: Replace automake specific name of listings in
Makfile.sources
lib/tests/Makefile: Replace automake specific names of listings in
Makefile.sources
lib/Makefile: Replace automake specific names of listings in
Makefile.sources

 Android.mk                   |   2 +
 benchmarks/Android.mk        |   6 +-
 benchmarks/Makefile.am       |   7 +-
 benchmarks/Makefile.sources  |  15 +-
 configure.ac                 |  25 +++-
 demos/Android.mk             |   5 +-
 demos/Makefile.am            |  10 +-
 demos/Makefile.sources       |   7 +
 lib/Android.mk               |   2 +-
 lib/Makefile.am              |  10 +-
 lib/Makefile.sources         |   2 +-
 lib/stubs/drm/README         |   4 +
 lib/stubs/drm/intel_bufmgr.c | 269 ++++++++++++++++++++++++++++++++++++
 lib/stubs/drm/intel_bufmgr.h | 321 +++++++++++++++++++++++++++++++++++++++++++
 lib/tests/Android.mk         |   2 +-
 lib/tests/Makefile.am        |   3 +
 lib/tests/Makefile.sources   |   8 +-
 tests/Makefile.am            |   4 +-
 tools/Android.mk             |   6 +
 tools/Makefile.am            |   7 +
 tools/Makefile.sources       |  73 +++++-----
 21 files changed, 723 insertions(+), 65 deletions(-)
 create mode 100644 demos/Makefile.sources
 create mode 100644 lib/stubs/drm/README
 create mode 100644 lib/stubs/drm/intel_bufmgr.c
 create mode 100644 lib/stubs/drm/intel_bufmgr.h
Signature · 6 lines
2.7.4

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#1 lore raw

PATCH v4 1/13 configure.ac: Test for libdrm_intel and build for it if present.

From: Robert Foss <[email protected]>

Test for libdrm_intel and build for it if present.
Also expose the HAVE_INTEL #define to allow code to be conditionally compiled.

---
 configure.ac | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)
configure.ac +16 -1
index 0405c8b..49903e4 100644
@@ -100,7 +100,7 @@ if test "x$GCC" = "xyes"; then
 fi
 AC_SUBST(ASSEMBLER_WARN_CFLAGS)
 
-PKG_CHECK_MODULES(DRM, [libdrm_intel >= 2.4.64 libdrm])
+PKG_CHECK_MODULES(DRM, [libdrm])
 PKG_CHECK_MODULES(PCIACCESS, [pciaccess >= 0.10])
 
 case "$target_cpu" in
@@ -150,6 +150,21 @@ PKG_CHECK_MODULES(GLIB, glib-2.0)
 # -----------------------------------------------------------------------------
 #			Configuration options
 # -----------------------------------------------------------------------------
+AC_ARG_ENABLE(intel, AS_HELP_STRING([--disable-intel],
+	      [Enable building of intel specific parts (default: auto)]),
+	      [INTEL=$enableval], [INTEL=auto])
+if test "x$INTEL" = xauto; then
+	PKG_CHECK_EXISTS([libdrm_intel >= 2.4.64], [INTEL=yes], [INTEL=no])
+fi
+if test "x$INTEL" = xyes; then
+	PKG_CHECK_MODULES(DRM_INTEL, [libdrm_intel >= 2.4.64])
+	AC_DEFINE(HAVE_LIBDRM_INTEL, 1, [Have intel support])
+else
+       DRM_INTEL_CFLAGS=$(top_srcdir)/lib/stubs/drm/
+       AC_SUBST([DRM_INTEL_CFLAGS])
+fi
+AM_CONDITIONAL(HAVE_LIBDRM_INTEL, [test "x$INTEL" = xyes])
+
 # for dma-buf tests
 AC_ARG_ENABLE(nouveau, AS_HELP_STRING([--disable-nouveau],
 	      [Enable use of nouveau API for prime tests (default: auto)]),
Signature · 6 lines
2.7.4

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#2 lore raw

PATCH v4 2/13 configure.ac: Harmonize HAVE_XXX flag for all drm platforms to HAVE_LIBDRM_XXX.

In reply to [email protected]

From: Robert Foss <[email protected]>

Replace the automake flag HAVE_XXX for VC4/NOUVEAU with HAVE_LIBDRM_XXX in order for the flags to be more descriptive and also follow the same convention as HAVE_LIBDRM_INTEL.

---
 configure.ac      | 8 ++++----
 lib/Makefile.am   | 2 +-
 tests/Makefile.am | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)
configure.ac +4 -4
index 49903e4..a6210ae 100644
@@ -174,9 +174,9 @@ if test "x$NOUVEAU" = xauto; then
 fi
 if test "x$NOUVEAU" = xyes; then
 	PKG_CHECK_MODULES(DRM_NOUVEAU, [libdrm_nouveau >= 2.4.33])
-	AC_DEFINE(HAVE_NOUVEAU, 1, [Have nouveau support])
+	AC_DEFINE(HAVE_LIBDRM_NOUVEAU, 1, [Have nouveau support])
 fi
-AM_CONDITIONAL(HAVE_NOUVEAU, [test "x$NOUVEAU" = xyes])
+AM_CONDITIONAL(HAVE_LIBDRM_NOUVEAU, [test "x$NOUVEAU" = xyes])
 
 AC_ARG_ENABLE(vc4, AS_HELP_STRING([--disable-vc4],
 	      [Enable building of vc4 tests (default: auto)]),
@@ -186,9 +186,9 @@ if test "x$VC4" = xauto; then
 fi
 if test "x$VC4" = xyes; then
 	PKG_CHECK_MODULES(DRM_VC4, [libdrm_vc4])
-	AC_DEFINE(HAVE_VC4, 1, [Have vc4 support])
+	AC_DEFINE(HAVE_LIBDRM_VC4, 1, [Have vc4 support])
 fi
-AM_CONDITIONAL(HAVE_VC4, [test "x$VC4" = xyes])
+AM_CONDITIONAL(HAVE_LIBDRM_VC4, [test "x$VC4" = xyes])
 
 # Define a configure option for the shader debugger
 AC_ARG_ENABLE(shader-debugger, AS_HELP_STRING([--enable-shader-debugger],
lib/Makefile.am +1 -1
index d2f2e16..d2ae98d 100644
@@ -8,7 +8,7 @@ include Makefile.sources
 noinst_LTLIBRARIES = libintel_tools.la
 noinst_HEADERS = check-ndebug.h
 
-if HAVE_VC4
+if HAVE_LIBDRM_VC4
     libintel_tools_la_SOURCES += 	\
         igt_vc4.c			\
         igt_vc4.h
tests/Makefile.am +2 -2
index c2c2025..737afbe 100644
@@ -1,10 +1,10 @@
 include Makefile.sources
 
-if HAVE_NOUVEAU
+if HAVE_LIBDRM_NOUVEAU
     TESTS_progs_M += $(NOUVEAU_TESTS_M)
 endif
 
-if HAVE_VC4
+if HAVE_LIBDRM_VC4
     TESTS_progs_M += $(VC4_TESTS_M)
 endif
 
Signature · 6 lines
2.7.4

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#3 lore raw

PATCH v4 3/13 Enable HAVE_LIBDRM_INTEL unconditionally for Android.

In reply to [email protected]

From: Robert Foss <[email protected]>

Always set HAVE_LIBDRM_INTEL to true for Android targets.

---
 Android.mk | 2 ++
 1 file changed, 2 insertions(+)
Android.mk +2 -0
index 681d114..3690fc5 100644
@@ -1,2 +1,4 @@
+HAVE_LIBDRM_INTEL := true
+
 include $(call all-named-subdir-makefiles, lib tests tools benchmarks)
 
Signature · 6 lines
2.7.4

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#4 lore raw

PATCH v4 4/13 benchmarks/Makefile: Don't build benchmarks that depend on libdrm_intel.

In reply to [email protected]

From: Robert Foss <[email protected]>

Use the HAS_INTEL automake flag to avoid building benchmarks that won't compile unless libdrm_intel is available in the build system.

---
 benchmarks/Android.mk       |  4 ++++
 benchmarks/Makefile.am      |  5 ++++-
 benchmarks/Makefile.sources | 13 ++++++++-----
 3 files changed, 16 insertions(+), 6 deletions(-)
benchmarks/Android.mk +4 -0
index 207a177..22ecd2f 100644
@@ -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))))
benchmarks/Makefile.am +4 -1
index 49d2f64..7400dd0 100644
@@ -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)
benchmarks/Makefile.sources +8 -5
index bc4f2b5..5804d3b 100644
@@ -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)
Signature · 6 lines
2.7.4

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#5 lore raw

PATCH v4 5/13 tools/Makefile: Don't build tools that depend on libdrm_intel.

In reply to [email protected]

From: Robert Foss <[email protected]>

Use the HAS_INTEL automake flag to avoid building tools that won't compile unless libdrm_intel is available in the build system.

---
 tools/Android.mk       |  5 +++++
 tools/Makefile.am      |  5 +++++
 tools/Makefile.sources | 16 ++++++----------
 3 files changed, 16 insertions(+), 10 deletions(-)
tools/Android.mk +5 -0
index 5f64184..306a4b5 100644
@@ -67,6 +67,11 @@ ifneq ("${ANDROID_HAS_CAIRO}", "1")
     skip_tools_list += intel_residency
 endif
 
+ifeq ($(HAVE_LIBDRM_INTEL),true)
+    bin_PROGRAMS += $(LIBDRM_INTEL_BIN)
+    intel_error_decode_LDFLAGS = -lz
+endif
+
 tools_list := $(filter-out $(skip_tools_list),$(bin_PROGRAMS))
 
 $(foreach item,$(tools_list),$(eval $(call add_tool,$(item))))
tools/Makefile.am +5 -0
index 5f45144..f8ac0d8 100644
@@ -1,5 +1,10 @@
 include Makefile.sources
 
+if HAVE_LIBDRM_INTEL
+	bin_PROGRAMS += $(LIBDRM_INTEL_BIN)
+	intel_error_decode_LDFLAGS = -lz
+endif
+
 SUBDIRS = null_state_gen registers
 
 AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/lib
tools/Makefile.sources +6 -10
index 5d5958d..07d8d9b 100644
@@ -13,11 +13,8 @@ bin_PROGRAMS = 				\
 	intel_bios_reader 		\
 	intel_display_crc		\
 	intel_display_poller		\
-	intel_dump_decode 		\
-	intel_error_decode 		\
 	intel_forcewaked		\
 	intel_gpu_frequency		\
-	intel_framebuffer_dump 		\
 	intel_firmware_decode		\
 	intel_gpu_time 			\
 	intel_gpu_top 			\
@@ -27,7 +24,6 @@ bin_PROGRAMS = 				\
 	intel_lid			\
 	intel_opregion_decode		\
 	intel_panel_fitter		\
-	intel_perf_counters		\
 	intel_reg_checker 		\
 	intel_residency			\
 	intel_stepping 			\
@@ -35,8 +31,12 @@ bin_PROGRAMS = 				\
 
 dist_bin_SCRIPTS = intel_gpu_abrt
 
-intel_dump_decode_SOURCES = 	\
-	intel_dump_decode.c
+LIBDRM_INTEL_BIN =		\
+	intel_dump_decode	\
+	intel_error_decode	\
+	intel_framebuffer_dump	\
+	intel_perf_counters	\
+	$(NULL)
 
 intel_reg_SOURCES =		\
 	intel_reg.c		\
@@ -44,10 +44,6 @@ intel_reg_SOURCES =		\
 	intel_reg_spec.c	\
 	intel_reg_spec.h
 
-intel_error_decode_SOURCES =	\
-	intel_error_decode.c
-intel_error_decode_LDFLAGS = -lz
-
 intel_bios_reader_SOURCES =	\
 	intel_bios_reader.c	\
 	intel_bios.h
Signature · 6 lines
2.7.4

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#6 lore raw

PATCH v4 6/13 tools/Makefile: Format whitespace.

In reply to [email protected]

From: Robert Foss <[email protected]>

Harmonize tabs/spaces etc.

---
 tools/Makefile.sources | 57 +++++++++++++++++++++++++-------------------------
 1 file changed, 29 insertions(+), 28 deletions(-)
tools/Makefile.sources +29 -28
index 07d8d9b..7ed5fe5 100644
@@ -1,33 +1,34 @@
-noinst_PROGRAMS = \
-	hsw_compute_wrpll \
-	skl_compute_wrpll \
-	skl_ddb_allocation \
+noinst_PROGRAMS =		\
+	hsw_compute_wrpll	\
+	skl_compute_wrpll	\
+	skl_ddb_allocation	\
 	$(NULL)
 
-bin_PROGRAMS = 				\
-	igt_stats			\
-	intel_audio_dump 		\
-	intel_reg			\
-	intel_backlight 		\
-	intel_bios_dumper 		\
-	intel_bios_reader 		\
-	intel_display_crc		\
-	intel_display_poller		\
-	intel_forcewaked		\
-	intel_gpu_frequency		\
-	intel_firmware_decode		\
-	intel_gpu_time 			\
-	intel_gpu_top 			\
-	intel_gtt 			\
-	intel_infoframes		\
-	intel_l3_parity			\
-	intel_lid			\
-	intel_opregion_decode		\
-	intel_panel_fitter		\
-	intel_reg_checker 		\
-	intel_residency			\
-	intel_stepping 			\
-	intel_watermark
+bin_PROGRAMS =			\
+	igt_stats		\
+	intel_audio_dump	\
+	intel_reg		\
+	intel_backlight		\
+	intel_bios_dumper	\
+	intel_bios_reader	\
+	intel_display_crc	\
+	intel_display_poller	\
+	intel_forcewaked	\
+	intel_gpu_frequency	\
+	intel_firmware_decode	\
+	intel_gpu_time		\
+	intel_gpu_top		\
+	intel_gtt		\
+	intel_infoframes	\
+	intel_l3_parity		\
+	intel_lid		\
+	intel_opregion_decode	\
+	intel_panel_fitter	\
+	intel_reg_checker	\
+	intel_residency		\
+	intel_stepping		\
+	intel_watermark		\
+	$(NULL)
 
 dist_bin_SCRIPTS = intel_gpu_abrt
 
Signature · 6 lines
2.7.4

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#7 lore raw

PATCH v4 7/13 demos/Makefile: Don't build tools that depend on libdrm_intel.

In reply to [email protected]

From: Robert Foss <[email protected]>

Use the HAS_INTEL automake flag to avoid building tools that won't compile unless libdrm_intel is available in the build system.

---
 demos/Android.mk       | 5 ++++-
 demos/Makefile.am      | 8 +++++---
 demos/Makefile.sources | 7 +++++++
 3 files changed, 16 insertions(+), 4 deletions(-)
 create mode 100644 demos/Makefile.sources
demos/Android.mk +4 -1
index 7d06c9a..add2414 100644
@@ -4,8 +4,11 @@ LOCAL_PATH := $(call my-dir)
 
 include $(CLEAR_VARS)
 
-LOCAL_SRC_FILES := intel_sprite_on.c
+LOCAL_SRC_FILES :=
 
+ifeq ($(HAVE_LIBDRM_INTEL),true)
+    LOCAL_SRC_FILES += $(LIBDRM_INTEL_BIN)
+endif
 
 LOCAL_CFLAGS += -DHAVE_TERMIOS_H
 LOCAL_CFLAGS += -DANDROID -UNDEBUG
demos/Makefile.am +5 -3
index f5725f4..48eb6c2 100644
@@ -1,6 +1,8 @@
-bin_PROGRAMS = 				\
-	intel_sprite_on			\
-	$(NULL)
+include Makefile.sources
+
+if HAVE_LIBDRM_INTEL
+	bin_PROGRAMS += $(LIBDRM_INTEL_BIN)
+endif
 
 AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/lib
 AM_CFLAGS = $(DRM_CFLAGS) $(PCIACCESS_CFLAGS) $(CWARNFLAGS) \
demos/Makefile.sources new file +7 -0
new file mode 100644
index 0000000..302f6d9
@@ -0,0 +1,7 @@
+bin_PROGRAMS =			\
+	$(NULL)
+
+HAVE_LIBDRM_INTEL_BIN =		\
+	intel_sprite_on		\
+	$(NULL)
+
Signature · 6 lines
2.7.4

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#8 lore raw

PATCH v4 8/13 lib/stubs: Add stubs for intel_bufmgr.

In reply to [email protected]

From: Robert Foss <[email protected]>

This patch provides stubs for functionality otherwise provided by intel_bufmgr.

The stubbed functions all fail with a call to igt_require_f(false,""). Defines and enums have been copied from libdrm_intel.

Due to the stubbed tests failing with an igt_require_f() call, these stubs are not well suited for non-tests, since tools/benchmarks/etc 'skipping' execution is unhelpful.

---
 lib/Makefile.am              |   6 +
 lib/stubs/drm/README         |   4 +
 lib/stubs/drm/intel_bufmgr.c | 269 ++++++++++++++++++++++++++++++++++++
 lib/stubs/drm/intel_bufmgr.h | 321 +++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 600 insertions(+)
 create mode 100644 lib/stubs/drm/README
 create mode 100644 lib/stubs/drm/intel_bufmgr.c
 create mode 100644 lib/stubs/drm/intel_bufmgr.h
lib/Makefile.am +6 -0
index d2ae98d..365d7d9 100644
@@ -14,6 +14,12 @@ if HAVE_LIBDRM_VC4
         igt_vc4.h
 endif
 
+if !HAVE_LIBDRM_INTEL
+    libintel_tools_la_SOURCES += 	\
+        stubs/drm/intel_bufmgr.c	\
+        stubs/drm/intel_bufmgr.h
+endif
+
 AM_CPPFLAGS = -I$(top_srcdir)
 AM_CFLAGS = $(CWARNFLAGS) $(DRM_CFLAGS) $(PCIACCESS_CFLAGS) $(LIBUNWIND_CFLAGS) $(DEBUG_CFLAGS) \
 	    -DIGT_SRCDIR=\""$(abs_top_srcdir)/tests"\" \
lib/stubs/drm/README new file +4 -0
new file mode 100644
index 0000000..79f2b5f
@@ -0,0 +1,4 @@
+intel_bufmgr.h is a local copy of the file provided by libdrm (intel/intel_bufmgr.h).
+
+Before releasing i-g-t a current copy of intel_bufmgr.h should be copied into
+this directory of i-g-t.
lib/stubs/drm/intel_bufmgr.c new file +269 -0

269 lines not on this page · raw message

lib/stubs/drm/intel_bufmgr.h new file +321 -0

321 lines not on this page · raw message

Signature · 6 lines
2.7.4

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#9 lore raw

PATCH v4 9/13 demos/Makefile: Replace automake specific name of listing in Makfile.sources

In reply to [email protected]

From: Robert Foss <[email protected]>

Replace the automake specific name of listings in Makefile.sources with something not automake specific.

---
 demos/Android.mk       | 2 +-
 demos/Makefile.am      | 2 ++
 demos/Makefile.sources | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)
demos/Android.mk +1 -1
index add2414..90d8b37 100644
@@ -4,7 +4,7 @@ LOCAL_PATH := $(call my-dir)
 
 include $(CLEAR_VARS)
 
-LOCAL_SRC_FILES :=
+LOCAL_SRC_FILES := $(demos_prog_lists)
 
 ifeq ($(HAVE_LIBDRM_INTEL),true)
     LOCAL_SRC_FILES += $(LIBDRM_INTEL_BIN)
demos/Makefile.am +2 -0
index 48eb6c2..fe0ff1f 100644
@@ -1,5 +1,7 @@
 include Makefile.sources
 
+bin_PROGRAMS = $(demos_prog_list)
+
 if HAVE_LIBDRM_INTEL
 	bin_PROGRAMS += $(LIBDRM_INTEL_BIN)
 endif
demos/Makefile.sources +1 -1
index 302f6d9..31f7f83 100644
@@ -1,4 +1,4 @@
-bin_PROGRAMS =			\
+demos_prog_list =		\
 	$(NULL)
 
 HAVE_LIBDRM_INTEL_BIN =		\
Signature · 6 lines
2.7.4

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#10 lore raw

PATCH v4 10/13 benchmarks/Makefile: Replace automake specific name of listing in Makfile.sources

In reply to [email protected]

From: Robert Foss <[email protected]>

Replace the automake specific name of listings in Makefile.sources with something not automake specific.

---
 benchmarks/Android.mk       | 2 +-
 benchmarks/Makefile.am      | 2 ++
 benchmarks/Makefile.sources | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)
benchmarks/Android.mk +1 -1
index 22ecd2f..147f5db 100644
@@ -32,7 +32,7 @@ endef
 
 #================#
 
-benchmark_list := $(benchmarks_PROGRAMS)
+benchmark_list := $(benchmarks_prog_list)
 
 ifeq ($(HAVE_LIBDRM_INTEL),true)
     benchmark_list += $(LIBDRM_INTEL_BENCHMARKS)
benchmarks/Makefile.am +2 -0
index 7400dd0..8ae3cb3 100644
@@ -1,5 +1,7 @@
 include Makefile.sources
 
+benchmarks_PROGRAMS = $(benchmarks_prog_list)
+
 if HAVE_LIBDRM_INTEL
 	benchmarks_PROGRAMS += $(LIBDRM_INTEL_BENCHMARKS)
 endif
benchmarks/Makefile.sources +1 -1
index 5804d3b..8fb342a 100644
@@ -1,6 +1,6 @@
 benchmarksdir=$(libexecdir)/intel-gpu-tools/benchmarks
 
-benchmarks_PROGRAMS =			\
+benchmarks_prog_list =			\
 	gem_blt				\
 	gem_create			\
 	gem_exec_ctx			\
Signature · 6 lines
2.7.4

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#11 lore raw

PATCH v4 11/13 tools/Makefile: Replace automake specific name of listings in Makfile.sources

In reply to [email protected]

From: Robert Foss <[email protected]>

Replace the automake specific names of listings in Makefile.sources with something not automake specific.

---
 tools/Android.mk       | 1 +
 tools/Makefile.am      | 2 ++
 tools/Makefile.sources | 2 +-
 3 files changed, 4 insertions(+), 1 deletion(-)
tools/Android.mk +1 -0
index 306a4b5..6cdedeb 100644
@@ -55,6 +55,7 @@ endef
 $(shell mkdir -p $(TARGET_OUT_VENDOR)/$(LOCAL_TOOLS_DIR)/registers)
 $(shell cp $(LOCAL_PATH)/registers/* $(TARGET_OUT_VENDOR)/$(LOCAL_TOOLS_DIR)/registers)
 
+bin_PROGRAMS := $(tools_prog_lists)
 
 skip_tools_list := \
     intel_framebuffer_dump \
tools/Makefile.am +2 -0
index f8ac0d8..d324321 100644
@@ -1,5 +1,7 @@
 include Makefile.sources
 
+bin_PROGRAMS = $(tools_prog_lists)
+
 if HAVE_LIBDRM_INTEL
 	bin_PROGRAMS += $(LIBDRM_INTEL_BIN)
 	intel_error_decode_LDFLAGS = -lz
tools/Makefile.sources +1 -1
index 7ed5fe5..2bb6c8e 100644
@@ -4,7 +4,7 @@ noinst_PROGRAMS =		\
 	skl_ddb_allocation	\
 	$(NULL)
 
-bin_PROGRAMS =			\
+tools_prog_lists =		\
 	igt_stats		\
 	intel_audio_dump	\
 	intel_reg		\
Signature · 6 lines
2.7.4

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#12 lore raw

PATCH v4 12/13 lib/tests/Makefile: Replace automake specific names of listings in Makefile.sources

In reply to [email protected]

From: Robert Foss <[email protected]>

Replace the automake specific names of listings with something that isn't automake specific.

---
 lib/tests/Android.mk       | 2 +-
 lib/tests/Makefile.am      | 3 +++
 lib/tests/Makefile.sources | 8 ++++----
 3 files changed, 8 insertions(+), 5 deletions(-)
lib/tests/Android.mk +1 -1
index df8e159..026f17f 100644
@@ -37,5 +37,5 @@ IGT_LOCAL_C_INCLUDES += ${ANDROID_BUILD_TOP}/external/PRIVATE/drm/include/drm
 IGT_LOCAL_STATIC_LIBRARIES := libintel_gpu_tools
 IGT_LOCAL_SHARED_LIBRARIES := libpciaccess libdrm libdrm_intel
 
-$(foreach item,$(check_PROGRAMS),$(eval $(call add_test,$(item))))
+$(foreach item,$($(check_prog_list)),$(eval $(call add_test,$(item))))
 
lib/tests/Makefile.am +3 -0
index 582cc3e..c2fa2eb 100644
@@ -1,5 +1,8 @@
 include Makefile.sources
 
+check_PROGRAMS = $(check_prog_list)
+check_SCRIPTS = $(check_script_list)
+
 AM_TESTS_ENVIRONMENT = \
 	top_builddir=$(top_builddir) \
 	top_srcdir=$(top_srcdir)
lib/tests/Makefile.sources +4 -4
index 707c445..5d8c785 100644
@@ -1,4 +1,4 @@
-check_PROGRAMS = \
+check_prog_list = \
 	igt_no_exit \
 	igt_no_exit_list_only \
 	igt_fork_helper \
@@ -15,13 +15,13 @@ check_PROGRAMS = \
 	igt_exit_handler \
 	$(NULL)
 
-check_SCRIPTS = \
+check_script_list = \
 	igt_command_line.sh \
 	$(NULL)
 
 TESTS = \
-	$(check_PROGRAMS) \
-	$(check_SCRIPTS) \
+	$(check_prog_list) \
+	$(check_script_list) \
 	$(NULL)
 
 # Test that exercise specific asserts in the test framework library and are
Signature · 6 lines
2.7.4

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#13 lore raw

PATCH v4 13/13 lib/Makefile: Replace automake specific names of listings in Makefile.sources

In reply to [email protected]

From: Robert Foss <[email protected]>

Replace the automake specific variable names for listings in Makefile.sources with something not automake specific.

---
 lib/Android.mk       | 2 +-
 lib/Makefile.am      | 2 ++
 lib/Makefile.sources | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)
lib/Android.mk +1 -1
index badec1e..eb72f84 100644
@@ -44,7 +44,7 @@ skip_lib_list := \
     -DANDROID_HAS_CAIRO=0
 endif
 
-LOCAL_SRC_FILES := $(filter-out $(skip_lib_list),$(libintel_tools_la_SOURCES))
+LOCAL_SRC_FILES := $(filter-out $(skip_lib_list),$(lib_source_list))
 
 include $(BUILD_STATIC_LIBRARY)
 
lib/Makefile.am +2 -0
index 365d7d9..4c0893d 100644
@@ -5,6 +5,8 @@ SUBDIRS = . tests
 
 include Makefile.sources
 
+libintel_tools_la_SOURCES = $(lib_source_list)
+
 noinst_LTLIBRARIES = libintel_tools.la
 noinst_HEADERS = check-ndebug.h
 
lib/Makefile.sources +1 -1
index f50ff4d..3cc33f4 100644
@@ -1,4 +1,4 @@
-libintel_tools_la_SOURCES = 	\
+lib_source_list =	 	\
 	debug.h			\
 	drmtest.c		\
 	drmtest.h		\
Signature · 6 lines
2.7.4

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Reviewed-by on the v4 series
#14 lore raw
In reply to [email protected]
Quoted 31 lines · On 23 June 2016 at 10:34, <[email protected]> wrote:

From: Robert Foss <[email protected]>

Hey,

I've been looking at the possibilty of removing the compile time depency on libdrm_intel. There are two technical solutions to this problem as far as I can see; stubs and conditional compilation.

This series uses the stubbing approach.

Changes since v1:
- Replaced the automake flags HAVE_VC4/NOUVEAU/INTEL with HAVE_LIBDRM_XXX.
- Move conditionals from Makefile.sources to Arduino.mk/Makefile.am.
- Removed duplicated i915_drm.h symbols from intel_drm_stubs.h.
- Replaced igt_require with igt_require_f to communicate stubs being the cause of failure.
- Rename intel_drm_stubs to intel_bufmgr.
- Moved intel_bufmgr to lib/stubs/drm.
- Remove header inclusion changes in favor for inclusion of stubs in lib/stubs/drm using build scripts.
- Rebased on trunk.

Changes since v2:
- Removed conditional compilation from intel_bufmgr.h.
- Enable HAVE_LIBDRM_INTEL on android platforms.
- Remove unnecessary whitespace.
- Remove unnecessary inclusion of C files.
- De-duplicated intel_bufmgr.c error string.
- Changed Makefile.sources variable names to be non-automake specific

Quoted 7 lines

Changes since v3:
- Added signoff to two commits.
- Changed automake if not statement.
- Removed accidental space character.
- Copied in new copy of intel_bufmgr.h
- Improved wording of lib/stubs/drm/README.

Just an idea/suggestion for the future, not sure if it's normal approach in IGT:
Adding the detailed change log to the respective patch (be that before or after the --- line) as opposed to here is better IMHO. It provides provides direct, quick and easy feedback to the reviewer.

Something that just hit me - 1/13 should only do "check for libdrm_intel and error otherwise. set the AC_CONDITIONAL()" with the actual "allow libdrm_intel less systems to build IGT" patch coming after the stubs were introduced.

As-is building w/o libdrm_intel will be allowed, yet broken through the series, which shouldn't be an issue here. Just something worth mentioning for future work.

As-is the series is

-Emil
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#15 lore raw
Quoted 39 lines · Emil Velikov
Quoted 31 lines · On 23 June 2016 at 10:34, <[email protected]> wrote:

From: Robert Foss <[email protected]>

Hey,

I've been looking at the possibilty of removing the compile time depency on libdrm_intel. There are two technical solutions to this problem as far as I can see; stubs and conditional compilation.

This series uses the stubbing approach.

Changes since v1:
- Replaced the automake flags HAVE_VC4/NOUVEAU/INTEL with HAVE_LIBDRM_XXX.
- Move conditionals from Makefile.sources to Arduino.mk/Makefile.am.
- Removed duplicated i915_drm.h symbols from intel_drm_stubs.h.
- Replaced igt_require with igt_require_f to communicate stubs being the cause of failure.
- Rename intel_drm_stubs to intel_bufmgr.
- Moved intel_bufmgr to lib/stubs/drm.
- Remove header inclusion changes in favor for inclusion of stubs in lib/stubs/drm using build scripts.
- Rebased on trunk.

Changes since v2:
- Removed conditional compilation from intel_bufmgr.h.
- Enable HAVE_LIBDRM_INTEL on android platforms.
- Remove unnecessary whitespace.
- Remove unnecessary inclusion of C files.
- De-duplicated intel_bufmgr.c error string.
- Changed Makefile.sources variable names to be non-automake specific

Quoted 7 lines

Changes since v3:
- Added signoff to two commits.
- Changed automake if not statement.
- Removed accidental space character.
- Copied in new copy of intel_bufmgr.h
- Improved wording of lib/stubs/drm/README.

Quoted 4 lines

Just an idea/suggestion for the future, not sure if it's normal approach in IGT:
Adding the detailed change log to the respective patch (be that before or after the --- line) as opposed to here is better IMHO. It provides provides direct, quick and easy feedback to the reviewer.

Making a per commit changelog is probably the way to go, I hope you'll forgive me if don't create a retroactive one for this series though. I'll make it habit for upcoming series.

Quoted 5 lines

Something that just hit me - 1/13 should only do "check for libdrm_intel and error otherwise. set the AC_CONDITIONAL()" with the actual "allow libdrm_intel less systems to build IGT" patch coming after the stubs were introduced.

If someone feels strongly about the issue I'd happily make that change and submit a v++ patch series.

Quoted 10 lines

As-is building w/o libdrm_intel will be allowed, yet broken through the series, which shouldn't be an issue here. Just something worth mentioning for future work.

As-is the series is

-Emil

Thanks for having a look Emil and all the feedback, it's much appreciated.

Rob.
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx