Thorium_Archive
/
thorium
1
0
Fork 0
Code Issues 207 Pull Requests 3 Packages Projects Releases 53 Wiki Activity

libaom fix 3

This commit is contained in:
Alexander Frick 2023-10-12 02:52:29 -05:00
parent 01c9bddca1
commit 30f7b7b518
2 changed files with 157 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/third_party/libaom/BUILD.gn vendored
View File

@ -222,28 +222,6 @@ if (current_cpu == "arm64") {
}
sources = aom_av1_encoder_intrin_arm_crc32
}
source_set("libaom_intrinsics_neon_dotprod") {
check_includes = false
configs -= [ "//build/config/compiler:chromium_code" ]
configs += [ "//build/config/compiler:no_chromium_code" ]
configs += [ "//build/config/compiler:march-dotprod" ]
configs += [ ":libaom_config" ]
sources = aom_av1_common_intrin_neon_dotprod
sources += aom_dsp_common_intrin_neon_dotprod
sources += aom_av1_encoder_intrin_neon_dotprod
sources += aom_dsp_encoder_intrin_neon_dotprod
}
source_set("libaom_intrinsics_neon_i8mm") {
check_includes = false
configs -= [ "//build/config/compiler:chromium_code" ]
configs += [ "//build/config/compiler:no_chromium_code" ]
configs += [ "//build/config/compiler:march-i8mm" ]
configs += [ ":libaom_config" ]
sources = aom_av1_common_intrin_neon_i8mm
sources += aom_dsp_common_intrin_neon_i8mm
}
}
static_library("libaom") {
@ -302,8 +280,6 @@ static_library("libaom") {
sources += [ "source/libaom/aom_ports/aarch64_cpudetect.c" ]
deps += [
":libaom_intrinsics_arm_crc32",
":libaom_intrinsics_neon_dotprod",
":libaom_intrinsics_neon_i8mm",
]
}
if (current_cpu == "arm") {

157
src/third_party/libaom/source/libaom/aom_ports/aarch64_cpudetect.c vendored Normal file
View File

@ -0,0 +1,157 @@
/*
* Copyright (c) 2023, Alliance for Open Media. All rights reserved
*
* This source code is subject to the terms of the BSD 2 Clause License and
* the Alliance for Open Media Patent License 1.0. If the BSD 2 Clause License
* was not distributed with this source code in the LICENSE file, you can
* obtain it at www.aomedia.org/license/software. If the Alliance for Open
* Media Patent License 1.0 was not distributed with this source code in the
* PATENTS file, you can obtain it at www.aomedia.org/license/patent.
*/
#include "arm_cpudetect.h"
#if defined(__APPLE__)
#include <sys/sysctl.h>
#endif
#if !CONFIG_RUNTIME_CPU_DETECT
static int arm_get_cpu_caps(void) {
// This function should actually be a no-op. There is no way to adjust any of
// these because the RTCD tables do not exist: the functions are called
// statically.
int flags = 0;
#if HAVE_NEON
flags |= HAS_NEON;
#endif // HAVE_NEON
return flags;
}
#elif defined(__APPLE__) // end !CONFIG_RUNTIME_CPU_DETECT
// sysctlbyname() parameter documentation for instruction set characteristics:
// https://developer.apple.com/documentation/kernel/1387446-sysctlbyname/determining_instruction_set_characteristics
static INLINE bool have_feature(const char *feature) {
int64_t feature_present = 0;
size_t size = sizeof(feature_present);
if (sysctlbyname(feature, &feature_present, &size, NULL, 0) != 0) {
return false;
}
return feature_present;
}
static int arm_get_cpu_caps(void) {
int flags = 0;
#if HAVE_NEON
flags |= HAS_NEON;
#endif // HAVE_NEON
#if HAVE_ARM_CRC32
if (have_feature("hw.optional.armv8_crc32")) flags |= HAS_ARM_CRC32;
#endif // HAVE_ARM_CRC32
}
#elif defined(_MSC_VER) // end __APPLE__
static int arm_get_cpu_caps(void) {
int flags = 0;
// IsProcessorFeaturePresent() parameter documentation:
// https://learn.microsoft.com/en-us/windows/win32/api/processthreadsapi/nf-processthreadsapi-isprocessorfeaturepresent#parameters
#if HAVE_NEON
flags |= HAS_NEON; // Neon is mandatory in Armv8.0-A.
#endif // HAVE_NEON
#if HAVE_ARM_CRC32
if (IsProcessorFeaturePresent(PF_ARM_V8_CRC32_INSTRUCTIONS_AVAILABLE)) {
flags |= HAS_ARM_CRC32;
}
#endif // HAVE_ARM_CRC32
// No I8MM or SVE feature detection available on Windows at time of writing.
return flags;
}
#elif defined(ANDROID_USE_CPU_FEATURES_LIB)
static int arm_get_cpu_caps(void) {
int flags = 0;
#if HAVE_NEON
flags |= HAS_NEON; // Neon is mandatory in Armv8.0-A.
#endif // HAVE_NEON
return flags;
}
#elif defined(__linux__) // end defined(AOM_USE_ANDROID_CPU_FEATURES)
#include <sys/auxv.h>
// Define hwcap values ourselves: building with an old auxv header where these
// hwcap values are not defined should not prevent features from being enabled.
#define AOM_AARCH64_HWCAP_CRC32 (1 << 7)
#define AOM_AARCH64_HWCAP_ASIMDDP (1 << 20)
#define AOM_AARCH64_HWCAP_SVE (1 << 22)
#define AOM_AARCH64_HWCAP2_I8MM (1 << 13)
static int arm_get_cpu_caps(void) {
int flags = 0;
unsigned long hwcap = getauxval(AT_HWCAP);
unsigned long hwcap2 = getauxval(AT_HWCAP2);
#if HAVE_NEON
flags |= HAS_NEON; // Neon is mandatory in Armv8.0-A.
#endif // HAVE_NEON
#if HAVE_ARM_CRC32
if (hwcap & AOM_AARCH64_HWCAP_CRC32) flags |= HAS_ARM_CRC32;
#endif // HAVE_ARM_CRC32
return flags;
}
#elif defined(__Fuchsia__) // end __linux__
#include <zircon/features.h>
#include <zircon/syscalls.h>
// Added in https://fuchsia-review.googlesource.com/c/fuchsia/+/894282.
#ifndef ZX_ARM64_FEATURE_ISA_I8MM
#define ZX_ARM64_FEATURE_ISA_I8MM ((uint32_t)(1u << 19))
#endif
// Added in https://fuchsia-review.googlesource.com/c/fuchsia/+/895083.
#ifndef ZX_ARM64_FEATURE_ISA_SVE
#define ZX_ARM64_FEATURE_ISA_SVE ((uint32_t)(1u << 20))
#endif
static int arm_get_cpu_caps(void) {
int flags = 0;
#if HAVE_NEON
flags |= HAS_NEON; // Neon is mandatory in Armv8.0-A.
#endif // HAVE_NEON
uint32_t features;
zx_status_t status = zx_system_get_features(ZX_FEATURE_KIND_CPU, &features);
if (status != ZX_OK) return flags;
#if HAVE_ARM_CRC32
if (features & ZX_ARM64_FEATURE_ISA_CRC32) flags |= HAS_ARM_CRC32;
#endif // HAVE_ARM_CRC32
#if HAVE_SVE
if (features & ZX_ARM64_FEATURE_ISA_SVE) flags |= HAS_SVE;
#endif // HAVE_SVE
return flags;
}
#else // end __Fuchsia__
#error \
"Runtime CPU detection selected, but no CPU detection method " \
"available for your platform. Rerun cmake with -DCONFIG_RUNTIME_CPU_DETECT=0."
#endif
int aom_arm_cpu_caps(void) {
int flags = 0;
if (!arm_cpu_env_flags(&flags)) {
flags = arm_get_cpu_caps() & arm_cpu_env_mask();
}
// Restrict flags: FEAT_I8MM assumes that FEAT_DotProd is available.
if (!(flags & HAS_NEON_DOTPROD)) flags &= ~HAS_NEON_I8MM;
// Restrict flags: SVE assumes that FEAT_{DotProd,I8MM} are available.
if (!(flags & HAS_NEON_DOTPROD)) flags &= ~HAS_SVE;
if (!(flags & HAS_NEON_I8MM)) flags &= ~HAS_SVE;
return flags;
}