intel: Move batch decoder/disassembler from tools/ to common/

Making these part of libintel_common allows us to use them in the DRI
driver.  The standalone tool binaries already link against the common
library, too, so it's no harder for them.

Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
This commit is contained in:
Kenneth Graunke
2018-05-01 17:27:08 -07:00
parent 5c04971831
commit 7c22c150c4
7 changed files with 9 additions and 11 deletions

View File

@@ -9,10 +9,13 @@ BLORP_FILES = \
COMMON_FILES = \ COMMON_FILES = \
common/gen_clflush.h \ common/gen_clflush.h \
common/gen_batch_decoder.c \
common/gen_debug.c \ common/gen_debug.c \
common/gen_debug.h \ common/gen_debug.h \
common/gen_decoder.c \ common/gen_decoder.c \
common/gen_decoder.h \ common/gen_decoder.h \
common/gen_disasm.c \
common/gen_disasm.h \
common/gen_defines.h \ common/gen_defines.h \
common/gen_l3_config.c \ common/gen_l3_config.c \
common/gen_l3_config.h \ common/gen_l3_config.h \

View File

@@ -25,9 +25,6 @@ noinst_PROGRAMS += \
tools_aubinator_SOURCES = \ tools_aubinator_SOURCES = \
tools/aubinator.c \ tools/aubinator.c \
tools/disasm.c \
tools/gen_batch_decoder.c \
tools/gen_disasm.h \
tools/intel_aub.h tools/intel_aub.h
tools_aubinator_CFLAGS = \ tools_aubinator_CFLAGS = \
@@ -48,10 +45,7 @@ tools_aubinator_LDADD = \
tools_aubinator_error_decode_SOURCES = \ tools_aubinator_error_decode_SOURCES = \
tools/aubinator_error_decode.c \ tools/aubinator_error_decode.c
tools/disasm.c \
tools/gen_batch_decoder.c \
tools/gen_disasm.h
tools_aubinator_error_decode_LDADD = \ tools_aubinator_error_decode_LDADD = \
common/libintel_common.la \ common/libintel_common.la \

View File

@@ -22,10 +22,13 @@
files_libintel_common = files( files_libintel_common = files(
'gen_clflush.h', 'gen_clflush.h',
'gen_batch_decoder.c',
'gen_debug.c', 'gen_debug.c',
'gen_debug.h', 'gen_debug.h',
'gen_decoder.c', 'gen_decoder.c',
'gen_decoder.h', 'gen_decoder.h',
'gen_disasm.c',
'gen_disasm.h',
'gen_l3_config.c', 'gen_l3_config.c',
'gen_l3_config.h', 'gen_l3_config.h',
'gen_urb_config.c', 'gen_urb_config.c',

View File

@@ -20,8 +20,7 @@
aubinator = executable( aubinator = executable(
'aubinator', 'aubinator',
files('aubinator.c', 'disasm.c', 'gen_batch_decoder.c', files('aubinator.c', 'intel_aub.h'),
'gen_disasm.h', 'intel_aub.h'),
dependencies : [dep_expat, dep_zlib, dep_dl, dep_thread, dep_m], dependencies : [dep_expat, dep_zlib, dep_dl, dep_thread, dep_m],
include_directories : [inc_common, inc_intel], include_directories : [inc_common, inc_intel],
link_with : [libintel_common, libintel_compiler, libintel_dev, libmesa_util], link_with : [libintel_common, libintel_compiler, libintel_dev, libmesa_util],
@@ -32,8 +31,7 @@ aubinator = executable(
aubinator_error_decode = executable( aubinator_error_decode = executable(
'aubinator_error_decode', 'aubinator_error_decode',
files('aubinator_error_decode.c', 'disasm.c', 'gen_disasm.h', files('aubinator_error_decode.c'),
'gen_batch_decoder.c'),
dependencies : [dep_zlib, dep_thread], dependencies : [dep_zlib, dep_thread],
include_directories : [inc_common, inc_intel], include_directories : [inc_common, inc_intel],
link_with : [libintel_common, libintel_compiler, libintel_dev, libmesa_util], link_with : [libintel_common, libintel_compiler, libintel_dev, libmesa_util],