Commit 83ed7d9735 for aom

commit 83ed7d973533fc045b116f4c7d22f66c86d407bb
Author: Jerome Jiang <jianj@google.com>
Date:   Thu Nov 12 17:19:42 2026 -0500

    Prepare Highway SIMD config for Chromium

    - Define HWY_DISABLE_PCLMUL_AES alongside HWY_HEADER_ONLY when
      CONFIG_HIGHWAY=1 in CMakeLists.txt.
    - Gate HAS_SSE4_1 on SSE..SSE4.2 (+ PCLMUL/AES if enabled),
      HAS_AVX2 on HAS_SSE4_1 + FMA/BMI1/BMI2/F16C, and HAS_AVX512 on
      HAS_AVX2 in aom_ports/x86.h when CONFIG_HIGHWAY=1 so runtime
      CPUID detection matches Highway's target pragmas.
    - Mark third_party/highway as shipped in Chromium in
      README.libaom.

    Change-Id: Ibf014d987b476ca4e22e65409003c3c9bd8ac35b

diff --git a/CMakeLists.txt b/CMakeLists.txt
index d2bf63bff5..26b4dd6f70 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -301,7 +301,7 @@ if(CONFIG_HIGHWAY)
               "${AOM_ROOT}/third_party/highway/hwy/contrib/dot/dot-inl.h"
               "${AOM_ROOT}/third_party/highway/hwy/contrib/image/image.h"
               "${AOM_ROOT}/third_party/highway/hwy/contrib/math/math-inl.h")
-  add_definitions(-DHWY_HEADER_ONLY)
+  add_definitions(-DHWY_HEADER_ONLY -DHWY_DISABLE_PCLMUL_AES)
   add_library(aom_hwy OBJECT ${AOM_HIGHWAY_SOURCES})
   set_target_properties(aom_hwy PROPERTIES LINKER_LANGUAGE CXX)
   set(AOM_LIB_TARGETS ${AOM_LIB_TARGETS} aom_hwy)
