Attachment #776105 for bug #838373

View | Details | Raw Unified | Return to bug 838373
Collapse All | Expand All




    ]
if CONFIG['INTEL_ARCHITECTURE']:
    SOURCES += [
#        'skia/src/opts/SkOpts_avx.cpp',
#        'skia/src/opts/SkOpts_hsw.cpp',
#        'skia/src/opts/SkOpts_sse41.cpp',
#        'skia/src/opts/SkOpts_sse42.cpp',
        'skia/src/opts/SkOpts_ssse3.cpp',
    ]
#    SOURCES['skia/src/opts/SkOpts_avx.cpp'].flags += skia_opt_flags
#    SOURCES['skia/src/opts/SkOpts_hsw.cpp'].flags += skia_opt_flags
#    SOURCES['skia/src/opts/SkOpts_sse41.cpp'].flags += skia_opt_flags
#    SOURCES['skia/src/opts/SkOpts_sse42.cpp'].flags += skia_opt_flags
    SOURCES['skia/src/opts/SkOpts_ssse3.cpp'].flags += skia_opt_flags
elif CONFIG['CPU_ARCH'] == 'aarch64':
    SOURCES += [


if CONFIG['INTEL_ARCHITECTURE']:
    SOURCES['skia/src/opts/SkOpts_ssse3.cpp'].flags += ['-mssse3']
#    SOURCES['skia/src/opts/SkOpts_sse41.cpp'].flags += ['-msse4.1']
#    SOURCES['skia/src/opts/SkOpts_sse42.cpp'].flags += ['-msse4.2']
#    SOURCES['skia/src/opts/SkOpts_avx.cpp'].flags += ['-mavx']
#    SOURCES['skia/src/opts/SkOpts_hsw.cpp'].flags += ['-mavx2', '-mf16c', '-mfma']
elif CONFIG['CPU_ARCH'] == 'arm' and CONFIG['CC_TYPE'] in ('clang', 'gcc'):
    CXXFLAGS += CONFIG['NEON_FLAGS']
elif CONFIG['CPU_ARCH'] == 'aarch64' and CONFIG['CC_TYPE'] in ('clang', 'gcc'):




#ifndef SK_CPU_SSE_LEVEL
    // These checks must be done in descending order to ensure we set the highest
    // available SSE level.
    #if defined(__SSSE3__)
        #define SK_CPU_SSE_LEVEL    SK_CPU_SSE_LEVEL_AVX512
    #elif defined(__AVX2__)
        #define SK_CPU_SSE_LEVEL    SK_CPU_SSE_LEVEL_AVX2
    #elif defined(__AVX__)
        #define SK_CPU_SSE_LEVEL    SK_CPU_SSE_LEVEL_AVX
    #elif defined(__SSE4_2__)
        #define SK_CPU_SSE_LEVEL    SK_CPU_SSE_LEVEL_SSE42
    #elif defined(__SSE4_1__)
        #define SK_CPU_SSE_LEVEL    SK_CPU_SSE_LEVEL_SSE41
    #elif defined(__SSSE3__)
        #define SK_CPU_SSE_LEVEL    SK_CPU_SSE_LEVEL_SSSE3
    #elif defined(__SSE3__)
        #define SK_CPU_SSE_LEVEL    SK_CPU_SSE_LEVEL_SSE3




    #else
        #define SK_OPTS_NS neon
    #endif
#elif SK_CPU_SSE_LEVEL >= SK_CPU_SSE_LEVEL_AVX2
    #define SK_OPTS_NS avx2
#elif SK_CPU_SSE_LEVEL >= SK_CPU_SSE_LEVEL_AVX
    #define SK_OPTS_NS avx
#elif SK_CPU_SSE_LEVEL >= SK_CPU_SSE_LEVEL_SSE42
    #define SK_OPTS_NS sse42
#elif SK_CPU_SSE_LEVEL >= SK_CPU_SSE_LEVEL_SSE41
    #define SK_OPTS_NS sse41
#elif SK_CPU_SSE_LEVEL >= SK_CPU_SSE_LEVEL_SSSE3
    #define SK_OPTS_NS ssse3
#elif SK_CPU_SSE_LEVEL >= SK_CPU_SSE_LEVEL_SSE3


    // Each Init_foo() is defined in src/opts/SkOpts_foo.cpp.
    void Init_ssse3();
    //void Init_sse41();
    //void Init_sse42();
    //void Init_avx();
    //void Init_hsw();
    //void Init_crc32();

    static void init() {
#if !defined(SK_BUILD_NO_OPTS)

            if (SkCpu::Supports(SkCpu::SSSE3)) { Init_ssse3(); }
        #endif

   #elif defined(SK_CPU_ARM64)
            if (SkCpu::Supports(SkCpu::SSE41)) { Init_sse41(); }
        #endif

        #if SK_CPU_SSE_LEVEL < SK_CPU_SSE_LEVEL_SSE42
            if (SkCpu::Supports(SkCpu::SSE42)) { Init_sse42(); }
        #endif

        #if SK_CPU_SSE_LEVEL < SK_CPU_SSE_LEVEL_AVX
            if (SkCpu::Supports(SkCpu::AVX)) { Init_avx();   }
            if (SkCpu::Supports(SkCpu::HSW)) { Init_hsw();   }
        #endif

        if (SkCpu::Supports(SkCpu::HSW  )) { Init_hsw();   }

    #elif defined(SK_CPU_ARM64)
        if (SkCpu::Supports(SkCpu::CRC32)) { Init_crc32(); }

    #endif

Return to bug 838373

Lines 117-133 Link Here

(-)aaa/gfx/skia/skia/include/core/SkPreConfig.h (-11 / +1 lines)
117	#ifndef SK_CPU_SSE_LEVEL	117	#ifndef SK_CPU_SSE_LEVEL
118	// These checks must be done in descending order to ensure we set the highest	118	// These checks must be done in descending order to ensure we set the highest
119	// available SSE level.	119	// available SSE level.
120	#if defined(__AVX512F__)	120	#if defined(__SSSE3__)
121	#define SK_CPU_SSE_LEVEL SK_CPU_SSE_LEVEL_AVX512
122	#elif defined(__AVX2__)
123	#define SK_CPU_SSE_LEVEL SK_CPU_SSE_LEVEL_AVX2
124	#elif defined(__AVX__)
125	#define SK_CPU_SSE_LEVEL SK_CPU_SSE_LEVEL_AVX
126	#elif defined(__SSE4_2__)
127	#define SK_CPU_SSE_LEVEL SK_CPU_SSE_LEVEL_SSE42
128	#elif defined(__SSE4_1__)
129	#define SK_CPU_SSE_LEVEL SK_CPU_SSE_LEVEL_SSE41
130	#elif defined(__SSSE3__)
131	#define SK_CPU_SSE_LEVEL SK_CPU_SSE_LEVEL_SSSE3	121	#define SK_CPU_SSE_LEVEL SK_CPU_SSE_LEVEL_SSSE3
132	#elif defined(__SSE3__)	122	#elif defined(__SSE3__)
133	#define SK_CPU_SSE_LEVEL SK_CPU_SSE_LEVEL_SSE3	123	#define SK_CPU_SSE_LEVEL SK_CPU_SSE_LEVEL_SSE3

Lines 16-29 Link Here

(-)aaa/gfx/skia/skia/src/core/SkOpts.cpp (-29 / +6 lines)
16	#else	16	#else
17	#define SK_OPTS_NS neon	17	#define SK_OPTS_NS neon
18	#endif	18	#endif
19	#elif SK_CPU_SSE_LEVEL >= SK_CPU_SSE_LEVEL_AVX2
20	#define SK_OPTS_NS avx2
21	#elif SK_CPU_SSE_LEVEL >= SK_CPU_SSE_LEVEL_AVX
22	#define SK_OPTS_NS avx
23	#elif SK_CPU_SSE_LEVEL >= SK_CPU_SSE_LEVEL_SSE42
24	#define SK_OPTS_NS sse42
25	#elif SK_CPU_SSE_LEVEL >= SK_CPU_SSE_LEVEL_SSE41
26	#define SK_OPTS_NS sse41
27	#elif SK_CPU_SSE_LEVEL >= SK_CPU_SSE_LEVEL_SSSE3	19	#elif SK_CPU_SSE_LEVEL >= SK_CPU_SSE_LEVEL_SSSE3
28	#define SK_OPTS_NS ssse3	20	#define SK_OPTS_NS ssse3
29	#elif SK_CPU_SSE_LEVEL >= SK_CPU_SSE_LEVEL_SSE3	21	#elif SK_CPU_SSE_LEVEL >= SK_CPU_SSE_LEVEL_SSE3
Lines 108-118 Link Here
108		100
109	// Each Init_foo() is defined in src/opts/SkOpts_foo.cpp.	101	// Each Init_foo() is defined in src/opts/SkOpts_foo.cpp.
110	void Init_ssse3();	102	void Init_ssse3();
111	void Init_sse41();	103	//void Init_sse41();
112	void Init_sse42();	104	//void Init_sse42();
113	void Init_avx();	105	//void Init_avx();
114	void Init_hsw();	106	//void Init_hsw();
115	void Init_crc32();	107	//void Init_crc32();
116		108
117	static void init() {	109	static void init() {
118	#if !defined(SK_BUILD_NO_OPTS)	110	#if !defined(SK_BUILD_NO_OPTS)
Lines 121-142 Link Here
121	if (SkCpu::Supports(SkCpu::SSSE3)) { Init_ssse3(); }	113	if (SkCpu::Supports(SkCpu::SSSE3)) { Init_ssse3(); }
122	#endif	114	#endif
123		115
124	#if SK_CPU_SSE_LEVEL < SK_CPU_SSE_LEVEL_SSE41	116	#elif defined(SK_CPU_ARM64)
125	if (SkCpu::Supports(SkCpu::SSE41)) { Init_sse41(); }
126	#endif
127
128	#if SK_CPU_SSE_LEVEL < SK_CPU_SSE_LEVEL_SSE42
129	if (SkCpu::Supports(SkCpu::SSE42)) { Init_sse42(); }
130	#endif
131
132	#if SK_CPU_SSE_LEVEL < SK_CPU_SSE_LEVEL_AVX
133	if (SkCpu::Supports(SkCpu::AVX)) { Init_avx(); }
134	if (SkCpu::Supports(SkCpu::HSW)) { Init_hsw(); }
135	#endif
136
137	if (SkCpu::Supports(SkCpu::HSW )) { Init_hsw(); }
138
139	#elif defined(SK_CPU_ARM64)
140	if (SkCpu::Supports(SkCpu::CRC32)) { Init_crc32(); }	117	if (SkCpu::Supports(SkCpu::CRC32)) { Init_crc32(); }
141		118
142	#endif	119	#endif

Lines 412-427 Link Here

(-)aaa/gfx/skia/moz.build (-12 / +12 lines)
412	]	412	]
413	if CONFIG['INTEL_ARCHITECTURE']:	413	if CONFIG['INTEL_ARCHITECTURE']:
414	SOURCES += [	414	SOURCES += [
415	'skia/src/opts/SkOpts_avx.cpp',	415	# 'skia/src/opts/SkOpts_avx.cpp',
416	'skia/src/opts/SkOpts_hsw.cpp',	416	# 'skia/src/opts/SkOpts_hsw.cpp',
417	'skia/src/opts/SkOpts_sse41.cpp',	417	# 'skia/src/opts/SkOpts_sse41.cpp',
418	'skia/src/opts/SkOpts_sse42.cpp',	418	# 'skia/src/opts/SkOpts_sse42.cpp',
419	'skia/src/opts/SkOpts_ssse3.cpp',	419	'skia/src/opts/SkOpts_ssse3.cpp',
420	]	420	]
421	SOURCES['skia/src/opts/SkOpts_avx.cpp'].flags += skia_opt_flags	421	# SOURCES['skia/src/opts/SkOpts_avx.cpp'].flags += skia_opt_flags
422	SOURCES['skia/src/opts/SkOpts_hsw.cpp'].flags += skia_opt_flags	422	# SOURCES['skia/src/opts/SkOpts_hsw.cpp'].flags += skia_opt_flags
423	SOURCES['skia/src/opts/SkOpts_sse41.cpp'].flags += skia_opt_flags	423	# SOURCES['skia/src/opts/SkOpts_sse41.cpp'].flags += skia_opt_flags
424	SOURCES['skia/src/opts/SkOpts_sse42.cpp'].flags += skia_opt_flags	424	# SOURCES['skia/src/opts/SkOpts_sse42.cpp'].flags += skia_opt_flags
425	SOURCES['skia/src/opts/SkOpts_ssse3.cpp'].flags += skia_opt_flags	425	SOURCES['skia/src/opts/SkOpts_ssse3.cpp'].flags += skia_opt_flags
426	elif CONFIG['CPU_ARCH'] == 'aarch64':	426	elif CONFIG['CPU_ARCH'] == 'aarch64':
427	SOURCES += [	427	SOURCES += [
Lines 451-460 Link Here
451		451
452	if CONFIG['INTEL_ARCHITECTURE']:	452	if CONFIG['INTEL_ARCHITECTURE']:
453	SOURCES['skia/src/opts/SkOpts_ssse3.cpp'].flags += ['-mssse3']	453	SOURCES['skia/src/opts/SkOpts_ssse3.cpp'].flags += ['-mssse3']
454	SOURCES['skia/src/opts/SkOpts_sse41.cpp'].flags += ['-msse4.1']	454	# SOURCES['skia/src/opts/SkOpts_sse41.cpp'].flags += ['-msse4.1']
455	SOURCES['skia/src/opts/SkOpts_sse42.cpp'].flags += ['-msse4.2']	455	# SOURCES['skia/src/opts/SkOpts_sse42.cpp'].flags += ['-msse4.2']
456	SOURCES['skia/src/opts/SkOpts_avx.cpp'].flags += ['-mavx']	456	# SOURCES['skia/src/opts/SkOpts_avx.cpp'].flags += ['-mavx']
457	SOURCES['skia/src/opts/SkOpts_hsw.cpp'].flags += ['-mavx2', '-mf16c', '-mfma']	457	# SOURCES['skia/src/opts/SkOpts_hsw.cpp'].flags += ['-mavx2', '-mf16c', '-mfma']
458	elif CONFIG['CPU_ARCH'] == 'arm' and CONFIG['CC_TYPE'] in ('clang', 'gcc'):	458	elif CONFIG['CPU_ARCH'] == 'arm' and CONFIG['CC_TYPE'] in ('clang', 'gcc'):
459	CXXFLAGS += CONFIG['NEON_FLAGS']	459	CXXFLAGS += CONFIG['NEON_FLAGS']
460	elif CONFIG['CPU_ARCH'] == 'aarch64' and CONFIG['CC_TYPE'] in ('clang', 'gcc'):	460	elif CONFIG['CPU_ARCH'] == 'aarch64' and CONFIG['CC_TYPE'] in ('clang', 'gcc'):