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

Revert of GYP groudwork for half-float opts support. (patchset #1 id:1 of https://codereview.chromium.org/915693002/)

Browse Source 
Reason for revert:
Going to punt on 16-bit float support for now.  Can't figure out ARM 64.

Original issue's description:
> GYP groudwork for half-float opts support.
>
> This sets us up two new opts targets with the immediate goal of adding half-float (SkHalf.h) opts:
>   - opts_neon_fp16: uses hardware support on most ARM chips with NEON to do 4 conversions at a time;
>   - opts_avx: uses hardware support on Intel chips with AVX to do 8 conversions at a time.
>
> opts_avx will be a handy thing to have around later too, especially if we want to work with floats.
>
> This doesn't actually add any new source files to these libraries yet, so they're no-ops for now.
> I'll need to write a parallel change to Chrome's GN and GYPs before we can start adding sources.
>
> This also rolls GYP up to head, to get suppport for EnableEnhancedInstructionSet: '3' on Windows,
> which is how we turn on AVX there.  There's no Mac-specific flag, so we use OTHER_CPLUSPLUSFLAGS.
>
> BUG=skia:
>
> TBR=reed@google.com
>
> Committed: https://skia.googlesource.com/skia/+/46b80833394d7919cadf2abf2b93802141dd21c5

TBR=reed@google.com,mtklein@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=skia:

Review URL: https://codereview.chromium.org/912223002
This commit is contained in:
mtklein 2015-02-10 18:18:18 -08:00 committed by Commit bot
parent 94aca69d1e
commit d160192fd9
3 changed files with 2 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
DEPS
View File

@ -11,7 +11,7 @@ deps = {
"third_party/externals/angle2" : "https://chromium.googlesource.com/angle/angle.git@53c1a456a1886d9020d0cea81e0059f7e8caeb66",
"third_party/externals/freetype" : "https://skia.googlesource.com/third_party/freetype2.git@VER-2-5-0-1",
"third_party/externals/gyp" : "https://chromium.googlesource.com/external/gyp.git@67000714d51ea081a2661d4c40d7034d42341472",
"third_party/externals/gyp" : "https://chromium.googlesource.com/external/gyp.git@f1c42f73e4cc2912460aab113f9cd31ee3fafd38",
"third_party/externals/harfbuzz": "https://skia.googlesource.com/third_party/harfbuzz.git@0.9.35",
"third_party/externals/jsoncpp" : "https://chromium.googlesource.com/external/jsoncpp/jsoncpp.git@1afff032c83e26ddf7f2776e8b43de5ad666c1fa",
"third_party/externals/libjpeg" : "https://chromium.googlesource.com/chromium/deps/libjpeg_turbo.git@82ce8a6d4ebe12a177c0c3597192f2b4f09e81c3",

45
gyp/opts.gyp
View File

@ -28,7 +28,7 @@
'conditions': [
[ 'skia_arch_type == "x86" and skia_os != "ios"', {
'cflags': [ '-msse2' ],
'dependencies': [ 'opts_ssse3', 'opts_sse41', 'opts_avx' ],
'dependencies': [ 'opts_ssse3', 'opts_sse41' ],
'sources': [ '<@(sse2_sources)' ],
}],
@ -55,7 +55,6 @@
'cflags': [ '-fomit-frame-pointer' ],
'variables': { 'arm_neon_optional%': '<(arm_neon_optional>' },
'sources': [ '<@(armv7_sources)' ],
'dependencies': [ 'opts_neon_fp16' ],
'conditions': [
[ 'arm_neon == 1 or arm_neon_optional == 1', {
'dependencies': [ 'opts_neon' ]
@ -120,26 +119,6 @@
}],
],
},
{
'target_name': 'opts_avx',
'product_name': 'skia_opts_avx',
'type': 'static_library',
'standalone_static_library': 1,
'dependencies': [ 'core.gyp:*' ],
'sources': [ '<@(avx_sources)' ],
'conditions': [
[ 'skia_os == "win"', {
'defines' : [ 'SK_CPU_SSE_LEVEL=50' ],
'msvs_settings': { 'VCCLCompilerTool': { 'EnabledEnhancedInstructionSet': '3' } },
}],
[ 'not skia_android_framework', {
'cflags': [ '-mavx' ],
}],
[ 'skia_os == "mac"', {
'xcode_settings': { 'OTHER_CPLUSPLUSFLAGS': [ '-mavx' ] },
}],
],
},
{
'target_name': 'opts_neon',
'product_name': 'skia_opts_neon',
@ -174,27 +153,5 @@
'-Wl,--fix-cortex-a8',
],
},
{
'target_name': 'opts_neon_fp16',
'product_name': 'skia_opts_neon_fp16',
'type': 'static_library',
'standalone_static_library': 1,
'dependencies': [ 'core.gyp:*' ],
'include_dirs': [ '../src/core' ],
'sources': [ '<@(neon_fp16_sources)' ],
'conditions': [
[ 'not skia_android_framework', {
'cflags': [
'-mfpu=neon-fp16',
'-mfp16-format=ieee',
'-fomit-frame-pointer',
],
}],
],
'ldflags': [
'-march=armv7-a',
'-Wl,--fix-cortex-a8',
],
},
],
}

4
gyp/opts.gypi
View File

@ -33,8 +33,6 @@
'<(skia_src_path)/opts/memset16_neon.S',
'<(skia_src_path)/opts/memset32_neon.S',
],
'neon_fp16_sources': [
],
'arm64_sources': [
'<(skia_src_path)/opts/SkBitmapProcState_arm_neon.cpp',
'<(skia_src_path)/opts/SkBitmapProcState_matrixProcs_neon.cpp',
@ -83,6 +81,4 @@
'<(skia_src_path)/opts/SkBlurImage_opts_SSE4.cpp',
'<(skia_src_path)/opts/SkBlitRow_opts_SSE4.cpp',
],
'avx_sources': [
],
}