X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fintel%2Fcompiler%2Fmeson.build;h=452f71238ff6f7a5a9dc44fbdb6f48ceb6a647e1;hb=cf52b40fb0bf53816ca4bb90e31ecd146fbcb533;hp=e12fa22cf1b2980888a1bf0ed51a0b5f1486c474;hpb=d1992255bb29054fa51763376d125183a9f602f3;p=mesa.git

diff --git a/src/intel/compiler/meson.build b/src/intel/compiler/meson.build
index e12fa22cf1b..452f71238ff 100644
--- a/src/intel/compiler/meson.build
+++ b/src/intel/compiler/meson.build
@@ -33,14 +33,18 @@ libintel_compiler_files = files(
   'brw_compiler.h',
   'brw_dead_control_flow.cpp',
   'brw_dead_control_flow.h',
+  'brw_debug_recompile.c',
   'brw_disasm.c',
-  'brw_eu.c',
+  'brw_disasm_info.c',
+  'brw_disasm_info.h',
+  'brw_eu.cpp',
   'brw_eu_compact.c',
   'brw_eu_defines.h',
   'brw_eu_emit.c',
   'brw_eu.h',
   'brw_eu_util.c',
   'brw_eu_validate.c',
+  'brw_fs_bank_conflicts.cpp',
   'brw_fs_builder.h',
   'brw_fs_cmod_propagation.cpp',
   'brw_fs_combine_constants.cpp',
@@ -52,30 +56,39 @@ libintel_compiler_files = files(
   'brw_fs.h',
   'brw_fs_live_variables.cpp',
   'brw_fs_live_variables.h',
-  'brw_fs_lower_conversions.cpp',
   'brw_fs_lower_pack.cpp',
+  'brw_fs_lower_regioning.cpp',
   'brw_fs_nir.cpp',
   'brw_fs_reg_allocate.cpp',
   'brw_fs_register_coalesce.cpp',
   'brw_fs_saturate_propagation.cpp',
+  'brw_fs_scoreboard.cpp',
   'brw_fs_sel_peephole.cpp',
-  'brw_fs_surface_builder.cpp',
-  'brw_fs_surface_builder.h',
   'brw_fs_validate.cpp',
   'brw_fs_visitor.cpp',
   'brw_inst.h',
   'brw_interpolation_map.c',
+  'brw_ir.h',
   'brw_ir_allocator.h',
+  'brw_ir_analysis.h',
   'brw_ir_fs.h',
+  'brw_ir_performance.h',
+  'brw_ir_performance.cpp',
   'brw_ir_vec4.h',
   'brw_nir.h',
   'brw_nir.c',
   'brw_nir_analyze_boolean_resolves.c',
   'brw_nir_analyze_ubo_ranges.c',
   'brw_nir_attribute_workarounds.c',
-  'brw_nir_intrinsics.c',
+  'brw_nir_lower_conversions.c',
+  'brw_nir_lower_cs_intrinsics.c',
+  'brw_nir_lower_alpha_to_coverage.c',
+  'brw_nir_lower_image_load_store.c',
+  'brw_nir_lower_mem_access_bit_sizes.c',
+  'brw_nir_lower_scoped_barriers.c',
   'brw_nir_opt_peephole_ffma.c',
   'brw_nir_tcs_workarounds.c',
+  'brw_nir_clamp_image_1d_2d_array_sizes.c',
   'brw_packed_float.c',
   'brw_predicated_break.cpp',
   'brw_reg.h',
@@ -112,27 +125,27 @@ libintel_compiler_files = files(
   'brw_wm_iz.cpp',
   'gen6_gs_visitor.cpp',
   'gen6_gs_visitor.h',
-  'intel_asm_annotation.c',
-  'intel_asm_annotation.h',
 )
 
 brw_nir_trig = custom_target(
   'brw_nir_trig_workarounds.c',
   input : 'brw_nir_trig_workarounds.py',
   output : 'brw_nir_trig_workarounds.c',
-  command : [prog_python2, '@INPUT@', '-p',
-             join_paths(meson.source_root(), 'src/compiler/nir/')],
-  depend_files : files('../../compiler/nir/nir_algebraic.py'),
+  command : [
+    prog_python, '@INPUT@',
+    '-p', join_paths(meson.source_root(), 'src/compiler/nir/'),
+  ],
+  depend_files : nir_algebraic_py,
   capture : true,
 )
 
 libintel_compiler = static_library(
   'intel_compiler',
-  [libintel_compiler_files, brw_nir_trig, nir_opcodes_h, nir_builder_opcodes_h,
-   ir_expression_operation_h],
-  include_directories : [inc_common, inc_intel, inc_nir],
-  c_args : [c_vis_args, no_override_init_args],
-  cpp_args : [cpp_vis_args],
+  [libintel_compiler_files, brw_nir_trig, ir_expression_operation_h],
+  include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_intel],
+  c_args : [no_override_init_args],
+  gnu_symbol_visibility : 'hidden',
+  dependencies : idep_nir_headers,
   build_by_default : false,
 )
 
@@ -141,15 +154,20 @@ if with_tests
   foreach t : ['fs_cmod_propagation', 'fs_copy_propagation',
                'fs_saturate_propagation', 'vf_float_conversions',
                'vec4_register_coalesce', 'vec4_copy_propagation',
-               'vec4_cmod_propagation', 'eu_compact', 'eu_validate']
-    _exe = executable(
-      [t, nir_opcodes_h, ir_expression_operation_h],
-      'test_@0@.cpp'.format(t),
-      include_directories : [inc_common, inc_intel],
-      link_with : [libgtest, libintel_compiler, libintel_common, libnir,
-                   libmesa_util, libisl],
-      dependencies : [dep_thread, dep_dl],
+               'vec4_cmod_propagation', 'vec4_dead_code_eliminate',
+               'eu_compact', 'eu_validate', 'fs_scoreboard']
+    test(
+      t,
+      executable(
+        [t, ir_expression_operation_h],
+        'test_@0@.cpp'.format(t),
+        include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_intel],
+        link_with : [
+          libintel_compiler, libintel_common, libintel_dev, libisl,
+        ],
+        dependencies : [idep_gtest, idep_nir, idep_mesautil],
+      ),
+      suite : ['intel'],
     )
-    test(t, _exe)
   endforeach
 endif