public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
From: Than Ngo <than@redhat.com>
To: git-commits@fedoraproject.org
Subject: [rpms/chromium] epel9-next: - Update to 144.0.7559.59
Date: Fri, 07 Aug 2026 16:08:37 GMT	[thread overview]
Message-ID: <178611891755.1.7884042325931469784.rpms-chromium-8afd22427084@fedoraproject.org> (raw)

          A new commit has been pushed.

          Repo   : rpms/chromium
          Branch : epel9-next
          Commit : 8afd224270843061fbdb2d9d3d7a1d84f5a3ba82
          Author : Than Ngo <than@redhat.com>
          Date   : 2026-01-14T11:03:27+01:00
          Stats  : +5159/-5012 in 46 file(s)
          URL    : https://src.fedoraproject.org/rpms/chromium/c/8afd224270843061fbdb2d9d3d7a1d84f5a3ba82?branch=epel9-next

          Log:
          - Update to 144.0.7559.59
* CVE-2026-0899: Out of bounds memory access in V8
* CVE-2026-0900: Inappropriate implementation in V8
* CVE-2026-0901: Inappropriate implementation in Blink
* CVE-2026-0902: Inappropriate implementation in V8
* CVE-2026-0903: Insufficient validation of untrusted input in Downloads
* CVE-2026-0904: Incorrect security UI in Digital Credentials
* CVE-2026-0905: Insufficient policy enforcement in Network
* CVE-2026-0906: Incorrect security UI
* CVE-2026-0907: Incorrect security UI in Split View
* CVE-2026-0908: Use after free in ANGLE

---
diff --git a/0001-Add-PPC64-support-for-boringssl.patch b/0001-Add-PPC64-support-for-boringssl.patch
index a9139b0..11ef25c 100644
--- a/0001-Add-PPC64-support-for-boringssl.patch
+++ b/0001-Add-PPC64-support-for-boringssl.patch
@@ -1,7 +1,7 @@
-Index: chromium-143.0.7499.40/third_party/boringssl/src/crypto/abi_self_test.cc
+Index: chromium-144.0.7559.59/third_party/boringssl/src/crypto/abi_self_test.cc
 ===================================================================
---- chromium-143.0.7499.40.orig/third_party/boringssl/src/crypto/abi_self_test.cc
-+++ chromium-143.0.7499.40/third_party/boringssl/src/crypto/abi_self_test.cc
+--- chromium-144.0.7559.59.orig/third_party/boringssl/src/crypto/abi_self_test.cc
++++ chromium-144.0.7559.59/third_party/boringssl/src/crypto/abi_self_test.cc
 @@ -521,3 +521,289 @@ TEST(ABITest, AArch64) {
    CHECK_ABI_NO_UNWIND(abi_test_clobber_v15_upper);
  }
@@ -292,10 +292,10 @@ Index: chromium-143.0.7499.40/third_party/boringssl/src/crypto/abi_self_test.cc
 +  CHECK_ABI_NO_UNWIND(abi_test_clobber_lr);
 +}
 +#endif   // OPENSSL_PPC64LE && SUPPORTS_ABI_TEST
-Index: chromium-143.0.7499.40/third_party/boringssl/src/crypto/cpu_ppc64le.cc
+Index: chromium-144.0.7559.59/third_party/boringssl/src/crypto/cpu_ppc64le.cc
 ===================================================================
 --- /dev/null
-+++ chromium-143.0.7499.40/third_party/boringssl/src/crypto/cpu_ppc64le.cc
++++ chromium-144.0.7559.59/third_party/boringssl/src/crypto/cpu_ppc64le.cc
 @@ -0,0 +1,38 @@
 +/* Copyright (c) 2016, Google Inc.
 + *
@@ -335,10 +335,10 @@ Index: chromium-143.0.7499.40/third_party/boringssl/src/crypto/cpu_ppc64le.cc
 +}
 +
 +#endif  // OPENSSL_PPC64LE
-Index: chromium-143.0.7499.40/third_party/boringssl/src/crypto/crypto.cc
+Index: chromium-144.0.7559.59/third_party/boringssl/src/crypto/crypto.cc
 ===================================================================
---- chromium-143.0.7499.40.orig/third_party/boringssl/src/crypto/crypto.cc
-+++ chromium-143.0.7499.40/third_party/boringssl/src/crypto/crypto.cc
+--- chromium-144.0.7559.59.orig/third_party/boringssl/src/crypto/crypto.cc
++++ chromium-144.0.7559.59/third_party/boringssl/src/crypto/crypto.cc
 @@ -67,6 +67,10 @@ uint32_t OPENSSL_get_ia32cap(int idx) {
    return OPENSSL_ia32cap_P[idx];
  }
@@ -350,10 +350,10 @@ Index: chromium-143.0.7499.40/third_party/boringssl/src/crypto/crypto.cc
  #elif (defined(OPENSSL_ARM) || defined(OPENSSL_AARCH64)) && \
      !defined(OPENSSL_STATIC_ARMCAP)
  HIDDEN uint32_t OPENSSL_armcap_P = 0;
-Index: chromium-143.0.7499.40/third_party/boringssl/src/crypto/fipsmodule/aes/asm/aesp8-ppc.pl
+Index: chromium-144.0.7559.59/third_party/boringssl/src/crypto/fipsmodule/aes/asm/aesp8-ppc.pl
 ===================================================================
 --- /dev/null
-+++ chromium-143.0.7499.40/third_party/boringssl/src/crypto/fipsmodule/aes/asm/aesp8-ppc.pl
++++ chromium-144.0.7559.59/third_party/boringssl/src/crypto/fipsmodule/aes/asm/aesp8-ppc.pl
 @@ -0,0 +1,3809 @@
 +#! /usr/bin/env perl
 +# Copyright 2014-2018 The OpenSSL Project Authors. All Rights Reserved.
@@ -4164,10 +4164,10 @@ Index: chromium-143.0.7499.40/third_party/boringssl/src/crypto/fipsmodule/aes/as
 +}
 +
 +close STDOUT or die "error closing STDOUT: $!";
-Index: chromium-143.0.7499.40/third_party/boringssl/src/crypto/fipsmodule/aes/internal.h
+Index: chromium-144.0.7559.59/third_party/boringssl/src/crypto/fipsmodule/aes/internal.h
 ===================================================================
---- chromium-143.0.7499.40.orig/third_party/boringssl/src/crypto/fipsmodule/aes/internal.h
-+++ chromium-143.0.7499.40/third_party/boringssl/src/crypto/fipsmodule/aes/internal.h
+--- chromium-144.0.7559.59.orig/third_party/boringssl/src/crypto/fipsmodule/aes/internal.h
++++ chromium-144.0.7559.59/third_party/boringssl/src/crypto/fipsmodule/aes/internal.h
 @@ -81,6 +81,12 @@ inline int vpaes_capable(void) { return
  inline int vpaes_capable(void) { return CRYPTO_is_NEON_capable(); }
  #endif
@@ -4195,10 +4195,10 @@ Index: chromium-143.0.7499.40/third_party/boringssl/src/crypto/fipsmodule/aes/in
  #endif
  #endif  // OPENSSL_NO_ASM
  
-Index: chromium-143.0.7499.40/third_party/boringssl/src/crypto/fipsmodule/bcm.cc
+Index: chromium-144.0.7559.59/third_party/boringssl/src/crypto/fipsmodule/bcm.cc
 ===================================================================
---- chromium-143.0.7499.40.orig/third_party/boringssl/src/crypto/fipsmodule/bcm.cc
-+++ chromium-143.0.7499.40/third_party/boringssl/src/crypto/fipsmodule/bcm.cc
+--- chromium-144.0.7559.59.orig/third_party/boringssl/src/crypto/fipsmodule/bcm.cc
++++ chromium-144.0.7559.59/third_party/boringssl/src/crypto/fipsmodule/bcm.cc
 @@ -105,6 +105,7 @@
  #include "self_check/fips.cc.inc"
  #include "self_check/self_check.cc.inc"
@@ -4207,10 +4207,10 @@ Index: chromium-143.0.7499.40/third_party/boringssl/src/crypto/fipsmodule/bcm.cc
  #include "sha/sha1.cc.inc"
  #include "sha/sha256.cc.inc"
  #include "sha/sha512.cc.inc"
-Index: chromium-143.0.7499.40/third_party/boringssl/src/crypto/fipsmodule/bn/bn.cc.inc
+Index: chromium-144.0.7559.59/third_party/boringssl/src/crypto/fipsmodule/bn/bn.cc.inc
 ===================================================================
---- chromium-143.0.7499.40.orig/third_party/boringssl/src/crypto/fipsmodule/bn/bn.cc.inc
-+++ chromium-143.0.7499.40/third_party/boringssl/src/crypto/fipsmodule/bn/bn.cc.inc
+--- chromium-144.0.7559.59.orig/third_party/boringssl/src/crypto/fipsmodule/bn/bn.cc.inc
++++ chromium-144.0.7559.59/third_party/boringssl/src/crypto/fipsmodule/bn/bn.cc.inc
 @@ -330,6 +330,23 @@ int bn_expand(BIGNUM *bn, size_t bits) {
  }
  
@@ -4235,11 +4235,11 @@ Index: chromium-143.0.7499.40/third_party/boringssl/src/crypto/fipsmodule/bn/bn.
    if ((size_t)bn->width <= words) {
      if (!bn_wexpand(bn, words)) {
        return 0;
-Index: chromium-143.0.7499.40/third_party/boringssl/src/crypto/fipsmodule/cipher/e_aes.cc.inc
+Index: chromium-144.0.7559.59/third_party/boringssl/src/crypto/fipsmodule/cipher/e_aes.cc.inc
 ===================================================================
---- chromium-143.0.7499.40.orig/third_party/boringssl/src/crypto/fipsmodule/cipher/e_aes.cc.inc
-+++ chromium-143.0.7499.40/third_party/boringssl/src/crypto/fipsmodule/cipher/e_aes.cc.inc
-@@ -1229,6 +1229,8 @@ int EVP_has_aes_hardware(void) {
+--- chromium-144.0.7559.59.orig/third_party/boringssl/src/crypto/fipsmodule/cipher/e_aes.cc.inc
++++ chromium-144.0.7559.59/third_party/boringssl/src/crypto/fipsmodule/cipher/e_aes.cc.inc
+@@ -1234,6 +1234,8 @@ int EVP_has_aes_hardware(void) {
    return hwaes_capable() && crypto_gcm_clmul_enabled();
  #elif defined(OPENSSL_ARM) || defined(OPENSSL_AARCH64)
    return hwaes_capable() && CRYPTO_is_ARMv8_PMULL_capable();
@@ -4248,10 +4248,10 @@ Index: chromium-143.0.7499.40/third_party/boringssl/src/crypto/fipsmodule/cipher
  #else
    return 0;
  #endif
-Index: chromium-143.0.7499.40/third_party/boringssl/src/crypto/fipsmodule/aes/asm/ghashp8-ppc.pl
+Index: chromium-144.0.7559.59/third_party/boringssl/src/crypto/fipsmodule/aes/asm/ghashp8-ppc.pl
 ===================================================================
 --- /dev/null
-+++ chromium-143.0.7499.40/third_party/boringssl/src/crypto/fipsmodule/aes/asm/ghashp8-ppc.pl
++++ chromium-144.0.7559.59/third_party/boringssl/src/crypto/fipsmodule/aes/asm/ghashp8-ppc.pl
 @@ -0,0 +1,671 @@
 +#! /usr/bin/env perl
 +# Copyright 2014-2016 The OpenSSL Project Authors. All Rights Reserved.
@@ -4924,10 +4924,10 @@ Index: chromium-143.0.7499.40/third_party/boringssl/src/crypto/fipsmodule/aes/as
 +}
 +
 +close STDOUT or die "error closing STDOUT: $!"; # enforce flush
-Index: chromium-143.0.7499.40/third_party/boringssl/src/crypto/fipsmodule/aes/gcm.cc.inc
+Index: chromium-144.0.7559.59/third_party/boringssl/src/crypto/fipsmodule/aes/gcm.cc.inc
 ===================================================================
---- chromium-143.0.7499.40.orig/third_party/boringssl/src/crypto/fipsmodule/aes/gcm.cc.inc
-+++ chromium-143.0.7499.40/third_party/boringssl/src/crypto/fipsmodule/aes/gcm.cc.inc
+--- chromium-144.0.7559.59.orig/third_party/boringssl/src/crypto/fipsmodule/aes/gcm.cc.inc
++++ chromium-144.0.7559.59/third_party/boringssl/src/crypto/fipsmodule/aes/gcm.cc.inc
 @@ -233,6 +233,13 @@ void CRYPTO_ghash_init(gmult_func *out_m
      *out_hash = gcm_ghash_neon;
      return;
@@ -4942,10 +4942,10 @@ Index: chromium-143.0.7499.40/third_party/boringssl/src/crypto/fipsmodule/aes/gc
  #endif
  
    gcm_init_nohw(out_table, H);
-Index: chromium-143.0.7499.40/third_party/boringssl/src/crypto/fipsmodule/aes/gcm_test.cc
+Index: chromium-144.0.7559.59/third_party/boringssl/src/crypto/fipsmodule/aes/gcm_test.cc
 ===================================================================
---- chromium-143.0.7499.40.orig/third_party/boringssl/src/crypto/fipsmodule/aes/gcm_test.cc
-+++ chromium-143.0.7499.40/third_party/boringssl/src/crypto/fipsmodule/aes/gcm_test.cc
+--- chromium-144.0.7559.59.orig/third_party/boringssl/src/crypto/fipsmodule/aes/gcm_test.cc
++++ chromium-144.0.7559.59/third_party/boringssl/src/crypto/fipsmodule/aes/gcm_test.cc
 @@ -169,5 +169,15 @@ TEST(GCMTest, ABI) {
      }
    }
@@ -4962,10 +4962,10 @@ Index: chromium-143.0.7499.40/third_party/boringssl/src/crypto/fipsmodule/aes/gc
 +#endif  // GHASH_ASM_PPC64LE
  }
  #endif  // SUPPORTS_ABI_TEST && !OPENSSL_NO_ASM
-Index: chromium-143.0.7499.40/third_party/boringssl/src/crypto/rand/getrandom_fillin.h
+Index: chromium-144.0.7559.59/third_party/boringssl/src/crypto/rand/getrandom_fillin.h
 ===================================================================
---- chromium-143.0.7499.40.orig/third_party/boringssl/src/crypto/rand/getrandom_fillin.h
-+++ chromium-143.0.7499.40/third_party/boringssl/src/crypto/rand/getrandom_fillin.h
+--- chromium-144.0.7559.59.orig/third_party/boringssl/src/crypto/rand/getrandom_fillin.h
++++ chromium-144.0.7559.59/third_party/boringssl/src/crypto/rand/getrandom_fillin.h
 @@ -30,6 +30,8 @@
  #define EXPECTED_NR_getrandom 278
  #elif defined(OPENSSL_ARM)
@@ -4975,10 +4975,10 @@ Index: chromium-143.0.7499.40/third_party/boringssl/src/crypto/rand/getrandom_fi
  #elif defined(OPENSSL_RISCV64)
  #define EXPECTED_NR_getrandom 278
  #endif
-Index: chromium-143.0.7499.40/third_party/boringssl/src/crypto/fipsmodule/rand/rand.cc.inc
+Index: chromium-144.0.7559.59/third_party/boringssl/src/crypto/fipsmodule/rand/rand.cc.inc
 ===================================================================
---- chromium-143.0.7499.40.orig/third_party/boringssl/src/crypto/fipsmodule/rand/rand.cc.inc
-+++ chromium-143.0.7499.40/third_party/boringssl/src/crypto/fipsmodule/rand/rand.cc.inc
+--- chromium-144.0.7559.59.orig/third_party/boringssl/src/crypto/fipsmodule/rand/rand.cc.inc
++++ chromium-144.0.7559.59/third_party/boringssl/src/crypto/fipsmodule/rand/rand.cc.inc
 @@ -425,6 +425,11 @@ bcm_infallible BCM_rand_bytes_with_addit
      // Take a read lock around accesses to |state->drbg|. This is needed to
      // avoid returning bad entropy if we race with
@@ -4991,10 +4991,10 @@ Index: chromium-143.0.7499.40/third_party/boringssl/src/crypto/fipsmodule/rand/r
      CRYPTO_MUTEX_lock_read(&state->clear_drbg_lock);
  #endif
      if (!CTR_DRBG_reseed_ex(&state->drbg, seed, sizeof(seed),
-Index: chromium-143.0.7499.40/third_party/boringssl/src/crypto/fipsmodule/sha/internal.h
+Index: chromium-144.0.7559.59/third_party/boringssl/src/crypto/fipsmodule/sha/internal.h
 ===================================================================
---- chromium-143.0.7499.40.orig/third_party/boringssl/src/crypto/fipsmodule/sha/internal.h
-+++ chromium-143.0.7499.40/third_party/boringssl/src/crypto/fipsmodule/sha/internal.h
+--- chromium-144.0.7559.59.orig/third_party/boringssl/src/crypto/fipsmodule/sha/internal.h
++++ chromium-144.0.7559.59/third_party/boringssl/src/crypto/fipsmodule/sha/internal.h
 @@ -23,6 +23,16 @@
  extern "C" {
  #endif
@@ -5012,10 +5012,10 @@ Index: chromium-143.0.7499.40/third_party/boringssl/src/crypto/fipsmodule/sha/in
  // Define SHA{n}[_{variant}]_ASM if sha{n}_block_data_order[_{variant}] is
  // defined in assembly.
  
-Index: chromium-143.0.7499.40/third_party/boringssl/src/crypto/fipsmodule/sha/sha1-altivec.cc.inc
+Index: chromium-144.0.7559.59/third_party/boringssl/src/crypto/fipsmodule/sha/sha1-altivec.cc.inc
 ===================================================================
 --- /dev/null
-+++ chromium-143.0.7499.40/third_party/boringssl/src/crypto/fipsmodule/sha/sha1-altivec.cc.inc
++++ chromium-144.0.7559.59/third_party/boringssl/src/crypto/fipsmodule/sha/sha1-altivec.cc.inc
 @@ -0,0 +1,369 @@
 +/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.ccom)
 + * All rights reserved.
@@ -5386,10 +5386,10 @@ Index: chromium-143.0.7499.40/third_party/boringssl/src/crypto/fipsmodule/sha/sh
 +#undef BODY_20_39
 +#undef BODY_40_59
 +#undef BODY_60_79
-Index: chromium-143.0.7499.40/third_party/boringssl/src/crypto/internal.h
+Index: chromium-144.0.7559.59/third_party/boringssl/src/crypto/internal.h
 ===================================================================
---- chromium-143.0.7499.40.orig/third_party/boringssl/src/crypto/internal.h
-+++ chromium-143.0.7499.40/third_party/boringssl/src/crypto/internal.h
+--- chromium-144.0.7559.59.orig/third_party/boringssl/src/crypto/internal.h
++++ chromium-144.0.7559.59/third_party/boringssl/src/crypto/internal.h
 @@ -66,8 +66,9 @@ extern "C" {
  #if !defined(OPENSSL_NO_ASM) && !defined(OPENSSL_STATIC_ARMCAP) && \
      (defined(OPENSSL_X86) || defined(OPENSSL_X86_64) ||            \
@@ -5402,7 +5402,7 @@ Index: chromium-143.0.7499.40/third_party/boringssl/src/crypto/internal.h
  #define NEED_CPUID
  
  // OPENSSL_cpuid_setup initializes the platform-specific feature cache. This
-@@ -1419,6 +1420,16 @@ inline int CRYPTO_is_ARMv8_SHA512_capabl
+@@ -1420,6 +1421,16 @@ inline int CRYPTO_is_ARMv8_SHA512_capabl
  #endif  // OPENSSL_ARM || OPENSSL_AARCH64
  
  
@@ -5419,10 +5419,10 @@ Index: chromium-143.0.7499.40/third_party/boringssl/src/crypto/internal.h
  #if defined(BORINGSSL_DISPATCH_TEST)
  // Runtime CPU dispatch testing support
  
-Index: chromium-143.0.7499.40/third_party/boringssl/src/crypto/perlasm/ppc-xlate.pl
+Index: chromium-144.0.7559.59/third_party/boringssl/src/crypto/perlasm/ppc-xlate.pl
 ===================================================================
 --- /dev/null
-+++ chromium-143.0.7499.40/third_party/boringssl/src/crypto/perlasm/ppc-xlate.pl
++++ chromium-144.0.7559.59/third_party/boringssl/src/crypto/perlasm/ppc-xlate.pl
 @@ -0,0 +1,320 @@
 +#! /usr/bin/env perl
 +# Copyright 2006-2016 The OpenSSL Project Authors. All Rights Reserved.
@@ -5744,10 +5744,10 @@ Index: chromium-143.0.7499.40/third_party/boringssl/src/crypto/perlasm/ppc-xlate
 +___
 +
 +close STDOUT or die "error closing STDOUT: $!";
-Index: chromium-143.0.7499.40/third_party/boringssl/src/crypto/test/abi_test.h
+Index: chromium-144.0.7559.59/third_party/boringssl/src/crypto/test/abi_test.h
 ===================================================================
---- chromium-143.0.7499.40.orig/third_party/boringssl/src/crypto/test/abi_test.h
-+++ chromium-143.0.7499.40/third_party/boringssl/src/crypto/test/abi_test.h
+--- chromium-144.0.7559.59.orig/third_party/boringssl/src/crypto/test/abi_test.h
++++ chromium-144.0.7559.59/third_party/boringssl/src/crypto/test/abi_test.h
 @@ -179,7 +179,78 @@ struct alignas(16) Reg128 {
    CALLER_STATE_REGISTER(uint64_t, x28)                               \
    CALLER_STATE_REGISTER(uint64_t, x29)
@@ -5854,10 +5854,10 @@ Index: chromium-143.0.7499.40/third_party/boringssl/src/crypto/test/abi_test.h
    static_assert(sizeof...(args) <= 8,
                  "too many arguments for abi_test_trampoline");
  
-Index: chromium-143.0.7499.40/third_party/boringssl/src/crypto/test/asm/trampoline-ppc.pl
+Index: chromium-144.0.7559.59/third_party/boringssl/src/crypto/test/asm/trampoline-ppc.pl
 ===================================================================
 --- /dev/null
-+++ chromium-143.0.7499.40/third_party/boringssl/src/crypto/test/asm/trampoline-ppc.pl
++++ chromium-144.0.7559.59/third_party/boringssl/src/crypto/test/asm/trampoline-ppc.pl
 @@ -0,0 +1,262 @@
 +#!/usr/bin/env perl
 +# Copyright (c) 2019, Google Inc.
@@ -6121,10 +6121,10 @@ Index: chromium-143.0.7499.40/third_party/boringssl/src/crypto/test/asm/trampoli
 +
 +print $code;
 +close STDOUT or die "error closing STDOUT: $!";
-Index: chromium-143.0.7499.40/third_party/boringssl/src/include/openssl/target.h
+Index: chromium-144.0.7559.59/third_party/boringssl/src/include/openssl/target.h
 ===================================================================
---- chromium-143.0.7499.40.orig/third_party/boringssl/src/include/openssl/target.h
-+++ chromium-143.0.7499.40/third_party/boringssl/src/include/openssl/target.h
+--- chromium-144.0.7559.59.orig/third_party/boringssl/src/include/openssl/target.h
++++ chromium-144.0.7559.59/third_party/boringssl/src/include/openssl/target.h
 @@ -34,6 +34,9 @@
  #elif defined(__ARMEL__) || defined(_M_ARM)
  #define OPENSSL_32_BIT
@@ -6135,10 +6135,10 @@ Index: chromium-143.0.7499.40/third_party/boringssl/src/include/openssl/target.h
  #elif defined(__MIPSEL__) && !defined(__LP64__)
  #define OPENSSL_32_BIT
  #define OPENSSL_MIPS
-Index: chromium-143.0.7499.40/third_party/boringssl/src/util/fipstools/acvp/modulewrapper/main.cc
+Index: chromium-144.0.7559.59/third_party/boringssl/src/util/fipstools/acvp/modulewrapper/main.cc
 ===================================================================
---- chromium-143.0.7499.40.orig/third_party/boringssl/src/util/fipstools/acvp/modulewrapper/main.cc
-+++ chromium-143.0.7499.40/third_party/boringssl/src/util/fipstools/acvp/modulewrapper/main.cc
+--- chromium-144.0.7559.59.orig/third_party/boringssl/src/util/fipstools/acvp/modulewrapper/main.cc
++++ chromium-144.0.7559.59/third_party/boringssl/src/util/fipstools/acvp/modulewrapper/main.cc
 @@ -31,6 +31,8 @@ int main(int argc, char **argv) {
      puts("ARM (32-bit)");
  #elif defined(OPENSSL_AARCH64)
@@ -6148,10 +6148,10 @@ Index: chromium-143.0.7499.40/third_party/boringssl/src/util/fipstools/acvp/modu
  #else
  #error "FIPS build not supported on this architecture"
  #endif
-Index: chromium-143.0.7499.40/third_party/boringssl/src/util/fipstools/delocate/delocate.go
+Index: chromium-144.0.7559.59/third_party/boringssl/src/util/fipstools/delocate/delocate.go
 ===================================================================
---- chromium-143.0.7499.40.orig/third_party/boringssl/src/util/fipstools/delocate/delocate.go
-+++ chromium-143.0.7499.40/third_party/boringssl/src/util/fipstools/delocate/delocate.go
+--- chromium-144.0.7559.59.orig/third_party/boringssl/src/util/fipstools/delocate/delocate.go
++++ chromium-144.0.7559.59/third_party/boringssl/src/util/fipstools/delocate/delocate.go
 @@ -56,7 +56,8 @@ type stringWriter interface {
  type processorType int
  
@@ -6751,10 +6751,10 @@ Index: chromium-143.0.7499.40/third_party/boringssl/src/util/fipstools/delocate/
  		case "str", "bl", "ldr", "st1":
  			return aarch64
  		}
-Index: chromium-143.0.7499.40/third_party/boringssl/src/util/fipstools/delocate/delocate.peg
+Index: chromium-144.0.7559.59/third_party/boringssl/src/util/fipstools/delocate/delocate.peg
 ===================================================================
---- chromium-143.0.7499.40.orig/third_party/boringssl/src/util/fipstools/delocate/delocate.peg
-+++ chromium-143.0.7499.40/third_party/boringssl/src/util/fipstools/delocate/delocate.peg
+--- chromium-144.0.7559.59.orig/third_party/boringssl/src/util/fipstools/delocate/delocate.peg
++++ chromium-144.0.7559.59/third_party/boringssl/src/util/fipstools/delocate/delocate.peg
 @@ -12,9 +12,9 @@
  # See the License for the specific language governing permissions and
  # limitations under the License.
@@ -6768,10 +6768,10 @@ Index: chromium-143.0.7499.40/third_party/boringssl/src/util/fipstools/delocate/
  
  # To regenerate delocate.peg.go:
  #
-Index: chromium-143.0.7499.40/third_party/boringssl/src/util/fipstools/delocate/delocate_test.go
+Index: chromium-144.0.7559.59/third_party/boringssl/src/util/fipstools/delocate/delocate_test.go
 ===================================================================
---- chromium-143.0.7499.40.orig/third_party/boringssl/src/util/fipstools/delocate/delocate_test.go
-+++ chromium-143.0.7499.40/third_party/boringssl/src/util/fipstools/delocate/delocate_test.go
+--- chromium-144.0.7559.59.orig/third_party/boringssl/src/util/fipstools/delocate/delocate_test.go
++++ chromium-144.0.7559.59/third_party/boringssl/src/util/fipstools/delocate/delocate_test.go
 @@ -39,6 +39,11 @@ func (test *delocateTest) Path(file stri
  
  var delocateTests = []delocateTest{
@@ -6784,10 +6784,10 @@ Index: chromium-143.0.7499.40/third_party/boringssl/src/util/fipstools/delocate/
  	{"x86_64-Basic", []string{"in.s"}, "out.s"},
  	{"x86_64-BSS", []string{"in.s"}, "out.s"},
  	{"x86_64-GOTRewrite", []string{"in.s"}, "out.s"},
-Index: chromium-143.0.7499.40/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-GlobalEntry/in.s
+Index: chromium-144.0.7559.59/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-GlobalEntry/in.s
 ===================================================================
 --- /dev/null
-+++ chromium-143.0.7499.40/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-GlobalEntry/in.s
++++ chromium-144.0.7559.59/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-GlobalEntry/in.s
 @@ -0,0 +1,9 @@
 +	.text
 +foo:
@@ -6798,10 +6798,10 @@ Index: chromium-143.0.7499.40/third_party/boringssl/src/util/fipstools/delocate/
 +	.localentry foo,.-foo
 +.LVL0:
 +	bl
-Index: chromium-143.0.7499.40/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-GlobalEntry/out.s
+Index: chromium-144.0.7559.59/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-GlobalEntry/out.s
 ===================================================================
 --- /dev/null
-+++ chromium-143.0.7499.40/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-GlobalEntry/out.s
++++ chromium-144.0.7559.59/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-GlobalEntry/out.s
 @@ -0,0 +1,62 @@
 +.text
 +.file 1 "inserted_by_delocate.cc"
@@ -6865,19 +6865,19 @@ Index: chromium-143.0.7499.40/third_party/boringssl/src/util/fipstools/delocate/
 +.byte 0xff
 +.byte 0x31
 +.byte 0x80
-Index: chromium-143.0.7499.40/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-LoadToR0/in.s
+Index: chromium-144.0.7559.59/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-LoadToR0/in.s
 ===================================================================
 --- /dev/null
-+++ chromium-143.0.7499.40/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-LoadToR0/in.s
++++ chromium-144.0.7559.59/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-LoadToR0/in.s
 @@ -0,0 +1,4 @@
 +	.text
 +foo:
 +	addis 22,2,bar@toc@ha
 +	ld 0,bar@toc@l(22)
-Index: chromium-143.0.7499.40/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-LoadToR0/out.s
+Index: chromium-144.0.7559.59/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-LoadToR0/out.s
 ===================================================================
 --- /dev/null
-+++ chromium-143.0.7499.40/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-LoadToR0/out.s
++++ chromium-144.0.7559.59/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-LoadToR0/out.s
 @@ -0,0 +1,72 @@
 +.text
 +.file 1 "inserted_by_delocate.cc"
@@ -6951,10 +6951,10 @@ Index: chromium-143.0.7499.40/third_party/boringssl/src/util/fipstools/delocate/
 +.byte 0xff
 +.byte 0x31
 +.byte 0x80
-Index: chromium-143.0.7499.40/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-Sample/in.s
+Index: chromium-144.0.7559.59/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-Sample/in.s
 ===================================================================
 --- /dev/null
-+++ chromium-143.0.7499.40/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-Sample/in.s
++++ chromium-144.0.7559.59/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-Sample/in.s
 @@ -0,0 +1,161 @@
 +	.file	"foo.cc"
 +	.abiversion 2
@@ -7117,10 +7117,10 @@ Index: chromium-143.0.7499.40/third_party/boringssl/src/util/fipstools/delocate/
 +	.size	exported_function,.-exported_function
 +	.ident	"GCC: (Ubuntu 4.9.2-10ubuntu13) 4.9.2"
 +	.section	.note.GNU-stack,"",@progbits
-Index: chromium-143.0.7499.40/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-Sample/out.s
+Index: chromium-144.0.7559.59/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-Sample/out.s
 ===================================================================
 --- /dev/null
-+++ chromium-143.0.7499.40/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-Sample/out.s
++++ chromium-144.0.7559.59/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-Sample/out.s
 @@ -0,0 +1,552 @@
 +.text
 +.file 1 "inserted_by_delocate.cc"
@@ -7674,10 +7674,10 @@ Index: chromium-143.0.7499.40/third_party/boringssl/src/util/fipstools/delocate/
 +.byte 0xff
 +.byte 0x31
 +.byte 0x80
-Index: chromium-143.0.7499.40/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-Sample2/in.s
+Index: chromium-144.0.7559.59/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-Sample2/in.s
 ===================================================================
 --- /dev/null
-+++ chromium-143.0.7499.40/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-Sample2/in.s
++++ chromium-144.0.7559.59/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-Sample2/in.s
 @@ -0,0 +1,226 @@
 +	.file	"foo.cc"
 +	.abiversion 2
@@ -7905,10 +7905,10 @@ Index: chromium-143.0.7499.40/third_party/boringssl/src/util/fipstools/delocate/
 +	.zero	20
 +	.ident	"GCC: (Ubuntu 4.9.2-10ubuntu13) 4.9.2"
 +	.section	.note.GNU-stack,"",@progbits
-Index: chromium-143.0.7499.40/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-Sample2/out.s
+Index: chromium-144.0.7559.59/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-Sample2/out.s
 ===================================================================
 --- /dev/null
-+++ chromium-143.0.7499.40/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-Sample2/out.s
++++ chromium-144.0.7559.59/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-Sample2/out.s
 @@ -0,0 +1,677 @@
 +.text
 +.file 1 "inserted_by_delocate.cc"
@@ -8587,10 +8587,10 @@ Index: chromium-143.0.7499.40/third_party/boringssl/src/util/fipstools/delocate/
 +.byte 0xff
 +.byte 0x31
 +.byte 0x80
-Index: chromium-143.0.7499.40/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-TOCWithOffset/in.s
+Index: chromium-144.0.7559.59/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-TOCWithOffset/in.s
 ===================================================================
 --- /dev/null
-+++ chromium-143.0.7499.40/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-TOCWithOffset/in.s
++++ chromium-144.0.7559.59/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-TOCWithOffset/in.s
 @@ -0,0 +1,23 @@
 +	.text
 +foo:
@@ -8615,10 +8615,10 @@ Index: chromium-143.0.7499.40/third_party/boringssl/src/util/fipstools/delocate/
 +
 +	addis 4, 2, 1+foo-2@toc@ha+3
 +	addi 4, 4, 1+foo-2@toc@l+3
-Index: chromium-143.0.7499.40/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-TOCWithOffset/out.s
+Index: chromium-144.0.7559.59/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-TOCWithOffset/out.s
 ===================================================================
 --- /dev/null
-+++ chromium-143.0.7499.40/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-TOCWithOffset/out.s
++++ chromium-144.0.7559.59/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-TOCWithOffset/out.s
 @@ -0,0 +1,178 @@
 +.text
 +.file 1 "inserted_by_delocate.cc"
@@ -8798,10 +8798,10 @@ Index: chromium-143.0.7499.40/third_party/boringssl/src/util/fipstools/delocate/
 +.byte 0xff
 +.byte 0x31
 +.byte 0x80
-Index: chromium-143.0.7499.40/third_party/boringssl/src/crypto/fipsmodule/sha/sha1.cc.inc
+Index: chromium-144.0.7559.59/third_party/boringssl/src/crypto/fipsmodule/sha/sha1.cc.inc
 ===================================================================
---- chromium-143.0.7499.40.orig/third_party/boringssl/src/crypto/fipsmodule/sha/sha1.cc.inc
-+++ chromium-143.0.7499.40/third_party/boringssl/src/crypto/fipsmodule/sha/sha1.cc.inc
+--- chromium-144.0.7559.59.orig/third_party/boringssl/src/crypto/fipsmodule/sha/sha1.cc.inc
++++ chromium-144.0.7559.59/third_party/boringssl/src/crypto/fipsmodule/sha/sha1.cc.inc
 @@ -377,6 +377,10 @@ static void sha1_block_data_order(uint32
      return;
    }
@@ -8813,10 +8813,10 @@ Index: chromium-143.0.7499.40/third_party/boringssl/src/crypto/fipsmodule/sha/sh
    sha1_block_data_order_nohw(state, data, num);
  }
  
-Index: chromium-143.0.7499.40/third_party/boringssl/src/build.json
+Index: chromium-144.0.7559.59/third_party/boringssl/src/build.json
 ===================================================================
---- chromium-143.0.7499.40.orig/third_party/boringssl/src/build.json
-+++ chromium-143.0.7499.40/third_party/boringssl/src/build.json
+--- chromium-144.0.7559.59.orig/third_party/boringssl/src/build.json
++++ chromium-144.0.7559.59/third_party/boringssl/src/build.json
 @@ -130,6 +130,10 @@
              {"src": "crypto/fipsmodule/sha/asm/sha512-armv4.pl"},
              {"src": "crypto/fipsmodule/aes/asm/vpaes-armv7.pl"}
@@ -8836,7 +8836,7 @@ Index: chromium-143.0.7499.40/third_party/boringssl/src/build.json
              "crypto/crypto.cc",
              "crypto/curve25519/curve25519.cc",
              "crypto/curve25519/curve25519_64_adx.cc",
-@@ -803,6 +808,9 @@
+@@ -805,6 +810,9 @@
          "perlasm_arm": [
              {"src": "crypto/test/asm/trampoline-armv4.pl"}
          ],
@@ -8846,10 +8846,10 @@ Index: chromium-143.0.7499.40/third_party/boringssl/src/build.json
          "perlasm_x86": [
              {"src": "crypto/test/asm/trampoline-x86.pl"}
          ],
-Index: chromium-143.0.7499.40/third_party/boringssl/src/util/pregenerate/build.go
+Index: chromium-144.0.7559.59/third_party/boringssl/src/util/pregenerate/build.go
 ===================================================================
---- chromium-143.0.7499.40.orig/third_party/boringssl/src/util/pregenerate/build.go
-+++ chromium-143.0.7499.40/third_party/boringssl/src/util/pregenerate/build.go
+--- chromium-144.0.7559.59.orig/third_party/boringssl/src/util/pregenerate/build.go
++++ chromium-144.0.7559.59/third_party/boringssl/src/util/pregenerate/build.go
 @@ -38,6 +38,7 @@ type InputTarget struct {
  	// architecture.
  	PerlasmAarch64 []PerlasmSource `json:"perlasm_aarch64,omitempty"`
@@ -8868,10 +8868,10 @@ Index: chromium-143.0.7499.40/third_party/boringssl/src/util/pregenerate/build.g
  	for _, p := range in.PerlasmX86 {
  		addPerlasmTask(&out.Asm, &p, "-apple.S", []string{"macosx", "-fPIC"})
  		addPerlasmTask(&out.Asm, &p, "-linux.S", []string{"elf", "-fPIC"})
-Index: chromium-143.0.7499.40/third_party/boringssl/README.ppc64le
+Index: chromium-144.0.7559.59/third_party/boringssl/README.ppc64le
 ===================================================================
 --- /dev/null
-+++ chromium-143.0.7499.40/third_party/boringssl/README.ppc64le
++++ chromium-144.0.7559.59/third_party/boringssl/README.ppc64le
 @@ -0,0 +1,8 @@
 +==============================================================
 +To recreate boringssl pregenerated files patch for ppc64le:
@@ -8881,10 +8881,10 @@ Index: chromium-143.0.7499.40/third_party/boringssl/README.ppc64le
 +go run ./util/pregenerate
 +cd ../../../../
 +diff -urN chromium-*/third_party/boringssl/src/gen.orig chromium-*/third_party/boringssl/src/gen
-Index: chromium-143.0.7499.40/third_party/boringssl/src/gen/sources.gni
+Index: chromium-144.0.7559.59/third_party/boringssl/src/gen/sources.gni
 ===================================================================
---- chromium-143.0.7499.40.orig/third_party/boringssl/src/gen/sources.gni
-+++ chromium-143.0.7499.40/third_party/boringssl/src/gen/sources.gni
+--- chromium-144.0.7559.59.orig/third_party/boringssl/src/gen/sources.gni
++++ chromium-144.0.7559.59/third_party/boringssl/src/gen/sources.gni
 @@ -123,6 +123,7 @@ bcm_sources_asm = [
    "gen/bcm/aesv8-gcm-armv8-apple.S",
    "gen/bcm/aesv8-gcm-armv8-linux.S",

diff --git a/0001-Add-ppc64-target-to-libaom.patch b/0001-Add-ppc64-target-to-libaom.patch
index c328bda..b6d5ffe 100644
--- a/0001-Add-ppc64-target-to-libaom.patch
+++ b/0001-Add-ppc64-target-to-libaom.patch
@@ -8,10 +8,10 @@ Subject: [PATCH] Add ppc64 target to libaom
  third_party/libaom/cmake_update.sh |  3 +++
  2 files changed, 15 insertions(+)
 
-Index: chromium-143.0.7499.40/third_party/libaom/BUILD.gn
+Index: chromium-144.0.7559.59/third_party/libaom/BUILD.gn
 ===================================================================
---- chromium-143.0.7499.40.orig/third_party/libaom/BUILD.gn
-+++ chromium-143.0.7499.40/third_party/libaom/BUILD.gn
+--- chromium-144.0.7559.59.orig/third_party/libaom/BUILD.gn
++++ chromium-144.0.7559.59/third_party/libaom/BUILD.gn
 @@ -299,6 +299,18 @@ if (current_cpu == "arm64" || current_cp
    }
  }
@@ -41,10 +41,10 @@ Index: chromium-143.0.7499.40/third_party/libaom/BUILD.gn
    if (is_android) {
      deps += [ "//third_party/cpu_features:ndk_compat" ]
    }
-Index: chromium-143.0.7499.40/third_party/libaom/cmake_update.sh
+Index: chromium-144.0.7559.59/third_party/libaom/cmake_update.sh
 ===================================================================
---- chromium-143.0.7499.40.orig/third_party/libaom/cmake_update.sh
-+++ chromium-143.0.7499.40/third_party/libaom/cmake_update.sh
+--- chromium-144.0.7559.59.orig/third_party/libaom/cmake_update.sh
++++ chromium-144.0.7559.59/third_party/libaom/cmake_update.sh
 @@ -167,6 +167,9 @@ egrep \
    "#define [A-Z0-9_]+[[:space:]]+[01]" "${CFG}/win/ia32/config/aom_config.h" \
    | awk '{print "%define " $2 " " $3}' > "${CFG}/win/ia32/config/aom_config.asm"

diff --git a/0001-Add-pregenerated-config-for-libaom-on-ppc64.patch b/0001-Add-pregenerated-config-for-libaom-on-ppc64.patch
index 176ab0d..2f82037 100644
--- a/0001-Add-pregenerated-config-for-libaom-on-ppc64.patch
+++ b/0001-Add-pregenerated-config-for-libaom-on-ppc64.patch
@@ -1,7 +1,7 @@
-Index: chromium-143.0.7499.40/third_party/libaom/source/config/linux/ppc64/config/aom_config.asm
+Index: chromium-144.0.7559.59/third_party/libaom/source/config/linux/ppc64/config/aom_config.asm
 ===================================================================
 --- /dev/null
-+++ chromium-143.0.7499.40/third_party/libaom/source/config/linux/ppc64/config/aom_config.asm
++++ chromium-144.0.7559.59/third_party/libaom/source/config/linux/ppc64/config/aom_config.asm
 @@ -0,0 +1,100 @@
 +;
 +; Copyright (c) 2025, Alliance for Open Media. All rights reserved.
@@ -103,10 +103,10 @@ Index: chromium-143.0.7499.40/third_party/libaom/source/config/linux/ppc64/confi
 +HAVE_VSX equ 1
 +HAVE_WXWIDGETS equ 0
 +STATIC_LINK_JXL equ 0
-Index: chromium-143.0.7499.40/third_party/libaom/source/config/linux/ppc64/config/aom_config.c
+Index: chromium-144.0.7559.59/third_party/libaom/source/config/linux/ppc64/config/aom_config.c
 ===================================================================
 --- /dev/null
-+++ chromium-143.0.7499.40/third_party/libaom/source/config/linux/ppc64/config/aom_config.c
++++ chromium-144.0.7559.59/third_party/libaom/source/config/linux/ppc64/config/aom_config.c
 @@ -0,0 +1,13 @@
 +/*
 + * Copyright (c) 2025, Alliance for Open Media. All rights reserved.
@@ -121,10 +121,10 @@ Index: chromium-143.0.7499.40/third_party/libaom/source/config/linux/ppc64/confi
 +#include "aom/aom_codec.h"
 +static const char* const cfg = "cmake ../source/libaom -G \"Unix Makefiles\" -DCMAKE_TOOLCHAIN_FILE=\"../source/libaom/build/cmake/toolchains/ppc-linux-gcc.cmake\" -DCONFIG_AV1_DECODER=0 -DCONFIG_AV1_ENCODER=1 -DCONFIG_AV1_HIGHBITDEPTH=0 -DCONFIG_AV1_TEMPORAL_DENOISING=1 -DCONFIG_QUANT_MATRIX=0 -DCONFIG_REALTIME_ONLY=1 -DCONFIG_SIZE_LIMIT=1 -DDECODE_HEIGHT_LIMIT=16384 -DDECODE_WIDTH_LIMIT=16384";
 +const char *aom_codec_build_config(void) {return cfg;}
-Index: chromium-143.0.7499.40/third_party/libaom/source/config/linux/ppc64/config/aom_config.h
+Index: chromium-144.0.7559.59/third_party/libaom/source/config/linux/ppc64/config/aom_config.h
 ===================================================================
 --- /dev/null
-+++ chromium-143.0.7499.40/third_party/libaom/source/config/linux/ppc64/config/aom_config.h
++++ chromium-144.0.7559.59/third_party/libaom/source/config/linux/ppc64/config/aom_config.h
 @@ -0,0 +1,103 @@
 +/*
 + * Copyright (c) 2025, Alliance for Open Media. All rights reserved.
@@ -229,10 +229,10 @@ Index: chromium-143.0.7499.40/third_party/libaom/source/config/linux/ppc64/confi
 +#define HAVE_WXWIDGETS 0
 +#define STATIC_LINK_JXL 0
 +#endif  // AOM_CONFIG_H_
-Index: chromium-143.0.7499.40/third_party/libaom/source/config/linux/ppc64/config/aom_dsp_rtcd.h
+Index: chromium-144.0.7559.59/third_party/libaom/source/config/linux/ppc64/config/aom_dsp_rtcd.h
 ===================================================================
 --- /dev/null
-+++ chromium-143.0.7499.40/third_party/libaom/source/config/linux/ppc64/config/aom_dsp_rtcd.h
++++ chromium-144.0.7559.59/third_party/libaom/source/config/linux/ppc64/config/aom_dsp_rtcd.h
 @@ -0,0 +1,1177 @@
 +/*
 + * Copyright (c) 2025, Alliance for Open Media. All rights reserved.
@@ -1411,10 +1411,10 @@ Index: chromium-143.0.7499.40/third_party/libaom/source/config/linux/ppc64/confi
 +#endif
 +
 +#endif  // AOM_DSP_RTCD_H_
-Index: chromium-143.0.7499.40/third_party/libaom/source/config/linux/ppc64/config/aom_scale_rtcd.h
+Index: chromium-144.0.7559.59/third_party/libaom/source/config/linux/ppc64/config/aom_scale_rtcd.h
 ===================================================================
 --- /dev/null
-+++ chromium-143.0.7499.40/third_party/libaom/source/config/linux/ppc64/config/aom_scale_rtcd.h
++++ chromium-144.0.7559.59/third_party/libaom/source/config/linux/ppc64/config/aom_scale_rtcd.h
 @@ -0,0 +1,91 @@
 +/*
 + * Copyright (c) 2025, Alliance for Open Media. All rights reserved.
@@ -1507,10 +1507,10 @@ Index: chromium-143.0.7499.40/third_party/libaom/source/config/linux/ppc64/confi
 +#endif
 +
 +#endif  // AOM_SCALE_RTCD_H_
-Index: chromium-143.0.7499.40/third_party/libaom/source/config/linux/ppc64/config/av1_rtcd.h
+Index: chromium-144.0.7559.59/third_party/libaom/source/config/linux/ppc64/config/av1_rtcd.h
 ===================================================================
 --- /dev/null
-+++ chromium-143.0.7499.40/third_party/libaom/source/config/linux/ppc64/config/av1_rtcd.h
++++ chromium-144.0.7559.59/third_party/libaom/source/config/linux/ppc64/config/av1_rtcd.h
 @@ -0,0 +1,405 @@
 +/*
 + * Copyright (c) 2025, Alliance for Open Media. All rights reserved.

diff --git a/0001-Enable-ppc64-pointer-compression.patch b/0001-Enable-ppc64-pointer-compression.patch
index b8ef777..a7197a5 100644
--- a/0001-Enable-ppc64-pointer-compression.patch
+++ b/0001-Enable-ppc64-pointer-compression.patch
@@ -1,8 +1,8 @@
-Index: chromium-143.0.7499.40/v8/gni/v8.gni
+Index: chromium-144.0.7559.59/v8/gni/v8.gni
 ===================================================================
---- chromium-143.0.7499.40.orig/v8/gni/v8.gni
-+++ chromium-143.0.7499.40/v8/gni/v8.gni
-@@ -298,7 +298,7 @@ assert(
+--- chromium-144.0.7559.59.orig/v8/gni/v8.gni
++++ chromium-144.0.7559.59/v8/gni/v8.gni
+@@ -317,7 +317,7 @@ assert(
  if (v8_enable_pointer_compression == "") {
    v8_enable_pointer_compression =
        v8_current_cpu == "arm64" || v8_current_cpu == "x64" ||

diff --git a/0001-Force-baseline-POWER8-AltiVec-VSX-CPU-features-when-.patch b/0001-Force-baseline-POWER8-AltiVec-VSX-CPU-features-when-.patch
index 6842368..3c1c68d 100644
--- a/0001-Force-baseline-POWER8-AltiVec-VSX-CPU-features-when-.patch
+++ b/0001-Force-baseline-POWER8-AltiVec-VSX-CPU-features-when-.patch
@@ -8,11 +8,11 @@ Subject: [PATCH] Force baseline POWER8 / AltiVec / VSX CPU features when on a
  BUILD.gn | 6 ++++++
  1 file changed, 6 insertions(+)
 
-Index: chromium-143.0.7499.40/v8/BUILD.gn
+Index: chromium-144.0.7559.59/v8/BUILD.gn
 ===================================================================
---- chromium-143.0.7499.40.orig/v8/BUILD.gn
-+++ chromium-143.0.7499.40/v8/BUILD.gn
-@@ -1577,7 +1577,14 @@ config("toolchain") {
+--- chromium-144.0.7559.59.orig/v8/BUILD.gn
++++ chromium-144.0.7559.59/v8/BUILD.gn
+@@ -1596,7 +1596,14 @@ config("toolchain") {
    if (v8_current_cpu == "ppc64") {
      defines += [ "V8_TARGET_ARCH_PPC64" ]
      cflags += [ "-ffp-contract=off" ]

diff --git a/0001-Implement-support-for-PPC64-on-Linux.patch b/0001-Implement-support-for-PPC64-on-Linux.patch
index 2bfce0a..772cd3c 100644
--- a/0001-Implement-support-for-PPC64-on-Linux.patch
+++ b/0001-Implement-support-for-PPC64-on-Linux.patch
@@ -40,20 +40,20 @@ This patch implements support for the PPC64 architecture on Linux hosts.
  util/misc/capture_context_test_util_linux.cc  |   6 +
  36 files changed, 932 insertions(+), 12 deletions(-)
 
-Index: chromium-143.0.7499.40/third_party/crashpad/crashpad/CONTRIBUTORS
+Index: chromium-144.0.7559.59/third_party/crashpad/crashpad/CONTRIBUTORS
 ===================================================================
---- chromium-143.0.7499.40.orig/third_party/crashpad/crashpad/CONTRIBUTORS
-+++ chromium-143.0.7499.40/third_party/crashpad/crashpad/CONTRIBUTORS
+--- chromium-144.0.7559.59.orig/third_party/crashpad/crashpad/CONTRIBUTORS
++++ chromium-144.0.7559.59/third_party/crashpad/crashpad/CONTRIBUTORS
 @@ -13,3 +13,5 @@ Mark Mentovai <mark@chromium.org>
  Robert Sesek <rsesek@chromium.org>
  Scott Graham <scottmg@chromium.org>
  Joshua Peraza <jperaza@chromium.org>
 +Shawn Anastasio <sanastasio@raptorengineering.com>
 +Timothy Pearson <tpearson@raptorengineering.com>
-Index: chromium-143.0.7499.40/third_party/crashpad/crashpad/minidump/minidump_context.h
+Index: chromium-144.0.7559.59/third_party/crashpad/crashpad/minidump/minidump_context.h
 ===================================================================
---- chromium-143.0.7499.40.orig/third_party/crashpad/crashpad/minidump/minidump_context.h
-+++ chromium-143.0.7499.40/third_party/crashpad/crashpad/minidump/minidump_context.h
+--- chromium-144.0.7559.59.orig/third_party/crashpad/crashpad/minidump/minidump_context.h
++++ chromium-144.0.7559.59/third_party/crashpad/crashpad/minidump/minidump_context.h
 @@ -686,6 +686,70 @@ struct MinidumpContextRISCV64 {
    uint32_t fcsr;
  };
@@ -125,10 +125,10 @@ Index: chromium-143.0.7499.40/third_party/crashpad/crashpad/minidump/minidump_co
  }  // namespace crashpad
  
  #endif  // CRASHPAD_MINIDUMP_MINIDUMP_CONTEXT_H_
-Index: chromium-143.0.7499.40/third_party/crashpad/crashpad/minidump/minidump_context_writer.cc
+Index: chromium-144.0.7559.59/third_party/crashpad/crashpad/minidump/minidump_context_writer.cc
 ===================================================================
---- chromium-143.0.7499.40.orig/third_party/crashpad/crashpad/minidump/minidump_context_writer.cc
-+++ chromium-143.0.7499.40/third_party/crashpad/crashpad/minidump/minidump_context_writer.cc
+--- chromium-144.0.7559.59.orig/third_party/crashpad/crashpad/minidump/minidump_context_writer.cc
++++ chromium-144.0.7559.59/third_party/crashpad/crashpad/minidump/minidump_context_writer.cc
 @@ -110,6 +110,13 @@ MinidumpContextWriter::CreateFromSnapsho
        break;
      }
@@ -192,10 +192,10 @@ Index: chromium-143.0.7499.40/third_party/crashpad/crashpad/minidump/minidump_co
 +}
  
  }  // namespace crashpad
-Index: chromium-143.0.7499.40/third_party/crashpad/crashpad/minidump/minidump_context_writer.h
+Index: chromium-144.0.7559.59/third_party/crashpad/crashpad/minidump/minidump_context_writer.h
 ===================================================================
---- chromium-143.0.7499.40.orig/third_party/crashpad/crashpad/minidump/minidump_context_writer.h
-+++ chromium-143.0.7499.40/third_party/crashpad/crashpad/minidump/minidump_context_writer.h
+--- chromium-144.0.7559.59.orig/third_party/crashpad/crashpad/minidump/minidump_context_writer.h
++++ chromium-144.0.7559.59/third_party/crashpad/crashpad/minidump/minidump_context_writer.h
 @@ -413,6 +413,49 @@ class MinidumpContextRISCV64Writer final
    MinidumpContextRISCV64 context_;
  };
@@ -246,10 +246,10 @@ Index: chromium-143.0.7499.40/third_party/crashpad/crashpad/minidump/minidump_co
  }  // namespace crashpad
  
  #endif  // CRASHPAD_MINIDUMP_MINIDUMP_CONTEXT_WRITER_H_
-Index: chromium-143.0.7499.40/third_party/crashpad/crashpad/minidump/minidump_context_writer_test.cc
+Index: chromium-144.0.7559.59/third_party/crashpad/crashpad/minidump/minidump_context_writer_test.cc
 ===================================================================
---- chromium-143.0.7499.40.orig/third_party/crashpad/crashpad/minidump/minidump_context_writer_test.cc
-+++ chromium-143.0.7499.40/third_party/crashpad/crashpad/minidump/minidump_context_writer_test.cc
+--- chromium-144.0.7559.59.orig/third_party/crashpad/crashpad/minidump/minidump_context_writer_test.cc
++++ chromium-144.0.7559.59/third_party/crashpad/crashpad/minidump/minidump_context_writer_test.cc
 @@ -322,6 +322,21 @@ TYPED_TEST(MinidumpContextWriter, RISCV6
                     TypeParam>(context, ExpectMinidumpContextRISCV64, kSeed);
  }
@@ -272,10 +272,10 @@ Index: chromium-143.0.7499.40/third_party/crashpad/crashpad/minidump/minidump_co
  }  // namespace
  }  // namespace test
  }  // namespace crashpad
-Index: chromium-143.0.7499.40/third_party/crashpad/crashpad/minidump/minidump_misc_info_writer.cc
+Index: chromium-144.0.7559.59/third_party/crashpad/crashpad/minidump/minidump_misc_info_writer.cc
 ===================================================================
---- chromium-143.0.7499.40.orig/third_party/crashpad/crashpad/minidump/minidump_misc_info_writer.cc
-+++ chromium-143.0.7499.40/third_party/crashpad/crashpad/minidump/minidump_misc_info_writer.cc
+--- chromium-144.0.7559.59.orig/third_party/crashpad/crashpad/minidump/minidump_misc_info_writer.cc
++++ chromium-144.0.7559.59/third_party/crashpad/crashpad/minidump/minidump_misc_info_writer.cc
 @@ -177,6 +177,8 @@ std::string MinidumpMiscInfoDebugBuildSt
    static constexpr char kCPU[] = "mips64";
  #elif defined(ARCH_CPU_RISCV64)
@@ -285,10 +285,10 @@ Index: chromium-143.0.7499.40/third_party/crashpad/crashpad/minidump/minidump_mi
  #else
  #error define kCPU for this CPU
  #endif
-Index: chromium-143.0.7499.40/third_party/crashpad/crashpad/minidump/test/minidump_context_test_util.cc
+Index: chromium-144.0.7559.59/third_party/crashpad/crashpad/minidump/test/minidump_context_test_util.cc
 ===================================================================
---- chromium-143.0.7499.40.orig/third_party/crashpad/crashpad/minidump/test/minidump_context_test_util.cc
-+++ chromium-143.0.7499.40/third_party/crashpad/crashpad/minidump/test/minidump_context_test_util.cc
+--- chromium-144.0.7559.59.orig/third_party/crashpad/crashpad/minidump/test/minidump_context_test_util.cc
++++ chromium-144.0.7559.59/third_party/crashpad/crashpad/minidump/test/minidump_context_test_util.cc
 @@ -297,6 +297,40 @@ void InitializeMinidumpContextRISCV64(Mi
    context->fcsr = value++;
  }
@@ -369,10 +369,10 @@ Index: chromium-143.0.7499.40/third_party/crashpad/crashpad/minidump/test/minidu
 +
  }  // namespace test
  }  // namespace crashpad
-Index: chromium-143.0.7499.40/third_party/crashpad/crashpad/minidump/test/minidump_context_test_util.h
+Index: chromium-144.0.7559.59/third_party/crashpad/crashpad/minidump/test/minidump_context_test_util.h
 ===================================================================
---- chromium-143.0.7499.40.orig/third_party/crashpad/crashpad/minidump/test/minidump_context_test_util.h
-+++ chromium-143.0.7499.40/third_party/crashpad/crashpad/minidump/test/minidump_context_test_util.h
+--- chromium-144.0.7559.59.orig/third_party/crashpad/crashpad/minidump/test/minidump_context_test_util.h
++++ chromium-144.0.7559.59/third_party/crashpad/crashpad/minidump/test/minidump_context_test_util.h
 @@ -90,6 +90,9 @@ void ExpectMinidumpContextMIPS64(uint32_
  void ExpectMinidumpContextRISCV64(uint32_t expect_seed,
                                    const MinidumpContextRISCV64* observed,
@@ -383,10 +383,10 @@ Index: chromium-143.0.7499.40/third_party/crashpad/crashpad/minidump/test/minidu
  //! \}
  
  }  // namespace test
-Index: chromium-143.0.7499.40/third_party/crashpad/crashpad/snapshot/capture_memory.cc
+Index: chromium-144.0.7559.59/third_party/crashpad/crashpad/snapshot/capture_memory.cc
 ===================================================================
---- chromium-143.0.7499.40.orig/third_party/crashpad/crashpad/snapshot/capture_memory.cc
-+++ chromium-143.0.7499.40/third_party/crashpad/crashpad/snapshot/capture_memory.cc
+--- chromium-144.0.7559.59.orig/third_party/crashpad/crashpad/snapshot/capture_memory.cc
++++ chromium-144.0.7559.59/third_party/crashpad/crashpad/snapshot/capture_memory.cc
 @@ -123,6 +123,11 @@ void CaptureMemory::PointedToByContext(c
    for (size_t i = 0; i < std::size(context.riscv64->regs); ++i) {
      MaybeCaptureMemoryAround(delegate, context.riscv64->regs[i]);
@@ -399,10 +399,10 @@ Index: chromium-143.0.7499.40/third_party/crashpad/crashpad/snapshot/capture_mem
  #else
  #error Port.
  #endif
-Index: chromium-143.0.7499.40/third_party/crashpad/crashpad/snapshot/cpu_architecture.h
+Index: chromium-144.0.7559.59/third_party/crashpad/crashpad/snapshot/cpu_architecture.h
 ===================================================================
---- chromium-143.0.7499.40.orig/third_party/crashpad/crashpad/snapshot/cpu_architecture.h
-+++ chromium-143.0.7499.40/third_party/crashpad/crashpad/snapshot/cpu_architecture.h
+--- chromium-144.0.7559.59.orig/third_party/crashpad/crashpad/snapshot/cpu_architecture.h
++++ chromium-144.0.7559.59/third_party/crashpad/crashpad/snapshot/cpu_architecture.h
 @@ -47,6 +47,9 @@ enum CPUArchitecture {
  
    //! \brief 64-bit RISC-V.
@@ -413,10 +413,10 @@ Index: chromium-143.0.7499.40/third_party/crashpad/crashpad/snapshot/cpu_archite
  };
  
  }  // namespace crashpad
-Index: chromium-143.0.7499.40/third_party/crashpad/crashpad/snapshot/cpu_context.cc
+Index: chromium-144.0.7559.59/third_party/crashpad/crashpad/snapshot/cpu_context.cc
 ===================================================================
---- chromium-143.0.7499.40.orig/third_party/crashpad/crashpad/snapshot/cpu_context.cc
-+++ chromium-143.0.7499.40/third_party/crashpad/crashpad/snapshot/cpu_context.cc
+--- chromium-144.0.7559.59.orig/third_party/crashpad/crashpad/snapshot/cpu_context.cc
++++ chromium-144.0.7559.59/third_party/crashpad/crashpad/snapshot/cpu_context.cc
 @@ -173,6 +173,8 @@ uint64_t CPUContext::InstructionPointer(
        return arm64->pc;
      case kCPUArchitectureRISCV64:
@@ -443,10 +443,10 @@ Index: chromium-143.0.7499.40/third_party/crashpad/crashpad/snapshot/cpu_context
      case kCPUArchitectureRISCV64:
        return true;
      case kCPUArchitectureX86:
-Index: chromium-143.0.7499.40/third_party/crashpad/crashpad/snapshot/cpu_context.h
+Index: chromium-144.0.7559.59/third_party/crashpad/crashpad/snapshot/cpu_context.h
 ===================================================================
---- chromium-143.0.7499.40.orig/third_party/crashpad/crashpad/snapshot/cpu_context.h
-+++ chromium-143.0.7499.40/third_party/crashpad/crashpad/snapshot/cpu_context.h
+--- chromium-144.0.7559.59.orig/third_party/crashpad/crashpad/snapshot/cpu_context.h
++++ chromium-144.0.7559.59/third_party/crashpad/crashpad/snapshot/cpu_context.h
 @@ -371,6 +371,24 @@ struct CPUContextRISCV64 {
    uint32_t fcsr;
  };
@@ -480,10 +480,10 @@ Index: chromium-143.0.7499.40/third_party/crashpad/crashpad/snapshot/cpu_context
    };
  };
  
-Index: chromium-143.0.7499.40/third_party/crashpad/crashpad/snapshot/linux/cpu_context_linux.h
+Index: chromium-144.0.7559.59/third_party/crashpad/crashpad/snapshot/linux/cpu_context_linux.h
 ===================================================================
---- chromium-143.0.7499.40.orig/third_party/crashpad/crashpad/snapshot/linux/cpu_context_linux.h
-+++ chromium-143.0.7499.40/third_party/crashpad/crashpad/snapshot/linux/cpu_context_linux.h
+--- chromium-144.0.7559.59.orig/third_party/crashpad/crashpad/snapshot/linux/cpu_context_linux.h
++++ chromium-144.0.7559.59/third_party/crashpad/crashpad/snapshot/linux/cpu_context_linux.h
 @@ -15,6 +15,7 @@
  #ifndef CRASHPAD_SNAPSHOT_LINUX_CPU_CONTEXT_LINUX_H_
  #define CRASHPAD_SNAPSHOT_LINUX_CPU_CONTEXT_LINUX_H_
@@ -571,10 +571,10 @@ Index: chromium-143.0.7499.40/third_party/crashpad/crashpad/snapshot/linux/cpu_c
  }  // namespace internal
  }  // namespace crashpad
  
-Index: chromium-143.0.7499.40/third_party/crashpad/crashpad/snapshot/linux/debug_rendezvous_test.cc
+Index: chromium-144.0.7559.59/third_party/crashpad/crashpad/snapshot/linux/debug_rendezvous_test.cc
 ===================================================================
---- chromium-143.0.7499.40.orig/third_party/crashpad/crashpad/snapshot/linux/debug_rendezvous_test.cc
-+++ chromium-143.0.7499.40/third_party/crashpad/crashpad/snapshot/linux/debug_rendezvous_test.cc
+--- chromium-144.0.7559.59.orig/third_party/crashpad/crashpad/snapshot/linux/debug_rendezvous_test.cc
++++ chromium-144.0.7559.59/third_party/crashpad/crashpad/snapshot/linux/debug_rendezvous_test.cc
 @@ -194,12 +194,15 @@ void TestAgainstTarget(PtraceConnection*
                device == 0 && inode == 0 && mapping_name == "[vdso]";
  #if defined(ARCH_CPU_X86)
@@ -592,10 +592,10 @@ Index: chromium-143.0.7499.40/third_party/crashpad/crashpad/snapshot/linux/debug
          },
          module_mapping->name,
          module_mapping->device,
-Index: chromium-143.0.7499.40/third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux.cc
+Index: chromium-144.0.7559.59/third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux.cc
 ===================================================================
---- chromium-143.0.7499.40.orig/third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux.cc
-+++ chromium-143.0.7499.40/third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux.cc
+--- chromium-144.0.7559.59.orig/third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux.cc
++++ chromium-144.0.7559.59/third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux.cc
 @@ -367,6 +367,69 @@ bool ExceptionSnapshotLinux::ReadContext
    return internal::ReadContext(reader, context_address, context_.riscv64);
  }
@@ -666,10 +666,10 @@ Index: chromium-143.0.7499.40/third_party/crashpad/crashpad/snapshot/linux/excep
  #endif  // ARCH_CPU_X86_FAMILY
  
  bool ExceptionSnapshotLinux::Initialize(
-Index: chromium-143.0.7499.40/third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux.h
+Index: chromium-144.0.7559.59/third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux.h
 ===================================================================
---- chromium-143.0.7499.40.orig/third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux.h
-+++ chromium-143.0.7499.40/third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux.h
+--- chromium-144.0.7559.59.orig/third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux.h
++++ chromium-144.0.7559.59/third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux.h
 @@ -94,6 +94,8 @@ class ExceptionSnapshotLinux final : pub
      CPUContextMIPS64 mips64;
  #elif defined(ARCH_CPU_RISCV64)
@@ -679,10 +679,10 @@ Index: chromium-143.0.7499.40/third_party/crashpad/crashpad/snapshot/linux/excep
  #endif
    } context_union_;
    CPUContext context_;
-Index: chromium-143.0.7499.40/third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux_test.cc
+Index: chromium-144.0.7559.59/third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux_test.cc
 ===================================================================
---- chromium-143.0.7499.40.orig/third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux_test.cc
-+++ chromium-143.0.7499.40/third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux_test.cc
+--- chromium-144.0.7559.59.orig/third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux_test.cc
++++ chromium-144.0.7559.59/third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux_test.cc
 @@ -325,7 +325,28 @@ void ExpectContext(const CPUContext& act
                     sizeof(actual.riscv64->fpregs)),
              0);
@@ -712,10 +712,10 @@ Index: chromium-143.0.7499.40/third_party/crashpad/crashpad/snapshot/linux/excep
  #else
  #error Port.
  #endif
-Index: chromium-143.0.7499.40/third_party/crashpad/crashpad/snapshot/linux/process_reader_linux.cc
+Index: chromium-144.0.7559.59/third_party/crashpad/crashpad/snapshot/linux/process_reader_linux.cc
 ===================================================================
---- chromium-143.0.7499.40.orig/third_party/crashpad/crashpad/snapshot/linux/process_reader_linux.cc
-+++ chromium-143.0.7499.40/third_party/crashpad/crashpad/snapshot/linux/process_reader_linux.cc
+--- chromium-144.0.7559.59.orig/third_party/crashpad/crashpad/snapshot/linux/process_reader_linux.cc
++++ chromium-144.0.7559.59/third_party/crashpad/crashpad/snapshot/linux/process_reader_linux.cc
 @@ -129,6 +129,8 @@ void ProcessReaderLinux::Thread::Initial
                                      : thread_info.thread_context.t32.regs[29];
  #elif defined(ARCH_CPU_RISCV64)
@@ -725,10 +725,10 @@ Index: chromium-143.0.7499.40/third_party/crashpad/crashpad/snapshot/linux/proce
  #else
  #error Port.
  #endif
-Index: chromium-143.0.7499.40/third_party/crashpad/crashpad/snapshot/linux/signal_context.h
+Index: chromium-144.0.7559.59/third_party/crashpad/crashpad/snapshot/linux/signal_context.h
 ===================================================================
---- chromium-143.0.7499.40.orig/third_party/crashpad/crashpad/snapshot/linux/signal_context.h
-+++ chromium-143.0.7499.40/third_party/crashpad/crashpad/snapshot/linux/signal_context.h
+--- chromium-144.0.7559.59.orig/third_party/crashpad/crashpad/snapshot/linux/signal_context.h
++++ chromium-144.0.7559.59/third_party/crashpad/crashpad/snapshot/linux/signal_context.h
 @@ -456,6 +456,89 @@ static_assert(offsetof(UContext<ContextT
                    offsetof(ucontext_t, uc_mcontext.__fpregs),
                "context offset mismatch");
@@ -819,10 +819,10 @@ Index: chromium-143.0.7499.40/third_party/crashpad/crashpad/snapshot/linux/signa
  #else
  #error Port.
  #endif  // ARCH_CPU_X86_FAMILY
-Index: chromium-143.0.7499.40/third_party/crashpad/crashpad/snapshot/linux/system_snapshot_linux.cc
+Index: chromium-144.0.7559.59/third_party/crashpad/crashpad/snapshot/linux/system_snapshot_linux.cc
 ===================================================================
---- chromium-143.0.7499.40.orig/third_party/crashpad/crashpad/snapshot/linux/system_snapshot_linux.cc
-+++ chromium-143.0.7499.40/third_party/crashpad/crashpad/snapshot/linux/system_snapshot_linux.cc
+--- chromium-144.0.7559.59.orig/third_party/crashpad/crashpad/snapshot/linux/system_snapshot_linux.cc
++++ chromium-144.0.7559.59/third_party/crashpad/crashpad/snapshot/linux/system_snapshot_linux.cc
 @@ -229,6 +229,8 @@ CPUArchitecture SystemSnapshotLinux::Get
                                      : kCPUArchitectureMIPSEL;
  #elif defined(ARCH_CPU_RISCV64)
@@ -862,10 +862,10 @@ Index: chromium-143.0.7499.40/third_party/crashpad/crashpad/snapshot/linux/syste
  #else
  #error Port.
  #endif  // ARCH_CPU_X86_FAMILY
-Index: chromium-143.0.7499.40/third_party/crashpad/crashpad/snapshot/linux/thread_snapshot_linux.cc
+Index: chromium-144.0.7559.59/third_party/crashpad/crashpad/snapshot/linux/thread_snapshot_linux.cc
 ===================================================================
---- chromium-143.0.7499.40.orig/third_party/crashpad/crashpad/snapshot/linux/thread_snapshot_linux.cc
-+++ chromium-143.0.7499.40/third_party/crashpad/crashpad/snapshot/linux/thread_snapshot_linux.cc
+--- chromium-144.0.7559.59.orig/third_party/crashpad/crashpad/snapshot/linux/thread_snapshot_linux.cc
++++ chromium-144.0.7559.59/third_party/crashpad/crashpad/snapshot/linux/thread_snapshot_linux.cc
 @@ -196,6 +196,14 @@ bool ThreadSnapshotLinux::Initialize(
    InitializeCPUContextRISCV64(thread.thread_info.thread_context.t64,
                                thread.thread_info.float_context.f64,
@@ -881,10 +881,10 @@ Index: chromium-143.0.7499.40/third_party/crashpad/crashpad/snapshot/linux/threa
  #else
  #error Port.
  #endif
-Index: chromium-143.0.7499.40/third_party/crashpad/crashpad/snapshot/linux/thread_snapshot_linux.h
+Index: chromium-144.0.7559.59/third_party/crashpad/crashpad/snapshot/linux/thread_snapshot_linux.h
 ===================================================================
---- chromium-143.0.7499.40.orig/third_party/crashpad/crashpad/snapshot/linux/thread_snapshot_linux.h
-+++ chromium-143.0.7499.40/third_party/crashpad/crashpad/snapshot/linux/thread_snapshot_linux.h
+--- chromium-144.0.7559.59.orig/third_party/crashpad/crashpad/snapshot/linux/thread_snapshot_linux.h
++++ chromium-144.0.7559.59/third_party/crashpad/crashpad/snapshot/linux/thread_snapshot_linux.h
 @@ -79,6 +79,8 @@ class ThreadSnapshotLinux final : public
      CPUContextMIPS64 mips64;
  #elif defined(ARCH_CPU_RISCV64)
@@ -894,10 +894,10 @@ Index: chromium-143.0.7499.40/third_party/crashpad/crashpad/snapshot/linux/threa
  #else
  #error Port.
  #endif  // ARCH_CPU_X86_FAMILY
-Index: chromium-143.0.7499.40/third_party/crashpad/crashpad/snapshot/test/test_cpu_context.cc
+Index: chromium-144.0.7559.59/third_party/crashpad/crashpad/snapshot/test/test_cpu_context.cc
 ===================================================================
---- chromium-143.0.7499.40.orig/third_party/crashpad/crashpad/snapshot/test/test_cpu_context.cc
-+++ chromium-143.0.7499.40/third_party/crashpad/crashpad/snapshot/test/test_cpu_context.cc
+--- chromium-144.0.7559.59.orig/third_party/crashpad/crashpad/snapshot/test/test_cpu_context.cc
++++ chromium-144.0.7559.59/third_party/crashpad/crashpad/snapshot/test/test_cpu_context.cc
 @@ -317,5 +317,38 @@ void InitializeCPUContextRISCV64(CPUCont
    riscv64->fcsr = value++;
  }
@@ -937,10 +937,10 @@ Index: chromium-143.0.7499.40/third_party/crashpad/crashpad/snapshot/test/test_c
 +
  }  // namespace test
  }  // namespace crashpad
-Index: chromium-143.0.7499.40/third_party/crashpad/crashpad/snapshot/test/test_cpu_context.h
+Index: chromium-144.0.7559.59/third_party/crashpad/crashpad/snapshot/test/test_cpu_context.h
 ===================================================================
---- chromium-143.0.7499.40.orig/third_party/crashpad/crashpad/snapshot/test/test_cpu_context.h
-+++ chromium-143.0.7499.40/third_party/crashpad/crashpad/snapshot/test/test_cpu_context.h
+--- chromium-144.0.7559.59.orig/third_party/crashpad/crashpad/snapshot/test/test_cpu_context.h
++++ chromium-144.0.7559.59/third_party/crashpad/crashpad/snapshot/test/test_cpu_context.h
 @@ -64,6 +64,7 @@ void InitializeCPUContextARM64(CPUContex
  void InitializeCPUContextMIPS(CPUContext* context, uint32_t seed);
  void InitializeCPUContextMIPS64(CPUContext* context, uint32_t seed);
@@ -949,10 +949,10 @@ Index: chromium-143.0.7499.40/third_party/crashpad/crashpad/snapshot/test/test_c
  //! \}
  
  }  // namespace test
-Index: chromium-143.0.7499.40/third_party/crashpad/crashpad/test/linux/get_tls.cc
+Index: chromium-144.0.7559.59/third_party/crashpad/crashpad/test/linux/get_tls.cc
 ===================================================================
---- chromium-143.0.7499.40.orig/third_party/crashpad/crashpad/test/linux/get_tls.cc
-+++ chromium-143.0.7499.40/third_party/crashpad/crashpad/test/linux/get_tls.cc
+--- chromium-144.0.7559.59.orig/third_party/crashpad/crashpad/test/linux/get_tls.cc
++++ chromium-144.0.7559.59/third_party/crashpad/crashpad/test/linux/get_tls.cc
 @@ -51,6 +51,8 @@ LinuxVMAddress GetTLS() {
        : "$3");
  #elif defined(ARCH_CPU_RISCV64)
@@ -962,10 +962,10 @@ Index: chromium-143.0.7499.40/third_party/crashpad/crashpad/test/linux/get_tls.c
  #else
  #error Port.
  #endif  // ARCH_CPU_ARMEL
-Index: chromium-143.0.7499.40/third_party/crashpad/crashpad/test/multiprocess_posix.cc
+Index: chromium-144.0.7559.59/third_party/crashpad/crashpad/test/multiprocess_posix.cc
 ===================================================================
---- chromium-143.0.7499.40.orig/third_party/crashpad/crashpad/test/multiprocess_posix.cc
-+++ chromium-143.0.7499.40/third_party/crashpad/crashpad/test/multiprocess_posix.cc
+--- chromium-144.0.7559.59.orig/third_party/crashpad/crashpad/test/multiprocess_posix.cc
++++ chromium-144.0.7559.59/third_party/crashpad/crashpad/test/multiprocess_posix.cc
 @@ -162,7 +162,8 @@ void Multiprocess::SetExpectedChildTermi
  }
  
@@ -976,10 +976,10 @@ Index: chromium-143.0.7499.40/third_party/crashpad/crashpad/test/multiprocess_po
    SetExpectedChildTermination(kTerminationSignal, SIGTRAP);
  #else
    SetExpectedChildTermination(kTerminationSignal, SIGILL);
-Index: chromium-143.0.7499.40/third_party/crashpad/crashpad/util/linux/auxiliary_vector.cc
+Index: chromium-144.0.7559.59/third_party/crashpad/crashpad/util/linux/auxiliary_vector.cc
 ===================================================================
---- chromium-143.0.7499.40.orig/third_party/crashpad/crashpad/util/linux/auxiliary_vector.cc
-+++ chromium-143.0.7499.40/third_party/crashpad/crashpad/util/linux/auxiliary_vector.cc
+--- chromium-144.0.7559.59.orig/third_party/crashpad/crashpad/util/linux/auxiliary_vector.cc
++++ chromium-144.0.7559.59/third_party/crashpad/crashpad/util/linux/auxiliary_vector.cc
 @@ -56,6 +56,11 @@ bool AuxiliaryVector::Read(PtraceConnect
      if (type == AT_IGNORE) {
        continue;
@@ -992,10 +992,10 @@ Index: chromium-143.0.7499.40/third_party/crashpad/crashpad/util/linux/auxiliary
      if (!MapInsertOrReplace(&values_, type, value, nullptr)) {
        LOG(ERROR) << "duplicate auxv entry";
        return false;
-Index: chromium-143.0.7499.40/third_party/crashpad/crashpad/util/linux/ptracer.cc
+Index: chromium-144.0.7559.59/third_party/crashpad/crashpad/util/linux/ptracer.cc
 ===================================================================
---- chromium-143.0.7499.40.orig/third_party/crashpad/crashpad/util/linux/ptracer.cc
-+++ chromium-143.0.7499.40/third_party/crashpad/crashpad/util/linux/ptracer.cc
+--- chromium-144.0.7559.59.orig/third_party/crashpad/crashpad/util/linux/ptracer.cc
++++ chromium-144.0.7559.59/third_party/crashpad/crashpad/util/linux/ptracer.cc
 @@ -430,6 +430,64 @@ bool GetThreadArea64(pid_t tid,
    return true;
  }
@@ -1071,10 +1071,10 @@ Index: chromium-143.0.7499.40/third_party/crashpad/crashpad/util/linux/ptracer.c
             GetThreadArea64(tid,
                             info->thread_context,
                             &info->thread_specific_data_address,
-Index: chromium-143.0.7499.40/third_party/crashpad/crashpad/util/linux/thread_info.h
+Index: chromium-144.0.7559.59/third_party/crashpad/crashpad/util/linux/thread_info.h
 ===================================================================
---- chromium-143.0.7499.40.orig/third_party/crashpad/crashpad/util/linux/thread_info.h
-+++ chromium-143.0.7499.40/third_party/crashpad/crashpad/util/linux/thread_info.h
+--- chromium-144.0.7559.59.orig/third_party/crashpad/crashpad/util/linux/thread_info.h
++++ chromium-144.0.7559.59/third_party/crashpad/crashpad/util/linux/thread_info.h
 @@ -34,6 +34,10 @@
  #include <asm/ptrace.h>
  #endif
@@ -1193,10 +1193,10 @@ Index: chromium-143.0.7499.40/third_party/crashpad/crashpad/util/linux/thread_in
    //! \brief The thread-local storage address for the thread.
    LinuxVMAddress thread_specific_data_address;
  };
-Index: chromium-143.0.7499.40/third_party/crashpad/crashpad/util/misc/capture_context.h
+Index: chromium-144.0.7559.59/third_party/crashpad/crashpad/util/misc/capture_context.h
 ===================================================================
---- chromium-143.0.7499.40.orig/third_party/crashpad/crashpad/util/misc/capture_context.h
-+++ chromium-143.0.7499.40/third_party/crashpad/crashpad/util/misc/capture_context.h
+--- chromium-144.0.7559.59.orig/third_party/crashpad/crashpad/util/misc/capture_context.h
++++ chromium-144.0.7559.59/third_party/crashpad/crashpad/util/misc/capture_context.h
 @@ -70,6 +70,7 @@ using NativeCPUContext = ucontext_t;
  //!     Linux               | ARM/ARM64    | `r0`/`x0`
  //!     Linux               | MIPS/MIPS64  | `$a0`
@@ -1205,10 +1205,10 @@ Index: chromium-143.0.7499.40/third_party/crashpad/crashpad/util/misc/capture_co
  //!
  //!     Additionally, the value `LR` on ARM/ARM64 will be the return address of
  //!     this function.
-Index: chromium-143.0.7499.40/third_party/crashpad/crashpad/util/misc/capture_context_linux.S
+Index: chromium-144.0.7559.59/third_party/crashpad/crashpad/util/misc/capture_context_linux.S
 ===================================================================
---- chromium-143.0.7499.40.orig/third_party/crashpad/crashpad/util/misc/capture_context_linux.S
-+++ chromium-143.0.7499.40/third_party/crashpad/crashpad/util/misc/capture_context_linux.S
+--- chromium-144.0.7559.59.orig/third_party/crashpad/crashpad/util/misc/capture_context_linux.S
++++ chromium-144.0.7559.59/third_party/crashpad/crashpad/util/misc/capture_context_linux.S
 @@ -30,7 +30,7 @@
    .globl CAPTURECONTEXT_SYMBOL2
  #if defined(__i386__) || defined(__x86_64__)
@@ -1435,10 +1435,10 @@ Index: chromium-143.0.7499.40/third_party/crashpad/crashpad/util/misc/capture_co
  #elif defined(__riscv)
  
    #define MCONTEXT_GREGS_OFFSET 176
-Index: chromium-143.0.7499.40/third_party/crashpad/crashpad/util/misc/capture_context_test.cc
+Index: chromium-144.0.7559.59/third_party/crashpad/crashpad/util/misc/capture_context_test.cc
 ===================================================================
---- chromium-143.0.7499.40.orig/third_party/crashpad/crashpad/util/misc/capture_context_test.cc
-+++ chromium-143.0.7499.40/third_party/crashpad/crashpad/util/misc/capture_context_test.cc
+--- chromium-144.0.7559.59.orig/third_party/crashpad/crashpad/util/misc/capture_context_test.cc
++++ chromium-144.0.7559.59/third_party/crashpad/crashpad/util/misc/capture_context_test.cc
 @@ -48,7 +48,7 @@ void TestCaptureContext() {
    uintptr_t pc = ProgramCounterFromContext(context_1);
  
@@ -1448,10 +1448,10 @@ Index: chromium-143.0.7499.40/third_party/crashpad/crashpad/util/misc/capture_co
    // Sanitizers can cause enough code bloat that the “nearby” check would
    // likely fail.
    const uintptr_t kReferencePC =
-Index: chromium-143.0.7499.40/third_party/crashpad/crashpad/util/misc/capture_context_test_util_linux.cc
+Index: chromium-144.0.7559.59/third_party/crashpad/crashpad/util/misc/capture_context_test_util_linux.cc
 ===================================================================
---- chromium-143.0.7499.40.orig/third_party/crashpad/crashpad/util/misc/capture_context_test_util_linux.cc
-+++ chromium-143.0.7499.40/third_party/crashpad/crashpad/util/misc/capture_context_test_util_linux.cc
+--- chromium-144.0.7559.59.orig/third_party/crashpad/crashpad/util/misc/capture_context_test_util_linux.cc
++++ chromium-144.0.7559.59/third_party/crashpad/crashpad/util/misc/capture_context_test_util_linux.cc
 @@ -38,6 +38,8 @@ void SanityCheckContext(const NativeCPUC
  #elif defined(ARCH_CPU_RISCV64)
    EXPECT_EQ(context.uc_mcontext.__gregs[10],

diff --git a/0001-Implement-support-for-ppc64-on-Linux.patch b/0001-Implement-support-for-ppc64-on-Linux.patch
index 5923874..fa7ef9f 100644
--- a/0001-Implement-support-for-ppc64-on-Linux.patch
+++ b/0001-Implement-support-for-ppc64-on-Linux.patch
@@ -54,10 +54,10 @@ https://wiki.raptorcs.com/wiki/Porting/Chromium
  src/tools/linux/md2core/minidump-2-core.cc    | 45 +++++++++++++++
  25 files changed, 281 insertions(+), 35 deletions(-)
 
-Index: chromium-143.0.7499.40/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/raw_context_cpu.h
+Index: chromium-144.0.7559.59/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/raw_context_cpu.h
 ===================================================================
---- chromium-143.0.7499.40.orig/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/raw_context_cpu.h
-+++ chromium-143.0.7499.40/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/raw_context_cpu.h
+--- chromium-144.0.7559.59.orig/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/raw_context_cpu.h
++++ chromium-144.0.7559.59/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/raw_context_cpu.h
 @@ -51,6 +51,8 @@ typedef MDRawContextRISCV64 RawContextCP
  # else
  #  error "Unexpected __riscv_xlen"
@@ -67,10 +67,10 @@ Index: chromium-143.0.7499.40/third_party/breakpad/breakpad/src/client/linux/dum
  #else
  #error "This code has not been ported to your platform yet."
  #endif
-Index: chromium-143.0.7499.40/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/thread_info.cc
+Index: chromium-144.0.7559.59/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/thread_info.cc
 ===================================================================
---- chromium-143.0.7499.40.orig/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/thread_info.cc
-+++ chromium-143.0.7499.40/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/thread_info.cc
+--- chromium-144.0.7559.59.orig/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/thread_info.cc
++++ chromium-144.0.7559.59/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/thread_info.cc
 @@ -336,7 +336,42 @@ void ThreadInfo::FillCPUContext(RawConte
  #error "Unexpected __riscv_xlen"
  #endif
@@ -153,10 +153,10 @@ Index: chromium-143.0.7499.40/third_party/breakpad/breakpad/src/client/linux/dum
 +#endif
 +
  }  // namespace google_breakpad
-Index: chromium-143.0.7499.40/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/thread_info.h
+Index: chromium-144.0.7559.59/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/thread_info.h
 ===================================================================
---- chromium-143.0.7499.40.orig/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/thread_info.h
-+++ chromium-143.0.7499.40/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/thread_info.h
+--- chromium-144.0.7559.59.orig/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/thread_info.h
++++ chromium-144.0.7559.59/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/thread_info.h
 @@ -67,6 +67,10 @@ struct ThreadInfo {
    // Use the structures defined in <sys/user.h>
    struct user_regs_struct regs;
@@ -180,10 +180,10 @@ Index: chromium-143.0.7499.40/third_party/breakpad/breakpad/src/client/linux/dum
  };
  
  }  // namespace google_breakpad
-Index: chromium-143.0.7499.40/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.cc
+Index: chromium-144.0.7559.59/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.cc
 ===================================================================
---- chromium-143.0.7499.40.orig/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.cc
-+++ chromium-143.0.7499.40/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.cc
+--- chromium-144.0.7559.59.orig/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.cc
++++ chromium-144.0.7559.59/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.cc
 @@ -324,6 +324,48 @@ void UContextReader::FillCPUContext(RawC
  #error "Unexpected __riscv_xlen"
  #endif
@@ -233,10 +233,10 @@ Index: chromium-143.0.7499.40/third_party/breakpad/breakpad/src/client/linux/dum
  #endif
  
  }  // namespace google_breakpad
-Index: chromium-143.0.7499.40/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.h
+Index: chromium-144.0.7559.59/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.h
 ===================================================================
---- chromium-143.0.7499.40.orig/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.h
-+++ chromium-143.0.7499.40/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.h
+--- chromium-144.0.7559.59.orig/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.h
++++ chromium-144.0.7559.59/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.h
 @@ -54,6 +54,9 @@ struct UContextReader {
  #elif defined(__aarch64__)
    static void FillCPUContext(RawContextCPU* out, const ucontext_t* uc,
@@ -247,10 +247,10 @@ Index: chromium-143.0.7499.40/third_party/breakpad/breakpad/src/client/linux/dum
  #else
    static void FillCPUContext(RawContextCPU* out, const ucontext_t* uc);
  #endif
-Index: chromium-143.0.7499.40/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc
+Index: chromium-144.0.7559.59/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc
 ===================================================================
---- chromium-143.0.7499.40.orig/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc
-+++ chromium-143.0.7499.40/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc
+--- chromium-144.0.7559.59.orig/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc
++++ chromium-144.0.7559.59/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc
 @@ -466,6 +466,13 @@ bool ExceptionHandler::HandleSignal(int
      memcpy(&g_crash_context_.float_state, fp_ptr,
             sizeof(g_crash_context_.float_state));
@@ -295,10 +295,10 @@ Index: chromium-143.0.7499.40/third_party/breakpad/breakpad/src/client/linux/han
  #elif defined(__riscv)
    context.siginfo.si_addr =
        reinterpret_cast<void*>(context.context.uc_mcontext.__gregs[REG_PC]);
-Index: chromium-143.0.7499.40/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.h
+Index: chromium-144.0.7559.59/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.h
 ===================================================================
---- chromium-143.0.7499.40.orig/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.h
-+++ chromium-143.0.7499.40/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.h
+--- chromium-144.0.7559.59.orig/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.h
++++ chromium-144.0.7559.59/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.h
 @@ -197,7 +197,11 @@ class ExceptionHandler {
      siginfo_t siginfo;
      pid_t tid;  // the crashing thread.
@@ -312,10 +312,10 @@ Index: chromium-143.0.7499.40/third_party/breakpad/breakpad/src/client/linux/han
      fpstate_t float_state;
  #endif
    };
-Index: chromium-143.0.7499.40/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler_unittest.cc
+Index: chromium-144.0.7559.59/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler_unittest.cc
 ===================================================================
---- chromium-143.0.7499.40.orig/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler_unittest.cc
-+++ chromium-143.0.7499.40/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler_unittest.cc
+--- chromium-144.0.7559.59.orig/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler_unittest.cc
++++ chromium-144.0.7559.59/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler_unittest.cc
 @@ -325,7 +325,7 @@ TEST(ExceptionHandlerTest, ParallelChild
        ASSERT_EQ(SIGSEGV, WTERMSIG(status));
        return;
@@ -347,10 +347,10 @@ Index: chromium-143.0.7499.40/third_party/breakpad/breakpad/src/client/linux/han
    const int kOffset = kMemorySize - sizeof(kIllegalInstruction);
  
    const pid_t child = fork();
-Index: chromium-143.0.7499.40/third_party/breakpad/breakpad/src/client/linux/microdump_writer/microdump_writer.cc
+Index: chromium-144.0.7559.59/third_party/breakpad/breakpad/src/client/linux/microdump_writer/microdump_writer.cc
 ===================================================================
---- chromium-143.0.7499.40.orig/third_party/breakpad/breakpad/src/client/linux/microdump_writer/microdump_writer.cc
-+++ chromium-143.0.7499.40/third_party/breakpad/breakpad/src/client/linux/microdump_writer/microdump_writer.cc
+--- chromium-144.0.7559.59.orig/third_party/breakpad/breakpad/src/client/linux/microdump_writer/microdump_writer.cc
++++ chromium-144.0.7559.59/third_party/breakpad/breakpad/src/client/linux/microdump_writer/microdump_writer.cc
 @@ -143,7 +143,9 @@ class MicrodumpWriter {
                    const MicrodumpExtraInfo& microdump_extra_info,
                    LinuxDumper* dumper)
@@ -393,10 +393,10 @@ Index: chromium-143.0.7499.40/third_party/breakpad/breakpad/src/client/linux/mic
    const google_breakpad::fpstate_t* const float_state_;
  #endif
    LinuxDumper* dumper_;
-Index: chromium-143.0.7499.40/third_party/breakpad/breakpad/src/client/linux/microdump_writer/microdump_writer_unittest.cc
+Index: chromium-144.0.7559.59/third_party/breakpad/breakpad/src/client/linux/microdump_writer/microdump_writer_unittest.cc
 ===================================================================
---- chromium-143.0.7499.40.orig/third_party/breakpad/breakpad/src/client/linux/microdump_writer/microdump_writer_unittest.cc
-+++ chromium-143.0.7499.40/third_party/breakpad/breakpad/src/client/linux/microdump_writer/microdump_writer_unittest.cc
+--- chromium-144.0.7559.59.orig/third_party/breakpad/breakpad/src/client/linux/microdump_writer/microdump_writer_unittest.cc
++++ chromium-144.0.7559.59/third_party/breakpad/breakpad/src/client/linux/microdump_writer/microdump_writer_unittest.cc
 @@ -281,10 +281,19 @@ TEST(MicrodumpWriterTest, BasicWithMappi
    CrashAndGetMicrodump(mappings, MicrodumpExtraInfo(), &buf);
    ASSERT_TRUE(ContainsMicrodump(buf));
@@ -420,10 +420,10 @@ Index: chromium-143.0.7499.40/third_party/breakpad/breakpad/src/client/linux/mic
  #else
    ASSERT_NE(std::string::npos,
              buf.find("M 00001000 0000002A 00001000 "
-Index: chromium-143.0.7499.40/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_core_dumper.cc
+Index: chromium-144.0.7559.59/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_core_dumper.cc
 ===================================================================
---- chromium-143.0.7499.40.orig/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_core_dumper.cc
-+++ chromium-143.0.7499.40/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_core_dumper.cc
+--- chromium-144.0.7559.59.orig/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_core_dumper.cc
++++ chromium-144.0.7559.59/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_core_dumper.cc
 @@ -118,6 +118,9 @@ bool LinuxCoreDumper::GetThreadInfoByInd
  #elif defined(__riscv)
      stack_pointer = reinterpret_cast<uint8_t*>(
@@ -446,10 +446,10 @@ Index: chromium-143.0.7499.40/third_party/breakpad/breakpad/src/client/linux/min
  # if defined(__ANDROID__)
          for (int i = EF_R0; i <= EF_R31; i++)
            info.mcontext.gregs[i - EF_R0] = status->pr_reg[i];
-Index: chromium-143.0.7499.40/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper.cc
+Index: chromium-144.0.7559.59/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper.cc
 ===================================================================
---- chromium-143.0.7499.40.orig/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper.cc
-+++ chromium-143.0.7499.40/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper.cc
+--- chromium-144.0.7559.59.orig/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper.cc
++++ chromium-144.0.7559.59/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper.cc
 @@ -789,7 +789,9 @@ bool LinuxDumper::GetStackInfo(const voi
        reinterpret_cast<uint8_t*>(int_stack_pointer & ~(page_size - 1));
  
@@ -461,10 +461,10 @@ Index: chromium-143.0.7499.40/third_party/breakpad/breakpad/src/client/linux/min
  
    const MappingInfo* mapping = FindMapping(stack_pointer);
    if (!mapping)
-Index: chromium-143.0.7499.40/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper.h
+Index: chromium-144.0.7559.59/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper.h
 ===================================================================
---- chromium-143.0.7499.40.orig/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper.h
-+++ chromium-143.0.7499.40/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper.h
+--- chromium-144.0.7559.59.orig/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper.h
++++ chromium-144.0.7559.59/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper.h
 @@ -64,7 +64,8 @@ namespace google_breakpad {
  typedef Elf32_auxv_t elf_aux_entry;
  #elif defined(__x86_64) || defined(__aarch64__) || \
@@ -475,10 +475,10 @@ Index: chromium-143.0.7499.40/third_party/breakpad/breakpad/src/client/linux/min
  typedef Elf64_auxv_t elf_aux_entry;
  #endif
  
-Index: chromium-143.0.7499.40/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper_unittest_helper.cc
+Index: chromium-144.0.7559.59/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper_unittest_helper.cc
 ===================================================================
---- chromium-143.0.7499.40.orig/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper_unittest_helper.cc
-+++ chromium-143.0.7499.40/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper_unittest_helper.cc
+--- chromium-144.0.7559.59.orig/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper_unittest_helper.cc
++++ chromium-144.0.7559.59/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper_unittest_helper.cc
 @@ -57,6 +57,8 @@
  #define TID_PTR_REGISTER "$1"
  #elif defined(__riscv)
@@ -488,10 +488,10 @@ Index: chromium-143.0.7499.40/third_party/breakpad/breakpad/src/client/linux/min
  #else
  #error This test has not been ported to this platform.
  #endif
-Index: chromium-143.0.7499.40/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_ptrace_dumper.cc
+Index: chromium-144.0.7559.59/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_ptrace_dumper.cc
 ===================================================================
---- chromium-143.0.7499.40.orig/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_ptrace_dumper.cc
-+++ chromium-143.0.7499.40/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_ptrace_dumper.cc
+--- chromium-144.0.7559.59.orig/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_ptrace_dumper.cc
++++ chromium-144.0.7559.59/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_ptrace_dumper.cc
 @@ -208,12 +208,12 @@ bool LinuxPtraceDumper::ReadRegisterSet(
  #ifdef PTRACE_GETREGSET
    struct iovec io;
@@ -533,10 +533,10 @@ Index: chromium-143.0.7499.40/third_party/breakpad/breakpad/src/client/linux/min
  #else
  # error "This code hasn't been ported to your platform yet."
  #endif
-Index: chromium-143.0.7499.40/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_ptrace_dumper_unittest.cc
+Index: chromium-144.0.7559.59/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_ptrace_dumper_unittest.cc
 ===================================================================
---- chromium-143.0.7499.40.orig/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_ptrace_dumper_unittest.cc
-+++ chromium-143.0.7499.40/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_ptrace_dumper_unittest.cc
+--- chromium-144.0.7559.59.orig/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_ptrace_dumper_unittest.cc
++++ chromium-144.0.7559.59/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_ptrace_dumper_unittest.cc
 @@ -469,6 +469,9 @@ TEST(LinuxPtraceDumperTest, VerifyStackR
  #elif defined(__riscv)
      pid_t* process_tid_location =
@@ -556,10 +556,10 @@ Index: chromium-143.0.7499.40/third_party/breakpad/breakpad/src/client/linux/min
  #else
  #error This test has not been ported to this platform.
  #endif
-Index: chromium-143.0.7499.40/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer.cc
+Index: chromium-144.0.7559.59/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer.cc
 ===================================================================
---- chromium-143.0.7499.40.orig/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer.cc
-+++ chromium-143.0.7499.40/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer.cc
+--- chromium-144.0.7559.59.orig/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer.cc
++++ chromium-144.0.7559.59/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer.cc
 @@ -145,7 +145,9 @@ class MinidumpWriter {
        : fd_(minidump_fd),
          path_(minidump_path),
@@ -613,10 +613,10 @@ Index: chromium-143.0.7499.40/third_party/breakpad/breakpad/src/client/linux/min
    const google_breakpad::fpstate_t* const float_state_;  // ditto
  #endif
    LinuxDumper* dumper_;
-Index: chromium-143.0.7499.40/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer.h
+Index: chromium-144.0.7559.59/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer.h
 ===================================================================
---- chromium-143.0.7499.40.orig/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer.h
-+++ chromium-143.0.7499.40/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer.h
+--- chromium-144.0.7559.59.orig/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer.h
++++ chromium-144.0.7559.59/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer.h
 @@ -47,6 +47,8 @@ class ExceptionHandler;
  
  #if defined(__aarch64__)
@@ -626,10 +626,10 @@ Index: chromium-143.0.7499.40/third_party/breakpad/breakpad/src/client/linux/min
  #elif !defined(__ARM_EABI__) && !defined(__mips__)
  typedef std::remove_pointer<fpregset_t>::type fpstate_t;
  #endif
-Index: chromium-143.0.7499.40/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer_unittest.cc
+Index: chromium-144.0.7559.59/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer_unittest.cc
 ===================================================================
---- chromium-143.0.7499.40.orig/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer_unittest.cc
-+++ chromium-143.0.7499.40/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer_unittest.cc
+--- chromium-144.0.7559.59.orig/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer_unittest.cc
++++ chromium-144.0.7559.59/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer_unittest.cc
 @@ -723,6 +723,9 @@ TEST(MinidumpWriterTest, InvalidStackPoi
  #elif defined(__riscv)
    context.context.uc_mcontext.__gregs[MD_CONTEXT_RISCV_REG_SP] =
@@ -640,10 +640,10 @@ Index: chromium-143.0.7499.40/third_party/breakpad/breakpad/src/client/linux/min
  #else
  # error "This code has not been ported to your platform yet."
  #endif
-Index: chromium-143.0.7499.40/third_party/breakpad/breakpad/src/common/linux/memory_mapped_file.cc
+Index: chromium-144.0.7559.59/third_party/breakpad/breakpad/src/common/linux/memory_mapped_file.cc
 ===================================================================
---- chromium-143.0.7499.40.orig/third_party/breakpad/breakpad/src/common/linux/memory_mapped_file.cc
-+++ chromium-143.0.7499.40/third_party/breakpad/breakpad/src/common/linux/memory_mapped_file.cc
+--- chromium-144.0.7559.59.orig/third_party/breakpad/breakpad/src/common/linux/memory_mapped_file.cc
++++ chromium-144.0.7559.59/third_party/breakpad/breakpad/src/common/linux/memory_mapped_file.cc
 @@ -72,8 +72,7 @@ bool MemoryMappedFile::Map(const char* p
  
  #if defined(__x86_64__) || defined(__aarch64__) || \
@@ -654,10 +654,10 @@ Index: chromium-143.0.7499.40/third_party/breakpad/breakpad/src/common/linux/mem
    struct kernel_stat st;
    if (sys_fstat(fd, &st) == -1 || st.st_size < 0) {
  #else
-Index: chromium-143.0.7499.40/third_party/breakpad/breakpad/src/common/linux/memory_mapped_file_unittest.cc
+Index: chromium-144.0.7559.59/third_party/breakpad/breakpad/src/common/linux/memory_mapped_file_unittest.cc
 ===================================================================
---- chromium-143.0.7499.40.orig/third_party/breakpad/breakpad/src/common/linux/memory_mapped_file_unittest.cc
-+++ chromium-143.0.7499.40/third_party/breakpad/breakpad/src/common/linux/memory_mapped_file_unittest.cc
+--- chromium-144.0.7559.59.orig/third_party/breakpad/breakpad/src/common/linux/memory_mapped_file_unittest.cc
++++ chromium-144.0.7559.59/third_party/breakpad/breakpad/src/common/linux/memory_mapped_file_unittest.cc
 @@ -178,9 +178,10 @@ TEST_F(MemoryMappedFileTest, RemapAfterM
  TEST_F(MemoryMappedFileTest, MapWithOffset) {
    // Put more data in the test file this time. Offsets can only be
@@ -672,10 +672,10 @@ Index: chromium-143.0.7499.40/third_party/breakpad/breakpad/src/common/linux/mem
    for (size_t i = 0; i < data1_size; ++i) {
      data1[i] = i & 0x7f;
    }
-Index: chromium-143.0.7499.40/third_party/breakpad/breakpad/src/common/memory_allocator_unittest.cc
+Index: chromium-144.0.7559.59/third_party/breakpad/breakpad/src/common/memory_allocator_unittest.cc
 ===================================================================
---- chromium-143.0.7499.40.orig/third_party/breakpad/breakpad/src/common/memory_allocator_unittest.cc
-+++ chromium-143.0.7499.40/third_party/breakpad/breakpad/src/common/memory_allocator_unittest.cc
+--- chromium-144.0.7559.59.orig/third_party/breakpad/breakpad/src/common/memory_allocator_unittest.cc
++++ chromium-144.0.7559.59/third_party/breakpad/breakpad/src/common/memory_allocator_unittest.cc
 @@ -64,8 +64,9 @@ TEST(PageAllocatorTest, LargeObject) {
  
    EXPECT_EQ(0U, allocator.pages_allocated());
@@ -687,10 +687,10 @@ Index: chromium-143.0.7499.40/third_party/breakpad/breakpad/src/common/memory_al
    for (unsigned i = 1; i < 10; ++i) {
      uint8_t* p = reinterpret_cast<uint8_t*>(allocator.Alloc(i));
      ASSERT_FALSE(p == nullptr);
-Index: chromium-143.0.7499.40/third_party/breakpad/breakpad/src/tools/linux/md2core/minidump-2-core.cc
+Index: chromium-144.0.7559.59/third_party/breakpad/breakpad/src/tools/linux/md2core/minidump-2-core.cc
 ===================================================================
---- chromium-143.0.7499.40.orig/third_party/breakpad/breakpad/src/tools/linux/md2core/minidump-2-core.cc
-+++ chromium-143.0.7499.40/third_party/breakpad/breakpad/src/tools/linux/md2core/minidump-2-core.cc
+--- chromium-144.0.7559.59.orig/third_party/breakpad/breakpad/src/tools/linux/md2core/minidump-2-core.cc
++++ chromium-144.0.7559.59/third_party/breakpad/breakpad/src/tools/linux/md2core/minidump-2-core.cc
 @@ -82,6 +82,8 @@
    #define ELF_ARCH  EM_AARCH64
  #elif defined(__riscv)

diff --git a/0001-add-xnn-ppc64el-support.patch b/0001-add-xnn-ppc64el-support.patch
index 9fd2f46..f8415ac 100644
--- a/0001-add-xnn-ppc64el-support.patch
+++ b/0001-add-xnn-ppc64el-support.patch
@@ -1,7 +1,7 @@
-Index: chromium-143.0.7499.40/third_party/xnnpack/generate_build_gn.py
+Index: chromium-144.0.7559.59/third_party/xnnpack/generate_build_gn.py
 ===================================================================
---- chromium-143.0.7499.40.orig/third_party/xnnpack/generate_build_gn.py
-+++ chromium-143.0.7499.40/third_party/xnnpack/generate_build_gn.py
+--- chromium-144.0.7559.59.orig/third_party/xnnpack/generate_build_gn.py
++++ chromium-144.0.7559.59/third_party/xnnpack/generate_build_gn.py
 @@ -239,7 +239,10 @@ _PLATFORMS = [
                bazel_platform='//:linux_aarch64'),
      _Platform(gn_cpu='riscv64',
@@ -14,10 +14,10 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/generate_build_gn.py
  ]
  
  
-Index: chromium-143.0.7499.40/third_party/xnnpack/bazelroot/BUILD
+Index: chromium-144.0.7559.59/third_party/xnnpack/bazelroot/BUILD
 ===================================================================
---- chromium-143.0.7499.40.orig/third_party/xnnpack/bazelroot/BUILD
-+++ chromium-143.0.7499.40/third_party/xnnpack/bazelroot/BUILD
+--- chromium-144.0.7559.59.orig/third_party/xnnpack/bazelroot/BUILD
++++ chromium-144.0.7559.59/third_party/xnnpack/bazelroot/BUILD
 @@ -29,6 +29,14 @@ platform(
      ],
  )

diff --git a/0001-sandbox-Enable-seccomp_bpf-for-ppc64.patch b/0001-sandbox-Enable-seccomp_bpf-for-ppc64.patch
index 2e4cbc3..29ab492 100644
--- a/0001-sandbox-Enable-seccomp_bpf-for-ppc64.patch
+++ b/0001-sandbox-Enable-seccomp_bpf-for-ppc64.patch
@@ -1,8 +1,8 @@
-Index: chromium-143.0.7499.40/sandbox/linux/seccomp-bpf/trap.cc
+Index: chromium-144.0.7559.59/sandbox/linux/seccomp-bpf/trap.cc
 ===================================================================
---- chromium-143.0.7499.40.orig/sandbox/linux/seccomp-bpf/trap.cc
-+++ chromium-143.0.7499.40/sandbox/linux/seccomp-bpf/trap.cc
-@@ -236,6 +236,20 @@ void Trap::SigSys(int nr, LinuxSigInfo*
+--- chromium-144.0.7559.59.orig/sandbox/linux/seccomp-bpf/trap.cc
++++ chromium-144.0.7559.59/sandbox/linux/seccomp-bpf/trap.cc
+@@ -231,6 +231,20 @@ void Trap::SigSys(int nr, LinuxSigInfo*
        SetIsInSigHandler();
      }
  
@@ -23,10 +23,10 @@ Index: chromium-143.0.7499.40/sandbox/linux/seccomp-bpf/trap.cc
      // Copy the seccomp-specific data into a arch_seccomp_data structure. This
      // is what we are showing to TrapFnc callbacks that the system call
      // evaluator registered with the sandbox.
-Index: chromium-143.0.7499.40/sandbox/features.gni
+Index: chromium-144.0.7559.59/sandbox/features.gni
 ===================================================================
---- chromium-143.0.7499.40.orig/sandbox/features.gni
-+++ chromium-143.0.7499.40/sandbox/features.gni
+--- chromium-144.0.7559.59.orig/sandbox/features.gni
++++ chromium-144.0.7559.59/sandbox/features.gni
 @@ -9,4 +9,5 @@
  use_seccomp_bpf = (is_linux || is_chromeos || is_android) &&
                    (current_cpu == "x86" || current_cpu == "x64" ||
@@ -34,10 +34,10 @@ Index: chromium-143.0.7499.40/sandbox/features.gni
 -                   current_cpu == "mipsel" || current_cpu == "mips64el")
 +                   current_cpu == "mipsel" || current_cpu == "mips64el" ||
 +                   current_cpu == "ppc64")
-Index: chromium-143.0.7499.40/sandbox/policy/linux/bpf_renderer_policy_linux.cc
+Index: chromium-144.0.7559.59/sandbox/policy/linux/bpf_renderer_policy_linux.cc
 ===================================================================
---- chromium-143.0.7499.40.orig/sandbox/policy/linux/bpf_renderer_policy_linux.cc
-+++ chromium-143.0.7499.40/sandbox/policy/linux/bpf_renderer_policy_linux.cc
+--- chromium-144.0.7559.59.orig/sandbox/policy/linux/bpf_renderer_policy_linux.cc
++++ chromium-144.0.7559.59/sandbox/policy/linux/bpf_renderer_policy_linux.cc
 @@ -17,6 +17,11 @@
  #include "sandbox/linux/system_headers/linux_syscalls.h"
  #include "sandbox/policy/linux/sandbox_linux.h"
@@ -59,10 +59,10 @@ Index: chromium-143.0.7499.40/sandbox/policy/linux/bpf_renderer_policy_linux.cc
      case __NR_getrlimit:
      case __NR_setrlimit:
  // We allow setrlimit to dynamically adjust the address space limit as
-Index: chromium-143.0.7499.40/sandbox/linux/bpf_dsl/linux_syscall_ranges.h
+Index: chromium-144.0.7559.59/sandbox/linux/bpf_dsl/linux_syscall_ranges.h
 ===================================================================
---- chromium-143.0.7499.40.orig/sandbox/linux/bpf_dsl/linux_syscall_ranges.h
-+++ chromium-143.0.7499.40/sandbox/linux/bpf_dsl/linux_syscall_ranges.h
+--- chromium-144.0.7559.59.orig/sandbox/linux/bpf_dsl/linux_syscall_ranges.h
++++ chromium-144.0.7559.59/sandbox/linux/bpf_dsl/linux_syscall_ranges.h
 @@ -56,6 +56,13 @@
  #define MAX_PUBLIC_SYSCALL __NR_syscalls
  #define MAX_SYSCALL MAX_PUBLIC_SYSCALL
@@ -77,10 +77,10 @@ Index: chromium-143.0.7499.40/sandbox/linux/bpf_dsl/linux_syscall_ranges.h
  #else
  #error "Unsupported architecture"
  #endif
-Index: chromium-143.0.7499.40/sandbox/linux/BUILD.gn
+Index: chromium-144.0.7559.59/sandbox/linux/BUILD.gn
 ===================================================================
---- chromium-143.0.7499.40.orig/sandbox/linux/BUILD.gn
-+++ chromium-143.0.7499.40/sandbox/linux/BUILD.gn
+--- chromium-144.0.7559.59.orig/sandbox/linux/BUILD.gn
++++ chromium-144.0.7559.59/sandbox/linux/BUILD.gn
 @@ -376,6 +376,8 @@ component("sandbox_services") {
  
  source_set("sandbox_services_headers") {
@@ -90,10 +90,10 @@ Index: chromium-143.0.7499.40/sandbox/linux/BUILD.gn
      "system_headers/arm64_linux_syscalls.h",
      "system_headers/arm_linux_syscalls.h",
      "system_headers/arm_linux_ucontext.h",
-Index: chromium-143.0.7499.40/sandbox/linux/system_headers/linux_syscalls.h
+Index: chromium-144.0.7559.59/sandbox/linux/system_headers/linux_syscalls.h
 ===================================================================
---- chromium-143.0.7499.40.orig/sandbox/linux/system_headers/linux_syscalls.h
-+++ chromium-143.0.7499.40/sandbox/linux/system_headers/linux_syscalls.h
+--- chromium-144.0.7559.59.orig/sandbox/linux/system_headers/linux_syscalls.h
++++ chromium-144.0.7559.59/sandbox/linux/system_headers/linux_syscalls.h
 @@ -44,4 +44,8 @@
  #include "sandbox/linux/system_headers/arm64_linux_syscalls.h"
  #endif
@@ -103,10 +103,10 @@ Index: chromium-143.0.7499.40/sandbox/linux/system_headers/linux_syscalls.h
 +#endif
 +
  #endif  // SANDBOX_LINUX_SYSTEM_HEADERS_LINUX_SYSCALLS_H_
-Index: chromium-143.0.7499.40/sandbox/linux/system_headers/ppc64_linux_syscalls.h
+Index: chromium-144.0.7559.59/sandbox/linux/system_headers/ppc64_linux_syscalls.h
 ===================================================================
 --- /dev/null
-+++ chromium-143.0.7499.40/sandbox/linux/system_headers/ppc64_linux_syscalls.h
++++ chromium-144.0.7559.59/sandbox/linux/system_headers/ppc64_linux_syscalls.h
 @@ -0,0 +1,25 @@
 +// Copyright 2014 The Chromium Authors. All rights reserved.
 +// Use of this source code is governed by a BSD-style license that can be
@@ -133,10 +133,10 @@ Index: chromium-143.0.7499.40/sandbox/linux/system_headers/ppc64_linux_syscalls.
 +#endif
 +
 +#endif  // SANDBOX_LINUX_SYSTEM_HEADERS_PPC64_LINUX_SYSCALLS_H_
-Index: chromium-143.0.7499.40/sandbox/linux/system_headers/ppc64_linux_ucontext.h
+Index: chromium-144.0.7559.59/sandbox/linux/system_headers/ppc64_linux_ucontext.h
 ===================================================================
 --- /dev/null
-+++ chromium-143.0.7499.40/sandbox/linux/system_headers/ppc64_linux_ucontext.h
++++ chromium-144.0.7559.59/sandbox/linux/system_headers/ppc64_linux_ucontext.h
 @@ -0,0 +1,12 @@
 +// Copyright 2014 The Chromium Authors. All rights reserved.
 +// Use of this source code is governed by a BSD-style license that can be
@@ -150,11 +150,11 @@ Index: chromium-143.0.7499.40/sandbox/linux/system_headers/ppc64_linux_ucontext.
 +//TODO: is it necessary to redefine ucontext on PPC64?
 +
 +#endif  // SANDBOX_LINUX_SYSTEM_HEADERS_PPC64_LINUX_UCONTEXT_H_
-Index: chromium-143.0.7499.40/sandbox/linux/syscall_broker/broker_process.cc
+Index: chromium-144.0.7559.59/sandbox/linux/syscall_broker/broker_process.cc
 ===================================================================
---- chromium-143.0.7499.40.orig/sandbox/linux/syscall_broker/broker_process.cc
-+++ chromium-143.0.7499.40/sandbox/linux/syscall_broker/broker_process.cc
-@@ -167,7 +167,7 @@ bool BrokerProcess::IsSyscallBrokerable(
+--- chromium-144.0.7559.59.orig/sandbox/linux/syscall_broker/broker_process.cc
++++ chromium-144.0.7559.59/sandbox/linux/syscall_broker/broker_process.cc
+@@ -166,7 +166,7 @@ bool BrokerProcess::IsSyscallBrokerable(
  #if defined(__NR_fstatat64)
      case __NR_fstatat64:
  #endif
@@ -163,10 +163,10 @@ Index: chromium-143.0.7499.40/sandbox/linux/syscall_broker/broker_process.cc
      case __NR_newfstatat:
  #endif
        return !fast_check || policy_->allowed_command_set.test(COMMAND_STAT);
-Index: chromium-143.0.7499.40/sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc
+Index: chromium-144.0.7559.59/sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc
 ===================================================================
---- chromium-143.0.7499.40.orig/sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc
-+++ chromium-143.0.7499.40/sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc
+--- chromium-144.0.7559.59.orig/sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc
++++ chromium-144.0.7559.59/sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc
 @@ -90,7 +90,8 @@ bool IsBaselinePolicyWatched(int sysno)
           SyscallSets::IsPrctl(sysno) ||
           SyscallSets::IsProcessGroupOrSession(sysno) ||
@@ -196,11 +196,11 @@ Index: chromium-143.0.7499.40/sandbox/linux/seccomp-bpf-helpers/baseline_policy.
    if (SyscallSets::IsSocketCall(sysno))
      return RestrictSocketcallCommand();
  #endif
-Index: chromium-143.0.7499.40/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc
+Index: chromium-144.0.7559.59/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc
 ===================================================================
---- chromium-143.0.7499.40.orig/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc
-+++ chromium-143.0.7499.40/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc
-@@ -44,7 +44,7 @@
+--- chromium-144.0.7559.59.orig/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc
++++ chromium-144.0.7559.59/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc
+@@ -43,7 +43,7 @@
  #define MAP_DROPPABLE 0x08  // Zero memory under memory pressure.
  #endif
  
@@ -209,7 +209,7 @@ Index: chromium-143.0.7499.40/sandbox/linux/seccomp-bpf-helpers/syscall_paramete
      !defined(PTRACE_GET_THREAD_AREA)
  // Also include asm/ptrace-abi.h since ptrace.h in older libc (for instance
  // the one in Ubuntu 16.04 LTS) is missing PTRACE_GET_THREAD_AREA.
-@@ -53,6 +53,11 @@
+@@ -52,6 +52,11 @@
  #include <asm/ptrace-abi.h>
  #endif
  
@@ -219,8 +219,8 @@ Index: chromium-143.0.7499.40/sandbox/linux/seccomp-bpf-helpers/syscall_paramete
 +#endif
 +
  #if BUILDFLAG(IS_ANDROID)
+ #include "base/android/background_thread_pool_field_trial.h"
  
- #if !defined(F_DUPFD_CLOEXEC)
 @@ -110,6 +115,15 @@ inline bool IsArchitectureMips() {
  #endif
  }
@@ -305,10 +305,10 @@ Index: chromium-143.0.7499.40/sandbox/linux/seccomp-bpf-helpers/syscall_paramete
      case __NR_sendto:  // Could specify destination.
        argIndex = 3;
        break;
-Index: chromium-143.0.7499.40/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.h
+Index: chromium-144.0.7559.59/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.h
 ===================================================================
---- chromium-143.0.7499.40.orig/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.h
-+++ chromium-143.0.7499.40/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.h
+--- chromium-144.0.7559.59.orig/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.h
++++ chromium-144.0.7559.59/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.h
 @@ -56,7 +56,7 @@ SANDBOX_EXPORT bpf_dsl::ResultExpr Restr
  // O_NONBLOCK | O_SYNC | O_LARGEFILE | O_CLOEXEC | O_NOATIME.
  SANDBOX_EXPORT bpf_dsl::ResultExpr RestrictFcntlCommands();
@@ -318,10 +318,10 @@ Index: chromium-143.0.7499.40/sandbox/linux/seccomp-bpf-helpers/syscall_paramete
  // Restrict socketcall(2) to only allow socketpair(2), send(2), recv(2),
  // sendto(2), recvfrom(2), shutdown(2), sendmsg(2) and recvmsg(2).
  SANDBOX_EXPORT bpf_dsl::ResultExpr RestrictSocketcallCommand();
-Index: chromium-143.0.7499.40/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
+Index: chromium-144.0.7559.59/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
 ===================================================================
---- chromium-143.0.7499.40.orig/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
-+++ chromium-143.0.7499.40/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
+--- chromium-144.0.7559.59.orig/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
++++ chromium-144.0.7559.59/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
 @@ -29,7 +29,8 @@ bool SyscallSets::IsAllowedGettime(int s
    switch (sysno) {
      case __NR_gettimeofday:
@@ -781,10 +781,10 @@ Index: chromium-143.0.7499.40/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
      case __NR_vserver:
  #endif
        return true;
-Index: chromium-143.0.7499.40/sandbox/linux/seccomp-bpf-helpers/syscall_sets.h
+Index: chromium-144.0.7559.59/sandbox/linux/seccomp-bpf-helpers/syscall_sets.h
 ===================================================================
---- chromium-143.0.7499.40.orig/sandbox/linux/seccomp-bpf-helpers/syscall_sets.h
-+++ chromium-143.0.7499.40/sandbox/linux/seccomp-bpf-helpers/syscall_sets.h
+--- chromium-144.0.7559.59.orig/sandbox/linux/seccomp-bpf-helpers/syscall_sets.h
++++ chromium-144.0.7559.59/sandbox/linux/seccomp-bpf-helpers/syscall_sets.h
 @@ -46,13 +46,14 @@ class SANDBOX_EXPORT SyscallSets {
    static bool IsDeniedGetOrModifySocket(int sysno);
  
@@ -834,11 +834,11 @@ Index: chromium-143.0.7499.40/sandbox/linux/seccomp-bpf-helpers/syscall_sets.h
    // Big system V multiplexing system call.
    static bool IsSystemVIpc(int sysno);
  #endif
-Index: chromium-143.0.7499.40/sandbox/linux/services/syscall_wrappers.cc
+Index: chromium-144.0.7559.59/sandbox/linux/services/syscall_wrappers.cc
 ===================================================================
---- chromium-143.0.7499.40.orig/sandbox/linux/services/syscall_wrappers.cc
-+++ chromium-143.0.7499.40/sandbox/linux/services/syscall_wrappers.cc
-@@ -68,7 +68,7 @@ long sys_clone(unsigned long flags,
+--- chromium-144.0.7559.59.orig/sandbox/linux/services/syscall_wrappers.cc
++++ chromium-144.0.7559.59/sandbox/linux/services/syscall_wrappers.cc
+@@ -63,7 +63,7 @@ long sys_clone(unsigned long flags,
  #if defined(ARCH_CPU_X86_64)
    return syscall(__NR_clone, flags, child_stack, ptid, ctid, tls);
  #elif defined(ARCH_CPU_X86) || defined(ARCH_CPU_ARM_FAMILY) || \
@@ -847,10 +847,10 @@ Index: chromium-143.0.7499.40/sandbox/linux/services/syscall_wrappers.cc
    // CONFIG_CLONE_BACKWARDS defined.
    return syscall(__NR_clone, flags, child_stack, ptid, tls, ctid);
  #endif
-Index: chromium-143.0.7499.40/sandbox/linux/bpf_dsl/seccomp_macros.h
+Index: chromium-144.0.7559.59/sandbox/linux/bpf_dsl/seccomp_macros.h
 ===================================================================
---- chromium-143.0.7499.40.orig/sandbox/linux/bpf_dsl/seccomp_macros.h
-+++ chromium-143.0.7499.40/sandbox/linux/bpf_dsl/seccomp_macros.h
+--- chromium-144.0.7559.59.orig/sandbox/linux/bpf_dsl/seccomp_macros.h
++++ chromium-144.0.7559.59/sandbox/linux/bpf_dsl/seccomp_macros.h
 @@ -14,6 +14,9 @@
  #if defined(__mips__)
  // sys/user.h in eglibc misses size_t definition
@@ -913,10 +913,10 @@ Index: chromium-143.0.7499.40/sandbox/linux/bpf_dsl/seccomp_macros.h
  #else
  #error Unsupported target platform
  
-Index: chromium-143.0.7499.40/sandbox/linux/system_headers/linux_seccomp.h
+Index: chromium-144.0.7559.59/sandbox/linux/system_headers/linux_seccomp.h
 ===================================================================
---- chromium-143.0.7499.40.orig/sandbox/linux/system_headers/linux_seccomp.h
-+++ chromium-143.0.7499.40/sandbox/linux/system_headers/linux_seccomp.h
+--- chromium-144.0.7559.59.orig/sandbox/linux/system_headers/linux_seccomp.h
++++ chromium-144.0.7559.59/sandbox/linux/system_headers/linux_seccomp.h
 @@ -38,6 +38,9 @@
  #ifndef EM_AARCH64
  #define EM_AARCH64 183
@@ -940,10 +940,10 @@ Index: chromium-143.0.7499.40/sandbox/linux/system_headers/linux_seccomp.h
  
  // For prctl.h
  #ifndef PR_SET_SECCOMP
-Index: chromium-143.0.7499.40/sandbox/linux/system_headers/linux_signal.h
+Index: chromium-144.0.7559.59/sandbox/linux/system_headers/linux_signal.h
 ===================================================================
---- chromium-143.0.7499.40.orig/sandbox/linux/system_headers/linux_signal.h
-+++ chromium-143.0.7499.40/sandbox/linux/system_headers/linux_signal.h
+--- chromium-144.0.7559.59.orig/sandbox/linux/system_headers/linux_signal.h
++++ chromium-144.0.7559.59/sandbox/linux/system_headers/linux_signal.h
 @@ -13,7 +13,7 @@
  // (not undefined, but defined different values and in different memory
  // layouts). So, fill the gap here.
@@ -953,10 +953,10 @@ Index: chromium-143.0.7499.40/sandbox/linux/system_headers/linux_signal.h
  
  #define LINUX_SIGHUP 1
  #define LINUX_SIGINT 2
-Index: chromium-143.0.7499.40/sandbox/linux/seccomp-bpf/syscall.cc
+Index: chromium-144.0.7559.59/sandbox/linux/seccomp-bpf/syscall.cc
 ===================================================================
---- chromium-143.0.7499.40.orig/sandbox/linux/seccomp-bpf/syscall.cc
-+++ chromium-143.0.7499.40/sandbox/linux/seccomp-bpf/syscall.cc
+--- chromium-144.0.7559.59.orig/sandbox/linux/seccomp-bpf/syscall.cc
++++ chromium-144.0.7559.59/sandbox/linux/seccomp-bpf/syscall.cc
 @@ -19,7 +19,7 @@ namespace sandbox {
  namespace {
  
@@ -1051,11 +1051,11 @@ Index: chromium-143.0.7499.40/sandbox/linux/seccomp-bpf/syscall.cc
  #endif
    SECCOMP_RESULT(ctx) = static_cast<greg_t>(ret_val);
  }
-Index: chromium-143.0.7499.40/sandbox/linux/seccomp-bpf-helpers/baseline_policy_unittest.cc
+Index: chromium-144.0.7559.59/sandbox/linux/seccomp-bpf-helpers/baseline_policy_unittest.cc
 ===================================================================
---- chromium-143.0.7499.40.orig/sandbox/linux/seccomp-bpf-helpers/baseline_policy_unittest.cc
-+++ chromium-143.0.7499.40/sandbox/linux/seccomp-bpf-helpers/baseline_policy_unittest.cc
-@@ -350,8 +350,10 @@ TEST_BASELINE_SIGSYS(__NR_timer_create)
+--- chromium-144.0.7559.59.orig/sandbox/linux/seccomp-bpf-helpers/baseline_policy_unittest.cc
++++ chromium-144.0.7559.59/sandbox/linux/seccomp-bpf-helpers/baseline_policy_unittest.cc
+@@ -354,8 +354,10 @@ TEST_BASELINE_SIGSYS(__NR_timer_create)
  
  #if !defined(__aarch64__)
  TEST_BASELINE_SIGSYS(__NR_inotify_init)
@@ -1066,10 +1066,10 @@ Index: chromium-143.0.7499.40/sandbox/linux/seccomp-bpf-helpers/baseline_policy_
  
  #if defined(LIBC_GLIBC) && !BUILDFLAG(IS_CHROMEOS)
  BPF_TEST_C(BaselinePolicy, FutexEINVAL, BaselinePolicy) {
-Index: chromium-143.0.7499.40/sandbox/linux/system_headers/linux_stat.h
+Index: chromium-144.0.7559.59/sandbox/linux/system_headers/linux_stat.h
 ===================================================================
---- chromium-143.0.7499.40.orig/sandbox/linux/system_headers/linux_stat.h
-+++ chromium-143.0.7499.40/sandbox/linux/system_headers/linux_stat.h
+--- chromium-144.0.7559.59.orig/sandbox/linux/system_headers/linux_stat.h
++++ chromium-144.0.7559.59/sandbox/linux/system_headers/linux_stat.h
 @@ -173,6 +173,28 @@ struct kernel_stat {
    unsigned int __unused4;
    unsigned int __unused5;
@@ -1086,12 +1086,12 @@ Index: chromium-143.0.7499.40/sandbox/linux/system_headers/linux_stat.h
 +   long            st_size;
 +   unsigned long   st_blksize;
 +   unsigned long   st_blocks;
-+   // unsigned long   st_atime;
-+   unsigned long   st_atime_nsec;
-+   //unsigned long   st_mtime;
-+   unsigned long   st_mtime_nsec;
-+   //unsigned long   st_ctime;
-+   unsigned long   st_ctime_nsec;
++   unsigned long   st_atime_;
++   unsigned long   st_atime_nsec_;
++   unsigned long   st_mtime_;
++   unsigned long   st_mtime_nsec_;
++   unsigned long   st_ctime_;
++   unsigned long   st_ctime_nsec_;
 +   unsigned long   __unused4;
 +   unsigned long   __unused5;
 +   unsigned long   __unused6;
@@ -1099,10 +1099,10 @@ Index: chromium-143.0.7499.40/sandbox/linux/system_headers/linux_stat.h
  #endif
  
  #if !defined(AT_EMPTY_PATH)
-Index: chromium-143.0.7499.40/sandbox/linux/services/credentials.cc
+Index: chromium-144.0.7559.59/sandbox/linux/services/credentials.cc
 ===================================================================
---- chromium-143.0.7499.40.orig/sandbox/linux/services/credentials.cc
-+++ chromium-143.0.7499.40/sandbox/linux/services/credentials.cc
+--- chromium-144.0.7559.59.orig/sandbox/linux/services/credentials.cc
++++ chromium-144.0.7559.59/sandbox/linux/services/credentials.cc
 @@ -85,7 +85,7 @@ bool ChrootToSafeEmptyDir() {
    alignas(16) std::array<char, PTHREAD_STACK_MIN_CONST> stack_buf;
  
@@ -1134,10 +1134,10 @@ Index: chromium-143.0.7499.40/sandbox/linux/services/credentials.cc
    clone_flags |= CLONE_VM | CLONE_VFORK | CLONE_SETTLS;
  
    char tls_buf[PTHREAD_STACK_MIN_CONST] = {};
-Index: chromium-143.0.7499.40/sandbox/policy/linux/bpf_utility_policy_linux.cc
+Index: chromium-144.0.7559.59/sandbox/policy/linux/bpf_utility_policy_linux.cc
 ===================================================================
---- chromium-143.0.7499.40.orig/sandbox/policy/linux/bpf_utility_policy_linux.cc
-+++ chromium-143.0.7499.40/sandbox/policy/linux/bpf_utility_policy_linux.cc
+--- chromium-144.0.7559.59.orig/sandbox/policy/linux/bpf_utility_policy_linux.cc
++++ chromium-144.0.7559.59/sandbox/policy/linux/bpf_utility_policy_linux.cc
 @@ -34,7 +34,7 @@ ResultExpr UtilityProcessPolicy::Evaluat
      case __NR_fdatasync:
      case __NR_fsync:
@@ -1147,11 +1147,11 @@ Index: chromium-143.0.7499.40/sandbox/policy/linux/bpf_utility_policy_linux.cc
      case __NR_getrlimit:
  #endif
  #if defined(__i386__) || defined(__arm__)
-Index: chromium-143.0.7499.40/sandbox/linux/seccomp-bpf-helpers/sigsys_handlers.cc
+Index: chromium-144.0.7559.59/sandbox/linux/seccomp-bpf-helpers/sigsys_handlers.cc
 ===================================================================
---- chromium-143.0.7499.40.orig/sandbox/linux/seccomp-bpf-helpers/sigsys_handlers.cc
-+++ chromium-143.0.7499.40/sandbox/linux/seccomp-bpf-helpers/sigsys_handlers.cc
-@@ -389,7 +389,16 @@ intptr_t SIGSYSFstatatHandler(const stru
+--- chromium-144.0.7559.59.orig/sandbox/linux/seccomp-bpf-helpers/sigsys_handlers.cc
++++ chromium-144.0.7559.59/sandbox/linux/seccomp-bpf-helpers/sigsys_handlers.cc
+@@ -384,7 +384,16 @@ intptr_t SIGSYSFstatatHandler(const stru
    if (args.nr == __NR_fstatat_default) {
      if (*reinterpret_cast<const char*>(args.args[1]) == '\0' &&
          args.args[3] == static_cast<uint64_t>(AT_EMPTY_PATH)) {

diff --git a/0001-swiftshader-fix-build.patch b/0001-swiftshader-fix-build.patch
index c3f8771..efd12dc 100644
--- a/0001-swiftshader-fix-build.patch
+++ b/0001-swiftshader-fix-build.patch
@@ -1,6 +1,13 @@
-diff -up chromium-140.0.7339.80/third_party/swiftshader/third_party/llvm-16.0/BUILD.gn.me chromium-140.0.7339.80/third_party/swiftshader/third_party/llvm-16.0/BUILD.gn
---- chromium-140.0.7339.80/third_party/swiftshader/third_party/llvm-16.0/BUILD.gn.me	2025-09-04 06:45:21.570780130 +0200
-+++ chromium-140.0.7339.80/third_party/swiftshader/third_party/llvm-16.0/BUILD.gn	2025-09-04 06:55:56.278501043 +0200
+Description: fix swiftshader build issue on ppc64el
+Origin: vendor, https://gitlab.raptorengineering.com/raptor-engineering-public/chromium/openpower-patches/-/blob/chromium-131/patches/ppc64le/third_party/0001-swiftshader-fix-build.patch
+Bug: https://buildd.debian.org/status/fetch.php?pkg=chromium&arch=ppc64el&ver=131.0.6778.204-1&stamp=1734633529&raw=0
+Last-Update: 2024-12-20
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+Index: chromium-144.0.7559.59/third_party/swiftshader/third_party/llvm-16.0/BUILD.gn
+===================================================================
+--- chromium-144.0.7559.59.orig/third_party/swiftshader/third_party/llvm-16.0/BUILD.gn
++++ chromium-144.0.7559.59/third_party/swiftshader/third_party/llvm-16.0/BUILD.gn
 @@ -1599,6 +1599,9 @@ swiftshader_llvm_source_set("swiftshader
      "llvm/lib/Target/PowerPC/PPCVSXFMAMutate.cpp",
      "llvm/lib/Target/PowerPC/PPCVSXSwapRemoval.cpp",

diff --git a/0001-third_party-angle-Include-missing-header-cstddef-in-.patch b/0001-third_party-angle-Include-missing-header-cstddef-in-.patch
index 0377a9b..72b1e2a 100644
--- a/0001-third_party-angle-Include-missing-header-cstddef-in-.patch
+++ b/0001-third_party-angle-Include-missing-header-cstddef-in-.patch
@@ -1,7 +1,7 @@
-Index: chromium-143.0.7499.40/third_party/angle/src/libANGLE/Constants.h
+Index: chromium-144.0.7559.59/third_party/angle/src/libANGLE/Constants.h
 ===================================================================
---- chromium-143.0.7499.40.orig/third_party/angle/src/libANGLE/Constants.h
-+++ chromium-143.0.7499.40/third_party/angle/src/libANGLE/Constants.h
+--- chromium-144.0.7559.59.orig/third_party/angle/src/libANGLE/Constants.h
++++ chromium-144.0.7559.59/third_party/angle/src/libANGLE/Constants.h
 @@ -9,6 +9,7 @@
  #ifndef LIBANGLE_CONSTANTS_H_
  #define LIBANGLE_CONSTANTS_H_

diff --git a/0001-third_party-libvpx-Properly-generate-gni-on-ppc64.patch b/0001-third_party-libvpx-Properly-generate-gni-on-ppc64.patch
index 8f06a2d..358582b 100644
--- a/0001-third_party-libvpx-Properly-generate-gni-on-ppc64.patch
+++ b/0001-third_party-libvpx-Properly-generate-gni-on-ppc64.patch
@@ -8,10 +8,10 @@ Subject: [PATCH] third_party/libvpx: Properly generate gni on ppc64
  third_party/libvpx/generate_gni.sh | 10 ++++++++++
  2 files changed, 12 insertions(+)
 
-Index: chromium-143.0.7499.40/third_party/libvpx/BUILD.gn
+Index: chromium-144.0.7559.59/third_party/libvpx/BUILD.gn
 ===================================================================
---- chromium-143.0.7499.40.orig/third_party/libvpx/BUILD.gn
-+++ chromium-143.0.7499.40/third_party/libvpx/BUILD.gn
+--- chromium-144.0.7559.59.orig/third_party/libvpx/BUILD.gn
++++ chromium-144.0.7559.59/third_party/libvpx/BUILD.gn
 @@ -297,6 +297,8 @@ if (current_cpu == "x86" || (current_cpu
      } else if (current_cpu == "x64") {
        deps = [ ":libvpx_x86_64_headers" ]

diff --git a/0001-third_party-pffft-Include-altivec.h-on-ppc64-with-SI.patch b/0001-third_party-pffft-Include-altivec.h-on-ppc64-with-SI.patch
index 2ba1e48..06a8f9e 100644
--- a/0001-third_party-pffft-Include-altivec.h-on-ppc64-with-SI.patch
+++ b/0001-third_party-pffft-Include-altivec.h-on-ppc64-with-SI.patch
@@ -8,10 +8,10 @@ Subject: [PATCH] third_party/pffft: Include altivec.h on ppc64 with SIMD
  third_party/pffft/src/pffft.c | 1 +
  1 file changed, 1 insertion(+)
 
-Index: chromium-143.0.7499.40/third_party/pffft/src/pffft.c
+Index: chromium-144.0.7559.59/third_party/pffft/src/pffft.c
 ===================================================================
---- chromium-143.0.7499.40.orig/third_party/pffft/src/pffft.c
-+++ chromium-143.0.7499.40/third_party/pffft/src/pffft.c
+--- chromium-144.0.7559.59.orig/third_party/pffft/src/pffft.c
++++ chromium-144.0.7559.59/third_party/pffft/src/pffft.c
 @@ -100,6 +100,7 @@
     Altivec support macros 
  */

diff --git a/0002-Add-PPC64-generated-files-for-boringssl.patch b/0002-Add-PPC64-generated-files-for-boringssl.patch
index 12d7619..79e72c5 100644
--- a/0002-Add-PPC64-generated-files-for-boringssl.patch
+++ b/0002-Add-PPC64-generated-files-for-boringssl.patch
@@ -1,7 +1,7 @@
-Index: chromium-143.0.7499.40/third_party/boringssl/src/gen/bcm/aesp8-ppc-linux.S
+Index: chromium-144.0.7559.59/third_party/boringssl/src/gen/bcm/aesp8-ppc-linux.S
 ===================================================================
 --- /dev/null
-+++ chromium-143.0.7499.40/third_party/boringssl/src/gen/bcm/aesp8-ppc-linux.S
++++ chromium-144.0.7559.59/third_party/boringssl/src/gen/bcm/aesp8-ppc-linux.S
 @@ -0,0 +1,3673 @@
 +// This file is generated from a similarly-named Perl script in the BoringSSL
 +// source tree. Do not edit by hand.
@@ -3676,10 +3676,10 @@ Index: chromium-143.0.7499.40/third_party/boringssl/src/gen/bcm/aesp8-ppc-linux.
 +// See https://www.airs.ccom/blog/archives/518.
 +.section .note.GNU-stack,"",%progbits
 +#endif
-Index: chromium-143.0.7499.40/third_party/boringssl/src/gen/bcm/ghashp8-ppc-linux.S
+Index: chromium-144.0.7559.59/third_party/boringssl/src/gen/bcm/ghashp8-ppc-linux.S
 ===================================================================
 --- /dev/null
-+++ chromium-143.0.7499.40/third_party/boringssl/src/gen/bcm/ghashp8-ppc-linux.S
++++ chromium-144.0.7559.59/third_party/boringssl/src/gen/bcm/ghashp8-ppc-linux.S
 @@ -0,0 +1,590 @@
 +// This file is generated from a similarly-named Perl script in the BoringSSL
 +// source tree. Do not edit by hand.
@@ -4271,10 +4271,10 @@ Index: chromium-143.0.7499.40/third_party/boringssl/src/gen/bcm/ghashp8-ppc-linu
 +// See https://www.airs.ccom/blog/archives/518.
 +.section .note.GNU-stack,"",%progbits
 +#endif
-Index: chromium-143.0.7499.40/third_party/boringssl/src/gen/sources.cmake
+Index: chromium-144.0.7559.59/third_party/boringssl/src/gen/sources.cmake
 ===================================================================
---- chromium-143.0.7499.40.orig/third_party/boringssl/src/gen/sources.cmake
-+++ chromium-143.0.7499.40/third_party/boringssl/src/gen/sources.cmake
+--- chromium-144.0.7559.59.orig/third_party/boringssl/src/gen/sources.cmake
++++ chromium-144.0.7559.59/third_party/boringssl/src/gen/sources.cmake
 @@ -122,6 +122,7 @@ set(
    gen/bcm/aesni-x86-linux.S
    gen/bcm/aesni-x86_64-apple.S
@@ -4299,7 +4299,7 @@ Index: chromium-143.0.7499.40/third_party/boringssl/src/gen/sources.cmake
    crypto/crypto.cc
    crypto/curve25519/curve25519.cc
    crypto/curve25519/curve25519_64_adx.cc
-@@ -2971,6 +2974,7 @@ set(
+@@ -2980,6 +2983,7 @@ set(
    gen/test_support/trampoline-armv8-apple.S
    gen/test_support/trampoline-armv8-linux.S
    gen/test_support/trampoline-armv8-win.S
@@ -4307,10 +4307,10 @@ Index: chromium-143.0.7499.40/third_party/boringssl/src/gen/sources.cmake
    gen/test_support/trampoline-x86-apple.S
    gen/test_support/trampoline-x86-linux.S
    gen/test_support/trampoline-x86_64-apple.S
-Index: chromium-143.0.7499.40/third_party/boringssl/src/gen/sources.json
+Index: chromium-144.0.7559.59/third_party/boringssl/src/gen/sources.json
 ===================================================================
---- chromium-143.0.7499.40.orig/third_party/boringssl/src/gen/sources.json
-+++ chromium-143.0.7499.40/third_party/boringssl/src/gen/sources.json
+--- chromium-144.0.7559.59.orig/third_party/boringssl/src/gen/sources.json
++++ chromium-144.0.7559.59/third_party/boringssl/src/gen/sources.json
 @@ -100,6 +100,7 @@
        "gen/bcm/aesni-x86-linux.S",
        "gen/bcm/aesni-x86_64-apple.S",
@@ -4335,7 +4335,7 @@ Index: chromium-143.0.7499.40/third_party/boringssl/src/gen/sources.json
        "crypto/crypto.cc",
        "crypto/curve25519/curve25519.cc",
        "crypto/curve25519/curve25519_64_adx.cc",
-@@ -2883,6 +2886,7 @@
+@@ -2892,6 +2895,7 @@
        "gen/test_support/trampoline-armv8-apple.S",
        "gen/test_support/trampoline-armv8-linux.S",
        "gen/test_support/trampoline-armv8-win.S",
@@ -4343,10 +4343,10 @@ Index: chromium-143.0.7499.40/third_party/boringssl/src/gen/sources.json
        "gen/test_support/trampoline-x86-apple.S",
        "gen/test_support/trampoline-x86-linux.S",
        "gen/test_support/trampoline-x86_64-apple.S",
-Index: chromium-143.0.7499.40/third_party/boringssl/src/gen/test_support/trampoline-ppc-linux.S
+Index: chromium-144.0.7559.59/third_party/boringssl/src/gen/test_support/trampoline-ppc-linux.S
 ===================================================================
 --- /dev/null
-+++ chromium-143.0.7499.40/third_party/boringssl/src/gen/test_support/trampoline-ppc-linux.S
++++ chromium-144.0.7559.59/third_party/boringssl/src/gen/test_support/trampoline-ppc-linux.S
 @@ -0,0 +1,1413 @@
 +// This file is generated from a similarly-named Perl script in the BoringSSL
 +// source tree. Do not edit by hand.

diff --git a/0002-Add-ppc64-trap-instructions.patch b/0002-Add-ppc64-trap-instructions.patch
index 61e9992..9559580 100644
--- a/0002-Add-ppc64-trap-instructions.patch
+++ b/0002-Add-ppc64-trap-instructions.patch
@@ -1,7 +1,7 @@
-Index: chromium-143.0.7499.40/v8/src/base/immediate-crash.h
+Index: chromium-144.0.7559.59/v8/src/base/immediate-crash.h
 ===================================================================
---- chromium-143.0.7499.40.orig/v8/src/base/immediate-crash.h
-+++ chromium-143.0.7499.40/v8/src/base/immediate-crash.h
+--- chromium-144.0.7559.59.orig/v8/src/base/immediate-crash.h
++++ chromium-144.0.7559.59/v8/src/base/immediate-crash.h
 @@ -98,6 +98,13 @@
  #define TRAP_SEQUENCE1_() asm volatile(".2byte 0x0001");
  #define TRAP_SEQUENCE2_() asm volatile("")

diff --git a/0002-regenerate-xnn-buildgn.patch b/0002-regenerate-xnn-buildgn.patch
index 09eb811..21211da 100644
--- a/0002-regenerate-xnn-buildgn.patch
+++ b/0002-regenerate-xnn-buildgn.patch
@@ -1,10 +1,10 @@
 File regenerated by running 'python3 generate_build_gn.py'
 Requires Bazel 8 or higher to regenerate
 
-Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
+Index: chromium-144.0.7559.59/third_party/xnnpack/BUILD.gn
 ===================================================================
---- chromium-143.0.7499.40.orig/third_party/xnnpack/BUILD.gn
-+++ chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
+--- chromium-144.0.7559.59.orig/third_party/xnnpack/BUILD.gn
++++ chromium-144.0.7559.59/third_party/xnnpack/BUILD.gn
 @@ -35,10 +35,10 @@ config("xnnpack_public_config") {
    }
  
@@ -20,7 +20,7 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
  }
  
  config("xnnpack_private_config") {
-@@ -48,1840 +48,2104 @@ config("xnnpack_private_config") {
+@@ -48,1844 +48,2108 @@ config("xnnpack_private_config") {
    ]
  }
  
@@ -1687,6 +1687,7 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 +    ":f32-vtanh_arm64",
 +    ":f32-vunary_arm64",
 +    ":operators_arm64",
++    ":pf16-f16-f16-igemm_arch=armv8.2-a+sve+sve2",
 +    ":pf16-gemm_arch=armv8.2-a+sve+sve2",
 +    ":pf32-gemm_arch=armv8.2-a+sve+sve2",
 +    ":pqs8-f32-qc8w-igemm_arch=armv8.2-a+sve+sve2",
@@ -1709,6 +1710,7 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 +    ":qd8-f32-qb4w-gemm_arch=armv8.2-a+dotprod",
 +    ":qd8-f32-qb4w-gemm_arch=armv8.2-a+i8mm+fp16",
 +    ":qd8-f32-qb4w-gemm_arm64",
++    ":qd8-f32-qc2w-gemm_arch=armv8.2-a+dotprod",
 +    ":qd8-f32-qc4w-gemm_arch=armv8.2-a+dotprod",
 +    ":qd8-f32-qc4w-gemm_arch=armv8.2-a+i8mm+fp16",
 +    ":qd8-f32-qc4w-gemm_arm64",
@@ -2425,6 +2427,7 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 +    ":f32-vtanh_arm64_standalone",
 +    ":f32-vunary_arm64_standalone",
 +    ":operators_arm64_standalone",
++    ":pf16-f16-f16-igemm_arch=armv8.2-a+sve+sve2_standalone",
 +    ":pf16-gemm_arch=armv8.2-a+sve+sve2_standalone",
 +    ":pf32-gemm_arch=armv8.2-a+sve+sve2_standalone",
 +    ":pqs8-f32-qc8w-igemm_arch=armv8.2-a+sve+sve2_standalone",
@@ -2447,6 +2450,7 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 +    ":qd8-f32-qb4w-gemm_arch=armv8.2-a+dotprod_standalone",
 +    ":qd8-f32-qb4w-gemm_arch=armv8.2-a+i8mm+fp16_standalone",
 +    ":qd8-f32-qb4w-gemm_arm64_standalone",
++    ":qd8-f32-qc2w-gemm_arch=armv8.2-a+dotprod_standalone",
 +    ":qd8-f32-qc4w-gemm_arch=armv8.2-a+dotprod_standalone",
 +    ":qd8-f32-qc4w-gemm_arch=armv8.2-a+i8mm+fp16_standalone",
 +    ":qd8-f32-qc4w-gemm_arm64_standalone",
@@ -2650,6 +2654,7 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -      ":f32-vtanh_arm64",
 -      ":f32-vunary_arm64",
 -      ":operators_arm64",
+-      ":pf16-f16-f16-igemm_arch=armv8.2-a+sve+sve2",
 -      ":pf16-gemm_arch=armv8.2-a+sve+sve2",
 -      ":pf32-gemm_arch=armv8.2-a+sve+sve2",
 -      ":pqs8-f32-qc8w-igemm_arch=armv8.2-a+sve+sve2",
@@ -2672,6 +2677,7 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -      ":qd8-f32-qb4w-gemm_arch=armv8.2-a+dotprod",
 -      ":qd8-f32-qb4w-gemm_arch=armv8.2-a+i8mm+fp16",
 -      ":qd8-f32-qb4w-gemm_arm64",
+-      ":qd8-f32-qc2w-gemm_arch=armv8.2-a+dotprod",
 -      ":qd8-f32-qc4w-gemm_arch=armv8.2-a+dotprod",
 -      ":qd8-f32-qc4w-gemm_arch=armv8.2-a+i8mm+fp16",
 -      ":qd8-f32-qc4w-gemm_arm64",
@@ -3042,6 +3048,7 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -      ":f32-vtanh_arm64_standalone",
 -      ":f32-vunary_arm64_standalone",
 -      ":operators_arm64_standalone",
+-      ":pf16-f16-f16-igemm_arch=armv8.2-a+sve+sve2_standalone",
 -      ":pf16-gemm_arch=armv8.2-a+sve+sve2_standalone",
 -      ":pf32-gemm_arch=armv8.2-a+sve+sve2_standalone",
 -      ":pqs8-f32-qc8w-igemm_arch=armv8.2-a+sve+sve2_standalone",
@@ -3064,6 +3071,7 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -      ":qd8-f32-qb4w-gemm_arch=armv8.2-a+dotprod_standalone",
 -      ":qd8-f32-qb4w-gemm_arch=armv8.2-a+i8mm+fp16_standalone",
 -      ":qd8-f32-qb4w-gemm_arm64_standalone",
+-      ":qd8-f32-qc2w-gemm_arch=armv8.2-a+dotprod_standalone",
 -      ":qd8-f32-qc4w-gemm_arch=armv8.2-a+dotprod_standalone",
 -      ":qd8-f32-qc4w-gemm_arch=armv8.2-a+i8mm+fp16_standalone",
 -      ":qd8-f32-qc4w-gemm_arm64_standalone",
@@ -3933,7 +3941,7 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
      ]
    }
  } else {
-@@ -1891,6 +2155,7 @@ if (current_cpu == "x64" || current_cpu
+@@ -1895,6 +2159,7 @@ if (current_cpu == "x64" || current_cpu
    }
  }
  
@@ -3941,7 +3949,7 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
  if (build_with_chromium) {
    source_set("xnnpack") {
      public = [ "src/include/xnnpack.h" ]
-@@ -1901,37 +2166,37 @@ if (build_with_chromium) {
+@@ -1905,38 +2170,38 @@ if (build_with_chromium) {
      configs += [ ":xnnpack_private_config" ]
  
      sources = [
@@ -3970,6 +3978,7 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -      "src/src/sanitizers.c",
 -      "src/src/subgraph.c",
 -      "src/src/tensor.c",
+-      "src/src/xnnpack/fingerprint_check.c",
 +    "src/src/cache.c",
 +    "src/src/datatype.c",
 +    "src/src/indirection.c",
@@ -3989,7 +3998,8 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 +    "src/src/runtime.c",
 +    "src/src/sanitizers.c",
 +    "src/src/subgraph.c",
-+    "src/src/tensor.c"
++    "src/src/tensor.c",
++    "src/src/xnnpack/fingerprint_check.c"
      ]
  
      deps = xnnpack_deps + [
@@ -4006,7 +4016,7 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
  
      public_configs = [ ":xnnpack_public_config" ]
    }
-@@ -1948,37 +2213,37 @@ if (build_with_internal_optimization_gui
+@@ -1953,38 +2218,38 @@ if (build_with_internal_optimization_gui
      configs += [ ":xnnpack_private_config" ]
  
      sources = [
@@ -4035,6 +4045,7 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -      "src/src/sanitizers.c",
 -      "src/src/subgraph.c",
 -      "src/src/tensor.c",
+-      "src/src/xnnpack/fingerprint_check.c",
 +    "src/src/cache.c",
 +    "src/src/datatype.c",
 +    "src/src/indirection.c",
@@ -4054,7 +4065,8 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 +    "src/src/runtime.c",
 +    "src/src/sanitizers.c",
 +    "src/src/subgraph.c",
-+    "src/src/tensor.c"
++    "src/src/tensor.c",
++    "src/src/xnnpack/fingerprint_check.c"
      ]
  
      deps = xnnpack_standalone_deps + [
@@ -4071,7 +4083,7 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
  
      public_configs = [ ":xnnpack_public_config" ]
  
-@@ -1989,56289 +2254,65801 @@ if (build_with_internal_optimization_gui
+@@ -1995,56421 +2260,65945 @@ if (build_with_internal_optimization_gui
  }
  
  if (current_cpu == "x64" || current_cpu == "x86") {
@@ -5368,7 +5380,7 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f16-f32acc-rdsum/gen/f16-f32acc-rdsum-7p7x-avx512skx-u64.c",
+-        "src/src/f16-f32acc-rdsum/gen/f16-f32acc-rdsum-7p7x-minmax-avx512skx-u64.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -5424,7 +5436,7 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f16-f32acc-rdsum/gen/f16-f32acc-rdsum-7p7x-avx512skx-u64.c",
+-        "src/src/f16-f32acc-rdsum/gen/f16-f32acc-rdsum-7p7x-minmax-avx512skx-u64.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -5463,7 +5475,7 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f16-f32acc-rdsum/gen/f16-f32acc-rdsum-7p7x-f16c-u32.c",
+-        "src/src/f16-f32acc-rdsum/gen/f16-f32acc-rdsum-7p7x-minmax-f16c-u32.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -5497,7 +5509,7 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f16-f32acc-rdsum/gen/f16-f32acc-rdsum-7p7x-f16c-u32.c",
+-        "src/src/f16-f32acc-rdsum/gen/f16-f32acc-rdsum-7p7x-minmax-f16c-u32.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -7213,7 +7225,7 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-f32acc-rdsum/gen/f16-f32acc-rdsum-7p7x-avx512skx-u64.c"
++      "src/src/f16-f32acc-rdsum/gen/f16-f32acc-rdsum-7p7x-minmax-avx512skx-u64.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -7285,7 +7297,7 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-f32acc-rdsum/gen/f16-f32acc-rdsum-7p7x-avx512skx-u64.c"
++      "src/src/f16-f32acc-rdsum/gen/f16-f32acc-rdsum-7p7x-minmax-avx512skx-u64.c"
 +    ]
  
 -      sources = [
@@ -7362,7 +7374,7 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-f32acc-rdsum/gen/f16-f32acc-rdsum-7p7x-f16c-u32.c"
++      "src/src/f16-f32acc-rdsum/gen/f16-f32acc-rdsum-7p7x-minmax-f16c-u32.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -7454,7 +7466,7 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-f32acc-rdsum/gen/f16-f32acc-rdsum-7p7x-f16c-u32.c"
++      "src/src/f16-f32acc-rdsum/gen/f16-f32acc-rdsum-7p7x-minmax-f16c-u32.c"
 +    ]
  
 -      sources = [
@@ -24962,6 +24974,8 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -        "src/src/operators/convolution-nhwc.c",
 -        "src/src/operators/deconvolution-nhwc.c",
 -        "src/src/operators/dynamic-fully-connected-nc.c",
+-        "src/src/operators/fingerprint_cache.c",
+-        "src/src/operators/fingerprint_id.c",
 -        "src/src/operators/fully-connected-nc.c",
 -        "src/src/operators/max-pooling-nhwc.c",
 -        "src/src/operators/pack-lh.c",
@@ -25035,6 +25049,8 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -        "src/src/operators/convolution-nhwc.c",
 -        "src/src/operators/deconvolution-nhwc.c",
 -        "src/src/operators/dynamic-fully-connected-nc.c",
+-        "src/src/operators/fingerprint_cache.c",
+-        "src/src/operators/fingerprint_id.c",
 -        "src/src/operators/fully-connected-nc.c",
 -        "src/src/operators/max-pooling-nhwc.c",
 -        "src/src/operators/pack-lh.c",
@@ -30881,6 +30897,7 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -      if (!(is_android && use_order_profiling)) {
 -        assert_no_deps = [ "//base" ]
 -      }
+-    }
 +if (build_with_chromium) {
 +  source_set("f32-vcmul_sse-no-sse2") {
 +    cflags = [
@@ -30906,9 +30923,33 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 +    ]
 +
 +    public_configs = [ ":xnnpack_public_config" ]
-+  }
+   }
 +}
-+
+ 
+-  if (build_with_chromium) {
+-    source_set("qd8-f32-qc8w-igemm_sse4.1-no-sse4.2") {
+-      cflags = [
+-        "-mno-sse4.2",
+-        "-msse4.1",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-1x4c8-minmax-sse41-ld64.c",
+-        "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-4x4c8-minmax-sse41-ld64.c",
+-      ]
+-
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
+-
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/fp16",
+-        "//third_party/fxdiv",
+-        "//third_party/pthreadpool",
+-      ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
 +  source_set("f32-vcmul_sse-no-sse2_standalone") {
@@ -30933,7 +30974,8 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 +      "//third_party/fxdiv",
 +      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
-+
+ 
+-      public_configs = [ ":xnnpack_public_config" ]
 +    public_configs = [ ":xnnpack_public_config" ]
 +
 +    if (!(is_android && use_order_profiling)) {
@@ -30942,8 +30984,9 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
    }
 +}
  
--  if (build_with_chromium) {
--    source_set("qd8-f32-qc8w-igemm_sse4.1-no-sse4.2") {
+-  # This is a target that cannot depend on //base.
+-  if (build_with_internal_optimization_guide) {
+-    source_set("qd8-f32-qc8w-igemm_sse4.1-no-sse4.2_standalone") {
 -      cflags = [
 -        "-mno-sse4.2",
 -        "-msse4.1",
@@ -30964,8 +31007,15 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -        "//third_party/cpuinfo",
 -        "//third_party/fp16",
 -        "//third_party/fxdiv",
--        "//third_party/pthreadpool",
+-        "//third_party/pthreadpool:pthreadpool_standalone",
 -      ]
+-
+-      public_configs = [ ":xnnpack_public_config" ]
+-
+-      if (!(is_android && use_order_profiling)) {
+-        assert_no_deps = [ "//base" ]
+-      }
+-    }
 +if (build_with_chromium) {
 +  source_set("f32-vcmul_x64") {
 +    cflags = [
@@ -30990,9 +31040,12 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 +    ]
 +
 +    public_configs = [ ":xnnpack_public_config" ]
-+  }
+   }
 +}
-+
+ 
+-  if (build_with_chromium) {
+-    source_set("qd8-f32-qc8w-igemm_x64") {
+-      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
 +  source_set("f32-vcmul_x64_standalone") {
@@ -31004,19 +31057,35 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 +      "src/include/xnnpack.h",
 +      "src/src/f32-vcmul/gen/f32-vcmul-scalar-u4.c"
 +    ]
-+
+ 
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-1x2-minmax-scalar.c",
+-        "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-1x4-minmax-scalar.c",
+-        "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-4x4-minmax-scalar.c",
+-      ]
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
 +    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 +    configs += [ ":xnnpack_private_config" ]
-+
+ 
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
 +      "//third_party/fxdiv",
 +      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
-+
+ 
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/fp16",
+-        "//third_party/fxdiv",
+-        "//third_party/pthreadpool",
+-      ]
 +    public_configs = [ ":xnnpack_public_config" ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -31028,16 +31097,29 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
--    source_set("qd8-f32-qc8w-igemm_sse4.1-no-sse4.2_standalone") {
--      cflags = [
--        "-mno-sse4.2",
--        "-msse4.1",
--      ]
--
+-    source_set("qd8-f32-qc8w-igemm_x64_standalone") {
+-      cflags = []
++if (build_with_chromium) {
++  source_set("f32-vcopysign_avx-no-avx2-no-f16c-no-fma") {
++    cflags = [
++      "-mavx",
++    "-mno-avx2",
++    "-mno-f16c",
++    "-mno-fma"
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/f32-vcopysign/gen/f32-vcopysign-avx.c",
++    "src/src/f32-vcopysign/gen/f32-vcopysignc-avx.c",
++    "src/src/f32-vcopysign/gen/f32-vrcopysignc-avx.c"
++    ]
+ 
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-1x4c8-minmax-sse41-ld64.c",
--        "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-4x4c8-minmax-sse41-ld64.c",
+-        "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-1x2-minmax-scalar.c",
+-        "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-1x4-minmax-scalar.c",
+-        "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-4x4-minmax-scalar.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -31057,22 +31139,7 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -      if (!(is_android && use_order_profiling)) {
 -        assert_no_deps = [ "//base" ]
 -      }
-+if (build_with_chromium) {
-+  source_set("f32-vcopysign_avx-no-avx2-no-f16c-no-fma") {
-+    cflags = [
-+      "-mavx",
-+    "-mno-avx2",
-+    "-mno-f16c",
-+    "-mno-fma"
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/f32-vcopysign/gen/f32-vcopysign-avx.c",
-+    "src/src/f32-vcopysign/gen/f32-vcopysignc-avx.c",
-+    "src/src/f32-vcopysign/gen/f32-vrcopysignc-avx.c"
-+    ]
-+
+-    }
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
 +    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
@@ -31086,9 +31153,35 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 +    ]
 +
 +    public_configs = [ ":xnnpack_public_config" ]
-+  }
+   }
 +}
-+
+ 
+-  if (build_with_chromium) {
+-    source_set("qs8-dwconv_avx-no-avx2-no-f16c-no-fma") {
+-      cflags = [
+-        "-mavx",
+-        "-mno-avx2",
+-        "-mno-f16c",
+-        "-mno-fma",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qs8-dwconv/gen/qs8-dwconv-25p16c-minmax-fp32-avx-mul16-add16.c",
+-        "src/src/qs8-dwconv/gen/qs8-dwconv-9p16c-minmax-fp32-avx-mul16-add16.c",
+-      ]
+-
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
+-
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/fp16",
+-        "//third_party/fxdiv",
+-        "//third_party/pthreadpool",
+-      ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
 +  source_set("f32-vcopysign_avx-no-avx2-no-f16c-no-fma_standalone") {
@@ -31117,7 +31210,8 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 +      "//third_party/fxdiv",
 +      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
-+
+ 
+-      public_configs = [ ":xnnpack_public_config" ]
 +    public_configs = [ ":xnnpack_public_config" ]
 +
 +    if (!(is_android && use_order_profiling)) {
@@ -31126,9 +31220,39 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
    }
 +}
  
--  if (build_with_chromium) {
--    source_set("qd8-f32-qc8w-igemm_x64") {
--      cflags = []
+-  # This is a target that cannot depend on //base.
+-  if (build_with_internal_optimization_guide) {
+-    source_set("qs8-dwconv_avx-no-avx2-no-f16c-no-fma_standalone") {
+-      cflags = [
+-        "-mavx",
+-        "-mno-avx2",
+-        "-mno-f16c",
+-        "-mno-fma",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qs8-dwconv/gen/qs8-dwconv-25p16c-minmax-fp32-avx-mul16-add16.c",
+-        "src/src/qs8-dwconv/gen/qs8-dwconv-9p16c-minmax-fp32-avx-mul16-add16.c",
+-      ]
+-
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
+-
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/fp16",
+-        "//third_party/fxdiv",
+-        "//third_party/pthreadpool:pthreadpool_standalone",
+-      ]
+-
+-      public_configs = [ ":xnnpack_public_config" ]
+-
+-      if (!(is_android && use_order_profiling)) {
+-        assert_no_deps = [ "//base" ]
+-      }
 +if (build_with_chromium) {
 +  source_set("f32-vcopysign_avx512f") {
 +    cflags = [
@@ -31157,13 +31281,7 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 +    public_configs = [ ":xnnpack_public_config" ]
 +  }
 +}
- 
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-1x2-minmax-scalar.c",
--        "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-1x4-minmax-scalar.c",
--        "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-4x4-minmax-scalar.c",
--      ]
++
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
 +  source_set("f32-vcopysign_avx512f_standalone") {
@@ -31182,33 +31300,47 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
 +    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 +    configs += [ ":xnnpack_private_config" ]
- 
--      configs -= [ "//build/config/compiler:chromium_code" ]
--      configs += [ "//build/config/compiler:no_chromium_code" ]
--      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
--      configs += [ ":xnnpack_private_config" ]
++
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
 +      "//third_party/fxdiv",
 +      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
++
++    public_configs = [ ":xnnpack_public_config" ]
++
++    if (!(is_android && use_order_profiling)) {
++      assert_no_deps = [ "//base" ]
+     }
+   }
++}
  
+-  if (build_with_chromium) {
+-    source_set("qs8-dwconv_f16c-fma-avx2") {
+-      cflags = [
+-        "-mavx2",
+-        "-mf16c",
+-        "-mfma",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qs8-dwconv/gen/qs8-dwconv-25p16c-minmax-fp32-avx2-mul32.c",
+-        "src/src/qs8-dwconv/gen/qs8-dwconv-9p16c-minmax-fp32-avx2-mul32.c",
+-      ]
+-
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
+-
 -      deps = [
 -        "//third_party/cpuinfo",
 -        "//third_party/fp16",
 -        "//third_party/fxdiv",
 -        "//third_party/pthreadpool",
 -      ]
-+    public_configs = [ ":xnnpack_public_config" ]
- 
--      public_configs = [ ":xnnpack_public_config" ]
-+    if (!(is_android && use_order_profiling)) {
-+      assert_no_deps = [ "//base" ]
-     }
-   }
-+}
-+
 +if (build_with_chromium) {
 +  source_set("f32-vcopysign_sse2-no-sse3") {
 +    cflags = [
@@ -31238,11 +31370,7 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 +    public_configs = [ ":xnnpack_public_config" ]
 +  }
 +}
- 
--  # This is a target that cannot depend on //base.
--  if (build_with_internal_optimization_guide) {
--    source_set("qd8-f32-qc8w-igemm_x64_standalone") {
--      cflags = []
++
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
 +  source_set("f32-vcopysign_sse2-no-sse3_standalone") {
@@ -31272,49 +31400,26 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 +
 +    public_configs = [ ":xnnpack_public_config" ]
  
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-1x2-minmax-scalar.c",
--        "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-1x4-minmax-scalar.c",
--        "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-4x4-minmax-scalar.c",
--      ]
--
--      configs -= [ "//build/config/compiler:chromium_code" ]
--      configs += [ "//build/config/compiler:no_chromium_code" ]
--      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
--      configs += [ ":xnnpack_private_config" ]
--
--      deps = [
--        "//third_party/cpuinfo",
--        "//third_party/fp16",
--        "//third_party/fxdiv",
--        "//third_party/pthreadpool:pthreadpool_standalone",
--      ]
--
 -      public_configs = [ ":xnnpack_public_config" ]
--
--      if (!(is_android && use_order_profiling)) {
--        assert_no_deps = [ "//base" ]
--      }
 +    if (!(is_android && use_order_profiling)) {
 +      assert_no_deps = [ "//base" ]
      }
    }
 +}
  
--  if (build_with_chromium) {
--    source_set("qs8-dwconv_avx-no-avx2-no-f16c-no-fma") {
+-  # This is a target that cannot depend on //base.
+-  if (build_with_internal_optimization_guide) {
+-    source_set("qs8-dwconv_f16c-fma-avx2_standalone") {
 -      cflags = [
--        "-mavx",
--        "-mno-avx2",
--        "-mno-f16c",
--        "-mno-fma",
+-        "-mavx2",
+-        "-mf16c",
+-        "-mfma",
 -      ]
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/qs8-dwconv/gen/qs8-dwconv-25p16c-minmax-fp32-avx-mul16-add16.c",
--        "src/src/qs8-dwconv/gen/qs8-dwconv-9p16c-minmax-fp32-avx-mul16-add16.c",
+-        "src/src/qs8-dwconv/gen/qs8-dwconv-25p16c-minmax-fp32-avx2-mul32.c",
+-        "src/src/qs8-dwconv/gen/qs8-dwconv-9p16c-minmax-fp32-avx2-mul32.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -31326,8 +31431,14 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -        "//third_party/cpuinfo",
 -        "//third_party/fp16",
 -        "//third_party/fxdiv",
--        "//third_party/pthreadpool",
+-        "//third_party/pthreadpool:pthreadpool_standalone",
 -      ]
+-
+-      public_configs = [ ":xnnpack_public_config" ]
+-
+-      if (!(is_android && use_order_profiling)) {
+-        assert_no_deps = [ "//base" ]
+-      }
 +if (build_with_chromium) {
 +  source_set("f32-vcopysign_x64") {
 +    cflags = [
@@ -31384,28 +31495,30 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 +    ]
 +
 +    public_configs = [ ":xnnpack_public_config" ]
- 
--      public_configs = [ ":xnnpack_public_config" ]
++
 +    if (!(is_android && use_order_profiling)) {
 +      assert_no_deps = [ "//base" ]
      }
    }
 +}
  
--  # This is a target that cannot depend on //base.
--  if (build_with_internal_optimization_guide) {
--    source_set("qs8-dwconv_avx-no-avx2-no-f16c-no-fma_standalone") {
+-  if (build_with_chromium) {
+-    source_set(
+-        "qs8-dwconv_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
 -      cflags = [
--        "-mavx",
--        "-mno-avx2",
--        "-mno-f16c",
--        "-mno-fma",
+-        "-mavx512bw",
+-        "-mavx512cd",
+-        "-mavx512dq",
+-        "-mavx512f",
+-        "-mavx512vl",
+-        "-mf16c",
+-        "-mfma",
 -      ]
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/qs8-dwconv/gen/qs8-dwconv-25p16c-minmax-fp32-avx-mul16-add16.c",
--        "src/src/qs8-dwconv/gen/qs8-dwconv-9p16c-minmax-fp32-avx-mul16-add16.c",
+-        "src/src/qs8-dwconv/gen/qs8-dwconv-25p32c-minmax-fp32-avx512skx-mul32.c",
+-        "src/src/qs8-dwconv/gen/qs8-dwconv-9p32c-minmax-fp32-avx512skx-mul32.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -31417,14 +31530,8 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -        "//third_party/cpuinfo",
 -        "//third_party/fp16",
 -        "//third_party/fxdiv",
--        "//third_party/pthreadpool:pthreadpool_standalone",
+-        "//third_party/pthreadpool",
 -      ]
--
--      public_configs = [ ":xnnpack_public_config" ]
--
--      if (!(is_android && use_order_profiling)) {
--        assert_no_deps = [ "//base" ]
--      }
 +if (build_with_chromium) {
 +  source_set("f32-vcos_avx-no-avx2-no-f16c-no-fma") {
 +    cflags = [
@@ -31483,25 +31590,32 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 +    ]
 +
 +    public_configs = [ ":xnnpack_public_config" ]
-+
+ 
+-      public_configs = [ ":xnnpack_public_config" ]
 +    if (!(is_android && use_order_profiling)) {
 +      assert_no_deps = [ "//base" ]
      }
    }
 +}
  
--  if (build_with_chromium) {
--    source_set("qs8-dwconv_f16c-fma-avx2") {
+-  # This is a target that cannot depend on //base.
+-  if (build_with_internal_optimization_guide) {
+-    source_set(
+-        "qs8-dwconv_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") {
 -      cflags = [
--        "-mavx2",
+-        "-mavx512bw",
+-        "-mavx512cd",
+-        "-mavx512dq",
+-        "-mavx512f",
+-        "-mavx512vl",
 -        "-mf16c",
 -        "-mfma",
 -      ]
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/qs8-dwconv/gen/qs8-dwconv-25p16c-minmax-fp32-avx2-mul32.c",
--        "src/src/qs8-dwconv/gen/qs8-dwconv-9p16c-minmax-fp32-avx2-mul32.c",
+-        "src/src/qs8-dwconv/gen/qs8-dwconv-25p32c-minmax-fp32-avx512skx-mul32.c",
+-        "src/src/qs8-dwconv/gen/qs8-dwconv-9p32c-minmax-fp32-avx512skx-mul32.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -31513,8 +31627,14 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -        "//third_party/cpuinfo",
 -        "//third_party/fp16",
 -        "//third_party/fxdiv",
--        "//third_party/pthreadpool",
+-        "//third_party/pthreadpool:pthreadpool_standalone",
 -      ]
+-
+-      public_configs = [ ":xnnpack_public_config" ]
+-
+-      if (!(is_android && use_order_profiling)) {
+-        assert_no_deps = [ "//base" ]
+-      }
 +if (build_with_chromium) {
 +  source_set("f32-vcos_avx512f") {
 +    cflags = [
@@ -31565,8 +31685,7 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 +      "//third_party/fxdiv",
 +      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
- 
--      public_configs = [ ":xnnpack_public_config" ]
++
 +    public_configs = [ ":xnnpack_public_config" ]
 +
 +    if (!(is_android && use_order_profiling)) {
@@ -31575,19 +31694,17 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
    }
 +}
  
--  # This is a target that cannot depend on //base.
--  if (build_with_internal_optimization_guide) {
--    source_set("qs8-dwconv_f16c-fma-avx2_standalone") {
+-  if (build_with_chromium) {
+-    source_set("qs8-dwconv_sse2-no-sse3") {
 -      cflags = [
--        "-mavx2",
--        "-mf16c",
--        "-mfma",
+-        "-mno-sse3",
+-        "-msse2",
 -      ]
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/qs8-dwconv/gen/qs8-dwconv-25p16c-minmax-fp32-avx2-mul32.c",
--        "src/src/qs8-dwconv/gen/qs8-dwconv-9p16c-minmax-fp32-avx2-mul32.c",
+-        "src/src/qs8-dwconv/gen/qs8-dwconv-25p8c-minmax-fp32-sse2-mul16-add16.c",
+-        "src/src/qs8-dwconv/gen/qs8-dwconv-9p8c-minmax-fp32-sse2-mul16-add16.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -31599,14 +31716,8 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -        "//third_party/cpuinfo",
 -        "//third_party/fp16",
 -        "//third_party/fxdiv",
--        "//third_party/pthreadpool:pthreadpool_standalone",
+-        "//third_party/pthreadpool",
 -      ]
--
--      public_configs = [ ":xnnpack_public_config" ]
--
--      if (!(is_android && use_order_profiling)) {
--        assert_no_deps = [ "//base" ]
--      }
 +if (build_with_chromium) {
 +  source_set("f32-vcos_f16c-fma-no-avx2") {
 +    cflags = [
@@ -31663,30 +31774,26 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 +    ]
 +
 +    public_configs = [ ":xnnpack_public_config" ]
-+
+ 
+-      public_configs = [ ":xnnpack_public_config" ]
 +    if (!(is_android && use_order_profiling)) {
 +      assert_no_deps = [ "//base" ]
      }
    }
 +}
  
--  if (build_with_chromium) {
--    source_set(
--        "qs8-dwconv_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
+-  # This is a target that cannot depend on //base.
+-  if (build_with_internal_optimization_guide) {
+-    source_set("qs8-dwconv_sse2-no-sse3_standalone") {
 -      cflags = [
--        "-mavx512bw",
--        "-mavx512cd",
--        "-mavx512dq",
--        "-mavx512f",
--        "-mavx512vl",
--        "-mf16c",
--        "-mfma",
+-        "-mno-sse3",
+-        "-msse2",
 -      ]
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/qs8-dwconv/gen/qs8-dwconv-25p32c-minmax-fp32-avx512skx-mul32.c",
--        "src/src/qs8-dwconv/gen/qs8-dwconv-9p32c-minmax-fp32-avx512skx-mul32.c",
+-        "src/src/qs8-dwconv/gen/qs8-dwconv-25p8c-minmax-fp32-sse2-mul16-add16.c",
+-        "src/src/qs8-dwconv/gen/qs8-dwconv-9p8c-minmax-fp32-sse2-mul16-add16.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -31698,8 +31805,14 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -        "//third_party/cpuinfo",
 -        "//third_party/fp16",
 -        "//third_party/fxdiv",
--        "//third_party/pthreadpool",
+-        "//third_party/pthreadpool:pthreadpool_standalone",
 -      ]
+-
+-      public_configs = [ ":xnnpack_public_config" ]
+-
+-      if (!(is_android && use_order_profiling)) {
+-        assert_no_deps = [ "//base" ]
+-      }
 +if (build_with_chromium) {
 +  source_set("f32-vcos_sse2-no-sse3") {
 +    cflags = [
@@ -31756,32 +31869,24 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 +    ]
 +
 +    public_configs = [ ":xnnpack_public_config" ]
- 
--      public_configs = [ ":xnnpack_public_config" ]
++
 +    if (!(is_android && use_order_profiling)) {
 +      assert_no_deps = [ "//base" ]
      }
    }
 +}
  
--  # This is a target that cannot depend on //base.
--  if (build_with_internal_optimization_guide) {
--    source_set(
--        "qs8-dwconv_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") {
+-  if (build_with_chromium) {
+-    source_set("qs8-dwconv_sse4.1-no-sse4.2") {
 -      cflags = [
--        "-mavx512bw",
--        "-mavx512cd",
--        "-mavx512dq",
--        "-mavx512f",
--        "-mavx512vl",
--        "-mf16c",
--        "-mfma",
+-        "-mno-sse4.2",
+-        "-msse4.1",
 -      ]
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/qs8-dwconv/gen/qs8-dwconv-25p32c-minmax-fp32-avx512skx-mul32.c",
--        "src/src/qs8-dwconv/gen/qs8-dwconv-9p32c-minmax-fp32-avx512skx-mul32.c",
+-        "src/src/qs8-dwconv/gen/qs8-dwconv-25p8c-minmax-fp32-sse41-mul16-add16.c",
+-        "src/src/qs8-dwconv/gen/qs8-dwconv-9p8c-minmax-fp32-sse41-mul16-add16.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -31793,14 +31898,8 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -        "//third_party/cpuinfo",
 -        "//third_party/fp16",
 -        "//third_party/fxdiv",
--        "//third_party/pthreadpool:pthreadpool_standalone",
+-        "//third_party/pthreadpool",
 -      ]
--
--      public_configs = [ ":xnnpack_public_config" ]
--
--      if (!(is_android && use_order_profiling)) {
--        assert_no_deps = [ "//base" ]
--      }
 +if (build_with_chromium) {
 +  source_set("f32-vcos_x64") {
 +    cflags = [
@@ -31851,7 +31950,8 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 +      "//third_party/fxdiv",
 +      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
-+
+ 
+-      public_configs = [ ":xnnpack_public_config" ]
 +    public_configs = [ ":xnnpack_public_config" ]
 +
 +    if (!(is_android && use_order_profiling)) {
@@ -31860,17 +31960,18 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
    }
 +}
  
--  if (build_with_chromium) {
--    source_set("qs8-dwconv_sse2-no-sse3") {
+-  # This is a target that cannot depend on //base.
+-  if (build_with_internal_optimization_guide) {
+-    source_set("qs8-dwconv_sse4.1-no-sse4.2_standalone") {
 -      cflags = [
--        "-mno-sse3",
--        "-msse2",
+-        "-mno-sse4.2",
+-        "-msse4.1",
 -      ]
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/qs8-dwconv/gen/qs8-dwconv-25p8c-minmax-fp32-sse2-mul16-add16.c",
--        "src/src/qs8-dwconv/gen/qs8-dwconv-9p8c-minmax-fp32-sse2-mul16-add16.c",
+-        "src/src/qs8-dwconv/gen/qs8-dwconv-25p8c-minmax-fp32-sse41-mul16-add16.c",
+-        "src/src/qs8-dwconv/gen/qs8-dwconv-9p8c-minmax-fp32-sse41-mul16-add16.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -31882,8 +31983,14 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -        "//third_party/cpuinfo",
 -        "//third_party/fp16",
 -        "//third_party/fxdiv",
--        "//third_party/pthreadpool",
+-        "//third_party/pthreadpool:pthreadpool_standalone",
 -      ]
+-
+-      public_configs = [ ":xnnpack_public_config" ]
+-
+-      if (!(is_android && use_order_profiling)) {
+-        assert_no_deps = [ "//base" ]
+-      }
 +if (build_with_chromium) {
 +  source_set("f32-velu_avx-no-avx2-no-f16c-no-fma") {
 +    cflags = [
@@ -31942,26 +32049,73 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 +    ]
 +
 +    public_configs = [ ":xnnpack_public_config" ]
- 
--      public_configs = [ ":xnnpack_public_config" ]
++
 +    if (!(is_android && use_order_profiling)) {
 +      assert_no_deps = [ "//base" ]
      }
    }
 +}
  
--  # This is a target that cannot depend on //base.
--  if (build_with_internal_optimization_guide) {
--    source_set("qs8-dwconv_sse2-no-sse3_standalone") {
--      cflags = [
--        "-mno-sse3",
--        "-msse2",
--      ]
--
+-  if (build_with_chromium) {
+-    source_set("qs8-dwconv_x64") {
+-      cflags = []
++if (build_with_chromium) {
++  source_set("f32-velu_avx512f") {
++    cflags = [
++      "-mavx512f"
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/f32-velu/gen/f32-velu-avx512f-rr1-p6-u64.c"
++    ]
++
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
++
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool",
++    ]
++
++    public_configs = [ ":xnnpack_public_config" ]
++  }
++}
++
++# This is a target that cannot depend on //base.
++if (build_with_internal_optimization_guide) {
++  source_set("f32-velu_avx512f_standalone") {
++    cflags = [
++      "-mavx512f"
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/f32-velu/gen/f32-velu-avx512f-rr1-p6-u64.c"
++    ]
++
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
++
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool:pthreadpool_standalone",
++    ]
+ 
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/qs8-dwconv/gen/qs8-dwconv-25p8c-minmax-fp32-sse2-mul16-add16.c",
--        "src/src/qs8-dwconv/gen/qs8-dwconv-9p8c-minmax-fp32-sse2-mul16-add16.c",
+-        "src/src/qs8-dwconv/gen/qs8-dwconv-25p1c-minmax-fp32-scalar-fmagic.c",
+-        "src/src/qs8-dwconv/gen/qs8-dwconv-25p2c-minmax-fp32-scalar-lrintf.c",
+-        "src/src/qs8-dwconv/gen/qs8-dwconv-9p1c-minmax-fp32-scalar-fmagic.c",
+-        "src/src/qs8-dwconv/gen/qs8-dwconv-9p2c-minmax-fp32-scalar-lrintf.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -31973,23 +32127,32 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -        "//third_party/cpuinfo",
 -        "//third_party/fp16",
 -        "//third_party/fxdiv",
--        "//third_party/pthreadpool:pthreadpool_standalone",
+-        "//third_party/pthreadpool",
 -      ]
--
++    public_configs = [ ":xnnpack_public_config" ]
+ 
 -      public_configs = [ ":xnnpack_public_config" ]
--
--      if (!(is_android && use_order_profiling)) {
--        assert_no_deps = [ "//base" ]
--      }
++    if (!(is_android && use_order_profiling)) {
++      assert_no_deps = [ "//base" ]
+     }
+   }
++}
+ 
+-  # This is a target that cannot depend on //base.
+-  if (build_with_internal_optimization_guide) {
+-    source_set("qs8-dwconv_x64_standalone") {
+-      cflags = []
 +if (build_with_chromium) {
-+  source_set("f32-velu_avx512f") {
++  source_set("f32-velu_f16c-fma-avx2") {
 +    cflags = [
-+      "-mavx512f"
++      "-mavx2",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-velu/gen/f32-velu-avx512f-rr1-p6-u64.c"
++      "src/src/f32-velu/gen/f32-velu-avx2-rr1-lut4-p4-perm-u32.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -32010,14 +32173,16 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-velu_avx512f_standalone") {
++  source_set("f32-velu_f16c-fma-avx2_standalone") {
 +    cflags = [
-+      "-mavx512f"
++      "-mavx2",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-velu/gen/f32-velu-avx512f-rr1-p6-u64.c"
++      "src/src/f32-velu/gen/f32-velu-avx2-rr1-lut4-p4-perm-u32.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -32031,7 +32196,32 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 +      "//third_party/fxdiv",
 +      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
-+
+ 
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qs8-dwconv/gen/qs8-dwconv-25p1c-minmax-fp32-scalar-fmagic.c",
+-        "src/src/qs8-dwconv/gen/qs8-dwconv-25p2c-minmax-fp32-scalar-lrintf.c",
+-        "src/src/qs8-dwconv/gen/qs8-dwconv-9p1c-minmax-fp32-scalar-fmagic.c",
+-        "src/src/qs8-dwconv/gen/qs8-dwconv-9p2c-minmax-fp32-scalar-lrintf.c",
+-      ]
+-
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
+-
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/fp16",
+-        "//third_party/fxdiv",
+-        "//third_party/pthreadpool:pthreadpool_standalone",
+-      ]
+-
+-      public_configs = [ ":xnnpack_public_config" ]
+-
+-      if (!(is_android && use_order_profiling)) {
+-        assert_no_deps = [ "//base" ]
+-      }
 +    public_configs = [ ":xnnpack_public_config" ]
 +
 +    if (!(is_android && use_order_profiling)) {
@@ -32041,16 +32231,16 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 +}
  
 -  if (build_with_chromium) {
--    source_set("qs8-dwconv_sse4.1-no-sse4.2") {
+-    source_set("qs8-f16-vcvt_f16c-fma-avx2") {
 -      cflags = [
--        "-mno-sse4.2",
--        "-msse4.1",
+-        "-mavx2",
+-        "-mf16c",
+-        "-mfma",
 -      ]
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/qs8-dwconv/gen/qs8-dwconv-25p8c-minmax-fp32-sse41-mul16-add16.c",
--        "src/src/qs8-dwconv/gen/qs8-dwconv-9p8c-minmax-fp32-sse41-mul16-add16.c",
+-        "src/src/qs8-f16-vcvt/gen/qs8-f16-vcvt-avx2-u16.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -32065,16 +32255,15 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f32-velu_f16c-fma-avx2") {
++  source_set("f32-velu_sse2-no-sse3") {
 +    cflags = [
-+      "-mavx2",
-+    "-mf16c",
-+    "-mfma"
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-velu/gen/f32-velu-avx2-rr1-lut4-p4-perm-u32.c"
++      "src/src/f32-velu/gen/f32-velu-sse2-rr2-lut16-p3-u12.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -32095,19 +32284,17 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-velu_f16c-fma-avx2_standalone") {
++  source_set("f32-velu_sse2-no-sse3_standalone") {
 +    cflags = [
-+      "-mavx2",
-+    "-mf16c",
-+    "-mfma"
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-velu/gen/f32-velu-avx2-rr1-lut4-p4-perm-u32.c"
++      "src/src/f32-velu/gen/f32-velu-sse2-rr2-lut16-p3-u12.c"
 +    ]
- 
--      public_configs = [ ":xnnpack_public_config" ]
++
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
 +    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
@@ -32119,7 +32306,8 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 +      "//third_party/fxdiv",
 +      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
-+
+ 
+-      public_configs = [ ":xnnpack_public_config" ]
 +    public_configs = [ ":xnnpack_public_config" ]
 +
 +    if (!(is_android && use_order_profiling)) {
@@ -32130,16 +32318,16 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
--    source_set("qs8-dwconv_sse4.1-no-sse4.2_standalone") {
+-    source_set("qs8-f16-vcvt_f16c-fma-avx2_standalone") {
 -      cflags = [
--        "-mno-sse4.2",
--        "-msse4.1",
+-        "-mavx2",
+-        "-mf16c",
+-        "-mfma",
 -      ]
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/qs8-dwconv/gen/qs8-dwconv-25p8c-minmax-fp32-sse41-mul16-add16.c",
--        "src/src/qs8-dwconv/gen/qs8-dwconv-9p8c-minmax-fp32-sse41-mul16-add16.c",
+-        "src/src/qs8-f16-vcvt/gen/qs8-f16-vcvt-avx2-u16.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -32160,15 +32348,14 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -        assert_no_deps = [ "//base" ]
 -      }
 +if (build_with_chromium) {
-+  source_set("f32-velu_sse2-no-sse3") {
++  source_set("f32-velu_x64") {
 +    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-velu/gen/f32-velu-sse2-rr2-lut16-p3-u12.c"
++      "src/src/f32-velu/gen/f32-velu-scalar-rr2-lut16-p3-u4.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -32189,15 +32376,14 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-velu_sse2-no-sse3_standalone") {
++  source_set("f32-velu_x64_standalone") {
 +    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-velu/gen/f32-velu-sse2-rr2-lut16-p3-u12.c"
++      "src/src/f32-velu/gen/f32-velu-scalar-rr2-lut16-p3-u4.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -32221,65 +32407,17 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 +}
  
 -  if (build_with_chromium) {
--    source_set("qs8-dwconv_x64") {
--      cflags = []
-+if (build_with_chromium) {
-+  source_set("f32-velu_x64") {
-+    cflags = [
-+  
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/f32-velu/gen/f32-velu-scalar-rr2-lut16-p3-u4.c"
-+    ]
-+
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
-+
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool",
-+    ]
-+
-+    public_configs = [ ":xnnpack_public_config" ]
-+  }
-+}
-+
-+# This is a target that cannot depend on //base.
-+if (build_with_internal_optimization_guide) {
-+  source_set("f32-velu_x64_standalone") {
-+    cflags = [
-+  
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/f32-velu/gen/f32-velu-scalar-rr2-lut16-p3-u4.c"
-+    ]
-+
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
-+
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool:pthreadpool_standalone",
-+    ]
- 
+-    source_set("qs8-f32-vcvt_avx-no-avx2-no-f16c-no-fma") {
+-      cflags = [
+-        "-mavx",
+-        "-mno-avx2",
+-        "-mno-f16c",
+-        "-mno-fma",
+-      ]
+-
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/qs8-dwconv/gen/qs8-dwconv-25p1c-minmax-fp32-scalar-fmagic.c",
--        "src/src/qs8-dwconv/gen/qs8-dwconv-25p2c-minmax-fp32-scalar-lrintf.c",
--        "src/src/qs8-dwconv/gen/qs8-dwconv-9p1c-minmax-fp32-scalar-fmagic.c",
--        "src/src/qs8-dwconv/gen/qs8-dwconv-9p2c-minmax-fp32-scalar-lrintf.c",
+-        "src/src/qs8-f32-vcvt/gen/qs8-f32-vcvt-avx-u32.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -32293,19 +32431,6 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -        "//third_party/fxdiv",
 -        "//third_party/pthreadpool",
 -      ]
-+    public_configs = [ ":xnnpack_public_config" ]
- 
--      public_configs = [ ":xnnpack_public_config" ]
-+    if (!(is_android && use_order_profiling)) {
-+      assert_no_deps = [ "//base" ]
-     }
-   }
-+}
- 
--  # This is a target that cannot depend on //base.
--  if (build_with_internal_optimization_guide) {
--    source_set("qs8-dwconv_x64_standalone") {
--      cflags = []
 +if (build_with_chromium) {
 +  source_set("f32-vexp_avx-no-avx2-no-f16c-no-fma") {
 +    cflags = [
@@ -32365,48 +32490,26 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 +
 +    public_configs = [ ":xnnpack_public_config" ]
  
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qs8-dwconv/gen/qs8-dwconv-25p1c-minmax-fp32-scalar-fmagic.c",
--        "src/src/qs8-dwconv/gen/qs8-dwconv-25p2c-minmax-fp32-scalar-lrintf.c",
--        "src/src/qs8-dwconv/gen/qs8-dwconv-9p1c-minmax-fp32-scalar-fmagic.c",
--        "src/src/qs8-dwconv/gen/qs8-dwconv-9p2c-minmax-fp32-scalar-lrintf.c",
--      ]
--
--      configs -= [ "//build/config/compiler:chromium_code" ]
--      configs += [ "//build/config/compiler:no_chromium_code" ]
--      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
--      configs += [ ":xnnpack_private_config" ]
--
--      deps = [
--        "//third_party/cpuinfo",
--        "//third_party/fp16",
--        "//third_party/fxdiv",
--        "//third_party/pthreadpool:pthreadpool_standalone",
--      ]
--
 -      public_configs = [ ":xnnpack_public_config" ]
--
--      if (!(is_android && use_order_profiling)) {
--        assert_no_deps = [ "//base" ]
--      }
 +    if (!(is_android && use_order_profiling)) {
 +      assert_no_deps = [ "//base" ]
      }
    }
 +}
  
--  if (build_with_chromium) {
--    source_set("qs8-f16-vcvt_f16c-fma-avx2") {
+-  # This is a target that cannot depend on //base.
+-  if (build_with_internal_optimization_guide) {
+-    source_set("qs8-f32-vcvt_avx-no-avx2-no-f16c-no-fma_standalone") {
 -      cflags = [
--        "-mavx2",
--        "-mf16c",
--        "-mfma",
+-        "-mavx",
+-        "-mno-avx2",
+-        "-mno-f16c",
+-        "-mno-fma",
 -      ]
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/qs8-f16-vcvt/gen/qs8-f16-vcvt-avx2-u16.c",
+-        "src/src/qs8-f32-vcvt/gen/qs8-f32-vcvt-avx-u32.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -32418,8 +32521,14 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -        "//third_party/cpuinfo",
 -        "//third_party/fp16",
 -        "//third_party/fxdiv",
--        "//third_party/pthreadpool",
+-        "//third_party/pthreadpool:pthreadpool_standalone",
 -      ]
+-
+-      public_configs = [ ":xnnpack_public_config" ]
+-
+-      if (!(is_android && use_order_profiling)) {
+-        assert_no_deps = [ "//base" ]
+-      }
 +if (build_with_chromium) {
 +  source_set("f32-vexp_avx512f") {
 +    cflags = [
@@ -32458,8 +32567,7 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 +      "src/include/xnnpack.h",
 +      "src/src/f32-vexp/gen/f32-vexp-avx512f-rational-3-2-div.c"
 +    ]
- 
--      public_configs = [ ":xnnpack_public_config" ]
++
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
 +    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
@@ -32480,9 +32588,8 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
    }
 +}
  
--  # This is a target that cannot depend on //base.
--  if (build_with_internal_optimization_guide) {
--    source_set("qs8-f16-vcvt_f16c-fma-avx2_standalone") {
+-  if (build_with_chromium) {
+-    source_set("qs8-f32-vcvt_f16c-fma-avx2") {
 -      cflags = [
 -        "-mavx2",
 -        "-mf16c",
@@ -32491,7 +32598,7 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/qs8-f16-vcvt/gen/qs8-f16-vcvt-avx2-u16.c",
+-        "src/src/qs8-f32-vcvt/gen/qs8-f32-vcvt-avx2-u16.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -32503,14 +32610,8 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -        "//third_party/cpuinfo",
 -        "//third_party/fp16",
 -        "//third_party/fxdiv",
--        "//third_party/pthreadpool:pthreadpool_standalone",
+-        "//third_party/pthreadpool",
 -      ]
--
--      public_configs = [ ":xnnpack_public_config" ]
--
--      if (!(is_android && use_order_profiling)) {
--        assert_no_deps = [ "//base" ]
--      }
 +if (build_with_chromium) {
 +  source_set("f32-vexp_f16c-fma-no-avx2") {
 +    cflags = [
@@ -32558,7 +32659,8 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
 +    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 +    configs += [ ":xnnpack_private_config" ]
-+
+ 
+-      public_configs = [ ":xnnpack_public_config" ]
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
@@ -32574,18 +32676,18 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
    }
 +}
  
--  if (build_with_chromium) {
--    source_set("qs8-f32-vcvt_avx-no-avx2-no-f16c-no-fma") {
+-  # This is a target that cannot depend on //base.
+-  if (build_with_internal_optimization_guide) {
+-    source_set("qs8-f32-vcvt_f16c-fma-avx2_standalone") {
 -      cflags = [
--        "-mavx",
--        "-mno-avx2",
--        "-mno-f16c",
--        "-mno-fma",
+-        "-mavx2",
+-        "-mf16c",
+-        "-mfma",
 -      ]
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/qs8-f32-vcvt/gen/qs8-f32-vcvt-avx-u32.c",
+-        "src/src/qs8-f32-vcvt/gen/qs8-f32-vcvt-avx2-u16.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -32597,8 +32699,14 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -        "//third_party/cpuinfo",
 -        "//third_party/fp16",
 -        "//third_party/fxdiv",
--        "//third_party/pthreadpool",
+-        "//third_party/pthreadpool:pthreadpool_standalone",
 -      ]
+-
+-      public_configs = [ ":xnnpack_public_config" ]
+-
+-      if (!(is_android && use_order_profiling)) {
+-        assert_no_deps = [ "//base" ]
+-      }
 +if (build_with_chromium) {
 +  source_set("f32-vexp_sse2-no-sse3") {
 +    cflags = [
@@ -32653,8 +32761,7 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 +      "//third_party/fxdiv",
 +      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
- 
--      public_configs = [ ":xnnpack_public_config" ]
++
 +    public_configs = [ ":xnnpack_public_config" ]
 +
 +    if (!(is_android && use_order_profiling)) {
@@ -32663,19 +32770,22 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
    }
 +}
  
--  # This is a target that cannot depend on //base.
--  if (build_with_internal_optimization_guide) {
--    source_set("qs8-f32-vcvt_avx-no-avx2-no-f16c-no-fma_standalone") {
+-  if (build_with_chromium) {
+-    source_set(
+-        "qs8-f32-vcvt_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
 -      cflags = [
--        "-mavx",
--        "-mno-avx2",
--        "-mno-f16c",
--        "-mno-fma",
+-        "-mavx512bw",
+-        "-mavx512cd",
+-        "-mavx512dq",
+-        "-mavx512f",
+-        "-mavx512vl",
+-        "-mf16c",
+-        "-mfma",
 -      ]
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/qs8-f32-vcvt/gen/qs8-f32-vcvt-avx-u32.c",
+-        "src/src/qs8-f32-vcvt/gen/qs8-f32-vcvt-avx512skx-u32.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -32687,14 +32797,8 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -        "//third_party/cpuinfo",
 -        "//third_party/fp16",
 -        "//third_party/fxdiv",
--        "//third_party/pthreadpool:pthreadpool_standalone",
+-        "//third_party/pthreadpool",
 -      ]
--
--      public_configs = [ ":xnnpack_public_config" ]
--
--      if (!(is_android && use_order_profiling)) {
--        assert_no_deps = [ "//base" ]
--      }
 +if (build_with_chromium) {
 +  source_set("f32-vexp_x64") {
 +    cflags = [
@@ -32747,24 +32851,31 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 +    ]
 +
 +    public_configs = [ ":xnnpack_public_config" ]
-+
+ 
+-      public_configs = [ ":xnnpack_public_config" ]
 +    if (!(is_android && use_order_profiling)) {
 +      assert_no_deps = [ "//base" ]
      }
    }
 +}
  
--  if (build_with_chromium) {
--    source_set("qs8-f32-vcvt_f16c-fma-avx2") {
+-  # This is a target that cannot depend on //base.
+-  if (build_with_internal_optimization_guide) {
+-    source_set(
+-        "qs8-f32-vcvt_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") {
 -      cflags = [
--        "-mavx2",
+-        "-mavx512bw",
+-        "-mavx512cd",
+-        "-mavx512dq",
+-        "-mavx512f",
+-        "-mavx512vl",
 -        "-mf16c",
 -        "-mfma",
 -      ]
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/qs8-f32-vcvt/gen/qs8-f32-vcvt-avx2-u16.c",
+-        "src/src/qs8-f32-vcvt/gen/qs8-f32-vcvt-avx512skx-u32.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -32776,8 +32887,14 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -        "//third_party/cpuinfo",
 -        "//third_party/fp16",
 -        "//third_party/fxdiv",
--        "//third_party/pthreadpool",
+-        "//third_party/pthreadpool:pthreadpool_standalone",
 -      ]
+-
+-      public_configs = [ ":xnnpack_public_config" ]
+-
+-      if (!(is_android && use_order_profiling)) {
+-        assert_no_deps = [ "//base" ]
+-      }
 +if (build_with_chromium) {
 +  source_set("f32-vgelu_avx-no-avx2-no-f16c-no-fma") {
 +    cflags = [
@@ -32836,26 +32953,23 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 +    ]
 +
 +    public_configs = [ ":xnnpack_public_config" ]
- 
--      public_configs = [ ":xnnpack_public_config" ]
++
 +    if (!(is_android && use_order_profiling)) {
 +      assert_no_deps = [ "//base" ]
      }
    }
 +}
  
--  # This is a target that cannot depend on //base.
--  if (build_with_internal_optimization_guide) {
--    source_set("qs8-f32-vcvt_f16c-fma-avx2_standalone") {
+-  if (build_with_chromium) {
+-    source_set("qs8-f32-vcvt_sse2-no-sse3") {
 -      cflags = [
--        "-mavx2",
--        "-mf16c",
--        "-mfma",
+-        "-mno-sse3",
+-        "-msse2",
 -      ]
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/qs8-f32-vcvt/gen/qs8-f32-vcvt-avx2-u16.c",
+-        "src/src/qs8-f32-vcvt/gen/qs8-f32-vcvt-sse2-u32.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -32867,14 +32981,8 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -        "//third_party/cpuinfo",
 -        "//third_party/fp16",
 -        "//third_party/fxdiv",
--        "//third_party/pthreadpool:pthreadpool_standalone",
+-        "//third_party/pthreadpool",
 -      ]
--
--      public_configs = [ ":xnnpack_public_config" ]
--
--      if (!(is_android && use_order_profiling)) {
--        assert_no_deps = [ "//base" ]
--      }
 +if (build_with_chromium) {
 +  source_set("f32-vgelu_avx512f") {
 +    cflags = [
@@ -32925,7 +33033,8 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 +      "//third_party/fxdiv",
 +      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
-+
+ 
+-      public_configs = [ ":xnnpack_public_config" ]
 +    public_configs = [ ":xnnpack_public_config" ]
 +
 +    if (!(is_android && use_order_profiling)) {
@@ -32934,22 +33043,17 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
    }
 +}
  
--  if (build_with_chromium) {
--    source_set(
--        "qs8-f32-vcvt_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
+-  # This is a target that cannot depend on //base.
+-  if (build_with_internal_optimization_guide) {
+-    source_set("qs8-f32-vcvt_sse2-no-sse3_standalone") {
 -      cflags = [
--        "-mavx512bw",
--        "-mavx512cd",
--        "-mavx512dq",
--        "-mavx512f",
--        "-mavx512vl",
--        "-mf16c",
--        "-mfma",
+-        "-mno-sse3",
+-        "-msse2",
 -      ]
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/qs8-f32-vcvt/gen/qs8-f32-vcvt-avx512skx-u32.c",
+-        "src/src/qs8-f32-vcvt/gen/qs8-f32-vcvt-sse2-u32.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -32961,8 +33065,14 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -        "//third_party/cpuinfo",
 -        "//third_party/fp16",
 -        "//third_party/fxdiv",
--        "//third_party/pthreadpool",
+-        "//third_party/pthreadpool:pthreadpool_standalone",
 -      ]
+-
+-      public_configs = [ ":xnnpack_public_config" ]
+-
+-      if (!(is_android && use_order_profiling)) {
+-        assert_no_deps = [ "//base" ]
+-      }
 +if (build_with_chromium) {
 +  source_set("f32-vgelu_f16c-fma-no-avx2") {
 +    cflags = [
@@ -32987,8 +33097,7 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 +      "//third_party/fxdiv",
 +      "//third_party/pthreadpool",
 +    ]
- 
--      public_configs = [ ":xnnpack_public_config" ]
++
 +    public_configs = [ ":xnnpack_public_config" ]
 +  }
 +}
@@ -33027,23 +33136,16 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
    }
 +}
  
--  # This is a target that cannot depend on //base.
--  if (build_with_internal_optimization_guide) {
--    source_set(
--        "qs8-f32-vcvt_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") {
+-  if (build_with_chromium) {
+-    source_set("qs8-f32-vcvt_sse4.1-no-sse4.2") {
 -      cflags = [
--        "-mavx512bw",
--        "-mavx512cd",
--        "-mavx512dq",
--        "-mavx512f",
--        "-mavx512vl",
--        "-mf16c",
--        "-mfma",
+-        "-mno-sse4.2",
+-        "-msse4.1",
 -      ]
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/qs8-f32-vcvt/gen/qs8-f32-vcvt-avx512skx-u32.c",
+-        "src/src/qs8-f32-vcvt/gen/qs8-f32-vcvt-sse41-u16.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -33055,14 +33157,8 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -        "//third_party/cpuinfo",
 -        "//third_party/fp16",
 -        "//third_party/fxdiv",
--        "//third_party/pthreadpool:pthreadpool_standalone",
+-        "//third_party/pthreadpool",
 -      ]
--
--      public_configs = [ ":xnnpack_public_config" ]
--
--      if (!(is_android && use_order_profiling)) {
--        assert_no_deps = [ "//base" ]
--      }
 +if (build_with_chromium) {
 +  source_set("f32-vgelu_sse2-no-sse3") {
 +    cflags = [
@@ -33119,23 +33215,25 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 +    ]
 +
 +    public_configs = [ ":xnnpack_public_config" ]
-+
+ 
+-      public_configs = [ ":xnnpack_public_config" ]
 +    if (!(is_android && use_order_profiling)) {
 +      assert_no_deps = [ "//base" ]
      }
    }
 +}
  
--  if (build_with_chromium) {
--    source_set("qs8-f32-vcvt_sse2-no-sse3") {
+-  # This is a target that cannot depend on //base.
+-  if (build_with_internal_optimization_guide) {
+-    source_set("qs8-f32-vcvt_sse4.1-no-sse4.2_standalone") {
 -      cflags = [
--        "-mno-sse3",
--        "-msse2",
+-        "-mno-sse4.2",
+-        "-msse4.1",
 -      ]
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/qs8-f32-vcvt/gen/qs8-f32-vcvt-sse2-u32.c",
+-        "src/src/qs8-f32-vcvt/gen/qs8-f32-vcvt-sse41-u16.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -33147,8 +33245,14 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -        "//third_party/cpuinfo",
 -        "//third_party/fp16",
 -        "//third_party/fxdiv",
--        "//third_party/pthreadpool",
+-        "//third_party/pthreadpool:pthreadpool_standalone",
 -      ]
+-
+-      public_configs = [ ":xnnpack_public_config" ]
+-
+-      if (!(is_android && use_order_profiling)) {
+-        assert_no_deps = [ "//base" ]
+-      }
 +if (build_with_chromium) {
 +  source_set("f32-vgelu_x64") {
 +    cflags = [
@@ -33201,14 +33305,16 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 +    ]
 +
 +    public_configs = [ ":xnnpack_public_config" ]
- 
--      public_configs = [ ":xnnpack_public_config" ]
++
 +    if (!(is_android && use_order_profiling)) {
 +      assert_no_deps = [ "//base" ]
      }
    }
 +}
-+
+ 
+-  if (build_with_chromium) {
+-    source_set("qs8-f32-vcvt_x64") {
+-      cflags = []
 +if (build_with_chromium) {
 +  source_set("f32-vhswish_avx-no-avx2-no-f16c-no-fma") {
 +    cflags = [
@@ -33239,36 +33345,10 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 +  }
 +}
  
--  # This is a target that cannot depend on //base.
--  if (build_with_internal_optimization_guide) {
--    source_set("qs8-f32-vcvt_sse2-no-sse3_standalone") {
--      cflags = [
--        "-mno-sse3",
--        "-msse2",
--      ]
--
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/qs8-f32-vcvt/gen/qs8-f32-vcvt-sse2-u32.c",
--      ]
--
--      configs -= [ "//build/config/compiler:chromium_code" ]
--      configs += [ "//build/config/compiler:no_chromium_code" ]
--      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
--      configs += [ ":xnnpack_private_config" ]
--
--      deps = [
--        "//third_party/cpuinfo",
--        "//third_party/fp16",
--        "//third_party/fxdiv",
--        "//third_party/pthreadpool:pthreadpool_standalone",
+-        "src/src/qs8-f32-vcvt/gen/qs8-f32-vcvt-scalar-u4.c",
 -      ]
--
--      public_configs = [ ":xnnpack_public_config" ]
--
--      if (!(is_android && use_order_profiling)) {
--        assert_no_deps = [ "//base" ]
--      }
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
 +  source_set("f32-vhswish_avx-no-avx2-no-f16c-no-fma_standalone") {
@@ -33288,45 +33368,33 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
 +    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 +    configs += [ ":xnnpack_private_config" ]
-+
+ 
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
 +      "//third_party/fxdiv",
 +      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
-+
-+    public_configs = [ ":xnnpack_public_config" ]
-+
-+    if (!(is_android && use_order_profiling)) {
-+      assert_no_deps = [ "//base" ]
-     }
-   }
-+}
  
--  if (build_with_chromium) {
--    source_set("qs8-f32-vcvt_sse4.1-no-sse4.2") {
--      cflags = [
--        "-mno-sse4.2",
--        "-msse4.1",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qs8-f32-vcvt/gen/qs8-f32-vcvt-sse41-u16.c",
--      ]
--
--      configs -= [ "//build/config/compiler:chromium_code" ]
--      configs += [ "//build/config/compiler:no_chromium_code" ]
--      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
--      configs += [ ":xnnpack_private_config" ]
--
 -      deps = [
 -        "//third_party/cpuinfo",
 -        "//third_party/fp16",
 -        "//third_party/fxdiv",
 -        "//third_party/pthreadpool",
 -      ]
++    public_configs = [ ":xnnpack_public_config" ]
+ 
+-      public_configs = [ ":xnnpack_public_config" ]
++    if (!(is_android && use_order_profiling)) {
++      assert_no_deps = [ "//base" ]
+     }
+   }
++}
++
 +if (build_with_chromium) {
 +  source_set("f32-vhswish_avx512f") {
 +    cflags = [
@@ -33353,7 +33421,11 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 +    public_configs = [ ":xnnpack_public_config" ]
 +  }
 +}
-+
+ 
+-  # This is a target that cannot depend on //base.
+-  if (build_with_internal_optimization_guide) {
+-    source_set("qs8-f32-vcvt_x64_standalone") {
+-      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
 +  source_set("f32-vhswish_avx512f_standalone") {
@@ -33377,27 +33449,51 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 +      "//third_party/fxdiv",
 +      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
++
++    public_configs = [ ":xnnpack_public_config" ]
  
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qs8-f32-vcvt/gen/qs8-f32-vcvt-scalar-u4.c",
+-      ]
+-
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
+-
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/fp16",
+-        "//third_party/fxdiv",
+-        "//third_party/pthreadpool:pthreadpool_standalone",
+-      ]
+-
 -      public_configs = [ ":xnnpack_public_config" ]
-+    public_configs = [ ":xnnpack_public_config" ]
-+
+-
+-      if (!(is_android && use_order_profiling)) {
+-        assert_no_deps = [ "//base" ]
+-      }
 +    if (!(is_android && use_order_profiling)) {
 +      assert_no_deps = [ "//base" ]
      }
    }
 +}
  
--  # This is a target that cannot depend on //base.
--  if (build_with_internal_optimization_guide) {
--    source_set("qs8-f32-vcvt_sse4.1-no-sse4.2_standalone") {
+-  if (build_with_chromium) {
+-    source_set("qs8-packw_avx2-avxvnni-f16c-fma-gfni") {
 -      cflags = [
--        "-mno-sse4.2",
--        "-msse4.1",
+-        "-mavx2",
+-        "-mavxvnni",
+-        "-mf16c",
+-        "-mfma",
+-        "-mgfni",
 -      ]
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/qs8-f32-vcvt/gen/qs8-f32-vcvt-sse41-u16.c",
+-        "src/src/qs8-packw/gen/qs8-packw-x8c8-gemm-goi-avxvnni-prfm.c",
+-        "src/src/qs8-packw/gen/qs8-packw-x8c8-gemm-goi-avxvnni.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -33409,14 +33505,8 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -        "//third_party/cpuinfo",
 -        "//third_party/fp16",
 -        "//third_party/fxdiv",
--        "//third_party/pthreadpool:pthreadpool_standalone",
+-        "//third_party/pthreadpool",
 -      ]
--
--      public_configs = [ ":xnnpack_public_config" ]
--
--      if (!(is_android && use_order_profiling)) {
--        assert_no_deps = [ "//base" ]
--      }
 +if (build_with_chromium) {
 +  source_set("f32-vhswish_f16c-fma-no-avx2") {
 +    cflags = [
@@ -33473,16 +33563,48 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 +    ]
 +
 +    public_configs = [ ":xnnpack_public_config" ]
-+
+ 
+-      public_configs = [ ":xnnpack_public_config" ]
 +    if (!(is_android && use_order_profiling)) {
 +      assert_no_deps = [ "//base" ]
      }
    }
 +}
  
--  if (build_with_chromium) {
--    source_set("qs8-f32-vcvt_x64") {
--      cflags = []
+-  # This is a target that cannot depend on //base.
+-  if (build_with_internal_optimization_guide) {
+-    source_set("qs8-packw_avx2-avxvnni-f16c-fma-gfni_standalone") {
+-      cflags = [
+-        "-mavx2",
+-        "-mavxvnni",
+-        "-mf16c",
+-        "-mfma",
+-        "-mgfni",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qs8-packw/gen/qs8-packw-x8c8-gemm-goi-avxvnni-prfm.c",
+-        "src/src/qs8-packw/gen/qs8-packw-x8c8-gemm-goi-avxvnni.c",
+-      ]
+-
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
+-
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/fp16",
+-        "//third_party/fxdiv",
+-        "//third_party/pthreadpool:pthreadpool_standalone",
+-      ]
+-
+-      public_configs = [ ":xnnpack_public_config" ]
+-
+-      if (!(is_android && use_order_profiling)) {
+-        assert_no_deps = [ "//base" ]
+-      }
 +if (build_with_chromium) {
 +  source_set("f32-vhswish_sse2-no-sse3") {
 +    cflags = [
@@ -33525,46 +33647,51 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 +      "src/src/f32-vhswish/gen/f32-vhswish-sse2.c",
 +    "src/src/f32-vhswish/gen/f32-vhswish-sse2fma.c"
 +    ]
- 
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qs8-f32-vcvt/gen/qs8-f32-vcvt-scalar-u4.c",
--      ]
++
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
 +    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 +    configs += [ ":xnnpack_private_config" ]
- 
--      configs -= [ "//build/config/compiler:chromium_code" ]
--      configs += [ "//build/config/compiler:no_chromium_code" ]
--      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
--      configs += [ ":xnnpack_private_config" ]
++
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
 +      "//third_party/fxdiv",
 +      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
- 
--      deps = [
--        "//third_party/cpuinfo",
--        "//third_party/fp16",
--        "//third_party/fxdiv",
--        "//third_party/pthreadpool",
--      ]
++
 +    public_configs = [ ":xnnpack_public_config" ]
- 
--      public_configs = [ ":xnnpack_public_config" ]
++
 +    if (!(is_android && use_order_profiling)) {
 +      assert_no_deps = [ "//base" ]
      }
    }
 +}
  
--  # This is a target that cannot depend on //base.
--  if (build_with_internal_optimization_guide) {
--    source_set("qs8-f32-vcvt_x64_standalone") {
--      cflags = []
+-  if (build_with_chromium) {
+-    source_set("qs8-packw_f16c-fma-avx2") {
+-      cflags = [
+-        "-mavx2",
+-        "-mf16c",
+-        "-mfma",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qs8-packw/gen/qs8-packw-x8c8-gemm-goi-avx2-madd.c",
+-      ]
+-
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
+-
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/fp16",
+-        "//third_party/fxdiv",
+-        "//third_party/pthreadpool",
+-      ]
 +if (build_with_chromium) {
 +  source_set("f32-vhswish_x64") {
 +    cflags = [
@@ -33591,29 +33718,7 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 +    public_configs = [ ":xnnpack_public_config" ]
 +  }
 +}
- 
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qs8-f32-vcvt/gen/qs8-f32-vcvt-scalar-u4.c",
--      ]
--
--      configs -= [ "//build/config/compiler:chromium_code" ]
--      configs += [ "//build/config/compiler:no_chromium_code" ]
--      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
--      configs += [ ":xnnpack_private_config" ]
--
--      deps = [
--        "//third_party/cpuinfo",
--        "//third_party/fp16",
--        "//third_party/fxdiv",
--        "//third_party/pthreadpool:pthreadpool_standalone",
--      ]
--
--      public_configs = [ ":xnnpack_public_config" ]
--
--      if (!(is_android && use_order_profiling)) {
--        assert_no_deps = [ "//base" ]
--      }
++
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
 +  source_set("f32-vhswish_x64_standalone") {
@@ -33637,7 +33742,8 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 +      "//third_party/fxdiv",
 +      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
-+
+ 
+-      public_configs = [ ":xnnpack_public_config" ]
 +    public_configs = [ ":xnnpack_public_config" ]
 +
 +    if (!(is_android && use_order_profiling)) {
@@ -33646,20 +33752,18 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
    }
 +}
  
--  if (build_with_chromium) {
--    source_set("qs8-packw_avx2-avxvnni-f16c-fma-gfni") {
+-  # This is a target that cannot depend on //base.
+-  if (build_with_internal_optimization_guide) {
+-    source_set("qs8-packw_f16c-fma-avx2_standalone") {
 -      cflags = [
 -        "-mavx2",
--        "-mavxvnni",
 -        "-mf16c",
 -        "-mfma",
--        "-mgfni",
 -      ]
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/qs8-packw/gen/qs8-packw-x8c8-gemm-goi-avxvnni-prfm.c",
--        "src/src/qs8-packw/gen/qs8-packw-x8c8-gemm-goi-avxvnni.c",
+-        "src/src/qs8-packw/gen/qs8-packw-x8c8-gemm-goi-avx2-madd.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -33671,8 +33775,14 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -        "//third_party/cpuinfo",
 -        "//third_party/fp16",
 -        "//third_party/fxdiv",
--        "//third_party/pthreadpool",
+-        "//third_party/pthreadpool:pthreadpool_standalone",
 -      ]
+-
+-      public_configs = [ ":xnnpack_public_config" ]
+-
+-      if (!(is_android && use_order_profiling)) {
+-        assert_no_deps = [ "//base" ]
+-      }
 +if (build_with_chromium) {
 +  source_set("f32-vlog_avx512f") {
 +    cflags = [
@@ -33695,8 +33805,7 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 +      "//third_party/fxdiv",
 +      "//third_party/pthreadpool",
 +    ]
- 
--      public_configs = [ ":xnnpack_public_config" ]
++
 +    public_configs = [ ":xnnpack_public_config" ]
 +  }
 +}
@@ -33733,21 +33842,25 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
    }
 +}
  
--  # This is a target that cannot depend on //base.
--  if (build_with_internal_optimization_guide) {
--    source_set("qs8-packw_avx2-avxvnni-f16c-fma-gfni_standalone") {
+-  if (build_with_chromium) {
+-    source_set(
+-        "qs8-packw_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni") {
 -      cflags = [
--        "-mavx2",
--        "-mavxvnni",
+-        "-mavx512bw",
+-        "-mavx512cd",
+-        "-mavx512dq",
+-        "-mavx512f",
+-        "-mavx512vl",
+-        "-mavx512vnni",
 -        "-mf16c",
 -        "-mfma",
--        "-mgfni",
 -      ]
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/qs8-packw/gen/qs8-packw-x8c8-gemm-goi-avxvnni-prfm.c",
--        "src/src/qs8-packw/gen/qs8-packw-x8c8-gemm-goi-avxvnni.c",
+-        "src/src/qs8-packw/gen/qs8-packw-x16c8-gemm-goi-avx256vnni-prfm.c",
+-        "src/src/qs8-packw/gen/qs8-packw-x64c4-gemm-goi-avx256vnni-prfm.c",
+-        "src/src/qs8-packw/gen/qs8-packw-x8c8-gemm-goi-avx256vnni-prfm.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -33759,14 +33872,8 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -        "//third_party/cpuinfo",
 -        "//third_party/fp16",
 -        "//third_party/fxdiv",
--        "//third_party/pthreadpool:pthreadpool_standalone",
+-        "//third_party/pthreadpool",
 -      ]
--
--      public_configs = [ ":xnnpack_public_config" ]
--
--      if (!(is_android && use_order_profiling)) {
--        assert_no_deps = [ "//base" ]
--      }
 +if (build_with_chromium) {
 +  source_set("f32-vlog_f16c-fma-avx2") {
 +    cflags = [
@@ -33823,24 +33930,34 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 +    ]
 +
 +    public_configs = [ ":xnnpack_public_config" ]
-+
+ 
+-      public_configs = [ ":xnnpack_public_config" ]
 +    if (!(is_android && use_order_profiling)) {
 +      assert_no_deps = [ "//base" ]
      }
    }
 +}
  
--  if (build_with_chromium) {
--    source_set("qs8-packw_f16c-fma-avx2") {
+-  # This is a target that cannot depend on //base.
+-  if (build_with_internal_optimization_guide) {
+-    source_set(
+-        "qs8-packw_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni_standalone") {
 -      cflags = [
--        "-mavx2",
+-        "-mavx512bw",
+-        "-mavx512cd",
+-        "-mavx512dq",
+-        "-mavx512f",
+-        "-mavx512vl",
+-        "-mavx512vnni",
 -        "-mf16c",
 -        "-mfma",
 -      ]
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/qs8-packw/gen/qs8-packw-x8c8-gemm-goi-avx2-madd.c",
+-        "src/src/qs8-packw/gen/qs8-packw-x16c8-gemm-goi-avx256vnni-prfm.c",
+-        "src/src/qs8-packw/gen/qs8-packw-x64c4-gemm-goi-avx256vnni-prfm.c",
+-        "src/src/qs8-packw/gen/qs8-packw-x8c8-gemm-goi-avx256vnni-prfm.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -33852,8 +33969,14 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -        "//third_party/cpuinfo",
 -        "//third_party/fp16",
 -        "//third_party/fxdiv",
--        "//third_party/pthreadpool",
+-        "//third_party/pthreadpool:pthreadpool_standalone",
 -      ]
+-
+-      public_configs = [ ":xnnpack_public_config" ]
+-
+-      if (!(is_android && use_order_profiling)) {
+-        assert_no_deps = [ "//base" ]
+-      }
 +if (build_with_chromium) {
 +  source_set("f32-vlog_f16c-fma-no-avx2") {
 +    cflags = [
@@ -33910,14 +34033,16 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 +    ]
 +
 +    public_configs = [ ":xnnpack_public_config" ]
- 
--      public_configs = [ ":xnnpack_public_config" ]
++
 +    if (!(is_android && use_order_profiling)) {
 +      assert_no_deps = [ "//base" ]
      }
    }
 +}
-+
+ 
+-  if (build_with_chromium) {
+-    source_set("qs8-packw_x64") {
+-      cflags = []
 +if (build_with_chromium) {
 +  source_set("f32-vlog_sse2-no-sse3") {
 +    cflags = [
@@ -33947,18 +34072,12 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 +  }
 +}
  
--  # This is a target that cannot depend on //base.
--  if (build_with_internal_optimization_guide) {
--    source_set("qs8-packw_f16c-fma-avx2_standalone") {
--      cflags = [
--        "-mavx2",
--        "-mf16c",
--        "-mfma",
--      ]
--
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/qs8-packw/gen/qs8-packw-x8c8-gemm-goi-avx2-madd.c",
+-        "src/src/qs8-packw/gen/qs8-packw-x16c8-gemm-goi-scalar.c",
+-        "src/src/qs8-packw/gen/qs8-packw-x4c8-gemm-gio-scalar.c",
+-        "src/src/qs8-packw/gen/qs8-packw-x4c8-gemm-goi-scalar.c",
+-        "src/src/qs8-packw/gen/qs8-packw-x8c8-gemm-gio-scalar.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -33970,14 +34089,8 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -        "//third_party/cpuinfo",
 -        "//third_party/fp16",
 -        "//third_party/fxdiv",
--        "//third_party/pthreadpool:pthreadpool_standalone",
+-        "//third_party/pthreadpool",
 -      ]
--
--      public_configs = [ ":xnnpack_public_config" ]
--
--      if (!(is_android && use_order_profiling)) {
--        assert_no_deps = [ "//base" ]
--      }
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
 +  source_set("f32-vlog_sse2-no-sse3_standalone") {
@@ -34005,45 +34118,18 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 +    ]
 +
 +    public_configs = [ ":xnnpack_public_config" ]
-+
+ 
+-      public_configs = [ ":xnnpack_public_config" ]
 +    if (!(is_android && use_order_profiling)) {
 +      assert_no_deps = [ "//base" ]
      }
    }
 +}
  
--  if (build_with_chromium) {
--    source_set(
--        "qs8-packw_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni") {
--      cflags = [
--        "-mavx512bw",
--        "-mavx512cd",
--        "-mavx512dq",
--        "-mavx512f",
--        "-mavx512vl",
--        "-mavx512vnni",
--        "-mf16c",
--        "-mfma",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qs8-packw/gen/qs8-packw-x16c8-gemm-goi-avx256vnni-prfm.c",
--        "src/src/qs8-packw/gen/qs8-packw-x64c4-gemm-goi-avx256vnni-prfm.c",
--        "src/src/qs8-packw/gen/qs8-packw-x8c8-gemm-goi-avx256vnni-prfm.c",
--      ]
--
--      configs -= [ "//build/config/compiler:chromium_code" ]
--      configs += [ "//build/config/compiler:no_chromium_code" ]
--      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
--      configs += [ ":xnnpack_private_config" ]
--
--      deps = [
--        "//third_party/cpuinfo",
--        "//third_party/fp16",
--        "//third_party/fxdiv",
--        "//third_party/pthreadpool",
--      ]
+-  # This is a target that cannot depend on //base.
+-  if (build_with_internal_optimization_guide) {
+-    source_set("qs8-packw_x64_standalone") {
+-      cflags = []
 +if (build_with_chromium) {
 +  source_set("f32-vlog_x64") {
 +    cflags = [
@@ -34094,36 +34180,53 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 +      "//third_party/fxdiv",
 +      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
++
++    public_configs = [ ":xnnpack_public_config" ]
  
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qs8-packw/gen/qs8-packw-x16c8-gemm-goi-scalar.c",
+-        "src/src/qs8-packw/gen/qs8-packw-x4c8-gemm-gio-scalar.c",
+-        "src/src/qs8-packw/gen/qs8-packw-x4c8-gemm-goi-scalar.c",
+-        "src/src/qs8-packw/gen/qs8-packw-x8c8-gemm-gio-scalar.c",
+-      ]
+-
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
+-
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/fp16",
+-        "//third_party/fxdiv",
+-        "//third_party/pthreadpool:pthreadpool_standalone",
+-      ]
+-
 -      public_configs = [ ":xnnpack_public_config" ]
-+    public_configs = [ ":xnnpack_public_config" ]
-+
+-
+-      if (!(is_android && use_order_profiling)) {
+-        assert_no_deps = [ "//base" ]
+-      }
 +    if (!(is_android && use_order_profiling)) {
 +      assert_no_deps = [ "//base" ]
      }
    }
 +}
  
--  # This is a target that cannot depend on //base.
--  if (build_with_internal_optimization_guide) {
--    source_set(
--        "qs8-packw_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni_standalone") {
+-  if (build_with_chromium) {
+-    source_set("qs8-qc4w-gemm_avx-no-avx2-no-f16c-no-fma") {
 -      cflags = [
--        "-mavx512bw",
--        "-mavx512cd",
--        "-mavx512dq",
--        "-mavx512f",
--        "-mavx512vl",
--        "-mavx512vnni",
--        "-mf16c",
--        "-mfma",
+-        "-mavx",
+-        "-mno-avx2",
+-        "-mno-f16c",
+-        "-mno-fma",
 -      ]
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/qs8-packw/gen/qs8-packw-x16c8-gemm-goi-avx256vnni-prfm.c",
--        "src/src/qs8-packw/gen/qs8-packw-x64c4-gemm-goi-avx256vnni-prfm.c",
--        "src/src/qs8-packw/gen/qs8-packw-x8c8-gemm-goi-avx256vnni-prfm.c",
+-        "src/src/qs8-qc4w-gemm/gen/qs8-qc4w-gemm-1x4c8-minmax-avx-madd-prfm.c",
+-        "src/src/qs8-qc4w-gemm/gen/qs8-qc4w-gemm-5x4c8-minmax-avx-madd-prfm.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -34135,14 +34238,8 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -        "//third_party/cpuinfo",
 -        "//third_party/fp16",
 -        "//third_party/fxdiv",
--        "//third_party/pthreadpool:pthreadpool_standalone",
+-        "//third_party/pthreadpool",
 -      ]
--
--      public_configs = [ ":xnnpack_public_config" ]
--
--      if (!(is_android && use_order_profiling)) {
--        assert_no_deps = [ "//base" ]
--      }
 +if (build_with_chromium) {
 +  source_set("f32-vlrelu_avx-no-avx2-no-f16c-no-fma") {
 +    cflags = [
@@ -34201,16 +34298,47 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 +    ]
 +
 +    public_configs = [ ":xnnpack_public_config" ]
-+
+ 
+-      public_configs = [ ":xnnpack_public_config" ]
 +    if (!(is_android && use_order_profiling)) {
 +      assert_no_deps = [ "//base" ]
      }
    }
 +}
  
--  if (build_with_chromium) {
--    source_set("qs8-packw_x64") {
--      cflags = []
+-  # This is a target that cannot depend on //base.
+-  if (build_with_internal_optimization_guide) {
+-    source_set("qs8-qc4w-gemm_avx-no-avx2-no-f16c-no-fma_standalone") {
+-      cflags = [
+-        "-mavx",
+-        "-mno-avx2",
+-        "-mno-f16c",
+-        "-mno-fma",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qs8-qc4w-gemm/gen/qs8-qc4w-gemm-1x4c8-minmax-avx-madd-prfm.c",
+-        "src/src/qs8-qc4w-gemm/gen/qs8-qc4w-gemm-5x4c8-minmax-avx-madd-prfm.c",
+-      ]
+-
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
+-
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/fp16",
+-        "//third_party/fxdiv",
+-        "//third_party/pthreadpool:pthreadpool_standalone",
+-      ]
+-
+-      public_configs = [ ":xnnpack_public_config" ]
+-
+-      if (!(is_android && use_order_profiling)) {
+-        assert_no_deps = [ "//base" ]
+-      }
 +if (build_with_chromium) {
 +  source_set("f32-vlrelu_avx512f") {
 +    cflags = [
@@ -34261,13 +34389,29 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 +      "//third_party/fxdiv",
 +      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
++
++    public_configs = [ ":xnnpack_public_config" ]
++
++    if (!(is_android && use_order_profiling)) {
++      assert_no_deps = [ "//base" ]
+     }
+   }
++}
  
+-  if (build_with_chromium) {
+-    source_set("qs8-qc4w-gemm_avx2-avxvnni-f16c-fma-gfni") {
+-      cflags = [
+-        "-mavx2",
+-        "-mavxvnni",
+-        "-mf16c",
+-        "-mfma",
+-        "-mgfni",
+-      ]
+-
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/qs8-packw/gen/qs8-packw-x16c8-gemm-goi-scalar.c",
--        "src/src/qs8-packw/gen/qs8-packw-x4c8-gemm-gio-scalar.c",
--        "src/src/qs8-packw/gen/qs8-packw-x4c8-gemm-goi-scalar.c",
--        "src/src/qs8-packw/gen/qs8-packw-x8c8-gemm-gio-scalar.c",
+-        "src/src/qs8-qc4w-gemm/gen/qs8-qc4w-gemm-1x8c8-minmax-avxvnni-prfm.c",
+-        "src/src/qs8-qc4w-gemm/gen/qs8-qc4w-gemm-5x8c8-minmax-avxvnni-prfm.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -34281,19 +34425,6 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -        "//third_party/fxdiv",
 -        "//third_party/pthreadpool",
 -      ]
-+    public_configs = [ ":xnnpack_public_config" ]
- 
--      public_configs = [ ":xnnpack_public_config" ]
-+    if (!(is_android && use_order_profiling)) {
-+      assert_no_deps = [ "//base" ]
-     }
-   }
-+}
- 
--  # This is a target that cannot depend on //base.
--  if (build_with_internal_optimization_guide) {
--    source_set("qs8-packw_x64_standalone") {
--      cflags = []
 +if (build_with_chromium) {
 +  source_set("f32-vlrelu_sse-no-sse2") {
 +    cflags = [
@@ -34321,7 +34452,8 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 +    public_configs = [ ":xnnpack_public_config" ]
 +  }
 +}
-+
+ 
+-      public_configs = [ ":xnnpack_public_config" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
 +  source_set("f32-vlrelu_sse-no-sse2_standalone") {
@@ -34346,32 +34478,7 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 +      "//third_party/fxdiv",
 +      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
- 
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qs8-packw/gen/qs8-packw-x16c8-gemm-goi-scalar.c",
--        "src/src/qs8-packw/gen/qs8-packw-x4c8-gemm-gio-scalar.c",
--        "src/src/qs8-packw/gen/qs8-packw-x4c8-gemm-goi-scalar.c",
--        "src/src/qs8-packw/gen/qs8-packw-x8c8-gemm-gio-scalar.c",
--      ]
--
--      configs -= [ "//build/config/compiler:chromium_code" ]
--      configs += [ "//build/config/compiler:no_chromium_code" ]
--      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
--      configs += [ ":xnnpack_private_config" ]
--
--      deps = [
--        "//third_party/cpuinfo",
--        "//third_party/fp16",
--        "//third_party/fxdiv",
--        "//third_party/pthreadpool:pthreadpool_standalone",
--      ]
--
--      public_configs = [ ":xnnpack_public_config" ]
--
--      if (!(is_android && use_order_profiling)) {
--        assert_no_deps = [ "//base" ]
--      }
++
 +    public_configs = [ ":xnnpack_public_config" ]
 +
 +    if (!(is_android && use_order_profiling)) {
@@ -34380,19 +34487,21 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
    }
 +}
  
--  if (build_with_chromium) {
--    source_set("qs8-qc4w-gemm_avx-no-avx2-no-f16c-no-fma") {
+-  # This is a target that cannot depend on //base.
+-  if (build_with_internal_optimization_guide) {
+-    source_set("qs8-qc4w-gemm_avx2-avxvnni-f16c-fma-gfni_standalone") {
 -      cflags = [
--        "-mavx",
--        "-mno-avx2",
--        "-mno-f16c",
--        "-mno-fma",
+-        "-mavx2",
+-        "-mavxvnni",
+-        "-mf16c",
+-        "-mfma",
+-        "-mgfni",
 -      ]
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/qs8-qc4w-gemm/gen/qs8-qc4w-gemm-1x4c8-minmax-avx-madd-prfm.c",
--        "src/src/qs8-qc4w-gemm/gen/qs8-qc4w-gemm-5x4c8-minmax-avx-madd-prfm.c",
+-        "src/src/qs8-qc4w-gemm/gen/qs8-qc4w-gemm-1x8c8-minmax-avxvnni-prfm.c",
+-        "src/src/qs8-qc4w-gemm/gen/qs8-qc4w-gemm-5x8c8-minmax-avxvnni-prfm.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -34404,8 +34513,14 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -        "//third_party/cpuinfo",
 -        "//third_party/fp16",
 -        "//third_party/fxdiv",
--        "//third_party/pthreadpool",
+-        "//third_party/pthreadpool:pthreadpool_standalone",
 -      ]
+-
+-      public_configs = [ ":xnnpack_public_config" ]
+-
+-      if (!(is_android && use_order_profiling)) {
+-        assert_no_deps = [ "//base" ]
+-      }
 +if (build_with_chromium) {
 +  source_set("f32-vlrelu_sse4.1-no-sse4.2") {
 +    cflags = [
@@ -34422,8 +34537,7 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
 +    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 +    configs += [ ":xnnpack_private_config" ]
- 
--      public_configs = [ ":xnnpack_public_config" ]
++
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
@@ -34468,20 +34582,18 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
    }
 +}
  
--  # This is a target that cannot depend on //base.
--  if (build_with_internal_optimization_guide) {
--    source_set("qs8-qc4w-gemm_avx-no-avx2-no-f16c-no-fma_standalone") {
+-  if (build_with_chromium) {
+-    source_set("qs8-qc4w-gemm_f16c-fma-avx2") {
 -      cflags = [
--        "-mavx",
--        "-mno-avx2",
--        "-mno-f16c",
--        "-mno-fma",
+-        "-mavx2",
+-        "-mf16c",
+-        "-mfma",
 -      ]
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/qs8-qc4w-gemm/gen/qs8-qc4w-gemm-1x4c8-minmax-avx-madd-prfm.c",
--        "src/src/qs8-qc4w-gemm/gen/qs8-qc4w-gemm-5x4c8-minmax-avx-madd-prfm.c",
+-        "src/src/qs8-qc4w-gemm/gen/qs8-qc4w-gemm-1x8c8-minmax-avx2-madd-prfm.c",
+-        "src/src/qs8-qc4w-gemm/gen/qs8-qc4w-gemm-7x8c8-minmax-avx2-madd-prfm.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -34493,14 +34605,8 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -        "//third_party/cpuinfo",
 -        "//third_party/fp16",
 -        "//third_party/fxdiv",
--        "//third_party/pthreadpool:pthreadpool_standalone",
+-        "//third_party/pthreadpool",
 -      ]
--
--      public_configs = [ ":xnnpack_public_config" ]
--
--      if (!(is_android && use_order_profiling)) {
--        assert_no_deps = [ "//base" ]
--      }
 +if (build_with_chromium) {
 +  source_set("f32-vlrelu_x64") {
 +    cflags = [
@@ -34539,7 +34645,8 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 +      "src/include/xnnpack.h",
 +      "src/src/f32-vlrelu/gen/f32-vlrelu-scalar-u4.c"
 +    ]
-+
+ 
+-      public_configs = [ ":xnnpack_public_config" ]
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
 +    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
@@ -34560,20 +34667,19 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
    }
 +}
  
--  if (build_with_chromium) {
--    source_set("qs8-qc4w-gemm_avx2-avxvnni-f16c-fma-gfni") {
+-  # This is a target that cannot depend on //base.
+-  if (build_with_internal_optimization_guide) {
+-    source_set("qs8-qc4w-gemm_f16c-fma-avx2_standalone") {
 -      cflags = [
 -        "-mavx2",
--        "-mavxvnni",
 -        "-mf16c",
 -        "-mfma",
--        "-mgfni",
 -      ]
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/qs8-qc4w-gemm/gen/qs8-qc4w-gemm-1x8c8-minmax-avxvnni-prfm.c",
--        "src/src/qs8-qc4w-gemm/gen/qs8-qc4w-gemm-5x8c8-minmax-avxvnni-prfm.c",
+-        "src/src/qs8-qc4w-gemm/gen/qs8-qc4w-gemm-1x8c8-minmax-avx2-madd-prfm.c",
+-        "src/src/qs8-qc4w-gemm/gen/qs8-qc4w-gemm-7x8c8-minmax-avx2-madd-prfm.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -34585,8 +34691,14 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -        "//third_party/cpuinfo",
 -        "//third_party/fp16",
 -        "//third_party/fxdiv",
--        "//third_party/pthreadpool",
+-        "//third_party/pthreadpool:pthreadpool_standalone",
 -      ]
+-
+-      public_configs = [ ":xnnpack_public_config" ]
+-
+-      if (!(is_android && use_order_profiling)) {
+-        assert_no_deps = [ "//base" ]
+-      }
 +if (build_with_chromium) {
 +  source_set("f32-vmulcaddc_sse-no-sse2") {
 +    cflags = [
@@ -34641,29 +34753,32 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 +    ]
 +
 +    public_configs = [ ":xnnpack_public_config" ]
- 
--      public_configs = [ ":xnnpack_public_config" ]
++
 +    if (!(is_android && use_order_profiling)) {
 +      assert_no_deps = [ "//base" ]
      }
    }
 +}
  
--  # This is a target that cannot depend on //base.
--  if (build_with_internal_optimization_guide) {
--    source_set("qs8-qc4w-gemm_avx2-avxvnni-f16c-fma-gfni_standalone") {
+-  if (build_with_chromium) {
+-    source_set(
+-        "qs8-qc4w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
 -      cflags = [
--        "-mavx2",
--        "-mavxvnni",
+-        "-mavx512bw",
+-        "-mavx512cd",
+-        "-mavx512dq",
+-        "-mavx512f",
+-        "-mavx512vl",
 -        "-mf16c",
 -        "-mfma",
--        "-mgfni",
 -      ]
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/qs8-qc4w-gemm/gen/qs8-qc4w-gemm-1x8c8-minmax-avxvnni-prfm.c",
--        "src/src/qs8-qc4w-gemm/gen/qs8-qc4w-gemm-5x8c8-minmax-avxvnni-prfm.c",
+-        "src/src/qs8-qc4w-gemm/gen/qs8-qc4w-gemm-1x16c8-minmax-fp32-avx512skx-madd-prfm.c",
+-        "src/src/qs8-qc4w-gemm/gen/qs8-qc4w-gemm-1x8c8-minmax-fp32-avx256skx-madd-prfm.c",
+-        "src/src/qs8-qc4w-gemm/gen/qs8-qc4w-gemm-7x16c8-minmax-fp32-avx512skx-madd-prfm.c",
+-        "src/src/qs8-qc4w-gemm/gen/qs8-qc4w-gemm-7x8c8-minmax-fp32-avx256skx-madd-prfm.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -34675,14 +34790,8 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -        "//third_party/cpuinfo",
 -        "//third_party/fp16",
 -        "//third_party/fxdiv",
--        "//third_party/pthreadpool:pthreadpool_standalone",
+-        "//third_party/pthreadpool",
 -      ]
--
--      public_configs = [ ":xnnpack_public_config" ]
--
--      if (!(is_android && use_order_profiling)) {
--        assert_no_deps = [ "//base" ]
--      }
 +if (build_with_chromium) {
 +  source_set("f32-vmulcaddc_x64") {
 +    cflags = [
@@ -34733,7 +34842,8 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 +      "//third_party/fxdiv",
 +      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
-+
+ 
+-      public_configs = [ ":xnnpack_public_config" ]
 +    public_configs = [ ":xnnpack_public_config" ]
 +
 +    if (!(is_android && use_order_profiling)) {
@@ -34742,18 +34852,26 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
    }
 +}
  
--  if (build_with_chromium) {
--    source_set("qs8-qc4w-gemm_f16c-fma-avx2") {
+-  # This is a target that cannot depend on //base.
+-  if (build_with_internal_optimization_guide) {
+-    source_set(
+-        "qs8-qc4w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") {
 -      cflags = [
--        "-mavx2",
+-        "-mavx512bw",
+-        "-mavx512cd",
+-        "-mavx512dq",
+-        "-mavx512f",
+-        "-mavx512vl",
 -        "-mf16c",
 -        "-mfma",
 -      ]
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/qs8-qc4w-gemm/gen/qs8-qc4w-gemm-1x8c8-minmax-avx2-madd-prfm.c",
--        "src/src/qs8-qc4w-gemm/gen/qs8-qc4w-gemm-7x8c8-minmax-avx2-madd-prfm.c",
+-        "src/src/qs8-qc4w-gemm/gen/qs8-qc4w-gemm-1x16c8-minmax-fp32-avx512skx-madd-prfm.c",
+-        "src/src/qs8-qc4w-gemm/gen/qs8-qc4w-gemm-1x8c8-minmax-fp32-avx256skx-madd-prfm.c",
+-        "src/src/qs8-qc4w-gemm/gen/qs8-qc4w-gemm-7x16c8-minmax-fp32-avx512skx-madd-prfm.c",
+-        "src/src/qs8-qc4w-gemm/gen/qs8-qc4w-gemm-7x8c8-minmax-fp32-avx256skx-madd-prfm.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -34765,8 +34883,14 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -        "//third_party/cpuinfo",
 -        "//third_party/fp16",
 -        "//third_party/fxdiv",
--        "//third_party/pthreadpool",
+-        "//third_party/pthreadpool:pthreadpool_standalone",
 -      ]
+-
+-      public_configs = [ ":xnnpack_public_config" ]
+-
+-      if (!(is_android && use_order_profiling)) {
+-        assert_no_deps = [ "//base" ]
+-      }
 +if (build_with_chromium) {
 +  source_set("f32-vrnd_avx-no-avx2-no-f16c-no-fma") {
 +    cflags = [
@@ -34831,27 +34955,31 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 +    ]
 +
 +    public_configs = [ ":xnnpack_public_config" ]
- 
--      public_configs = [ ":xnnpack_public_config" ]
++
 +    if (!(is_android && use_order_profiling)) {
 +      assert_no_deps = [ "//base" ]
      }
    }
 +}
  
--  # This is a target that cannot depend on //base.
--  if (build_with_internal_optimization_guide) {
--    source_set("qs8-qc4w-gemm_f16c-fma-avx2_standalone") {
+-  if (build_with_chromium) {
+-    source_set(
+-        "qs8-qc4w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni") {
 -      cflags = [
--        "-mavx2",
+-        "-mavx512bw",
+-        "-mavx512cd",
+-        "-mavx512dq",
+-        "-mavx512f",
+-        "-mavx512vl",
+-        "-mavx512vnni",
 -        "-mf16c",
 -        "-mfma",
 -      ]
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/qs8-qc4w-gemm/gen/qs8-qc4w-gemm-1x8c8-minmax-avx2-madd-prfm.c",
--        "src/src/qs8-qc4w-gemm/gen/qs8-qc4w-gemm-7x8c8-minmax-avx2-madd-prfm.c",
+-        "src/src/qs8-qc4w-gemm/gen/qs8-qc4w-gemm-1x8c8-minmax-fp32-avx256vnni-prfm.c",
+-        "src/src/qs8-qc4w-gemm/gen/qs8-qc4w-gemm-7x8c8-minmax-fp32-avx256vnni-prfm.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -34863,14 +34991,8 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -        "//third_party/cpuinfo",
 -        "//third_party/fp16",
 -        "//third_party/fxdiv",
--        "//third_party/pthreadpool:pthreadpool_standalone",
+-        "//third_party/pthreadpool",
 -      ]
--
--      public_configs = [ ":xnnpack_public_config" ]
--
--      if (!(is_android && use_order_profiling)) {
--        assert_no_deps = [ "//base" ]
--      }
 +if (build_with_chromium) {
 +  source_set("f32-vrnd_avx512f") {
 +    cflags = [
@@ -34929,32 +35051,33 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 +    ]
 +
 +    public_configs = [ ":xnnpack_public_config" ]
-+
+ 
+-      public_configs = [ ":xnnpack_public_config" ]
 +    if (!(is_android && use_order_profiling)) {
 +      assert_no_deps = [ "//base" ]
      }
    }
 +}
  
--  if (build_with_chromium) {
+-  # This is a target that cannot depend on //base.
+-  if (build_with_internal_optimization_guide) {
 -    source_set(
--        "qs8-qc4w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
+-        "qs8-qc4w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni_standalone") {
 -      cflags = [
 -        "-mavx512bw",
 -        "-mavx512cd",
 -        "-mavx512dq",
 -        "-mavx512f",
 -        "-mavx512vl",
+-        "-mavx512vnni",
 -        "-mf16c",
 -        "-mfma",
 -      ]
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/qs8-qc4w-gemm/gen/qs8-qc4w-gemm-1x16c8-minmax-fp32-avx512skx-madd-prfm.c",
--        "src/src/qs8-qc4w-gemm/gen/qs8-qc4w-gemm-1x8c8-minmax-fp32-avx256skx-madd-prfm.c",
--        "src/src/qs8-qc4w-gemm/gen/qs8-qc4w-gemm-7x16c8-minmax-fp32-avx512skx-madd-prfm.c",
--        "src/src/qs8-qc4w-gemm/gen/qs8-qc4w-gemm-7x8c8-minmax-fp32-avx256skx-madd-prfm.c",
+-        "src/src/qs8-qc4w-gemm/gen/qs8-qc4w-gemm-1x8c8-minmax-fp32-avx256vnni-prfm.c",
+-        "src/src/qs8-qc4w-gemm/gen/qs8-qc4w-gemm-7x8c8-minmax-fp32-avx256vnni-prfm.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -34966,8 +35089,14 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -        "//third_party/cpuinfo",
 -        "//third_party/fp16",
 -        "//third_party/fxdiv",
--        "//third_party/pthreadpool",
+-        "//third_party/pthreadpool:pthreadpool_standalone",
 -      ]
+-
+-      public_configs = [ ":xnnpack_public_config" ]
+-
+-      if (!(is_android && use_order_profiling)) {
+-        assert_no_deps = [ "//base" ]
+-      }
 +if (build_with_chromium) {
 +  source_set("f32-vrnd_sse2-no-sse3") {
 +    cflags = [
@@ -35028,34 +35157,24 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 +    ]
 +
 +    public_configs = [ ":xnnpack_public_config" ]
- 
--      public_configs = [ ":xnnpack_public_config" ]
++
 +    if (!(is_android && use_order_profiling)) {
 +      assert_no_deps = [ "//base" ]
      }
    }
 +}
  
--  # This is a target that cannot depend on //base.
--  if (build_with_internal_optimization_guide) {
--    source_set(
--        "qs8-qc4w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") {
+-  if (build_with_chromium) {
+-    source_set("qs8-qc4w-gemm_ssse3-no-sse4.1") {
 -      cflags = [
--        "-mavx512bw",
--        "-mavx512cd",
--        "-mavx512dq",
--        "-mavx512f",
--        "-mavx512vl",
--        "-mf16c",
--        "-mfma",
+-        "-mno-sse4.1",
+-        "-mssse3",
 -      ]
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/qs8-qc4w-gemm/gen/qs8-qc4w-gemm-1x16c8-minmax-fp32-avx512skx-madd-prfm.c",
--        "src/src/qs8-qc4w-gemm/gen/qs8-qc4w-gemm-1x8c8-minmax-fp32-avx256skx-madd-prfm.c",
--        "src/src/qs8-qc4w-gemm/gen/qs8-qc4w-gemm-7x16c8-minmax-fp32-avx512skx-madd-prfm.c",
--        "src/src/qs8-qc4w-gemm/gen/qs8-qc4w-gemm-7x8c8-minmax-fp32-avx256skx-madd-prfm.c",
+-        "src/src/qs8-qc4w-gemm/gen/qs8-qc4w-gemm-1x4c8-minmax-ssse3-madd-prfm.c",
+-        "src/src/qs8-qc4w-gemm/gen/qs8-qc4w-gemm-5x4c8-minmax-ssse3-madd-prfm.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -35067,14 +35186,8 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -        "//third_party/cpuinfo",
 -        "//third_party/fp16",
 -        "//third_party/fxdiv",
--        "//third_party/pthreadpool:pthreadpool_standalone",
+-        "//third_party/pthreadpool",
 -      ]
--
--      public_configs = [ ":xnnpack_public_config" ]
--
--      if (!(is_android && use_order_profiling)) {
--        assert_no_deps = [ "//base" ]
--      }
 +if (build_with_chromium) {
 +  source_set("f32-vrnd_sse4.1-no-sse4.2") {
 +    cflags = [
@@ -35101,7 +35214,8 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 +      "//third_party/fxdiv",
 +      "//third_party/pthreadpool",
 +    ]
-+
+ 
+-      public_configs = [ ":xnnpack_public_config" ]
 +    public_configs = [ ":xnnpack_public_config" ]
 +  }
 +}
@@ -35142,24 +35256,18 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
    }
 +}
  
--  if (build_with_chromium) {
--    source_set(
--        "qs8-qc4w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni") {
+-  # This is a target that cannot depend on //base.
+-  if (build_with_internal_optimization_guide) {
+-    source_set("qs8-qc4w-gemm_ssse3-no-sse4.1_standalone") {
 -      cflags = [
--        "-mavx512bw",
--        "-mavx512cd",
--        "-mavx512dq",
--        "-mavx512f",
--        "-mavx512vl",
--        "-mavx512vnni",
--        "-mf16c",
--        "-mfma",
+-        "-mno-sse4.1",
+-        "-mssse3",
 -      ]
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/qs8-qc4w-gemm/gen/qs8-qc4w-gemm-1x8c8-minmax-fp32-avx256vnni-prfm.c",
--        "src/src/qs8-qc4w-gemm/gen/qs8-qc4w-gemm-7x8c8-minmax-fp32-avx256vnni-prfm.c",
+-        "src/src/qs8-qc4w-gemm/gen/qs8-qc4w-gemm-1x4c8-minmax-ssse3-madd-prfm.c",
+-        "src/src/qs8-qc4w-gemm/gen/qs8-qc4w-gemm-5x4c8-minmax-ssse3-madd-prfm.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -35171,8 +35279,14 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -        "//third_party/cpuinfo",
 -        "//third_party/fp16",
 -        "//third_party/fxdiv",
--        "//third_party/pthreadpool",
+-        "//third_party/pthreadpool:pthreadpool_standalone",
 -      ]
+-
+-      public_configs = [ ":xnnpack_public_config" ]
+-
+-      if (!(is_android && use_order_profiling)) {
+-        assert_no_deps = [ "//base" ]
+-      }
 +if (build_with_chromium) {
 +  source_set("f32-vrnd_x64") {
 +    cflags = [
@@ -35229,8 +35343,7 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 +      "//third_party/fxdiv",
 +      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
- 
--      public_configs = [ ":xnnpack_public_config" ]
++
 +    public_configs = [ ":xnnpack_public_config" ]
 +
 +    if (!(is_android && use_order_profiling)) {
@@ -35239,44 +35352,9 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
    }
 +}
  
--  # This is a target that cannot depend on //base.
--  if (build_with_internal_optimization_guide) {
--    source_set(
--        "qs8-qc4w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni_standalone") {
--      cflags = [
--        "-mavx512bw",
--        "-mavx512cd",
--        "-mavx512dq",
--        "-mavx512f",
--        "-mavx512vl",
--        "-mavx512vnni",
--        "-mf16c",
--        "-mfma",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qs8-qc4w-gemm/gen/qs8-qc4w-gemm-1x8c8-minmax-fp32-avx256vnni-prfm.c",
--        "src/src/qs8-qc4w-gemm/gen/qs8-qc4w-gemm-7x8c8-minmax-fp32-avx256vnni-prfm.c",
--      ]
--
--      configs -= [ "//build/config/compiler:chromium_code" ]
--      configs += [ "//build/config/compiler:no_chromium_code" ]
--      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
--      configs += [ ":xnnpack_private_config" ]
--
--      deps = [
--        "//third_party/cpuinfo",
--        "//third_party/fp16",
--        "//third_party/fxdiv",
--        "//third_party/pthreadpool:pthreadpool_standalone",
--      ]
--
--      public_configs = [ ":xnnpack_public_config" ]
--
--      if (!(is_android && use_order_profiling)) {
--        assert_no_deps = [ "//base" ]
--      }
+-  if (build_with_chromium) {
+-    source_set("qs8-qc4w-gemm_x64") {
+-      cflags = []
 +if (build_with_chromium) {
 +  source_set("f32-vrsqrt_avx-no-avx2-no-f16c-no-fma") {
 +    cflags = [
@@ -35323,51 +35401,47 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 +      "src/src/f32-vrsqrt/gen/f32-vrsqrt-avx-rsqrt.c",
 +    "src/src/f32-vrsqrt/gen/f32-vrsqrt-avx-sqrt.c"
 +    ]
-+
+ 
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qs8-qc4w-gemm/gen/qs8-qc4w-gemm-1x4-minmax-fp32-scalar-fmagic.c",
+-        "src/src/qs8-qc4w-gemm/gen/qs8-qc4w-gemm-3x4-minmax-fp32-scalar-fmagic.c",
+-      ]
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
 +    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 +    configs += [ ":xnnpack_private_config" ]
-+
+ 
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
 +      "//third_party/fxdiv",
 +      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
-+
-+    public_configs = [ ":xnnpack_public_config" ]
-+
-+    if (!(is_android && use_order_profiling)) {
-+      assert_no_deps = [ "//base" ]
-     }
-   }
-+}
  
--  if (build_with_chromium) {
--    source_set("qs8-qc4w-gemm_ssse3-no-sse4.1") {
--      cflags = [
--        "-mno-sse4.1",
--        "-mssse3",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qs8-qc4w-gemm/gen/qs8-qc4w-gemm-1x4c8-minmax-ssse3-madd-prfm.c",
--        "src/src/qs8-qc4w-gemm/gen/qs8-qc4w-gemm-5x4c8-minmax-ssse3-madd-prfm.c",
--      ]
--
--      configs -= [ "//build/config/compiler:chromium_code" ]
--      configs += [ "//build/config/compiler:no_chromium_code" ]
--      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
--      configs += [ ":xnnpack_private_config" ]
--
 -      deps = [
 -        "//third_party/cpuinfo",
 -        "//third_party/fp16",
 -        "//third_party/fxdiv",
 -        "//third_party/pthreadpool",
 -      ]
++    public_configs = [ ":xnnpack_public_config" ]
+ 
+-      public_configs = [ ":xnnpack_public_config" ]
++    if (!(is_android && use_order_profiling)) {
++      assert_no_deps = [ "//base" ]
+     }
+   }
++}
+ 
+-  # This is a target that cannot depend on //base.
+-  if (build_with_internal_optimization_guide) {
+-    source_set("qs8-qc4w-gemm_x64_standalone") {
+-      cflags = []
 +if (build_with_chromium) {
 +  source_set("f32-vrsqrt_avx512f") {
 +    cflags = [
@@ -35420,28 +35494,52 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 +      "//third_party/fxdiv",
 +      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
-+
-+    public_configs = [ ":xnnpack_public_config" ]
  
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qs8-qc4w-gemm/gen/qs8-qc4w-gemm-1x4-minmax-fp32-scalar-fmagic.c",
+-        "src/src/qs8-qc4w-gemm/gen/qs8-qc4w-gemm-3x4-minmax-fp32-scalar-fmagic.c",
+-      ]
+-
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
+-
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/fp16",
+-        "//third_party/fxdiv",
+-        "//third_party/pthreadpool:pthreadpool_standalone",
+-      ]
+-
 -      public_configs = [ ":xnnpack_public_config" ]
+-
+-      if (!(is_android && use_order_profiling)) {
+-        assert_no_deps = [ "//base" ]
+-      }
++    public_configs = [ ":xnnpack_public_config" ]
++
 +    if (!(is_android && use_order_profiling)) {
 +      assert_no_deps = [ "//base" ]
      }
    }
 +}
  
--  # This is a target that cannot depend on //base.
--  if (build_with_internal_optimization_guide) {
--    source_set("qs8-qc4w-gemm_ssse3-no-sse4.1_standalone") {
+-  if (build_with_chromium) {
+-    source_set("qs8-qc8w-dwconv_avx-no-avx2-no-f16c-no-fma") {
 -      cflags = [
--        "-mno-sse4.1",
--        "-mssse3",
+-        "-mavx",
+-        "-mno-avx2",
+-        "-mno-f16c",
+-        "-mno-fma",
 -      ]
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/qs8-qc4w-gemm/gen/qs8-qc4w-gemm-1x4c8-minmax-ssse3-madd-prfm.c",
--        "src/src/qs8-qc4w-gemm/gen/qs8-qc4w-gemm-5x4c8-minmax-ssse3-madd-prfm.c",
+-        "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-25p16c-minmax-fp32-avx-mul16-add16.c",
+-        "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-3p16c-minmax-fp32-avx-mul16-add16.c",
+-        "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-9p16c-minmax-fp32-avx-mul16-add16.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -35453,14 +35551,8 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -        "//third_party/cpuinfo",
 -        "//third_party/fp16",
 -        "//third_party/fxdiv",
--        "//third_party/pthreadpool:pthreadpool_standalone",
+-        "//third_party/pthreadpool",
 -      ]
--
--      public_configs = [ ":xnnpack_public_config" ]
--
--      if (!(is_android && use_order_profiling)) {
--        assert_no_deps = [ "//base" ]
--      }
 +if (build_with_chromium) {
 +  source_set("f32-vrsqrt_sse2-no-sse3") {
 +    cflags = [
@@ -35515,7 +35607,8 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 +      "//third_party/fxdiv",
 +      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
-+
+ 
+-      public_configs = [ ":xnnpack_public_config" ]
 +    public_configs = [ ":xnnpack_public_config" ]
 +
 +    if (!(is_android && use_order_profiling)) {
@@ -35524,9 +35617,40 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
    }
 +}
  
--  if (build_with_chromium) {
--    source_set("qs8-qc4w-gemm_x64") {
--      cflags = []
+-  # This is a target that cannot depend on //base.
+-  if (build_with_internal_optimization_guide) {
+-    source_set("qs8-qc8w-dwconv_avx-no-avx2-no-f16c-no-fma_standalone") {
+-      cflags = [
+-        "-mavx",
+-        "-mno-avx2",
+-        "-mno-f16c",
+-        "-mno-fma",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-25p16c-minmax-fp32-avx-mul16-add16.c",
+-        "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-3p16c-minmax-fp32-avx-mul16-add16.c",
+-        "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-9p16c-minmax-fp32-avx-mul16-add16.c",
+-      ]
+-
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
+-
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/fp16",
+-        "//third_party/fxdiv",
+-        "//third_party/pthreadpool:pthreadpool_standalone",
+-      ]
+-
+-      public_configs = [ ":xnnpack_public_config" ]
+-
+-      if (!(is_android && use_order_profiling)) {
+-        assert_no_deps = [ "//base" ]
+-      }
 +if (build_with_chromium) {
 +  source_set("f32-vrsqrt_x64") {
 +    cflags = [
@@ -35567,47 +35691,53 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 +      "src/src/f32-vrsqrt/gen/f32-vrsqrt-scalar-rsqrt-u1.c",
 +    "src/src/f32-vrsqrt/gen/f32-vrsqrt-scalar-sqrt.c"
 +    ]
- 
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qs8-qc4w-gemm/gen/qs8-qc4w-gemm-1x4-minmax-fp32-scalar-fmagic.c",
--        "src/src/qs8-qc4w-gemm/gen/qs8-qc4w-gemm-3x4-minmax-fp32-scalar-fmagic.c",
--      ]
++
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
 +    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 +    configs += [ ":xnnpack_private_config" ]
- 
--      configs -= [ "//build/config/compiler:chromium_code" ]
--      configs += [ "//build/config/compiler:no_chromium_code" ]
--      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
--      configs += [ ":xnnpack_private_config" ]
++
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
 +      "//third_party/fxdiv",
 +      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
- 
--      deps = [
--        "//third_party/cpuinfo",
--        "//third_party/fp16",
--        "//third_party/fxdiv",
--        "//third_party/pthreadpool",
--      ]
++
 +    public_configs = [ ":xnnpack_public_config" ]
- 
--      public_configs = [ ":xnnpack_public_config" ]
++
 +    if (!(is_android && use_order_profiling)) {
 +      assert_no_deps = [ "//base" ]
      }
    }
 +}
  
--  # This is a target that cannot depend on //base.
--  if (build_with_internal_optimization_guide) {
--    source_set("qs8-qc4w-gemm_x64_standalone") {
--      cflags = []
+-  if (build_with_chromium) {
+-    source_set("qs8-qc8w-dwconv_f16c-fma-avx2") {
+-      cflags = [
+-        "-mavx2",
+-        "-mf16c",
+-        "-mfma",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-25p16c-minmax-fp32-avx2-mul32.c",
+-        "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-3p16c-minmax-fp32-avx2-mul32.c",
+-        "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-9p16c-minmax-fp32-avx2-mul32.c",
+-      ]
+-
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
+-
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/fp16",
+-        "//third_party/fxdiv",
+-        "//third_party/pthreadpool",
+-      ]
 +if (build_with_chromium) {
 +  source_set("f32-vsigmoid_avx-no-avx2-no-f16c-no-fma") {
 +    cflags = [
@@ -35667,49 +35797,27 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 +
 +    public_configs = [ ":xnnpack_public_config" ]
  
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qs8-qc4w-gemm/gen/qs8-qc4w-gemm-1x4-minmax-fp32-scalar-fmagic.c",
--        "src/src/qs8-qc4w-gemm/gen/qs8-qc4w-gemm-3x4-minmax-fp32-scalar-fmagic.c",
--      ]
--
--      configs -= [ "//build/config/compiler:chromium_code" ]
--      configs += [ "//build/config/compiler:no_chromium_code" ]
--      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
--      configs += [ ":xnnpack_private_config" ]
--
--      deps = [
--        "//third_party/cpuinfo",
--        "//third_party/fp16",
--        "//third_party/fxdiv",
--        "//third_party/pthreadpool:pthreadpool_standalone",
--      ]
--
 -      public_configs = [ ":xnnpack_public_config" ]
--
--      if (!(is_android && use_order_profiling)) {
--        assert_no_deps = [ "//base" ]
--      }
 +    if (!(is_android && use_order_profiling)) {
 +      assert_no_deps = [ "//base" ]
      }
    }
 +}
  
--  if (build_with_chromium) {
--    source_set("qs8-qc8w-dwconv_avx-no-avx2-no-f16c-no-fma") {
+-  # This is a target that cannot depend on //base.
+-  if (build_with_internal_optimization_guide) {
+-    source_set("qs8-qc8w-dwconv_f16c-fma-avx2_standalone") {
 -      cflags = [
--        "-mavx",
--        "-mno-avx2",
--        "-mno-f16c",
--        "-mno-fma",
+-        "-mavx2",
+-        "-mf16c",
+-        "-mfma",
 -      ]
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-25p16c-minmax-fp32-avx-mul16-add16.c",
--        "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-3p16c-minmax-fp32-avx-mul16-add16.c",
--        "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-9p16c-minmax-fp32-avx-mul16-add16.c",
+-        "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-25p16c-minmax-fp32-avx2-mul32.c",
+-        "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-3p16c-minmax-fp32-avx2-mul32.c",
+-        "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-9p16c-minmax-fp32-avx2-mul32.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -35721,8 +35829,14 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -        "//third_party/cpuinfo",
 -        "//third_party/fp16",
 -        "//third_party/fxdiv",
--        "//third_party/pthreadpool",
+-        "//third_party/pthreadpool:pthreadpool_standalone",
 -      ]
+-
+-      public_configs = [ ":xnnpack_public_config" ]
+-
+-      if (!(is_android && use_order_profiling)) {
+-        assert_no_deps = [ "//base" ]
+-      }
 +if (build_with_chromium) {
 +  source_set("f32-vsigmoid_avx512f") {
 +    cflags = [
@@ -35775,29 +35889,31 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 +    ]
 +
 +    public_configs = [ ":xnnpack_public_config" ]
- 
--      public_configs = [ ":xnnpack_public_config" ]
++
 +    if (!(is_android && use_order_profiling)) {
 +      assert_no_deps = [ "//base" ]
      }
    }
 +}
  
--  # This is a target that cannot depend on //base.
--  if (build_with_internal_optimization_guide) {
--    source_set("qs8-qc8w-dwconv_avx-no-avx2-no-f16c-no-fma_standalone") {
+-  if (build_with_chromium) {
+-    source_set(
+-        "qs8-qc8w-dwconv_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
 -      cflags = [
--        "-mavx",
--        "-mno-avx2",
--        "-mno-f16c",
--        "-mno-fma",
+-        "-mavx512bw",
+-        "-mavx512cd",
+-        "-mavx512dq",
+-        "-mavx512f",
+-        "-mavx512vl",
+-        "-mf16c",
+-        "-mfma",
 -      ]
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-25p16c-minmax-fp32-avx-mul16-add16.c",
--        "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-3p16c-minmax-fp32-avx-mul16-add16.c",
--        "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-9p16c-minmax-fp32-avx-mul16-add16.c",
+-        "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-25p32c-minmax-fp32-avx512skx-mul32.c",
+-        "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-3p32c-minmax-fp32-avx512skx-mul32.c",
+-        "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-9p32c-minmax-fp32-avx512skx-mul32.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -35809,14 +35925,8 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -        "//third_party/cpuinfo",
 -        "//third_party/fp16",
 -        "//third_party/fxdiv",
--        "//third_party/pthreadpool:pthreadpool_standalone",
+-        "//third_party/pthreadpool",
 -      ]
--
--      public_configs = [ ":xnnpack_public_config" ]
--
--      if (!(is_android && use_order_profiling)) {
--        assert_no_deps = [ "//base" ]
--      }
 +if (build_with_chromium) {
 +  source_set("f32-vsigmoid_f16c-fma-avx2") {
 +    cflags = [
@@ -35841,7 +35951,8 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 +      "//third_party/fxdiv",
 +      "//third_party/pthreadpool",
 +    ]
-+
+ 
+-      public_configs = [ ":xnnpack_public_config" ]
 +    public_configs = [ ":xnnpack_public_config" ]
 +  }
 +}
@@ -35880,19 +35991,25 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
    }
 +}
  
--  if (build_with_chromium) {
--    source_set("qs8-qc8w-dwconv_f16c-fma-avx2") {
+-  # This is a target that cannot depend on //base.
+-  if (build_with_internal_optimization_guide) {
+-    source_set(
+-        "qs8-qc8w-dwconv_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") {
 -      cflags = [
--        "-mavx2",
+-        "-mavx512bw",
+-        "-mavx512cd",
+-        "-mavx512dq",
+-        "-mavx512f",
+-        "-mavx512vl",
 -        "-mf16c",
 -        "-mfma",
 -      ]
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-25p16c-minmax-fp32-avx2-mul32.c",
--        "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-3p16c-minmax-fp32-avx2-mul32.c",
--        "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-9p16c-minmax-fp32-avx2-mul32.c",
+-        "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-25p32c-minmax-fp32-avx512skx-mul32.c",
+-        "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-3p32c-minmax-fp32-avx512skx-mul32.c",
+-        "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-9p32c-minmax-fp32-avx512skx-mul32.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -35904,8 +36021,14 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -        "//third_party/cpuinfo",
 -        "//third_party/fp16",
 -        "//third_party/fxdiv",
--        "//third_party/pthreadpool",
+-        "//third_party/pthreadpool:pthreadpool_standalone",
 -      ]
+-
+-      public_configs = [ ":xnnpack_public_config" ]
+-
+-      if (!(is_android && use_order_profiling)) {
+-        assert_no_deps = [ "//base" ]
+-      }
 +if (build_with_chromium) {
 +  source_set("f32-vsigmoid_sse2-no-sse3") {
 +    cflags = [
@@ -35958,8 +36081,7 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 +      "//third_party/fxdiv",
 +      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
- 
--      public_configs = [ ":xnnpack_public_config" ]
++
 +    public_configs = [ ":xnnpack_public_config" ]
 +
 +    if (!(is_android && use_order_profiling)) {
@@ -35968,20 +36090,18 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
    }
 +}
  
--  # This is a target that cannot depend on //base.
--  if (build_with_internal_optimization_guide) {
--    source_set("qs8-qc8w-dwconv_f16c-fma-avx2_standalone") {
+-  if (build_with_chromium) {
+-    source_set("qs8-qc8w-dwconv_sse2-no-sse3") {
 -      cflags = [
--        "-mavx2",
--        "-mf16c",
--        "-mfma",
+-        "-mno-sse3",
+-        "-msse2",
 -      ]
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-25p16c-minmax-fp32-avx2-mul32.c",
--        "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-3p16c-minmax-fp32-avx2-mul32.c",
--        "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-9p16c-minmax-fp32-avx2-mul32.c",
+-        "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-25p8c-minmax-fp32-sse2-mul16.c",
+-        "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-3p8c-minmax-fp32-sse2-mul16.c",
+-        "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-9p8c-minmax-fp32-sse2-mul16.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -35993,14 +36113,8 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -        "//third_party/cpuinfo",
 -        "//third_party/fp16",
 -        "//third_party/fxdiv",
--        "//third_party/pthreadpool:pthreadpool_standalone",
+-        "//third_party/pthreadpool",
 -      ]
--
--      public_configs = [ ":xnnpack_public_config" ]
--
--      if (!(is_android && use_order_profiling)) {
--        assert_no_deps = [ "//base" ]
--      }
 +if (build_with_chromium) {
 +  source_set("f32-vsigmoid_sse4.1-no-sse4.2") {
 +    cflags = [
@@ -36055,44 +36169,14 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 +    ]
 +
 +    public_configs = [ ":xnnpack_public_config" ]
-+
+ 
+-      public_configs = [ ":xnnpack_public_config" ]
 +    if (!(is_android && use_order_profiling)) {
 +      assert_no_deps = [ "//base" ]
      }
    }
 +}
- 
--  if (build_with_chromium) {
--    source_set(
--        "qs8-qc8w-dwconv_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
--      cflags = [
--        "-mavx512bw",
--        "-mavx512cd",
--        "-mavx512dq",
--        "-mavx512f",
--        "-mavx512vl",
--        "-mf16c",
--        "-mfma",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-25p32c-minmax-fp32-avx512skx-mul32.c",
--        "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-3p32c-minmax-fp32-avx512skx-mul32.c",
--        "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-9p32c-minmax-fp32-avx512skx-mul32.c",
--      ]
--
--      configs -= [ "//build/config/compiler:chromium_code" ]
--      configs += [ "//build/config/compiler:no_chromium_code" ]
--      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
--      configs += [ ":xnnpack_private_config" ]
--
--      deps = [
--        "//third_party/cpuinfo",
--        "//third_party/fp16",
--        "//third_party/fxdiv",
--        "//third_party/pthreadpool",
--      ]
++
 +if (build_with_chromium) {
 +  source_set("f32-vsigmoid_x64") {
 +    cflags = [
@@ -36119,7 +36203,39 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 +    public_configs = [ ":xnnpack_public_config" ]
 +  }
 +}
-+
+ 
+-  # This is a target that cannot depend on //base.
+-  if (build_with_internal_optimization_guide) {
+-    source_set("qs8-qc8w-dwconv_sse2-no-sse3_standalone") {
+-      cflags = [
+-        "-mno-sse3",
+-        "-msse2",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-25p8c-minmax-fp32-sse2-mul16.c",
+-        "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-3p8c-minmax-fp32-sse2-mul16.c",
+-        "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-9p8c-minmax-fp32-sse2-mul16.c",
+-      ]
+-
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
+-
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/fp16",
+-        "//third_party/fxdiv",
+-        "//third_party/pthreadpool:pthreadpool_standalone",
+-      ]
+-
+-      public_configs = [ ":xnnpack_public_config" ]
+-
+-      if (!(is_android && use_order_profiling)) {
+-        assert_no_deps = [ "//base" ]
+-      }
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
 +  source_set("f32-vsigmoid_x64_standalone") {
@@ -36145,33 +36261,25 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 +    ]
 +
 +    public_configs = [ ":xnnpack_public_config" ]
- 
--      public_configs = [ ":xnnpack_public_config" ]
++
 +    if (!(is_android && use_order_profiling)) {
 +      assert_no_deps = [ "//base" ]
      }
    }
 +}
  
--  # This is a target that cannot depend on //base.
--  if (build_with_internal_optimization_guide) {
--    source_set(
--        "qs8-qc8w-dwconv_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") {
+-  if (build_with_chromium) {
+-    source_set("qs8-qc8w-dwconv_sse4.1-no-sse4.2") {
 -      cflags = [
--        "-mavx512bw",
--        "-mavx512cd",
--        "-mavx512dq",
--        "-mavx512f",
--        "-mavx512vl",
--        "-mf16c",
--        "-mfma",
+-        "-mno-sse4.2",
+-        "-msse4.1",
 -      ]
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-25p32c-minmax-fp32-avx512skx-mul32.c",
--        "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-3p32c-minmax-fp32-avx512skx-mul32.c",
--        "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-9p32c-minmax-fp32-avx512skx-mul32.c",
+-        "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-25p8c-minmax-fp32-sse41-mul16.c",
+-        "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-3p8c-minmax-fp32-sse41-mul16.c",
+-        "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-9p8c-minmax-fp32-sse41-mul16.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -36183,14 +36291,8 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -        "//third_party/cpuinfo",
 -        "//third_party/fp16",
 -        "//third_party/fxdiv",
--        "//third_party/pthreadpool:pthreadpool_standalone",
+-        "//third_party/pthreadpool",
 -      ]
--
--      public_configs = [ ":xnnpack_public_config" ]
--
--      if (!(is_android && use_order_profiling)) {
--        assert_no_deps = [ "//base" ]
--      }
 +if (build_with_chromium) {
 +  source_set("f32-vsin_avx-no-avx2-no-f16c-no-fma") {
 +    cflags = [
@@ -36247,7 +36349,8 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 +      "//third_party/fxdiv",
 +      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
-+
+ 
+-      public_configs = [ ":xnnpack_public_config" ]
 +    public_configs = [ ":xnnpack_public_config" ]
 +
 +    if (!(is_android && use_order_profiling)) {
@@ -36256,18 +36359,19 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
    }
 +}
  
--  if (build_with_chromium) {
--    source_set("qs8-qc8w-dwconv_sse2-no-sse3") {
+-  # This is a target that cannot depend on //base.
+-  if (build_with_internal_optimization_guide) {
+-    source_set("qs8-qc8w-dwconv_sse4.1-no-sse4.2_standalone") {
 -      cflags = [
--        "-mno-sse3",
--        "-msse2",
+-        "-mno-sse4.2",
+-        "-msse4.1",
 -      ]
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-25p8c-minmax-fp32-sse2-mul16.c",
--        "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-3p8c-minmax-fp32-sse2-mul16.c",
--        "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-9p8c-minmax-fp32-sse2-mul16.c",
+-        "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-25p8c-minmax-fp32-sse41-mul16.c",
+-        "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-3p8c-minmax-fp32-sse41-mul16.c",
+-        "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-9p8c-minmax-fp32-sse41-mul16.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -36279,8 +36383,14 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -        "//third_party/cpuinfo",
 -        "//third_party/fp16",
 -        "//third_party/fxdiv",
--        "//third_party/pthreadpool",
+-        "//third_party/pthreadpool:pthreadpool_standalone",
 -      ]
+-
+-      public_configs = [ ":xnnpack_public_config" ]
+-
+-      if (!(is_android && use_order_profiling)) {
+-        assert_no_deps = [ "//base" ]
+-      }
 +if (build_with_chromium) {
 +  source_set("f32-vsin_avx512f") {
 +    cflags = [
@@ -36324,8 +36434,7 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
 +    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 +    configs += [ ":xnnpack_private_config" ]
- 
--      public_configs = [ ":xnnpack_public_config" ]
++
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
@@ -36341,38 +36450,9 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
    }
 +}
  
--  # This is a target that cannot depend on //base.
--  if (build_with_internal_optimization_guide) {
--    source_set("qs8-qc8w-dwconv_sse2-no-sse3_standalone") {
--      cflags = [
--        "-mno-sse3",
--        "-msse2",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-25p8c-minmax-fp32-sse2-mul16.c",
--        "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-3p8c-minmax-fp32-sse2-mul16.c",
--        "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-9p8c-minmax-fp32-sse2-mul16.c",
--      ]
--
--      configs -= [ "//build/config/compiler:chromium_code" ]
--      configs += [ "//build/config/compiler:no_chromium_code" ]
--      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
--      configs += [ ":xnnpack_private_config" ]
--
--      deps = [
--        "//third_party/cpuinfo",
--        "//third_party/fp16",
--        "//third_party/fxdiv",
--        "//third_party/pthreadpool:pthreadpool_standalone",
--      ]
--
--      public_configs = [ ":xnnpack_public_config" ]
--
--      if (!(is_android && use_order_profiling)) {
--        assert_no_deps = [ "//base" ]
--      }
+-  if (build_with_chromium) {
+-    source_set("qs8-qc8w-dwconv_x64") {
+-      cflags = []
 +if (build_with_chromium) {
 +  source_set("f32-vsin_f16c-fma-no-avx2") {
 +    cflags = [
@@ -36427,27 +36507,15 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 +      "//third_party/fxdiv",
 +      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
-+
-+    public_configs = [ ":xnnpack_public_config" ]
-+
-+    if (!(is_android && use_order_profiling)) {
-+      assert_no_deps = [ "//base" ]
-     }
-   }
-+}
  
--  if (build_with_chromium) {
--    source_set("qs8-qc8w-dwconv_sse4.1-no-sse4.2") {
--      cflags = [
--        "-mno-sse4.2",
--        "-msse4.1",
--      ]
--
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-25p8c-minmax-fp32-sse41-mul16.c",
--        "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-3p8c-minmax-fp32-sse41-mul16.c",
--        "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-9p8c-minmax-fp32-sse41-mul16.c",
+-        "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-25p1c-minmax-fp32-scalar-fmagic.c",
+-        "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-25p2c-minmax-fp32-scalar-lrintf.c",
+-        "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-3p1c-minmax-fp32-scalar-fmagic.c",
+-        "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-3p2c-minmax-fp32-scalar-lrintf.c",
+-        "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-9p1c-minmax-fp32-scalar-fmagic.c",
+-        "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-9p2c-minmax-fp32-scalar-lrintf.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -36461,6 +36529,19 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -        "//third_party/fxdiv",
 -        "//third_party/pthreadpool",
 -      ]
++    public_configs = [ ":xnnpack_public_config" ]
+ 
+-      public_configs = [ ":xnnpack_public_config" ]
++    if (!(is_android && use_order_profiling)) {
++      assert_no_deps = [ "//base" ]
+     }
+   }
++}
+ 
+-  # This is a target that cannot depend on //base.
+-  if (build_with_internal_optimization_guide) {
+-    source_set("qs8-qc8w-dwconv_x64_standalone") {
+-      cflags = []
 +if (build_with_chromium) {
 +  source_set("f32-vsin_sse2-no-sse3") {
 +    cflags = [
@@ -36515,29 +36596,55 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 +      "//third_party/fxdiv",
 +      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
-+
-+    public_configs = [ ":xnnpack_public_config" ]
  
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-25p1c-minmax-fp32-scalar-fmagic.c",
+-        "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-25p2c-minmax-fp32-scalar-lrintf.c",
+-        "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-3p1c-minmax-fp32-scalar-fmagic.c",
+-        "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-3p2c-minmax-fp32-scalar-lrintf.c",
+-        "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-9p1c-minmax-fp32-scalar-fmagic.c",
+-        "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-9p2c-minmax-fp32-scalar-lrintf.c",
+-      ]
+-
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
+-
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/fp16",
+-        "//third_party/fxdiv",
+-        "//third_party/pthreadpool:pthreadpool_standalone",
+-      ]
+-
 -      public_configs = [ ":xnnpack_public_config" ]
+-
+-      if (!(is_android && use_order_profiling)) {
+-        assert_no_deps = [ "//base" ]
+-      }
++    public_configs = [ ":xnnpack_public_config" ]
++
 +    if (!(is_android && use_order_profiling)) {
 +      assert_no_deps = [ "//base" ]
      }
    }
 +}
  
--  # This is a target that cannot depend on //base.
--  if (build_with_internal_optimization_guide) {
--    source_set("qs8-qc8w-dwconv_sse4.1-no-sse4.2_standalone") {
+-  if (build_with_chromium) {
+-    source_set("qs8-qc8w-gemm_avx-no-avx2-no-f16c-no-fma") {
 -      cflags = [
--        "-mno-sse4.2",
--        "-msse4.1",
+-        "-mavx",
+-        "-mno-avx2",
+-        "-mno-f16c",
+-        "-mno-fma",
 -      ]
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-25p8c-minmax-fp32-sse41-mul16.c",
--        "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-3p8c-minmax-fp32-sse41-mul16.c",
--        "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-9p8c-minmax-fp32-sse41-mul16.c",
+-        "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-1x4c8-minmax-fp32-avx-ld128.c",
+-        "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-2x4c8-minmax-fp32-avx-ld128.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -36549,14 +36656,8 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -        "//third_party/cpuinfo",
 -        "//third_party/fp16",
 -        "//third_party/fxdiv",
--        "//third_party/pthreadpool:pthreadpool_standalone",
+-        "//third_party/pthreadpool",
 -      ]
--
--      public_configs = [ ":xnnpack_public_config" ]
--
--      if (!(is_android && use_order_profiling)) {
--        assert_no_deps = [ "//base" ]
--      }
 +if (build_with_chromium) {
 +  source_set("f32-vsin_x64") {
 +    cflags = [
@@ -36572,7 +36673,8 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
 +    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 +    configs += [ ":xnnpack_private_config" ]
-+
+ 
+-      public_configs = [ ":xnnpack_public_config" ]
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
@@ -36616,9 +36718,39 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
    }
 +}
  
--  if (build_with_chromium) {
--    source_set("qs8-qc8w-dwconv_x64") {
--      cflags = []
+-  # This is a target that cannot depend on //base.
+-  if (build_with_internal_optimization_guide) {
+-    source_set("qs8-qc8w-gemm_avx-no-avx2-no-f16c-no-fma_standalone") {
+-      cflags = [
+-        "-mavx",
+-        "-mno-avx2",
+-        "-mno-f16c",
+-        "-mno-fma",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-1x4c8-minmax-fp32-avx-ld128.c",
+-        "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-2x4c8-minmax-fp32-avx-ld128.c",
+-      ]
+-
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
+-
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/fp16",
+-        "//third_party/fxdiv",
+-        "//third_party/pthreadpool:pthreadpool_standalone",
+-      ]
+-
+-      public_configs = [ ":xnnpack_public_config" ]
+-
+-      if (!(is_android && use_order_profiling)) {
+-        assert_no_deps = [ "//base" ]
+-      }
 +if (build_with_chromium) {
 +  source_set("f32-vsqrt_avx-no-avx2-no-f16c-no-fma") {
 +    cflags = [
@@ -36677,15 +36809,29 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 +      "//third_party/fxdiv",
 +      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
++
++    public_configs = [ ":xnnpack_public_config" ]
++
++    if (!(is_android && use_order_profiling)) {
++      assert_no_deps = [ "//base" ]
+     }
+   }
++}
  
+-  if (build_with_chromium) {
+-    source_set("qs8-qc8w-gemm_avx2-avxvnni-f16c-fma-gfni") {
+-      cflags = [
+-        "-mavx2",
+-        "-mavxvnni",
+-        "-mf16c",
+-        "-mfma",
+-        "-mgfni",
+-      ]
+-
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-25p1c-minmax-fp32-scalar-fmagic.c",
--        "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-25p2c-minmax-fp32-scalar-lrintf.c",
--        "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-3p1c-minmax-fp32-scalar-fmagic.c",
--        "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-3p2c-minmax-fp32-scalar-lrintf.c",
--        "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-9p1c-minmax-fp32-scalar-fmagic.c",
--        "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-9p2c-minmax-fp32-scalar-lrintf.c",
+-        "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-1x8c8-minmax-fp32-avxvnni-prfm.c",
+-        "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-5x8c8-minmax-fp32-avxvnni-prfm.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -36699,15 +36845,6 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -        "//third_party/fxdiv",
 -        "//third_party/pthreadpool",
 -      ]
-+    public_configs = [ ":xnnpack_public_config" ]
- 
--      public_configs = [ ":xnnpack_public_config" ]
-+    if (!(is_android && use_order_profiling)) {
-+      assert_no_deps = [ "//base" ]
-     }
-   }
-+}
-+
 +if (build_with_chromium) {
 +  source_set("f32-vsqrt_avx512f") {
 +    cflags = [
@@ -37475,6 +37612,8 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 +    "src/src/operators/convolution-nhwc.c",
 +    "src/src/operators/deconvolution-nhwc.c",
 +    "src/src/operators/dynamic-fully-connected-nc.c",
++    "src/src/operators/fingerprint_cache.c",
++    "src/src/operators/fingerprint_id.c",
 +    "src/src/operators/fully-connected-nc.c",
 +    "src/src/operators/max-pooling-nhwc.c",
 +    "src/src/operators/pack-lh.c",
@@ -37523,6 +37662,8 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 +    "src/src/operators/convolution-nhwc.c",
 +    "src/src/operators/deconvolution-nhwc.c",
 +    "src/src/operators/dynamic-fully-connected-nc.c",
++    "src/src/operators/fingerprint_cache.c",
++    "src/src/operators/fingerprint_id.c",
 +    "src/src/operators/fully-connected-nc.c",
 +    "src/src/operators/max-pooling-nhwc.c",
 +    "src/src/operators/pack-lh.c",
@@ -62239,6 +62380,8 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 +    "src/src/operators/convolution-nhwc.c",
 +    "src/src/operators/deconvolution-nhwc.c",
 +    "src/src/operators/dynamic-fully-connected-nc.c",
++    "src/src/operators/fingerprint_cache.c",
++    "src/src/operators/fingerprint_id.c",
 +    "src/src/operators/fully-connected-nc.c",
 +    "src/src/operators/max-pooling-nhwc.c",
 +    "src/src/operators/pack-lh.c",
@@ -62287,6 +62430,8 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 +    "src/src/operators/convolution-nhwc.c",
 +    "src/src/operators/deconvolution-nhwc.c",
 +    "src/src/operators/dynamic-fully-connected-nc.c",
++    "src/src/operators/fingerprint_cache.c",
++    "src/src/operators/fingerprint_id.c",
 +    "src/src/operators/fully-connected-nc.c",
 +    "src/src/operators/max-pooling-nhwc.c",
 +    "src/src/operators/pack-lh.c",
@@ -62322,6 +62467,65 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
++  source_set("pf16-f16-f16-igemm_arch=armv8.2-a+sve+sve2") {
++    cflags = [
++      "-march=armv8.2-a+sve+sve2"
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/pf16-f16-f16-igemm/pf16-f16-f16-igemm-32x32c2-minmax-neonsme2.c"
++    ]
++
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
++
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool",
++    ]
++
++    public_configs = [ ":xnnpack_public_config" ]
++  }
++}
++
++# This is a target that cannot depend on //base.
++if (build_with_internal_optimization_guide) {
++  source_set("pf16-f16-f16-igemm_arch=armv8.2-a+sve+sve2_standalone") {
++    cflags = [
++      "-march=armv8.2-a+sve+sve2"
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/pf16-f16-f16-igemm/pf16-f16-f16-igemm-32x32c2-minmax-neonsme2.c"
++    ]
++
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
++
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool:pthreadpool_standalone",
++    ]
++
++    public_configs = [ ":xnnpack_public_config" ]
++
++    if (!(is_android && use_order_profiling)) {
++      assert_no_deps = [ "//base" ]
++    }
++  }
++}
++
++if (build_with_chromium) {
 +  source_set("pf16-gemm_arch=armv8.2-a+sve+sve2") {
 +    cflags = [
 +      "-march=armv8.2-a+sve+sve2"
@@ -63686,6 +63890,67 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
++  source_set("qd8-f32-qc2w-gemm_arch=armv8.2-a+dotprod") {
++    cflags = [
++      "-march=armv8.2-a+dotprod"
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/qd8-f32-qc2w-gemm/qd8-f32-qc2w-gemm-1x16c4-minmax-neondot.c",
++    "src/src/qd8-f32-qc2w-gemm/qd8-f32-qc2w-gemm-4x16c4-minmax-neondot.c"
++    ]
++
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
++
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool",
++    ]
++
++    public_configs = [ ":xnnpack_public_config" ]
++  }
++}
++
++# This is a target that cannot depend on //base.
++if (build_with_internal_optimization_guide) {
++  source_set("qd8-f32-qc2w-gemm_arch=armv8.2-a+dotprod_standalone") {
++    cflags = [
++      "-march=armv8.2-a+dotprod"
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/qd8-f32-qc2w-gemm/qd8-f32-qc2w-gemm-1x16c4-minmax-neondot.c",
++    "src/src/qd8-f32-qc2w-gemm/qd8-f32-qc2w-gemm-4x16c4-minmax-neondot.c"
++    ]
++
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
++
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool:pthreadpool_standalone",
++    ]
++
++    public_configs = [ ":xnnpack_public_config" ]
++
++    if (!(is_android && use_order_profiling)) {
++      assert_no_deps = [ "//base" ]
++    }
++  }
++}
++
++if (build_with_chromium) {
 +  source_set("qd8-f32-qc4w-gemm_arch=armv8.2-a+dotprod") {
 +    cflags = [
 +      "-march=armv8.2-a+dotprod"
@@ -66824,169 +67089,10 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 +      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
  
--  # This is a target that cannot depend on //base.
--  if (build_with_internal_optimization_guide) {
--    source_set("qs8-qc8w-dwconv_x64_standalone") {
--      cflags = []
-+    public_configs = [ ":xnnpack_public_config" ]
- 
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-25p1c-minmax-fp32-scalar-fmagic.c",
--        "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-25p2c-minmax-fp32-scalar-lrintf.c",
--        "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-3p1c-minmax-fp32-scalar-fmagic.c",
--        "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-3p2c-minmax-fp32-scalar-lrintf.c",
--        "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-9p1c-minmax-fp32-scalar-fmagic.c",
--        "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-9p2c-minmax-fp32-scalar-lrintf.c",
--      ]
--
--      configs -= [ "//build/config/compiler:chromium_code" ]
--      configs += [ "//build/config/compiler:no_chromium_code" ]
--      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
--      configs += [ ":xnnpack_private_config" ]
--
--      deps = [
--        "//third_party/cpuinfo",
--        "//third_party/fp16",
--        "//third_party/fxdiv",
--        "//third_party/pthreadpool:pthreadpool_standalone",
--      ]
--
--      public_configs = [ ":xnnpack_public_config" ]
--
--      if (!(is_android && use_order_profiling)) {
--        assert_no_deps = [ "//base" ]
--      }
-+    if (!(is_android && use_order_profiling)) {
-+      assert_no_deps = [ "//base" ]
-     }
-   }
-+}
- 
--  if (build_with_chromium) {
--    source_set("qs8-qc8w-gemm_avx-no-avx2-no-f16c-no-fma") {
--      cflags = [
--        "-mavx",
--        "-mno-avx2",
--        "-mno-f16c",
--        "-mno-fma",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-1x4c8-minmax-fp32-avx-ld128.c",
--        "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-2x4c8-minmax-fp32-avx-ld128.c",
--      ]
--
--      configs -= [ "//build/config/compiler:chromium_code" ]
--      configs += [ "//build/config/compiler:no_chromium_code" ]
--      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
--      configs += [ ":xnnpack_private_config" ]
--
--      deps = [
--        "//third_party/cpuinfo",
--        "//third_party/fp16",
--        "//third_party/fxdiv",
--        "//third_party/pthreadpool",
--      ]
-+if (build_with_chromium) {
-+  source_set("qu8-gemm_arch=armv8.2-a+fp16+dotprod") {
-+    cflags = [
-+      "-march=armv8.2-a+fp16+dotprod"
-+    ]
-+  
-+  asmflags = cflags
- 
--      public_configs = [ ":xnnpack_public_config" ]
--    }
--  }
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/qu8-gemm/gen/qu8-gemm-4x16-minmax-rndnu-asm-aarch64-neon-mlal-lane-cortex-a53-prfm.S",
-+    "src/src/qu8-gemm/gen/qu8-gemm-4x16-minmax-rndnu-asm-aarch64-neon-mlal-lane-cortex-a75-prfm.S",
-+    "src/src/qu8-gemm/gen/qu8-gemm-4x16-minmax-rndnu-asm-aarch64-neon-mlal-lane-cortex-a75.S",
-+    "src/src/qu8-gemm/gen/qu8-gemm-4x16-minmax-rndnu16-asm-aarch64-neon-mlal-lane-cortex-a53-prfm.S"
-+    ]
- 
--  # This is a target that cannot depend on //base.
--  if (build_with_internal_optimization_guide) {
--    source_set("qs8-qc8w-gemm_avx-no-avx2-no-f16c-no-fma_standalone") {
--      cflags = [
--        "-mavx",
--        "-mno-avx2",
--        "-mno-f16c",
--        "-mno-fma",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-1x4c8-minmax-fp32-avx-ld128.c",
--        "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-2x4c8-minmax-fp32-avx-ld128.c",
--      ]
--
--      configs -= [ "//build/config/compiler:chromium_code" ]
--      configs += [ "//build/config/compiler:no_chromium_code" ]
--      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
--      configs += [ ":xnnpack_private_config" ]
--
--      deps = [
--        "//third_party/cpuinfo",
--        "//third_party/fp16",
--        "//third_party/fxdiv",
--        "//third_party/pthreadpool:pthreadpool_standalone",
--      ]
--
 -      public_configs = [ ":xnnpack_public_config" ]
--
--      if (!(is_android && use_order_profiling)) {
--        assert_no_deps = [ "//base" ]
--      }
 -    }
 -  }
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
- 
--  if (build_with_chromium) {
--    source_set("qs8-qc8w-gemm_avx2-avxvnni-f16c-fma-gfni") {
--      cflags = [
--        "-mavx2",
--        "-mavxvnni",
--        "-mf16c",
--        "-mfma",
--        "-mgfni",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-1x8c8-minmax-fp32-avxvnni-prfm.c",
--        "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-5x8c8-minmax-fp32-avxvnni-prfm.c",
--      ]
--
--      configs -= [ "//build/config/compiler:chromium_code" ]
--      configs += [ "//build/config/compiler:no_chromium_code" ]
--      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
--      configs += [ ":xnnpack_private_config" ]
--
--      deps = [
--        "//third_party/cpuinfo",
--        "//third_party/fp16",
--        "//third_party/fxdiv",
--        "//third_party/pthreadpool",
--      ]
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool",
-+    ]
- 
--      public_configs = [ ":xnnpack_public_config" ]
--    }
 +    public_configs = [ ":xnnpack_public_config" ]
-   }
-+}
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
@@ -67022,16 +67128,11 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -      if (!(is_android && use_order_profiling)) {
 -        assert_no_deps = [ "//base" ]
 -      }
--    }
--  }
-+# This is a target that cannot depend on //base.
-+if (build_with_internal_optimization_guide) {
-+  source_set("qu8-gemm_arch=armv8.2-a+fp16+dotprod_standalone") {
-+    cflags = [
-+      "-march=armv8.2-a+fp16+dotprod"
-+    ]
-+  
-+  asmflags = cflags
++    if (!(is_android && use_order_profiling)) {
++      assert_no_deps = [ "//base" ]
+     }
+   }
++}
  
 -  if (build_with_chromium) {
 -    source_set("qs8-qc8w-gemm_avx2-avxvnniint8-f16c-fma-gfni") {
@@ -67060,6 +67161,17 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -        "//third_party/fxdiv",
 -        "//third_party/pthreadpool",
 -      ]
++if (build_with_chromium) {
++  source_set("qu8-gemm_arch=armv8.2-a+fp16+dotprod") {
++    cflags = [
++      "-march=armv8.2-a+fp16+dotprod"
++    ]
++  
++  asmflags = cflags
+ 
+-      public_configs = [ ":xnnpack_public_config" ]
+-    }
+-  }
 +    sources = [
 +      "src/include/xnnpack.h",
 +      "src/src/qu8-gemm/gen/qu8-gemm-4x16-minmax-rndnu-asm-aarch64-neon-mlal-lane-cortex-a53-prfm.S",
@@ -67068,14 +67180,6 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 +    "src/src/qu8-gemm/gen/qu8-gemm-4x16-minmax-rndnu16-asm-aarch64-neon-mlal-lane-cortex-a53-prfm.S"
 +    ]
  
--      public_configs = [ ":xnnpack_public_config" ]
--    }
--  }
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
- 
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
 -    source_set("qs8-qc8w-gemm_avx2-avxvnniint8-f16c-fma-gfni_standalone") {
@@ -67112,12 +67216,10 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -      }
 -    }
 -  }
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool:pthreadpool_standalone",
-+    ]
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
  
 -  if (build_with_chromium) {
 -    source_set("qs8-qc8w-gemm_f16c-fma-avx2") {
@@ -67144,12 +67246,16 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -        "//third_party/fxdiv",
 -        "//third_party/pthreadpool",
 -      ]
-+    public_configs = [ ":xnnpack_public_config" ]
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool",
++    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
-+    if (!(is_android && use_order_profiling)) {
-+      assert_no_deps = [ "//base" ]
-     }
+-    }
++    public_configs = [ ":xnnpack_public_config" ]
    }
 +}
  
@@ -67187,22 +67293,14 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -      }
 -    }
 -  }
-+if (build_with_chromium) {
-+  source_set("qu8-gemm_arm64") {
++# This is a target that cannot depend on //base.
++if (build_with_internal_optimization_guide) {
++  source_set("qu8-gemm_arch=armv8.2-a+fp16+dotprod_standalone") {
 +    cflags = [
-+  
++      "-march=armv8.2-a+fp16+dotprod"
 +    ]
 +  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/qu8-gemm/gen/qu8-gemm-1x16-minmax-rndnu-neon-mlal-lane.c",
-+    "src/src/qu8-gemm/gen/qu8-gemm-1x16-minmax-rndnu16-neon-mlal-lane.c",
-+    "src/src/qu8-gemm/gen/qu8-gemm-1x4-minmax-fp32-scalar-lrintf.c",
-+    "src/src/qu8-gemm/gen/qu8-gemm-1x8-minmax-rndnu-neon-mlal-lane.c",
-+    "src/src/qu8-gemm/gen/qu8-gemm-3x4-minmax-fp32-scalar-lrintf.c",
-+    "src/src/qu8-gemm/gen/qu8-gemm-3x8-minmax-rndnu-neon-mlal-lane.c",
-+    "src/src/qu8-gemm/gen/qu8-gemm-4x16-minmax-rndnu-neon-mlal-lane.c"
-+    ]
++  asmflags = cflags
  
 -  if (build_with_chromium) {
 -    source_set(
@@ -67236,20 +67334,21 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -        "//third_party/fxdiv",
 -        "//third_party/pthreadpool",
 -      ]
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/qu8-gemm/gen/qu8-gemm-4x16-minmax-rndnu-asm-aarch64-neon-mlal-lane-cortex-a53-prfm.S",
++    "src/src/qu8-gemm/gen/qu8-gemm-4x16-minmax-rndnu-asm-aarch64-neon-mlal-lane-cortex-a75-prfm.S",
++    "src/src/qu8-gemm/gen/qu8-gemm-4x16-minmax-rndnu-asm-aarch64-neon-mlal-lane-cortex-a75.S",
++    "src/src/qu8-gemm/gen/qu8-gemm-4x16-minmax-rndnu16-asm-aarch64-neon-mlal-lane-cortex-a53-prfm.S"
++    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
 -    }
 -  }
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool",
-+    ]
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
@@ -67291,9 +67390,13 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -        assert_no_deps = [ "//base" ]
 -      }
 -    }
-+    public_configs = [ ":xnnpack_public_config" ]
-   }
-+}
+-  }
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool:pthreadpool_standalone",
++    ]
  
 -  if (build_with_chromium) {
 -    source_set(
@@ -67326,27 +67429,14 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -        "//third_party/fxdiv",
 -        "//third_party/pthreadpool",
 -      ]
--
++    public_configs = [ ":xnnpack_public_config" ]
+ 
 -      public_configs = [ ":xnnpack_public_config" ]
--    }
--  }
-+# This is a target that cannot depend on //base.
-+if (build_with_internal_optimization_guide) {
-+  source_set("qu8-gemm_arm64_standalone") {
-+    cflags = [
-+  
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/qu8-gemm/gen/qu8-gemm-1x16-minmax-rndnu-neon-mlal-lane.c",
-+    "src/src/qu8-gemm/gen/qu8-gemm-1x16-minmax-rndnu16-neon-mlal-lane.c",
-+    "src/src/qu8-gemm/gen/qu8-gemm-1x4-minmax-fp32-scalar-lrintf.c",
-+    "src/src/qu8-gemm/gen/qu8-gemm-1x8-minmax-rndnu-neon-mlal-lane.c",
-+    "src/src/qu8-gemm/gen/qu8-gemm-3x4-minmax-fp32-scalar-lrintf.c",
-+    "src/src/qu8-gemm/gen/qu8-gemm-3x8-minmax-rndnu-neon-mlal-lane.c",
-+    "src/src/qu8-gemm/gen/qu8-gemm-4x16-minmax-rndnu-neon-mlal-lane.c"
-+    ]
++    if (!(is_android && use_order_profiling)) {
++      assert_no_deps = [ "//base" ]
+     }
+   }
++}
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
@@ -67388,10 +67478,22 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -      }
 -    }
 -  }
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
++if (build_with_chromium) {
++  source_set("qu8-gemm_arm64") {
++    cflags = [
++  
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/qu8-gemm/gen/qu8-gemm-1x16-minmax-rndnu-neon-mlal-lane.c",
++    "src/src/qu8-gemm/gen/qu8-gemm-1x16-minmax-rndnu16-neon-mlal-lane.c",
++    "src/src/qu8-gemm/gen/qu8-gemm-1x4-minmax-fp32-scalar-lrintf.c",
++    "src/src/qu8-gemm/gen/qu8-gemm-1x8-minmax-rndnu-neon-mlal-lane.c",
++    "src/src/qu8-gemm/gen/qu8-gemm-3x4-minmax-fp32-scalar-lrintf.c",
++    "src/src/qu8-gemm/gen/qu8-gemm-3x8-minmax-rndnu-neon-mlal-lane.c",
++    "src/src/qu8-gemm/gen/qu8-gemm-4x16-minmax-rndnu-neon-mlal-lane.c"
++    ]
  
 -  if (build_with_chromium) {
 -    source_set(
@@ -67427,18 +67529,21 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -        "//third_party/fxdiv",
 -        "//third_party/pthreadpool",
 -      ]
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
+ 
+-      public_configs = [ ":xnnpack_public_config" ]
+-    }
+-  }
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
 +      "//third_party/fxdiv",
-+      "//third_party/pthreadpool:pthreadpool_standalone",
++      "//third_party/pthreadpool",
 +    ]
  
--      public_configs = [ ":xnnpack_public_config" ]
--    }
--  }
-+    public_configs = [ ":xnnpack_public_config" ]
- 
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
 -    source_set(
@@ -67480,9 +67585,8 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -      if (!(is_android && use_order_profiling)) {
 -        assert_no_deps = [ "//base" ]
 -      }
-+    if (!(is_android && use_order_profiling)) {
-+      assert_no_deps = [ "//base" ]
-     }
+-    }
++    public_configs = [ ":xnnpack_public_config" ]
    }
 +}
  
@@ -67510,23 +67614,26 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -        "//third_party/fxdiv",
 -        "//third_party/pthreadpool",
 -      ]
-+if (build_with_chromium) {
-+  source_set("qu8-igemm_arch=armv8.2-a+fp16+dotprod") {
-+    cflags = [
-+      "-march=armv8.2-a+fp16+dotprod"
-+    ]
-+  
-+  asmflags = cflags
- 
+-
 -      public_configs = [ ":xnnpack_public_config" ]
 -    }
 -  }
++# This is a target that cannot depend on //base.
++if (build_with_internal_optimization_guide) {
++  source_set("qu8-gemm_arm64_standalone") {
++    cflags = [
++  
++    ]
++  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-igemm/gen/qu8-igemm-4x16-minmax-rndnu-asm-aarch64-neon-mlal-lane-cortex-a53-prfm.S",
-+    "src/src/qu8-igemm/gen/qu8-igemm-4x16-minmax-rndnu-asm-aarch64-neon-mlal-lane-cortex-a75-prfm.S",
-+    "src/src/qu8-igemm/gen/qu8-igemm-4x16-minmax-rndnu-asm-aarch64-neon-mlal-lane-cortex-a75.S",
-+    "src/src/qu8-igemm/gen/qu8-igemm-4x16-minmax-rndnu16-asm-aarch64-neon-mlal-lane-cortex-a53-prfm.S"
++      "src/src/qu8-gemm/gen/qu8-gemm-1x16-minmax-rndnu-neon-mlal-lane.c",
++    "src/src/qu8-gemm/gen/qu8-gemm-1x16-minmax-rndnu16-neon-mlal-lane.c",
++    "src/src/qu8-gemm/gen/qu8-gemm-1x4-minmax-fp32-scalar-lrintf.c",
++    "src/src/qu8-gemm/gen/qu8-gemm-1x8-minmax-rndnu-neon-mlal-lane.c",
++    "src/src/qu8-gemm/gen/qu8-gemm-3x4-minmax-fp32-scalar-lrintf.c",
++    "src/src/qu8-gemm/gen/qu8-gemm-3x8-minmax-rndnu-neon-mlal-lane.c",
++    "src/src/qu8-gemm/gen/qu8-gemm-4x16-minmax-rndnu-neon-mlal-lane.c"
 +    ]
  
 -  # This is a target that cannot depend on //base.
@@ -67595,14 +67702,13 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
 +      "//third_party/fxdiv",
-+      "//third_party/pthreadpool",
++      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
 -    }
+-  }
 +    public_configs = [ ":xnnpack_public_config" ]
-   }
-+}
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
@@ -67635,20 +67741,28 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -      if (!(is_android && use_order_profiling)) {
 -        assert_no_deps = [ "//base" ]
 -      }
--    }
--  }
-+# This is a target that cannot depend on //base.
-+if (build_with_internal_optimization_guide) {
-+  source_set("qu8-igemm_arch=armv8.2-a+fp16+dotprod_standalone") {
++    if (!(is_android && use_order_profiling)) {
++      assert_no_deps = [ "//base" ]
+     }
+   }
++}
+ 
+-  if (build_with_chromium) {
+-    source_set("qs8-qc8w-gemm_x64") {
+-      cflags = []
++if (build_with_chromium) {
++  source_set("qu8-igemm_arch=armv8.2-a+fp16+dotprod") {
 +    cflags = [
 +      "-march=armv8.2-a+fp16+dotprod"
 +    ]
 +  
 +  asmflags = cflags
  
--  if (build_with_chromium) {
--    source_set("qs8-qc8w-gemm_x64") {
--      cflags = []
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-1x4-minmax-fp32-scalar-lrintf.c",
+-        "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-3x4-minmax-fp32-scalar-lrintf.c",
+-      ]
 +    sources = [
 +      "src/include/xnnpack.h",
 +      "src/src/qu8-igemm/gen/qu8-igemm-4x16-minmax-rndnu-asm-aarch64-neon-mlal-lane-cortex-a53-prfm.S",
@@ -67657,26 +67771,14 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 +    "src/src/qu8-igemm/gen/qu8-igemm-4x16-minmax-rndnu16-asm-aarch64-neon-mlal-lane-cortex-a53-prfm.S"
 +    ]
  
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-1x4-minmax-fp32-scalar-lrintf.c",
--        "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-3x4-minmax-fp32-scalar-lrintf.c",
--      ]
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
- 
 -      configs -= [ "//build/config/compiler:chromium_code" ]
 -      configs += [ "//build/config/compiler:no_chromium_code" ]
 -      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 -      configs += [ ":xnnpack_private_config" ]
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool:pthreadpool_standalone",
-+    ]
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
  
 -      deps = [
 -        "//third_party/cpuinfo",
@@ -67684,12 +67786,16 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -        "//third_party/fxdiv",
 -        "//third_party/pthreadpool",
 -      ]
-+    public_configs = [ ":xnnpack_public_config" ]
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool",
++    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
-+    if (!(is_android && use_order_profiling)) {
-+      assert_no_deps = [ "//base" ]
-     }
+-    }
++    public_configs = [ ":xnnpack_public_config" ]
    }
 +}
  
@@ -67697,23 +67803,7 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -  if (build_with_internal_optimization_guide) {
 -    source_set("qs8-qc8w-gemm_x64_standalone") {
 -      cflags = []
-+if (build_with_chromium) {
-+  source_set("qu8-igemm_arm64") {
-+    cflags = [
-+  
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/qu8-igemm/gen/qu8-igemm-1x16-minmax-rndnu-neon-mlal-lane.c",
-+    "src/src/qu8-igemm/gen/qu8-igemm-1x16-minmax-rndnu16-neon-mlal-lane.c",
-+    "src/src/qu8-igemm/gen/qu8-igemm-1x4-minmax-fp32-scalar-lrintf.c",
-+    "src/src/qu8-igemm/gen/qu8-igemm-1x8-minmax-rndnu-neon-mlal-lane.c",
-+    "src/src/qu8-igemm/gen/qu8-igemm-3x4-minmax-fp32-scalar-lrintf.c",
-+    "src/src/qu8-igemm/gen/qu8-igemm-3x8-minmax-rndnu-neon-mlal-lane.c",
-+    "src/src/qu8-igemm/gen/qu8-igemm-4x16-minmax-rndnu-neon-mlal-lane.c"
-+    ]
- 
+-
 -      sources = [
 -        "src/include/xnnpack.h",
 -        "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-1x4-minmax-fp32-scalar-lrintf.c",
@@ -67739,10 +67829,14 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -      }
 -    }
 -  }
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
++# This is a target that cannot depend on //base.
++if (build_with_internal_optimization_guide) {
++  source_set("qu8-igemm_arch=armv8.2-a+fp16+dotprod_standalone") {
++    cflags = [
++      "-march=armv8.2-a+fp16+dotprod"
++    ]
++  
++  asmflags = cflags
  
 -  if (build_with_chromium) {
 -    source_set("qs8-qc8w-igemm_avx-no-avx2-no-f16c-no-fma") {
@@ -67770,18 +67864,21 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -        "//third_party/fxdiv",
 -        "//third_party/pthreadpool",
 -      ]
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool",
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/qu8-igemm/gen/qu8-igemm-4x16-minmax-rndnu-asm-aarch64-neon-mlal-lane-cortex-a53-prfm.S",
++    "src/src/qu8-igemm/gen/qu8-igemm-4x16-minmax-rndnu-asm-aarch64-neon-mlal-lane-cortex-a75-prfm.S",
++    "src/src/qu8-igemm/gen/qu8-igemm-4x16-minmax-rndnu-asm-aarch64-neon-mlal-lane-cortex-a75.S",
++    "src/src/qu8-igemm/gen/qu8-igemm-4x16-minmax-rndnu16-asm-aarch64-neon-mlal-lane-cortex-a53-prfm.S"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
 -    }
-+    public_configs = [ ":xnnpack_public_config" ]
-   }
-+}
+-  }
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
@@ -67818,22 +67915,11 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -      }
 -    }
 -  }
-+# This is a target that cannot depend on //base.
-+if (build_with_internal_optimization_guide) {
-+  source_set("qu8-igemm_arm64_standalone") {
-+    cflags = [
-+  
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/qu8-igemm/gen/qu8-igemm-1x16-minmax-rndnu-neon-mlal-lane.c",
-+    "src/src/qu8-igemm/gen/qu8-igemm-1x16-minmax-rndnu16-neon-mlal-lane.c",
-+    "src/src/qu8-igemm/gen/qu8-igemm-1x4-minmax-fp32-scalar-lrintf.c",
-+    "src/src/qu8-igemm/gen/qu8-igemm-1x8-minmax-rndnu-neon-mlal-lane.c",
-+    "src/src/qu8-igemm/gen/qu8-igemm-3x4-minmax-fp32-scalar-lrintf.c",
-+    "src/src/qu8-igemm/gen/qu8-igemm-3x8-minmax-rndnu-neon-mlal-lane.c",
-+    "src/src/qu8-igemm/gen/qu8-igemm-4x16-minmax-rndnu-neon-mlal-lane.c"
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
  
 -  if (build_with_chromium) {
@@ -67863,20 +67949,14 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -        "//third_party/fxdiv",
 -        "//third_party/pthreadpool",
 -      ]
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
++    public_configs = [ ":xnnpack_public_config" ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
--    }
--  }
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool:pthreadpool_standalone",
-+    ]
++    if (!(is_android && use_order_profiling)) {
++      assert_no_deps = [ "//base" ]
+     }
+   }
++}
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
@@ -67912,13 +67992,24 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -      if (!(is_android && use_order_profiling)) {
 -        assert_no_deps = [ "//base" ]
 -      }
-+    public_configs = [ ":xnnpack_public_config" ]
-+
-+    if (!(is_android && use_order_profiling)) {
-+      assert_no_deps = [ "//base" ]
-     }
-   }
-+}
+-    }
+-  }
++if (build_with_chromium) {
++  source_set("qu8-igemm_arm64") {
++    cflags = [
++  
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/qu8-igemm/gen/qu8-igemm-1x16-minmax-rndnu-neon-mlal-lane.c",
++    "src/src/qu8-igemm/gen/qu8-igemm-1x16-minmax-rndnu16-neon-mlal-lane.c",
++    "src/src/qu8-igemm/gen/qu8-igemm-1x4-minmax-fp32-scalar-lrintf.c",
++    "src/src/qu8-igemm/gen/qu8-igemm-1x8-minmax-rndnu-neon-mlal-lane.c",
++    "src/src/qu8-igemm/gen/qu8-igemm-3x4-minmax-fp32-scalar-lrintf.c",
++    "src/src/qu8-igemm/gen/qu8-igemm-3x8-minmax-rndnu-neon-mlal-lane.c",
++    "src/src/qu8-igemm/gen/qu8-igemm-4x16-minmax-rndnu-neon-mlal-lane.c"
++    ]
  
 -  if (build_with_chromium) {
 -    source_set("qs8-qc8w-igemm_avx2-avxvnniint8-f16c-fma-gfni") {
@@ -67947,27 +68038,21 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -        "//third_party/fxdiv",
 -        "//third_party/pthreadpool",
 -      ]
-+if (build_with_chromium) {
-+  source_set("qu8-rdsum_arm64") {
-+    cflags = [
-+  
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/qu8-rdsum/gen/qu8-rdsum-7p7x-neon-u16.c",
-+    "src/src/qu8-rdsum/gen/qu8-rdsum-7p7x-neon-u32.c",
-+    "src/src/qu8-rdsum/gen/qu8-rdsum-scalar.c"
-+    ]
- 
--      public_configs = [ ":xnnpack_public_config" ]
--    }
--  }
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
 +    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 +    configs += [ ":xnnpack_private_config" ]
  
+-      public_configs = [ ":xnnpack_public_config" ]
+-    }
+-  }
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool",
++    ]
+ 
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
 -    source_set("qs8-qc8w-igemm_avx2-avxvnniint8-f16c-fma-gfni_standalone") {
@@ -68003,13 +68088,6 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -        assert_no_deps = [ "//base" ]
 -      }
 -    }
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool",
-+    ]
-+
 +    public_configs = [ ":xnnpack_public_config" ]
    }
 +}
@@ -68041,16 +68119,20 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -      ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qu8-rdsum_arm64_standalone") {
++  source_set("qu8-igemm_arm64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-rdsum/gen/qu8-rdsum-7p7x-neon-u16.c",
-+    "src/src/qu8-rdsum/gen/qu8-rdsum-7p7x-neon-u32.c",
-+    "src/src/qu8-rdsum/gen/qu8-rdsum-scalar.c"
++      "src/src/qu8-igemm/gen/qu8-igemm-1x16-minmax-rndnu-neon-mlal-lane.c",
++    "src/src/qu8-igemm/gen/qu8-igemm-1x16-minmax-rndnu16-neon-mlal-lane.c",
++    "src/src/qu8-igemm/gen/qu8-igemm-1x4-minmax-fp32-scalar-lrintf.c",
++    "src/src/qu8-igemm/gen/qu8-igemm-1x8-minmax-rndnu-neon-mlal-lane.c",
++    "src/src/qu8-igemm/gen/qu8-igemm-3x4-minmax-fp32-scalar-lrintf.c",
++    "src/src/qu8-igemm/gen/qu8-igemm-3x8-minmax-rndnu-neon-mlal-lane.c",
++    "src/src/qu8-igemm/gen/qu8-igemm-4x16-minmax-rndnu-neon-mlal-lane.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -68185,15 +68267,16 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("qu8-rsum_arm64") {
++  source_set("qu8-rdsum_arm64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-rsum/gen/qu8-rsum-neon-u32-acc2.c",
-+    "src/src/qu8-rsum/gen/qu8-rsum-scalar-u4.c"
++      "src/src/qu8-rdsum/gen/qu8-rdsum-7p7x-neon-u16.c",
++    "src/src/qu8-rdsum/gen/qu8-rdsum-7p7x-neon-u32.c",
++    "src/src/qu8-rdsum/gen/qu8-rdsum-scalar.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -68321,15 +68404,16 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -      ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qu8-rsum_arm64_standalone") {
++  source_set("qu8-rdsum_arm64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-rsum/gen/qu8-rsum-neon-u32-acc2.c",
-+    "src/src/qu8-rsum/gen/qu8-rsum-scalar-u4.c"
++      "src/src/qu8-rdsum/gen/qu8-rdsum-7p7x-neon-u16.c",
++    "src/src/qu8-rdsum/gen/qu8-rdsum-7p7x-neon-u32.c",
++    "src/src/qu8-rdsum/gen/qu8-rdsum-scalar.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -68457,17 +68541,15 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("qu8-vadd_arm64") {
++  source_set("qu8-rsum_arm64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vadd/gen/qu8-vadd-minmax-neon-ld64-u16.c",
-+    "src/src/qu8-vadd/gen/qu8-vadd-minmax-neon-ld64-u32.c",
-+    "src/src/qu8-vadd/gen/qu8-vadd-minmax-scalar-u1.c",
-+    "src/src/qu8-vadd/gen/qu8-vadd-minmax-scalar-u4.c"
++      "src/src/qu8-rsum/gen/qu8-rsum-neon-u32-acc2.c",
++    "src/src/qu8-rsum/gen/qu8-rsum-scalar-u4.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -68550,17 +68632,15 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qu8-vadd_arm64_standalone") {
++  source_set("qu8-rsum_arm64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vadd/gen/qu8-vadd-minmax-neon-ld64-u16.c",
-+    "src/src/qu8-vadd/gen/qu8-vadd-minmax-neon-ld64-u32.c",
-+    "src/src/qu8-vadd/gen/qu8-vadd-minmax-scalar-u1.c",
-+    "src/src/qu8-vadd/gen/qu8-vadd-minmax-scalar-u4.c"
++      "src/src/qu8-rsum/gen/qu8-rsum-neon-u32-acc2.c",
++    "src/src/qu8-rsum/gen/qu8-rsum-scalar-u4.c"
 +    ]
  
 -      sources = [
@@ -68604,17 +68684,17 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -    source_set("qs8-qc8w-igemm_x64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("qu8-vaddc_arm64") {
++  source_set("qu8-vadd_arm64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vaddc/gen/qu8-vaddc-minmax-neon-ld64-u16.c",
-+    "src/src/qu8-vaddc/gen/qu8-vaddc-minmax-neon-ld64-u32.c",
-+    "src/src/qu8-vaddc/gen/qu8-vaddc-minmax-scalar-u1.c",
-+    "src/src/qu8-vaddc/gen/qu8-vaddc-minmax-scalar-u4.c"
++      "src/src/qu8-vadd/gen/qu8-vadd-minmax-neon-ld64-u16.c",
++    "src/src/qu8-vadd/gen/qu8-vadd-minmax-neon-ld64-u32.c",
++    "src/src/qu8-vadd/gen/qu8-vadd-minmax-scalar-u1.c",
++    "src/src/qu8-vadd/gen/qu8-vadd-minmax-scalar-u4.c"
 +    ]
  
 -      sources = [
@@ -68723,17 +68803,17 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -  }
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qu8-vaddc_arm64_standalone") {
++  source_set("qu8-vadd_arm64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vaddc/gen/qu8-vaddc-minmax-neon-ld64-u16.c",
-+    "src/src/qu8-vaddc/gen/qu8-vaddc-minmax-neon-ld64-u32.c",
-+    "src/src/qu8-vaddc/gen/qu8-vaddc-minmax-scalar-u1.c",
-+    "src/src/qu8-vaddc/gen/qu8-vaddc-minmax-scalar-u4.c"
++      "src/src/qu8-vadd/gen/qu8-vadd-minmax-neon-ld64-u16.c",
++    "src/src/qu8-vadd/gen/qu8-vadd-minmax-neon-ld64-u32.c",
++    "src/src/qu8-vadd/gen/qu8-vadd-minmax-scalar-u1.c",
++    "src/src/qu8-vadd/gen/qu8-vadd-minmax-scalar-u4.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -68835,15 +68915,17 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -        "src/src/qs8-qu8-packw/gen/qs8-qu8-packw-x16c8-gemm-goi-scalar.c",
 -      ]
 +if (build_with_chromium) {
-+  source_set("qu8-vcvt_arm64") {
++  source_set("qu8-vaddc_arm64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vcvt/gen/qu8-vcvt-neon-u32.c",
-+    "src/src/qu8-vcvt/gen/qu8-vcvt-scalar-u4.c"
++      "src/src/qu8-vaddc/gen/qu8-vaddc-minmax-neon-ld64-u16.c",
++    "src/src/qu8-vaddc/gen/qu8-vaddc-minmax-neon-ld64-u32.c",
++    "src/src/qu8-vaddc/gen/qu8-vaddc-minmax-scalar-u1.c",
++    "src/src/qu8-vaddc/gen/qu8-vaddc-minmax-scalar-u4.c"
 +    ]
  
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -68880,15 +68962,17 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qu8-vcvt_arm64_standalone") {
++  source_set("qu8-vaddc_arm64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vcvt/gen/qu8-vcvt-neon-u32.c",
-+    "src/src/qu8-vcvt/gen/qu8-vcvt-scalar-u4.c"
++      "src/src/qu8-vaddc/gen/qu8-vaddc-minmax-neon-ld64-u16.c",
++    "src/src/qu8-vaddc/gen/qu8-vaddc-minmax-neon-ld64-u32.c",
++    "src/src/qu8-vaddc/gen/qu8-vaddc-minmax-scalar-u1.c",
++    "src/src/qu8-vaddc/gen/qu8-vaddc-minmax-scalar-u4.c"
 +    ]
  
 -      sources = [
@@ -69023,15 +69107,15 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("qu8-vlrelu_arm64") {
++  source_set("qu8-vcvt_arm64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vlrelu/gen/qu8-vlrelu-neon-u32.c",
-+    "src/src/qu8-vlrelu/gen/qu8-vlrelu-scalar-andxor-u4.c"
++      "src/src/qu8-vcvt/gen/qu8-vcvt-neon-u32.c",
++    "src/src/qu8-vcvt/gen/qu8-vcvt-scalar-u4.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -69115,15 +69199,15 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -      ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qu8-vlrelu_arm64_standalone") {
++  source_set("qu8-vcvt_arm64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vlrelu/gen/qu8-vlrelu-neon-u32.c",
-+    "src/src/qu8-vlrelu/gen/qu8-vlrelu-scalar-andxor-u4.c"
++      "src/src/qu8-vcvt/gen/qu8-vcvt-neon-u32.c",
++    "src/src/qu8-vcvt/gen/qu8-vcvt-scalar-u4.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -69188,15 +69272,15 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -        "src/src/qs8-rdsum/gen/qs8-rdsum-minmax-fp32-scalar-u1-acc1.c",
 -      ]
 +if (build_with_chromium) {
-+  source_set("qu8-vmul_arm64") {
++  source_set("qu8-vlrelu_arm64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vmul/gen/qu8-vmul-minmax-fp32-scalar-u4.c",
-+    "src/src/qu8-vmul/gen/qu8-vmul-minmax-rndnu-neon-ld64-u16.c"
++      "src/src/qu8-vlrelu/gen/qu8-vlrelu-neon-u32.c",
++    "src/src/qu8-vlrelu/gen/qu8-vlrelu-scalar-andxor-u4.c"
 +    ]
  
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -69233,15 +69317,15 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qu8-vmul_arm64_standalone") {
++  source_set("qu8-vlrelu_arm64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vmul/gen/qu8-vmul-minmax-fp32-scalar-u4.c",
-+    "src/src/qu8-vmul/gen/qu8-vmul-minmax-rndnu-neon-ld64-u16.c"
++      "src/src/qu8-vlrelu/gen/qu8-vlrelu-neon-u32.c",
++    "src/src/qu8-vlrelu/gen/qu8-vlrelu-scalar-andxor-u4.c"
 +    ]
  
 -      sources = [
@@ -69375,15 +69459,15 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("qu8-vmulc_arm64") {
++  source_set("qu8-vmul_arm64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vmulc/gen/qu8-vmulc-minmax-fp32-scalar-u4.c",
-+    "src/src/qu8-vmulc/gen/qu8-vmulc-minmax-rndnu-neon-ld64-u16.c"
++      "src/src/qu8-vmul/gen/qu8-vmul-minmax-fp32-scalar-u4.c",
++    "src/src/qu8-vmul/gen/qu8-vmul-minmax-rndnu-neon-ld64-u16.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -69469,15 +69553,15 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -      ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qu8-vmulc_arm64_standalone") {
++  source_set("qu8-vmul_arm64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vmulc/gen/qu8-vmulc-minmax-fp32-scalar-u4.c",
-+    "src/src/qu8-vmulc/gen/qu8-vmulc-minmax-rndnu-neon-ld64-u16.c"
++      "src/src/qu8-vmul/gen/qu8-vmul-minmax-fp32-scalar-u4.c",
++    "src/src/qu8-vmul/gen/qu8-vmul-minmax-rndnu-neon-ld64-u16.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -69613,14 +69697,15 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("qu8-vprelu_arm64") {
++  source_set("qu8-vmulc_arm64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vprelu/gen/qu8-vprelu-scalar-u8.c"
++      "src/src/qu8-vmulc/gen/qu8-vmulc-minmax-fp32-scalar-u4.c",
++    "src/src/qu8-vmulc/gen/qu8-vmulc-minmax-rndnu-neon-ld64-u16.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -69701,14 +69786,15 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qu8-vprelu_arm64_standalone") {
++  source_set("qu8-vmulc_arm64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vprelu/gen/qu8-vprelu-scalar-u8.c"
++      "src/src/qu8-vmulc/gen/qu8-vmulc-minmax-fp32-scalar-u4.c",
++    "src/src/qu8-vmulc/gen/qu8-vmulc-minmax-rndnu-neon-ld64-u16.c"
 +    ]
  
 -      sources = [
@@ -69776,14 +69862,14 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("qu8-vpreluc_arm64") {
++  source_set("qu8-vprelu_arm64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vpreluc/gen/qu8-vpreluc-scalar-u8.c"
++      "src/src/qu8-vprelu/gen/qu8-vprelu-scalar-u8.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -69889,14 +69975,14 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -      ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qu8-vpreluc_arm64_standalone") {
++  source_set("qu8-vprelu_arm64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vpreluc/gen/qu8-vpreluc-scalar-u8.c"
++      "src/src/qu8-vprelu/gen/qu8-vprelu-scalar-u8.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -70024,14 +70110,14 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("qu8-vrpreluc_arm64") {
++  source_set("qu8-vpreluc_arm64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vrpreluc/gen/qu8-vrpreluc-scalar-u8.c"
++      "src/src/qu8-vpreluc/gen/qu8-vpreluc-scalar-u8.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -70132,14 +70218,14 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -      ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qu8-vrpreluc_arm64_standalone") {
++  source_set("qu8-vpreluc_arm64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vrpreluc/gen/qu8-vrpreluc-scalar-u8.c"
++      "src/src/qu8-vpreluc/gen/qu8-vpreluc-scalar-u8.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -70205,16 +70291,14 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -        "src/src/qs8-vadd/gen/qs8-vadd-minmax-scalar-u4.c",
 -      ]
 +if (build_with_chromium) {
-+  source_set("reference_arm64") {
++  source_set("qu8-vrpreluc_arm64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/reference/binary-elementwise.cc",
-+    "src/src/reference/packing.cc",
-+    "src/src/reference/unary-elementwise.cc"
++      "src/src/qu8-vrpreluc/gen/qu8-vrpreluc-scalar-u8.c"
 +    ]
  
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -70251,16 +70335,14 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("reference_arm64_standalone") {
++  source_set("qu8-vrpreluc_arm64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/reference/binary-elementwise.cc",
-+    "src/src/reference/packing.cc",
-+    "src/src/reference/unary-elementwise.cc"
++      "src/src/qu8-vrpreluc/gen/qu8-vrpreluc-scalar-u8.c"
 +    ]
  
 -      sources = [
@@ -70393,16 +70475,16 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("s8-ibilinear_arm64") {
++  source_set("reference_arm64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/s8-ibilinear/gen/s8-ibilinear-neon-u16.c",
-+    "src/src/s8-ibilinear/gen/s8-ibilinear-neon-u8.c",
-+    "src/src/s8-ibilinear/gen/s8-ibilinear-scalar-u1.c"
++      "src/src/reference/binary-elementwise.cc",
++    "src/src/reference/packing.cc",
++    "src/src/reference/unary-elementwise.cc"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -70487,16 +70569,16 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -      ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("s8-ibilinear_arm64_standalone") {
++  source_set("reference_arm64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/s8-ibilinear/gen/s8-ibilinear-neon-u16.c",
-+    "src/src/s8-ibilinear/gen/s8-ibilinear-neon-u8.c",
-+    "src/src/s8-ibilinear/gen/s8-ibilinear-scalar-u1.c"
++      "src/src/reference/binary-elementwise.cc",
++    "src/src/reference/packing.cc",
++    "src/src/reference/unary-elementwise.cc"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -70617,15 +70699,16 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("s8-maxpool_arm64") {
++  source_set("s8-ibilinear_arm64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/s8-maxpool/gen/s8-maxpool-9p-minmax-neon-u16.c",
-+    "src/src/s8-maxpool/gen/s8-maxpool-9p-minmax-scalar-u1.c"
++      "src/src/s8-ibilinear/gen/s8-ibilinear-neon-u16.c",
++    "src/src/s8-ibilinear/gen/s8-ibilinear-neon-u8.c",
++    "src/src/s8-ibilinear/gen/s8-ibilinear-scalar-u1.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -70706,15 +70789,16 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("s8-maxpool_arm64_standalone") {
++  source_set("s8-ibilinear_arm64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/s8-maxpool/gen/s8-maxpool-9p-minmax-neon-u16.c",
-+    "src/src/s8-maxpool/gen/s8-maxpool-9p-minmax-scalar-u1.c"
++      "src/src/s8-ibilinear/gen/s8-ibilinear-neon-u16.c",
++    "src/src/s8-ibilinear/gen/s8-ibilinear-neon-u8.c",
++    "src/src/s8-ibilinear/gen/s8-ibilinear-scalar-u1.c"
 +    ]
  
 -      sources = [
@@ -70784,17 +70868,15 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("s8-rdminmax_arm64") {
++  source_set("s8-maxpool_arm64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/s8-rdminmax/gen/s8-rdmax-2p2x-neon-u32.c",
-+    "src/src/s8-rdminmax/gen/s8-rdmax-2p2x-scalar-u2.c",
-+    "src/src/s8-rdminmax/gen/s8-rdmin-2p2x-neon-u32.c",
-+    "src/src/s8-rdminmax/gen/s8-rdmin-2p2x-scalar-u2.c"
++      "src/src/s8-maxpool/gen/s8-maxpool-9p-minmax-neon-u16.c",
++    "src/src/s8-maxpool/gen/s8-maxpool-9p-minmax-scalar-u1.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -70900,17 +70982,15 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -      ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("s8-rdminmax_arm64_standalone") {
++  source_set("s8-maxpool_arm64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/s8-rdminmax/gen/s8-rdmax-2p2x-neon-u32.c",
-+    "src/src/s8-rdminmax/gen/s8-rdmax-2p2x-scalar-u2.c",
-+    "src/src/s8-rdminmax/gen/s8-rdmin-2p2x-neon-u32.c",
-+    "src/src/s8-rdminmax/gen/s8-rdmin-2p2x-scalar-u2.c"
++      "src/src/s8-maxpool/gen/s8-maxpool-9p-minmax-neon-u16.c",
++    "src/src/s8-maxpool/gen/s8-maxpool-9p-minmax-scalar-u1.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -71026,19 +71106,17 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("s8-rminmax_arm64") {
++  source_set("s8-rdminmax_arm64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/s8-rminmax/gen/s8-rmax-neon-u32-acc2.c",
-+    "src/src/s8-rminmax/gen/s8-rmax-scalar-u2-acc2.c",
-+    "src/src/s8-rminmax/gen/s8-rmin-neon-u32-acc2.c",
-+    "src/src/s8-rminmax/gen/s8-rmin-scalar-u2-acc2.c",
-+    "src/src/s8-rminmax/gen/s8-rminmax-neon-u32-acc2.c",
-+    "src/src/s8-rminmax/gen/s8-rminmax-scalar-u2-acc2.c"
++      "src/src/s8-rdminmax/gen/s8-rdmax-2p2x-neon-u32.c",
++    "src/src/s8-rdminmax/gen/s8-rdmax-2p2x-scalar-u2.c",
++    "src/src/s8-rdminmax/gen/s8-rdmin-2p2x-neon-u32.c",
++    "src/src/s8-rdminmax/gen/s8-rdmin-2p2x-scalar-u2.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -71139,19 +71217,17 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -      ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("s8-rminmax_arm64_standalone") {
++  source_set("s8-rdminmax_arm64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/s8-rminmax/gen/s8-rmax-neon-u32-acc2.c",
-+    "src/src/s8-rminmax/gen/s8-rmax-scalar-u2-acc2.c",
-+    "src/src/s8-rminmax/gen/s8-rmin-neon-u32-acc2.c",
-+    "src/src/s8-rminmax/gen/s8-rmin-scalar-u2-acc2.c",
-+    "src/src/s8-rminmax/gen/s8-rminmax-neon-u32-acc2.c",
-+    "src/src/s8-rminmax/gen/s8-rminmax-scalar-u2-acc2.c"
++      "src/src/s8-rdminmax/gen/s8-rdmax-2p2x-neon-u32.c",
++    "src/src/s8-rdminmax/gen/s8-rdmax-2p2x-scalar-u2.c",
++    "src/src/s8-rdminmax/gen/s8-rdmin-2p2x-neon-u32.c",
++    "src/src/s8-rdminmax/gen/s8-rdmin-2p2x-scalar-u2.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -71216,15 +71292,19 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -        "src/src/qs8-vcvt/gen/qs8-vcvt-scalar-u4.c",
 -      ]
 +if (build_with_chromium) {
-+  source_set("s8-vclamp_arm64") {
++  source_set("s8-rminmax_arm64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/s8-vclamp/s8-vclamp-neon-u64.c",
-+    "src/src/s8-vclamp/s8-vclamp-scalar-u4.c"
++      "src/src/s8-rminmax/gen/s8-rmax-neon-u32-acc2.c",
++    "src/src/s8-rminmax/gen/s8-rmax-scalar-u2-acc2.c",
++    "src/src/s8-rminmax/gen/s8-rmin-neon-u32-acc2.c",
++    "src/src/s8-rminmax/gen/s8-rmin-scalar-u2-acc2.c",
++    "src/src/s8-rminmax/gen/s8-rminmax-neon-u32-acc2.c",
++    "src/src/s8-rminmax/gen/s8-rminmax-scalar-u2-acc2.c"
 +    ]
  
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -71261,15 +71341,19 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("s8-vclamp_arm64_standalone") {
++  source_set("s8-rminmax_arm64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/s8-vclamp/s8-vclamp-neon-u64.c",
-+    "src/src/s8-vclamp/s8-vclamp-scalar-u4.c"
++      "src/src/s8-rminmax/gen/s8-rmax-neon-u32-acc2.c",
++    "src/src/s8-rminmax/gen/s8-rmax-scalar-u2-acc2.c",
++    "src/src/s8-rminmax/gen/s8-rmin-neon-u32-acc2.c",
++    "src/src/s8-rminmax/gen/s8-rmin-scalar-u2-acc2.c",
++    "src/src/s8-rminmax/gen/s8-rminmax-neon-u32-acc2.c",
++    "src/src/s8-rminmax/gen/s8-rminmax-scalar-u2-acc2.c"
 +    ]
  
 -      sources = [
@@ -71401,42 +71485,15 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("subgraph_arm64") {
++  source_set("s8-vclamp_arm64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/subgraph/argmax-pooling-2d.c",
-+    "src/src/subgraph/average-pooling-2d.c",
-+    "src/src/subgraph/batch-matrix-multiply.c",
-+    "src/src/subgraph/binary.c",
-+    "src/src/subgraph/concatenate.c",
-+    "src/src/subgraph/convolution-2d.c",
-+    "src/src/subgraph/copy.c",
-+    "src/src/subgraph/deconvolution-2d.c",
-+    "src/src/subgraph/deprecated.c",
-+    "src/src/subgraph/depth-to-space-2d.c",
-+    "src/src/subgraph/depthwise-convolution-2d.c",
-+    "src/src/subgraph/even-split.c",
-+    "src/src/subgraph/fully-connected-sparse.c",
-+    "src/src/subgraph/fully-connected.c",
-+    "src/src/subgraph/max-pooling-2d.c",
-+    "src/src/subgraph/pack-lh.c",
-+    "src/src/subgraph/reshape-helpers.c",
-+    "src/src/subgraph/rope.c",
-+    "src/src/subgraph/softmax.c",
-+    "src/src/subgraph/space-to-depth-2d.c",
-+    "src/src/subgraph/static-constant-pad.c",
-+    "src/src/subgraph/static-reduce.c",
-+    "src/src/subgraph/static-resize-bilinear-2d.c",
-+    "src/src/subgraph/static-slice.c",
-+    "src/src/subgraph/static-transpose.c",
-+    "src/src/subgraph/subgraph-utils.c",
-+    "src/src/subgraph/unary.c",
-+    "src/src/subgraph/unpooling-2d.c",
-+    "src/src/subgraph/validation.c"
++      "src/src/s8-vclamp/s8-vclamp-neon-u64.c",
++    "src/src/s8-vclamp/s8-vclamp-scalar-u4.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -71515,42 +71572,15 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -      ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("subgraph_arm64_standalone") {
++  source_set("s8-vclamp_arm64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/subgraph/argmax-pooling-2d.c",
-+    "src/src/subgraph/average-pooling-2d.c",
-+    "src/src/subgraph/batch-matrix-multiply.c",
-+    "src/src/subgraph/binary.c",
-+    "src/src/subgraph/concatenate.c",
-+    "src/src/subgraph/convolution-2d.c",
-+    "src/src/subgraph/copy.c",
-+    "src/src/subgraph/deconvolution-2d.c",
-+    "src/src/subgraph/deprecated.c",
-+    "src/src/subgraph/depth-to-space-2d.c",
-+    "src/src/subgraph/depthwise-convolution-2d.c",
-+    "src/src/subgraph/even-split.c",
-+    "src/src/subgraph/fully-connected-sparse.c",
-+    "src/src/subgraph/fully-connected.c",
-+    "src/src/subgraph/max-pooling-2d.c",
-+    "src/src/subgraph/pack-lh.c",
-+    "src/src/subgraph/reshape-helpers.c",
-+    "src/src/subgraph/rope.c",
-+    "src/src/subgraph/softmax.c",
-+    "src/src/subgraph/space-to-depth-2d.c",
-+    "src/src/subgraph/static-constant-pad.c",
-+    "src/src/subgraph/static-reduce.c",
-+    "src/src/subgraph/static-resize-bilinear-2d.c",
-+    "src/src/subgraph/static-slice.c",
-+    "src/src/subgraph/static-transpose.c",
-+    "src/src/subgraph/subgraph-utils.c",
-+    "src/src/subgraph/unary.c",
-+    "src/src/subgraph/unpooling-2d.c",
-+    "src/src/subgraph/validation.c"
++      "src/src/s8-vclamp/s8-vclamp-neon-u64.c",
++    "src/src/s8-vclamp/s8-vclamp-scalar-u4.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -71665,22 +71695,42 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("tables_arm64") {
++  source_set("subgraph_arm64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/tables/exp2-k-over-2048.c",
-+    "src/src/tables/exp2-k-over-64.c",
-+    "src/src/tables/exp2minus-k-over-16.c",
-+    "src/src/tables/exp2minus-k-over-2048.c",
-+    "src/src/tables/exp2minus-k-over-32.c",
-+    "src/src/tables/exp2minus-k-over-4.c",
-+    "src/src/tables/exp2minus-k-over-64.c",
-+    "src/src/tables/exp2minus-k-over-8.c",
-+    "src/src/tables/vlog.c"
++      "src/src/subgraph/argmax-pooling-2d.c",
++    "src/src/subgraph/average-pooling-2d.c",
++    "src/src/subgraph/batch-matrix-multiply.c",
++    "src/src/subgraph/binary.c",
++    "src/src/subgraph/concatenate.c",
++    "src/src/subgraph/convolution-2d.c",
++    "src/src/subgraph/copy.c",
++    "src/src/subgraph/deconvolution-2d.c",
++    "src/src/subgraph/deprecated.c",
++    "src/src/subgraph/depth-to-space-2d.c",
++    "src/src/subgraph/depthwise-convolution-2d.c",
++    "src/src/subgraph/even-split.c",
++    "src/src/subgraph/fully-connected-sparse.c",
++    "src/src/subgraph/fully-connected.c",
++    "src/src/subgraph/max-pooling-2d.c",
++    "src/src/subgraph/pack-lh.c",
++    "src/src/subgraph/reshape-helpers.c",
++    "src/src/subgraph/rope.c",
++    "src/src/subgraph/softmax.c",
++    "src/src/subgraph/space-to-depth-2d.c",
++    "src/src/subgraph/static-constant-pad.c",
++    "src/src/subgraph/static-reduce.c",
++    "src/src/subgraph/static-resize-bilinear-2d.c",
++    "src/src/subgraph/static-slice.c",
++    "src/src/subgraph/static-transpose.c",
++    "src/src/subgraph/subgraph-utils.c",
++    "src/src/subgraph/unary.c",
++    "src/src/subgraph/unpooling-2d.c",
++    "src/src/subgraph/validation.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -71761,22 +71811,42 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("tables_arm64_standalone") {
++  source_set("subgraph_arm64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/tables/exp2-k-over-2048.c",
-+    "src/src/tables/exp2-k-over-64.c",
-+    "src/src/tables/exp2minus-k-over-16.c",
-+    "src/src/tables/exp2minus-k-over-2048.c",
-+    "src/src/tables/exp2minus-k-over-32.c",
-+    "src/src/tables/exp2minus-k-over-4.c",
-+    "src/src/tables/exp2minus-k-over-64.c",
-+    "src/src/tables/exp2minus-k-over-8.c",
-+    "src/src/tables/vlog.c"
++      "src/src/subgraph/argmax-pooling-2d.c",
++    "src/src/subgraph/average-pooling-2d.c",
++    "src/src/subgraph/batch-matrix-multiply.c",
++    "src/src/subgraph/binary.c",
++    "src/src/subgraph/concatenate.c",
++    "src/src/subgraph/convolution-2d.c",
++    "src/src/subgraph/copy.c",
++    "src/src/subgraph/deconvolution-2d.c",
++    "src/src/subgraph/deprecated.c",
++    "src/src/subgraph/depth-to-space-2d.c",
++    "src/src/subgraph/depthwise-convolution-2d.c",
++    "src/src/subgraph/even-split.c",
++    "src/src/subgraph/fully-connected-sparse.c",
++    "src/src/subgraph/fully-connected.c",
++    "src/src/subgraph/max-pooling-2d.c",
++    "src/src/subgraph/pack-lh.c",
++    "src/src/subgraph/reshape-helpers.c",
++    "src/src/subgraph/rope.c",
++    "src/src/subgraph/softmax.c",
++    "src/src/subgraph/space-to-depth-2d.c",
++    "src/src/subgraph/static-constant-pad.c",
++    "src/src/subgraph/static-reduce.c",
++    "src/src/subgraph/static-resize-bilinear-2d.c",
++    "src/src/subgraph/static-slice.c",
++    "src/src/subgraph/static-transpose.c",
++    "src/src/subgraph/subgraph-utils.c",
++    "src/src/subgraph/unary.c",
++    "src/src/subgraph/unpooling-2d.c",
++    "src/src/subgraph/validation.c"
 +    ]
  
 -      sources = [
@@ -71819,16 +71889,22 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -    source_set("qs8-vlrelu_x64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("u8-ibilinear_arm64") {
++  source_set("tables_arm64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/u8-ibilinear/gen/u8-ibilinear-neon-u16.c",
-+    "src/src/u8-ibilinear/gen/u8-ibilinear-neon-u8.c",
-+    "src/src/u8-ibilinear/gen/u8-ibilinear-scalar-u1.c"
++      "src/src/tables/exp2-k-over-2048.c",
++    "src/src/tables/exp2-k-over-64.c",
++    "src/src/tables/exp2minus-k-over-16.c",
++    "src/src/tables/exp2minus-k-over-2048.c",
++    "src/src/tables/exp2minus-k-over-32.c",
++    "src/src/tables/exp2minus-k-over-4.c",
++    "src/src/tables/exp2minus-k-over-64.c",
++    "src/src/tables/exp2minus-k-over-8.c",
++    "src/src/tables/vlog.c"
 +    ]
  
 -      sources = [
@@ -71934,16 +72010,22 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -  }
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("u8-ibilinear_arm64_standalone") {
++  source_set("tables_arm64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/u8-ibilinear/gen/u8-ibilinear-neon-u16.c",
-+    "src/src/u8-ibilinear/gen/u8-ibilinear-neon-u8.c",
-+    "src/src/u8-ibilinear/gen/u8-ibilinear-scalar-u1.c"
++      "src/src/tables/exp2-k-over-2048.c",
++    "src/src/tables/exp2-k-over-64.c",
++    "src/src/tables/exp2minus-k-over-16.c",
++    "src/src/tables/exp2minus-k-over-2048.c",
++    "src/src/tables/exp2minus-k-over-32.c",
++    "src/src/tables/exp2minus-k-over-4.c",
++    "src/src/tables/exp2minus-k-over-64.c",
++    "src/src/tables/exp2minus-k-over-8.c",
++    "src/src/tables/vlog.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -72046,14 +72128,16 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("u8-lut32norm_arm64") {
++  source_set("u8-ibilinear_arm64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/u8-lut32norm/u8-lut32norm-scalar.c"
++      "src/src/u8-ibilinear/gen/u8-ibilinear-neon-u16.c",
++    "src/src/u8-ibilinear/gen/u8-ibilinear-neon-u8.c",
++    "src/src/u8-ibilinear/gen/u8-ibilinear-scalar-u1.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -72111,14 +72195,16 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("u8-lut32norm_arm64_standalone") {
++  source_set("u8-ibilinear_arm64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/u8-lut32norm/u8-lut32norm-scalar.c"
++      "src/src/u8-ibilinear/gen/u8-ibilinear-neon-u16.c",
++    "src/src/u8-ibilinear/gen/u8-ibilinear-neon-u8.c",
++    "src/src/u8-ibilinear/gen/u8-ibilinear-scalar-u1.c"
 +    ]
  
 -      sources = [
@@ -72161,15 +72247,14 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -    source_set("qs8-vmul_x64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("u8-maxpool_arm64") {
++  source_set("u8-lut32norm_arm64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/u8-maxpool/gen/u8-maxpool-9p-minmax-neon-u16.c",
-+    "src/src/u8-maxpool/gen/u8-maxpool-9p-minmax-scalar-u1.c"
++      "src/src/u8-lut32norm/u8-lut32norm-scalar.c"
 +    ]
  
 -      sources = [
@@ -72275,15 +72360,14 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -  }
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("u8-maxpool_arm64_standalone") {
++  source_set("u8-lut32norm_arm64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/u8-maxpool/gen/u8-maxpool-9p-minmax-neon-u16.c",
-+    "src/src/u8-maxpool/gen/u8-maxpool-9p-minmax-scalar-u1.c"
++      "src/src/u8-lut32norm/u8-lut32norm-scalar.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -72386,17 +72470,15 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("u8-rdminmax_arm64") {
++  source_set("u8-maxpool_arm64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/u8-rdminmax/gen/u8-rdmax-2p2x-neon-u32.c",
-+    "src/src/u8-rdminmax/gen/u8-rdmax-2p2x-scalar-u2.c",
-+    "src/src/u8-rdminmax/gen/u8-rdmin-2p2x-neon-u32.c",
-+    "src/src/u8-rdminmax/gen/u8-rdmin-2p2x-scalar-u2.c"
++      "src/src/u8-maxpool/gen/u8-maxpool-9p-minmax-neon-u16.c",
++    "src/src/u8-maxpool/gen/u8-maxpool-9p-minmax-scalar-u1.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -72454,17 +72536,15 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("u8-rdminmax_arm64_standalone") {
++  source_set("u8-maxpool_arm64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/u8-rdminmax/gen/u8-rdmax-2p2x-neon-u32.c",
-+    "src/src/u8-rdminmax/gen/u8-rdmax-2p2x-scalar-u2.c",
-+    "src/src/u8-rdminmax/gen/u8-rdmin-2p2x-neon-u32.c",
-+    "src/src/u8-rdminmax/gen/u8-rdmin-2p2x-scalar-u2.c"
++      "src/src/u8-maxpool/gen/u8-maxpool-9p-minmax-neon-u16.c",
++    "src/src/u8-maxpool/gen/u8-maxpool-9p-minmax-scalar-u1.c"
 +    ]
  
 -      sources = [
@@ -72532,19 +72612,17 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("u8-rminmax_arm64") {
++  source_set("u8-rdminmax_arm64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/u8-rminmax/gen/u8-rmax-neon-u32-acc2.c",
-+    "src/src/u8-rminmax/gen/u8-rmax-scalar-u2-acc2.c",
-+    "src/src/u8-rminmax/gen/u8-rmin-neon-u32-acc2.c",
-+    "src/src/u8-rminmax/gen/u8-rmin-scalar-u2-acc2.c",
-+    "src/src/u8-rminmax/gen/u8-rminmax-neon-u32-acc2.c",
-+    "src/src/u8-rminmax/gen/u8-rminmax-scalar-u2-acc2.c"
++      "src/src/u8-rdminmax/gen/u8-rdmax-2p2x-neon-u32.c",
++    "src/src/u8-rdminmax/gen/u8-rdmax-2p2x-scalar-u2.c",
++    "src/src/u8-rdminmax/gen/u8-rdmin-2p2x-neon-u32.c",
++    "src/src/u8-rdminmax/gen/u8-rdmin-2p2x-scalar-u2.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -72627,19 +72705,17 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("u8-rminmax_arm64_standalone") {
++  source_set("u8-rdminmax_arm64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/u8-rminmax/gen/u8-rmax-neon-u32-acc2.c",
-+    "src/src/u8-rminmax/gen/u8-rmax-scalar-u2-acc2.c",
-+    "src/src/u8-rminmax/gen/u8-rmin-neon-u32-acc2.c",
-+    "src/src/u8-rminmax/gen/u8-rmin-scalar-u2-acc2.c",
-+    "src/src/u8-rminmax/gen/u8-rminmax-neon-u32-acc2.c",
-+    "src/src/u8-rminmax/gen/u8-rminmax-scalar-u2-acc2.c"
++      "src/src/u8-rdminmax/gen/u8-rdmax-2p2x-neon-u32.c",
++    "src/src/u8-rdminmax/gen/u8-rdmax-2p2x-scalar-u2.c",
++    "src/src/u8-rdminmax/gen/u8-rdmin-2p2x-neon-u32.c",
++    "src/src/u8-rdminmax/gen/u8-rdmin-2p2x-scalar-u2.c"
 +    ]
  
 -      sources = [
@@ -72707,15 +72783,19 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("u8-vclamp_arm64") {
++  source_set("u8-rminmax_arm64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/u8-vclamp/u8-vclamp-neon-u64.c",
-+    "src/src/u8-vclamp/u8-vclamp-scalar-u4.c"
++      "src/src/u8-rminmax/gen/u8-rmax-neon-u32-acc2.c",
++    "src/src/u8-rminmax/gen/u8-rmax-scalar-u2-acc2.c",
++    "src/src/u8-rminmax/gen/u8-rmin-neon-u32-acc2.c",
++    "src/src/u8-rminmax/gen/u8-rmin-scalar-u2-acc2.c",
++    "src/src/u8-rminmax/gen/u8-rminmax-neon-u32-acc2.c",
++    "src/src/u8-rminmax/gen/u8-rminmax-scalar-u2-acc2.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -72798,15 +72878,19 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("u8-vclamp_arm64_standalone") {
++  source_set("u8-rminmax_arm64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/u8-vclamp/u8-vclamp-neon-u64.c",
-+    "src/src/u8-vclamp/u8-vclamp-scalar-u4.c"
++      "src/src/u8-rminmax/gen/u8-rmax-neon-u32-acc2.c",
++    "src/src/u8-rminmax/gen/u8-rmax-scalar-u2-acc2.c",
++    "src/src/u8-rminmax/gen/u8-rmin-neon-u32-acc2.c",
++    "src/src/u8-rminmax/gen/u8-rmin-scalar-u2-acc2.c",
++    "src/src/u8-rminmax/gen/u8-rminmax-neon-u32-acc2.c",
++    "src/src/u8-rminmax/gen/u8-rminmax-scalar-u2-acc2.c"
 +    ]
  
 -      sources = [
@@ -72874,14 +72958,15 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("x16-pack-lh_arch=armv8.2-a+sve+sve2") {
++  source_set("u8-vclamp_arm64") {
 +    cflags = [
-+      "-march=armv8.2-a+sve+sve2"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x16-pack-lh/x16-packlh-neonsme2.c"
++      "src/src/u8-vclamp/u8-vclamp-neon-u64.c",
++    "src/src/u8-vclamp/u8-vclamp-scalar-u4.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -72964,14 +73049,15 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("x16-pack-lh_arch=armv8.2-a+sve+sve2_standalone") {
++  source_set("u8-vclamp_arm64_standalone") {
 +    cflags = [
-+      "-march=armv8.2-a+sve+sve2"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x16-pack-lh/x16-packlh-neonsme2.c"
++      "src/src/u8-vclamp/u8-vclamp-neon-u64.c",
++    "src/src/u8-vclamp/u8-vclamp-scalar-u4.c"
 +    ]
  
 -      sources = [
@@ -73014,15 +73100,17 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -    source_set("qs8-vrpreluc_x64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("x16-packw_arm64") {
++  source_set("x16-pack-lh_arch=armv8.2-a+sve+sve2") {
 +    cflags = [
-+  
++      "-march=armv8.2-a+sve+sve2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x16-packw/gen/x16-packw-x16-gemm-goi-neon-ld4lane-u8-prfm.c",
-+    "src/src/x16-packw/gen/x16-packw-x8-gemm-goi-neon-ld4lane-u8-prfm.c"
++      "src/src/x16-pack-lh/x16-packlh-igemm-neonsme.c",
++    "src/src/x16-pack-lh/x16-packlh-igemm-neonsme2.c",
++    "src/src/x16-pack-lh/x16-packlh-neonsme.c",
++    "src/src/x16-pack-lh/x16-packlh-neonsme2.c"
 +    ]
  
 -      sources = [
@@ -73130,15 +73218,17 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -  }
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("x16-packw_arm64_standalone") {
++  source_set("x16-pack-lh_arch=armv8.2-a+sve+sve2_standalone") {
 +    cflags = [
-+  
++      "-march=armv8.2-a+sve+sve2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x16-packw/gen/x16-packw-x16-gemm-goi-neon-ld4lane-u8-prfm.c",
-+    "src/src/x16-packw/gen/x16-packw-x8-gemm-goi-neon-ld4lane-u8-prfm.c"
++      "src/src/x16-pack-lh/x16-packlh-igemm-neonsme.c",
++    "src/src/x16-pack-lh/x16-packlh-igemm-neonsme2.c",
++    "src/src/x16-pack-lh/x16-packlh-neonsme.c",
++    "src/src/x16-pack-lh/x16-packlh-neonsme2.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -73252,15 +73342,15 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("x16-transposec_arm64") {
++  source_set("x16-packw_arm64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x16-transposec/gen/x16-transposec-2x4-scalar-int.c",
-+    "src/src/x16-transposec/gen/x16-transposec-8x8-reuse-dec-zip-neon.c"
++      "src/src/x16-packw/gen/x16-packw-x16-gemm-goi-neon-ld4lane-u8-prfm.c",
++    "src/src/x16-packw/gen/x16-packw-x8-gemm-goi-neon-ld4lane-u8-prfm.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -73346,15 +73436,15 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -      ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("x16-transposec_arm64_standalone") {
++  source_set("x16-packw_arm64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x16-transposec/gen/x16-transposec-2x4-scalar-int.c",
-+    "src/src/x16-transposec/gen/x16-transposec-8x8-reuse-dec-zip-neon.c"
++      "src/src/x16-packw/gen/x16-packw-x16-gemm-goi-neon-ld4lane-u8-prfm.c",
++    "src/src/x16-packw/gen/x16-packw-x8-gemm-goi-neon-ld4lane-u8-prfm.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -73472,15 +73562,15 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("x16-x32-packw_arm64") {
++  source_set("x16-transposec_arm64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x16-x32-packw/gen/x16-x32-packw-x32c2-gemm-gio-scalar.c",
-+    "src/src/x16-x32-packw/gen/x16-x32-packw-x32c2-gemm-goi-scalar.c"
++      "src/src/x16-transposec/gen/x16-transposec-2x4-scalar-int.c",
++    "src/src/x16-transposec/gen/x16-transposec-8x8-reuse-dec-zip-neon.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -73529,15 +73619,15 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("x16-x32-packw_arm64_standalone") {
++  source_set("x16-transposec_arm64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x16-x32-packw/gen/x16-x32-packw-x32c2-gemm-gio-scalar.c",
-+    "src/src/x16-x32-packw/gen/x16-x32-packw-x32c2-gemm-goi-scalar.c"
++      "src/src/x16-transposec/gen/x16-transposec-2x4-scalar-int.c",
++    "src/src/x16-transposec/gen/x16-transposec-8x8-reuse-dec-zip-neon.c"
 +    ]
  
 -      sources = [
@@ -73672,16 +73762,15 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("x24-transposec_arm64") {
++  source_set("x16-x32-packw_arm64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x24-transposec/gen/x24-transposec-1x2-scalar.c",
-+    "src/src/x24-transposec/x24-transposec-2x2-neon-tbl64.c",
-+    "src/src/x24-transposec/x24-transposec-4x4-aarch64-neon-tbl128.c"
++      "src/src/x16-x32-packw/gen/x16-x32-packw-x32c2-gemm-gio-scalar.c",
++    "src/src/x16-x32-packw/gen/x16-x32-packw-x32c2-gemm-goi-scalar.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -73766,16 +73855,15 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -      ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("x24-transposec_arm64_standalone") {
++  source_set("x16-x32-packw_arm64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x24-transposec/gen/x24-transposec-1x2-scalar.c",
-+    "src/src/x24-transposec/x24-transposec-2x2-neon-tbl64.c",
-+    "src/src/x24-transposec/x24-transposec-4x4-aarch64-neon-tbl128.c"
++      "src/src/x16-x32-packw/gen/x16-x32-packw-x32c2-gemm-gio-scalar.c",
++    "src/src/x16-x32-packw/gen/x16-x32-packw-x32c2-gemm-goi-scalar.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -73896,14 +73984,16 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("x32-pack-lh_arch=armv8.2-a+sve+sve2") {
++  source_set("x24-transposec_arm64") {
 +    cflags = [
-+      "-march=armv8.2-a+sve+sve2"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x32-pack-lh/x32-packlh-neonsme.c"
++      "src/src/x24-transposec/gen/x24-transposec-1x2-scalar.c",
++    "src/src/x24-transposec/x24-transposec-2x2-neon-tbl64.c",
++    "src/src/x24-transposec/x24-transposec-4x4-aarch64-neon-tbl128.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -73984,14 +74074,16 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("x32-pack-lh_arch=armv8.2-a+sve+sve2_standalone") {
++  source_set("x24-transposec_arm64_standalone") {
 +    cflags = [
-+      "-march=armv8.2-a+sve+sve2"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x32-pack-lh/x32-packlh-neonsme.c"
++      "src/src/x24-transposec/gen/x24-transposec-1x2-scalar.c",
++    "src/src/x24-transposec/x24-transposec-2x2-neon-tbl64.c",
++    "src/src/x24-transposec/x24-transposec-4x4-aarch64-neon-tbl128.c"
 +    ]
  
 -      sources = [
@@ -74059,24 +74151,15 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("x32-packw_arm64") {
++  source_set("x32-pack-lh_arch=armv8.2-a+sve+sve2") {
 +    cflags = [
-+  
++      "-march=armv8.2-a+sve+sve2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x32-packw/gen/x32-packw-gio-neon-u2.c",
-+    "src/src/x32-packw/gen/x32-packw-x16-gemm-goi-neon-ld4lane-u4-prfm.c",
-+    "src/src/x32-packw/gen/x32-packw-x2-gemm-gio-scalar.c",
-+    "src/src/x32-packw/gen/x32-packw-x2-gemm-goi-neon-ld2lane-u2-prfm.c",
-+    "src/src/x32-packw/gen/x32-packw-x2-gemm-goi-scalar-float-u4.c",
-+    "src/src/x32-packw/gen/x32-packw-x32-gemm-goi-scalar-int-u2.c",
-+    "src/src/x32-packw/gen/x32-packw-x4-gemm-gio-scalar.c",
-+    "src/src/x32-packw/gen/x32-packw-x4-gemm-goi-scalar-float-u4.c",
-+    "src/src/x32-packw/gen/x32-packw-x64-gemm-goi-scalar-int-u2.c",
-+    "src/src/x32-packw/gen/x32-packw-x8-gemm-goi-neon-ld4lane-u4-prfm.c",
-+    "src/src/x32-packw/gen/x32-packw-x8s4-gemm-goi-neon-ld4lane-u4-prfm.c"
++      "src/src/x32-pack-lh/x32-packlh-neonsme.c",
++    "src/src/x32-pack-lh/x32-packlh-neonsme2.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -74185,24 +74268,15 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -      ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("x32-packw_arm64_standalone") {
++  source_set("x32-pack-lh_arch=armv8.2-a+sve+sve2_standalone") {
 +    cflags = [
-+  
++      "-march=armv8.2-a+sve+sve2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x32-packw/gen/x32-packw-gio-neon-u2.c",
-+    "src/src/x32-packw/gen/x32-packw-x16-gemm-goi-neon-ld4lane-u4-prfm.c",
-+    "src/src/x32-packw/gen/x32-packw-x2-gemm-gio-scalar.c",
-+    "src/src/x32-packw/gen/x32-packw-x2-gemm-goi-neon-ld2lane-u2-prfm.c",
-+    "src/src/x32-packw/gen/x32-packw-x2-gemm-goi-scalar-float-u4.c",
-+    "src/src/x32-packw/gen/x32-packw-x32-gemm-goi-scalar-int-u2.c",
-+    "src/src/x32-packw/gen/x32-packw-x4-gemm-gio-scalar.c",
-+    "src/src/x32-packw/gen/x32-packw-x4-gemm-goi-scalar-float-u4.c",
-+    "src/src/x32-packw/gen/x32-packw-x64-gemm-goi-scalar-int-u2.c",
-+    "src/src/x32-packw/gen/x32-packw-x8-gemm-goi-neon-ld4lane-u4-prfm.c",
-+    "src/src/x32-packw/gen/x32-packw-x8s4-gemm-goi-neon-ld4lane-u4-prfm.c"
++      "src/src/x32-pack-lh/x32-packlh-neonsme.c",
++    "src/src/x32-pack-lh/x32-packlh-neonsme2.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -74333,16 +74407,24 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("x32-transposec_arm64") {
++  source_set("x32-packw_arm64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x32-transposec/gen/x32-transposec-2x4-scalar-int.c",
-+    "src/src/x32-transposec/gen/x32-transposec-4x4-reuse-dec-zip-neon.c",
-+    "src/src/x32-transposec/x32-transposec-4x4-aarch64-neon-tbl128.c"
++      "src/src/x32-packw/gen/x32-packw-gio-neon-u2.c",
++    "src/src/x32-packw/gen/x32-packw-x16-gemm-goi-neon-ld4lane-u4-prfm.c",
++    "src/src/x32-packw/gen/x32-packw-x2-gemm-gio-scalar.c",
++    "src/src/x32-packw/gen/x32-packw-x2-gemm-goi-neon-ld2lane-u2-prfm.c",
++    "src/src/x32-packw/gen/x32-packw-x2-gemm-goi-scalar-float-u4.c",
++    "src/src/x32-packw/gen/x32-packw-x32-gemm-goi-scalar-int-u2.c",
++    "src/src/x32-packw/gen/x32-packw-x4-gemm-gio-scalar.c",
++    "src/src/x32-packw/gen/x32-packw-x4-gemm-goi-scalar-float-u4.c",
++    "src/src/x32-packw/gen/x32-packw-x64-gemm-goi-scalar-int-u2.c",
++    "src/src/x32-packw/gen/x32-packw-x8-gemm-goi-neon-ld4lane-u4-prfm.c",
++    "src/src/x32-packw/gen/x32-packw-x8s4-gemm-goi-neon-ld4lane-u4-prfm.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -74446,16 +74528,24 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -      ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("x32-transposec_arm64_standalone") {
++  source_set("x32-packw_arm64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x32-transposec/gen/x32-transposec-2x4-scalar-int.c",
-+    "src/src/x32-transposec/gen/x32-transposec-4x4-reuse-dec-zip-neon.c",
-+    "src/src/x32-transposec/x32-transposec-4x4-aarch64-neon-tbl128.c"
++      "src/src/x32-packw/gen/x32-packw-gio-neon-u2.c",
++    "src/src/x32-packw/gen/x32-packw-x16-gemm-goi-neon-ld4lane-u4-prfm.c",
++    "src/src/x32-packw/gen/x32-packw-x2-gemm-gio-scalar.c",
++    "src/src/x32-packw/gen/x32-packw-x2-gemm-goi-neon-ld2lane-u2-prfm.c",
++    "src/src/x32-packw/gen/x32-packw-x2-gemm-goi-scalar-float-u4.c",
++    "src/src/x32-packw/gen/x32-packw-x32-gemm-goi-scalar-int-u2.c",
++    "src/src/x32-packw/gen/x32-packw-x4-gemm-gio-scalar.c",
++    "src/src/x32-packw/gen/x32-packw-x4-gemm-goi-scalar-float-u4.c",
++    "src/src/x32-packw/gen/x32-packw-x64-gemm-goi-scalar-int-u2.c",
++    "src/src/x32-packw/gen/x32-packw-x8-gemm-goi-neon-ld4lane-u4-prfm.c",
++    "src/src/x32-packw/gen/x32-packw-x8s4-gemm-goi-neon-ld4lane-u4-prfm.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -74522,15 +74612,16 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -        "src/src/qu8-gemm/gen/qu8-gemm-3x4-minmax-fp32-scalar-lrintf.c",
 -      ]
 +if (build_with_chromium) {
-+  source_set("x32-unpool_arm64") {
++  source_set("x32-transposec_arm64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x32-unpool/x32-unpool-neon.c",
-+    "src/src/x32-unpool/x32-unpool-scalar.c"
++      "src/src/x32-transposec/gen/x32-transposec-2x4-scalar-int.c",
++    "src/src/x32-transposec/gen/x32-transposec-4x4-reuse-dec-zip-neon.c",
++    "src/src/x32-transposec/x32-transposec-4x4-aarch64-neon-tbl128.c"
 +    ]
  
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -74567,15 +74658,16 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("x32-unpool_arm64_standalone") {
++  source_set("x32-transposec_arm64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x32-unpool/x32-unpool-neon.c",
-+    "src/src/x32-unpool/x32-unpool-scalar.c"
++      "src/src/x32-transposec/gen/x32-transposec-2x4-scalar-int.c",
++    "src/src/x32-transposec/gen/x32-transposec-4x4-reuse-dec-zip-neon.c",
++    "src/src/x32-transposec/x32-transposec-4x4-aarch64-neon-tbl128.c"
 +    ]
  
 -      sources = [
@@ -74711,16 +74803,15 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("x64-transposec_arm64") {
++  source_set("x32-unpool_arm64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x64-transposec/gen/x64-transposec-2x2-multi-dec-zip-neon.c",
-+    "src/src/x64-transposec/gen/x64-transposec-2x2-reuse-dec-zip-neon.c",
-+    "src/src/x64-transposec/gen/x64-transposec-4x2-scalar-int.c"
++      "src/src/x32-unpool/x32-unpool-neon.c",
++    "src/src/x32-unpool/x32-unpool-scalar.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -74807,16 +74898,15 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -      ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("x64-transposec_arm64_standalone") {
++  source_set("x32-unpool_arm64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x64-transposec/gen/x64-transposec-2x2-multi-dec-zip-neon.c",
-+    "src/src/x64-transposec/gen/x64-transposec-2x2-reuse-dec-zip-neon.c",
-+    "src/src/x64-transposec/gen/x64-transposec-4x2-scalar-int.c"
++      "src/src/x32-unpool/x32-unpool-neon.c",
++    "src/src/x32-unpool/x32-unpool-scalar.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -74940,15 +75030,16 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("x8-lut_arm64") {
++  source_set("x64-transposec_arm64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x8-lut/gen/x8-lut-aarch64-neon-tbx128x4-u64.c",
-+    "src/src/x8-lut/gen/x8-lut-scalar-u4.c"
++      "src/src/x64-transposec/gen/x64-transposec-2x2-multi-dec-zip-neon.c",
++    "src/src/x64-transposec/gen/x64-transposec-2x2-reuse-dec-zip-neon.c",
++    "src/src/x64-transposec/gen/x64-transposec-4x2-scalar-int.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -75031,15 +75122,16 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("x8-lut_arm64_standalone") {
++  source_set("x64-transposec_arm64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x8-lut/gen/x8-lut-aarch64-neon-tbx128x4-u64.c",
-+    "src/src/x8-lut/gen/x8-lut-scalar-u4.c"
++      "src/src/x64-transposec/gen/x64-transposec-2x2-multi-dec-zip-neon.c",
++    "src/src/x64-transposec/gen/x64-transposec-2x2-reuse-dec-zip-neon.c",
++    "src/src/x64-transposec/gen/x64-transposec-4x2-scalar-int.c"
 +    ]
  
 -      sources = [
@@ -75109,15 +75201,15 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("x8-pack-lh_arch=armv8.2-a+sve+sve2") {
++  source_set("x8-lut_arm64") {
 +    cflags = [
-+      "-march=armv8.2-a+sve+sve2"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x8-pack-lh/x8-packlh-igemm-neonsme2.c",
-+    "src/src/x8-pack-lh/x8-packlh-neonsme2.c"
++      "src/src/x8-lut/gen/x8-lut-aarch64-neon-tbx128x4-u64.c",
++    "src/src/x8-lut/gen/x8-lut-scalar-u4.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -75198,15 +75290,15 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("x8-pack-lh_arch=armv8.2-a+sve+sve2_standalone") {
++  source_set("x8-lut_arm64_standalone") {
 +    cflags = [
-+      "-march=armv8.2-a+sve+sve2"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x8-pack-lh/x8-packlh-igemm-neonsme2.c",
-+    "src/src/x8-pack-lh/x8-packlh-neonsme2.c"
++      "src/src/x8-lut/gen/x8-lut-aarch64-neon-tbx128x4-u64.c",
++    "src/src/x8-lut/gen/x8-lut-scalar-u4.c"
 +    ]
  
 -      sources = [
@@ -75249,15 +75341,15 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -    source_set("qu8-rdsum_x64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("x8-packq_arm64") {
++  source_set("x8-pack-lh_arch=armv8.2-a+sve+sve2") {
 +    cflags = [
-+  
++      "-march=armv8.2-a+sve+sve2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x8-packq/x8-packq-aarch64-neon-f32qp8-u2.c",
-+    "src/src/x8-packq/x8-packq-scalar-f32qp8-u1.c"
++      "src/src/x8-pack-lh/x8-packlh-igemm-neonsme2.c",
++    "src/src/x8-pack-lh/x8-packlh-neonsme2.c"
 +    ]
  
 -      sources = [
@@ -75361,15 +75453,15 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -  }
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("x8-packq_arm64_standalone") {
++  source_set("x8-pack-lh_arch=armv8.2-a+sve+sve2_standalone") {
 +    cflags = [
-+  
++      "-march=armv8.2-a+sve+sve2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x8-packq/x8-packq-aarch64-neon-f32qp8-u2.c",
-+    "src/src/x8-packq/x8-packq-scalar-f32qp8-u1.c"
++      "src/src/x8-pack-lh/x8-packlh-igemm-neonsme2.c",
++    "src/src/x8-pack-lh/x8-packlh-neonsme2.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -75456,65 +75548,47 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -        "src/include/xnnpack.h",
 -        "src/src/qu8-rsum/gen/qu8-rsum-scalar-u4.c",
 -      ]
-+if (build_with_chromium) {
-+  source_set("x8-packw_arm64") {
-+    cflags = [
-+  
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/x8-packw/gen/x8-packw-x16-gemm-goi-scalar-u2.c",
-+    "src/src/x8-packw/gen/x8-packw-x32-gemm-goi-scalar-u2.c",
-+    "src/src/x8-packw/gen/x8-packw-x4-gemm-goi-scalar-u2.c",
-+    "src/src/x8-packw/gen/x8-packw-x8-gemm-goi-scalar-u2.c"
-+    ]
- 
+-
 -      configs -= [ "//build/config/compiler:chromium_code" ]
 -      configs += [ "//build/config/compiler:no_chromium_code" ]
 -      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 -      configs += [ ":xnnpack_private_config" ]
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
- 
+-
 -      deps = [
 -        "//third_party/cpuinfo",
 -        "//third_party/fp16",
 -        "//third_party/fxdiv",
 -        "//third_party/pthreadpool",
 -      ]
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool",
++if (build_with_chromium) {
++  source_set("x8-packq_arm64") {
++    cflags = [
++  
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/x8-packq/x8-packq-aarch64-neon-f32qp8-u2.c",
++    "src/src/x8-packq/x8-packq-scalar-f32qp8-u1.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
 -    }
-+    public_configs = [ ":xnnpack_public_config" ]
-   }
-+}
+-  }
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
 -    source_set("qu8-rsum_x64_standalone") {
 -      cflags = []
-+# This is a target that cannot depend on //base.
-+if (build_with_internal_optimization_guide) {
-+  source_set("x8-packw_arm64_standalone") {
-+    cflags = [
-+  
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/x8-packw/gen/x8-packw-x16-gemm-goi-scalar-u2.c",
-+    "src/src/x8-packw/gen/x8-packw-x32-gemm-goi-scalar-u2.c",
-+    "src/src/x8-packw/gen/x8-packw-x4-gemm-goi-scalar-u2.c",
-+    "src/src/x8-packw/gen/x8-packw-x8-gemm-goi-scalar-u2.c"
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool",
 +    ]
  
 -      sources = [
@@ -75540,11 +75614,9 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -        assert_no_deps = [ "//base" ]
 -      }
 -    }
--  }
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
++    public_configs = [ ":xnnpack_public_config" ]
+   }
++}
  
 -  if (build_with_chromium) {
 -    source_set("qu8-vadd_avx-no-avx2-no-f16c-no-fma") {
@@ -75571,17 +75643,26 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -        "//third_party/fxdiv",
 -        "//third_party/pthreadpool",
 -      ]
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool:pthreadpool_standalone",
++# This is a target that cannot depend on //base.
++if (build_with_internal_optimization_guide) {
++  source_set("x8-packq_arm64_standalone") {
++    cflags = [
++  
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/x8-packq/x8-packq-aarch64-neon-f32qp8-u2.c",
++    "src/src/x8-packq/x8-packq-scalar-f32qp8-u1.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
 -    }
 -  }
-+    public_configs = [ ":xnnpack_public_config" ]
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
@@ -75615,11 +75696,14 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -      if (!(is_android && use_order_profiling)) {
 -        assert_no_deps = [ "//base" ]
 -      }
-+    if (!(is_android && use_order_profiling)) {
-+      assert_no_deps = [ "//base" ]
-     }
-   }
-+}
+-    }
+-  }
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool:pthreadpool_standalone",
++    ]
  
 -  if (build_with_chromium) {
 -    source_set("qu8-vadd_f16c-fma-avx2") {
@@ -75645,25 +75729,14 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -        "//third_party/fxdiv",
 -        "//third_party/pthreadpool",
 -      ]
-+if (build_with_chromium) {
-+  source_set("x8-transposec_arm64") {
-+    cflags = [
-+  
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/x8-transposec/gen/x8-transposec-16x16-reuse-dec-zip-neon.c",
-+    "src/src/x8-transposec/gen/x8-transposec-2x4-scalar-int.c"
-+    ]
++    public_configs = [ ":xnnpack_public_config" ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
--    }
--  }
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
++    if (!(is_android && use_order_profiling)) {
++      assert_no_deps = [ "//base" ]
+     }
+   }
++}
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
@@ -75697,16 +75770,20 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -        assert_no_deps = [ "//base" ]
 -      }
 -    }
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool",
+-  }
++if (build_with_chromium) {
++  source_set("x8-packw_arm64") {
++    cflags = [
++  
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/x8-packw/gen/x8-packw-x16-gemm-goi-scalar-u2.c",
++    "src/src/x8-packw/gen/x8-packw-x32-gemm-goi-scalar-u2.c",
++    "src/src/x8-packw/gen/x8-packw-x4-gemm-goi-scalar-u2.c",
++    "src/src/x8-packw/gen/x8-packw-x8-gemm-goi-scalar-u2.c"
 +    ]
-+
-+    public_configs = [ ":xnnpack_public_config" ]
-   }
-+}
  
 -  if (build_with_chromium) {
 -    source_set(
@@ -75737,27 +75814,21 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -        "//third_party/fxdiv",
 -        "//third_party/pthreadpool",
 -      ]
-+# This is a target that cannot depend on //base.
-+if (build_with_internal_optimization_guide) {
-+  source_set("x8-transposec_arm64_standalone") {
-+    cflags = [
-+  
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/x8-transposec/gen/x8-transposec-16x16-reuse-dec-zip-neon.c",
-+    "src/src/x8-transposec/gen/x8-transposec-2x4-scalar-int.c"
-+    ]
- 
--      public_configs = [ ":xnnpack_public_config" ]
--    }
--  }
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
 +    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 +    configs += [ ":xnnpack_private_config" ]
  
+-      public_configs = [ ":xnnpack_public_config" ]
+-    }
+-  }
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool",
++    ]
+ 
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
 -    source_set(
@@ -75795,13 +75866,9 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -        assert_no_deps = [ "//base" ]
 -      }
 -    }
--  }
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool:pthreadpool_standalone",
-+    ]
++    public_configs = [ ":xnnpack_public_config" ]
+   }
++}
  
 -  if (build_with_chromium) {
 -    source_set("qu8-vadd_sse2-no-sse3") {
@@ -75826,14 +75893,24 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -        "//third_party/fxdiv",
 -        "//third_party/pthreadpool",
 -      ]
-+    public_configs = [ ":xnnpack_public_config" ]
- 
+-
 -      public_configs = [ ":xnnpack_public_config" ]
-+    if (!(is_android && use_order_profiling)) {
-+      assert_no_deps = [ "//base" ]
-     }
-   }
-+}
+-    }
+-  }
++# This is a target that cannot depend on //base.
++if (build_with_internal_optimization_guide) {
++  source_set("x8-packw_arm64_standalone") {
++    cflags = [
++  
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/x8-packw/gen/x8-packw-x16-gemm-goi-scalar-u2.c",
++    "src/src/x8-packw/gen/x8-packw-x32-gemm-goi-scalar-u2.c",
++    "src/src/x8-packw/gen/x8-packw-x4-gemm-goi-scalar-u2.c",
++    "src/src/x8-packw/gen/x8-packw-x8-gemm-goi-scalar-u2.c"
++    ]
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
@@ -75867,16 +75944,10 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -      }
 -    }
 -  }
-+if (build_with_chromium) {
-+  source_set("xx-copy_arm64") {
-+    cflags = [
-+  
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/xx-copy/xx-copy-scalar-memcpy.c"
-+    ]
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
  
 -  if (build_with_chromium) {
 -    source_set("qu8-vadd_sse4.1-no-sse4.2") {
@@ -75901,21 +75972,18 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -        "//third_party/fxdiv",
 -        "//third_party/pthreadpool",
 -      ]
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
- 
--      public_configs = [ ":xnnpack_public_config" ]
--    }
--  }
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
 +      "//third_party/fxdiv",
-+      "//third_party/pthreadpool",
++      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
  
+-      public_configs = [ ":xnnpack_public_config" ]
+-    }
+-  }
++    public_configs = [ ":xnnpack_public_config" ]
+ 
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
 -    source_set("qu8-vadd_sse4.1-no-sse4.2_standalone") {
@@ -75946,46 +76014,41 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -      if (!(is_android && use_order_profiling)) {
 -        assert_no_deps = [ "//base" ]
 -      }
--    }
-+    public_configs = [ ":xnnpack_public_config" ]
++    if (!(is_android && use_order_profiling)) {
++      assert_no_deps = [ "//base" ]
+     }
    }
 +}
  
 -  if (build_with_chromium) {
 -    source_set("qu8-vadd_x64") {
 -      cflags = []
-+# This is a target that cannot depend on //base.
-+if (build_with_internal_optimization_guide) {
-+  source_set("xx-copy_arm64_standalone") {
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qu8-vadd/gen/qu8-vadd-minmax-scalar-u1.c",
+-        "src/src/qu8-vadd/gen/qu8-vadd-minmax-scalar-u4.c",
+-      ]
++if (build_with_chromium) {
++  source_set("x8-transposec_arm64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/xx-copy/xx-copy-scalar-memcpy.c"
++      "src/src/x8-transposec/gen/x8-transposec-16x16-reuse-dec-zip-neon.c",
++    "src/src/x8-transposec/gen/x8-transposec-2x4-scalar-int.c"
 +    ]
  
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qu8-vadd/gen/qu8-vadd-minmax-scalar-u1.c",
--        "src/src/qu8-vadd/gen/qu8-vadd-minmax-scalar-u4.c",
--      ]
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
- 
 -      configs -= [ "//build/config/compiler:chromium_code" ]
 -      configs += [ "//build/config/compiler:no_chromium_code" ]
 -      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 -      configs += [ ":xnnpack_private_config" ]
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool:pthreadpool_standalone",
-+    ]
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
  
 -      deps = [
 -        "//third_party/cpuinfo",
@@ -75993,12 +76056,16 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -        "//third_party/fxdiv",
 -        "//third_party/pthreadpool",
 -      ]
-+    public_configs = [ ":xnnpack_public_config" ]
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool",
++    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
-+    if (!(is_android && use_order_profiling)) {
-+      assert_no_deps = [ "//base" ]
-     }
+-    }
++    public_configs = [ ":xnnpack_public_config" ]
    }
 +}
  
@@ -76006,16 +76073,17 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -  if (build_with_internal_optimization_guide) {
 -    source_set("qu8-vadd_x64_standalone") {
 -      cflags = []
-+if (build_with_chromium) {
-+  source_set("xx-fill_arm64") {
++# This is a target that cannot depend on //base.
++if (build_with_internal_optimization_guide) {
++  source_set("x8-transposec_arm64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/xx-fill/xx-fill-neon-u64.c",
-+    "src/src/xx-fill/xx-fill-scalar-u16.c"
++      "src/src/x8-transposec/gen/x8-transposec-16x16-reuse-dec-zip-neon.c",
++    "src/src/x8-transposec/gen/x8-transposec-2x4-scalar-int.c"
 +    ]
  
 -      sources = [
@@ -76077,14 +76145,13 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
 +      "//third_party/fxdiv",
-+      "//third_party/pthreadpool",
++      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
 -    }
+-  }
 +    public_configs = [ ":xnnpack_public_config" ]
-   }
-+}
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
@@ -76118,20 +76185,11 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -      if (!(is_android && use_order_profiling)) {
 -        assert_no_deps = [ "//base" ]
 -      }
--    }
--  }
-+# This is a target that cannot depend on //base.
-+if (build_with_internal_optimization_guide) {
-+  source_set("xx-fill_arm64_standalone") {
-+    cflags = [
-+  
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/xx-fill/xx-fill-neon-u64.c",
-+    "src/src/xx-fill/xx-fill-scalar-u16.c"
-+    ]
++    if (!(is_android && use_order_profiling)) {
++      assert_no_deps = [ "//base" ]
+     }
+   }
++}
  
 -  if (build_with_chromium) {
 -    source_set("qu8-vaddc_f16c-fma-avx2") {
@@ -76157,20 +76215,24 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -        "//third_party/fxdiv",
 -        "//third_party/pthreadpool",
 -      ]
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
++if (build_with_chromium) {
++  source_set("xx-copy_arm64") {
++    cflags = [
++  
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/xx-copy/xx-copy-scalar-memcpy.c"
++    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
 -    }
 -  }
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool:pthreadpool_standalone",
-+    ]
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
@@ -76203,11 +76265,15 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -      if (!(is_android && use_order_profiling)) {
 -        assert_no_deps = [ "//base" ]
 -      }
-+    public_configs = [ ":xnnpack_public_config" ]
+-    }
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool",
++    ]
 +
-+    if (!(is_android && use_order_profiling)) {
-+      assert_no_deps = [ "//base" ]
-     }
++    public_configs = [ ":xnnpack_public_config" ]
    }
 +}
  
@@ -76240,16 +76306,16 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -        "//third_party/fxdiv",
 -        "//third_party/pthreadpool",
 -      ]
-+if (build_with_chromium) {
-+  source_set("xx-pad_arm64") {
++# This is a target that cannot depend on //base.
++if (build_with_internal_optimization_guide) {
++  source_set("xx-copy_arm64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/xx-pad/xx-pad-p16-neon-u16.c",
-+    "src/src/xx-pad/xx-pad-p4-scalar-u16.c"
++      "src/src/xx-copy/xx-copy-scalar-memcpy.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -76297,16 +76363,13 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -        assert_no_deps = [ "//base" ]
 -      }
 -    }
+-  }
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
 +      "//third_party/fxdiv",
-+      "//third_party/pthreadpool",
++      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
-+
-+    public_configs = [ ":xnnpack_public_config" ]
-   }
-+}
  
 -  if (build_with_chromium) {
 -    source_set("qu8-vaddc_sse2-no-sse3") {
@@ -76331,26 +76394,14 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -        "//third_party/fxdiv",
 -        "//third_party/pthreadpool",
 -      ]
-+# This is a target that cannot depend on //base.
-+if (build_with_internal_optimization_guide) {
-+  source_set("xx-pad_arm64_standalone") {
-+    cflags = [
-+  
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/xx-pad/xx-pad-p16-neon-u16.c",
-+    "src/src/xx-pad/xx-pad-p4-scalar-u16.c"
-+    ]
++    public_configs = [ ":xnnpack_public_config" ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
--    }
--  }
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
++    if (!(is_android && use_order_profiling)) {
++      assert_no_deps = [ "//base" ]
+     }
+   }
++}
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
@@ -76384,11 +76435,16 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -      }
 -    }
 -  }
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool:pthreadpool_standalone",
++if (build_with_chromium) {
++  source_set("xx-fill_arm64") {
++    cflags = [
++  
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/xx-fill/xx-fill-neon-u64.c",
++    "src/src/xx-fill/xx-fill-scalar-u16.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -76414,14 +76470,20 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -        "//third_party/fxdiv",
 -        "//third_party/pthreadpool",
 -      ]
-+    public_configs = [ ":xnnpack_public_config" ]
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
-+    if (!(is_android && use_order_profiling)) {
-+      assert_no_deps = [ "//base" ]
-     }
-   }
-+}
+-    }
+-  }
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool",
++    ]
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
@@ -76454,29 +76516,6 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -        assert_no_deps = [ "//base" ]
 -      }
 -    }
-+if (build_with_chromium) {
-+  source_set("xx-transposev_arm64") {
-+    cflags = [
-+  
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/xx-transposev/xx-transposev-1x1-scalar-memcpy.c"
-+    ]
-+
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
-+
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool",
-+    ]
-+
 +    public_configs = [ ":xnnpack_public_config" ]
    }
 +}
@@ -76486,14 +76525,15 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("xx-transposev_arm64_standalone") {
++  source_set("xx-fill_arm64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/xx-transposev/xx-transposev-1x1-scalar-memcpy.c"
++      "src/src/xx-fill/xx-fill-neon-u64.c",
++    "src/src/xx-fill/xx-fill-scalar-u16.c"
 +    ]
  
 -      sources = [
@@ -76536,8 +76576,7 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -  if (build_with_internal_optimization_guide) {
 -    source_set("qu8-vaddc_x64_standalone") {
 -      cflags = []
-+}
- 
+-
 -      sources = [
 -        "src/include/xnnpack.h",
 -        "src/src/qu8-vaddc/gen/qu8-vaddc-minmax-scalar-u1.c",
@@ -76563,39 +76602,16 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -      }
 -    }
 -  }
-+if (current_cpu == "riscv64") {
 +if (build_with_chromium) {
-+  source_set("configs_riscv64") {
++  source_set("xx-pad_arm64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/configs/argmaxpool-config.c",
-+    "src/src/configs/avgpool-config.c",
-+    "src/src/configs/binary-elementwise-config.c",
-+    "src/src/configs/cmul-config.c",
-+    "src/src/configs/conv-hwc2chw-config.c",
-+    "src/src/configs/dwconv-config.c",
-+    "src/src/configs/dwconv2d-chw-config.c",
-+    "src/src/configs/gemm-config.c",
-+    "src/src/configs/hardware-config.c",
-+    "src/src/configs/ibilinear-chw-config.c",
-+    "src/src/configs/ibilinear-config.c",
-+    "src/src/configs/lut32norm-config.c",
-+    "src/src/configs/maxpool-config.c",
-+    "src/src/configs/pack-lh-config.c",
-+    "src/src/configs/raddstoreexpminusmax-config.c",
-+    "src/src/configs/reduce-config.c",
-+    "src/src/configs/spmm-config.c",
-+    "src/src/configs/transpose-config.c",
-+    "src/src/configs/unary-elementwise-config.c",
-+    "src/src/configs/unpool-config.c",
-+    "src/src/configs/vmulcaddc-config.c",
-+    "src/src/configs/x8-lut-config.c",
-+    "src/src/configs/xx-fill-config.c",
-+    "src/src/configs/xx-pad-config.c"
++      "src/src/xx-pad/xx-pad-p16-neon-u16.c",
++    "src/src/xx-pad/xx-pad-p4-scalar-u16.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -76701,37 +76717,15 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -      ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("configs_riscv64_standalone") {
++  source_set("xx-pad_arm64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/configs/argmaxpool-config.c",
-+    "src/src/configs/avgpool-config.c",
-+    "src/src/configs/binary-elementwise-config.c",
-+    "src/src/configs/cmul-config.c",
-+    "src/src/configs/conv-hwc2chw-config.c",
-+    "src/src/configs/dwconv-config.c",
-+    "src/src/configs/dwconv2d-chw-config.c",
-+    "src/src/configs/gemm-config.c",
-+    "src/src/configs/hardware-config.c",
-+    "src/src/configs/ibilinear-chw-config.c",
-+    "src/src/configs/ibilinear-config.c",
-+    "src/src/configs/lut32norm-config.c",
-+    "src/src/configs/maxpool-config.c",
-+    "src/src/configs/pack-lh-config.c",
-+    "src/src/configs/raddstoreexpminusmax-config.c",
-+    "src/src/configs/reduce-config.c",
-+    "src/src/configs/spmm-config.c",
-+    "src/src/configs/transpose-config.c",
-+    "src/src/configs/unary-elementwise-config.c",
-+    "src/src/configs/unpool-config.c",
-+    "src/src/configs/vmulcaddc-config.c",
-+    "src/src/configs/x8-lut-config.c",
-+    "src/src/configs/xx-fill-config.c",
-+    "src/src/configs/xx-pad-config.c"
++      "src/src/xx-pad/xx-pad-p16-neon-u16.c",
++    "src/src/xx-pad/xx-pad-p4-scalar-u16.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -76847,18 +76841,14 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("enums_riscv64") {
++  source_set("xx-transposev_arm64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/enums/allocation-type.c",
-+    "src/src/enums/datatype-strings.c",
-+    "src/src/enums/microkernel-type.c",
-+    "src/src/enums/node-type.c",
-+    "src/src/enums/operator-type.c"
++      "src/src/xx-transposev/xx-transposev-1x1-scalar-memcpy.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -76959,18 +76949,14 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -      ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("enums_riscv64_standalone") {
++  source_set("xx-transposev_arm64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/enums/allocation-type.c",
-+    "src/src/enums/datatype-strings.c",
-+    "src/src/enums/microkernel-type.c",
-+    "src/src/enums/node-type.c",
-+    "src/src/enums/operator-type.c"
++      "src/src/xx-transposev/xx-transposev-1x1-scalar-memcpy.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -77029,20 +77015,45 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -  if (build_with_chromium) {
 -    source_set("qu8-vcvt_x64") {
 -      cflags = []
--
++}
+ 
 -      sources = [
 -        "src/include/xnnpack.h",
 -        "src/src/qu8-vcvt/gen/qu8-vcvt-scalar-u4.c",
 -      ]
++if (current_cpu == "riscv64") {
 +if (build_with_chromium) {
-+  source_set("f16-f32-vcvt_riscv64") {
++  source_set("configs_riscv64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-f32-vcvt/gen/f16-f32-vcvt-scalar-u4.c"
++      "src/src/configs/argmaxpool-config.c",
++    "src/src/configs/avgpool-config.c",
++    "src/src/configs/binary-elementwise-config.c",
++    "src/src/configs/cmul-config.c",
++    "src/src/configs/conv-hwc2chw-config.c",
++    "src/src/configs/dwconv-config.c",
++    "src/src/configs/dwconv2d-chw-config.c",
++    "src/src/configs/gemm-config.c",
++    "src/src/configs/hardware-config.c",
++    "src/src/configs/ibilinear-chw-config.c",
++    "src/src/configs/ibilinear-config.c",
++    "src/src/configs/lut32norm-config.c",
++    "src/src/configs/maxpool-config.c",
++    "src/src/configs/pack-lh-config.c",
++    "src/src/configs/raddstoreexpminusmax-config.c",
++    "src/src/configs/reduce-config.c",
++    "src/src/configs/spmm-config.c",
++    "src/src/configs/transpose-config.c",
++    "src/src/configs/unary-elementwise-config.c",
++    "src/src/configs/unpool-config.c",
++    "src/src/configs/vmulcaddc-config.c",
++    "src/src/configs/x8-lut-config.c",
++    "src/src/configs/xx-fill-config.c",
++    "src/src/configs/xx-pad-config.c"
 +    ]
  
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -77079,14 +77090,37 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-f32-vcvt_riscv64_standalone") {
++  source_set("configs_riscv64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-f32-vcvt/gen/f16-f32-vcvt-scalar-u4.c"
++      "src/src/configs/argmaxpool-config.c",
++    "src/src/configs/avgpool-config.c",
++    "src/src/configs/binary-elementwise-config.c",
++    "src/src/configs/cmul-config.c",
++    "src/src/configs/conv-hwc2chw-config.c",
++    "src/src/configs/dwconv-config.c",
++    "src/src/configs/dwconv2d-chw-config.c",
++    "src/src/configs/gemm-config.c",
++    "src/src/configs/hardware-config.c",
++    "src/src/configs/ibilinear-chw-config.c",
++    "src/src/configs/ibilinear-config.c",
++    "src/src/configs/lut32norm-config.c",
++    "src/src/configs/maxpool-config.c",
++    "src/src/configs/pack-lh-config.c",
++    "src/src/configs/raddstoreexpminusmax-config.c",
++    "src/src/configs/reduce-config.c",
++    "src/src/configs/spmm-config.c",
++    "src/src/configs/transpose-config.c",
++    "src/src/configs/unary-elementwise-config.c",
++    "src/src/configs/unpool-config.c",
++    "src/src/configs/vmulcaddc-config.c",
++    "src/src/configs/x8-lut-config.c",
++    "src/src/configs/xx-fill-config.c",
++    "src/src/configs/xx-pad-config.c"
 +    ]
  
 -      sources = [
@@ -77218,14 +77252,18 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f16-qs8-vcvt_riscv64") {
++  source_set("enums_riscv64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-qs8-vcvt/gen/f16-qs8-vcvt-scalar-imagic-u4.c"
++      "src/src/enums/allocation-type.c",
++    "src/src/enums/datatype-strings.c",
++    "src/src/enums/microkernel-type.c",
++    "src/src/enums/node-type.c",
++    "src/src/enums/operator-type.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -77304,14 +77342,18 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -      ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-qs8-vcvt_riscv64_standalone") {
++  source_set("enums_riscv64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-qs8-vcvt/gen/f16-qs8-vcvt-scalar-imagic-u4.c"
++      "src/src/enums/allocation-type.c",
++    "src/src/enums/datatype-strings.c",
++    "src/src/enums/microkernel-type.c",
++    "src/src/enums/node-type.c",
++    "src/src/enums/operator-type.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -77426,14 +77468,14 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f16-qu8-vcvt_riscv64") {
++  source_set("f16-f32-vcvt_riscv64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-qu8-vcvt/gen/f16-qu8-vcvt-scalar-imagic-u4.c"
++      "src/src/f16-f32-vcvt/gen/f16-f32-vcvt-scalar-u4.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -77514,14 +77556,14 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-qu8-vcvt_riscv64_standalone") {
++  source_set("f16-f32-vcvt_riscv64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-qu8-vcvt/gen/f16-qu8-vcvt-scalar-imagic-u4.c"
++      "src/src/f16-f32-vcvt/gen/f16-f32-vcvt-scalar-u4.c"
 +    ]
  
 -      sources = [
@@ -77564,15 +77606,14 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -    source_set("qu8-vlrelu_x64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("f16-rdminmax_riscv64") {
++  source_set("f16-qs8-vcvt_riscv64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-rdminmax/gen/f16-rdmax-2p2x-scalar-u2.c",
-+    "src/src/f16-rdminmax/gen/f16-rdmin-2p2x-scalar-u2.c"
++      "src/src/f16-qs8-vcvt/gen/f16-qs8-vcvt-scalar-imagic-u4.c"
 +    ]
  
 -      sources = [
@@ -77678,15 +77719,14 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -  }
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-rdminmax_riscv64_standalone") {
++  source_set("f16-qs8-vcvt_riscv64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-rdminmax/gen/f16-rdmax-2p2x-scalar-u2.c",
-+    "src/src/f16-rdminmax/gen/f16-rdmin-2p2x-scalar-u2.c"
++      "src/src/f16-qs8-vcvt/gen/f16-qs8-vcvt-scalar-imagic-u4.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -77789,16 +77829,14 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f16-rminmax_riscv64") {
++  source_set("f16-qu8-vcvt_riscv64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-rminmax/gen/f16-rmax-scalar-u2-acc2.c",
-+    "src/src/f16-rminmax/gen/f16-rmin-scalar-u2-acc2.c",
-+    "src/src/f16-rminmax/gen/f16-rminmax-scalar-u2-acc2.c"
++      "src/src/f16-qu8-vcvt/gen/f16-qu8-vcvt-scalar-imagic-u4.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -77856,16 +77894,14 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-rminmax_riscv64_standalone") {
++  source_set("f16-qu8-vcvt_riscv64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-rminmax/gen/f16-rmax-scalar-u2-acc2.c",
-+    "src/src/f16-rminmax/gen/f16-rmin-scalar-u2-acc2.c",
-+    "src/src/f16-rminmax/gen/f16-rminmax-scalar-u2-acc2.c"
++      "src/src/f16-qu8-vcvt/gen/f16-qu8-vcvt-scalar-imagic-u4.c"
 +    ]
  
 -      sources = [
@@ -77908,14 +77944,15 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -    source_set("qu8-vmul_x64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("f16-vapproxgelu_riscv64") {
++  source_set("f16-rdminmax_riscv64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vapproxgelu/gen/f16-vapproxgelu-scalar-rational-6-4-div.c"
++      "src/src/f16-rdminmax/gen/f16-rdmax-2p2x-scalar-u2.c",
++    "src/src/f16-rdminmax/gen/f16-rdmin-2p2x-scalar-u2.c"
 +    ]
  
 -      sources = [
@@ -78021,14 +78058,15 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -  }
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-vapproxgelu_riscv64_standalone") {
++  source_set("f16-rdminmax_riscv64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vapproxgelu/gen/f16-vapproxgelu-scalar-rational-6-4-div.c"
++      "src/src/f16-rdminmax/gen/f16-rdmax-2p2x-scalar-u2.c",
++    "src/src/f16-rdminmax/gen/f16-rdmin-2p2x-scalar-u2.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -78131,14 +78169,16 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f16-vcos_riscv64") {
++  source_set("f16-rminmax_riscv64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vcos/gen/f16-vcos-scalar-rational-3-2-div.c"
++      "src/src/f16-rminmax/gen/f16-rmax-scalar-u2-acc2.c",
++    "src/src/f16-rminmax/gen/f16-rmin-scalar-u2-acc2.c",
++    "src/src/f16-rminmax/gen/f16-rminmax-scalar-u2-acc2.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -78196,14 +78236,16 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-vcos_riscv64_standalone") {
++  source_set("f16-rminmax_riscv64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vcos/gen/f16-vcos-scalar-rational-3-2-div.c"
++      "src/src/f16-rminmax/gen/f16-rmax-scalar-u2-acc2.c",
++    "src/src/f16-rminmax/gen/f16-rmin-scalar-u2-acc2.c",
++    "src/src/f16-rminmax/gen/f16-rminmax-scalar-u2-acc2.c"
 +    ]
  
 -      sources = [
@@ -78271,14 +78313,14 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f16-vexp_riscv64") {
++  source_set("f16-vapproxgelu_riscv64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vexp/gen/f16-vexp-scalar-poly-3.c"
++      "src/src/f16-vapproxgelu/gen/f16-vapproxgelu-scalar-rational-6-4-div.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -78361,14 +78403,14 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-vexp_riscv64_standalone") {
++  source_set("f16-vapproxgelu_riscv64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vexp/gen/f16-vexp-scalar-poly-3.c"
++      "src/src/f16-vapproxgelu/gen/f16-vapproxgelu-scalar-rational-6-4-div.c"
 +    ]
  
 -      sources = [
@@ -78436,14 +78478,14 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f16-vgelu_riscv64") {
++  source_set("f16-vcos_riscv64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vgelu/gen/f16-vgelu-scalar-rational-6-4-div.c"
++      "src/src/f16-vcos/gen/f16-vcos-scalar-rational-3-2-div.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -78526,14 +78568,14 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-vgelu_riscv64_standalone") {
++  source_set("f16-vcos_riscv64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vgelu/gen/f16-vgelu-scalar-rational-6-4-div.c"
++      "src/src/f16-vcos/gen/f16-vcos-scalar-rational-3-2-div.c"
 +    ]
  
 -      sources = [
@@ -78601,14 +78643,14 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f16-vsin_riscv64") {
++  source_set("f16-vexp_riscv64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vsin/gen/f16-vsin-scalar-rational-3-2-div.c"
++      "src/src/f16-vexp/gen/f16-vexp-scalar-poly-3.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -78701,14 +78743,14 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -      configs += [ ":xnnpack_private_config" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-vsin_riscv64_standalone") {
++  source_set("f16-vexp_riscv64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vsin/gen/f16-vsin-scalar-rational-3-2-div.c"
++      "src/src/f16-vexp/gen/f16-vexp-scalar-poly-3.c"
 +    ]
  
 -      deps = [
@@ -78777,15 +78819,14 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -        "src/src/reference/unary-elementwise.cc",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f32-argmaxpool_arch=rv64gcv-abi=lp64d") {
++  source_set("f16-vgelu_riscv64") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-argmaxpool/f32-argmaxpool-9p8x-rvv-u1v.c"
++      "src/src/f16-vgelu/gen/f16-vgelu-scalar-rational-6-4-div.c"
 +    ]
  
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -78822,15 +78863,14 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-argmaxpool_arch=rv64gcv-abi=lp64d_standalone") {
++  source_set("f16-vgelu_riscv64_standalone") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-argmaxpool/f32-argmaxpool-9p8x-rvv-u1v.c"
++      "src/src/f16-vgelu/gen/f16-vgelu-scalar-rational-6-4-div.c"
 +    ]
  
 -      sources = [
@@ -78959,14 +78999,14 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f32-argmaxpool_riscv64") {
++  source_set("f16-vsin_riscv64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-argmaxpool/f32-argmaxpool-9p8x-scalar-c1.c"
++      "src/src/f16-vsin/gen/f16-vsin-scalar-rational-3-2-div.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -79024,14 +79064,14 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-argmaxpool_riscv64_standalone") {
++  source_set("f16-vsin_riscv64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-argmaxpool/f32-argmaxpool-9p8x-scalar-c1.c"
++      "src/src/f16-vsin/gen/f16-vsin-scalar-rational-3-2-div.c"
 +    ]
  
 -      sources = [
@@ -79099,14 +79139,15 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f32-avgpool_riscv64") {
++  source_set("f32-argmaxpool_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-avgpool/gen/f32-avgpool-9p-minmax-scalar-u1.c"
++      "src/src/f32-argmaxpool/f32-argmaxpool-9p8x-rvv-u1v.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -79187,14 +79228,15 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-avgpool_riscv64_standalone") {
++  source_set("f32-argmaxpool_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-avgpool/gen/f32-avgpool-9p-minmax-scalar-u1.c"
++      "src/src/f32-argmaxpool/f32-argmaxpool-9p8x-rvv-u1v.c"
 +    ]
  
 -      sources = [
@@ -79262,15 +79304,14 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f32-conv-hwc2chw_arch=rv64gcv-abi=lp64d") {
++  source_set("f32-argmaxpool_riscv64") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-conv-hwc2chw/f32-conv-hwc2chw-3x3s2p1c3x2v-rvv-2x2.c"
++      "src/src/f32-argmaxpool/f32-argmaxpool-9p8x-scalar-c1.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -79353,15 +79394,14 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-conv-hwc2chw_arch=rv64gcv-abi=lp64d_standalone") {
++  source_set("f32-argmaxpool_riscv64_standalone") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-conv-hwc2chw/f32-conv-hwc2chw-3x3s2p1c3x2v-rvv-2x2.c"
++      "src/src/f32-argmaxpool/f32-argmaxpool-9p8x-scalar-c1.c"
 +    ]
  
 -      sources = [
@@ -79431,14 +79471,14 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f32-conv-hwc2chw_riscv64") {
++  source_set("f32-avgpool_riscv64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-conv-hwc2chw/f32-conv-hwc2chw-3x3s2p1c3x4-scalar-1x1.c"
++      "src/src/f32-avgpool/gen/f32-avgpool-9p-minmax-scalar-u1.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -79523,14 +79563,14 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-conv-hwc2chw_riscv64_standalone") {
++  source_set("f32-avgpool_riscv64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-conv-hwc2chw/f32-conv-hwc2chw-3x3s2p1c3x4-scalar-1x1.c"
++      "src/src/f32-avgpool/gen/f32-avgpool-9p-minmax-scalar-u1.c"
 +    ]
  
 -      sources = [
@@ -79602,7 +79642,7 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f32-dwconv2d-chw_arch=rv64gcv-abi=lp64d") {
++  source_set("f32-conv-hwc2chw_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gcv"
@@ -79610,8 +79650,7 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-3x3p1-minmax-rvv-7x1v.c",
-+    "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-3x3s2p1-minmax-rvv-2x2v.c"
++      "src/src/f32-conv-hwc2chw/f32-conv-hwc2chw-3x3s2p1c3x2v-rvv-2x2.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -79720,7 +79759,7 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -      ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-dwconv2d-chw_arch=rv64gcv-abi=lp64d_standalone") {
++  source_set("f32-conv-hwc2chw_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gcv"
@@ -79728,8 +79767,7 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-3x3p1-minmax-rvv-7x1v.c",
-+    "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-3x3s2p1-minmax-rvv-2x2v.c"
++      "src/src/f32-conv-hwc2chw/f32-conv-hwc2chw-3x3s2p1c3x2v-rvv-2x2.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -79850,21 +79888,14 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f32-dwconv2d-chw_riscv64") {
++  source_set("f32-conv-hwc2chw_riscv64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-3x3p1-minmax-scalar-2x1-acc2.c",
-+    "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-3x3p1-minmax-scalar-4x1.c",
-+    "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-3x3s2p1-minmax-scalar-1x1-acc2.c",
-+    "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-3x3s2p1-minmax-scalar-2x1-acc2.c",
-+    "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-5x5p2-minmax-scalar-1x1-acc5.c",
-+    "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-5x5p2-minmax-scalar-2x1-acc2.c",
-+    "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-5x5s2p2-minmax-scalar-1x1-acc5.c",
-+    "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-5x5s2p2-minmax-scalar-2x1-acc2.c"
++      "src/src/f32-conv-hwc2chw/f32-conv-hwc2chw-3x3s2p1c3x4-scalar-1x1.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -79945,21 +79976,14 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-dwconv2d-chw_riscv64_standalone") {
++  source_set("f32-conv-hwc2chw_riscv64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-3x3p1-minmax-scalar-2x1-acc2.c",
-+    "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-3x3p1-minmax-scalar-4x1.c",
-+    "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-3x3s2p1-minmax-scalar-1x1-acc2.c",
-+    "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-3x3s2p1-minmax-scalar-2x1-acc2.c",
-+    "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-5x5p2-minmax-scalar-1x1-acc5.c",
-+    "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-5x5p2-minmax-scalar-2x1-acc2.c",
-+    "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-5x5s2p2-minmax-scalar-1x1-acc5.c",
-+    "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-5x5s2p2-minmax-scalar-2x1-acc2.c"
++      "src/src/f32-conv-hwc2chw/f32-conv-hwc2chw-3x3s2p1c3x4-scalar-1x1.c"
 +    ]
  
 -      sources = [
@@ -80001,25 +80025,7 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -  if (build_with_internal_optimization_guide) {
 -    source_set("s8-vclamp_x64_standalone") {
 -      cflags = []
-+if (build_with_chromium) {
-+  source_set("f32-dwconv_arch=rv64gcv-abi=lp64d") {
-+    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/f32-dwconv/gen/f32-dwconv-25p8vc-minmax-rvv.c",
-+    "src/src/f32-dwconv/gen/f32-dwconv-25p8vc-rvv.c",
-+    "src/src/f32-dwconv/gen/f32-dwconv-3p8vc-minmax-rvv.c",
-+    "src/src/f32-dwconv/gen/f32-dwconv-3p8vc-rvv.c",
-+    "src/src/f32-dwconv/gen/f32-dwconv-4p8vc-minmax-rvv.c",
-+    "src/src/f32-dwconv/gen/f32-dwconv-4p8vc-rvv.c",
-+    "src/src/f32-dwconv/gen/f32-dwconv-9p8vc-minmax-rvv.c",
-+    "src/src/f32-dwconv/gen/f32-dwconv-9p8vc-rvv.c"
-+    ]
- 
+-
 -      sources = [
 -        "src/include/xnnpack.h",
 -        "src/src/s8-vclamp/s8-vclamp-scalar-u4.c",
@@ -80043,28 +80049,9 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -        assert_no_deps = [ "//base" ]
 -      }
 -    }
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
-+
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool",
-+    ]
-+
-+    public_configs = [ ":xnnpack_public_config" ]
-   }
-+}
- 
--  if (build_with_chromium) {
--    source_set("subgraph_x64") {
--      cflags = []
-+# This is a target that cannot depend on //base.
-+if (build_with_internal_optimization_guide) {
-+  source_set("f32-dwconv_arch=rv64gcv-abi=lp64d_standalone") {
+-  }
++if (build_with_chromium) {
++  source_set("f32-dwconv2d-chw_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gcv"
@@ -80072,16 +80059,18 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-dwconv/gen/f32-dwconv-25p8vc-minmax-rvv.c",
-+    "src/src/f32-dwconv/gen/f32-dwconv-25p8vc-rvv.c",
-+    "src/src/f32-dwconv/gen/f32-dwconv-3p8vc-minmax-rvv.c",
-+    "src/src/f32-dwconv/gen/f32-dwconv-3p8vc-rvv.c",
-+    "src/src/f32-dwconv/gen/f32-dwconv-4p8vc-minmax-rvv.c",
-+    "src/src/f32-dwconv/gen/f32-dwconv-4p8vc-rvv.c",
-+    "src/src/f32-dwconv/gen/f32-dwconv-9p8vc-minmax-rvv.c",
-+    "src/src/f32-dwconv/gen/f32-dwconv-9p8vc-rvv.c"
++      "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-3x3p1-minmax-rvv-7x1v.c",
++    "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-3x3s2p1-minmax-rvv-2x2v.c"
 +    ]
  
+-  if (build_with_chromium) {
+-    source_set("subgraph_x64") {
+-      cflags = []
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
+ 
 -      sources = [
 -        "src/include/xnnpack.h",
 -        "src/src/subgraph/argmax-pooling-2d.c",
@@ -80126,26 +80115,36 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -        "//third_party/fxdiv",
 -        "//third_party/pthreadpool",
 -      ]
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
- 
--      public_configs = [ ":xnnpack_public_config" ]
--    }
--  }
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
 +      "//third_party/fxdiv",
-+      "//third_party/pthreadpool:pthreadpool_standalone",
++      "//third_party/pthreadpool",
 +    ]
  
+-      public_configs = [ ":xnnpack_public_config" ]
+-    }
++    public_configs = [ ":xnnpack_public_config" ]
+   }
++}
+ 
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
 -    source_set("subgraph_x64_standalone") {
 -      cflags = []
-+    public_configs = [ ":xnnpack_public_config" ]
++# This is a target that cannot depend on //base.
++if (build_with_internal_optimization_guide) {
++  source_set("f32-dwconv2d-chw_arch=rv64gcv-abi=lp64d_standalone") {
++    cflags = [
++      "-mabi=lp64d",
++    "-march=rv64gcv"
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-3x3p1-minmax-rvv-7x1v.c",
++    "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-3x3s2p1-minmax-rvv-2x2v.c"
++    ]
  
 -      sources = [
 -        "src/include/xnnpack.h",
@@ -80197,33 +80196,21 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -      if (!(is_android && use_order_profiling)) {
 -        assert_no_deps = [ "//base" ]
 -      }
-+    if (!(is_android && use_order_profiling)) {
-+      assert_no_deps = [ "//base" ]
-     }
-   }
-+}
+-    }
+-  }
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
  
 -  if (build_with_chromium) {
 -    source_set("tables_x64") {
 -      cflags = []
-+if (build_with_chromium) {
-+  source_set("f32-dwconv_riscv64") {
-+    cflags = [
-+  
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/f32-dwconv/gen/f32-dwconv-25p1c-minmax-scalar-acc2.c",
-+    "src/src/f32-dwconv/gen/f32-dwconv-25p1c-scalar-acc2.c",
-+    "src/src/f32-dwconv/gen/f32-dwconv-25p2c-minmax-scalar-acc2.c",
-+    "src/src/f32-dwconv/gen/f32-dwconv-25p2c-scalar-acc2.c",
-+    "src/src/f32-dwconv/gen/f32-dwconv-3p1c-minmax-scalar-acc2.c",
-+    "src/src/f32-dwconv/gen/f32-dwconv-3p1c-scalar-acc2.c",
-+    "src/src/f32-dwconv/gen/f32-dwconv-4p1c-minmax-scalar-acc2.c",
-+    "src/src/f32-dwconv/gen/f32-dwconv-4p1c-scalar-acc2.c",
-+    "src/src/f32-dwconv/gen/f32-dwconv-9p1c-minmax-scalar-acc2.c",
-+    "src/src/f32-dwconv/gen/f32-dwconv-9p1c-scalar-acc2.c"
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
  
 -      sources = [
@@ -80250,21 +80237,12 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -        "//third_party/fxdiv",
 -        "//third_party/pthreadpool",
 -      ]
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
++    public_configs = [ ":xnnpack_public_config" ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
--    }
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool",
-+    ]
-+
-+    public_configs = [ ":xnnpack_public_config" ]
++    if (!(is_android && use_order_profiling)) {
++      assert_no_deps = [ "//base" ]
+     }
    }
 +}
  
@@ -80272,25 +80250,22 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -  if (build_with_internal_optimization_guide) {
 -    source_set("tables_x64_standalone") {
 -      cflags = []
-+# This is a target that cannot depend on //base.
-+if (build_with_internal_optimization_guide) {
-+  source_set("f32-dwconv_riscv64_standalone") {
++if (build_with_chromium) {
++  source_set("f32-dwconv2d-chw_riscv64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-dwconv/gen/f32-dwconv-25p1c-minmax-scalar-acc2.c",
-+    "src/src/f32-dwconv/gen/f32-dwconv-25p1c-scalar-acc2.c",
-+    "src/src/f32-dwconv/gen/f32-dwconv-25p2c-minmax-scalar-acc2.c",
-+    "src/src/f32-dwconv/gen/f32-dwconv-25p2c-scalar-acc2.c",
-+    "src/src/f32-dwconv/gen/f32-dwconv-3p1c-minmax-scalar-acc2.c",
-+    "src/src/f32-dwconv/gen/f32-dwconv-3p1c-scalar-acc2.c",
-+    "src/src/f32-dwconv/gen/f32-dwconv-4p1c-minmax-scalar-acc2.c",
-+    "src/src/f32-dwconv/gen/f32-dwconv-4p1c-scalar-acc2.c",
-+    "src/src/f32-dwconv/gen/f32-dwconv-9p1c-minmax-scalar-acc2.c",
-+    "src/src/f32-dwconv/gen/f32-dwconv-9p1c-scalar-acc2.c"
++      "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-3x3p1-minmax-scalar-2x1-acc2.c",
++    "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-3x3p1-minmax-scalar-4x1.c",
++    "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-3x3s2p1-minmax-scalar-1x1-acc2.c",
++    "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-3x3s2p1-minmax-scalar-2x1-acc2.c",
++    "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-5x5p2-minmax-scalar-1x1-acc5.c",
++    "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-5x5p2-minmax-scalar-2x1-acc2.c",
++    "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-5x5s2p2-minmax-scalar-1x1-acc5.c",
++    "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-5x5s2p2-minmax-scalar-2x1-acc2.c"
 +    ]
  
 -      sources = [
@@ -80357,13 +80332,14 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
 +      "//third_party/fxdiv",
-+      "//third_party/pthreadpool:pthreadpool_standalone",
++      "//third_party/pthreadpool",
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
 -    }
--  }
 +    public_configs = [ ":xnnpack_public_config" ]
+   }
++}
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
@@ -80395,11 +80371,26 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -      if (!(is_android && use_order_profiling)) {
 -        assert_no_deps = [ "//base" ]
 -      }
-+    if (!(is_android && use_order_profiling)) {
-+      assert_no_deps = [ "//base" ]
-     }
-   }
-+}
+-    }
+-  }
++# This is a target that cannot depend on //base.
++if (build_with_internal_optimization_guide) {
++  source_set("f32-dwconv2d-chw_riscv64_standalone") {
++    cflags = [
++  
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-3x3p1-minmax-scalar-2x1-acc2.c",
++    "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-3x3p1-minmax-scalar-4x1.c",
++    "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-3x3s2p1-minmax-scalar-1x1-acc2.c",
++    "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-3x3s2p1-minmax-scalar-2x1-acc2.c",
++    "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-5x5p2-minmax-scalar-1x1-acc5.c",
++    "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-5x5p2-minmax-scalar-2x1-acc2.c",
++    "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-5x5s2p2-minmax-scalar-1x1-acc5.c",
++    "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-5x5s2p2-minmax-scalar-2x1-acc2.c"
++    ]
  
 -  if (build_with_chromium) {
 -    source_set("u8-ibilinear_sse4.1-no-sse4.2") {
@@ -80424,25 +80415,21 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -        "//third_party/fxdiv",
 -        "//third_party/pthreadpool",
 -      ]
-+if (build_with_chromium) {
-+  source_set("f32-f16-vcvt_riscv64") {
-+    cflags = [
-+  
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/f32-f16-vcvt/gen/f32-f16-vcvt-scalar-fabsf-u2.c"
-+    ]
- 
--      public_configs = [ ":xnnpack_public_config" ]
--    }
--  }
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
 +    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 +    configs += [ ":xnnpack_private_config" ]
  
+-      public_configs = [ ":xnnpack_public_config" ]
+-    }
+-  }
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool:pthreadpool_standalone",
++    ]
+ 
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
 -    source_set("u8-ibilinear_sse4.1-no-sse4.2_standalone") {
@@ -80473,74 +80460,36 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -      if (!(is_android && use_order_profiling)) {
 -        assert_no_deps = [ "//base" ]
 -      }
--    }
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool",
-+    ]
-+
 +    public_configs = [ ":xnnpack_public_config" ]
++
++    if (!(is_android && use_order_profiling)) {
++      assert_no_deps = [ "//base" ]
+     }
    }
 +}
  
 -  if (build_with_chromium) {
 -    source_set("u8-ibilinear_x64") {
 -      cflags = []
-+# This is a target that cannot depend on //base.
-+if (build_with_internal_optimization_guide) {
-+  source_set("f32-f16-vcvt_riscv64_standalone") {
-+    cflags = [
-+  
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/f32-f16-vcvt/gen/f32-f16-vcvt-scalar-fabsf-u2.c"
-+    ]
- 
+-
 -      sources = [
 -        "src/include/xnnpack.h",
 -        "src/src/u8-ibilinear/gen/u8-ibilinear-scalar-u1.c",
 -      ]
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
- 
+-
 -      configs -= [ "//build/config/compiler:chromium_code" ]
 -      configs += [ "//build/config/compiler:no_chromium_code" ]
 -      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 -      configs += [ ":xnnpack_private_config" ]
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool:pthreadpool_standalone",
-+    ]
- 
+-
 -      deps = [
 -        "//third_party/cpuinfo",
 -        "//third_party/fp16",
 -        "//third_party/fxdiv",
 -        "//third_party/pthreadpool",
 -      ]
-+    public_configs = [ ":xnnpack_public_config" ]
- 
--      public_configs = [ ":xnnpack_public_config" ]
-+    if (!(is_android && use_order_profiling)) {
-+      assert_no_deps = [ "//base" ]
-     }
-   }
-+}
- 
--  # This is a target that cannot depend on //base.
--  if (build_with_internal_optimization_guide) {
--    source_set("u8-ibilinear_x64_standalone") {
--      cflags = []
 +if (build_with_chromium) {
-+  source_set("f32-gemm_arch=rv64gcv-abi=lp64d") {
++  source_set("f32-dwconv_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gcv"
@@ -80548,8 +80497,33 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-gemm/gen/f32-gemm-1x4v-minmax-rvv.c",
-+    "src/src/f32-gemm/gen/f32-gemm-7x4v-minmax-rvv.c"
++      "src/src/f32-dwconv/gen/f32-dwconv-25p8vc-minmax-rvv.c",
++    "src/src/f32-dwconv/gen/f32-dwconv-25p8vc-rvv.c",
++    "src/src/f32-dwconv/gen/f32-dwconv-3p8vc-minmax-rvv.c",
++    "src/src/f32-dwconv/gen/f32-dwconv-3p8vc-rvv.c",
++    "src/src/f32-dwconv/gen/f32-dwconv-4p8vc-minmax-rvv.c",
++    "src/src/f32-dwconv/gen/f32-dwconv-4p8vc-rvv.c",
++    "src/src/f32-dwconv/gen/f32-dwconv-9p8vc-minmax-rvv.c",
++    "src/src/f32-dwconv/gen/f32-dwconv-9p8vc-rvv.c"
++    ]
+ 
+-      public_configs = [ ":xnnpack_public_config" ]
+-    }
+-  }
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
+ 
+-  # This is a target that cannot depend on //base.
+-  if (build_with_internal_optimization_guide) {
+-    source_set("u8-ibilinear_x64_standalone") {
+-      cflags = []
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool",
 +    ]
  
 -      sources = [
@@ -80575,37 +80549,16 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -        assert_no_deps = [ "//base" ]
 -      }
 -    }
--  }
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
++    public_configs = [ ":xnnpack_public_config" ]
+   }
++}
  
 -  if (build_with_chromium) {
 -    source_set("u8-lut32norm_x64") {
 -      cflags = []
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool",
-+    ]
- 
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/u8-lut32norm/u8-lut32norm-scalar.c",
--      ]
-+    public_configs = [ ":xnnpack_public_config" ]
-+  }
-+}
- 
--      configs -= [ "//build/config/compiler:chromium_code" ]
--      configs += [ "//build/config/compiler:no_chromium_code" ]
--      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
--      configs += [ ":xnnpack_private_config" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-gemm_arch=rv64gcv-abi=lp64d_standalone") {
++  source_set("f32-dwconv_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gcv"
@@ -80613,24 +80566,29 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-gemm/gen/f32-gemm-1x4v-minmax-rvv.c",
-+    "src/src/f32-gemm/gen/f32-gemm-7x4v-minmax-rvv.c"
++      "src/src/f32-dwconv/gen/f32-dwconv-25p8vc-minmax-rvv.c",
++    "src/src/f32-dwconv/gen/f32-dwconv-25p8vc-rvv.c",
++    "src/src/f32-dwconv/gen/f32-dwconv-3p8vc-minmax-rvv.c",
++    "src/src/f32-dwconv/gen/f32-dwconv-3p8vc-rvv.c",
++    "src/src/f32-dwconv/gen/f32-dwconv-4p8vc-minmax-rvv.c",
++    "src/src/f32-dwconv/gen/f32-dwconv-4p8vc-rvv.c",
++    "src/src/f32-dwconv/gen/f32-dwconv-9p8vc-minmax-rvv.c",
++    "src/src/f32-dwconv/gen/f32-dwconv-9p8vc-rvv.c"
 +    ]
  
--      deps = [
--        "//third_party/cpuinfo",
--        "//third_party/fp16",
--        "//third_party/fxdiv",
--        "//third_party/pthreadpool",
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/u8-lut32norm/u8-lut32norm-scalar.c",
 -      ]
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
 +    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 +    configs += [ ":xnnpack_private_config" ]
  
--      public_configs = [ ":xnnpack_public_config" ]
--    }
--  }
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
@@ -80638,12 +80596,26 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 +      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
  
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/fp16",
+-        "//third_party/fxdiv",
+-        "//third_party/pthreadpool",
+-      ]
++    public_configs = [ ":xnnpack_public_config" ]
+ 
+-      public_configs = [ ":xnnpack_public_config" ]
++    if (!(is_android && use_order_profiling)) {
++      assert_no_deps = [ "//base" ]
+     }
+   }
++}
+ 
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
 -    source_set("u8-lut32norm_x64_standalone") {
 -      cflags = []
-+    public_configs = [ ":xnnpack_public_config" ]
- 
+-
 -      sources = [
 -        "src/include/xnnpack.h",
 -        "src/src/u8-lut32norm/u8-lut32norm-scalar.c",
@@ -80666,11 +80638,27 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -      if (!(is_android && use_order_profiling)) {
 -        assert_no_deps = [ "//base" ]
 -      }
-+    if (!(is_android && use_order_profiling)) {
-+      assert_no_deps = [ "//base" ]
-     }
-   }
-+}
+-    }
+-  }
++if (build_with_chromium) {
++  source_set("f32-dwconv_riscv64") {
++    cflags = [
++  
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/f32-dwconv/gen/f32-dwconv-25p1c-minmax-scalar-acc2.c",
++    "src/src/f32-dwconv/gen/f32-dwconv-25p1c-scalar-acc2.c",
++    "src/src/f32-dwconv/gen/f32-dwconv-25p2c-minmax-scalar-acc2.c",
++    "src/src/f32-dwconv/gen/f32-dwconv-25p2c-scalar-acc2.c",
++    "src/src/f32-dwconv/gen/f32-dwconv-3p1c-minmax-scalar-acc2.c",
++    "src/src/f32-dwconv/gen/f32-dwconv-3p1c-scalar-acc2.c",
++    "src/src/f32-dwconv/gen/f32-dwconv-4p1c-minmax-scalar-acc2.c",
++    "src/src/f32-dwconv/gen/f32-dwconv-4p1c-scalar-acc2.c",
++    "src/src/f32-dwconv/gen/f32-dwconv-9p1c-minmax-scalar-acc2.c",
++    "src/src/f32-dwconv/gen/f32-dwconv-9p1c-scalar-acc2.c"
++    ]
  
 -  if (build_with_chromium) {
 -    source_set("u8-maxpool_sse2-no-sse3") {
@@ -80695,32 +80683,21 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -        "//third_party/fxdiv",
 -        "//third_party/pthreadpool",
 -      ]
-+if (build_with_chromium) {
-+  source_set("f32-gemm_riscv64") {
-+    cflags = [
-+  
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/f32-gemm/gen/f32-gemm-1x4-minmax-scalar.c",
-+    "src/src/f32-gemm/gen/f32-gemm-1x4-relu-scalar.c",
-+    "src/src/f32-gemm/gen/f32-gemm-1x4-scalar.c",
-+    "src/src/f32-gemm/gen/f32-gemm-4x2-minmax-scalar.c",
-+    "src/src/f32-gemm/gen/f32-gemm-4x2-scalar.c",
-+    "src/src/f32-gemm/gen/f32-gemm-4x4-minmax-scalar.c",
-+    "src/src/f32-gemm/gen/f32-gemm-4x4-relu-scalar.c",
-+    "src/src/f32-gemm/gen/f32-gemm-4x4-scalar.c"
-+    ]
- 
--      public_configs = [ ":xnnpack_public_config" ]
--    }
--  }
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
 +    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 +    configs += [ ":xnnpack_private_config" ]
  
+-      public_configs = [ ":xnnpack_public_config" ]
+-    }
+-  }
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool",
++    ]
+ 
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
 -    source_set("u8-maxpool_sse2-no-sse3_standalone") {
@@ -80752,13 +80729,6 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -        assert_no_deps = [ "//base" ]
 -      }
 -    }
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool",
-+    ]
-+
 +    public_configs = [ ":xnnpack_public_config" ]
    }
 +}
@@ -80768,21 +80738,23 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-gemm_riscv64_standalone") {
++  source_set("f32-dwconv_riscv64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-gemm/gen/f32-gemm-1x4-minmax-scalar.c",
-+    "src/src/f32-gemm/gen/f32-gemm-1x4-relu-scalar.c",
-+    "src/src/f32-gemm/gen/f32-gemm-1x4-scalar.c",
-+    "src/src/f32-gemm/gen/f32-gemm-4x2-minmax-scalar.c",
-+    "src/src/f32-gemm/gen/f32-gemm-4x2-scalar.c",
-+    "src/src/f32-gemm/gen/f32-gemm-4x4-minmax-scalar.c",
-+    "src/src/f32-gemm/gen/f32-gemm-4x4-relu-scalar.c",
-+    "src/src/f32-gemm/gen/f32-gemm-4x4-scalar.c"
++      "src/src/f32-dwconv/gen/f32-dwconv-25p1c-minmax-scalar-acc2.c",
++    "src/src/f32-dwconv/gen/f32-dwconv-25p1c-scalar-acc2.c",
++    "src/src/f32-dwconv/gen/f32-dwconv-25p2c-minmax-scalar-acc2.c",
++    "src/src/f32-dwconv/gen/f32-dwconv-25p2c-scalar-acc2.c",
++    "src/src/f32-dwconv/gen/f32-dwconv-3p1c-minmax-scalar-acc2.c",
++    "src/src/f32-dwconv/gen/f32-dwconv-3p1c-scalar-acc2.c",
++    "src/src/f32-dwconv/gen/f32-dwconv-4p1c-minmax-scalar-acc2.c",
++    "src/src/f32-dwconv/gen/f32-dwconv-4p1c-scalar-acc2.c",
++    "src/src/f32-dwconv/gen/f32-dwconv-9p1c-minmax-scalar-acc2.c",
++    "src/src/f32-dwconv/gen/f32-dwconv-9p1c-scalar-acc2.c"
 +    ]
  
 -      sources = [
@@ -80850,14 +80822,14 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f32-ibilinear-chw_riscv64") {
++  source_set("f32-f16-vcvt_riscv64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-ibilinear-chw/gen/f32-ibilinear-chw-scalar-p4.c"
++      "src/src/f32-f16-vcvt/gen/f32-f16-vcvt-scalar-fabsf-u2.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -80940,14 +80912,14 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-ibilinear-chw_riscv64_standalone") {
++  source_set("f32-f16-vcvt_riscv64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-ibilinear-chw/gen/f32-ibilinear-chw-scalar-p4.c"
++      "src/src/f32-f16-vcvt/gen/f32-f16-vcvt-scalar-fabsf-u2.c"
 +    ]
  
 -      sources = [
@@ -81017,14 +80989,16 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f32-ibilinear_riscv64") {
++  source_set("f32-gemm_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-ibilinear/gen/f32-ibilinear-scalar-u2.c"
++      "src/src/f32-gemm/gen/f32-gemm-1x4v-minmax-rvv.c",
++    "src/src/f32-gemm/gen/f32-gemm-7x4v-minmax-rvv.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -81109,14 +81083,16 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-ibilinear_riscv64_standalone") {
++  source_set("f32-gemm_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-ibilinear/gen/f32-ibilinear-scalar-u2.c"
++      "src/src/f32-gemm/gen/f32-gemm-1x4v-minmax-rvv.c",
++    "src/src/f32-gemm/gen/f32-gemm-7x4v-minmax-rvv.c"
 +    ]
  
 -      sources = [
@@ -81161,16 +81137,21 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -    source_set("u8-rminmax_x64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("f32-igemm_arch=rv64gcv-abi=lp64d") {
++  source_set("f32-gemm_riscv64") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-igemm/gen/f32-igemm-1x4v-minmax-rvv.c",
-+    "src/src/f32-igemm/gen/f32-igemm-7x4v-minmax-rvv.c"
++      "src/src/f32-gemm/gen/f32-gemm-1x4-minmax-scalar.c",
++    "src/src/f32-gemm/gen/f32-gemm-1x4-relu-scalar.c",
++    "src/src/f32-gemm/gen/f32-gemm-1x4-scalar.c",
++    "src/src/f32-gemm/gen/f32-gemm-4x2-minmax-scalar.c",
++    "src/src/f32-gemm/gen/f32-gemm-4x2-scalar.c",
++    "src/src/f32-gemm/gen/f32-gemm-4x4-minmax-scalar.c",
++    "src/src/f32-gemm/gen/f32-gemm-4x4-relu-scalar.c",
++    "src/src/f32-gemm/gen/f32-gemm-4x4-scalar.c"
 +    ]
  
 -      sources = [
@@ -81276,16 +81257,21 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -  }
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-igemm_arch=rv64gcv-abi=lp64d_standalone") {
++  source_set("f32-gemm_riscv64_standalone") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-igemm/gen/f32-igemm-1x4v-minmax-rvv.c",
-+    "src/src/f32-igemm/gen/f32-igemm-7x4v-minmax-rvv.c"
++      "src/src/f32-gemm/gen/f32-gemm-1x4-minmax-scalar.c",
++    "src/src/f32-gemm/gen/f32-gemm-1x4-relu-scalar.c",
++    "src/src/f32-gemm/gen/f32-gemm-1x4-scalar.c",
++    "src/src/f32-gemm/gen/f32-gemm-4x2-minmax-scalar.c",
++    "src/src/f32-gemm/gen/f32-gemm-4x2-scalar.c",
++    "src/src/f32-gemm/gen/f32-gemm-4x4-minmax-scalar.c",
++    "src/src/f32-gemm/gen/f32-gemm-4x4-relu-scalar.c",
++    "src/src/f32-gemm/gen/f32-gemm-4x4-scalar.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -81400,21 +81386,14 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f32-igemm_riscv64") {
++  source_set("f32-ibilinear-chw_riscv64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-igemm/gen/f32-igemm-1x4-minmax-scalar.c",
-+    "src/src/f32-igemm/gen/f32-igemm-1x4-relu-scalar.c",
-+    "src/src/f32-igemm/gen/f32-igemm-1x4-scalar.c",
-+    "src/src/f32-igemm/gen/f32-igemm-4x2-minmax-scalar.c",
-+    "src/src/f32-igemm/gen/f32-igemm-4x2-scalar.c",
-+    "src/src/f32-igemm/gen/f32-igemm-4x4-minmax-scalar.c",
-+    "src/src/f32-igemm/gen/f32-igemm-4x4-relu-scalar.c",
-+    "src/src/f32-igemm/gen/f32-igemm-4x4-scalar.c"
++      "src/src/f32-ibilinear-chw/gen/f32-ibilinear-chw-scalar-p4.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -81472,21 +81451,14 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-igemm_riscv64_standalone") {
++  source_set("f32-ibilinear-chw_riscv64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-igemm/gen/f32-igemm-1x4-minmax-scalar.c",
-+    "src/src/f32-igemm/gen/f32-igemm-1x4-relu-scalar.c",
-+    "src/src/f32-igemm/gen/f32-igemm-1x4-scalar.c",
-+    "src/src/f32-igemm/gen/f32-igemm-4x2-minmax-scalar.c",
-+    "src/src/f32-igemm/gen/f32-igemm-4x2-scalar.c",
-+    "src/src/f32-igemm/gen/f32-igemm-4x4-minmax-scalar.c",
-+    "src/src/f32-igemm/gen/f32-igemm-4x4-relu-scalar.c",
-+    "src/src/f32-igemm/gen/f32-igemm-4x4-scalar.c"
++      "src/src/f32-ibilinear-chw/gen/f32-ibilinear-chw-scalar-p4.c"
 +    ]
  
 -      sources = [
@@ -81529,15 +81501,14 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -    source_set("u8-vclamp_x64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("f32-maxpool_arch=rv64gcv-abi=lp64d") {
++  source_set("f32-ibilinear_riscv64") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-maxpool/gen/f32-maxpool-9p-minmax-rvv-u2v.c"
++      "src/src/f32-ibilinear/gen/f32-ibilinear-scalar-u2.c"
 +    ]
  
 -      sources = [
@@ -81641,15 +81612,14 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -  }
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-maxpool_arch=rv64gcv-abi=lp64d_standalone") {
++  source_set("f32-ibilinear_riscv64_standalone") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-maxpool/gen/f32-maxpool-9p-minmax-rvv-u2v.c"
++      "src/src/f32-ibilinear/gen/f32-ibilinear-scalar-u2.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -81754,14 +81724,16 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f32-maxpool_riscv64") {
++  source_set("f32-igemm_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-maxpool/gen/f32-maxpool-9p-minmax-scalar-u1.c"
++      "src/src/f32-igemm/gen/f32-igemm-1x4v-minmax-rvv.c",
++    "src/src/f32-igemm/gen/f32-igemm-7x4v-minmax-rvv.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -81819,14 +81791,16 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-maxpool_riscv64_standalone") {
++  source_set("f32-igemm_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-maxpool/gen/f32-maxpool-9p-minmax-scalar-u1.c"
++      "src/src/f32-igemm/gen/f32-igemm-1x4v-minmax-rvv.c",
++    "src/src/f32-igemm/gen/f32-igemm-7x4v-minmax-rvv.c"
 +    ]
  
 -      sources = [
@@ -81869,15 +81843,21 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -    source_set("x16-transposec_x64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("f32-qc4w-gemm_riscv64") {
++  source_set("f32-igemm_riscv64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-qc4w-gemm/gen/f32-qc4w-gemm-1x4-minmax-scalar.c",
-+    "src/src/f32-qc4w-gemm/gen/f32-qc4w-gemm-4x4-minmax-scalar.c"
++      "src/src/f32-igemm/gen/f32-igemm-1x4-minmax-scalar.c",
++    "src/src/f32-igemm/gen/f32-igemm-1x4-relu-scalar.c",
++    "src/src/f32-igemm/gen/f32-igemm-1x4-scalar.c",
++    "src/src/f32-igemm/gen/f32-igemm-4x2-minmax-scalar.c",
++    "src/src/f32-igemm/gen/f32-igemm-4x2-scalar.c",
++    "src/src/f32-igemm/gen/f32-igemm-4x4-minmax-scalar.c",
++    "src/src/f32-igemm/gen/f32-igemm-4x4-relu-scalar.c",
++    "src/src/f32-igemm/gen/f32-igemm-4x4-scalar.c"
 +    ]
  
 -      sources = [
@@ -81934,15 +81914,21 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -      configs += [ ":xnnpack_private_config" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-qc4w-gemm_riscv64_standalone") {
++  source_set("f32-igemm_riscv64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-qc4w-gemm/gen/f32-qc4w-gemm-1x4-minmax-scalar.c",
-+    "src/src/f32-qc4w-gemm/gen/f32-qc4w-gemm-4x4-minmax-scalar.c"
++      "src/src/f32-igemm/gen/f32-igemm-1x4-minmax-scalar.c",
++    "src/src/f32-igemm/gen/f32-igemm-1x4-relu-scalar.c",
++    "src/src/f32-igemm/gen/f32-igemm-1x4-scalar.c",
++    "src/src/f32-igemm/gen/f32-igemm-4x2-minmax-scalar.c",
++    "src/src/f32-igemm/gen/f32-igemm-4x2-scalar.c",
++    "src/src/f32-igemm/gen/f32-igemm-4x4-minmax-scalar.c",
++    "src/src/f32-igemm/gen/f32-igemm-4x4-relu-scalar.c",
++    "src/src/f32-igemm/gen/f32-igemm-4x4-scalar.c"
 +    ]
  
 -      deps = [
@@ -82025,15 +82011,15 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f32-qc8w-gemm_riscv64") {
++  source_set("f32-maxpool_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-qc8w-gemm/gen/f32-qc8w-gemm-1x4-minmax-scalar.c",
-+    "src/src/f32-qc8w-gemm/gen/f32-qc8w-gemm-4x4-minmax-scalar.c"
++      "src/src/f32-maxpool/gen/f32-maxpool-9p-minmax-rvv-u2v.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -82091,15 +82077,15 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-qc8w-gemm_riscv64_standalone") {
++  source_set("f32-maxpool_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-qc8w-gemm/gen/f32-qc8w-gemm-1x4-minmax-scalar.c",
-+    "src/src/f32-qc8w-gemm/gen/f32-qc8w-gemm-4x4-minmax-scalar.c"
++      "src/src/f32-maxpool/gen/f32-maxpool-9p-minmax-rvv-u2v.c"
 +    ]
  
 -      sources = [
@@ -82142,15 +82128,14 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -    source_set("x24-transposec_x64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("f32-qs8-vcvt_arch=rv64gcv-abi=lp64d") {
++  source_set("f32-maxpool_riscv64") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-qs8-vcvt/gen/f32-qs8-vcvt-rvv-u2v.c"
++      "src/src/f32-maxpool/gen/f32-maxpool-9p-minmax-scalar-u1.c"
 +    ]
  
 -      sources = [
@@ -82264,15 +82249,14 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -  }
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-qs8-vcvt_arch=rv64gcv-abi=lp64d_standalone") {
++  source_set("f32-maxpool_riscv64_standalone") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-qs8-vcvt/gen/f32-qs8-vcvt-rvv-u2v.c"
++      "src/src/f32-maxpool/gen/f32-maxpool-9p-minmax-scalar-u1.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -82324,15 +82308,15 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -    source_set("x32-packw_avx512f_standalone") {
 -      cflags = [ "-mavx512f" ]
 +if (build_with_chromium) {
-+  source_set("f32-qs8-vcvt_riscv64") {
++  source_set("f32-qc4w-gemm_riscv64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-qs8-vcvt/gen/f32-qs8-vcvt-scalar-imagic-u4.c",
-+    "src/src/f32-qs8-vcvt/gen/f32-qs8-vcvt-scalar-lrintf-u4.c"
++      "src/src/f32-qc4w-gemm/gen/f32-qc4w-gemm-1x4-minmax-scalar.c",
++    "src/src/f32-qc4w-gemm/gen/f32-qc4w-gemm-4x4-minmax-scalar.c"
 +    ]
  
 -      sources = [
@@ -82440,15 +82424,15 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -  }
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-qs8-vcvt_riscv64_standalone") {
++  source_set("f32-qc4w-gemm_riscv64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-qs8-vcvt/gen/f32-qs8-vcvt-scalar-imagic-u4.c",
-+    "src/src/f32-qs8-vcvt/gen/f32-qs8-vcvt-scalar-lrintf-u4.c"
++      "src/src/f32-qc4w-gemm/gen/f32-qc4w-gemm-1x4-minmax-scalar.c",
++    "src/src/f32-qc4w-gemm/gen/f32-qc4w-gemm-4x4-minmax-scalar.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -82458,6 +82442,13 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
 +    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 +    configs += [ ":xnnpack_private_config" ]
++
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool:pthreadpool_standalone",
++    ]
  
 -      sources = [
 -        "src/include/xnnpack.h",
@@ -82480,13 +82471,6 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -        "//third_party/fxdiv",
 -        "//third_party/pthreadpool",
 -      ]
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool:pthreadpool_standalone",
-+    ]
-+
 +    public_configs = [ ":xnnpack_public_config" ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -82501,15 +82485,15 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -    source_set("x32-packw_x64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("f32-qu8-vcvt_arch=rv64gcv-abi=lp64d") {
++  source_set("f32-qc8w-gemm_riscv64") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-qu8-vcvt/gen/f32-qu8-vcvt-rvv-u2v.c"
++      "src/src/f32-qc8w-gemm/gen/f32-qc8w-gemm-1x4-minmax-scalar.c",
++    "src/src/f32-qc8w-gemm/gen/f32-qc8w-gemm-4x4-minmax-scalar.c"
 +    ]
  
 -      sources = [
@@ -82620,15 +82604,15 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -  }
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-qu8-vcvt_arch=rv64gcv-abi=lp64d_standalone") {
++  source_set("f32-qc8w-gemm_riscv64_standalone") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-qu8-vcvt/gen/f32-qu8-vcvt-rvv-u2v.c"
++      "src/src/f32-qc8w-gemm/gen/f32-qc8w-gemm-1x4-minmax-scalar.c",
++    "src/src/f32-qc8w-gemm/gen/f32-qc8w-gemm-4x4-minmax-scalar.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -82716,15 +82700,15 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -        "src/src/x32-transposec/gen/x32-transposec-2x4-scalar-int.c",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f32-qu8-vcvt_riscv64") {
++  source_set("f32-qs8-vcvt_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-qu8-vcvt/gen/f32-qu8-vcvt-scalar-imagic-u4.c",
-+    "src/src/f32-qu8-vcvt/gen/f32-qu8-vcvt-scalar-lrintf-u4.c"
++      "src/src/f32-qs8-vcvt/gen/f32-qs8-vcvt-rvv-u2v.c"
 +    ]
  
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -82761,15 +82745,15 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-qu8-vcvt_riscv64_standalone") {
++  source_set("f32-qs8-vcvt_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-qu8-vcvt/gen/f32-qu8-vcvt-scalar-imagic-u4.c",
-+    "src/src/f32-qu8-vcvt/gen/f32-qu8-vcvt-scalar-lrintf-u4.c"
++      "src/src/f32-qs8-vcvt/gen/f32-qs8-vcvt-rvv-u2v.c"
 +    ]
  
 -      sources = [
@@ -82881,15 +82865,15 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -        "src/src/x32-unpool/x32-unpool-scalar.c",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f32-raddstoreexpminusmax_arch=rv64gcv-abi=lp64d") {
++  source_set("f32-qs8-vcvt_riscv64") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-raddstoreexpminusmax/gen/f32-raddstoreexpminusmax-rvv-rr2-p6-u4v.c"
++      "src/src/f32-qs8-vcvt/gen/f32-qs8-vcvt-scalar-imagic-u4.c",
++    "src/src/f32-qs8-vcvt/gen/f32-qs8-vcvt-scalar-lrintf-u4.c"
 +    ]
  
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -82926,15 +82910,15 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-raddstoreexpminusmax_arch=rv64gcv-abi=lp64d_standalone") {
++  source_set("f32-qs8-vcvt_riscv64_standalone") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-raddstoreexpminusmax/gen/f32-raddstoreexpminusmax-rvv-rr2-p6-u4v.c"
++      "src/src/f32-qs8-vcvt/gen/f32-qs8-vcvt-scalar-imagic-u4.c",
++    "src/src/f32-qs8-vcvt/gen/f32-qs8-vcvt-scalar-lrintf-u4.c"
 +    ]
  
 -      sources = [
@@ -83065,14 +83049,15 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f32-raddstoreexpminusmax_riscv64") {
++  source_set("f32-qu8-vcvt_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-raddstoreexpminusmax/gen/f32-raddstoreexpminusmax-scalar-rr2-p5-u4-acc2.c"
++      "src/src/f32-qu8-vcvt/gen/f32-qu8-vcvt-rvv-u2v.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -83130,14 +83115,15 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-raddstoreexpminusmax_riscv64_standalone") {
++  source_set("f32-qu8-vcvt_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-raddstoreexpminusmax/gen/f32-raddstoreexpminusmax-scalar-rr2-p5-u4-acc2.c"
++      "src/src/f32-qu8-vcvt/gen/f32-qu8-vcvt-rvv-u2v.c"
 +    ]
  
 -      sources = [
@@ -83205,15 +83191,15 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f32-rdminmax_riscv64") {
++  source_set("f32-qu8-vcvt_riscv64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-rdminmax/gen/f32-rdmax-2p2x-scalar-u2.c",
-+    "src/src/f32-rdminmax/gen/f32-rdmin-2p2x-scalar-u2.c"
++      "src/src/f32-qu8-vcvt/gen/f32-qu8-vcvt-scalar-imagic-u4.c",
++    "src/src/f32-qu8-vcvt/gen/f32-qu8-vcvt-scalar-lrintf-u4.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -83319,15 +83305,15 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -      ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-rdminmax_riscv64_standalone") {
++  source_set("f32-qu8-vcvt_riscv64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-rdminmax/gen/f32-rdmax-2p2x-scalar-u2.c",
-+    "src/src/f32-rdminmax/gen/f32-rdmin-2p2x-scalar-u2.c"
++      "src/src/f32-qu8-vcvt/gen/f32-qu8-vcvt-scalar-imagic-u4.c",
++    "src/src/f32-qu8-vcvt/gen/f32-qu8-vcvt-scalar-lrintf-u4.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -83454,14 +83440,15 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f32-rdsum2_riscv64") {
++  source_set("f32-raddstoreexpminusmax_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-rdsum2/gen/f32-rdsum2-7p7x-minmax-scalar.c"
++      "src/src/f32-raddstoreexpminusmax/gen/f32-raddstoreexpminusmax-rvv-rr2-p6-u4v.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -83556,14 +83543,15 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-rdsum2_riscv64_standalone") {
++  source_set("f32-raddstoreexpminusmax_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-rdsum2/gen/f32-rdsum2-7p7x-minmax-scalar.c"
++      "src/src/f32-raddstoreexpminusmax/gen/f32-raddstoreexpminusmax-rvv-rr2-p6-u4v.c"
 +    ]
  
 -      sources = [
@@ -83606,15 +83594,14 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -    source_set("x8-lut_x64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("f32-rdsum_arch=rv64gcv-abi=lp64d") {
++  source_set("f32-raddstoreexpminusmax_riscv64") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-rdsum/gen/f32-rdsum-7p7x-minmax-rvv-u4v.c"
++      "src/src/f32-raddstoreexpminusmax/gen/f32-raddstoreexpminusmax-scalar-rr2-p5-u4-acc2.c"
 +    ]
  
 -      sources = [
@@ -83670,15 +83657,14 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -      configs += [ ":xnnpack_private_config" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-rdsum_arch=rv64gcv-abi=lp64d_standalone") {
++  source_set("f32-raddstoreexpminusmax_riscv64_standalone") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-rdsum/gen/f32-rdsum-7p7x-minmax-rvv-u4v.c"
++      "src/src/f32-raddstoreexpminusmax/gen/f32-raddstoreexpminusmax-scalar-rr2-p5-u4-acc2.c"
 +    ]
  
 -      deps = [
@@ -83740,15 +83726,21 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -    source_set("x8-packw_x64") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("f32-rdsum_riscv64") {
++  source_set("f32-rdminmax_riscv64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-rdsum/gen/f32-rdsum-7p7x-minmax-scalar.c"
++      "src/src/f32-rdminmax/gen/f32-rdmax-2p2x-scalar-u2.c",
++    "src/src/f32-rdminmax/gen/f32-rdmin-2p2x-scalar-u2.c"
 +    ]
++
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
  
 -      sources = [
 -        "src/include/xnnpack.h",
@@ -83769,20 +83761,15 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -        "//third_party/fxdiv",
 -        "//third_party/pthreadpool",
 -      ]
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
- 
--      public_configs = [ ":xnnpack_public_config" ]
--    }
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
 +      "//third_party/fxdiv",
 +      "//third_party/pthreadpool",
 +    ]
-+
+ 
+-      public_configs = [ ":xnnpack_public_config" ]
+-    }
 +    public_configs = [ ":xnnpack_public_config" ]
    }
 +}
@@ -83793,14 +83780,15 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-rdsum_riscv64_standalone") {
++  source_set("f32-rdminmax_riscv64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-rdsum/gen/f32-rdsum-7p7x-minmax-scalar.c"
++      "src/src/f32-rdminmax/gen/f32-rdmax-2p2x-scalar-u2.c",
++    "src/src/f32-rdminmax/gen/f32-rdmin-2p2x-scalar-u2.c"
 +    ]
  
 -      sources = [
@@ -83932,17 +83920,14 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f32-rminmax_arch=rv64gcv-abi=lp64d") {
++  source_set("f32-rdsum2_riscv64") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-rminmax/gen/f32-rmax-rvv-u8v.c",
-+    "src/src/f32-rminmax/gen/f32-rmin-rvv-u8v.c",
-+    "src/src/f32-rminmax/gen/f32-rminmax-rvv-u8v.c"
++      "src/src/f32-rdsum2/gen/f32-rdsum2-7p7x-minmax-scalar.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -84000,17 +83985,14 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-rminmax_arch=rv64gcv-abi=lp64d_standalone") {
++  source_set("f32-rdsum2_riscv64_standalone") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-rminmax/gen/f32-rmax-rvv-u8v.c",
-+    "src/src/f32-rminmax/gen/f32-rmin-rvv-u8v.c",
-+    "src/src/f32-rminmax/gen/f32-rminmax-rvv-u8v.c"
++      "src/src/f32-rdsum2/gen/f32-rdsum2-7p7x-minmax-scalar.c"
 +    ]
  
 -      sources = [
@@ -84053,16 +84035,15 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -    source_set("x8-transposec_x64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("f32-rminmax_riscv64") {
++  source_set("f32-rdsum_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-rminmax/gen/f32-rmax-scalar-u4-acc4.c",
-+    "src/src/f32-rminmax/gen/f32-rmin-scalar-u4-acc4.c",
-+    "src/src/f32-rminmax/gen/f32-rminmax-scalar-u4-acc4.c"
++      "src/src/f32-rdsum/gen/f32-rdsum-7p7x-minmax-rvv-u4v.c"
 +    ]
  
 -      sources = [
@@ -84118,16 +84099,15 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -      configs += [ ":xnnpack_private_config" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-rminmax_riscv64_standalone") {
++  source_set("f32-rdsum_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-rminmax/gen/f32-rmax-scalar-u4-acc4.c",
-+    "src/src/f32-rminmax/gen/f32-rmin-scalar-u4-acc4.c",
-+    "src/src/f32-rminmax/gen/f32-rminmax-scalar-u4-acc4.c"
++      "src/src/f32-rdsum/gen/f32-rdsum-7p7x-minmax-rvv-u4v.c"
 +    ]
  
 -      deps = [
@@ -84209,14 +84189,14 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f32-rsum2_riscv64") {
++  source_set("f32-rdsum_riscv64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-rsum2/gen/f32-rsum2-scalar-u1.c"
++      "src/src/f32-rdsum/gen/f32-rdsum-7p7x-minmax-scalar.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -84274,14 +84254,14 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-rsum2_riscv64_standalone") {
++  source_set("f32-rdsum_riscv64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-rsum2/gen/f32-rsum2-scalar-u1.c"
++      "src/src/f32-rdsum/gen/f32-rdsum-7p7x-minmax-scalar.c"
 +    ]
  
 -      sources = [
@@ -84349,14 +84329,17 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f32-rsum_riscv64") {
++  source_set("f32-rminmax_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-rsum/gen/f32-rsum-scalar-u4-acc4.c"
++      "src/src/f32-rminmax/gen/f32-rmax-rvv-u8v.c",
++    "src/src/f32-rminmax/gen/f32-rmin-rvv-u8v.c",
++    "src/src/f32-rminmax/gen/f32-rminmax-rvv-u8v.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -84437,14 +84420,17 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-rsum_riscv64_standalone") {
++  source_set("f32-rminmax_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-rsum/gen/f32-rsum-scalar-u4-acc4.c"
++      "src/src/f32-rminmax/gen/f32-rmax-rvv-u8v.c",
++    "src/src/f32-rminmax/gen/f32-rmin-rvv-u8v.c",
++    "src/src/f32-rminmax/gen/f32-rminmax-rvv-u8v.c"
 +    ]
  
 -      sources = [
@@ -84487,17 +84473,16 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -    source_set("xx-pad_x64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("f32-spmm_arch=rv64gcv-abi=lp64d") {
++  source_set("f32-rminmax_riscv64") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-spmm/gen/f32-spmm-4vx4-minmax-rvv.c",
-+    "src/src/f32-spmm/gen/f32-spmm-8vx1-minmax-rvv.c",
-+    "src/src/f32-spmm/gen/f32-spmm-8vx2-minmax-rvv.c"
++      "src/src/f32-rminmax/gen/f32-rmax-scalar-u4-acc4.c",
++    "src/src/f32-rminmax/gen/f32-rmin-scalar-u4-acc4.c",
++    "src/src/f32-rminmax/gen/f32-rminmax-scalar-u4-acc4.c"
 +    ]
  
 -      sources = [
@@ -84553,17 +84538,16 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -      configs += [ ":xnnpack_private_config" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-spmm_arch=rv64gcv-abi=lp64d_standalone") {
++  source_set("f32-rminmax_riscv64_standalone") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-spmm/gen/f32-spmm-4vx4-minmax-rvv.c",
-+    "src/src/f32-spmm/gen/f32-spmm-8vx1-minmax-rvv.c",
-+    "src/src/f32-spmm/gen/f32-spmm-8vx2-minmax-rvv.c"
++      "src/src/f32-rminmax/gen/f32-rmax-scalar-u4-acc4.c",
++    "src/src/f32-rminmax/gen/f32-rmin-scalar-u4-acc4.c",
++    "src/src/f32-rminmax/gen/f32-rminmax-scalar-u4-acc4.c"
 +    ]
  
 -      deps = [
@@ -84626,16 +84610,14 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -    source_set("configs_arm64") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("f32-spmm_riscv64") {
++  source_set("f32-rsum2_riscv64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-spmm/gen/f32-spmm-8x1-minmax-scalar.c",
-+    "src/src/f32-spmm/gen/f32-spmm-8x2-minmax-scalar.c",
-+    "src/src/f32-spmm/gen/f32-spmm-8x4-minmax-scalar.c"
++      "src/src/f32-rsum2/gen/f32-rsum2-scalar-u1.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -84701,16 +84683,14 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-spmm_riscv64_standalone") {
++  source_set("f32-rsum2_riscv64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-spmm/gen/f32-spmm-8x1-minmax-scalar.c",
-+    "src/src/f32-spmm/gen/f32-spmm-8x2-minmax-scalar.c",
-+    "src/src/f32-spmm/gen/f32-spmm-8x4-minmax-scalar.c"
++      "src/src/f32-rsum2/gen/f32-rsum2-scalar-u1.c"
 +    ]
  
 -      sources = [
@@ -84809,14 +84789,14 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -    source_set("enums_arm64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("f32-vapproxgelu_riscv64") {
++  source_set("f32-rsum_riscv64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vapproxgelu/gen/f32-vapproxgelu-scalar-rational-12-10-div.c"
++      "src/src/f32-rsum/gen/f32-rsum-scalar-u4-acc4.c"
 +    ]
  
 -      sources = [
@@ -84867,14 +84847,14 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -      cflags = [ "-march=armv8.2-a+fp16" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vapproxgelu_riscv64_standalone") {
++  source_set("f32-rsum_riscv64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vapproxgelu/gen/f32-vapproxgelu-scalar-rational-12-10-div.c"
++      "src/src/f32-rsum/gen/f32-rsum-scalar-u4-acc4.c"
 +    ]
  
 -      sources = [
@@ -84917,7 +84897,7 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -    source_set("f16-avgpool_arch=armv8.2-a+fp16_standalone") {
 -      cflags = [ "-march=armv8.2-a+fp16" ]
 +if (build_with_chromium) {
-+  source_set("f32-vbinary_arch=rv64gcv-abi=lp64d") {
++  source_set("f32-spmm_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gcv"
@@ -84925,22 +84905,9 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vbinary/gen/f32-vadd-rvv-u8v.c",
-+    "src/src/f32-vbinary/gen/f32-vaddc-rvv-u8v.c",
-+    "src/src/f32-vbinary/gen/f32-vdiv-rvv-u8v.c",
-+    "src/src/f32-vbinary/gen/f32-vdivc-rvv-u8v.c",
-+    "src/src/f32-vbinary/gen/f32-vmax-rvv-u8v.c",
-+    "src/src/f32-vbinary/gen/f32-vmaxc-rvv-u8v.c",
-+    "src/src/f32-vbinary/gen/f32-vmin-rvv-u8v.c",
-+    "src/src/f32-vbinary/gen/f32-vminc-rvv-u8v.c",
-+    "src/src/f32-vbinary/gen/f32-vmul-rvv-u8v.c",
-+    "src/src/f32-vbinary/gen/f32-vmulc-rvv-u8v.c",
-+    "src/src/f32-vbinary/gen/f32-vrdivc-rvv-u8v.c",
-+    "src/src/f32-vbinary/gen/f32-vrsubc-rvv-u8v.c",
-+    "src/src/f32-vbinary/gen/f32-vsqrdiff-rvv-u8v.c",
-+    "src/src/f32-vbinary/gen/f32-vsqrdiffc-rvv-u8v.c",
-+    "src/src/f32-vbinary/gen/f32-vsub-rvv-u8v.c",
-+    "src/src/f32-vbinary/gen/f32-vsubc-rvv-u8v.c"
++      "src/src/f32-spmm/gen/f32-spmm-4vx4-minmax-rvv.c",
++    "src/src/f32-spmm/gen/f32-spmm-8vx1-minmax-rvv.c",
++    "src/src/f32-spmm/gen/f32-spmm-8vx2-minmax-rvv.c"
 +    ]
  
 -      sources = [
@@ -84996,7 +84963,7 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -      configs += [ ":xnnpack_private_config" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vbinary_arch=rv64gcv-abi=lp64d_standalone") {
++  source_set("f32-spmm_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gcv"
@@ -85004,22 +84971,9 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vbinary/gen/f32-vadd-rvv-u8v.c",
-+    "src/src/f32-vbinary/gen/f32-vaddc-rvv-u8v.c",
-+    "src/src/f32-vbinary/gen/f32-vdiv-rvv-u8v.c",
-+    "src/src/f32-vbinary/gen/f32-vdivc-rvv-u8v.c",
-+    "src/src/f32-vbinary/gen/f32-vmax-rvv-u8v.c",
-+    "src/src/f32-vbinary/gen/f32-vmaxc-rvv-u8v.c",
-+    "src/src/f32-vbinary/gen/f32-vmin-rvv-u8v.c",
-+    "src/src/f32-vbinary/gen/f32-vminc-rvv-u8v.c",
-+    "src/src/f32-vbinary/gen/f32-vmul-rvv-u8v.c",
-+    "src/src/f32-vbinary/gen/f32-vmulc-rvv-u8v.c",
-+    "src/src/f32-vbinary/gen/f32-vrdivc-rvv-u8v.c",
-+    "src/src/f32-vbinary/gen/f32-vrsubc-rvv-u8v.c",
-+    "src/src/f32-vbinary/gen/f32-vsqrdiff-rvv-u8v.c",
-+    "src/src/f32-vbinary/gen/f32-vsqrdiffc-rvv-u8v.c",
-+    "src/src/f32-vbinary/gen/f32-vsub-rvv-u8v.c",
-+    "src/src/f32-vbinary/gen/f32-vsubc-rvv-u8v.c"
++      "src/src/f32-spmm/gen/f32-spmm-4vx4-minmax-rvv.c",
++    "src/src/f32-spmm/gen/f32-spmm-8vx1-minmax-rvv.c",
++    "src/src/f32-spmm/gen/f32-spmm-8vx2-minmax-rvv.c"
 +    ]
  
 -      deps = [
@@ -85081,33 +85035,22 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -    source_set("f16-dwconv2d-chw_arch=armv8.2-a+fp16") {
 -      cflags = [ "-march=armv8.2-a+fp16" ]
 +if (build_with_chromium) {
-+  source_set("f32-vbinary_riscv64") {
++  source_set("f32-spmm_riscv64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vbinary/gen/f32-vadd-scalar-u8.c",
-+    "src/src/f32-vbinary/gen/f32-vaddc-scalar-u8.c",
-+    "src/src/f32-vbinary/gen/f32-vdiv-scalar-u2.c",
-+    "src/src/f32-vbinary/gen/f32-vdivc-scalar-u2.c",
-+    "src/src/f32-vbinary/gen/f32-vmax-scalar-u8.c",
-+    "src/src/f32-vbinary/gen/f32-vmaxc-scalar-u8.c",
-+    "src/src/f32-vbinary/gen/f32-vmin-scalar-u8.c",
-+    "src/src/f32-vbinary/gen/f32-vminc-scalar-u8.c",
-+    "src/src/f32-vbinary/gen/f32-vmul-scalar-u8.c",
-+    "src/src/f32-vbinary/gen/f32-vmulc-scalar-u8.c",
-+    "src/src/f32-vbinary/gen/f32-vprelu-scalar-u8.c",
-+    "src/src/f32-vbinary/gen/f32-vpreluc-scalar-u8.c",
-+    "src/src/f32-vbinary/gen/f32-vrdivc-scalar-u2.c",
-+    "src/src/f32-vbinary/gen/f32-vrpreluc-scalar-u8.c",
-+    "src/src/f32-vbinary/gen/f32-vrsubc-scalar-u8.c",
-+    "src/src/f32-vbinary/gen/f32-vsqrdiff-scalar-u8.c",
-+    "src/src/f32-vbinary/gen/f32-vsqrdiffc-scalar-u8.c",
-+    "src/src/f32-vbinary/gen/f32-vsub-scalar-u8.c",
-+    "src/src/f32-vbinary/gen/f32-vsubc-scalar-u8.c"
++      "src/src/f32-spmm/gen/f32-spmm-8x1-minmax-scalar.c",
++    "src/src/f32-spmm/gen/f32-spmm-8x2-minmax-scalar.c",
++    "src/src/f32-spmm/gen/f32-spmm-8x4-minmax-scalar.c"
 +    ]
++
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
  
 -      sources = [
 -        "src/include/xnnpack.h",
@@ -85128,20 +85071,15 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -        "//third_party/fxdiv",
 -        "//third_party/pthreadpool",
 -      ]
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
- 
--      public_configs = [ ":xnnpack_public_config" ]
--    }
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
 +      "//third_party/fxdiv",
 +      "//third_party/pthreadpool",
 +    ]
-+
+ 
+-      public_configs = [ ":xnnpack_public_config" ]
+-    }
 +    public_configs = [ ":xnnpack_public_config" ]
    }
 +}
@@ -85152,32 +85090,16 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -      cflags = [ "-march=armv8.2-a+fp16" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vbinary_riscv64_standalone") {
++  source_set("f32-spmm_riscv64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vbinary/gen/f32-vadd-scalar-u8.c",
-+    "src/src/f32-vbinary/gen/f32-vaddc-scalar-u8.c",
-+    "src/src/f32-vbinary/gen/f32-vdiv-scalar-u2.c",
-+    "src/src/f32-vbinary/gen/f32-vdivc-scalar-u2.c",
-+    "src/src/f32-vbinary/gen/f32-vmax-scalar-u8.c",
-+    "src/src/f32-vbinary/gen/f32-vmaxc-scalar-u8.c",
-+    "src/src/f32-vbinary/gen/f32-vmin-scalar-u8.c",
-+    "src/src/f32-vbinary/gen/f32-vminc-scalar-u8.c",
-+    "src/src/f32-vbinary/gen/f32-vmul-scalar-u8.c",
-+    "src/src/f32-vbinary/gen/f32-vmulc-scalar-u8.c",
-+    "src/src/f32-vbinary/gen/f32-vprelu-scalar-u8.c",
-+    "src/src/f32-vbinary/gen/f32-vpreluc-scalar-u8.c",
-+    "src/src/f32-vbinary/gen/f32-vrdivc-scalar-u2.c",
-+    "src/src/f32-vbinary/gen/f32-vrpreluc-scalar-u8.c",
-+    "src/src/f32-vbinary/gen/f32-vrsubc-scalar-u8.c",
-+    "src/src/f32-vbinary/gen/f32-vsqrdiff-scalar-u8.c",
-+    "src/src/f32-vbinary/gen/f32-vsqrdiffc-scalar-u8.c",
-+    "src/src/f32-vbinary/gen/f32-vsub-scalar-u8.c",
-+    "src/src/f32-vbinary/gen/f32-vsubc-scalar-u8.c"
++      "src/src/f32-spmm/gen/f32-spmm-8x1-minmax-scalar.c",
++    "src/src/f32-spmm/gen/f32-spmm-8x2-minmax-scalar.c",
++    "src/src/f32-spmm/gen/f32-spmm-8x4-minmax-scalar.c"
 +    ]
  
 -      sources = [
@@ -85256,14 +85178,14 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -    source_set("f16-dwconv_arch=armv8.2-a+fp16_standalone") {
 -      cflags = [ "-march=armv8.2-a+fp16" ]
 +if (build_with_chromium) {
-+  source_set("f32-vclamp_riscv64") {
++  source_set("f32-vapproxgelu_riscv64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vclamp/gen/f32-vclamp-scalar.c"
++      "src/src/f32-vapproxgelu/gen/f32-vapproxgelu-scalar-rational-12-10-div.c"
 +    ]
  
 -      sources = [
@@ -85314,14 +85236,14 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vclamp_riscv64_standalone") {
++  source_set("f32-vapproxgelu_riscv64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vclamp/gen/f32-vclamp-scalar.c"
++      "src/src/f32-vapproxgelu/gen/f32-vapproxgelu-scalar-rational-12-10-div.c"
 +    ]
  
 -      sources = [
@@ -85366,7 +85288,7 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -    source_set("f16-f32-vcvt_arm64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("f32-vcmul_arch=rv64gcv-abi=lp64d") {
++  source_set("f32-vbinary_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gcv"
@@ -85374,7 +85296,22 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vcmul/gen/f32-vcmul-rvv-u2v.c"
++      "src/src/f32-vbinary/gen/f32-vadd-rvv-u8v.c",
++    "src/src/f32-vbinary/gen/f32-vaddc-rvv-u8v.c",
++    "src/src/f32-vbinary/gen/f32-vdiv-rvv-u8v.c",
++    "src/src/f32-vbinary/gen/f32-vdivc-rvv-u8v.c",
++    "src/src/f32-vbinary/gen/f32-vmax-rvv-u8v.c",
++    "src/src/f32-vbinary/gen/f32-vmaxc-rvv-u8v.c",
++    "src/src/f32-vbinary/gen/f32-vmin-rvv-u8v.c",
++    "src/src/f32-vbinary/gen/f32-vminc-rvv-u8v.c",
++    "src/src/f32-vbinary/gen/f32-vmul-rvv-u8v.c",
++    "src/src/f32-vbinary/gen/f32-vmulc-rvv-u8v.c",
++    "src/src/f32-vbinary/gen/f32-vrdivc-rvv-u8v.c",
++    "src/src/f32-vbinary/gen/f32-vrsubc-rvv-u8v.c",
++    "src/src/f32-vbinary/gen/f32-vsqrdiff-rvv-u8v.c",
++    "src/src/f32-vbinary/gen/f32-vsqrdiffc-rvv-u8v.c",
++    "src/src/f32-vbinary/gen/f32-vsub-rvv-u8v.c",
++    "src/src/f32-vbinary/gen/f32-vsubc-rvv-u8v.c"
 +    ]
  
 -      sources = [
@@ -85423,7 +85360,7 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -      cflags = [ "-march=armv8.2-a+fp16" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vcmul_arch=rv64gcv-abi=lp64d_standalone") {
++  source_set("f32-vbinary_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gcv"
@@ -85431,7 +85368,22 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vcmul/gen/f32-vcmul-rvv-u2v.c"
++      "src/src/f32-vbinary/gen/f32-vadd-rvv-u8v.c",
++    "src/src/f32-vbinary/gen/f32-vaddc-rvv-u8v.c",
++    "src/src/f32-vbinary/gen/f32-vdiv-rvv-u8v.c",
++    "src/src/f32-vbinary/gen/f32-vdivc-rvv-u8v.c",
++    "src/src/f32-vbinary/gen/f32-vmax-rvv-u8v.c",
++    "src/src/f32-vbinary/gen/f32-vmaxc-rvv-u8v.c",
++    "src/src/f32-vbinary/gen/f32-vmin-rvv-u8v.c",
++    "src/src/f32-vbinary/gen/f32-vminc-rvv-u8v.c",
++    "src/src/f32-vbinary/gen/f32-vmul-rvv-u8v.c",
++    "src/src/f32-vbinary/gen/f32-vmulc-rvv-u8v.c",
++    "src/src/f32-vbinary/gen/f32-vrdivc-rvv-u8v.c",
++    "src/src/f32-vbinary/gen/f32-vrsubc-rvv-u8v.c",
++    "src/src/f32-vbinary/gen/f32-vsqrdiff-rvv-u8v.c",
++    "src/src/f32-vbinary/gen/f32-vsqrdiffc-rvv-u8v.c",
++    "src/src/f32-vbinary/gen/f32-vsub-rvv-u8v.c",
++    "src/src/f32-vbinary/gen/f32-vsubc-rvv-u8v.c"
 +    ]
  
 -      sources = [
@@ -85474,14 +85426,32 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -    source_set("f16-f32acc-rdsum2_arch=armv8.2-a+fp16_standalone") {
 -      cflags = [ "-march=armv8.2-a+fp16" ]
 +if (build_with_chromium) {
-+  source_set("f32-vcmul_riscv64") {
++  source_set("f32-vbinary_riscv64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vcmul/gen/f32-vcmul-scalar-u4.c"
++      "src/src/f32-vbinary/gen/f32-vadd-scalar-u8.c",
++    "src/src/f32-vbinary/gen/f32-vaddc-scalar-u8.c",
++    "src/src/f32-vbinary/gen/f32-vdiv-scalar-u2.c",
++    "src/src/f32-vbinary/gen/f32-vdivc-scalar-u2.c",
++    "src/src/f32-vbinary/gen/f32-vmax-scalar-u8.c",
++    "src/src/f32-vbinary/gen/f32-vmaxc-scalar-u8.c",
++    "src/src/f32-vbinary/gen/f32-vmin-scalar-u8.c",
++    "src/src/f32-vbinary/gen/f32-vminc-scalar-u8.c",
++    "src/src/f32-vbinary/gen/f32-vmul-scalar-u8.c",
++    "src/src/f32-vbinary/gen/f32-vmulc-scalar-u8.c",
++    "src/src/f32-vbinary/gen/f32-vprelu-scalar-u8.c",
++    "src/src/f32-vbinary/gen/f32-vpreluc-scalar-u8.c",
++    "src/src/f32-vbinary/gen/f32-vrdivc-scalar-u2.c",
++    "src/src/f32-vbinary/gen/f32-vrpreluc-scalar-u8.c",
++    "src/src/f32-vbinary/gen/f32-vrsubc-scalar-u8.c",
++    "src/src/f32-vbinary/gen/f32-vsqrdiff-scalar-u8.c",
++    "src/src/f32-vbinary/gen/f32-vsqrdiffc-scalar-u8.c",
++    "src/src/f32-vbinary/gen/f32-vsub-scalar-u8.c",
++    "src/src/f32-vbinary/gen/f32-vsubc-scalar-u8.c"
 +    ]
  
 -      sources = [
@@ -85528,14 +85498,32 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -      cflags = [ "-march=armv8.2-a+fp16" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vcmul_riscv64_standalone") {
++  source_set("f32-vbinary_riscv64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vcmul/gen/f32-vcmul-scalar-u4.c"
++      "src/src/f32-vbinary/gen/f32-vadd-scalar-u8.c",
++    "src/src/f32-vbinary/gen/f32-vaddc-scalar-u8.c",
++    "src/src/f32-vbinary/gen/f32-vdiv-scalar-u2.c",
++    "src/src/f32-vbinary/gen/f32-vdivc-scalar-u2.c",
++    "src/src/f32-vbinary/gen/f32-vmax-scalar-u8.c",
++    "src/src/f32-vbinary/gen/f32-vmaxc-scalar-u8.c",
++    "src/src/f32-vbinary/gen/f32-vmin-scalar-u8.c",
++    "src/src/f32-vbinary/gen/f32-vminc-scalar-u8.c",
++    "src/src/f32-vbinary/gen/f32-vmul-scalar-u8.c",
++    "src/src/f32-vbinary/gen/f32-vmulc-scalar-u8.c",
++    "src/src/f32-vbinary/gen/f32-vprelu-scalar-u8.c",
++    "src/src/f32-vbinary/gen/f32-vpreluc-scalar-u8.c",
++    "src/src/f32-vbinary/gen/f32-vrdivc-scalar-u2.c",
++    "src/src/f32-vbinary/gen/f32-vrpreluc-scalar-u8.c",
++    "src/src/f32-vbinary/gen/f32-vrsubc-scalar-u8.c",
++    "src/src/f32-vbinary/gen/f32-vsqrdiff-scalar-u8.c",
++    "src/src/f32-vbinary/gen/f32-vsqrdiffc-scalar-u8.c",
++    "src/src/f32-vbinary/gen/f32-vsub-scalar-u8.c",
++    "src/src/f32-vbinary/gen/f32-vsubc-scalar-u8.c"
 +    ]
  
 -      sources = [
@@ -85578,16 +85566,14 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -    source_set("f16-f32acc-rdsum_arch=armv8.2-a+fp16_standalone") {
 -      cflags = [ "-march=armv8.2-a+fp16" ]
 +if (build_with_chromium) {
-+  source_set("f32-vcopysign_riscv64") {
++  source_set("f32-vclamp_riscv64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vcopysign/gen/f32-vcopysign-scalar.c",
-+    "src/src/f32-vcopysign/gen/f32-vcopysignc-scalar.c",
-+    "src/src/f32-vcopysign/gen/f32-vrcopysignc-scalar.c"
++      "src/src/f32-vclamp/gen/f32-vclamp-scalar.c"
 +    ]
  
 -      sources = [
@@ -85643,16 +85629,14 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -      configs += [ ":xnnpack_private_config" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vcopysign_riscv64_standalone") {
++  source_set("f32-vclamp_riscv64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vcopysign/gen/f32-vcopysign-scalar.c",
-+    "src/src/f32-vcopysign/gen/f32-vcopysignc-scalar.c",
-+    "src/src/f32-vcopysign/gen/f32-vrcopysignc-scalar.c"
++      "src/src/f32-vclamp/gen/f32-vclamp-scalar.c"
 +    ]
  
 -      deps = [
@@ -85719,14 +85703,15 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -        "src/src/f16-f32acc-rsum/gen/f16-f32acc-rsum-neonfp16arith-u32-acc4.c",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f32-vcos_riscv64") {
++  source_set("f32-vcmul_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vcos/gen/f32-vcos-scalar-rational-5-4-div.c"
++      "src/src/f32-vcmul/gen/f32-vcmul-rvv-u2v.c"
 +    ]
  
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -85763,14 +85748,15 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -      cflags = [ "-march=armv8.2-a+fp16" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vcos_riscv64_standalone") {
++  source_set("f32-vcmul_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vcos/gen/f32-vcos-scalar-rational-5-4-div.c"
++      "src/src/f32-vcmul/gen/f32-vcmul-rvv-u2v.c"
 +    ]
  
 -      sources = [
@@ -85845,14 +85831,14 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -    source_set("f16-gemm_arch=armv8.2-a+fp16_standalone") {
 -      cflags = [ "-march=armv8.2-a+fp16" ]
 +if (build_with_chromium) {
-+  source_set("f32-velu_riscv64") {
++  source_set("f32-vcmul_riscv64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-velu/gen/f32-velu-scalar-rr2-lut16-p3-u4.c"
++      "src/src/f32-vcmul/gen/f32-vcmul-scalar-u4.c"
 +    ]
  
 -      sources = [
@@ -85902,14 +85888,14 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -      cflags = [ "-march=armv8.2-a+fp16+dotprod" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-velu_riscv64_standalone") {
++  source_set("f32-vcmul_riscv64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-velu/gen/f32-velu-scalar-rr2-lut16-p3-u4.c"
++      "src/src/f32-vcmul/gen/f32-vcmul-scalar-u4.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -85960,22 +85946,31 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -    source_set("f16-gemm_arch=armv8.2-a+fp16+dotprod_standalone") {
 -      cflags = [ "-march=armv8.2-a+fp16+dotprod" ]
 +if (build_with_chromium) {
-+  source_set("f32-vexp_riscv64") {
++  source_set("f32-vcopysign_riscv64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vexp/gen/f32-vexp-scalar-rational-3-2-div.c"
++      "src/src/f32-vcopysign/gen/f32-vcopysign-scalar.c",
++    "src/src/f32-vcopysign/gen/f32-vcopysignc-scalar.c",
++    "src/src/f32-vcopysign/gen/f32-vrcopysignc-scalar.c"
 +    ]
- 
--      asmflags = cflags
++
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
 +    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 +    configs += [ ":xnnpack_private_config" ]
  
+-      asmflags = cflags
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool",
++    ]
+ 
 -      sources = [
 -        "src/include/xnnpack.h",
 -        "src/src/f16-gemm/gen/f16-gemm-1x16-minmax-asm-aarch64-neonfp16arith-ld64.S",
@@ -86004,13 +85999,6 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -        assert_no_deps = [ "//base" ]
 -      }
 -    }
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool",
-+    ]
-+
 +    public_configs = [ ":xnnpack_public_config" ]
    }
 +}
@@ -86020,14 +86008,16 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -      cflags = [ "-march=armv8.2-a+fp16" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vexp_riscv64_standalone") {
++  source_set("f32-vcopysign_riscv64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vexp/gen/f32-vexp-scalar-rational-3-2-div.c"
++      "src/src/f32-vcopysign/gen/f32-vcopysign-scalar.c",
++    "src/src/f32-vcopysign/gen/f32-vcopysignc-scalar.c",
++    "src/src/f32-vcopysign/gen/f32-vrcopysignc-scalar.c"
 +    ]
  
 -      sources = [
@@ -86070,14 +86060,14 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -    source_set("f16-ibilinear-chw_arch=armv8.2-a+fp16_standalone") {
 -      cflags = [ "-march=armv8.2-a+fp16" ]
 +if (build_with_chromium) {
-+  source_set("f32-vgelu_riscv64") {
++  source_set("f32-vcos_riscv64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vgelu/gen/f32-vgelu-scalar-rational-12-10-div.c"
++      "src/src/f32-vcos/gen/f32-vcos-scalar-rational-5-4-div.c"
 +    ]
  
 -      sources = [
@@ -86133,14 +86123,14 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -      configs += [ ":xnnpack_private_config" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vgelu_riscv64_standalone") {
++  source_set("f32-vcos_riscv64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vgelu/gen/f32-vgelu-scalar-rational-12-10-div.c"
++      "src/src/f32-vcos/gen/f32-vcos-scalar-rational-5-4-div.c"
 +    ]
  
 -      deps = [
@@ -86222,15 +86212,14 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f32-vhswish_arch=rv64gcv-abi=lp64d") {
++  source_set("f32-velu_riscv64") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vhswish/gen/f32-vhswish-rvv-u4v.c"
++      "src/src/f32-velu/gen/f32-velu-scalar-rr2-lut16-p3-u4.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -86287,23 +86276,29 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -      cflags = [ "-march=armv8.2-a+fp16+dotprod" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vhswish_arch=rv64gcv-abi=lp64d_standalone") {
++  source_set("f32-velu_riscv64_standalone") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vhswish/gen/f32-vhswish-rvv-u4v.c"
++      "src/src/f32-velu/gen/f32-velu-scalar-rr2-lut16-p3-u4.c"
 +    ]
- 
--      asmflags = cflags
++
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
 +    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 +    configs += [ ":xnnpack_private_config" ]
  
+-      asmflags = cflags
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool:pthreadpool_standalone",
++    ]
+ 
 -      sources = [
 -        "src/include/xnnpack.h",
 -        "src/src/f16-igemm/f16-igemm-1x16-minmax-asm-aarch64-neonfp16arith-ld64.S",
@@ -86325,13 +86320,6 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -        "//third_party/fxdiv",
 -        "//third_party/pthreadpool",
 -      ]
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool:pthreadpool_standalone",
-+    ]
-+
 +    public_configs = [ ":xnnpack_public_config" ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -86346,14 +86334,14 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -    source_set("f16-igemm_arch=armv8.2-a+fp16+dotprod_standalone") {
 -      cflags = [ "-march=armv8.2-a+fp16+dotprod" ]
 +if (build_with_chromium) {
-+  source_set("f32-vhswish_riscv64") {
++  source_set("f32-vexp_riscv64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vhswish/gen/f32-vhswish-scalar.c"
++      "src/src/f32-vexp/gen/f32-vexp-scalar-rational-3-2-div.c"
 +    ]
  
 -      asmflags = cflags
@@ -86406,14 +86394,14 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -      cflags = [ "-march=armv8.2-a+fp16" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vhswish_riscv64_standalone") {
++  source_set("f32-vexp_riscv64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vhswish/gen/f32-vhswish-scalar.c"
++      "src/src/f32-vexp/gen/f32-vexp-scalar-rational-3-2-div.c"
 +    ]
  
 -      sources = [
@@ -86456,14 +86444,14 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -    source_set("f16-maxpool_arch=armv8.2-a+fp16_standalone") {
 -      cflags = [ "-march=armv8.2-a+fp16" ]
 +if (build_with_chromium) {
-+  source_set("f32-vlog_riscv64") {
++  source_set("f32-vgelu_riscv64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vlog/gen/f32-vlog-scalar-rational-3-3-div.c"
++      "src/src/f32-vgelu/gen/f32-vgelu-scalar-rational-12-10-div.c"
 +    ]
  
 -      sources = [
@@ -86510,14 +86498,14 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -      cflags = [ "-march=armv8.2-a+fp16" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vlog_riscv64_standalone") {
++  source_set("f32-vgelu_riscv64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vlog/gen/f32-vlog-scalar-rational-3-3-div.c"
++      "src/src/f32-vgelu/gen/f32-vgelu-scalar-rational-12-10-div.c"
 +    ]
  
 -      sources = [
@@ -86560,7 +86548,7 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -    source_set("f16-qs8-vcvt_arch=armv8.2-a+fp16_standalone") {
 -      cflags = [ "-march=armv8.2-a+fp16" ]
 +if (build_with_chromium) {
-+  source_set("f32-vlrelu_arch=rv64gcv-abi=lp64d") {
++  source_set("f32-vhswish_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gcv"
@@ -86568,7 +86556,7 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vlrelu/gen/f32-vlrelu-rvv-u4v.c"
++      "src/src/f32-vhswish/gen/f32-vhswish-rvv-u4v.c"
 +    ]
  
 -      sources = [
@@ -86594,37 +86582,28 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -        assert_no_deps = [ "//base" ]
 -      }
 -    }
--  }
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
 +    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 +    configs += [ ":xnnpack_private_config" ]
- 
--  if (build_with_chromium) {
--    source_set("f16-qs8-vcvt_arm64") {
--      cflags = []
++
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
 +      "//third_party/fxdiv",
 +      "//third_party/pthreadpool",
 +    ]
- 
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/f16-qs8-vcvt/gen/f16-qs8-vcvt-scalar-imagic-u4.c",
--      ]
++
 +    public_configs = [ ":xnnpack_public_config" ]
-+  }
+   }
 +}
  
--      configs -= [ "//build/config/compiler:chromium_code" ]
--      configs += [ "//build/config/compiler:no_chromium_code" ]
--      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
--      configs += [ ":xnnpack_private_config" ]
+-  if (build_with_chromium) {
+-    source_set("f16-qs8-vcvt_arm64") {
+-      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vlrelu_arch=rv64gcv-abi=lp64d_standalone") {
++  source_set("f32-vhswish_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gcv"
@@ -86632,23 +86611,22 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vlrelu/gen/f32-vlrelu-rvv-u4v.c"
++      "src/src/f32-vhswish/gen/f32-vhswish-rvv-u4v.c"
 +    ]
  
--      deps = [
--        "//third_party/cpuinfo",
--        "//third_party/fp16",
--        "//third_party/fxdiv",
--        "//third_party/pthreadpool",
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/f16-qs8-vcvt/gen/f16-qs8-vcvt-scalar-imagic-u4.c",
 -      ]
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
 +    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 +    configs += [ ":xnnpack_private_config" ]
  
--      public_configs = [ ":xnnpack_public_config" ]
--    }
--  }
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
@@ -86656,11 +86634,35 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 +      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
  
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/fp16",
+-        "//third_party/fxdiv",
+-        "//third_party/pthreadpool",
+-      ]
++    public_configs = [ ":xnnpack_public_config" ]
+ 
+-      public_configs = [ ":xnnpack_public_config" ]
++    if (!(is_android && use_order_profiling)) {
++      assert_no_deps = [ "//base" ]
+     }
+   }
++}
+ 
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
 -    source_set("f16-qs8-vcvt_arm64_standalone") {
 -      cflags = []
-+    public_configs = [ ":xnnpack_public_config" ]
++if (build_with_chromium) {
++  source_set("f32-vhswish_riscv64") {
++    cflags = [
++  
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/f32-vhswish/gen/f32-vhswish-scalar.c"
++    ]
  
 -      sources = [
 -        "src/include/xnnpack.h",
@@ -86684,55 +86686,93 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -      if (!(is_android && use_order_profiling)) {
 -        assert_no_deps = [ "//base" ]
 -      }
-+    if (!(is_android && use_order_profiling)) {
-+      assert_no_deps = [ "//base" ]
-     }
+-    }
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
++
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool",
++    ]
++
++    public_configs = [ ":xnnpack_public_config" ]
    }
 +}
  
 -  if (build_with_chromium) {
 -    source_set("f16-qu8-vcvt_arm64") {
 -      cflags = []
--
++# This is a target that cannot depend on //base.
++if (build_with_internal_optimization_guide) {
++  source_set("f32-vhswish_riscv64_standalone") {
++    cflags = [
++  
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/f32-vhswish/gen/f32-vhswish-scalar.c"
++    ]
+ 
 -      sources = [
 -        "src/include/xnnpack.h",
 -        "src/src/f16-qu8-vcvt/gen/f16-qu8-vcvt-scalar-imagic-u4.c",
 -      ]
--
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
+ 
 -      configs -= [ "//build/config/compiler:chromium_code" ]
 -      configs += [ "//build/config/compiler:no_chromium_code" ]
 -      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 -      configs += [ ":xnnpack_private_config" ]
--
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool:pthreadpool_standalone",
++    ]
+ 
 -      deps = [
 -        "//third_party/cpuinfo",
 -        "//third_party/fp16",
 -        "//third_party/fxdiv",
 -        "//third_party/pthreadpool",
 -      ]
++    public_configs = [ ":xnnpack_public_config" ]
+ 
+-      public_configs = [ ":xnnpack_public_config" ]
++    if (!(is_android && use_order_profiling)) {
++      assert_no_deps = [ "//base" ]
+     }
+   }
++}
+ 
+-  # This is a target that cannot depend on //base.
+-  if (build_with_internal_optimization_guide) {
+-    source_set("f16-qu8-vcvt_arm64_standalone") {
+-      cflags = []
 +if (build_with_chromium) {
-+  source_set("f32-vlrelu_riscv64") {
++  source_set("f32-vlog_riscv64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vlrelu/gen/f32-vlrelu-scalar-u4.c"
++      "src/src/f32-vlog/gen/f32-vlog-scalar-rational-3-3-div.c"
 +    ]
- 
--      public_configs = [ ":xnnpack_public_config" ]
--    }
--  }
++
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
 +    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 +    configs += [ ":xnnpack_private_config" ]
- 
--  # This is a target that cannot depend on //base.
--  if (build_with_internal_optimization_guide) {
--    source_set("f16-qu8-vcvt_arm64_standalone") {
--      cflags = []
++
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
@@ -86772,14 +86812,14 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -      cflags = [ "-march=armv8.2-a+fp16" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vlrelu_riscv64_standalone") {
++  source_set("f32-vlog_riscv64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vlrelu/gen/f32-vlrelu-scalar-u4.c"
++      "src/src/f32-vlog/gen/f32-vlog-scalar-rational-3-3-div.c"
 +    ]
  
 -      sources = [
@@ -86822,14 +86862,15 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -    source_set("f16-raddstoreexpminusmax_arch=armv8.2-a+fp16_standalone") {
 -      cflags = [ "-march=armv8.2-a+fp16" ]
 +if (build_with_chromium) {
-+  source_set("f32-vmulcaddc_riscv64") {
++  source_set("f32-vlrelu_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vmulcaddc/gen/f32-vmulcaddc-c1-minmax-scalar-2x.c"
++      "src/src/f32-vlrelu/gen/f32-vlrelu-rvv-u4v.c"
 +    ]
  
 -      sources = [
@@ -86886,14 +86927,15 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -      configs += [ ":xnnpack_private_config" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vmulcaddc_riscv64_standalone") {
++  source_set("f32-vlrelu_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vmulcaddc/gen/f32-vmulcaddc-c1-minmax-scalar-2x.c"
++      "src/src/f32-vlrelu/gen/f32-vlrelu-rvv-u4v.c"
 +    ]
  
 -      deps = [
@@ -86974,18 +87016,14 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f32-vrnd_arch=rv64gcv-abi=lp64d") {
++  source_set("f32-vlrelu_riscv64") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vrnd/gen/f32-vrndd-rvv-u4v.c",
-+    "src/src/f32-vrnd/gen/f32-vrndne-rvv-u4v.c",
-+    "src/src/f32-vrnd/gen/f32-vrndu-rvv-u4v.c",
-+    "src/src/f32-vrnd/gen/f32-vrndz-rvv-u4v.c"
++      "src/src/f32-vlrelu/gen/f32-vlrelu-scalar-u4.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -87040,18 +87078,14 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -      cflags = [ "-march=armv8.2-a+fp16" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vrnd_arch=rv64gcv-abi=lp64d_standalone") {
++  source_set("f32-vlrelu_riscv64_standalone") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vrnd/gen/f32-vrndd-rvv-u4v.c",
-+    "src/src/f32-vrnd/gen/f32-vrndne-rvv-u4v.c",
-+    "src/src/f32-vrnd/gen/f32-vrndu-rvv-u4v.c",
-+    "src/src/f32-vrnd/gen/f32-vrndz-rvv-u4v.c"
++      "src/src/f32-vlrelu/gen/f32-vlrelu-scalar-u4.c"
 +    ]
  
 -      sources = [
@@ -87096,17 +87130,14 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -    source_set("f16-rminmax_arch=armv8.2-a+fp16_standalone") {
 -      cflags = [ "-march=armv8.2-a+fp16" ]
 +if (build_with_chromium) {
-+  source_set("f32-vrnd_riscv64") {
++  source_set("f32-vmulcaddc_riscv64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vrnd/gen/f32-vrndd-scalar-libm-u1.c",
-+    "src/src/f32-vrnd/gen/f32-vrndne-scalar-libm-u1.c",
-+    "src/src/f32-vrnd/gen/f32-vrndu-scalar-libm-u1.c",
-+    "src/src/f32-vrnd/gen/f32-vrndz-scalar-libm-u1.c"
++      "src/src/f32-vmulcaddc/gen/f32-vmulcaddc-c1-minmax-scalar-2x.c"
 +    ]
  
 -      sources = [
@@ -87166,17 +87197,14 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -      configs += [ ":xnnpack_private_config" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vrnd_riscv64_standalone") {
++  source_set("f32-vmulcaddc_riscv64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vrnd/gen/f32-vrndd-scalar-libm-u1.c",
-+    "src/src/f32-vrnd/gen/f32-vrndne-scalar-libm-u1.c",
-+    "src/src/f32-vrnd/gen/f32-vrndu-scalar-libm-u1.c",
-+    "src/src/f32-vrnd/gen/f32-vrndz-scalar-libm-u1.c"
++      "src/src/f32-vmulcaddc/gen/f32-vmulcaddc-c1-minmax-scalar-2x.c"
 +    ]
  
 -      deps = [
@@ -87257,7 +87285,7 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f32-vrsqrt_arch=rv64gcv-abi=lp64d") {
++  source_set("f32-vrnd_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gcv"
@@ -87265,7 +87293,10 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vrsqrt/gen/f32-vrsqrt-rvv-rsqrt-u4v.c"
++      "src/src/f32-vrnd/gen/f32-vrndd-rvv-u4v.c",
++    "src/src/f32-vrnd/gen/f32-vrndne-rvv-u4v.c",
++    "src/src/f32-vrnd/gen/f32-vrndu-rvv-u4v.c",
++    "src/src/f32-vrnd/gen/f32-vrndz-rvv-u4v.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -87319,7 +87350,7 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -      cflags = [ "-march=armv8.2-a+fp16" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vrsqrt_arch=rv64gcv-abi=lp64d_standalone") {
++  source_set("f32-vrnd_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gcv"
@@ -87327,7 +87358,10 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vrsqrt/gen/f32-vrsqrt-rvv-rsqrt-u4v.c"
++      "src/src/f32-vrnd/gen/f32-vrndd-rvv-u4v.c",
++    "src/src/f32-vrnd/gen/f32-vrndne-rvv-u4v.c",
++    "src/src/f32-vrnd/gen/f32-vrndu-rvv-u4v.c",
++    "src/src/f32-vrnd/gen/f32-vrndz-rvv-u4v.c"
 +    ]
  
 -      sources = [
@@ -87370,15 +87404,17 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -    source_set("f16-vapproxgelu_arch=armv8.2-a+fp16_standalone") {
 -      cflags = [ "-march=armv8.2-a+fp16" ]
 +if (build_with_chromium) {
-+  source_set("f32-vrsqrt_riscv64") {
++  source_set("f32-vrnd_riscv64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vrsqrt/gen/f32-vrsqrt-scalar-rsqrt-u1.c",
-+    "src/src/f32-vrsqrt/gen/f32-vrsqrt-scalar-sqrt.c"
++      "src/src/f32-vrnd/gen/f32-vrndd-scalar-libm-u1.c",
++    "src/src/f32-vrnd/gen/f32-vrndne-scalar-libm-u1.c",
++    "src/src/f32-vrnd/gen/f32-vrndu-scalar-libm-u1.c",
++    "src/src/f32-vrnd/gen/f32-vrndz-scalar-libm-u1.c"
 +    ]
  
 -      sources = [
@@ -87434,15 +87470,17 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -      configs += [ ":xnnpack_private_config" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vrsqrt_riscv64_standalone") {
++  source_set("f32-vrnd_riscv64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vrsqrt/gen/f32-vrsqrt-scalar-rsqrt-u1.c",
-+    "src/src/f32-vrsqrt/gen/f32-vrsqrt-scalar-sqrt.c"
++      "src/src/f32-vrnd/gen/f32-vrndd-scalar-libm-u1.c",
++    "src/src/f32-vrnd/gen/f32-vrndne-scalar-libm-u1.c",
++    "src/src/f32-vrnd/gen/f32-vrndu-scalar-libm-u1.c",
++    "src/src/f32-vrnd/gen/f32-vrndz-scalar-libm-u1.c"
 +    ]
  
 -      deps = [
@@ -87542,14 +87580,15 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f32-vsigmoid_riscv64") {
++  source_set("f32-vrsqrt_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vsigmoid/gen/f32-vsigmoid-scalar-rr2-lut64-p2-div-u2.c"
++      "src/src/f32-vrsqrt/gen/f32-vrsqrt-rvv-rsqrt-u4v.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -87624,14 +87663,15 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -      cflags = [ "-march=armv8.2-a+fp16" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vsigmoid_riscv64_standalone") {
++  source_set("f32-vrsqrt_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vsigmoid/gen/f32-vsigmoid-scalar-rr2-lut64-p2-div-u2.c"
++      "src/src/f32-vrsqrt/gen/f32-vrsqrt-rvv-rsqrt-u4v.c"
 +    ]
  
 -      sources = [
@@ -87674,14 +87714,15 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -    source_set("f16-vclamp_arch=armv8.2-a+fp16_standalone") {
 -      cflags = [ "-march=armv8.2-a+fp16" ]
 +if (build_with_chromium) {
-+  source_set("f32-vsin_riscv64") {
++  source_set("f32-vrsqrt_riscv64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vsin/gen/f32-vsin-scalar-rational-5-4-div.c"
++      "src/src/f32-vrsqrt/gen/f32-vrsqrt-scalar-rsqrt-u1.c",
++    "src/src/f32-vrsqrt/gen/f32-vrsqrt-scalar-sqrt.c"
 +    ]
  
 -      sources = [
@@ -87737,14 +87778,15 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -      configs += [ ":xnnpack_private_config" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vsin_riscv64_standalone") {
++  source_set("f32-vrsqrt_riscv64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vsin/gen/f32-vsin-scalar-rational-5-4-div.c"
++      "src/src/f32-vrsqrt/gen/f32-vrsqrt-scalar-rsqrt-u1.c",
++    "src/src/f32-vrsqrt/gen/f32-vrsqrt-scalar-sqrt.c"
 +    ]
  
 -      deps = [
@@ -87823,14 +87865,14 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f32-vsqrt_riscv64") {
++  source_set("f32-vsigmoid_riscv64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vsqrt/gen/f32-vsqrt-scalar-sqrt.c"
++      "src/src/f32-vsigmoid/gen/f32-vsigmoid-scalar-rr2-lut64-p2-div-u2.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -87884,14 +87926,14 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vsqrt_riscv64_standalone") {
++  source_set("f32-vsigmoid_riscv64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vsqrt/gen/f32-vsqrt-scalar-sqrt.c"
++      "src/src/f32-vsigmoid/gen/f32-vsigmoid-scalar-rr2-lut64-p2-div-u2.c"
 +    ]
  
 -      sources = [
@@ -87934,14 +87976,14 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -    source_set("f16-vcos_arm64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("f32-vtanh_riscv64") {
++  source_set("f32-vsin_riscv64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vtanh/gen/f32-vtanh-scalar-rational-9-8-div.c"
++      "src/src/f32-vsin/gen/f32-vsin-scalar-rational-5-4-div.c"
 +    ]
  
 -      sources = [
@@ -87997,14 +88039,14 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -      configs += [ ":xnnpack_private_config" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vtanh_riscv64_standalone") {
++  source_set("f32-vsin_riscv64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vtanh/gen/f32-vtanh-scalar-rational-9-8-div.c"
++      "src/src/f32-vsin/gen/f32-vsin-scalar-rational-5-4-div.c"
 +    ]
  
 -      deps = [
@@ -88083,16 +88125,14 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f32-vunary_riscv64") {
++  source_set("f32-vsqrt_riscv64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vunary/gen/f32-vabs-scalar.c",
-+    "src/src/f32-vunary/gen/f32-vneg-scalar.c",
-+    "src/src/f32-vunary/gen/f32-vsqr-scalar.c"
++      "src/src/f32-vsqrt/gen/f32-vsqrt-scalar-sqrt.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -88146,16 +88186,14 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vunary_riscv64_standalone") {
++  source_set("f32-vsqrt_riscv64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vunary/gen/f32-vabs-scalar.c",
-+    "src/src/f32-vunary/gen/f32-vneg-scalar.c",
-+    "src/src/f32-vunary/gen/f32-vsqr-scalar.c"
++      "src/src/f32-vsqrt/gen/f32-vsqrt-scalar-sqrt.c"
 +    ]
  
 -      sources = [
@@ -88198,34 +88236,14 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -    source_set("f16-vexp_arm64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("operators_riscv64") {
++  source_set("f32-vtanh_riscv64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/operators/argmax-pooling-nhwc.c",
-+    "src/src/operators/average-pooling-nhwc.c",
-+    "src/src/operators/batch-matrix-multiply-nc.c",
-+    "src/src/operators/binary-elementwise-nd.c",
-+    "src/src/operators/constant-pad-nd.c",
-+    "src/src/operators/convolution-nchw.c",
-+    "src/src/operators/convolution-nhwc.c",
-+    "src/src/operators/deconvolution-nhwc.c",
-+    "src/src/operators/dynamic-fully-connected-nc.c",
-+    "src/src/operators/fully-connected-nc.c",
-+    "src/src/operators/max-pooling-nhwc.c",
-+    "src/src/operators/pack-lh.c",
-+    "src/src/operators/reduce-nd.c",
-+    "src/src/operators/resize-bilinear-nchw.c",
-+    "src/src/operators/resize-bilinear-nhwc.c",
-+    "src/src/operators/rope-nthc.c",
-+    "src/src/operators/slice-nd.c",
-+    "src/src/operators/softmax-nc.c",
-+    "src/src/operators/transpose-nd.c",
-+    "src/src/operators/unary-elementwise-nc.c",
-+    "src/src/operators/unpooling-nhwc.c"
++      "src/src/f32-vtanh/gen/f32-vtanh-scalar-rational-9-8-div.c"
 +    ]
  
 -      sources = [
@@ -88281,34 +88299,14 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -      configs += [ ":xnnpack_private_config" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("operators_riscv64_standalone") {
++  source_set("f32-vtanh_riscv64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/operators/argmax-pooling-nhwc.c",
-+    "src/src/operators/average-pooling-nhwc.c",
-+    "src/src/operators/batch-matrix-multiply-nc.c",
-+    "src/src/operators/binary-elementwise-nd.c",
-+    "src/src/operators/constant-pad-nd.c",
-+    "src/src/operators/convolution-nchw.c",
-+    "src/src/operators/convolution-nhwc.c",
-+    "src/src/operators/deconvolution-nhwc.c",
-+    "src/src/operators/dynamic-fully-connected-nc.c",
-+    "src/src/operators/fully-connected-nc.c",
-+    "src/src/operators/max-pooling-nhwc.c",
-+    "src/src/operators/pack-lh.c",
-+    "src/src/operators/reduce-nd.c",
-+    "src/src/operators/resize-bilinear-nchw.c",
-+    "src/src/operators/resize-bilinear-nhwc.c",
-+    "src/src/operators/rope-nthc.c",
-+    "src/src/operators/slice-nd.c",
-+    "src/src/operators/softmax-nc.c",
-+    "src/src/operators/transpose-nd.c",
-+    "src/src/operators/unary-elementwise-nc.c",
-+    "src/src/operators/unpooling-nhwc.c"
++      "src/src/f32-vtanh/gen/f32-vtanh-scalar-rational-9-8-div.c"
 +    ]
  
 -      deps = [
@@ -88387,15 +88385,16 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("qd8-f32-qb4w-gemm_riscv64") {
++  source_set("f32-vunary_riscv64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qd8-f32-qb4w-gemm/gen/qd8-f32-qb4w-gemm-1x4-minmax-scalar.c",
-+    "src/src/qd8-f32-qb4w-gemm/gen/qd8-f32-qb4w-gemm-4x4-minmax-scalar.c"
++      "src/src/f32-vunary/gen/f32-vabs-scalar.c",
++    "src/src/f32-vunary/gen/f32-vneg-scalar.c",
++    "src/src/f32-vunary/gen/f32-vsqr-scalar.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -88449,15 +88448,16 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -      cflags = [ "-march=armv8.2-a+fp16" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qd8-f32-qb4w-gemm_riscv64_standalone") {
++  source_set("f32-vunary_riscv64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qd8-f32-qb4w-gemm/gen/qd8-f32-qb4w-gemm-1x4-minmax-scalar.c",
-+    "src/src/qd8-f32-qb4w-gemm/gen/qd8-f32-qb4w-gemm-4x4-minmax-scalar.c"
++      "src/src/f32-vunary/gen/f32-vabs-scalar.c",
++    "src/src/f32-vunary/gen/f32-vneg-scalar.c",
++    "src/src/f32-vunary/gen/f32-vsqr-scalar.c"
 +    ]
  
 -      sources = [
@@ -88500,16 +88500,36 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -    source_set("f16-vhswish_arch=armv8.2-a+fp16_standalone") {
 -      cflags = [ "-march=armv8.2-a+fp16" ]
 +if (build_with_chromium) {
-+  source_set("qd8-f32-qc4w-gemm_arch=rv64gcv-abi=lp64d") {
++  source_set("operators_riscv64") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-1x4v-minmax-rvv.c",
-+    "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-4x4v-minmax-rvv.c"
++      "src/src/operators/argmax-pooling-nhwc.c",
++    "src/src/operators/average-pooling-nhwc.c",
++    "src/src/operators/batch-matrix-multiply-nc.c",
++    "src/src/operators/binary-elementwise-nd.c",
++    "src/src/operators/constant-pad-nd.c",
++    "src/src/operators/convolution-nchw.c",
++    "src/src/operators/convolution-nhwc.c",
++    "src/src/operators/deconvolution-nhwc.c",
++    "src/src/operators/dynamic-fully-connected-nc.c",
++    "src/src/operators/fingerprint_cache.c",
++    "src/src/operators/fingerprint_id.c",
++    "src/src/operators/fully-connected-nc.c",
++    "src/src/operators/max-pooling-nhwc.c",
++    "src/src/operators/pack-lh.c",
++    "src/src/operators/reduce-nd.c",
++    "src/src/operators/resize-bilinear-nchw.c",
++    "src/src/operators/resize-bilinear-nhwc.c",
++    "src/src/operators/rope-nthc.c",
++    "src/src/operators/slice-nd.c",
++    "src/src/operators/softmax-nc.c",
++    "src/src/operators/transpose-nd.c",
++    "src/src/operators/unary-elementwise-nc.c",
++    "src/src/operators/unpooling-nhwc.c"
 +    ]
  
 -      sources = [
@@ -88565,16 +88585,36 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -      configs += [ ":xnnpack_private_config" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qd8-f32-qc4w-gemm_arch=rv64gcv-abi=lp64d_standalone") {
++  source_set("operators_riscv64_standalone") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-1x4v-minmax-rvv.c",
-+    "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-4x4v-minmax-rvv.c"
++      "src/src/operators/argmax-pooling-nhwc.c",
++    "src/src/operators/average-pooling-nhwc.c",
++    "src/src/operators/batch-matrix-multiply-nc.c",
++    "src/src/operators/binary-elementwise-nd.c",
++    "src/src/operators/constant-pad-nd.c",
++    "src/src/operators/convolution-nchw.c",
++    "src/src/operators/convolution-nhwc.c",
++    "src/src/operators/deconvolution-nhwc.c",
++    "src/src/operators/dynamic-fully-connected-nc.c",
++    "src/src/operators/fingerprint_cache.c",
++    "src/src/operators/fingerprint_id.c",
++    "src/src/operators/fully-connected-nc.c",
++    "src/src/operators/max-pooling-nhwc.c",
++    "src/src/operators/pack-lh.c",
++    "src/src/operators/reduce-nd.c",
++    "src/src/operators/resize-bilinear-nchw.c",
++    "src/src/operators/resize-bilinear-nhwc.c",
++    "src/src/operators/rope-nthc.c",
++    "src/src/operators/slice-nd.c",
++    "src/src/operators/softmax-nc.c",
++    "src/src/operators/transpose-nd.c",
++    "src/src/operators/unary-elementwise-nc.c",
++    "src/src/operators/unpooling-nhwc.c"
 +    ]
  
 -      deps = [
@@ -88640,42 +88680,33 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -        "src/include/xnnpack.h",
 -        "src/src/f16-vmulcaddc/gen/f16-vmulcaddc-c8-minmax-neonfp16arith-2x.c",
 -      ]
--
--      configs -= [ "//build/config/compiler:chromium_code" ]
--      configs += [ "//build/config/compiler:no_chromium_code" ]
--      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
--      configs += [ ":xnnpack_private_config" ]
--
--      deps = [
--        "//third_party/cpuinfo",
--        "//third_party/fp16",
--        "//third_party/fxdiv",
--        "//third_party/pthreadpool",
--      ]
 +if (build_with_chromium) {
-+  source_set("qd8-f32-qc4w-gemm_riscv64") {
++  source_set("qd8-f32-qb4w-gemm_riscv64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-1x4-minmax-scalar.c",
-+    "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-4x4-minmax-scalar.c"
++      "src/src/qd8-f32-qb4w-gemm/gen/qd8-f32-qb4w-gemm-1x4-minmax-scalar.c",
++    "src/src/qd8-f32-qb4w-gemm/gen/qd8-f32-qb4w-gemm-4x4-minmax-scalar.c"
 +    ]
  
--      public_configs = [ ":xnnpack_public_config" ]
--    }
--  }
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
 +    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 +    configs += [ ":xnnpack_private_config" ]
  
--  # This is a target that cannot depend on //base.
--  if (build_with_internal_optimization_guide) {
--    source_set("f16-vmulcaddc_arch=armv8.2-a+fp16_standalone") {
--      cflags = [ "-march=armv8.2-a+fp16" ]
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/fp16",
+-        "//third_party/fxdiv",
+-        "//third_party/pthreadpool",
+-      ]
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
@@ -88683,6 +88714,29 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 +      "//third_party/pthreadpool",
 +    ]
  
+-      public_configs = [ ":xnnpack_public_config" ]
+-    }
++    public_configs = [ ":xnnpack_public_config" ]
+   }
++}
+ 
+-  # This is a target that cannot depend on //base.
+-  if (build_with_internal_optimization_guide) {
+-    source_set("f16-vmulcaddc_arch=armv8.2-a+fp16_standalone") {
+-      cflags = [ "-march=armv8.2-a+fp16" ]
++# This is a target that cannot depend on //base.
++if (build_with_internal_optimization_guide) {
++  source_set("qd8-f32-qb4w-gemm_riscv64_standalone") {
++    cflags = [
++  
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/qd8-f32-qb4w-gemm/gen/qd8-f32-qb4w-gemm-1x4-minmax-scalar.c",
++    "src/src/qd8-f32-qb4w-gemm/gen/qd8-f32-qb4w-gemm-4x4-minmax-scalar.c"
++    ]
+ 
 -      sources = [
 -        "src/include/xnnpack.h",
 -        "src/src/f16-vmulcaddc/gen/f16-vmulcaddc-c8-minmax-neonfp16arith-2x.c",
@@ -88706,24 +88760,20 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -        assert_no_deps = [ "//base" ]
 -      }
 -    }
-+    public_configs = [ ":xnnpack_public_config" ]
-   }
-+}
+-  }
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
  
 -  if (build_with_chromium) {
 -    source_set("f16-vrnd_arch=armv8.2-a+fp16") {
 -      cflags = [ "-march=armv8.2-a+fp16" ]
-+# This is a target that cannot depend on //base.
-+if (build_with_internal_optimization_guide) {
-+  source_set("qd8-f32-qc4w-gemm_riscv64_standalone") {
-+    cflags = [
-+  
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-1x4-minmax-scalar.c",
-+    "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-4x4-minmax-scalar.c"
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
  
 -      sources = [
@@ -88745,26 +88795,31 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -        "//third_party/fxdiv",
 -        "//third_party/pthreadpool",
 -      ]
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
++    public_configs = [ ":xnnpack_public_config" ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
--    }
--  }
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool:pthreadpool_standalone",
-+    ]
++    if (!(is_android && use_order_profiling)) {
++      assert_no_deps = [ "//base" ]
+     }
+   }
++}
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
 -    source_set("f16-vrnd_arch=armv8.2-a+fp16_standalone") {
 -      cflags = [ "-march=armv8.2-a+fp16" ]
-+    public_configs = [ ":xnnpack_public_config" ]
++if (build_with_chromium) {
++  source_set("qd8-f32-qc4w-gemm_arch=rv64gcv-abi=lp64d") {
++    cflags = [
++      "-mabi=lp64d",
++    "-march=rv64gcv"
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-1x4v-minmax-rvv.c",
++    "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-4x4v-minmax-rvv.c"
++    ]
  
 -      sources = [
 -        "src/include/xnnpack.h",
@@ -88791,6 +88846,98 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -      if (!(is_android && use_order_profiling)) {
 -        assert_no_deps = [ "//base" ]
 -      }
+-    }
+-  }
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
+ 
+-  if (build_with_chromium) {
+-    source_set("f16-vrsqrt_arch=armv8.2-a+fp16") {
+-      cflags = [ "-march=armv8.2-a+fp16" ]
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool",
++    ]
+ 
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/f16-vrsqrt/gen/f16-vrsqrt-neonfp16arith-rsqrt-u16.c",
+-      ]
++    public_configs = [ ":xnnpack_public_config" ]
++  }
++}
+ 
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
++# This is a target that cannot depend on //base.
++if (build_with_internal_optimization_guide) {
++  source_set("qd8-f32-qc4w-gemm_arch=rv64gcv-abi=lp64d_standalone") {
++    cflags = [
++      "-mabi=lp64d",
++    "-march=rv64gcv"
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-1x4v-minmax-rvv.c",
++    "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-4x4v-minmax-rvv.c"
++    ]
+ 
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/fp16",
+-        "//third_party/fxdiv",
+-        "//third_party/pthreadpool",
+-      ]
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
+ 
+-      public_configs = [ ":xnnpack_public_config" ]
+-    }
+-  }
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool:pthreadpool_standalone",
++    ]
+ 
+-  # This is a target that cannot depend on //base.
+-  if (build_with_internal_optimization_guide) {
+-    source_set("f16-vrsqrt_arch=armv8.2-a+fp16_standalone") {
+-      cflags = [ "-march=armv8.2-a+fp16" ]
++    public_configs = [ ":xnnpack_public_config" ]
+ 
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/f16-vrsqrt/gen/f16-vrsqrt-neonfp16arith-rsqrt-u16.c",
+-      ]
+-
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
+-
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/fp16",
+-        "//third_party/fxdiv",
+-        "//third_party/pthreadpool:pthreadpool_standalone",
+-      ]
+-
+-      public_configs = [ ":xnnpack_public_config" ]
+-
+-      if (!(is_android && use_order_profiling)) {
+-        assert_no_deps = [ "//base" ]
+-      }
 +    if (!(is_android && use_order_profiling)) {
 +      assert_no_deps = [ "//base" ]
      }
@@ -88798,12 +88945,13 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 +}
  
 -  if (build_with_chromium) {
--    source_set("f16-vrsqrt_arch=armv8.2-a+fp16") {
+-    source_set("f16-vsigmoid_arch=armv8.2-a+fp16") {
 -      cflags = [ "-march=armv8.2-a+fp16" ]
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f16-vrsqrt/gen/f16-vrsqrt-neonfp16arith-rsqrt-u16.c",
+-        "src/src/f16-vsigmoid/gen/f16-vsigmoid-neonfp16arith-rr2-p2-nr1fma-u32.c",
+-        "src/src/f16-vsigmoid/gen/f16-vsigmoid-neonfp16arith-rr2-p2-nr1recps-u16.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -88818,16 +88966,15 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("qd8-f32-qc8w-gemm_arch=rv64gcv-abi=lp64d") {
++  source_set("qd8-f32-qc4w-gemm_riscv64") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-1x4v-minmax-rvv.c",
-+    "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-4x4v-minmax-rvv.c"
++      "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-1x4-minmax-scalar.c",
++    "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-4x4-minmax-scalar.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -88840,7 +88987,7 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
--    source_set("f16-vrsqrt_arch=armv8.2-a+fp16_standalone") {
+-    source_set("f16-vsigmoid_arch=armv8.2-a+fp16_standalone") {
 -      cflags = [ "-march=armv8.2-a+fp16" ]
 +    deps = [
 +      "//third_party/cpuinfo",
@@ -88851,7 +88998,8 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f16-vrsqrt/gen/f16-vrsqrt-neonfp16arith-rsqrt-u16.c",
+-        "src/src/f16-vsigmoid/gen/f16-vsigmoid-neonfp16arith-rr2-p2-nr1fma-u32.c",
+-        "src/src/f16-vsigmoid/gen/f16-vsigmoid-neonfp16arith-rr2-p2-nr1recps-u16.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -88877,26 +89025,24 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 +}
  
 -  if (build_with_chromium) {
--    source_set("f16-vsigmoid_arch=armv8.2-a+fp16") {
+-    source_set("f16-vsin_arch=armv8.2-a+fp16") {
 -      cflags = [ "-march=armv8.2-a+fp16" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qd8-f32-qc8w-gemm_arch=rv64gcv-abi=lp64d_standalone") {
++  source_set("qd8-f32-qc4w-gemm_riscv64_standalone") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-1x4v-minmax-rvv.c",
-+    "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-4x4v-minmax-rvv.c"
++      "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-1x4-minmax-scalar.c",
++    "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-4x4-minmax-scalar.c"
 +    ]
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f16-vsigmoid/gen/f16-vsigmoid-neonfp16arith-rr2-p2-nr1fma-u32.c",
--        "src/src/f16-vsigmoid/gen/f16-vsigmoid-neonfp16arith-rr2-p2-nr1recps-u16.c",
+-        "src/src/f16-vsin/gen/f16-vsin-neonfp16arith-rational-3-2-div.c",
 -      ]
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
@@ -88931,25 +89077,24 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
--    source_set("f16-vsigmoid_arch=armv8.2-a+fp16_standalone") {
+-    source_set("f16-vsin_arch=armv8.2-a+fp16_standalone") {
 -      cflags = [ "-march=armv8.2-a+fp16" ]
 +if (build_with_chromium) {
-+  source_set("qd8-f32-qc8w-gemm_riscv64") {
++  source_set("qd8-f32-qc8w-gemm_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-1x2-minmax-scalar.c",
-+    "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-1x4-minmax-scalar.c",
-+    "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-4x4-minmax-scalar.c"
++      "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-1x4v-minmax-rvv.c",
++    "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-4x4v-minmax-rvv.c"
 +    ]
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f16-vsigmoid/gen/f16-vsigmoid-neonfp16arith-rr2-p2-nr1fma-u32.c",
--        "src/src/f16-vsigmoid/gen/f16-vsigmoid-neonfp16arith-rr2-p2-nr1recps-u16.c",
+-        "src/src/f16-vsin/gen/f16-vsin-neonfp16arith-rational-3-2-div.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -88977,8 +89122,8 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 +    configs += [ ":xnnpack_private_config" ]
  
 -  if (build_with_chromium) {
--    source_set("f16-vsin_arch=armv8.2-a+fp16") {
--      cflags = [ "-march=armv8.2-a+fp16" ]
+-    source_set("f16-vsin_arm64") {
+-      cflags = []
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
@@ -88988,7 +89133,7 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f16-vsin/gen/f16-vsin-neonfp16arith-rational-3-2-div.c",
+-        "src/src/f16-vsin/gen/f16-vsin-scalar-rational-3-2-div.c",
 -      ]
 +    public_configs = [ ":xnnpack_public_config" ]
 +  }
@@ -89000,16 +89145,16 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -      configs += [ ":xnnpack_private_config" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qd8-f32-qc8w-gemm_riscv64_standalone") {
++  source_set("qd8-f32-qc8w-gemm_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-1x2-minmax-scalar.c",
-+    "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-1x4-minmax-scalar.c",
-+    "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-4x4-minmax-scalar.c"
++      "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-1x4v-minmax-rvv.c",
++    "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-4x4v-minmax-rvv.c"
 +    ]
  
 -      deps = [
@@ -89035,13 +89180,13 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
--    source_set("f16-vsin_arch=armv8.2-a+fp16_standalone") {
--      cflags = [ "-march=armv8.2-a+fp16" ]
+-    source_set("f16-vsin_arm64_standalone") {
+-      cflags = []
 +    public_configs = [ ":xnnpack_public_config" ]
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f16-vsin/gen/f16-vsin-neonfp16arith-rational-3-2-div.c",
+-        "src/src/f16-vsin/gen/f16-vsin-scalar-rational-3-2-div.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -89068,12 +89213,13 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 +}
  
 -  if (build_with_chromium) {
--    source_set("f16-vsin_arm64") {
--      cflags = []
+-    source_set("f16-vsqrt_arch=armv8.2-a+fp16") {
+-      cflags = [ "-march=armv8.2-a+fp16" ]
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f16-vsin/gen/f16-vsin-scalar-rational-3-2-div.c",
+-        "src/src/f16-vsqrt/gen/f16-vsqrt-aarch64-neonfp16arith-sqrt-u8.c",
+-        "src/src/f16-vsqrt/gen/f16-vsqrt-neonfp16arith-nr1fma1adj-u8.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -89088,16 +89234,16 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("qd8-f32-qc8w-igemm_arch=rv64gcv-abi=lp64d") {
++  source_set("qd8-f32-qc8w-gemm_riscv64") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-1x4v-minmax-rvv.c",
-+    "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-4x4v-minmax-rvv.c"
++      "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-1x2-minmax-scalar.c",
++    "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-1x4-minmax-scalar.c",
++    "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-4x4-minmax-scalar.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -89110,8 +89256,8 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
--    source_set("f16-vsin_arm64_standalone") {
--      cflags = []
+-    source_set("f16-vsqrt_arch=armv8.2-a+fp16_standalone") {
+-      cflags = [ "-march=armv8.2-a+fp16" ]
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
@@ -89121,7 +89267,8 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f16-vsin/gen/f16-vsin-scalar-rational-3-2-div.c",
+-        "src/src/f16-vsqrt/gen/f16-vsqrt-aarch64-neonfp16arith-sqrt-u8.c",
+-        "src/src/f16-vsqrt/gen/f16-vsqrt-neonfp16arith-nr1fma1adj-u8.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -89147,26 +89294,26 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 +}
  
 -  if (build_with_chromium) {
--    source_set("f16-vsqrt_arch=armv8.2-a+fp16") {
+-    source_set("f16-vtanh_arch=armv8.2-a+fp16") {
 -      cflags = [ "-march=armv8.2-a+fp16" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qd8-f32-qc8w-igemm_arch=rv64gcv-abi=lp64d_standalone") {
++  source_set("qd8-f32-qc8w-gemm_riscv64_standalone") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-1x4v-minmax-rvv.c",
-+    "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-4x4v-minmax-rvv.c"
++      "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-1x2-minmax-scalar.c",
++    "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-1x4-minmax-scalar.c",
++    "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-4x4-minmax-scalar.c"
 +    ]
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f16-vsqrt/gen/f16-vsqrt-aarch64-neonfp16arith-sqrt-u8.c",
--        "src/src/f16-vsqrt/gen/f16-vsqrt-neonfp16arith-nr1fma1adj-u8.c",
+-        "src/src/f16-vtanh/gen/f16-vtanh-aarch64-neonfp16arith-expm1minus-rr1-p3h2ts-div-u32.c",
+-        "src/src/f16-vtanh/gen/f16-vtanh-neonfp16arith-expm1minus-rr1-p3h2ts-nr1fma-u32.c",
 -      ]
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
@@ -89201,25 +89348,25 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
--    source_set("f16-vsqrt_arch=armv8.2-a+fp16_standalone") {
+-    source_set("f16-vtanh_arch=armv8.2-a+fp16_standalone") {
 -      cflags = [ "-march=armv8.2-a+fp16" ]
 +if (build_with_chromium) {
-+  source_set("qd8-f32-qc8w-igemm_riscv64") {
++  source_set("qd8-f32-qc8w-igemm_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-1x2-minmax-scalar.c",
-+    "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-1x4-minmax-scalar.c",
-+    "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-4x4-minmax-scalar.c"
++      "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-1x4v-minmax-rvv.c",
++    "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-4x4v-minmax-rvv.c"
 +    ]
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f16-vsqrt/gen/f16-vsqrt-aarch64-neonfp16arith-sqrt-u8.c",
--        "src/src/f16-vsqrt/gen/f16-vsqrt-neonfp16arith-nr1fma1adj-u8.c",
+-        "src/src/f16-vtanh/gen/f16-vtanh-aarch64-neonfp16arith-expm1minus-rr1-p3h2ts-div-u32.c",
+-        "src/src/f16-vtanh/gen/f16-vtanh-neonfp16arith-expm1minus-rr1-p3h2ts-nr1fma-u32.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -89247,7 +89394,7 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 +    configs += [ ":xnnpack_private_config" ]
  
 -  if (build_with_chromium) {
--    source_set("f16-vtanh_arch=armv8.2-a+fp16") {
+-    source_set("f16-vunary_arch=armv8.2-a+fp16") {
 -      cflags = [ "-march=armv8.2-a+fp16" ]
 +    deps = [
 +      "//third_party/cpuinfo",
@@ -89258,8 +89405,9 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f16-vtanh/gen/f16-vtanh-aarch64-neonfp16arith-expm1minus-rr1-p3h2ts-div-u32.c",
--        "src/src/f16-vtanh/gen/f16-vtanh-neonfp16arith-expm1minus-rr1-p3h2ts-nr1fma-u32.c",
+-        "src/src/f16-vunary/gen/f16-vabs-neonfp16arith-u16.c",
+-        "src/src/f16-vunary/gen/f16-vneg-neonfp16arith-u16.c",
+-        "src/src/f16-vunary/gen/f16-vsqr-neonfp16arith-u16.c",
 -      ]
 +    public_configs = [ ":xnnpack_public_config" ]
 +  }
@@ -89271,16 +89419,16 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -      configs += [ ":xnnpack_private_config" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qd8-f32-qc8w-igemm_riscv64_standalone") {
++  source_set("qd8-f32-qc8w-igemm_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-1x2-minmax-scalar.c",
-+    "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-1x4-minmax-scalar.c",
-+    "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-4x4-minmax-scalar.c"
++      "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-1x4v-minmax-rvv.c",
++    "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-4x4v-minmax-rvv.c"
 +    ]
  
 -      deps = [
@@ -89306,14 +89454,15 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
--    source_set("f16-vtanh_arch=armv8.2-a+fp16_standalone") {
+-    source_set("f16-vunary_arch=armv8.2-a+fp16_standalone") {
 -      cflags = [ "-march=armv8.2-a+fp16" ]
 +    public_configs = [ ":xnnpack_public_config" ]
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f16-vtanh/gen/f16-vtanh-aarch64-neonfp16arith-expm1minus-rr1-p3h2ts-div-u32.c",
--        "src/src/f16-vtanh/gen/f16-vtanh-neonfp16arith-expm1minus-rr1-p3h2ts-nr1fma-u32.c",
+-        "src/src/f16-vunary/gen/f16-vabs-neonfp16arith-u16.c",
+-        "src/src/f16-vunary/gen/f16-vneg-neonfp16arith-u16.c",
+-        "src/src/f16-vunary/gen/f16-vsqr-neonfp16arith-u16.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -89340,14 +89489,13 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 +}
  
 -  if (build_with_chromium) {
--    source_set("f16-vunary_arch=armv8.2-a+fp16") {
--      cflags = [ "-march=armv8.2-a+fp16" ]
+-    source_set("f32-argmaxpool_arm64") {
+-      cflags = []
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f16-vunary/gen/f16-vabs-neonfp16arith-u16.c",
--        "src/src/f16-vunary/gen/f16-vneg-neonfp16arith-u16.c",
--        "src/src/f16-vunary/gen/f16-vsqr-neonfp16arith-u16.c",
+-        "src/src/f32-argmaxpool/f32-argmaxpool-9p8x-neon-c4.c",
+-        "src/src/f32-argmaxpool/f32-argmaxpool-9p8x-scalar-c1.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -89362,16 +89510,16 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("qs8-dwconv_arch=rv64gcv-abi=lp64d") {
++  source_set("qd8-f32-qc8w-igemm_riscv64") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-dwconv/gen/qs8-dwconv-25p8vc-minmax-fp32-rvv.c",
-+    "src/src/qs8-dwconv/gen/qs8-dwconv-9p8vc-minmax-fp32-rvv.c"
++      "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-1x2-minmax-scalar.c",
++    "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-1x4-minmax-scalar.c",
++    "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-4x4-minmax-scalar.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -89384,8 +89532,8 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
--    source_set("f16-vunary_arch=armv8.2-a+fp16_standalone") {
--      cflags = [ "-march=armv8.2-a+fp16" ]
+-    source_set("f32-argmaxpool_arm64_standalone") {
+-      cflags = []
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
@@ -89395,9 +89543,8 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f16-vunary/gen/f16-vabs-neonfp16arith-u16.c",
--        "src/src/f16-vunary/gen/f16-vneg-neonfp16arith-u16.c",
--        "src/src/f16-vunary/gen/f16-vsqr-neonfp16arith-u16.c",
+-        "src/src/f32-argmaxpool/f32-argmaxpool-9p8x-neon-c4.c",
+-        "src/src/f32-argmaxpool/f32-argmaxpool-9p8x-scalar-c1.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -89423,26 +89570,26 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 +}
  
 -  if (build_with_chromium) {
--    source_set("f32-argmaxpool_arm64") {
+-    source_set("f32-avgpool_arm64") {
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-dwconv_arch=rv64gcv-abi=lp64d_standalone") {
++  source_set("qd8-f32-qc8w-igemm_riscv64_standalone") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-dwconv/gen/qs8-dwconv-25p8vc-minmax-fp32-rvv.c",
-+    "src/src/qs8-dwconv/gen/qs8-dwconv-9p8vc-minmax-fp32-rvv.c"
++      "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-1x2-minmax-scalar.c",
++    "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-1x4-minmax-scalar.c",
++    "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-4x4-minmax-scalar.c"
 +    ]
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f32-argmaxpool/f32-argmaxpool-9p8x-neon-c4.c",
--        "src/src/f32-argmaxpool/f32-argmaxpool-9p8x-scalar-c1.c",
+-        "src/src/f32-avgpool/gen/f32-avgpool-9p-minmax-neon-u4.c",
+-        "src/src/f32-avgpool/gen/f32-avgpool-9p-minmax-scalar-u1.c",
 -      ]
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
@@ -89477,26 +89624,25 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
--    source_set("f32-argmaxpool_arm64_standalone") {
+-    source_set("f32-avgpool_arm64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("qs8-dwconv_riscv64") {
++  source_set("qs8-dwconv_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-dwconv/gen/qs8-dwconv-25p1c-minmax-fp32-scalar-fmagic.c",
-+    "src/src/qs8-dwconv/gen/qs8-dwconv-25p2c-minmax-fp32-scalar-lrintf.c",
-+    "src/src/qs8-dwconv/gen/qs8-dwconv-9p1c-minmax-fp32-scalar-fmagic.c",
-+    "src/src/qs8-dwconv/gen/qs8-dwconv-9p2c-minmax-fp32-scalar-lrintf.c"
++      "src/src/qs8-dwconv/gen/qs8-dwconv-25p8vc-minmax-fp32-rvv.c",
++    "src/src/qs8-dwconv/gen/qs8-dwconv-9p8vc-minmax-fp32-rvv.c"
 +    ]
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f32-argmaxpool/f32-argmaxpool-9p8x-neon-c4.c",
--        "src/src/f32-argmaxpool/f32-argmaxpool-9p8x-scalar-c1.c",
+-        "src/src/f32-avgpool/gen/f32-avgpool-9p-minmax-neon-u4.c",
+-        "src/src/f32-avgpool/gen/f32-avgpool-9p-minmax-scalar-u1.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -89517,64 +89663,54 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -        assert_no_deps = [ "//base" ]
 -      }
 -    }
--  }
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
 +    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 +    configs += [ ":xnnpack_private_config" ]
- 
--  if (build_with_chromium) {
--    source_set("f32-avgpool_arm64") {
--      cflags = []
++
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
 +      "//third_party/fxdiv",
 +      "//third_party/pthreadpool",
 +    ]
- 
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/f32-avgpool/gen/f32-avgpool-9p-minmax-neon-u4.c",
--        "src/src/f32-avgpool/gen/f32-avgpool-9p-minmax-scalar-u1.c",
--      ]
++
 +    public_configs = [ ":xnnpack_public_config" ]
-+  }
+   }
 +}
  
--      configs -= [ "//build/config/compiler:chromium_code" ]
--      configs += [ "//build/config/compiler:no_chromium_code" ]
--      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
--      configs += [ ":xnnpack_private_config" ]
+-  if (build_with_chromium) {
+-    source_set("f32-conv-hwc2chw_arm64") {
+-      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-dwconv_riscv64_standalone") {
++  source_set("qs8-dwconv_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-dwconv/gen/qs8-dwconv-25p1c-minmax-fp32-scalar-fmagic.c",
-+    "src/src/qs8-dwconv/gen/qs8-dwconv-25p2c-minmax-fp32-scalar-lrintf.c",
-+    "src/src/qs8-dwconv/gen/qs8-dwconv-9p1c-minmax-fp32-scalar-fmagic.c",
-+    "src/src/qs8-dwconv/gen/qs8-dwconv-9p2c-minmax-fp32-scalar-lrintf.c"
++      "src/src/qs8-dwconv/gen/qs8-dwconv-25p8vc-minmax-fp32-rvv.c",
++    "src/src/qs8-dwconv/gen/qs8-dwconv-9p8vc-minmax-fp32-rvv.c"
 +    ]
  
--      deps = [
--        "//third_party/cpuinfo",
--        "//third_party/fp16",
--        "//third_party/fxdiv",
--        "//third_party/pthreadpool",
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/f32-conv-hwc2chw/f32-conv-hwc2chw-3x3s2p1c3x4-aarch64-neonfma-2x2.c",
+-        "src/src/f32-conv-hwc2chw/f32-conv-hwc2chw-3x3s2p1c3x4-neon-2x2.c",
+-        "src/src/f32-conv-hwc2chw/f32-conv-hwc2chw-3x3s2p1c3x4-scalar-1x1.c",
 -      ]
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
 +    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 +    configs += [ ":xnnpack_private_config" ]
  
--      public_configs = [ ":xnnpack_public_config" ]
--    }
--  }
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
@@ -89582,92 +89718,37 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 +      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
  
--  # This is a target that cannot depend on //base.
--  if (build_with_internal_optimization_guide) {
--    source_set("f32-avgpool_arm64_standalone") {
--      cflags = []
-+    public_configs = [ ":xnnpack_public_config" ]
- 
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/f32-avgpool/gen/f32-avgpool-9p-minmax-neon-u4.c",
--        "src/src/f32-avgpool/gen/f32-avgpool-9p-minmax-scalar-u1.c",
--      ]
--
--      configs -= [ "//build/config/compiler:chromium_code" ]
--      configs += [ "//build/config/compiler:no_chromium_code" ]
--      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
--      configs += [ ":xnnpack_private_config" ]
--
 -      deps = [
 -        "//third_party/cpuinfo",
 -        "//third_party/fp16",
 -        "//third_party/fxdiv",
--        "//third_party/pthreadpool:pthreadpool_standalone",
+-        "//third_party/pthreadpool",
 -      ]
--
++    public_configs = [ ":xnnpack_public_config" ]
+ 
 -      public_configs = [ ":xnnpack_public_config" ]
--
--      if (!(is_android && use_order_profiling)) {
--        assert_no_deps = [ "//base" ]
--      }
 +    if (!(is_android && use_order_profiling)) {
 +      assert_no_deps = [ "//base" ]
      }
    }
 +}
  
--  if (build_with_chromium) {
--    source_set("f32-conv-hwc2chw_arm64") {
+-  # This is a target that cannot depend on //base.
+-  if (build_with_internal_optimization_guide) {
+-    source_set("f32-conv-hwc2chw_arm64_standalone") {
 -      cflags = []
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/f32-conv-hwc2chw/f32-conv-hwc2chw-3x3s2p1c3x4-aarch64-neonfma-2x2.c",
--        "src/src/f32-conv-hwc2chw/f32-conv-hwc2chw-3x3s2p1c3x4-neon-2x2.c",
--        "src/src/f32-conv-hwc2chw/f32-conv-hwc2chw-3x3s2p1c3x4-scalar-1x1.c",
--      ]
--
--      configs -= [ "//build/config/compiler:chromium_code" ]
--      configs += [ "//build/config/compiler:no_chromium_code" ]
--      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
--      configs += [ ":xnnpack_private_config" ]
--
--      deps = [
--        "//third_party/cpuinfo",
--        "//third_party/fp16",
--        "//third_party/fxdiv",
--        "//third_party/pthreadpool",
--      ]
 +if (build_with_chromium) {
-+  source_set("qs8-f32-vcvt_arch=rv64gcv-abi=lp64d") {
++  source_set("qs8-dwconv_riscv64") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-f32-vcvt/gen/qs8-f32-vcvt-rvv-u2v.c"
-+    ]
- 
--      public_configs = [ ":xnnpack_public_config" ]
--    }
--  }
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
- 
--  # This is a target that cannot depend on //base.
--  if (build_with_internal_optimization_guide) {
--    source_set("f32-conv-hwc2chw_arm64_standalone") {
--      cflags = []
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool",
++      "src/src/qs8-dwconv/gen/qs8-dwconv-25p1c-minmax-fp32-scalar-fmagic.c",
++    "src/src/qs8-dwconv/gen/qs8-dwconv-25p2c-minmax-fp32-scalar-lrintf.c",
++    "src/src/qs8-dwconv/gen/qs8-dwconv-9p1c-minmax-fp32-scalar-fmagic.c",
++    "src/src/qs8-dwconv/gen/qs8-dwconv-9p2c-minmax-fp32-scalar-lrintf.c"
 +    ]
  
 -      sources = [
@@ -89695,6 +89776,18 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -        assert_no_deps = [ "//base" ]
 -      }
 -    }
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
++
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool",
++    ]
++
 +    public_configs = [ ":xnnpack_public_config" ]
    }
 +}
@@ -89704,15 +89797,17 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-f32-vcvt_arch=rv64gcv-abi=lp64d_standalone") {
++  source_set("qs8-dwconv_riscv64_standalone") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-f32-vcvt/gen/qs8-f32-vcvt-rvv-u2v.c"
++      "src/src/qs8-dwconv/gen/qs8-dwconv-25p1c-minmax-fp32-scalar-fmagic.c",
++    "src/src/qs8-dwconv/gen/qs8-dwconv-25p2c-minmax-fp32-scalar-lrintf.c",
++    "src/src/qs8-dwconv/gen/qs8-dwconv-9p1c-minmax-fp32-scalar-fmagic.c",
++    "src/src/qs8-dwconv/gen/qs8-dwconv-9p2c-minmax-fp32-scalar-lrintf.c"
 +    ]
  
 -      sources = [
@@ -89814,14 +89909,15 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -    source_set("f32-dwconv_arch=armv8.2-a+fp16+dotprod") {
 -      cflags = [ "-march=armv8.2-a+fp16+dotprod" ]
 +if (build_with_chromium) {
-+  source_set("qs8-f32-vcvt_riscv64") {
++  source_set("qs8-f32-vcvt_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-f32-vcvt/gen/qs8-f32-vcvt-scalar-u4.c"
++      "src/src/qs8-f32-vcvt/gen/qs8-f32-vcvt-rvv-u2v.c"
 +    ]
  
 -      asmflags = cflags
@@ -89857,14 +89953,15 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -      ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-f32-vcvt_riscv64_standalone") {
++  source_set("qs8-f32-vcvt_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-f32-vcvt/gen/qs8-f32-vcvt-scalar-u4.c"
++      "src/src/qs8-f32-vcvt/gen/qs8-f32-vcvt-rvv-u2v.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -89955,17 +90052,14 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("qs8-packw_riscv64") {
++  source_set("qs8-f32-vcvt_riscv64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-packw/gen/qs8-packw-x16c8-gemm-goi-scalar.c",
-+    "src/src/qs8-packw/gen/qs8-packw-x4c8-gemm-gio-scalar.c",
-+    "src/src/qs8-packw/gen/qs8-packw-x4c8-gemm-goi-scalar.c",
-+    "src/src/qs8-packw/gen/qs8-packw-x8c8-gemm-gio-scalar.c"
++      "src/src/qs8-f32-vcvt/gen/qs8-f32-vcvt-scalar-u4.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -90036,17 +90130,14 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-packw_riscv64_standalone") {
++  source_set("qs8-f32-vcvt_riscv64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-packw/gen/qs8-packw-x16c8-gemm-goi-scalar.c",
-+    "src/src/qs8-packw/gen/qs8-packw-x4c8-gemm-gio-scalar.c",
-+    "src/src/qs8-packw/gen/qs8-packw-x4c8-gemm-goi-scalar.c",
-+    "src/src/qs8-packw/gen/qs8-packw-x8c8-gemm-gio-scalar.c"
++      "src/src/qs8-f32-vcvt/gen/qs8-f32-vcvt-scalar-u4.c"
 +    ]
  
 -      sources = [
@@ -90091,15 +90182,17 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -    source_set("f32-f16-vcvt_arm64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("qs8-qc4w-gemm_riscv64") {
++  source_set("qs8-packw_riscv64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-qc4w-gemm/gen/qs8-qc4w-gemm-1x4-minmax-fp32-scalar-fmagic.c",
-+    "src/src/qs8-qc4w-gemm/gen/qs8-qc4w-gemm-3x4-minmax-fp32-scalar-fmagic.c"
++      "src/src/qs8-packw/gen/qs8-packw-x16c8-gemm-goi-scalar.c",
++    "src/src/qs8-packw/gen/qs8-packw-x4c8-gemm-gio-scalar.c",
++    "src/src/qs8-packw/gen/qs8-packw-x4c8-gemm-goi-scalar.c",
++    "src/src/qs8-packw/gen/qs8-packw-x8c8-gemm-gio-scalar.c"
 +    ]
  
 -      sources = [
@@ -90186,15 +90279,17 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -      ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-qc4w-gemm_riscv64_standalone") {
++  source_set("qs8-packw_riscv64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-qc4w-gemm/gen/qs8-qc4w-gemm-1x4-minmax-fp32-scalar-fmagic.c",
-+    "src/src/qs8-qc4w-gemm/gen/qs8-qc4w-gemm-3x4-minmax-fp32-scalar-fmagic.c"
++      "src/src/qs8-packw/gen/qs8-packw-x16c8-gemm-goi-scalar.c",
++    "src/src/qs8-packw/gen/qs8-packw-x4c8-gemm-gio-scalar.c",
++    "src/src/qs8-packw/gen/qs8-packw-x4c8-gemm-goi-scalar.c",
++    "src/src/qs8-packw/gen/qs8-packw-x8c8-gemm-gio-scalar.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -90306,17 +90401,15 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("qs8-qc8w-dwconv_arch=rv64gcv-abi=lp64d") {
++  source_set("qs8-qc4w-gemm_riscv64") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-25p8vc-minmax-fp32-rvv.c",
-+    "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-3p8vc-minmax-fp32-rvv.c",
-+    "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-9p8vc-minmax-fp32-rvv.c"
++      "src/src/qs8-qc4w-gemm/gen/qs8-qc4w-gemm-1x4-minmax-fp32-scalar-fmagic.c",
++    "src/src/qs8-qc4w-gemm/gen/qs8-qc4w-gemm-3x4-minmax-fp32-scalar-fmagic.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -90388,17 +90481,15 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-qc8w-dwconv_arch=rv64gcv-abi=lp64d_standalone") {
++  source_set("qs8-qc4w-gemm_riscv64_standalone") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-25p8vc-minmax-fp32-rvv.c",
-+    "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-3p8vc-minmax-fp32-rvv.c",
-+    "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-9p8vc-minmax-fp32-rvv.c"
++      "src/src/qs8-qc4w-gemm/gen/qs8-qc4w-gemm-1x4-minmax-fp32-scalar-fmagic.c",
++    "src/src/qs8-qc4w-gemm/gen/qs8-qc4w-gemm-3x4-minmax-fp32-scalar-fmagic.c"
 +    ]
  
 -      sources = [
@@ -90443,19 +90534,17 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -    source_set("f32-ibilinear-chw_arm64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("qs8-qc8w-dwconv_riscv64") {
++  source_set("qs8-qc8w-dwconv_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-25p1c-minmax-fp32-scalar-fmagic.c",
-+    "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-25p2c-minmax-fp32-scalar-lrintf.c",
-+    "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-3p1c-minmax-fp32-scalar-fmagic.c",
-+    "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-3p2c-minmax-fp32-scalar-lrintf.c",
-+    "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-9p1c-minmax-fp32-scalar-fmagic.c",
-+    "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-9p2c-minmax-fp32-scalar-lrintf.c"
++      "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-25p8vc-minmax-fp32-rvv.c",
++    "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-3p8vc-minmax-fp32-rvv.c",
++    "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-9p8vc-minmax-fp32-rvv.c"
 +    ]
  
 -      sources = [
@@ -90515,19 +90604,17 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -      configs += [ ":xnnpack_private_config" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-qc8w-dwconv_riscv64_standalone") {
++  source_set("qs8-qc8w-dwconv_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-25p1c-minmax-fp32-scalar-fmagic.c",
-+    "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-25p2c-minmax-fp32-scalar-lrintf.c",
-+    "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-3p1c-minmax-fp32-scalar-fmagic.c",
-+    "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-3p2c-minmax-fp32-scalar-lrintf.c",
-+    "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-9p1c-minmax-fp32-scalar-fmagic.c",
-+    "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-9p2c-minmax-fp32-scalar-lrintf.c"
++      "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-25p8vc-minmax-fp32-rvv.c",
++    "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-3p8vc-minmax-fp32-rvv.c",
++    "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-9p8vc-minmax-fp32-rvv.c"
 +    ]
  
 -      deps = [
@@ -90591,16 +90678,19 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -    source_set("f32-igemm_arch=armv8.2-a+fp16+dotprod") {
 -      cflags = [ "-march=armv8.2-a+fp16+dotprod" ]
 +if (build_with_chromium) {
-+  source_set("qs8-qc8w-gemm_arch=rv64gcv-abi=lp64d") {
++  source_set("qs8-qc8w-dwconv_riscv64") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-1x4v-minmax-fp32-rvv.c",
-+    "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-4x4v-minmax-fp32-rvv.c"
++      "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-25p1c-minmax-fp32-scalar-fmagic.c",
++    "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-25p2c-minmax-fp32-scalar-lrintf.c",
++    "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-3p1c-minmax-fp32-scalar-fmagic.c",
++    "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-3p2c-minmax-fp32-scalar-lrintf.c",
++    "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-9p1c-minmax-fp32-scalar-fmagic.c",
++    "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-9p2c-minmax-fp32-scalar-lrintf.c"
 +    ]
  
 -      asmflags = cflags
@@ -90663,16 +90753,19 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -      asmflags = cflags
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-qc8w-gemm_arch=rv64gcv-abi=lp64d_standalone") {
++  source_set("qs8-qc8w-dwconv_riscv64_standalone") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-1x4v-minmax-fp32-rvv.c",
-+    "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-4x4v-minmax-fp32-rvv.c"
++      "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-25p1c-minmax-fp32-scalar-fmagic.c",
++    "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-25p2c-minmax-fp32-scalar-lrintf.c",
++    "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-3p1c-minmax-fp32-scalar-fmagic.c",
++    "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-3p2c-minmax-fp32-scalar-lrintf.c",
++    "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-9p1c-minmax-fp32-scalar-fmagic.c",
++    "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-9p2c-minmax-fp32-scalar-lrintf.c"
 +    ]
  
 -      sources = [
@@ -90779,15 +90872,16 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -    source_set("f32-igemm_arm64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("qs8-qc8w-gemm_riscv64") {
++  source_set("qs8-qc8w-gemm_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-1x4-minmax-fp32-scalar-lrintf.c",
-+    "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-3x4-minmax-fp32-scalar-lrintf.c"
++      "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-1x4v-minmax-fp32-rvv.c",
++    "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-4x4v-minmax-fp32-rvv.c"
 +    ]
  
 -      sources = [
@@ -90862,15 +90956,16 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -      configs += [ ":xnnpack_private_config" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-qc8w-gemm_riscv64_standalone") {
++  source_set("qs8-qc8w-gemm_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-1x4-minmax-fp32-scalar-lrintf.c",
-+    "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-3x4-minmax-fp32-scalar-lrintf.c"
++      "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-1x4v-minmax-fp32-rvv.c",
++    "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-4x4v-minmax-fp32-rvv.c"
 +    ]
  
 -      deps = [
@@ -90956,16 +91051,15 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("qs8-qc8w-igemm_arch=rv64gcv-abi=lp64d") {
++  source_set("qs8-qc8w-gemm_riscv64") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-1x4v-minmax-fp32-rvv.c",
-+    "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-4x4v-minmax-fp32-rvv.c"
++      "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-1x4-minmax-fp32-scalar-lrintf.c",
++    "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-3x4-minmax-fp32-scalar-lrintf.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -91027,16 +91121,15 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -      asmflags = cflags
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-qc8w-igemm_arch=rv64gcv-abi=lp64d_standalone") {
++  source_set("qs8-qc8w-gemm_riscv64_standalone") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-1x4v-minmax-fp32-rvv.c",
-+    "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-4x4v-minmax-fp32-rvv.c"
++      "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-1x4-minmax-fp32-scalar-lrintf.c",
++    "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-3x4-minmax-fp32-scalar-lrintf.c"
 +    ]
  
 -      sources = [
@@ -91081,15 +91174,16 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -    source_set("f32-qc8w-gemm_arch=armv8.2-a+fp16+dotprod_standalone") {
 -      cflags = [ "-march=armv8.2-a+fp16+dotprod" ]
 +if (build_with_chromium) {
-+  source_set("qs8-qc8w-igemm_riscv64") {
++  source_set("qs8-qc8w-igemm_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-1x4-minmax-fp32-scalar-lrintf.c",
-+    "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-3x4-minmax-fp32-scalar-lrintf.c"
++      "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-1x4v-minmax-fp32-rvv.c",
++    "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-4x4v-minmax-fp32-rvv.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -91139,15 +91233,16 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-qc8w-igemm_riscv64_standalone") {
++  source_set("qs8-qc8w-igemm_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-1x4-minmax-fp32-scalar-lrintf.c",
-+    "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-3x4-minmax-fp32-scalar-lrintf.c"
++      "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-1x4v-minmax-fp32-rvv.c",
++    "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-4x4v-minmax-fp32-rvv.c"
 +    ]
  
 -      sources = [
@@ -91249,14 +91344,15 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("qs8-qu8-packw_riscv64") {
++  source_set("qs8-qc8w-igemm_riscv64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-qu8-packw/gen/qs8-qu8-packw-x16c8-gemm-goi-scalar.c"
++      "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-1x4-minmax-fp32-scalar-lrintf.c",
++    "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-3x4-minmax-fp32-scalar-lrintf.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -91313,14 +91409,15 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-qu8-packw_riscv64_standalone") {
++  source_set("qs8-qc8w-igemm_riscv64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-qu8-packw/gen/qs8-qu8-packw-x16c8-gemm-goi-scalar.c"
++      "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-1x4-minmax-fp32-scalar-lrintf.c",
++    "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-3x4-minmax-fp32-scalar-lrintf.c"
 +    ]
  
 -      sources = [
@@ -91404,15 +91501,14 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -        "src/src/f32-raddstoreexpminusmax/gen/f32-raddstoreexpminusmax-scalar-rr2-p5-u4-acc2.c",
 -      ]
 +if (build_with_chromium) {
-+  source_set("qs8-rdsum_arch=rv64gcv-abi=lp64d") {
++  source_set("qs8-qu8-packw_riscv64") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-rdsum/gen/qs8-rdsum-7p7x-rvv-u2v.c"
++      "src/src/qs8-qu8-packw/gen/qs8-qu8-packw-x16c8-gemm-goi-scalar.c"
 +    ]
  
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -91449,15 +91545,14 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-rdsum_arch=rv64gcv-abi=lp64d_standalone") {
++  source_set("qs8-qu8-packw_riscv64_standalone") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-rdsum/gen/qs8-rdsum-7p7x-rvv-u2v.c"
++      "src/src/qs8-qu8-packw/gen/qs8-qu8-packw-x16c8-gemm-goi-scalar.c"
 +    ]
  
 -      sources = [
@@ -91533,14 +91628,15 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -    source_set("f32-rdminmax_arm64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("qs8-rdsum_riscv64") {
++  source_set("qs8-rdsum_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-rdsum/gen/qs8-rdsum-minmax-fp32-scalar-u1-acc1.c"
++      "src/src/qs8-rdsum/gen/qs8-rdsum-7p7x-rvv-u2v.c"
 +    ]
  
 -      sources = [
@@ -91600,14 +91696,15 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -      configs += [ ":xnnpack_private_config" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-rdsum_riscv64_standalone") {
++  source_set("qs8-rdsum_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-rdsum/gen/qs8-rdsum-minmax-fp32-scalar-u1-acc1.c"
++      "src/src/qs8-rdsum/gen/qs8-rdsum-7p7x-rvv-u2v.c"
 +    ]
  
 -      deps = [
@@ -91676,15 +91773,14 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -        "src/src/f32-rdsum/gen/f32-rdsum-7p7x-minmax-scalar.c",
 -      ]
 +if (build_with_chromium) {
-+  source_set("qs8-rsum_arch=rv64gcv-abi=lp64d") {
++  source_set("qs8-rdsum_riscv64") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-rsum/gen/qs8-rsum-rvv-u2v.c"
++      "src/src/qs8-rdsum/gen/qs8-rdsum-minmax-fp32-scalar-u1-acc1.c"
 +    ]
  
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -91721,15 +91817,14 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-rsum_arch=rv64gcv-abi=lp64d_standalone") {
++  source_set("qs8-rdsum_riscv64_standalone") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-rsum/gen/qs8-rsum-rvv-u2v.c"
++      "src/src/qs8-rdsum/gen/qs8-rdsum-minmax-fp32-scalar-u1-acc1.c"
 +    ]
  
 -      sources = [
@@ -91807,14 +91902,15 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -    source_set("f32-rminmax_arm64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("qs8-rsum_riscv64") {
++  source_set("qs8-rsum_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-rsum/gen/qs8-rsum-scalar-u4.c"
++      "src/src/qs8-rsum/gen/qs8-rsum-rvv-u2v.c"
 +    ]
  
 -      sources = [
@@ -91876,14 +91972,15 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -      configs += [ ":xnnpack_private_config" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-rsum_riscv64_standalone") {
++  source_set("qs8-rsum_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-rsum/gen/qs8-rsum-scalar-u4.c"
++      "src/src/qs8-rsum/gen/qs8-rsum-rvv-u2v.c"
 +    ]
  
 -      deps = [
@@ -91943,25 +92040,184 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 +}
  
 -  if (build_with_chromium) {
--    source_set("f32-rsum_arm64") {
+-    source_set("f32-rsum_arm64") {
+-      cflags = []
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/f32-rsum/gen/f32-rsum-neon-u16-acc4.c",
+-        "src/src/f32-rsum/gen/f32-rsum-scalar-u4-acc4.c",
+-      ]
+-
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
+-
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/fp16",
+-        "//third_party/fxdiv",
+-        "//third_party/pthreadpool",
+-      ]
++if (build_with_chromium) {
++  source_set("qs8-rsum_riscv64") {
++    cflags = [
++  
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/qs8-rsum/gen/qs8-rsum-scalar-u4.c"
++    ]
+ 
+-      public_configs = [ ":xnnpack_public_config" ]
+-    }
+-  }
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
+ 
+-  # This is a target that cannot depend on //base.
+-  if (build_with_internal_optimization_guide) {
+-    source_set("f32-rsum_arm64_standalone") {
+-      cflags = []
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool",
++    ]
+ 
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/f32-rsum/gen/f32-rsum-neon-u16-acc4.c",
+-        "src/src/f32-rsum/gen/f32-rsum-scalar-u4-acc4.c",
+-      ]
+-
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
+-
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/fp16",
+-        "//third_party/fxdiv",
+-        "//third_party/pthreadpool:pthreadpool_standalone",
+-      ]
+-
+-      public_configs = [ ":xnnpack_public_config" ]
+-
+-      if (!(is_android && use_order_profiling)) {
+-        assert_no_deps = [ "//base" ]
+-      }
+-    }
++    public_configs = [ ":xnnpack_public_config" ]
+   }
++}
+ 
+-  if (build_with_chromium) {
+-    source_set("f32-spmm_arm64") {
+-      cflags = []
++# This is a target that cannot depend on //base.
++if (build_with_internal_optimization_guide) {
++  source_set("qs8-rsum_riscv64_standalone") {
++    cflags = [
++  
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/qs8-rsum/gen/qs8-rsum-scalar-u4.c"
++    ]
+ 
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/f32-spmm/gen/f32-spmm-32x1-minmax-neon.c",
+-        "src/src/f32-spmm/gen/f32-spmm-32x1-minmax-neonfma-pipelined.c",
+-        "src/src/f32-spmm/gen/f32-spmm-32x2-minmax-aarch64-neonfma.c",
+-        "src/src/f32-spmm/gen/f32-spmm-32x4-minmax-aarch64-neonfma.c",
+-        "src/src/f32-spmm/gen/f32-spmm-8x1-minmax-scalar.c",
+-        "src/src/f32-spmm/gen/f32-spmm-8x2-minmax-scalar.c",
+-        "src/src/f32-spmm/gen/f32-spmm-8x4-minmax-scalar.c",
+-      ]
+-
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
+-
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/fp16",
+-        "//third_party/fxdiv",
+-        "//third_party/pthreadpool",
+-      ]
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
+ 
+-      public_configs = [ ":xnnpack_public_config" ]
+-    }
+-  }
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool:pthreadpool_standalone",
++    ]
+ 
+-  # This is a target that cannot depend on //base.
+-  if (build_with_internal_optimization_guide) {
+-    source_set("f32-spmm_arm64_standalone") {
+-      cflags = []
++    public_configs = [ ":xnnpack_public_config" ]
+ 
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/f32-spmm/gen/f32-spmm-32x1-minmax-neon.c",
+-        "src/src/f32-spmm/gen/f32-spmm-32x1-minmax-neonfma-pipelined.c",
+-        "src/src/f32-spmm/gen/f32-spmm-32x2-minmax-aarch64-neonfma.c",
+-        "src/src/f32-spmm/gen/f32-spmm-32x4-minmax-aarch64-neonfma.c",
+-        "src/src/f32-spmm/gen/f32-spmm-8x1-minmax-scalar.c",
+-        "src/src/f32-spmm/gen/f32-spmm-8x2-minmax-scalar.c",
+-        "src/src/f32-spmm/gen/f32-spmm-8x4-minmax-scalar.c",
+-      ]
+-
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
+-
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/fp16",
+-        "//third_party/fxdiv",
+-        "//third_party/pthreadpool:pthreadpool_standalone",
+-      ]
+-
+-      public_configs = [ ":xnnpack_public_config" ]
+-
+-      if (!(is_android && use_order_profiling)) {
+-        assert_no_deps = [ "//base" ]
+-      }
++    if (!(is_android && use_order_profiling)) {
++      assert_no_deps = [ "//base" ]
+     }
+   }
++}
+ 
+-  if (build_with_chromium) {
+-    source_set("f32-vapproxgelu_arm64") {
 -      cflags = []
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f32-rsum/gen/f32-rsum-neon-u16-acc4.c",
--        "src/src/f32-rsum/gen/f32-rsum-scalar-u4-acc4.c",
--      ]
--
--      configs -= [ "//build/config/compiler:chromium_code" ]
--      configs += [ "//build/config/compiler:no_chromium_code" ]
--      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
--      configs += [ ":xnnpack_private_config" ]
--
--      deps = [
--        "//third_party/cpuinfo",
--        "//third_party/fp16",
--        "//third_party/fxdiv",
--        "//third_party/pthreadpool",
+-        "src/src/f32-vapproxgelu/gen/f32-vapproxgelu-neon-rational-12-10-div.c",
+-        "src/src/f32-vapproxgelu/gen/f32-vapproxgelu-scalar-rational-12-10-div.c",
 -      ]
 +if (build_with_chromium) {
 +  source_set("qs8-vadd_arch=rv64gcv-abi=lp64d") {
@@ -91975,167 +92231,6 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 +      "src/src/qs8-vadd/gen/qs8-vadd-minmax-rvv-u2v.c"
 +    ]
  
--      public_configs = [ ":xnnpack_public_config" ]
--    }
--  }
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
- 
--  # This is a target that cannot depend on //base.
--  if (build_with_internal_optimization_guide) {
--    source_set("f32-rsum_arm64_standalone") {
--      cflags = []
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool",
-+    ]
- 
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/f32-rsum/gen/f32-rsum-neon-u16-acc4.c",
--        "src/src/f32-rsum/gen/f32-rsum-scalar-u4-acc4.c",
--      ]
--
--      configs -= [ "//build/config/compiler:chromium_code" ]
--      configs += [ "//build/config/compiler:no_chromium_code" ]
--      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
--      configs += [ ":xnnpack_private_config" ]
--
--      deps = [
--        "//third_party/cpuinfo",
--        "//third_party/fp16",
--        "//third_party/fxdiv",
--        "//third_party/pthreadpool:pthreadpool_standalone",
--      ]
--
--      public_configs = [ ":xnnpack_public_config" ]
--
--      if (!(is_android && use_order_profiling)) {
--        assert_no_deps = [ "//base" ]
--      }
--    }
-+    public_configs = [ ":xnnpack_public_config" ]
-   }
-+}
- 
--  if (build_with_chromium) {
--    source_set("f32-spmm_arm64") {
--      cflags = []
-+# This is a target that cannot depend on //base.
-+if (build_with_internal_optimization_guide) {
-+  source_set("qs8-vadd_arch=rv64gcv-abi=lp64d_standalone") {
-+    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/qs8-vadd/gen/qs8-vadd-minmax-rvv-u2v.c"
-+    ]
- 
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/f32-spmm/gen/f32-spmm-32x1-minmax-neon.c",
--        "src/src/f32-spmm/gen/f32-spmm-32x1-minmax-neonfma-pipelined.c",
--        "src/src/f32-spmm/gen/f32-spmm-32x2-minmax-aarch64-neonfma.c",
--        "src/src/f32-spmm/gen/f32-spmm-32x4-minmax-aarch64-neonfma.c",
--        "src/src/f32-spmm/gen/f32-spmm-8x1-minmax-scalar.c",
--        "src/src/f32-spmm/gen/f32-spmm-8x2-minmax-scalar.c",
--        "src/src/f32-spmm/gen/f32-spmm-8x4-minmax-scalar.c",
--      ]
--
--      configs -= [ "//build/config/compiler:chromium_code" ]
--      configs += [ "//build/config/compiler:no_chromium_code" ]
--      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
--      configs += [ ":xnnpack_private_config" ]
--
--      deps = [
--        "//third_party/cpuinfo",
--        "//third_party/fp16",
--        "//third_party/fxdiv",
--        "//third_party/pthreadpool",
--      ]
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
- 
--      public_configs = [ ":xnnpack_public_config" ]
--    }
--  }
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool:pthreadpool_standalone",
-+    ]
- 
--  # This is a target that cannot depend on //base.
--  if (build_with_internal_optimization_guide) {
--    source_set("f32-spmm_arm64_standalone") {
--      cflags = []
-+    public_configs = [ ":xnnpack_public_config" ]
- 
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/f32-spmm/gen/f32-spmm-32x1-minmax-neon.c",
--        "src/src/f32-spmm/gen/f32-spmm-32x1-minmax-neonfma-pipelined.c",
--        "src/src/f32-spmm/gen/f32-spmm-32x2-minmax-aarch64-neonfma.c",
--        "src/src/f32-spmm/gen/f32-spmm-32x4-minmax-aarch64-neonfma.c",
--        "src/src/f32-spmm/gen/f32-spmm-8x1-minmax-scalar.c",
--        "src/src/f32-spmm/gen/f32-spmm-8x2-minmax-scalar.c",
--        "src/src/f32-spmm/gen/f32-spmm-8x4-minmax-scalar.c",
--      ]
--
--      configs -= [ "//build/config/compiler:chromium_code" ]
--      configs += [ "//build/config/compiler:no_chromium_code" ]
--      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
--      configs += [ ":xnnpack_private_config" ]
--
--      deps = [
--        "//third_party/cpuinfo",
--        "//third_party/fp16",
--        "//third_party/fxdiv",
--        "//third_party/pthreadpool:pthreadpool_standalone",
--      ]
--
--      public_configs = [ ":xnnpack_public_config" ]
--
--      if (!(is_android && use_order_profiling)) {
--        assert_no_deps = [ "//base" ]
--      }
-+    if (!(is_android && use_order_profiling)) {
-+      assert_no_deps = [ "//base" ]
-     }
-   }
-+}
- 
--  if (build_with_chromium) {
--    source_set("f32-vapproxgelu_arm64") {
--      cflags = []
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/f32-vapproxgelu/gen/f32-vapproxgelu-neon-rational-12-10-div.c",
--        "src/src/f32-vapproxgelu/gen/f32-vapproxgelu-scalar-rational-12-10-div.c",
--      ]
-+if (build_with_chromium) {
-+  source_set("qs8-vadd_riscv64") {
-+    cflags = [
-+  
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/qs8-vadd/gen/qs8-vadd-minmax-scalar-u1.c",
-+    "src/src/qs8-vadd/gen/qs8-vadd-minmax-scalar-u4.c"
-+    ]
- 
 -      configs -= [ "//build/config/compiler:chromium_code" ]
 -      configs += [ "//build/config/compiler:no_chromium_code" ]
 -      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
@@ -92170,15 +92265,15 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-vadd_riscv64_standalone") {
++  source_set("qs8-vadd_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vadd/gen/qs8-vadd-minmax-scalar-u1.c",
-+    "src/src/qs8-vadd/gen/qs8-vadd-minmax-scalar-u4.c"
++      "src/src/qs8-vadd/gen/qs8-vadd-minmax-rvv-u2v.c"
 +    ]
  
 -      sources = [
@@ -92288,15 +92383,15 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -    source_set("f32-vbinary_arm64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("qs8-vaddc_arch=rv64gcv-abi=lp64d") {
++  source_set("qs8-vadd_riscv64") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vaddc/gen/qs8-vaddc-minmax-rvv-u2v.c"
++      "src/src/qs8-vadd/gen/qs8-vadd-minmax-scalar-u1.c",
++    "src/src/qs8-vadd/gen/qs8-vadd-minmax-scalar-u4.c"
 +    ]
  
 -      sources = [
@@ -92390,15 +92485,15 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -      configs += [ ":xnnpack_private_config" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-vaddc_arch=rv64gcv-abi=lp64d_standalone") {
++  source_set("qs8-vadd_riscv64_standalone") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vaddc/gen/qs8-vaddc-minmax-rvv-u2v.c"
++      "src/src/qs8-vadd/gen/qs8-vadd-minmax-scalar-u1.c",
++    "src/src/qs8-vadd/gen/qs8-vadd-minmax-scalar-u4.c"
 +    ]
  
 -      deps = [
@@ -92467,15 +92562,15 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -        "src/src/f32-vcmul/gen/f32-vcmul-scalar-u4.c",
 -      ]
 +if (build_with_chromium) {
-+  source_set("qs8-vaddc_riscv64") {
++  source_set("qs8-vaddc_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vaddc/gen/qs8-vaddc-minmax-scalar-u1.c",
-+    "src/src/qs8-vaddc/gen/qs8-vaddc-minmax-scalar-u4.c"
++      "src/src/qs8-vaddc/gen/qs8-vaddc-minmax-rvv-u2v.c"
 +    ]
  
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -92512,15 +92607,15 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-vaddc_riscv64_standalone") {
++  source_set("qs8-vaddc_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vaddc/gen/qs8-vaddc-minmax-scalar-u1.c",
-+    "src/src/qs8-vaddc/gen/qs8-vaddc-minmax-scalar-u4.c"
++      "src/src/qs8-vaddc/gen/qs8-vaddc-minmax-rvv-u2v.c"
 +    ]
  
 -      sources = [
@@ -92598,14 +92693,15 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -    source_set("f32-vcopysign_arm64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("qs8-vcvt_riscv64") {
++  source_set("qs8-vaddc_riscv64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vcvt/gen/qs8-vcvt-scalar-u4.c"
++      "src/src/qs8-vaddc/gen/qs8-vaddc-minmax-scalar-u1.c",
++    "src/src/qs8-vaddc/gen/qs8-vaddc-minmax-scalar-u4.c"
 +    ]
  
 -      sources = [
@@ -92667,14 +92763,15 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -      configs += [ ":xnnpack_private_config" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-vcvt_riscv64_standalone") {
++  source_set("qs8-vaddc_riscv64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vcvt/gen/qs8-vcvt-scalar-u4.c"
++      "src/src/qs8-vaddc/gen/qs8-vaddc-minmax-scalar-u1.c",
++    "src/src/qs8-vaddc/gen/qs8-vaddc-minmax-scalar-u4.c"
 +    ]
  
 -      deps = [
@@ -92757,15 +92854,14 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("qs8-vlrelu_arch=rv64gcv-abi=lp64d") {
++  source_set("qs8-vcvt_riscv64") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vlrelu/gen/qs8-vlrelu-rvv-u2v.c"
++      "src/src/qs8-vcvt/gen/qs8-vcvt-scalar-u4.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -92822,15 +92918,14 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-vlrelu_arch=rv64gcv-abi=lp64d_standalone") {
++  source_set("qs8-vcvt_riscv64_standalone") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vlrelu/gen/qs8-vlrelu-rvv-u2v.c"
++      "src/src/qs8-vcvt/gen/qs8-vcvt-scalar-u4.c"
 +    ]
  
 -      sources = [
@@ -92874,14 +92969,15 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -    source_set("f32-vexp_arm64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("qs8-vlrelu_riscv64") {
++  source_set("qs8-vlrelu_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vlrelu/gen/qs8-vlrelu-scalar-andxor-u4.c"
++      "src/src/qs8-vlrelu/gen/qs8-vlrelu-rvv-u2v.c"
 +    ]
  
 -      sources = [
@@ -92939,14 +93035,15 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -      configs += [ ":xnnpack_private_config" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-vlrelu_riscv64_standalone") {
++  source_set("qs8-vlrelu_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vlrelu/gen/qs8-vlrelu-scalar-andxor-u4.c"
++      "src/src/qs8-vlrelu/gen/qs8-vlrelu-rvv-u2v.c"
 +    ]
  
 -      deps = [
@@ -93027,15 +93124,14 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("qs8-vmul_arch=rv64gcv-abi=lp64d") {
++  source_set("qs8-vlrelu_riscv64") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vmul/gen/qs8-vmul-minmax-f32-rvv-u2v.c"
++      "src/src/qs8-vlrelu/gen/qs8-vlrelu-scalar-andxor-u4.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -93090,15 +93186,14 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-vmul_arch=rv64gcv-abi=lp64d_standalone") {
++  source_set("qs8-vlrelu_riscv64_standalone") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vmul/gen/qs8-vmul-minmax-f32-rvv-u2v.c"
++      "src/src/qs8-vlrelu/gen/qs8-vlrelu-scalar-andxor-u4.c"
 +    ]
  
 -      sources = [
@@ -93142,14 +93237,15 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -    source_set("f32-vlog_arm64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("qs8-vmul_riscv64") {
++  source_set("qs8-vmul_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vmul/gen/qs8-vmul-minmax-fp32-scalar-u4.c"
++      "src/src/qs8-vmul/gen/qs8-vmul-minmax-f32-rvv-u2v.c"
 +    ]
  
 -      sources = [
@@ -93207,14 +93303,15 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -      configs += [ ":xnnpack_private_config" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-vmul_riscv64_standalone") {
++  source_set("qs8-vmul_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vmul/gen/qs8-vmul-minmax-fp32-scalar-u4.c"
++      "src/src/qs8-vmul/gen/qs8-vmul-minmax-f32-rvv-u2v.c"
 +    ]
  
 -      deps = [
@@ -93284,15 +93381,14 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -        "src/src/f32-vmulcaddc/gen/f32-vmulcaddc-c4-minmax-neonfma-2x.c",
 -      ]
 +if (build_with_chromium) {
-+  source_set("qs8-vmulc_arch=rv64gcv-abi=lp64d") {
++  source_set("qs8-vmul_riscv64") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vmulc/gen/qs8-vmulc-minmax-f32-rvv-u2v.c"
++      "src/src/qs8-vmul/gen/qs8-vmul-minmax-fp32-scalar-u4.c"
 +    ]
  
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -93329,15 +93425,14 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-vmulc_arch=rv64gcv-abi=lp64d_standalone") {
++  source_set("qs8-vmul_riscv64_standalone") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vmulc/gen/qs8-vmulc-minmax-f32-rvv-u2v.c"
++      "src/src/qs8-vmul/gen/qs8-vmul-minmax-fp32-scalar-u4.c"
 +    ]
  
 -      sources = [
@@ -93422,14 +93517,15 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -    source_set("f32-vrnd_arm64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("qs8-vmulc_riscv64") {
++  source_set("qs8-vmulc_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vmulc/gen/qs8-vmulc-minmax-fp32-scalar-u4.c"
++      "src/src/qs8-vmulc/gen/qs8-vmulc-minmax-f32-rvv-u2v.c"
 +    ]
  
 -      sources = [
@@ -93498,14 +93594,15 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -      configs += [ ":xnnpack_private_config" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-vmulc_riscv64_standalone") {
++  source_set("qs8-vmulc_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vmulc/gen/qs8-vmulc-minmax-fp32-scalar-u4.c"
++      "src/src/qs8-vmulc/gen/qs8-vmulc-minmax-f32-rvv-u2v.c"
 +    ]
  
 -      deps = [
@@ -93588,14 +93685,14 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("qs8-vprelu_riscv64") {
++  source_set("qs8-vmulc_riscv64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vprelu/gen/qs8-vprelu-scalar-u8.c"
++      "src/src/qs8-vmulc/gen/qs8-vmulc-minmax-fp32-scalar-u4.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -93651,14 +93748,14 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-vprelu_riscv64_standalone") {
++  source_set("qs8-vmulc_riscv64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vprelu/gen/qs8-vprelu-scalar-u8.c"
++      "src/src/qs8-vmulc/gen/qs8-vmulc-minmax-fp32-scalar-u4.c"
 +    ]
  
 -      sources = [
@@ -93702,14 +93799,14 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -    source_set("f32-vsin_arm64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("qs8-vpreluc_riscv64") {
++  source_set("qs8-vprelu_riscv64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vpreluc/gen/qs8-vpreluc-scalar-u8.c"
++      "src/src/qs8-vprelu/gen/qs8-vprelu-scalar-u8.c"
 +    ]
  
 -      sources = [
@@ -93767,14 +93864,14 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -      configs += [ ":xnnpack_private_config" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-vpreluc_riscv64_standalone") {
++  source_set("qs8-vprelu_riscv64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vpreluc/gen/qs8-vpreluc-scalar-u8.c"
++      "src/src/qs8-vprelu/gen/qs8-vprelu-scalar-u8.c"
 +    ]
  
 -      deps = [
@@ -93842,59 +93939,46 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -        "src/src/f32-vtanh/gen/f32-vtanh-neon-rational-9-8-div.c",
 -        "src/src/f32-vtanh/gen/f32-vtanh-scalar-rational-9-8-div.c",
 -      ]
-+if (build_with_chromium) {
-+  source_set("qs8-vrpreluc_riscv64") {
-+    cflags = [
-+  
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/qs8-vrpreluc/gen/qs8-vrpreluc-scalar-u8.c"
-+    ]
- 
+-
 -      configs -= [ "//build/config/compiler:chromium_code" ]
 -      configs += [ "//build/config/compiler:no_chromium_code" ]
 -      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 -      configs += [ ":xnnpack_private_config" ]
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
- 
+-
 -      deps = [
 -        "//third_party/cpuinfo",
 -        "//third_party/fp16",
 -        "//third_party/fxdiv",
 -        "//third_party/pthreadpool",
 -      ]
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool",
++if (build_with_chromium) {
++  source_set("qs8-vpreluc_riscv64") {
++    cflags = [
++  
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/qs8-vpreluc/gen/qs8-vpreluc-scalar-u8.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
 -    }
-+    public_configs = [ ":xnnpack_public_config" ]
-   }
-+}
+-  }
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
 -    source_set("f32-vtanh_arm64_standalone") {
 -      cflags = []
-+# This is a target that cannot depend on //base.
-+if (build_with_internal_optimization_guide) {
-+  source_set("qs8-vrpreluc_riscv64_standalone") {
-+    cflags = [
-+  
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/qs8-vrpreluc/gen/qs8-vrpreluc-scalar-u8.c"
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool",
 +    ]
  
 -      sources = [
@@ -93921,20 +94005,23 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -        assert_no_deps = [ "//base" ]
 -      }
 -    }
--  }
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
++    public_configs = [ ":xnnpack_public_config" ]
+   }
++}
  
 -  if (build_with_chromium) {
 -    source_set("f32-vunary_arm64") {
 -      cflags = []
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool:pthreadpool_standalone",
++# This is a target that cannot depend on //base.
++if (build_with_internal_optimization_guide) {
++  source_set("qs8-vpreluc_riscv64_standalone") {
++    cflags = [
++  
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/qs8-vpreluc/gen/qs8-vpreluc-scalar-u8.c"
 +    ]
  
 -      sources = [
@@ -93958,31 +94045,26 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -        "//third_party/fxdiv",
 -        "//third_party/pthreadpool",
 -      ]
-+    public_configs = [ ":xnnpack_public_config" ]
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
-+    if (!(is_android && use_order_profiling)) {
-+      assert_no_deps = [ "//base" ]
-     }
-   }
-+}
+-    }
+-  }
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool:pthreadpool_standalone",
++    ]
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
 -    source_set("f32-vunary_arm64_standalone") {
 -      cflags = []
-+if (build_with_chromium) {
-+  source_set("qu8-dwconv_arch=rv64gcv-abi=lp64d") {
-+    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/qu8-dwconv/gen/qu8-dwconv-25p8vc-minmax-fp32-rvv.c",
-+    "src/src/qu8-dwconv/gen/qu8-dwconv-9p8vc-minmax-fp32-rvv.c"
-+    ]
++    public_configs = [ ":xnnpack_public_config" ]
  
 -      sources = [
 -        "src/include/xnnpack.h",
@@ -94011,97 +94093,16 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -      if (!(is_android && use_order_profiling)) {
 -        assert_no_deps = [ "//base" ]
 -      }
--    }
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
-+
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool",
-+    ]
-+
-+    public_configs = [ ":xnnpack_public_config" ]
++    if (!(is_android && use_order_profiling)) {
++      assert_no_deps = [ "//base" ]
+     }
    }
 +}
  
 -  if (build_with_chromium) {
 -    source_set("operators_arm64") {
 -      cflags = []
-+# This is a target that cannot depend on //base.
-+if (build_with_internal_optimization_guide) {
-+  source_set("qu8-dwconv_arch=rv64gcv-abi=lp64d_standalone") {
-+    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/qu8-dwconv/gen/qu8-dwconv-25p8vc-minmax-fp32-rvv.c",
-+    "src/src/qu8-dwconv/gen/qu8-dwconv-9p8vc-minmax-fp32-rvv.c"
-+    ]
- 
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/operators/argmax-pooling-nhwc.c",
--        "src/src/operators/average-pooling-nhwc.c",
--        "src/src/operators/batch-matrix-multiply-nc.c",
--        "src/src/operators/binary-elementwise-nd.c",
--        "src/src/operators/constant-pad-nd.c",
--        "src/src/operators/convolution-nchw.c",
--        "src/src/operators/convolution-nhwc.c",
--        "src/src/operators/deconvolution-nhwc.c",
--        "src/src/operators/dynamic-fully-connected-nc.c",
--        "src/src/operators/fully-connected-nc.c",
--        "src/src/operators/max-pooling-nhwc.c",
--        "src/src/operators/pack-lh.c",
--        "src/src/operators/reduce-nd.c",
--        "src/src/operators/resize-bilinear-nchw.c",
--        "src/src/operators/resize-bilinear-nhwc.c",
--        "src/src/operators/rope-nthc.c",
--        "src/src/operators/slice-nd.c",
--        "src/src/operators/softmax-nc.c",
--        "src/src/operators/transpose-nd.c",
--        "src/src/operators/unary-elementwise-nc.c",
--        "src/src/operators/unpooling-nhwc.c",
--      ]
 -
--      configs -= [ "//build/config/compiler:chromium_code" ]
--      configs += [ "//build/config/compiler:no_chromium_code" ]
--      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
--      configs += [ ":xnnpack_private_config" ]
--
--      deps = [
--        "//third_party/cpuinfo",
--        "//third_party/fp16",
--        "//third_party/fxdiv",
--        "//third_party/pthreadpool",
--      ]
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
- 
--      public_configs = [ ":xnnpack_public_config" ]
--    }
--  }
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool:pthreadpool_standalone",
-+    ]
- 
--  # This is a target that cannot depend on //base.
--  if (build_with_internal_optimization_guide) {
--    source_set("operators_arm64_standalone") {
--      cflags = []
-+    public_configs = [ ":xnnpack_public_config" ]
- 
 -      sources = [
 -        "src/include/xnnpack.h",
 -        "src/src/operators/argmax-pooling-nhwc.c",
@@ -94113,6 +94114,8 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -        "src/src/operators/convolution-nhwc.c",
 -        "src/src/operators/deconvolution-nhwc.c",
 -        "src/src/operators/dynamic-fully-connected-nc.c",
+-        "src/src/operators/fingerprint_cache.c",
+-        "src/src/operators/fingerprint_id.c",
 -        "src/src/operators/fully-connected-nc.c",
 -        "src/src/operators/max-pooling-nhwc.c",
 -        "src/src/operators/pack-lh.c",
@@ -94136,58 +94139,31 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -        "//third_party/cpuinfo",
 -        "//third_party/fp16",
 -        "//third_party/fxdiv",
--        "//third_party/pthreadpool:pthreadpool_standalone",
--      ]
--
--      public_configs = [ ":xnnpack_public_config" ]
--
--      if (!(is_android && use_order_profiling)) {
--        assert_no_deps = [ "//base" ]
--      }
-+    if (!(is_android && use_order_profiling)) {
-+      assert_no_deps = [ "//base" ]
-     }
-   }
-+}
- 
--  if (build_with_chromium) {
--    source_set("pf16-gemm_arch=armv8.2-a+sve+sve2") {
--      cflags = [ "-march=armv8.2-a+sve+sve2" ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/pf16-gemm/pf16-gemm-1x32c2-minmax-neonsme2.c",
--        "src/src/pf16-gemm/pf16-gemm-32x32c2-minmax-neonsme2.c",
+-        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("qu8-dwconv_riscv64") {
++  source_set("qs8-vrpreluc_riscv64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-dwconv/gen/qu8-dwconv-25p1c-minmax-fp32-scalar-fmagic.c",
-+    "src/src/qu8-dwconv/gen/qu8-dwconv-25p2c-minmax-fp32-scalar-lrintf.c",
-+    "src/src/qu8-dwconv/gen/qu8-dwconv-9p1c-minmax-fp32-scalar-fmagic.c",
-+    "src/src/qu8-dwconv/gen/qu8-dwconv-9p2c-minmax-fp32-scalar-lrintf.c"
++      "src/src/qs8-vrpreluc/gen/qs8-vrpreluc-scalar-u8.c"
 +    ]
  
--      configs -= [ "//build/config/compiler:chromium_code" ]
--      configs += [ "//build/config/compiler:no_chromium_code" ]
--      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
--      configs += [ ":xnnpack_private_config" ]
+-      public_configs = [ ":xnnpack_public_config" ]
+-    }
+-  }
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
 +    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 +    configs += [ ":xnnpack_private_config" ]
  
--      deps = [
--        "//third_party/cpuinfo",
--        "//third_party/fp16",
--        "//third_party/fxdiv",
--        "//third_party/pthreadpool",
--      ]
+-  # This is a target that cannot depend on //base.
+-  if (build_with_internal_optimization_guide) {
+-    source_set("operators_arm64_standalone") {
+-      cflags = []
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
@@ -94195,35 +94171,31 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 +      "//third_party/pthreadpool",
 +    ]
  
--      public_configs = [ ":xnnpack_public_config" ]
--    }
-+    public_configs = [ ":xnnpack_public_config" ]
-   }
-+}
- 
--  # This is a target that cannot depend on //base.
--  if (build_with_internal_optimization_guide) {
--    source_set("pf16-gemm_arch=armv8.2-a+sve+sve2_standalone") {
--      cflags = [ "-march=armv8.2-a+sve+sve2" ]
-+# This is a target that cannot depend on //base.
-+if (build_with_internal_optimization_guide) {
-+  source_set("qu8-dwconv_riscv64_standalone") {
-+    cflags = [
-+  
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/qu8-dwconv/gen/qu8-dwconv-25p1c-minmax-fp32-scalar-fmagic.c",
-+    "src/src/qu8-dwconv/gen/qu8-dwconv-25p2c-minmax-fp32-scalar-lrintf.c",
-+    "src/src/qu8-dwconv/gen/qu8-dwconv-9p1c-minmax-fp32-scalar-fmagic.c",
-+    "src/src/qu8-dwconv/gen/qu8-dwconv-9p2c-minmax-fp32-scalar-lrintf.c"
-+    ]
- 
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/pf16-gemm/pf16-gemm-1x32c2-minmax-neonsme2.c",
--        "src/src/pf16-gemm/pf16-gemm-32x32c2-minmax-neonsme2.c",
+-        "src/src/operators/argmax-pooling-nhwc.c",
+-        "src/src/operators/average-pooling-nhwc.c",
+-        "src/src/operators/batch-matrix-multiply-nc.c",
+-        "src/src/operators/binary-elementwise-nd.c",
+-        "src/src/operators/constant-pad-nd.c",
+-        "src/src/operators/convolution-nchw.c",
+-        "src/src/operators/convolution-nhwc.c",
+-        "src/src/operators/deconvolution-nhwc.c",
+-        "src/src/operators/dynamic-fully-connected-nc.c",
+-        "src/src/operators/fingerprint_cache.c",
+-        "src/src/operators/fingerprint_id.c",
+-        "src/src/operators/fully-connected-nc.c",
+-        "src/src/operators/max-pooling-nhwc.c",
+-        "src/src/operators/pack-lh.c",
+-        "src/src/operators/reduce-nd.c",
+-        "src/src/operators/resize-bilinear-nchw.c",
+-        "src/src/operators/resize-bilinear-nhwc.c",
+-        "src/src/operators/rope-nthc.c",
+-        "src/src/operators/slice-nd.c",
+-        "src/src/operators/softmax-nc.c",
+-        "src/src/operators/transpose-nd.c",
+-        "src/src/operators/unary-elementwise-nc.c",
+-        "src/src/operators/unpooling-nhwc.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -94244,35 +94216,45 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -        assert_no_deps = [ "//base" ]
 -      }
 -    }
--  }
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [ "//build/config/compiler:no_chromium_code" ]
-+    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
-+    configs += [ ":xnnpack_private_config" ]
++    public_configs = [ ":xnnpack_public_config" ]
+   }
++}
  
 -  if (build_with_chromium) {
--    source_set("pf32-gemm_arch=armv8.2-a+sve+sve2") {
+-    source_set("pf16-f16-f16-igemm_arch=armv8.2-a+sve+sve2") {
 -      cflags = [ "-march=armv8.2-a+sve+sve2" ]
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool:pthreadpool_standalone",
++# This is a target that cannot depend on //base.
++if (build_with_internal_optimization_guide) {
++  source_set("qs8-vrpreluc_riscv64_standalone") {
++    cflags = [
++  
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/qs8-vrpreluc/gen/qs8-vrpreluc-scalar-u8.c"
 +    ]
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/pf32-gemm/pf32-gemm-1x32-minmax-neonsme.c",
--        "src/src/pf32-gemm/pf32-gemm-1x32-minmax-neonsme2.c",
--        "src/src/pf32-gemm/pf32-gemm-32x32-minmax-neonsme.c",
--        "src/src/pf32-gemm/pf32-gemm-32x32-minmax-neonsme2.c",
+-        "src/src/pf16-f16-f16-igemm/pf16-f16-f16-igemm-32x32c2-minmax-neonsme2.c",
 -      ]
--
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
+ 
 -      configs -= [ "//build/config/compiler:chromium_code" ]
 -      configs += [ "//build/config/compiler:no_chromium_code" ]
 -      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 -      configs += [ ":xnnpack_private_config" ]
--
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool:pthreadpool_standalone",
++    ]
+ 
 -      deps = [
 -        "//third_party/cpuinfo",
 -        "//third_party/fp16",
@@ -94290,10 +94272,10 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
--    source_set("pf32-gemm_arch=armv8.2-a+sve+sve2_standalone") {
+-    source_set("pf16-f16-f16-igemm_arch=armv8.2-a+sve+sve2_standalone") {
 -      cflags = [ "-march=armv8.2-a+sve+sve2" ]
 +if (build_with_chromium) {
-+  source_set("qu8-f32-vcvt_arch=rv64gcv-abi=lp64d") {
++  source_set("qu8-dwconv_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gcv"
@@ -94301,15 +94283,13 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-f32-vcvt/gen/qu8-f32-vcvt-rvv-u2v.c"
++      "src/src/qu8-dwconv/gen/qu8-dwconv-25p8vc-minmax-fp32-rvv.c",
++    "src/src/qu8-dwconv/gen/qu8-dwconv-9p8vc-minmax-fp32-rvv.c"
 +    ]
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/pf32-gemm/pf32-gemm-1x32-minmax-neonsme.c",
--        "src/src/pf32-gemm/pf32-gemm-1x32-minmax-neonsme2.c",
--        "src/src/pf32-gemm/pf32-gemm-32x32-minmax-neonsme.c",
--        "src/src/pf32-gemm/pf32-gemm-32x32-minmax-neonsme2.c",
+-        "src/src/pf16-f16-f16-igemm/pf16-f16-f16-igemm-32x32c2-minmax-neonsme2.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -94337,7 +94317,7 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 +    configs += [ ":xnnpack_private_config" ]
  
 -  if (build_with_chromium) {
--    source_set("pqs8-f32-qc8w-igemm_arch=armv8.2-a+sve+sve2") {
+-    source_set("pf16-gemm_arch=armv8.2-a+sve+sve2") {
 -      cflags = [ "-march=armv8.2-a+sve+sve2" ]
 +    deps = [
 +      "//third_party/cpuinfo",
@@ -94348,7 +94328,8 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/pqs8-f32-qc8w-igemm/pqs8-f32-qc8w-igemm-32x32c4-minmax-neonsme2.c",
+-        "src/src/pf16-gemm/pf16-gemm-1x32c2-minmax-neonsme2.c",
+-        "src/src/pf16-gemm/pf16-gemm-32x32c2-minmax-neonsme2.c",
 -      ]
 +    public_configs = [ ":xnnpack_public_config" ]
 +  }
@@ -94360,7 +94341,7 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -      configs += [ ":xnnpack_private_config" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qu8-f32-vcvt_arch=rv64gcv-abi=lp64d_standalone") {
++  source_set("qu8-dwconv_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gcv"
@@ -94368,7 +94349,8 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-f32-vcvt/gen/qu8-f32-vcvt-rvv-u2v.c"
++      "src/src/qu8-dwconv/gen/qu8-dwconv-25p8vc-minmax-fp32-rvv.c",
++    "src/src/qu8-dwconv/gen/qu8-dwconv-9p8vc-minmax-fp32-rvv.c"
 +    ]
  
 -      deps = [
@@ -94394,13 +94376,14 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
--    source_set("pqs8-f32-qc8w-igemm_arch=armv8.2-a+sve+sve2_standalone") {
+-    source_set("pf16-gemm_arch=armv8.2-a+sve+sve2_standalone") {
 -      cflags = [ "-march=armv8.2-a+sve+sve2" ]
 +    public_configs = [ ":xnnpack_public_config" ]
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/pqs8-f32-qc8w-igemm/pqs8-f32-qc8w-igemm-32x32c4-minmax-neonsme2.c",
+-        "src/src/pf16-gemm/pf16-gemm-1x32c2-minmax-neonsme2.c",
+-        "src/src/pf16-gemm/pf16-gemm-32x32c2-minmax-neonsme2.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -94427,13 +94410,15 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 +}
  
 -  if (build_with_chromium) {
--    source_set("pqs8-qc8w-gemm_arch=armv8.2-a+sve+sve2") {
+-    source_set("pf32-gemm_arch=armv8.2-a+sve+sve2") {
 -      cflags = [ "-march=armv8.2-a+sve+sve2" ]
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/pqs8-qc8w-gemm/pqs8-qc8w-gemm-1x32c4-minmax-neonsme2.c",
--        "src/src/pqs8-qc8w-gemm/pqs8-qc8w-gemm-32x32c4-minmax-neonsme2.c",
+-        "src/src/pf32-gemm/pf32-gemm-1x32-minmax-neonsme.c",
+-        "src/src/pf32-gemm/pf32-gemm-1x32-minmax-neonsme2.c",
+-        "src/src/pf32-gemm/pf32-gemm-32x32-minmax-neonsme.c",
+-        "src/src/pf32-gemm/pf32-gemm-32x32-minmax-neonsme2.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -94448,14 +94433,17 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("qu8-f32-vcvt_riscv64") {
++  source_set("qu8-dwconv_riscv64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-f32-vcvt/gen/qu8-f32-vcvt-scalar-u4.c"
++      "src/src/qu8-dwconv/gen/qu8-dwconv-25p1c-minmax-fp32-scalar-fmagic.c",
++    "src/src/qu8-dwconv/gen/qu8-dwconv-25p2c-minmax-fp32-scalar-lrintf.c",
++    "src/src/qu8-dwconv/gen/qu8-dwconv-9p1c-minmax-fp32-scalar-fmagic.c",
++    "src/src/qu8-dwconv/gen/qu8-dwconv-9p2c-minmax-fp32-scalar-lrintf.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -94468,7 +94456,7 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
--    source_set("pqs8-qc8w-gemm_arch=armv8.2-a+sve+sve2_standalone") {
+-    source_set("pf32-gemm_arch=armv8.2-a+sve+sve2_standalone") {
 -      cflags = [ "-march=armv8.2-a+sve+sve2" ]
 +    deps = [
 +      "//third_party/cpuinfo",
@@ -94479,8 +94467,10 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/pqs8-qc8w-gemm/pqs8-qc8w-gemm-1x32c4-minmax-neonsme2.c",
--        "src/src/pqs8-qc8w-gemm/pqs8-qc8w-gemm-32x32c4-minmax-neonsme2.c",
+-        "src/src/pf32-gemm/pf32-gemm-1x32-minmax-neonsme.c",
+-        "src/src/pf32-gemm/pf32-gemm-1x32-minmax-neonsme2.c",
+-        "src/src/pf32-gemm/pf32-gemm-32x32-minmax-neonsme.c",
+-        "src/src/pf32-gemm/pf32-gemm-32x32-minmax-neonsme2.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -94506,24 +94496,26 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 +}
  
 -  if (build_with_chromium) {
--    source_set("qb4-packw_arch=armv8.2-a+dotprod") {
--      cflags = [ "-march=armv8.2-a+dotprod" ]
+-    source_set("pqs8-f32-qc8w-igemm_arch=armv8.2-a+sve+sve2") {
+-      cflags = [ "-march=armv8.2-a+sve+sve2" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qu8-f32-vcvt_riscv64_standalone") {
++  source_set("qu8-dwconv_riscv64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-f32-vcvt/gen/qu8-f32-vcvt-scalar-u4.c"
++      "src/src/qu8-dwconv/gen/qu8-dwconv-25p1c-minmax-fp32-scalar-fmagic.c",
++    "src/src/qu8-dwconv/gen/qu8-dwconv-25p2c-minmax-fp32-scalar-lrintf.c",
++    "src/src/qu8-dwconv/gen/qu8-dwconv-9p1c-minmax-fp32-scalar-fmagic.c",
++    "src/src/qu8-dwconv/gen/qu8-dwconv-9p2c-minmax-fp32-scalar-lrintf.c"
 +    ]
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/qb4-packw/gen/qb4-packw-x16c4-gemm-goi-aarch64-neondot.c",
--        "src/src/qb4-packw/gen/qb4-packw-x16c8-gemm-goi-aarch64-neondot.c",
+-        "src/src/pqs8-f32-qc8w-igemm/pqs8-f32-qc8w-igemm-32x32c4-minmax-neonsme2.c",
 -      ]
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
@@ -94558,24 +94550,23 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
--    source_set("qb4-packw_arch=armv8.2-a+dotprod_standalone") {
--      cflags = [ "-march=armv8.2-a+dotprod" ]
+-    source_set("pqs8-f32-qc8w-igemm_arch=armv8.2-a+sve+sve2_standalone") {
+-      cflags = [ "-march=armv8.2-a+sve+sve2" ]
 +if (build_with_chromium) {
-+  source_set("qu8-gemm_riscv64") {
++  source_set("qu8-f32-vcvt_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-gemm/gen/qu8-gemm-1x4-minmax-fp32-scalar-lrintf.c",
-+    "src/src/qu8-gemm/gen/qu8-gemm-3x4-minmax-fp32-scalar-lrintf.c"
++      "src/src/qu8-f32-vcvt/gen/qu8-f32-vcvt-rvv-u2v.c"
 +    ]
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/qb4-packw/gen/qb4-packw-x16c4-gemm-goi-aarch64-neondot.c",
--        "src/src/qb4-packw/gen/qb4-packw-x16c8-gemm-goi-aarch64-neondot.c",
+-        "src/src/pqs8-f32-qc8w-igemm/pqs8-f32-qc8w-igemm-32x32c4-minmax-neonsme2.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -94603,8 +94594,8 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 +    configs += [ ":xnnpack_private_config" ]
  
 -  if (build_with_chromium) {
--    source_set("qd8-f16-qb4w-gemm_arch=armv8.2-a+dotprod+fp16") {
--      cflags = [ "-march=armv8.2-a+dotprod+fp16" ]
+-    source_set("pqs8-qc8w-gemm_arch=armv8.2-a+sve+sve2") {
+-      cflags = [ "-march=armv8.2-a+sve+sve2" ]
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
@@ -94614,8 +94605,8 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/qd8-f16-qb4w-gemm/gen/qd8-f16-qb4w-gemm-1x16c4-minmax-neondotfp16arith.c",
--        "src/src/qd8-f16-qb4w-gemm/gen/qd8-f16-qb4w-gemm-4x16c4-minmax-neondotfp16arith.c",
+-        "src/src/pqs8-qc8w-gemm/pqs8-qc8w-gemm-1x32c4-minmax-neonsme2.c",
+-        "src/src/pqs8-qc8w-gemm/pqs8-qc8w-gemm-32x32c4-minmax-neonsme2.c",
 -      ]
 +    public_configs = [ ":xnnpack_public_config" ]
 +  }
@@ -94627,15 +94618,15 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -      configs += [ ":xnnpack_private_config" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qu8-gemm_riscv64_standalone") {
++  source_set("qu8-f32-vcvt_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-gemm/gen/qu8-gemm-1x4-minmax-fp32-scalar-lrintf.c",
-+    "src/src/qu8-gemm/gen/qu8-gemm-3x4-minmax-fp32-scalar-lrintf.c"
++      "src/src/qu8-f32-vcvt/gen/qu8-f32-vcvt-rvv-u2v.c"
 +    ]
  
 -      deps = [
@@ -94661,14 +94652,14 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
--    source_set("qd8-f16-qb4w-gemm_arch=armv8.2-a+dotprod+fp16_standalone") {
--      cflags = [ "-march=armv8.2-a+dotprod+fp16" ]
+-    source_set("pqs8-qc8w-gemm_arch=armv8.2-a+sve+sve2_standalone") {
+-      cflags = [ "-march=armv8.2-a+sve+sve2" ]
 +    public_configs = [ ":xnnpack_public_config" ]
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/qd8-f16-qb4w-gemm/gen/qd8-f16-qb4w-gemm-1x16c4-minmax-neondotfp16arith.c",
--        "src/src/qd8-f16-qb4w-gemm/gen/qd8-f16-qb4w-gemm-4x16c4-minmax-neondotfp16arith.c",
+-        "src/src/pqs8-qc8w-gemm/pqs8-qc8w-gemm-1x32c4-minmax-neonsme2.c",
+-        "src/src/pqs8-qc8w-gemm/pqs8-qc8w-gemm-32x32c4-minmax-neonsme2.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -94695,13 +94686,13 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 +}
  
 -  if (build_with_chromium) {
--    source_set("qd8-f16-qb4w-gemm_arch=armv8.2-a+fp16") {
--      cflags = [ "-march=armv8.2-a+fp16" ]
+-    source_set("qb4-packw_arch=armv8.2-a+dotprod") {
+-      cflags = [ "-march=armv8.2-a+dotprod" ]
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/qd8-f16-qb4w-gemm/gen/qd8-f16-qb4w-gemm-1x16-minmax-neonfp16arith-mlal-lane.c",
--        "src/src/qd8-f16-qb4w-gemm/gen/qd8-f16-qb4w-gemm-6x16-minmax-neonfp16arith-mlal-lane.c",
+-        "src/src/qb4-packw/gen/qb4-packw-x16c4-gemm-goi-aarch64-neondot.c",
+-        "src/src/qb4-packw/gen/qb4-packw-x16c8-gemm-goi-aarch64-neondot.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -94716,15 +94707,14 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("qu8-igemm_riscv64") {
++  source_set("qu8-f32-vcvt_riscv64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-igemm/gen/qu8-igemm-1x4-minmax-fp32-scalar-lrintf.c",
-+    "src/src/qu8-igemm/gen/qu8-igemm-3x4-minmax-fp32-scalar-lrintf.c"
++      "src/src/qu8-f32-vcvt/gen/qu8-f32-vcvt-scalar-u4.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -94737,8 +94727,8 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
--    source_set("qd8-f16-qb4w-gemm_arch=armv8.2-a+fp16_standalone") {
--      cflags = [ "-march=armv8.2-a+fp16" ]
+-    source_set("qb4-packw_arch=armv8.2-a+dotprod_standalone") {
+-      cflags = [ "-march=armv8.2-a+dotprod" ]
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
@@ -94748,8 +94738,8 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/qd8-f16-qb4w-gemm/gen/qd8-f16-qb4w-gemm-1x16-minmax-neonfp16arith-mlal-lane.c",
--        "src/src/qd8-f16-qb4w-gemm/gen/qd8-f16-qb4w-gemm-6x16-minmax-neonfp16arith-mlal-lane.c",
+-        "src/src/qb4-packw/gen/qb4-packw-x16c4-gemm-goi-aarch64-neondot.c",
+-        "src/src/qb4-packw/gen/qb4-packw-x16c8-gemm-goi-aarch64-neondot.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -94775,25 +94765,24 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 +}
  
 -  if (build_with_chromium) {
--    source_set("qd8-f16-qb4w-gemm_arch=armv8.2-a+i8mm+fp16") {
--      cflags = [ "-march=armv8.2-a+i8mm+fp16" ]
+-    source_set("qd8-f16-qb4w-gemm_arch=armv8.2-a+dotprod+fp16") {
+-      cflags = [ "-march=armv8.2-a+dotprod+fp16" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qu8-igemm_riscv64_standalone") {
++  source_set("qu8-f32-vcvt_riscv64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-igemm/gen/qu8-igemm-1x4-minmax-fp32-scalar-lrintf.c",
-+    "src/src/qu8-igemm/gen/qu8-igemm-3x4-minmax-fp32-scalar-lrintf.c"
++      "src/src/qu8-f32-vcvt/gen/qu8-f32-vcvt-scalar-u4.c"
 +    ]
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/qd8-f16-qb4w-gemm/gen/qd8-f16-qb4w-gemm-1x16c8-minmax-neoni8mm.c",
--        "src/src/qd8-f16-qb4w-gemm/gen/qd8-f16-qb4w-gemm-4x16c8-minmax-neoni8mm.c",
+-        "src/src/qd8-f16-qb4w-gemm/gen/qd8-f16-qb4w-gemm-1x16c4-minmax-neondotfp16arith.c",
+-        "src/src/qd8-f16-qb4w-gemm/gen/qd8-f16-qb4w-gemm-4x16c4-minmax-neondotfp16arith.c",
 -      ]
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
@@ -94828,24 +94817,24 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
--    source_set("qd8-f16-qb4w-gemm_arch=armv8.2-a+i8mm+fp16_standalone") {
--      cflags = [ "-march=armv8.2-a+i8mm+fp16" ]
+-    source_set("qd8-f16-qb4w-gemm_arch=armv8.2-a+dotprod+fp16_standalone") {
+-      cflags = [ "-march=armv8.2-a+dotprod+fp16" ]
 +if (build_with_chromium) {
-+  source_set("qu8-rdsum_arch=rv64gcv-abi=lp64d") {
++  source_set("qu8-gemm_riscv64") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-rdsum/gen/qu8-rdsum-7p7x-rvv-u2v.c"
++      "src/src/qu8-gemm/gen/qu8-gemm-1x4-minmax-fp32-scalar-lrintf.c",
++    "src/src/qu8-gemm/gen/qu8-gemm-3x4-minmax-fp32-scalar-lrintf.c"
 +    ]
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/qd8-f16-qb4w-gemm/gen/qd8-f16-qb4w-gemm-1x16c8-minmax-neoni8mm.c",
--        "src/src/qd8-f16-qb4w-gemm/gen/qd8-f16-qb4w-gemm-4x16c8-minmax-neoni8mm.c",
+-        "src/src/qd8-f16-qb4w-gemm/gen/qd8-f16-qb4w-gemm-1x16c4-minmax-neondotfp16arith.c",
+-        "src/src/qd8-f16-qb4w-gemm/gen/qd8-f16-qb4w-gemm-4x16c4-minmax-neondotfp16arith.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -94866,18 +94855,180 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -        assert_no_deps = [ "//base" ]
 -      }
 -    }
+-  }
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
 +    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 +    configs += [ ":xnnpack_private_config" ]
-+
+ 
+-  if (build_with_chromium) {
+-    source_set("qd8-f16-qb4w-gemm_arch=armv8.2-a+fp16") {
+-      cflags = [ "-march=armv8.2-a+fp16" ]
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
 +      "//third_party/fxdiv",
 +      "//third_party/pthreadpool",
 +    ]
-+
+ 
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qd8-f16-qb4w-gemm/gen/qd8-f16-qb4w-gemm-1x16-minmax-neonfp16arith-mlal-lane.c",
+-        "src/src/qd8-f16-qb4w-gemm/gen/qd8-f16-qb4w-gemm-6x16-minmax-neonfp16arith-mlal-lane.c",
+-      ]
++    public_configs = [ ":xnnpack_public_config" ]
++  }
++}
+ 
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
++# This is a target that cannot depend on //base.
++if (build_with_internal_optimization_guide) {
++  source_set("qu8-gemm_riscv64_standalone") {
++    cflags = [
++  
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/qu8-gemm/gen/qu8-gemm-1x4-minmax-fp32-scalar-lrintf.c",
++    "src/src/qu8-gemm/gen/qu8-gemm-3x4-minmax-fp32-scalar-lrintf.c"
++    ]
+ 
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/fp16",
+-        "//third_party/fxdiv",
+-        "//third_party/pthreadpool",
+-      ]
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
+ 
+-      public_configs = [ ":xnnpack_public_config" ]
+-    }
+-  }
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool:pthreadpool_standalone",
++    ]
+ 
+-  # This is a target that cannot depend on //base.
+-  if (build_with_internal_optimization_guide) {
+-    source_set("qd8-f16-qb4w-gemm_arch=armv8.2-a+fp16_standalone") {
+-      cflags = [ "-march=armv8.2-a+fp16" ]
++    public_configs = [ ":xnnpack_public_config" ]
+ 
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qd8-f16-qb4w-gemm/gen/qd8-f16-qb4w-gemm-1x16-minmax-neonfp16arith-mlal-lane.c",
+-        "src/src/qd8-f16-qb4w-gemm/gen/qd8-f16-qb4w-gemm-6x16-minmax-neonfp16arith-mlal-lane.c",
+-      ]
+-
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
+-
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/fp16",
+-        "//third_party/fxdiv",
+-        "//third_party/pthreadpool:pthreadpool_standalone",
+-      ]
+-
+-      public_configs = [ ":xnnpack_public_config" ]
+-
+-      if (!(is_android && use_order_profiling)) {
+-        assert_no_deps = [ "//base" ]
+-      }
++    if (!(is_android && use_order_profiling)) {
++      assert_no_deps = [ "//base" ]
+     }
+   }
++}
+ 
+-  if (build_with_chromium) {
+-    source_set("qd8-f16-qb4w-gemm_arch=armv8.2-a+i8mm+fp16") {
+-      cflags = [ "-march=armv8.2-a+i8mm+fp16" ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qd8-f16-qb4w-gemm/gen/qd8-f16-qb4w-gemm-1x16c8-minmax-neoni8mm.c",
+-        "src/src/qd8-f16-qb4w-gemm/gen/qd8-f16-qb4w-gemm-4x16c8-minmax-neoni8mm.c",
+-      ]
+-
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
+-
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/fp16",
+-        "//third_party/fxdiv",
+-        "//third_party/pthreadpool",
+-      ]
++if (build_with_chromium) {
++  source_set("qu8-igemm_riscv64") {
++    cflags = [
++  
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/qu8-igemm/gen/qu8-igemm-1x4-minmax-fp32-scalar-lrintf.c",
++    "src/src/qu8-igemm/gen/qu8-igemm-3x4-minmax-fp32-scalar-lrintf.c"
++    ]
+ 
+-      public_configs = [ ":xnnpack_public_config" ]
+-    }
+-  }
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
+ 
+-  # This is a target that cannot depend on //base.
+-  if (build_with_internal_optimization_guide) {
+-    source_set("qd8-f16-qb4w-gemm_arch=armv8.2-a+i8mm+fp16_standalone") {
+-      cflags = [ "-march=armv8.2-a+i8mm+fp16" ]
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool",
++    ]
+ 
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qd8-f16-qb4w-gemm/gen/qd8-f16-qb4w-gemm-1x16c8-minmax-neoni8mm.c",
+-        "src/src/qd8-f16-qb4w-gemm/gen/qd8-f16-qb4w-gemm-4x16c8-minmax-neoni8mm.c",
+-      ]
+-
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
+-
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/fp16",
+-        "//third_party/fxdiv",
+-        "//third_party/pthreadpool:pthreadpool_standalone",
+-      ]
+-
+-      public_configs = [ ":xnnpack_public_config" ]
+-
+-      if (!(is_android && use_order_profiling)) {
+-        assert_no_deps = [ "//base" ]
+-      }
+-    }
 +    public_configs = [ ":xnnpack_public_config" ]
    }
 +}
@@ -94887,15 +95038,15 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -      cflags = [ "-march=armv8.2-a+dotprod+fp16" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qu8-rdsum_arch=rv64gcv-abi=lp64d_standalone") {
++  source_set("qu8-igemm_riscv64_standalone") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-rdsum/gen/qu8-rdsum-7p7x-rvv-u2v.c"
++      "src/src/qu8-igemm/gen/qu8-igemm-1x4-minmax-fp32-scalar-lrintf.c",
++    "src/src/qu8-igemm/gen/qu8-igemm-3x4-minmax-fp32-scalar-lrintf.c"
 +    ]
  
 -      sources = [
@@ -94939,14 +95090,15 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -    source_set("qd8-f16-qc4w-gemm_arch=armv8.2-a+dotprod+fp16_standalone") {
 -      cflags = [ "-march=armv8.2-a+dotprod+fp16" ]
 +if (build_with_chromium) {
-+  source_set("qu8-rdsum_riscv64") {
++  source_set("qu8-rdsum_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-rdsum/gen/qu8-rdsum-scalar.c"
++      "src/src/qu8-rdsum/gen/qu8-rdsum-7p7x-rvv-u2v.c"
 +    ]
  
 -      sources = [
@@ -95004,14 +95156,15 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -      configs += [ ":xnnpack_private_config" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qu8-rdsum_riscv64_standalone") {
++  source_set("qu8-rdsum_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-rdsum/gen/qu8-rdsum-scalar.c"
++      "src/src/qu8-rdsum/gen/qu8-rdsum-7p7x-rvv-u2v.c"
 +    ]
  
 -      deps = [
@@ -95080,15 +95233,14 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -        "src/src/qd8-f16-qc4w-gemm/gen/qd8-f16-qc4w-gemm-4x16c8-minmax-neoni8mm.c",
 -      ]
 +if (build_with_chromium) {
-+  source_set("qu8-rsum_arch=rv64gcv-abi=lp64d") {
++  source_set("qu8-rdsum_riscv64") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-rsum/gen/qu8-rsum-rvv-u2v.c"
++      "src/src/qu8-rdsum/gen/qu8-rdsum-scalar.c"
 +    ]
  
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -95125,15 +95277,14 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -      cflags = [ "-march=armv8.2-a+i8mm+fp16" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qu8-rsum_arch=rv64gcv-abi=lp64d_standalone") {
++  source_set("qu8-rdsum_riscv64_standalone") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-rsum/gen/qu8-rsum-rvv-u2v.c"
++      "src/src/qu8-rdsum/gen/qu8-rdsum-scalar.c"
 +    ]
  
 -      sources = [
@@ -95209,14 +95360,15 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -    source_set("qd8-f16-qc8w-gemm_arch=armv8.2-a+dotprod+fp16_standalone") {
 -      cflags = [ "-march=armv8.2-a+dotprod+fp16" ]
 +if (build_with_chromium) {
-+  source_set("qu8-rsum_riscv64") {
++  source_set("qu8-rsum_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-rsum/gen/qu8-rsum-scalar-u4.c"
++      "src/src/qu8-rsum/gen/qu8-rsum-rvv-u2v.c"
 +    ]
  
 -      sources = [
@@ -95276,14 +95428,15 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -      configs += [ ":xnnpack_private_config" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qu8-rsum_riscv64_standalone") {
++  source_set("qu8-rsum_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-rsum/gen/qu8-rsum-scalar-u4.c"
++      "src/src/qu8-rsum/gen/qu8-rsum-rvv-u2v.c"
 +    ]
  
 -      deps = [
@@ -95346,15 +95499,14 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -    source_set("qd8-f16-qc8w-gemm_arch=armv8.2-a+fp16+dotprod") {
 -      cflags = [ "-march=armv8.2-a+fp16+dotprod" ]
 +if (build_with_chromium) {
-+  source_set("qu8-vadd_arch=rv64gcv-abi=lp64d") {
++  source_set("qu8-rsum_riscv64") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vadd/gen/qu8-vadd-minmax-rvv-u2v.c"
++      "src/src/qu8-rsum/gen/qu8-rsum-scalar-u4.c"
 +    ]
  
 -      asmflags = cflags
@@ -95391,15 +95543,14 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -      ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qu8-vadd_arch=rv64gcv-abi=lp64d_standalone") {
++  source_set("qu8-rsum_riscv64_standalone") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vadd/gen/qu8-vadd-minmax-rvv-u2v.c"
++      "src/src/qu8-rsum/gen/qu8-rsum-scalar-u4.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -95463,15 +95614,15 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -        "src/src/qd8-f16-qc8w-gemm/gen/qd8-f16-qc8w-gemm-4x16c8-minmax-neoni8mm.c",
 -      ]
 +if (build_with_chromium) {
-+  source_set("qu8-vadd_riscv64") {
++  source_set("qu8-vadd_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vadd/gen/qu8-vadd-minmax-scalar-u1.c",
-+    "src/src/qu8-vadd/gen/qu8-vadd-minmax-scalar-u4.c"
++      "src/src/qu8-vadd/gen/qu8-vadd-minmax-rvv-u2v.c"
 +    ]
  
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -95508,15 +95659,15 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -      cflags = [ "-march=armv8.2-a+i8mm+fp16" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qu8-vadd_riscv64_standalone") {
++  source_set("qu8-vadd_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vadd/gen/qu8-vadd-minmax-scalar-u1.c",
-+    "src/src/qu8-vadd/gen/qu8-vadd-minmax-scalar-u4.c"
++      "src/src/qu8-vadd/gen/qu8-vadd-minmax-rvv-u2v.c"
 +    ]
  
 -      sources = [
@@ -95592,15 +95743,15 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -    source_set("qd8-f16-qc8w-igemm_arch=armv8.2-a+dotprod+fp16_standalone") {
 -      cflags = [ "-march=armv8.2-a+dotprod+fp16" ]
 +if (build_with_chromium) {
-+  source_set("qu8-vaddc_arch=rv64gcv-abi=lp64d") {
++  source_set("qu8-vadd_riscv64") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vaddc/gen/qu8-vaddc-minmax-rvv-u2v.c"
++      "src/src/qu8-vadd/gen/qu8-vadd-minmax-scalar-u1.c",
++    "src/src/qu8-vadd/gen/qu8-vadd-minmax-scalar-u4.c"
 +    ]
  
 -      sources = [
@@ -95660,15 +95811,15 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -      configs += [ ":xnnpack_private_config" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qu8-vaddc_arch=rv64gcv-abi=lp64d_standalone") {
++  source_set("qu8-vadd_riscv64_standalone") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vaddc/gen/qu8-vaddc-minmax-rvv-u2v.c"
++      "src/src/qu8-vadd/gen/qu8-vadd-minmax-scalar-u1.c",
++    "src/src/qu8-vadd/gen/qu8-vadd-minmax-scalar-u4.c"
 +    ]
  
 -      deps = [
@@ -95731,15 +95882,15 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -    source_set("qd8-f16-qc8w-igemm_arch=armv8.2-a+fp16+dotprod") {
 -      cflags = [ "-march=armv8.2-a+fp16+dotprod" ]
 +if (build_with_chromium) {
-+  source_set("qu8-vaddc_riscv64") {
++  source_set("qu8-vaddc_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vaddc/gen/qu8-vaddc-minmax-scalar-u1.c",
-+    "src/src/qu8-vaddc/gen/qu8-vaddc-minmax-scalar-u4.c"
++      "src/src/qu8-vaddc/gen/qu8-vaddc-minmax-rvv-u2v.c"
 +    ]
  
 -      asmflags = cflags
@@ -95776,15 +95927,15 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -      ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qu8-vaddc_riscv64_standalone") {
++  source_set("qu8-vaddc_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vaddc/gen/qu8-vaddc-minmax-scalar-u1.c",
-+    "src/src/qu8-vaddc/gen/qu8-vaddc-minmax-scalar-u4.c"
++      "src/src/qu8-vaddc/gen/qu8-vaddc-minmax-rvv-u2v.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -95860,14 +96011,15 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("qu8-vcvt_riscv64") {
++  source_set("qu8-vaddc_riscv64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vcvt/gen/qu8-vcvt-scalar-u4.c"
++      "src/src/qu8-vaddc/gen/qu8-vaddc-minmax-scalar-u1.c",
++    "src/src/qu8-vaddc/gen/qu8-vaddc-minmax-scalar-u4.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -95922,14 +96074,15 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -      cflags = [ "-march=armv8.2-a+dotprod" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qu8-vcvt_riscv64_standalone") {
++  source_set("qu8-vaddc_riscv64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vcvt/gen/qu8-vcvt-scalar-u4.c"
++      "src/src/qu8-vaddc/gen/qu8-vaddc-minmax-scalar-u1.c",
++    "src/src/qu8-vaddc/gen/qu8-vaddc-minmax-scalar-u4.c"
 +    ]
  
 -      sources = [
@@ -95973,15 +96126,14 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -    source_set("qd8-f32-qb4w-gemm_arch=armv8.2-a+dotprod_standalone") {
 -      cflags = [ "-march=armv8.2-a+dotprod" ]
 +if (build_with_chromium) {
-+  source_set("qu8-vlrelu_arch=rv64gcv-abi=lp64d") {
++  source_set("qu8-vcvt_riscv64") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vlrelu/gen/qu8-vlrelu-rvv-u2v.c"
++      "src/src/qu8-vcvt/gen/qu8-vcvt-scalar-u4.c"
 +    ]
  
 -      sources = [
@@ -96039,15 +96191,14 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -      configs += [ ":xnnpack_private_config" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qu8-vlrelu_arch=rv64gcv-abi=lp64d_standalone") {
++  source_set("qu8-vcvt_riscv64_standalone") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vlrelu/gen/qu8-vlrelu-rvv-u2v.c"
++      "src/src/qu8-vcvt/gen/qu8-vcvt-scalar-u4.c"
 +    ]
  
 -      deps = [
@@ -96130,14 +96281,15 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("qu8-vlrelu_riscv64") {
++  source_set("qu8-vlrelu_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vlrelu/gen/qu8-vlrelu-scalar-andxor-u4.c"
++      "src/src/qu8-vlrelu/gen/qu8-vlrelu-rvv-u2v.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -96190,24 +96342,25 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 +}
  
 -  if (build_with_chromium) {
--    source_set("qd8-f32-qc4w-gemm_arch=armv8.2-a+dotprod") {
+-    source_set("qd8-f32-qc2w-gemm_arch=armv8.2-a+dotprod") {
 -      cflags = [ "-march=armv8.2-a+dotprod" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qu8-vlrelu_riscv64_standalone") {
++  source_set("qu8-vlrelu_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vlrelu/gen/qu8-vlrelu-scalar-andxor-u4.c"
++      "src/src/qu8-vlrelu/gen/qu8-vlrelu-rvv-u2v.c"
 +    ]
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-1x16c4-minmax-neondot.c",
--        "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-4x16c4-minmax-neondot.c",
+-        "src/src/qd8-f32-qc2w-gemm/qd8-f32-qc2w-gemm-1x16c4-minmax-neondot.c",
+-        "src/src/qd8-f32-qc2w-gemm/qd8-f32-qc2w-gemm-4x16c4-minmax-neondot.c",
 -      ]
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
@@ -96242,24 +96395,23 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
--    source_set("qd8-f32-qc4w-gemm_arch=armv8.2-a+dotprod_standalone") {
+-    source_set("qd8-f32-qc2w-gemm_arch=armv8.2-a+dotprod_standalone") {
 -      cflags = [ "-march=armv8.2-a+dotprod" ]
 +if (build_with_chromium) {
-+  source_set("qu8-vmul_arch=rv64gcv-abi=lp64d") {
++  source_set("qu8-vlrelu_riscv64") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vmul/gen/qu8-vmul-minmax-f32-rvv-u2v.c"
++      "src/src/qu8-vlrelu/gen/qu8-vlrelu-scalar-andxor-u4.c"
 +    ]
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-1x16c4-minmax-neondot.c",
--        "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-4x16c4-minmax-neondot.c",
+-        "src/src/qd8-f32-qc2w-gemm/qd8-f32-qc2w-gemm-1x16c4-minmax-neondot.c",
+-        "src/src/qd8-f32-qc2w-gemm/qd8-f32-qc2w-gemm-4x16c4-minmax-neondot.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -96287,8 +96439,8 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 +    configs += [ ":xnnpack_private_config" ]
  
 -  if (build_with_chromium) {
--    source_set("qd8-f32-qc4w-gemm_arch=armv8.2-a+i8mm+fp16") {
--      cflags = [ "-march=armv8.2-a+i8mm+fp16" ]
+-    source_set("qd8-f32-qc4w-gemm_arch=armv8.2-a+dotprod") {
+-      cflags = [ "-march=armv8.2-a+dotprod" ]
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
@@ -96298,8 +96450,8 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-1x16c8-minmax-neoni8mm.c",
--        "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-4x16c8-minmax-neoni8mm.c",
+-        "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-1x16c4-minmax-neondot.c",
+-        "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-4x16c4-minmax-neondot.c",
 -      ]
 +    public_configs = [ ":xnnpack_public_config" ]
 +  }
@@ -96311,15 +96463,14 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -      configs += [ ":xnnpack_private_config" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qu8-vmul_arch=rv64gcv-abi=lp64d_standalone") {
++  source_set("qu8-vlrelu_riscv64_standalone") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vmul/gen/qu8-vmul-minmax-f32-rvv-u2v.c"
++      "src/src/qu8-vlrelu/gen/qu8-vlrelu-scalar-andxor-u4.c"
 +    ]
  
 -      deps = [
@@ -96345,14 +96496,14 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
--    source_set("qd8-f32-qc4w-gemm_arch=armv8.2-a+i8mm+fp16_standalone") {
--      cflags = [ "-march=armv8.2-a+i8mm+fp16" ]
+-    source_set("qd8-f32-qc4w-gemm_arch=armv8.2-a+dotprod_standalone") {
+-      cflags = [ "-march=armv8.2-a+dotprod" ]
 +    public_configs = [ ":xnnpack_public_config" ]
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-1x16c8-minmax-neoni8mm.c",
--        "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-4x16c8-minmax-neoni8mm.c",
+-        "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-1x16c4-minmax-neondot.c",
+-        "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-4x16c4-minmax-neondot.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -96379,40 +96530,94 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 +}
  
 -  if (build_with_chromium) {
--    source_set("qd8-f32-qc4w-gemm_arm64") {
--      cflags = []
+-    source_set("qd8-f32-qc4w-gemm_arch=armv8.2-a+i8mm+fp16") {
+-      cflags = [ "-march=armv8.2-a+i8mm+fp16" ]
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-1x16-minmax-neon-mlal-lane.c",
--        "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-1x4-minmax-scalar.c",
--        "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-4x4-minmax-scalar.c",
--        "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-6x16-minmax-neon-mlal-lane.c",
+-        "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-1x16c8-minmax-neoni8mm.c",
+-        "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-4x16c8-minmax-neoni8mm.c",
 -      ]
--
++if (build_with_chromium) {
++  source_set("qu8-vmul_arch=rv64gcv-abi=lp64d") {
++    cflags = [
++      "-mabi=lp64d",
++    "-march=rv64gcv"
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/qu8-vmul/gen/qu8-vmul-minmax-f32-rvv-u2v.c"
++    ]
+ 
 -      configs -= [ "//build/config/compiler:chromium_code" ]
 -      configs += [ "//build/config/compiler:no_chromium_code" ]
 -      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 -      configs += [ ":xnnpack_private_config" ]
--
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
+ 
 -      deps = [
 -        "//third_party/cpuinfo",
 -        "//third_party/fp16",
 -        "//third_party/fxdiv",
 -        "//third_party/pthreadpool",
 -      ]
-+if (build_with_chromium) {
-+  source_set("qu8-vmul_riscv64") {
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool",
++    ]
+ 
+-      public_configs = [ ":xnnpack_public_config" ]
+-    }
++    public_configs = [ ":xnnpack_public_config" ]
+   }
++}
+ 
+-  # This is a target that cannot depend on //base.
+-  if (build_with_internal_optimization_guide) {
+-    source_set("qd8-f32-qc4w-gemm_arch=armv8.2-a+i8mm+fp16_standalone") {
+-      cflags = [ "-march=armv8.2-a+i8mm+fp16" ]
++# This is a target that cannot depend on //base.
++if (build_with_internal_optimization_guide) {
++  source_set("qu8-vmul_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vmul/gen/qu8-vmul-minmax-fp32-scalar-u4.c"
++      "src/src/qu8-vmul/gen/qu8-vmul-minmax-f32-rvv-u2v.c"
 +    ]
  
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-1x16c8-minmax-neoni8mm.c",
+-        "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-4x16c8-minmax-neoni8mm.c",
+-      ]
+-
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
+-
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/fp16",
+-        "//third_party/fxdiv",
+-        "//third_party/pthreadpool:pthreadpool_standalone",
+-      ]
+-
 -      public_configs = [ ":xnnpack_public_config" ]
+-
+-      if (!(is_android && use_order_profiling)) {
+-        assert_no_deps = [ "//base" ]
+-      }
 -    }
 -  }
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -96420,15 +96625,57 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 +    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
 +    configs += [ ":xnnpack_private_config" ]
  
--  # This is a target that cannot depend on //base.
--  if (build_with_internal_optimization_guide) {
--    source_set("qd8-f32-qc4w-gemm_arm64_standalone") {
+-  if (build_with_chromium) {
+-    source_set("qd8-f32-qc4w-gemm_arm64") {
 -      cflags = []
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
 +      "//third_party/fxdiv",
-+      "//third_party/pthreadpool",
++      "//third_party/pthreadpool:pthreadpool_standalone",
++    ]
+ 
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-1x16-minmax-neon-mlal-lane.c",
+-        "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-1x4-minmax-scalar.c",
+-        "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-4x4-minmax-scalar.c",
+-        "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-6x16-minmax-neon-mlal-lane.c",
+-      ]
+-
+-      configs -= [ "//build/config/compiler:chromium_code" ]
+-      configs += [ "//build/config/compiler:no_chromium_code" ]
+-      configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
+-      configs += [ ":xnnpack_private_config" ]
+-
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/fp16",
+-        "//third_party/fxdiv",
+-        "//third_party/pthreadpool",
+-      ]
++    public_configs = [ ":xnnpack_public_config" ]
+ 
+-      public_configs = [ ":xnnpack_public_config" ]
++    if (!(is_android && use_order_profiling)) {
++      assert_no_deps = [ "//base" ]
+     }
+   }
++}
+ 
+-  # This is a target that cannot depend on //base.
+-  if (build_with_internal_optimization_guide) {
+-    source_set("qd8-f32-qc4w-gemm_arm64_standalone") {
+-      cflags = []
++if (build_with_chromium) {
++  source_set("qu8-vmul_riscv64") {
++    cflags = [
++  
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/qu8-vmul/gen/qu8-vmul-minmax-fp32-scalar-u4.c"
 +    ]
  
 -      sources = [
@@ -96457,6 +96704,18 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -        assert_no_deps = [ "//base" ]
 -      }
 -    }
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code" ]
++    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
++    configs += [ ":xnnpack_private_config" ]
++
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool",
++    ]
++
 +    public_configs = [ ":xnnpack_public_config" ]
    }
 +}
@@ -103571,6 +103830,9 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -
 -      sources = [
 -        "src/include/xnnpack.h",
+-        "src/src/x16-pack-lh/x16-packlh-igemm-neonsme.c",
+-        "src/src/x16-pack-lh/x16-packlh-igemm-neonsme2.c",
+-        "src/src/x16-pack-lh/x16-packlh-neonsme.c",
 -        "src/src/x16-pack-lh/x16-packlh-neonsme2.c",
 -      ]
 -
@@ -103617,6 +103879,9 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
  
 -      sources = [
 -        "src/include/xnnpack.h",
+-        "src/src/x16-pack-lh/x16-packlh-igemm-neonsme.c",
+-        "src/src/x16-pack-lh/x16-packlh-igemm-neonsme2.c",
+-        "src/src/x16-pack-lh/x16-packlh-neonsme.c",
 -        "src/src/x16-pack-lh/x16-packlh-neonsme2.c",
 -      ]
 -
@@ -104019,6 +104284,7 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -      sources = [
 -        "src/include/xnnpack.h",
 -        "src/src/x32-pack-lh/x32-packlh-neonsme.c",
+-        "src/src/x32-pack-lh/x32-packlh-neonsme2.c",
 -      ]
 +    public_configs = [ ":xnnpack_public_config" ]
 +  }
@@ -104070,6 +104336,7 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -      sources = [
 -        "src/include/xnnpack.h",
 -        "src/src/x32-pack-lh/x32-packlh-neonsme.c",
+-        "src/src/x32-pack-lh/x32-packlh-neonsme2.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -110226,6 +110493,8 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 +    "src/src/operators/convolution-nhwc.c",
 +    "src/src/operators/deconvolution-nhwc.c",
 +    "src/src/operators/dynamic-fully-connected-nc.c",
++    "src/src/operators/fingerprint_cache.c",
++    "src/src/operators/fingerprint_id.c",
 +    "src/src/operators/fully-connected-nc.c",
 +    "src/src/operators/max-pooling-nhwc.c",
 +    "src/src/operators/pack-lh.c",
@@ -110311,6 +110580,8 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 +    "src/src/operators/convolution-nhwc.c",
 +    "src/src/operators/deconvolution-nhwc.c",
 +    "src/src/operators/dynamic-fully-connected-nc.c",
++    "src/src/operators/fingerprint_cache.c",
++    "src/src/operators/fingerprint_id.c",
 +    "src/src/operators/fully-connected-nc.c",
 +    "src/src/operators/max-pooling-nhwc.c",
 +    "src/src/operators/pack-lh.c",
@@ -112026,6 +112297,8 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -        "src/src/operators/convolution-nhwc.c",
 -        "src/src/operators/deconvolution-nhwc.c",
 -        "src/src/operators/dynamic-fully-connected-nc.c",
+-        "src/src/operators/fingerprint_cache.c",
+-        "src/src/operators/fingerprint_id.c",
 -        "src/src/operators/fully-connected-nc.c",
 -        "src/src/operators/max-pooling-nhwc.c",
 -        "src/src/operators/pack-lh.c",
@@ -112083,6 +112356,8 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn
 -        "src/src/operators/convolution-nhwc.c",
 -        "src/src/operators/deconvolution-nhwc.c",
 -        "src/src/operators/dynamic-fully-connected-nc.c",
+-        "src/src/operators/fingerprint_cache.c",
+-        "src/src/operators/fingerprint_id.c",
 -        "src/src/operators/fully-connected-nc.c",
 -        "src/src/operators/max-pooling-nhwc.c",
 -        "src/src/operators/pack-lh.c",

diff --git a/0002-third_party-libvpx-Remove-bad-ppc64-config.patch b/0002-third_party-libvpx-Remove-bad-ppc64-config.patch
index c8c0a6e..a6dba00 100644
--- a/0002-third_party-libvpx-Remove-bad-ppc64-config.patch
+++ b/0002-third_party-libvpx-Remove-bad-ppc64-config.patch
@@ -1,6 +1,6 @@
-Index: chromium-143.0.7499.40/third_party/libvpx/source/config/linux/ppc64/vp8_rtcd.h
+Index: chromium-144.0.7559.59/third_party/libvpx/source/config/linux/ppc64/vp8_rtcd.h
 ===================================================================
---- chromium-143.0.7499.40.orig/third_party/libvpx/source/config/linux/ppc64/vp8_rtcd.h
+--- chromium-144.0.7559.59.orig/third_party/libvpx/source/config/linux/ppc64/vp8_rtcd.h
 +++ /dev/null
 @@ -1,186 +0,0 @@
 -/*
@@ -189,9 +189,9 @@ Index: chromium-143.0.7499.40/third_party/libvpx/source/config/linux/ppc64/vp8_r
 -#endif
 -
 -#endif  // VP8_RTCD_H_
-Index: chromium-143.0.7499.40/third_party/libvpx/source/config/linux/ppc64/vp9_rtcd.h
+Index: chromium-144.0.7559.59/third_party/libvpx/source/config/linux/ppc64/vp9_rtcd.h
 ===================================================================
---- chromium-143.0.7499.40.orig/third_party/libvpx/source/config/linux/ppc64/vp9_rtcd.h
+--- chromium-144.0.7559.59.orig/third_party/libvpx/source/config/linux/ppc64/vp9_rtcd.h
 +++ /dev/null
 @@ -1,119 +0,0 @@
 -/*
@@ -313,9 +313,9 @@ Index: chromium-143.0.7499.40/third_party/libvpx/source/config/linux/ppc64/vp9_r
 -#endif
 -
 -#endif  // VP9_RTCD_H_
-Index: chromium-143.0.7499.40/third_party/libvpx/source/config/linux/ppc64/vpx_config.asm
+Index: chromium-144.0.7559.59/third_party/libvpx/source/config/linux/ppc64/vpx_config.asm
 ===================================================================
---- chromium-143.0.7499.40.orig/third_party/libvpx/source/config/linux/ppc64/vpx_config.asm
+--- chromium-144.0.7559.59.orig/third_party/libvpx/source/config/linux/ppc64/vpx_config.asm
 +++ /dev/null
 @@ -1,107 +0,0 @@
 -@ This file was created from a .asm file
@@ -425,9 +425,9 @@ Index: chromium-143.0.7499.40/third_party/libvpx/source/config/linux/ppc64/vpx_c
 -.equ DECODE_WIDTH_LIMIT ,  16384
 -.equ DECODE_HEIGHT_LIMIT ,  16384
 -    .section .note.GNU-stack,"",%progbits
-Index: chromium-143.0.7499.40/third_party/libvpx/source/config/linux/ppc64/vpx_config.c
+Index: chromium-144.0.7559.59/third_party/libvpx/source/config/linux/ppc64/vpx_config.c
 ===================================================================
---- chromium-143.0.7499.40.orig/third_party/libvpx/source/config/linux/ppc64/vpx_config.c
+--- chromium-144.0.7559.59.orig/third_party/libvpx/source/config/linux/ppc64/vpx_config.c
 +++ /dev/null
 @@ -1,10 +0,0 @@
 -/* Copyright (c) 2011 The WebM project authors. All Rights Reserved. */
@@ -440,9 +440,9 @@ Index: chromium-143.0.7499.40/third_party/libvpx/source/config/linux/ppc64/vpx_c
 -#include "vpx/vpx_codec.h"
 -static const char* const cfg = "--target=ppc64le-linux-gcc --enable-external-build --enable-postproc --enable-multi-res-encoding --enable-temporal-denoising --enable-vp9-temporal-denoising --enable-vp9-postproc --size-limit=16384x16384 --enable-realtime-only --disable-install-docs --disable-libyuv --enable-unit-tests";
 -const char *vpx_codec_build_config(void) {return cfg;}
-Index: chromium-143.0.7499.40/third_party/libvpx/source/config/linux/ppc64/vpx_config.h
+Index: chromium-144.0.7559.59/third_party/libvpx/source/config/linux/ppc64/vpx_config.h
 ===================================================================
---- chromium-143.0.7499.40.orig/third_party/libvpx/source/config/linux/ppc64/vpx_config.h
+--- chromium-144.0.7559.59.orig/third_party/libvpx/source/config/linux/ppc64/vpx_config.h
 +++ /dev/null
 @@ -1,116 +0,0 @@
 -/* Copyright (c) 2011 The WebM project authors. All Rights Reserved. */
@@ -561,9 +561,9 @@ Index: chromium-143.0.7499.40/third_party/libvpx/source/config/linux/ppc64/vpx_c
 -#define DECODE_WIDTH_LIMIT 16384
 -#define DECODE_HEIGHT_LIMIT 16384
 -#endif /* VPX_CONFIG_H */
-Index: chromium-143.0.7499.40/third_party/libvpx/source/config/linux/ppc64/vpx_dsp_rtcd.h
+Index: chromium-144.0.7559.59/third_party/libvpx/source/config/linux/ppc64/vpx_dsp_rtcd.h
 ===================================================================
---- chromium-143.0.7499.40.orig/third_party/libvpx/source/config/linux/ppc64/vpx_dsp_rtcd.h
+--- chromium-144.0.7559.59.orig/third_party/libvpx/source/config/linux/ppc64/vpx_dsp_rtcd.h
 +++ /dev/null
 @@ -1,858 +0,0 @@
 -/*
@@ -1424,9 +1424,9 @@ Index: chromium-143.0.7499.40/third_party/libvpx/source/config/linux/ppc64/vpx_d
 -#endif
 -
 -#endif  // VPX_DSP_RTCD_H_
-Index: chromium-143.0.7499.40/third_party/libvpx/source/config/linux/ppc64/vpx_scale_rtcd.h
+Index: chromium-144.0.7559.59/third_party/libvpx/source/config/linux/ppc64/vpx_scale_rtcd.h
 ===================================================================
---- chromium-143.0.7499.40.orig/third_party/libvpx/source/config/linux/ppc64/vpx_scale_rtcd.h
+--- chromium-144.0.7559.59.orig/third_party/libvpx/source/config/linux/ppc64/vpx_scale_rtcd.h
 +++ /dev/null
 @@ -1,83 +0,0 @@
 -/*

diff --git a/0002-third_party-lss-kernel-structs.patch b/0002-third_party-lss-kernel-structs.patch
index 9b2d8e5..a81d439 100644
--- a/0002-third_party-lss-kernel-structs.patch
+++ b/0002-third_party-lss-kernel-structs.patch
@@ -1,7 +1,7 @@
-Index: chromium-143.0.7499.40/third_party/lss/linux_syscall_support.h
+Index: chromium-144.0.7559.59/third_party/lss/linux_syscall_support.h
 ===================================================================
---- chromium-143.0.7499.40.orig/third_party/lss/linux_syscall_support.h
-+++ chromium-143.0.7499.40/third_party/lss/linux_syscall_support.h
+--- chromium-144.0.7559.59.orig/third_party/lss/linux_syscall_support.h
++++ chromium-144.0.7559.59/third_party/lss/linux_syscall_support.h
 @@ -86,7 +86,7 @@
   * Porting to other related platforms should not be difficult.
   */

diff --git a/0003-third_party-libvpx-Add-ppc64-generated-config.patch b/0003-third_party-libvpx-Add-ppc64-generated-config.patch
index b4d484c..e329359 100644
--- a/0003-third_party-libvpx-Add-ppc64-generated-config.patch
+++ b/0003-third_party-libvpx-Add-ppc64-generated-config.patch
@@ -1,7 +1,7 @@
-Index: chromium-143.0.7499.40/third_party/libvpx/source/config/linux/ppc64/vp8_rtcd.h
+Index: chromium-144.0.7559.59/third_party/libvpx/source/config/linux/ppc64/vp8_rtcd.h
 ===================================================================
 --- /dev/null
-+++ chromium-143.0.7499.40/third_party/libvpx/source/config/linux/ppc64/vp8_rtcd.h
++++ chromium-144.0.7559.59/third_party/libvpx/source/config/linux/ppc64/vp8_rtcd.h
 @@ -0,0 +1,316 @@
 +// This file is generated. Do not edit.
 +#ifndef VP8_RTCD_H_
@@ -319,10 +319,10 @@ Index: chromium-143.0.7499.40/third_party/libvpx/source/config/linux/ppc64/vp8_r
 +#endif
 +
 +#endif
-Index: chromium-143.0.7499.40/third_party/libvpx/source/config/linux/ppc64/vp9_rtcd.h
+Index: chromium-144.0.7559.59/third_party/libvpx/source/config/linux/ppc64/vp9_rtcd.h
 ===================================================================
 --- /dev/null
-+++ chromium-143.0.7499.40/third_party/libvpx/source/config/linux/ppc64/vp9_rtcd.h
++++ chromium-144.0.7559.59/third_party/libvpx/source/config/linux/ppc64/vp9_rtcd.h
 @@ -0,0 +1,267 @@
 +// This file is generated. Do not edit.
 +#ifndef VP9_RTCD_H_
@@ -591,10 +591,10 @@ Index: chromium-143.0.7499.40/third_party/libvpx/source/config/linux/ppc64/vp9_r
 +#endif
 +
 +#endif
-Index: chromium-143.0.7499.40/third_party/libvpx/source/config/linux/ppc64/vpx_config.asm
+Index: chromium-144.0.7559.59/third_party/libvpx/source/config/linux/ppc64/vpx_config.asm
 ===================================================================
 --- /dev/null
-+++ chromium-143.0.7499.40/third_party/libvpx/source/config/linux/ppc64/vpx_config.asm
++++ chromium-144.0.7559.59/third_party/libvpx/source/config/linux/ppc64/vpx_config.asm
 @@ -0,0 +1,107 @@
 +@ This file was created from a .asm file
 +@  using the ads2gas.pl script.
@@ -703,10 +703,10 @@ Index: chromium-143.0.7499.40/third_party/libvpx/source/config/linux/ppc64/vpx_c
 +.equ DECODE_WIDTH_LIMIT ,  16384
 +.equ DECODE_HEIGHT_LIMIT ,  16384
 +    .section .note.GNU-stack,"",%progbits
-Index: chromium-143.0.7499.40/third_party/libvpx/source/config/linux/ppc64/vpx_config.c
+Index: chromium-144.0.7559.59/third_party/libvpx/source/config/linux/ppc64/vpx_config.c
 ===================================================================
 --- /dev/null
-+++ chromium-143.0.7499.40/third_party/libvpx/source/config/linux/ppc64/vpx_config.c
++++ chromium-144.0.7559.59/third_party/libvpx/source/config/linux/ppc64/vpx_config.c
 @@ -0,0 +1,10 @@
 +/* Copyright (c) 2011 The WebM project authors. All Rights Reserved. */
 +/*  */
@@ -718,10 +718,10 @@ Index: chromium-143.0.7499.40/third_party/libvpx/source/config/linux/ppc64/vpx_c
 +#include "vpx/vpx_codec.h"
 +static const char* const cfg = "--target=generic-gnu --enable-vp9-highbitdepth --enable-external-build --enable-postproc --enable-multi-res-encoding --enable-temporal-denoising --enable-vp9-temporal-denoising --enable-vp9-postproc --size-limit=16384x16384 --enable-realtime-only --disable-install-docs --disable-libyuv";
 +const char *vpx_codec_build_config(void) {return cfg;}
-Index: chromium-143.0.7499.40/third_party/libvpx/source/config/linux/ppc64/vpx_config.h
+Index: chromium-144.0.7559.59/third_party/libvpx/source/config/linux/ppc64/vpx_config.h
 ===================================================================
 --- /dev/null
-+++ chromium-143.0.7499.40/third_party/libvpx/source/config/linux/ppc64/vpx_config.h
++++ chromium-144.0.7559.59/third_party/libvpx/source/config/linux/ppc64/vpx_config.h
 @@ -0,0 +1,116 @@
 +/* Copyright (c) 2011 The WebM project authors. All Rights Reserved. */
 +/*  */
@@ -839,10 +839,10 @@ Index: chromium-143.0.7499.40/third_party/libvpx/source/config/linux/ppc64/vpx_c
 +#define DECODE_WIDTH_LIMIT 16384
 +#define DECODE_HEIGHT_LIMIT 16384
 +#endif /* VPX_CONFIG_H */
-Index: chromium-143.0.7499.40/third_party/libvpx/source/config/linux/ppc64/vpx_dsp_rtcd.h
+Index: chromium-144.0.7559.59/third_party/libvpx/source/config/linux/ppc64/vpx_dsp_rtcd.h
 ===================================================================
 --- /dev/null
-+++ chromium-143.0.7499.40/third_party/libvpx/source/config/linux/ppc64/vpx_dsp_rtcd.h
++++ chromium-144.0.7559.59/third_party/libvpx/source/config/linux/ppc64/vpx_dsp_rtcd.h
 @@ -0,0 +1,4128 @@
 +// This file is generated. Do not edit.
 +#ifndef VPX_DSP_RTCD_H_
@@ -4972,10 +4972,10 @@ Index: chromium-143.0.7499.40/third_party/libvpx/source/config/linux/ppc64/vpx_d
 +#endif
 +
 +#endif
-Index: chromium-143.0.7499.40/third_party/libvpx/source/config/linux/ppc64/vpx_scale_rtcd.h
+Index: chromium-144.0.7559.59/third_party/libvpx/source/config/linux/ppc64/vpx_scale_rtcd.h
 ===================================================================
 --- /dev/null
-+++ chromium-143.0.7499.40/third_party/libvpx/source/config/linux/ppc64/vpx_scale_rtcd.h
++++ chromium-144.0.7559.59/third_party/libvpx/source/config/linux/ppc64/vpx_scale_rtcd.h
 @@ -0,0 +1,96 @@
 +// This file is generated. Do not edit.
 +#ifndef VPX_SCALE_RTCD_H_

diff --git a/0004-third_party-crashpad-port-curl-transport-ppc64.patch b/0004-third_party-crashpad-port-curl-transport-ppc64.patch
index 550213d..bb55c2e 100644
--- a/0004-third_party-crashpad-port-curl-transport-ppc64.patch
+++ b/0004-third_party-crashpad-port-curl-transport-ppc64.patch
@@ -1,7 +1,7 @@
-Index: chromium-143.0.7499.40/third_party/crashpad/crashpad/util/net/http_transport_libcurl.cc
+Index: chromium-144.0.7559.59/third_party/crashpad/crashpad/util/net/http_transport_libcurl.cc
 ===================================================================
---- chromium-143.0.7499.40.orig/third_party/crashpad/crashpad/util/net/http_transport_libcurl.cc
-+++ chromium-143.0.7499.40/third_party/crashpad/crashpad/util/net/http_transport_libcurl.cc
+--- chromium-144.0.7559.59.orig/third_party/crashpad/crashpad/util/net/http_transport_libcurl.cc
++++ chromium-144.0.7559.59/third_party/crashpad/crashpad/util/net/http_transport_libcurl.cc
 @@ -239,6 +239,12 @@ std::string UserAgent() {
  #endif
  #elif defined (ARCH_CPU_RISCV64)

diff --git a/0004-third_party-libvpx-work-around-ambiguous-vsx.patch b/0004-third_party-libvpx-work-around-ambiguous-vsx.patch
index 58aed49..9adceb3 100644
--- a/0004-third_party-libvpx-work-around-ambiguous-vsx.patch
+++ b/0004-third_party-libvpx-work-around-ambiguous-vsx.patch
@@ -1,7 +1,7 @@
-Index: chromium-143.0.7499.40/third_party/libvpx/source/libvpx/vp9/encoder/ppc/vp9_quantize_vsx.c
+Index: chromium-144.0.7559.59/third_party/libvpx/source/libvpx/vp9/encoder/ppc/vp9_quantize_vsx.c
 ===================================================================
---- chromium-143.0.7499.40.orig/third_party/libvpx/source/libvpx/vp9/encoder/ppc/vp9_quantize_vsx.c
-+++ chromium-143.0.7499.40/third_party/libvpx/source/libvpx/vp9/encoder/ppc/vp9_quantize_vsx.c
+--- chromium-144.0.7559.59.orig/third_party/libvpx/source/libvpx/vp9/encoder/ppc/vp9_quantize_vsx.c
++++ chromium-144.0.7559.59/third_party/libvpx/source/libvpx/vp9/encoder/ppc/vp9_quantize_vsx.c
 @@ -38,6 +38,28 @@ static INLINE int16x8_t vec_max_across(i
    return vec_max(a, vec_perm(a, a, vec_perm16));
  }
@@ -137,10 +137,10 @@ Index: chromium-143.0.7499.40/third_party/libvpx/source/libvpx/vp9/encoder/ppc/v
  
      eob = vec_max(eob, vec_or(scan0, zero_coeff0));
      eob2 = vec_max(vec_or(scan1, zero_coeff1), vec_or(scan2, zero_coeff2));
-Index: chromium-143.0.7499.40/third_party/libvpx/source/libvpx/vpx_dsp/ppc/fdct32x32_vsx.c
+Index: chromium-144.0.7559.59/third_party/libvpx/source/libvpx/vpx_dsp/ppc/fdct32x32_vsx.c
 ===================================================================
---- chromium-143.0.7499.40.orig/third_party/libvpx/source/libvpx/vpx_dsp/ppc/fdct32x32_vsx.c
-+++ chromium-143.0.7499.40/third_party/libvpx/source/libvpx/vpx_dsp/ppc/fdct32x32_vsx.c
+--- chromium-144.0.7559.59.orig/third_party/libvpx/source/libvpx/vpx_dsp/ppc/fdct32x32_vsx.c
++++ chromium-144.0.7559.59/third_party/libvpx/source/libvpx/vpx_dsp/ppc/fdct32x32_vsx.c
 @@ -15,6 +15,28 @@
  #include "vpx_dsp/ppc/txfm_common_vsx.h"
  #include "vpx_dsp/ppc/types_vsx.h"
@@ -255,10 +255,10 @@ Index: chromium-143.0.7499.40/third_party/libvpx/source/libvpx/vpx_dsp/ppc/fdct3
  }
  
  // Returns 1 if negative 0 if positive
-Index: chromium-143.0.7499.40/third_party/libvpx/source/libvpx/vpx_dsp/ppc/quantize_vsx.c
+Index: chromium-144.0.7559.59/third_party/libvpx/source/libvpx/vpx_dsp/ppc/quantize_vsx.c
 ===================================================================
---- chromium-143.0.7499.40.orig/third_party/libvpx/source/libvpx/vpx_dsp/ppc/quantize_vsx.c
-+++ chromium-143.0.7499.40/third_party/libvpx/source/libvpx/vpx_dsp/ppc/quantize_vsx.c
+--- chromium-144.0.7559.59.orig/third_party/libvpx/source/libvpx/vpx_dsp/ppc/quantize_vsx.c
++++ chromium-144.0.7559.59/third_party/libvpx/source/libvpx/vpx_dsp/ppc/quantize_vsx.c
 @@ -13,6 +13,28 @@
  #include "./vpx_dsp_rtcd.h"
  #include "vpx_dsp/ppc/types_vsx.h"

diff --git a/HACK-debian-clang-disable-base-musttail.patch b/HACK-debian-clang-disable-base-musttail.patch
index 566c8d9..07e60f7 100644
--- a/HACK-debian-clang-disable-base-musttail.patch
+++ b/HACK-debian-clang-disable-base-musttail.patch
@@ -1,7 +1,7 @@
-Index: chromium-143.0.7499.40/base/compiler_specific.h
+Index: chromium-144.0.7559.59/base/compiler_specific.h
 ===================================================================
---- chromium-143.0.7499.40.orig/base/compiler_specific.h
-+++ chromium-143.0.7499.40/base/compiler_specific.h
+--- chromium-144.0.7559.59.orig/base/compiler_specific.h
++++ chromium-144.0.7559.59/base/compiler_specific.h
 @@ -198,7 +198,7 @@
  //     MUSTTAIL return Func1(d + 1);  // `Func1()` will be tail-called.
  //   }

diff --git a/HACK-debian-clang-disable-pa-musttail.patch b/HACK-debian-clang-disable-pa-musttail.patch
index f124de4..d06c52e 100644
--- a/HACK-debian-clang-disable-pa-musttail.patch
+++ b/HACK-debian-clang-disable-pa-musttail.patch
@@ -1,7 +1,7 @@
-Index: chromium-143.0.7499.40/base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/compiler_specific.h
+Index: chromium-144.0.7559.59/base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/compiler_specific.h
 ===================================================================
---- chromium-143.0.7499.40.orig/base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/compiler_specific.h
-+++ chromium-143.0.7499.40/base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/compiler_specific.h
+--- chromium-144.0.7559.59.orig/base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/compiler_specific.h
++++ chromium-144.0.7559.59/base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/compiler_specific.h
 @@ -139,7 +139,7 @@
  //     PA_MUSTTAIL return Func1(d + 1);  // `Func1()` will be tail-called.
  //   }

diff --git a/HACK-third_party-libvpx-use-generic-gnu.patch b/HACK-third_party-libvpx-use-generic-gnu.patch
index 44c118d..215eb0d 100644
--- a/HACK-third_party-libvpx-use-generic-gnu.patch
+++ b/HACK-third_party-libvpx-use-generic-gnu.patch
@@ -1,7 +1,7 @@
-Index: chromium-143.0.7499.40/third_party/libvpx/generate_gni.sh
+Index: chromium-144.0.7559.59/third_party/libvpx/generate_gni.sh
 ===================================================================
---- chromium-143.0.7499.40.orig/third_party/libvpx/generate_gni.sh
-+++ chromium-143.0.7499.40/third_party/libvpx/generate_gni.sh
+--- chromium-144.0.7559.59.orig/third_party/libvpx/generate_gni.sh
++++ chromium-144.0.7559.59/third_party/libvpx/generate_gni.sh
 @@ -429,7 +429,7 @@ gen_config_files linux/mipsel "--target=
  gen_config_files linux/mips64el "--target=mips64-linux-gcc ${all_platforms}"
  gen_config_files linux/loongarch \
@@ -11,10 +11,10 @@ Index: chromium-143.0.7499.40/third_party/libvpx/generate_gni.sh
  gen_config_files linux/generic "--target=generic-gnu $HIGHBD ${all_platforms}"
  gen_config_files win/arm64-highbd \
    "--target=arm64-win64-vs15 ${all_platforms} ${HIGHBD} ${disable_sve}"
-Index: chromium-143.0.7499.40/third_party/libvpx/source/libvpx/build/make/rtcd.pl
+Index: chromium-144.0.7559.59/third_party/libvpx/source/libvpx/build/make/rtcd.pl
 ===================================================================
---- chromium-143.0.7499.40.orig/third_party/libvpx/source/libvpx/build/make/rtcd.pl
-+++ chromium-143.0.7499.40/third_party/libvpx/source/libvpx/build/make/rtcd.pl
+--- chromium-144.0.7559.59.orig/third_party/libvpx/source/libvpx/build/make/rtcd.pl
++++ chromium-144.0.7559.59/third_party/libvpx/source/libvpx/build/make/rtcd.pl
 @@ -527,8 +527,9 @@ if ($opts{arch} eq 'x86') {
    }
    arm;
@@ -27,10 +27,10 @@ Index: chromium-143.0.7499.40/third_party/libvpx/source/libvpx/build/make/rtcd.p
  } elsif ($opts{arch} =~ /loongarch/ ) {
    @ALL_ARCHS = filter(qw/lsx lasx/);
    loongarch;
-Index: chromium-143.0.7499.40/third_party/libvpx/BUILD.gn
+Index: chromium-144.0.7559.59/third_party/libvpx/BUILD.gn
 ===================================================================
---- chromium-143.0.7499.40.orig/third_party/libvpx/BUILD.gn
-+++ chromium-143.0.7499.40/third_party/libvpx/BUILD.gn
+--- chromium-144.0.7559.59.orig/third_party/libvpx/BUILD.gn
++++ chromium-144.0.7559.59/third_party/libvpx/BUILD.gn
 @@ -98,6 +98,14 @@ config("libvpx_config") {
        "-Wno-sign-compare",
      ]

diff --git a/Rtc_base-system-arch.h-PPC.patch b/Rtc_base-system-arch.h-PPC.patch
index 4985a70..b5a4185 100644
--- a/Rtc_base-system-arch.h-PPC.patch
+++ b/Rtc_base-system-arch.h-PPC.patch
@@ -1,7 +1,7 @@
-Index: chromium-143.0.7499.40/third_party/webrtc/rtc_base/system/arch.h
+Index: chromium-144.0.7559.59/third_party/webrtc/rtc_base/system/arch.h
 ===================================================================
---- chromium-143.0.7499.40.orig/third_party/webrtc/rtc_base/system/arch.h
-+++ chromium-143.0.7499.40/third_party/webrtc/rtc_base/system/arch.h
+--- chromium-144.0.7559.59.orig/third_party/webrtc/rtc_base/system/arch.h
++++ chromium-144.0.7559.59/third_party/webrtc/rtc_base/system/arch.h
 @@ -46,6 +46,18 @@
  #endif
  #if defined(__MIPSEL__)

diff --git a/add-ppc64-architecture-string.patch b/add-ppc64-architecture-string.patch
index ab36e41..3983cfa 100644
--- a/add-ppc64-architecture-string.patch
+++ b/add-ppc64-architecture-string.patch
@@ -1,7 +1,7 @@
-Index: chromium-143.0.7499.40/base/system/sys_info.cc
+Index: chromium-144.0.7559.59/base/system/sys_info.cc
 ===================================================================
---- chromium-143.0.7499.40.orig/base/system/sys_info.cc
-+++ chromium-143.0.7499.40/base/system/sys_info.cc
+--- chromium-144.0.7559.59.orig/base/system/sys_info.cc
++++ chromium-144.0.7559.59/base/system/sys_info.cc
 @@ -263,6 +263,8 @@ std::string SysInfo::ProcessCPUArchitect
    return "ARM";
  #elif defined(ARCH_CPU_ARM64)

diff --git a/add-ppc64-architecture-to-extensions.diff b/add-ppc64-architecture-to-extensions.diff
index 2053505..39e0495 100644
--- a/add-ppc64-architecture-to-extensions.diff
+++ b/add-ppc64-architecture-to-extensions.diff
@@ -1,7 +1,7 @@
-Index: chromium-143.0.7499.40/chrome/browser/extensions/api/runtime/chrome_runtime_api_delegate.cc
+Index: chromium-144.0.7559.59/chrome/browser/extensions/api/runtime/chrome_runtime_api_delegate.cc
 ===================================================================
---- chromium-143.0.7499.40.orig/chrome/browser/extensions/api/runtime/chrome_runtime_api_delegate.cc
-+++ chromium-143.0.7499.40/chrome/browser/extensions/api/runtime/chrome_runtime_api_delegate.cc
+--- chromium-144.0.7559.59.orig/chrome/browser/extensions/api/runtime/chrome_runtime_api_delegate.cc
++++ chromium-144.0.7559.59/chrome/browser/extensions/api/runtime/chrome_runtime_api_delegate.cc
 @@ -383,6 +383,8 @@ bool ChromeRuntimeAPIDelegate::GetPlatfo
      info->arch = extensions::api::runtime::PlatformArch::kMips64;
    } else if (arch == "riscv64") {
@@ -11,10 +11,10 @@ Index: chromium-143.0.7499.40/chrome/browser/extensions/api/runtime/chrome_runti
    } else {
      NOTREACHED();
    }
-Index: chromium-143.0.7499.40/extensions/common/api/runtime.json
+Index: chromium-144.0.7559.59/extensions/common/api/runtime.json
 ===================================================================
---- chromium-143.0.7499.40.orig/extensions/common/api/runtime.json
-+++ chromium-143.0.7499.40/extensions/common/api/runtime.json
+--- chromium-144.0.7559.59.orig/extensions/common/api/runtime.json
++++ chromium-144.0.7559.59/extensions/common/api/runtime.json
 @@ -98,7 +98,8 @@
              {"name": "x86-64", "description": "Specifies the processer architecture as x86-64."},
              {"name": "mips", "description": "Specifies the processer architecture as mips."},

diff --git a/add-ppc64-pthread-stack-size.patch b/add-ppc64-pthread-stack-size.patch
index ceb2849..8f4472b 100644
--- a/add-ppc64-pthread-stack-size.patch
+++ b/add-ppc64-pthread-stack-size.patch
@@ -1,7 +1,7 @@
-Index: chromium-143.0.7499.40/base/process/launch.h
+Index: chromium-144.0.7559.59/base/process/launch.h
 ===================================================================
---- chromium-143.0.7499.40.orig/base/process/launch.h
-+++ chromium-143.0.7499.40/base/process/launch.h
+--- chromium-144.0.7559.59.orig/base/process/launch.h
++++ chromium-144.0.7559.59/base/process/launch.h
 @@ -58,6 +58,9 @@ enum TerminationStatus : int;
  #if defined(ARCH_CPU_ARM64) || defined(ARCH_CPU_LOONGARCH64)
  #define PTHREAD_STACK_MIN_CONST \

diff --git a/chromium-141-rust-clanglib.patch b/chromium-141-rust-clanglib.patch
deleted file mode 100644
index b9142c8..0000000
--- a/chromium-141-rust-clanglib.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-diff -up chromium-141.0.7390.37/build/config/clang/BUILD.gn.rust-clang_lib chromium-141.0.7390.37/build/config/clang/BUILD.gn
---- chromium-141.0.7390.37/build/config/clang/BUILD.gn.rust-clang_lib	2025-09-23 22:21:14.000000000 +0200
-+++ chromium-141.0.7390.37/build/config/clang/BUILD.gn	2025-09-27 12:15:44.380395911 +0200
-@@ -168,7 +168,21 @@ template("clang_lib") {
-         }
-       } else if (is_apple) {
-         _dir = "darwin"
--      } else if (is_linux || is_chromeos) {
-+      } else if (is_linux) {
-+        if (current_cpu == "x64") {
-+          _dir = "x86_64-redhat-linux-gnu"
-+        } else if (current_cpu == "x86") {
-+          _dir = "i386-redhat-linux-gnu"
-+        } else if (current_cpu == "arm64") {
-+          _dir = "aarch64-redhat-linux-gnu"
-+        } else if (current_cpu == "arm") {
-+          _dir = "armhf-redhat-linux-gnu"
-+        } else if (current_cpu == "ppc64") {
-+          _dir = "ppc64le-redhat-linux-gnu"
-+        } else {
-+          assert(false)  # Unhandled cpu type
-+        }
-+      } else if (is_chromeos) {
-         if (current_cpu == "x64") {
-           _dir = "x86_64-unknown-linux-gnu"
-         } else if (current_cpu == "x86") {
-diff -up chromium-141.0.7390.37/build/rust/rust_bindgen_generator.gni.rust-clang_lib chromium-141.0.7390.37/build/rust/rust_bindgen_generator.gni
---- chromium-141.0.7390.37/build/rust/rust_bindgen_generator.gni.rust-clang_lib	2025-09-23 22:21:14.000000000 +0200
-+++ chromium-141.0.7390.37/build/rust/rust_bindgen_generator.gni	2025-09-27 11:41:29.777786734 +0200
-@@ -18,11 +18,11 @@ if (host_os == "win") {
- 
- # On Windows, the libclang.dll is beside the bindgen.exe, otherwise it is in
- # ../lib.
--_libclang_path = rust_bindgen_root
-+_libclang_path = clang_base_path
- if (host_os == "win") {
-   _libclang_path += "/bin"
- } else {
--  _libclang_path += "/lib"
-+  _libclang_path += "/lib64"
- }
- 
- # Template to build Rust/C bindings with bindgen.
-diff -up chromium-141.0.7390.37/build/rust/rust_bindgen.gni.rust-clang_lib chromium-141.0.7390.37/build/rust/rust_bindgen.gni
---- chromium-141.0.7390.37/build/rust/rust_bindgen.gni.rust-clang_lib	2025-09-23 22:21:14.000000000 +0200
-+++ chromium-141.0.7390.37/build/rust/rust_bindgen.gni	2025-09-27 11:41:29.777891843 +0200
-@@ -19,11 +19,11 @@ if (host_os == "win") {
- 
- # On Windows, the libclang.dll is beside the bindgen.exe, otherwise it is in
- # ../lib.
--_libclang_path = rust_bindgen_root
-+_libclang_path = clang_base_path
- if (host_os == "win") {
-   _libclang_path += "/bin"
- } else {
--  _libclang_path += "/lib"
-+  _libclang_path += "/lib64"
- }
- 
- # Template to build Rust/C bindings with bindgen.

diff --git a/chromium-142-Add-ExtractData-support-for-text-uri-list.patch b/chromium-142-Add-ExtractData-support-for-text-uri-list.patch
deleted file mode 100644
index 71d7e94..0000000
--- a/chromium-142-Add-ExtractData-support-for-text-uri-list.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-From 3e6fd579fa63e68c9d0092ea56f7a457c03bdb7d Mon Sep 17 00:00:00 2001
-From: LuK1337 <priv.luk@gmail.com>
-Date: Thu, 20 Nov 2025 14:27:50 -0800
-Subject: [PATCH] [ozone/wayland] Add ExtractData() support for text/uri-list
-
-When dragging a file from chrome://downloads to KDE Konsole, the
-following message shows up in the debug output: "Cannot deliver data of
-type text/uri-list and no text representation is available.".
-
-After making it so text/uri-list is handled the same way as
-text/x-moz-url, the log message is gone and path to file is pasted into
-terminal as one would expect.
-
-Bug: 460074619
-Test: ozone_unittests
-Change-Id: Iab0144ca7d3d3983d0e61d74f42a53b366f9e830
-Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/7145698
-Auto-Submit: Łukasz Patron <priv.luk@gmail.com>
-Reviewed-by: Kramer Ge <fangzhoug@chromium.org>
-Reviewed-by: Peter McNeeley <petermcneeley@google.com>
-Commit-Queue: Peter McNeeley <petermcneeley@google.com>
-Cr-Commit-Position: refs/heads/main@{#1548075}
----
-
-diff --git a/AUTHORS b/AUTHORS
-index abceab66..98ced4a 100644
---- a/AUTHORS
-+++ b/AUTHORS
-@@ -943,6 +943,7 @@
- Luka Dojcilovic <l.dojcilovic@gmail.com>
- Lukas Lihotzki <lukas@lihotzki.de>
- Lukasz Krakowiak <lukasz.krakowiak@mobica.com>
-+Lukasz Patron <priv.luk@gmail.com>
- Luke Inman-Semerau <luke.semerau@gmail.com>
- Luke Gu <gulukesh@gmail.com>
- Luke Warlow <lukewarlow156@gmail.com>
-diff --git a/ui/ozone/platform/wayland/host/wayland_exchange_data_provider.cc b/ui/ozone/platform/wayland/host/wayland_exchange_data_provider.cc
-index 2d32cc9..da6da7ae 100644
---- a/ui/ozone/platform/wayland/host/wayland_exchange_data_provider.cc
-+++ b/ui/ozone/platform/wayland/host/wayland_exchange_data_provider.cc
-@@ -277,7 +277,8 @@
-   DCHECK(out_content);
-   DCHECK(IsMimeTypeSupported(mime_type));
-   if (std::optional<ui::OSExchangeData::UrlInfo> url_info;
--      mime_type == ui::kMimeTypeMozillaUrl &&
-+      (mime_type == ui::kMimeTypeMozillaUrl ||
-+       mime_type == ui::kMimeTypeUriList) &&
-       (url_info = GetURLAndTitle(kFilenameToURLPolicy)).has_value()) {
-     out_content->append(url_info->url.spec());
-     return true;
-diff --git a/ui/ozone/platform/wayland/host/wayland_exchange_data_provider_unittest.cc b/ui/ozone/platform/wayland/host/wayland_exchange_data_provider_unittest.cc
-index 70b6d9d..29a8ad0 100644
---- a/ui/ozone/platform/wayland/host/wayland_exchange_data_provider_unittest.cc
-+++ b/ui/ozone/platform/wayland/host/wayland_exchange_data_provider_unittest.cc
-@@ -61,6 +61,17 @@
-   EXPECT_EQ("pickled-str", read_pickled_str);
- }
- 
-+TEST(WaylandExchangeDataProviderTest, FileNameAsUriList) {
-+  WaylandExchangeDataProvider provider;
-+  std::string extracted;
-+  EXPECT_FALSE(provider.ExtractData(kMimeTypeUriList, &extracted));
-+
-+  extracted.clear();
-+  provider.AddData(ToClipboardData("file:///dev/null"), kMimeTypeUriList);
-+  EXPECT_TRUE(provider.ExtractData(kMimeTypeUriList, &extracted));
-+  EXPECT_EQ("file:///dev/null", extracted);
-+}
-+
- TEST(WaylandExchangeDataProviderTest, FileContents) {
-   constexpr std::string kName("filename");
-   constexpr std::string kContents("contents");

diff --git a/chromium-142-Update-pointer-position-during-draggin.patch b/chromium-142-Update-pointer-position-during-draggin.patch
deleted file mode 100644
index eb0e1c8..0000000
--- a/chromium-142-Update-pointer-position-during-draggin.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-From 4aed3650884fb2eb5605a051e92387204ae88cad Mon Sep 17 00:00:00 2001
-From: LuK1337 <priv.luk@gmail.com>
-Date: Sun, 30 Nov 2025 20:36:28 -0800
-Subject: [PATCH] [ozone/wayland] Update pointer position during dragging
-
-Prior to this change, dragging a file from chrome://downloads by its
-filename would often open the file after it was dropped somewhere, this
-is because the synthetic mouse release has outdated location.
-
-After ensuring that pointer location is updated during drag motion,
-similarly to WaylandWindowDragController::OnDragLeave(), this is no
-longer a problem.
-
-Bug: 462468355
-Test: ozone_unittests
-Change-Id: Ib377b7ec04a9f5a02a21e36f7c43871a3e414798
-Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/7182320
-Reviewed-by: Peter McNeeley <petermcneeley@google.com>
-Commit-Queue: Peter McNeeley <petermcneeley@google.com>
-Auto-Submit: Łukasz Patron <priv.luk@gmail.com>
-Reviewed-by: Kramer Ge <fangzhoug@chromium.org>
-Cr-Commit-Position: refs/heads/main@{#1551919}
----
-
-diff --git a/ui/ozone/platform/wayland/host/wayland_data_drag_controller.cc b/ui/ozone/platform/wayland/host/wayland_data_drag_controller.cc
-index b557e465..47b0911 100644
---- a/ui/ozone/platform/wayland/host/wayland_data_drag_controller.cc
-+++ b/ui/ozone/platform/wayland/host/wayland_data_drag_controller.cc
-@@ -486,17 +486,9 @@
-   if (drag_source_.has_value()) {
-     // Update the cursor position only for drag with mouse.
-     if (*drag_source_ == mojom::DragEventSource::kMouse) {
--      auto* cursor_position = connection_->wayland_cursor_position();
--      if (cursor_position) {
--        CHECK(window_);
--        // TODO(crbug.com/41494257): Once we enable the input region for
--        // subsurfaces, we need to update this part since the location will no
--        // longer be relative to the window.
--        auto location_in_screen =
--            gfx::ToRoundedPoint(location) +
--            window_->GetBoundsInDIP().origin().OffsetFromOrigin();
--        cursor_position->OnCursorPositionChanged(location_in_screen);
--      }
-+      pointer_delegate_->OnPointerMotionEvent(
-+          location, timestamp, wl::EventDispatchPolicy::kImmediate,
-+          /*is_synthesized=*/true);
-     }
-   }
- 
-diff --git a/ui/ozone/platform/wayland/host/wayland_data_drag_controller.h b/ui/ozone/platform/wayland/host/wayland_data_drag_controller.h
-index e1239e6b..9a3ea8a2 100644
---- a/ui/ozone/platform/wayland/host/wayland_data_drag_controller.h
-+++ b/ui/ozone/platform/wayland/host/wayland_data_drag_controller.h
-@@ -130,6 +130,10 @@
-   // TODO(crbug.com/40598679): Remove once focus is fixed during DND sessions.
-   WaylandWindow* entered_window() const { return window_; }
- 
-+  WaylandPointer::Delegate* pointer_delegate() const {
-+    return pointer_delegate_;
-+  }
-+
-   // Returns false iff the data is for a window dragging session.
-   bool ShouldReleaseCaptureForDrag(ui::OSExchangeData* data) const;
- 
-diff --git a/ui/ozone/platform/wayland/host/wayland_data_drag_controller_unittest.cc b/ui/ozone/platform/wayland/host/wayland_data_drag_controller_unittest.cc
-index 4156ce4..d2a867acaf 100644
---- a/ui/ozone/platform/wayland/host/wayland_data_drag_controller_unittest.cc
-+++ b/ui/ozone/platform/wayland/host/wayland_data_drag_controller_unittest.cc
-@@ -1441,8 +1441,10 @@
-     // Send a drag motion and see if cursor position is updated.
-     SendDndMotion(gfx::Point(10, 11));
-     WaitForDragDropTasks();
--    // Cursor position should be updated.
-+    // Cursor and pointer positions should be updated.
-+    auto* pointer_delegate = drag_controller()->pointer_delegate();
-     EXPECT_EQ(gfx::Point(10, 11), cursor_position->GetCursorSurfacePoint());
-+    EXPECT_EQ(gfx::PointF(10, 11), pointer_delegate->GetPointerLocation());
- 
-     SendDndLeave();
-     SendDndCancelled();

diff --git a/chromium-144-rust-clanglib.patch b/chromium-144-rust-clanglib.patch
new file mode 100644
index 0000000..981fe52
--- /dev/null
+++ b/chromium-144-rust-clanglib.patch
@@ -0,0 +1,66 @@
+diff -up chromium-144.0.7559.31/build/config/clang/BUILD.gn.rust-clang_lib chromium-144.0.7559.31/build/config/clang/BUILD.gn
+--- chromium-144.0.7559.31/build/config/clang/BUILD.gn.rust-clang_lib	2025-12-17 01:06:32.000000000 +0100
++++ chromium-144.0.7559.31/build/config/clang/BUILD.gn	2025-12-23 19:01:33.876897379 +0100
+@@ -177,7 +177,21 @@ template("clang_lib") {
+         }
+       } else if (is_apple) {
+         _dir = "darwin"
+-      } else if (is_linux || is_chromeos) {
++      } else if (is_linux) {
++        if (current_cpu == "x64") {
++          _dir = "x86_64-redhat-linux-gnu"
++        } else if (current_cpu == "x86") {
++          _dir = "i386-redhat-linux-gnu"
++        } else if (current_cpu == "arm64") {
++          _dir = "aarch64-redhat-linux-gnu"
++        } else if (current_cpu == "arm") {
++          _dir = "armhf-redhat-linux-gnu"
++        } else if (current_cpu == "ppc64") {
++          _dir = "ppc64le-redhat-linux-gnu"
++        } else {
++          assert(false)  # Unhandled cpu type
++        }
++      } else if (is_chromeos) {
+         if (current_cpu == "x64") {
+           _dir = "x86_64-unknown-linux-gnu"
+         } else if (current_cpu == "x86") {
+diff -up chromium-144.0.7559.31/build/rust/rust_bindgen_generator.gni.rust-clang_lib chromium-144.0.7559.31/build/rust/rust_bindgen_generator.gni
+--- chromium-144.0.7559.31/build/rust/rust_bindgen_generator.gni.rust-clang_lib	2025-12-17 01:06:32.000000000 +0100
++++ chromium-144.0.7559.31/build/rust/rust_bindgen_generator.gni	2025-12-23 19:21:34.335924481 +0100
+@@ -26,14 +26,14 @@ if (!use_chromium_rust_toolchain &&
+ 
+ # On Windows, the libclang.dll is beside the bindgen.exe, otherwise it is in
+ # ../lib.
+-_libclang_path = rust_bindgen_root
++_libclang_path = clang_base_path
+ if (!use_chromium_rust_toolchain &&
+     (host_cpu == "ppc64" || host_cpu == "s390x")) {
+   _libclang_path = rust_sysroot_absolute + "/lib64"
+ } else if (host_os == "win") {
+   _libclang_path += "/bin"
+ } else {
+-  _libclang_path += "/lib"
++  _libclang_path += "/lib64"
+ }
+ 
+ # Template to build Rust/C bindings with bindgen.
+diff -up chromium-144.0.7559.31/build/rust/rust_bindgen.gni.rust-clang_lib chromium-144.0.7559.31/build/rust/rust_bindgen.gni
+--- chromium-144.0.7559.31/build/rust/rust_bindgen.gni.rust-clang_lib	2025-12-17 01:06:32.000000000 +0100
++++ chromium-144.0.7559.31/build/rust/rust_bindgen.gni	2025-12-23 19:22:12.089755683 +0100
+@@ -19,14 +19,14 @@ if (host_os == "win") {
+ 
+ # On Windows, the libclang.dll is beside the bindgen.exe, otherwise it is in
+ # ../lib.
+-_libclang_path = rust_bindgen_root
++_libclang_path = clang_base_path
+ if (!use_chromium_rust_toolchain &&
+     (current_cpu == "ppc64" || current_cpu == "s390x")) {
+   _libclang_path = rust_sysroot_absolute + "/lib64"
+ } else if (host_os == "win") {
+   _libclang_path += "/bin"
+ } else {
+-  _libclang_path += "/lib"
++  _libclang_path += "/lib64"
+ }
+ 
+ # Template to build Rust/C bindings with bindgen.

diff --git a/chromium-144-rust-libadler2.patch b/chromium-144-rust-libadler2.patch
new file mode 100644
index 0000000..631a321
--- /dev/null
+++ b/chromium-144-rust-libadler2.patch
@@ -0,0 +1,16 @@
+diff -up chromium-144.0.7559.31/build/rust/std/BUILD.gn.than chromium-144.0.7559.31/build/rust/std/BUILD.gn
+--- chromium-144.0.7559.31/build/rust/std/BUILD.gn.than	2025-12-26 15:06:36.274081861 +0100
++++ chromium-144.0.7559.31/build/rust/std/BUILD.gn	2025-12-26 16:11:45.697054423 +0100
+@@ -55,11 +55,7 @@ if (toolchain_has_rust) {
+       "miniz_oxide",
+       "object",
+     ]
+-    if (rustc_nightly_capability) {
+-      stdlib_files += [ "adler2" ]
+-    } else {
+-      stdlib_files += [ "adler" ]
+-    }
++    stdlib_files += [ "adler2" ]
+   }
+ 
+   if (toolchain_for_rust_host_build_tools) {

diff --git a/chromium.spec b/chromium.spec
index a65c8b5..735d788 100644
--- a/chromium.spec
+++ b/chromium.spec
@@ -260,7 +260,7 @@
 %endif
 
 Name:	chromium
-Version: 143.0.7499.192
+Version: 144.0.7559.59
 Release: 1%{?dist}
 Summary: A WebKit (Blink) powered web browser that Google doesn't want you to use
 Url: http://www.chromium.org/Home
@@ -345,6 +345,9 @@ Patch150: chromium-124-qt6.patch
 # revert, it causes ramdom crash on aarch64
 Patch300: chromium-131-revert-decommit-pooled-pages-by-default.patch
 
+# Disable rust nightly features
+Patch301: chromium-144-rust-libadler2.patch
+
 # disable memory tagging (epel8 on aarch64) due to new feature IFUNC-Resolver
 # it is not supported in old glibc < 2.30, error: fatal error: 'sys/ifunc.h' file not found
 Patch305: chromium-124-el8-arm64-memory_tagging.patch
@@ -408,7 +411,7 @@ Patch356: chromium-141-use_libcxx_modules.patch
 Patch357: chromium-134-type-mismatch-error.patch
 
 # set clang_lib path
-Patch358: chromium-141-rust-clanglib.patch
+Patch358: chromium-144-rust-clanglib.patch
 
 # PowerPC64 LE support
 # Timothy Pearson's patchset
@@ -447,7 +450,6 @@ Patch396: skia-vsx-instructions.patch
 Patch397: 0001-Implement-support-for-ppc64-on-Linux.patch
 Patch398: 0001-Implement-support-for-PPC64-on-Linux.patch
 Patch399: 0001-Force-baseline-POWER8-AltiVec-VSX-CPU-features-when-.patch
-Patch400: fix-clang-selection.patch
 Patch401: fix-rustc.patch
 Patch402: fix-rust-linking.patch
 Patch403: fix-breakpad-compile.patch
@@ -482,9 +484,6 @@ Patch511: 0002-Fix-Missing-OPENSSL_NO_ENGINE-Guard.patch
 %endif
 
 # upstream patches
-# Fix Wayland URI DnD issues
-Patch1001: chromium-142-Add-ExtractData-support-for-text-uri-list.patch
-Patch1002: chromium-142-Update-pointer-position-during-draggin.patch
 
 # Use chromium-latest.py to generate clean tarball from released build tarballs, found here:
 # http://build.chromium.org/buildbot/official/
@@ -532,6 +531,7 @@ BuildRequires: gcc-toolset-14-libatomic-devel
 %endif
 
 BuildRequires: rustc
+BuildRequires: rustfmt
 BuildRequires: bindgen-cli
 
 %if ! %{bundlezstd}
@@ -1081,6 +1081,8 @@ Qt6 UI for chromium.
 %patch -P300 -p1 -R -b .revert-decommit-pooled-pages-by-default
 %endif
 
+%patch -P301 -p1 -b .rust-libadler2
+
 %if 0%{?rhel} == 8
 %ifarch aarch64
 %patch -P305 -p1 -b .el8-memory_tagging
@@ -1095,11 +1097,6 @@ Qt6 UI for chromium.
 %patch -P310 -p1 -b .rust-FTBFS-suppress-warnings
 %patch -P311 -p1 -b .fstack-protector-strong
 
-%if 0%{?rhel} == 9 || 0%{?rhel_minor_version} == 1
-%patch -P312 -p1 -b .el9-rust-no-alloc-shim-is-unstable
-%patch -P313 -p1 -b .el9-rust_alloc_error_handler_should_panic
-%endif
-
 %if 0%{?rhel} && 0%{?rhel} < 10
 %patch -P354 -p1 -b .split-threshold-for-reg-with-hint
 %endif
@@ -1152,7 +1149,6 @@ Qt6 UI for chromium.
 %patch -P397 -p1 -b .0001-Implement-support-for-ppc64-on-Linux
 %patch -P398 -p1 -b .0001-Implement-support-for-PPC64-on-Linux
 %patch -P399 -p1 -b .0001-Force-baseline-POWER8-AltiVec-VSX-CPU-features-when-
-%patch -P400 -p1 -b .fix-clang-selection
 %patch -P401 -p1 -b .fix-rustc
 %patch -P402 -p1 -b .fix-rust-linking
 %patch -P403 -p1 -b .fix-breakpad-compile
@@ -1177,8 +1173,6 @@ Qt6 UI for chromium.
 %endif
 
 # Upstream patches
-%patch -P1001 -p1 -b .Add-ExtractData-support-for-text-uri-list.patch
-%patch -P1002 -p1 -b .Update-pointer-position-during-draggin.patch
 
 # Change shebang in all relevant files in this directory and all subdirectories
 # See `man find` for how the `-exec command {} +` syntax works
@@ -1817,8 +1811,21 @@ fi
 %endif
 
 %changelog
+* Wed Jan 14 2026 Than Ngo <than@redhat.com> - 144.0.7559.59-1
+- Update to 144.0.7559.59
+  * CVE-2026-0899: Out of bounds memory access in V8
+  * CVE-2026-0900: Inappropriate implementation in V8
+  * CVE-2026-0901: Inappropriate implementation in Blink
+  * CVE-2026-0902: Inappropriate implementation in V8
+  * CVE-2026-0903: Insufficient validation of untrusted input in Downloads
+  * CVE-2026-0904: Incorrect security UI in Digital Credentials
+  * CVE-2026-0905: Insufficient policy enforcement in Network
+  * CVE-2026-0906: Incorrect security UI
+  * CVE-2026-0907: Incorrect security UI in Split View
+  * CVE-2026-0908: Use after free in ANGLE
+
 * Wed Jan 07 2026 Than Ngo <than@redhat.com> - 143.0.7499.192-1
-- Update tp 143.0.7499.192
+- Update to 143.0.7499.192
   * High CVE-2026-0628: Insufficient policy enforcement in WebView tag
 - Fix rhbz#2425338, Enable control flow integrity support for x86_64/aarch64
 - Enable build for epel10.1

diff --git a/dawn-fix-ppc64le-detection.patch b/dawn-fix-ppc64le-detection.patch
index a32fa4e..9eb8581 100644
--- a/dawn-fix-ppc64le-detection.patch
+++ b/dawn-fix-ppc64le-detection.patch
@@ -1,7 +1,7 @@
-Index: chromium-143.0.7499.40/third_party/dawn/src/dawn/common/Platform.h
+Index: chromium-144.0.7559.59/third_party/dawn/src/dawn/common/Platform.h
 ===================================================================
---- chromium-143.0.7499.40.orig/third_party/dawn/src/dawn/common/Platform.h
-+++ chromium-143.0.7499.40/third_party/dawn/src/dawn/common/Platform.h
+--- chromium-144.0.7559.59.orig/third_party/dawn/src/dawn/common/Platform.h
++++ chromium-144.0.7559.59/third_party/dawn/src/dawn/common/Platform.h
 @@ -163,10 +163,12 @@
  #elif defined(__s390x__)
  #define DAWN_PLATFORM_IS_S390X 1

diff --git a/fix-breakpad-compile.patch b/fix-breakpad-compile.patch
index 1ce2a60..7ad360b 100644
--- a/fix-breakpad-compile.patch
+++ b/fix-breakpad-compile.patch
@@ -1,7 +1,7 @@
-Index: chromium-143.0.7499.40/third_party/breakpad/BUILD.gn
+Index: chromium-144.0.7559.59/third_party/breakpad/BUILD.gn
 ===================================================================
---- chromium-143.0.7499.40.orig/third_party/breakpad/BUILD.gn
-+++ chromium-143.0.7499.40/third_party/breakpad/BUILD.gn
+--- chromium-144.0.7559.59.orig/third_party/breakpad/BUILD.gn
++++ chromium-144.0.7559.59/third_party/breakpad/BUILD.gn
 @@ -804,7 +804,6 @@ if (is_linux || is_chromeos || is_androi
        "breakpad/src/client/minidump_file_writer.h",
        "breakpad/src/common/convert_UTF.cc",

diff --git a/fix-clang-selection.patch b/fix-clang-selection.patch
deleted file mode 100644
index a503030..0000000
--- a/fix-clang-selection.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: chromium-143.0.7499.40/build/config/BUILDCONFIG.gn
-===================================================================
---- chromium-143.0.7499.40.orig/build/config/BUILDCONFIG.gn
-+++ chromium-143.0.7499.40/build/config/BUILDCONFIG.gn
-@@ -138,7 +138,6 @@ declare_args() {
-   # Set to true when compiling with the Clang compiler.
-   is_clang = current_os != "linux" ||
-              (current_cpu != "s390x" && current_cpu != "s390" &&
--              current_cpu != "ppc64" && current_cpu != "ppc" &&
-               current_cpu != "mips" && current_cpu != "mips64")
- 
-   # Allows the path to a custom target toolchain to be injected as a single

diff --git a/fix-different-data-layouts.patch b/fix-different-data-layouts.patch
index f2e5403..31e5254 100644
--- a/fix-different-data-layouts.patch
+++ b/fix-different-data-layouts.patch
@@ -24,10 +24,10 @@ inconsistency in data layouts when targeting this particular platform.
 The error reported by the linker is not technically an error, however, only
 a warning goosed up by a --fatal-warnings flag.
 
-Index: chromium-143.0.7499.40/build/config/compiler/BUILD.gn
+Index: chromium-144.0.7559.59/build/config/compiler/BUILD.gn
 ===================================================================
---- chromium-143.0.7499.40.orig/build/config/compiler/BUILD.gn
-+++ chromium-143.0.7499.40/build/config/compiler/BUILD.gn
+--- chromium-144.0.7559.59.orig/build/config/compiler/BUILD.gn
++++ chromium-144.0.7559.59/build/config/compiler/BUILD.gn
 @@ -470,7 +470,7 @@ config("compiler") {
  
      # Linker warnings.

diff --git a/fix-page-allocator-overflow.patch b/fix-page-allocator-overflow.patch
index dbfc560..0cda503 100644
--- a/fix-page-allocator-overflow.patch
+++ b/fix-page-allocator-overflow.patch
@@ -1,7 +1,7 @@
-Index: chromium-143.0.7499.40/base/allocator/dispatcher/tls.h
+Index: chromium-144.0.7559.59/base/allocator/dispatcher/tls.h
 ===================================================================
---- chromium-143.0.7499.40.orig/base/allocator/dispatcher/tls.h
-+++ chromium-143.0.7499.40/base/allocator/dispatcher/tls.h
+--- chromium-144.0.7559.59.orig/base/allocator/dispatcher/tls.h
++++ chromium-144.0.7559.59/base/allocator/dispatcher/tls.h
 @@ -88,6 +88,8 @@ struct BASE_EXPORT MMapAllocator {
    constexpr static size_t AllocationChunkSize = 16384;
  #elif BUILDFLAG(IS_LINUX) && defined(ARCH_CPU_ARM64)
@@ -11,10 +11,10 @@ Index: chromium-143.0.7499.40/base/allocator/dispatcher/tls.h
  #else
    constexpr static size_t AllocationChunkSize = 4096;
  #endif
-Index: chromium-143.0.7499.40/base/allocator/partition_allocator/src/partition_alloc/partition_alloc_constants.h
+Index: chromium-144.0.7559.59/base/allocator/partition_allocator/src/partition_alloc/partition_alloc_constants.h
 ===================================================================
---- chromium-143.0.7499.40.orig/base/allocator/partition_allocator/src/partition_alloc/partition_alloc_constants.h
-+++ chromium-143.0.7499.40/base/allocator/partition_allocator/src/partition_alloc/partition_alloc_constants.h
+--- chromium-144.0.7559.59.orig/base/allocator/partition_allocator/src/partition_alloc/partition_alloc_constants.h
++++ chromium-144.0.7559.59/base/allocator/partition_allocator/src/partition_alloc/partition_alloc_constants.h
 @@ -399,7 +399,7 @@ PA_ALWAYS_INLINE constexpr size_t MaxDir
  // TODO(casey.smalley@arm.com): under 64k pages we can end up in a situation
  // where a normal slot span will be large enough to contain multiple items,

diff --git a/fix-partition-alloc-compile.patch b/fix-partition-alloc-compile.patch
index 8721f1b..2fd5cfb 100644
--- a/fix-partition-alloc-compile.patch
+++ b/fix-partition-alloc-compile.patch
@@ -1,9 +1,9 @@
 kIndex: chromium-114.0.5735.45/base/allocator/partition_allocator/partition_alloc.gni
 ===================================================================
-Index: chromium-143.0.7499.40/base/allocator/partition_allocator/partition_alloc.gni
+Index: chromium-144.0.7559.59/base/allocator/partition_allocator/partition_alloc.gni
 ===================================================================
---- chromium-143.0.7499.40.orig/base/allocator/partition_allocator/partition_alloc.gni
-+++ chromium-143.0.7499.40/base/allocator/partition_allocator/partition_alloc.gni
+--- chromium-144.0.7559.59.orig/base/allocator/partition_allocator/partition_alloc.gni
++++ chromium-144.0.7559.59/base/allocator/partition_allocator/partition_alloc.gni
 @@ -71,7 +71,7 @@ is_clang_or_gcc = is_clang || !is_win
  # Whether 64-bit pointers are used.
  # A static_assert in partition_alloc_config.h verifies that.

diff --git a/fix-rust-linking.patch b/fix-rust-linking.patch
index 28f2a1f..dca5333 100644
--- a/fix-rust-linking.patch
+++ b/fix-rust-linking.patch
@@ -1,8 +1,8 @@
-Index: chromium-143.0.7499.40/build/toolchain/gcc_toolchain.gni
+Index: chromium-144.0.7559.59/build/toolchain/gcc_toolchain.gni
 ===================================================================
---- chromium-143.0.7499.40.orig/build/toolchain/gcc_toolchain.gni
-+++ chromium-143.0.7499.40/build/toolchain/gcc_toolchain.gni
-@@ -422,7 +422,13 @@ template("single_gcc_toolchain") {
+--- chromium-144.0.7559.59.orig/build/toolchain/gcc_toolchain.gni
++++ chromium-144.0.7559.59/build/toolchain/gcc_toolchain.gni
+@@ -415,7 +415,13 @@ template("single_gcc_toolchain") {
          # -soname flag is not available on aix ld
          soname_flag = "-Wl,-soname=\"$soname\""
        }
@@ -17,7 +17,7 @@ Index: chromium-143.0.7499.40/build/toolchain/gcc_toolchain.gni
  
        # Generate a map file to be used for binary size analysis.
        # Map file adds ~10% to the link time on a z620.
-@@ -534,7 +540,13 @@ template("single_gcc_toolchain") {
+@@ -527,7 +533,13 @@ template("single_gcc_toolchain") {
          whole_archive_flag = "-Wl,--whole-archive"
          no_whole_archive_flag = "-Wl,--no-whole-archive"
        }

diff --git a/fix-rustc.patch b/fix-rustc.patch
index 1655042..d5b7a2c 100644
--- a/fix-rustc.patch
+++ b/fix-rustc.patch
@@ -1,10 +1,10 @@
 author: Andres Salomon <dilinger@debian.org>
 description: allow ppc64le to build by using proper rustc target
-Index: chromium-143.0.7499.40/build/config/rust.gni
+Index: chromium-144.0.7559.59/build/config/rust.gni
 ===================================================================
---- chromium-143.0.7499.40.orig/build/config/rust.gni
-+++ chromium-143.0.7499.40/build/config/rust.gni
-@@ -176,6 +176,9 @@ rust_abi_target = ""
+--- chromium-144.0.7559.59.orig/build/config/rust.gni
++++ chromium-144.0.7559.59/build/config/rust.gni
+@@ -186,6 +186,9 @@ rust_abi_target = ""
  if (is_linux || is_chromeos) {
    if (current_cpu == "arm64") {
      rust_abi_target = "aarch64-unknown-linux-gnu"

diff --git a/fix-study-crash.patch b/fix-study-crash.patch
index 2d1058a..0a0dd1b 100644
--- a/fix-study-crash.patch
+++ b/fix-study-crash.patch
@@ -1,7 +1,7 @@
-Index: chromium-143.0.7499.40/components/variations/proto/study.proto
+Index: chromium-144.0.7559.59/components/variations/proto/study.proto
 ===================================================================
---- chromium-143.0.7499.40.orig/components/variations/proto/study.proto
-+++ chromium-143.0.7499.40/components/variations/proto/study.proto
+--- chromium-144.0.7559.59.orig/components/variations/proto/study.proto
++++ chromium-144.0.7559.59/components/variations/proto/study.proto
 @@ -293,6 +293,9 @@ message Study {
      // A Mac-only value, indicating an x86-64 binary running on an arm64 host
      // via "Rosetta 2" binary translation.
@@ -12,11 +12,11 @@ Index: chromium-143.0.7499.40/components/variations/proto/study.proto
    }
  
    // Enum to pass as optional bool.
-Index: chromium-143.0.7499.40/components/variations/service/variations_field_trial_creator.cc
+Index: chromium-144.0.7559.59/components/variations/service/variations_field_trial_creator.cc
 ===================================================================
---- chromium-143.0.7499.40.orig/components/variations/service/variations_field_trial_creator.cc
-+++ chromium-143.0.7499.40/components/variations/service/variations_field_trial_creator.cc
-@@ -105,6 +105,9 @@ Study::CpuArchitecture GetCurrentCpuArch
+--- chromium-144.0.7559.59.orig/components/variations/service/variations_field_trial_creator.cc
++++ chromium-144.0.7559.59/components/variations/service/variations_field_trial_creator.cc
+@@ -108,6 +108,9 @@ Study::CpuArchitecture GetCurrentCpuArch
    if (process_arch == "x86") {
      return Study::X86_32;
    }

diff --git a/fix-unknown-warning-option-messages.diff b/fix-unknown-warning-option-messages.diff
index 8c767e1..1555a08 100644
--- a/fix-unknown-warning-option-messages.diff
+++ b/fix-unknown-warning-option-messages.diff
@@ -1,8 +1,8 @@
-Index: chromium-143.0.7499.40/build/config/compiler/BUILD.gn
+Index: chromium-144.0.7559.59/build/config/compiler/BUILD.gn
 ===================================================================
---- chromium-143.0.7499.40.orig/build/config/compiler/BUILD.gn
-+++ chromium-143.0.7499.40/build/config/compiler/BUILD.gn
-@@ -2134,7 +2134,9 @@ config("default_warnings") {
+--- chromium-144.0.7559.59.orig/build/config/compiler/BUILD.gn
++++ chromium-144.0.7559.59/build/config/compiler/BUILD.gn
+@@ -2129,7 +2129,9 @@ config("default_warnings") {
  
        # Don't warn about "maybe" uninitialized. Clang doesn't include this
        # in -Wall but gcc does, and it gives false positives.
@@ -13,7 +13,7 @@ Index: chromium-143.0.7499.40/build/config/compiler/BUILD.gn
        cflags += [ "-Wno-deprecated-declarations" ]
  
        # -Wcomment gives too many false positives in the case a
-@@ -2145,7 +2147,9 @@ config("default_warnings") {
+@@ -2140,7 +2142,9 @@ config("default_warnings") {
  
        # -Wpacked-not-aligned complains all generated mojom-shared-internal.h
        # files.

diff --git a/skia-vsx-instructions.patch b/skia-vsx-instructions.patch
index b84166c..acffaa2 100644
--- a/skia-vsx-instructions.patch
+++ b/skia-vsx-instructions.patch
@@ -1,8 +1,8 @@
-Index: chromium-143.0.7499.40/third_party/skia/BUILD.gn
+Index: chromium-144.0.7559.59/third_party/skia/BUILD.gn
 ===================================================================
---- chromium-143.0.7499.40.orig/third_party/skia/BUILD.gn
-+++ chromium-143.0.7499.40/third_party/skia/BUILD.gn
-@@ -192,6 +192,12 @@ opts("lasx") {
+--- chromium-144.0.7559.59.orig/third_party/skia/BUILD.gn
++++ chromium-144.0.7559.59/third_party/skia/BUILD.gn
+@@ -199,6 +199,12 @@ opts("lasx") {
    cflags = [ "-mlasx" ]
  }
  
@@ -15,7 +15,7 @@ Index: chromium-143.0.7499.40/third_party/skia/BUILD.gn
  # Any feature of Skia that requires third-party code should be optional and use this template.
  template("optional") {
    if (invoker.enabled) {
-@@ -1686,6 +1692,7 @@ skia_component("skia") {
+@@ -1700,6 +1706,7 @@ skia_component("skia") {
      ":skx",
      ":typeface_fontations",
      ":vello",
@@ -23,10 +23,10 @@ Index: chromium-143.0.7499.40/third_party/skia/BUILD.gn
      ":webp_decode",
      ":wuffs",
      ":xml",
-Index: chromium-143.0.7499.40/third_party/skia/gn/skia/BUILD.gn
+Index: chromium-144.0.7559.59/third_party/skia/gn/skia/BUILD.gn
 ===================================================================
---- chromium-143.0.7499.40.orig/third_party/skia/gn/skia/BUILD.gn
-+++ chromium-143.0.7499.40/third_party/skia/gn/skia/BUILD.gn
+--- chromium-144.0.7559.59.orig/third_party/skia/gn/skia/BUILD.gn
++++ chromium-144.0.7559.59/third_party/skia/gn/skia/BUILD.gn
 @@ -142,6 +142,8 @@ config("default") {
        "-mfpmath=sse",
      ]
@@ -36,10 +36,10 @@ Index: chromium-143.0.7499.40/third_party/skia/gn/skia/BUILD.gn
    } else if (current_cpu == "loong64") {
      cflags += [
        "-mlsx",
-Index: chromium-143.0.7499.40/third_party/skia/include/core/SkTypes.h
+Index: chromium-144.0.7559.59/third_party/skia/include/core/SkTypes.h
 ===================================================================
---- chromium-143.0.7499.40.orig/third_party/skia/include/core/SkTypes.h
-+++ chromium-143.0.7499.40/third_party/skia/include/core/SkTypes.h
+--- chromium-144.0.7559.59.orig/third_party/skia/include/core/SkTypes.h
++++ chromium-144.0.7559.59/third_party/skia/include/core/SkTypes.h
 @@ -198,4 +198,43 @@ static constexpr uint32_t SK_InvalidGenI
  */
  static constexpr uint32_t SK_InvalidUniqueID = 0;
@@ -84,10 +84,10 @@ Index: chromium-143.0.7499.40/third_party/skia/include/core/SkTypes.h
 +#endif
 +
  #endif
-Index: chromium-143.0.7499.40/third_party/skia/src/base/SkSpinlock.cpp
+Index: chromium-144.0.7559.59/third_party/skia/src/base/SkSpinlock.cpp
 ===================================================================
---- chromium-143.0.7499.40.orig/third_party/skia/src/base/SkSpinlock.cpp
-+++ chromium-143.0.7499.40/third_party/skia/src/base/SkSpinlock.cpp
+--- chromium-144.0.7559.59.orig/third_party/skia/src/base/SkSpinlock.cpp
++++ chromium-144.0.7559.59/third_party/skia/src/base/SkSpinlock.cpp
 @@ -33,7 +33,8 @@
  #endif
  
@@ -98,10 +98,10 @@ Index: chromium-143.0.7499.40/third_party/skia/src/base/SkSpinlock.cpp
      #include <emmintrin.h>
      static void do_pause() { _mm_pause(); }
  #else
-Index: chromium-143.0.7499.40/third_party/skia/src/opts/SkBitmapProcState_opts.h
+Index: chromium-144.0.7559.59/third_party/skia/src/opts/SkBitmapProcState_opts.h
 ===================================================================
---- chromium-143.0.7499.40.orig/third_party/skia/src/opts/SkBitmapProcState_opts.h
-+++ chromium-143.0.7499.40/third_party/skia/src/opts/SkBitmapProcState_opts.h
+--- chromium-144.0.7559.59.orig/third_party/skia/src/opts/SkBitmapProcState_opts.h
++++ chromium-144.0.7559.59/third_party/skia/src/opts/SkBitmapProcState_opts.h
 @@ -21,7 +21,13 @@
  // The rest are scattershot at the moment but I want to get them
  // all migrated to be normal code inside SkBitmapProcState.cpp.
@@ -117,10 +117,10 @@ Index: chromium-143.0.7499.40/third_party/skia/src/opts/SkBitmapProcState_opts.h
      #include <immintrin.h>
  #elif defined(SK_ARM_HAS_NEON)
      #include <arm_neon.h>
-Index: chromium-143.0.7499.40/third_party/skia/src/opts/SkBlitRow_opts.h
+Index: chromium-144.0.7559.59/third_party/skia/src/opts/SkBlitRow_opts.h
 ===================================================================
---- chromium-143.0.7499.40.orig/third_party/skia/src/opts/SkBlitRow_opts.h
-+++ chromium-143.0.7499.40/third_party/skia/src/opts/SkBlitRow_opts.h
+--- chromium-144.0.7559.59.orig/third_party/skia/src/opts/SkBlitRow_opts.h
++++ chromium-144.0.7559.59/third_party/skia/src/opts/SkBlitRow_opts.h
 @@ -69,7 +69,7 @@
  #endif
  
@@ -130,10 +130,10 @@ Index: chromium-143.0.7499.40/third_party/skia/src/opts/SkBlitRow_opts.h
  
      static inline __m128i SkPMSrcOver_SSE2(const __m128i& src, const __m128i& dst) {
          __m128i scale = _mm_sub_epi32(_mm_set1_epi32(256),
-Index: chromium-143.0.7499.40/third_party/skia/src/opts/SkRasterPipeline_opts.h
+Index: chromium-144.0.7559.59/third_party/skia/src/opts/SkRasterPipeline_opts.h
 ===================================================================
---- chromium-143.0.7499.40.orig/third_party/skia/src/opts/SkRasterPipeline_opts.h
-+++ chromium-143.0.7499.40/third_party/skia/src/opts/SkRasterPipeline_opts.h
+--- chromium-144.0.7559.59.orig/third_party/skia/src/opts/SkRasterPipeline_opts.h
++++ chromium-144.0.7559.59/third_party/skia/src/opts/SkRasterPipeline_opts.h
 @@ -1,5 +1,6 @@
  /*
   * Copyright 2018 Google Inc.
@@ -394,7 +394,7 @@ Index: chromium-143.0.7499.40/third_party/skia/src/opts/SkRasterPipeline_opts.h
      // These platforms are ideal for wider stages, and their default ABI is ideal.
      #define ABI
      #define SKRP_NARROW_STAGES 0
-@@ -5574,6 +5784,10 @@ SI F sqrt_(F x) {
+@@ -5600,6 +5810,10 @@ SI F sqrt_(F x) {
      float32x4_t lo,hi;
      split(x, &lo,&hi);
      return join<F>(sqrt(lo), sqrt(hi));
@@ -405,7 +405,7 @@ Index: chromium-143.0.7499.40/third_party/skia/src/opts/SkRasterPipeline_opts.h
  #elif defined(SKRP_CPU_LASX)
      __m256 lo,hi;
      split(x, &lo,&hi);
-@@ -5605,6 +5819,10 @@ SI F floor_(F x) {
+@@ -5631,6 +5845,10 @@ SI F floor_(F x) {
      __m128 lo,hi;
      split(x, &lo,&hi);
      return join<F>(_mm_floor_ps(lo), _mm_floor_ps(hi));
@@ -416,7 +416,7 @@ Index: chromium-143.0.7499.40/third_party/skia/src/opts/SkRasterPipeline_opts.h
  #elif defined(SKRP_CPU_LASX)
      __m256 lo,hi;
      split(x, &lo,&hi);
-@@ -5624,6 +5842,7 @@ SI F floor_(F x) {
+@@ -5650,6 +5868,7 @@ SI F floor_(F x) {
  //     (2 * a * b + (1 << 15)) >> 16
  // The result is a number on [-1, 1).
  // Note: on neon this is a saturating multiply while the others are not.
@@ -424,7 +424,7 @@ Index: chromium-143.0.7499.40/third_party/skia/src/opts/SkRasterPipeline_opts.h
  SI I16 scaled_mult(I16 a, I16 b) {
  #if defined(SKRP_CPU_SKX)
      return (I16)_mm256_mulhrs_epi16((__m256i)a, (__m256i)b);
-@@ -5635,6 +5854,22 @@ SI I16 scaled_mult(I16 a, I16 b) {
+@@ -5661,6 +5880,22 @@ SI I16 scaled_mult(I16 a, I16 b) {
      return vqrdmulhq_s16(a, b);
  #elif defined(SKRP_CPU_NEON)
      return vqrdmulhq_s16(a, b);
@@ -447,7 +447,7 @@ Index: chromium-143.0.7499.40/third_party/skia/src/opts/SkRasterPipeline_opts.h
  #elif defined(SKRP_CPU_LASX)
      I16 res = __lasx_xvmuh_h(a, b);
      return __lasx_xvslli_h(res, 1);
-@@ -5662,7 +5897,26 @@ SI U16 constrained_add(I16 a, U16 b) {
+@@ -5688,7 +5923,26 @@ SI U16 constrained_add(I16 a, U16 b) {
              SkASSERT(-ib <= ia && ia <= 65535 - ib);
          }
      #endif
@@ -474,7 +474,7 @@ Index: chromium-143.0.7499.40/third_party/skia/src/opts/SkRasterPipeline_opts.h
  }
  
  SI F fract(F x) { return x - floor_(x); }
-@@ -6718,8 +6972,14 @@ LOWP_STAGE_GP(bilerp_clamp_8888, const S
+@@ -6744,8 +6998,14 @@ LOWP_STAGE_GP(bilerp_clamp_8888, const S
      //         2^-8 * v = 2^-9 * (tx*(R - L) + (R + L))
      //                v = 1/2 * (tx*(R - L) + (R + L))
      auto lerpX = [&](U16 left, U16 right) -> U16 {
@@ -489,7 +489,7 @@ Index: chromium-143.0.7499.40/third_party/skia/src/opts/SkRasterPipeline_opts.h
          // The constrained_add is the most subtle part of lerp. The first term is on the interval
          // [-1, 1), and the second term is on the interval is on the interval [0, 1) because
          // both terms are too high by a factor of 2 which will be handled below. (Both R and L are
-@@ -6731,7 +6991,12 @@ LOWP_STAGE_GP(bilerp_clamp_8888, const S
+@@ -6757,7 +7017,12 @@ LOWP_STAGE_GP(bilerp_clamp_8888, const S
          U16 v2  = constrained_add(scaled_mult(tx, width), middle) + 1;
          // Divide by 2 to calculate v and at the same time bring the intermediate value onto the
          // interval [0, 1/2] to set up for the lerpY.
@@ -502,7 +502,7 @@ Index: chromium-143.0.7499.40/third_party/skia/src/opts/SkRasterPipeline_opts.h
      };
  
      const uint32_t* ptr;
-@@ -6765,9 +7030,15 @@ LOWP_STAGE_GP(bilerp_clamp_8888, const S
+@@ -6791,9 +7056,15 @@ LOWP_STAGE_GP(bilerp_clamp_8888, const S
          I16 width  = (I16)bottom - (I16)top;
          U16 middle = bottom + top;
          // Add + 0x80 for rounding.
@@ -519,10 +519,10 @@ Index: chromium-143.0.7499.40/third_party/skia/src/opts/SkRasterPipeline_opts.h
      };
  
      r = lerpY(topR, bottomR);
-Index: chromium-143.0.7499.40/third_party/skia/src/base/SkVx.h
+Index: chromium-144.0.7559.59/third_party/skia/src/base/SkVx.h
 ===================================================================
---- chromium-143.0.7499.40.orig/third_party/skia/src/base/SkVx.h
-+++ chromium-143.0.7499.40/third_party/skia/src/base/SkVx.h
+--- chromium-144.0.7559.59.orig/third_party/skia/src/base/SkVx.h
++++ chromium-144.0.7559.59/third_party/skia/src/base/SkVx.h
 @@ -41,7 +41,12 @@
  #endif
  
@@ -537,10 +537,10 @@ Index: chromium-143.0.7499.40/third_party/skia/src/base/SkVx.h
          #include <immintrin.h>
      #elif SK_CPU_SSE_LEVEL >= SK_CPU_SSE_LEVEL_SSE41
          #include <smmintrin.h>
-Index: chromium-143.0.7499.40/third_party/skia/src/core/SkBlitMask_opts_ssse3.cpp
+Index: chromium-144.0.7559.59/third_party/skia/src/core/SkBlitMask_opts_ssse3.cpp
 ===================================================================
---- chromium-143.0.7499.40.orig/third_party/skia/src/core/SkBlitMask_opts_ssse3.cpp
-+++ chromium-143.0.7499.40/third_party/skia/src/core/SkBlitMask_opts_ssse3.cpp
+--- chromium-144.0.7559.59.orig/third_party/skia/src/core/SkBlitMask_opts_ssse3.cpp
++++ chromium-144.0.7559.59/third_party/skia/src/core/SkBlitMask_opts_ssse3.cpp
 @@ -9,7 +9,7 @@
  #include "src/core/SkBlitMask.h"
  #include "src/core/SkOptsTargets.h"
@@ -550,10 +550,10 @@ Index: chromium-143.0.7499.40/third_party/skia/src/core/SkBlitMask_opts_ssse3.cp
  
  // The order of these includes is important:
  // 1) Select the target CPU architecture by defining SK_OPTS_TARGET and including SkOpts_SetTarget
-Index: chromium-143.0.7499.40/third_party/skia/src/core/SkSwizzler_opts_ssse3.cpp
+Index: chromium-144.0.7559.59/third_party/skia/src/core/SkSwizzler_opts_ssse3.cpp
 ===================================================================
---- chromium-143.0.7499.40.orig/third_party/skia/src/core/SkSwizzler_opts_ssse3.cpp
-+++ chromium-143.0.7499.40/third_party/skia/src/core/SkSwizzler_opts_ssse3.cpp
+--- chromium-144.0.7559.59.orig/third_party/skia/src/core/SkSwizzler_opts_ssse3.cpp
++++ chromium-144.0.7559.59/third_party/skia/src/core/SkSwizzler_opts_ssse3.cpp
 @@ -10,7 +10,7 @@
  #include "src/core/SkOptsTargets.h"
  #include "src/core/SkSwizzlePriv.h"
@@ -563,10 +563,10 @@ Index: chromium-143.0.7499.40/third_party/skia/src/core/SkSwizzler_opts_ssse3.cp
      !defined(SK_ENABLE_OPTIMIZE_SIZE) && \
      SK_CPU_SSE_LEVEL < SK_CPU_SSE_LEVEL_SSSE3
  
-Index: chromium-143.0.7499.40/third_party/skia/src/core/SkBlitMask_opts.cpp
+Index: chromium-144.0.7559.59/third_party/skia/src/core/SkBlitMask_opts.cpp
 ===================================================================
---- chromium-143.0.7499.40.orig/third_party/skia/src/core/SkBlitMask_opts.cpp
-+++ chromium-143.0.7499.40/third_party/skia/src/core/SkBlitMask_opts.cpp
+--- chromium-144.0.7559.59.orig/third_party/skia/src/core/SkBlitMask_opts.cpp
++++ chromium-144.0.7559.59/third_party/skia/src/core/SkBlitMask_opts.cpp
 @@ -25,7 +25,7 @@ namespace SkOpts {
      static bool init() {
      #if defined(SK_ENABLE_OPTIMIZE_SIZE)
@@ -576,10 +576,10 @@ Index: chromium-143.0.7499.40/third_party/skia/src/core/SkBlitMask_opts.cpp
          #if SK_CPU_SSE_LEVEL < SK_CPU_SSE_LEVEL_SSSE3
              if (SkCpu::Supports(SkCpu::SSSE3)) { Init_BlitMask_ssse3(); }
          #endif
-Index: chromium-143.0.7499.40/third_party/skia/src/core/SkBitmapProcState_opts.cpp
+Index: chromium-144.0.7559.59/third_party/skia/src/core/SkBitmapProcState_opts.cpp
 ===================================================================
---- chromium-143.0.7499.40.orig/third_party/skia/src/core/SkBitmapProcState_opts.cpp
-+++ chromium-143.0.7499.40/third_party/skia/src/core/SkBitmapProcState_opts.cpp
+--- chromium-144.0.7559.59.orig/third_party/skia/src/core/SkBitmapProcState_opts.cpp
++++ chromium-144.0.7559.59/third_party/skia/src/core/SkBitmapProcState_opts.cpp
 @@ -27,7 +27,7 @@ namespace SkOpts {
      static bool init() {
      #if defined(SK_ENABLE_OPTIMIZE_SIZE)
@@ -589,10 +589,10 @@ Index: chromium-143.0.7499.40/third_party/skia/src/core/SkBitmapProcState_opts.c
          #if SK_CPU_SSE_LEVEL < SK_CPU_SSE_LEVEL_SSSE3
              if (SkCpu::Supports(SkCpu::SSSE3)) { Init_BitmapProcState_ssse3(); }
          #endif
-Index: chromium-143.0.7499.40/third_party/skia/src/core/SkCpu.h
+Index: chromium-144.0.7559.59/third_party/skia/src/core/SkCpu.h
 ===================================================================
---- chromium-143.0.7499.40.orig/third_party/skia/src/core/SkCpu.h
-+++ chromium-143.0.7499.40/third_party/skia/src/core/SkCpu.h
+--- chromium-144.0.7559.59.orig/third_party/skia/src/core/SkCpu.h
++++ chromium-144.0.7559.59/third_party/skia/src/core/SkCpu.h
 @@ -60,7 +60,7 @@ inline bool SkCpu::Supports(uint32_t mas
  
      // If we mask in compile-time known lower limits, the compiler can
@@ -602,10 +602,10 @@ Index: chromium-143.0.7499.40/third_party/skia/src/core/SkCpu.h
      #if SK_CPU_SSE_LEVEL >= SK_CPU_SSE_LEVEL_SSE1
      features |= SSE1;
      #endif
-Index: chromium-143.0.7499.40/third_party/skia/src/core/SkBitmapProcState_opts_ssse3.cpp
+Index: chromium-144.0.7559.59/third_party/skia/src/core/SkBitmapProcState_opts_ssse3.cpp
 ===================================================================
---- chromium-143.0.7499.40.orig/third_party/skia/src/core/SkBitmapProcState_opts_ssse3.cpp
-+++ chromium-143.0.7499.40/third_party/skia/src/core/SkBitmapProcState_opts_ssse3.cpp
+--- chromium-144.0.7559.59.orig/third_party/skia/src/core/SkBitmapProcState_opts_ssse3.cpp
++++ chromium-144.0.7559.59/third_party/skia/src/core/SkBitmapProcState_opts_ssse3.cpp
 @@ -8,7 +8,7 @@
  #include "include/private/base/SkFeatures.h"
  #include "src/core/SkOptsTargets.h"
@@ -615,10 +615,10 @@ Index: chromium-143.0.7499.40/third_party/skia/src/core/SkBitmapProcState_opts_s
  
  // The order of these includes is important:
  // 1) Select the target CPU architecture by defining SK_OPTS_TARGET and including SkOpts_SetTarget
-Index: chromium-143.0.7499.40/third_party/skia/include/private/base/SkFeatures.h
+Index: chromium-144.0.7559.59/third_party/skia/include/private/base/SkFeatures.h
 ===================================================================
---- chromium-143.0.7499.40.orig/third_party/skia/include/private/base/SkFeatures.h
-+++ chromium-143.0.7499.40/third_party/skia/include/private/base/SkFeatures.h
+--- chromium-144.0.7559.59.orig/third_party/skia/include/private/base/SkFeatures.h
++++ chromium-144.0.7559.59/third_party/skia/include/private/base/SkFeatures.h
 @@ -63,6 +63,8 @@
  
  #if defined(__i386) || defined(_M_IX86) ||  defined(__x86_64__) || defined(_M_X64)
@@ -628,10 +628,10 @@ Index: chromium-143.0.7499.40/third_party/skia/include/private/base/SkFeatures.h
  #endif
  
  #if defined(__loongarch__) || defined (__loongarch64)
-Index: chromium-143.0.7499.40/third_party/skia/src/opts/SkSwizzler_opts.inc
+Index: chromium-144.0.7559.59/third_party/skia/src/opts/SkSwizzler_opts.inc
 ===================================================================
---- chromium-143.0.7499.40.orig/third_party/skia/src/opts/SkSwizzler_opts.inc
-+++ chromium-143.0.7499.40/third_party/skia/src/opts/SkSwizzler_opts.inc
+--- chromium-144.0.7559.59.orig/third_party/skia/src/opts/SkSwizzler_opts.inc
++++ chromium-144.0.7559.59/third_party/skia/src/opts/SkSwizzler_opts.inc
 @@ -14,7 +14,10 @@
  #include <cmath>
  #include <utility>
@@ -678,10 +678,10 @@ Index: chromium-143.0.7499.40/third_party/skia/src/opts/SkSwizzler_opts.inc
  #elif SK_CPU_SSE_LEVEL >= SK_CPU_SSE_LEVEL_SSE1 && (defined(__clang__) || !defined(_MSC_VER))
  // -- SSE -- Harden against timing attacks -- MSVC is not supported.
  using F4 = __m128;
-Index: chromium-143.0.7499.40/third_party/skia/src/core/SkBlitter_ARGB32.cpp
+Index: chromium-144.0.7559.59/third_party/skia/src/core/SkBlitter_ARGB32.cpp
 ===================================================================
---- chromium-143.0.7499.40.orig/third_party/skia/src/core/SkBlitter_ARGB32.cpp
-+++ chromium-143.0.7499.40/third_party/skia/src/core/SkBlitter_ARGB32.cpp
+--- chromium-144.0.7559.59.orig/third_party/skia/src/core/SkBlitter_ARGB32.cpp
++++ chromium-144.0.7559.59/third_party/skia/src/core/SkBlitter_ARGB32.cpp
 @@ -129,6 +129,16 @@ static inline SkPMColor blend_lcd16_opaq
  #if SK_CPU_SSE_LEVEL >= SK_CPU_SSE_LEVEL_SSE2
      #include <emmintrin.h>

diff --git a/sources b/sources
index fb67321..c0bc4dc 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
 SHA512 (node-v22.14.0-stripped.tar.gz) = affddb541009c6d378049c2d7845b981335d9e7aa387efcc472e5efb621c345cd58ca69778a394f7e4ebbb5e4b1a115a389838ef1b6458ef5e98f2071b166e15
-SHA512 (chromium-143.0.7499.192-clean.tar.xz) = 252f3feb974a9618f649c3ba6b848f87b747bee173d86c956a3c822305343574cfd369414c94c8e648c3d65d4f4e54c171d364989c0fb937240ed16abe6dda9a
+SHA512 (chromium-144.0.7559.59-clean.tar.xz) = 15c866cb35455daac4cbec3dc600966c13f4dff2a1665395fe1f6cc769f614c08cd5ff7819ff0838dcf1201ffc4a04f03ae0c32beed8e44eb8dca24c2fd7e042

                 reply	other threads:[~2026-08-07 16:08 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=178611891755.1.7884042325931469784.rpms-chromium-8afd22427084@fedoraproject.org \
    --to=than@redhat.com \
    --cc=git-commits@fedoraproject.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox