automake: drop assembler/shader-debugger automake support

Seems to have seen no activity in past years, dropping the automake
support hopefully doesn't upset anyone.

Acked-by: Petri Latvala <petri.latvala@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>

7 files changed, 0 insertions, 312 deletions

diff --git a/Makefile.am b/Makefile.am
index 81b66509..8bcdb65c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -32,14 +32,6 @@ SUBDIRS += runner
 endif
 
 if BUILD_X86
-if BUILD_ASSEMBLER
-SUBDIRS += assembler
-endif
-
-if BUILD_SHADER_DEBUGGER
-SUBDIRS += debugger
-endif
-
 SUBDIRS += overlay benchmarks
 endif
 
diff --git a/assembler/Makefile.am b/assembler/Makefile.am
deleted file mode 100644
index 49422e02..00000000
--- a/assembler/Makefile.am
+++ /dev/null
@@ -1,160 +0,0 @@
-SUBDIRS = doc test
-
-noinst_LTLIBRARIES = libbrw.la
-
-bin_PROGRAMS = intel-gen4asm intel-gen4disasm
-
-libbrw_la_SOURCES =		\
-	brw_compat.h		\
-	brw_context.c		\
-	brw_context.h		\
-	brw_disasm.c		\
-	brw_defines.h		\
-	brw_eu.h		\
-	brw_eu.c		\
-	brw_eu_compact.c	\
-	brw_eu_debug.c		\
-	brw_eu_emit.c		\
-	brw_eu_util.c		\
-	brw_reg.h		\
-	brw_structs.h		\
-	gen8_disasm.c		\
-	gen8_instruction.h	\
-	gen8_instruction.c	\
-	ralloc.c		\
-	ralloc.h		\
-	$(NULL)
-
-AM_YFLAGS = -d --warnings=all
-AM_CFLAGS= $(ASSEMBLER_WARN_CFLAGS)
-
-LEX = flex -i
-BUILT_SOURCES = gram.h gram.c lex.c
-gram.h: gram.c
-
-intel_gen4asm_SOURCES =	\
-	gen4asm.h	\
-	gram.y		\
-	lex.l		\
-	main.c		\
-	$(NULL)
-
-intel_gen4asm_LDADD = libbrw.la
-
-intel_gen4disasm_SOURCES =  disasm-main.c
-intel_gen4disasm_LDADD = libbrw.la
-
-pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = intel-gen4asm.pc
-
-check_SCRIPTS = test/run-test.sh
-
-TESTS = \
-	test/mov \
-	test/frc \
-	test/regtype \
-	test/rndd \
-	test/rndu \
-	test/rnde \
-	test/rnde-intsrc \
-	test/rndz \
-	test/lzd \
-	test/not \
-	test/immediate \
-	$(NULL)
-
-# Tests that are expected to fail because they contain some inccorect code.
-XFAIL_TESTS =
-
-# Those tests were already failing when the assembler was imported from
-# the intel-gen4asm git repository:
-#   http://cgit.freedesktop.org/xorg/app/intel-gen4asm/
-# We disable them "for now" as a workaround to be able to release i-g-t
-disabled_tests = \
-	test/declare \
-	test/jmpi \
-	test/if \
-	test/iff \
-	test/while \
-	test/else \
-	test/break \
-	test/cont \
-	test/halt \
-	test/wait \
-	test/endif \
-	$(NULL)
-
-disabled_xfail_tests = \
-	test/rnde-intsrc \
-	$(NULL)
-
-TESTDATA = \
-	test/mov.expected \
-	test/mov.g4a \
-	test/frc.expected \
-	test/frc.g4a \
-	test/rndd.expected \
-	test/rndd.g4a \
-	test/rndu.expected \
-	test/rndu.g4a \
-	test/rnde.expected \
-	test/rnde.g4a \
-	test/rnde-intsrc.expected \
-	test/rnde-intsrc.g4a \
-	test/rndz.expected \
-	test/rndz.g4a \
-	test/lzd.expected \
-	test/lzd.g4a \
-	test/not.expected \
-	test/not.g4a \
-	test/jmpi.expected \
-	test/jmpi.g4a \
-	test/if.expected \
-	test/if.g4a \
-	test/iff.expected \
-	test/iff.g4a \
-	test/while.expected \
-	test/while.g4a \
-	test/else.expected \
-	test/else.g4a \
-	test/break.expected \
-	test/break.g4a \
-	test/cont.expected \
-	test/cont.g4a \
-	test/halt.expected \
-	test/halt.g4a \
-	test/wait.expected \
-	test/wait.g4a \
-	test/endif.expected \
-	test/endif.g4a \
-	test/declare.expected \
-	test/declare.g4a \
-	test/immediate.g4a \
-	test/immediate.expected \
-	$(NULL)
-
-test_EXTRA_DIST = \
-	${TESTDATA} \
-	test/run-test.sh \
-	$(NULL)
-
-$(TESTS): test/run-test.sh
-	sed "s|TEST|$@|g" ${srcdir}/test/run-test.sh > $@
-	chmod +x $@
-
-test_CLEANFILES = \
-	test/*.out \
-	${TESTS} \
-	$(NULL)
-
-CLEANFILES = $(BUILT_SOURCES) \
-	     $(test_CLEANFILES) \
-	     $(NULL)
-
-EXTRA_DIST = \
-	README \
-	TODO \
-	meson.build \
-	intel-gen4asm.pc.in \
-	$(test_EXTRA_DIST) \
-	$(NULL)
diff --git a/assembler/doc/Makefile.am b/assembler/doc/Makefile.am
deleted file mode 100644
index 257fc385..00000000
--- a/assembler/doc/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-EXTRA_DIST = \
-	examples/packed_yuv_sf.g4a \
-	examples/packed_yuv_wm.g4a
diff --git a/assembler/test/Makefile.am b/assembler/test/Makefile.am
deleted file mode 100644
index e69de29b..00000000
--- a/assembler/test/Makefile.am
+++ /dev/null
diff --git a/configure.ac b/configure.ac
index dbf056e7..249403d2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -101,16 +101,6 @@ m4_ifndef([XORG_MACROS_VERSION],
 XORG_MACROS_VERSION(1.16)
 XORG_DEFAULT_OPTIONS
 
-# warning flags for the assembler. We can't quite use CWARNFLAGS for it yet as
-# it generates waaaay too many warnings.
-ASSEMBLER_WARN_CFLAGS=""
-if test "x$GCC" = "xyes"; then
-	ASSEMBLER_WARN_CFLAGS="-Wall -Wstrict-prototypes \
-	-Wmissing-prototypes -Wmissing-declarations \
-	-Wnested-externs -fno-strict-aliasing"
-fi
-AC_SUBST(ASSEMBLER_WARN_CFLAGS)
-
 PKG_CHECK_MODULES(DRM, [libdrm >= 2.4.82])
 PKG_CHECK_MODULES(PCIACCESS, [pciaccess >= 0.10])
 PKG_CHECK_MODULES(KMOD, [libkmod])
@@ -132,29 +122,8 @@ case "$target_cpu" in
 		;;
 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)
-	AS_IF([test x"$LEX" != "x:" -a x"$YACC" != xyacc],
-		[enable_assembler=yes],
-		[enable_assembler=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"
-	enable_assembler="no"
-	BUILD_SHADER_DEBUGGER="no"
-fi
 AM_CONDITIONAL(BUILD_X86, [test "x$build_x86" = xyes])
 
-AM_CONDITIONAL(BUILD_ASSEMBLER, [test "x$enable_assembler" = 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"])
@@ -277,45 +246,6 @@ if test "x$VC4" = xyes; then
 fi
 AM_CONDITIONAL(BUILD_VC4, [test "x$VC4" = xyes])
 
-# Define a configure option for the shader debugger
-AC_ARG_ENABLE(shader-debugger, AS_HELP_STRING([--enable-shader-debugger],
-	      [Enable shader debugging support [autodetected]]),
-	      [BUILD_SHADER_DEBUGGER="$enableval"], [BUILD_SHADER_DEBUGGER=no])
-
-# Shader debugger depends on python3, intel-genasm and objcopy
-if test "x$BUILD_SHADER_DEBUGGER" != xno; then
-	# Check that the assembler is built
-	if test "x$enable_assembler" = xno; then
-		BUILD_SHADER_DEBUGGER=no
-		if test "x$BUILD_SHADER_DEBUGGER" = xyes; then
-			AC_MSG_ERROR([Shader debugger requested, but assembler not enabled.])
-		fi
-	fi
-
-	# Check Python 3 is installed
-	if test "$PYTHON" = ":" ; then
-		if test "x$BUILD_SHADER_DEBUGGER" = xyes; then
-			AC_MSG_ERROR([Shader debugger requested, python version 3 not found.])
-		else
-			BUILD_SHADER_DEBUGGER=no
-		fi
-	fi
-
-	# Check for the objcopy GNU binary utiliy command
-	AC_PATH_PROGS([OBJCOPY], objcopy)
-	if test -z "$OBJCOPY" ; then
-		if test "x$BUILD_SHADER_DEBUGGER" = xyes; then
-			AC_MSG_ERROR([Shader debugger requested, but objcopy command not found.])
-		else
-			BUILD_SHADER_DEBUGGER=no
-		fi
-	fi
-fi
-
-AM_CONDITIONAL(BUILD_SHADER_DEBUGGER, [test "x$BUILD_SHADER_DEBUGGER" != xno])
-AS_IF([test "x$BUILD_SHADER_DEBUGGER" != xno],
-      [enable_debugger=yes], [enable_debugger=no])
-
 # enable debug symbols
 AC_ARG_ENABLE(debug,
 	      AS_HELP_STRING([--disable-debug],
@@ -395,12 +325,6 @@ AC_CONFIG_FILES([
 		 tools/registers/Makefile
 		 include/Makefile
 		 include/drm-uapi/Makefile
-		 debugger/Makefile
-		 debugger/system_routine/Makefile
-		 assembler/Makefile
-		 assembler/doc/Makefile
-		 assembler/test/Makefile
-		 assembler/intel-gen4asm.pc
 		 overlay/Makefile
 		 runner/Makefile
 		 runner/testdata/Makefile
@@ -423,8 +347,6 @@ echo "       Compile prime tests: ${NOUVEAU}"
 echo "       Debug flags        : ${DEBUG_CFLAGS}"
 echo ""
 echo " • Tools:"
-echo "       Assembler          : ${enable_assembler}"
-echo "       Debugger           : ${enable_debugger}"
 echo "       Overlay            : X: ${enable_overlay_xlib}, Xv: ${enable_overlay_xvlib}"
 echo "       x86-specific tools : ${build_x86}"
 echo "       Test runner        : ${BUILD_RUNNER}"
diff --git a/debugger/Makefile.am b/debugger/Makefile.am
deleted file mode 100644
index e3a084d2..00000000
--- a/debugger/Makefile.am
+++ /dev/null
@@ -1,20 +0,0 @@
-
-SUBDIRS = system_routine
-
-bin_PROGRAMS = eudb
-noinst_PROGRAMS = debug_rdata
-
-AM_CPPFLAGS = 			\
-	-I$(top_srcdir)		\
-	-I$(top_srcdir)/lib	\
-	-I$(top_srcdir)/include/drm-uapi \
-	-I$(top_srcdir)/lib/stubs/syscalls
-
-AM_CFLAGS = 			\
-	$(DRM_CFLAGS) 		\
-	$(PCIACCESS_CFLAGS) 	\
-	$(CAIRO_CFLAGS)		\
-	$(LIBUNWIND_CFLAGS)	\
-	$(CWARNFLAGS)
-
-LDADD = $(top_builddir)/lib/libintel_tools.la
diff --git a/debugger/system_routine/Makefile.am b/debugger/system_routine/Makefile.am
deleted file mode 100644
index 95d8fb6f..00000000
--- a/debugger/system_routine/Makefile.am
+++ /dev/null
@@ -1,43 +0,0 @@
-
-noinst_PROGRAMS = eviction_macro sr tiny
-nodist_sr_SOURCES = sr.c
-nodist_tiny_SOURCES = tiny.c
-
-GEN4ASM = $(top_builddir)/assembler/intel-gen4asm
-GEN4ASM_FLAGS = -g6 -a -b
-ASM_CPPFLAGS = 				\
-	-x assembler-with-cpp 		\
-	-P -DGEN_ASM -DSANDYBRIDGE 	\
-	-I$(top_srcdir)/lib 		\
-	-I$(builddir)
-
-evict.h : eviction_macro
-	$(builddir)/eviction_macro > evict.h
-
-sr.cpp : sr.g4a
-	$(srcdir)/pre_cpp.py $(srcdir)/sr.g4a > $@.tmp && mv $@.tmp $@
-sr.asm : sr.cpp evict.h
-	$(CPP) $(ASM_CPPFLAGS) -o $@ sr.cpp
-sr.c: sr.asm
-	$(GEN4ASM) $(GEN4ASM_FLAGS) sr.asm -o $@
-sr.o : sr.c
-	$(CC) -c -o $@ sr.c
-sr$(EXEEXT) : sr.o
-	$(OBJCOPY) -O binary -K gen_eu_bytes sr.o $@
-
-# Test.g4a is the simplest possible system routine we can run on the GPU
-# without actually hanging the system. The system routine kernel is very
-# simple and doesn't depend on any external communication to run.
-tiny.cpp : test.g4a
-	$(srcdir)/pre_cpp.py $(srcdir)/test.g4a > $@.tmp && mv $@.tmp $@
-tiny.asm : tiny.cpp
-	$(CPP) $(ASM_CPPFLAGS) -o $@ tiny.cpp
-tiny.c: tiny.asm
-	$(GEN4ASM) $(GEN4ASM_FLAGS) tiny.asm -o $@
-tiny.o : tiny.c
-	$(CC) -c -o $@ tiny.c
-tiny$(EXEEXT) : tiny.o
-	$(OBJCOPY) -O binary -K gen_eu_bytes tiny.o $@
-
-CLEANFILES = evict.h sr.cpp sr.asm sr.c tiny.cpp tiny.asm tiny.c
-EXTRA_DIST = pre_cpp.py sr.g4a test.g4a