AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Revert of Enable the SSSE3 compile time check on all platforms. (https://codereview.chromium.org/403583002/)

Browse Source 
Reason for revert:
This is blocking the roll. Chromium Windows trybots (like win_chromium_x64_rel) are crashing in the SSSE3 code (for example SkCanvasVideoRenderTest.CroppedFrame).

Original issue's description:
> Enable the SSSE3 compile time check on all platforms (3rd attempt)
>
> BUG=skia:2746
>
> Committed: https://skia.googlesource.com/skia/+/933834851f9d48fbd85b728cc92e1f0134bfaa4e

R=halcanary@google.com, mtklein@google.com, djsollen@google.com
TBR=djsollen@google.com, halcanary@google.com, mtklein@google.com
NOTREECHECKS=true
NOTRY=true
BUG=skia:2746

Author: bungeman@google.com

Review URL: https://codereview.chromium.org/418523002
This commit is contained in:
bungeman 2014-07-23 11:28:18 -07:00 committed by Commit bot
parent ddb459e746
commit 2da0f85488
4 changed files with 37 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gyp/common_conditions.gypi
View File

@ -646,11 +646,6 @@
'-fuse-ld=gold',
],
'conditions': [
[ 'skia_arch_type == "x86"', {
'cflags': [
'-mssse3',
],
}],
[ 'skia_android_framework', {
'libraries!': [
'-lstdc++',

48
gyp/opts.gyp
View File

@ -188,20 +188,19 @@
'../src/core',
'../src/utils',
],
'sources': [
'../src/opts/SkBitmapProcState_opts_SSSE3.cpp',
],
'conditions': [
[ 'skia_os == "win"', {
'defines' : [ 'SK_CPU_SSE_LEVEL=31' ],
}],
# (Mac has -mssse3 globally.)
[ 'skia_os in ["linux", "freebsd", "openbsd", "solaris", "nacl", "chromeos", "android"] \
and not skia_android_framework', {
'cflags': [
'-mssse3',
],
}],
# (Mac has -mssse3 globally.)
[ 'skia_arch_type == "x86"', {
'sources': [
'../src/opts/SkBitmapProcState_opts_SSSE3.cpp',
],
}],
],
},
# For the same lame reasons as what is done for skia_opts, we also have to
@ -221,6 +220,24 @@
'../src/core',
'../src/utils',
],
'conditions': [
[ 'skia_os in ["linux", "freebsd", "openbsd", "solaris", "nacl", "chromeos", "android"] \
and not skia_android_framework', {
'cflags': [
'-msse4',
],
}],
[ 'skia_os == "mac"', {
'xcode_settings': {
'OTHER_CPLUSPLUSFLAGS!': [
'-mssse3',
],
'OTHER_CPLUSPLUSFLAGS': [
'-msse4',
],
},
}],
[ 'skia_arch_type == "x86"', {
'sources': [
'../src/opts/SkBlurImage_opts_SSE4.cpp',
],
@ -235,25 +252,8 @@
'../src/opts/SkBlitRow_opts_SSE4_asm.S',
],
}],
[ 'skia_os == "win"', {
'defines' : [ 'SK_CPU_SSE_LEVEL=41' ],
}],
[ 'skia_os in ["linux", "freebsd", "openbsd", "solaris", "nacl", "chromeos", "android"] \
and not skia_android_framework', {
'cflags': [
'-msse4.1',
],
}],
[ 'skia_os == "mac"', {
'xcode_settings': {
'OTHER_CPLUSPLUSFLAGS!': [
'-mssse3',
],
'OTHER_CPLUSPLUSFLAGS': [
'-msse4.1',
],
},
}],
],
},
# NEON code must be compiled with -mfpu=neon which also affects scalar

11
src/opts/SkBitmapProcState_opts_SSSE3.cpp
View File

@ -9,11 +9,12 @@
#include "SkPaint.h"
#include "SkUtils.h"
/* With the exception of the compilers that don't support it, we always build the
* SSSE3 functions and enable the caller to determine SSSE3 support. However for
* compilers that do not support SSSE3 we provide a stub implementation.
/* With the exception of the Android framework we always build the SSSE3 functions
* and enable the caller to determine SSSE3 support. However for the Android framework
* if the device does not support SSSE3 then the compiler will not supply the required
* -mssse3 option needed to build this file, so instead we provide a stub implementation.
*/
#if SK_CPU_SSE_LEVEL >= SK_CPU_SSE_LEVEL_SSSE3
#if !defined(SK_BUILD_FOR_ANDROID_FRAMEWORK) || SK_CPU_SSE_LEVEL >= SK_CPU_SSE_LEVEL_SSSE3
#include <tmmintrin.h> // SSSE3
@ -731,7 +732,7 @@ void S32_alpha_D32_filter_DXDY_SSSE3(const SkBitmapProcState& s,
S32_generic_D32_filter_DXDY_SSSE3<true>(s, xy, count, colors);
}
#else // SK_CPU_SSE_LEVEL >= SK_CPU_SSE_LEVEL_SSSE3
#else // !defined(SK_BUILD_FOR_ANDROID_FRAMEWORK) || SK_CPU_SSE_LEVEL >= SK_CPU_SSE_LEVEL_SSSE3
void S32_opaque_D32_filter_DX_SSSE3(const SkBitmapProcState& s,
const uint32_t* xy,

11
src/opts/SkBlurImage_opts_SSE4.cpp
View File

@ -10,11 +10,12 @@
#include "SkColorPriv.h"
#include "SkRect.h"
/* With the exception of the compilers that don't support it, we always build the
* SSE4 functions and enable the caller to determine SSE4 support. However for
* compilers that do not support SSE4x we provide a stub implementation.
/* With the exception of the Android framework we always build the SSE4 functions
* and enable the caller to determine SSE4 support. However, for the Android framework,
* if the device does not support SSE4x then the compiler will not supply the required
* -msse4* option needed to build this file, so instead we provide a stub implementation.
*/
#if SK_CPU_SSE_LEVEL >= SK_CPU_SSE_LEVEL_SSE41
#if !defined(SK_BUILD_FOR_ANDROID_FRAMEWORK) || SK_CPU_SSE_LEVEL >= SK_CPU_SSE_LEVEL_SSE41
#include <smmintrin.h>
@ -109,7 +110,7 @@ bool SkBoxBlurGetPlatformProcs_SSE4(SkBoxBlurProc* boxBlurX,
return true;
}
#else // SK_CPU_SSE_LEVEL >= SK_CPU_SSE_LEVEL_SSE41
#else // !defined(SK_BUILD_FOR_ANDROID_FRAMEWORK) || SK_CPU_SSE_LEVEL >= SK_CPU_SSE_LEVEL_SSE41
bool SkBoxBlurGetPlatformProcs_SSE4(SkBoxBlurProc* boxBlurX,
SkBoxBlurProc* boxBlurY,