[Libreoffice-commits] core.git: config_host.mk.in configure.ac external/skia sc/Library_sc.mk
Luboš Luňák (via logerrit)
logerrit at kemper.freedesktop.org
Tue Dec 3 09:44:48 UTC 2019
config_host.mk.in | 9 +
configure.ac | 296 +++++++++++++++++++++++++++++-------------
external/skia/Library_skia.mk | 43 +++---
sc/Library_sc.mk | 9 -
4 files changed, 243 insertions(+), 114 deletions(-)
New commits:
commit bb0f9eb14e89949181a588742aa89185c0548cac
Author: Luboš Luňák <l.lunak at collabora.com>
AuthorDate: Mon Dec 2 14:27:59 2019 +0100
Commit: Luboš Luňák <l.lunak at collabora.com>
CommitDate: Tue Dec 3 10:43:30 2019 +0100
split instrinsics CXXFLAGS per each instruction set
The common usage pattern should be having one source file per each
instruction set and then one source file compiled with neutral flags
that dispatches to the relevant code based on runtime checks.
Which means that there can't be any one "correct" flag, otherwise
all files would get compiled e.g. with SSE4.2 but then CPUs capable
only of SSE2 would crash running that code.
Change-Id: I362bf66f672dae4588a48effe3bcd30c34ea75b3
Reviewed-on: https://gerrit.libreoffice.org/84227
Reviewed-by: Tomaž Vajngerl <quikee at gmail.com>
Tested-by: Jenkins
Reviewed-by: Luboš Luňák <l.lunak at collabora.com>
diff --git a/config_host.mk.in b/config_host.mk.in
index a8fba104e23f..35f92df1d641 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -96,6 +96,14 @@ export CXX_X64_BINARY=@CXX_X64_BINARY@
export CXX_X86_BINARY=@CXX_X86_BINARY@
@x_CXXFLAGS@ export CXXFLAGS=@CXXFLAGS@
export CXXFLAGS_CXX11=@CXXFLAGS_CXX11@
+export CXXFLAGS_INTRINSICS_SSE2=@CXXFLAGS_INTRINSICS_SSE2@
+export CXXFLAGS_INTRINSICS_SSSE3=@CXXFLAGS_INTRINSICS_SSSE3@
+export CXXFLAGS_INTRINSICS_SSE41=@CXXFLAGS_INTRINSICS_SSE41@
+export CXXFLAGS_INTRINSICS_SSE42=@CXXFLAGS_INTRINSICS_SSE42@
+export CXXFLAGS_INTRINSICS_AVX=@CXXFLAGS_INTRINSICS_AVX@
+export CXXFLAGS_INTRINSICS_AVX2=@CXXFLAGS_INTRINSICS_AVX2@
+export CXXFLAGS_INTRINSICS_F16C=@CXXFLAGS_INTRINSICS_F16C@
+export CXXFLAGS_INTRINSICS_FMA=@CXXFLAGS_INTRINSICS_FMA@
export DATADIR=@DATADIR@
export DBUS_CFLAGS=$(gb_SPACE)@DBUS_CFLAGS@
export DBUS_LIBS=$(gb_SPACE)@DBUS_LIBS@
@@ -649,7 +657,6 @@ export ZLIB_LIBS=$(gb_SPACE)@ZLIB_LIBS@
export ZMF_CFLAGS=$(gb_SPACE)@ZMF_CFLAGS@
export ZMF_LIBS=$(gb_SPACE)@ZMF_LIBS@
export USE_AVMEDIA_DUMMY=@USE_AVMEDIA_DUMMY@
-export INTRINSICS_CXXFLAGS=@INTRINSICS_CXXFLAGS@
# lang-related stuff
include $(BUILDDIR)/config_$(gb_Side)_lang.mk
diff --git a/configure.ac b/configure.ac
index d1a1cd1b6f16..27e0f7a06839 100644
--- a/configure.ac
+++ b/configure.ac
@@ -6777,103 +6777,219 @@ dnl ===================================================================
dnl CPU Intrinsics support - SSE, AVX
dnl ===================================================================
-INTRINSICS_CXXFLAGS=""
+CXXFLAGS_INTRINSICS_SSE2=
+CXXFLAGS_INTRINSICS_SSSE3=
+CXXFLAGS_INTRINSICS_SSE41=
+CXXFLAGS_INTRINSICS_SSE42=
+CXXFLAGS_INTRINSICS_AVX=
+CXXFLAGS_INTRINSICS_AVX2=
+CXXFLAGS_INTRINSICS_F16C=
+CXXFLAGS_INTRINSICS_FMA=
if test "$GCC" = "yes"; then
- AC_MSG_CHECKING([whether $CXX can compile SSE2 intrinsics])
- AC_LANG_PUSH([C++])
- save_CXXFLAGS=$CXXFLAGS
- CXXFLAGS="$CXXFLAGS -msse2"
- AC_COMPILE_IFELSE([AC_LANG_SOURCE([
- #include <emmintrin.h>
- int main () {
- volatile __m128i a = _mm_set1_epi32 (0), b = _mm_set1_epi32 (0), c;
- c = _mm_xor_si128 (a, b);
- return 0;
- }
- ])],
- [can_compile_sse2=yes],
- [can_compile_sse2=no])
- AC_LANG_POP([C++])
- CXXFLAGS=$save_CXXFLAGS
- AC_MSG_RESULT([${can_compile_sse2}])
- if test "${can_compile_sse2}" = "yes" ; then
- INTRINSICS_CXXFLAGS="-msse2"
- else
- AC_MSG_WARN([cannot compile SSE2 intrinsics])
- fi
+ flag_sse2=-msse2
+ flag_ssse3=-mssse3
+ flag_sse41=-msse4.1
+ flag_sse42=-msse4.2
+ flag_avx=-mavx
+ flag_avx2=-mavx2
+ flag_f16c=-mf16c
+ flag_fma=-mfma
+else
+ # https://docs.microsoft.com/en-us/cpp/build/reference/arch-x86
+ # MSVC seems to differentiate only between SSE and SSE2, where in fact
+ # SSE2 seems to be SSE2+.
+ # Even if -arch:SSE2 is the default, set it explicitly, so that the variable
+ # is not empty (and can be tested in gbuild), moreover we now default to SSE
+ # for 32bit x86.
+ flag_sse2=-arch:SSE2
+ flag_ssse3=-arch:SSE2
+ flag_sse41=-arch:SSE2
+ flag_sse42=-arch:SSE2
+ flag_avx=-arch:AVX
+ flag_avx2=-arch:AVX2
+ # These are part of -arch:AVX2
+ flag_f16c=-arch:AVX2
+ flag_fma=-arch:AVX2
+fi
+
+AC_MSG_CHECKING([whether $CXX can compile SSE2 intrinsics])
+AC_LANG_PUSH([C++])
+save_CXXFLAGS=$CXXFLAGS
+CXXFLAGS="$CXXFLAGS $flag_sse2"
+AC_COMPILE_IFELSE([AC_LANG_SOURCE([
+ #include <emmintrin.h>
+ int main () {
+ __m128i a = _mm_set1_epi32 (0), b = _mm_set1_epi32 (0), c;
+ c = _mm_xor_si128 (a, b);
+ return 0;
+ }
+ ])],
+ [can_compile_sse2=yes],
+ [can_compile_sse2=no])
+AC_LANG_POP([C++])
+CXXFLAGS=$save_CXXFLAGS
+AC_MSG_RESULT([${can_compile_sse2}])
+if test "${can_compile_sse2}" = "yes" ; then
+ CXXFLAGS_INTRINSICS_SSE2="$flag_sse2"
+fi
- AC_MSG_CHECKING([whether $CXX can compile SSSE3 intrinsics])
- AC_LANG_PUSH([C++])
- save_CXXFLAGS=$CXXFLAGS
- CXXFLAGS="$CXXFLAGS -mssse3"
- AC_COMPILE_IFELSE([AC_LANG_SOURCE([
- #include <tmmintrin.h>
- int main () {
- volatile __m128i a = _mm_set1_epi32 (0), b = _mm_set1_epi32 (0), c;
- c = _mm_maddubs_epi16 (a, b);
- return 0;
- }
- ])],
- [can_compile_ssse3=yes],
- [can_compile_ssse3=no])
- AC_LANG_POP([C++])
- CXXFLAGS=$save_CXXFLAGS
- AC_MSG_RESULT([${can_compile_ssse3}])
- if test "${can_compile_ssse3}" = "yes" ; then
- INTRINSICS_CXXFLAGS="-mssse3"
- else
- AC_MSG_WARN([cannot compile SSSE3 intrinsics])
- fi
+AC_MSG_CHECKING([whether $CXX can compile SSSE3 intrinsics])
+AC_LANG_PUSH([C++])
+save_CXXFLAGS=$CXXFLAGS
+CXXFLAGS="$CXXFLAGS $flag_ssse3"
+AC_COMPILE_IFELSE([AC_LANG_SOURCE([
+ #include <tmmintrin.h>
+ int main () {
+ __m128i a = _mm_set1_epi32 (0), b = _mm_set1_epi32 (0), c;
+ c = _mm_maddubs_epi16 (a, b);
+ return 0;
+ }
+ ])],
+ [can_compile_ssse3=yes],
+ [can_compile_ssse3=no])
+AC_LANG_POP([C++])
+CXXFLAGS=$save_CXXFLAGS
+AC_MSG_RESULT([${can_compile_ssse3}])
+if test "${can_compile_ssse3}" = "yes" ; then
+ CXXFLAGS_INTRINSICS_SSSE3="$flag_ssse3"
+fi
- AC_MSG_CHECKING([whether $CXX can compile AVX intrinsics])
- AC_LANG_PUSH([C++])
- save_CXXFLAGS=$CXXFLAGS
- CXXFLAGS="$CXXFLAGS -mavx"
- AC_COMPILE_IFELSE([AC_LANG_SOURCE([
- #include <immintrin.h>
- int main () {
- volatile __m256 a = _mm256_set1_ps (0.0f), b = _mm256_set1_ps (0.0f), c;
- c = _mm256_xor_ps(a, b);
- return 0;
- }
- ])],
- [can_compile_avx=yes],
- [can_compile_avx=no])
- AC_LANG_POP([C++])
- CXXFLAGS=$save_CXXFLAGS
- AC_MSG_RESULT([${can_compile_avx}])
- if test "${can_compile_avx}" = "yes" ; then
- INTRINSICS_CXXFLAGS="-mavx"
- else
- AC_MSG_WARN([cannot compile AVX intrinsics])
- fi
+AC_MSG_CHECKING([whether $CXX can compile SSE4.1 intrinsics])
+AC_LANG_PUSH([C++])
+save_CXXFLAGS=$CXXFLAGS
+CXXFLAGS="$CXXFLAGS $flag_sse41"
+AC_COMPILE_IFELSE([AC_LANG_SOURCE([
+ #include <smmintrin.h>
+ int main () {
+ __m128i a = _mm_set1_epi32 (0), b = _mm_set1_epi32 (0), c;
+ c = _mm_cmpeq_epi64 (a, b);
+ return 0;
+ }
+ ])],
+ [can_compile_sse41=yes],
+ [can_compile_sse41=no])
+AC_LANG_POP([C++])
+CXXFLAGS=$save_CXXFLAGS
+AC_MSG_RESULT([${can_compile_sse41}])
+if test "${can_compile_sse41}" = "yes" ; then
+ CXXFLAGS_INTRINSICS_SSE41="$flag_sse41"
+fi
- AC_MSG_CHECKING([whether $CXX can compile AVX2 intrinsics])
- AC_LANG_PUSH([C++])
- save_CXXFLAGS=$CXXFLAGS
- CXXFLAGS="$CXXFLAGS -mavx2"
- AC_COMPILE_IFELSE([AC_LANG_SOURCE([
- #include <immintrin.h>
- int main () {
- volatile __m256i a = _mm256_set1_epi32 (0), b = _mm256_set1_epi32 (0), c;
- c = _mm256_maddubs_epi16(a, b);
- return 0;
- }
- ])],
- [can_compile_avx2=yes],
- [can_compile_avx2=no])
- AC_LANG_POP([C++])
- CXXFLAGS=$save_CXXFLAGS
- AC_MSG_RESULT([${can_compile_avx2}])
- if test "${can_compile_avx2}" = "yes" ; then
- INTRINSICS_CXXFLAGS="-mavx2"
- else
- AC_MSG_WARN([cannot compile AVX2 intrinsics])
- fi
+AC_MSG_CHECKING([whether $CXX can compile SSE4.2 intrinsics])
+AC_LANG_PUSH([C++])
+save_CXXFLAGS=$CXXFLAGS
+CXXFLAGS="$CXXFLAGS $flag_sse42"
+AC_COMPILE_IFELSE([AC_LANG_SOURCE([
+ #include <nmmintrin.h>
+ int main () {
+ __m128i a = _mm_set1_epi32 (0), b = _mm_set1_epi32 (0), c;
+ c = _mm_cmpgt_epi64 (a, b);
+ return 0;
+ }
+ ])],
+ [can_compile_sse42=yes],
+ [can_compile_sse42=no])
+AC_LANG_POP([C++])
+CXXFLAGS=$save_CXXFLAGS
+AC_MSG_RESULT([${can_compile_sse42}])
+if test "${can_compile_sse42}" = "yes" ; then
+ CXXFLAGS_INTRINSICS_SSE42="$flag_sse42"
+fi
+
+AC_MSG_CHECKING([whether $CXX can compile AVX intrinsics])
+AC_LANG_PUSH([C++])
+save_CXXFLAGS=$CXXFLAGS
+CXXFLAGS="$CXXFLAGS $flag_avx"
+AC_COMPILE_IFELSE([AC_LANG_SOURCE([
+ #include <immintrin.h>
+ int main () {
+ __m256 a = _mm256_set1_ps (0.0f), b = _mm256_set1_ps (0.0f), c;
+ c = _mm256_xor_ps(a, b);
+ return 0;
+ }
+ ])],
+ [can_compile_avx=yes],
+ [can_compile_avx=no])
+AC_LANG_POP([C++])
+CXXFLAGS=$save_CXXFLAGS
+AC_MSG_RESULT([${can_compile_avx}])
+if test "${can_compile_avx}" = "yes" ; then
+ CXXFLAGS_INTRINSICS_AVX="$flag_avx"
fi
-AC_SUBST([INTRINSICS_CXXFLAGS])
+AC_MSG_CHECKING([whether $CXX can compile AVX2 intrinsics])
+AC_LANG_PUSH([C++])
+save_CXXFLAGS=$CXXFLAGS
+CXXFLAGS="$CXXFLAGS $flag_avx2"
+AC_COMPILE_IFELSE([AC_LANG_SOURCE([
+ #include <immintrin.h>
+ int main () {
+ __m256i a = _mm256_set1_epi32 (0), b = _mm256_set1_epi32 (0), c;
+ c = _mm256_maddubs_epi16(a, b);
+ return 0;
+ }
+ ])],
+ [can_compile_avx2=yes],
+ [can_compile_avx2=no])
+AC_LANG_POP([C++])
+CXXFLAGS=$save_CXXFLAGS
+AC_MSG_RESULT([${can_compile_avx2}])
+if test "${can_compile_avx2}" = "yes" ; then
+ CXXFLAGS_INTRINSICS_AVX2="$flag_avx2"
+fi
+
+AC_MSG_CHECKING([whether $CXX can compile F16C intrinsics])
+AC_LANG_PUSH([C++])
+save_CXXFLAGS=$CXXFLAGS
+CXXFLAGS="$CXXFLAGS $flag_f16c"
+AC_COMPILE_IFELSE([AC_LANG_SOURCE([
+ #include <immintrin.h>
+ int main () {
+ __m128i a = _mm_set1_epi32 (0);
+ __m128 c;
+ c = _mm_cvtph_ps(a);
+ return 0;
+ }
+ ])],
+ [can_compile_f16c=yes],
+ [can_compile_f16c=no])
+AC_LANG_POP([C++])
+CXXFLAGS=$save_CXXFLAGS
+AC_MSG_RESULT([${can_compile_f16c}])
+if test "${can_compile_f16c}" = "yes" ; then
+ CXXFLAGS_INTRINSICS_F16C="$flag_f16c"
+fi
+
+AC_MSG_CHECKING([whether $CXX can compile FMA intrinsics])
+AC_LANG_PUSH([C++])
+save_CXXFLAGS=$CXXFLAGS
+CXXFLAGS="$CXXFLAGS $flag_fma"
+AC_COMPILE_IFELSE([AC_LANG_SOURCE([
+ #include <immintrin.h>
+ int main () {
+ __m256 a = _mm256_set1_ps (0.0f), b = _mm256_set1_ps (0.0f), c = _mm256_set1_ps (0.0f), d;
+ d = _mm256_fmadd_ps(a, b, c);
+ return 0;
+ }
+ ])],
+ [can_compile_fma=yes],
+ [can_compile_fma=no])
+AC_LANG_POP([C++])
+CXXFLAGS=$save_CXXFLAGS
+AC_MSG_RESULT([${can_compile_fma}])
+if test "${can_compile_fma}" = "yes" ; then
+ CXXFLAGS_INTRINSICS_FMA="$flag_fma"
+fi
+
+AC_SUBST([CXXFLAGS_INTRINSICS_SSE2])
+AC_SUBST([CXXFLAGS_INTRINSICS_SSSE3])
+AC_SUBST([CXXFLAGS_INTRINSICS_SSE41])
+AC_SUBST([CXXFLAGS_INTRINSICS_SSE42])
+AC_SUBST([CXXFLAGS_INTRINSICS_AVX])
+AC_SUBST([CXXFLAGS_INTRINSICS_AVX2])
+AC_SUBST([CXXFLAGS_INTRINSICS_F16C])
+AC_SUBST([CXXFLAGS_INTRINSICS_FMA])
dnl ===================================================================
dnl system stl sanity tests
diff --git a/external/skia/Library_skia.mk b/external/skia/Library_skia.mk
index 6c988bb79ac0..2fe24876b499 100644
--- a/external/skia/Library_skia.mk
+++ b/external/skia/Library_skia.mk
@@ -22,9 +22,6 @@ $(eval $(call gb_Library_add_defs,skia,\
))
ifeq ($(OS),WNT)
-$(eval $(call gb_Library_add_cxxflags,skia, \
- -arch:SSE2 \
-))
ifneq ($(gb_ENABLE_PCH),)
$(eval $(call gb_Library_add_cxxflags,skia, \
-FIsrc/utils/win/SkDWriteNTDDI_VERSION.h \
@@ -41,11 +38,6 @@ $(eval $(call gb_Library_use_system_win32_libs,skia,\
gdi32 \
))
else
-# TODO SKIA
-$(eval $(call gb_Library_add_cxxflags,skia, \
- -mssse3 \
-))
-
$(eval $(call gb_Library_use_externals,skia,\
freetype \
fontconfig \
@@ -216,7 +208,6 @@ $(eval $(call gb_Library_add_generated_exception_objects,skia,\
UnpackedTarball/skia/src/core/SkNormalFlatSource \
UnpackedTarball/skia/src/core/SkNormalMapSource \
UnpackedTarball/skia/src/core/SkNormalSource \
- UnpackedTarball/skia/src/core/SkOpts \
UnpackedTarball/skia/src/core/SkOverdrawCanvas \
UnpackedTarball/skia/src/core/SkPaint \
UnpackedTarball/skia/src/core/SkPaintPriv \
@@ -800,18 +791,38 @@ $(eval $(call gb_Library_add_generated_exception_objects,skia,\
))
$(eval $(call gb_Library_add_generated_exception_objects,skia,\
- UnpackedTarball/skia/src/opts/SkOpts_avx \
- UnpackedTarball/skia/src/opts/SkOpts_crc32 \
- UnpackedTarball/skia/src/opts/SkOpts_hsw \
- UnpackedTarball/skia/src/opts/SkOpts_sse41 \
- UnpackedTarball/skia/src/opts/SkOpts_sse42 \
- UnpackedTarball/skia/src/opts/SkOpts_ssse3 \
UnpackedTarball/skia/src/ports/SkGlobalInitialization_default \
UnpackedTarball/skia/src/ports/SkImageGenerator_none \
UnpackedTarball/skia/src/ports/SkOSFile_stdio \
))
$(eval $(call gb_Library_add_generated_exception_objects,skia,\
+ UnpackedTarball/skia/src/opts/SkOpts_avx, $(CXXFLAGS_INTRINSICS_AVX) \
+))
+$(eval $(call gb_Library_add_generated_exception_objects,skia,\
+ UnpackedTarball/skia/src/opts/SkOpts_hsw, \
+ $(CXXFLAGS_INTRINSICS_AVX2) $(CXXFLAGS_INTRINSICS_F16C) $(CXXFLAGS_INTRINSICS_FMA)\
+))
+$(eval $(call gb_Library_add_generated_exception_objects,skia,\
+ UnpackedTarball/skia/src/opts/SkOpts_sse41, $(CXXFLAGS_INTRINSICS_SSE41) \
+))
+$(eval $(call gb_Library_add_generated_exception_objects,skia,\
+ UnpackedTarball/skia/src/opts/SkOpts_sse42, $(CXXFLAGS_INTRINSICS_SSE42) \
+))
+$(eval $(call gb_Library_add_generated_exception_objects,skia,\
+ UnpackedTarball/skia/src/opts/SkOpts_ssse3, $(CXXFLAGS_INTRINSICS_SSSE3) \
+))
+
+# Compile this file with the best intrinsics available.
+$(eval $(call gb_Library_add_generated_exception_objects,skia,\
+ UnpackedTarball/skia/src/core/SkOpts, \
+ $(CXXFLAGS_INTRINSICS_SSSE3) \
+ $(CXXFLAGS_INTRINSICS_SSE41) $(CXXFLAGS_INTRINSICS_SSE42) \
+ $(CXXFLAGS_INTRINSICS_AVX) \
+ $(CXXFLAGS_INTRINSICS_AVX2) $(CXXFLAGS_INTRINSICS_F16C) $(CXXFLAGS_INTRINSICS_FMA) \
+))
+
+$(eval $(call gb_Library_add_generated_exception_objects,skia,\
UnpackedTarball/skia/tools/gpu/vk/VkTestUtils \
UnpackedTarball/skia/tools/sk_app/GLWindowContext \
UnpackedTarball/skia/tools/sk_app/VulkanWindowContext \
@@ -886,6 +897,8 @@ endif
# UnpackedTarball/skia/src/gpu/gl/iOS/GrGLMakeNativeInterface_iOS \
# UnpackedTarball/skia/src/gpu/gl/mac/GrGLMakeNativeInterface_mac \
+# UnpackedTarball/skia/src/opts/SkOpts_crc32 \
+
# UnpackedTarball/skia/src/ports/SkDebug_android \
# UnpackedTarball/skia/src/ports/SkDiscardableMemory_none \
# UnpackedTarball/skia/src/ports/SkFontConfigInterface \
diff --git a/sc/Library_sc.mk b/sc/Library_sc.mk
index 9c057eaf6a6d..997b14c0add9 100644
--- a/sc/Library_sc.mk
+++ b/sc/Library_sc.mk
@@ -98,17 +98,10 @@ $(eval $(call gb_Library_use_libraries,sc,\
xo \
))
-ifeq ($(OS),WNT)
$(eval $(call gb_Library_add_exception_objects,sc,\
- sc/source/core/tool/arraysumSSE2, -arch:SSE2 \
+ sc/source/core/tool/arraysumSSE2, $(CXXFLAGS_INTRINSICS_SSE2) \
))
-else
-$(eval $(call gb_Library_add_exception_objects,sc,\
- sc/source/core/tool/arraysumSSE2 \
-))
-endif
-
$(eval $(call gb_Library_add_exception_objects,sc,\
sc/source/core/data/attarray \
sc/source/core/data/attrib \
More information about the Libreoffice-commits
mailing list