diff --git a/aom_ports/x86.h b/aom_ports/x86.h
index 4d00d7241c..83868bb406 100644
--- a/aom_ports/x86.h
+++ b/aom_ports/x86.h
@@ -177,12 +177,18 @@ static inline uint64_t xgetbv(void) {
 #define SSE_BITS BIT(25)
 #define SSE2_BITS BIT(26)
 #define SSE3_BITS BIT(0)
+#define PCLMUL_BITS BIT(1)
 #define SSSE3_BITS BIT(9)
+#define FMA_BITS BIT(12)
 #define SSE4_1_BITS BIT(19)
 #define SSE4_2_BITS BIT(20)
+#define AES_BITS BIT(25)
 // Bits 27 (OSXSAVE) & 28 (256-bit AVX)
 #define AVX_BITS (BIT(27) | BIT(28))
+#define F16C_BITS BIT(29)
+#define BMI1_BITS BIT(3)
 #define AVX2_BITS BIT(5)
+#define BMI2_BITS BIT(8)
 // Bits 16 (AVX512-F) & 17 (AVX512-DQ) & 28 (AVX512-CD) & 30 (AVX512-BW)
 // & 31 (AVX512-VL)
 #define AVX512_BITS (BIT(16) | BIT(17) | BIT(28) | BIT(30) | BIT(31))
@@ -192,6 +198,31 @@ static inline uint64_t xgetbv(void) {
 #define AVX512_DL_BITS \
   (BIT(1) | BIT(6) | BIT(8) | BIT(9) | BIT(10) | BIT(11) | BIT(12) | BIT(14))

+#if CONFIG_HIGHWAY
+#if defined(HWY_DISABLE_PCLMUL_AES)
+#define HWY_PCLMUL_AES_BITS 0
+#else
+#define HWY_PCLMUL_AES_BITS (PCLMUL_BITS | AES_BITS)
+#endif
+#if defined(HWY_DISABLE_BMI2_FMA)
+#define HWY_FMA_BITS 0
+#define HWY_BMI_BITS 0
+#else
+#define HWY_FMA_BITS FMA_BITS
+#define HWY_BMI_BITS (BMI1_BITS | BMI2_BITS)
+#endif
+#if defined(HWY_DISABLE_F16C)
+#define HWY_F16C_BITS 0
+#else
+#define HWY_F16C_BITS F16C_BITS
+#endif
+#define HWY_SSE4_EDX_BITS (SSE_BITS | SSE2_BITS)
+#define HWY_SSE4_ECX_BITS \
+  (SSE3_BITS | SSSE3_BITS | SSE4_1_BITS | SSE4_2_BITS | HWY_PCLMUL_AES_BITS)
+#define HWY_AVX2_ECX_BITS (HWY_SSE4_ECX_BITS | HWY_FMA_BITS | HWY_F16C_BITS)
+#define HWY_AVX2_EBX_BITS (AVX2_BITS | HWY_BMI_BITS)
+#endif  // CONFIG_HIGHWAY
+
 #define FEATURE_SET(reg, feature) \
   (((reg) & (feature##_BITS)) == (feature##_BITS))

@@ -221,7 +252,14 @@ static inline int x86_simd_caps(void) {
   flags |= FEATURE_SET(reg_edx, SSE2) ? HAS_SSE2 : 0;
   flags |= FEATURE_SET(reg_ecx, SSE3) ? HAS_SSE3 : 0;
   flags |= FEATURE_SET(reg_ecx, SSSE3) ? HAS_SSSE3 : 0;
+#if CONFIG_HIGHWAY
+  if (FEATURE_SET(reg_edx, HWY_SSE4_EDX) &&
+      FEATURE_SET(reg_ecx, HWY_SSE4_ECX)) {
+    flags |= HAS_SSE4_1;
+  }
+#else
   flags |= FEATURE_SET(reg_ecx, SSE4_1) ? HAS_SSE4_1 : 0;
+#endif
   flags |= FEATURE_SET(reg_ecx, SSE4_2) ? HAS_SSE4_2 : 0;

   // bits 27 (OSXSAVE) & 28 (256-bit AVX)
@@ -230,14 +268,24 @@ static inline int x86_simd_caps(void) {
     if ((xgetbv() & 0x6) == 0x6) {
       flags |= HAS_AVX;
       if (max_cpuid_val >= 7) {
+#if CONFIG_HIGHWAY
+        const int has_avx2_leaf1 =
+            (flags & HAS_SSE4_1) && FEATURE_SET(reg_ecx, HWY_AVX2_ECX);
+#endif
         /* Get the leaf 7 feature flags. Needed to check for AVX2 support */
         cpuid(7, 0, reg_eax, reg_ebx, reg_ecx, reg_edx);
+#if CONFIG_HIGHWAY
+        if (has_avx2_leaf1 && FEATURE_SET(reg_ebx, HWY_AVX2_EBX)) {
+          flags |= HAS_AVX2;
+        }
+#else
         flags |= FEATURE_SET(reg_ebx, AVX2) ? HAS_AVX2 : 0;
+#endif
         // Check for OS-support of ZMM and YMM state. Necessary for AVX512.
         // Only set HAS_AVX512 flag if AVX512_DL feature are supported.
         // Older AVX512 implementations (such as Skylake) have turbo curves that
         // are currently problematic for mixed AVX512/AVX2 code
-        if ((xgetbv() & 0xe6) == 0xe6) {
+        if ((flags & HAS_AVX2) && (xgetbv() & 0xe6) == 0xe6) {
           flags |=
               FEATURE_SET(reg_ebx, AVX512) && FEATURE_SET(reg_ecx, AVX512_DL)
                   ? HAS_AVX512
diff --git a/third_party/highway/README.libaom b/third_party/highway/README.libaom
index b19ee19117..828a7c1c33 100644
--- a/third_party/highway/README.libaom
+++ b/third_party/highway/README.libaom
@@ -6,7 +6,7 @@ Update Mechanism: Manual
 Revision: adf91c746e70c58389e5793e658ba4d04051b138
 License: BSD-3-Clause
 License File: LICENSE-BSD3
-Shipped in Chromium: no
+Shipped in Chromium: yes
 Security Critical: yes

 Description: