From bbcc64772580c8a979288791afa02d30bc476d2e Mon Sep 17 00:00:00 2001 From: trav90 Date: Fri, 19 Oct 2018 21:52:15 -0500 Subject: Update aom to v1.0.0 Update aom to commit id d14c5bb4f336ef1842046089849dee4a301fbbf0. --- third_party/aom/build/cmake/cpu.cmake | 133 ++++++++++++++++++++-------------- 1 file changed, 80 insertions(+), 53 deletions(-) (limited to 'third_party/aom/build/cmake/cpu.cmake') diff --git a/third_party/aom/build/cmake/cpu.cmake b/third_party/aom/build/cmake/cpu.cmake index 5d0b1a6e8..6f866d04d 100644 --- a/third_party/aom/build/cmake/cpu.cmake +++ b/third_party/aom/build/cmake/cpu.cmake @@ -1,72 +1,99 @@ -## -## Copyright (c) 2017, 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. -## -if ("${AOM_TARGET_CPU}" STREQUAL "arm64") +# +# Copyright (c) 2017, 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. +# + +if("${AOM_TARGET_CPU}" STREQUAL "arm64") set(ARCH_ARM 1) - set(HAVE_NEON 1) set(RTCD_ARCH_ARM "yes") - set(RTCD_HAVE_NEON "yes") -elseif ("${AOM_TARGET_CPU}" MATCHES "^armv7") + + if(ENABLE_NEON) + set(HAVE_NEON 1) + set(RTCD_HAVE_NEON "yes") + else() + set(HAVE_NEON 0) + set(AOM_RTCD_FLAGS ${AOM_RTCD_FLAGS} --disable-neon) + endif() +elseif("${AOM_TARGET_CPU}" MATCHES "^armv7") set(ARCH_ARM 1) - set(HAVE_NEON 1) - set(HAVE_NEON_ASM 1) set(RTCD_ARCH_ARM "yes") - set(RTCD_HAVE_NEON "yes") - set(RTCD_HAVE_NEON_ASM "yes") -elseif ("${AOM_TARGET_CPU}" MATCHES "^mips") + + if(ENABLE_NEON) + set(HAVE_NEON 1) + set(RTCD_HAVE_NEON "yes") + else() + set(HAVE_NEON 0) + set(AOM_RTCD_FLAGS ${AOM_RTCD_FLAGS} --disable-neon) + endif() +elseif("${AOM_TARGET_CPU}" MATCHES "^mips") set(ARCH_MIPS 1) + set(RTCD_ARCH_MIPS "yes") - if ("${AOM_TARGET_CPU}" STREQUAL "mips32") + if("${AOM_TARGET_CPU}" STREQUAL "mips32") set(HAVE_MIPS32 1) - elseif ("${AOM_TARGET_CPU}" STREQUAL "mips64") + set(RTCD_HAVE_MIPS32 "yes") + elseif("${AOM_TARGET_CPU}" STREQUAL "mips64") set(HAVE_MIPS64 1) - endif () + set(RTCD_HAVE_MIPS64 "yes") + endif() - set(RTCD_ARCH_MIPS "yes") - - if (HAVE_DSPR2) + # HAVE_DSPR2 is set by mips toolchain files. + if(ENABLE_DSPR2 AND HAVE_DSPR2) set(RTCD_HAVE_DSPR2 "yes") - endif () + else() + set(HAVE_DSPR2 0) + set(AOM_RTCD_FLAGS ${AOM_RTCD_FLAGS} --disable-dspr2) + endif() - if (HAVE_MSA) + # HAVE_MSA is set by mips toolchain files. + if(ENABLE_MSA AND HAVE_MSA) set(RTCD_HAVE_MSA "yes") - endif () -elseif ("${AOM_TARGET_CPU}" MATCHES "^x86") - if ("${AOM_TARGET_CPU}" STREQUAL "x86") + else() + set(HAVE_MSA 0) + set(AOM_RTCD_FLAGS ${AOM_RTCD_FLAGS} --disable-msa) + endif() +elseif("${AOM_TARGET_CPU}" MATCHES "ppc") + set(ARCH_PPC 1) + set(RTCD_ARCH_PPC "yes") + + if(ENABLE_VSX) + set(HAVE_VSX 1) + set(RTCD_HAVE_VSX "yes") + else() + set(HAVE_VSX 0) + set(AOM_RTCD_FLAGS ${AOM_RTCD_FLAGS} --disable-vsx) + endif() +elseif("${AOM_TARGET_CPU}" MATCHES "^x86") + if("${AOM_TARGET_CPU}" STREQUAL "x86") set(ARCH_X86 1) set(RTCD_ARCH_X86 "yes") - elseif ("${AOM_TARGET_CPU}" STREQUAL "x86_64") + elseif("${AOM_TARGET_CPU}" STREQUAL "x86_64") set(ARCH_X86_64 1) set(RTCD_ARCH_X86_64 "yes") - endif () + endif() - set(HAVE_MMX 1) - set(HAVE_SSE 1) - set(HAVE_SSE2 1) - set(HAVE_SSE3 1) - set(HAVE_SSSE3 1) - set(HAVE_SSE4_1 1) - set(HAVE_AVX 1) - set(HAVE_AVX2 1) - set(RTCD_HAVE_MMX "yes") - set(RTCD_HAVE_SSE "yes") - set(RTCD_HAVE_SSE2 "yes") - set(RTCD_HAVE_SSE3 "yes") - set(RTCD_HAVE_SSSE3 "yes") - set(RTCD_HAVE_SSE4_1 "yes") - set(RTCD_HAVE_AVX "yes") - set(RTCD_HAVE_AVX2 "yes") -endif () + set(X86_FLAVORS "MMX;SSE;SSE2;SSE3;SSSE3;SSE4_1;SSE4_2;AVX;AVX2") + foreach(flavor ${X86_FLAVORS}) + if(ENABLE_${flavor} AND NOT disable_remaining_flavors) + set(HAVE_${flavor} 1) + set(RTCD_HAVE_${flavor} "yes") + else() + set(disable_remaining_flavors 1) + set(HAVE_${flavor} 0) + string(TOLOWER ${flavor} flavor) + set(AOM_RTCD_FLAGS ${AOM_RTCD_FLAGS} --disable-${flavor}) + endif() + endforeach() +endif() -foreach (config_var ${AOM_CONFIG_VARS}) - if (${${config_var}}) +foreach(config_var ${AOM_CONFIG_VARS}) + if(${${config_var}}) set(RTCD_${config_var} yes) - endif () -endforeach () + endif() +endforeach() -- cgit v1.2.3