diff options
| author |  mtklein <mtklein@chromium.org> | 2015-12-17 10:18:04 -0800 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-12-17 10:18:04 -0800 |
| commit | f6d8d28883755d4ded224207b634a08367ee006f (patch) | |
| tree | 7be70a8655047653bf631f94e67903f9bf367bba /cmake | |
| parent | 62a627be6a7e3fdb4fe1c67de0c371a276c761f6 (diff) | |
update CMake and Google3 builds for AVX/AVX2
The _avx.cpp code was working in a degraded (SSE2/SSSE3) mode silently.
This CL will make the _avx.cpp code start using AVX.
There is currently no _avx2.cpp code, but I'm writing some now,
and this change will make it work properly from the start.
Chrome and Android builds should already be okay.
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1535443003
CQ_EXTRA_TRYBOTS=client.skia.compile:Build-Ubuntu-GCC-x86_64-Release-CMake-Trybot,Build-Mac10.9-Clang-x86_64-Release-CMake-Trybot
Review URL: https://codereview.chromium.org/1535443003
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/CMakeLists.txt | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt index 2de051b3fc..fcbce4ff5c 100644 --- a/cmake/CMakeLists.txt +++ b/cmake/CMakeLists.txt @@ -114,11 +114,15 @@ endif() remove_srcs(../src/gpu/gl/angle/*) # TODO remove_srcs(../src/codec/* ../src/android/*) # TODO: Requires Chromium's libjpeg-turbo, and incompatible giflib. -# Certain files must be compiled with support for SSSE3 or SSE4.1 intrinsics. +# Certain files must be compiled with support for SSSE3, SSE4.1, AVX, or AVX2 intrinsics. file (GLOB_RECURSE ssse3_srcs ../src/*ssse3*.cpp ../src/*SSSE3*.cpp) file (GLOB_RECURSE sse41_srcs ../src/*sse4*.cpp ../src/*SSE4*.cpp) +file (GLOB_RECURSE avx_srcs ../src/*_avx.cpp) +file (GLOB_RECURSE avx2_srcs ../src/*_avx2.cpp) set_source_files_properties(${ssse3_srcs} PROPERTIES COMPILE_FLAGS -mssse3) set_source_files_properties(${sse41_srcs} PROPERTIES COMPILE_FLAGS -msse4.1) +set_source_files_properties(${avx_srcs} PROPERTIES COMPILE_FLAGS -mavx) +set_source_files_properties(${avx2_srcs} PROPERTIES COMPILE_FLAGS -mavx2) # Detect our optional dependencies. # If we can't find them, don't build the parts of Skia that use them. |