wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 832390 - Enable arm optimization with libpng version 1.6.7. r=glandium

Browse Source
This commit is contained in:
Glenn Randers-Pehrson 2013-12-20 11:37:47 -05:00
parent 87568c071a
commit f24970936b
9 changed files with 543 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
configure.in
View File

@ -3812,6 +3812,7 @@ if test "${BZ2_DIR}" -a -d "${BZ2_DIR}" -a "$MOZ_NATIVE_BZ2" = 1; then
MOZ_BZ2_LIBS="-L${BZ2_DIR}/lib ${MOZ_BZ2_LIBS}"
fi
dnl ========================================================
dnl system PNG Support
dnl ========================================================
MOZ_ARG_WITH_STRING(system-png,
@ -3856,10 +3857,37 @@ if test "${PNG_DIR}" -a -d "${PNG_DIR}" -a "$MOZ_NATIVE_PNG" = 1; then
MOZ_PNG_LIBS="-L${PNG_DIR}/lib ${MOZ_PNG_LIBS}"
fi
MOZ_PNG_ARM_NEON_CHECK=
if test "$MOZ_NATIVE_PNG" != 1 -a "$CPU_ARCH" = "arm" ; then
MOZ_ARG_ENABLE_STRING(png-arm-neon-support,
[ --enable-png-arm-neon-support=TYPE
Options include:
no
check (default)
nocheck (faster but unsafe)],
[MOZ_PNG_ARM_NEON_SUPPORT=$enableval ] )
case "$MOZ_PNG_ARM_NEON_SUPPORT" in
no)
# enable-png-arm-neon-support = no
;;
nocheck)
# enable-png-arm-neon-support = nocheck
MOZ_PNG_ARM_NEON=1
;;
*)
MOZ_PNG_ARM_NEON=1
MOZ_PNG_ARM_NEON_CHECK=1
;;
esac
fi
AC_SUBST(MOZ_PNG_ARM_NEON_CHECK)
fi # SKIP_LIBRARY_CHECKS
AC_SUBST(MOZ_PNG_ARM_NEON)
dnl ========================================================
dnl system HunSpell Support
dnl ========================================================
MOZ_ARG_ENABLE_BOOL(system-hunspell,

2
media/libpng/MOZCHANGES
View File

@ -1,6 +1,8 @@
Changes made to pristine png source by mozilla.org developers.
2013/12/11 -- Enable ARM support (bug #832390).
2013/11/17 -- Synced with libpng-1.6.7 (bug #938740).
2013/09/21 -- Synced with libpng-1.6.6 (bug #886499).

406
media/libpng/arm/MOZ_PNG_cpu-features.c Normal file
View File

@ -0,0 +1,406 @@
/*
* Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
*
* Use of this source code is governed by a BSD-style license
* that can be found in the LICENSE file in the root of the source
* tree. An additional intellectual property rights grant can be found
* in the file PATENTS. All contributing project authors may
* be found in the AUTHORS file in the root of the source tree.
*/
/* This is a copy of webrtc/system_wrappers/source/android/cpu-features.c
* with name changed to MOZ_PNG_cpu-features.c, exported symbols prefixed
* with "MOZ_PNG_", and cpufeatures.h changed to a local file with MOZ_PNG
* prefix.
*/
#ifdef __ANDROID__
#include <sys/system_properties.h>
#ifdef __arm__
#include <machine/cpu-features.h>
#endif
#include <errno.h>
#include <fcntl.h>
#include <pthread.h>
#include <stdio.h>
#include <stdlib.h>
/* Was #include "webrtc/system_wrappers/source/android/cpu-features.h" */
#include "MOZ_PNG_cpu-features.h"
static pthread_once_t g_once;
static AndroidCpuFamily g_cpuFamily;
static uint64_t g_cpuFeatures;
static int g_cpuCount;
static const int android_cpufeatures_debug = 0;
#ifdef __arm__
# define DEFAULT_CPU_FAMILY ANDROID_CPU_FAMILY_ARM
#elif defined __i386__
# define DEFAULT_CPU_FAMILY ANDROID_CPU_FAMILY_X86
#else
# define DEFAULT_CPU_FAMILY ANDROID_CPU_FAMILY_UNKNOWN
#endif
#define D(...) \
do { \
if (android_cpufeatures_debug) { \
printf(__VA_ARGS__); fflush(stdout); \
} \
} while (0)
#ifdef __i386__
static __inline__ void x86_cpuid(int func, int values[4])
{
int a, b, c, d;
/* We need to preserve ebx since we're compiling PIC code */
/* this means we can't use "=b" for the second output register */
__asm__ __volatile__ ( \
"push %%ebx\n"
"cpuid\n" \
"mov %1, %%ebx\n"
"pop %%ebx\n"
: "=a" (a), "=r" (b), "=c" (c), "=d" (d) \
: "a" (func) \
);
values[0] = a;
values[1] = b;
values[2] = c;
values[3] = d;
}
#endif
/* Read the content of /proc/cpuinfo into a user-provided buffer.
* Return the length of the data, or -1 on error. Does *not*
* zero-terminate the content. Will not read more
* than 'buffsize' bytes.
*/
static int
read_file(const char* pathname, char* buffer, size_t buffsize)
{
int fd, len;
fd = open(pathname, O_RDONLY);
if (fd < 0)
return -1;
do {
len = read(fd, buffer, buffsize);
} while (len < 0 && errno == EINTR);
close(fd);
return len;
}
/* Extract the content of a the first occurence of a given field in
* the content of /proc/cpuinfo and return it as a heap-allocated
* string that must be freed by the caller.
*
* Return NULL if not found
*/
static char*
extract_cpuinfo_field(char* buffer, int buflen, const char* field)
{
int fieldlen = strlen(field);
char* bufend = buffer + buflen;
char* result = NULL;
int len, ignore;
const char *p, *q;
/* Look for first field occurence, and ensures it starts the line.
*/
p = buffer;
bufend = buffer + buflen;
for (;;) {
p = memmem(p, bufend-p, field, fieldlen);
if (p == NULL)
goto EXIT;
if (p == buffer || p[-1] == '\n')
break;
p += fieldlen;
}
/* Skip to the first column followed by a space */
p += fieldlen;
p = memchr(p, ':', bufend-p);
if (p == NULL || p[1] != ' ')
goto EXIT;
/* Find the end of the line */
p += 2;
q = memchr(p, '\n', bufend-p);
if (q == NULL)
q = bufend;
/* Copy the line into a heap-allocated buffer */
len = q-p;
result = malloc(len+1);
if (result == NULL)
goto EXIT;
memcpy(result, p, len);
result[len] = '\0';
EXIT:
return result;
}
/* Count the number of occurences of a given field prefix in /proc/cpuinfo.
*/
static int
count_cpuinfo_field(char* buffer, int buflen, const char* field)
{
int fieldlen = strlen(field);
const char* p = buffer;
const char* bufend = buffer + buflen;
const char* q;
int count = 0;
for (;;) {
const char* q;
p = memmem(p, bufend-p, field, fieldlen);
if (p == NULL)
break;
/* Ensure that the field is at the start of a line */
if (p > buffer && p[-1] != '\n') {
p += fieldlen;
continue;
}
/* skip any whitespace */
q = p + fieldlen;
while (q < bufend && (*q == ' ' || *q == '\t'))
q++;
/* we must have a colon now */
if (q < bufend && *q == ':') {
count += 1;
q ++;
}
p = q;
}
return count;
}
/* Like strlen(), but for constant string literals */
#define STRLEN_CONST(x) ((sizeof(x)-1)
/* Checks that a space-separated list of items contains one given 'item'.
* Returns 1 if found, 0 otherwise.
*/
static int
has_list_item(const char* list, const char* item)
{
const char* p = list;
int itemlen = strlen(item);
if (list == NULL)
return 0;
while (*p) {
const char* q;
/* skip spaces */
while (*p == ' ' || *p == '\t')
p++;
/* find end of current list item */
q = p;
while (*q && *q != ' ' && *q != '\t')
q++;
if (itemlen == q-p && !memcmp(p, item, itemlen))
return 1;
/* skip to next item */
p = q;
}
return 0;
}
static void
android_cpuInit(void)
{
char cpuinfo[4096];
int cpuinfo_len;
g_cpuFamily = DEFAULT_CPU_FAMILY;
g_cpuFeatures = 0;
g_cpuCount = 1;
cpuinfo_len = read_file("/proc/cpuinfo", cpuinfo, sizeof cpuinfo);
D("cpuinfo_len is (%d):\n%.*s\n", cpuinfo_len,
cpuinfo_len >= 0 ? cpuinfo_len : 0, cpuinfo);
if (cpuinfo_len < 0) /* should not happen */ {
return;
}
/* Count the CPU cores, the value may be 0 for single-core CPUs */
g_cpuCount = count_cpuinfo_field(cpuinfo, cpuinfo_len, "processor");
if (g_cpuCount == 0) {
g_cpuCount = count_cpuinfo_field(cpuinfo, cpuinfo_len, "Processor");
if (g_cpuCount == 0) {
g_cpuCount = 1;
}
}
D("found cpuCount = %d\n", g_cpuCount);
#ifdef __ARM_ARCH__
{
char* features = NULL;
char* architecture = NULL;
/* Extract architecture from the "CPU Architecture" field.
* The list is well-known, unlike the the output of
* the 'Processor' field which can vary greatly.
*
* See the definition of the 'proc_arch' array in
* $KERNEL/arch/arm/kernel/setup.c and the 'c_show' function in
* same file.
*/
char* cpuArch = extract_cpuinfo_field(cpuinfo, cpuinfo_len, "CPU architecture");
if (cpuArch != NULL) {
char* end;
long archNumber;
int hasARMv7 = 0;
D("found cpuArch = '%s'\n", cpuArch);
/* read the initial decimal number, ignore the rest */
archNumber = strtol(cpuArch, &end, 10);
/* Here we assume that ARMv8 will be upwards compatible with v7
* in the future. Unfortunately, there is no 'Features' field to
* indicate that Thumb-2 is supported.
*/
if (end > cpuArch && archNumber >= 7) {
hasARMv7 = 1;
}
/* Unfortunately, it seems that certain ARMv6-based CPUs
* report an incorrect architecture number of 7!
*
* See http://code.google.com/p/android/issues/detail?id=10812
*
* We try to correct this by looking at the 'elf_format'
* field reported by the 'Processor' field, which is of the
* form of "(v7l)" for an ARMv7-based CPU, and "(v6l)" for
* an ARMv6-one.
*/
if (hasARMv7) {
char* cpuProc = extract_cpuinfo_field(cpuinfo, cpuinfo_len,
"Processor");
if (cpuProc != NULL) {
D("found cpuProc = '%s'\n", cpuProc);
if (has_list_item(cpuProc, "(v6l)")) {
D("CPU processor and architecture mismatch!!\n");
hasARMv7 = 0;
}
free(cpuProc);
}
}
if (hasARMv7) {
g_cpuFeatures |= ANDROID_CPU_ARM_FEATURE_ARMv7;
}
/* The LDREX / STREX instructions are available from ARMv6 */
if (archNumber >= 6) {
g_cpuFeatures |= ANDROID_CPU_ARM_FEATURE_LDREX_STREX;
}
free(cpuArch);
}
/* Extract the list of CPU features from 'Features' field */
char* cpuFeatures = extract_cpuinfo_field(cpuinfo, cpuinfo_len, "Features");
if (cpuFeatures != NULL) {
D("found cpuFeatures = '%s'\n", cpuFeatures);
if (has_list_item(cpuFeatures, "vfpv3"))
g_cpuFeatures |= ANDROID_CPU_ARM_FEATURE_VFPv3;
else if (has_list_item(cpuFeatures, "vfpv3d16"))
g_cpuFeatures |= ANDROID_CPU_ARM_FEATURE_VFPv3;
if (has_list_item(cpuFeatures, "neon")) {
/* Note: Certain kernels only report neon but not vfpv3
* in their features list. However, ARM mandates
* that if Neon is implemented, so must be VFPv3
* so always set the flag.
*/
g_cpuFeatures |= ANDROID_CPU_ARM_FEATURE_NEON |
ANDROID_CPU_ARM_FEATURE_VFPv3;
}
free(cpuFeatures);
}
}
#endif /* __ARM_ARCH__ */
#ifdef __i386__
g_cpuFamily = ANDROID_CPU_FAMILY_X86;
int regs[4];
/* According to http://en.wikipedia.org/wiki/CPUID */
#define VENDOR_INTEL_b 0x756e6547
#define VENDOR_INTEL_c 0x6c65746e
#define VENDOR_INTEL_d 0x49656e69
x86_cpuid(0, regs);
int vendorIsIntel = (regs[1] == VENDOR_INTEL_b &&
regs[2] == VENDOR_INTEL_c &&
regs[3] == VENDOR_INTEL_d);
x86_cpuid(1, regs);
if ((regs[2] & (1 << 9)) != 0) {
g_cpuFeatures |= ANDROID_CPU_X86_FEATURE_SSSE3;
}
if ((regs[2] & (1 << 23)) != 0) {
g_cpuFeatures |= ANDROID_CPU_X86_FEATURE_POPCNT;
}
if (vendorIsIntel && (regs[2] & (1 << 22)) != 0) {
g_cpuFeatures |= ANDROID_CPU_X86_FEATURE_MOVBE;
}
#endif
}
AndroidCpuFamily
android_getCpuFamily(void)
{
pthread_once(&g_once, android_cpuInit);
return g_cpuFamily;
}
uint64_t
android_getCpuFeatures(void)
{
pthread_once(&g_once, android_cpuInit);
return g_cpuFeatures;
}
int
android_getCpuCount(void)
{
pthread_once(&g_once, android_cpuInit);
return g_cpuCount;
}
#endif /* __ANDROID__ */

65
media/libpng/arm/MOZ_PNG_cpu-features.h Normal file
View File

@ -0,0 +1,65 @@
/*
* Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
*
* Use of this source code is governed by a BSD-style license
* that can be found in the LICENSE file in the root of the source
* tree. An additional intellectual property rights grant can be found
* in the file PATENTS. All contributing project authors may
* be found in the AUTHORS file in the root of the source tree.
*/
/* This is a copy of webrtc/system_wrappers/source/android/cpu-features.h
* with name changed to MOZ_PNG_cpu-features.h and exported symbols
* prefixed with "MOZ_PNG_".
*/
// You can download Android source at
// http://source.android.com/source/downloading.html
// Original files are in ndk/sources/android/cpufeatures
// Revision is Change-Id: I9a0629efba36a6023f05e5f092e7addcc1b7d2a9
#ifndef CPU_FEATURES_H
#define CPU_FEATURES_H
#define android_getCpuFamily MOZ_PNG_android_getCpuFamily
#define android_getCpuFeatures MOZ_PNG_android_getCpuFeatures
#define android_getCpuCount MOZ_PNG_android_getCpuCount
#include <sys/cdefs.h>
#include <stdint.h>
__BEGIN_DECLS
typedef enum {
ANDROID_CPU_FAMILY_UNKNOWN = 0,
ANDROID_CPU_FAMILY_ARM,
ANDROID_CPU_FAMILY_X86,
ANDROID_CPU_FAMILY_MAX /* do not remove */
} AndroidCpuFamily;
/* Return family of the device's CPU */
extern AndroidCpuFamily android_getCpuFamily(void);
enum {
ANDROID_CPU_ARM_FEATURE_ARMv7 = (1 << 0),
ANDROID_CPU_ARM_FEATURE_VFPv3 = (1 << 1),
ANDROID_CPU_ARM_FEATURE_NEON = (1 << 2),
ANDROID_CPU_ARM_FEATURE_LDREX_STREX = (1 << 3),
};
enum {
ANDROID_CPU_X86_FEATURE_SSSE3 = (1 << 0),
ANDROID_CPU_X86_FEATURE_POPCNT = (1 << 1),
ANDROID_CPU_X86_FEATURE_MOVBE = (1 << 2),
};
extern uint64_t android_getCpuFeatures(void);
/* Return the number of CPU cores detected on this device. */
extern int android_getCpuCount(void);
__END_DECLS
#endif /* CPU_FEATURES_H */

2
media/libpng/arm/arm_init.c
View File

@ -28,7 +28,7 @@
*
* Documentation: http://www.kandroid.org/ndk/docs/CPU-ARM-NEON.html
*/
#include <cpu-features.h>
#include "MOZ_PNG_cpu-features.h"
static int
png_have_neon(png_structp png_ptr)

14
media/libpng/arm/filter_neon.S
View File

@ -10,6 +10,12 @@
* and license in png.h
*/
/* These are required because Mozilla's moz.build system doesn't pass
* -DDefined macros to the assembler.
*/
#define PNG_READ_SUPPORTED
#define MOZ_PNG_HAVE_ARM_NEON
/* This is required to get the symbol renames, which are #defines, and also
* includes the definition (or not) of PNG_ARM_NEON_OPT.
*/
@ -46,6 +52,14 @@ ELF .size \name, . - \name
.purgem endfunc
.endm
.text
/* Explicitly specifying alignment here because some versions of
gas don't align code correctly. See
http://lists.gnu.org/archive/html/bug-binutils/2011-06/msg00199.html
and https://bugzilla.mozilla.org/show_bug.cgi?id=920992
*/
.align 2
.if \export
.global \name
.endif

5
media/libpng/arm/moz.build
View File

@ -1,5 +0,0 @@
# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
# vim: set filetype=python:
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.

15
media/libpng/moz.build
View File

@ -7,7 +7,7 @@
EXPORTS += [
'mozpngconf.h',
'png.h',
'pngconf.h',
'pngconf.h'
]
UNIFIED_SOURCES += [
@ -24,19 +24,26 @@ UNIFIED_SOURCES += [
'pngtrans.c',
'pngwio.c',
'pngwrite.c',
'pngwutil.c',
'pngwutil.c'
]
if CONFIG['MOZ_PNG_ARM_NEON']:
DEFINES['MOZ_PNG_HAVE_ARM_NEON'] = True
UNIFIED_SOURCES += [
'arm/arm_init.c'
'arm/arm_init.c',
'arm/filter_neon_intrinsics.c'
]
if CONFIG['MOZ_PNG_ARM_NEON']:
SOURCES += [
'arm/filter_neon.S'
]
if CONFIG['MOZ_PNG_ARM_NEON_CHECK']:
DEFINES['MOZ_PNG_HAVE_ARM_NEON_CHECK'] = True
UNIFIED_SOURCES += [
'arm/MOZ_PNG_cpu-features.c'
]
LIBRARY_NAME = 'mozpng'
MSVC_ENABLE_PGO = True

17
media/libpng/mozpngconf.h
View File

@ -30,7 +30,22 @@
#endif
#undef PNG_ARM_NEON_OPT /* This may have been defined in pngpriv.h */
#define PNG_ARM_NEON_OPT 0
#ifdef __ARM_NEON__
# ifdef MOZ_PNG_HAVE_ARM_NEON
# ifdef MOZ_PNG_HAVE_ARM_NEON_CHECK
# define PNG_ARM_NEON_CHECK_SUPPORTED
# define PNG_ARM_NEON_OPT 1
# else
# define PNG_ARM_NEON_OPT 2
# endif
# define PNG_ALIGNED_MEMORY_SUPPORTED
/* Accept the PNG_ARM_NEON_IMPLEMENTATION setting from pngpriv.h. */
# else
# define PNG_ARM_NEON_OPT 0
# endif
#else
# define PNG_ARM_NEON_OPT 0
#endif
#define PNG_BENIGN_READ_ERRORS_SUPPORTED
#define PNG_READ_SUPPORTED