From f127ee1f74681c5e393007f1751dd31690ee834e Mon Sep 17 00:00:00 2001 From: Alexander Frick Date: Fri, 13 Oct 2023 07:07:33 -0500 Subject: [PATCH] raspi Final --- arm/build/config/compiler/BUILD.gn | 12 ------------ arm/raspi/build/config/compiler/BUILD.gn | 16 ++-------------- src/third_party/libaom/BUILD.gn | 16 ---------------- src/third_party/libaom/cmake_update.sh | 12 ++++++------ 4 files changed, 8 insertions(+), 48 deletions(-) diff --git a/arm/build/config/compiler/BUILD.gn b/arm/build/config/compiler/BUILD.gn index 0ad77e11..b82dabe8 100644 --- a/arm/build/config/compiler/BUILD.gn +++ b/arm/build/config/compiler/BUILD.gn @@ -1429,18 +1429,6 @@ config("compiler_cpu_abi") { asmflags = cflags } -config("march-dotprod") { - if (!is_win || is_clang) { - cflags = [ "-march=armv8.2-a+dotprod" ] - } -} - -config("march-i8mm") { - if (!is_win || is_clang) { - cflags = [ "-march=armv8.2-a+dotprod+i8mm" ] - } -} - # This provides options to tweak code generation that are necessary # for particular Chromium code or for working around particular # compiler bugs (or the combination of the two). diff --git a/arm/raspi/build/config/compiler/BUILD.gn b/arm/raspi/build/config/compiler/BUILD.gn index 326197da..4462314d 100644 --- a/arm/raspi/build/config/compiler/BUILD.gn +++ b/arm/raspi/build/config/compiler/BUILD.gn @@ -1147,8 +1147,8 @@ config("compiler_cpu_abi") { } else if (current_cpu == "arm64") { if (is_clang && !is_android && !is_nacl && !is_fuchsia && !(is_chromeos_lacros && is_chromeos_device)) { - cflags += [ "--target=aarch64-linux-gnu", "-march=armv8-a+crc", "-mcpu=cortex-a72", "-mtune=cortex-a72", ] - ldflags += [ "--target=aarch64-linux-gnu", "-march=armv8-a+crc", ] + cflags += [ "--target=aarch64-linux-gnu", "-march=armv8-a+simd", "-mtune=cortex-a72", ] + ldflags += [ "--target=aarch64-linux-gnu", "-march=armv8-a+simd", ] } } else if (current_cpu == "mipsel" && !is_nacl) { ldflags += [ "-Wl,--hash-style=sysv" ] @@ -1414,18 +1414,6 @@ config("compiler_cpu_abi") { asmflags = cflags } -config("march-dotprod") { - if (!is_win || is_clang) { - cflags = [ "-march=armv8.2-a+dotprod" ] - } -} - -config("march-i8mm") { - if (!is_win || is_clang) { - cflags = [ "-march=armv8.2-a+dotprod+i8mm" ] - } -} - # This provides options to tweak code generation that are necessary # for particular Chromium code or for working around particular # compiler bugs (or the combination of the two). diff --git a/src/third_party/libaom/BUILD.gn b/src/third_party/libaom/BUILD.gn index 344e2d31..ab7964ab 100644 --- a/src/third_party/libaom/BUILD.gn +++ b/src/third_party/libaom/BUILD.gn @@ -211,19 +211,6 @@ if (current_cpu == "arm64" || cpu_arch_full == "arm-neon" || } } -if (current_cpu == "arm64") { - source_set("libaom_intrinsics_arm_crc32") { - check_includes = false - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ ":libaom_config" ] - if (!is_win || is_clang) { - cflags = [ "-march=armv8-a+crc" ] - } - sources = aom_av1_encoder_intrin_arm_crc32 - } -} - static_library("libaom") { check_includes = false if (!is_debug && is_win) { @@ -278,9 +265,6 @@ static_library("libaom") { if (current_cpu == "arm64") { # This is needed by all arm boards due to aom_arm_cpu_caps() sources += [ "source/libaom/aom_ports/aarch64_cpudetect.c" ] - deps += [ - ":libaom_intrinsics_arm_crc32", - ] } if (current_cpu == "arm") { # This is needed by all arm boards due to aom_arm_cpu_caps() diff --git a/src/third_party/libaom/cmake_update.sh b/src/third_party/libaom/cmake_update.sh index bbba1d76..9d23cd6b 100755 --- a/src/third_party/libaom/cmake_update.sh +++ b/src/third_party/libaom/cmake_update.sh @@ -185,12 +185,12 @@ gen_config_files linux/arm-neon \ reset_dirs linux/arm-neon-cpu-detect gen_config_files linux/arm-neon-cpu-detect \ - "${toolchain}/armv7-linux-gcc.cmake -DCONFIG_RUNTIME_CPU_DETECT=1 -DENABLE_NEON_DOTPROD=0 -DENABLE_NEON_I8MM=0 \ + "${toolchain}/armv7-linux-gcc.cmake -DCONFIG_RUNTIME_CPU_DETECT=1 -DENABLE_ARM_CRC32=0 -DENABLE_NEON_DOTPROD=0 -DENABLE_NEON_I8MM=0 \ ${all_platforms}" reset_dirs linux/arm64-cpu-detect gen_config_files linux/arm64-cpu-detect \ - "${toolchain}/arm64-linux-gcc.cmake -DCONFIG_RUNTIME_CPU_DETECT=1 -DENABLE_NEON_DOTPROD=0 -DENABLE_NEON_I8MM=0 \ + "${toolchain}/arm64-linux-gcc.cmake -DCONFIG_RUNTIME_CPU_DETECT=1 -DENABLE_ARM_CRC32=0 -DENABLE_NEON_DOTPROD=0 -DENABLE_NEON_I8MM=0 \ ${all_platforms}" # CMAKE_INSTALL_NAME_TOOL is set to a non-empty/true value to allow this @@ -198,12 +198,12 @@ gen_config_files linux/arm64-cpu-detect \ # commands are not invoked so the value doesn't matter. reset_dirs ios/arm-neon gen_config_files ios/arm-neon \ - "${toolchain}/armv7-ios.cmake -DCMAKE_INSTALL_NAME_TOOL=no-such-command -DENABLE_NEON_DOTPROD=0 -DENABLE_NEON_I8MM=0 \ + "${toolchain}/armv7-ios.cmake -DCMAKE_INSTALL_NAME_TOOL=no-such-command -DENABLE_ARM_CRC32=0 -DENABLE_NEON_DOTPROD=0 -DENABLE_NEON_I8MM=0 \ ${all_platforms}" reset_dirs ios/arm64 gen_config_files ios/arm64 \ - "${toolchain}/arm64-ios.cmake -DCMAKE_INSTALL_NAME_TOOL=no-such-command -DENABLE_NEON_DOTPROD=0 -DENABLE_NEON_I8MM=0 \ + "${toolchain}/arm64-ios.cmake -DCMAKE_INSTALL_NAME_TOOL=no-such-command -DENABLE_ARM_CRC32=0 -DENABLE_NEON_DOTPROD=0 -DENABLE_NEON_I8MM=0 \ ${all_platforms}" # Copy linux configurations and modify for Windows. @@ -215,7 +215,7 @@ convert_to_windows "${CFG}/win/arm64-cpu-detect/config/aom_config.h" update_readme -git cl format > /dev/null \ - || echo "WARNING: 'git cl format' failed. Please run 'git cl format' manually." +# git cl format > /dev/null \ +# || echo "WARNING: 'git cl format' failed. Please run 'git cl format' manually." cleanup