diff options
| author | Luboš Luňák <l.lunak@collabora.com> | 2020-06-30 17:58:12 +0200 |
|---|---|---|
| committer | Luboš Luňák <l.lunak@collabora.com> | 2020-07-01 11:35:08 +0200 |
| commit | 3dfc6d42edfd469436ad177ad1ebc5526679aa99 (patch) | |
| tree | a879d9a9156c78ea119d6d56133c2c5b292ddfd3 /configure.ac | |
| parent | 3550a459db6d633fccd5a8599b75662689d270c4 (diff) | |
update Skia to chrome/m85 snapshot
Change-Id: I3af3517c9c213e0db8365aecd0a008d817ca4dcf
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97592
Tested-by: Jenkins
Reviewed-by: Luboš Luňák <l.lunak@collabora.com>
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 47 |
1 files changed, 47 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac index 20536adf2464..b8492f0fc343 100644 --- a/configure.ac +++ b/configure.ac @@ -6874,6 +6874,7 @@ CXXFLAGS_INTRINSICS_SSE41= CXXFLAGS_INTRINSICS_SSE42= CXXFLAGS_INTRINSICS_AVX= CXXFLAGS_INTRINSICS_AVX2= +CXXFLAGS_INTRINSICS_AVX512= CXXFLAGS_INTRINSICS_F16C= CXXFLAGS_INTRINSICS_FMA= @@ -6885,6 +6886,7 @@ if test "$GCC" = "yes" -o "$COM_IS_CLANG" = TRUE; then flag_sse42=-msse4.2 flag_avx=-mavx flag_avx2=-mavx2 + flag_avx512="-mavx512f -mavx512vl -mavx512bw -mavx512dq -mavx512cd" flag_f16c=-mf16c flag_fma=-mfma else @@ -6899,6 +6901,7 @@ else flag_sse42=-arch:SSE2 flag_avx=-arch:AVX flag_avx2=-arch:AVX2 + flag_avx512=-arch:AVX512 # These are part of -arch:AVX2 flag_f16c=-arch:AVX2 flag_fma=-arch:AVX2 @@ -7030,6 +7033,26 @@ if test "${can_compile_avx2}" = "yes" ; then CXXFLAGS_INTRINSICS_AVX2="$flag_avx2" fi +AC_MSG_CHECKING([whether $CXX can compile AVX512 intrinsics]) +AC_LANG_PUSH([C++]) +save_CXXFLAGS=$CXXFLAGS +CXXFLAGS="$CXXFLAGS $flag_avx512" +AC_COMPILE_IFELSE([AC_LANG_SOURCE([ + #include <immintrin.h> + int main () { + __m512i a = _mm512_loadu_si512(0); + return 0; + } + ])], + [can_compile_avx512=yes], + [can_compile_avx512=no]) +AC_LANG_POP([C++]) +CXXFLAGS=$save_CXXFLAGS +AC_MSG_RESULT([${can_compile_avx512}]) +if test "${can_compile_avx512}" = "yes" ; then + CXXFLAGS_INTRINSICS_AVX512="$flag_avx512" +fi + AC_MSG_CHECKING([whether $CXX can compile F16C intrinsics]) AC_LANG_PUSH([C++]) save_CXXFLAGS=$CXXFLAGS @@ -7079,6 +7102,7 @@ AC_SUBST([CXXFLAGS_INTRINSICS_SSE41]) AC_SUBST([CXXFLAGS_INTRINSICS_SSE42]) AC_SUBST([CXXFLAGS_INTRINSICS_AVX]) AC_SUBST([CXXFLAGS_INTRINSICS_AVX2]) +AC_SUBST([CXXFLAGS_INTRINSICS_AVX512]) AC_SUBST([CXXFLAGS_INTRINSICS_F16C]) AC_SUBST([CXXFLAGS_INTRINSICS_FMA]) @@ -11179,6 +11203,7 @@ CLANG_CXXFLAGS_INTRINSICS_SSE41= CLANG_CXXFLAGS_INTRINSICS_SSE42= CLANG_CXXFLAGS_INTRINSICS_AVX= CLANG_CXXFLAGS_INTRINSICS_AVX2= +CLANG_CXXFLAGS_INTRINSICS_AVX512= CLANG_CXXFLAGS_INTRINSICS_F16C= CLANG_CXXFLAGS_INTRINSICS_FMA= @@ -11235,6 +11260,7 @@ if test "$ENABLE_SKIA" = TRUE -a "$COM_IS_CLANG" != TRUE; then flag_sse42=-msse4.2 flag_avx=-mavx flag_avx2=-mavx2 + flag_avx512="-mavx512f -mavx512vl -mavx512bw -mavx512dq -mavx512cd" flag_f16c=-mf16c flag_fma=-mfma @@ -11364,6 +11390,26 @@ if test "$ENABLE_SKIA" = TRUE -a "$COM_IS_CLANG" != TRUE; then CLANG_CXXFLAGS_INTRINSICS_AVX2="$flag_avx2" fi + AC_MSG_CHECKING([whether $CXX can compile AVX512 intrinsics]) + AC_LANG_PUSH([C++]) + save_CXXFLAGS=$CXXFLAGS + CXXFLAGS="$CXXFLAGS $flag_avx512" + AC_COMPILE_IFELSE([AC_LANG_SOURCE([ + #include <immintrin.h> + int main () { + __m512i a = _mm512_loadu_si512(0); + return 0; + } + ])], + [can_compile_avx512=yes], + [can_compile_avx512=no]) + AC_LANG_POP([C++]) + CXXFLAGS=$save_CXXFLAGS + AC_MSG_RESULT([${can_compile_avx512}]) + if test "${can_compile_avx512}" = "yes" ; then + CLANG_CXXFLAGS_INTRINSICS_AVX512="$flag_avx512" + fi + AC_MSG_CHECKING([whether $CXX can compile F16C intrinsics]) AC_LANG_PUSH([C++]) save_CXXFLAGS=$CXXFLAGS @@ -11418,6 +11464,7 @@ AC_SUBST(CLANG_CXXFLAGS_INTRINSICS_SSE41) AC_SUBST(CLANG_CXXFLAGS_INTRINSICS_SSE42) AC_SUBST(CLANG_CXXFLAGS_INTRINSICS_AVX) AC_SUBST(CLANG_CXXFLAGS_INTRINSICS_AVX2) +AC_SUBST(CLANG_CXXFLAGS_INTRINSICS_AVX512) AC_SUBST(CLANG_CXXFLAGS_INTRINSICS_F16C) AC_SUBST(CLANG_CXXFLAGS_INTRINSICS_FMA) |