dri-devel.lists.freedesktop.org archive mirror
 help / color / mirror / Atom feed
* [PATCH i-g-t 1/5] benchmarks: Build gem_exec_tracer with meson
@ 2021-03-25 18:59 Arkadiusz Hiler
  2021-03-25 18:59 ` [PATCH i-g-t 2/5] tests: Build gem_concurrent_all " Arkadiusz Hiler
                   ` (3 more replies)
  0 siblings, 4 replies; 6+ messages in thread
From: Arkadiusz Hiler @ 2021-03-25 18:59 UTC (permalink / raw)
  To: igt-dev; +Cc: intel-gfx, dri-devel

Seems it has been overlooked during mesonification.

It's a shared module that's meant to be LD_PRELOAD-ed to intercept
EXECBUFFER2 calls for the purpose of replaying them later.

Signed-off-by: Arkadiusz Hiler <arek@hiler.eu>
---
 benchmarks/meson.build | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/benchmarks/meson.build b/benchmarks/meson.build
index c70e1aac..bede51dc 100644
--- a/benchmarks/meson.build
+++ b/benchmarks/meson.build
@@ -35,3 +35,11 @@ foreach prog : benchmark_progs
 		   install_dir : benchmarksdir,
 		   dependencies : igt_deps)
 endforeach
+
+lib_gem_exec_tracer = shared_module(
+  'gem_exec_tracer',
+  'gem_exec_tracer.c',
+  dependencies : dlsym,
+  include_directories : inc,
+  install_dir : benchmarksdir,
+  install: true)
-- 
2.31.0

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

^ permalink raw reply related	[flat|nested] 6+ messages in thread
* [PATCH i-g-t 2/5] tests: Build gem_concurrent_all with meson
  2021-03-25 18:59 [PATCH i-g-t 1/5] benchmarks: Build gem_exec_tracer with meson Arkadiusz Hiler
@ 2021-03-25 18:59 ` Arkadiusz Hiler
  2021-03-25 21:09   ` [igt-dev] " Daniel Vetter
  2021-03-25 18:59 ` [PATCH i-g-t 3/5] tests: Remove ddx_intel_after_fbdev Arkadiusz Hiler
                   ` (2 subsequent siblings)
  3 siblings, 1 reply; 6+ messages in thread
From: Arkadiusz Hiler @ 2021-03-25 18:59 UTC (permalink / raw)
  To: igt-dev; +Cc: intel-gfx, dri-devel

...and add it to test-list-full.txt just like we do when building with
autotools.

Signed-off-by: Arkadiusz Hiler <arek@hiler.eu>
---
 tests/meson.build | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/tests/meson.build b/tests/meson.build
index 54a1a3c7..8e3cd390 100644
--- a/tests/meson.build
+++ b/tests/meson.build
@@ -402,6 +402,19 @@ test_list_target = custom_target('testlist',
 	      install : true,
 	      install_dir : libexecdir)
 
+test_executables += executable('gem_concurrent_all', 'i915/gem_concurrent_all.c',
+	   dependencies : test_deps + [ libatomic ],
+	   install_dir : libexecdir,
+	   install_rpath : libexecdir_rpathdir,
+	   install : true)
+test_list += 'gem_concurrent_all'
+
+test_list_full_target = custom_target('testlist-full',
+	      output : 'test-list-full.txt',
+	      command : [ gen_testlist, '@OUTPUT@', test_list ],
+	      install : true,
+	      install_dir : libexecdir)
+
 test_script = find_program('igt_command_line.sh')
 foreach prog : test_list
 	test('testcase check ' + prog, test_script, args : prog)
-- 
2.31.0

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

^ permalink raw reply related	[flat|nested] 6+ messages in thread
* [PATCH i-g-t 3/5] tests: Remove ddx_intel_after_fbdev
  2021-03-25 18:59 [PATCH i-g-t 1/5] benchmarks: Build gem_exec_tracer with meson Arkadiusz Hiler
  2021-03-25 18:59 ` [PATCH i-g-t 2/5] tests: Build gem_concurrent_all " Arkadiusz Hiler
@ 2021-03-25 18:59 ` Arkadiusz Hiler
  2021-03-25 18:59 ` [PATCH i-g-t 4/5] .gitlab-ci: Don't test Autotools Arkadiusz Hiler
  2021-03-25 18:59 ` [PATCH i-g-t 5/5] Get rid of GNU Autotools Arkadiusz Hiler
  3 siblings, 0 replies; 6+ messages in thread
From: Arkadiusz Hiler @ 2021-03-25 18:59 UTC (permalink / raw)
  To: igt-dev; +Cc: intel-gfx, Petri Latvala, dri-devel

It's not a even a proper test.

Suggested-by: Petri Latvala <petri.latvala@intel.com>
Signed-off-by: Arkadiusz Hiler <arek@hiler.eu>
---
 tests/Makefile.sources      |  4 --
 tests/ddx_intel_after_fbdev | 73 -------------------------------------
 2 files changed, 77 deletions(-)
 delete mode 100755 tests/ddx_intel_after_fbdev

diff --git a/tests/Makefile.sources b/tests/Makefile.sources
index 4f24fb3a..ffc7878a 100644
--- a/tests/Makefile.sources
+++ b/tests/Makefile.sources
@@ -550,10 +550,6 @@ kernel_tests_full = \
 	$(extra_kernel_tests) \
 	$(NULL)
 
-scripts = \
-	ddx_intel_after_fbdev \
-	$(NULL)
-
 IMAGES = pass.png 1080p-left.png 1080p-right.png
 
 testdisplay_SOURCES = \
