Update libaom up to M120

https://bugs.webkit.org/show_bug.cgi?id=265863
rdar://119182695

Reviewed by Jean-Yves Avenard.

* Source/ThirdParty/libwebrtc/Configurations/libaom.xcconfig: Moving from iOS to minux arm64-cpu-detect.
* Source/ThirdParty/libwebrtc/Source/third_party/libaom/source/libaom/: Resynced.
* Source/ThirdParty/libwebrtc/libwebrtc.xcodeproj/project.pbxproj:

Canonical link: https://commits.webkit.org/271613@main

Author: youennf

Source/ThirdParty/libwebrtc/Configurations/libaom.xcconfig

@@ -14,7 +14,7 @@ WARNING_CFLAGS = -Wno-implicit-function-declaration -Wno-strict-prototypes;
 
 // FIXME: Enable x86 optimization
 HEADER_SEARCH_PATHS[arch=x86_64] = Source/third_party/libaom/source/config/linux/generic Source/third_party/libaom/source/libaom Source/third_party/libaom/source/config;
-HEADER_SEARCH_PATHS[arch=arm64*] = Source/third_party/libaom/source/config/ios/arm64 Source/third_party/libaom/source/libaom Source/third_party/libaom/source/config;
+HEADER_SEARCH_PATHS[arch=arm64*] = Source/third_party/libaom/source/config/linux/arm64-cpu-detect Source/third_party/libaom/source/libaom Source/third_party/libaom/source/config;
 
 INSTALL_PATH = $(INSTALL_PATH_PREFIX)$(WK_LIBRARY_INSTALL_PATH);
 PUBLIC_HEADERS_FOLDER_PATH = $(INSTALL_PATH_PREFIX)$(WK_LIBRARY_HEADERS_FOLDER_PATH)/libwebrtc;
@@ -26,12 +26,13 @@ GCC_PREPROCESSOR_DEFINITIONS[sdk=iphonesimulator*] = $(inherited);
 GCC_PREPROCESSOR_DEFINITIONS[sdk=macosx*] = $(inherited) $(GCC_PREPROCESSOR_DEFINITIONS_$(WK_IS_CATALYST))
 GCC_PREPROCESSOR_DEFINITIONS_YES = WEBRTC_WEBKIT_MAC_CATALIST
 
-ARM_FILES = *_neon.c arm_cpudetect.c *_arm.c
+ARM_FILES = *_neon.c arm_cpudetect.c *_arm.c hash_arm_crc32.c *_neon_dotprod.c *_neon.c
 X86_FILES = *_sse2.c *_ssse3.c *_sse4.c *_avx2.c *_avx2.cc *_avx.c *.asm
 
 EXCLUDED_SOURCE_FILE_NAMES[arch=x86_64] = $(ARM_FILES) $(EXCLUDED_SOURCE_FILE_NAMES_$(WK_IS_CATALYST));
 EXCLUDED_SOURCE_FILE_NAMES_YES = *_sse4.c *_avx.c;
 EXCLUDED_SOURCE_FILE_NAMES[arch=arm64*] = $(X86_FILES) *_mmx.c
 EXCLUDED_SOURCE_FILE_NAMES[sdk=iphonesimulator*][arch=x86_64] = $(ARM_FILES) $(X86_FILES)
+EXCLUDED_SOURCE_FILE_NAMES[sdk=iphoneos*] =  $(X86_FILES) *_mmx.c hash_arm_crc32.c *_neon_dotprod.c
 
 OTHER_LDFLAGS = $(inherited) $(SOURCE_VERSION_LDFLAGS);

Source/ThirdParty/libwebrtc/Source/third_party/libaom/BUILD.gn

@@ -8,6 +8,7 @@ import("//build/config/arm.gni")
 import("//build/config/sanitizers/sanitizers.gni")
 import("//testing/libfuzzer/fuzzer_test.gni")
 import("//third_party/libaom/libaom_srcs.gni")
+import("//third_party/libaom/libaom_test_srcs.gni")
 import("//third_party/libaom/options.gni")
 import("//third_party/nasm/nasm_assemble.gni")
 
@@ -36,6 +37,8 @@ if (current_cpu == "x86") {
   } else {
     cpu_arch_full = "arm"
   }
