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

remove aarch64 offline compilation

Browse Source 
The baseline compiled into Skia is now pretty much identical.

Minor diffs due to the offline code using -ffp-contract=fast, and the
baseline not.  Explicit calls to fma() are still FMAs, but we're no
longer letting the compiler uncover FMAs we didn't explicitly call out.

If this goes well, we should be able to turn on the 8-bit pipeline.

Change-Id: I8f73157cfce7373574c20f6435fe86b46477afa9
Reviewed-on: https://skia-review.googlesource.com/39520
Reviewed-by: Herb Derby <herb@google.com>
Commit-Queue: Mike Klein <mtklein@chromium.org>
This commit is contained in:
Mike Klein 2017-08-28 13:09:18 -04:00 committed by Skia Commit-Bot
parent a93a14a998
commit de67a2c0e0
3 changed files with 2 additions and 7471 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/jumper/SkJumper.cpp
View File

@ -112,13 +112,6 @@ extern "C" {
#if __has_feature(memory_sanitizer)
// We'll just run portable code.
#elif defined(__aarch64__)
StartPipelineFn ASM(start_pipeline,aarch64);
StageFn ASM(just_return,aarch64);
#define M(st) StageFn ASM(st,aarch64);
SK_RASTER_PIPELINE_STAGES(M)
#undef M
#elif defined(__arm__)
StartPipelineFn ASM(start_pipeline,vfp4);
StageFn ASM(just_return,vfp4);
@ -229,15 +222,6 @@ static SkJumper_Engine choose_engine() {
#if __has_feature(memory_sanitizer)
// We'll just run portable code.
#elif defined(__aarch64__)
return {
#define M(stage) ASM(stage, aarch64),
{ SK_RASTER_PIPELINE_STAGES(M) },
M(start_pipeline)
M(just_return)
#undef M
};
#elif defined(__arm__)
if (1 && SkCpu::Supports(SkCpu::NEON|SkCpu::NEON_FMA|SkCpu::VFP_FP16)) {
return {

7439
src/jumper/SkJumper_generated.S
View File

File diff suppressed because it is too large Load Diff

18
src/jumper/build_stages.py
View File

@ -102,17 +102,6 @@ subprocess.check_call(['ld', '-r', '-o', 'win_merged.o',
'win_hsw.o', 'win_avx.o', 'win_sse41.o', 'win_sse2.o',
'win_8bit_hsw.o', 'win_8bit_sse41.o', 'win_8bit_sse2.o'])
# iOS disallows the use of register x18,
# so we need to use it as a least-common denominator.
aarch64 = [ '--target=arm64-apple-ios' ]
subprocess.check_call(clang + cflags + aarch64 +
['-c', stages] +
['-o', 'aarch64.o'])
# TODO: need to work out relocations (adrp, lCPI, etc.)
#subprocess.check_call(clang + cflags + aarch64 +
# ['-c', stages_8bit] +
# ['-o', '8bit_aarch64.o'])
vfp4 = [
'--target=armv7a-linux-gnueabihf',
'-mfpu=neon-vfpv4',
@ -232,12 +221,7 @@ print ' #define BALIGN32 .balign 32'
print '#endif'
print '.text'
print '#if defined(__aarch64__)'
print 'BALIGN4'
parse_object_file( 'aarch64.o', '.long')
#parse_object_file('8bit_aarch64.o', '.long')
print '#elif defined(__arm__)'
print '#if defined(__arm__)'
print 'BALIGN4'
parse_object_file( 'vfp4.o', '.long', target='elf32-littlearm')
#parse_object_file('8bit_vfp4.o', '.long', target='elf32-littlearm')