diff --git a/tests/ddx_intel_after_fbdev b/tests/ddx_intel_after_fbdev
deleted file mode 100755
index f068209d..00000000
--- a/tests/ddx_intel_after_fbdev
+++ /dev/null
@@ -1,73 +0,0 @@
-#!/bin/bash
-#
-# Testcase: Load Intel DDX after fbdev was loaded
-#
-
-whoami | grep -q root || {
-	echo "ERROR: not running as root"
-	exit 1
-}
-
-# no other X session should be running
-find /tmp/ -name .X*lock 2>/dev/null | grep -q X && {
-	echo "ERROR: X session already running"
-	exit 1
-}
-
-TMPDIR=$(mktemp -d /tmp/igt.XXXX) || {
-	echo "ERROR: Failed to create temp dir"
-	exit 1
-}
-
-cat > $TMPDIR/xorg.conf.fbdev << EOF
-Section "Device"
-	Driver		"fbdev"
-	Identifier 	"Device[fbdev]"
-EndSection
-EOF
-
-cat > $TMPDIR/xorg.conf.intel << EOF
-Section "Device"
-	Driver		"intel"
-	Identifier 	"Device[intel]"
-EndSection
-EOF
-
-# log before fbdev
-dmesg -c > $TMPDIR/dmesg.1.before.fbdev
-cp /var/log/Xorg.0.log $TMPDIR/Xorg.0.log.1.before.fbdev
-
-# run fbdev
-xinit -- /usr/bin/X -config $TMPDIR/xorg.conf.fbdev & 
-sleep 5
-if [ -f `which intel_reg` ]; then
-`which intel_reg` dump > $TMPDIR/intel_reg_dump.1.fbdev
-fi
-killall X
-
-# log after fbdev & before intel
-dmesg -c > $TMPDIR/dmesg.2.after.fbdev.before.intel
-cp /var/log/Xorg.0.log $TMPDIR/Xorg.0.log.2.after.fbdev.before.intel
-
-sleep 5
-
-# run intel
-xinit -- /usr/bin/X -config $TMPDIR/xorg.conf.intel & 
-sleep 5 
-if [ -f `which intel_reg` ]; then
-`which intel_reg` dump > $TMPDIR/intel_reg_dump.2.intel
-fi
-killall X
-
-# log after intel
-dmesg -c > $TMPDIR/dmesg.3.after.intel
-cp /var/log/Xorg.0.log $TMPDIR/Xorg.0.log.3.after.intel
-
-cp $0 $TMPDIR/
-
-tar czf $TMPDIR.tar.gz $TMPDIR/*
-if [ -f $TMPDIR.tar.gz ]; then
-	echo $TMPDIR.tar.gz contains this script, all configs and logs generated on this tests
-fi
-
-exit 0
-- 
2.31.0

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

^ permalink raw reply related	[flat|nested] 6+ messages in thread
* [PATCH i-g-t 4/5] .gitlab-ci: Don't test Autotools
  2021-03-25 18:59 [PATCH i-g-t 1/5] benchmarks: Build gem_exec_tracer with meson Arkadiusz Hiler
  2021-03-25 18:59 ` [PATCH i-g-t 2/5] tests: Build gem_concurrent_all " Arkadiusz Hiler
  2021-03-25 18:59 ` [PATCH i-g-t 3/5] tests: Remove ddx_intel_after_fbdev Arkadiusz Hiler
@ 2021-03-25 18:59 ` Arkadiusz Hiler
  2021-03-25 18:59 ` [PATCH i-g-t 5/5] Get rid of GNU Autotools Arkadiusz Hiler
  3 siblings, 0 replies; 6+ messages in thread
From: Arkadiusz Hiler @ 2021-03-25 18:59 UTC (permalink / raw)
  To: igt-dev; +Cc: intel-gfx, dri-devel

Signed-off-by: Arkadiusz Hiler <arek@hiler.eu>
---
 .gitlab-ci.yml          | 18 ------------------
 Dockerfile.build-debian |  8 --------
 2 files changed, 26 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e226d9d7..2b03fc98 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -154,17 +154,6 @@ build:tests-debian-meson-mips:
     paths:
       - build
 
-build:tests-debian-autotools:
-  image: $CI_REGISTRY/$CI_PROJECT_PATH/build-debian:commit-$CI_COMMIT_SHA
-  stage: build
-  script:
-    - ./autogen.sh --enable-{chamelium,audio,intel,amdgpu,nouveau,tests,runner}
-    - make -j $(nproc) || make -j 1
-    - cp tests/test-list.txt autotools-test-list.txt
-  artifacts:
-    paths:
-      - autotools-test-list.txt
-
 #################### TEST ##########################
 
 test:ninja-test:
@@ -236,13 +225,6 @@ test:ninja-test-mips:
       - build
     when: on_failure
 
-test:test-list-diff:
-  dependencies:
-    - build:tests-debian-autotools
-    - build:tests-debian-meson
-  stage: test
-  script: diff <(sed "s/ /\n/g" meson-test-list.txt| grep -v 'vc4\|v3d\|panfrost\|nouveau' | sort) <(sed "s/ /\n/g" autotools-test-list.txt | sort)
-
 test:list-undocumented-tests:
   dependencies:
     - build:tests-fedora
diff --git a/Dockerfile.build-debian b/Dockerfile.build-debian
index b143a532..454f4bce 100644
--- a/Dockerfile.build-debian
+++ b/Dockerfile.build-debian
@@ -20,12 +20,4 @@ RUN apt-get install -y \
 			peg \
 			libdrm-intel1
 
-# autotools build deps
-RUN apt-get install -y \
-			autoconf \
-			automake \
-			xutils-dev \
-			libtool \
-			make
-
 RUN apt-get clean
-- 
2.31.0

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

^ permalink raw reply related	[flat|nested] 6+ messages in thread
* [PATCH i-g-t 5/5] Get rid of GNU Autotools
  2021-03-25 18:59 [PATCH i-g-t 1/5] benchmarks: Build gem_exec_tracer with meson Arkadiusz Hiler
                   ` (2 preceding siblings ...)
  2021-03-25 18:59 ` [PATCH i-g-t 4/5] .gitlab-ci: Don't test Autotools Arkadiusz Hiler
@ 2021-03-25 18:59 ` Arkadiusz Hiler
  3 siblings, 0 replies; 6+ messages in thread
From: Arkadiusz Hiler @ 2021-03-25 18:59 UTC (permalink / raw)
  To: igt-dev; +Cc: Tomi Sarvela, Daniel Vetter, intel-gfx, Petri Latvala, dri-devel

Autotools have been deprecated in favor of Meson since early 2019.

Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Cc: Petri Latvala <petri.latvala@intel.com>
Cc: Tomi Sarvela <tomi.p.sarvela@intel.com>
Signed-off-by: Arkadiusz Hiler <arek@hiler.eu>
---
 Makefile.am                      |  44 ---
 autogen.sh                       |  17 -
 benchmarks/Makefile.am           |  28 --
 benchmarks/Makefile.sources      |  28 --
 configure.ac                     | 343 ------------------
 lib/Makefile.am                  | 226 ------------
 lib/Makefile.sources             | 195 -----------
 m4/as-compiler-flag.m4           |  62 ----
 m4/ax_gcc_func_attribute.m4      | 226 ------------
 overlay/Makefile.am              |  70 ----
 scripts/Makefile.am              |   2 -
 tests/Makefile.am                | 153 --------
 tests/Makefile.sources           | 581 -------------------------------
 tests/intel-ci/Makefile.am       |   5 -
 tools/Makefile.am                |  31 --
 tools/Makefile.sources           |  80 -----
 tools/i915-perf/Makefile.am      |  29 --
 tools/meson.build                |   5 +-
 tools/null_state_gen/Makefile.am |  31 --
 tools/registers/Makefile.am      |   2 -
 20 files changed, 1 insertion(+), 2157 deletions(-)
 delete mode 100644 Makefile.am
 delete mode 100755 autogen.sh
 delete mode 100644 benchmarks/Makefile.am
 delete mode 100644 benchmarks/Makefile.sources
 delete mode 100644 configure.ac
 delete mode 100644 lib/Makefile.am
 delete mode 100644 lib/Makefile.sources
 delete mode 100644 m4/as-compiler-flag.m4
 delete mode 100644 m4/ax_gcc_func_attribute.m4
 delete mode 100644 overlay/Makefile.am
 delete mode 100644 scripts/Makefile.am
 delete mode 100644 tests/Makefile.am
 delete mode 100644 tests/Makefile.sources
 delete mode 100644 tests/intel-ci/Makefile.am
 delete mode 100644 tools/Makefile.am
 delete mode 100644 tools/Makefile.sources
 delete mode 100644 tools/i915-perf/Makefile.am
 delete mode 100644 tools/null_state_gen/Makefile.am
 delete mode 100644 tools/registers/Makefile.am

diff --git a/Makefile.am b/Makefile.am
deleted file mode 100644
index 94250964..00000000
--- a/Makefile.am
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright © 2005 Adam Jackson.
-# Copyright © 2009,2013 Intel Corporation
-#
-#  Permission is hereby granted, free of charge, to any person obtaining a
-#  copy of this software and associated documentation files (the "Software"),
-#  to deal in the Software without restriction, including without limitation
-#  on the rights to use, copy, modify, merge, publish, distribute, sub
-#  license, and/or sell copies of the Software, and to permit persons to whom
-#  the Software is furnished to do so, subject to the following conditions:
-#
-#  The above copyright notice and this permission notice (including the next
-#  paragraph) shall be included in all copies or substantial portions of the
-#  Software.
-#
-#  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-#  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-#  FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.  IN NO EVENT SHALL
-#  ADAM JACKSON BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
-#  IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-#  CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-ACLOCAL_AMFLAGS = ${ACLOCAL_FLAGS} -I m4
-
-SUBDIRS = lib tools scripts benchmarks
-
-if BUILD_TESTS
-SUBDIRS += tests
-endif
-
-if BUILD_X86
-SUBDIRS += overlay benchmarks
-endif
-
-MAINTAINERCLEANFILES = ChangeLog INSTALL
-
-.PHONY: ChangeLog INSTALL
-
-INSTALL:
-	$(INSTALL_CMD)
-
-ChangeLog:
-	$(CHANGELOG_CMD)
-
-dist-hook: ChangeLog INSTALL
diff --git a/autogen.sh b/autogen.sh
deleted file mode 100755
index 65fcab2f..00000000
--- a/autogen.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-#! /bin/sh
-
-srcdir=`dirname $0`
-test -z "$srcdir" && srcdir=.
-
-ORIGDIR=`pwd`
-cd $srcdir
-
-autoreconf -v --install || exit 1
-cd $ORIGDIR || exit $?
-
-git config --local --get format.subjectPrefix >/dev/null 2>&1 ||
-    git config --local format.subjectPrefix "PATCH i-g-t"
-
-if test -z "$NOCONFIGURE"; then
-        $srcdir/configure "$@"
-fi
diff --git a/benchmarks/Makefile.am b/benchmarks/Makefile.am
deleted file mode 100644
index 45b923eb..00000000
--- a/benchmarks/Makefile.am
+++ /dev/null
@@ -1,28 +0,0 @@
-include Makefile.sources
-
-benchmarks_PROGRAMS = $(benchmarks_prog_list)
-
-if HAVE_LIBDRM_INTEL
-benchmarks_PROGRAMS += $(LIBDRM_INTEL_BENCHMARKS)
-endif
-
-AM_CPPFLAGS = \
-	-I$(top_srcdir) \
-	-I$(top_srcdir)/include/drm-uapi \
-	-I$(top_srcdir)/lib \
-	-I$(top_srcdir)/lib/stubs/syscalls
-
-AM_CFLAGS = -I$(top_srcdir)/include/drm-uapi \
-	    $(DRM_CFLAGS) $(CWARNFLAGS) $(CAIRO_CFLAGS) $(LIBUNWIND_CFLAGS) \
-	    $(WERROR_CFLAGS) -D_GNU_SOURCE
-LDADD = $(top_builddir)/lib/libintel_tools.la
-
-benchmarks_LTLIBRARIES = gem_exec_tracer.la
-gem_exec_tracer_la_LDFLAGS = -module -avoid-version -no-undefined
-gem_exec_tracer_la_LIBADD = -ldl
-
-gem_latency_CFLAGS = $(AM_CFLAGS) $(THREAD_CFLAGS)
-gem_latency_LDADD = $(LDADD) -lpthread
-gem_syslatency_CFLAGS = $(AM_CFLAGS) $(THREAD_CFLAGS)
-gem_syslatency_LDADD = $(LDADD) -lpthread
-gem_wsim_LDADD = $(LDADD) -lpthread
diff --git a/benchmarks/Makefile.sources b/benchmarks/Makefile.sources
deleted file mode 100644
index dae3cdda..00000000
--- a/benchmarks/Makefile.sources
+++ /dev/null
@@ -1,28 +0,0 @@
-benchmarksdir=$(libexecdir)/igt-gpu-tools/benchmarks
-
-benchmarks_prog_list =			\
-	gem_blt				\
-	gem_busy			\
-	gem_create			\
-	gem_exec_ctx			\
-	gem_exec_fault			\
-	gem_exec_nop			\
-	gem_exec_reloc			\
-	gem_exec_trace			\
-	gem_latency			\
-	gem_prw				\
-	gem_set_domain			\
-	gem_syslatency			\
-	gem_wsim			\
-	kms_vblank			\
-	prime_lookup			\
-	vgem_mmap			\
-	$(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)
diff --git a/configure.ac b/configure.ac
deleted file mode 100644
index 6cdfcb3d..00000000
--- a/configure.ac
+++ /dev/null
@@ -1,343 +0,0 @@
-#  Copyright 2005 Adam Jackson.
-#
-#  Permission is hereby granted, free of charge, to any person obtaining a
-#  copy of this software and associated documentation files (the "Software"),
-#  to deal in the Software without restriction, including without limitation
-#  on the rights to use, copy, modify, merge, publish, distribute, sub
-#  license, and/or sell copies of the Software, and to permit persons to whom
-#  the Software is furnished to do so, subject to the following conditions:
-#
-#  The above copyright notice and this permission notice (including the next
-#  paragraph) shall be included in all copies or substantial portions of the
-#  Software.
-#
-#  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-#  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-#  FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.  IN NO EVENT SHALL
-#  ADAM JACKSON BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
-#  IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-#  CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-#
-# Process this file with autoconf to produce a configure script
-
-AC_PREREQ([2.60])
-AC_INIT([igt-gpu-tools],
-	[1.25],
-	[https://bugs.freedesktop.org/enter_bug.cgi?product=DRI&component=IGT],
-	[igt-gpu-tools])
-
-AC_SUBST([i915_perf_version], [1.2.0], [libi915_perf.so version])
-
-AC_CONFIG_SRCDIR([Makefile.am])
-AC_CONFIG_HEADERS([config.h])
-AC_CONFIG_MACRO_DIR([m4])
-AC_CONFIG_AUX_DIR([build-aux])
-AC_USE_SYSTEM_EXTENSIONS
-AC_SYS_LARGEFILE
-AC_GNU_SOURCE
-AC_CANONICAL_HOST
-AC_CANONICAL_TARGET
-
-AM_INIT_AUTOMAKE([1.12 foreign subdir-objects dist-bzip2])
-AM_PATH_PYTHON([3],, [:])
-
-AC_PROG_CC
-AC_PROG_LEX
-AC_PROG_YACC
-
-# Checks for functions, headers, structures, etc.
-AC_HEADER_STDC
-AC_CHECK_HEADERS([termios.h linux/kd.h sys/kd.h libgen.h sys/io.h])
-AC_CHECK_MEMBERS([struct sysinfo.totalram],[],[],[AC_INCLUDES_DEFAULT
-		  #include <sys/sysinfo.h>
-		  ])
-AC_CHECK_TYPES([sighandler_t],[],[],[AC_INCLUDES_DEFAULT
-#include <signal.h>])
-AC_CHECK_FUNCS([swapctl])
-AC_CHECK_FUNCS([asprintf])
-AX_GCC_FUNC_ATTRIBUTE([constructor])
-
-dnl Check for POSIX timers
-AC_CHECK_FUNCS(timer_create, [], [
-	AC_CHECK_LIB(rt, timer_create, [
-		TIMER_LIBS="-lrt"
-		], [
-		AC_CHECK_LIB(pthread, timer_create, [
-			TIMER_LIBS="-lpthread"
-		], [
-		AC_MSG_ERROR([Failed to find library containing timer_create.])
-		])
-	])
-])
-AC_SUBST(TIMER_LIBS)
-
-dnl Check for memfd_create
-AC_CHECK_FUNCS(memfd_create)
-
-dnl Check for CPUID
-cpuid="yes"
-AC_TRY_LINK([
-	#include <cpuid.h>
-	#include <stddef.h>
-	],
-	[
-	int eax, ebx, ecx, edx;
-	if (__get_cpuid_max(0, NULL) < 4)
-		return 0;
-	__cpuid_count(4, 0, eax, ebx, ecx, edx);
-	],
-	[cpuid="yes"],
-	[cpuid="no"]
-)
-if test "x$cpuid" = "xyes"; then
-	AC_DEFINE(HAVE_CPUID_H, 1, [Found a useable cpuid.h])
-fi
-
-# Initialize libtool
-AC_DISABLE_STATIC
-AC_PROG_LIBTOOL
-
-# Require X.Org macros 1.16 or later for XORG_TESTSET_CFLAG
-m4_ifndef([XORG_MACROS_VERSION],
-	  [m4_fatal([must install xorg-macros 1.16 or later before running autoconf/autogen])])
-XORG_MACROS_VERSION(1.16)
-XORG_DEFAULT_OPTIONS
-
-PKG_CHECK_MODULES(DRM, [libdrm >= 2.4.82])
-PKG_CHECK_MODULES(PCIACCESS, [pciaccess >= 0.10])
-PKG_CHECK_MODULES(KMOD, [libkmod])
-PKG_CHECK_MODULES(PROCPS, [libprocps])
-PKG_CHECK_MODULES(LIBUNWIND, [libunwind])
-PKG_CHECK_MODULES(LIBDW, [libdw])
-PKG_CHECK_MODULES(VALGRIND, [valgrind], [have_valgrind=yes], [have_valgrind=no])
-
-if test x$have_valgrind = xyes; then
-	AC_DEFINE(HAVE_VALGRIND, 1, [Enable valgrind annotation support.])
-fi
-
-case "$target_cpu" in
-	x86*|i?86)
-		build_x86="yes"
-		;;
-	*)
-		build_x86="no"
-		;;
-esac
-
-if test x"$build_x86" = xyes; then
-	PKG_CHECK_MODULES(OVERLAY_XVLIB, [xv x11 xext dri2proto >= 2.6], enable_overlay_xvlib=yes, enable_overlay_xvlib=no)
-	PKG_CHECK_MODULES(OVERLAY_XLIB, [cairo-xlib dri2proto >= 2.6], enable_overlay_xlib=yes, enable_overlay_xlib=no)
-
-	AC_CHECK_TOOL([LEG], [leg])
-	if test x"$LEG" != xleg; then
-		enable_overlay_xvlib="no"
-		enable_overlay_xlib="no"
-		AC_MSG_NOTICE([Failed to find leg, required for overlay, try : apt-get install peg])
-	fi
-else
-	enable_overlay_xvlib="no"
-	enable_overlay_xlib="no"
-fi
-AM_CONDITIONAL(BUILD_X86, [test "x$build_x86" = xyes])
-
-AM_CONDITIONAL(BUILD_OVERLAY_XVLIB, [test "x$enable_overlay_xvlib" = xyes])
-AM_CONDITIONAL(BUILD_OVERLAY_XLIB, [test "x$enable_overlay_xlib" = xyes])
-AM_CONDITIONAL(BUILD_OVERLAY, [test "x$enable_overlay_xlib" = xyes -o "x$enable_overlay_xvlib" = "xyes"])
-if test x$enable_overlay_xvlib = xyes; then
-	AC_DEFINE(HAVE_OVERLAY_XVLIB, 1, [Enable XV backend])
-fi
-if test x$enable_overlay_xlib = xyes; then
-	AC_DEFINE(HAVE_OVERLAY_XLIB, 1, [Enable X backend])
-fi
-PKG_CHECK_MODULES(XRANDR, xrandr >= 1.3, AC_DEFINE(HAVE_XRANDR, 1, [Have libXrandr]), [have_xrandr=no])
-
-# for testdisplay
-PKG_CHECK_MODULES(CAIRO, [cairo >= 1.17.2], [],
-	[AC_MSG_WARN([Cairo too old, HDR formats not available. Upgrade to cairo 1.17.2])
-	PKG_CHECK_MODULES(CAIRO, [cairo >= 1.12.0])]
-)
-PKG_CHECK_MODULES(LIBUDEV, [libudev])
-PKG_CHECK_MODULES(GLIB, [glib-2.0])
-PKG_CHECK_MODULES(PIXMAN, [pixman-1 >= 0.36.0], [], [
-	AC_MSG_WARN([Pixman too old, HDR formats not available. Upgrade to pixman 0.36.0])
-	PKG_CHECK_MODULES(PIXMAN, [pixman-1])
-])
-
-PKG_CHECK_MODULES(GSL, [gsl], [gsl=yes], [gsl=no])
-AM_CONDITIONAL(HAVE_GSL, [test "x$gsl" = xyes])
-
-PKG_CHECK_MODULES(ALSA, [alsa], [alsa=yes], [alsa=no])
-AM_CONDITIONAL(HAVE_ALSA, [test "x$alsa" = xyes])
-
-# for chamelium
-AC_ARG_ENABLE(chamelium, AS_HELP_STRING([--enable-chamelium],
-	      [Enable building of chamelium libraries and tests (default: no)]),
-	      [if test x$enableval = xyes; then enable_chamelium=yes; fi],
-	      [enable_chamelium=no])
-AM_CONDITIONAL(HAVE_CHAMELIUM, [test "x$enable_chamelium" = xyes])
-if test "x$enable_chamelium" = xyes; then
-	PKG_CHECK_MODULES(XMLRPC, xmlrpc xmlrpc_util xmlrpc_client,
-		          [xmlrpc=yes], [xmlrpc=no])
-	if test x"$xmlrpc" != xyes; then
-		AC_CHECK_PROG([XMLRPC_C_CONFIG], [xmlrpc-c-config], [yes], [no])
-		if test x"$XMLRPC_C_CONFIG" = xyes; then
-			XMLRPC_CFLAGS=$(xmlrpc-c-config client --cflags)
-			XMLRPC_LIBS=$(xmlrpc-c-config client --libs)
-			AC_SUBST(XMLRPC_CFLAGS)
-			AC_SUBST(XMLRPC_LIBS)
-		else
-			AC_MSG_ERROR([Failed to find xmlrpc, required by chamelium.])
-		fi
-	fi
-	if test x"$gsl" != xyes; then
-		AC_MSG_ERROR([Failed to find gsl, required by chamelium.])
-	fi
-	if test x"$alsa" != xyes; then
-		AC_MSG_ERROR([Failed to find alsa, required by chamelium.])
-	fi
-
-	AC_DEFINE(HAVE_CHAMELIUM, 1, [Enable Chamelium support])
-fi
-
-# -----------------------------------------------------------------------------
-#			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.75], [INTEL=yes], [INTEL=no])
-fi
-if test "x$INTEL" = xyes; then
-	PKG_CHECK_MODULES(DRM_INTEL, [libdrm_intel >= 2.4.75])
-	AC_DEFINE(HAVE_LIBDRM_INTEL, 1, [Have intel support])
-else
-	DRM_INTEL_CFLAGS=-I$\(top_srcdir\)/lib/stubs/drm/
-	DRM_INTEL_LIBS=
-fi
-DRM_CFLAGS="$DRM_CFLAGS $DRM_INTEL_CFLAGS"
-DRM_LIBS="$DRM_LIBS $DRM_INTEL_LIBS"
-AC_SUBST([DRM_CFLAGS])
-AC_SUBST([DRM_LIBS])
-
-AM_CONDITIONAL(HAVE_LIBDRM_INTEL, [test "x$INTEL" = xyes])
-
-AC_ARG_ENABLE(amdgpu, AS_HELP_STRING([--disable-amdgpu],
-	      [Enable building of amdgpu tests (default: auto)]),
-	      [AMDGPU=$enableval], [AMDGPU=auto])
-if test "x$AMDGPU" = xauto; then
-	PKG_CHECK_EXISTS([libdrm_amdgpu >= 2.4.81], [AMDGPU=yes], [AMDGPU=no])
-fi
-if test "x$AMDGPU" = xyes; then
-	PKG_CHECK_MODULES(DRM_AMDGPU, [libdrm_amdgpu >= 2.4.81])
-	AC_DEFINE(HAVE_LIBDRM_AMDGPU, 1, [Have amdgpu support])
-fi
-AM_CONDITIONAL(HAVE_LIBDRM_AMDGPU, [test "x$AMDGPU" = xyes])
-
-# for dma-buf tests
-AC_ARG_ENABLE(nouveau, AS_HELP_STRING([--disable-nouveau],
-	      [Enable use of nouveau API for prime tests (default: auto)]),
-	      [NOUVEAU=$enableval], [NOUVEAU=auto])
-if test "x$NOUVEAU" = xauto; then
-	PKG_CHECK_EXISTS([libdrm_nouveau >= 2.4.33], [NOUVEAU=yes], [NOUVEAU=no])
-fi
-if test "x$NOUVEAU" = xyes; then
-	PKG_CHECK_MODULES(DRM_NOUVEAU, [libdrm_nouveau >= 2.4.33])
-	AC_DEFINE(HAVE_LIBDRM_NOUVEAU, 1, [Have nouveau support])
-fi
-AM_CONDITIONAL(HAVE_LIBDRM_NOUVEAU, [test "x$NOUVEAU" = xyes])
-
-# enable debug symbols
-AC_ARG_ENABLE(debug,
-	      AS_HELP_STRING([--disable-debug],
-			     [Build tests without debug symbols]),
-	      [], [enable_debug=yes])
-
-AC_ARG_ENABLE(werror,
-	      AS_HELP_STRING([--enable-werror],
-			     [Fail on warnings]),
-	      [], [enable_werror=no])
-
-# disable "warning: pointer of type ‘void *’ used in arithmetic"
-AS_COMPILER_FLAG([-Wno-pointer-arith], [CWARNFLAGS+=" -Wno-pointer-arith"], [])
-
-if test "x$enable_debug" = xyes; then
-	AS_COMPILER_FLAG([-g3], [DEBUG_CFLAGS="-g3"], [DEBUG_CFLAGS="-g"])
-	AS_COMPILER_FLAG([-Og], [DEBUG_CFLAGS+=" -Og -Wno-maybe-uninitialized"], # disable maybe-uninitialized due to false positives
-			 [DEBUG_CFLAGS+=" -O0"])
-	AC_SUBST([DEBUG_CFLAGS])
-fi
-
-if test "x$enable_werror" = xyes; then
-	AS_COMPILER_FLAG([-Werror], [WERROR_CFLAGS="-Werror"])
-fi
-
-# prevent relinking the world on every commit for developers
-AC_ARG_ENABLE(git-hash,
-	      AS_HELP_STRING([--disable-git-hash],
-			     [Do not use git hash in version]),
-	      [git_hash=$enableval], [git_hash=yes])
-AC_SUBST(GIT_HASH, [$git_hash])
-
-# -----------------------------------------------------------------------------
-
-# To build multithread code, gcc uses -pthread, Solaris Studio cc uses -mt
-XORG_TESTSET_CFLAG([THREAD_CFLAGS], [-pthread], [-mt])
-AC_SUBST([THREAD_CFLAGS])
-
-AC_ARG_ENABLE(tests,
-	      AS_HELP_STRING([--disable-tests],
-	      [Disable tests build (default: enabled)]),
-	      [BUILD_TESTS=$enableval], [BUILD_TESTS="yes"])
-if test "x$BUILD_TESTS" = xyes; then
-	AC_DEFINE(BUILD_TESTS, 1, [Build tests])
-fi
-AM_CONDITIONAL(BUILD_TESTS, [test "x$BUILD_TESTS" = xyes])
-AC_DEFINE_UNQUOTED(TARGET_CPU_PLATFORM, ["$host_cpu"], [Target platform])
-
-files="broadwell cherryview haswell ivybridge sandybridge valleyview skylake"
-for file in $files; do
-	REGISTER_FILES="$REGISTER_FILES $file `cat $srcdir/tools/registers/$file`"
-done
-REGISTER_FILES=`echo $REGISTER_FILES | tr ' ' '\n' | sort -u | tr '\n' ' '`
-AC_SUBST(REGISTER_FILES)
-
-AC_CONFIG_FILES([
-		 Makefile
-		 benchmarks/Makefile
-		 lib/Makefile
-		 lib/i915-perf.pc
-		 scripts/Makefile
-		 tests/Makefile
-		 tests/intel-ci/Makefile
-		 tools/Makefile
-		 tools/i915-perf/Makefile
-		 tools/null_state_gen/Makefile
-		 tools/registers/Makefile
-		 overlay/Makefile
-		 ])
-
-AC_OUTPUT
-
-# Print a summary of the compilation
-echo ""
-echo "Intel GPU tools"
-
-echo ""
-echo " • Tests:"
-echo "       Build tests        : ${BUILD_TESTS}"
-echo "       Chamelium tests    : ${enable_chamelium}"
-echo "       Compile prime tests: ${NOUVEAU}"
-echo "       Debug flags        : ${DEBUG_CFLAGS}"
-echo ""
-echo " • Tools:"
-echo "       Overlay            : X: ${enable_overlay_xlib}, Xv: ${enable_overlay_xvlib}"
-echo "       x86-specific tools : ${build_x86}"
-echo "       Test runner        : ${BUILD_RUNNER}"
-echo ""
-echo " • Fail on warnings       : ${enable_werror}"
-echo ""
-echo " WARNING: automake is deprecated, please use meson"
-echo ""
-
-# vim: set ft=config ts=8 sw=8 tw=0 noet :
diff --git a/lib/Makefile.am b/lib/Makefile.am
deleted file mode 100644
index c0899cd1..00000000
--- a/lib/Makefile.am
+++ /dev/null
@@ -1,226 +0,0 @@
-IGT_LIB_PATH := $(builddir)
-GPU_TOOLS_PATH := $(top_srcdir)
-
-i915_perf_hardware =		\
-	hsw			\
-	bdw chv			\
-	sklgt2 sklgt3 sklgt4	\
-	kblgt2 kblgt3		\
-	cflgt2 cflgt3		\
-	bxt glk			\
-	cnl			\
-	icl ehl			\
-	tglgt1 tglgt2 rkl dg1 adl
-
-i915_perf_xml_files = $(i915_perf_hardware:%=i915/perf-configs/oa-%.xml)
-
-$(builddir)/i915/i915_perf_equations.c: i915/perf-configs/perf-equations-codegen.py $(i915_perf_xml_files)
-	@$(PYTHON) i915/perf-configs/perf-equations-codegen.py --code $@ --header `echo $@ | sed s/.c$$/.h/` $(i915_perf_xml_files)
-
-$(builddir)/i915/i915_perf_equations.h: $(builddir)/i915/i915_perf_equations.c
-
-$(builddir)/i915/i915_perf_registers_%.c: i915/perf-configs/oa-%.xml i915/perf-configs/perf-registers-codegen.py
-	@$(PYTHON) i915/perf-configs/perf-registers-codegen.py --code $@ --header `echo $@ | sed s/.c$$/.h/` --xml-file $<
-
-$(builddir)/i915/i915_perf_registers_%.h: $(builddir)/i915/i915_perf_registers_%.c
-
-$(builddir)/i915/i915_perf_metrics_%.c: i915/perf-configs/oa-%.xml i915/perf-configs/perf-metricset-codegen.py
-	@$(PYTHON) i915/perf-configs/perf-metricset-codegen.py --code $@ --header `echo $@ | sed s/.c$$/.h/` --equations-include i915_perf_equations.h --registers-include `echo $@ | sed s/metrics/registers/ | sed s/.c$$/.h/` --xml-file $<
-
-$(builddir)/i915/i915_perf_metrics_%.h: $(builddir)/i915/i915_perf_metrics_%.c
-
-# Automake... Kill me already...
-i915_perf_generated_files = \
-	$(builddir)/i915/i915_perf_metrics_hsw.c \
-	$(builddir)/i915/i915_perf_metrics_hsw.h \
-	$(builddir)/i915/i915_perf_registers_hsw.c \
-	$(builddir)/i915/i915_perf_registers_hsw.h \
-	$(builddir)/i915/i915_perf_metrics_chv.c \
-	$(builddir)/i915/i915_perf_metrics_chv.h \
-	$(builddir)/i915/i915_perf_registers_chv.c \
-	$(builddir)/i915/i915_perf_registers_chv.h \
-	$(builddir)/i915/i915_perf_metrics_bdw.c \
-	$(builddir)/i915/i915_perf_metrics_bdw.h \
-	$(builddir)/i915/i915_perf_registers_bdw.c \
-	$(builddir)/i915/i915_perf_registers_bdw.h \
-	$(builddir)/i915/i915_perf_metrics_sklgt2.c \
-	$(builddir)/i915/i915_perf_metrics_sklgt2.h \
-	$(builddir)/i915/i915_perf_registers_sklgt2.c \
-	$(builddir)/i915/i915_perf_registers_sklgt2.h \
-	$(builddir)/i915/i915_perf_metrics_sklgt3.c \
-	$(builddir)/i915/i915_perf_metrics_sklgt3.h \
-	$(builddir)/i915/i915_perf_registers_sklgt3.c \
-	$(builddir)/i915/i915_perf_registers_sklgt3.h \
-	$(builddir)/i915/i915_perf_metrics_sklgt4.c \
-	$(builddir)/i915/i915_perf_metrics_sklgt4.h \
-	$(builddir)/i915/i915_perf_registers_sklgt4.c \
-	$(builddir)/i915/i915_perf_registers_sklgt4.h \
-	$(builddir)/i915/i915_perf_metrics_kblgt2.c \
-	$(builddir)/i915/i915_perf_metrics_kblgt2.h \
-	$(builddir)/i915/i915_perf_registers_kblgt2.c \
-	$(builddir)/i915/i915_perf_registers_kblgt2.h \
-	$(builddir)/i915/i915_perf_metrics_kblgt3.c \
-	$(builddir)/i915/i915_perf_metrics_kblgt3.h \
-	$(builddir)/i915/i915_perf_registers_kblgt3.c \
-	$(builddir)/i915/i915_perf_registers_kblgt3.h \
-	$(builddir)/i915/i915_perf_metrics_cflgt2.c \
-	$(builddir)/i915/i915_perf_metrics_cflgt2.h \
-	$(builddir)/i915/i915_perf_registers_cflgt2.c \
-	$(builddir)/i915/i915_perf_registers_cflgt2.h \
-	$(builddir)/i915/i915_perf_metrics_cflgt3.c \
-	$(builddir)/i915/i915_perf_metrics_cflgt3.h \
-	$(builddir)/i915/i915_perf_registers_cflgt3.c \
-	$(builddir)/i915/i915_perf_registers_cflgt3.h \
-	$(builddir)/i915/i915_perf_metrics_bxt.c \
-	$(builddir)/i915/i915_perf_metrics_bxt.h \
-	$(builddir)/i915/i915_perf_registers_bxt.c \
-	$(builddir)/i915/i915_perf_registers_bxt.h \
-	$(builddir)/i915/i915_perf_metrics_glk.c \
-	$(builddir)/i915/i915_perf_metrics_glk.h \
-	$(builddir)/i915/i915_perf_registers_glk.c \
-	$(builddir)/i915/i915_perf_registers_glk.h \
-	$(builddir)/i915/i915_perf_metrics_cnl.c \
-	$(builddir)/i915/i915_perf_metrics_cnl.h \
-	$(builddir)/i915/i915_perf_registers_cnl.c \
-	$(builddir)/i915/i915_perf_registers_cnl.h \
-	$(builddir)/i915/i915_perf_metrics_icl.c \
-	$(builddir)/i915/i915_perf_metrics_icl.h \
-	$(builddir)/i915/i915_perf_registers_icl.c \
-	$(builddir)/i915/i915_perf_registers_icl.h \
-	$(builddir)/i915/i915_perf_metrics_ehl.c \
-	$(builddir)/i915/i915_perf_metrics_ehl.h \
-	$(builddir)/i915/i915_perf_registers_ehl.c \
-	$(builddir)/i915/i915_perf_registers_ehl.h \
-	$(builddir)/i915/i915_perf_metrics_tglgt1.c \
-	$(builddir)/i915/i915_perf_metrics_tglgt1.h \
-	$(builddir)/i915/i915_perf_registers_tglgt1.c \
-	$(builddir)/i915/i915_perf_registers_tglgt1.h \
-	$(builddir)/i915/i915_perf_metrics_tglgt2.c \
-	$(builddir)/i915/i915_perf_metrics_tglgt2.h \
-	$(builddir)/i915/i915_perf_registers_tglgt2.c \
-	$(builddir)/i915/i915_perf_registers_tglgt2.h \
-	$(builddir)/i915/i915_perf_metrics_rkl.c \
-	$(builddir)/i915/i915_perf_metrics_rkl.h \
-	$(builddir)/i915/i915_perf_registers_rkl.c \
-	$(builddir)/i915/i915_perf_registers_rkl.h \
-	$(builddir)/i915/i915_perf_metrics_dg1.c \
-	$(builddir)/i915/i915_perf_metrics_dg1.h \
-	$(builddir)/i915/i915_perf_registers_dg1.c \
-	$(builddir)/i915/i915_perf_registers_dg1.h \
-	$(builddir)/i915/i915_perf_metrics_adl.c \
-	$(builddir)/i915/i915_perf_metrics_adl.h \
-	$(builddir)/i915/i915_perf_registers_adl.c \
-	$(builddir)/i915/i915_perf_registers_adl.h \
-	$(builddir)/i915/i915_perf_equations.c \
-	$(builddir)/i915/i915_perf_equations.h
-
-include Makefile.sources
-
-libintel_tools_la_SOURCES = $(lib_source_list)
-
-libigt_device_scan_la_SOURCES = \
-	igt_list.c		\
-	igt_tools_stub.c	\
-	igt_device_scan.c	\
-	igt_device_scan.h	\
-	intel_device_info.c	\
-	intel_chipset.h
-
-libigt_perf_la_SOURCES = \
-	igt_perf.c	 \
-	igt_perf.h
-
-libi915_perf_la_SOURCES = \
-	$(i915_perf_sources) \
-	$(i915_perf_generated_files)
-libi915_perf_HEADERS =		\
-	igt_list.h		\
-	i915/perf.h		\
-	i915/perf_data.h	\
-	i915/perf_data_reader.h
-libi915_perfdir = $(includedir)/i915-perf
-
-pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = i915-perf.pc
-
-lib_LTLIBRARIES = libi915_perf.la
-
-noinst_LTLIBRARIES = libintel_tools.la libigt_perf.la libigt_device_scan.la
-noinst_HEADERS = check-ndebug.h
-
-if !HAVE_LIBDRM_INTEL
-    libintel_tools_la_SOURCES += 	\
-        stubs/drm/intel_bufmgr.c	\
-        stubs/drm/intel_bufmgr.h
-endif
-
-if HAVE_CHAMELIUM
-lib_source_list +=	 	\
-	igt_chamelium.h		\
-	igt_chamelium.c		\
-	igt_chamelium_stream.h	\
-	igt_chamelium_stream.c	\
-	$(NULL)
-endif
-
-if HAVE_GSL
-lib_source_list +=		\
-	igt_frame.c		\
-	igt_frame.h		\
-	igt_audio.c		\
-	igt_audio.h		\
-	$(NULL)
-endif
-
-if HAVE_ALSA
-lib_source_list +=		\
-	igt_alsa.c		\
-	igt_alsa.h		\
-	$(NULL)
-endif
-
-AM_CPPFLAGS = \
-	-I$(top_srcdir)/include/drm-uapi \
-	-I$(top_srcdir) \
-	-I$(top_srcdir)/lib/stubs/syscalls
-
-AM_CFLAGS = \
-	    $(CWARNFLAGS) \
-	    $(DRM_CFLAGS) \
-	    $(PCIACCESS_CFLAGS) \
-	    $(LIBUNWIND_CFLAGS) \
-	    $(LIBDW_CFLAGS) \
-	    $(GSL_CFLAGS) \
-	    $(KMOD_CFLAGS) \
-	    $(PROCPS_CFLAGS) \
-	    $(DEBUG_CFLAGS) \
-	    $(XMLRPC_CFLAGS) \
-	    $(LIBUDEV_CFLAGS) \
-	    $(PIXMAN_CFLAGS) \
-	    $(GLIB_CFLAGS) \
-	    $(VALGRIND_CFLAGS) \
-	    -DIGT_SRCDIR=\""$(abs_top_srcdir)/tests"\" \
-	    -DIGT_DATADIR=\""$(pkgdatadir)"\" \
-	    -D_GNU_SOURCE \
-	    -DIGT_LOG_DOMAIN=\""$(subst _,-,$*)"\" \
-	    -pthread
-
-AM_CFLAGS += $(CAIRO_CFLAGS)
-
-libintel_tools_la_LIBADD = \
-	$(DRM_LIBS) \
-	$(PCIACCESS_LIBS) \
-	$(PROCPS_LIBS) \
-	$(GSL_LIBS) \
-	$(KMOD_LIBS) \
-	$(CAIRO_LIBS) \
-	$(LIBUDEV_LIBS) \
-	$(LIBUNWIND_LIBS) \
-	$(LIBDW_LIBS) \
-	$(TIMER_LIBS) \
-	$(XMLRPC_LIBS) \
-	$(LIBUDEV_LIBS) \
-	$(PIXMAN_LIBS) \
-	$(GLIB_LIBS) \
-	libigt_perf.la \
-	-lm
diff --git a/lib/Makefile.sources b/lib/Makefile.sources
deleted file mode 100644
index 4f6389f8..00000000
--- a/lib/Makefile.sources
+++ /dev/null
@@ -1,195 +0,0 @@
-lib_source_list =	 	\
-	debug.h			\
-	drmtest.c		\
-	drmtest.h		\
-	i830_reg.h		\
-	i915/gem.c		\
-	i915/gem.h		\
-	i915/gem_context.c	\
-	i915/gem_context.h	\
-	i915/gem_create.c	\
-	i915/gem_engine_topology.c	\
-	i915/gem_engine_topology.h	\
-	i915/gem_scheduler.c	\
-	i915/gem_scheduler.h	\
-	i915/gem_submission.c	\
-	i915/gem_submission.h	\
-	i915/gem_ring.h	\
-	i915/gem_ring.c	\
-	i915/gem_mman.c	\
-	i915/gem_mman.h	\
-	i915/gem_vm.c	\
-	i915/gem_vm.h	\
-	i915_3d.h		\
-	i915_reg.h		\
-	i915_pciids.h		\
-	igt.h			\
-	igt_debugfs.c		\
-	igt_debugfs.h		\
-	igt_device.c		\
-	igt_device.h		\
-	igt_device_scan.c	\
-	igt_device_scan.h	\
-	igt_aux.c		\
-	igt_aux.h		\
-	igt_collection.c	\
-	igt_collection.h	\
-	igt_color_encoding.c	\
-	igt_color_encoding.h	\
-	igt_edid.c		\
-	igt_edid.h		\
-	igt_eld.c		\
-	igt_eld.h		\
-	igt_gt.c		\
-	igt_gt.h		\
-	igt_halffloat.c		\
-	igt_halffloat.h		\
-	igt_infoframe.c		\
-	igt_infoframe.h		\
-	igt_list.c		\
-	igt_list.h		\
-	igt_matrix.c		\
-	igt_matrix.h		\
-	igt_params.c		\
-	igt_params.h		\
-	igt_primes.c		\
-	igt_primes.h		\
-	igt_rand.c		\
-	igt_rand.h		\
-	igt_rapl.c		\
-	igt_rapl.h		\
-	igt_rc.h		\
-	igt_stats.c		\
-	igt_stats.h		\
-	igt_sysfs.c		\
-	igt_sysfs.h		\
-	igt_sysrq.c		\
-	igt_sysrq.h		\
-	igt_taints.c		\
-	igt_taints.h		\
-	igt_thread.c		\
-	igt_thread.h		\
-	igt_x86.h		\
-	igt_x86.c		\
-	igt_vec.c		\
-	igt_vec.h		\
-	igt_vgem.c		\
-	igt_vgem.h		\
-	instdone.c		\
-	instdone.h		\
-	intel_aub.h		\
-	intel_batchbuffer.c	\
-	intel_batchbuffer.h	\
-	intel_bufops.c		\
-	intel_bufops.h		\
-	intel_chipset.c		\
-	intel_chipset.h		\
-	intel_device_info.c	\
-	intel_os.c		\
-	intel_io.h		\
-	intel_mmio.c		\
-	intel_reg.h		\
-	ioctl_wrappers.c	\
-	ioctl_wrappers.h	\
-	media_fill.c		\
-	media_fill.h            \
-	huc_copy.c		\
-	huc_copy.h		\
-	media_spin.h		\
-	media_spin.c		\
-	gpgpu_fill.h		\
-	gpgpu_fill.c		\
-	gpu_cmds.h		\
-	gpu_cmds.c		\
-	gen7_media.h            \
-	gen8_media.h            \
-	rendercopy_i915.c	\
-	rendercopy_i830.c	\
-	gen4_render.h		\
-	gen6_render.h		\
-	gen7_render.h		\
-	gen8_render.h		\
-	gen9_render.h		\
-	rendercopy_gen4.c	\
-	rendercopy_gen6.c	\
-	rendercopy_gen7.c	\
-	rendercopy_gen8.c	\
-	rendercopy_gen9.c	\
-	rendercopy.h		\
-	surfaceformat.h		\
-	sw_sync.c		\
-	sw_sync.h		\
-	intel_aux_pgtable.c	\
-	intel_reg_map.c		\
-	intel_iosf.c		\
-	igt_kms.c		\
-	igt_kms.h		\
-	igt_fb.c		\
-	igt_fb.h		\
-	igt_core.c		\
-	igt_core.h		\
-	igt_draw.c		\
-	igt_draw.h		\
-	igt_pm.c		\
-	igt_pm.h		\
-	igt_dummyload.c		\
-	igt_dummyload.h		\
-	uwildmat/uwildmat.h	\
-	uwildmat/uwildmat.c	\
-	igt_kmod.c		\
-	igt_kmod.h		\
-	igt_syncobj.c		\
-	igt_syncobj.h		\
-	igt_psr.c		\
-	igt_psr.h		\
-	igt_v3d.c		\
-	igt_v3d.h		\
-	igt_vc4.c		\
-	igt_vc4.h		\
-	igt_amd.c		\
-	igt_amd.h		\
-	veboxcopy_gen12.c	\
-	$(NULL)
-
-i915_perf_sources =			\
-	igt_list.c			\
-	i915/perf.c	 		\
-	i915/perf.h			\
-	i915/perf_data.h		\
-	i915/perf_data_reader.c		\
-	i915/perf_data_reader.h
-
-.PHONY: version.h.tmp
-
-# leaving a space here to work around automake's conditionals
- ifeq ($(GIT_HASH),no)
-$(IGT_LIB_PATH)/version.h.tmp:
-	@echo '#define IGT_GIT_SHA1 "git"' >> $@
- else
-$(IGT_LIB_PATH)/version.h.tmp:
-	@touch $@
-	@if test -d $(GPU_TOOLS_PATH)/.git; then \
-		if which git > /dev/null 2>&1; then \
-			cd $(GPU_TOOLS_PATH); \
-			git log -n 1 --oneline | \
-			sed 's/^\([^ ]*\) .*/#define IGT_GIT_SHA1 "g\1"/' ; \
-		else \
-			echo '#define IGT_GIT_SHA1 "NO-GIT"' ; \
-		fi \
-	else \
-		echo '#define IGT_GIT_SHA1 "NOT-GIT"' ; \
-	fi >> $@
- endif # GIT_HASH
-
-
-$(IGT_LIB_PATH)/version.h: $(IGT_LIB_PATH)/version.h.tmp
-	@if ! cmp -s $(IGT_LIB_PATH)/version.h.tmp $(IGT_LIB_PATH)/version.h; then \
-		mv $(IGT_LIB_PATH)/version.h.tmp $(IGT_LIB_PATH)/version.h ; \
-	else \
-		rm $(IGT_LIB_PATH)/version.h.tmp ; \
-	fi
-
-BUILT_SOURCES =				\
-	$(IGT_LIB_PATH)/version.h	\
-	$(i915_perf_generated_files)
-CLEANFILES = $(IGT_LIB_PATH)/version.h $(IGT_LIB_PATH)/version.h.tmp $(i915_perf_generated_files)
diff --git a/m4/as-compiler-flag.m4 b/m4/as-compiler-flag.m4
deleted file mode 100644
index 0f660cf0..00000000
--- a/m4/as-compiler-flag.m4
+++ /dev/null
@@ -1,62 +0,0 @@
-dnl as-compiler-flag.m4 0.1.0
-
-dnl autostars m4 macro for detection of compiler flags
-
-dnl David Schleef <ds@schleef.org>
-
-dnl $Id: as-compiler-flag.m4,v 1.1 2005/12/15 23:35:19 ds Exp $
-
-dnl AS_COMPILER_FLAG(CFLAGS, ACTION-IF-ACCEPTED, [ACTION-IF-NOT-ACCEPTED])
-dnl Tries to compile with the given CFLAGS.
-dnl Runs ACTION-IF-ACCEPTED if the compiler can compile with the flags,
-dnl and ACTION-IF-NOT-ACCEPTED otherwise.
-
-AC_DEFUN([AS_COMPILER_FLAG],
-[
-  AC_MSG_CHECKING([to see if compiler understands $1])
-
-  save_CFLAGS="$CFLAGS"
-  CFLAGS="$CFLAGS $1"
-
-  AC_TRY_COMPILE([ ], [], [flag_ok=yes], [flag_ok=no])
-  CFLAGS="$save_CFLAGS"
-
-  if test "X$flag_ok" = Xyes ; then
-    m4_ifvaln([$2],[$2])
-    true
-  else
-    m4_ifvaln([$3],[$3])
-    true
-  fi
-  AC_MSG_RESULT([$flag_ok])
-])
-
-dnl AS_COMPILER_FLAGS(VAR, FLAGS)
-dnl Tries to compile with the given CFLAGS.
-
-AC_DEFUN([AS_COMPILER_FLAGS],
-[
-  list=$2
-  flags_supported=""
-  flags_unsupported=""
-  AC_MSG_CHECKING([for supported compiler flags])
-  for each in $list
-  do
-    save_CFLAGS="$CFLAGS"
-    CFLAGS="$CFLAGS $each"
-    AC_TRY_COMPILE([ ], [], [flag_ok=yes], [flag_ok=no])
-    CFLAGS="$save_CFLAGS"
-
-    if test "X$flag_ok" = Xyes ; then
-      flags_supported="$flags_supported $each"
-    else
-      flags_unsupported="$flags_unsupported $each"
-    fi
-  done
-  AC_MSG_RESULT([$flags_supported])
-  if test "X$flags_unsupported" != X ; then
-    AC_MSG_WARN([unsupported compiler flags: $flags_unsupported])
-  fi
-  $1="$$1 $flags_supported"
-])
-
diff --git a/m4/ax_gcc_func_attribute.m4 b/m4/ax_gcc_func_attribute.m4
deleted file mode 100644
index a6d9f6c5..00000000
--- a/m4/ax_gcc_func_attribute.m4
+++ /dev/null
@@ -1,226 +0,0 @@
-# ===========================================================================
-#   http://www.gnu.org/software/autoconf-archive/ax_gcc_func_attribute.html
-# ===========================================================================
-#
-# SYNOPSIS
-#
-#   AX_GCC_FUNC_ATTRIBUTE(ATTRIBUTE)
-#
-# DESCRIPTION
-#
-#   This macro checks if the compiler supports one of GCC's function
-#   attributes; many other compilers also provide function attributes with
-#   the same syntax. Compiler warnings are used to detect supported
-#   attributes as unsupported ones are ignored by default so quieting
-#   warnings when using this macro will yield false positives.
-#
-#   The ATTRIBUTE parameter holds the name of the attribute to be checked.
-#
-#   If ATTRIBUTE is supported define HAVE_FUNC_ATTRIBUTE_<ATTRIBUTE>.
-#
-#   The macro caches its result in the ax_cv_have_func_attribute_<attribute>
-#   variable.
-#
-#   The macro currently supports the following function attributes:
-#
-#    alias
-#    aligned
-#    alloc_size
-#    always_inline
-#    artificial
-#    cold
-#    const
-#    constructor
-#    constructor_priority for constructor attribute with priority
-#    deprecated
-#    destructor
-#    dllexport
-#    dllimport
-#    error
-#    externally_visible
-#    flatten
-#    format
-#    format_arg
-#    gnu_inline
-#    hot
-#    ifunc
-#    leaf
-#    malloc
-#    noclone
-#    noinline
-#    nonnull
-#    noreturn
-#    nothrow
-#    optimize
-#    pure
-#    unused
-#    used
-#    visibility
-#    warning
-#    warn_unused_result
-#    weak
-#    weakref
-#
-#   Unsuppored function attributes will be tested with a prototype returning
-#   an int and not accepting any arguments and the result of the check might
-#   be wrong or meaningless so use with care.
-#
-# LICENSE
-#
-#   Copyright (c) 2013 Gabriele Svelto <gabriele.svelto@gmail.com>
-#
-#   Copying and distribution of this file, with or without modification, are
-#   permitted in any medium without royalty provided the copyright notice
-#   and this notice are preserved.  This file is offered as-is, without any
-#   warranty.
-
-#serial 4
-
-AC_DEFUN([AX_GCC_FUNC_ATTRIBUTE], [
-    AS_VAR_PUSHDEF([ac_var], [ax_cv_have_func_attribute_$1])
-
-    AC_CACHE_CHECK([for __attribute__(($1))], [ac_var], [
-        AC_LINK_IFELSE([AC_LANG_PROGRAM([
-            m4_case([$1],
-                [alias], [
-                    int foo( void ) { return 0; }
-                    int bar( void ) __attribute__(($1("foo")));
-                ],
-                [aligned], [
-                    int foo( void ) __attribute__(($1(32)));
-                ],
-                [alloc_size], [
-                    void *foo(int a) __attribute__(($1(1)));
-                ],
-                [always_inline], [
-                    inline __attribute__(($1)) int foo( void ) { return 0; }
-                ],
-                [artificial], [
-                    inline __attribute__(($1)) int foo( void ) { return 0; }
-                ],
-                [cold], [
-                    int foo( void ) __attribute__(($1));
-                ],
-                [const], [
-                    int foo( void ) __attribute__(($1));
-                ],
-                [constructor_priority], [
-                    int foo( void ) __attribute__((__constructor__(65535/2)));
-                ],
-                [constructor], [
-                    int foo( void ) __attribute__(($1));
-                ],
-                [deprecated], [
-                    int foo( void ) __attribute__(($1("")));
-                ],
-                [destructor], [
-                    int foo( void ) __attribute__(($1));
-                ],
-                [dllexport], [
-                    __attribute__(($1)) int foo( void ) { return 0; }
-                ],
-                [dllimport], [
-                    int foo( void ) __attribute__(($1));
-                ],
-                [error], [
-                    int foo( void ) __attribute__(($1("")));
-                ],
-                [externally_visible], [
-                    int foo( void ) __attribute__(($1));
-                ],
-                [flatten], [
-                    int foo( void ) __attribute__(($1));
-                ],
-                [format], [
-                    int foo(const char *p, ...) __attribute__(($1(printf, 1, 2)));
-                ],
-                [format_arg], [
-                    char *foo(const char *p) __attribute__(($1(1)));
-                ],
-                [gnu_inline], [
-                    inline __attribute__(($1)) int foo( void ) { return 0; }
-                ],
-                [hot], [
-                    int foo( void ) __attribute__(($1));
-                ],
-                [ifunc], [
-                    int my_foo( void ) { return 0; }
-                    static int (*resolve_foo(void))(void) { return my_foo; }
-                    int foo( void ) __attribute__(($1("resolve_foo")));
-                ],
-                [leaf], [
-                    __attribute__(($1)) int foo( void ) { return 0; }
-                ],
-                [malloc], [
-                    void *foo( void ) __attribute__(($1));
-                ],
-                [noclone], [
-                    int foo( void ) __attribute__(($1));
-                ],
-                [noinline], [
-                    __attribute__(($1)) int foo( void ) { return 0; }
-                ],
-                [nonnull], [
-                    int foo(char *p) __attribute__(($1(1)));
-                ],
-                [noreturn], [
-                    void foo( void ) __attribute__(($1));
-                ],
-                [nothrow], [
-                    int foo( void ) __attribute__(($1));
-                ],
-                [optimize], [
-                    __attribute__(($1(3))) int foo( void ) { return 0; }
-                ],
-                [pure], [
-                    int foo( void ) __attribute__(($1));
-                ],
-                [returns_nonnull], [
-                    void *foo( void ) __attribute__(($1));
-                ],
-                [unused], [
-                    int foo( void ) __attribute__(($1));
-                ],
-                [used], [
-                    int foo( void ) __attribute__(($1));
-                ],
-                [visibility], [
-                    int foo_def( void ) __attribute__(($1("default")));
-                    int foo_hid( void ) __attribute__(($1("hidden")));
-                    int foo_int( void ) __attribute__(($1("internal")));
-                    int foo_pro( void ) __attribute__(($1("protected")));
-                ],
-                [warning], [
-                    int foo( void ) __attribute__(($1("")));
-                ],
-                [warn_unused_result], [
-                    int foo( void ) __attribute__(($1));
-                ],
-                [weak], [
-                    int foo( void ) __attribute__(($1));
-                ],
-                [weakref], [
-                    static int foo( void ) { return 0; }
-                    static int bar( void ) __attribute__(($1("foo")));
-                ],
-                [
-                 m4_warn([syntax], [Unsupported attribute $1, the test may fail])
-                 int foo( void ) __attribute__(($1));
-                ]
-            )], [])
-            ],
-            dnl GCC doesn't exit with an error if an unknown attribute is
-            dnl provided but only outputs a warning, so accept the attribute
-            dnl only if no warning were issued.
-            [AS_IF([test -s conftest.err],
-                [AS_VAR_SET([ac_var], [no])],
-                [AS_VAR_SET([ac_var], [yes])])],
-            [AS_VAR_SET([ac_var], [no])])
-    ])
-
-    AS_IF([test yes = AS_VAR_GET([ac_var])],
-        [AC_DEFINE_UNQUOTED(AS_TR_CPP(HAVE_FUNC_ATTRIBUTE_$1), 1,
-            [Define to 1 if the system has the `$1' function attribute])], [])
-
-    AS_VAR_POPDEF([ac_var])
-])
diff --git a/overlay/Makefile.am b/overlay/Makefile.am
deleted file mode 100644
index eeeddbba..00000000
--- a/overlay/Makefile.am
+++ /dev/null
@@ -1,70 +0,0 @@
-if BUILD_OVERLAY
-bin_PROGRAMS = intel-gpu-overlay
-
-BUILT_SOURCES = tracepoint_format.h
-endif
-
-tracepoint_format.h: tracepoint_format.leg
-	$(LEG) -o $@ $<
-
-AM_CPPFLAGS = -I. -I$(top_srcdir)/include/drm-uapi \
-	      -I$(top_srcdir)/lib/stubs/syscalls
-AM_CFLAGS = $(DRM_CFLAGS) $(PCIACCESS_CFLAGS) $(CWARNFLAGS) \
-	$(CAIRO_CFLAGS) $(OVERLAY_CFLAGS) $(WERROR_CFLAGS) -I$(srcdir)/../lib
-LDADD = $(DRM_LIBS) $(PCIACCESS_LIBS) $(CAIRO_LIBS) $(OVERLAY_LIBS) $(top_builddir)/lib/libigt_perf.la
-
-intel_gpu_overlay_SOURCES = \
-	chart.h \
-	chart.c \
-	config.c \
-	cpu-top.h \
-	cpu-top.c \
-	debugfs.h \
-	debugfs.c \
-	gem-interrupts.h \
-	gem-interrupts.c \
-	gem-objects.h \
-	gem-objects.c \
-	gpu-top.h \
-	gpu-top.c \
-	gpu-perf.h \
-	gpu-perf.c \
-	gpu-freq.h \
-	gpu-freq.c \
-	overlay.h \
-	overlay.c \
-	power.h \
-	power.c \
-	rc6.h \
-	rc6.c \
-	$(NULL)
-
-if BUILD_OVERLAY_XLIB
-both_x11_sources = x11/position.c x11/position.h
-AM_CFLAGS += $(OVERLAY_XLIB_CFLAGS) $(XRANDR_CFLAGS)
-LDADD += $(OVERLAY_XLIB_LIBS) $(XRANDR_LIBS)
-intel_gpu_overlay_SOURCES += \
-	x11/x11-window.c \
-	$(NULL)
-endif
-
-if BUILD_OVERLAY_XVLIB
-both_x11_sources = x11/position.c
-AM_CFLAGS += $(OVERLAY_XVLIB_CFLAGS) $(XRANDR_CFLAGS)
-LDADD += $(OVERLAY_XVLIB_LIBS) $(XRANDR_LIBS)
-intel_gpu_overlay_SOURCES += \
-	x11/dri2.c \
-	x11/dri2.h \
-	x11/rgb2yuv.c \
-	x11/rgb2yuv.h \
-	x11/x11-overlay.c \
-	$(NULL)
-endif
-
-intel_gpu_overlay_SOURCES += \
-	kms/kms-overlay.c \
-	$(NULL)
-
-intel_gpu_overlay_SOURCES += $(both_x11_sources)
-
-intel_gpu_overlay_LDADD = $(LDADD) -lrt -lm
diff --git a/scripts/Makefile.am b/scripts/Makefile.am
deleted file mode 100644
index 64171529..00000000
--- a/scripts/Makefile.am
+++ /dev/null
@@ -1,2 +0,0 @@
-dist_noinst_SCRIPTS = intel-gfx-trybot who.sh run-tests.sh trace.pl
-noinst_PYTHON = throttle.py
diff --git a/tests/Makefile.am b/tests/Makefile.am
deleted file mode 100644
index a6c807d8..00000000
--- a/tests/Makefile.am
+++ /dev/null
@@ -1,153 +0,0 @@
-include Makefile.sources
-
-SUBDIRS = intel-ci
-
-if HAVE_LIBDRM_AMDGPU
-    TESTS_progs += $(AMDGPU_TESTS)
-endif
-
-if HAVE_LIBDRM_NOUVEAU
-    TESTS_progs += $(NOUVEAU_TESTS)
-endif
-
-if HAVE_CHAMELIUM
-TESTS_progs += \
-	kms_chamelium \
-	kms_color_chamelium \
-	$(NULL)
-endif
-
-TESTS_progs += testdisplay
-
-TESTS_progs += kms_color
-
-if BUILD_TESTS
-test-list.txt: Makefile
-	@echo TESTLIST > $@
-	@echo ${kernel_tests} >> $@
-	@echo END TESTLIST >> $@
-
-test-list-full.txt: Makefile
-	@echo TESTLIST > $@
-	@echo ${kernel_tests} ${extra_kernel_tests} >> $@
-	@echo END TESTLIST >> $@
-
-
-noinst_PROGRAMS = \
-	$(TESTS_testsuite) \
-	$(NULL)
-
-pkglibexec_PROGRAMS = \
-	$(TESTS_progs) \
-	$(TESTS_progs_X) \
-	$(NULL)
-
-pkglibexec_PROGRAMS += gem_stress
-gem_stress_SOURCES = i915/gem_stress.c
-
-# Piglit expects test-list*.txt to be in the same directory as the
-# tests. pkglibexec_DATA is an invalid combo to autotools, so work
-# around that by defining a new directory variable that is the same as
-# libexec directory and install the .txt files there.
-wrap_libexecdir = $(pkglibexecdir)
-wrap_libexec_DATA = \
-	test-list.txt \
-	test-list-full.txt \
-	$(NULL)
-
-dist_pkglibexec_SCRIPTS = \
-	$(TESTS_scripts) \
-	$(scripts) \
-	$(NULL)
-
-dist_pkgdata_DATA = \
-	$(IMAGES) \
-	$(NULL)
-
-all-local: .gitignore
-.gitignore: Makefile.sources
-	@echo "$(pkglibexec_PROGRAMS) test-list.txt test-list-full.txt /.gitignore" | sed 's/\s\+/\n/g' | sort > $@
-
-CLEANFILES = test-list.txt test-list-full.txt .gitignore
-
-AM_CFLAGS = $(CWARNFLAGS) -Wno-unused-result $(DEBUG_CFLAGS)\
-	-I$(top_srcdir)/include/drm-uapi \
-	-I$(srcdir)/.. \
-	-I$(srcdir)/../lib \
-	-I$(top_srcdir)/lib/stubs/syscalls \
-	-include "$(srcdir)/../lib/check-ndebug.h" \
-	-DIGT_SRCDIR=\""$(abs_srcdir)"\" \
-	-DIGT_DATADIR=\""$(pkgdatadir)"\" \
-	-D_GNU_SOURCE \
-	$(DRM_CFLAGS) $(LIBUNWIND_CFLAGS) $(WERROR_CFLAGS) \
-	$(NULL)
-
-LDADD = ../lib/libintel_tools.la $(XMLRPC_LIBS)
-
-AM_CFLAGS += $(CAIRO_CFLAGS) $(LIBUDEV_CFLAGS)
-AM_LDFLAGS = -Wl,--as-needed
-
-api_intel_bb_LDADD = $(LDADD) -lz
-drm_import_export_CFLAGS = $(AM_CFLAGS) $(THREAD_CFLAGS)
-drm_import_export_LDADD = $(LDADD) -lpthread
-dumb_buffer_CFLAGS = $(AM_CFLAGS) $(THREAD_CFLAGS)
-dumb_buffer_LDADD = $(LDADD) -lpthread -latomic
-gem_create_CFLAGS = $(AM_CFLAGS) $(THREAD_CFLAGS)
-gem_create_LDADD = $(LDADD) -lpthread -latomic
-gem_close_race_CFLAGS = $(AM_CFLAGS) $(THREAD_CFLAGS)
-gem_close_race_LDADD = $(LDADD) -lpthread
-gem_ctx_freq_LDADD = $(LDADD) $(top_builddir)/lib/libigt_perf.la
-gem_ctx_sseu_LDADD = $(LDADD) $(top_builddir)/lib/libigt_perf.la
-gem_exec_balancer_LDADD = $(LDADD) $(top_builddir)/lib/libigt_perf.la
-gem_exec_capture_LDADD = $(LDADD) -lz
-gem_exec_parallel_CFLAGS = $(AM_CFLAGS) $(THREAD_CFLAGS)
-gem_exec_parallel_LDADD = $(LDADD) -lpthread
-gem_fence_thrash_CFLAGS = $(AM_CFLAGS) $(THREAD_CFLAGS)
-gem_fence_thrash_LDADD = $(LDADD) -lpthread
-gem_fence_upload_CFLAGS = $(AM_CFLAGS) $(THREAD_CFLAGS)
-gem_fence_upload_LDADD = $(LDADD) -lpthread
-gem_flink_race_CFLAGS = $(AM_CFLAGS) $(THREAD_CFLAGS)
-gem_flink_race_LDADD = $(LDADD) -lpthread
-gem_mmap_gtt_CFLAGS = $(AM_CFLAGS) $(THREAD_CFLAGS)
-gem_mmap_gtt_LDADD = $(LDADD) -lpthread
-gem_mmap_offset_CFLAGS = $(AM_CFLAGS) $(THREAD_CFLAGS)
-gem_mmap_offset_LDADD = $(LDADD) -lpthread -latomic
-gem_mmap_wc_CFLAGS = $(AM_CFLAGS) $(THREAD_CFLAGS)
-gem_mmap_wc_LDADD = $(LDADD) -lpthread
-gem_sync_CFLAGS = $(AM_CFLAGS) $(THREAD_CFLAGS)
-gem_sync_LDADD = $(LDADD) -lpthread
-gem_tiled_swapping_CFLAGS = $(AM_CFLAGS) $(THREAD_CFLAGS)
-gem_tiled_swapping_LDADD = $(LDADD) -lpthread
-i915_pm_rc6_residency_LDADD = $(LDADD) $(top_builddir)/lib/libigt_perf.la
-prime_self_import_CFLAGS = $(AM_CFLAGS) $(THREAD_CFLAGS)
-prime_self_import_LDADD = $(LDADD) -lpthread
-gem_userptr_blits_CFLAGS = $(AM_CFLAGS) $(THREAD_CFLAGS)
-gem_userptr_blits_LDADD = $(LDADD) -lpthread
-perf_LDADD = $(LDADD) $(top_builddir)/lib/libi915_perf.la
-perf_pmu_LDADD = $(LDADD) $(top_builddir)/lib/libigt_perf.la
-sw_sync_LDADD = $(LDADD) -latomic
-
-kms_flip_LDADD = $(LDADD) -lpthread
-
-prime_nv_test_CFLAGS = $(AM_CFLAGS) $(DRM_NOUVEAU_CFLAGS)
-prime_nv_test_LDADD = $(LDADD) $(DRM_NOUVEAU_LIBS)
-prime_nv_api_CFLAGS = $(AM_CFLAGS) $(DRM_NOUVEAU_CFLAGS)
-prime_nv_api_LDADD = $(LDADD) $(DRM_NOUVEAU_LIBS)
-prime_nv_pcopy_CFLAGS = $(AM_CFLAGS) $(DRM_NOUVEAU_CFLAGS)
-prime_nv_pcopy_LDADD = $(LDADD) $(DRM_NOUVEAU_LIBS)
-
-kms_chamelium_CFLAGS = $(AM_CFLAGS) $(XMLRPC_CFLAGS) $(LIBUDEV_CFLAGS) $(ALSA_CFLAGS)
-kms_chamelium_LDADD = $(LDADD) $(XMLRPC_LIBS) $(LIBUDEV_LIBS) $(ALSA_LIBS)
-
-testdisplay_CFLAGS = $(AM_CFLAGS) $(GLIB_CFLAGS)
-
-amdgpu_amd_basic_CFLAGS = $(AM_CFLAGS) $(DRM_AMDGPU_CFLAGS)
-amdgpu_amd_basic_LDADD = $(LDADD) $(DRM_AMDGPU_LIBS)
-amdgpu_amd_cs_nop_CFLAGS = $(AM_CFLAGS) $(DRM_AMDGPU_CFLAGS)
-amdgpu_amd_cs_nop_LDADD = $(LDADD) $(DRM_AMDGPU_LIBS)
-amdgpu_amd_prime_CFLAGS = $(AM_CFLAGS) $(DRM_AMDGPU_CFLAGS)
-amdgpu_amd_prime_LDADD = $(LDADD) $(DRM_AMDGPU_LIBS)
-amdgpu_amd_info_CFLAGS = $(AM_CFLAGS) $(DRM_AMDGPU_CFLAGS)
-amdgpu_amd_info_LDADD = $(LDADD) $(DRM_AMDGPU_LIBS)
-
-endif
diff --git a/tests/Makefile.sources b/tests/Makefile.sources
deleted file mode 100644
index ffc7878a..00000000
--- a/tests/Makefile.sources
+++ /dev/null
@@ -1,581 +0,0 @@
-NOUVEAU_TESTS = \
-	prime_nv_api \
-	prime_nv_pcopy \
-	prime_nv_test \
-	$(NULL)
-
-AMDGPU_TESTS = \
-	amdgpu/amd_basic \
-	amdgpu/amd_bypass \
-	amdgpu/amd_color \
-	amdgpu/amd_cs_nop \
-	amdgpu/amd_info \
-	amdgpu/amd_prime \
-	amdgpu/amd_abm \
-	$(NULL)
-
-TESTS_progs = \
-	core_auth \
-	core_getclient \
-	core_getstats \
-	core_getversion \
-	core_hotunplug \
-	core_setmaster \
-	core_setmaster_vs_auth \
-	debugfs_test \
-	device_reset \
-	dmabuf \
-	drm_import_export \
-	drm_mm \
-	drm_read \
-	dumb_buffer \
-	fbdev \
-	feature_discovery \
-	kms_3d \
-	kms_addfb_basic \
-	kms_async_flips \
-	kms_atomic \
-	kms_atomic_interruptible \
-	kms_atomic_transition \
-	kms_available_modes_crc \
-	kms_big_fb \
-	kms_big_joiner \
-	kms_busy \
-	kms_ccs \
-	kms_concurrent \
-	kms_content_protection\
-	kms_cursor_crc \
-	kms_cursor_edge_walk \
-	kms_cursor_legacy \
-	kms_dp_aux_dev \
-	kms_dp_dsc \
-	kms_dp_tiled_display \
-	kms_draw_crc \
-	kms_fbcon_fbt \
-	kms_fence_pin_leak \
-	kms_flip \
-	kms_flip_event_leak \
-	kms_flip_scaled_crc \
-	kms_flip_tiling \
-	kms_force_connector_basic \
-	kms_frontbuffer_tracking \
-	kms_getfb \
-	kms_hdmi_inject \
-	kms_hdr \
-	kms_invalid_dotclock \
-	kms_lease \
-	kms_legacy_colorkey \
-	kms_mmap_write_crc \
-	kms_multipipe_modeset \
-	kms_panel_fitting \
-	kms_pipe_b_c_ivb \
-	kms_pipe_crc_basic \
-	kms_plane \
-	kms_plane_alpha_blend \
-	kms_plane_cursor \
-	kms_plane_lowres \
-	kms_plane_multiple \
-	kms_plane_scaling \
-	kms_prime \
-	kms_prop_blob \
-	kms_properties \
-	kms_psr \
-	kms_psr2_su \
-	kms_psr2_sf \
-	kms_pwrite_crc \
-	kms_rmfb \
-	kms_rotation_crc \
-	kms_selftest \
-	kms_sequence \
-	kms_setmode \
-	kms_sysfs_edid_timing \
-	kms_tv_load_detect \
-	kms_universal_plane \
-	kms_vblank \
-	kms_vrr \
-	kms_writeback \
-	meta_test \
-	prime_busy \
-	prime_mmap \
-	prime_mmap_coherency \
-	prime_mmap_kms \
-	prime_self_import \
-	prime_udl \
-	prime_vgem \
-	sw_sync \
-	syncobj_basic \
-	syncobj_timeline \
-	syncobj_wait \
-	template \
-	tools_test \
-	vgem_basic \
-	vgem_slow \
-	$(NULL)
-
-TESTS_progs += api_intel_bb
-api_intel_bb_SOURCES = i915/api_intel_bb.c
-
-TESTS_progs += sysfs_clients
-sysfs_clients_SOURCES = i915/sysfs_clients.c
-
-TESTS_progs += sysfs_defaults
-sysfs_defaults_SOURCES = i915/sysfs_defaults.c
-
-TESTS_progs += sysfs_heartbeat_interval
-sysfs_heartbeat_interval_SOURCES = i915/sysfs_heartbeat_interval.c
-
-TESTS_progs += sysfs_preempt_timeout
-sysfs_preempt_timeout_SOURCES = i915/sysfs_preempt_timeout.c
-
-TESTS_progs += sysfs_timeslice_duration
-sysfs_timeslice_duration_SOURCES = i915/sysfs_timeslice_duration.c
-
-TESTS_progs += perf
-perf_SOURCES = i915/perf.c
-
-TESTS_progs += perf_pmu
-perf_pmu_SOURCES = i915/perf_pmu.c
-
-TESTS_progs += gem_bad_reloc
-gem_bad_reloc_SOURCES = i915/gem_bad_reloc.c
-
-TESTS_progs += gem_basic
-gem_basic_SOURCES = i915/gem_basic.c
-
-TESTS_progs += gem_blits
-gem_blits_SOURCES = i915/gem_blits.c
-
-TESTS_progs += gem_busy
-gem_busy_SOURCES = i915/gem_busy.c
-
-TESTS_progs += gem_caching
-gem_caching_SOURCES = i915/gem_caching.c
-
-TESTS_progs += gem_close
-gem_close_SOURCES = i915/gem_close.c
-
-TESTS_progs += gem_close_race
-gem_close_race_SOURCES = i915/gem_close_race.c
-
-TESTS_progs += gem_concurrent_blit
-gem_concurrent_blit_SOURCES = i915/gem_concurrent_blit.c
-
-TESTS_progs += gem_create
-gem_create_SOURCES = i915/gem_create.c
-
-TESTS_progs += gem_cs_tlb
-gem_cs_tlb_SOURCES = i915/gem_cs_tlb.c
-
-TESTS_progs += gem_ctx_bad_destroy
-gem_ctx_bad_destroy_SOURCES = i915/gem_ctx_bad_destroy.c
-
-TESTS_progs += gem_ctx_clone
-gem_ctx_clone_SOURCES = i915/gem_ctx_clone.c
-
-TESTS_progs += gem_ctx_create
-gem_ctx_create_SOURCES = i915/gem_ctx_create.c
-
-TESTS_progs += gem_ctx_engines
-gem_ctx_engines_SOURCES = i915/gem_ctx_engines.c
-
-TESTS_progs += gem_ctx_exec
-gem_ctx_exec_SOURCES = i915/gem_ctx_exec.c
-
-TESTS_progs += gem_ctx_freq
-gem_ctx_freq_SOURCES = i915/gem_ctx_freq.c
-
-TESTS_progs += gem_ctx_isolation
-gem_ctx_isolation_SOURCES = i915/gem_ctx_isolation.c
-
-TESTS_progs += gem_ctx_param
-gem_ctx_param_SOURCES = i915/gem_ctx_param.c
-
-TESTS_progs += gem_ctx_persistence
-gem_ctx_persistence_SOURCES = i915/gem_ctx_persistence.c
-
-TESTS_progs += gem_ctx_ringsize
-gem_ctx_ringsize_SOURCES = i915/gem_ctx_ringsize.c
-
-TESTS_progs += gem_ctx_shared
-gem_ctx_shared_SOURCES = i915/gem_ctx_shared.c
-
-TESTS_progs += gem_ctx_sseu
-gem_ctx_sseu_SOURCES = i915/gem_ctx_sseu.c
-
-TESTS_progs += gem_ctx_switch
-gem_ctx_switch_SOURCES = i915/gem_ctx_switch.c
-
-TESTS_progs += gem_eio
-gem_eio_SOURCES = i915/gem_eio.c
-
-TESTS_progs += gem_evict_alignment
-gem_evict_alignment_SOURCES = i915/gem_evict_alignment.c
-
-TESTS_progs += gem_evict_everything
-gem_evict_everything_SOURCES = i915/gem_evict_everything.c
-
-TESTS_progs += gem_exec_alignment
-gem_exec_alignment_SOURCES = i915/gem_exec_alignment.c
-
-TESTS_progs += gem_exec_async
-gem_exec_async_SOURCES = i915/gem_exec_async.c
-
-TESTS_progs += gem_exec_await
-gem_exec_await_SOURCES = i915/gem_exec_await.c
-
-TESTS_progs += gem_exec_balancer
-gem_exec_balancer_SOURCES = i915/gem_exec_balancer.c
-
-TESTS_progs += gem_exec_basic
-gem_exec_basic_SOURCES = i915/gem_exec_basic.c
-
-TESTS_progs += gem_exec_big
-gem_exec_big_SOURCES = i915/gem_exec_big.c
-
-TESTS_progs += gem_exec_capture
-gem_exec_capture_SOURCES = i915/gem_exec_capture.c
-
-TESTS_progs += gem_exec_create
-gem_exec_create_SOURCES = i915/gem_exec_create.c
-
-TESTS_progs += gem_exec_fence
-gem_exec_fence_SOURCES = i915/gem_exec_fence.c
-
-TESTS_progs += gem_exec_flush
-gem_exec_flush_SOURCES = i915/gem_exec_flush.c
-
-TESTS_progs += gem_exec_gttfill
-gem_exec_gttfill_SOURCES = i915/gem_exec_gttfill.c
-
-TESTS_progs += gem_exec_latency
-gem_exec_latency_SOURCES = i915/gem_exec_latency.c
-
-TESTS_progs += gem_exec_lut_handle
-gem_exec_lut_handle_SOURCES = i915/gem_exec_lut_handle.c
-
-TESTS_progs += gem_exec_nop
-gem_exec_nop_SOURCES = i915/gem_exec_nop.c
-
-TESTS_progs += gem_exec_parallel
-gem_exec_parallel_SOURCES = i915/gem_exec_parallel.c
-
-TESTS_progs += gem_exec_params
-gem_exec_params_SOURCES = i915/gem_exec_params.c
-
-TESTS_progs += gen7_exec_parse
-gen7_exec_parse_SOURCES = i915/gen7_exec_parse.c
-
-TESTS_progs += gen9_exec_parse
-gen9_exec_parse_SOURCES = i915/gen9_exec_parse.c
-
-TESTS_progs += gem_exec_reloc
-gem_exec_reloc_SOURCES = i915/gem_exec_reloc.c
-
-TESTS_progs += gem_exec_schedule
-gem_exec_schedule_SOURCES = i915/gem_exec_schedule.c
-
-TESTS_progs += gem_exec_fair
-gem_exec_fair_SOURCES = i915/gem_exec_fair.c
-
-TESTS_progs += gem_exec_store
-gem_exec_store_SOURCES = i915/gem_exec_store.c
-
-TESTS_progs += gem_exec_endless
-gem_exec_endless_SOURCES = i915/gem_exec_endless.c
-
-TESTS_progs += gem_exec_suspend
-gem_exec_suspend_SOURCES = i915/gem_exec_suspend.c
-
-TESTS_progs += gem_exec_whisper
-gem_exec_whisper_SOURCES = i915/gem_exec_whisper.c
-
-TESTS_progs += gem_fd_exhaustion
-gem_fd_exhaustion_SOURCES = i915/gem_fd_exhaustion.c
-
-TESTS_progs += gem_fence_thrash
-gem_fence_thrash_SOURCES = i915/gem_fence_thrash.c
-
-TESTS_progs += gem_fence_upload
-gem_fence_upload_SOURCES = i915/gem_fence_upload.c
-
-TESTS_progs += gem_fenced_exec_thrash
-gem_fenced_exec_thrash_SOURCES = i915/gem_fenced_exec_thrash.c
-
-TESTS_progs += gem_flink_basic
-gem_flink_basic_SOURCES = i915/gem_flink_basic.c
-
-TESTS_progs += gem_flink_race
-gem_flink_race_SOURCES = i915/gem_flink_race.c
-
-TESTS_progs += gem_gpgpu_fill
-gem_gpgpu_fill_SOURCES = i915/gem_gpgpu_fill.c
-
-TESTS_progs += gem_gtt_cpu_tlb
-gem_gtt_cpu_tlb_SOURCES = i915/gem_gtt_cpu_tlb.c
-
-TESTS_progs += gem_gtt_hog
-gem_gtt_hog_SOURCES = i915/gem_gtt_hog.c
-
-TESTS_progs += gem_gtt_speed
-gem_gtt_speed_SOURCES = i915/gem_gtt_speed.c
-
-TESTS_progs += gem_linear_blits
-gem_linear_blits_SOURCES = i915/gem_linear_blits.c
-
-TESTS_progs += gem_lut_handle
-gem_lut_handle_SOURCES = i915/gem_lut_handle.c
-
-TESTS_progs += gem_madvise
-gem_madvise_SOURCES = i915/gem_madvise.c
-
-TESTS_progs += gem_media_fill
-gem_media_fill_SOURCES = i915/gem_media_fill.c
-
-TESTS_progs += gem_media_vme
-gem_media_vme_SOURCES = i915/gem_media_vme.c
-
-TESTS_progs += gem_huc_copy
-gem_huc_copy_SOURCES = i915/gem_huc_copy.c
-
-TESTS_progs += gem_mmap
-gem_mmap_SOURCES = i915/gem_mmap.c
-
-TESTS_progs += gem_mmap_gtt
-gem_mmap_gtt_SOURCES = i915/gem_mmap_gtt.c
-
-TESTS_progs += gem_mmap_offset
-gem_mmap_offset_SOURCES = i915/gem_mmap_offset.c
-
-TESTS_progs += gem_mmap_wc
-gem_mmap_wc_SOURCES = i915/gem_mmap_wc.c
-
-TESTS_progs += gem_partial_pwrite_pread
-gem_partial_pwrite_pread_SOURCES = i915/gem_partial_pwrite_pread.c
-
-TESTS_progs += gem_pipe_control_store_loop
-gem_pipe_control_store_loop_SOURCES = i915/gem_pipe_control_store_loop.c
-
-TESTS_progs += gem_ppgtt
-gem_ppgtt_SOURCES = i915/gem_ppgtt.c
-
-TESTS_progs += gem_pread
-gem_pread_SOURCES = i915/gem_pread.c
-
-TESTS_progs += gem_pread_after_blit
-gem_pread_after_blit_SOURCES = i915/gem_pread_after_blit.c
-
-TESTS_progs += gem_pwrite
-gem_pwrite_SOURCES = i915/gem_pwrite.c
-
-TESTS_progs += gem_pwrite_snooped
-gem_pwrite_snooped_SOURCES = i915/gem_pwrite_snooped.c
-
-TESTS_progs += gem_read_read_speed
-gem_read_read_speed_SOURCES = i915/gem_read_read_speed.c
-
-TESTS_progs += gem_readwrite
-gem_readwrite_SOURCES = i915/gem_readwrite.c
-
-TESTS_progs += gem_reg_read
-gem_reg_read_SOURCES = i915/gem_reg_read.c
-
-TESTS_progs += gem_render_copy
-gem_render_copy_SOURCES = i915/gem_render_copy.c
-
-TESTS_progs += gem_render_copy_redux
-gem_render_copy_redux_SOURCES = i915/gem_render_copy_redux.c
-
-TESTS_progs += gem_render_linear_blits
-gem_render_linear_blits_SOURCES = i915/gem_render_linear_blits.c
-
-TESTS_progs += gem_render_tiled_blits
-gem_render_tiled_blits_SOURCES = i915/gem_render_tiled_blits.c
-
-TESTS_progs += gem_request_retire
-gem_request_retire_SOURCES = i915/gem_request_retire.c
-
-TESTS_progs += gem_reset_stats
-gem_reset_stats_SOURCES = i915/gem_reset_stats.c
-
-TESTS_progs += gem_ringfill
-gem_ringfill_SOURCES = i915/gem_ringfill.c
-
-TESTS_progs += gem_set_tiling_vs_blt
-gem_set_tiling_vs_blt_SOURCES = i915/gem_set_tiling_vs_blt.c
-
-TESTS_progs += gem_set_tiling_vs_gtt
-gem_set_tiling_vs_gtt_SOURCES = i915/gem_set_tiling_vs_gtt.c
-
-TESTS_progs += gem_set_tiling_vs_pwrite
-gem_set_tiling_vs_pwrite_SOURCES = i915/gem_set_tiling_vs_pwrite.c
-
-TESTS_progs += gem_shrink
-gem_shrink_SOURCES = i915/gem_shrink.c
-
-TESTS_progs += gem_softpin
-gem_softpin_SOURCES = i915/gem_softpin.c
-
-TESTS_progs += gem_spin_batch
-gem_spin_batch_SOURCES = i915/gem_spin_batch.c
-
-TESTS_progs += gem_streaming_writes
-gem_streaming_writes_SOURCES = i915/gem_streaming_writes.c
-
-TESTS_progs += gem_sync
-gem_sync_SOURCES = i915/gem_sync.c
-
-TESTS_progs += gem_tiled_blits
-gem_tiled_blits_SOURCES = i915/gem_tiled_blits.c
-
-TESTS_progs += gem_tiled_fence_blits
-gem_tiled_fence_blits_SOURCES = i915/gem_tiled_fence_blits.c
-
-TESTS_progs += gem_tiled_partial_pwrite_pread
-gem_tiled_partial_pwrite_pread_SOURCES = i915/gem_tiled_partial_pwrite_pread.c
-
-TESTS_progs += gem_tiled_pread_basic
-gem_tiled_pread_basic_SOURCES = i915/gem_tiled_pread_basic.c
-
-TESTS_progs += gem_tiled_pread_pwrite
-gem_tiled_pread_pwrite_SOURCES = i915/gem_tiled_pread_pwrite.c
-
-TESTS_progs += gem_tiled_swapping
-gem_tiled_swapping_SOURCES = i915/gem_tiled_swapping.c
-
-TESTS_progs += gem_tiled_wb
-gem_tiled_wb_SOURCES = i915/gem_tiled_wb.c
-
-TESTS_progs += gem_tiled_wc
-gem_tiled_wc_SOURCES = i915/gem_tiled_wc.c
-
-TESTS_progs += gem_tiling_max_stride
-gem_tiling_max_stride_SOURCES = i915/gem_tiling_max_stride.c
-
-TESTS_progs += gem_unfence_active_buffers
-gem_unfence_active_buffers_SOURCES = i915/gem_unfence_active_buffers.c
-
-TESTS_progs += gem_unref_active_buffers
-gem_unref_active_buffers_SOURCES = i915/gem_unref_active_buffers.c
-
-TESTS_progs += gem_userptr_blits
-gem_userptr_blits_SOURCES = i915/gem_userptr_blits.c
-
-TESTS_progs += gem_wait
-gem_wait_SOURCES = i915/gem_wait.c
-
-TESTS_progs += gem_workarounds
-gem_workarounds_SOURCES = i915/gem_workarounds.c
-
-TESTS_progs += gen3_mixed_blits
-gen3_mixed_blits_SOURCES = i915/gen3_mixed_blits.c
-
-TESTS_progs += gen3_render_linear_blits
-gen3_render_linear_blits_SOURCES = i915/gen3_render_linear_blits.c
-
-TESTS_progs += gen3_render_mixed_blits
-gen3_render_mixed_blits_SOURCES = i915/gen3_render_mixed_blits.c
-
-TESTS_progs += gen3_render_tiledx_blits
-gen3_render_tiledx_blits_SOURCES = i915/gen3_render_tiledx_blits.c
-
-TESTS_progs += gen3_render_tiledy_blits
-gen3_render_tiledy_blits_SOURCES = i915/gen3_render_tiledy_blits.c
-
-TESTS_progs += i915_fb_tiling
-i915_fb_tiling_SOURCES = i915/i915_fb_tiling.c
-
-TESTS_progs += i915_getparams_basic
-i915_getparams_basic_SOURCES = i915/i915_getparams_basic.c
-
-TESTS_progs += i915_hangman
-i915_hangman_SOURCES = i915/i915_hangman.c
-
-TESTS_progs += i915_module_load
-i915_module_load_SOURCES = i915/i915_module_load.c
-
-TESTS_progs += i915_pciid
-i915_pciid_SOURCES = i915/i915_pciid.c
-
-TESTS_progs += i915_pm_backlight
-i915_pm_backlight_SOURCES = i915/i915_pm_backlight.c
-
-TESTS_progs += i915_pm_lpsp
-i915_pm_lpsp_SOURCES = i915/i915_pm_lpsp.c
-
-TESTS_progs += i915_pm_rc6_residency
-i915_pm_rc6_residency_SOURCES = i915/i915_pm_rc6_residency.c
-
-TESTS_progs += i915_pm_rpm
-i915_pm_rpm_SOURCES = i915/i915_pm_rpm.c
-
-TESTS_progs += i915_pm_dc
-i915_pm_dc_SOURCES = i915/i915_pm_dc.c
-
-TESTS_progs += i915_pm_rps
-i915_pm_rps_SOURCES = i915/i915_pm_rps.c
-
-TESTS_progs += i915_pm_sseu
-i915_pm_sseu_SOURCES = i915/i915_pm_sseu.c
-
-TESTS_progs += i915_query
-i915_query_SOURCES = i915/i915_query.c
-
-TESTS_progs += i915_selftest
-i915_selftest_SOURCES = i915/i915_selftest.c
-
-TESTS_progs += i915_suspend
-i915_suspend_SOURCES = i915/i915_suspend.c
-
-TESTS_progs += gem_vm_create
-gem_vm_create_SOURCES = i915/gem_vm_create.c
-
-TESTS_progs_X = gem_concurrent_all
-gem_concurrent_all_SOURCES = i915/gem_concurrent_all.c
-
-kernel_tests = \
-	$(TESTS_progs) \
-	$(TESTS_scripts) \
-	$(NULL)
-
-# This target contains testcases with lots of subtests.
-# It was split from kernel_tests because of the overhead of listing all
-# the subtests in piglit
-extra_kernel_tests = \
-	$(TESTS_progs_X) \
-	$(NULL)
-
-
-kernel_tests_full = \
-	$(kernel_tests) \
-	$(extra_kernel_tests) \
-	$(NULL)
-
-IMAGES = pass.png 1080p-left.png 1080p-right.png
-
-testdisplay_SOURCES = \
-	testdisplay.c \
-	testdisplay.h \
-	testdisplay_hotplug.c \
-	$(NULL)
-
-kms_color_SOURCES = \
-        kms_color.c \
-        kms_color_helper.h \
-        kms_color_helper.c \
-        $(NULL)
-
-kms_color_chamelium_SOURCES = \
-        kms_color_chamelium.c \
-        kms_color_helper.h \
-        kms_color_helper.c \
-        $(NULL)
-
-check_SCRIPTS = igt_command_line.sh \
-	$(NULL)
-
-TESTS = $(check_SCRIPTS) \
-	$(NULL)
-
-common_files = \
-	       eviction_common.c \
-	       $(NULL)
diff --git a/tests/intel-ci/Makefile.am b/tests/intel-ci/Makefile.am
deleted file mode 100644
index a1b0439f..00000000
--- a/tests/intel-ci/Makefile.am
+++ /dev/null
@@ -1,5 +0,0 @@
-dist_pkgdata_DATA = \
-	fast-feedback.testlist \
-	meta.testlist \
-	README \
-	$(NULL)
diff --git a/tools/Makefile.am b/tools/Makefile.am
deleted file mode 100644
index 53699bab..00000000
--- a/tools/Makefile.am
+++ /dev/null
@@ -1,31 +0,0 @@
-include Makefile.sources
-
-bin_PROGRAMS = $(tools_prog_lists)
-
-if HAVE_LIBDRM_INTEL
-bin_PROGRAMS += $(LIBDRM_INTEL_BIN)
-intel_error_decode_LDFLAGS = -lz
-endif
-
-bin_PROGRAMS += intel_dp_compliance
-intel_dp_compliance_CFLAGS = $(AM_CFLAGS) $(GLIB_CFLAGS)
-intel_dp_compliance_LDADD = $(top_builddir)/lib/libintel_tools.la
-
-bin_PROGRAMS += amd_hdmi_compliance
-amd_hdmi_compliance_CFLAGS = $(AM_CFLAGS) $(GLIB_CFLAGS)
-
-bin_PROGRAMS += msm_dp_compliance
-msm_dp_compliance_CFLAGS = $(AM_CFLAGS) $(GLIB_CFLAGS)
-msm_dp_compliance_LDADD = $(top_builddir)/lib/libintel_tools.la
-
-SUBDIRS = i915-perf null_state_gen registers
-
-AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/include/drm-uapi -I$(top_srcdir)/lib \
-	      -I$(top_srcdir)/lib/stubs/syscalls
-AM_CFLAGS = $(DEBUG_CFLAGS) $(DRM_CFLAGS) $(PCIACCESS_CFLAGS) $(CWARNFLAGS) \
-	    $(CAIRO_CFLAGS) $(LIBUNWIND_CFLAGS) -DIGT_DATADIR=\"$(pkgdatadir)\" \
-	    $(WERROR_CFLAGS) -D_GNU_SOURCE
-LDADD = $(top_builddir)/lib/libintel_tools.la
-AM_LDFLAGS = -Wl,--as-needed
-
-intel_gpu_top_LDADD = $(top_builddir)/lib/libigt_perf.la $(top_builddir)/lib/libigt_device_scan.la $(LIBUDEV_LIBS) $(GLIB_LIBS) -lm
diff --git a/tools/Makefile.sources b/tools/Makefile.sources
deleted file mode 100644
index c93bfe7d..00000000
--- a/tools/Makefile.sources
+++ /dev/null
@@ -1,80 +0,0 @@
-noinst_PROGRAMS =		\
-	hsw_compute_wrpll	\
-	skl_compute_wrpll	\
-	skl_ddb_allocation	\
-	cnl_compute_wrpll 	\
-	$(NULL)
-
-tools_prog_lists =		\
-	igt_stats		\
-	dpcd_reg		\
-	intel_audio_dump	\
-	intel_reg		\
-	intel_backlight		\
-	intel_bios_dumper	\
-	intel_display_crc	\
-	intel_display_poller	\
-	intel_forcewaked	\
-	intel_gpu_frequency	\
-	intel_firmware_decode	\
-	intel_gpu_time		\
-	intel_gpu_top		\
-	intel_gtt		\
-	intel_guc_logger        \
-	intel_infoframes	\
-	intel_l3_parity		\
-	intel_lid		\
-	intel_opregion_decode	\
-	intel_panel_fitter	\
-	intel_reg_checker	\
-	intel_residency		\
-	intel_stepping		\
-	intel_vbt_decode	\
-	intel_watermark		\
-	intel_gem_info		\
-	intel_gvtg_test     \
-	lsgpu			\
-	$(NULL)
-
-dist_bin_SCRIPTS = intel_gpu_abrt
-
-LIBDRM_INTEL_BIN =		\
-	intel_dump_decode	\
-	intel_error_decode	\
-	intel_framebuffer_dump	\
-	intel_perf_counters	\
-	$(NULL)
-
-intel_reg_SOURCES =		\
-	intel_reg.c		\
-	intel_reg_decode.c	\
-	intel_reg_spec.c	\
-	intel_reg_spec.h
-
-intel_vbt_decode_SOURCES =	\
-	intel_vbt_decode.c	\
-	intel_vbt_defs.h \
-	intel_bios.h
-
-intel_l3_parity_SOURCES =	\
-	intel_l3_parity.c	\
-	intel_l3_parity.h	\
-	intel_l3_udev_listener.c
-
-intel_dp_compliance_SOURCES = \
-        intel_dp_compliance.c \
-        igt_dp_compliance.h \
-        igt_dp_compliance_hotplug.c \
-        igt_compliance_utils.c \
-        $(NULL)
-
-amd_hdmi_compliance_SOURCES = \
-        amd_hdmi_compliance.c \
-		$(NULL)
-
-msm_dp_compliance_SOURCES = \
-        msm_dp_compliance.c \
-		igt_dp_compliance.h \
-		igt_dp_compliance_hotplug.c \
-		igt_compliance_utils.c \
-		$(NULL)
diff --git a/tools/i915-perf/Makefile.am b/tools/i915-perf/Makefile.am
deleted file mode 100644
index 5520a59e..00000000
--- a/tools/i915-perf/Makefile.am
+++ /dev/null
@@ -1,29 +0,0 @@
-bin_PROGRAMS =			\
-	i915-perf-configs	\
-	i915-perf-control	\
-	i915-perf-recorder	\
-	i915-perf-reader
-
-AM_CFLAGS = $(CWARNFLAGS) -Wno-unused-result $(DEBUG_CFLAGS)\
-	-I$(top_srcdir)/include/drm-uapi \
-	-I$(top_srcdir)/lib \
-	-D_GNU_SOURCE \
-	$(DRM_CFLAGS) $(WERROR_CFLAGS) \
-	$(NULL)
-
-LDADD = $(top_builddir)/lib/libintel_tools.la
-
-i915_perf_configs_SOURCES = i915_perf_configs.c
-i915_perf_configs_CFLAGS = $(AM_CFLAGS) -I$(top_srcdir)/lib/i915
-i915_perf_configs_LDADD = $(LDADD) $(top_builddir)/lib/libi915_perf.la
-
-i915_perf_control_SOURCES = i915_perf_control.c
-i915_perf_control_CFLAGS = $(AM_CFLAGS)
-
-i915_perf_recorder_SOURCES = i915_perf_recorder.c
-i915_perf_recorder_CFLAGS = $(AM_CFLAGS) -I$(top_srcdir)/lib/i915
-i915_perf_recorder_LDADD = $(LDADD) $(top_builddir)/lib/libi915_perf.la
-
-i915_perf_reader_SOURCES = i915_perf_reader.c
-i915_perf_reader_CFLAGS = $(AM_CFLAGS) -I$(top_srcdir)/lib/i915
-i915_perf_reader_LDADD = ../../lib/libintel_tools.la $(top_builddir)/lib/libi915_perf.la
diff --git a/tools/meson.build b/tools/meson.build
index cf693c0a..b6b97534 100644
--- a/tools/meson.build
+++ b/tools/meson.build
@@ -86,10 +86,7 @@ executable('intel_reg', sources : intel_reg_src,
 
 install_data('intel_gpu_abrt', install_dir : bindir)
 
-install_subdir('registers', install_dir : datadir,
-	       exclude_files : [
-		 'Makefile', 'Makefile.in', 'Makefile.am',
-	       ])
+install_subdir('registers', install_dir : datadir)
 
 executable('intel_gpu_top', 'intel_gpu_top.c',
 	   install : true,
diff --git a/tools/null_state_gen/Makefile.am b/tools/null_state_gen/Makefile.am
deleted file mode 100644
index d473a897..00000000
--- a/tools/null_state_gen/Makefile.am
+++ /dev/null
@@ -1,31 +0,0 @@
-GPU_TOOLS_PATH := $(top_srcdir)
-AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/include/drm-uapi \
-	      -I$(top_srcdir)/lib/stubs/syscalls
-AM_CFLAGS = $(DEBUG_CFLAGS) $(CWARNFLAGS)
-
-noinst_PROGRAMS = intel_null_state_gen
-
-intel_null_state_gen_SOURCES = 	\
-	intel_batchbuffer.c \
-	intel_batchbuffer.h \
-	intel_renderstate.h \
-	intel_renderstate_gen6.c \
-	intel_renderstate_gen7.c \
-	intel_renderstate_gen8.c \
-	intel_renderstate_gen9.c \
-	intel_null_state_gen.c
-
-gens := 6 7 8 9
-
-h = /tmp/intel_renderstate_gen$$gen.c
-states: intel_null_state_gen
-	for gen in $(gens); do \
-		head -n 22 intel_null_state_gen.c >$(h); \
-		if test -d $(GPU_TOOLS_PATH)/.git; then \
-			echo -n " * Generated by: " >>$(h); \
-			git describe >>$(h); \
-		fi; \
-		echo " */" >>$(h); \
-		echo "" >>$(h); \
-		./intel_null_state_gen $$gen >>$(h); \
-	done
diff --git a/tools/registers/Makefile.am b/tools/registers/Makefile.am
deleted file mode 100644
index 14293df0..00000000
--- a/tools/registers/Makefile.am
+++ /dev/null
@@ -1,2 +0,0 @@
-register_definitiondir = ${pkgdatadir}/registers
-dist_register_definition_DATA = ${REGISTER_FILES}
-- 
2.31.0

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

^ permalink raw reply related	[flat|nested] 6+ messages in thread
* Re: [igt-dev] [PATCH i-g-t 2/5] tests: Build gem_concurrent_all with meson
  2021-03-25 18:59 ` [PATCH i-g-t 2/5] tests: Build gem_concurrent_all " Arkadiusz Hiler
@ 2021-03-25 21:09   ` Daniel Vetter
  0 siblings, 0 replies; 6+ messages in thread
From: Daniel Vetter @ 2021-03-25 21:09 UTC (permalink / raw)
  To: Arkadiusz Hiler; +Cc: igt-dev, intel-gfx, dri-devel

On Thu, Mar 25, 2021 at 08:59:12PM +0200, Arkadiusz Hiler wrote:
> ...and add it to test-list-full.txt just like we do when building with
> autotools.
> 
> Signed-off-by: Arkadiusz Hiler <arek@hiler.eu>

tbh it might be time to sunset this. I kinda started it, it grew to
astronomical combinatorial combinations, it's been on the skiplist since
ages, and there's even more stuff on the skiplist. Looking at the history
it started very benign to tests some pwrite/pread vs rendering
synchronization issues. But it's definitely not doing just that anymore.

But maybe in a next patch series.

On the series: Acked-by: Daniel Vetter <daniel.vetter@ffwll.ch>

> ---
>  tests/meson.build | 13 +++++++++++++
>  1 file changed, 13 insertions(+)
> 
> diff --git a/tests/meson.build b/tests/meson.build
> index 54a1a3c7..8e3cd390 100644
> --- a/tests/meson.build
> +++ b/tests/meson.build
> @@ -402,6 +402,19 @@ test_list_target = custom_target('testlist',
>  	      install : true,
>  	      install_dir : libexecdir)
>  
> +test_executables += executable('gem_concurrent_all', 'i915/gem_concurrent_all.c',
> +	   dependencies : test_deps + [ libatomic ],
> +	   install_dir : libexecdir,
> +	   install_rpath : libexecdir_rpathdir,
> +	   install : true)
> +test_list += 'gem_concurrent_all'
> +
> +test_list_full_target = custom_target('testlist-full',
> +	      output : 'test-list-full.txt',
> +	      command : [ gen_testlist, '@OUTPUT@', test_list ],
> +	      install : true,
> +	      install_dir : libexecdir)
> +
>  test_script = find_program('igt_command_line.sh')
>  foreach prog : test_list
>  	test('testcase check ' + prog, test_script, args : prog)
> -- 
> 2.31.0
> 
> _______________________________________________
> igt-dev mailing list
> igt-dev@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/igt-dev

-- 
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

^ permalink raw reply	[flat|nested] 6+ messages in thread
end of thread, other threads:[~2021-03-25 21:09 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-03-25 18:59 [PATCH i-g-t 1/5] benchmarks: Build gem_exec_tracer with meson Arkadiusz Hiler
2021-03-25 18:59 ` [PATCH i-g-t 2/5] tests: Build gem_concurrent_all " Arkadiusz Hiler
2021-03-25 21:09   ` [igt-dev] " Daniel Vetter
2021-03-25 18:59 ` [PATCH i-g-t 3/5] tests: Remove ddx_intel_after_fbdev Arkadiusz Hiler
2021-03-25 18:59 ` [PATCH i-g-t 4/5] .gitlab-ci: Don't test Autotools Arkadiusz Hiler
2021-03-25 18:59 ` [PATCH i-g-t 5/5] Get rid of GNU Autotools Arkadiusz Hiler

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).