+} else if (current_cpu == "arm64") {
+  cpu_arch_full = "arm64-cpu-detect"
 } else if (current_cpu == "riscv64") {
   cpu_arch_full = "generic"
 } else if (current_cpu == "loong64") {
@@ -47,10 +50,8 @@ if (current_cpu == "x86") {
 if (is_nacl) {
   platform_include_dir = "source/config/linux/generic"
 } else {
-  if (is_ios && current_cpu == "arm") {
-    os_category = current_os
-  } else if (is_posix || is_fuchsia) {
-    # Should cover linux, fuchsia, mac, and the ios simulator.
+  if (is_posix || is_fuchsia) {
+    # Should cover linux, fuchsia, mac, and ios.
     os_category = "linux"
   } else {  # This should only match windows.
     os_category = current_os
@@ -208,7 +209,47 @@ 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
+  }
+
+  source_set("libaom_intrinsics_neon_dotprod") {
+    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.2-a+dotprod" ]
+    }
+    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 += [ ":libaom_config" ]
+    if (!is_win || is_clang) {
+      cflags = [ "-march=armv8.2-a+dotprod+i8mm" ]
+    }
+    sources = aom_av1_common_intrin_neon_i8mm
+    sources += aom_dsp_common_intrin_neon_i8mm
+  }
+}
+
 static_library("libaom") {
+  check_includes = false
   if (!is_debug && is_win) {
     configs -= [ "//build/config/compiler:default_optimization" ]
     configs += [ "//build/config/compiler:optimize_max" ]
@@ -258,13 +299,21 @@ static_library("libaom") {
       cpu_arch_full == "arm-neon-cpu-detect") {
     deps += [ ":libaom_intrinsics_neon" ]
   }
-  if (current_cpu == "arm64" || current_cpu == "arm") {
+  if (current_cpu == "arm64") {
     # This is needed by all arm boards due to aom_arm_cpu_caps()
-    sources +=
-        [ "//third_party/libaom/source/libaom/aom_ports/arm_cpudetect.c" ]
+    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") {
+    # This is needed by all arm boards due to aom_arm_cpu_caps()
+    sources += [ "source/libaom/aom_ports/aarch32_cpudetect.c" ]
   }
   if (is_android) {
-    deps += [ "//third_party/android_ndk:cpu_features" ]
+    deps += [ "//third_party/cpu_features:ndk_compat" ]
   }
   public_configs = [ ":libaom_external_config" ]
   public_deps = [ ":libaom_buildflags" ]
@@ -294,3 +343,47 @@ fuzzer_test("libaom_av1_dec_fuzzer") {
   deps = [ ":libaom" ]
   additional_configs = [ ":libaom_config" ]
 }
+
+config("test_libaom_config") {
+  include_dirs = [ "//third_party/libaom/source/libaom/third_party/libwebm" ]
+}
+
+test("test_libaom") {
+  sources = aom_libwebm_sources
+  sources += aom_webm_decoder_sources
+  sources += aom_webm_encoder_sources
+  sources += aom_common_app_util_sources
+  sources += aom_decoder_app_util_sources
+  sources += aom_encoder_app_util_sources
+  sources += aom_unit_test_common_sources
+  sources += aom_unit_test_decoder_sources
+  sources += aom_unit_test_encoder_sources
+  sources += aom_unit_test_wrapper_sources
+  sources += [ "source/gen_src/usage_exit.c" ]
+
+  deps = [
+    ":libaom",
+    "//third_party/googletest:gtest",
+  ]
+
+  defines = [ "CHROMIUM" ]
+
+  if (is_android) {
+    use_raw_android_executable = true
+    defines += [ "LIBAOM_TEST_DATA_PATH=/data/local/tmp/chromium_tests_root/third_party/libaom/testdata" ]
+    data = [ "testdata/" ]
+  } else {
+    defines += [ string_join("",
+                             [
+                               "LIBAOM_TEST_DATA_PATH=",
+                               rebase_path("testdata", root_build_dir),
+                             ]) ]
+  }
+
+  configs -= [ "//build/config/compiler:chromium_code" ]
+  configs += [
+    "//build/config/compiler:no_chromium_code",
+    ":libaom_config",
+    ":test_libaom_config",
+  ]
+}

Source/ThirdParty/libwebrtc/Source/third_party/libaom/OWNERS

@@ -2,3 +2,7 @@
 jzern@chromium.org
 jzern@google.com
 wtc@google.com
+
+# Secondary OWNERS
+dalecurtis@chromium.org
+eugene@chromium.org

Source/ThirdParty/libwebrtc/Source/third_party/libaom/README.chromium

@@ -1,13 +1,13 @@
 Name: Alliance for Open Media Video Codec
 Short Name: libaom
 URL: https://aomedia.googlesource.com/aom/
-Version: 0
-Date: Wednesday May 10 2023
-Revision: 5f516275fb8761562bd877f2a8f185cd76c2a274
-CPEPrefix: cpe:/a:aomedia:aomedia:3.6.0
+Version: N/A
+Revision: 1dbe1c7fae2456f91ccc79fecb919e9ffea0727a
+CPEPrefix: cpe:/a:aomedia:aomedia:3.6.1
 License: BSD
 License File: source/libaom/LICENSE
 Security Critical: yes
+Shipped: yes
 
 Description:
 Provides tools for:
@@ -40,7 +40,7 @@ after running roll_dep.py.
      ./cmake_update.sh
 
    This will also update this file with the new revision.
-   Update 'Version' and 'CPEPrefix' in this file if necessary.
+   Update 'Revision' and 'CPEPrefix' in this file if necessary.
 
 3. Amend the commit created by the first step:
 

Source/ThirdParty/libwebrtc/Source/third_party/libaom/cmake_update.sh

@@ -22,8 +22,8 @@
 # - gcc-aarch64-linux-gnu
 # - g++-aarch64-linux-gnu
 # 32bit build environment for cmake. Including but potentially not limited to:
-# - lib32gcc-12-dev
-# - lib32stdc++-12-dev
+# - lib32gcc-13-dev
+# - lib32stdc++-13-dev
 # Alternatively: treat 32bit builds like Windows and manually tweak aom_config.h
 
 set -eE
@@ -80,21 +80,15 @@ function gen_config_files() {
 }
 
 function update_readme() {
-  local IFS=$'\n'
-  # Split git log output '<date>\n<commit hash>' on the newline to produce 2
-  # array entries.
-  local vals=($(git -C "${SRC}" --no-pager log -1 --format="%cd%n%H" \
-    --date=format:"%A %B %d %Y"))
+  local revision=$(git -C "${SRC}" --no-pager log -1 --format="%H")
   sed -E -i.bak \
-    -e "s/^(Date:)[[:space:]]+.*$/\1 ${vals[0]}/" \
-    -e "s/^(Revision:)[[:space:]]+[a-f0-9]{40}/\1 ${vals[1]}/" \
+    -e "s/^(Revision:)[[:space:]]+[a-f0-9]{40}/\1 ${revision}/" \
     ${BASE}/README.chromium
   rm ${BASE}/README.chromium.bak
   cat <<EOF
 
 README.chromium updated with:
-Date: ${vals[0]}
-Revision: ${vals[1]}
+Revision: ${revision}
 EOF
 }
 
@@ -143,8 +137,11 @@ gen_config_files linux/generic "-DAOM_TARGET_CPU=generic ${all_platforms}"
 # Strip .pl files from gni
 sed -i.bak '/\.pl",$/d' libaom_srcs.gni
 rm libaom_srcs.gni.bak
-# libaom_srcs.gni and aom_version.h are shared.
+# libaom_srcs.gni, libaom_test_srcs.gni, usage_exit.c
+# and aom_version.h are shared.
 cp libaom_srcs.gni "${BASE}"
+cp libaom_test_srcs.gni "${BASE}"
+cp gen_src/usage_exit.c "${BASE}/source/gen_src"
 cp config/aom_version.h "${CFG}/config/"
 
 reset_dirs linux/ia32
@@ -177,34 +174,24 @@ gen_config_files linux/arm \
 
 reset_dirs linux/arm-neon
 gen_config_files linux/arm-neon \
-  "${toolchain}/armv7-linux-gcc.cmake ${all_platforms}"
+  "${toolchain}/armv7-linux-gcc.cmake -DCONFIG_RUNTIME_CPU_DETECT=0 \
+   ${all_platforms}"
 
 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 \
    ${all_platforms}"
 
-reset_dirs linux/arm64
-gen_config_files linux/arm64 \
-  "${toolchain}/arm64-linux-gcc.cmake ${all_platforms}"
-
-# CMAKE_INSTALL_NAME_TOOL is set to a non-empty/true value to allow this
-# configuration to complete on platforms without `install_name`. The build
-# 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 \
-   ${all_platforms}"
-
-reset_dirs ios/arm64
-gen_config_files ios/arm64 \
-  "${toolchain}/arm64-ios.cmake -DCMAKE_INSTALL_NAME_TOOL=no-such-command \
+reset_dirs linux/arm64-cpu-detect
+gen_config_files linux/arm64-cpu-detect \
+  "${toolchain}/arm64-linux-gcc.cmake -DCONFIG_RUNTIME_CPU_DETECT=1 \
    ${all_platforms}"
 
 # Copy linux configurations and modify for Windows.
-reset_dirs win/arm64
-cp "${CFG}/linux/arm64/config"/* "${CFG}/win/arm64/config/"
-convert_to_windows "${CFG}/win/arm64/config/aom_config.h"
+reset_dirs win/arm64-cpu-detect
+cp "${CFG}/linux/arm64-cpu-detect/config"/* \
+  "${CFG}/win/arm64-cpu-detect/config/"
+convert_to_windows "${CFG}/win/arm64-cpu-detect/config/aom_config.h"
 )
 
 update_readme