From abf0bf9e9b801b6e904907f3a779dbe82bf245e0 Mon Sep 17 00:00:00 2001 From: Anuj Phogat Date: Tue, 13 Apr 2021 22:03:32 -0700 Subject: intel: Rename {i965, iris, anv, isl}_gen prefix in build files export SEARCH_PATH="src/intel src/gallium/drivers/iris src/mesa/drivers/dri/i965 grep -E "(i965|iris|anv|isl)_gen" -rIl $SEARCH_PATH | xargs sed -ie "s/\(i965\|iris\|anv\|isl\)_gen\([_@]\)/\1_per_hw_ver\2/g" Signed-off-by: Anuj Phogat Reviewed-by: Kenneth Graunke Part-of: --- src/gallium/drivers/iris/meson.build | 8 ++++---- src/intel/isl/meson.build | 12 ++++++------ src/intel/vulkan/meson.build | 14 +++++++------- src/mesa/drivers/dri/i965/meson.build | 8 ++++---- 4 files changed, 21 insertions(+), 21 deletions(-) diff --git a/src/gallium/drivers/iris/meson.build b/src/gallium/drivers/iris/meson.build index 1b4ca55678c..c292f884e47 100644 --- a/src/gallium/drivers/iris/meson.build +++ b/src/gallium/drivers/iris/meson.build @@ -57,10 +57,10 @@ files_libiris = files( 'iris_disk_cache.c', ) -iris_gen_libs = [] +iris_per_hw_ver_libs = [] foreach v : ['80', '90', '110', '120', '125'] - iris_gen_libs += static_library( - 'iris_gen@0@'.format(v), + iris_per_hw_ver_libs += static_library( + 'iris_per_hw_ver@0@'.format(v), ['iris_blorp.c', 'iris_query.c', 'iris_state.c', gen_xml_pack], include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_intel], c_args : [ @@ -86,7 +86,7 @@ libiris = static_library( gnu_symbol_visibility : 'hidden', dependencies : [dep_libdrm, dep_valgrind, idep_genxml, idep_libintel_common, idep_nir_headers], link_with : [ - iris_gen_libs, libintel_compiler, libintel_dev, libisl, + iris_per_hw_ver_libs, libintel_compiler, libintel_dev, libisl, libblorp, libintel_perf ], ) diff --git a/src/intel/isl/meson.build b/src/intel/isl/meson.build index ca00d1bd66a..430de21aa92 100644 --- a/src/intel/isl/meson.build +++ b/src/intel/isl/meson.build @@ -18,7 +18,7 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE # SOFTWARE. -isl_gen_files = files( +isl_per_hw_ver_files = files( 'isl_emit_depth_stencil.c', 'isl_surface_state.c', ) @@ -58,15 +58,15 @@ isl_gfx125_files = files( 'isl_gfx12.h', ) -isl_gen_libs = [] +isl_per_hw_ver_libs = [] foreach g : [['40', isl_gfx4_files], ['50', []], ['60', isl_gfx6_files], ['70', isl_gfx7_files], ['75', []], ['80', isl_gfx8_files], ['90', isl_gfx9_files], ['110', []], ['120', isl_gfx12_files], ['125', isl_gfx12_files]] _gen = g[0] - isl_gen_libs += static_library( - 'isl_gen@0@'.format(_gen), - [g[1], isl_gen_files, gen_xml_pack], + isl_per_hw_ver_libs += static_library( + 'isl_per_hw_ver@0@'.format(_gen), + [g[1], isl_per_hw_ver_files, gen_xml_pack], include_directories : [inc_include, inc_src, inc_gallium, inc_intel], dependencies : idep_mesautil, c_args : [ @@ -136,7 +136,7 @@ libisl = static_library( 'isl', [libisl_files, isl_format_layout_c, genX_bits_h], include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_intel], - link_with : [isl_gen_libs, isl_tiled_memcpy, isl_tiled_memcpy_sse41], + link_with : [isl_per_hw_ver_libs, isl_tiled_memcpy, isl_tiled_memcpy_sse41], dependencies : idep_mesautil, c_args : [no_override_init_args], gnu_symbol_visibility : 'hidden', diff --git a/src/intel/vulkan/meson.build b/src/intel/vulkan/meson.build index 84159b3a2e0..7b0167b3f3c 100644 --- a/src/intel/vulkan/meson.build +++ b/src/intel/vulkan/meson.build @@ -49,8 +49,8 @@ intel_icd = custom_target( install : true, ) -libanv_gen_libs = [] -anv_gen_files = files( +libanv_per_hw_ver_libs = [] +anv_per_hw_ver_files = files( 'genX_blorp_exec.c', 'genX_cmd_buffer.c', 'genX_gpu_memcpy.c', @@ -63,9 +63,9 @@ foreach g : [['70', ['gfx7_cmd_buffer.c']], ['75', ['gfx7_cmd_buffer.c']], ['110', ['gfx8_cmd_buffer.c']], ['120', ['gfx8_cmd_buffer.c']], ['125', ['gfx8_cmd_buffer.c']]] _gen = g[0] - libanv_gen_libs += static_library( - 'anv_gen@0@'.format(_gen), - [anv_gen_files, g[1], anv_entrypoints[0]], + libanv_per_hw_ver_libs += static_library( + 'anv_per_hw_ver@0@'.format(_gen), + [anv_per_hw_ver_files, g[1], anv_entrypoints[0]], include_directories : [ inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_compiler, inc_intel, inc_vulkan_wsi, ], @@ -175,7 +175,7 @@ libvulkan_intel = shared_library( include_directories : [ inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_intel, inc_compiler, inc_vulkan_wsi, ], - link_whole : [libanv_common, libanv_gen_libs], + link_whole : [libanv_common, libanv_per_hw_ver_libs], link_with : [ libintel_compiler, libintel_dev, libisl, libblorp, libvulkan_wsi, libintel_perf, @@ -212,7 +212,7 @@ if with_tests ], link_whole : libanv_common, link_with : [ - libanv_gen_libs, libintel_compiler, libintel_common, libintel_dev, + libanv_per_hw_ver_libs, libintel_compiler, libintel_common, libintel_dev, libisl, libblorp, libvulkan_wsi, libintel_perf, ], dependencies : [ diff --git a/src/mesa/drivers/dri/i965/meson.build b/src/mesa/drivers/dri/i965/meson.build index 8ac2f906d21..50dd605b22d 100644 --- a/src/mesa/drivers/dri/i965/meson.build +++ b/src/mesa/drivers/dri/i965/meson.build @@ -130,10 +130,10 @@ files_i965 = files( 'libdrm_macros.h', ) -i965_gen_libs = [] +i965_per_hw_ver_libs = [] foreach v : ['40', '45', '50', '60', '70', '75', '80', '90', '110'] - i965_gen_libs += static_library( - 'i965_gen@0@'.format(v), + i965_per_hw_ver_libs += static_library( + 'i965_per_hw_ver@0@'.format(v), ['genX_blorp_exec.c', 'genX_boilerplate.h', 'genX_pipe_control.c', 'genX_state_upload.c', gen_xml_pack], include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_intel, inc_dri_common], @@ -157,7 +157,7 @@ libi965 = static_library( cpp_args : [c_sse2_args], gnu_symbol_visibility : 'hidden', link_with : [ - i965_gen_libs, libintel_dev, libisl, libintel_compiler, libblorp, + i965_per_hw_ver_libs, libintel_dev, libisl, libintel_compiler, libblorp, libintel_perf ], dependencies : [ -- cgit v1.2.3