Commit abf0bf9e authored by Anuj Phogat's avatar Anuj Phogat Committed by Marge Bot
Browse files

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's avatarAnuj Phogat <anuj.phogat@gmail.com>
Reviewed-by: Kenneth Graunke's avatarKenneth Graunke <kenneth@whitecape.org>
Part-of: <mesa/mesa!10241>
parent 238b0d7b
......@@ -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
],
)
......
......@@ -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',
......
......@@ -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 : [
......
......@@ -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 : [
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment