[Mesa-dev] [PATCH v1 2/5] meson: specify -msse manually for 32-bit build

Sergii Romantsov sergii.romantsov at gmail.com
Fri Oct 26 10:05:25 UTC 2018


While building of 32bit Mesa gcc doesn't specifies __SSE__ by default.
So it has to be done manually by flag '-msee'.
Added support of such specification to build-system.
That enables optimization for file src/util/rounding.h.

CC: Dylan Baker <dylan at pnwbakers.com>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=108560
Signed-off-by: Sergii Romantsov <sergii.romantsov at globallogic.com>
---
 src/compiler/glsl/meson.build           | 2 +-
 src/compiler/meson.build                | 4 ++--
 src/compiler/nir/meson.build            | 2 +-
 src/glx/meson.build                     | 2 +-
 src/intel/blorp/meson.build             | 2 +-
 src/intel/common/meson.build            | 2 +-
 src/intel/compiler/meson.build          | 4 ++--
 src/intel/isl/meson.build               | 2 +-
 src/intel/tools/meson.build             | 2 +-
 src/mesa/drivers/dri/common/meson.build | 4 ++--
 src/mesa/meson.build                    | 4 ++--
 src/util/meson.build                    | 2 +-
 12 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/src/compiler/glsl/meson.build b/src/compiler/glsl/meson.build
index 71b4c42..1b96bdc 100644
--- a/src/compiler/glsl/meson.build
+++ b/src/compiler/glsl/meson.build
@@ -215,7 +215,7 @@ libglsl = static_library(
   [files_libglsl, glsl_parser, glsl_lexer_cpp, ir_expression_operation_h,
    ir_expression_operation_strings_h, ir_expression_operation_constant_h],
   c_args : [c_vis_args, c_msvc_compat_args, no_override_init_args],
-  cpp_args : [cpp_vis_args, cpp_msvc_compat_args],
+  cpp_args : [cpp_vis_args, cpp_msvc_compat_args, cpp_sse_args],
   link_with : libglcpp,
   include_directories : [inc_common, inc_compiler, inc_nir],
   dependencies : idep_nir,
diff --git a/src/compiler/meson.build b/src/compiler/meson.build
index 0f8f3c1..8ae49c4 100644
--- a/src/compiler/meson.build
+++ b/src/compiler/meson.build
@@ -48,8 +48,8 @@ libcompiler = static_library(
   'compiler',
   [files_libcompiler, ir_expression_operation_h],
   include_directories : [inc_mapi, inc_mesa, inc_compiler, inc_common],
-  c_args : [c_vis_args, c_msvc_compat_args, no_override_init_args],
-  cpp_args : [cpp_vis_args, cpp_msvc_compat_args],
+  c_args : [c_vis_args, c_msvc_compat_args, no_override_init_args, c_sse_args],
+  cpp_args : [cpp_vis_args, cpp_msvc_compat_args, cpp_sse_args],
   dependencies : [dep_valgrind],
   build_by_default : false,
 )
diff --git a/src/compiler/nir/meson.build b/src/compiler/nir/meson.build
index d8f6564..528d8f7 100644
--- a/src/compiler/nir/meson.build
+++ b/src/compiler/nir/meson.build
@@ -215,7 +215,7 @@ libnir = static_library(
    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],
+  c_args : [c_vis_args, c_msvc_compat_args, no_override_init_args, c_sse_args],
   link_with : libcompiler,
   build_by_default : false,
 )
diff --git a/src/glx/meson.build b/src/glx/meson.build
index dd8ba60..1d4327f 100644
--- a/src/glx/meson.build
+++ b/src/glx/meson.build
@@ -146,7 +146,7 @@ libglx = static_library(
   [files_libglx, glx_generated],
   include_directories : [inc_common, inc_glapi, inc_loader, inc_gl_internal],
   c_args : [
-    c_vis_args, gl_lib_cargs,
+    c_vis_args, gl_lib_cargs, c_sse_args,
     '-DGL_LIB_NAME="lib at 0@.so. at 1@"'.format(gl_lib_name, gl_lib_version.split('.')[0]),
   ],
   link_with : [
diff --git a/src/intel/blorp/meson.build b/src/intel/blorp/meson.build
index c1201b0..490ce6f 100644
--- a/src/intel/blorp/meson.build
+++ b/src/intel/blorp/meson.build
@@ -32,6 +32,6 @@ libblorp = static_library(
   'blorp',
   files_libblorp,
   include_directories : [inc_common, inc_intel],
-  c_args : [c_vis_args, no_override_init_args],
+  c_args : [c_vis_args, no_override_init_args, c_sse_args],
   dependencies : idep_nir_headers,
 )
diff --git a/src/intel/common/meson.build b/src/intel/common/meson.build
index 332e978..c452a40 100644
--- a/src/intel/common/meson.build
+++ b/src/intel/common/meson.build
@@ -41,7 +41,7 @@ libintel_common = static_library(
   ['intel_common', genX_xml_h],
   files_libintel_common,
   include_directories : [inc_common, inc_intel],
-  c_args : [c_vis_args, no_override_init_args],
+  c_args : [c_vis_args, no_override_init_args, c_sse_args],
   link_with : [libisl],
   dependencies : [dep_expat, dep_libdrm, dep_thread],
 )
diff --git a/src/intel/compiler/meson.build b/src/intel/compiler/meson.build
index 3cdeb62..a6fd188 100644
--- a/src/intel/compiler/meson.build
+++ b/src/intel/compiler/meson.build
@@ -134,8 +134,8 @@ libintel_compiler = static_library(
   'intel_compiler',
   [libintel_compiler_files, brw_nir_trig, ir_expression_operation_h],
   include_directories : [inc_common, inc_intel],
-  c_args : [c_vis_args, no_override_init_args],
-  cpp_args : [cpp_vis_args],
+  c_args : [c_vis_args, no_override_init_args, c_sse_args],
+  cpp_args : [cpp_vis_args, cpp_sse_args],
   dependencies : idep_nir_headers,
   build_by_default : false,
 )
diff --git a/src/intel/isl/meson.build b/src/intel/isl/meson.build
index 62cde19..8261381 100644
--- a/src/intel/isl/meson.build
+++ b/src/intel/isl/meson.build
@@ -84,7 +84,7 @@ libisl = static_library(
   [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],
+  c_args : [c_vis_args, no_override_init_args, c_sse_args],
 )
 
 if with_tests
diff --git a/src/intel/tools/meson.build b/src/intel/tools/meson.build
index 44d6bdd..f3dcd3d 100644
--- a/src/intel/tools/meson.build
+++ b/src/intel/tools/meson.build
@@ -55,7 +55,7 @@ i965_disasm = executable(
   dependencies : [dep_thread],
   include_directories : [inc_common, inc_intel],
   link_with : [libintel_common, libintel_compiler, libintel_dev, libmesa_util],
-  c_args : [c_vis_args, no_override_init_args],
+  c_args : [c_vis_args, no_override_init_args, c_sse_args],
   build_by_default : true,
   install : true
 )
diff --git a/src/mesa/drivers/dri/common/meson.build b/src/mesa/drivers/dri/common/meson.build
index d9a9abd..b8974ba 100644
--- a/src/mesa/drivers/dri/common/meson.build
+++ b/src/mesa/drivers/dri/common/meson.build
@@ -24,7 +24,7 @@ libdricommon = static_library(
   'dricommon',
   ['utils.c', 'utils.h', 'dri_util.c', 'dri_util.h', xmlpool_options_h],
   include_directories : [inc_common, inc_util],
-  c_args : c_vis_args,
+  c_args : [c_vis_args, c_sse_args],
   dependencies : dep_libdrm,
   build_by_default : false,
 )
@@ -33,7 +33,7 @@ libmegadriver_stub = static_library(
   'megadriver_stub',
   'megadriver_stub.c',
   include_directories : inc_common,
-  c_args : c_vis_args,
+  c_args : [c_vis_args, c_sse_args],
   dependencies : dep_libdrm,
   build_by_default : false,
 )
diff --git a/src/mesa/meson.build b/src/mesa/meson.build
index ea88497..be88320 100644
--- a/src/mesa/meson.build
+++ b/src/mesa/meson.build
@@ -722,8 +722,8 @@ endif
 libmesa_classic = static_library(
   'mesa_classic',
   [files_libmesa_common, files_libmesa_classic],
-  c_args : [c_vis_args, c_msvc_compat_args],
-  cpp_args : [cpp_vis_args, cpp_msvc_compat_args],
+  c_args : [c_vis_args, c_msvc_compat_args, c_sse_args],
+  cpp_args : [cpp_vis_args, cpp_msvc_compat_args, cpp_sse_args],
   include_directories : [inc_common, inc_libmesa_asm, include_directories('main')],
   link_with : [libglsl, libmesa_sse41],
   dependencies : idep_nir_headers,
diff --git a/src/util/meson.build b/src/util/meson.build
index 49d84c1..5bcb1d7 100644
--- a/src/util/meson.build
+++ b/src/util/meson.build
@@ -114,7 +114,7 @@ libmesa_util = static_library(
   [files_mesa_util, format_srgb],
   include_directories : inc_common,
   dependencies : [dep_zlib, dep_clock, dep_thread, dep_atomic],
-  c_args : [c_msvc_compat_args, c_vis_args],
+  c_args : [c_msvc_compat_args, c_vis_args, c_sse_args],
   build_by_default : false
 )
 
-- 
2.7.4



More information about the mesa-dev mailing list