intel/nir: Allow splitting a single load into up to 32 loads

[mesa.git] / src / intel / isl / meson.build

diff --git a/src/intel/isl/meson.build b/src/intel/isl/meson.build
index 36b8b8ffa200ba7dfdc5ce5ae865c2d579bd7f90..66f19039ce2fa1e22e924c4b60facda71ec1f05f 100644 (file)
--- a/src/intel/isl/meson.build
+++ b/src/intel/isl/meson.build
@@ -48,17 +48,26 @@ isl_gen9_files = files(
   'isl_gen9.h',
 )
 
+isl_gen12_files = files(
+  'isl_gen12.c',
+  'isl_gen12.h',
+)
+
 isl_gen_libs = []
 foreach g : [['40', isl_gen4_files], ['50', []], ['60', isl_gen6_files],
              ['70', isl_gen7_files], ['75', []], ['80', isl_gen8_files],
-             ['90', isl_gen9_files], ['100', []], ['110', []]]
+             ['90', isl_gen9_files], ['100', []], ['110', []],
+             ['120', isl_gen12_files]]
   _gen = g[0]
   isl_gen_libs += static_library(
-    'libisl_gen@0@'.format(_gen),
+    'isl_gen@0@'.format(_gen),
     [g[1], isl_gen_files, gen_xml_pack],
-    include_directories : [inc_common, inc_intel],
-    c_args : [c_vis_args, no_override_init_args,
-              '-DGEN_VERSIONx10=@0@'.format(_gen)],
+    include_directories : [inc_include, inc_src, inc_gallium, inc_intel],
+    c_args : [
+      no_override_init_args,
+      '-DGEN_VERSIONx10=@0@'.format(_gen)
+    ],
+    gnu_symbol_visibility : 'hidden',
   )
 endforeach
 
@@ -66,12 +75,48 @@ isl_format_layout_c = custom_target(
   'isl_format_layout.c',
   input : ['gen_format_layout.py', 'isl_format_layout.csv'],
   output : 'isl_format_layout.c',
-  command : [prog_python2, '@INPUT0@', '--csv', '@INPUT1@', '--out', '@OUTPUT@'],
+  command : [prog_python, '@INPUT0@', '--csv', '@INPUT1@', '--out', '@OUTPUT@'],
+)
+
+files_isl_tiled_memcpy = files(
+  'isl_tiled_memcpy_normal.c'
+)
+
+files_isl_tiled_memcpy_sse41 = files(
+  'isl_tiled_memcpy_sse41.c',
+)
+
+isl_tiled_memcpy = static_library(
+  'isl_tiled_memcpy',
+  [files_isl_tiled_memcpy],
+  include_directories : [
+    inc_include, inc_src, inc_mesa, inc_gallium, inc_intel,
+  ],
+  c_args : [no_override_init_args, '-msse2'],
+  gnu_symbol_visibility : 'hidden',
+  extra_files : ['isl_tiled_memcpy.c']
 )
 
+if with_sse41
+  isl_tiled_memcpy_sse41 = static_library(
+    'isl_tiled_memcpy_sse41',
+    [files_isl_tiled_memcpy_sse41],
+    include_directories : [
+      inc_include, inc_src, inc_mesa, inc_gallium, inc_intel,
+    ],
+    link_args : ['-Wl,--exclude-libs=ALL'],
+    c_args : [no_override_init_args, '-msse2', sse41_args],
+    gnu_symbol_visibility : 'hidden',
+    extra_files : ['isl_tiled_memcpy.c']
+  )
+else
+  isl_tiled_memcpy_sse41 = []
+endif
+
 libisl_files = files(
   'isl.c',
   'isl.h',
+  'isl_aux_info.c',
   'isl_drm.c',
   'isl_genX_priv.h',
   'isl_format.c',
@@ -82,9 +127,10 @@ libisl_files = files(
 libisl = static_library(
   'isl',
   [libisl_files, isl_format_layout_c, genX_bits_h],
-  include_directories : [inc_common, inc_intel, inc_drm_uapi],
-  link_with : isl_gen_libs,
-  c_args : [c_vis_args, no_override_init_args],
+  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],
+  c_args : [no_override_init_args],
+  gnu_symbol_visibility : 'hidden',
 )
 
 if with_tests
@@ -93,9 +139,25 @@ if with_tests
     executable(
       'isl_surf_get_image_offset_test',
       'tests/isl_surf_get_image_offset_test.c',
-      dependencies : dep_m,
-      include_directories : [inc_common, inc_intel],
-      link_with : [libisl, libintel_common],
-    )
+      dependencies : [dep_m, idep_mesautil],
+      include_directories : [inc_include, inc_src, inc_gallium, inc_intel],
+      link_with : [libisl, libintel_dev],
+    ),
+    suite : ['intel'],
+  )
+  test(
+    'isl_aux_info',
+    executable(
+      'isl_aux_info_test',
+      [
+        'tests/isl_aux_info_test.cpp',
+        'isl_aux_info.c',
+      ],
+      dependencies : [dep_m, idep_gtest, idep_mesautil],
+      include_directories : [inc_include, inc_src, inc_gallium, inc_intel],
+      c_args : '-DIN_UNIT_TEST',
+      cpp_args : '-DIN_UNIT_TEST',
+    ),
+    suite : ['intel'],
   )
 endif