X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fcompiler%2Fnir%2Fmeson.build;h=71fed704af64cfbff695a4139c27046111f5bdc0;hb=27e6117ee9f77ef40721f7757e181ddf93fc60dd;hp=f79752df663721b604773dcfa6556a760fd73d8d;hpb=a99c360a463019a4aca9b551bd79c9c84f297468;p=mesa.git diff --git a/src/compiler/nir/meson.build b/src/compiler/nir/meson.build index f79752df663..71fed704af6 100644 --- a/src/compiler/nir/meson.build +++ b/src/compiler/nir/meson.build @@ -94,12 +94,15 @@ files_libnir = files( 'nir_control_flow.c', 'nir_control_flow.h', 'nir_control_flow_private.h', + 'nir_convert_ycbcr.c', 'nir_deref.c', 'nir_deref.h', + 'nir_divergence_analysis.c', 'nir_dominance.c', 'nir_format_convert.h', 'nir_from_ssa.c', 'nir_gather_info.c', + 'nir_gather_ssa_types.c', 'nir_gather_xfb_info.c', 'nir_gs_count_vertices.c', 'nir_inline_functions.c', @@ -112,40 +115,58 @@ files_libnir = files( 'nir_lower_alu.c', 'nir_lower_alu_to_scalar.c', 'nir_lower_alpha_test.c', + 'nir_lower_amul.c', 'nir_lower_array_deref_of_vec.c', 'nir_lower_atomics_to_ssbo.c', 'nir_lower_bitmap.c', + 'nir_lower_bool_to_bitsize.c', 'nir_lower_bool_to_float.c', 'nir_lower_bool_to_int32.c', 'nir_lower_clamp_color_outputs.c', 'nir_lower_clip.c', 'nir_lower_clip_cull_distance_arrays.c', - 'nir_lower_constant_initializers.c', + 'nir_lower_clip_disable.c', + 'nir_lower_clip_halfz.c', + 'nir_lower_variable_initializers.c', + 'nir_lower_discard_to_demote.c', 'nir_lower_double_ops.c', 'nir_lower_drawpixels.c', 'nir_lower_fb_read.c', + 'nir_lower_flatshade.c', + 'nir_lower_flrp.c', 'nir_lower_fragcoord_wtrans.c', + 'nir_lower_fragcolor.c', 'nir_lower_frexp.c', 'nir_lower_global_vars_to_local.c', + 'nir_lower_goto_ifs.c', 'nir_lower_gs_intrinsics.c', 'nir_lower_load_const_to_scalar.c', 'nir_lower_locals_to_regs.c', 'nir_lower_idiv.c', 'nir_lower_indirect_derefs.c', + 'nir_lower_input_attachments.c', 'nir_lower_int64.c', + 'nir_lower_interpolation.c', + 'nir_lower_int_to_float.c', 'nir_lower_io.c', 'nir_lower_io_arrays_to_elements.c', 'nir_lower_io_to_temporaries.c', 'nir_lower_io_to_scalar.c', 'nir_lower_io_to_vector.c', + 'nir_lower_mediump_outputs.c', + 'nir_lower_memory_model.c', 'nir_lower_non_uniform_access.c', 'nir_lower_packing.c', 'nir_lower_passthrough_edgeflags.c', 'nir_lower_patch_vertices.c', 'nir_lower_phis_to_scalar.c', + 'nir_lower_point_size.c', + 'nir_lower_point_size_mov.c', 'nir_lower_regs_to_ssa.c', 'nir_lower_returns.c', + 'nir_lower_samplers.c', 'nir_lower_scratch.c', + 'nir_lower_ssbo.c', 'nir_lower_subgroups.c', 'nir_lower_system_values.c', 'nir_lower_tex.c', @@ -157,12 +178,15 @@ files_libnir = files( 'nir_lower_viewport_transform.c', 'nir_lower_wpos_center.c', 'nir_lower_wpos_ytransform.c', + 'nir_lower_wrmasks.c', 'nir_lower_bit_size.c', + 'nir_lower_ubo_vec4.c', 'nir_lower_uniforms_to_ubo.c', 'nir_metadata.c', - 'nir_move_load_const.c', 'nir_move_vec_src_uses_to_dest.c', 'nir_normalize_cubemap_coords.c', + 'nir_opt_access.c', + 'nir_opt_barriers.c', 'nir_opt_combine_stores.c', 'nir_opt_comparison_pre.c', 'nir_opt_conditional_discard.c', @@ -179,26 +203,32 @@ files_libnir = files( 'nir_opt_if.c', 'nir_opt_intrinsics.c', 'nir_opt_large_constants.c', + 'nir_opt_load_store_vectorize.c', 'nir_opt_loop_unroll.c', - 'nir_opt_move_comparisons.c', - 'nir_opt_move_load_ubo.c', + 'nir_opt_move.c', 'nir_opt_peephole_select.c', + 'nir_opt_rematerialize_compares.c', 'nir_opt_remove_phis.c', - 'nir_opt_shrink_load.c', + 'nir_opt_shrink_vectors.c', + 'nir_opt_sink.c', 'nir_opt_trivial_continues.c', 'nir_opt_undef.c', + 'nir_opt_vectorize.c', 'nir_phi_builder.c', 'nir_phi_builder.h', 'nir_print.c', 'nir_propagate_invariant.c', + 'nir_range_analysis.c', + 'nir_range_analysis.h', 'nir_remove_dead_variables.c', 'nir_repair_ssa.c', + 'nir_schedule.c', + 'nir_schedule.h', 'nir_search.c', 'nir_search.h', 'nir_search_helpers.h', 'nir_serialize.c', 'nir_serialize.h', - 'nir_strip.c', 'nir_split_per_member_structs.c', 'nir_split_var_copies.c', 'nir_split_vars.c', @@ -206,6 +236,7 @@ files_libnir = files( 'nir_to_lcssa.c', 'nir_validate.c', 'nir_vla.h', + 'nir_vulkan.h', 'nir_worklist.c', 'nir_worklist.h', 'nir_xfb_info.h', @@ -227,13 +258,14 @@ files_libnir = files( '../spirv/vtn_variables.c', ) -libnir = static_library( +_libnir = static_library( 'nir', [files_libnir, spirv_info_c, nir_opt_algebraic_c, nir_opcodes_c, nir_opcodes_h, nir_constant_expressions_c, nir_builder_opcodes_h, vtn_gather_types_c, nir_intrinsics_c, nir_intrinsics_h], - include_directories : [inc_common, inc_compiler, include_directories('../spirv')], - c_args : [c_vis_args, c_msvc_compat_args, no_override_init_args], + include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_compiler, include_directories('../spirv')], + c_args : [c_msvc_compat_args, no_override_init_args], + gnu_symbol_visibility : 'hidden', link_with : libcompiler, build_by_default : false, ) @@ -247,22 +279,35 @@ idep_nir_headers = declare_dependency( # Also link with nir idep_nir = declare_dependency( dependencies : idep_nir_headers, - link_with : libnir, + link_with : _libnir, ) nir_algebraic_py = files('nir_algebraic.py') if with_tests + test( + 'nir_builder', + executable( + 'nir_builder_test', + files('tests/builder_tests.cpp'), + cpp_args : [cpp_msvc_compat_args], + gnu_symbol_visibility : 'hidden', + include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux], + dependencies : [dep_thread, idep_gtest, idep_nir, idep_mesautil], + ), + suite : ['compiler', 'nir'], + ) + test( 'nir_control_flow', executable( 'nir_control_flow_test', files('tests/control_flow_tests.cpp'), - cpp_args : [cpp_vis_args, cpp_msvc_compat_args], - include_directories : [inc_common], - dependencies : [dep_thread, idep_gtest, idep_nir], - link_with : libmesa_util, - ), + cpp_args : [cpp_msvc_compat_args], + gnu_symbol_visibility : 'hidden', + include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux], + dependencies : [dep_thread, idep_gtest, idep_nir, idep_mesautil], + ), suite : ['compiler', 'nir'], ) @@ -271,13 +316,14 @@ if with_tests executable( 'nir_vars_test', files('tests/vars_tests.cpp'), - cpp_args : [cpp_vis_args, cpp_msvc_compat_args], - include_directories : [inc_common], - dependencies : [dep_thread, idep_gtest, idep_nir], - link_with : libmesa_util, + cpp_args : [cpp_msvc_compat_args], + gnu_symbol_visibility : 'hidden', + include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux], + dependencies : [dep_thread, idep_gtest, idep_nir, idep_mesautil], ), suite : ['compiler', 'nir'], ) + test( 'nir_algebraic_parser', prog_python, @@ -292,10 +338,64 @@ if with_tests executable( 'negative_equal', files('tests/negative_equal_tests.cpp'), - c_args : [c_vis_args, c_msvc_compat_args, no_override_init_args], - include_directories : [inc_common], - dependencies : [dep_thread, idep_gtest, idep_nir], - link_with : libmesa_util, - ) + c_args : [c_msvc_compat_args, no_override_init_args], + gnu_symbol_visibility : 'hidden', + include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux], + dependencies : [dep_thread, idep_gtest, idep_nir, idep_mesautil], + ), + suite : ['compiler', 'nir'], + ) + + test( + 'comparison_pre', + executable( + 'comparison_pre', + files('tests/comparison_pre_tests.cpp'), + c_args : [c_msvc_compat_args, no_override_init_args], + gnu_symbol_visibility : 'hidden', + include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux], + dependencies : [dep_thread, idep_gtest, idep_nir, idep_mesautil], + ), + suite : ['compiler', 'nir'], + ) + + test( + 'load_store_vectorizer', + executable( + 'load_store_vectorizer', + files('tests/load_store_vectorizer_tests.cpp'), + cpp_args : [cpp_msvc_compat_args], + gnu_symbol_visibility : 'hidden', + include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux], + dependencies : [dep_thread, idep_gtest, idep_nir, idep_mesautil], + ), + suite : ['compiler', 'nir'], + should_fail : meson.get_cross_property('xfail', '').contains('load_store_vectorizer'), + ) + + test( + 'nir_serialize_test', + executable( + 'nir_serialize_test', + files('tests/serialize_tests.cpp'), + cpp_args : [cpp_msvc_compat_args], + gnu_symbol_visibility : 'hidden', + include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux], + dependencies : [dep_thread, idep_gtest, idep_nir, idep_mesautil], + ), + suite : ['compiler', 'nir'], + ) + + test( + 'nir_opt_if', + executable( + 'nir_opt_if_tests', + files('tests/opt_if_tests.cpp'), + cpp_args : [cpp_msvc_compat_args], + gnu_symbol_visibility : 'hidden', + include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux], + dependencies : [dep_thread, idep_gtest, idep_nir, idep_mesautil], + ), + suite : ['compiler', 'nir'], ) endif