Module: Mesa Branch: main Commit: 669a68489da936924cb733c7d11d19a8999c8fae URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=669a68489da936924cb733c7d11d19a8999c8fae
Author: Yonggang Luo <[email protected]> Date: Fri Feb 17 14:45:08 2023 +0800 meson: Use sse2_arg and sse2_args to replace usage of c and c_sse2_args And now c_sse2_arg and c_sse2_args are remvoed Signed-off-by: Yonggang Luo <[email protected]> Reviewed-by: David Heidelberg <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/21375> --- src/gallium/drivers/crocus/meson.build | 6 +++--- src/gallium/drivers/iris/meson.build | 6 +++--- src/intel/isl/meson.build | 4 ++-- src/intel/meson.build | 6 ------ src/intel/perf/meson.build | 4 ++-- src/intel/tools/meson.build | 2 +- src/intel/vulkan/grl/meson.build | 4 ++-- src/intel/vulkan/meson.build | 4 ++-- src/intel/vulkan_hasvk/meson.build | 6 +++--- 9 files changed, 18 insertions(+), 24 deletions(-) diff --git a/src/gallium/drivers/crocus/meson.build b/src/gallium/drivers/crocus/meson.build index e0a270bfb21..89c9d5e7fae 100644 --- a/src/gallium/drivers/crocus/meson.build +++ b/src/gallium/drivers/crocus/meson.build @@ -60,7 +60,7 @@ foreach v : ['40', '45', '50', '60', '70', '75', '80'] ['crocus_blorp.c', 'crocus_query.c', 'crocus_state.c', 'crocus_blt.c', gen_xml_pack], include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_intel], c_args : [ - no_override_init_args, c_sse2_args, + no_override_init_args, sse2_args, '-DGFX_VERx10=@0@'.format(v), ], gnu_symbol_visibility : 'hidden', @@ -77,8 +77,8 @@ libcrocus = static_library( # these should not be necessary, but main/macros.h... inc_mesa, inc_mapi ], - c_args : [c_sse2_args], - cpp_args : [c_sse2_args], + c_args : [sse2_args], + cpp_args : [sse2_args], gnu_symbol_visibility : 'hidden', dependencies : [dep_libdrm, dep_valgrind, idep_genxml, idep_libintel_common, idep_nir_headers], link_with : [ diff --git a/src/gallium/drivers/iris/meson.build b/src/gallium/drivers/iris/meson.build index e64b861b2f6..97413cc0638 100644 --- a/src/gallium/drivers/iris/meson.build +++ b/src/gallium/drivers/iris/meson.build @@ -65,7 +65,7 @@ foreach v : ['80', '90', '110', '120', '125'] ['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 : [ - no_override_init_args, c_sse2_args, + no_override_init_args, sse2_args, '-DGFX_VERx10=@0@'.format(v), ], gnu_symbol_visibility : 'hidden', @@ -83,8 +83,8 @@ libiris = static_library( # these should not be necessary, but main/macros.h... inc_mesa, inc_mapi ], - c_args : [c_sse2_args], - cpp_args : [c_sse2_args], + c_args : [sse2_args], + cpp_args : [sse2_args], gnu_symbol_visibility : 'hidden', dependencies : [dep_libdrm, dep_valgrind, idep_genxml, idep_nir_headers, idep_libintel_common, idep_intel_driver_ds, ], diff --git a/src/intel/isl/meson.build b/src/intel/isl/meson.build index 14fd487c305..7c8356255c5 100644 --- a/src/intel/isl/meson.build +++ b/src/intel/isl/meson.build @@ -101,7 +101,7 @@ isl_tiled_memcpy = static_library( inc_include, inc_src, inc_mesa, inc_gallium, inc_intel, ], dependencies : idep_mesautil, - c_args : [no_override_init_args, c_sse2_arg], + c_args : [no_override_init_args, sse2_arg], gnu_symbol_visibility : 'hidden', extra_files : ['isl_tiled_memcpy.c'] ) @@ -115,7 +115,7 @@ if with_sse41 ], dependencies : idep_mesautil, link_args : ['-Wl,--exclude-libs=ALL'], - c_args : [no_override_init_args, c_sse2_arg, sse41_args], + c_args : [no_override_init_args, sse2_arg, sse41_args], gnu_symbol_visibility : 'hidden', extra_files : ['isl_tiled_memcpy.c'] ) diff --git a/src/intel/meson.build b/src/intel/meson.build index 57307b579ff..377179d9077 100644 --- a/src/intel/meson.build +++ b/src/intel/meson.build @@ -18,12 +18,6 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE # SOFTWARE. -c_sse2_args = [] -c_sse2_arg = [] -if ['x86', 'x86_64'].contains(host_machine.cpu_family()) - c_sse2_arg = ['-msse2', '-mfpmath=sse'] - c_sse2_args = [c_sse2_arg, '-mstackrealign'] -endif inc_intel = include_directories('.') subdir('genxml') diff --git a/src/intel/perf/meson.build b/src/intel/perf/meson.build index a4d17e98f04..e2d74033cd3 100644 --- a/src/intel/perf/meson.build +++ b/src/intel/perf/meson.build @@ -39,8 +39,8 @@ libintel_perf = static_library( include_directories : [ inc_include, inc_src, inc_intel, ], - c_args : [no_override_init_args, c_sse2_arg], - cpp_args : [c_sse2_arg], + c_args : [no_override_init_args, sse2_arg], + cpp_args : [sse2_arg], gnu_symbol_visibility : 'hidden', ) diff --git a/src/intel/tools/meson.build b/src/intel/tools/meson.build index 981177eb66d..c6eecca4c18 100644 --- a/src/intel/tools/meson.build +++ b/src/intel/tools/meson.build @@ -96,7 +96,7 @@ libintel_sanitize_gpu = shared_library( dependencies : [idep_mesautil, dep_dl, dep_thread], include_directories : [inc_include, inc_src, inc_intel], link_with : libintel_common, - c_args : [no_override_init_args, c_sse2_args], + c_args : [no_override_init_args, sse2_args], gnu_symbol_visibility : 'hidden', install_dir : get_option('libexecdir'), install : true diff --git a/src/intel/vulkan/grl/meson.build b/src/intel/vulkan/grl/meson.build index 979414c07c1..407931fac7f 100644 --- a/src/intel/vulkan/grl/meson.build +++ b/src/intel/vulkan/grl/meson.build @@ -165,11 +165,11 @@ foreach t : [['125', 'gfx125', 'dg2']] inc_intel, ], c_args : [ - no_override_init_args, c_sse2_args, + no_override_init_args, sse2_args, '-DGFX_VERx10=@0@'.format(verX10), ], cpp_args : [ - no_override_init_args, c_sse2_args, + no_override_init_args, sse2_args, '-DGFX_VERx10=@0@'.format(verX10), ], dependencies : [ diff --git a/src/intel/vulkan/meson.build b/src/intel/vulkan/meson.build index 1886ea0904a..84e8a0e13b5 100644 --- a/src/intel/vulkan/meson.build +++ b/src/intel/vulkan/meson.build @@ -24,7 +24,7 @@ inc_anv = include_directories('.') anv_flags = [ no_override_init_args, - c_sse2_args, + sse2_args, ] anv_cpp_flags = [] @@ -281,7 +281,7 @@ if with_tests executable( t, ['tests/@[email protected]'.format(t), anv_entrypoints[0]], - c_args : [ c_sse2_args ], + c_args : [ sse2_args ], link_with : libvulkan_intel_test, dependencies : [ dep_libdrm, dep_thread, dep_m, dep_valgrind, diff --git a/src/intel/vulkan_hasvk/meson.build b/src/intel/vulkan_hasvk/meson.build index 0d53080a2f0..a3fb228428c 100644 --- a/src/intel/vulkan_hasvk/meson.build +++ b/src/intel/vulkan_hasvk/meson.build @@ -84,7 +84,7 @@ foreach g : [['70', ['gfx7_cmd_buffer.c']], inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_compiler, inc_intel, ], c_args : [ - no_override_init_args, c_sse2_args, + no_override_init_args, sse2_args, '-DGFX_VERx10=@0@'.format(_gfx_ver), ], gnu_symbol_visibility : 'hidden', @@ -138,7 +138,7 @@ anv_deps = [ ] anv_flags = [ no_override_init_args, - c_sse2_args, + sse2_args, ] anv_cpp_flags = [] @@ -243,7 +243,7 @@ if with_tests executable( t, ['tests/@[email protected]'.format(t), anv_hasvk_entrypoints[0]], - c_args : [ c_sse2_args ], + c_args : [ sse2_args ], link_with : libvulkan_intel_hasvk_test, dependencies : [ dep_libdrm, dep_thread, dep_m, dep_valgrind,
