Roll openmax_dl to the latest.
This picks up: -Fix Android ARM Neon build. -Fix Android GN build. This also fixes an issue with the GN ARM NEON build. BUG=451035 Review URL: https://codereview.chromium.org/871433002 Cr-Original-Commit-Position: refs/heads/master@{#312629} Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src Cr-Mirrored-Commit: d2a76a150091e5c5f1d9e4a42a27d6f1f7538137
This commit is contained in:
fdegans
Commit bot
Родитель
48e15483b7
Коммит
00acc540d7
|
|
@ -20,16 +20,19 @@ if (cpu_arch == "arm") {
|
|||
|
||||
# Whether to use the neon FPU instruction set or not.
|
||||
arm_use_neon = true
|
||||
|
||||
# Whether to enable optional NEON code paths.
|
||||
arm_optionally_use_neon = false
|
||||
|
||||
if (is_android) {
|
||||
arm_use_neon = false
|
||||
arm_optionally_use_neon = true
|
||||
}
|
||||
}
|
||||
|
||||
assert(arm_float_abi == "" || arm_float_abi == "hard" ||
|
||||
arm_float_abi == "soft" || arm_float_abi == "softfp")
|
||||
|
||||
if (is_android) {
|
||||
arm_use_neon = false
|
||||
}
|
||||
arm_optionally_use_neon = true
|
||||
|
||||
if (arm_version == 6) {
|
||||
arm_arch = "armv6"
|
||||
if (arm_tune != "") {
|
||||
|
|
|
|||
|
|
@ -1,249 +0,0 @@
|
|||
# Copyright 2014 The Chromium Authors. All rights reserved.
|
||||
# Use of this source code is governed by a BSD-style license that can be
|
||||
# found in the LICENSE file.
|
||||
|
||||
import("//build/config/arm.gni")
|
||||
|
||||
declare_args() {
|
||||
# Override this value to build with small float FFT tables
|
||||
openmax_big_float_fft = true
|
||||
}
|
||||
|
||||
config("dl_config") {
|
||||
include_dirs = [ ".." ]
|
||||
if (cpu_arch == "arm") {
|
||||
if (arm_use_neon) {
|
||||
# Enable build-time NEON selection.
|
||||
defines = [ "DL_ARM_NEON" ]
|
||||
} else if (is_android) {
|
||||
# Enable run-time NEON selection.
|
||||
defines = [ "DL_ARM_NEON_OPTIONAL" ]
|
||||
}
|
||||
} else if (cpu_arch == "arm64") {
|
||||
# Enable build-time NEON selection.
|
||||
defines = [ "DL_ARM_NEON" ]
|
||||
}
|
||||
}
|
||||
|
||||
# GYP: third_party/openmax_dl/dl/dl.gyp:openmax_dl
|
||||
source_set("dl") {
|
||||
public_configs = [ ":dl_config" ]
|
||||
sources = [
|
||||
"api/omxtypes.h",
|
||||
"sp/api/omxSP.h",
|
||||
"sp/src/armSP_FFT_F32TwiddleTable.c",
|
||||
]
|
||||
|
||||
cflags = []
|
||||
deps = []
|
||||
defines = []
|
||||
|
||||
if (openmax_big_float_fft) {
|
||||
defines += [ "BIG_FFT_TABLE" ]
|
||||
}
|
||||
|
||||
if (cpu_arch == "arm" || cpu_arch == "arm64") {
|
||||
sources += [
|
||||
# Common files that are used by both arm and arm64 code.
|
||||
"api/arm/armOMX.h",
|
||||
"api/arm/omxtypes_s.h",
|
||||
"sp/api/armSP.h",
|
||||
"sp/src/arm/armSP_FFT_S32TwiddleTable.c",
|
||||
"sp/src/arm/omxSP_FFTGetBufSize_C_FC32.c",
|
||||
"sp/src/arm/omxSP_FFTGetBufSize_C_SC32.c",
|
||||
"sp/src/arm/omxSP_FFTGetBufSize_R_F32.c",
|
||||
"sp/src/arm/omxSP_FFTGetBufSize_R_S32.c",
|
||||
"sp/src/arm/omxSP_FFTInit_C_FC32.c",
|
||||
"sp/src/arm/omxSP_FFTInit_R_F32.c",
|
||||
]
|
||||
}
|
||||
|
||||
if (cpu_arch == "arm") {
|
||||
if (arm_use_neon || is_android) {
|
||||
deps += [ ":openmax_dl_armv7" ]
|
||||
}
|
||||
configs -= [ "//build/config/compiler:compiler_arm_fpu" ]
|
||||
cflags += [ "-mfpu=neon" ]
|
||||
|
||||
if (arm_use_neon || is_android) {
|
||||
sources += [
|
||||
# Common files that are used by both the NEON and non-NEON code.
|
||||
"api/armCOMM_s.h",
|
||||
"sp/src/arm/omxSP_FFTGetBufSize_C_SC16.c",
|
||||
"sp/src/arm/omxSP_FFTGetBufSize_R_S16.c",
|
||||
"sp/src/arm/omxSP_FFTGetBufSize_R_S16S32.c",
|
||||
"sp/src/arm/omxSP_FFTInit_C_SC16.c",
|
||||
"sp/src/arm/omxSP_FFTInit_C_SC32.c",
|
||||
"sp/src/arm/omxSP_FFTInit_R_S16.c",
|
||||
"sp/src/arm/omxSP_FFTInit_R_S16S32.c",
|
||||
"sp/src/arm/omxSP_FFTInit_R_S32.c",
|
||||
|
||||
# Complex 32-bit fixed-point FFT.
|
||||
"sp/src/arm/neon/armSP_FFT_CToC_SC32_Radix2_fs_unsafe_s.S",
|
||||
"sp/src/arm/neon/armSP_FFT_CToC_SC32_Radix2_ls_unsafe_s.S",
|
||||
"sp/src/arm/neon/armSP_FFT_CToC_SC32_Radix2_unsafe_s.S",
|
||||
"sp/src/arm/neon/armSP_FFT_CToC_SC32_Radix4_fs_unsafe_s.S",
|
||||
"sp/src/arm/neon/armSP_FFT_CToC_SC32_Radix4_ls_unsafe_s.S",
|
||||
"sp/src/arm/neon/armSP_FFT_CToC_SC32_Radix4_unsafe_s.S",
|
||||
"sp/src/arm/neon/armSP_FFT_CToC_SC32_Radix8_fs_unsafe_s.S",
|
||||
"sp/src/arm/neon/omxSP_FFTFwd_CToC_SC32_Sfs_s.S",
|
||||
"sp/src/arm/neon/omxSP_FFTInv_CToC_SC32_Sfs_s.S",
|
||||
|
||||
# Real 32-bit fixed-point FFT
|
||||
"sp/src/arm/neon/armSP_FFTInv_CCSToR_S32_preTwiddleRadix2_unsafe_s.S",
|
||||
"sp/src/arm/neon/omxSP_FFTFwd_RToCCS_S32_Sfs_s.S",
|
||||
"sp/src/arm/neon/omxSP_FFTInv_CCSToR_S32_Sfs_s.S",
|
||||
|
||||
# Complex 16-bit fixed-point FFT
|
||||
"sp/src/arm/neon/armSP_FFTInv_CCSToR_S16_preTwiddleRadix2_unsafe_s.S",
|
||||
"sp/src/arm/neon/armSP_FFT_CToC_SC16_Radix2_fs_unsafe_s.S",
|
||||
"sp/src/arm/neon/armSP_FFT_CToC_SC16_Radix2_ls_unsafe_s.S",
|
||||
"sp/src/arm/neon/armSP_FFT_CToC_SC16_Radix2_ps_unsafe_s.S",
|
||||
"sp/src/arm/neon/armSP_FFT_CToC_SC16_Radix2_unsafe_s.S",
|
||||
"sp/src/arm/neon/armSP_FFT_CToC_SC16_Radix4_fs_unsafe_s.S",
|
||||
"sp/src/arm/neon/armSP_FFT_CToC_SC16_Radix4_ls_unsafe_s.S",
|
||||
"sp/src/arm/neon/armSP_FFT_CToC_SC16_Radix4_unsafe_s.S",
|
||||
"sp/src/arm/neon/armSP_FFT_CToC_SC16_Radix8_fs_unsafe_s.S",
|
||||
"sp/src/arm/neon/omxSP_FFTFwd_CToC_SC16_Sfs_s.S",
|
||||
"sp/src/arm/neon/omxSP_FFTInv_CToC_SC16_Sfs_s.S",
|
||||
|
||||
# Real 16-bit fixed-point FFT
|
||||
"sp/src/arm/neon/omxSP_FFTFwd_RToCCS_S16_Sfs_s.S",
|
||||
"sp/src/arm/neon/omxSP_FFTInv_CCSToR_S16_Sfs_s.S",
|
||||
"sp/src/arm/neon/omxSP_FFTFwd_RToCCS_S16S32_Sfs_s.S",
|
||||
"sp/src/arm/neon/omxSP_FFTInv_CCSToR_S32S16_Sfs_s.S",
|
||||
|
||||
# Complex floating-point FFT
|
||||
"sp/src/arm/neon/armSP_FFT_CToC_FC32_Radix2_fs_unsafe_s.S",
|
||||
"sp/src/arm/neon/armSP_FFT_CToC_FC32_Radix2_ls_unsafe_s.S",
|
||||
"sp/src/arm/neon/armSP_FFT_CToC_FC32_Radix2_unsafe_s.S",
|
||||
"sp/src/arm/neon/armSP_FFT_CToC_FC32_Radix4_fs_unsafe_s.S",
|
||||
"sp/src/arm/neon/armSP_FFT_CToC_FC32_Radix4_ls_unsafe_s.S",
|
||||
"sp/src/arm/neon/armSP_FFT_CToC_FC32_Radix4_unsafe_s.S",
|
||||
"sp/src/arm/neon/armSP_FFT_CToC_FC32_Radix8_fs_unsafe_s.S",
|
||||
"sp/src/arm/neon/omxSP_FFTFwd_CToC_FC32_Sfs_s.S",
|
||||
"sp/src/arm/neon/omxSP_FFTInv_CToC_FC32_Sfs_s.S",
|
||||
|
||||
# Real floating-point FFT
|
||||
"sp/src/arm/neon/armSP_FFTInv_CCSToR_F32_preTwiddleRadix2_unsafe_s.S",
|
||||
"sp/src/arm/neon/omxSP_FFTFwd_RToCCS_F32_Sfs_s.S",
|
||||
"sp/src/arm/neon/omxSP_FFTInv_CCSToR_F32_Sfs_s.S",
|
||||
]
|
||||
}
|
||||
}
|
||||
|
||||
if (cpu_arch == "ia32" || cpu_arch == "x64") {
|
||||
cflags += [ "-msse2" ]
|
||||
|
||||
sources += [
|
||||
# Real 32-bit floating-point FFT.
|
||||
"sp/api/x86SP.h",
|
||||
"sp/src/x86/omxSP_FFTFwd_RToCCS_F32_Sfs.c",
|
||||
"sp/src/x86/omxSP_FFTGetBufSize_R_F32.c",
|
||||
"sp/src/x86/omxSP_FFTInit_R_F32.c",
|
||||
"sp/src/x86/omxSP_FFTInv_CCSToR_F32_Sfs.c",
|
||||
"sp/src/x86/x86SP_FFT_CToC_FC32_Fwd_Radix2_fs.c",
|
||||
"sp/src/x86/x86SP_FFT_CToC_FC32_Fwd_Radix2_ls.c",
|
||||
"sp/src/x86/x86SP_FFT_CToC_FC32_Fwd_Radix2_ls_sse.c",
|
||||
"sp/src/x86/x86SP_FFT_CToC_FC32_Fwd_Radix2_ms.c",
|
||||
"sp/src/x86/x86SP_FFT_CToC_FC32_Fwd_Radix4_fs.c",
|
||||
"sp/src/x86/x86SP_FFT_CToC_FC32_Fwd_Radix4_fs_sse.c",
|
||||
"sp/src/x86/x86SP_FFT_CToC_FC32_Fwd_Radix4_ls.c",
|
||||
"sp/src/x86/x86SP_FFT_CToC_FC32_Fwd_Radix4_ls_sse.c",
|
||||
"sp/src/x86/x86SP_FFT_CToC_FC32_Fwd_Radix4_ms.c",
|
||||
"sp/src/x86/x86SP_FFT_CToC_FC32_Fwd_Radix4_ms_sse.c",
|
||||
"sp/src/x86/x86SP_FFT_CToC_FC32_Inv_Radix2_fs.c",
|
||||
"sp/src/x86/x86SP_FFT_CToC_FC32_Inv_Radix2_ls.c",
|
||||
"sp/src/x86/x86SP_FFT_CToC_FC32_Inv_Radix2_ls_sse.c",
|
||||
"sp/src/x86/x86SP_FFT_CToC_FC32_Inv_Radix2_ms.c",
|
||||
"sp/src/x86/x86SP_FFT_CToC_FC32_Inv_Radix4_fs.c",
|
||||
"sp/src/x86/x86SP_FFT_CToC_FC32_Inv_Radix4_fs_sse.c",
|
||||
"sp/src/x86/x86SP_FFT_CToC_FC32_Inv_Radix4_ls.c",
|
||||
"sp/src/x86/x86SP_FFT_CToC_FC32_Inv_Radix4_ls_sse.c",
|
||||
"sp/src/x86/x86SP_FFT_CToC_FC32_Inv_Radix4_ms.c",
|
||||
"sp/src/x86/x86SP_FFT_CToC_FC32_Inv_Radix4_ms_sse.c",
|
||||
"sp/src/x86/x86SP_FFT_F32_radix2_kernel.c",
|
||||
"sp/src/x86/x86SP_FFT_F32_radix4_kernel.c",
|
||||
"sp/src/x86/x86SP_SSE_Math.h",
|
||||
]
|
||||
}
|
||||
if (cpu_arch == "arm64") {
|
||||
sources += [
|
||||
"api/arm/arm64COMM_s.h",
|
||||
|
||||
# Complex floating-point FFT
|
||||
"sp/src/arm/arm64/armSP_FFT_CToC_FC32_Radix2_fs_s.S",
|
||||
"sp/src/arm/arm64/armSP_FFT_CToC_FC32_Radix2_ls_s.S",
|
||||
"sp/src/arm/arm64/armSP_FFT_CToC_FC32_Radix2_s.S",
|
||||
"sp/src/arm/arm64/armSP_FFT_CToC_FC32_Radix4_fs_s.S",
|
||||
"sp/src/arm/arm64/armSP_FFT_CToC_FC32_Radix4_ls_s.S",
|
||||
"sp/src/arm/arm64/armSP_FFT_CToC_FC32_Radix4_s.S",
|
||||
"sp/src/arm/arm64/armSP_FFT_CToC_FC32_Radix8_fs_s.S",
|
||||
"sp/src/arm/arm64/omxSP_FFTInv_CToC_FC32.c",
|
||||
"sp/src/arm/arm64/omxSP_FFTFwd_CToC_FC32.c",
|
||||
|
||||
# Real floating-point FFT
|
||||
"sp/src/arm/arm64/armSP_FFTInv_CCSToR_F32_preTwiddleRadix2_s.S",
|
||||
"sp/src/arm/arm64/omxSP_FFTFwd_RToCCS_F32.c",
|
||||
"sp/src/arm/arm64/ComplexToRealFixup.S",
|
||||
"sp/src/arm/arm64/omxSP_FFTInv_CCSToR_F32.c",
|
||||
]
|
||||
}
|
||||
if (cpu_arch == "mipsel") {
|
||||
cflags += [ "-std=c99" ]
|
||||
sources -= [ "sp/src/armSP_FFT_F32TwiddleTable.c" ]
|
||||
|
||||
sources += [
|
||||
"sp/api/mipsSP.h",
|
||||
"sp/src/mips/mips_FFTFwd_RToCCS_F32_complex.c",
|
||||
"sp/src/mips/mips_FFTFwd_RToCCS_F32_real.c",
|
||||
"sp/src/mips/mips_FFTInv_CCSToR_F32_complex.c",
|
||||
"sp/src/mips/mips_FFTInv_CCSToR_F32_real.c",
|
||||
"sp/src/mips/omxSP_FFT_F32TwiddleTable.c",
|
||||
"sp/src/mips/omxSP_FFTFwd_RToCCS_F32_Sfs.c",
|
||||
"sp/src/mips/omxSP_FFTGetBufSize_R_F32.c",
|
||||
"sp/src/mips/omxSP_FFTInit_R_F32.c",
|
||||
"sp/src/mips/omxSP_FFTInv_CCSToR_F32_Sfs.c",
|
||||
]
|
||||
}
|
||||
}
|
||||
|
||||
if (cpu_arch == "arm") {
|
||||
# GYP: third_party/openmax_dl/dl/dl.gyp:openmax_dl
|
||||
# Non-NEON implementation of FFT. This library is NOT
|
||||
# standalone. Applications must link with openmax_dl.
|
||||
source_set("openmax_dl_armv7") {
|
||||
configs += [ ":dl_config" ]
|
||||
visibility = [ ":*" ]
|
||||
|
||||
#TODO(GYP):
|
||||
#'cflags!': [
|
||||
#'-mfpu=neon',
|
||||
#],
|
||||
|
||||
sources = [
|
||||
# Complex floating-point FFT
|
||||
"sp/src/arm/armv7/armSP_FFT_CToC_FC32_Radix2_fs_unsafe_s.S",
|
||||
"sp/src/arm/armv7/armSP_FFT_CToC_FC32_Radix4_fs_unsafe_s.S",
|
||||
"sp/src/arm/armv7/armSP_FFT_CToC_FC32_Radix4_unsafe_s.S",
|
||||
"sp/src/arm/armv7/armSP_FFT_CToC_FC32_Radix8_fs_unsafe_s.S",
|
||||
"sp/src/arm/armv7/omxSP_FFTInv_CToC_FC32_Sfs_s.S",
|
||||
"sp/src/arm/armv7/omxSP_FFTFwd_CToC_FC32_Sfs_s.S",
|
||||
|
||||
# Real floating-point FFT
|
||||
"sp/src/arm/armv7/armSP_FFTInv_CCSToR_F32_preTwiddleRadix2_unsafe_s.S",
|
||||
"sp/src/arm/armv7/omxSP_FFTFwd_RToCCS_F32_Sfs_s.S",
|
||||
"sp/src/arm/armv7/omxSP_FFTInv_CCSToR_F32_Sfs_s.S",
|
||||
]
|
||||
if (is_android) {
|
||||
# We only do run-time NEON detection on Android.
|
||||
deps = [
|
||||
"//third_party/android_tools:cpu_features",
|
||||
]
|
||||
libs = [ "log" ]
|
||||
|
||||
# Detection routine
|
||||
sources += [ "sp/src/arm/detect.c" ]
|
||||
}
|
||||
}
|
||||
}
|
||||
Загрузка…
Ссылка в новой задаче