public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [rpms/chromium] f45: Merge branch 'rawhide' into f45
@ 2026-09-23 15:13 Than Ngo
  0 siblings, 0 replies; 4+ messages in thread
From: Than Ngo @ 2026-09-23 15:13 UTC (permalink / raw)
  To: git-commits

A new commit has been pushed.

Repo   : rpms/chromium
Branch : f45
Commit : c4fb99e99ac47b61450d05ab53edcb5049b54351
Author : Than Ngo <than@redhat.com>
Date   : 2026-09-23T17:13:16+02:00
Stats  : +27756/-25655 in 11 file(s)
URL    : https://src.fedoraproject.org/rpms/chromium/c/c4fb99e99ac47b61450d05ab53edcb5049b54351?branch=f45

Log:
Merge branch 'rawhide' into f45

---
diff --git a/0002-regenerate-xnn-buildgn.patch b/0002-regenerate-xnn-buildgn.patch
index b4e6962..799c948 100644
--- a/0002-regenerate-xnn-buildgn.patch
+++ b/0002-regenerate-xnn-buildgn.patch
@@ -6,11 +6,10 @@ This causes various toolchain failures of the form:
 
 While resolving toolchains for target @@rules_python+//python:current_py_toolchain
 	@@bazel_tools//tools/python:toolchain_type
-
-Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
+Index: chromium-154.0.8037.44/third_party/xnnpack/BUILD.gn
 ===================================================================
---- chromium-153.0.8010.36.orig/third_party/xnnpack/BUILD.gn
-+++ chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
+--- chromium-154.0.8037.44.orig/third_party/xnnpack/BUILD.gn
++++ chromium-154.0.8037.44/third_party/xnnpack/BUILD.gn
 @@ -34,10 +34,10 @@ config("xnnpack_public_config") {
    }
  
@@ -26,7 +25,7 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
  }
  
  config("xnnpack_private_config") {
-@@ -48,2160 +48,2452 @@ config("xnnpack_private_config") {
+@@ -48,2186 +48,2484 @@ config("xnnpack_private_config") {
    ]
  }
  
@@ -42,11 +41,15 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +    ":bf16-qu8-vcvt_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl",
 +    ":bf16-qu8-vcvt_x64",
 +    ":bf16-rminmax_x64",
++    ":bf16-vunary_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl",
++    ":bf16-vunary_x64",
 +    ":configs_x64",
 +    ":enums_x64",
 +    ":f16-avgpool_f16c-no-avx2-no-fma",
++    ":f16-avgpool_x64",
 +    ":f16-dwconv_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni-avx512fp16",
 +    ":f16-dwconv_f16c-fma-no-avx2",
++    ":f16-dwconv_x64",
 +    ":f16-f32-vcvt_avx-no-avx2-no-f16c-no-fma",
 +    ":f16-f32-vcvt_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl",
 +    ":f16-f32-vcvt_f16c-no-avx2-no-fma",
@@ -307,6 +310,7 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +    ":f32-vunary_x64",
 +    ":operators_x64",
 +    ":qd8-bf16-qb4w-gemm_f16c-fma-avx2",
++    ":qd8-bf16-qb4w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni",
 +    ":qd8-bf16-qb4w-gemm_x64",
 +    ":qd8-f16-qb4w-gemm_f16c-fma-avx2",
 +    ":qd8-f16-qc2w-gemm_avx2-avxvnni-f16c-fma-gfni",
@@ -571,6 +575,7 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +    ":u8-vclamp_sse2-no-sse3",
 +    ":u8-vclamp_x64",
 +    ":x16-packw_f16c-fma-avx2",
++    ":x16-packw_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl",
 +    ":x16-packw_x64",
 +    ":x16-transposec_f16c-fma-avx2",
 +    ":x16-transposec_sse2-no-sse3",
@@ -619,11 +624,15 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +    ":bf16-qu8-vcvt_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone",
 +    ":bf16-qu8-vcvt_x64_standalone",
 +    ":bf16-rminmax_x64_standalone",
++    ":bf16-vunary_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone",
++    ":bf16-vunary_x64_standalone",
 +    ":configs_x64_standalone",
 +    ":enums_x64_standalone",
 +    ":f16-avgpool_f16c-no-avx2-no-fma_standalone",
++    ":f16-avgpool_x64_standalone",
 +    ":f16-dwconv_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni-avx512fp16_standalone",
 +    ":f16-dwconv_f16c-fma-no-avx2_standalone",
++    ":f16-dwconv_x64_standalone",
 +    ":f16-f32-vcvt_avx-no-avx2-no-f16c-no-fma_standalone",
 +    ":f16-f32-vcvt_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone",
 +    ":f16-f32-vcvt_f16c-no-avx2-no-fma_standalone",
@@ -884,6 +893,7 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +    ":f32-vunary_x64_standalone",
 +    ":operators_x64_standalone",
 +    ":qd8-bf16-qb4w-gemm_f16c-fma-avx2_standalone",
++    ":qd8-bf16-qb4w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni_standalone",
 +    ":qd8-bf16-qb4w-gemm_x64_standalone",
 +    ":qd8-f16-qb4w-gemm_f16c-fma-avx2_standalone",
 +    ":qd8-f16-qc2w-gemm_avx2-avxvnni-f16c-fma-gfni_standalone",
@@ -1148,6 +1158,7 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +    ":u8-vclamp_sse2-no-sse3_standalone",
 +    ":u8-vclamp_x64_standalone",
 +    ":x16-packw_f16c-fma-avx2_standalone",
++    ":x16-packw_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone",
 +    ":x16-packw_x64_standalone",
 +    ":x16-transposec_f16c-fma-avx2_standalone",
 +    ":x16-transposec_sse2-no-sse3_standalone",
@@ -1198,11 +1209,15 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -      ":bf16-qu8-vcvt_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl",
 -      ":bf16-qu8-vcvt_x64",
 -      ":bf16-rminmax_x64",
+-      ":bf16-vunary_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl",
+-      ":bf16-vunary_x64",
 -      ":configs_x64",
 -      ":enums_x64",
 -      ":f16-avgpool_f16c-no-avx2-no-fma",
+-      ":f16-avgpool_x64",
 -      ":f16-dwconv_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni-avx512fp16",
 -      ":f16-dwconv_f16c-fma-no-avx2",
+-      ":f16-dwconv_x64",
 -      ":f16-f32-vcvt_avx-no-avx2-no-f16c-no-fma",
 -      ":f16-f32-vcvt_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl",
 -      ":f16-f32-vcvt_f16c-no-avx2-no-fma",
@@ -1463,6 +1478,7 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -      ":f32-vunary_x64",
 -      ":operators_x64",
 -      ":qd8-bf16-qb4w-gemm_f16c-fma-avx2",
+-      ":qd8-bf16-qb4w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni",
 -      ":qd8-bf16-qb4w-gemm_x64",
 -      ":qd8-f16-qb4w-gemm_f16c-fma-avx2",
 -      ":qd8-f16-qc2w-gemm_avx2-avxvnni-f16c-fma-gfni",
@@ -1727,6 +1743,7 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -      ":u8-vclamp_sse2-no-sse3",
 -      ":u8-vclamp_x64",
 -      ":x16-packw_f16c-fma-avx2",
+-      ":x16-packw_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl",
 -      ":x16-packw_x64",
 -      ":x16-transposec_f16c-fma-avx2",
 -      ":x16-transposec_sse2-no-sse3",
@@ -1767,12 +1784,15 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +    ":bf16-qs8-vcvt_arm64",
 +    ":bf16-qu8-vcvt_arm64",
 +    ":bf16-rminmax_arm64",
++    ":bf16-vunary_arm64",
 +    ":configs_arm64",
 +    ":enums_arm64",
 +    ":f16-avgpool_arch=armv8.2-a+fp16",
++    ":f16-avgpool_arm64",
 +    ":f16-conv-hwc2chw_arch=armv8.2-a+fp16",
 +    ":f16-dwconv2d-chw_arch=armv8.2-a+fp16",
 +    ":f16-dwconv_arch=armv8.2-a+fp16",
++    ":f16-dwconv_arm64",
 +    ":f16-f32-vcvt_arm64",
 +    ":f16-f32acc-rdsum2_arch=armv8.2-a+fp16",
 +    ":f16-f32acc-rdsum_arch=armv8.2-a+fp16",
@@ -1913,6 +1933,7 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +    ":qd8-f32-qc8w-igemm_arch=armv8.2-a+fp16+dotprod",
 +    ":qd8-f32-qc8w-igemm_arch=armv8.2-a+i8mm+fp16",
 +    ":qd8-f32-qc8w-igemm_arm64",
++    ":qp8-f16-qc8w-gemm_arch=armv8.2-a+sve+sve2",
 +    ":qp8-f32-qb4w-gemm_arch=armv8.2-a+dotprod",
 +    ":qp8-f32-qb4w-gemm_arch=armv8.2-a+i8mm+fp16",
 +    ":qp8-f32-qc4w-gemm_arch=armv8.2-a+dotprod",
@@ -2015,11 +2036,15 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -      ":bf16-qu8-vcvt_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone",
 -      ":bf16-qu8-vcvt_x64_standalone",
 -      ":bf16-rminmax_x64_standalone",
+-      ":bf16-vunary_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone",
+-      ":bf16-vunary_x64_standalone",
 -      ":configs_x64_standalone",
 -      ":enums_x64_standalone",
 -      ":f16-avgpool_f16c-no-avx2-no-fma_standalone",
+-      ":f16-avgpool_x64_standalone",
 -      ":f16-dwconv_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni-avx512fp16_standalone",
 -      ":f16-dwconv_f16c-fma-no-avx2_standalone",
+-      ":f16-dwconv_x64_standalone",
 -      ":f16-f32-vcvt_avx-no-avx2-no-f16c-no-fma_standalone",
 -      ":f16-f32-vcvt_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone",
 -      ":f16-f32-vcvt_f16c-no-avx2-no-fma_standalone",
@@ -2280,6 +2305,7 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -      ":f32-vunary_x64_standalone",
 -      ":operators_x64_standalone",
 -      ":qd8-bf16-qb4w-gemm_f16c-fma-avx2_standalone",
+-      ":qd8-bf16-qb4w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni_standalone",
 -      ":qd8-bf16-qb4w-gemm_x64_standalone",
 -      ":qd8-f16-qb4w-gemm_f16c-fma-avx2_standalone",
 -      ":qd8-f16-qc2w-gemm_avx2-avxvnni-f16c-fma-gfni_standalone",
@@ -2544,6 +2570,7 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -      ":u8-vclamp_sse2-no-sse3_standalone",
 -      ":u8-vclamp_x64_standalone",
 -      ":x16-packw_f16c-fma-avx2_standalone",
+-      ":x16-packw_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone",
 -      ":x16-packw_x64_standalone",
 -      ":x16-transposec_f16c-fma-avx2_standalone",
 -      ":x16-transposec_sse2-no-sse3_standalone",
@@ -2584,12 +2611,15 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +    ":bf16-qs8-vcvt_arm64_standalone",
 +    ":bf16-qu8-vcvt_arm64_standalone",
 +    ":bf16-rminmax_arm64_standalone",
++    ":bf16-vunary_arm64_standalone",
 +    ":configs_arm64_standalone",
 +    ":enums_arm64_standalone",
 +    ":f16-avgpool_arch=armv8.2-a+fp16_standalone",
++    ":f16-avgpool_arm64_standalone",
 +    ":f16-conv-hwc2chw_arch=armv8.2-a+fp16_standalone",
 +    ":f16-dwconv2d-chw_arch=armv8.2-a+fp16_standalone",
 +    ":f16-dwconv_arch=armv8.2-a+fp16_standalone",
++    ":f16-dwconv_arm64_standalone",
 +    ":f16-f32-vcvt_arm64_standalone",
 +    ":f16-f32acc-rdsum2_arch=armv8.2-a+fp16_standalone",
 +    ":f16-f32acc-rdsum_arch=armv8.2-a+fp16_standalone",
@@ -2730,6 +2760,7 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +    ":qd8-f32-qc8w-igemm_arch=armv8.2-a+fp16+dotprod_standalone",
 +    ":qd8-f32-qc8w-igemm_arch=armv8.2-a+i8mm+fp16_standalone",
 +    ":qd8-f32-qc8w-igemm_arm64_standalone",
++    ":qp8-f16-qc8w-gemm_arch=armv8.2-a+sve+sve2_standalone",
 +    ":qp8-f32-qb4w-gemm_arch=armv8.2-a+dotprod_standalone",
 +    ":qp8-f32-qb4w-gemm_arch=armv8.2-a+i8mm+fp16_standalone",
 +    ":qp8-f32-qc4w-gemm_arch=armv8.2-a+dotprod_standalone",
@@ -2832,12 +2863,15 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -      ":bf16-qs8-vcvt_arm64",
 -      ":bf16-qu8-vcvt_arm64",
 -      ":bf16-rminmax_arm64",
+-      ":bf16-vunary_arm64",
 -      ":configs_arm64",
 -      ":enums_arm64",
 -      ":f16-avgpool_arch=armv8.2-a+fp16",
+-      ":f16-avgpool_arm64",
 -      ":f16-conv-hwc2chw_arch=armv8.2-a+fp16",
 -      ":f16-dwconv2d-chw_arch=armv8.2-a+fp16",
 -      ":f16-dwconv_arch=armv8.2-a+fp16",
+-      ":f16-dwconv_arm64",
 -      ":f16-f32-vcvt_arm64",
 -      ":f16-f32acc-rdsum2_arch=armv8.2-a+fp16",
 -      ":f16-f32acc-rdsum_arch=armv8.2-a+fp16",
@@ -2978,6 +3012,7 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -      ":qd8-f32-qc8w-igemm_arch=armv8.2-a+fp16+dotprod",
 -      ":qd8-f32-qc8w-igemm_arch=armv8.2-a+i8mm+fp16",
 -      ":qd8-f32-qc8w-igemm_arm64",
+-      ":qp8-f16-qc8w-gemm_arch=armv8.2-a+sve+sve2",
 -      ":qp8-f32-qb4w-gemm_arch=armv8.2-a+dotprod",
 -      ":qp8-f32-qb4w-gemm_arch=armv8.2-a+i8mm+fp16",
 -      ":qp8-f32-qc4w-gemm_arch=armv8.2-a+dotprod",
@@ -3072,10 +3107,13 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +    ":bf16-qs8-vcvt_riscv64",
 +    ":bf16-qu8-vcvt_riscv64",
 +    ":bf16-rminmax_riscv64",
++    ":bf16-vunary_riscv64",
 +    ":configs_riscv64",
 +    ":enums_riscv64",
 +    ":f16-avgpool_arch=rv64gc_zvfh-abi=lp64d",
++    ":f16-avgpool_riscv64",
 +    ":f16-dwconv_arch=rv64gc_zvfh-abi=lp64d",
++    ":f16-dwconv_riscv64",
 +    ":f16-f32-vcvt_arch=rv64gc_zvfh-abi=lp64d",
 +    ":f16-f32-vcvt_riscv64",
 +    ":f16-f32acc-rdsum2_arch=rv64gc_zvfh-abi=lp64d",
@@ -3328,12 +3366,15 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -      ":bf16-qs8-vcvt_arm64_standalone",
 -      ":bf16-qu8-vcvt_arm64_standalone",
 -      ":bf16-rminmax_arm64_standalone",
+-      ":bf16-vunary_arm64_standalone",
 -      ":configs_arm64_standalone",
 -      ":enums_arm64_standalone",
 -      ":f16-avgpool_arch=armv8.2-a+fp16_standalone",
+-      ":f16-avgpool_arm64_standalone",
 -      ":f16-conv-hwc2chw_arch=armv8.2-a+fp16_standalone",
 -      ":f16-dwconv2d-chw_arch=armv8.2-a+fp16_standalone",
 -      ":f16-dwconv_arch=armv8.2-a+fp16_standalone",
+-      ":f16-dwconv_arm64_standalone",
 -      ":f16-f32-vcvt_arm64_standalone",
 -      ":f16-f32acc-rdsum2_arch=armv8.2-a+fp16_standalone",
 -      ":f16-f32acc-rdsum_arch=armv8.2-a+fp16_standalone",
@@ -3474,6 +3515,7 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -      ":qd8-f32-qc8w-igemm_arch=armv8.2-a+fp16+dotprod_standalone",
 -      ":qd8-f32-qc8w-igemm_arch=armv8.2-a+i8mm+fp16_standalone",
 -      ":qd8-f32-qc8w-igemm_arm64_standalone",
+-      ":qp8-f16-qc8w-gemm_arch=armv8.2-a+sve+sve2_standalone",
 -      ":qp8-f32-qb4w-gemm_arch=armv8.2-a+dotprod_standalone",
 -      ":qp8-f32-qb4w-gemm_arch=armv8.2-a+i8mm+fp16_standalone",
 -      ":qp8-f32-qc4w-gemm_arch=armv8.2-a+dotprod_standalone",
@@ -3568,10 +3610,13 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +    ":bf16-qs8-vcvt_riscv64_standalone",
 +    ":bf16-qu8-vcvt_riscv64_standalone",
 +    ":bf16-rminmax_riscv64_standalone",
++    ":bf16-vunary_riscv64_standalone",
 +    ":configs_riscv64_standalone",
 +    ":enums_riscv64_standalone",
 +    ":f16-avgpool_arch=rv64gc_zvfh-abi=lp64d_standalone",
++    ":f16-avgpool_riscv64_standalone",
 +    ":f16-dwconv_arch=rv64gc_zvfh-abi=lp64d_standalone",
++    ":f16-dwconv_riscv64_standalone",
 +    ":f16-f32-vcvt_arch=rv64gc_zvfh-abi=lp64d_standalone",
 +    ":f16-f32-vcvt_riscv64_standalone",
 +    ":f16-f32acc-rdsum2_arch=rv64gc_zvfh-abi=lp64d_standalone",
@@ -3827,10 +3872,13 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -      ":bf16-qs8-vcvt_riscv64",
 -      ":bf16-qu8-vcvt_riscv64",
 -      ":bf16-rminmax_riscv64",
+-      ":bf16-vunary_riscv64",
 -      ":configs_riscv64",
 -      ":enums_riscv64",
 -      ":f16-avgpool_arch=rv64gc_zvfh-abi=lp64d",
+-      ":f16-avgpool_riscv64",
 -      ":f16-dwconv_arch=rv64gc_zvfh-abi=lp64d",
+-      ":f16-dwconv_riscv64",
 -      ":f16-f32-vcvt_arch=rv64gc_zvfh-abi=lp64d",
 -      ":f16-f32-vcvt_riscv64",
 -      ":f16-f32acc-rdsum2_arch=rv64gc_zvfh-abi=lp64d",
@@ -4078,8 +4126,11 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +    ":bf16-qs8-vcvt_ppc64",
 +    ":bf16-qu8-vcvt_ppc64",
 +    ":bf16-rminmax_ppc64",
++    ":bf16-vunary_ppc64",
 +    ":configs_ppc64",
 +    ":enums_ppc64",
++    ":f16-avgpool_ppc64",
++    ":f16-dwconv_ppc64",
 +    ":f16-f32-vcvt_ppc64",
 +    ":f16-qs8-vcvt_ppc64",
 +    ":f16-qu8-vcvt_ppc64",
@@ -4220,10 +4271,13 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -      ":bf16-qs8-vcvt_riscv64_standalone",
 -      ":bf16-qu8-vcvt_riscv64_standalone",
 -      ":bf16-rminmax_riscv64_standalone",
+-      ":bf16-vunary_riscv64_standalone",
 -      ":configs_riscv64_standalone",
 -      ":enums_riscv64_standalone",
 -      ":f16-avgpool_arch=rv64gc_zvfh-abi=lp64d_standalone",
+-      ":f16-avgpool_riscv64_standalone",
 -      ":f16-dwconv_arch=rv64gc_zvfh-abi=lp64d_standalone",
+-      ":f16-dwconv_riscv64_standalone",
 -      ":f16-f32-vcvt_arch=rv64gc_zvfh-abi=lp64d_standalone",
 -      ":f16-f32-vcvt_riscv64_standalone",
 -      ":f16-f32acc-rdsum2_arch=rv64gc_zvfh-abi=lp64d_standalone",
@@ -4471,8 +4525,11 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +    ":bf16-qs8-vcvt_ppc64_standalone",
 +    ":bf16-qu8-vcvt_ppc64_standalone",
 +    ":bf16-rminmax_ppc64_standalone",
++    ":bf16-vunary_ppc64_standalone",
 +    ":configs_ppc64_standalone",
 +    ":enums_ppc64_standalone",
++    ":f16-avgpool_ppc64_standalone",
++    ":f16-dwconv_ppc64_standalone",
 +    ":f16-f32-vcvt_ppc64_standalone",
 +    ":f16-qs8-vcvt_ppc64_standalone",
 +    ":f16-qu8-vcvt_ppc64_standalone",
@@ -4607,7 +4664,7 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
      ]
    }
  } else {
-@@ -2211,6 +2503,7 @@ if (current_cpu == "x64" || current_cpu
+@@ -2237,6 +2535,7 @@ if (current_cpu == "x64" || current_cpu
    }
  }
  
@@ -4615,7 +4672,7 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
  if (build_with_chromium) {
    source_set("xnnpack") {
      public = [ "src/include/xnnpack.h" ]
-@@ -2221,39 +2514,39 @@ if (build_with_chromium) {
+@@ -2247,39 +2546,39 @@ if (build_with_chromium) {
      configs += [ ":xnnpack_private_config" ]
  
      sources = [
@@ -4684,7 +4741,7 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
  
      public_configs = [ ":xnnpack_public_config" ]
    }
-@@ -2270,39 +2563,39 @@ if (build_with_internal_optimization_gui
+@@ -2296,39 +2595,39 @@ if (build_with_internal_optimization_gui
      configs += [ ":xnnpack_private_config" ]
  
      sources = [
@@ -4753,7 +4810,7 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
  
      public_configs = [ ":xnnpack_public_config" ]
  
-@@ -2313,66399 +2606,76963 @@ if (build_with_internal_optimization_gui
+@@ -2339,67192 +2638,77971 @@ if (build_with_internal_optimization_gui
  }
  
  if (current_cpu == "x64" || current_cpu == "x86") {
@@ -5224,16 +5281,6 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -  if (build_with_chromium) {
 -    source_set("bf16-qu8-vcvt_x64") {
 -      cflags = []
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/bf16-qu8-vcvt/gen/bf16-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" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
 +  source_set("bf16-qs8-vcvt_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") {
@@ -5252,20 +5299,19 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +      "src/src/bf16-qs8-vcvt/gen/bf16-qs8-vcvt-avx512skx-u128.c"
 +    ]
  
--      deps = [
--        "//third_party/cpuinfo",
--        "//third_party/fp16",
--        "//third_party/fxdiv",
--        "//third_party/pthreadpool",
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/bf16-qu8-vcvt/gen/bf16-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" ]
  
--      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",
@@ -5273,50 +5319,25 @@ Index: chromium-153.0.8010.36/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("bf16-qu8-vcvt_x64_standalone") {
--      cflags = []
-+    public_configs = [ ":xnnpack_public_config" ]
- 
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/bf16-qu8-vcvt/gen/bf16-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" ]
--
 -      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("bf16-rminmax_x64") {
+-  # This is a target that cannot depend on //base.
+-  if (build_with_internal_optimization_guide) {
+-    source_set("bf16-qu8-vcvt_x64_standalone") {
 -      cflags = []
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/bf16-rminmax/gen/bf16-rmax-scalar-u2-acc2.c",
--        "src/src/bf16-rminmax/gen/bf16-rmin-scalar-u2-acc2.c",
--        "src/src/bf16-rminmax/gen/bf16-rminmax-scalar-u2-acc2.c",
--      ]
 +if (build_with_chromium) {
 +  source_set("bf16-qs8-vcvt_x64") {
 +    cflags = [
@@ -5328,21 +5349,38 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +      "src/src/bf16-qs8-vcvt/gen/bf16-qs8-vcvt-scalar-imagic-u4.c"
 +    ]
  
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/bf16-qu8-vcvt/gen/bf16-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",
+-        "//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("bf16-rminmax_x64") {
+-      cflags = []
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
@@ -5350,16 +5388,20 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +      "//third_party/pthreadpool",
 +    ]
  
--      public_configs = [ ":xnnpack_public_config" ]
--    }
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/bf16-rminmax/gen/bf16-rmax-scalar-u2-acc2.c",
+-        "src/src/bf16-rminmax/gen/bf16-rmin-scalar-u2-acc2.c",
+-        "src/src/bf16-rminmax/gen/bf16-rminmax-scalar-u2-acc2.c",
+-      ]
 +    public_configs = [ ":xnnpack_public_config" ]
-   }
++  }
 +}
  
--  # This is a target that cannot depend on //base.
--  if (build_with_internal_optimization_guide) {
--    source_set("bf16-rminmax_x64_standalone") {
--      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" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
 +  source_set("bf16-qs8-vcvt_x64_standalone") {
@@ -5372,40 +5414,20 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +      "src/src/bf16-qs8-vcvt/gen/bf16-qs8-vcvt-scalar-imagic-u4.c"
 +    ]
  
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/bf16-rminmax/gen/bf16-rmax-scalar-u2-acc2.c",
--        "src/src/bf16-rminmax/gen/bf16-rmin-scalar-u2-acc2.c",
--        "src/src/bf16-rminmax/gen/bf16-rminmax-scalar-u2-acc2.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" ]
--
--      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("configs_x64") {
--      cflags = []
+-      public_configs = [ ":xnnpack_public_config" ]
+-    }
+-  }
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
@@ -5413,32 +5435,17 @@ Index: chromium-153.0.8010.36/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("bf16-rminmax_x64_standalone") {
+-      cflags = []
++    public_configs = [ ":xnnpack_public_config" ]
+ 
 -      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/bf16-rminmax/gen/bf16-rmax-scalar-u2-acc2.c",
+-        "src/src/bf16-rminmax/gen/bf16-rmin-scalar-u2-acc2.c",
+-        "src/src/bf16-rminmax/gen/bf16-rminmax-scalar-u2-acc2.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -5450,48 +5457,36 @@ Index: chromium-153.0.8010.36/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" ]
+-
+-      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("configs_x64_standalone") {
--      cflags = []
+-  if (build_with_chromium) {
+-    source_set(
+-        "bf16-vunary_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
+-      cflags = [
+-        "-mavx512bw",
+-        "-mavx512cd",
+-        "-mavx512dq",
+-        "-mavx512f",
+-        "-mavx512vl",
+-        "-mf16c",
+-        "-mfma",
+-      ]
 -
 -      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/bf16-vunary/gen/bf16-vunary-avx512skx.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -5503,16 +5498,8 @@ Index: chromium-153.0.8010.36/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("bf16-qu8-vcvt_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
 +    cflags = [
@@ -5530,21 +5517,31 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +      "src/src/bf16-qu8-vcvt/gen/bf16-qu8-vcvt-avx512skx-u128.c"
 +    ]
  
--  if (build_with_chromium) {
--    source_set("enums_x64") {
--      cflags = []
+-      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(
+-        "bf16-vunary_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") {
+-      cflags = [
+-        "-mavx512bw",
+-        "-mavx512cd",
+-        "-mavx512dq",
+-        "-mavx512f",
+-        "-mavx512vl",
+-        "-mf16c",
+-        "-mfma",
+-      ]
+-
 -      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/bf16-vunary/gen/bf16-vunary-avx512skx.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -5556,24 +5553,28 @@ Index: chromium-153.0.8010.36/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" ]
+-      }
+-    }
 +    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("enums_x64_standalone") {
+-  if (build_with_chromium) {
+-    source_set("bf16-vunary_x64") {
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
@@ -5595,6 +5596,253 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
  
 -      sources = [
 -        "src/include/xnnpack.h",
+-        "src/src/bf16-vunary/gen/bf16-vunary-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" ]
++    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("bf16-vunary_x64_standalone") {
+-      cflags = []
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/bf16-vunary/gen/bf16-vunary-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 (build_with_chromium) {
++  source_set("bf16-qu8-vcvt_x64") {
++    cflags = [
++  
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/bf16-qu8-vcvt/gen/bf16-qu8-vcvt-scalar-imagic-u4.c"
++    ]
+ 
+-  if (build_with_chromium) {
+-    source_set("configs_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/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" ]
+-      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) {
+-    source_set("configs_x64_standalone") {
+-      cflags = []
++# This is a target that cannot depend on //base.
++if (build_with_internal_optimization_guide) {
++  source_set("bf16-qu8-vcvt_x64_standalone") {
++    cflags = [
++  
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/bf16-qu8-vcvt/gen/bf16-qu8-vcvt-scalar-imagic-u4.c"
++    ]
+ 
+-      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",
+-      ]
+-
+-      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("enums_x64") {
+-      cflags = []
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool:pthreadpool_standalone",
++    ]
+ 
+-      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",
+-      ]
+-
+-      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("enums_x64_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",
@@ -5621,10 +5869,18 @@ Index: chromium-153.0.8010.36/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("bf16-rminmax_x64") {
++    cflags = [
++  
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/bf16-rminmax/gen/bf16-rmax-scalar-u2-acc2.c",
++    "src/src/bf16-rminmax/gen/bf16-rmin-scalar-u2-acc2.c",
++    "src/src/bf16-rminmax/gen/bf16-rminmax-scalar-u2-acc2.c"
++    ]
  
 -  if (build_with_chromium) {
 -    source_set("f16-avgpool_f16c-no-avx2-no-fma") {
@@ -5650,18 +5906,21 @@ Index: chromium-153.0.8010.36/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("f16-avgpool_f16c-no-avx2-no-fma_standalone") {
@@ -5693,12 +5952,113 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -      if (!(is_android && use_order_profiling)) {
 -        assert_no_deps = [ "//base" ]
 -      }
+-    }
++    public_configs = [ ":xnnpack_public_config" ]
+   }
++}
+ 
+-  if (build_with_chromium) {
+-    source_set("f16-avgpool_x64") {
+-      cflags = []
++# This is a target that cannot depend on //base.
++if (build_with_internal_optimization_guide) {
++  source_set("bf16-rminmax_x64_standalone") {
++    cflags = [
++  
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/bf16-rminmax/gen/bf16-rmax-scalar-u2-acc2.c",
++    "src/src/bf16-rminmax/gen/bf16-rmin-scalar-u2-acc2.c",
++    "src/src/bf16-rminmax/gen/bf16-rminmax-scalar-u2-acc2.c"
++    ]
+ 
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/f16-avgpool/gen/f16-f32acc-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" ]
+ 
+-      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-avgpool_x64_standalone") {
+-      cflags = []
++if (build_with_chromium) {
++  source_set("bf16-vunary_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
++    cflags = [
++      "-mavx512bw",
++    "-mavx512cd",
++    "-mavx512dq",
++    "-mavx512f",
++    "-mavx512vl",
++    "-mf16c",
++    "-mfma"
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/bf16-vunary/gen/bf16-vunary-avx512skx.c"
++    ]
+ 
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/f16-avgpool/gen/f16-f32acc-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",
+-      ]
+-
+-      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(
 -        "f16-dwconv_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni-avx512fp16") {
@@ -5718,6 +6078,8 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -      sources = [
 -        "src/include/xnnpack.h",
 -        "src/src/f16-dwconv/gen/f16-dwconv-25p32c-minmax-avx512fp16-acc2.c",
+-        "src/src/f16-dwconv/gen/f16-dwconv-3p32c-minmax-avx512fp16.c",
+-        "src/src/f16-dwconv/gen/f16-dwconv-4p32c-minmax-avx512fp16.c",
 -        "src/src/f16-dwconv/gen/f16-dwconv-9p32c-minmax-avx512fp16.c",
 -      ]
 -
@@ -5732,24 +6094,18 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -        "//third_party/fxdiv",
 -        "//third_party/pthreadpool",
 -      ]
-+if (build_with_chromium) {
-+  source_set("bf16-qu8-vcvt_x64") {
-+    cflags = [
-+  
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/bf16-qu8-vcvt/gen/bf16-qu8-vcvt-scalar-imagic-u4.c"
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//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" ]
+   }
++}
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
@@ -5771,6 +6127,8 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -      sources = [
 -        "src/include/xnnpack.h",
 -        "src/src/f16-dwconv/gen/f16-dwconv-25p32c-minmax-avx512fp16-acc2.c",
+-        "src/src/f16-dwconv/gen/f16-dwconv-3p32c-minmax-avx512fp16.c",
+-        "src/src/f16-dwconv/gen/f16-dwconv-4p32c-minmax-avx512fp16.c",
 -        "src/src/f16-dwconv/gen/f16-dwconv-9p32c-minmax-avx512fp16.c",
 -      ]
 -
@@ -5792,16 +6150,24 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -        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) {
++  source_set("bf16-vunary_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") {
++    cflags = [
++      "-mavx512bw",
++    "-mavx512cd",
++    "-mavx512dq",
++    "-mavx512f",
++    "-mavx512vl",
++    "-mf16c",
++    "-mfma"
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/bf16-vunary/gen/bf16-vunary-avx512skx.c"
 +    ]
-+
-+    public_configs = [ ":xnnpack_public_config" ]
-   }
-+}
  
 -  if (build_with_chromium) {
 -    source_set("f16-dwconv_f16c-fma-no-avx2") {
@@ -5830,26 +6196,21 @@ Index: chromium-153.0.8010.36/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("bf16-qu8-vcvt_x64_standalone") {
-+    cflags = [
-+  
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/bf16-qu8-vcvt/gen/bf16-qu8-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" ]
  
+-      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-dwconv_f16c-fma-no-avx2_standalone") {
@@ -5884,15 +6245,113 @@ Index: chromium-153.0.8010.36/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("f16-dwconv_x64") {
+-      cflags = []
++if (build_with_chromium) {
++  source_set("bf16-vunary_x64") {
++    cflags = [
++  
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/bf16-vunary/gen/bf16-vunary-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",
+-        "src/src/f16-dwconv/gen/f16-f32acc-dwconv-25p2c-minmax-scalar-acc2.c",
+-        "src/src/f16-dwconv/gen/f16-f32acc-dwconv-3p1c-minmax-scalar-acc2.c",
+-        "src/src/f16-dwconv/gen/f16-f32acc-dwconv-4p1c-minmax-scalar-acc2.c",
+-        "src/src/f16-dwconv/gen/f16-f32acc-dwconv-9p1c-minmax-scalar-acc2.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: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("f16-dwconv_x64_standalone") {
+-      cflags = []
++# This is a target that cannot depend on //base.
++if (build_with_internal_optimization_guide) {
++  source_set("bf16-vunary_x64_standalone") {
++    cflags = [
++  
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/bf16-vunary/gen/bf16-vunary-scalar.c"
 +    ]
  
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/f16-dwconv/gen/f16-f32acc-dwconv-25p2c-minmax-scalar-acc2.c",
+-        "src/src/f16-dwconv/gen/f16-f32acc-dwconv-3p1c-minmax-scalar-acc2.c",
+-        "src/src/f16-dwconv/gen/f16-f32acc-dwconv-4p1c-minmax-scalar-acc2.c",
+-        "src/src/f16-dwconv/gen/f16-f32acc-dwconv-9p1c-minmax-scalar-acc2.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("f16-f32-vcvt_avx-no-avx2-no-f16c-no-fma") {
 -      cflags = [
@@ -5918,14 +6377,17 @@ Index: chromium-153.0.8010.36/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:pthreadpool_standalone",
++    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
-+    if (!(is_android && use_order_profiling)) {
-+      assert_no_deps = [ "//base" ]
-     }
-   }
-+}
+-    }
+-  }
++    public_configs = [ ":xnnpack_public_config" ]
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
@@ -5959,20 +6421,11 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -      if (!(is_android && use_order_profiling)) {
 -        assert_no_deps = [ "//base" ]
 -      }
--    }
--  }
-+if (build_with_chromium) {
-+  source_set("bf16-rminmax_x64") {
-+    cflags = [
-+  
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/bf16-rminmax/gen/bf16-rmax-scalar-u2-acc2.c",
-+    "src/src/bf16-rminmax/gen/bf16-rmin-scalar-u2-acc2.c",
-+    "src/src/bf16-rminmax/gen/bf16-rminmax-scalar-u2-acc2.c"
-+    ]
++    if (!(is_android && use_order_profiling)) {
++      assert_no_deps = [ "//base" ]
+     }
+   }
++}
  
 -  if (build_with_chromium) {
 -    source_set(
@@ -6003,20 +6456,47 @@ Index: chromium-153.0.8010.36/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("configs_x64") {
++    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"
++    ]
  
 -      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) {
@@ -6055,6 +6535,13 @@ Index: chromium-153.0.8010.36/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" ]
    }
 +}
@@ -6085,16 +6572,37 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -      ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("bf16-rminmax_x64_standalone") {
++  source_set("configs_x64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/bf16-rminmax/gen/bf16-rmax-scalar-u2-acc2.c",
-+    "src/src/bf16-rminmax/gen/bf16-rmin-scalar-u2-acc2.c",
-+    "src/src/bf16-rminmax/gen/bf16-rminmax-scalar-u2-acc2.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"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -6210,37 +6718,18 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("configs_x64") {
++  source_set("enums_x64") {
 +    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/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"
 +    ]
  
 -  if (build_with_chromium) {
@@ -6321,37 +6810,18 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("configs_x64_standalone") {
++  source_set("enums_x64_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/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"
 +    ]
  
 -      sources = [
@@ -6393,7 +6863,19 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -  if (build_with_internal_optimization_guide) {
 -    source_set("f16-f32-vcvt_x64_standalone") {
 -      cflags = []
--
++if (build_with_chromium) {
++  source_set("f16-avgpool_f16c-no-avx2-no-fma") {
++    cflags = [
++      "-mf16c",
++    "-mno-avx2",
++    "-mno-fma"
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/f16-avgpool/gen/f16-avgpool-9p-minmax-f16c.c"
++    ]
+ 
 -      sources = [
 -        "src/include/xnnpack.h",
 -        "src/src/f16-f32-vcvt/gen/f16-f32-vcvt-scalar-u4.c",
@@ -6418,20 +6900,10 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -      }
 -    }
 -  }
-+if (build_with_chromium) {
-+  source_set("enums_x64") {
-+    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"
-+    ]
++    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-f32acc-gemm_f16c-fma-avx2") {
@@ -6458,14 +6930,6 @@ Index: chromium-153.0.8010.36/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",
@@ -6473,6 +6937,12 @@ Index: chromium-153.0.8010.36/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-f32acc-gemm_f16c-fma-avx2_standalone") {
@@ -6506,9 +6976,20 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -        assert_no_deps = [ "//base" ]
 -      }
 -    }
-+    public_configs = [ ":xnnpack_public_config" ]
-   }
-+}
+-  }
++# This is a target that cannot depend on //base.
++if (build_with_internal_optimization_guide) {
++  source_set("f16-avgpool_f16c-no-avx2-no-fma_standalone") {
++    cflags = [
++      "-mf16c",
++    "-mno-avx2",
++    "-mno-fma"
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/f16-avgpool/gen/f16-avgpool-9p-minmax-f16c.c"
++    ]
  
 -  if (build_with_chromium) {
 -    source_set(
@@ -6540,30 +7021,21 @@ Index: chromium-153.0.8010.36/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("enums_x64_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"
-+    ]
- 
--      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(
@@ -6601,52 +7073,16 @@ Index: chromium-153.0.8010.36/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:pthreadpool_standalone",
-+    ]
- 
--  if (build_with_chromium) {
--    source_set("f16-f32acc-igemm_f16c-fma-avx2") {
--      cflags = [
--        "-mavx2",
--        "-mf16c",
--        "-mfma",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/f16-f32acc-igemm/gen/f16-f32acc-igemm-1x16-minmax-avx2-broadcast.c",
--        "src/src/f16-f32acc-igemm/gen/f16-f32acc-igemm-4x16-minmax-avx2-broadcast.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("f16-f32acc-igemm_f16c-fma-avx2_standalone") {
+-  if (build_with_chromium) {
+-    source_set("f16-f32acc-igemm_f16c-fma-avx2") {
 -      cflags = [
 -        "-mavx2",
 -        "-mf16c",
@@ -6668,92 +7104,40 @@ Index: chromium-153.0.8010.36/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("f16-avgpool_f16c-no-avx2-no-fma") {
++  source_set("f16-avgpool_x64") {
 +    cflags = [
-+      "-mf16c",
-+    "-mno-avx2",
-+    "-mno-fma"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-avgpool/gen/f16-avgpool-9p-minmax-f16c.c"
++      "src/src/f16-avgpool/gen/f16-f32acc-avgpool-9p-minmax-scalar-u1.c"
 +    ]
  
--  if (build_with_chromium) {
--    source_set(
--        "f16-f32acc-igemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
--      cflags = [
--        "-mavx512bw",
--        "-mavx512cd",
--        "-mavx512dq",
--        "-mavx512f",
--        "-mavx512vl",
--        "-mf16c",
--        "-mfma",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/f16-f32acc-igemm/gen/f16-f32acc-igemm-1x32-minmax-avx512skx-broadcast.c",
--        "src/src/f16-f32acc-igemm/gen/f16-f32acc-igemm-4x32-minmax-avx512skx-broadcast.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" ]
+-    }
+-  }
 +    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(
--        "f16-f32acc-igemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") {
+-    source_set("f16-f32acc-igemm_f16c-fma-avx2_standalone") {
 -      cflags = [
--        "-mavx512bw",
--        "-mavx512cd",
--        "-mavx512dq",
--        "-mavx512f",
--        "-mavx512vl",
+-        "-mavx2",
 -        "-mf16c",
 -        "-mfma",
 -      ]
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f16-f32acc-igemm/gen/f16-f32acc-igemm-1x32-minmax-avx512skx-broadcast.c",
--        "src/src/f16-f32acc-igemm/gen/f16-f32acc-igemm-4x32-minmax-avx512skx-broadcast.c",
+-        "src/src/f16-f32acc-igemm/gen/f16-f32acc-igemm-1x16-minmax-avx2-broadcast.c",
+-        "src/src/f16-f32acc-igemm/gen/f16-f32acc-igemm-4x16-minmax-avx2-broadcast.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -6774,13 +7158,20 @@ Index: chromium-153.0.8010.36/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" ]
    }
 +}
  
 -  if (build_with_chromium) {
 -    source_set(
--        "f16-f32acc-rdsum2_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
+-        "f16-f32acc-igemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
 -      cflags = [
 -        "-mavx512bw",
 -        "-mavx512cd",
@@ -6793,7 +7184,8 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f16-f32acc-rdsum2/gen/f16-f32acc-rdsum2-7p7x-avx512skx.c",
+-        "src/src/f16-f32acc-igemm/gen/f16-f32acc-igemm-1x32-minmax-avx512skx-broadcast.c",
+-        "src/src/f16-f32acc-igemm/gen/f16-f32acc-igemm-4x32-minmax-avx512skx-broadcast.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -6809,16 +7201,14 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -      ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-avgpool_f16c-no-avx2-no-fma_standalone") {
++  source_set("f16-avgpool_x64_standalone") {
 +    cflags = [
-+      "-mf16c",
-+    "-mno-avx2",
-+    "-mno-fma"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-avgpool/gen/f16-avgpool-9p-minmax-f16c.c"
++      "src/src/f16-avgpool/gen/f16-f32acc-avgpool-9p-minmax-scalar-u1.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -6832,7 +7222,7 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
 -    source_set(
--        "f16-f32acc-rdsum2_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") {
+-        "f16-f32acc-igemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") {
 -      cflags = [
 -        "-mavx512bw",
 -        "-mavx512cd",
@@ -6845,7 +7235,8 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f16-f32acc-rdsum2/gen/f16-f32acc-rdsum2-7p7x-avx512skx.c",
+-        "src/src/f16-f32acc-igemm/gen/f16-f32acc-igemm-1x32-minmax-avx512skx-broadcast.c",
+-        "src/src/f16-f32acc-igemm/gen/f16-f32acc-igemm-4x32-minmax-avx512skx-broadcast.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -6875,16 +7266,21 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +    ]
  
 -  if (build_with_chromium) {
--    source_set("f16-f32acc-rdsum2_f16c-no-avx2-no-fma") {
+-    source_set(
+-        "f16-f32acc-rdsum2_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
 -      cflags = [
+-        "-mavx512bw",
+-        "-mavx512cd",
+-        "-mavx512dq",
+-        "-mavx512f",
+-        "-mavx512vl",
 -        "-mf16c",
--        "-mno-avx2",
--        "-mno-fma",
+-        "-mfma",
 -      ]
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f16-f32acc-rdsum2/gen/f16-f32acc-rdsum2-7p7x-f16c.c",
+-        "src/src/f16-f32acc-rdsum2/gen/f16-f32acc-rdsum2-7p7x-avx512skx.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -6909,16 +7305,21 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
--    source_set("f16-f32acc-rdsum2_f16c-no-avx2-no-fma_standalone") {
+-    source_set(
+-        "f16-f32acc-rdsum2_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") {
 -      cflags = [
+-        "-mavx512bw",
+-        "-mavx512cd",
+-        "-mavx512dq",
+-        "-mavx512f",
+-        "-mavx512vl",
 -        "-mf16c",
--        "-mno-avx2",
--        "-mno-fma",
+-        "-mfma",
 -      ]
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f16-f32acc-rdsum2/gen/f16-f32acc-rdsum2-7p7x-f16c.c",
+-        "src/src/f16-f32acc-rdsum2/gen/f16-f32acc-rdsum2-7p7x-avx512skx.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -6958,25 +7359,22 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +    sources = [
 +      "src/include/xnnpack.h",
 +      "src/src/f16-dwconv/gen/f16-dwconv-25p32c-minmax-avx512fp16-acc2.c",
++    "src/src/f16-dwconv/gen/f16-dwconv-3p32c-minmax-avx512fp16.c",
++    "src/src/f16-dwconv/gen/f16-dwconv-4p32c-minmax-avx512fp16.c",
 +    "src/src/f16-dwconv/gen/f16-dwconv-9p32c-minmax-avx512fp16.c"
 +    ]
  
 -  if (build_with_chromium) {
--    source_set(
--        "f16-f32acc-rdsum_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
+-    source_set("f16-f32acc-rdsum2_f16c-no-avx2-no-fma") {
 -      cflags = [
--        "-mavx512bw",
--        "-mavx512cd",
--        "-mavx512dq",
--        "-mavx512f",
--        "-mavx512vl",
 -        "-mf16c",
--        "-mfma",
+-        "-mno-avx2",
+-        "-mno-fma",
 -      ]
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f16-f32acc-rdsum/gen/f16-f32acc-rdsum-7p7x-minmax-avx512skx-u64.c",
+-        "src/src/f16-f32acc-rdsum2/gen/f16-f32acc-rdsum2-7p7x-f16c.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -7007,21 +7405,16 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
--    source_set(
--        "f16-f32acc-rdsum_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") {
+-    source_set("f16-f32acc-rdsum2_f16c-no-avx2-no-fma_standalone") {
 -      cflags = [
--        "-mavx512bw",
--        "-mavx512cd",
--        "-mavx512dq",
--        "-mavx512f",
--        "-mavx512vl",
 -        "-mf16c",
--        "-mfma",
+-        "-mno-avx2",
+-        "-mno-fma",
 -      ]
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f16-f32acc-rdsum/gen/f16-f32acc-rdsum-7p7x-minmax-avx512skx-u64.c",
+-        "src/src/f16-f32acc-rdsum2/gen/f16-f32acc-rdsum2-7p7x-f16c.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -7047,16 +7440,21 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +}
  
 -  if (build_with_chromium) {
--    source_set("f16-f32acc-rdsum_f16c-no-avx2-no-fma") {
+-    source_set(
+-        "f16-f32acc-rdsum_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
 -      cflags = [
+-        "-mavx512bw",
+-        "-mavx512cd",
+-        "-mavx512dq",
+-        "-mavx512f",
+-        "-mavx512vl",
 -        "-mf16c",
--        "-mno-avx2",
--        "-mno-fma",
+-        "-mfma",
 -      ]
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f16-f32acc-rdsum/gen/f16-f32acc-rdsum-7p7x-minmax-f16c-u32.c",
+-        "src/src/f16-f32acc-rdsum/gen/f16-f32acc-rdsum-7p7x-minmax-avx512skx-u64.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -7089,6 +7487,8 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +    sources = [
 +      "src/include/xnnpack.h",
 +      "src/src/f16-dwconv/gen/f16-dwconv-25p32c-minmax-avx512fp16-acc2.c",
++    "src/src/f16-dwconv/gen/f16-dwconv-3p32c-minmax-avx512fp16.c",
++    "src/src/f16-dwconv/gen/f16-dwconv-4p32c-minmax-avx512fp16.c",
 +    "src/src/f16-dwconv/gen/f16-dwconv-9p32c-minmax-avx512fp16.c"
 +    ]
  
@@ -7102,16 +7502,21 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
--    source_set("f16-f32acc-rdsum_f16c-no-avx2-no-fma_standalone") {
+-    source_set(
+-        "f16-f32acc-rdsum_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") {
 -      cflags = [
+-        "-mavx512bw",
+-        "-mavx512cd",
+-        "-mavx512dq",
+-        "-mavx512f",
+-        "-mavx512vl",
 -        "-mf16c",
--        "-mno-avx2",
--        "-mno-fma",
+-        "-mfma",
 -      ]
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f16-f32acc-rdsum/gen/f16-f32acc-rdsum-7p7x-minmax-f16c-u32.c",
+-        "src/src/f16-f32acc-rdsum/gen/f16-f32acc-rdsum-7p7x-minmax-avx512skx-u64.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -7141,21 +7546,16 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +    ]
  
 -  if (build_with_chromium) {
--    source_set(
--        "f16-f32acc-rsum2_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
+-    source_set("f16-f32acc-rdsum_f16c-no-avx2-no-fma") {
 -      cflags = [
--        "-mavx512bw",
--        "-mavx512cd",
--        "-mavx512dq",
--        "-mavx512f",
--        "-mavx512vl",
 -        "-mf16c",
--        "-mfma",
+-        "-mno-avx2",
+-        "-mno-fma",
 -      ]
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f16-f32acc-rsum2/gen/f16-f32acc-rsum2-avx512skx.c",
+-        "src/src/f16-f32acc-rdsum/gen/f16-f32acc-rdsum-7p7x-minmax-f16c-u32.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -7180,21 +7580,16 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
--    source_set(
--        "f16-f32acc-rsum2_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") {
+-    source_set("f16-f32acc-rdsum_f16c-no-avx2-no-fma_standalone") {
 -      cflags = [
--        "-mavx512bw",
--        "-mavx512cd",
--        "-mavx512dq",
--        "-mavx512f",
--        "-mavx512vl",
 -        "-mf16c",
--        "-mfma",
+-        "-mno-avx2",
+-        "-mno-fma",
 -      ]
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f16-f32acc-rsum2/gen/f16-f32acc-rsum2-avx512skx.c",
+-        "src/src/f16-f32acc-rdsum/gen/f16-f32acc-rdsum-7p7x-minmax-f16c-u32.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -7233,16 +7628,21 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +    ]
  
 -  if (build_with_chromium) {
--    source_set("f16-f32acc-rsum2_f16c-no-avx2-no-fma") {
+-    source_set(
+-        "f16-f32acc-rsum2_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
 -      cflags = [
+-        "-mavx512bw",
+-        "-mavx512cd",
+-        "-mavx512dq",
+-        "-mavx512f",
+-        "-mavx512vl",
 -        "-mf16c",
--        "-mno-avx2",
--        "-mno-fma",
+-        "-mfma",
 -      ]
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f16-f32acc-rsum2/gen/f16-f32acc-rsum2-f16c.c",
+-        "src/src/f16-f32acc-rsum2/gen/f16-f32acc-rsum2-avx512skx.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -7273,16 +7673,21 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
--    source_set("f16-f32acc-rsum2_f16c-no-avx2-no-fma_standalone") {
+-    source_set(
+-        "f16-f32acc-rsum2_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") {
 -      cflags = [
+-        "-mavx512bw",
+-        "-mavx512cd",
+-        "-mavx512dq",
+-        "-mavx512f",
+-        "-mavx512vl",
 -        "-mf16c",
--        "-mno-avx2",
--        "-mno-fma",
+-        "-mfma",
 -      ]
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f16-f32acc-rsum2/gen/f16-f32acc-rsum2-f16c.c",
+-        "src/src/f16-f32acc-rsum2/gen/f16-f32acc-rsum2-avx512skx.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -7308,21 +7713,16 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +}
  
 -  if (build_with_chromium) {
--    source_set(
--        "f16-f32acc-rsum_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
+-    source_set("f16-f32acc-rsum2_f16c-no-avx2-no-fma") {
 -      cflags = [
--        "-mavx512bw",
--        "-mavx512cd",
--        "-mavx512dq",
--        "-mavx512f",
--        "-mavx512vl",
 -        "-mf16c",
--        "-mfma",
+-        "-mno-avx2",
+-        "-mno-fma",
 -      ]
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f16-f32acc-rsum/gen/f16-f32acc-rsum-avx512skx-u32-acc2.c",
+-        "src/src/f16-f32acc-rsum2/gen/f16-f32acc-rsum2-f16c.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -7363,21 +7763,16 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
--    source_set(
--        "f16-f32acc-rsum_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") {
+-    source_set("f16-f32acc-rsum2_f16c-no-avx2-no-fma_standalone") {
 -      cflags = [
--        "-mavx512bw",
--        "-mavx512cd",
--        "-mavx512dq",
--        "-mavx512f",
--        "-mavx512vl",
 -        "-mf16c",
--        "-mfma",
+-        "-mno-avx2",
+-        "-mno-fma",
 -      ]
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f16-f32acc-rsum/gen/f16-f32acc-rsum-avx512skx-u32-acc2.c",
+-        "src/src/f16-f32acc-rsum2/gen/f16-f32acc-rsum2-f16c.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -7407,16 +7802,21 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +    ]
  
 -  if (build_with_chromium) {
--    source_set("f16-f32acc-rsum_f16c-no-avx2-no-fma") {
+-    source_set(
+-        "f16-f32acc-rsum_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
 -      cflags = [
+-        "-mavx512bw",
+-        "-mavx512cd",
+-        "-mavx512dq",
+-        "-mavx512f",
+-        "-mavx512vl",
 -        "-mf16c",
--        "-mno-avx2",
--        "-mno-fma",
+-        "-mfma",
 -      ]
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f16-f32acc-rsum/gen/f16-f32acc-rsum-f16c-u32-acc4.c",
+-        "src/src/f16-f32acc-rsum/gen/f16-f32acc-rsum-avx512skx-u32-acc2.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -7441,16 +7841,21 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
--    source_set("f16-f32acc-rsum_f16c-no-avx2-no-fma_standalone") {
+-    source_set(
+-        "f16-f32acc-rsum_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") {
 -      cflags = [
+-        "-mavx512bw",
+-        "-mavx512cd",
+-        "-mavx512dq",
+-        "-mavx512f",
+-        "-mavx512vl",
 -        "-mf16c",
--        "-mno-avx2",
--        "-mno-fma",
+-        "-mfma",
 -      ]
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f16-f32acc-rsum/gen/f16-f32acc-rsum-f16c-u32-acc4.c",
+-        "src/src/f16-f32acc-rsum/gen/f16-f32acc-rsum-avx512skx-u32-acc2.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -7473,39 +7878,30 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f16-f32-vcvt_avx-no-avx2-no-f16c-no-fma") {
++  source_set("f16-dwconv_x64") {
 +    cflags = [
-+      "-mavx",
-+    "-mno-avx2",
-+    "-mno-f16c",
-+    "-mno-fma"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-f32-vcvt/gen/f16-f32-vcvt-avx-int16-u16.c"
++      "src/src/f16-dwconv/gen/f16-f32acc-dwconv-25p2c-minmax-scalar-acc2.c",
++    "src/src/f16-dwconv/gen/f16-f32acc-dwconv-3p1c-minmax-scalar-acc2.c",
++    "src/src/f16-dwconv/gen/f16-f32acc-dwconv-4p1c-minmax-scalar-acc2.c",
++    "src/src/f16-dwconv/gen/f16-f32acc-dwconv-9p1c-minmax-scalar-acc2.c"
 +    ]
  
 -  if (build_with_chromium) {
--    source_set(
--        "f16-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni-avx512fp16") {
+-    source_set("f16-f32acc-rsum_f16c-no-avx2-no-fma") {
 -      cflags = [
--        "-mavx512bw",
--        "-mavx512cd",
--        "-mavx512dq",
--        "-mavx512f",
--        "-mavx512fp16",
--        "-mavx512vl",
--        "-mavx512vnni",
 -        "-mf16c",
--        "-mfma",
--        "-mgfni",
+-        "-mno-avx2",
+-        "-mno-fma",
 -      ]
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f16-gemm/gen/f16-gemm-1x32-minmax-avx512fp16-broadcast.c",
--        "src/src/f16-gemm/gen/f16-gemm-8x32-minmax-avx512fp16-broadcast.c",
+-        "src/src/f16-f32acc-rsum/gen/f16-f32acc-rsum-f16c-u32-acc4.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -7536,25 +7932,16 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
--    source_set(
--        "f16-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni-avx512fp16_standalone") {
+-    source_set("f16-f32acc-rsum_f16c-no-avx2-no-fma_standalone") {
 -      cflags = [
--        "-mavx512bw",
--        "-mavx512cd",
--        "-mavx512dq",
--        "-mavx512f",
--        "-mavx512fp16",
--        "-mavx512vl",
--        "-mavx512vnni",
 -        "-mf16c",
--        "-mfma",
--        "-mgfni",
+-        "-mno-avx2",
+-        "-mno-fma",
 -      ]
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f16-gemm/gen/f16-gemm-1x32-minmax-avx512fp16-broadcast.c",
--        "src/src/f16-gemm/gen/f16-gemm-8x32-minmax-avx512fp16-broadcast.c",
+-        "src/src/f16-f32acc-rsum/gen/f16-f32acc-rsum-f16c-u32-acc4.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -7580,16 +7967,25 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +}
  
 -  if (build_with_chromium) {
--    source_set("f16-ibilinear_f16c-fma-no-avx2") {
+-    source_set(
+-        "f16-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni-avx512fp16") {
 -      cflags = [
+-        "-mavx512bw",
+-        "-mavx512cd",
+-        "-mavx512dq",
+-        "-mavx512f",
+-        "-mavx512fp16",
+-        "-mavx512vl",
+-        "-mavx512vnni",
 -        "-mf16c",
 -        "-mfma",
--        "-mno-avx2",
+-        "-mgfni",
 -      ]
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f16-ibilinear/gen/f16-ibilinear-fma3-u8.c",
+-        "src/src/f16-gemm/gen/f16-gemm-1x32-minmax-avx512fp16-broadcast.c",
+-        "src/src/f16-gemm/gen/f16-gemm-8x32-minmax-avx512fp16-broadcast.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -7605,17 +8001,17 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -      ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-f32-vcvt_avx-no-avx2-no-f16c-no-fma_standalone") {
++  source_set("f16-dwconv_x64_standalone") {
 +    cflags = [
-+      "-mavx",
-+    "-mno-avx2",
-+    "-mno-f16c",
-+    "-mno-fma"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-f32-vcvt/gen/f16-f32-vcvt-avx-int16-u16.c"
++      "src/src/f16-dwconv/gen/f16-f32acc-dwconv-25p2c-minmax-scalar-acc2.c",
++    "src/src/f16-dwconv/gen/f16-f32acc-dwconv-3p1c-minmax-scalar-acc2.c",
++    "src/src/f16-dwconv/gen/f16-f32acc-dwconv-4p1c-minmax-scalar-acc2.c",
++    "src/src/f16-dwconv/gen/f16-f32acc-dwconv-9p1c-minmax-scalar-acc2.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -7628,16 +8024,25 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
--    source_set("f16-ibilinear_f16c-fma-no-avx2_standalone") {
+-    source_set(
+-        "f16-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni-avx512fp16_standalone") {
 -      cflags = [
+-        "-mavx512bw",
+-        "-mavx512cd",
+-        "-mavx512dq",
+-        "-mavx512f",
+-        "-mavx512fp16",
+-        "-mavx512vl",
+-        "-mavx512vnni",
 -        "-mf16c",
 -        "-mfma",
--        "-mno-avx2",
+-        "-mgfni",
 -      ]
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f16-ibilinear/gen/f16-ibilinear-fma3-u8.c",
+-        "src/src/f16-gemm/gen/f16-gemm-1x32-minmax-avx512fp16-broadcast.c",
+-        "src/src/f16-gemm/gen/f16-gemm-8x32-minmax-avx512fp16-broadcast.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -7667,6 +8072,86 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +    ]
  
 -  if (build_with_chromium) {
+-    source_set("f16-ibilinear_f16c-fma-no-avx2") {
+-      cflags = [
+-        "-mf16c",
+-        "-mfma",
+-        "-mno-avx2",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/f16-ibilinear/gen/f16-ibilinear-fma3-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" ]
+-
+-      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-ibilinear_f16c-fma-no-avx2_standalone") {
+-      cflags = [
+-        "-mf16c",
+-        "-mfma",
+-        "-mno-avx2",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/f16-ibilinear/gen/f16-ibilinear-fma3-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" ]
+-
+-      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("f16-f32-vcvt_avx-no-avx2-no-f16c-no-fma") {
++    cflags = [
++      "-mavx",
++    "-mno-avx2",
++    "-mno-f16c",
++    "-mno-fma"
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/f16-f32-vcvt/gen/f16-f32-vcvt-avx-int16-u16.c"
++    ]
+ 
+-  if (build_with_chromium) {
 -    source_set(
 -        "f16-igemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni-avx512fp16") {
 -      cflags = [
@@ -7699,14 +8184,20 @@ Index: chromium-153.0.8010.36/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) {
@@ -7749,23 +8240,9 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -        assert_no_deps = [ "//base" ]
 -      }
 -    }
--  }
-+if (build_with_chromium) {
-+  source_set("f16-f32-vcvt_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
-+    cflags = [
-+      "-mavx512bw",
-+    "-mavx512cd",
-+    "-mavx512dq",
-+    "-mavx512f",
-+    "-mavx512vl",
-+    "-mf16c",
-+    "-mfma"
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/f16-f32-vcvt/gen/f16-f32-vcvt-avx512skx-u16.c"
-+    ]
++    public_configs = [ ":xnnpack_public_config" ]
+   }
++}
  
 -  if (build_with_chromium) {
 -    source_set("f16-maxpool_f16c-fma-avx2") {
@@ -7791,20 +8268,28 @@ Index: chromium-153.0.8010.36/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" ]
++# This is a target that cannot depend on //base.
++if (build_with_internal_optimization_guide) {
++  source_set("f16-f32-vcvt_avx-no-avx2-no-f16c-no-fma_standalone") {
++    cflags = [
++      "-mavx",
++    "-mno-avx2",
++    "-mno-f16c",
++    "-mno-fma"
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/f16-f32-vcvt/gen/f16-f32-vcvt-avx-int16-u16.c"
++    ]
  
 -      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) {
@@ -7838,9 +8323,13 @@ Index: chromium-153.0.8010.36/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("f16-maxpool_sse4.1-no-sse4.2") {
@@ -7865,27 +8354,14 @@ Index: chromium-153.0.8010.36/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("f16-f32-vcvt_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") {
-+    cflags = [
-+      "-mavx512bw",
-+    "-mavx512cd",
-+    "-mavx512dq",
-+    "-mavx512f",
-+    "-mavx512vl",
-+    "-mf16c",
-+    "-mfma"
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/f16-f32-vcvt/gen/f16-f32-vcvt-avx512skx-u16.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) {
@@ -7919,10 +8395,22 @@ Index: chromium-153.0.8010.36/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("f16-f32-vcvt_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
++    cflags = [
++      "-mavx512bw",
++    "-mavx512cd",
++    "-mavx512dq",
++    "-mavx512f",
++    "-mavx512vl",
++    "-mf16c",
++    "-mfma"
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/f16-f32-vcvt/gen/f16-f32-vcvt-avx512skx-u16.c"
++    ]
  
 -  if (build_with_chromium) {
 -    source_set(
@@ -7953,18 +8441,21 @@ Index: chromium-153.0.8010.36/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(
@@ -8001,58 +8492,64 @@ Index: chromium-153.0.8010.36/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" ]
    }
 +}
  
 -  if (build_with_chromium) {
 -    source_set("f16-qs8-vcvt_x64") {
 -      cflags = []
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/f16-qs8-vcvt/gen/f16-qs8-vcvt-scalar-imagic-u4.c",
--      ]
-+if (build_with_chromium) {
-+  source_set("f16-f32-vcvt_f16c-no-avx2-no-fma") {
++# This is a target that cannot depend on //base.
++if (build_with_internal_optimization_guide) {
++  source_set("f16-f32-vcvt_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") {
 +    cflags = [
-+      "-mf16c",
-+    "-mno-avx2",
-+    "-mno-fma"
++      "-mavx512bw",
++    "-mavx512cd",
++    "-mavx512dq",
++    "-mavx512f",
++    "-mavx512vl",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-f32-vcvt/gen/f16-f32-vcvt-f16c-u16.c"
++      "src/src/f16-f32-vcvt/gen/f16-f32-vcvt-avx512skx-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" ]
+-      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" ]
  
+-      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",
 -      ]
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool",
-+    ]
++    public_configs = [ ":xnnpack_public_config" ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
--    }
-+    public_configs = [ ":xnnpack_public_config" ]
++    if (!(is_android && use_order_profiling)) {
++      assert_no_deps = [ "//base" ]
+     }
    }
 +}
  
@@ -8060,20 +8557,7 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -  if (build_with_internal_optimization_guide) {
 -    source_set("f16-qs8-vcvt_x64_standalone") {
 -      cflags = []
-+# This is a target that cannot depend on //base.
-+if (build_with_internal_optimization_guide) {
-+  source_set("f16-f32-vcvt_f16c-no-avx2-no-fma_standalone") {
-+    cflags = [
-+      "-mf16c",
-+    "-mno-avx2",
-+    "-mno-fma"
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/f16-f32-vcvt/gen/f16-f32-vcvt-f16c-u16.c"
-+    ]
- 
+-
 -      sources = [
 -        "src/include/xnnpack.h",
 -        "src/src/f16-qs8-vcvt/gen/f16-qs8-vcvt-scalar-imagic-u4.c",
@@ -8098,10 +8582,18 @@ Index: chromium-153.0.8010.36/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("f16-f32-vcvt_f16c-no-avx2-no-fma") {
++    cflags = [
++      "-mf16c",
++    "-mno-avx2",
++    "-mno-fma"
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/f16-f32-vcvt/gen/f16-f32-vcvt-f16c-u16.c"
++    ]
  
 -  if (build_with_chromium) {
 -    source_set(
@@ -8132,18 +8624,21 @@ Index: chromium-153.0.8010.36/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(
@@ -8180,57 +8675,60 @@ Index: chromium-153.0.8010.36/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" ]
    }
 +}
  
 -  if (build_with_chromium) {
 -    source_set("f16-qu8-vcvt_x64") {
 -      cflags = []
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/f16-qu8-vcvt/gen/f16-qu8-vcvt-scalar-imagic-u4.c",
--      ]
-+if (build_with_chromium) {
-+  source_set("f16-f32-vcvt_sse2-no-sse3") {
++# This is a target that cannot depend on //base.
++if (build_with_internal_optimization_guide) {
++  source_set("f16-f32-vcvt_f16c-no-avx2-no-fma_standalone") {
 +    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
++      "-mf16c",
++    "-mno-avx2",
++    "-mno-fma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-f32-vcvt/gen/f16-f32-vcvt-sse2-int16-u32.c"
++      "src/src/f16-f32-vcvt/gen/f16-f32-vcvt-f16c-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" ]
+-      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",
 -      ]
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool",
-+    ]
++    public_configs = [ ":xnnpack_public_config" ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
--    }
-+    public_configs = [ ":xnnpack_public_config" ]
++    if (!(is_android && use_order_profiling)) {
++      assert_no_deps = [ "//base" ]
+     }
    }
 +}
  
@@ -8238,19 +8736,7 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -  if (build_with_internal_optimization_guide) {
 -    source_set("f16-qu8-vcvt_x64_standalone") {
 -      cflags = []
-+# This is a target that cannot depend on //base.
-+if (build_with_internal_optimization_guide) {
-+  source_set("f16-f32-vcvt_sse2-no-sse3_standalone") {
-+    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/f16-f32-vcvt/gen/f16-f32-vcvt-sse2-int16-u32.c"
-+    ]
- 
+-
 -      sources = [
 -        "src/include/xnnpack.h",
 -        "src/src/f16-qu8-vcvt/gen/f16-qu8-vcvt-scalar-imagic-u4.c",
@@ -8275,10 +8761,17 @@ Index: chromium-153.0.8010.36/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("f16-f32-vcvt_sse2-no-sse3") {
++    cflags = [
++      "-mno-sse3",
++    "-msse2"
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/f16-f32-vcvt/gen/f16-f32-vcvt-sse2-int16-u32.c"
++    ]
  
 -  if (build_with_chromium) {
 -    source_set("f16-raddstoreexpminusmax_f16c-fma-avx2") {
@@ -8304,18 +8797,21 @@ Index: chromium-153.0.8010.36/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("f16-raddstoreexpminusmax_f16c-fma-avx2_standalone") {
@@ -8347,64 +8843,68 @@ Index: chromium-153.0.8010.36/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" ]
    }
 +}
  
 -  if (build_with_chromium) {
 -    source_set("f16-rdminmax_x64") {
 -      cflags = []
--
++# This is a target that cannot depend on //base.
++if (build_with_internal_optimization_guide) {
++  source_set("f16-f32-vcvt_sse2-no-sse3_standalone") {
++    cflags = [
++      "-mno-sse3",
++    "-msse2"
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/f16-f32-vcvt/gen/f16-f32-vcvt-sse2-int16-u32.c"
++    ]
+ 
 -      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",
 -      ]
--
++    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",
 -      ]
-+if (build_with_chromium) {
-+  source_set("f16-f32-vcvt_sse4.1-no-sse4.2") {
-+    cflags = [
-+      "-mno-sse4.2",
-+    "-msse4.1"
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/f16-f32-vcvt/gen/f16-f32-vcvt-sse41-int16-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) {
 -    source_set("f16-rdminmax_x64_standalone") {
 -      cflags = []
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool",
-+    ]
- 
+-
 -      sources = [
 -        "src/include/xnnpack.h",
 -        "src/src/f16-rdminmax/gen/f16-rdmax-2p2x-scalar-u2.c",
@@ -8429,9 +8929,18 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -        assert_no_deps = [ "//base" ]
 -      }
 -    }
-+    public_configs = [ ":xnnpack_public_config" ]
-   }
-+}
+-  }
++if (build_with_chromium) {
++  source_set("f16-f32-vcvt_sse4.1-no-sse4.2") {
++    cflags = [
++      "-mno-sse4.2",
++    "-msse4.1"
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/f16-f32-vcvt/gen/f16-f32-vcvt-sse41-int16-u16.c"
++    ]
  
 -  if (build_with_chromium) {
 -    source_set(
@@ -8464,27 +8973,21 @@ Index: chromium-153.0.8010.36/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("f16-f32-vcvt_sse4.1-no-sse4.2_standalone") {
-+    cflags = [
-+      "-mno-sse4.2",
-+    "-msse4.1"
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/f16-f32-vcvt/gen/f16-f32-vcvt-sse41-int16-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" ]
  
+-      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(
@@ -8524,13 +9027,9 @@ Index: chromium-153.0.8010.36/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(
@@ -8566,14 +9065,26 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -        "//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("f16-f32-vcvt_sse4.1-no-sse4.2_standalone") {
++    cflags = [
++      "-mno-sse4.2",
++    "-msse4.1"
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/f16-f32-vcvt/gen/f16-f32-vcvt-sse41-int16-u16.c"
++    ]
  
 -      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" ]
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
@@ -8618,15 +9129,11 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -      }
 -    }
 -  }
-+if (build_with_chromium) {
-+  source_set("f16-f32-vcvt_x64") {
-+    cflags = [
-+  
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/f16-f32-vcvt/gen/f16-f32-vcvt-scalar-u4.c"
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
  
 -  if (build_with_chromium) {
@@ -8653,20 +9160,14 @@ Index: chromium-153.0.8010.36/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",
-+    ]
++    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) {
@@ -8700,21 +9201,43 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -        assert_no_deps = [ "//base" ]
 -      }
 -    }
-+    public_configs = [ ":xnnpack_public_config" ]
-   }
-+}
+-  }
++if (build_with_chromium) {
++  source_set("f16-f32-vcvt_x64") {
++    cflags = [
++  
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/f16-f32-vcvt/gen/f16-f32-vcvt-scalar-u4.c"
++    ]
  
 -  if (build_with_chromium) {
 -    source_set("f16-rminmax_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" ]
++
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool",
++    ]
+ 
 -      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",
 -      ]
--
++    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" ]
@@ -9129,7 +9652,20 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -  if (build_with_internal_optimization_guide) {
 -    source_set("f16-vapproxgelu_x64_standalone") {
 -      cflags = []
--
++if (build_with_chromium) {
++  source_set("f16-f32acc-igemm_f16c-fma-avx2") {
++    cflags = [
++      "-mavx2",
++    "-mf16c",
++    "-mfma"
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/f16-f32acc-igemm/gen/f16-f32acc-igemm-1x16-minmax-avx2-broadcast.c",
++    "src/src/f16-f32acc-igemm/gen/f16-f32acc-igemm-4x16-minmax-avx2-broadcast.c"
++    ]
+ 
 -      sources = [
 -        "src/include/xnnpack.h",
 -        "src/src/f16-vapproxgelu/gen/f16-f32acc-vapproxgelu-scalar-rational-6-4-div.c",
@@ -9154,19 +9690,10 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -      }
 -    }
 -  }
-+if (build_with_chromium) {
-+  source_set("f16-f32acc-igemm_f16c-fma-avx2") {
-+    cflags = [
-+      "-mavx2",
-+    "-mf16c",
-+    "-mfma"
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/f16-f32acc-igemm/gen/f16-f32acc-igemm-1x16-minmax-avx2-broadcast.c",
-+    "src/src/f16-f32acc-igemm/gen/f16-f32acc-igemm-4x16-minmax-avx2-broadcast.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(
@@ -9218,14 +9745,6 @@ Index: chromium-153.0.8010.36/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",
@@ -9233,6 +9752,12 @@ Index: chromium-153.0.8010.36/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(
@@ -9291,9 +9816,21 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -        assert_no_deps = [ "//base" ]
 -      }
 -    }
-+    public_configs = [ ":xnnpack_public_config" ]
-   }
-+}
+-  }
++# This is a target that cannot depend on //base.
++if (build_with_internal_optimization_guide) {
++  source_set("f16-f32acc-igemm_f16c-fma-avx2_standalone") {
++    cflags = [
++      "-mavx2",
++    "-mf16c",
++    "-mfma"
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/f16-f32acc-igemm/gen/f16-f32acc-igemm-1x16-minmax-avx2-broadcast.c",
++    "src/src/f16-f32acc-igemm/gen/f16-f32acc-igemm-4x16-minmax-avx2-broadcast.c"
++    ]
  
 -  if (build_with_chromium) {
 -    source_set("f16-vbinary_f16c-no-avx2-no-fma") {
@@ -9337,23 +9874,19 @@ Index: chromium-153.0.8010.36/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" ]
 -    }
 -  }
-+# This is a target that cannot depend on //base.
-+if (build_with_internal_optimization_guide) {
-+  source_set("f16-f32acc-igemm_f16c-fma-avx2_standalone") {
-+    cflags = [
-+      "-mavx2",
-+    "-mf16c",
-+    "-mfma"
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/f16-f32acc-igemm/gen/f16-f32acc-igemm-1x16-minmax-avx2-broadcast.c",
-+    "src/src/f16-f32acc-igemm/gen/f16-f32acc-igemm-4x16-minmax-avx2-broadcast.c"
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
  
 -  # This is a target that cannot depend on //base.
@@ -9405,12 +9938,13 @@ Index: chromium-153.0.8010.36/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" ]
++    public_configs = [ ":xnnpack_public_config" ]
++
++    if (!(is_android && use_order_profiling)) {
++      assert_no_deps = [ "//base" ]
+     }
+   }
++}
  
 -  if (build_with_chromium) {
 -    source_set("f16-vclamp_f16c-no-avx2-no-fma") {
@@ -9436,17 +9970,31 @@ Index: chromium-153.0.8010.36/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",
++if (build_with_chromium) {
++  source_set("f16-f32acc-igemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
++    cflags = [
++      "-mavx512bw",
++    "-mavx512cd",
++    "-mavx512dq",
++    "-mavx512f",
++    "-mavx512vl",
++    "-mf16c",
++    "-mfma"
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/f16-f32acc-igemm/gen/f16-f32acc-igemm-1x32-minmax-avx512skx-broadcast.c",
++    "src/src/f16-f32acc-igemm/gen/f16-f32acc-igemm-4x32-minmax-avx512skx-broadcast.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) {
@@ -9479,22 +10027,24 @@ Index: chromium-153.0.8010.36/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",
++    ]
++
++    public_configs = [ ":xnnpack_public_config" ]
    }
 +}
  
 -  if (build_with_chromium) {
 -    source_set("f16-vcos_avx512f") {
 -      cflags = [ "-mavx512f" ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/f16-vcos/gen/f16-f32acc-vcos-avx512f-poly-3.c",
--      ]
-+if (build_with_chromium) {
-+  source_set("f16-f32acc-igemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
++# This is a target that cannot depend on //base.
++if (build_with_internal_optimization_guide) {
++  source_set("f16-f32acc-igemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") {
 +    cflags = [
 +      "-mavx512bw",
 +    "-mavx512cd",
@@ -9511,31 +10061,38 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +    "src/src/f16-f32acc-igemm/gen/f16-f32acc-igemm-4x32-minmax-avx512skx-broadcast.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",
+-        "src/src/f16-vcos/gen/f16-f32acc-vcos-avx512f-poly-3.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",
 -      ]
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool",
-+    ]
++    public_configs = [ ":xnnpack_public_config" ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
--    }
-+    public_configs = [ ":xnnpack_public_config" ]
++    if (!(is_android && use_order_profiling)) {
++      assert_no_deps = [ "//base" ]
+     }
    }
 +}
  
@@ -9543,9 +10100,8 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -  if (build_with_internal_optimization_guide) {
 -    source_set("f16-vcos_avx512f_standalone") {
 -      cflags = [ "-mavx512f" ]
-+# This is a target that cannot depend on //base.
-+if (build_with_internal_optimization_guide) {
-+  source_set("f16-f32acc-igemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") {
++if (build_with_chromium) {
++  source_set("f16-f32acc-rdsum2_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
 +    cflags = [
 +      "-mavx512bw",
 +    "-mavx512cd",
@@ -9558,8 +10114,7 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-f32acc-igemm/gen/f16-f32acc-igemm-1x32-minmax-avx512skx-broadcast.c",
-+    "src/src/f16-f32acc-igemm/gen/f16-f32acc-igemm-4x32-minmax-avx512skx-broadcast.c"
++      "src/src/f16-f32acc-rdsum2/gen/f16-f32acc-rdsum2-7p7x-avx512skx.c"
 +    ]
  
 -      sources = [
@@ -9627,13 +10182,14 @@ Index: chromium-153.0.8010.36/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) {
@@ -9674,11 +10230,25 @@ Index: chromium-153.0.8010.36/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("f16-f32acc-rdsum2_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") {
++    cflags = [
++      "-mavx512bw",
++    "-mavx512cd",
++    "-mavx512dq",
++    "-mavx512f",
++    "-mavx512vl",
++    "-mf16c",
++    "-mfma"
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/f16-f32acc-rdsum2/gen/f16-f32acc-rdsum2-7p7x-avx512skx.c"
++    ]
  
 -  if (build_with_chromium) {
 -    source_set("f16-vcos_f16c-no-avx2-no-fma") {
@@ -9704,31 +10274,21 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -        "//third_party/fxdiv",
 -        "//third_party/pthreadpool",
 -      ]
-+if (build_with_chromium) {
-+  source_set("f16-f32acc-rdsum2_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
-+    cflags = [
-+      "-mavx512bw",
-+    "-mavx512cd",
-+    "-mavx512dq",
-+    "-mavx512f",
-+    "-mavx512vl",
-+    "-mf16c",
-+    "-mfma"
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/f16-f32acc-rdsum2/gen/f16-f32acc-rdsum2-7p7x-avx512skx.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("f16-vcos_f16c-no-avx2-no-fma_standalone") {
@@ -9760,58 +10320,43 @@ Index: chromium-153.0.8010.36/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("f16-vcos_x64") {
 -      cflags = []
-+# This is a target that cannot depend on //base.
-+if (build_with_internal_optimization_guide) {
-+  source_set("f16-f32acc-rdsum2_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") {
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/f16-vcos/gen/f16-f32acc-vcos-scalar-poly-3.c",
+-      ]
++if (build_with_chromium) {
++  source_set("f16-f32acc-rdsum2_f16c-no-avx2-no-fma") {
 +    cflags = [
-+      "-mavx512bw",
-+    "-mavx512cd",
-+    "-mavx512dq",
-+    "-mavx512f",
-+    "-mavx512vl",
-+    "-mf16c",
-+    "-mfma"
++      "-mf16c",
++    "-mno-avx2",
++    "-mno-fma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-f32acc-rdsum2/gen/f16-f32acc-rdsum2-7p7x-avx512skx.c"
++      "src/src/f16-f32acc-rdsum2/gen/f16-f32acc-rdsum2-7p7x-f16c.c"
 +    ]
  
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/f16-vcos/gen/f16-f32acc-vcos-scalar-poly-3.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",
@@ -9819,12 +10364,16 @@ Index: chromium-153.0.8010.36/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" ]
    }
 +}
  
@@ -9832,7 +10381,20 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -  if (build_with_internal_optimization_guide) {
 -    source_set("f16-vcos_x64_standalone") {
 -      cflags = []
--
++# This is a target that cannot depend on //base.
++if (build_with_internal_optimization_guide) {
++  source_set("f16-f32acc-rdsum2_f16c-no-avx2-no-fma_standalone") {
++    cflags = [
++      "-mf16c",
++    "-mno-avx2",
++    "-mno-fma"
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/f16-f32acc-rdsum2/gen/f16-f32acc-rdsum2-7p7x-f16c.c"
++    ]
+ 
 -      sources = [
 -        "src/include/xnnpack.h",
 -        "src/src/f16-vcos/gen/f16-f32acc-vcos-scalar-poly-3.c",
@@ -9857,18 +10419,10 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -      }
 -    }
 -  }
-+if (build_with_chromium) {
-+  source_set("f16-f32acc-rdsum2_f16c-no-avx2-no-fma") {
-+    cflags = [
-+      "-mf16c",
-+    "-mno-avx2",
-+    "-mno-fma"
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/f16-f32acc-rdsum2/gen/f16-f32acc-rdsum2-7p7x-f16c.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("f16-velu_f16c-fma-avx2") {
@@ -9894,21 +10448,18 @@ Index: chromium-153.0.8010.36/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("f16-velu_f16c-fma-avx2_standalone") {
@@ -9940,47 +10491,45 @@ Index: chromium-153.0.8010.36/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("f16-vexp_avx512f") {
 -      cflags = [ "-mavx512f" ]
-+# This is a target that cannot depend on //base.
-+if (build_with_internal_optimization_guide) {
-+  source_set("f16-f32acc-rdsum2_f16c-no-avx2-no-fma_standalone") {
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/f16-vexp/gen/f16-f32acc-vexp-avx512f-poly-3.c",
+-      ]
++if (build_with_chromium) {
++  source_set("f16-f32acc-rdsum_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
 +    cflags = [
-+      "-mf16c",
-+    "-mno-avx2",
-+    "-mno-fma"
++      "-mavx512bw",
++    "-mavx512cd",
++    "-mavx512dq",
++    "-mavx512f",
++    "-mavx512vl",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-f32acc-rdsum2/gen/f16-f32acc-rdsum2-7p7x-f16c.c"
++      "src/src/f16-f32acc-rdsum/gen/f16-f32acc-rdsum-7p7x-minmax-avx512skx-u64.c"
 +    ]
  
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/f16-vexp/gen/f16-f32acc-vexp-avx512f-poly-3.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",
@@ -9988,12 +10537,16 @@ Index: chromium-153.0.8010.36/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" ]
    }
 +}
  
@@ -10001,8 +10554,9 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -  if (build_with_internal_optimization_guide) {
 -    source_set("f16-vexp_avx512f_standalone") {
 -      cflags = [ "-mavx512f" ]
-+if (build_with_chromium) {
-+  source_set("f16-f32acc-rdsum_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
++# This is a target that cannot depend on //base.
++if (build_with_internal_optimization_guide) {
++  source_set("f16-f32acc-rdsum_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") {
 +    cflags = [
 +      "-mavx512bw",
 +    "-mavx512cd",
@@ -10083,14 +10637,13 @@ Index: chromium-153.0.8010.36/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) {
@@ -10131,25 +10684,11 @@ Index: chromium-153.0.8010.36/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("f16-f32acc-rdsum_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") {
-+    cflags = [
-+      "-mavx512bw",
-+    "-mavx512cd",
-+    "-mavx512dq",
-+    "-mavx512f",
-+    "-mavx512vl",
-+    "-mf16c",
-+    "-mfma"
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/f16-f32acc-rdsum/gen/f16-f32acc-rdsum-7p7x-minmax-avx512skx-u64.c"
-+    ]
++    if (!(is_android && use_order_profiling)) {
++      assert_no_deps = [ "//base" ]
+     }
+   }
++}
  
 -  if (build_with_chromium) {
 -    source_set("f16-vexp_f16c-no-avx2-no-fma") {
@@ -10175,20 +10714,26 @@ Index: chromium-153.0.8010.36/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("f16-f32acc-rdsum_f16c-no-avx2-no-fma") {
++    cflags = [
++      "-mf16c",
++    "-mno-avx2",
++    "-mno-fma"
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/f16-f32acc-rdsum/gen/f16-f32acc-rdsum-7p7x-minmax-f16c-u32.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) {
@@ -10221,64 +10766,89 @@ Index: chromium-153.0.8010.36/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" ]
    }
 +}
  
 -  if (build_with_chromium) {
 -    source_set("f16-vexp_x64") {
 -      cflags = []
--
++# This is a target that cannot depend on //base.
++if (build_with_internal_optimization_guide) {
++  source_set("f16-f32acc-rdsum_f16c-no-avx2-no-fma_standalone") {
++    cflags = [
++      "-mf16c",
++    "-mno-avx2",
++    "-mno-fma"
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/f16-f32acc-rdsum/gen/f16-f32acc-rdsum-7p7x-minmax-f16c-u32.c"
++    ]
+ 
 -      sources = [
 -        "src/include/xnnpack.h",
 -        "src/src/f16-vexp/gen/f16-f32acc-vexp-scalar-poly-3.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",
 -      ]
-+if (build_with_chromium) {
-+  source_set("f16-f32acc-rdsum_f16c-no-avx2-no-fma") {
-+    cflags = [
-+      "-mf16c",
-+    "-mno-avx2",
-+    "-mno-fma"
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/f16-f32acc-rdsum/gen/f16-f32acc-rdsum-7p7x-minmax-f16c-u32.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) {
 -    source_set("f16-vexp_x64_standalone") {
 -      cflags = []
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool",
++if (build_with_chromium) {
++  source_set("f16-f32acc-rsum2_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
++    cflags = [
++      "-mavx512bw",
++    "-mavx512cd",
++    "-mavx512dq",
++    "-mavx512f",
++    "-mavx512vl",
++    "-mf16c",
++    "-mfma"
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/f16-f32acc-rsum2/gen/f16-f32acc-rsum2-avx512skx.c"
 +    ]
  
 -      sources = [
@@ -10304,45 +10874,50 @@ Index: chromium-153.0.8010.36/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-vgelu_x64") {
 -      cflags = []
-+# This is a target that cannot depend on //base.
-+if (build_with_internal_optimization_guide) {
-+  source_set("f16-f32acc-rdsum_f16c-no-avx2-no-fma_standalone") {
-+    cflags = [
-+      "-mf16c",
-+    "-mno-avx2",
-+    "-mno-fma"
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/f16-f32acc-rdsum/gen/f16-f32acc-rdsum-7p7x-minmax-f16c-u32.c"
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool",
 +    ]
  
 -      sources = [
 -        "src/include/xnnpack.h",
 -        "src/src/f16-vgelu/gen/f16-vgelu-scalar-rational-6-4-div.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:pthreadpool_standalone",
++# This is a target that cannot depend on //base.
++if (build_with_internal_optimization_guide) {
++  source_set("f16-f32acc-rsum2_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") {
++    cflags = [
++      "-mavx512bw",
++    "-mavx512cd",
++    "-mavx512dq",
++    "-mavx512f",
++    "-mavx512vl",
++    "-mf16c",
++    "-mfma"
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/f16-f32acc-rsum2/gen/f16-f32acc-rsum2-avx512skx.c"
 +    ]
  
 -      deps = [
@@ -10351,20 +10926,27 @@ Index: chromium-153.0.8010.36/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("f16-vgelu_x64_standalone") {
 -      cflags = []
--
++    public_configs = [ ":xnnpack_public_config" ]
+ 
 -      sources = [
 -        "src/include/xnnpack.h",
 -        "src/src/f16-vgelu/gen/f16-vgelu-scalar-rational-6-4-div.c",
@@ -10387,24 +10969,11 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -      if (!(is_android && use_order_profiling)) {
 -        assert_no_deps = [ "//base" ]
 -      }
--    }
--  }
-+if (build_with_chromium) {
-+  source_set("f16-f32acc-rsum2_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
-+    cflags = [
-+      "-mavx512bw",
-+    "-mavx512cd",
-+    "-mavx512dq",
-+    "-mavx512f",
-+    "-mavx512vl",
-+    "-mf16c",
-+    "-mfma"
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/f16-f32acc-rsum2/gen/f16-f32acc-rsum2-avx512skx.c"
-+    ]
++    if (!(is_android && use_order_profiling)) {
++      assert_no_deps = [ "//base" ]
+     }
+   }
++}
  
 -  if (build_with_chromium) {
 -    source_set("f16-vhswish_f16c-no-avx2-no-fma") {
@@ -10430,20 +10999,26 @@ Index: chromium-153.0.8010.36/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("f16-f32acc-rsum2_f16c-no-avx2-no-fma") {
++    cflags = [
++      "-mf16c",
++    "-mno-avx2",
++    "-mno-fma"
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/f16-f32acc-rsum2/gen/f16-f32acc-rsum2-f16c.c"
++    ]
  
 -      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) {
@@ -10477,6 +11052,13 @@ Index: chromium-153.0.8010.36/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" ]
    }
 +}
@@ -10486,20 +11068,16 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -      cflags = [ "-mavx512f" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-f32acc-rsum2_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") {
++  source_set("f16-f32acc-rsum2_f16c-no-avx2-no-fma_standalone") {
 +    cflags = [
-+      "-mavx512bw",
-+    "-mavx512cd",
-+    "-mavx512dq",
-+    "-mavx512f",
-+    "-mavx512vl",
-+    "-mf16c",
-+    "-mfma"
++      "-mf16c",
++    "-mno-avx2",
++    "-mno-fma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-f32acc-rsum2/gen/f16-f32acc-rsum2-avx512skx.c"
++      "src/src/f16-f32acc-rsum2/gen/f16-f32acc-rsum2-f16c.c"
 +    ]
  
 -      sources = [
@@ -10542,16 +11120,20 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -    source_set("f16-vlog_avx512f_standalone") {
 -      cflags = [ "-mavx512f" ]
 +if (build_with_chromium) {
-+  source_set("f16-f32acc-rsum2_f16c-no-avx2-no-fma") {
++  source_set("f16-f32acc-rsum_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
 +    cflags = [
-+      "-mf16c",
-+    "-mno-avx2",
-+    "-mno-fma"
++      "-mavx512bw",
++    "-mavx512cd",
++    "-mavx512dq",
++    "-mavx512f",
++    "-mavx512vl",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-f32acc-rsum2/gen/f16-f32acc-rsum2-f16c.c"
++      "src/src/f16-f32acc-rsum/gen/f16-f32acc-rsum-avx512skx-u32-acc2.c"
 +    ]
  
 -      sources = [
@@ -10671,16 +11253,20 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -  }
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-f32acc-rsum2_f16c-no-avx2-no-fma_standalone") {
++  source_set("f16-f32acc-rsum_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") {
 +    cflags = [
-+      "-mf16c",
-+    "-mno-avx2",
-+    "-mno-fma"
++      "-mavx512bw",
++    "-mavx512cd",
++    "-mavx512dq",
++    "-mavx512f",
++    "-mavx512vl",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-f32acc-rsum2/gen/f16-f32acc-rsum2-f16c.c"
++      "src/src/f16-f32acc-rsum/gen/f16-f32acc-rsum-avx512skx-u32-acc2.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -10770,20 +11356,16 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -        "src/src/f16-vlog/gen/f16-f32acc-vlog-scalar-rational-1-3-div.c",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f16-f32acc-rsum_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
++  source_set("f16-f32acc-rsum_f16c-no-avx2-no-fma") {
 +    cflags = [
-+      "-mavx512bw",
-+    "-mavx512cd",
-+    "-mavx512dq",
-+    "-mavx512f",
-+    "-mavx512vl",
-+    "-mf16c",
-+    "-mfma"
++      "-mf16c",
++    "-mno-avx2",
++    "-mno-fma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-f32acc-rsum/gen/f16-f32acc-rsum-avx512skx-u32-acc2.c"
++      "src/src/f16-f32acc-rsum/gen/f16-f32acc-rsum-f16c-u32-acc4.c"
 +    ]
  
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -10820,20 +11402,16 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-f32acc-rsum_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") {
++  source_set("f16-f32acc-rsum_f16c-no-avx2-no-fma_standalone") {
 +    cflags = [
-+      "-mavx512bw",
-+    "-mavx512cd",
-+    "-mavx512dq",
-+    "-mavx512f",
-+    "-mavx512vl",
-+    "-mf16c",
-+    "-mfma"
++      "-mf16c",
++    "-mno-avx2",
++    "-mno-fma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-f32acc-rsum/gen/f16-f32acc-rsum-avx512skx-u32-acc2.c"
++      "src/src/f16-f32acc-rsum/gen/f16-f32acc-rsum-f16c-u32-acc4.c"
 +    ]
  
 -      sources = [
@@ -10963,16 +11541,24 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f16-f32acc-rsum_f16c-no-avx2-no-fma") {
++  source_set("f16-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni-avx512fp16") {
 +    cflags = [
-+      "-mf16c",
-+    "-mno-avx2",
-+    "-mno-fma"
++      "-mavx512bw",
++    "-mavx512cd",
++    "-mavx512dq",
++    "-mavx512f",
++    "-mavx512fp16",
++    "-mavx512vl",
++    "-mavx512vnni",
++    "-mf16c",
++    "-mfma",
++    "-mgfni"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-f32acc-rsum/gen/f16-f32acc-rsum-f16c-u32-acc4.c"
++      "src/src/f16-gemm/gen/f16-gemm-1x32-minmax-avx512fp16-broadcast.c",
++    "src/src/f16-gemm/gen/f16-gemm-8x32-minmax-avx512fp16-broadcast.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -11055,16 +11641,24 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -      ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-f32acc-rsum_f16c-no-avx2-no-fma_standalone") {
++  source_set("f16-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni-avx512fp16_standalone") {
 +    cflags = [
-+      "-mf16c",
-+    "-mno-avx2",
-+    "-mno-fma"
++      "-mavx512bw",
++    "-mavx512cd",
++    "-mavx512dq",
++    "-mavx512f",
++    "-mavx512fp16",
++    "-mavx512vl",
++    "-mavx512vnni",
++    "-mf16c",
++    "-mfma",
++    "-mgfni"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-f32acc-rsum/gen/f16-f32acc-rsum-f16c-u32-acc4.c"
++      "src/src/f16-gemm/gen/f16-gemm-1x32-minmax-avx512fp16-broadcast.c",
++    "src/src/f16-gemm/gen/f16-gemm-8x32-minmax-avx512fp16-broadcast.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -11185,24 +11779,16 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f16-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni-avx512fp16") {
++  source_set("f16-ibilinear_f16c-fma-no-avx2") {
 +    cflags = [
-+      "-mavx512bw",
-+    "-mavx512cd",
-+    "-mavx512dq",
-+    "-mavx512f",
-+    "-mavx512fp16",
-+    "-mavx512vl",
-+    "-mavx512vnni",
-+    "-mf16c",
++      "-mf16c",
 +    "-mfma",
-+    "-mgfni"
++    "-mno-avx2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-gemm/gen/f16-gemm-1x32-minmax-avx512fp16-broadcast.c",
-+    "src/src/f16-gemm/gen/f16-gemm-8x32-minmax-avx512fp16-broadcast.c"
++      "src/src/f16-ibilinear/gen/f16-ibilinear-fma3-u8.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -11285,24 +11871,16 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -      cflags = [ "-mavx512f" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni-avx512fp16_standalone") {
++  source_set("f16-ibilinear_f16c-fma-no-avx2_standalone") {
 +    cflags = [
-+      "-mavx512bw",
-+    "-mavx512cd",
-+    "-mavx512dq",
-+    "-mavx512f",
-+    "-mavx512fp16",
-+    "-mavx512vl",
-+    "-mavx512vnni",
-+    "-mf16c",
++      "-mf16c",
 +    "-mfma",
-+    "-mgfni"
++    "-mno-avx2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-gemm/gen/f16-gemm-1x32-minmax-avx512fp16-broadcast.c",
-+    "src/src/f16-gemm/gen/f16-gemm-8x32-minmax-avx512fp16-broadcast.c"
++      "src/src/f16-ibilinear/gen/f16-ibilinear-fma3-u8.c"
 +    ]
  
 -      sources = [
@@ -11345,16 +11923,24 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -    source_set("f16-vsin_avx512f_standalone") {
 -      cflags = [ "-mavx512f" ]
 +if (build_with_chromium) {
-+  source_set("f16-ibilinear_f16c-fma-no-avx2") {
++  source_set("f16-igemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni-avx512fp16") {
 +    cflags = [
-+      "-mf16c",
++      "-mavx512bw",
++    "-mavx512cd",
++    "-mavx512dq",
++    "-mavx512f",
++    "-mavx512fp16",
++    "-mavx512vl",
++    "-mavx512vnni",
++    "-mf16c",
 +    "-mfma",
-+    "-mno-avx2"
++    "-mgfni"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-ibilinear/gen/f16-ibilinear-fma3-u8.c"
++      "src/src/f16-igemm/gen/f16-igemm-1x32-minmax-avx512fp16-broadcast.c",
++    "src/src/f16-igemm/gen/f16-igemm-8x32-minmax-avx512fp16-broadcast.c"
 +    ]
  
 -      sources = [
@@ -11474,16 +12060,24 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -  }
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-ibilinear_f16c-fma-no-avx2_standalone") {
++  source_set("f16-igemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni-avx512fp16_standalone") {
 +    cflags = [
-+      "-mf16c",
++      "-mavx512bw",
++    "-mavx512cd",
++    "-mavx512dq",
++    "-mavx512f",
++    "-mavx512fp16",
++    "-mavx512vl",
++    "-mavx512vnni",
++    "-mf16c",
 +    "-mfma",
-+    "-mno-avx2"
++    "-mgfni"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-ibilinear/gen/f16-ibilinear-fma3-u8.c"
++      "src/src/f16-igemm/gen/f16-igemm-1x32-minmax-avx512fp16-broadcast.c",
++    "src/src/f16-igemm/gen/f16-igemm-8x32-minmax-avx512fp16-broadcast.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -11573,24 +12167,16 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -        "src/src/f16-vsin/gen/f16-f32acc-vsin-scalar-poly-3.c",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f16-igemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni-avx512fp16") {
++  source_set("f16-maxpool_f16c-fma-avx2") {
 +    cflags = [
-+      "-mavx512bw",
-+    "-mavx512cd",
-+    "-mavx512dq",
-+    "-mavx512f",
-+    "-mavx512fp16",
-+    "-mavx512vl",
-+    "-mavx512vnni",
++      "-mavx2",
 +    "-mf16c",
-+    "-mfma",
-+    "-mgfni"
++    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-igemm/gen/f16-igemm-1x32-minmax-avx512fp16-broadcast.c",
-+    "src/src/f16-igemm/gen/f16-igemm-8x32-minmax-avx512fp16-broadcast.c"
++      "src/src/f16-maxpool/gen/f16-maxpool-9p-minmax-avx2-u16.c"
 +    ]
  
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -11627,24 +12213,16 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-igemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni-avx512fp16_standalone") {
++  source_set("f16-maxpool_f16c-fma-avx2_standalone") {
 +    cflags = [
-+      "-mavx512bw",
-+    "-mavx512cd",
-+    "-mavx512dq",
-+    "-mavx512f",
-+    "-mavx512fp16",
-+    "-mavx512vl",
-+    "-mavx512vnni",
++      "-mavx2",
 +    "-mf16c",
-+    "-mfma",
-+    "-mgfni"
++    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-igemm/gen/f16-igemm-1x32-minmax-avx512fp16-broadcast.c",
-+    "src/src/f16-igemm/gen/f16-igemm-8x32-minmax-avx512fp16-broadcast.c"
++      "src/src/f16-maxpool/gen/f16-maxpool-9p-minmax-avx2-u16.c"
 +    ]
  
 -      sources = [
@@ -11770,16 +12348,15 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f16-maxpool_f16c-fma-avx2") {
++  source_set("f16-maxpool_sse4.1-no-sse4.2") {
 +    cflags = [
-+      "-mavx2",
-+    "-mf16c",
-+    "-mfma"
++      "-mno-sse4.2",
++    "-msse4.1"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-maxpool/gen/f16-maxpool-9p-minmax-avx2-u16.c"
++      "src/src/f16-maxpool/gen/f16-maxpool-9p-minmax-sse41-u8.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -11833,16 +12410,15 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -      cflags = [ "-mavx512f" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-maxpool_f16c-fma-avx2_standalone") {
++  source_set("f16-maxpool_sse4.1-no-sse4.2_standalone") {
 +    cflags = [
-+      "-mavx2",
-+    "-mf16c",
-+    "-mfma"
++      "-mno-sse4.2",
++    "-msse4.1"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-maxpool/gen/f16-maxpool-9p-minmax-avx2-u16.c"
++      "src/src/f16-maxpool/gen/f16-maxpool-9p-minmax-sse41-u8.c"
 +    ]
  
 -      sources = [
@@ -11885,15 +12461,20 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -    source_set("f16-vtanh_avx512f_standalone") {
 -      cflags = [ "-mavx512f" ]
 +if (build_with_chromium) {
-+  source_set("f16-maxpool_sse4.1-no-sse4.2") {
++  source_set("f16-qs8-vcvt_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
 +    cflags = [
-+      "-mno-sse4.2",
-+    "-msse4.1"
++      "-mavx512bw",
++    "-mavx512cd",
++    "-mavx512dq",
++    "-mavx512f",
++    "-mavx512vl",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-maxpool/gen/f16-maxpool-9p-minmax-sse41-u8.c"
++      "src/src/f16-qs8-vcvt/gen/f16-qs8-vcvt-avx512skx-u128.c"
 +    ]
  
 -      sources = [
@@ -12013,15 +12594,20 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -  }
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-maxpool_sse4.1-no-sse4.2_standalone") {
++  source_set("f16-qs8-vcvt_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") {
 +    cflags = [
-+      "-mno-sse4.2",
-+    "-msse4.1"
++      "-mavx512bw",
++    "-mavx512cd",
++    "-mavx512dq",
++    "-mavx512f",
++    "-mavx512vl",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-maxpool/gen/f16-maxpool-9p-minmax-sse41-u8.c"
++      "src/src/f16-qs8-vcvt/gen/f16-qs8-vcvt-avx512skx-u128.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -12123,20 +12709,14 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f16-qs8-vcvt_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
++  source_set("f16-qs8-vcvt_x64") {
 +    cflags = [
-+      "-mavx512bw",
-+    "-mavx512cd",
-+    "-mavx512dq",
-+    "-mavx512f",
-+    "-mavx512vl",
-+    "-mf16c",
-+    "-mfma"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-qs8-vcvt/gen/f16-qs8-vcvt-avx512skx-u128.c"
++      "src/src/f16-qs8-vcvt/gen/f16-qs8-vcvt-scalar-imagic-u4.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -12211,20 +12791,14 @@ Index: chromium-153.0.8010.36/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_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") {
++  source_set("f16-qs8-vcvt_x64_standalone") {
 +    cflags = [
-+      "-mavx512bw",
-+    "-mavx512cd",
-+    "-mavx512dq",
-+    "-mavx512f",
-+    "-mavx512vl",
-+    "-mf16c",
-+    "-mfma"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-qs8-vcvt/gen/f16-qs8-vcvt-avx512skx-u128.c"
++      "src/src/f16-qs8-vcvt/gen/f16-qs8-vcvt-scalar-imagic-u4.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -12342,14 +12916,20 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f16-qs8-vcvt_x64") {
++  source_set("f16-qu8-vcvt_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
 +    cflags = [
-+  
++      "-mavx512bw",
++    "-mavx512cd",
++    "-mavx512dq",
++    "-mavx512f",
++    "-mavx512vl",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-qs8-vcvt/gen/f16-qs8-vcvt-scalar-imagic-u4.c"
++      "src/src/f16-qu8-vcvt/gen/f16-qu8-vcvt-avx512skx-u128.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -12430,14 +13010,20 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-qs8-vcvt_x64_standalone") {
++  source_set("f16-qu8-vcvt_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") {
 +    cflags = [
-+  
++      "-mavx512bw",
++    "-mavx512cd",
++    "-mavx512dq",
++    "-mavx512f",
++    "-mavx512vl",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-qs8-vcvt/gen/f16-qs8-vcvt-scalar-imagic-u4.c"
++      "src/src/f16-qu8-vcvt/gen/f16-qu8-vcvt-avx512skx-u128.c"
 +    ]
  
 -      sources = [
@@ -12505,20 +13091,14 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f16-qu8-vcvt_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
++  source_set("f16-qu8-vcvt_x64") {
 +    cflags = [
-+      "-mavx512bw",
-+    "-mavx512cd",
-+    "-mavx512dq",
-+    "-mavx512f",
-+    "-mavx512vl",
-+    "-mf16c",
-+    "-mfma"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-qu8-vcvt/gen/f16-qu8-vcvt-avx512skx-u128.c"
++      "src/src/f16-qu8-vcvt/gen/f16-qu8-vcvt-scalar-imagic-u4.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -12603,20 +13183,14 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -      cflags = [ "-mavx512f" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-qu8-vcvt_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") {
++  source_set("f16-qu8-vcvt_x64_standalone") {
 +    cflags = [
-+      "-mavx512bw",
-+    "-mavx512cd",
-+    "-mavx512dq",
-+    "-mavx512f",
-+    "-mavx512vl",
-+    "-mf16c",
-+    "-mfma"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-qu8-vcvt/gen/f16-qu8-vcvt-avx512skx-u128.c"
++      "src/src/f16-qu8-vcvt/gen/f16-qu8-vcvt-scalar-imagic-u4.c"
 +    ]
  
 -      sources = [
@@ -12684,14 +13258,16 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f16-qu8-vcvt_x64") {
++  source_set("f16-raddstoreexpminusmax_f16c-fma-avx2") {
 +    cflags = [
-+  
++      "-mavx2",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-qu8-vcvt/gen/f16-qu8-vcvt-scalar-imagic-u4.c"
++      "src/src/f16-raddstoreexpminusmax/gen/f16-raddstoreexpminusmax-avx2-rr1-p2-u32.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -12772,14 +13348,16 @@ Index: chromium-153.0.8010.36/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_x64_standalone") {
++  source_set("f16-raddstoreexpminusmax_f16c-fma-avx2_standalone") {
 +    cflags = [
-+  
++      "-mavx2",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-qu8-vcvt/gen/f16-qu8-vcvt-scalar-imagic-u4.c"
++      "src/src/f16-raddstoreexpminusmax/gen/f16-raddstoreexpminusmax-avx2-rr1-p2-u32.c"
 +    ]
  
 -      sources = [
@@ -12822,16 +13400,15 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -    source_set("f32-avgpool_x64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("f16-raddstoreexpminusmax_f16c-fma-avx2") {
++  source_set("f16-rdminmax_x64") {
 +    cflags = [
-+      "-mavx2",
-+    "-mf16c",
-+    "-mfma"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-raddstoreexpminusmax/gen/f16-raddstoreexpminusmax-avx2-rr1-p2-u32.c"
++      "src/src/f16-rdminmax/gen/f16-rdmax-2p2x-scalar-u2.c",
++    "src/src/f16-rdminmax/gen/f16-rdmin-2p2x-scalar-u2.c"
 +    ]
  
 -      sources = [
@@ -12945,16 +13522,15 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -  }
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-raddstoreexpminusmax_f16c-fma-avx2_standalone") {
++  source_set("f16-rdminmax_x64_standalone") {
 +    cflags = [
-+      "-mavx2",
-+    "-mf16c",
-+    "-mfma"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-raddstoreexpminusmax/gen/f16-raddstoreexpminusmax-avx2-rr1-p2-u32.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) {
@@ -13060,15 +13636,22 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -        "src/src/f32-bf16-vcvt/gen/f32-bf16-vcvt-scalar-u2.c",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f16-rdminmax_x64") {
++  source_set("f16-rminmax_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
 +    cflags = [
-+  
++      "-mavx512bw",
++    "-mavx512cd",
++    "-mavx512dq",
++    "-mavx512f",
++    "-mavx512vl",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    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-rminmax/gen/f16-rmax-avx512skx-u64-acc4.c",
++    "src/src/f16-rminmax/gen/f16-rmin-avx512skx-u64-acc4.c",
++    "src/src/f16-rminmax/gen/f16-rminmax-avx512skx-u64-acc4.c"
 +    ]
  
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -13105,15 +13688,22 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-rdminmax_x64_standalone") {
++  source_set("f16-rminmax_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") {
 +    cflags = [
-+  
++      "-mavx512bw",
++    "-mavx512cd",
++    "-mavx512dq",
++    "-mavx512f",
++    "-mavx512vl",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    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-rminmax/gen/f16-rmax-avx512skx-u64-acc4.c",
++    "src/src/f16-rminmax/gen/f16-rmin-avx512skx-u64-acc4.c",
++    "src/src/f16-rminmax/gen/f16-rminmax-avx512skx-u64-acc4.c"
 +    ]
  
 -      sources = [
@@ -13237,22 +13827,25 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f16-rminmax_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
++  source_set("f16-rminmax_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni-avx512fp16") {
 +    cflags = [
 +      "-mavx512bw",
 +    "-mavx512cd",
 +    "-mavx512dq",
 +    "-mavx512f",
++    "-mavx512fp16",
 +    "-mavx512vl",
++    "-mavx512vnni",
 +    "-mf16c",
-+    "-mfma"
++    "-mfma",
++    "-mgfni"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-rminmax/gen/f16-rmax-avx512skx-u64-acc4.c",
-+    "src/src/f16-rminmax/gen/f16-rmin-avx512skx-u64-acc4.c",
-+    "src/src/f16-rminmax/gen/f16-rminmax-avx512skx-u64-acc4.c"
++      "src/src/f16-rminmax/gen/f16-rmax-avx512fp16-u128-acc4.c",
++    "src/src/f16-rminmax/gen/f16-rmin-avx512fp16-u128-acc4.c",
++    "src/src/f16-rminmax/gen/f16-rminmax-avx512fp16-u128-acc4.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -13329,22 +13922,25 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -      ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-rminmax_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") {
++  source_set("f16-rminmax_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni-avx512fp16_standalone") {
 +    cflags = [
 +      "-mavx512bw",
 +    "-mavx512cd",
 +    "-mavx512dq",
 +    "-mavx512f",
++    "-mavx512fp16",
 +    "-mavx512vl",
++    "-mavx512vnni",
 +    "-mf16c",
-+    "-mfma"
++    "-mfma",
++    "-mgfni"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-rminmax/gen/f16-rmax-avx512skx-u64-acc4.c",
-+    "src/src/f16-rminmax/gen/f16-rmin-avx512skx-u64-acc4.c",
-+    "src/src/f16-rminmax/gen/f16-rminmax-avx512skx-u64-acc4.c"
++      "src/src/f16-rminmax/gen/f16-rmax-avx512fp16-u128-acc4.c",
++    "src/src/f16-rminmax/gen/f16-rmin-avx512fp16-u128-acc4.c",
++    "src/src/f16-rminmax/gen/f16-rminmax-avx512fp16-u128-acc4.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -13462,25 +14058,16 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f16-rminmax_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni-avx512fp16") {
++  source_set("f16-rminmax_f16c-no-avx2-no-fma") {
 +    cflags = [
-+      "-mavx512bw",
-+    "-mavx512cd",
-+    "-mavx512dq",
-+    "-mavx512f",
-+    "-mavx512fp16",
-+    "-mavx512vl",
-+    "-mavx512vnni",
-+    "-mf16c",
-+    "-mfma",
-+    "-mgfni"
++      "-mf16c",
++    "-mno-avx2",
++    "-mno-fma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-rminmax/gen/f16-rmax-avx512fp16-u128-acc4.c",
-+    "src/src/f16-rminmax/gen/f16-rmin-avx512fp16-u128-acc4.c",
-+    "src/src/f16-rminmax/gen/f16-rminmax-avx512fp16-u128-acc4.c"
++      "src/src/f16-rminmax/f16-rmax-f16c-u32.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -13533,25 +14120,16 @@ Index: chromium-153.0.8010.36/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_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni-avx512fp16_standalone") {
++  source_set("f16-rminmax_f16c-no-avx2-no-fma_standalone") {
 +    cflags = [
-+      "-mavx512bw",
-+    "-mavx512cd",
-+    "-mavx512dq",
-+    "-mavx512f",
-+    "-mavx512fp16",
-+    "-mavx512vl",
-+    "-mavx512vnni",
-+    "-mf16c",
-+    "-mfma",
-+    "-mgfni"
++      "-mf16c",
++    "-mno-avx2",
++    "-mno-fma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-rminmax/gen/f16-rmax-avx512fp16-u128-acc4.c",
-+    "src/src/f16-rminmax/gen/f16-rmin-avx512fp16-u128-acc4.c",
-+    "src/src/f16-rminmax/gen/f16-rminmax-avx512fp16-u128-acc4.c"
++      "src/src/f16-rminmax/f16-rmax-f16c-u32.c"
 +    ]
  
 -      sources = [
@@ -13695,16 +14273,16 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f16-rminmax_f16c-no-avx2-no-fma") {
++  source_set("f16-rminmax_x64") {
 +    cflags = [
-+      "-mf16c",
-+    "-mno-avx2",
-+    "-mno-fma"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-rminmax/f16-rmax-f16c-u32.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" ]
@@ -13785,16 +14363,16 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -      ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-rminmax_f16c-no-avx2-no-fma_standalone") {
++  source_set("f16-rminmax_x64_standalone") {
 +    cflags = [
-+      "-mf16c",
-+    "-mno-avx2",
-+    "-mno-fma"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-rminmax/f16-rmax-f16c-u32.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" ]
@@ -13919,16 +14497,14 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f16-rminmax_x64") {
++  source_set("f16-vapproxgelu_avx512f") {
 +    cflags = [
-+  
++      "-mavx512f"
 +    ]
 +  
 +    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-vapproxgelu/gen/f16-f32acc-vapproxgelu-avx512f-rational-6-4-div.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -13983,16 +14559,14 @@ Index: chromium-153.0.8010.36/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_x64_standalone") {
++  source_set("f16-vapproxgelu_avx512f_standalone") {
 +    cflags = [
-+  
++      "-mavx512f"
 +    ]
 +  
 +    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-vapproxgelu/gen/f16-f32acc-vapproxgelu-avx512f-rational-6-4-div.c"
 +    ]
  
 -      sources = [
@@ -14138,14 +14712,23 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f16-vapproxgelu_avx512f") {
++  source_set("f16-vapproxgelu_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni-avx512fp16") {
 +    cflags = [
-+      "-mavx512f"
++      "-mavx512bw",
++    "-mavx512cd",
++    "-mavx512dq",
++    "-mavx512f",
++    "-mavx512fp16",
++    "-mavx512vl",
++    "-mavx512vnni",
++    "-mf16c",
++    "-mfma",
++    "-mgfni"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vapproxgelu/gen/f16-f32acc-vapproxgelu-avx512f-rational-6-4-div.c"
++      "src/src/f16-vapproxgelu/gen/f16-vapproxgelu-avx512fp16-rational-6-4-div.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -14230,14 +14813,23 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -      ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-vapproxgelu_avx512f_standalone") {
++  source_set("f16-vapproxgelu_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni-avx512fp16_standalone") {
 +    cflags = [
-+      "-mavx512f"
++      "-mavx512bw",
++    "-mavx512cd",
++    "-mavx512dq",
++    "-mavx512f",
++    "-mavx512fp16",
++    "-mavx512vl",
++    "-mavx512vnni",
++    "-mf16c",
++    "-mfma",
++    "-mgfni"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vapproxgelu/gen/f16-f32acc-vapproxgelu-avx512f-rational-6-4-div.c"
++      "src/src/f16-vapproxgelu/gen/f16-vapproxgelu-avx512fp16-rational-6-4-div.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -14353,23 +14945,16 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f16-vapproxgelu_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni-avx512fp16") {
++  source_set("f16-vapproxgelu_f16c-no-avx2-no-fma") {
 +    cflags = [
-+      "-mavx512bw",
-+    "-mavx512cd",
-+    "-mavx512dq",
-+    "-mavx512f",
-+    "-mavx512fp16",
-+    "-mavx512vl",
-+    "-mavx512vnni",
-+    "-mf16c",
-+    "-mfma",
-+    "-mgfni"
++      "-mf16c",
++    "-mno-avx2",
++    "-mno-fma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vapproxgelu/gen/f16-vapproxgelu-avx512fp16-rational-6-4-div.c"
++      "src/src/f16-vapproxgelu/gen/f16-f32acc-vapproxgelu-f16c-rational-6-4-div.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -14450,23 +15035,16 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-vapproxgelu_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni-avx512fp16_standalone") {
++  source_set("f16-vapproxgelu_f16c-no-avx2-no-fma_standalone") {
 +    cflags = [
-+      "-mavx512bw",
-+    "-mavx512cd",
-+    "-mavx512dq",
-+    "-mavx512f",
-+    "-mavx512fp16",
-+    "-mavx512vl",
-+    "-mavx512vnni",
-+    "-mf16c",
-+    "-mfma",
-+    "-mgfni"
++      "-mf16c",
++    "-mno-avx2",
++    "-mno-fma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vapproxgelu/gen/f16-vapproxgelu-avx512fp16-rational-6-4-div.c"
++      "src/src/f16-vapproxgelu/gen/f16-f32acc-vapproxgelu-f16c-rational-6-4-div.c"
 +    ]
  
 -      sources = [
@@ -14509,16 +15087,14 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -    source_set("f32-f16-vcvt_x64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("f16-vapproxgelu_f16c-no-avx2-no-fma") {
++  source_set("f16-vapproxgelu_x64") {
 +    cflags = [
-+      "-mf16c",
-+    "-mno-avx2",
-+    "-mno-fma"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vapproxgelu/gen/f16-f32acc-vapproxgelu-f16c-rational-6-4-div.c"
++      "src/src/f16-vapproxgelu/gen/f16-f32acc-vapproxgelu-scalar-rational-6-4-div.c"
 +    ]
  
 -      sources = [
@@ -14630,16 +15206,14 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -  }
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-vapproxgelu_f16c-no-avx2-no-fma_standalone") {
++  source_set("f16-vapproxgelu_x64_standalone") {
 +    cflags = [
-+      "-mf16c",
-+    "-mno-avx2",
-+    "-mno-fma"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vapproxgelu/gen/f16-f32acc-vapproxgelu-f16c-rational-6-4-div.c"
++      "src/src/f16-vapproxgelu/gen/f16-f32acc-vapproxgelu-scalar-rational-6-4-div.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -14690,14 +15264,41 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -    source_set("f32-gemm_avx512f_standalone") {
 -      cflags = [ "-mavx512f" ]
 +if (build_with_chromium) {
-+  source_set("f16-vapproxgelu_x64") {
++  source_set("f16-vbinary_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni-avx512fp16") {
 +    cflags = [
-+  
++      "-mavx512bw",
++    "-mavx512cd",
++    "-mavx512dq",
++    "-mavx512f",
++    "-mavx512fp16",
++    "-mavx512vl",
++    "-mavx512vnni",
++    "-mf16c",
++    "-mfma",
++    "-mgfni"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vapproxgelu/gen/f16-f32acc-vapproxgelu-scalar-rational-6-4-div.c"
++      "src/src/f16-vbinary/gen/f16-vadd-avx512fp16-u64.c",
++    "src/src/f16-vbinary/gen/f16-vaddc-avx512fp16-u64.c",
++    "src/src/f16-vbinary/gen/f16-vdiv-avx512fp16-u64.c",
++    "src/src/f16-vbinary/gen/f16-vdivc-avx512fp16-u64.c",
++    "src/src/f16-vbinary/gen/f16-vmax-avx512fp16-u64.c",
++    "src/src/f16-vbinary/gen/f16-vmaxc-avx512fp16-u64.c",
++    "src/src/f16-vbinary/gen/f16-vmin-avx512fp16-u64.c",
++    "src/src/f16-vbinary/gen/f16-vminc-avx512fp16-u64.c",
++    "src/src/f16-vbinary/gen/f16-vmul-avx512fp16-u64.c",
++    "src/src/f16-vbinary/gen/f16-vmulc-avx512fp16-u64.c",
++    "src/src/f16-vbinary/gen/f16-vprelu-avx512fp16-u64.c",
++    "src/src/f16-vbinary/gen/f16-vpreluc-avx512fp16-u64.c",
++    "src/src/f16-vbinary/gen/f16-vrdivc-avx512fp16-u64.c",
++    "src/src/f16-vbinary/gen/f16-vrpreluc-avx512fp16-u64.c",
++    "src/src/f16-vbinary/gen/f16-vrsubc-avx512fp16-u64.c",
++    "src/src/f16-vbinary/gen/f16-vsqrdiff-avx512fp16-u64.c",
++    "src/src/f16-vbinary/gen/f16-vsqrdiffc-avx512fp16-u64.c",
++    "src/src/f16-vbinary/gen/f16-vsub-avx512fp16-u64.c",
++    "src/src/f16-vbinary/gen/f16-vsubc-avx512fp16-u64.c"
 +    ]
  
 -      sources = [
@@ -14820,14 +15421,41 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -  }
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-vapproxgelu_x64_standalone") {
++  source_set("f16-vbinary_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni-avx512fp16_standalone") {
 +    cflags = [
-+  
++      "-mavx512bw",
++    "-mavx512cd",
++    "-mavx512dq",
++    "-mavx512f",
++    "-mavx512fp16",
++    "-mavx512vl",
++    "-mavx512vnni",
++    "-mf16c",
++    "-mfma",
++    "-mgfni"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vapproxgelu/gen/f16-f32acc-vapproxgelu-scalar-rational-6-4-div.c"
++      "src/src/f16-vbinary/gen/f16-vadd-avx512fp16-u64.c",
++    "src/src/f16-vbinary/gen/f16-vaddc-avx512fp16-u64.c",
++    "src/src/f16-vbinary/gen/f16-vdiv-avx512fp16-u64.c",
++    "src/src/f16-vbinary/gen/f16-vdivc-avx512fp16-u64.c",
++    "src/src/f16-vbinary/gen/f16-vmax-avx512fp16-u64.c",
++    "src/src/f16-vbinary/gen/f16-vmaxc-avx512fp16-u64.c",
++    "src/src/f16-vbinary/gen/f16-vmin-avx512fp16-u64.c",
++    "src/src/f16-vbinary/gen/f16-vminc-avx512fp16-u64.c",
++    "src/src/f16-vbinary/gen/f16-vmul-avx512fp16-u64.c",
++    "src/src/f16-vbinary/gen/f16-vmulc-avx512fp16-u64.c",
++    "src/src/f16-vbinary/gen/f16-vprelu-avx512fp16-u64.c",
++    "src/src/f16-vbinary/gen/f16-vpreluc-avx512fp16-u64.c",
++    "src/src/f16-vbinary/gen/f16-vrdivc-avx512fp16-u64.c",
++    "src/src/f16-vbinary/gen/f16-vrpreluc-avx512fp16-u64.c",
++    "src/src/f16-vbinary/gen/f16-vrsubc-avx512fp16-u64.c",
++    "src/src/f16-vbinary/gen/f16-vsqrdiff-avx512fp16-u64.c",
++    "src/src/f16-vbinary/gen/f16-vsqrdiffc-avx512fp16-u64.c",
++    "src/src/f16-vbinary/gen/f16-vsub-avx512fp16-u64.c",
++    "src/src/f16-vbinary/gen/f16-vsubc-avx512fp16-u64.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -14914,41 +15542,34 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -    source_set("f32-gemm_x64") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("f16-vbinary_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni-avx512fp16") {
++  source_set("f16-vbinary_f16c-no-avx2-no-fma") {
 +    cflags = [
-+      "-mavx512bw",
-+    "-mavx512cd",
-+    "-mavx512dq",
-+    "-mavx512f",
-+    "-mavx512fp16",
-+    "-mavx512vl",
-+    "-mavx512vnni",
-+    "-mf16c",
-+    "-mfma",
-+    "-mgfni"
++      "-mf16c",
++    "-mno-avx2",
++    "-mno-fma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vbinary/gen/f16-vadd-avx512fp16-u64.c",
-+    "src/src/f16-vbinary/gen/f16-vaddc-avx512fp16-u64.c",
-+    "src/src/f16-vbinary/gen/f16-vdiv-avx512fp16-u64.c",
-+    "src/src/f16-vbinary/gen/f16-vdivc-avx512fp16-u64.c",
-+    "src/src/f16-vbinary/gen/f16-vmax-avx512fp16-u64.c",
-+    "src/src/f16-vbinary/gen/f16-vmaxc-avx512fp16-u64.c",
-+    "src/src/f16-vbinary/gen/f16-vmin-avx512fp16-u64.c",
-+    "src/src/f16-vbinary/gen/f16-vminc-avx512fp16-u64.c",
-+    "src/src/f16-vbinary/gen/f16-vmul-avx512fp16-u64.c",
-+    "src/src/f16-vbinary/gen/f16-vmulc-avx512fp16-u64.c",
-+    "src/src/f16-vbinary/gen/f16-vprelu-avx512fp16-u64.c",
-+    "src/src/f16-vbinary/gen/f16-vpreluc-avx512fp16-u64.c",
-+    "src/src/f16-vbinary/gen/f16-vrdivc-avx512fp16-u64.c",
-+    "src/src/f16-vbinary/gen/f16-vrpreluc-avx512fp16-u64.c",
-+    "src/src/f16-vbinary/gen/f16-vrsubc-avx512fp16-u64.c",
-+    "src/src/f16-vbinary/gen/f16-vsqrdiff-avx512fp16-u64.c",
-+    "src/src/f16-vbinary/gen/f16-vsqrdiffc-avx512fp16-u64.c",
-+    "src/src/f16-vbinary/gen/f16-vsub-avx512fp16-u64.c",
-+    "src/src/f16-vbinary/gen/f16-vsubc-avx512fp16-u64.c"
++      "src/src/f16-vbinary/gen/f16-vadd-f16c-u16.c",
++    "src/src/f16-vbinary/gen/f16-vaddc-f16c-u16.c",
++    "src/src/f16-vbinary/gen/f16-vdiv-f16c-u8.c",
++    "src/src/f16-vbinary/gen/f16-vdivc-f16c-u8.c",
++    "src/src/f16-vbinary/gen/f16-vmax-f16c-u16.c",
++    "src/src/f16-vbinary/gen/f16-vmaxc-f16c-u16.c",
++    "src/src/f16-vbinary/gen/f16-vmin-f16c-u16.c",
++    "src/src/f16-vbinary/gen/f16-vminc-f16c-u16.c",
++    "src/src/f16-vbinary/gen/f16-vmul-f16c-u16.c",
++    "src/src/f16-vbinary/gen/f16-vmulc-f16c-u16.c",
++    "src/src/f16-vbinary/gen/f16-vprelu-f16c-u16.c",
++    "src/src/f16-vbinary/gen/f16-vpreluc-f16c-u16.c",
++    "src/src/f16-vbinary/gen/f16-vrdivc-f16c-u8.c",
++    "src/src/f16-vbinary/gen/f16-vrpreluc-f16c-u16.c",
++    "src/src/f16-vbinary/gen/f16-vrsubc-f16c-u16.c",
++    "src/src/f16-vbinary/gen/f16-vsqrdiff-f16c-u16.c",
++    "src/src/f16-vbinary/gen/f16-vsqrdiffc-f16c-u16.c",
++    "src/src/f16-vbinary/gen/f16-vsub-f16c-u16.c",
++    "src/src/f16-vbinary/gen/f16-vsubc-f16c-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -14996,41 +15617,34 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-vbinary_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni-avx512fp16_standalone") {
++  source_set("f16-vbinary_f16c-no-avx2-no-fma_standalone") {
 +    cflags = [
-+      "-mavx512bw",
-+    "-mavx512cd",
-+    "-mavx512dq",
-+    "-mavx512f",
-+    "-mavx512fp16",
-+    "-mavx512vl",
-+    "-mavx512vnni",
-+    "-mf16c",
-+    "-mfma",
-+    "-mgfni"
++      "-mf16c",
++    "-mno-avx2",
++    "-mno-fma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vbinary/gen/f16-vadd-avx512fp16-u64.c",
-+    "src/src/f16-vbinary/gen/f16-vaddc-avx512fp16-u64.c",
-+    "src/src/f16-vbinary/gen/f16-vdiv-avx512fp16-u64.c",
-+    "src/src/f16-vbinary/gen/f16-vdivc-avx512fp16-u64.c",
-+    "src/src/f16-vbinary/gen/f16-vmax-avx512fp16-u64.c",
-+    "src/src/f16-vbinary/gen/f16-vmaxc-avx512fp16-u64.c",
-+    "src/src/f16-vbinary/gen/f16-vmin-avx512fp16-u64.c",
-+    "src/src/f16-vbinary/gen/f16-vminc-avx512fp16-u64.c",
-+    "src/src/f16-vbinary/gen/f16-vmul-avx512fp16-u64.c",
-+    "src/src/f16-vbinary/gen/f16-vmulc-avx512fp16-u64.c",
-+    "src/src/f16-vbinary/gen/f16-vprelu-avx512fp16-u64.c",
-+    "src/src/f16-vbinary/gen/f16-vpreluc-avx512fp16-u64.c",
-+    "src/src/f16-vbinary/gen/f16-vrdivc-avx512fp16-u64.c",
-+    "src/src/f16-vbinary/gen/f16-vrpreluc-avx512fp16-u64.c",
-+    "src/src/f16-vbinary/gen/f16-vrsubc-avx512fp16-u64.c",
-+    "src/src/f16-vbinary/gen/f16-vsqrdiff-avx512fp16-u64.c",
-+    "src/src/f16-vbinary/gen/f16-vsqrdiffc-avx512fp16-u64.c",
-+    "src/src/f16-vbinary/gen/f16-vsub-avx512fp16-u64.c",
-+    "src/src/f16-vbinary/gen/f16-vsubc-avx512fp16-u64.c"
++      "src/src/f16-vbinary/gen/f16-vadd-f16c-u16.c",
++    "src/src/f16-vbinary/gen/f16-vaddc-f16c-u16.c",
++    "src/src/f16-vbinary/gen/f16-vdiv-f16c-u8.c",
++    "src/src/f16-vbinary/gen/f16-vdivc-f16c-u8.c",
++    "src/src/f16-vbinary/gen/f16-vmax-f16c-u16.c",
++    "src/src/f16-vbinary/gen/f16-vmaxc-f16c-u16.c",
++    "src/src/f16-vbinary/gen/f16-vmin-f16c-u16.c",
++    "src/src/f16-vbinary/gen/f16-vminc-f16c-u16.c",
++    "src/src/f16-vbinary/gen/f16-vmul-f16c-u16.c",
++    "src/src/f16-vbinary/gen/f16-vmulc-f16c-u16.c",
++    "src/src/f16-vbinary/gen/f16-vprelu-f16c-u16.c",
++    "src/src/f16-vbinary/gen/f16-vpreluc-f16c-u16.c",
++    "src/src/f16-vbinary/gen/f16-vrdivc-f16c-u8.c",
++    "src/src/f16-vbinary/gen/f16-vrpreluc-f16c-u16.c",
++    "src/src/f16-vbinary/gen/f16-vrsubc-f16c-u16.c",
++    "src/src/f16-vbinary/gen/f16-vsqrdiff-f16c-u16.c",
++    "src/src/f16-vbinary/gen/f16-vsqrdiffc-f16c-u16.c",
++    "src/src/f16-vbinary/gen/f16-vsub-f16c-u16.c",
++    "src/src/f16-vbinary/gen/f16-vsubc-f16c-u16.c"
 +    ]
  
 -      sources = [
@@ -15147,7 +15761,7 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -        "src/src/f32-ibilinear-chw/gen/f32-ibilinear-chw-scalar-p4.c",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f16-vbinary_f16c-no-avx2-no-fma") {
++  source_set("f16-vclamp_f16c-no-avx2-no-fma") {
 +    cflags = [
 +      "-mf16c",
 +    "-mno-avx2",
@@ -15156,25 +15770,7 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vbinary/gen/f16-vadd-f16c-u16.c",
-+    "src/src/f16-vbinary/gen/f16-vaddc-f16c-u16.c",
-+    "src/src/f16-vbinary/gen/f16-vdiv-f16c-u8.c",
-+    "src/src/f16-vbinary/gen/f16-vdivc-f16c-u8.c",
-+    "src/src/f16-vbinary/gen/f16-vmax-f16c-u16.c",
-+    "src/src/f16-vbinary/gen/f16-vmaxc-f16c-u16.c",
-+    "src/src/f16-vbinary/gen/f16-vmin-f16c-u16.c",
-+    "src/src/f16-vbinary/gen/f16-vminc-f16c-u16.c",
-+    "src/src/f16-vbinary/gen/f16-vmul-f16c-u16.c",
-+    "src/src/f16-vbinary/gen/f16-vmulc-f16c-u16.c",
-+    "src/src/f16-vbinary/gen/f16-vprelu-f16c-u16.c",
-+    "src/src/f16-vbinary/gen/f16-vpreluc-f16c-u16.c",
-+    "src/src/f16-vbinary/gen/f16-vrdivc-f16c-u8.c",
-+    "src/src/f16-vbinary/gen/f16-vrpreluc-f16c-u16.c",
-+    "src/src/f16-vbinary/gen/f16-vrsubc-f16c-u16.c",
-+    "src/src/f16-vbinary/gen/f16-vsqrdiff-f16c-u16.c",
-+    "src/src/f16-vbinary/gen/f16-vsqrdiffc-f16c-u16.c",
-+    "src/src/f16-vbinary/gen/f16-vsub-f16c-u16.c",
-+    "src/src/f16-vbinary/gen/f16-vsubc-f16c-u16.c"
++      "src/src/f16-vclamp/gen/f16-vclamp-f16c-u16.c"
 +    ]
  
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -15211,7 +15807,7 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-vbinary_f16c-no-avx2-no-fma_standalone") {
++  source_set("f16-vclamp_f16c-no-avx2-no-fma_standalone") {
 +    cflags = [
 +      "-mf16c",
 +    "-mno-avx2",
@@ -15220,25 +15816,7 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vbinary/gen/f16-vadd-f16c-u16.c",
-+    "src/src/f16-vbinary/gen/f16-vaddc-f16c-u16.c",
-+    "src/src/f16-vbinary/gen/f16-vdiv-f16c-u8.c",
-+    "src/src/f16-vbinary/gen/f16-vdivc-f16c-u8.c",
-+    "src/src/f16-vbinary/gen/f16-vmax-f16c-u16.c",
-+    "src/src/f16-vbinary/gen/f16-vmaxc-f16c-u16.c",
-+    "src/src/f16-vbinary/gen/f16-vmin-f16c-u16.c",
-+    "src/src/f16-vbinary/gen/f16-vminc-f16c-u16.c",
-+    "src/src/f16-vbinary/gen/f16-vmul-f16c-u16.c",
-+    "src/src/f16-vbinary/gen/f16-vmulc-f16c-u16.c",
-+    "src/src/f16-vbinary/gen/f16-vprelu-f16c-u16.c",
-+    "src/src/f16-vbinary/gen/f16-vpreluc-f16c-u16.c",
-+    "src/src/f16-vbinary/gen/f16-vrdivc-f16c-u8.c",
-+    "src/src/f16-vbinary/gen/f16-vrpreluc-f16c-u16.c",
-+    "src/src/f16-vbinary/gen/f16-vrsubc-f16c-u16.c",
-+    "src/src/f16-vbinary/gen/f16-vsqrdiff-f16c-u16.c",
-+    "src/src/f16-vbinary/gen/f16-vsqrdiffc-f16c-u16.c",
-+    "src/src/f16-vbinary/gen/f16-vsub-f16c-u16.c",
-+    "src/src/f16-vbinary/gen/f16-vsubc-f16c-u16.c"
++      "src/src/f16-vclamp/gen/f16-vclamp-f16c-u16.c"
 +    ]
  
 -      sources = [
@@ -15350,16 +15928,14 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -        "src/src/f32-ibilinear/gen/f32-ibilinear-scalar-u2.c",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f16-vclamp_f16c-no-avx2-no-fma") {
++  source_set("f16-vcos_avx512f") {
 +    cflags = [
-+      "-mf16c",
-+    "-mno-avx2",
-+    "-mno-fma"
++      "-mavx512f"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vclamp/gen/f16-vclamp-f16c-u16.c"
++      "src/src/f16-vcos/gen/f16-f32acc-vcos-avx512f-poly-3.c"
 +    ]
  
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -15396,16 +15972,14 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-vclamp_f16c-no-avx2-no-fma_standalone") {
++  source_set("f16-vcos_avx512f_standalone") {
 +    cflags = [
-+      "-mf16c",
-+    "-mno-avx2",
-+    "-mno-fma"
++      "-mavx512f"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vclamp/gen/f16-vclamp-f16c-u16.c"
++      "src/src/f16-vcos/gen/f16-f32acc-vcos-avx512f-poly-3.c"
 +    ]
  
 -      sources = [
@@ -15522,14 +16096,23 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -    source_set("f32-igemm_avx512f") {
 -      cflags = [ "-mavx512f" ]
 +if (build_with_chromium) {
-+  source_set("f16-vcos_avx512f") {
++  source_set("f16-vcos_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni-avx512fp16") {
 +    cflags = [
-+      "-mavx512f"
++      "-mavx512bw",
++    "-mavx512cd",
++    "-mavx512dq",
++    "-mavx512f",
++    "-mavx512fp16",
++    "-mavx512vl",
++    "-mavx512vnni",
++    "-mf16c",
++    "-mfma",
++    "-mgfni"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vcos/gen/f16-f32acc-vcos-avx512f-poly-3.c"
++      "src/src/f16-vcos/gen/f16-vcos-avx512fp16-poly-3.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -15575,14 +16158,23 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -      cflags = [ "-mavx512f" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-vcos_avx512f_standalone") {
++  source_set("f16-vcos_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni-avx512fp16_standalone") {
 +    cflags = [
-+      "-mavx512f"
++      "-mavx512bw",
++    "-mavx512cd",
++    "-mavx512dq",
++    "-mavx512f",
++    "-mavx512fp16",
++    "-mavx512vl",
++    "-mavx512vnni",
++    "-mf16c",
++    "-mfma",
++    "-mgfni"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vcos/gen/f16-f32acc-vcos-avx512f-poly-3.c"
++      "src/src/f16-vcos/gen/f16-vcos-avx512fp16-poly-3.c"
 +    ]
  
 -      sources = [
@@ -15730,23 +16322,16 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f16-vcos_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni-avx512fp16") {
++  source_set("f16-vcos_f16c-no-avx2-no-fma") {
 +    cflags = [
-+      "-mavx512bw",
-+    "-mavx512cd",
-+    "-mavx512dq",
-+    "-mavx512f",
-+    "-mavx512fp16",
-+    "-mavx512vl",
-+    "-mavx512vnni",
-+    "-mf16c",
-+    "-mfma",
-+    "-mgfni"
++      "-mf16c",
++    "-mno-avx2",
++    "-mno-fma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vcos/gen/f16-vcos-avx512fp16-poly-3.c"
++      "src/src/f16-vcos/gen/f16-f32acc-vcos-f16c-poly-3.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -15806,23 +16391,16 @@ Index: chromium-153.0.8010.36/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_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni-avx512fp16_standalone") {
++  source_set("f16-vcos_f16c-no-avx2-no-fma_standalone") {
 +    cflags = [
-+      "-mavx512bw",
-+    "-mavx512cd",
-+    "-mavx512dq",
-+    "-mavx512f",
-+    "-mavx512fp16",
-+    "-mavx512vl",
-+    "-mavx512vnni",
-+    "-mf16c",
-+    "-mfma",
-+    "-mgfni"
++      "-mf16c",
++    "-mno-avx2",
++    "-mno-fma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vcos/gen/f16-vcos-avx512fp16-poly-3.c"
++      "src/src/f16-vcos/gen/f16-f32acc-vcos-f16c-poly-3.c"
 +    ]
  
 -      sources = [
@@ -15924,16 +16502,14 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f16-vcos_f16c-no-avx2-no-fma") {
++  source_set("f16-vcos_x64") {
 +    cflags = [
-+      "-mf16c",
-+    "-mno-avx2",
-+    "-mno-fma"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vcos/gen/f16-f32acc-vcos-f16c-poly-3.c"
++      "src/src/f16-vcos/gen/f16-f32acc-vcos-scalar-poly-3.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -15991,16 +16567,14 @@ Index: chromium-153.0.8010.36/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_f16c-no-avx2-no-fma_standalone") {
++  source_set("f16-vcos_x64_standalone") {
 +    cflags = [
-+      "-mf16c",
-+    "-mno-avx2",
-+    "-mno-fma"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vcos/gen/f16-f32acc-vcos-f16c-poly-3.c"
++      "src/src/f16-vcos/gen/f16-f32acc-vcos-scalar-poly-3.c"
 +    ]
  
 -      sources = [
@@ -16068,14 +16642,16 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f16-vcos_x64") {
++  source_set("f16-velu_f16c-fma-avx2") {
 +    cflags = [
-+  
++      "-mavx2",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vcos/gen/f16-f32acc-vcos-scalar-poly-3.c"
++      "src/src/f16-velu/gen/f16-velu-avx2-rr1-p3-u16.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -16184,14 +16760,16 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -      ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-vcos_x64_standalone") {
++  source_set("f16-velu_f16c-fma-avx2_standalone") {
 +    cflags = [
-+  
++      "-mavx2",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vcos/gen/f16-f32acc-vcos-scalar-poly-3.c"
++      "src/src/f16-velu/gen/f16-velu-avx2-rr1-p3-u16.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -16312,16 +16890,14 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f16-velu_f16c-fma-avx2") {
++  source_set("f16-vexp_avx512f") {
 +    cflags = [
-+      "-mavx2",
-+    "-mf16c",
-+    "-mfma"
++      "-mavx512f"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-velu/gen/f16-velu-avx2-rr1-p3-u16.c"
++      "src/src/f16-vexp/gen/f16-f32acc-vexp-avx512f-poly-3.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -16404,16 +16980,14 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-velu_f16c-fma-avx2_standalone") {
++  source_set("f16-vexp_avx512f_standalone") {
 +    cflags = [
-+      "-mavx2",
-+    "-mf16c",
-+    "-mfma"
++      "-mavx512f"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-velu/gen/f16-velu-avx2-rr1-p3-u16.c"
++      "src/src/f16-vexp/gen/f16-f32acc-vexp-avx512f-poly-3.c"
 +    ]
  
 -      sources = [
@@ -16483,14 +17057,23 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f16-vexp_avx512f") {
++  source_set("f16-vexp_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni-avx512fp16") {
 +    cflags = [
-+      "-mavx512f"
++      "-mavx512bw",
++    "-mavx512cd",
++    "-mavx512dq",
++    "-mavx512f",
++    "-mavx512fp16",
++    "-mavx512vl",
++    "-mavx512vnni",
++    "-mf16c",
++    "-mfma",
++    "-mgfni"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vexp/gen/f16-f32acc-vexp-avx512f-poly-3.c"
++      "src/src/f16-vexp/gen/f16-vexp-avx512fp16-poly-3.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -16599,14 +17182,23 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -      ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-vexp_avx512f_standalone") {
++  source_set("f16-vexp_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni-avx512fp16_standalone") {
 +    cflags = [
-+      "-mavx512f"
++      "-mavx512bw",
++    "-mavx512cd",
++    "-mavx512dq",
++    "-mavx512f",
++    "-mavx512fp16",
++    "-mavx512vl",
++    "-mavx512vnni",
++    "-mf16c",
++    "-mfma",
++    "-mgfni"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vexp/gen/f16-f32acc-vexp-avx512f-poly-3.c"
++      "src/src/f16-vexp/gen/f16-vexp-avx512fp16-poly-3.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -16741,23 +17333,16 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f16-vexp_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni-avx512fp16") {
++  source_set("f16-vexp_f16c-no-avx2-no-fma") {
 +    cflags = [
-+      "-mavx512bw",
-+    "-mavx512cd",
-+    "-mavx512dq",
-+    "-mavx512f",
-+    "-mavx512fp16",
-+    "-mavx512vl",
-+    "-mavx512vnni",
-+    "-mf16c",
-+    "-mfma",
-+    "-mgfni"
++      "-mf16c",
++    "-mno-avx2",
++    "-mno-fma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vexp/gen/f16-vexp-avx512fp16-poly-3.c"
++      "src/src/f16-vexp/gen/f16-f32acc-vexp-f16c-poly-3.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -16863,23 +17448,16 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -      ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-vexp_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni-avx512fp16_standalone") {
++  source_set("f16-vexp_f16c-no-avx2-no-fma_standalone") {
 +    cflags = [
-+      "-mavx512bw",
-+    "-mavx512cd",
-+    "-mavx512dq",
-+    "-mavx512f",
-+    "-mavx512fp16",
-+    "-mavx512vl",
-+    "-mavx512vnni",
-+    "-mf16c",
-+    "-mfma",
-+    "-mgfni"
++      "-mf16c",
++    "-mno-avx2",
++    "-mno-fma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vexp/gen/f16-vexp-avx512fp16-poly-3.c"
++      "src/src/f16-vexp/gen/f16-f32acc-vexp-f16c-poly-3.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -16946,16 +17524,14 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -        "src/src/f32-qc8w-gemm/gen/f32-qc8w-gemm-4x4-minmax-scalar.c",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f16-vexp_f16c-no-avx2-no-fma") {
++  source_set("f16-vexp_x64") {
 +    cflags = [
-+      "-mf16c",
-+    "-mno-avx2",
-+    "-mno-fma"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vexp/gen/f16-f32acc-vexp-f16c-poly-3.c"
++      "src/src/f16-vexp/gen/f16-f32acc-vexp-scalar-poly-3.c"
 +    ]
  
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -16992,16 +17568,14 @@ Index: chromium-153.0.8010.36/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_f16c-no-avx2-no-fma_standalone") {
++  source_set("f16-vexp_x64_standalone") {
 +    cflags = [
-+      "-mf16c",
-+    "-mno-avx2",
-+    "-mno-fma"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vexp/gen/f16-f32acc-vexp-f16c-poly-3.c"
++      "src/src/f16-vexp/gen/f16-f32acc-vexp-scalar-poly-3.c"
 +    ]
  
 -      sources = [
@@ -17134,14 +17708,14 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f16-vexp_x64") {
++  source_set("f16-vgelu_x64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vexp/gen/f16-f32acc-vexp-scalar-poly-3.c"
++      "src/src/f16-vgelu/gen/f16-vgelu-scalar-rational-6-4-div.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -17226,14 +17800,14 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -      ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-vexp_x64_standalone") {
++  source_set("f16-vgelu_x64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vexp/gen/f16-f32acc-vexp-scalar-poly-3.c"
++      "src/src/f16-vgelu/gen/f16-vgelu-scalar-rational-6-4-div.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -17354,14 +17928,16 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f16-vgelu_x64") {
++  source_set("f16-vhswish_f16c-no-avx2-no-fma") {
 +    cflags = [
-+  
++      "-mf16c",
++    "-mno-avx2",
++    "-mno-fma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vgelu/gen/f16-vgelu-scalar-rational-6-4-div.c"
++      "src/src/f16-vhswish/gen/f16-vhswish-f16c-u16.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -17442,14 +18018,16 @@ Index: chromium-153.0.8010.36/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_x64_standalone") {
++  source_set("f16-vhswish_f16c-no-avx2-no-fma_standalone") {
 +    cflags = [
-+  
++      "-mf16c",
++    "-mno-avx2",
++    "-mno-fma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vgelu/gen/f16-vgelu-scalar-rational-6-4-div.c"
++      "src/src/f16-vhswish/gen/f16-vhswish-f16c-u16.c"
 +    ]
  
 -      sources = [
@@ -17519,16 +18097,14 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f16-vhswish_f16c-no-avx2-no-fma") {
++  source_set("f16-vlog_avx512f") {
 +    cflags = [
-+      "-mf16c",
-+    "-mno-avx2",
-+    "-mno-fma"
++      "-mavx512f"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vhswish/gen/f16-vhswish-f16c-u16.c"
++      "src/src/f16-vlog/gen/f16-f32acc-vlog-avx512f-rational-1-3-div.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -17634,16 +18210,14 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -      ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-vhswish_f16c-no-avx2-no-fma_standalone") {
++  source_set("f16-vlog_avx512f_standalone") {
 +    cflags = [
-+      "-mf16c",
-+    "-mno-avx2",
-+    "-mno-fma"
++      "-mavx512f"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vhswish/gen/f16-vhswish-f16c-u16.c"
++      "src/src/f16-vlog/gen/f16-f32acc-vlog-avx512f-rational-1-3-div.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -17771,14 +18345,23 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f16-vlog_avx512f") {
++  source_set("f16-vlog_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni-avx512fp16") {
 +    cflags = [
-+      "-mavx512f"
++      "-mavx512bw",
++    "-mavx512cd",
++    "-mavx512dq",
++    "-mavx512f",
++    "-mavx512fp16",
++    "-mavx512vl",
++    "-mavx512vnni",
++    "-mf16c",
++    "-mfma",
++    "-mgfni"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vlog/gen/f16-f32acc-vlog-avx512f-rational-1-3-div.c"
++      "src/src/f16-vlog/gen/f16-vlog-avx512fp16-rational-1-3-div.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -17859,14 +18442,23 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-vlog_avx512f_standalone") {
++  source_set("f16-vlog_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni-avx512fp16_standalone") {
 +    cflags = [
-+      "-mavx512f"
++      "-mavx512bw",
++    "-mavx512cd",
++    "-mavx512dq",
++    "-mavx512f",
++    "-mavx512fp16",
++    "-mavx512vl",
++    "-mavx512vnni",
++    "-mf16c",
++    "-mfma",
++    "-mgfni"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vlog/gen/f16-f32acc-vlog-avx512f-rational-1-3-div.c"
++      "src/src/f16-vlog/gen/f16-vlog-avx512fp16-rational-1-3-div.c"
 +    ]
  
 -      sources = [
@@ -17910,23 +18502,16 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -    source_set("f32-qu8-vcvt_x64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("f16-vlog_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni-avx512fp16") {
++  source_set("f16-vlog_f16c-no-avx2-no-fma") {
 +    cflags = [
-+      "-mavx512bw",
-+    "-mavx512cd",
-+    "-mavx512dq",
-+    "-mavx512f",
-+    "-mavx512fp16",
-+    "-mavx512vl",
-+    "-mavx512vnni",
-+    "-mf16c",
-+    "-mfma",
-+    "-mgfni"
++      "-mf16c",
++    "-mno-avx2",
++    "-mno-fma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vlog/gen/f16-vlog-avx512fp16-rational-1-3-div.c"
++      "src/src/f16-vlog/gen/f16-f32acc-vlog-f16c-rational-1-3-div.c"
 +    ]
  
 -      sources = [
@@ -17974,23 +18559,16 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -      cflags = [ "-mavx512f" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-vlog_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni-avx512fp16_standalone") {
++  source_set("f16-vlog_f16c-no-avx2-no-fma_standalone") {
 +    cflags = [
-+      "-mavx512bw",
-+    "-mavx512cd",
-+    "-mavx512dq",
-+    "-mavx512f",
-+    "-mavx512fp16",
-+    "-mavx512vl",
-+    "-mavx512vnni",
-+    "-mf16c",
-+    "-mfma",
-+    "-mgfni"
++      "-mf16c",
++    "-mno-avx2",
++    "-mno-fma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vlog/gen/f16-vlog-avx512fp16-rational-1-3-div.c"
++      "src/src/f16-vlog/gen/f16-f32acc-vlog-f16c-rational-1-3-div.c"
 +    ]
  
 -      sources = [
@@ -18033,16 +18611,14 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -    source_set("f32-raddstoreexpminusmax_avx512f_standalone") {
 -      cflags = [ "-mavx512f" ]
 +if (build_with_chromium) {
-+  source_set("f16-vlog_f16c-no-avx2-no-fma") {
++  source_set("f16-vlog_x64") {
 +    cflags = [
-+      "-mf16c",
-+    "-mno-avx2",
-+    "-mno-fma"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vlog/gen/f16-f32acc-vlog-f16c-rational-1-3-div.c"
++      "src/src/f16-vlog/gen/f16-f32acc-vlog-scalar-rational-1-3-div.c"
 +    ]
  
 -      sources = [
@@ -18146,16 +18722,14 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -  }
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-vlog_f16c-no-avx2-no-fma_standalone") {
++  source_set("f16-vlog_x64_standalone") {
 +    cflags = [
-+      "-mf16c",
-+    "-mno-avx2",
-+    "-mno-fma"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vlog/gen/f16-f32acc-vlog-f16c-rational-1-3-div.c"
++      "src/src/f16-vlog/gen/f16-f32acc-vlog-scalar-rational-1-3-div.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -18270,14 +18844,16 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f16-vlog_x64") {
++  source_set("f16-vlrelu_f16c-no-avx2-no-fma") {
 +    cflags = [
-+  
++      "-mf16c",
++    "-mno-avx2",
++    "-mno-fma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vlog/gen/f16-f32acc-vlog-scalar-rational-1-3-div.c"
++      "src/src/f16-vlrelu/gen/f16-vlrelu-f16c-u16.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -18335,14 +18911,16 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-vlog_x64_standalone") {
++  source_set("f16-vlrelu_f16c-no-avx2-no-fma_standalone") {
 +    cflags = [
-+  
++      "-mf16c",
++    "-mno-avx2",
++    "-mno-fma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vlog/gen/f16-f32acc-vlog-scalar-rational-1-3-div.c"
++      "src/src/f16-vlrelu/gen/f16-vlrelu-f16c-u16.c"
 +    ]
  
 -      sources = [
@@ -18410,16 +18988,16 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f16-vlrelu_f16c-no-avx2-no-fma") {
++  source_set("f16-vmulcaddc_f16c-fma-no-avx2") {
 +    cflags = [
 +      "-mf16c",
-+    "-mno-avx2",
-+    "-mno-fma"
++    "-mfma",
++    "-mno-avx2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vlrelu/gen/f16-vlrelu-f16c-u16.c"
++      "src/src/f16-vmulcaddc/gen/f16-vmulcaddc-c8-minmax-fma3-2x.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -18506,16 +19084,16 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -      cflags = [ "-mavx512f" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-vlrelu_f16c-no-avx2-no-fma_standalone") {
++  source_set("f16-vmulcaddc_f16c-fma-no-avx2_standalone") {
 +    cflags = [
 +      "-mf16c",
-+    "-mno-avx2",
-+    "-mno-fma"
++    "-mfma",
++    "-mno-avx2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vlrelu/gen/f16-vlrelu-f16c-u16.c"
++      "src/src/f16-vmulcaddc/gen/f16-vmulcaddc-c8-minmax-fma3-2x.c"
 +    ]
  
 -      sources = [
@@ -18585,16 +19163,19 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f16-vmulcaddc_f16c-fma-no-avx2") {
++  source_set("f16-vrnd_f16c-no-avx2-no-fma") {
 +    cflags = [
 +      "-mf16c",
-+    "-mfma",
-+    "-mno-avx2"
++    "-mno-avx2",
++    "-mno-fma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vmulcaddc/gen/f16-vmulcaddc-c8-minmax-fma3-2x.c"
++      "src/src/f16-vrnd/gen/f16-vrndd-f16c-u16.c",
++    "src/src/f16-vrnd/gen/f16-vrndne-f16c-u16.c",
++    "src/src/f16-vrnd/gen/f16-vrndu-f16c-u16.c",
++    "src/src/f16-vrnd/gen/f16-vrndz-f16c-u16.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -18677,16 +19258,19 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-vmulcaddc_f16c-fma-no-avx2_standalone") {
++  source_set("f16-vrnd_f16c-no-avx2-no-fma_standalone") {
 +    cflags = [
 +      "-mf16c",
-+    "-mfma",
-+    "-mno-avx2"
++    "-mno-avx2",
++    "-mno-fma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vmulcaddc/gen/f16-vmulcaddc-c8-minmax-fma3-2x.c"
++      "src/src/f16-vrnd/gen/f16-vrndd-f16c-u16.c",
++    "src/src/f16-vrnd/gen/f16-vrndne-f16c-u16.c",
++    "src/src/f16-vrnd/gen/f16-vrndu-f16c-u16.c",
++    "src/src/f16-vrnd/gen/f16-vrndz-f16c-u16.c"
 +    ]
  
 -      sources = [
@@ -18756,7 +19340,7 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f16-vrnd_f16c-no-avx2-no-fma") {
++  source_set("f16-vrsqrt_f16c-no-avx2-no-fma") {
 +    cflags = [
 +      "-mf16c",
 +    "-mno-avx2",
@@ -18765,10 +19349,7 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vrnd/gen/f16-vrndd-f16c-u16.c",
-+    "src/src/f16-vrnd/gen/f16-vrndne-f16c-u16.c",
-+    "src/src/f16-vrnd/gen/f16-vrndu-f16c-u16.c",
-+    "src/src/f16-vrnd/gen/f16-vrndz-f16c-u16.c"
++      "src/src/f16-vrsqrt/gen/f16-vrsqrt-f16c-rsqrt-u32.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -18853,7 +19434,7 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -      cflags = [ "-mavx512f" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-vrnd_f16c-no-avx2-no-fma_standalone") {
++  source_set("f16-vrsqrt_f16c-no-avx2-no-fma_standalone") {
 +    cflags = [
 +      "-mf16c",
 +    "-mno-avx2",
@@ -18862,10 +19443,7 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vrnd/gen/f16-vrndd-f16c-u16.c",
-+    "src/src/f16-vrnd/gen/f16-vrndne-f16c-u16.c",
-+    "src/src/f16-vrnd/gen/f16-vrndu-f16c-u16.c",
-+    "src/src/f16-vrnd/gen/f16-vrndz-f16c-u16.c"
++      "src/src/f16-vrsqrt/gen/f16-vrsqrt-f16c-rsqrt-u32.c"
 +    ]
  
 -      sources = [
@@ -18933,16 +19511,16 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f16-vrsqrt_f16c-no-avx2-no-fma") {
++  source_set("f16-vsigmoid_f16c-fma-avx2") {
 +    cflags = [
-+      "-mf16c",
-+    "-mno-avx2",
-+    "-mno-fma"
++      "-mavx2",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vrsqrt/gen/f16-vrsqrt-f16c-rsqrt-u32.c"
++      "src/src/f16-vsigmoid/gen/f16-vsigmoid-avx2-rr1-p2-rcp-u32.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -19023,16 +19601,16 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-vrsqrt_f16c-no-avx2-no-fma_standalone") {
++  source_set("f16-vsigmoid_f16c-fma-avx2_standalone") {
 +    cflags = [
-+      "-mf16c",
-+    "-mno-avx2",
-+    "-mno-fma"
++      "-mavx2",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vrsqrt/gen/f16-vrsqrt-f16c-rsqrt-u32.c"
++      "src/src/f16-vsigmoid/gen/f16-vsigmoid-avx2-rr1-p2-rcp-u32.c"
 +    ]
  
 -      sources = [
@@ -19100,16 +19678,14 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f16-vsigmoid_f16c-fma-avx2") {
++  source_set("f16-vsin_avx512f") {
 +    cflags = [
-+      "-mavx2",
-+    "-mf16c",
-+    "-mfma"
++      "-mavx512f"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vsigmoid/gen/f16-vsigmoid-avx2-rr1-p2-rcp-u32.c"
++      "src/src/f16-vsin/gen/f16-f32acc-vsin-avx512f-poly-3.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -19194,16 +19770,14 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -      cflags = [ "-mavx512f" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-vsigmoid_f16c-fma-avx2_standalone") {
++  source_set("f16-vsin_avx512f_standalone") {
 +    cflags = [
-+      "-mavx2",
-+    "-mf16c",
-+    "-mfma"
++      "-mavx512f"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vsigmoid/gen/f16-vsigmoid-avx2-rr1-p2-rcp-u32.c"
++      "src/src/f16-vsin/gen/f16-f32acc-vsin-avx512f-poly-3.c"
 +    ]
  
 -      sources = [
@@ -19271,14 +19845,23 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f16-vsin_avx512f") {
++  source_set("f16-vsin_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni-avx512fp16") {
 +    cflags = [
-+      "-mavx512f"
++      "-mavx512bw",
++    "-mavx512cd",
++    "-mavx512dq",
++    "-mavx512f",
++    "-mavx512fp16",
++    "-mavx512vl",
++    "-mavx512vnni",
++    "-mf16c",
++    "-mfma",
++    "-mgfni"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vsin/gen/f16-f32acc-vsin-avx512f-poly-3.c"
++      "src/src/f16-vsin/gen/f16-vsin-avx512fp16-poly-3.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -19359,14 +19942,23 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-vsin_avx512f_standalone") {
++  source_set("f16-vsin_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni-avx512fp16_standalone") {
 +    cflags = [
-+      "-mavx512f"
++      "-mavx512bw",
++    "-mavx512cd",
++    "-mavx512dq",
++    "-mavx512f",
++    "-mavx512fp16",
++    "-mavx512vl",
++    "-mavx512vnni",
++    "-mf16c",
++    "-mfma",
++    "-mgfni"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vsin/gen/f16-f32acc-vsin-avx512f-poly-3.c"
++      "src/src/f16-vsin/gen/f16-vsin-avx512fp16-poly-3.c"
 +    ]
  
 -      sources = [
@@ -19434,23 +20026,16 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f16-vsin_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni-avx512fp16") {
++  source_set("f16-vsin_f16c-no-avx2-no-fma") {
 +    cflags = [
-+      "-mavx512bw",
-+    "-mavx512cd",
-+    "-mavx512dq",
-+    "-mavx512f",
-+    "-mavx512fp16",
-+    "-mavx512vl",
-+    "-mavx512vnni",
-+    "-mf16c",
-+    "-mfma",
-+    "-mgfni"
++      "-mf16c",
++    "-mno-avx2",
++    "-mno-fma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vsin/gen/f16-vsin-avx512fp16-poly-3.c"
++      "src/src/f16-vsin/gen/f16-f32acc-vsin-f16c-poly-3.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -19539,23 +20124,16 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -      cflags = [ "-mavx512f" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-vsin_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni-avx512fp16_standalone") {
++  source_set("f16-vsin_f16c-no-avx2-no-fma_standalone") {
 +    cflags = [
-+      "-mavx512bw",
-+    "-mavx512cd",
-+    "-mavx512dq",
-+    "-mavx512f",
-+    "-mavx512fp16",
-+    "-mavx512vl",
-+    "-mavx512vnni",
-+    "-mf16c",
-+    "-mfma",
-+    "-mgfni"
++      "-mf16c",
++    "-mno-avx2",
++    "-mno-fma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vsin/gen/f16-vsin-avx512fp16-poly-3.c"
++      "src/src/f16-vsin/gen/f16-f32acc-vsin-f16c-poly-3.c"
 +    ]
  
 -      sources = [
@@ -19627,16 +20205,14 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f16-vsin_f16c-no-avx2-no-fma") {
++  source_set("f16-vsin_x64") {
 +    cflags = [
-+      "-mf16c",
-+    "-mno-avx2",
-+    "-mno-fma"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vsin/gen/f16-f32acc-vsin-f16c-poly-3.c"
++      "src/src/f16-vsin/gen/f16-f32acc-vsin-scalar-poly-3.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -19721,16 +20297,14 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-vsin_f16c-no-avx2-no-fma_standalone") {
++  source_set("f16-vsin_x64_standalone") {
 +    cflags = [
-+      "-mf16c",
-+    "-mno-avx2",
-+    "-mno-fma"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vsin/gen/f16-f32acc-vsin-f16c-poly-3.c"
++      "src/src/f16-vsin/gen/f16-f32acc-vsin-scalar-poly-3.c"
 +    ]
  
 -      sources = [
@@ -19802,14 +20376,16 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f16-vsin_x64") {
++  source_set("f16-vsqrt_f16c-no-avx2-no-fma") {
 +    cflags = [
-+  
++      "-mf16c",
++    "-mno-avx2",
++    "-mno-fma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vsin/gen/f16-f32acc-vsin-scalar-poly-3.c"
++      "src/src/f16-vsqrt/gen/f16-vsqrt-f16c-rsqrt-u32.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -19894,14 +20470,16 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -      cflags = [ "-mavx512f" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-vsin_x64_standalone") {
++  source_set("f16-vsqrt_f16c-no-avx2-no-fma_standalone") {
 +    cflags = [
-+  
++      "-mf16c",
++    "-mno-avx2",
++    "-mno-fma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vsin/gen/f16-f32acc-vsin-scalar-poly-3.c"
++      "src/src/f16-vsqrt/gen/f16-vsqrt-f16c-rsqrt-u32.c"
 +    ]
  
 -      sources = [
@@ -19969,16 +20547,14 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f16-vsqrt_f16c-no-avx2-no-fma") {
++  source_set("f16-vsqrt_x64") {
 +    cflags = [
-+      "-mf16c",
-+    "-mno-avx2",
-+    "-mno-fma"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vsqrt/gen/f16-vsqrt-f16c-rsqrt-u32.c"
++      "src/src/f16-vsqrt/gen/f16-vsqrt-scalar-sqrt.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -20059,16 +20635,14 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-vsqrt_f16c-no-avx2-no-fma_standalone") {
++  source_set("f16-vsqrt_x64_standalone") {
 +    cflags = [
-+      "-mf16c",
-+    "-mno-avx2",
-+    "-mno-fma"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vsqrt/gen/f16-vsqrt-f16c-rsqrt-u32.c"
++      "src/src/f16-vsqrt/gen/f16-vsqrt-scalar-sqrt.c"
 +    ]
  
 -      sources = [
@@ -20136,14 +20710,14 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f16-vsqrt_x64") {
++  source_set("f16-vtanh_avx512f") {
 +    cflags = [
-+  
++      "-mavx512f"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vsqrt/gen/f16-vsqrt-scalar-sqrt.c"
++      "src/src/f16-vtanh/gen/f16-f32acc-vtanh-avx512f-rational-5-4-div.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -20228,14 +20802,14 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -      cflags = [ "-mavx512f" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-vsqrt_x64_standalone") {
++  source_set("f16-vtanh_avx512f_standalone") {
 +    cflags = [
-+  
++      "-mavx512f"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vsqrt/gen/f16-vsqrt-scalar-sqrt.c"
++      "src/src/f16-vtanh/gen/f16-f32acc-vtanh-avx512f-rational-5-4-div.c"
 +    ]
  
 -      sources = [
@@ -20303,14 +20877,23 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f16-vtanh_avx512f") {
++  source_set("f16-vtanh_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni-avx512fp16") {
 +    cflags = [
-+      "-mavx512f"
++      "-mavx512bw",
++    "-mavx512cd",
++    "-mavx512dq",
++    "-mavx512f",
++    "-mavx512fp16",
++    "-mavx512vl",
++    "-mavx512vnni",
++    "-mf16c",
++    "-mfma",
++    "-mgfni"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vtanh/gen/f16-f32acc-vtanh-avx512f-rational-5-4-div.c"
++      "src/src/f16-vtanh/gen/f16-vtanh-avx512fp16-rational-5-4-div.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -20391,14 +20974,23 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-vtanh_avx512f_standalone") {
++  source_set("f16-vtanh_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni-avx512fp16_standalone") {
 +    cflags = [
-+      "-mavx512f"
++      "-mavx512bw",
++    "-mavx512cd",
++    "-mavx512dq",
++    "-mavx512f",
++    "-mavx512fp16",
++    "-mavx512vl",
++    "-mavx512vnni",
++    "-mf16c",
++    "-mfma",
++    "-mgfni"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vtanh/gen/f16-f32acc-vtanh-avx512f-rational-5-4-div.c"
++      "src/src/f16-vtanh/gen/f16-vtanh-avx512fp16-rational-5-4-div.c"
 +    ]
  
 -      sources = [
@@ -20466,23 +21058,16 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f16-vtanh_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni-avx512fp16") {
++  source_set("f16-vtanh_f16c-no-avx2-no-fma") {
 +    cflags = [
-+      "-mavx512bw",
-+    "-mavx512cd",
-+    "-mavx512dq",
-+    "-mavx512f",
-+    "-mavx512fp16",
-+    "-mavx512vl",
-+    "-mavx512vnni",
-+    "-mf16c",
-+    "-mfma",
-+    "-mgfni"
++      "-mf16c",
++    "-mno-avx2",
++    "-mno-fma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vtanh/gen/f16-vtanh-avx512fp16-rational-5-4-div.c"
++      "src/src/f16-vtanh/gen/f16-f32acc-vtanh-f16c-rational-5-4-div.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -20563,23 +21148,16 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-vtanh_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni-avx512fp16_standalone") {
++  source_set("f16-vtanh_f16c-no-avx2-no-fma_standalone") {
 +    cflags = [
-+      "-mavx512bw",
-+    "-mavx512cd",
-+    "-mavx512dq",
-+    "-mavx512f",
-+    "-mavx512fp16",
-+    "-mavx512vl",
-+    "-mavx512vnni",
-+    "-mf16c",
-+    "-mfma",
-+    "-mgfni"
++      "-mf16c",
++    "-mno-avx2",
++    "-mno-fma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vtanh/gen/f16-vtanh-avx512fp16-rational-5-4-div.c"
++      "src/src/f16-vtanh/gen/f16-f32acc-vtanh-f16c-rational-5-4-div.c"
 +    ]
  
 -      sources = [
@@ -20651,16 +21229,14 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f16-vtanh_f16c-no-avx2-no-fma") {
++  source_set("f16-vtanh_x64") {
 +    cflags = [
-+      "-mf16c",
-+    "-mno-avx2",
-+    "-mno-fma"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vtanh/gen/f16-f32acc-vtanh-f16c-rational-5-4-div.c"
++      "src/src/f16-vtanh/gen/f16-f32acc-vtanh-scalar-rational-5-4-div.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -20745,16 +21321,14 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -      cflags = [ "-mavx512f" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-vtanh_f16c-no-avx2-no-fma_standalone") {
++  source_set("f16-vtanh_x64_standalone") {
 +    cflags = [
-+      "-mf16c",
-+    "-mno-avx2",
-+    "-mno-fma"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vtanh/gen/f16-f32acc-vtanh-f16c-rational-5-4-div.c"
++      "src/src/f16-vtanh/gen/f16-f32acc-vtanh-scalar-rational-5-4-div.c"
 +    ]
  
 -      sources = [
@@ -20797,14 +21371,16 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -    source_set("f32-vapproxgelu_avx512f_standalone") {
 -      cflags = [ "-mavx512f" ]
 +if (build_with_chromium) {
-+  source_set("f16-vtanh_x64") {
++  source_set("f16-vunary_f16c-no-avx2-no-fma") {
 +    cflags = [
-+  
++      "-mf16c",
++    "-mno-avx2",
++    "-mno-fma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vtanh/gen/f16-f32acc-vtanh-scalar-rational-5-4-div.c"
++      "src/src/f16-vunary/gen/f16-vsqr-f16c-u16.c"
 +    ]
  
 -      sources = [
@@ -20908,14 +21484,16 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -  }
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-vtanh_x64_standalone") {
++  source_set("f16-vunary_f16c-no-avx2-no-fma_standalone") {
 +    cflags = [
-+  
++      "-mf16c",
++    "-mno-avx2",
++    "-mno-fma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vtanh/gen/f16-f32acc-vtanh-scalar-rational-5-4-div.c"
++      "src/src/f16-vunary/gen/f16-vsqr-f16c-u16.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -21005,16 +21583,16 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -        "src/src/f32-vapproxgelu/gen/f32-vapproxgelu-scalar-rational-12-10-div.c",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f16-vunary_f16c-no-avx2-no-fma") {
++  source_set("f16-vunary_sse2-no-sse3") {
 +    cflags = [
-+      "-mf16c",
-+    "-mno-avx2",
-+    "-mno-fma"
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vunary/gen/f16-vsqr-f16c-u16.c"
++      "src/src/f16-vunary/gen/f16-vabs-sse2-u16.c",
++    "src/src/f16-vunary/gen/f16-vneg-sse2-u16.c"
 +    ]
  
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -21051,16 +21629,16 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-vunary_f16c-no-avx2-no-fma_standalone") {
++  source_set("f16-vunary_sse2-no-sse3_standalone") {
 +    cflags = [
-+      "-mf16c",
-+    "-mno-avx2",
-+    "-mno-fma"
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vunary/gen/f16-vsqr-f16c-u16.c"
++      "src/src/f16-vunary/gen/f16-vabs-sse2-u16.c",
++    "src/src/f16-vunary/gen/f16-vneg-sse2-u16.c"
 +    ]
  
 -      sources = [
@@ -21242,7 +21820,7 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f16-vunary_sse2-no-sse3") {
++  source_set("f32-argmaxpool_sse2-no-sse3") {
 +    cflags = [
 +      "-mno-sse3",
 +    "-msse2"
@@ -21250,8 +21828,7 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vunary/gen/f16-vabs-sse2-u16.c",
-+    "src/src/f16-vunary/gen/f16-vneg-sse2-u16.c"
++      "src/src/f32-argmaxpool/f32-argmaxpool-9p8x-sse2-c4.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -21358,7 +21935,7 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -      ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-vunary_sse2-no-sse3_standalone") {
++  source_set("f32-argmaxpool_sse2-no-sse3_standalone") {
 +    cflags = [
 +      "-mno-sse3",
 +    "-msse2"
@@ -21366,8 +21943,7 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vunary/gen/f16-vabs-sse2-u16.c",
-+    "src/src/f16-vunary/gen/f16-vneg-sse2-u16.c"
++      "src/src/f32-argmaxpool/f32-argmaxpool-9p8x-sse2-c4.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -21501,15 +22077,14 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f32-argmaxpool_sse2-no-sse3") {
++  source_set("f32-argmaxpool_x64") {
 +    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-argmaxpool/f32-argmaxpool-9p8x-sse2-c4.c"
++      "src/src/f32-argmaxpool/f32-argmaxpool-9p8x-scalar-c1.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -21573,15 +22148,14 @@ Index: chromium-153.0.8010.36/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_sse2-no-sse3_standalone") {
++  source_set("f32-argmaxpool_x64_standalone") {
 +    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-argmaxpool/f32-argmaxpool-9p8x-sse2-c4.c"
++      "src/src/f32-argmaxpool/f32-argmaxpool-9p8x-scalar-c1.c"
 +    ]
  
 -      sources = [
@@ -21715,14 +22289,17 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -        "src/src/f32-vclamp/gen/f32-vclamp-avx512f.c",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f32-argmaxpool_x64") {
++  source_set("f32-avgpool_avx-no-avx2-no-f16c-no-fma") {
 +    cflags = [
-+  
++      "-mavx",
++    "-mno-avx2",
++    "-mno-f16c",
++    "-mno-fma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-argmaxpool/f32-argmaxpool-9p8x-scalar-c1.c"
++      "src/src/f32-avgpool/gen/f32-avgpool-9p-minmax-avx-u8.c"
 +    ]
  
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -21759,14 +22336,17 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -      cflags = [ "-mavx512f" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-argmaxpool_x64_standalone") {
++  source_set("f32-avgpool_avx-no-avx2-no-f16c-no-fma_standalone") {
 +    cflags = [
-+  
++      "-mavx",
++    "-mno-avx2",
++    "-mno-f16c",
++    "-mno-fma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-argmaxpool/f32-argmaxpool-9p8x-scalar-c1.c"
++      "src/src/f32-avgpool/gen/f32-avgpool-9p-minmax-avx-u8.c"
 +    ]
  
 -      sources = [
@@ -21890,17 +22470,14 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f32-avgpool_avx-no-avx2-no-f16c-no-fma") {
++  source_set("f32-avgpool_avx512f") {
 +    cflags = [
-+      "-mavx",
-+    "-mno-avx2",
-+    "-mno-f16c",
-+    "-mno-fma"
++      "-mavx512f"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-avgpool/gen/f32-avgpool-9p-minmax-avx-u8.c"
++      "src/src/f32-avgpool/gen/f32-avgpool-9p-minmax-avx512f-u16.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -21954,17 +22531,14 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -      cflags = [ "-mavx512f" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-avgpool_avx-no-avx2-no-f16c-no-fma_standalone") {
++  source_set("f32-avgpool_avx512f_standalone") {
 +    cflags = [
-+      "-mavx",
-+    "-mno-avx2",
-+    "-mno-f16c",
-+    "-mno-fma"
++      "-mavx512f"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-avgpool/gen/f32-avgpool-9p-minmax-avx-u8.c"
++      "src/src/f32-avgpool/gen/f32-avgpool-9p-minmax-avx512f-u16.c"
 +    ]
  
 -      sources = [
@@ -22007,14 +22581,15 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -    source_set("f32-vcmul_avx512f_standalone") {
 -      cflags = [ "-mavx512f" ]
 +if (build_with_chromium) {
-+  source_set("f32-avgpool_avx512f") {
++  source_set("f32-avgpool_sse2-no-sse3") {
 +    cflags = [
-+      "-mavx512f"
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-avgpool/gen/f32-avgpool-9p-minmax-avx512f-u16.c"
++      "src/src/f32-avgpool/gen/f32-avgpool-9p-minmax-sse2-u4.c"
 +    ]
  
 -      sources = [
@@ -22118,14 +22693,15 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -  }
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-avgpool_avx512f_standalone") {
++  source_set("f32-avgpool_sse2-no-sse3_standalone") {
 +    cflags = [
-+      "-mavx512f"
++      "-mno-sse3",
++    "-msse2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-avgpool/gen/f32-avgpool-9p-minmax-avx512f-u16.c"
++      "src/src/f32-avgpool/gen/f32-avgpool-9p-minmax-sse2-u4.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -22213,15 +22789,14 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -        "src/src/f32-vcmul/gen/f32-vcmul-scalar-u4.c",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f32-avgpool_sse2-no-sse3") {
++  source_set("f32-avgpool_x64") {
 +    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-avgpool/gen/f32-avgpool-9p-minmax-sse2-u4.c"
++      "src/src/f32-avgpool/gen/f32-avgpool-9p-minmax-scalar-u1.c"
 +    ]
  
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -22258,15 +22833,14 @@ Index: chromium-153.0.8010.36/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_sse2-no-sse3_standalone") {
++  source_set("f32-avgpool_x64_standalone") {
 +    cflags = [
-+      "-mno-sse3",
-+    "-msse2"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-avgpool/gen/f32-avgpool-9p-minmax-sse2-u4.c"
++      "src/src/f32-avgpool/gen/f32-avgpool-9p-minmax-scalar-u1.c"
 +    ]
  
 -      sources = [
@@ -22388,14 +22962,20 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -        "src/src/f32-vcopysign/gen/f32-vrcopysignc-avx512f.c",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f32-avgpool_x64") {
++  source_set("f32-bf16-vcvt_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
 +    cflags = [
-+  
++      "-mavx512bw",
++    "-mavx512cd",
++    "-mavx512dq",
++    "-mavx512f",
++    "-mavx512vl",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-avgpool/gen/f32-avgpool-9p-minmax-scalar-u1.c"
++      "src/src/f32-bf16-vcvt/gen/f32-bf16-vcvt-avx512skx-u16.c"
 +    ]
  
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -22432,14 +23012,20 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -      cflags = [ "-mavx512f" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-avgpool_x64_standalone") {
++  source_set("f32-bf16-vcvt_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") {
 +    cflags = [
-+  
++      "-mavx512bw",
++    "-mavx512cd",
++    "-mavx512dq",
++    "-mavx512f",
++    "-mavx512vl",
++    "-mf16c",
++    "-mfma"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-avgpool/gen/f32-avgpool-9p-minmax-scalar-u1.c"
++      "src/src/f32-bf16-vcvt/gen/f32-bf16-vcvt-avx512skx-u16.c"
 +    ]
  
 -      sources = [
@@ -22559,20 +23145,23 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -        "src/src/f32-vcopysign/gen/f32-vrcopysignc-scalar.c",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f32-bf16-vcvt_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
++  source_set("f32-bf16-vcvt_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni-avx512bf16") {
 +    cflags = [
-+      "-mavx512bw",
++      "-mavx512bf16",
++    "-mavx512bw",
 +    "-mavx512cd",
 +    "-mavx512dq",
 +    "-mavx512f",
 +    "-mavx512vl",
++    "-mavx512vnni",
 +    "-mf16c",
-+    "-mfma"
++    "-mfma",
++    "-mgfni"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-bf16-vcvt/gen/f32-bf16-vcvt-avx512skx-u16.c"
++      "src/src/f32-bf16-vcvt/gen/f32-bf16-vcvt-avx512bf16-u16.c"
 +    ]
  
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -22609,20 +23198,23 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-bf16-vcvt_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") {
++  source_set("f32-bf16-vcvt_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni-avx512bf16_standalone") {
 +    cflags = [
-+      "-mavx512bw",
++      "-mavx512bf16",
++    "-mavx512bw",
 +    "-mavx512cd",
 +    "-mavx512dq",
 +    "-mavx512f",
 +    "-mavx512vl",
++    "-mavx512vnni",
 +    "-mf16c",
-+    "-mfma"
++    "-mfma",
++    "-mgfni"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-bf16-vcvt/gen/f32-bf16-vcvt-avx512skx-u16.c"
++      "src/src/f32-bf16-vcvt/gen/f32-bf16-vcvt-avx512bf16-u16.c"
 +    ]
  
 -      sources = [
@@ -22740,23 +23332,14 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -        "src/src/f32-vcos/gen/f32-vcos-avx512f-rational-5-4-div.c",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f32-bf16-vcvt_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni-avx512bf16") {
++  source_set("f32-bf16-vcvt_x64") {
 +    cflags = [
-+      "-mavx512bf16",
-+    "-mavx512bw",
-+    "-mavx512cd",
-+    "-mavx512dq",
-+    "-mavx512f",
-+    "-mavx512vl",
-+    "-mavx512vnni",
-+    "-mf16c",
-+    "-mfma",
-+    "-mgfni"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-bf16-vcvt/gen/f32-bf16-vcvt-avx512bf16-u16.c"
++      "src/src/f32-bf16-vcvt/gen/f32-bf16-vcvt-scalar-u2.c"
 +    ]
  
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -22793,23 +23376,14 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -      cflags = [ "-mavx512f" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-bf16-vcvt_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni-avx512bf16_standalone") {
++  source_set("f32-bf16-vcvt_x64_standalone") {
 +    cflags = [
-+      "-mavx512bf16",
-+    "-mavx512bw",
-+    "-mavx512cd",
-+    "-mavx512dq",
-+    "-mavx512f",
-+    "-mavx512vl",
-+    "-mavx512vnni",
-+    "-mf16c",
-+    "-mfma",
-+    "-mgfni"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-bf16-vcvt/gen/f32-bf16-vcvt-avx512bf16-u16.c"
++      "src/src/f32-bf16-vcvt/gen/f32-bf16-vcvt-scalar-u2.c"
 +    ]
  
 -      sources = [
@@ -22939,14 +23513,15 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f32-bf16-vcvt_x64") {
++  source_set("f32-conv-hwc2chw_sse-no-sse2") {
 +    cflags = [
-+  
++      "-mno-sse2",
++    "-msse"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-bf16-vcvt/gen/f32-bf16-vcvt-scalar-u2.c"
++      "src/src/f32-conv-hwc2chw/f32-conv-hwc2chw-3x3s2p1c3x4-sse-2x2.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -23005,14 +23580,15 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-bf16-vcvt_x64_standalone") {
++  source_set("f32-conv-hwc2chw_sse-no-sse2_standalone") {
 +    cflags = [
-+  
++      "-mno-sse2",
++    "-msse"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-bf16-vcvt/gen/f32-bf16-vcvt-scalar-u2.c"
++      "src/src/f32-conv-hwc2chw/f32-conv-hwc2chw-3x3s2p1c3x4-sse-2x2.c"
 +    ]
  
 -      sources = [
@@ -23080,15 +23656,14 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f32-conv-hwc2chw_sse-no-sse2") {
++  source_set("f32-conv-hwc2chw_x64") {
 +    cflags = [
-+      "-mno-sse2",
-+    "-msse"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-conv-hwc2chw/f32-conv-hwc2chw-3x3s2p1c3x4-sse-2x2.c"
++      "src/src/f32-conv-hwc2chw/f32-conv-hwc2chw-3x3s2p1c3x4-scalar-1x1.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -23173,15 +23748,14 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -      cflags = [ "-mavx512f" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-conv-hwc2chw_sse-no-sse2_standalone") {
++  source_set("f32-conv-hwc2chw_x64_standalone") {
 +    cflags = [
-+      "-mno-sse2",
-+    "-msse"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-conv-hwc2chw/f32-conv-hwc2chw-3x3s2p1c3x4-sse-2x2.c"
++      "src/src/f32-conv-hwc2chw/f32-conv-hwc2chw-3x3s2p1c3x4-scalar-1x1.c"
 +    ]
  
 -      sources = [
@@ -23224,14 +23798,18 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -    source_set("f32-velu_avx512f_standalone") {
 -      cflags = [ "-mavx512f" ]
 +if (build_with_chromium) {
-+  source_set("f32-conv-hwc2chw_x64") {
++  source_set("f32-dwconv2d-chw_sse-no-sse2") {
 +    cflags = [
-+  
++      "-mno-sse2",
++    "-msse"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-conv-hwc2chw/f32-conv-hwc2chw-3x3s2p1c3x4-scalar-1x1.c"
++      "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-3x3p1-minmax-sse-2x4-acc2.c",
++    "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-3x3s2p1-minmax-sse-1x4-acc3.c",
++    "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-5x5p2-minmax-sse-4x4.c",
++    "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-5x5s2p2-minmax-sse-2x4.c"
 +    ]
  
 -      sources = [
@@ -23335,14 +23913,18 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -  }
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-conv-hwc2chw_x64_standalone") {
++  source_set("f32-dwconv2d-chw_sse-no-sse2_standalone") {
 +    cflags = [
-+  
++      "-mno-sse2",
++    "-msse"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-conv-hwc2chw/f32-conv-hwc2chw-3x3s2p1c3x4-scalar-1x1.c"
++      "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-3x3p1-minmax-sse-2x4-acc2.c",
++    "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-3x3s2p1-minmax-sse-1x4-acc3.c",
++    "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-5x5p2-minmax-sse-4x4.c",
++    "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-5x5s2p2-minmax-sse-2x4.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -23430,18 +24012,15 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -        "src/src/f32-velu/gen/f32-velu-scalar-rr2-lut16-p3-u4.c",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f32-dwconv2d-chw_sse-no-sse2") {
++  source_set("f32-dwconv2d-chw_ssse3-no-sse4.1") {
 +    cflags = [
-+      "-mno-sse2",
-+    "-msse"
++      "-mno-sse4.1",
++    "-mssse3"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-3x3p1-minmax-sse-2x4-acc2.c",
-+    "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-3x3s2p1-minmax-sse-1x4-acc3.c",
-+    "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-5x5p2-minmax-sse-4x4.c",
-+    "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-5x5s2p2-minmax-sse-2x4.c"
++      "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-3x3p1-minmax-ssse3-2x4-acc2.c"
 +    ]
  
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -23478,18 +24057,15 @@ Index: chromium-153.0.8010.36/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_sse-no-sse2_standalone") {
++  source_set("f32-dwconv2d-chw_ssse3-no-sse4.1_standalone") {
 +    cflags = [
-+      "-mno-sse2",
-+    "-msse"
++      "-mno-sse4.1",
++    "-mssse3"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-3x3p1-minmax-sse-2x4-acc2.c",
-+    "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-3x3s2p1-minmax-sse-1x4-acc3.c",
-+    "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-5x5p2-minmax-sse-4x4.c",
-+    "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-5x5s2p2-minmax-sse-2x4.c"
++      "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-3x3p1-minmax-ssse3-2x4-acc2.c"
 +    ]
  
 -      sources = [
@@ -23605,15 +24181,21 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -        "src/src/f32-vexp/gen/f32-vexp-avx512f-rational-3-2-div.c",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f32-dwconv2d-chw_ssse3-no-sse4.1") {
++  source_set("f32-dwconv2d-chw_x64") {
 +    cflags = [
-+      "-mno-sse4.1",
-+    "-mssse3"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-3x3p1-minmax-ssse3-2x4-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"
 +    ]
  
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -23650,15 +24232,21 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -      cflags = [ "-mavx512f" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-dwconv2d-chw_ssse3-no-sse4.1_standalone") {
++  source_set("f32-dwconv2d-chw_x64_standalone") {
 +    cflags = [
-+      "-mno-sse4.1",
-+    "-mssse3"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-3x3p1-minmax-ssse3-2x4-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 = [
@@ -23788,21 +24376,20 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f32-dwconv2d-chw_x64") {
++  source_set("f32-dwconv_avx-no-avx2-no-f16c-no-fma") {
 +    cflags = [
-+  
++      "-mavx",
++    "-mno-avx2",
++    "-mno-f16c",
++    "-mno-fma"
 +    ]
 +  
 +    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-dwconv/gen/f32-dwconv-25p16c-minmax-avx.c",
++    "src/src/f32-dwconv/gen/f32-dwconv-3p16c-minmax-avx.c",
++    "src/src/f32-dwconv/gen/f32-dwconv-4p16c-minmax-avx.c",
++    "src/src/f32-dwconv/gen/f32-dwconv-9p16c-minmax-avx.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -23861,21 +24448,20 @@ Index: chromium-153.0.8010.36/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_x64_standalone") {
++  source_set("f32-dwconv_avx-no-avx2-no-f16c-no-fma_standalone") {
 +    cflags = [
-+  
++      "-mavx",
++    "-mno-avx2",
++    "-mno-f16c",
++    "-mno-fma"
 +    ]
 +  
 +    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-dwconv/gen/f32-dwconv-25p16c-minmax-avx.c",
++    "src/src/f32-dwconv/gen/f32-dwconv-3p16c-minmax-avx.c",
++    "src/src/f32-dwconv/gen/f32-dwconv-4p16c-minmax-avx.c",
++    "src/src/f32-dwconv/gen/f32-dwconv-9p16c-minmax-avx.c"
 +    ]
  
 -      sources = [
@@ -23943,20 +24529,17 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f32-dwconv_avx-no-avx2-no-f16c-no-fma") {
++  source_set("f32-dwconv_avx512f") {
 +    cflags = [
-+      "-mavx",
-+    "-mno-avx2",
-+    "-mno-f16c",
-+    "-mno-fma"
++      "-mavx512f"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-dwconv/gen/f32-dwconv-25p16c-minmax-avx.c",
-+    "src/src/f32-dwconv/gen/f32-dwconv-3p16c-minmax-avx.c",
-+    "src/src/f32-dwconv/gen/f32-dwconv-4p16c-minmax-avx.c",
-+    "src/src/f32-dwconv/gen/f32-dwconv-9p16c-minmax-avx.c"
++      "src/src/f32-dwconv/gen/f32-dwconv-25p16c-minmax-avx512f.c",
++    "src/src/f32-dwconv/gen/f32-dwconv-3p16c-minmax-avx512f.c",
++    "src/src/f32-dwconv/gen/f32-dwconv-4p16c-minmax-avx512f.c",
++    "src/src/f32-dwconv/gen/f32-dwconv-9p16c-minmax-avx512f.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -24041,20 +24624,17 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -      cflags = [ "-mavx512f" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-dwconv_avx-no-avx2-no-f16c-no-fma_standalone") {
++  source_set("f32-dwconv_avx512f_standalone") {
 +    cflags = [
-+      "-mavx",
-+    "-mno-avx2",
-+    "-mno-f16c",
-+    "-mno-fma"
++      "-mavx512f"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-dwconv/gen/f32-dwconv-25p16c-minmax-avx.c",
-+    "src/src/f32-dwconv/gen/f32-dwconv-3p16c-minmax-avx.c",
-+    "src/src/f32-dwconv/gen/f32-dwconv-4p16c-minmax-avx.c",
-+    "src/src/f32-dwconv/gen/f32-dwconv-9p16c-minmax-avx.c"
++      "src/src/f32-dwconv/gen/f32-dwconv-25p16c-minmax-avx512f.c",
++    "src/src/f32-dwconv/gen/f32-dwconv-3p16c-minmax-avx512f.c",
++    "src/src/f32-dwconv/gen/f32-dwconv-4p16c-minmax-avx512f.c",
++    "src/src/f32-dwconv/gen/f32-dwconv-9p16c-minmax-avx512f.c"
 +    ]
  
 -      sources = [
@@ -24097,17 +24677,19 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -    source_set("f32-vgelu_avx512f_standalone") {
 -      cflags = [ "-mavx512f" ]
 +if (build_with_chromium) {
-+  source_set("f32-dwconv_avx512f") {
++  source_set("f32-dwconv_f16c-fma-no-avx2") {
 +    cflags = [
-+      "-mavx512f"
++      "-mf16c",
++    "-mfma",
++    "-mno-avx2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-dwconv/gen/f32-dwconv-25p16c-minmax-avx512f.c",
-+    "src/src/f32-dwconv/gen/f32-dwconv-3p16c-minmax-avx512f.c",
-+    "src/src/f32-dwconv/gen/f32-dwconv-4p16c-minmax-avx512f.c",
-+    "src/src/f32-dwconv/gen/f32-dwconv-9p16c-minmax-avx512f.c"
++      "src/src/f32-dwconv/gen/f32-dwconv-25p16c-minmax-fma3.c",
++    "src/src/f32-dwconv/gen/f32-dwconv-3p16c-minmax-fma3.c",
++    "src/src/f32-dwconv/gen/f32-dwconv-4p16c-minmax-fma3.c",
++    "src/src/f32-dwconv/gen/f32-dwconv-9p16c-minmax-fma3.c"
 +    ]
  
 -      sources = [
@@ -24211,17 +24793,19 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -  }
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-dwconv_avx512f_standalone") {
++  source_set("f32-dwconv_f16c-fma-no-avx2_standalone") {
 +    cflags = [
-+      "-mavx512f"
++      "-mf16c",
++    "-mfma",
++    "-mno-avx2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-dwconv/gen/f32-dwconv-25p16c-minmax-avx512f.c",
-+    "src/src/f32-dwconv/gen/f32-dwconv-3p16c-minmax-avx512f.c",
-+    "src/src/f32-dwconv/gen/f32-dwconv-4p16c-minmax-avx512f.c",
-+    "src/src/f32-dwconv/gen/f32-dwconv-9p16c-minmax-avx512f.c"
++      "src/src/f32-dwconv/gen/f32-dwconv-25p16c-minmax-fma3.c",
++    "src/src/f32-dwconv/gen/f32-dwconv-3p16c-minmax-fma3.c",
++    "src/src/f32-dwconv/gen/f32-dwconv-4p16c-minmax-fma3.c",
++    "src/src/f32-dwconv/gen/f32-dwconv-9p16c-minmax-fma3.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -24311,19 +24895,18 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -        "src/src/f32-vgelu/gen/f32-vgelu-scalar-rational-12-10-div.c",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f32-dwconv_f16c-fma-no-avx2") {
++  source_set("f32-dwconv_sse-no-sse2") {
 +    cflags = [
-+      "-mf16c",
-+    "-mfma",
-+    "-mno-avx2"
++      "-mno-sse2",
++    "-msse"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-dwconv/gen/f32-dwconv-25p16c-minmax-fma3.c",
-+    "src/src/f32-dwconv/gen/f32-dwconv-3p16c-minmax-fma3.c",
-+    "src/src/f32-dwconv/gen/f32-dwconv-4p16c-minmax-fma3.c",
-+    "src/src/f32-dwconv/gen/f32-dwconv-9p16c-minmax-fma3.c"
++      "src/src/f32-dwconv/gen/f32-dwconv-25p8c-minmax-sse.c",
++    "src/src/f32-dwconv/gen/f32-dwconv-3p8c-minmax-sse.c",
++    "src/src/f32-dwconv/gen/f32-dwconv-4p8c-minmax-sse.c",
++    "src/src/f32-dwconv/gen/f32-dwconv-9p8c-minmax-sse.c"
 +    ]
  
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -24360,19 +24943,18 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-dwconv_f16c-fma-no-avx2_standalone") {
++  source_set("f32-dwconv_sse-no-sse2_standalone") {
 +    cflags = [
-+      "-mf16c",
-+    "-mfma",
-+    "-mno-avx2"
++      "-mno-sse2",
++    "-msse"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-dwconv/gen/f32-dwconv-25p16c-minmax-fma3.c",
-+    "src/src/f32-dwconv/gen/f32-dwconv-3p16c-minmax-fma3.c",
-+    "src/src/f32-dwconv/gen/f32-dwconv-4p16c-minmax-fma3.c",
-+    "src/src/f32-dwconv/gen/f32-dwconv-9p16c-minmax-fma3.c"
++      "src/src/f32-dwconv/gen/f32-dwconv-25p8c-minmax-sse.c",
++    "src/src/f32-dwconv/gen/f32-dwconv-3p8c-minmax-sse.c",
++    "src/src/f32-dwconv/gen/f32-dwconv-4p8c-minmax-sse.c",
++    "src/src/f32-dwconv/gen/f32-dwconv-9p8c-minmax-sse.c"
 +    ]
  
 -      sources = [
@@ -24488,18 +25070,23 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -        "src/src/f32-vhswish/gen/f32-vhswish-avx512f.c",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f32-dwconv_sse-no-sse2") {
++  source_set("f32-dwconv_x64") {
 +    cflags = [
-+      "-mno-sse2",
-+    "-msse"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-dwconv/gen/f32-dwconv-25p8c-minmax-sse.c",
-+    "src/src/f32-dwconv/gen/f32-dwconv-3p8c-minmax-sse.c",
-+    "src/src/f32-dwconv/gen/f32-dwconv-4p8c-minmax-sse.c",
-+    "src/src/f32-dwconv/gen/f32-dwconv-9p8c-minmax-sse.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"
 +    ]
  
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -24536,18 +25123,23 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -      cflags = [ "-mavx512f" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-dwconv_sse-no-sse2_standalone") {
++  source_set("f32-dwconv_x64_standalone") {
 +    cflags = [
-+      "-mno-sse2",
-+    "-msse"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-dwconv/gen/f32-dwconv-25p8c-minmax-sse.c",
-+    "src/src/f32-dwconv/gen/f32-dwconv-3p8c-minmax-sse.c",
-+    "src/src/f32-dwconv/gen/f32-dwconv-4p8c-minmax-sse.c",
-+    "src/src/f32-dwconv/gen/f32-dwconv-9p8c-minmax-sse.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 = [
@@ -24676,34 +25268,24 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -        "//third_party/fxdiv",
 -        "//third_party/pthreadpool",
 -      ]
+-
+-      public_configs = [ ":xnnpack_public_config" ]
+-    }
+-  }
 +if (build_with_chromium) {
-+  source_set("f32-dwconv_x64") {
++  source_set("f32-f16-vcvt_avx-no-avx2-no-f16c-no-fma") {
 +    cflags = [
-+  
++      "-mavx",
++    "-mno-avx2",
++    "-mno-f16c",
++    "-mno-fma"
 +    ]
 +  
 +    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-f16-vcvt/gen/f32-f16-vcvt-avx-u24.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-vhswish_sse2-no-sse3_standalone") {
@@ -24736,54 +25318,63 @@ Index: chromium-153.0.8010.36/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-vhswish_x64") {
+-      cflags = []
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
 +      "//third_party/fxdiv",
 +      "//third_party/pthreadpool",
 +    ]
-+
+ 
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/f32-vhswish/gen/f32-vhswish-scalar.c",
+-      ]
 +    public_configs = [ ":xnnpack_public_config" ]
-   }
++  }
 +}
  
--  if (build_with_chromium) {
--    source_set("f32-vhswish_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" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-dwconv_x64_standalone") {
++  source_set("f32-f16-vcvt_avx-no-avx2-no-f16c-no-fma_standalone") {
 +    cflags = [
-+  
++      "-mavx",
++    "-mno-avx2",
++    "-mno-f16c",
++    "-mno-fma"
 +    ]
 +  
 +    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-f16-vcvt/gen/f32-f16-vcvt-avx-u24.c"
 +    ]
  
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/f32-vhswish/gen/f32-vhswish-scalar.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" ]
  
--      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",
@@ -24791,38 +25382,11 @@ Index: chromium-153.0.8010.36/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("f32-vhswish_x64_standalone") {
 -      cflags = []
-+if (build_with_chromium) {
-+  source_set("f32-f16-vcvt_avx-no-avx2-no-f16c-no-fma") {
-+    cflags = [
-+      "-mavx",
-+    "-mno-avx2",
-+    "-mno-f16c",
-+    "-mno-fma"
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/f32-f16-vcvt/gen/f32-f16-vcvt-avx-u24.c"
-+    ]
++    public_configs = [ ":xnnpack_public_config" ]
  
 -      sources = [
 -        "src/include/xnnpack.h",
@@ -24846,79 +25410,14 @@ Index: chromium-153.0.8010.36/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 (build_with_chromium) {
--    source_set("f32-vlog_avx512f") {
--      cflags = [ "-mavx512f" ]
-+# This is a target that cannot depend on //base.
-+if (build_with_internal_optimization_guide) {
-+  source_set("f32-f16-vcvt_avx-no-avx2-no-f16c-no-fma_standalone") {
-+    cflags = [
-+      "-mavx",
-+    "-mno-avx2",
-+    "-mno-f16c",
-+    "-mno-fma"
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/f32-f16-vcvt/gen/f32-f16-vcvt-avx-u24.c"
-+    ]
- 
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/f32-vlog/gen/f32-vlog-avx512f-rational-3-3-div.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("f32-vlog_avx512f_standalone") {
+-  if (build_with_chromium) {
+-    source_set("f32-vlog_avx512f") {
 -      cflags = [ "-mavx512f" ]
 +if (build_with_chromium) {
 +  source_set("f32-f16-vcvt_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
@@ -24936,106 +25435,23 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +      "src/include/xnnpack.h",
 +      "src/src/f32-f16-vcvt/gen/f32-f16-vcvt-avx512skx-u16.c"
 +    ]
- 
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/f32-vlog/gen/f32-vlog-avx512f-rational-3-3-div.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("f32-vlog_f16c-fma-avx2") {
--      cflags = [
--        "-mavx2",
--        "-mf16c",
--        "-mfma",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/f32-vlog/gen/f32-vlog-avx2-rational-3-3-div.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) {
--    source_set("f32-vlog_f16c-fma-avx2_standalone") {
--      cflags = [
--        "-mavx2",
--        "-mf16c",
--        "-mfma",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/f32-vlog/gen/f32-vlog-avx2-rational-3-3-div.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-f16-vcvt_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") {
@@ -25053,109 +25469,27 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +      "src/include/xnnpack.h",
 +      "src/src/f32-f16-vcvt/gen/f32-f16-vcvt-avx512skx-u16.c"
 +    ]
- 
--  if (build_with_chromium) {
--    source_set("f32-vlog_f16c-fma-no-avx2") {
--      cflags = [
--        "-mf16c",
--        "-mfma",
--        "-mno-avx2",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/f32-vlog/gen/f32-vlog-fma3-rational-3-3-div.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-vlog_f16c-fma-no-avx2_standalone") {
--      cflags = [
--        "-mf16c",
--        "-mfma",
--        "-mno-avx2",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/f32-vlog/gen/f32-vlog-fma3-rational-3-3-div.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" ]
-     }
-   }
++    }
++  }
 +}
- 
--  if (build_with_chromium) {
--    source_set("f32-vlog_sse2-no-sse3") {
--      cflags = [
--        "-mno-sse3",
--        "-msse2",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/f32-vlog/gen/f32-vlog-sse2-rational-3-3-div.c",
--        "src/src/f32-vlog/gen/f32-vlog-sse2fma-rational-3-3-div.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-f16-vcvt_f16c-no-avx2-no-fma") {
 +    cflags = [
@@ -25168,47 +25502,12 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +      "src/include/xnnpack.h",
 +      "src/src/f32-f16-vcvt/gen/f32-f16-vcvt-f16c-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("f32-vlog_sse2-no-sse3_standalone") {
--      cflags = [
--        "-mno-sse3",
--        "-msse2",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/f32-vlog/gen/f32-vlog-sse2-rational-3-3-div.c",
--        "src/src/f32-vlog/gen/f32-vlog-sse2fma-rational-3-3-div.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" ]
--      }
--    }
++
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
@@ -25217,12 +25516,9 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +    ]
 +
 +    public_configs = [ ":xnnpack_public_config" ]
-   }
++  }
 +}
- 
--  if (build_with_chromium) {
--    source_set("f32-vlog_x64") {
--      cflags = []
++
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
 +  source_set("f32-f16-vcvt_f16c-no-avx2-no-fma_standalone") {
@@ -25236,71 +25532,27 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +      "src/include/xnnpack.h",
 +      "src/src/f32-f16-vcvt/gen/f32-f16-vcvt-f16c-u16.c"
 +    ]
- 
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/f32-vlog/gen/f32-vlog-scalar-rational-3-3-div.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("f32-vlog_x64_standalone") {
--      cflags = []
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/f32-vlog/gen/f32-vlog-scalar-rational-3-3-div.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-f16-vcvt_sse2-no-sse3") {
 +    cflags = [
@@ -25312,87 +25564,23 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +      "src/include/xnnpack.h",
 +      "src/src/f32-f16-vcvt/gen/f32-f16-vcvt-sse2-u16.c"
 +    ]
- 
--  if (build_with_chromium) {
--    source_set("f32-vlrelu_avx-no-avx2-no-f16c-no-fma") {
--      cflags = [
--        "-mavx",
--        "-mno-avx2",
--        "-mno-f16c",
--        "-mno-fma",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/f32-vlrelu/gen/f32-vlrelu-avx-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",
--      ]
++
 +    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("f32-vlrelu_avx-no-avx2-no-f16c-no-fma_standalone") {
--      cflags = [
--        "-mavx",
--        "-mno-avx2",
--        "-mno-f16c",
--        "-mno-fma",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/f32-vlrelu/gen/f32-vlrelu-avx-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" ]
--      }
--    }
++
 +    public_configs = [ ":xnnpack_public_config" ]
-   }
++  }
 +}
- 
--  if (build_with_chromium) {
--    source_set("f32-vlrelu_avx512f") {
--      cflags = [ "-mavx512f" ]
++
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
 +  source_set("f32-f16-vcvt_sse2-no-sse3_standalone") {
@@ -25405,46 +25593,27 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +      "src/include/xnnpack.h",
 +      "src/src/f32-f16-vcvt/gen/f32-f16-vcvt-sse2-u16.c"
 +    ]
- 
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/f32-vlrelu/gen/f32-vlrelu-avx512f-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" ]
- 
--      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("f32-vlrelu_avx512f_standalone") {
--      cflags = [ "-mavx512f" ]
++
 +if (build_with_chromium) {
 +  source_set("f32-f16-vcvt_sse4.1-no-sse4.2") {
 +    cflags = [
@@ -25456,104 +25625,23 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +      "src/include/xnnpack.h",
 +      "src/src/f32-f16-vcvt/gen/f32-f16-vcvt-sse41-u8.c"
 +    ]
- 
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/f32-vlrelu/gen/f32-vlrelu-avx512f-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" ]
--      }
--    }
--  }
++
 +    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-vlrelu_sse-no-sse2") {
--      cflags = [
--        "-mno-sse2",
--        "-msse",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/f32-vlrelu/gen/f32-vlrelu-sse-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" ]
--
--      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) {
--    source_set("f32-vlrelu_sse-no-sse2_standalone") {
--      cflags = [
--        "-mno-sse2",
--        "-msse",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/f32-vlrelu/gen/f32-vlrelu-sse-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" ]
--
--      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-f16-vcvt_sse4.1-no-sse4.2_standalone") {
@@ -25566,91 +25654,27 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +      "src/include/xnnpack.h",
 +      "src/src/f32-f16-vcvt/gen/f32-f16-vcvt-sse41-u8.c"
 +    ]
- 
--  if (build_with_chromium) {
--    source_set("f32-vlrelu_sse4.1-no-sse4.2") {
--      cflags = [
--        "-mno-sse4.2",
--        "-msse4.1",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/f32-vlrelu/gen/f32-vlrelu-sse41-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" ]
--
--      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-vlrelu_sse4.1-no-sse4.2_standalone") {
--      cflags = [
--        "-mno-sse4.2",
--        "-msse4.1",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/f32-vlrelu/gen/f32-vlrelu-sse41-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" ]
--
--      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" ]
-     }
-   }
++    }
++  }
 +}
- 
--  if (build_with_chromium) {
--    source_set("f32-vlrelu_x64") {
--      cflags = []
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/f32-vlrelu/gen/f32-vlrelu-scalar-u4.c",
--      ]
++
 +if (build_with_chromium) {
 +  source_set("f32-f16-vcvt_x64") {
 +    cflags = [
@@ -25661,39 +25685,23 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +      "src/include/xnnpack.h",
 +      "src/src/f32-f16-vcvt/gen/f32-f16-vcvt-scalar-fabsf-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",
 +    ]
- 
--      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_x64_standalone") {
--      cflags = []
++
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
 +  source_set("f32-f16-vcvt_x64_standalone") {
@@ -25705,115 +25713,27 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +      "src/include/xnnpack.h",
 +      "src/src/f32-f16-vcvt/gen/f32-f16-vcvt-scalar-fabsf-u2.c"
 +    ]
- 
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/f32-vlrelu/gen/f32-vlrelu-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" ]
--      }
--    }
--  }
++
 +    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-vmulcaddc_sse-no-sse2") {
--      cflags = [
--        "-mno-sse2",
--        "-msse",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/f32-vmulcaddc/gen/f32-vmulcaddc-c4-minmax-sse-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",
--      ]
++
 +    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" ]
- 
--  # This is a target that cannot depend on //base.
--  if (build_with_internal_optimization_guide) {
--    source_set("f32-vmulcaddc_sse-no-sse2_standalone") {
--      cflags = [
--        "-mno-sse2",
--        "-msse",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/f32-vmulcaddc/gen/f32-vmulcaddc-c4-minmax-sse-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: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-vmulcaddc_x64") {
--      cflags = []
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/f32-vmulcaddc/gen/f32-vmulcaddc-c1-minmax-scalar-2x.c",
--      ]
++
 +if (build_with_chromium) {
 +  source_set("f32-gemm_avx-no-avx2-no-f16c-no-fma") {
 +    cflags = [
@@ -25830,39 +25750,23 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +    "src/src/f32-gemm/gen/f32-gemm-5x16-minmax-avx-broadcast.c",
 +    "src/src/f32-gemm/gen/f32-gemm-5x8-minmax-avx-broadcast.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",
 +    ]
- 
--      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-vmulcaddc_x64_standalone") {
--      cflags = []
++
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
 +  source_set("f32-gemm_avx-no-avx2-no-f16c-no-fma_standalone") {
@@ -25880,140 +25784,27 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +    "src/src/f32-gemm/gen/f32-gemm-5x16-minmax-avx-broadcast.c",
 +    "src/src/f32-gemm/gen/f32-gemm-5x8-minmax-avx-broadcast.c"
 +    ]
- 
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/f32-vmulcaddc/gen/f32-vmulcaddc-c1-minmax-scalar-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: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("f32-vrnd_avx-no-avx2-no-f16c-no-fma") {
--      cflags = [
--        "-mavx",
--        "-mno-avx2",
--        "-mno-f16c",
--        "-mno-fma",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/f32-vrnd/gen/f32-vrndd-avx-u16.c",
--        "src/src/f32-vrnd/gen/f32-vrndne-avx-u16.c",
--        "src/src/f32-vrnd/gen/f32-vrndu-avx-u16.c",
--        "src/src/f32-vrnd/gen/f32-vrndz-avx-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",
--      ]
++
 +    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" ]
- 
--  # This is a target that cannot depend on //base.
--  if (build_with_internal_optimization_guide) {
--    source_set("f32-vrnd_avx-no-avx2-no-f16c-no-fma_standalone") {
--      cflags = [
--        "-mavx",
--        "-mno-avx2",
--        "-mno-f16c",
--        "-mno-fma",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/f32-vrnd/gen/f32-vrndd-avx-u16.c",
--        "src/src/f32-vrnd/gen/f32-vrndne-avx-u16.c",
--        "src/src/f32-vrnd/gen/f32-vrndu-avx-u16.c",
--        "src/src/f32-vrnd/gen/f32-vrndz-avx-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" ]
-     }
-   }
++    }
++  }
 +}
- 
--  if (build_with_chromium) {
--    source_set("f32-vrnd_avx512f") {
--      cflags = [ "-mavx512f" ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/f32-vrnd/gen/f32-vrndd-avx512f-u16.c",
--        "src/src/f32-vrnd/gen/f32-vrndne-avx512f-u16.c",
--        "src/src/f32-vrnd/gen/f32-vrndu-avx512f-u16.c",
--        "src/src/f32-vrnd/gen/f32-vrndz-avx512f-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",
--      ]
++
 +if (build_with_chromium) {
 +  source_set("f32-gemm_avx512f") {
 +    cflags = [
@@ -26027,82 +25818,23 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +    "src/src/f32-gemm/gen/f32-gemm-7x16-minmax-avx512f-broadcast.c",
 +    "src/src/f32-gemm/gen/f32-gemm-7x32-minmax-avx512f-broadcast.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-vrnd_avx512f_standalone") {
--      cflags = [ "-mavx512f" ]
++
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
 +      "//third_party/fxdiv",
 +      "//third_party/pthreadpool",
 +    ]
- 
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/f32-vrnd/gen/f32-vrndd-avx512f-u16.c",
--        "src/src/f32-vrnd/gen/f32-vrndne-avx512f-u16.c",
--        "src/src/f32-vrnd/gen/f32-vrndu-avx512f-u16.c",
--        "src/src/f32-vrnd/gen/f32-vrndz-avx512f-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" ]
--      }
--    }
++
 +    public_configs = [ ":xnnpack_public_config" ]
-   }
++  }
 +}
- 
--  if (build_with_chromium) {
--    source_set("f32-vrnd_sse2-no-sse3") {
--      cflags = [
--        "-mno-sse3",
--        "-msse2",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/f32-vrnd/gen/f32-vrndd-sse2-u8.c",
--        "src/src/f32-vrnd/gen/f32-vrndne-sse2-u8.c",
--        "src/src/f32-vrnd/gen/f32-vrndu-sse2-u8.c",
--        "src/src/f32-vrnd/gen/f32-vrndz-sse2-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" ]
--
--      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-gemm_avx512f_standalone") {
@@ -26117,127 +25849,27 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +    "src/src/f32-gemm/gen/f32-gemm-7x16-minmax-avx512f-broadcast.c",
 +    "src/src/f32-gemm/gen/f32-gemm-7x32-minmax-avx512f-broadcast.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-vrnd_sse2-no-sse3_standalone") {
--      cflags = [
--        "-mno-sse3",
--        "-msse2",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/f32-vrnd/gen/f32-vrndd-sse2-u8.c",
--        "src/src/f32-vrnd/gen/f32-vrndne-sse2-u8.c",
--        "src/src/f32-vrnd/gen/f32-vrndu-sse2-u8.c",
--        "src/src/f32-vrnd/gen/f32-vrndz-sse2-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" ]
--
--      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" ]
--      }
--    }
--  }
++
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
 +      "//third_party/fxdiv",
 +      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
- 
--  if (build_with_chromium) {
--    source_set("f32-vrnd_sse4.1-no-sse4.2") {
--      cflags = [
--        "-mno-sse4.2",
--        "-msse4.1",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/f32-vrnd/gen/f32-vrndd-sse41-u8.c",
--        "src/src/f32-vrnd/gen/f32-vrndne-sse41-u8.c",
--        "src/src/f32-vrnd/gen/f32-vrndu-sse41-u8.c",
--        "src/src/f32-vrnd/gen/f32-vrndz-sse41-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" ]
--
--      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("f32-vrnd_sse4.1-no-sse4.2_standalone") {
--      cflags = [
--        "-mno-sse4.2",
--        "-msse4.1",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/f32-vrnd/gen/f32-vrndd-sse41-u8.c",
--        "src/src/f32-vrnd/gen/f32-vrndne-sse41-u8.c",
--        "src/src/f32-vrnd/gen/f32-vrndu-sse41-u8.c",
--        "src/src/f32-vrnd/gen/f32-vrndz-sse41-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" ]
--
--      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-gemm_f16c-fma-no-avx2") {
 +    cflags = [
@@ -26258,51 +25890,23 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +    "src/src/f32-gemm/gen/f32-gemm-5x16-minmax-fma3-broadcast.c",
 +    "src/src/f32-gemm/gen/f32-gemm-5x8-minmax-fma3-broadcast.c"
 +    ]
- 
--  if (build_with_chromium) {
--    source_set("f32-vrnd_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/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",
--      ]
--
--      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) {
--    source_set("f32-vrnd_x64_standalone") {
--      cflags = []
++
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
 +  source_set("f32-gemm_f16c-fma-no-avx2_standalone") {
@@ -26324,125 +25928,27 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +    "src/src/f32-gemm/gen/f32-gemm-5x16-minmax-fma3-broadcast.c",
 +    "src/src/f32-gemm/gen/f32-gemm-5x8-minmax-fma3-broadcast.c"
 +    ]
- 
--      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",
--      ]
--
--      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("f32-vrsqrt_avx-no-avx2-no-f16c-no-fma") {
--      cflags = [
--        "-mavx",
--        "-mno-avx2",
--        "-mno-f16c",
--        "-mno-fma",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/f32-vrsqrt/gen/f32-vrsqrt-avx-rsqrt.c",
--        "src/src/f32-vrsqrt/gen/f32-vrsqrt-avx-sqrt.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: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("f32-vrsqrt_avx-no-avx2-no-f16c-no-fma_standalone") {
--      cflags = [
--        "-mavx",
--        "-mno-avx2",
--        "-mno-f16c",
--        "-mno-fma",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/f32-vrsqrt/gen/f32-vrsqrt-avx-rsqrt.c",
--        "src/src/f32-vrsqrt/gen/f32-vrsqrt-avx-sqrt.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-vrsqrt_avx512f") {
--      cflags = [ "-mavx512f" ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/f32-vrsqrt/gen/f32-vrsqrt-avx512f-rsqrt.c",
--        "src/src/f32-vrsqrt/gen/f32-vrsqrt-avx512f-sqrt.c",
--      ]
++
 +if (build_with_chromium) {
 +  source_set("f32-gemm_sse-no-sse2") {
 +    cflags = [
@@ -26456,39 +25962,23 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +    "src/src/f32-gemm/gen/f32-gemm-4x2c4-minmax-sse.c",
 +    "src/src/f32-gemm/gen/f32-gemm-4x8-minmax-sse-load1.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",
 +    ]
- 
--      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-vrsqrt_avx512f_standalone") {
--      cflags = [ "-mavx512f" ]
++
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
 +  source_set("f32-gemm_sse-no-sse2_standalone") {
@@ -26503,119 +25993,27 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +    "src/src/f32-gemm/gen/f32-gemm-4x2c4-minmax-sse.c",
 +    "src/src/f32-gemm/gen/f32-gemm-4x8-minmax-sse-load1.c"
 +    ]
- 
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/f32-vrsqrt/gen/f32-vrsqrt-avx512f-rsqrt.c",
--        "src/src/f32-vrsqrt/gen/f32-vrsqrt-avx512f-sqrt.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("f32-vrsqrt_sse2-no-sse3") {
--      cflags = [
--        "-mno-sse3",
--        "-msse2",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/f32-vrsqrt/gen/f32-vrsqrt-sse2-rsqrt.c",
--        "src/src/f32-vrsqrt/gen/f32-vrsqrt-sse2-sqrt.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: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("f32-vrsqrt_sse2-no-sse3_standalone") {
--      cflags = [
--        "-mno-sse3",
--        "-msse2",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/f32-vrsqrt/gen/f32-vrsqrt-sse2-rsqrt.c",
--        "src/src/f32-vrsqrt/gen/f32-vrsqrt-sse2-sqrt.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-vrsqrt_x64") {
--      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",
--      ]
++
 +if (build_with_chromium) {
 +  source_set("f32-gemm_x64") {
 +    cflags = [
@@ -26631,39 +26029,23 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +    "src/src/f32-gemm/gen/f32-gemm-4x4-minmax-scalar.c",
 +    "src/src/f32-gemm/gen/f32-gemm-4x4-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",
--      ]
++
 +    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("f32-vrsqrt_x64_standalone") {
--      cflags = []
++
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
 +  source_set("f32-gemm_x64_standalone") {
@@ -26680,132 +26062,27 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +    "src/src/f32-gemm/gen/f32-gemm-4x4-minmax-scalar.c",
 +    "src/src/f32-gemm/gen/f32-gemm-4x4-scalar.c"
 +    ]
- 
--      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",
--      ]
--
--      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("f32-vsigmoid_avx-no-avx2-no-f16c-no-fma") {
--      cflags = [
--        "-mavx",
--        "-mno-avx2",
--        "-mno-f16c",
--        "-mno-fma",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/f32-vsigmoid/gen/f32-vsigmoid-avx-rr2-p5-div-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",
--      ]
++
 +    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" ]
- 
--  # This is a target that cannot depend on //base.
--  if (build_with_internal_optimization_guide) {
--    source_set("f32-vsigmoid_avx-no-avx2-no-f16c-no-fma_standalone") {
--      cflags = [
--        "-mavx",
--        "-mno-avx2",
--        "-mno-f16c",
--        "-mno-fma",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/f32-vsigmoid/gen/f32-vsigmoid-avx-rr2-p5-div-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" ]
-     }
-   }
++    }
++  }
 +}
- 
--  if (build_with_chromium) {
--    source_set("f32-vsigmoid_avx512f") {
--      cflags = [ "-mavx512f" ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/f32-vsigmoid/gen/f32-vsigmoid-avx512f-rr2-lut32-p2-perm2-scalef-div-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",
--      ]
++
 +if (build_with_chromium) {
 +  source_set("f32-ibilinear-chw_sse-no-sse2") {
 +    cflags = [
@@ -26817,77 +26094,23 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +      "src/include/xnnpack.h",
 +      "src/src/f32-ibilinear-chw/gen/f32-ibilinear-chw-sse-p8.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-vsigmoid_avx512f_standalone") {
--      cflags = [ "-mavx512f" ]
++
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
 +      "//third_party/fxdiv",
 +      "//third_party/pthreadpool",
 +    ]
- 
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/f32-vsigmoid/gen/f32-vsigmoid-avx512f-rr2-lut32-p2-perm2-scalef-div-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",
--      ]
--
--      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-vsigmoid_f16c-fma-avx2") {
--      cflags = [
--        "-mavx2",
--        "-mf16c",
--        "-mfma",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/f32-vsigmoid/gen/f32-vsigmoid-avx2-rr1-p5-div-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",
--      ]
++
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
 +  source_set("f32-ibilinear-chw_sse-no-sse2_standalone") {
@@ -26900,121 +26123,27 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +      "src/include/xnnpack.h",
 +      "src/src/f32-ibilinear-chw/gen/f32-ibilinear-chw-sse-p8.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-vsigmoid_f16c-fma-avx2_standalone") {
--      cflags = [
--        "-mavx2",
--        "-mf16c",
--        "-mfma",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/f32-vsigmoid/gen/f32-vsigmoid-avx2-rr1-p5-div-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" ]
--      }
--    }
--  }
++
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
 +      "//third_party/fxdiv",
 +      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
- 
--  if (build_with_chromium) {
--    source_set("f32-vsigmoid_sse2-no-sse3") {
--      cflags = [
--        "-mno-sse3",
--        "-msse2",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/f32-vsigmoid/gen/f32-vsigmoid-sse2-rr2-lut64-p2-div-u8.c",
--        "src/src/f32-vsigmoid/gen/f32-vsigmoid-sse2-rr2-p5-div-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" ]
--
--      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("f32-vsigmoid_sse2-no-sse3_standalone") {
--      cflags = [
--        "-mno-sse3",
--        "-msse2",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/f32-vsigmoid/gen/f32-vsigmoid-sse2-rr2-lut64-p2-div-u8.c",
--        "src/src/f32-vsigmoid/gen/f32-vsigmoid-sse2-rr2-p5-div-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" ]
--
--      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-ibilinear-chw_x64") {
 +    cflags = [
@@ -27025,85 +26154,23 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +      "src/include/xnnpack.h",
 +      "src/src/f32-ibilinear-chw/gen/f32-ibilinear-chw-scalar-p4.c"
 +    ]
- 
--  if (build_with_chromium) {
--    source_set("f32-vsigmoid_sse4.1-no-sse4.2") {
--      cflags = [
--        "-mno-sse4.2",
--        "-msse4.1",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/f32-vsigmoid/gen/f32-vsigmoid-sse41-rr2-lut64-p2-div-u8.c",
--        "src/src/f32-vsigmoid/gen/f32-vsigmoid-sse41-rr2-p5-div-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" ]
--
--      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",
 +    ]
- 
--  # This is a target that cannot depend on //base.
--  if (build_with_internal_optimization_guide) {
--    source_set("f32-vsigmoid_sse4.1-no-sse4.2_standalone") {
--      cflags = [
--        "-mno-sse4.2",
--        "-msse4.1",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/f32-vsigmoid/gen/f32-vsigmoid-sse41-rr2-lut64-p2-div-u8.c",
--        "src/src/f32-vsigmoid/gen/f32-vsigmoid-sse41-rr2-p5-div-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" ]
--
--      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-vsigmoid_x64") {
--      cflags = []
++
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
 +  source_set("f32-ibilinear-chw_x64_standalone") {
@@ -27115,71 +26182,27 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +      "src/include/xnnpack.h",
 +      "src/src/f32-ibilinear-chw/gen/f32-ibilinear-chw-scalar-p4.c"
 +    ]
- 
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/f32-vsigmoid/gen/f32-vsigmoid-scalar-rr2-lut64-p2-div-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: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("f32-vsigmoid_x64_standalone") {
--      cflags = []
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/f32-vsigmoid/gen/f32-vsigmoid-scalar-rr2-lut64-p2-div-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" ]
--
--      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-ibilinear_sse-no-sse2") {
 +    cflags = [
@@ -27191,87 +26214,23 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +      "src/include/xnnpack.h",
 +      "src/src/f32-ibilinear/gen/f32-ibilinear-sse-u8.c"
 +    ]
- 
--  if (build_with_chromium) {
--    source_set("f32-vsin_avx-no-avx2-no-f16c-no-fma") {
--      cflags = [
--        "-mavx",
--        "-mno-avx2",
--        "-mno-f16c",
--        "-mno-fma",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/f32-vsin/gen/f32-vsin-avx-rational-5-4-div.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",
 +    ]
- 
--  # This is a target that cannot depend on //base.
--  if (build_with_internal_optimization_guide) {
--    source_set("f32-vsin_avx-no-avx2-no-f16c-no-fma_standalone") {
--      cflags = [
--        "-mavx",
--        "-mno-avx2",
--        "-mno-f16c",
--        "-mno-fma",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/f32-vsin/gen/f32-vsin-avx-rational-5-4-div.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-vsin_avx512f") {
--      cflags = [ "-mavx512f" ]
++
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
 +  source_set("f32-ibilinear_sse-no-sse2_standalone") {
@@ -27284,46 +26243,27 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +      "src/include/xnnpack.h",
 +      "src/src/f32-ibilinear/gen/f32-ibilinear-sse-u8.c"
 +    ]
- 
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/f32-vsin/gen/f32-vsin-avx512f-rational-5-4-div.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("f32-vsin_avx512f_standalone") {
--      cflags = [ "-mavx512f" ]
++
 +if (build_with_chromium) {
 +  source_set("f32-ibilinear_x64") {
 +    cflags = [
@@ -27334,106 +26274,23 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +      "src/include/xnnpack.h",
 +      "src/src/f32-ibilinear/gen/f32-ibilinear-scalar-u2.c"
 +    ]
- 
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/f32-vsin/gen/f32-vsin-avx512f-rational-5-4-div.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("f32-vsin_f16c-fma-no-avx2") {
--      cflags = [
--        "-mf16c",
--        "-mfma",
--        "-mno-avx2",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/f32-vsin/gen/f32-vsin-fma3-rational-5-4-div.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) {
--    source_set("f32-vsin_f16c-fma-no-avx2_standalone") {
--      cflags = [
--        "-mf16c",
--        "-mfma",
--        "-mno-avx2",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/f32-vsin/gen/f32-vsin-fma3-rational-5-4-div.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-ibilinear_x64_standalone") {
@@ -27445,93 +26302,27 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +      "src/include/xnnpack.h",
 +      "src/src/f32-ibilinear/gen/f32-ibilinear-scalar-u2.c"
 +    ]
- 
--  if (build_with_chromium) {
--    source_set("f32-vsin_sse2-no-sse3") {
--      cflags = [
--        "-mno-sse3",
--        "-msse2",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/f32-vsin/gen/f32-vsin-sse2-rational-5-4-div.c",
--        "src/src/f32-vsin/gen/f32-vsin-sse2fma-rational-5-4-div.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-vsin_sse2-no-sse3_standalone") {
--      cflags = [
--        "-mno-sse3",
--        "-msse2",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/f32-vsin/gen/f32-vsin-sse2-rational-5-4-div.c",
--        "src/src/f32-vsin/gen/f32-vsin-sse2fma-rational-5-4-div.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" ]
-     }
-   }
++    }
++  }
 +}
- 
--  if (build_with_chromium) {
--    source_set("f32-vsin_x64") {
--      cflags = []
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/f32-vsin/gen/f32-vsin-scalar-rational-5-4-div.c",
--      ]
++
 +if (build_with_chromium) {
 +  source_set("f32-igemm_avx-no-avx2-no-f16c-no-fma") {
 +    cflags = [
@@ -27548,39 +26339,23 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +    "src/src/f32-igemm/gen/f32-igemm-5x16-minmax-avx-broadcast.c",
 +    "src/src/f32-igemm/gen/f32-igemm-5x8-minmax-avx-broadcast.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",
 +    ]
- 
--      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-vsin_x64_standalone") {
--      cflags = []
++
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
 +  source_set("f32-igemm_avx-no-avx2-no-f16c-no-fma_standalone") {
@@ -27598,121 +26373,27 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +    "src/src/f32-igemm/gen/f32-igemm-5x16-minmax-avx-broadcast.c",
 +    "src/src/f32-igemm/gen/f32-igemm-5x8-minmax-avx-broadcast.c"
 +    ]
- 
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/f32-vsin/gen/f32-vsin-scalar-rational-5-4-div.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("f32-vsqrt_avx-no-avx2-no-f16c-no-fma") {
--      cflags = [
--        "-mavx",
--        "-mno-avx2",
--        "-mno-f16c",
--        "-mno-fma",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/f32-vsqrt/gen/f32-vsqrt-avx-rsqrt.c",
--        "src/src/f32-vsqrt/gen/f32-vsqrt-avx-sqrt.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: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("f32-vsqrt_avx-no-avx2-no-f16c-no-fma_standalone") {
--      cflags = [
--        "-mavx",
--        "-mno-avx2",
--        "-mno-f16c",
--        "-mno-fma",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/f32-vsqrt/gen/f32-vsqrt-avx-rsqrt.c",
--        "src/src/f32-vsqrt/gen/f32-vsqrt-avx-sqrt.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-vsqrt_avx512f") {
--      cflags = [ "-mavx512f" ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/f32-vsqrt/gen/f32-vsqrt-avx512f-rsqrt.c",
--      ]
++
 +if (build_with_chromium) {
 +  source_set("f32-igemm_avx512f") {
 +    cflags = [
@@ -27726,39 +26407,23 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +    "src/src/f32-igemm/gen/f32-igemm-7x16-minmax-avx512f-broadcast.c",
 +    "src/src/f32-igemm/gen/f32-igemm-7x32-minmax-avx512f-broadcast.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",
 +    ]
- 
--      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-vsqrt_avx512f_standalone") {
--      cflags = [ "-mavx512f" ]
++
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
 +  source_set("f32-igemm_avx512f_standalone") {
@@ -27773,117 +26438,27 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +    "src/src/f32-igemm/gen/f32-igemm-7x16-minmax-avx512f-broadcast.c",
 +    "src/src/f32-igemm/gen/f32-igemm-7x32-minmax-avx512f-broadcast.c"
 +    ]
- 
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/f32-vsqrt/gen/f32-vsqrt-avx512f-rsqrt.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("f32-vsqrt_sse2-no-sse3") {
--      cflags = [
--        "-mno-sse3",
--        "-msse2",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/f32-vsqrt/gen/f32-vsqrt-sse2-rsqrt.c",
--        "src/src/f32-vsqrt/gen/f32-vsqrt-sse2-sqrt.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: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("f32-vsqrt_sse2-no-sse3_standalone") {
--      cflags = [
--        "-mno-sse3",
--        "-msse2",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/f32-vsqrt/gen/f32-vsqrt-sse2-rsqrt.c",
--        "src/src/f32-vsqrt/gen/f32-vsqrt-sse2-sqrt.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-vsqrt_x64") {
--      cflags = []
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/f32-vsqrt/gen/f32-vsqrt-scalar-sqrt.c",
--      ]
++
 +if (build_with_chromium) {
 +  source_set("f32-igemm_f16c-fma-no-avx2") {
 +    cflags = [
@@ -27903,39 +26478,23 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +    "src/src/f32-igemm/gen/f32-igemm-5x16-minmax-fma3-broadcast-prfm.c",
 +    "src/src/f32-igemm/gen/f32-igemm-5x8-minmax-fma3-broadcast.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",
 +    ]
- 
--      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-vsqrt_x64_standalone") {
--      cflags = []
++
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
 +  source_set("f32-igemm_f16c-fma-no-avx2_standalone") {
@@ -27956,119 +26515,27 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +    "src/src/f32-igemm/gen/f32-igemm-5x16-minmax-fma3-broadcast-prfm.c",
 +    "src/src/f32-igemm/gen/f32-igemm-5x8-minmax-fma3-broadcast.c"
 +    ]
- 
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/f32-vsqrt/gen/f32-vsqrt-scalar-sqrt.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("f32-vtanh_avx-no-avx2-no-f16c-no-fma") {
--      cflags = [
--        "-mavx",
--        "-mno-avx2",
--        "-mno-f16c",
--        "-mno-fma",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/f32-vtanh/gen/f32-vtanh-avx-rational-9-8-div.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: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("f32-vtanh_avx-no-avx2-no-f16c-no-fma_standalone") {
--      cflags = [
--        "-mavx",
--        "-mno-avx2",
--        "-mno-f16c",
--        "-mno-fma",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/f32-vtanh/gen/f32-vtanh-avx-rational-9-8-div.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-vtanh_avx512f") {
--      cflags = [ "-mavx512f" ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/f32-vtanh/gen/f32-vtanh-avx512f-rational-9-8-div.c",
--      ]
++
 +if (build_with_chromium) {
 +  source_set("f32-igemm_sse-no-sse2") {
 +    cflags = [
@@ -28082,39 +26549,23 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +    "src/src/f32-igemm/gen/f32-igemm-4x2c4-minmax-sse.c",
 +    "src/src/f32-igemm/gen/f32-igemm-4x8-minmax-sse-load1.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",
 +    ]
- 
--      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-vtanh_avx512f_standalone") {
--      cflags = [ "-mavx512f" ]
++
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
 +  source_set("f32-igemm_sse-no-sse2_standalone") {
@@ -28129,133 +26580,27 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +    "src/src/f32-igemm/gen/f32-igemm-4x2c4-minmax-sse.c",
 +    "src/src/f32-igemm/gen/f32-igemm-4x8-minmax-sse-load1.c"
 +    ]
- 
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/f32-vtanh/gen/f32-vtanh-avx512f-rational-9-8-div.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("f32-vtanh_f16c-fma-no-avx2") {
--      cflags = [
--        "-mf16c",
--        "-mfma",
--        "-mno-avx2",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/f32-vtanh/gen/f32-vtanh-fma3-rational-9-8-div.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: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("f32-vtanh_f16c-fma-no-avx2_standalone") {
--      cflags = [
--        "-mf16c",
--        "-mfma",
--        "-mno-avx2",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/f32-vtanh/gen/f32-vtanh-fma3-rational-9-8-div.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-vtanh_sse2-no-sse3") {
--      cflags = [
--        "-mno-sse3",
--        "-msse2",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/f32-vtanh/gen/f32-vtanh-sse2-rational-9-8-div.c",
--        "src/src/f32-vtanh/gen/f32-vtanh-sse2fma-rational-9-8-div.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-igemm_x64") {
 +    cflags = [
@@ -28271,47 +26616,12 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +    "src/src/f32-igemm/gen/f32-igemm-4x4-minmax-scalar.c",
 +    "src/src/f32-igemm/gen/f32-igemm-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" ]
- 
--  # This is a target that cannot depend on //base.
--  if (build_with_internal_optimization_guide) {
--    source_set("f32-vtanh_sse2-no-sse3_standalone") {
--      cflags = [
--        "-mno-sse3",
--        "-msse2",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/f32-vtanh/gen/f32-vtanh-sse2-rational-9-8-div.c",
--        "src/src/f32-vtanh/gen/f32-vtanh-sse2fma-rational-9-8-div.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" ]
--      }
--    }
++
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
@@ -28320,12 +26630,9 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +    ]
 +
 +    public_configs = [ ":xnnpack_public_config" ]
-   }
++  }
 +}
- 
--  if (build_with_chromium) {
--    source_set("f32-vtanh_x64") {
--      cflags = []
++
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
 +  source_set("f32-igemm_x64_standalone") {
@@ -28342,71 +26649,27 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +    "src/src/f32-igemm/gen/f32-igemm-4x4-minmax-scalar.c",
 +    "src/src/f32-igemm/gen/f32-igemm-4x4-scalar.c"
 +    ]
- 
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/f32-vtanh/gen/f32-vtanh-scalar-rational-9-8-div.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("f32-vtanh_x64_standalone") {
--      cflags = []
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/f32-vtanh/gen/f32-vtanh-scalar-rational-9-8-div.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-maxpool_sse2-no-sse3") {
 +    cflags = [
@@ -28418,91 +26681,23 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +      "src/include/xnnpack.h",
 +      "src/src/f32-maxpool/gen/f32-maxpool-9p-minmax-sse2-u4.c"
 +    ]
- 
--  if (build_with_chromium) {
--    source_set("f32-vunary_avx-no-avx2-no-f16c-no-fma") {
--      cflags = [
--        "-mavx",
--        "-mno-avx2",
--        "-mno-f16c",
--        "-mno-fma",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/f32-vunary/gen/f32-vabs-avx.c",
--        "src/src/f32-vunary/gen/f32-vneg-avx.c",
--        "src/src/f32-vunary/gen/f32-vsqr-avx.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",
 +    ]
- 
--  # This is a target that cannot depend on //base.
--  if (build_with_internal_optimization_guide) {
--    source_set("f32-vunary_avx-no-avx2-no-f16c-no-fma_standalone") {
--      cflags = [
--        "-mavx",
--        "-mno-avx2",
--        "-mno-f16c",
--        "-mno-fma",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/f32-vunary/gen/f32-vabs-avx.c",
--        "src/src/f32-vunary/gen/f32-vneg-avx.c",
--        "src/src/f32-vunary/gen/f32-vsqr-avx.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-vunary_avx512f") {
--      cflags = [ "-mavx512f" ]
++
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
 +  source_set("f32-maxpool_sse2-no-sse3_standalone") {
@@ -28515,75 +26710,27 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +      "src/include/xnnpack.h",
 +      "src/src/f32-maxpool/gen/f32-maxpool-9p-minmax-sse2-u4.c"
 +    ]
- 
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/f32-vunary/gen/f32-vabs-avx512f.c",
--        "src/src/f32-vunary/gen/f32-vneg-avx512f.c",
--        "src/src/f32-vunary/gen/f32-vsqr-avx512f.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("f32-vunary_avx512f_standalone") {
--      cflags = [ "-mavx512f" ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/f32-vunary/gen/f32-vabs-avx512f.c",
--        "src/src/f32-vunary/gen/f32-vneg-avx512f.c",
--        "src/src/f32-vunary/gen/f32-vsqr-avx512f.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-maxpool_x64") {
 +    cflags = [
@@ -28594,87 +26741,23 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +      "src/include/xnnpack.h",
 +      "src/src/f32-maxpool/gen/f32-maxpool-9p-minmax-scalar-u1.c"
 +    ]
- 
--  if (build_with_chromium) {
--    source_set("f32-vunary_sse2-no-sse3") {
--      cflags = [
--        "-mno-sse3",
--        "-msse2",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/f32-vunary/gen/f32-vabs-sse2.c",
--        "src/src/f32-vunary/gen/f32-vneg-sse2.c",
--        "src/src/f32-vunary/gen/f32-vsqr-sse2.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",
 +    ]
- 
--  # This is a target that cannot depend on //base.
--  if (build_with_internal_optimization_guide) {
--    source_set("f32-vunary_sse2-no-sse3_standalone") {
--      cflags = [
--        "-mno-sse3",
--        "-msse2",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/f32-vunary/gen/f32-vabs-sse2.c",
--        "src/src/f32-vunary/gen/f32-vneg-sse2.c",
--        "src/src/f32-vunary/gen/f32-vsqr-sse2.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-vunary_x64") {
--      cflags = []
++
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
 +  source_set("f32-maxpool_x64_standalone") {
@@ -28686,75 +26769,27 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +      "src/include/xnnpack.h",
 +      "src/src/f32-maxpool/gen/f32-maxpool-9p-minmax-scalar-u1.c"
 +    ]
- 
--      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",
--      ]
++
 +    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("f32-vunary_x64_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",
--      ]
--
--      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-qc4w-gemm_avx-no-avx2-no-f16c-no-fma") {
 +    cflags = [
@@ -28769,70 +26804,23 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +      "src/src/f32-qc4w-gemm/gen/f32-qc4w-gemm-1x16-minmax-avx-broadcast.c",
 +    "src/src/f32-qc4w-gemm/gen/f32-qc4w-gemm-3x16-minmax-avx-broadcast.c"
 +    ]
- 
--  if (build_with_chromium) {
--    source_set("operators_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/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" ]
--      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) {
--    source_set("operators_x64_standalone") {
--      cflags = []
++
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
 +  source_set("f32-qc4w-gemm_avx-no-avx2-no-f16c-no-fma_standalone") {
@@ -28848,142 +26836,27 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +      "src/src/f32-qc4w-gemm/gen/f32-qc4w-gemm-1x16-minmax-avx-broadcast.c",
 +    "src/src/f32-qc4w-gemm/gen/f32-qc4w-gemm-3x16-minmax-avx-broadcast.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/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" ]
--      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("qd8-bf16-qb4w-gemm_f16c-fma-avx2") {
--      cflags = [
--        "-mavx2",
--        "-mf16c",
--        "-mfma",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qd8-bf16-qb4w-gemm/gen/qd8-bf16-qb4w-gemm-1x8c8-minmax-avx2.c",
--        "src/src/qd8-bf16-qb4w-gemm/gen/qd8-bf16-qb4w-gemm-3x8c8-minmax-avx2.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: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("qd8-bf16-qb4w-gemm_f16c-fma-avx2_standalone") {
--      cflags = [
--        "-mavx2",
--        "-mf16c",
--        "-mfma",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qd8-bf16-qb4w-gemm/gen/qd8-bf16-qb4w-gemm-1x8c8-minmax-avx2.c",
--        "src/src/qd8-bf16-qb4w-gemm/gen/qd8-bf16-qb4w-gemm-3x8c8-minmax-avx2.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-bf16-qb4w-gemm_x64") {
--      cflags = []
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qd8-bf16-qb4w-gemm/gen/qd8-bf16-qb4w-gemm-1x4-minmax-scalar.c",
--        "src/src/qd8-bf16-qb4w-gemm/gen/qd8-bf16-qb4w-gemm-4x4-minmax-scalar.c",
--      ]
++
 +if (build_with_chromium) {
 +  source_set("f32-qc4w-gemm_f16c-fma-avx2") {
 +    cflags = [
@@ -28997,39 +26870,23 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +      "src/src/f32-qc4w-gemm/gen/f32-qc4w-gemm-1x16-minmax-avx2-broadcast.c",
 +    "src/src/f32-qc4w-gemm/gen/f32-qc4w-gemm-3x16-minmax-avx2-broadcast.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",
 +    ]
- 
--      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-bf16-qb4w-gemm_x64_standalone") {
--      cflags = []
++
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
 +  source_set("f32-qc4w-gemm_f16c-fma-avx2_standalone") {
@@ -29044,139 +26901,27 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +      "src/src/f32-qc4w-gemm/gen/f32-qc4w-gemm-1x16-minmax-avx2-broadcast.c",
 +    "src/src/f32-qc4w-gemm/gen/f32-qc4w-gemm-3x16-minmax-avx2-broadcast.c"
 +    ]
- 
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qd8-bf16-qb4w-gemm/gen/qd8-bf16-qb4w-gemm-1x4-minmax-scalar.c",
--        "src/src/qd8-bf16-qb4w-gemm/gen/qd8-bf16-qb4w-gemm-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" ]
--      }
--    }
--  }
++
 +    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_f16c-fma-avx2") {
--      cflags = [
--        "-mavx2",
--        "-mf16c",
--        "-mfma",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qd8-f16-qb4w-gemm/gen/qd8-f16-qb4w-gemm-1x8c8-minmax-avx2.c",
--        "src/src/qd8-f16-qb4w-gemm/gen/qd8-f16-qb4w-gemm-3x8c8-minmax-avx2.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: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("qd8-f16-qb4w-gemm_f16c-fma-avx2_standalone") {
--      cflags = [
--        "-mavx2",
--        "-mf16c",
--        "-mfma",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qd8-f16-qb4w-gemm/gen/qd8-f16-qb4w-gemm-1x8c8-minmax-avx2.c",
--        "src/src/qd8-f16-qb4w-gemm/gen/qd8-f16-qb4w-gemm-3x8c8-minmax-avx2.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-qc2w-gemm_avx2-avxvnni-f16c-fma-gfni") {
--      cflags = [
--        "-mavx2",
--        "-mavxvnni",
--        "-mf16c",
--        "-mfma",
--        "-mgfni",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qd8-f16-qc2w-gemm/gen/qd8-f16-qc2w-gemm-1x8c8-minmax-avxvnni.c",
--        "src/src/qd8-f16-qc2w-gemm/gen/qd8-f16-qc2w-gemm-5x8c8-minmax-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",
--      ]
++
 +if (build_with_chromium) {
 +  source_set("f32-qc4w-gemm_f16c-fma-no-avx2") {
 +    cflags = [
@@ -29190,50 +26935,12 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +      "src/src/f32-qc4w-gemm/gen/f32-qc4w-gemm-1x16-minmax-fma3-broadcast.c",
 +    "src/src/f32-qc4w-gemm/gen/f32-qc4w-gemm-3x16-minmax-fma3-broadcast.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-qc2w-gemm_avx2-avxvnni-f16c-fma-gfni_standalone") {
--      cflags = [
--        "-mavx2",
--        "-mavxvnni",
--        "-mf16c",
--        "-mfma",
--        "-mgfni",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qd8-f16-qc2w-gemm/gen/qd8-f16-qc2w-gemm-1x8c8-minmax-avxvnni.c",
--        "src/src/qd8-f16-qc2w-gemm/gen/qd8-f16-qc2w-gemm-5x8c8-minmax-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" ]
--      }
--    }
++
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
@@ -29242,34 +26949,9 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +    ]
 +
 +    public_configs = [ ":xnnpack_public_config" ]
-   }
++  }
 +}
- 
--  if (build_with_chromium) {
--    source_set("qd8-f16-qc2w-gemm_f16c-fma-avx2") {
--      cflags = [
--        "-mavx2",
--        "-mf16c",
--        "-mfma",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qd8-f16-qc2w-gemm/gen/qd8-f16-qc2w-gemm-1x8c8-minmax-avx2-madd.c",
--        "src/src/qd8-f16-qc2w-gemm/gen/qd8-f16-qc2w-gemm-8x8c8-minmax-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",
--      ]
++
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
 +  source_set("f32-qc4w-gemm_f16c-fma-no-avx2_standalone") {
@@ -29284,47 +26966,12 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +      "src/src/f32-qc4w-gemm/gen/f32-qc4w-gemm-1x16-minmax-fma3-broadcast.c",
 +    "src/src/f32-qc4w-gemm/gen/f32-qc4w-gemm-3x16-minmax-fma3-broadcast.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-qc2w-gemm_f16c-fma-avx2_standalone") {
--      cflags = [
--        "-mavx2",
--        "-mf16c",
--        "-mfma",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qd8-f16-qc2w-gemm/gen/qd8-f16-qc2w-gemm-1x8c8-minmax-avx2-madd.c",
--        "src/src/qd8-f16-qc2w-gemm/gen/qd8-f16-qc2w-gemm-8x8c8-minmax-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:pthreadpool_standalone",
--      ]
--
--      public_configs = [ ":xnnpack_public_config" ]
--
--      if (!(is_android && use_order_profiling)) {
--        assert_no_deps = [ "//base" ]
--      }
++
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
@@ -29336,18 +26983,10 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +
 +    if (!(is_android && use_order_profiling)) {
 +      assert_no_deps = [ "//base" ]
-     }
-   }
++    }
++  }
 +}
- 
--  if (build_with_chromium) {
--    source_set("qd8-f16-qc2w-gemm_x64") {
--      cflags = []
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qd8-f16-qc2w-gemm/gen/qd8-f16-qc2w-gemm-1x2-minmax-scalar.c",
--      ]
++
 +if (build_with_chromium) {
 +  source_set("f32-qc4w-gemm_sse4.1-no-sse4.2") {
 +    cflags = [
@@ -29360,39 +26999,23 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +      "src/src/f32-qc4w-gemm/gen/f32-qc4w-gemm-1x8-minmax-sse41-dup.c",
 +    "src/src/f32-qc4w-gemm/gen/f32-qc4w-gemm-4x8-minmax-sse41-dup.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",
 +    ]
- 
--      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-f16-qc2w-gemm_x64_standalone") {
--      cflags = []
++
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
 +  source_set("f32-qc4w-gemm_sse4.1-no-sse4.2_standalone") {
@@ -29406,140 +27029,27 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +      "src/src/f32-qc4w-gemm/gen/f32-qc4w-gemm-1x8-minmax-sse41-dup.c",
 +    "src/src/f32-qc4w-gemm/gen/f32-qc4w-gemm-4x8-minmax-sse41-dup.c"
 +    ]
- 
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qd8-f16-qc2w-gemm/gen/qd8-f16-qc2w-gemm-1x2-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" ]
--      }
--    }
--  }
++
 +    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-qc4w-gemm_avx2-avxvnni-f16c-fma-gfni") {
--      cflags = [
--        "-mavx2",
--        "-mavxvnni",
--        "-mf16c",
--        "-mfma",
--        "-mgfni",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qd8-f16-qc4w-gemm/gen/qd8-f16-qc4w-gemm-1x8c8-minmax-avxvnni-prfm.c",
--        "src/src/qd8-f16-qc4w-gemm/gen/qd8-f16-qc4w-gemm-5x8c8-minmax-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: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("qd8-f16-qc4w-gemm_avx2-avxvnni-f16c-fma-gfni_standalone") {
--      cflags = [
--        "-mavx2",
--        "-mavxvnni",
--        "-mf16c",
--        "-mfma",
--        "-mgfni",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qd8-f16-qc4w-gemm/gen/qd8-f16-qc4w-gemm-1x8c8-minmax-avxvnni-prfm.c",
--        "src/src/qd8-f16-qc4w-gemm/gen/qd8-f16-qc4w-gemm-5x8c8-minmax-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: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-qc4w-gemm_f16c-fma-avx2") {
--      cflags = [
--        "-mavx2",
--        "-mf16c",
--        "-mfma",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qd8-f16-qc4w-gemm/gen/qd8-f16-qc4w-gemm-1x8c8-minmax-avx2-madd-prfm.c",
--        "src/src/qd8-f16-qc4w-gemm/gen/qd8-f16-qc4w-gemm-4x8c8-minmax-avx2-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",
--      ]
++
 +if (build_with_chromium) {
 +  source_set("f32-qc4w-gemm_x64") {
 +    cflags = [
@@ -29551,48 +27061,12 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +      "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"
 +    ]
- 
--      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-qc4w-gemm_f16c-fma-avx2_standalone") {
--      cflags = [
--        "-mavx2",
--        "-mf16c",
--        "-mfma",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qd8-f16-qc4w-gemm/gen/qd8-f16-qc4w-gemm-1x8c8-minmax-avx2-madd-prfm.c",
--        "src/src/qd8-f16-qc4w-gemm/gen/qd8-f16-qc4w-gemm-4x8c8-minmax-avx2-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" ]
--      }
--    }
++
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
@@ -29601,39 +27075,9 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +    ]
 +
 +    public_configs = [ ":xnnpack_public_config" ]
-   }
++  }
 +}
- 
--  if (build_with_chromium) {
--    source_set(
--        "qd8-f16-qc4w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
--      cflags = [
--        "-mavx512bw",
--        "-mavx512cd",
--        "-mavx512dq",
--        "-mavx512f",
--        "-mavx512vl",
--        "-mf16c",
--        "-mfma",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qd8-f16-qc4w-gemm/gen/qd8-f16-qc4w-gemm-1x8c8-minmax-avx256skx-madd-prfm.c",
--        "src/src/qd8-f16-qc4w-gemm/gen/qd8-f16-qc4w-gemm-8x8c8-minmax-avx256skx-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",
--      ]
++
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
 +  source_set("f32-qc4w-gemm_x64_standalone") {
@@ -29646,141 +27090,27 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +      "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"
 +    ]
- 
--      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-qc4w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") {
--      cflags = [
--        "-mavx512bw",
--        "-mavx512cd",
--        "-mavx512dq",
--        "-mavx512f",
--        "-mavx512vl",
--        "-mf16c",
--        "-mfma",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qd8-f16-qc4w-gemm/gen/qd8-f16-qc4w-gemm-1x8c8-minmax-avx256skx-madd-prfm.c",
--        "src/src/qd8-f16-qc4w-gemm/gen/qd8-f16-qc4w-gemm-8x8c8-minmax-avx256skx-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" ]
--      }
--    }
--  }
++
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
 +      "//third_party/fxdiv",
 +      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
- 
--  if (build_with_chromium) {
--    source_set(
--        "qd8-f16-qc4w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni") {
--      cflags = [
--        "-mavx512bw",
--        "-mavx512cd",
--        "-mavx512dq",
--        "-mavx512f",
--        "-mavx512vl",
--        "-mavx512vnni",
--        "-mf16c",
--        "-mfma",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qd8-f16-qc4w-gemm/gen/qd8-f16-qc4w-gemm-1x8c8-minmax-avx256vnni.c",
--        "src/src/qd8-f16-qc4w-gemm/gen/qd8-f16-qc4w-gemm-8x8c8-minmax-avx256vnni.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-f16-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/qd8-f16-qc4w-gemm/gen/qd8-f16-qc4w-gemm-1x8c8-minmax-avx256vnni.c",
--        "src/src/qd8-f16-qc4w-gemm/gen/qd8-f16-qc4w-gemm-8x8c8-minmax-avx256vnni.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-qc8w-gemm_avx-no-avx2-no-f16c-no-fma") {
 +    cflags = [
@@ -29795,113 +27125,23 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +      "src/src/f32-qc8w-gemm/gen/f32-qc8w-gemm-1x16-minmax-avx-broadcast.c",
 +    "src/src/f32-qc8w-gemm/gen/f32-qc8w-gemm-5x16-minmax-avx-broadcast.c"
 +    ]
- 
--  if (build_with_chromium) {
--    source_set("qd8-f16-qc8w-gemm_avx2-avxvnni-f16c-fma-gfni") {
--      cflags = [
--        "-mavx2",
--        "-mavxvnni",
--        "-mf16c",
--        "-mfma",
--        "-mgfni",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qd8-f16-qc8w-gemm/gen/qd8-f16-qc8w-gemm-1x8c8-minmax-avxvnni-prfm.c",
--        "src/src/qd8-f16-qc8w-gemm/gen/qd8-f16-qc8w-gemm-5x8c8-minmax-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",
--      ]
++
 +    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("qd8-f16-qc8w-gemm_avx2-avxvnni-f16c-fma-gfni_standalone") {
--      cflags = [
--        "-mavx2",
--        "-mavxvnni",
--        "-mf16c",
--        "-mfma",
--        "-mgfni",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qd8-f16-qc8w-gemm/gen/qd8-f16-qc8w-gemm-1x8c8-minmax-avxvnni-prfm.c",
--        "src/src/qd8-f16-qc8w-gemm/gen/qd8-f16-qc8w-gemm-5x8c8-minmax-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: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("qd8-f16-qc8w-gemm_f16c-fma-avx2") {
--      cflags = [
--        "-mavx2",
--        "-mf16c",
--        "-mfma",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qd8-f16-qc8w-gemm/gen/qd8-f16-qc8w-gemm-1x8c8-minmax-avx2.c",
--        "src/src/qd8-f16-qc8w-gemm/gen/qd8-f16-qc8w-gemm-3x8c8-minmax-avx2.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-qc8w-gemm_avx-no-avx2-no-f16c-no-fma_standalone") {
@@ -29917,134 +27157,27 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +      "src/src/f32-qc8w-gemm/gen/f32-qc8w-gemm-1x16-minmax-avx-broadcast.c",
 +    "src/src/f32-qc8w-gemm/gen/f32-qc8w-gemm-5x16-minmax-avx-broadcast.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-qc8w-gemm_f16c-fma-avx2_standalone") {
--      cflags = [
--        "-mavx2",
--        "-mf16c",
--        "-mfma",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qd8-f16-qc8w-gemm/gen/qd8-f16-qc8w-gemm-1x8c8-minmax-avx2.c",
--        "src/src/qd8-f16-qc8w-gemm/gen/qd8-f16-qc8w-gemm-3x8c8-minmax-avx2.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" ]
--      }
--    }
--  }
++
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
 +      "//third_party/fxdiv",
 +      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
- 
--  if (build_with_chromium) {
--    source_set(
--        "qd8-f16-qc8w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
--      cflags = [
--        "-mavx512bw",
--        "-mavx512cd",
--        "-mavx512dq",
--        "-mavx512f",
--        "-mavx512vl",
--        "-mf16c",
--        "-mfma",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qd8-f16-qc8w-gemm/gen/qd8-f16-qc8w-gemm-1x8c8-minmax-avx256skx.c",
--        "src/src/qd8-f16-qc8w-gemm/gen/qd8-f16-qc8w-gemm-5x8c8-minmax-avx256skx.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-f16-qc8w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") {
--      cflags = [
--        "-mavx512bw",
--        "-mavx512cd",
--        "-mavx512dq",
--        "-mavx512f",
--        "-mavx512vl",
--        "-mf16c",
--        "-mfma",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qd8-f16-qc8w-gemm/gen/qd8-f16-qc8w-gemm-1x8c8-minmax-avx256skx.c",
--        "src/src/qd8-f16-qc8w-gemm/gen/qd8-f16-qc8w-gemm-5x8c8-minmax-avx256skx.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-qc8w-gemm_f16c-fma-avx2") {
 +    cflags = [
@@ -30058,130 +27191,23 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +      "src/src/f32-qc8w-gemm/gen/f32-qc8w-gemm-1x16-minmax-avx2-broadcast.c",
 +    "src/src/f32-qc8w-gemm/gen/f32-qc8w-gemm-5x16-minmax-avx2-broadcast.c"
 +    ]
- 
--  if (build_with_chromium) {
--    source_set(
--        "qd8-f16-qc8w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni") {
--      cflags = [
--        "-mavx512bw",
--        "-mavx512cd",
--        "-mavx512dq",
--        "-mavx512f",
--        "-mavx512vl",
--        "-mavx512vnni",
--        "-mf16c",
--        "-mfma",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qd8-f16-qc8w-gemm/gen/qd8-f16-qc8w-gemm-1x8c8-minmax-avx256vnni.c",
--        "src/src/qd8-f16-qc8w-gemm/gen/qd8-f16-qc8w-gemm-8x8c8-minmax-avx256vnni.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",
 +    ]
- 
--  # This is a target that cannot depend on //base.
--  if (build_with_internal_optimization_guide) {
--    source_set(
--        "qd8-f16-qc8w-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/qd8-f16-qc8w-gemm/gen/qd8-f16-qc8w-gemm-1x8c8-minmax-avx256vnni.c",
--        "src/src/qd8-f16-qc8w-gemm/gen/qd8-f16-qc8w-gemm-8x8c8-minmax-avx256vnni.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(
--        "qd8-f16-qc8w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni-amx-tile-amx-int8") {
--      cflags = [
--        "-mamx-int8",
--        "-mamx-tile",
--        "-mavx512bw",
--        "-mavx512cd",
--        "-mavx512dq",
--        "-mavx512f",
--        "-mavx512vl",
--        "-mavx512vnni",
--        "-mf16c",
--        "-mfma",
--        "-mgfni",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qd8-f16-qc8w-gemm/gen/qd8-f16-qc8w-gemm-16x64c4-minmax-avx512amx.c",
--        "src/src/qd8-f16-qc8w-gemm/gen/qd8-f16-qc8w-gemm-1x64c4-minmax-avx512amx.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-qc8w-gemm_f16c-fma-avx2_standalone") {
@@ -30196,137 +27222,27 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +      "src/src/f32-qc8w-gemm/gen/f32-qc8w-gemm-1x16-minmax-avx2-broadcast.c",
 +    "src/src/f32-qc8w-gemm/gen/f32-qc8w-gemm-5x16-minmax-avx2-broadcast.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-qc8w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni-amx-tile-amx-int8_standalone") {
--      cflags = [
--        "-mamx-int8",
--        "-mamx-tile",
--        "-mavx512bw",
--        "-mavx512cd",
--        "-mavx512dq",
--        "-mavx512f",
--        "-mavx512vl",
--        "-mavx512vnni",
--        "-mf16c",
--        "-mfma",
--        "-mgfni",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qd8-f16-qc8w-gemm/gen/qd8-f16-qc8w-gemm-16x64c4-minmax-avx512amx.c",
--        "src/src/qd8-f16-qc8w-gemm/gen/qd8-f16-qc8w-gemm-1x64c4-minmax-avx512amx.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" ]
--      }
--    }
--  }
++
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
 +      "//third_party/fxdiv",
 +      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
- 
--  if (build_with_chromium) {
--    source_set("qd8-f16-qc8w-igemm_avx2-avxvnni-f16c-fma-gfni") {
--      cflags = [
--        "-mavx2",
--        "-mavxvnni",
--        "-mf16c",
--        "-mfma",
--        "-mgfni",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qd8-f16-qc8w-igemm/gen/qd8-f16-qc8w-igemm-1x8c8-minmax-avxvnni-prfm.c",
--        "src/src/qd8-f16-qc8w-igemm/gen/qd8-f16-qc8w-igemm-5x8c8-minmax-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",
--      ]
++
 +    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-f16-qc8w-igemm_avx2-avxvnni-f16c-fma-gfni_standalone") {
--      cflags = [
--        "-mavx2",
--        "-mavxvnni",
--        "-mf16c",
--        "-mfma",
--        "-mgfni",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qd8-f16-qc8w-igemm/gen/qd8-f16-qc8w-igemm-1x8c8-minmax-avxvnni-prfm.c",
--        "src/src/qd8-f16-qc8w-igemm/gen/qd8-f16-qc8w-igemm-5x8c8-minmax-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:pthreadpool_standalone",
--      ]
--
--      public_configs = [ ":xnnpack_public_config" ]
--
--      if (!(is_android && use_order_profiling)) {
--        assert_no_deps = [ "//base" ]
--      }
--    }
--  }
++
 +if (build_with_chromium) {
 +  source_set("f32-qc8w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
 +    cflags = [
@@ -30346,114 +27262,23 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +    "src/src/f32-qc8w-gemm/gen/f32-qc8w-gemm-1x32-minmax-avx512skx-broadcast.c",
 +    "src/src/f32-qc8w-gemm/gen/f32-qc8w-gemm-7x32-minmax-avx512skx-broadcast.c"
 +    ]
- 
--  if (build_with_chromium) {
--    source_set("qd8-f16-qc8w-igemm_f16c-fma-avx2") {
--      cflags = [
--        "-mavx2",
--        "-mf16c",
--        "-mfma",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qd8-f16-qc8w-igemm/gen/qd8-f16-qc8w-igemm-1x8c8-minmax-avx2.c",
--        "src/src/qd8-f16-qc8w-igemm/gen/qd8-f16-qc8w-igemm-3x8c8-minmax-avx2.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",
 +    ]
- 
--  # This is a target that cannot depend on //base.
--  if (build_with_internal_optimization_guide) {
--    source_set("qd8-f16-qc8w-igemm_f16c-fma-avx2_standalone") {
--      cflags = [
--        "-mavx2",
--        "-mf16c",
--        "-mfma",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qd8-f16-qc8w-igemm/gen/qd8-f16-qc8w-igemm-1x8c8-minmax-avx2.c",
--        "src/src/qd8-f16-qc8w-igemm/gen/qd8-f16-qc8w-igemm-3x8c8-minmax-avx2.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(
--        "qd8-f16-qc8w-igemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
--      cflags = [
--        "-mavx512bw",
--        "-mavx512cd",
--        "-mavx512dq",
--        "-mavx512f",
--        "-mavx512vl",
--        "-mf16c",
--        "-mfma",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qd8-f16-qc8w-igemm/gen/qd8-f16-qc8w-igemm-1x8c8-minmax-avx256skx.c",
--        "src/src/qd8-f16-qc8w-igemm/gen/qd8-f16-qc8w-igemm-5x8c8-minmax-avx256skx.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-qc8w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") {
@@ -30474,141 +27299,27 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +    "src/src/f32-qc8w-gemm/gen/f32-qc8w-gemm-1x32-minmax-avx512skx-broadcast.c",
 +    "src/src/f32-qc8w-gemm/gen/f32-qc8w-gemm-7x32-minmax-avx512skx-broadcast.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-qc8w-igemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") {
--      cflags = [
--        "-mavx512bw",
--        "-mavx512cd",
--        "-mavx512dq",
--        "-mavx512f",
--        "-mavx512vl",
--        "-mf16c",
--        "-mfma",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qd8-f16-qc8w-igemm/gen/qd8-f16-qc8w-igemm-1x8c8-minmax-avx256skx.c",
--        "src/src/qd8-f16-qc8w-igemm/gen/qd8-f16-qc8w-igemm-5x8c8-minmax-avx256skx.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" ]
--      }
--    }
--  }
++
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
 +      "//third_party/fxdiv",
 +      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
- 
--  if (build_with_chromium) {
--    source_set(
--        "qd8-f16-qc8w-igemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni") {
--      cflags = [
--        "-mavx512bw",
--        "-mavx512cd",
--        "-mavx512dq",
--        "-mavx512f",
--        "-mavx512vl",
--        "-mavx512vnni",
--        "-mf16c",
--        "-mfma",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qd8-f16-qc8w-igemm/gen/qd8-f16-qc8w-igemm-1x8c8-minmax-avx256vnni.c",
--        "src/src/qd8-f16-qc8w-igemm/gen/qd8-f16-qc8w-igemm-8x8c8-minmax-avx256vnni.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-f16-qc8w-igemm_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/qd8-f16-qc8w-igemm/gen/qd8-f16-qc8w-igemm-1x8c8-minmax-avx256vnni.c",
--        "src/src/qd8-f16-qc8w-igemm/gen/qd8-f16-qc8w-igemm-8x8c8-minmax-avx256vnni.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-qc8w-gemm_f16c-fma-no-avx2") {
 +    cflags = [
@@ -30622,128 +27333,23 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +      "src/src/f32-qc8w-gemm/gen/f32-qc8w-gemm-1x16-minmax-fma3-broadcast.c",
 +    "src/src/f32-qc8w-gemm/gen/f32-qc8w-gemm-5x16-minmax-fma3-broadcast.c"
 +    ]
- 
--  if (build_with_chromium) {
--    source_set(
--        "qd8-f16-qc8w-igemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni-amx-tile-amx-int8") {
--      cflags = [
--        "-mamx-int8",
--        "-mamx-tile",
--        "-mavx512bw",
--        "-mavx512cd",
--        "-mavx512dq",
--        "-mavx512f",
--        "-mavx512vl",
--        "-mavx512vnni",
--        "-mf16c",
--        "-mfma",
--        "-mgfni",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qd8-f16-qc8w-igemm/gen/qd8-f16-qc8w-igemm-16x64c4-minmax-avx512amx.c",
--        "src/src/qd8-f16-qc8w-igemm/gen/qd8-f16-qc8w-igemm-1x64c4-minmax-avx512amx.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",
 +    ]
- 
--  # This is a target that cannot depend on //base.
--  if (build_with_internal_optimization_guide) {
--    source_set(
--        "qd8-f16-qc8w-igemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni-amx-tile-amx-int8_standalone") {
--      cflags = [
--        "-mamx-int8",
--        "-mamx-tile",
--        "-mavx512bw",
--        "-mavx512cd",
--        "-mavx512dq",
--        "-mavx512f",
--        "-mavx512vl",
--        "-mavx512vnni",
--        "-mf16c",
--        "-mfma",
--        "-mgfni",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qd8-f16-qc8w-igemm/gen/qd8-f16-qc8w-igemm-16x64c4-minmax-avx512amx.c",
--        "src/src/qd8-f16-qc8w-igemm/gen/qd8-f16-qc8w-igemm-1x64c4-minmax-avx512amx.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("qd8-f32-qb4w-gemm_avx-no-avx2-no-f16c-no-fma") {
--      cflags = [
--        "-mavx",
--        "-mno-avx2",
--        "-mno-f16c",
--        "-mno-fma",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qd8-f32-qb4w-gemm/gen/qd8-f32-qb4w-gemm-1x4c8-minmax-avx-ld128.c",
--        "src/src/qd8-f32-qb4w-gemm/gen/qd8-f32-qb4w-gemm-4x4c8-minmax-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",
--      ]
++
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
 +  source_set("f32-qc8w-gemm_f16c-fma-no-avx2_standalone") {
@@ -30758,125 +27364,27 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +      "src/src/f32-qc8w-gemm/gen/f32-qc8w-gemm-1x16-minmax-fma3-broadcast.c",
 +    "src/src/f32-qc8w-gemm/gen/f32-qc8w-gemm-5x16-minmax-fma3-broadcast.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-qb4w-gemm_avx-no-avx2-no-f16c-no-fma_standalone") {
--      cflags = [
--        "-mavx",
--        "-mno-avx2",
--        "-mno-f16c",
--        "-mno-fma",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qd8-f32-qb4w-gemm/gen/qd8-f32-qb4w-gemm-1x4c8-minmax-avx-ld128.c",
--        "src/src/qd8-f32-qb4w-gemm/gen/qd8-f32-qb4w-gemm-4x4c8-minmax-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" ]
--      }
--    }
--  }
++
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
 +      "//third_party/fxdiv",
 +      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
- 
--  if (build_with_chromium) {
--    source_set("qd8-f32-qb4w-gemm_f16c-fma-avx2") {
--      cflags = [
--        "-mavx2",
--        "-mf16c",
--        "-mfma",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qd8-f32-qb4w-gemm/gen/qd8-f32-qb4w-gemm-1x8c8-minmax-avx2.c",
--        "src/src/qd8-f32-qb4w-gemm/gen/qd8-f32-qb4w-gemm-3x8c8-minmax-avx2.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-qb4w-gemm_f16c-fma-avx2_standalone") {
--      cflags = [
--        "-mavx2",
--        "-mf16c",
--        "-mfma",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qd8-f32-qb4w-gemm/gen/qd8-f32-qb4w-gemm-1x8c8-minmax-avx2.c",
--        "src/src/qd8-f32-qb4w-gemm/gen/qd8-f32-qb4w-gemm-3x8c8-minmax-avx2.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-qc8w-gemm_sse4.1-no-sse4.2") {
 +    cflags = [
@@ -30889,128 +27397,23 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +      "src/src/f32-qc8w-gemm/gen/f32-qc8w-gemm-1x8-minmax-sse41-dup.c",
 +    "src/src/f32-qc8w-gemm/gen/f32-qc8w-gemm-4x8-minmax-sse41-dup.c"
 +    ]
- 
--  if (build_with_chromium) {
--    source_set(
--        "qd8-f32-qb4w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni") {
--      cflags = [
--        "-mavx512bw",
--        "-mavx512cd",
--        "-mavx512dq",
--        "-mavx512f",
--        "-mavx512vl",
--        "-mavx512vnni",
--        "-mf16c",
--        "-mfma",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qd8-f32-qb4w-gemm/gen/qd8-f32-qb4w-gemm-1x16c8-minmax-avx512vnni-prfm.c",
--        "src/src/qd8-f32-qb4w-gemm/gen/qd8-f32-qb4w-gemm-8x16c8-minmax-avx512vnni-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",
--      ]
++
 +    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(
--        "qd8-f32-qb4w-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/qd8-f32-qb4w-gemm/gen/qd8-f32-qb4w-gemm-1x16c8-minmax-avx512vnni-prfm.c",
--        "src/src/qd8-f32-qb4w-gemm/gen/qd8-f32-qb4w-gemm-8x16c8-minmax-avx512vnni-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" ]
--      }
--    }
++
 +    public_configs = [ ":xnnpack_public_config" ]
-   }
++  }
 +}
- 
--  if (build_with_chromium) {
--    source_set(
--        "qd8-f32-qb4w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni") {
--      cflags = [
--        "-mavx512bw",
--        "-mavx512cd",
--        "-mavx512dq",
--        "-mavx512f",
--        "-mavx512vl",
--        "-mavx512vnni",
--        "-mf16c",
--        "-mfma",
--        "-mgfni",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qd8-f32-qb4w-gemm/gen/qd8-f32-qb4w-gemm-14x16c8-minmax-avx512vnnigfni-prfm.c",
--        "src/src/qd8-f32-qb4w-gemm/gen/qd8-f32-qb4w-gemm-1x16c8-minmax-avx512vnnigfni-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("f32-qc8w-gemm_sse4.1-no-sse4.2_standalone") {
@@ -31024,129 +27427,27 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +      "src/src/f32-qc8w-gemm/gen/f32-qc8w-gemm-1x8-minmax-sse41-dup.c",
 +    "src/src/f32-qc8w-gemm/gen/f32-qc8w-gemm-4x8-minmax-sse41-dup.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-qb4w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni_standalone") {
--      cflags = [
--        "-mavx512bw",
--        "-mavx512cd",
--        "-mavx512dq",
--        "-mavx512f",
--        "-mavx512vl",
--        "-mavx512vnni",
--        "-mf16c",
--        "-mfma",
--        "-mgfni",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qd8-f32-qb4w-gemm/gen/qd8-f32-qb4w-gemm-14x16c8-minmax-avx512vnnigfni-prfm.c",
--        "src/src/qd8-f32-qb4w-gemm/gen/qd8-f32-qb4w-gemm-1x16c8-minmax-avx512vnnigfni-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" ]
--      }
--    }
--  }
++
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
 +      "//third_party/fxdiv",
 +      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
- 
--  if (build_with_chromium) {
--    source_set("qd8-f32-qb4w-gemm_sse2-no-sse3") {
--      cflags = [
--        "-mno-sse3",
--        "-msse2",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qd8-f32-qb4w-gemm/gen/qd8-f32-qb4w-gemm-1x4c8-minmax-sse2-ld128.c",
--        "src/src/qd8-f32-qb4w-gemm/gen/qd8-f32-qb4w-gemm-4x4c8-minmax-sse2-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",
--      ]
++
 +    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-qb4w-gemm_sse2-no-sse3_standalone") {
--      cflags = [
--        "-mno-sse3",
--        "-msse2",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qd8-f32-qb4w-gemm/gen/qd8-f32-qb4w-gemm-1x4c8-minmax-sse2-ld128.c",
--        "src/src/qd8-f32-qb4w-gemm/gen/qd8-f32-qb4w-gemm-4x4c8-minmax-sse2-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-qc8w-gemm_x64") {
 +    cflags = [
@@ -31158,85 +27459,23 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +      "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) {
--    source_set("qd8-f32-qb4w-gemm_sse4.1-no-sse4.2") {
--      cflags = [
--        "-mno-sse4.2",
--        "-msse4.1",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qd8-f32-qb4w-gemm/gen/qd8-f32-qb4w-gemm-1x4c8-minmax-sse41-ld128.c",
--        "src/src/qd8-f32-qb4w-gemm/gen/qd8-f32-qb4w-gemm-3x4c8-minmax-sse41-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",
--      ]
++
 +    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("qd8-f32-qb4w-gemm_sse4.1-no-sse4.2_standalone") {
--      cflags = [
--        "-mno-sse4.2",
--        "-msse4.1",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qd8-f32-qb4w-gemm/gen/qd8-f32-qb4w-gemm-1x4c8-minmax-sse41-ld128.c",
--        "src/src/qd8-f32-qb4w-gemm/gen/qd8-f32-qb4w-gemm-3x4c8-minmax-sse41-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" ]
--      }
--    }
++
 +    public_configs = [ ":xnnpack_public_config" ]
-   }
++  }
 +}
- 
--  if (build_with_chromium) {
--    source_set("qd8-f32-qb4w-gemm_x64") {
--      cflags = []
++
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
 +  source_set("f32-qc8w-gemm_x64_standalone") {
@@ -31249,73 +27488,27 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +      "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 = [
--        "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",
--      ]
++
 +    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("qd8-f32-qb4w-gemm_x64_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",
--      ]
--
--      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-qs8-vcvt_avx-no-avx2-no-f16c-no-fma") {
 +    cflags = [
@@ -31329,117 +27522,23 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +      "src/include/xnnpack.h",
 +      "src/src/f32-qs8-vcvt/gen/f32-qs8-vcvt-avx-u32.c"
 +    ]
- 
--  if (build_with_chromium) {
--    source_set("qd8-f32-qc2w-gemm_avx2-avxvnni-f16c-fma-gfni") {
--      cflags = [
--        "-mavx2",
--        "-mavxvnni",
--        "-mf16c",
--        "-mfma",
--        "-mgfni",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qd8-f32-qc2w-gemm/gen/qd8-f32-qc2w-gemm-1x8c8-minmax-avxvnni.c",
--        "src/src/qd8-f32-qc2w-gemm/gen/qd8-f32-qc2w-gemm-5x8c8-minmax-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",
--      ]
++
 +    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("qd8-f32-qc2w-gemm_avx2-avxvnni-f16c-fma-gfni_standalone") {
--      cflags = [
--        "-mavx2",
--        "-mavxvnni",
--        "-mf16c",
--        "-mfma",
--        "-mgfni",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qd8-f32-qc2w-gemm/gen/qd8-f32-qc2w-gemm-1x8c8-minmax-avxvnni.c",
--        "src/src/qd8-f32-qc2w-gemm/gen/qd8-f32-qc2w-gemm-5x8c8-minmax-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" ]
--      }
--    }
++
 +    public_configs = [ ":xnnpack_public_config" ]
-   }
++  }
 +}
- 
--  if (build_with_chromium) {
--    source_set("qd8-f32-qc2w-gemm_f16c-fma-avx2") {
--      cflags = [
--        "-mavx2",
--        "-mf16c",
--        "-mfma",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qd8-f32-qc2w-gemm/gen/qd8-f32-qc2w-gemm-1x8c8-minmax-avx2-madd.c",
--        "src/src/qd8-f32-qc2w-gemm/gen/qd8-f32-qc2w-gemm-8x8c8-minmax-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",
--      ]
--
--      public_configs = [ ":xnnpack_public_config" ]
--    }
--  }
++
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
 +  source_set("f32-qs8-vcvt_avx-no-avx2-no-f16c-no-fma_standalone") {
@@ -31454,127 +27553,27 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +      "src/include/xnnpack.h",
 +      "src/src/f32-qs8-vcvt/gen/f32-qs8-vcvt-avx-u32.c"
 +    ]
- 
--  # This is a target that cannot depend on //base.
--  if (build_with_internal_optimization_guide) {
--    source_set("qd8-f32-qc2w-gemm_f16c-fma-avx2_standalone") {
--      cflags = [
--        "-mavx2",
--        "-mf16c",
--        "-mfma",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qd8-f32-qc2w-gemm/gen/qd8-f32-qc2w-gemm-1x8c8-minmax-avx2-madd.c",
--        "src/src/qd8-f32-qc2w-gemm/gen/qd8-f32-qc2w-gemm-8x8c8-minmax-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: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("qd8-f32-qc2w-gemm_ssse3-no-sse4.1") {
--      cflags = [
--        "-mno-sse4.1",
--        "-mssse3",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qd8-f32-qc2w-gemm/gen/qd8-f32-qc2w-gemm-1x4c8-minmax-ssse3-madd.c",
--        "src/src/qd8-f32-qc2w-gemm/gen/qd8-f32-qc2w-gemm-4x4c8-minmax-ssse3-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",
--      ]
++
 +    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" ]
- 
--  # This is a target that cannot depend on //base.
--  if (build_with_internal_optimization_guide) {
--    source_set("qd8-f32-qc2w-gemm_ssse3-no-sse4.1_standalone") {
--      cflags = [
--        "-mno-sse4.1",
--        "-mssse3",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qd8-f32-qc2w-gemm/gen/qd8-f32-qc2w-gemm-1x4c8-minmax-ssse3-madd.c",
--        "src/src/qd8-f32-qc2w-gemm/gen/qd8-f32-qc2w-gemm-4x4c8-minmax-ssse3-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: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-f32-qc2w-gemm_x64") {
--      cflags = []
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qd8-f32-qc2w-gemm/gen/qd8-f32-qc2w-gemm-1x2-minmax-scalar.c",
--      ]
++
 +if (build_with_chromium) {
 +  source_set("f32-qs8-vcvt_f16c-fma-avx2") {
 +    cflags = [
@@ -31587,39 +27586,23 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +      "src/include/xnnpack.h",
 +      "src/src/f32-qs8-vcvt/gen/f32-qs8-vcvt-avx2-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" ]
++
 +    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) {
--    source_set("qd8-f32-qc2w-gemm_x64_standalone") {
--      cflags = []
++
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
 +  source_set("f32-qs8-vcvt_f16c-fma-avx2_standalone") {
@@ -31633,140 +27616,27 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +      "src/include/xnnpack.h",
 +      "src/src/f32-qs8-vcvt/gen/f32-qs8-vcvt-avx2-u64.c"
 +    ]
- 
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qd8-f32-qc2w-gemm/gen/qd8-f32-qc2w-gemm-1x2-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" ]
--      }
--    }
--  }
++
 +    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-f32-qc4w-gemm_avx2-avxvnni-f16c-fma-gfni") {
--      cflags = [
--        "-mavx2",
--        "-mavxvnni",
--        "-mf16c",
--        "-mfma",
--        "-mgfni",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-1x8c8-minmax-avxvnni-prfm.c",
--        "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-5x8c8-minmax-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: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("qd8-f32-qc4w-gemm_avx2-avxvnni-f16c-fma-gfni_standalone") {
--      cflags = [
--        "-mavx2",
--        "-mavxvnni",
--        "-mf16c",
--        "-mfma",
--        "-mgfni",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-1x8c8-minmax-avxvnni-prfm.c",
--        "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-5x8c8-minmax-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: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-f32-qc4w-gemm_f16c-fma-avx2") {
--      cflags = [
--        "-mavx2",
--        "-mf16c",
--        "-mfma",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-1x8c8-minmax-avx2-madd-prfm.c",
--        "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-4x8c8-minmax-avx2-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",
--      ]
++
 +if (build_with_chromium) {
 +  source_set("f32-qs8-vcvt_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
 +    cflags = [
@@ -31783,48 +27653,12 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +      "src/include/xnnpack.h",
 +      "src/src/f32-qs8-vcvt/gen/f32-qs8-vcvt-avx512skx-u128.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_f16c-fma-avx2_standalone") {
--      cflags = [
--        "-mavx2",
--        "-mf16c",
--        "-mfma",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-1x8c8-minmax-avx2-madd-prfm.c",
--        "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-4x8c8-minmax-avx2-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" ]
--      }
--    }
++
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
@@ -31833,41 +27667,9 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +    ]
 +
 +    public_configs = [ ":xnnpack_public_config" ]
-   }
++  }
 +}
- 
--  if (build_with_chromium) {
--    source_set(
--        "qd8-f32-qc4w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
--      cflags = [
--        "-mavx512bw",
--        "-mavx512cd",
--        "-mavx512dq",
--        "-mavx512f",
--        "-mavx512vl",
--        "-mf16c",
--        "-mfma",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-1x16c8-minmax-avx512skx-madd-prfm.c",
--        "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-1x8c8-minmax-avx256skx-madd-prfm.c",
--        "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-8x16c8-minmax-avx512skx-madd-prfm.c",
--        "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-8x8c8-minmax-avx256skx-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",
--      ]
++
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
 +  source_set("f32-qs8-vcvt_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") {
@@ -31885,143 +27687,27 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +      "src/include/xnnpack.h",
 +      "src/src/f32-qs8-vcvt/gen/f32-qs8-vcvt-avx512skx-u128.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_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") {
--      cflags = [
--        "-mavx512bw",
--        "-mavx512cd",
--        "-mavx512dq",
--        "-mavx512f",
--        "-mavx512vl",
--        "-mf16c",
--        "-mfma",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-1x16c8-minmax-avx512skx-madd-prfm.c",
--        "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-1x8c8-minmax-avx256skx-madd-prfm.c",
--        "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-8x16c8-minmax-avx512skx-madd-prfm.c",
--        "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-8x8c8-minmax-avx256skx-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" ]
--      }
--    }
--  }
++
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
 +      "//third_party/fxdiv",
 +      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
- 
--  if (build_with_chromium) {
--    source_set(
--        "qd8-f32-qc4w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni") {
--      cflags = [
--        "-mavx512bw",
--        "-mavx512cd",
--        "-mavx512dq",
--        "-mavx512f",
--        "-mavx512vl",
--        "-mavx512vnni",
--        "-mf16c",
--        "-mfma",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-1x16c8-minmax-avx512vnni-prfm.c",
--        "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-8x16c8-minmax-avx512vnni-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(
--        "qd8-f32-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/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-1x16c8-minmax-avx512vnni-prfm.c",
--        "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-8x16c8-minmax-avx512vnni-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-qs8-vcvt_sse2-no-sse3") {
 +    cflags = [
@@ -32033,132 +27719,23 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +      "src/include/xnnpack.h",
 +      "src/src/f32-qs8-vcvt/gen/f32-qs8-vcvt-sse2-u32.c"
 +    ]
- 
--  if (build_with_chromium) {
--    source_set(
--        "qd8-f32-qc4w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni") {
--      cflags = [
--        "-mavx512bw",
--        "-mavx512cd",
--        "-mavx512dq",
--        "-mavx512f",
--        "-mavx512vl",
--        "-mavx512vnni",
--        "-mf16c",
--        "-mfma",
--        "-mgfni",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-14x16c8-minmax-avx512vnnigfni-prfm.c",
--        "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-1x16c8-minmax-avx512vnnigfni-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",
--      ]
++
 +    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(
--        "qd8-f32-qc4w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni_standalone") {
--      cflags = [
--        "-mavx512bw",
--        "-mavx512cd",
--        "-mavx512dq",
--        "-mavx512f",
--        "-mavx512vl",
--        "-mavx512vnni",
--        "-mf16c",
--        "-mfma",
--        "-mgfni",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-14x16c8-minmax-avx512vnnigfni-prfm.c",
--        "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-1x16c8-minmax-avx512vnnigfni-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" ]
--      }
--    }
++
 +    public_configs = [ ":xnnpack_public_config" ]
-   }
++  }
 +}
- 
--  if (build_with_chromium) {
--    source_set(
--        "qd8-f32-qc4w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni-amx-tile-amx-int8") {
--      cflags = [
--        "-mamx-int8",
--        "-mamx-tile",
--        "-mavx512bw",
--        "-mavx512cd",
--        "-mavx512dq",
--        "-mavx512f",
--        "-mavx512vl",
--        "-mavx512vnni",
--        "-mf16c",
--        "-mfma",
--        "-mgfni",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-16x64c4-minmax-avx512amx.c",
--        "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-1x64c4-minmax-avx512amx.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-qs8-vcvt_sse2-no-sse3_standalone") {
@@ -32171,131 +27748,27 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +      "src/include/xnnpack.h",
 +      "src/src/f32-qs8-vcvt/gen/f32-qs8-vcvt-sse2-u32.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_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni-amx-tile-amx-int8_standalone") {
--      cflags = [
--        "-mamx-int8",
--        "-mamx-tile",
--        "-mavx512bw",
--        "-mavx512cd",
--        "-mavx512dq",
--        "-mavx512f",
--        "-mavx512vl",
--        "-mavx512vnni",
--        "-mf16c",
--        "-mfma",
--        "-mgfni",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-16x64c4-minmax-avx512amx.c",
--        "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-1x64c4-minmax-avx512amx.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" ]
--      }
--    }
--  }
++
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
 +      "//third_party/fxdiv",
 +      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
- 
--  if (build_with_chromium) {
--    source_set("qd8-f32-qc4w-gemm_sse2-no-sse3") {
--      cflags = [
--        "-mno-sse3",
--        "-msse2",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-1x4c8-minmax-sse2-ld128.c",
--        "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-4x4c8-minmax-sse2-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",
--      ]
++
 +    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_sse2-no-sse3_standalone") {
--      cflags = [
--        "-mno-sse3",
--        "-msse2",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-1x4c8-minmax-sse2-ld128.c",
--        "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-4x4c8-minmax-sse2-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-qs8-vcvt_sse4.1-no-sse4.2") {
 +    cflags = [
@@ -32307,85 +27780,23 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +      "src/include/xnnpack.h",
 +      "src/src/f32-qs8-vcvt/gen/f32-qs8-vcvt-sse41-u32.c"
 +    ]
- 
--  if (build_with_chromium) {
--    source_set("qd8-f32-qc4w-gemm_ssse3-no-sse4.1") {
--      cflags = [
--        "-mno-sse4.1",
--        "-mssse3",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-1x4c8-minmax-ssse3-madd-prfm.c",
--        "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-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",
--      ]
++
 +    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("qd8-f32-qc4w-gemm_ssse3-no-sse4.1_standalone") {
--      cflags = [
--        "-mno-sse4.1",
--        "-mssse3",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-1x4c8-minmax-ssse3-madd-prfm.c",
--        "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-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: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("qd8-f32-qc4w-gemm_x64") {
--      cflags = []
++
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
 +  source_set("f32-qs8-vcvt_sse4.1-no-sse4.2_standalone") {
@@ -32398,73 +27809,27 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +      "src/include/xnnpack.h",
 +      "src/src/f32-qs8-vcvt/gen/f32-qs8-vcvt-sse41-u32.c"
 +    ]
- 
--      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",
--      ]
++
 +    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("qd8-f32-qc4w-gemm_x64_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",
--      ]
--
--      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-qs8-vcvt_x64") {
 +    cflags = [
@@ -32476,113 +27841,23 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +      "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"
 +    ]
- 
--  if (build_with_chromium) {
--    source_set("qd8-f32-qc8w-gemm_avx2-avxvnni-f16c-fma-gfni") {
--      cflags = [
--        "-mavx2",
--        "-mavxvnni",
--        "-mf16c",
--        "-mfma",
--        "-mgfni",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-1x8c8-minmax-avxvnni-prfm.c",
--        "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-5x8c8-minmax-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",
--      ]
++
 +    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("qd8-f32-qc8w-gemm_avx2-avxvnni-f16c-fma-gfni_standalone") {
--      cflags = [
--        "-mavx2",
--        "-mavxvnni",
--        "-mf16c",
--        "-mfma",
--        "-mgfni",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-1x8c8-minmax-avxvnni-prfm.c",
--        "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-5x8c8-minmax-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: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("qd8-f32-qc8w-gemm_f16c-fma-avx2") {
--      cflags = [
--        "-mavx2",
--        "-mf16c",
--        "-mfma",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-1x8c8-minmax-avx2.c",
--        "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-4x8c8-minmax-avx2.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-qs8-vcvt_x64_standalone") {
@@ -32595,138 +27870,27 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +      "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"
 +    ]
- 
--      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-qc8w-gemm_f16c-fma-avx2_standalone") {
--      cflags = [
--        "-mavx2",
--        "-mf16c",
--        "-mfma",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-1x8c8-minmax-avx2.c",
--        "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-4x8c8-minmax-avx2.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" ]
--      }
--    }
--  }
++
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
 +      "//third_party/fxdiv",
 +      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
- 
--  if (build_with_chromium) {
--    source_set(
--        "qd8-f32-qc8w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
--      cflags = [
--        "-mavx512bw",
--        "-mavx512cd",
--        "-mavx512dq",
--        "-mavx512f",
--        "-mavx512vl",
--        "-mf16c",
--        "-mfma",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-1x16c8-minmax-avx512skx-prfm.c",
--        "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-1x8c8-minmax-avx256skx.c",
--        "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-8x16c8-minmax-avx512skx-prfm.c",
--        "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-8x8c8-minmax-avx256skx.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-qc8w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") {
--      cflags = [
--        "-mavx512bw",
--        "-mavx512cd",
--        "-mavx512dq",
--        "-mavx512f",
--        "-mavx512vl",
--        "-mf16c",
--        "-mfma",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-1x16c8-minmax-avx512skx-prfm.c",
--        "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-1x8c8-minmax-avx256skx.c",
--        "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-8x16c8-minmax-avx512skx-prfm.c",
--        "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-8x8c8-minmax-avx256skx.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-qu8-vcvt_avx-no-avx2-no-f16c-no-fma") {
 +    cflags = [
@@ -32740,130 +27904,23 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +      "src/include/xnnpack.h",
 +      "src/src/f32-qu8-vcvt/gen/f32-qu8-vcvt-avx-u32.c"
 +    ]
- 
--  if (build_with_chromium) {
--    source_set(
--        "qd8-f32-qc8w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni") {
--      cflags = [
--        "-mavx512bw",
--        "-mavx512cd",
--        "-mavx512dq",
--        "-mavx512f",
--        "-mavx512vl",
--        "-mavx512vnni",
--        "-mf16c",
--        "-mfma",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-10x16c8-minmax-avx512vnni-prfm.c",
--        "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-1x16c8-minmax-avx512vnni-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",
--      ]
++
 +    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(
--        "qd8-f32-qc8w-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/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-10x16c8-minmax-avx512vnni-prfm.c",
--        "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-1x16c8-minmax-avx512vnni-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" ]
--      }
--    }
++
 +    public_configs = [ ":xnnpack_public_config" ]
-   }
++  }
 +}
- 
--  if (build_with_chromium) {
--    source_set(
--        "qd8-f32-qc8w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni-amx-tile-amx-int8") {
--      cflags = [
--        "-mamx-int8",
--        "-mamx-tile",
--        "-mavx512bw",
--        "-mavx512cd",
--        "-mavx512dq",
--        "-mavx512f",
--        "-mavx512vl",
--        "-mavx512vnni",
--        "-mf16c",
--        "-mfma",
--        "-mgfni",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-16x64c4-minmax-avx512amx.c",
--        "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-1x64c4-minmax-avx512amx.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-qu8-vcvt_avx-no-avx2-no-f16c-no-fma_standalone") {
@@ -32878,131 +27935,27 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +      "src/include/xnnpack.h",
 +      "src/src/f32-qu8-vcvt/gen/f32-qu8-vcvt-avx-u32.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-qc8w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni-amx-tile-amx-int8_standalone") {
--      cflags = [
--        "-mamx-int8",
--        "-mamx-tile",
--        "-mavx512bw",
--        "-mavx512cd",
--        "-mavx512dq",
--        "-mavx512f",
--        "-mavx512vl",
--        "-mavx512vnni",
--        "-mf16c",
--        "-mfma",
--        "-mgfni",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-16x64c4-minmax-avx512amx.c",
--        "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-1x64c4-minmax-avx512amx.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" ]
--      }
--    }
--  }
++
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
 +      "//third_party/fxdiv",
 +      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
- 
--  if (build_with_chromium) {
--    source_set("qd8-f32-qc8w-gemm_sse2-no-sse3") {
--      cflags = [
--        "-mno-sse3",
--        "-msse2",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-1x4c8-minmax-sse2-ld64.c",
--        "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-4x4c8-minmax-sse2-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",
--      ]
++
 +    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-qc8w-gemm_sse2-no-sse3_standalone") {
--      cflags = [
--        "-mno-sse3",
--        "-msse2",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-1x4c8-minmax-sse2-ld64.c",
--        "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-4x4c8-minmax-sse2-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:pthreadpool_standalone",
--      ]
--
--      public_configs = [ ":xnnpack_public_config" ]
--
--      if (!(is_android && use_order_profiling)) {
--        assert_no_deps = [ "//base" ]
--      }
--    }
--  }
++
 +if (build_with_chromium) {
 +  source_set("f32-qu8-vcvt_f16c-fma-avx2") {
 +    cflags = [
@@ -33015,85 +27968,23 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +      "src/include/xnnpack.h",
 +      "src/src/f32-qu8-vcvt/gen/f32-qu8-vcvt-avx2-u64.c"
 +    ]
- 
--  if (build_with_chromium) {
--    source_set("qd8-f32-qc8w-gemm_sse4.1-no-sse4.2") {
--      cflags = [
--        "-mno-sse4.2",
--        "-msse4.1",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-1x4c8-minmax-sse41-ld64.c",
--        "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-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",
--      ]
++
 +    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("qd8-f32-qc8w-gemm_sse4.1-no-sse4.2_standalone") {
--      cflags = [
--        "-mno-sse4.2",
--        "-msse4.1",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-1x4c8-minmax-sse41-ld64.c",
--        "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-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: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("qd8-f32-qc8w-gemm_x64") {
--      cflags = []
++
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
 +  source_set("f32-qu8-vcvt_f16c-fma-avx2_standalone") {
@@ -33107,75 +27998,27 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +      "src/include/xnnpack.h",
 +      "src/src/f32-qu8-vcvt/gen/f32-qu8-vcvt-avx2-u64.c"
 +    ]
- 
--      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",
--      ]
++
 +    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("qd8-f32-qc8w-gemm_x64_standalone") {
--      cflags = []
--
--      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",
--      ]
--
--      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-qu8-vcvt_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
 +    cflags = [
@@ -33192,113 +28035,23 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +      "src/include/xnnpack.h",
 +      "src/src/f32-qu8-vcvt/gen/f32-qu8-vcvt-avx512skx-u128.c"
 +    ]
- 
--  if (build_with_chromium) {
--    source_set("qd8-f32-qc8w-igemm_avx2-avxvnni-f16c-fma-gfni") {
--      cflags = [
--        "-mavx2",
--        "-mavxvnni",
--        "-mf16c",
--        "-mfma",
--        "-mgfni",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-1x8c8-minmax-avxvnni-prfm.c",
--        "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-5x8c8-minmax-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",
--      ]
++
 +    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("qd8-f32-qc8w-igemm_avx2-avxvnni-f16c-fma-gfni_standalone") {
--      cflags = [
--        "-mavx2",
--        "-mavxvnni",
--        "-mf16c",
--        "-mfma",
--        "-mgfni",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-1x8c8-minmax-avxvnni-prfm.c",
--        "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-5x8c8-minmax-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: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("qd8-f32-qc8w-igemm_f16c-fma-avx2") {
--      cflags = [
--        "-mavx2",
--        "-mf16c",
--        "-mfma",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-1x8c8-minmax-avx2.c",
--        "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-4x8c8-minmax-avx2.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-qu8-vcvt_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") {
@@ -33316,138 +28069,27 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +      "src/include/xnnpack.h",
 +      "src/src/f32-qu8-vcvt/gen/f32-qu8-vcvt-avx512skx-u128.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-qc8w-igemm_f16c-fma-avx2_standalone") {
--      cflags = [
--        "-mavx2",
--        "-mf16c",
--        "-mfma",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-1x8c8-minmax-avx2.c",
--        "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-4x8c8-minmax-avx2.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" ]
--      }
--    }
--  }
++
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
 +      "//third_party/fxdiv",
 +      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
- 
--  if (build_with_chromium) {
--    source_set(
--        "qd8-f32-qc8w-igemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
--      cflags = [
--        "-mavx512bw",
--        "-mavx512cd",
--        "-mavx512dq",
--        "-mavx512f",
--        "-mavx512vl",
--        "-mf16c",
--        "-mfma",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-1x16c8-minmax-avx512skx-prfm.c",
--        "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-1x8c8-minmax-avx256skx.c",
--        "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-8x16c8-minmax-avx512skx-prfm.c",
--        "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-8x8c8-minmax-avx256skx.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-qc8w-igemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") {
--      cflags = [
--        "-mavx512bw",
--        "-mavx512cd",
--        "-mavx512dq",
--        "-mavx512f",
--        "-mavx512vl",
--        "-mf16c",
--        "-mfma",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-1x16c8-minmax-avx512skx-prfm.c",
--        "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-1x8c8-minmax-avx256skx.c",
--        "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-8x16c8-minmax-avx512skx-prfm.c",
--        "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-8x8c8-minmax-avx256skx.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-qu8-vcvt_sse2-no-sse3") {
 +    cflags = [
@@ -33459,130 +28101,23 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +      "src/include/xnnpack.h",
 +      "src/src/f32-qu8-vcvt/gen/f32-qu8-vcvt-sse2-u32.c"
 +    ]
- 
--  if (build_with_chromium) {
--    source_set(
--        "qd8-f32-qc8w-igemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni") {
--      cflags = [
--        "-mavx512bw",
--        "-mavx512cd",
--        "-mavx512dq",
--        "-mavx512f",
--        "-mavx512vl",
--        "-mavx512vnni",
--        "-mf16c",
--        "-mfma",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-10x16c8-minmax-avx512vnni-prfm.c",
--        "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-1x16c8-minmax-avx512vnni-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",
--      ]
++
 +    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(
--        "qd8-f32-qc8w-igemm_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/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-10x16c8-minmax-avx512vnni-prfm.c",
--        "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-1x16c8-minmax-avx512vnni-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" ]
--      }
--    }
++
 +    public_configs = [ ":xnnpack_public_config" ]
-   }
++  }
 +}
- 
--  if (build_with_chromium) {
--    source_set(
--        "qd8-f32-qc8w-igemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni-amx-tile-amx-int8") {
--      cflags = [
--        "-mamx-int8",
--        "-mamx-tile",
--        "-mavx512bw",
--        "-mavx512cd",
--        "-mavx512dq",
--        "-mavx512f",
--        "-mavx512vl",
--        "-mavx512vnni",
--        "-mf16c",
--        "-mfma",
--        "-mgfni",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-16x64c4-minmax-avx512amx.c",
--        "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-1x64c4-minmax-avx512amx.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-qu8-vcvt_sse2-no-sse3_standalone") {
@@ -33595,131 +28130,27 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +      "src/include/xnnpack.h",
 +      "src/src/f32-qu8-vcvt/gen/f32-qu8-vcvt-sse2-u32.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-qc8w-igemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni-amx-tile-amx-int8_standalone") {
--      cflags = [
--        "-mamx-int8",
--        "-mamx-tile",
--        "-mavx512bw",
--        "-mavx512cd",
--        "-mavx512dq",
--        "-mavx512f",
--        "-mavx512vl",
--        "-mavx512vnni",
--        "-mf16c",
--        "-mfma",
--        "-mgfni",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-16x64c4-minmax-avx512amx.c",
--        "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-1x64c4-minmax-avx512amx.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" ]
--      }
--    }
--  }
++
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
 +      "//third_party/fxdiv",
 +      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
- 
--  if (build_with_chromium) {
--    source_set("qd8-f32-qc8w-igemm_sse2-no-sse3") {
--      cflags = [
--        "-mno-sse3",
--        "-msse2",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-1x4c8-minmax-sse2-ld64.c",
--        "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-4x4c8-minmax-sse2-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",
--      ]
++
 +    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-qc8w-igemm_sse2-no-sse3_standalone") {
--      cflags = [
--        "-mno-sse3",
--        "-msse2",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-1x4c8-minmax-sse2-ld64.c",
--        "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-4x4c8-minmax-sse2-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:pthreadpool_standalone",
--      ]
--
--      public_configs = [ ":xnnpack_public_config" ]
--
--      if (!(is_android && use_order_profiling)) {
--        assert_no_deps = [ "//base" ]
--      }
--    }
--  }
++
 +if (build_with_chromium) {
 +  source_set("f32-qu8-vcvt_x64") {
 +    cflags = [
@@ -33731,85 +28162,23 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +      "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) {
--    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",
--      ]
++
 +    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("qd8-f32-qc8w-igemm_sse4.1-no-sse4.2_standalone") {
--      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: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("qd8-f32-qc8w-igemm_x64") {
--      cflags = []
++
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
 +  source_set("f32-qu8-vcvt_x64_standalone") {
@@ -33822,75 +28191,27 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +      "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"
 +    ]
- 
--      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" ]
++
 +    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-qc8w-igemm_x64_standalone") {
--      cflags = []
--
--      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 (build_with_chromium) {
 +  source_set("f32-raddstoreexpminusmax_avx512f") {
 +    cflags = [
@@ -33901,111 +28222,23 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +      "src/include/xnnpack.h",
 +      "src/src/f32-raddstoreexpminusmax/gen/f32-raddstoreexpminusmax-avx512f-rr2-p5-u64-acc2.c"
 +    ]
- 
--  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",
--      ]
++
 +    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-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" ]
--      }
--    }
++
 +    public_configs = [ ":xnnpack_public_config" ]
-   }
++  }
 +}
- 
--  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",
--      ]
++
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
 +  source_set("f32-raddstoreexpminusmax_avx512f_standalone") {
@@ -34017,134 +28250,27 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +      "src/include/xnnpack.h",
 +      "src/src/f32-raddstoreexpminusmax/gen/f32-raddstoreexpminusmax-avx512f-rr2-p5-u64-acc2.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("qs8-dwconv_f16c-fma-avx2_standalone") {
--      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:pthreadpool_standalone",
--      ]
--
--      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",
 +    ]
- 
--  if (build_with_chromium) {
--    source_set(
--        "qs8-dwconv_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
--      cflags = [
--        "-mavx512bw",
--        "-mavx512cd",
--        "-mavx512dq",
--        "-mavx512f",
--        "-mavx512vl",
--        "-mf16c",
--        "-mfma",
--      ]
--
--      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",
--      ]
--
--      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-dwconv_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") {
--      cflags = [
--        "-mavx512bw",
--        "-mavx512cd",
--        "-mavx512dq",
--        "-mavx512f",
--        "-mavx512vl",
--        "-mf16c",
--        "-mfma",
--      ]
--
--      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",
--      ]
--
--      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-raddstoreexpminusmax_f16c-fma-avx2") {
 +    cflags = [
@@ -34157,110 +28283,23 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +      "src/include/xnnpack.h",
 +      "src/src/f32-raddstoreexpminusmax/gen/f32-raddstoreexpminusmax-avx2-rr2-p5-u32-acc2.c"
 +    ]
- 
--  if (build_with_chromium) {
--    source_set("qs8-dwconv_sse2-no-sse3") {
--      cflags = [
--        "-mno-sse3",
--        "-msse2",
--      ]
--
--      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",
--      ]
--
--      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",
 +    ]
- 
--  # 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",
--      ]
--
--      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",
--      ]
--
--      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("qs8-dwconv_sse4.1-no-sse4.2") {
--      cflags = [
--        "-mno-sse4.2",
--        "-msse4.1",
--      ]
--
--      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",
--      ]
--
--      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-raddstoreexpminusmax_f16c-fma-avx2_standalone") {
@@ -34274,87 +28313,27 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +      "src/include/xnnpack.h",
 +      "src/src/f32-raddstoreexpminusmax/gen/f32-raddstoreexpminusmax-avx2-rr2-p5-u32-acc2.c"
 +    ]
- 
--  # 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-sse4.2",
--        "-msse4.1",
--      ]
--
--      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",
--      ]
--
--      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-dwconv_x64") {
--      cflags = []
++
 +    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-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",
--      ]
++
 +    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-raddstoreexpminusmax_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
 +    cflags = [
@@ -34371,109 +28350,23 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +      "src/include/xnnpack.h",
 +      "src/src/f32-raddstoreexpminusmax/gen/f32-raddstoreexpminusmax-avx256skx-rr2-p5-u32-acc2.c"
 +    ]
- 
--      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" ]
--      }
--    }
--  }
++
 +    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-f16-vcvt_f16c-fma-avx2") {
--      cflags = [
--        "-mavx2",
--        "-mf16c",
--        "-mfma",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qs8-f16-vcvt/gen/qs8-f16-vcvt-avx2-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",
--      ]
++
 +    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("qs8-f16-vcvt_f16c-fma-avx2_standalone") {
--      cflags = [
--        "-mavx2",
--        "-mf16c",
--        "-mfma",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qs8-f16-vcvt/gen/qs8-f16-vcvt-avx2-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" ]
--      }
--    }
--  }
++
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
 +  source_set("f32-raddstoreexpminusmax_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") {
@@ -34491,111 +28384,27 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +      "src/include/xnnpack.h",
 +      "src/src/f32-raddstoreexpminusmax/gen/f32-raddstoreexpminusmax-avx256skx-rr2-p5-u32-acc2.c"
 +    ]
- 
--  if (build_with_chromium) {
--    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-f32-vcvt/gen/qs8-f32-vcvt-avx-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",
--      ]
++
 +    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("qs8-f32-vcvt_avx-no-avx2-no-f16c-no-fma_standalone") {
--      cflags = [
--        "-mavx",
--        "-mno-avx2",
--        "-mno-f16c",
--        "-mno-fma",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qs8-f32-vcvt/gen/qs8-f32-vcvt-avx-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",
--      ]
--
--      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" ]
-     }
-   }
++    }
++  }
 +}
- 
--  if (build_with_chromium) {
--    source_set("qs8-f32-vcvt_f16c-fma-avx2") {
--      cflags = [
--        "-mavx2",
--        "-mf16c",
--        "-mfma",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qs8-f32-vcvt/gen/qs8-f32-vcvt-avx2-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",
--      ]
++
 +if (build_with_chromium) {
 +  source_set("f32-raddstoreexpminusmax_sse2-no-sse3") {
 +    cflags = [
@@ -34607,47 +28416,12 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +      "src/include/xnnpack.h",
 +      "src/src/f32-raddstoreexpminusmax/gen/f32-raddstoreexpminusmax-sse2-rr2-p5-u16-acc2.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("qs8-f32-vcvt_f16c-fma-avx2_standalone") {
--      cflags = [
--        "-mavx2",
--        "-mf16c",
--        "-mfma",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qs8-f32-vcvt/gen/qs8-f32-vcvt-avx2-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" ]
--      }
--    }
++
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
@@ -34656,38 +28430,9 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +    ]
 +
 +    public_configs = [ ":xnnpack_public_config" ]
-   }
++  }
 +}
- 
--  if (build_with_chromium) {
--    source_set(
--        "qs8-f32-vcvt_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
--      cflags = [
--        "-mavx512bw",
--        "-mavx512cd",
--        "-mavx512dq",
--        "-mavx512f",
--        "-mavx512vl",
--        "-mf16c",
--        "-mfma",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qs8-f32-vcvt/gen/qs8-f32-vcvt-avx512skx-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",
--      ]
++
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
 +  source_set("f32-raddstoreexpminusmax_sse2-no-sse3_standalone") {
@@ -34700,124 +28445,27 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +      "src/include/xnnpack.h",
 +      "src/src/f32-raddstoreexpminusmax/gen/f32-raddstoreexpminusmax-sse2-rr2-p5-u16-acc2.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(
--        "qs8-f32-vcvt_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") {
--      cflags = [
--        "-mavx512bw",
--        "-mavx512cd",
--        "-mavx512dq",
--        "-mavx512f",
--        "-mavx512vl",
--        "-mf16c",
--        "-mfma",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qs8-f32-vcvt/gen/qs8-f32-vcvt-avx512skx-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",
--      ]
--
--      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",
 +    ]
- 
--  if (build_with_chromium) {
--    source_set("qs8-f32-vcvt_sse2-no-sse3") {
--      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",
--      ]
++
 +    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_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",
--      ]
--
--      public_configs = [ ":xnnpack_public_config" ]
--
--      if (!(is_android && use_order_profiling)) {
--        assert_no_deps = [ "//base" ]
--      }
--    }
--  }
++
 +if (build_with_chromium) {
 +  source_set("f32-raddstoreexpminusmax_x64") {
 +    cflags = [
@@ -34828,83 +28476,23 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +      "src/include/xnnpack.h",
 +      "src/src/f32-raddstoreexpminusmax/gen/f32-raddstoreexpminusmax-scalar-rr2-p5-u4-acc2.c"
 +    ]
- 
--  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",
--      ]
++
 +    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-f32-vcvt_sse4.1-no-sse4.2_standalone") {
--      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: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("qs8-f32-vcvt_x64") {
--      cflags = []
++
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
 +  source_set("f32-raddstoreexpminusmax_x64_standalone") {
@@ -34916,71 +28504,27 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +      "src/include/xnnpack.h",
 +      "src/src/f32-raddstoreexpminusmax/gen/f32-raddstoreexpminusmax-scalar-rr2-p5-u4-acc2.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 = []
--
--      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" ]
--      }
--    }
--  }
++
 +if (build_with_chromium) {
 +  source_set("f32-rdminmax_avx-no-avx2-no-f16c-no-fma") {
 +    cflags = [
@@ -34995,113 +28539,23 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +      "src/src/f32-rdminmax/gen/f32-rdmax-2p2x-avx-u32.c",
 +    "src/src/f32-rdminmax/gen/f32-rdmin-2p2x-avx-u32.c"
 +    ]
- 
--  if (build_with_chromium) {
--    source_set("qs8-packw_avx2-avxvnni-f16c-fma-gfni") {
--      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",
--      ]
++
 +    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-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" ]
--      }
--    }
++
 +    public_configs = [ ":xnnpack_public_config" ]
-   }
++  }
 +}
- 
--  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-x16c8-gemm-goi-avx2-madd.c",
--        "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",
--      ]
++
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
 +  source_set("f32-rdminmax_avx-no-avx2-no-f16c-no-fma_standalone") {
@@ -35117,138 +28571,27 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +      "src/src/f32-rdminmax/gen/f32-rdmax-2p2x-avx-u32.c",
 +    "src/src/f32-rdminmax/gen/f32-rdmin-2p2x-avx-u32.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("qs8-packw_f16c-fma-avx2_standalone") {
--      cflags = [
--        "-mavx2",
--        "-mf16c",
--        "-mfma",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qs8-packw/gen/qs8-packw-x16c8-gemm-goi-avx2-madd.c",
--        "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:pthreadpool_standalone",
--      ]
--
--      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",
 +    ]
- 
--  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",
--      ]
++
 +    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_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-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:pthreadpool_standalone",
--      ]
--
--      public_configs = [ ":xnnpack_public_config" ]
--
--      if (!(is_android && use_order_profiling)) {
--        assert_no_deps = [ "//base" ]
--      }
--    }
--  }
++
 +if (build_with_chromium) {
 +  source_set("f32-rdminmax_avx512f") {
 +    cflags = [
@@ -35260,54 +28603,23 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +      "src/src/f32-rdminmax/gen/f32-rdmax-2p2x-avx512f-u32.c",
 +    "src/src/f32-rdminmax/gen/f32-rdmin-2p2x-avx512f-u32.c"
 +    ]
- 
--  if (build_with_chromium) {
--    source_set("qs8-packw_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/qs8-packw/gen/qs8-packw-x16c4-gemm-gio-scalar.c",
--        "src/src/qs8-packw/gen/qs8-packw-x16c8-gemm-gio-scalar.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-x8c4-gemm-gio-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",
--      ]
++
 +    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("qs8-packw_x64_standalone") {
--      cflags = []
++
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
 +  source_set("f32-rdminmax_avx512f_standalone") {
@@ -35320,150 +28632,27 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +      "src/src/f32-rdminmax/gen/f32-rdmax-2p2x-avx512f-u32.c",
 +    "src/src/f32-rdminmax/gen/f32-rdmin-2p2x-avx512f-u32.c"
 +    ]
- 
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qs8-packw/gen/qs8-packw-x16c4-gemm-gio-scalar.c",
--        "src/src/qs8-packw/gen/qs8-packw-x16c8-gemm-gio-scalar.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-x8c4-gemm-gio-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" ]
--      }
--    }
--  }
++
 +    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-qc2w-gemm_avx2-avxvnni-f16c-fma-gfni") {
--      cflags = [
--        "-mavx2",
--        "-mavxvnni",
--        "-mf16c",
--        "-mfma",
--        "-mgfni",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qs8-qc2w-gemm/gen/qs8-qc2w-gemm-1x8c8-minmax-fp32-avxvnni.c",
--        "src/src/qs8-qc2w-gemm/gen/qs8-qc2w-gemm-5x8c8-minmax-fp32-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",
--      ]
++
 +    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" ]
- 
--  # This is a target that cannot depend on //base.
--  if (build_with_internal_optimization_guide) {
--    source_set("qs8-qc2w-gemm_avx2-avxvnni-f16c-fma-gfni_standalone") {
--      cflags = [
--        "-mavx2",
--        "-mavxvnni",
--        "-mf16c",
--        "-mfma",
--        "-mgfni",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qs8-qc2w-gemm/gen/qs8-qc2w-gemm-1x8c8-minmax-fp32-avxvnni.c",
--        "src/src/qs8-qc2w-gemm/gen/qs8-qc2w-gemm-5x8c8-minmax-fp32-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 (!(is_android && use_order_profiling)) {
 +      assert_no_deps = [ "//base" ]
-     }
-   }
++    }
++  }
 +}
- 
--  if (build_with_chromium) {
--    source_set("qs8-qc2w-gemm_f16c-fma-avx2") {
--      cflags = [
--        "-mavx2",
--        "-mf16c",
--        "-mfma",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qs8-qc2w-gemm/gen/qs8-qc2w-gemm-1x8c8-minmax-avx2-madd.c",
--        "src/src/qs8-qc2w-gemm/gen/qs8-qc2w-gemm-5x8c8-minmax-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",
--      ]
--
--      public_configs = [ ":xnnpack_public_config" ]
--    }
--  }
++
 +if (build_with_chromium) {
 +  source_set("f32-rdminmax_sse2-no-sse3") {
 +    cflags = [
@@ -35476,128 +28665,23 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +      "src/src/f32-rdminmax/gen/f32-rdmax-2p2x-sse2-u32.c",
 +    "src/src/f32-rdminmax/gen/f32-rdmin-2p2x-sse2-u32.c"
 +    ]
- 
--  # This is a target that cannot depend on //base.
--  if (build_with_internal_optimization_guide) {
--    source_set("qs8-qc2w-gemm_f16c-fma-avx2_standalone") {
--      cflags = [
--        "-mavx2",
--        "-mf16c",
--        "-mfma",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qs8-qc2w-gemm/gen/qs8-qc2w-gemm-1x8c8-minmax-avx2-madd.c",
--        "src/src/qs8-qc2w-gemm/gen/qs8-qc2w-gemm-5x8c8-minmax-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: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-qc2w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
--      cflags = [
--        "-mavx512bw",
--        "-mavx512cd",
--        "-mavx512dq",
--        "-mavx512f",
--        "-mavx512vl",
--        "-mf16c",
--        "-mfma",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qs8-qc2w-gemm/gen/qs8-qc2w-gemm-1x8c8-minmax-avx256skx-madd.c",
--        "src/src/qs8-qc2w-gemm/gen/qs8-qc2w-gemm-5x8c8-minmax-avx256skx-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",
--      ]
++
 +    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(
--        "qs8-qc2w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") {
--      cflags = [
--        "-mavx512bw",
--        "-mavx512cd",
--        "-mavx512dq",
--        "-mavx512f",
--        "-mavx512vl",
--        "-mf16c",
--        "-mfma",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qs8-qc2w-gemm/gen/qs8-qc2w-gemm-1x8c8-minmax-avx256skx-madd.c",
--        "src/src/qs8-qc2w-gemm/gen/qs8-qc2w-gemm-5x8c8-minmax-avx256skx-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: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-rdminmax_sse2-no-sse3_standalone") {
@@ -35611,108 +28695,27 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +      "src/src/f32-rdminmax/gen/f32-rdmax-2p2x-sse2-u32.c",
 +    "src/src/f32-rdminmax/gen/f32-rdmin-2p2x-sse2-u32.c"
 +    ]
- 
--  if (build_with_chromium) {
--    source_set("qs8-qc2w-gemm_ssse3-no-sse4.1") {
--      cflags = [
--        "-mno-sse4.1",
--        "-mssse3",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qs8-qc2w-gemm/gen/qs8-qc2w-gemm-1x4c8-minmax-fp32-ssse3-madd.c",
--        "src/src/qs8-qc2w-gemm/gen/qs8-qc2w-gemm-5x4c8-minmax-fp32-ssse3-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",
--      ]
++
 +    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("qs8-qc2w-gemm_ssse3-no-sse4.1_standalone") {
--      cflags = [
--        "-mno-sse4.1",
--        "-mssse3",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qs8-qc2w-gemm/gen/qs8-qc2w-gemm-1x4c8-minmax-fp32-ssse3-madd.c",
--        "src/src/qs8-qc2w-gemm/gen/qs8-qc2w-gemm-5x4c8-minmax-fp32-ssse3-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: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" ]
-     }
-   }
++    }
++  }
 +}
- 
--  if (build_with_chromium) {
--    source_set("qs8-qc2w-gemm_x64") {
--      cflags = []
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qs8-qc2w-gemm/gen/qs8-qc2w-gemm-1x2-minmax-fp32-scalar-fmagic.c",
--        "src/src/qs8-qc2w-gemm/gen/qs8-qc2w-gemm-1x4-minmax-fp32-scalar-fmagic.c",
--        "src/src/qs8-qc2w-gemm/gen/qs8-qc2w-gemm-3x4-minmax-fp32-scalar-fmagic.c",
--        "src/src/qs8-qc2w-gemm/gen/qs8-qc2w-gemm-4x4-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",
--      ]
++
 +if (build_with_chromium) {
 +  source_set("f32-rdminmax_x64") {
 +    cflags = [
@@ -35724,82 +28727,23 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +      "src/src/f32-rdminmax/gen/f32-rdmax-2p2x-scalar-u2.c",
 +    "src/src/f32-rdminmax/gen/f32-rdmin-2p2x-scalar-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" ]
- 
--  # This is a target that cannot depend on //base.
--  if (build_with_internal_optimization_guide) {
--    source_set("qs8-qc2w-gemm_x64_standalone") {
--      cflags = []
++
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
 +      "//third_party/fxdiv",
 +      "//third_party/pthreadpool",
 +    ]
- 
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qs8-qc2w-gemm/gen/qs8-qc2w-gemm-1x2-minmax-fp32-scalar-fmagic.c",
--        "src/src/qs8-qc2w-gemm/gen/qs8-qc2w-gemm-1x4-minmax-fp32-scalar-fmagic.c",
--        "src/src/qs8-qc2w-gemm/gen/qs8-qc2w-gemm-3x4-minmax-fp32-scalar-fmagic.c",
--        "src/src/qs8-qc2w-gemm/gen/qs8-qc2w-gemm-4x4-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 (build_with_chromium) {
--    source_set("qs8-qc4w-gemm_avx-no-avx2-no-f16c-no-fma") {
--      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",
--      ]
++
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
 +  source_set("f32-rdminmax_x64_standalone") {
@@ -35812,129 +28756,27 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +      "src/src/f32-rdminmax/gen/f32-rdmax-2p2x-scalar-u2.c",
 +    "src/src/f32-rdminmax/gen/f32-rdmin-2p2x-scalar-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" ]
- 
--  # 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" ]
--      }
--    }
--  }
++
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
 +      "//third_party/fxdiv",
 +      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
- 
--  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-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" ]
--      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_avx2-avxvnni-f16c-fma-gfni_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",
--      ]
--
--      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-rdsum2_avx-no-avx2-no-f16c-no-fma") {
 +    cflags = [
@@ -35948,116 +28790,23 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +      "src/include/xnnpack.h",
 +      "src/src/f32-rdsum2/gen/f32-rdsum2-7p7x-minmax-avx.c"
 +    ]
- 
--  if (build_with_chromium) {
--    source_set("qs8-qc4w-gemm_f16c-fma-avx2") {
--      cflags = [
--        "-mavx2",
--        "-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",
--      ]
--
--      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",
 +    ]
- 
--  # 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",
--        "-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",
--      ]
--
--      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(
--        "qs8-qc4w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
--      cflags = [
--        "-mavx512bw",
--        "-mavx512cd",
--        "-mavx512dq",
--        "-mavx512f",
--        "-mavx512vl",
--        "-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",
--      ]
--
--      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-rdsum2_avx-no-avx2-no-f16c-no-fma_standalone") {
@@ -36072,143 +28821,27 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +      "src/include/xnnpack.h",
 +      "src/src/f32-rdsum2/gen/f32-rdsum2-7p7x-minmax-avx.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(
--        "qs8-qc4w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") {
--      cflags = [
--        "-mavx512bw",
--        "-mavx512cd",
--        "-mavx512dq",
--        "-mavx512f",
--        "-mavx512vl",
--        "-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",
--      ]
--
--      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" ]
--      }
--    }
--  }
++
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
 +      "//third_party/fxdiv",
 +      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
- 
--  if (build_with_chromium) {
--    source_set(
--        "qs8-qc4w-gemm_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-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",
--      ]
++
 +    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-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("f32-rdsum2_avx512f") {
 +    cflags = [
@@ -36219,85 +28852,23 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +      "src/include/xnnpack.h",
 +      "src/src/f32-rdsum2/gen/f32-rdsum2-7p7x-minmax-avx512f.c"
 +    ]
- 
--  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",
--      ]
++
 +    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-qc4w-gemm_ssse3-no-sse4.1_standalone") {
--      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: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("qs8-qc4w-gemm_x64") {
--      cflags = []
++
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
 +  source_set("f32-rdsum2_avx512f_standalone") {
@@ -36309,47 +28880,27 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +      "src/include/xnnpack.h",
 +      "src/src/f32-rdsum2/gen/f32-rdsum2-7p7x-minmax-avx512f.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("f32-rdsum2_sse2-no-sse3") {
 +    cflags = [
@@ -36361,113 +28912,23 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +      "src/include/xnnpack.h",
 +      "src/src/f32-rdsum2/gen/f32-rdsum2-7p7x-minmax-sse2.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" ]
--
--      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-qc4w-packw_avx2-avxvnni-f16c-fma-gfni") {
--      cflags = [
--        "-mavx2",
--        "-mavxvnni",
--        "-mf16c",
--        "-mfma",
--        "-mgfni",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qs8-qc4w-packw/gen/qs8-qc4w-packw-x8c8-gemm-goi-avxvnni.c",
--        "src/src/qs8-qc4w-packw/gen/qs8-to-qu8-qc4w-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",
--      ]
++
 +    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("qs8-qc4w-packw_avx2-avxvnni-f16c-fma-gfni_standalone") {
--      cflags = [
--        "-mavx2",
--        "-mavxvnni",
--        "-mf16c",
--        "-mfma",
--        "-mgfni",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qs8-qc4w-packw/gen/qs8-qc4w-packw-x8c8-gemm-goi-avxvnni.c",
--        "src/src/qs8-qc4w-packw/gen/qs8-to-qu8-qc4w-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" ]
--      }
--    }
--  }
++
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
 +  source_set("f32-rdsum2_sse2-no-sse3_standalone") {
@@ -36480,129 +28941,27 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +      "src/include/xnnpack.h",
 +      "src/src/f32-rdsum2/gen/f32-rdsum2-7p7x-minmax-sse2.c"
 +    ]
- 
--  if (build_with_chromium) {
--    source_set(
--        "qs8-qc4w-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-qc4w-packw/gen/qs8-qc4w-packw-x16c8-gemm-goi-avx256vnni.c",
--        "src/src/qs8-qc4w-packw/gen/qs8-qc4w-packw-x8c8-gemm-goi-avx256vnni.c",
--        "src/src/qs8-qc4w-packw/gen/qs8-to-qu8-qc4w-packw-x16c8-gemm-goi-avx256vnni.c",
--        "src/src/qs8-qc4w-packw/gen/qs8-to-qu8-qc4w-packw-x8c8-gemm-goi-avx256vnni.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(
--        "qs8-qc4w-packw_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-packw/gen/qs8-qc4w-packw-x16c8-gemm-goi-avx256vnni.c",
--        "src/src/qs8-qc4w-packw/gen/qs8-qc4w-packw-x8c8-gemm-goi-avx256vnni.c",
--        "src/src/qs8-qc4w-packw/gen/qs8-to-qu8-qc4w-packw-x16c8-gemm-goi-avx256vnni.c",
--        "src/src/qs8-qc4w-packw/gen/qs8-to-qu8-qc4w-packw-x8c8-gemm-goi-avx256vnni.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" ]
-     }
-   }
++    }
++  }
 +}
- 
--  if (build_with_chromium) {
--    source_set("qs8-qc4w-packw_sse2-no-sse3") {
--      cflags = [
--        "-mno-sse3",
--        "-msse2",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qs8-qc4w-packw/gen/qs8-qc4uw-packw-x4c8-gemm-goi-sse2.c",
--        "src/src/qs8-qc4w-packw/gen/qs8-qc4uw-packw-x8c8-gemm-goi-sse2.c",
--        "src/src/qs8-qc4w-packw/gen/qs8-to-qu8-qc4uw-packw-x4c8-gemm-goi-sse2.c",
--        "src/src/qs8-qc4w-packw/gen/qs8-to-qu8-qc4uw-packw-x8c8-gemm-goi-sse2.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-rdsum2_x64") {
 +    cflags = [
@@ -36613,49 +28972,12 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +      "src/include/xnnpack.h",
 +      "src/src/f32-rdsum2/gen/f32-rdsum2-7p7x-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" ]
- 
--  # This is a target that cannot depend on //base.
--  if (build_with_internal_optimization_guide) {
--    source_set("qs8-qc4w-packw_sse2-no-sse3_standalone") {
--      cflags = [
--        "-mno-sse3",
--        "-msse2",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qs8-qc4w-packw/gen/qs8-qc4uw-packw-x4c8-gemm-goi-sse2.c",
--        "src/src/qs8-qc4w-packw/gen/qs8-qc4uw-packw-x8c8-gemm-goi-sse2.c",
--        "src/src/qs8-qc4w-packw/gen/qs8-to-qu8-qc4uw-packw-x4c8-gemm-goi-sse2.c",
--        "src/src/qs8-qc4w-packw/gen/qs8-to-qu8-qc4uw-packw-x8c8-gemm-goi-sse2.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" ]
--      }
--    }
++
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
@@ -36664,12 +28986,9 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +    ]
 +
 +    public_configs = [ ":xnnpack_public_config" ]
-   }
++  }
 +}
- 
--  if (build_with_chromium) {
--    source_set("qs8-qc4w-packw_x64") {
--      cflags = []
++
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
 +  source_set("f32-rdsum2_x64_standalone") {
@@ -36681,73 +29000,27 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +      "src/include/xnnpack.h",
 +      "src/src/f32-rdsum2/gen/f32-rdsum2-7p7x-minmax-scalar.c"
 +    ]
- 
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qs8-qc4w-packw/gen/qs8-qc4uw-packw-x16c8-gemm-goi-scalar.c",
--        "src/src/qs8-qc4w-packw/gen/qs8-to-qu8-qc4uw-packw-x16c8-gemm-goi-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" ]
++
 +    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-packw_x64_standalone") {
--      cflags = []
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qs8-qc4w-packw/gen/qs8-qc4uw-packw-x16c8-gemm-goi-scalar.c",
--        "src/src/qs8-qc4w-packw/gen/qs8-to-qu8-qc4uw-packw-x16c8-gemm-goi-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 (build_with_chromium) {
 +  source_set("f32-rdsum_avx-no-avx2-no-f16c-no-fma") {
 +    cflags = [
@@ -36761,114 +29034,23 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +      "src/include/xnnpack.h",
 +      "src/src/f32-rdsum/gen/f32-rdsum-7p7x-minmax-avx-u32.c"
 +    ]
- 
--  if (build_with_chromium) {
--    source_set("qs8-qc8w-dwconv_avx-no-avx2-no-f16c-no-fma") {
--      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",
--      ]
++
 +    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-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" ]
--      }
--    }
++
 +    public_configs = [ ":xnnpack_public_config" ]
-   }
++  }
 +}
- 
--  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",
--      ]
++
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
 +  source_set("f32-rdsum_avx-no-avx2-no-f16c-no-fma_standalone") {
@@ -36883,137 +29065,27 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +      "src/include/xnnpack.h",
 +      "src/src/f32-rdsum/gen/f32-rdsum-7p7x-minmax-avx-u32.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("qs8-qc8w-dwconv_f16c-fma-avx2_standalone") {
--      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:pthreadpool_standalone",
--      ]
--
--      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",
 +    ]
- 
--  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",
--      ]
++
 +    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") {
--      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:pthreadpool_standalone",
--      ]
--
--      public_configs = [ ":xnnpack_public_config" ]
--
--      if (!(is_android && use_order_profiling)) {
--        assert_no_deps = [ "//base" ]
--      }
--    }
--  }
++
 +if (build_with_chromium) {
 +  source_set("f32-rdsum_avx512f") {
 +    cflags = [
@@ -37024,113 +29096,23 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +      "src/include/xnnpack.h",
 +      "src/src/f32-rdsum/gen/f32-rdsum-7p7x-minmax-avx512f-u64.c"
 +    ]
- 
--  if (build_with_chromium) {
--    source_set("qs8-qc8w-dwconv_sse2-no-sse3") {
--      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",
--      ]
++
 +    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-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" ]
--      }
--    }
++
 +    public_configs = [ ":xnnpack_public_config" ]
-   }
++  }
 +}
- 
--  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",
--      ]
--
--      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-rdsum_avx512f_standalone") {
@@ -37142,90 +29124,27 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +      "src/include/xnnpack.h",
 +      "src/src/f32-rdsum/gen/f32-rdsum-7p7x-minmax-avx512f-u64.c"
 +    ]
- 
--  # 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-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",
--      ]
--
--      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-dwconv_x64") {
--      cflags = []
++
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
 +      "//third_party/fxdiv",
 +      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
- 
--      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",
--      ]
++
 +    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-rdsum_sse2-no-sse3") {
 +    cflags = [
@@ -37237,115 +29156,23 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +      "src/include/xnnpack.h",
 +      "src/src/f32-rdsum/gen/f32-rdsum-7p7x-minmax-sse2-u16.c"
 +    ]
- 
--      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" ]
--      }
--    }
--  }
++
 +    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_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",
--      ]
++
 +    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("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" ]
--      }
--    }
--  }
++
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
 +  source_set("f32-rdsum_sse2-no-sse3_standalone") {
@@ -37358,118 +29185,27 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +      "src/include/xnnpack.h",
 +      "src/src/f32-rdsum/gen/f32-rdsum-7p7x-minmax-sse2-u16.c"
 +    ]
- 
--  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",
--      ]
++
 +    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("qs8-qc8w-gemm_avx2-avxvnni-f16c-fma-gfni_standalone") {
--      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: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" ]
-     }
-   }
++    }
++  }
 +}
- 
--  if (build_with_chromium) {
--    source_set("qs8-qc8w-gemm_avx2-avxvnniint8-f16c-fma-gfni") {
--      cflags = [
--        "-mavx2",
--        "-mavxvnniint8",
--        "-mf16c",
--        "-mfma",
--        "-mgfni",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-1x8c8-minmax-fp32-avxvnniint8-prfm.c",
--        "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-5x8c8-minmax-fp32-avxvnniint8-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",
--      ]
++
 +if (build_with_chromium) {
 +  source_set("f32-rdsum_x64") {
 +    cflags = [
@@ -37480,50 +29216,12 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +      "src/include/xnnpack.h",
 +      "src/src/f32-rdsum/gen/f32-rdsum-7p7x-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" ]
- 
--  # 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") {
--      cflags = [
--        "-mavx2",
--        "-mavxvnniint8",
--        "-mf16c",
--        "-mfma",
--        "-mgfni",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-1x8c8-minmax-fp32-avxvnniint8-prfm.c",
--        "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-5x8c8-minmax-fp32-avxvnniint8-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" ]
--      }
--    }
++
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
@@ -37532,34 +29230,9 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +    ]
 +
 +    public_configs = [ ":xnnpack_public_config" ]
-   }
++  }
 +}
- 
--  if (build_with_chromium) {
--    source_set("qs8-qc8w-gemm_f16c-fma-avx2") {
--      cflags = [
--        "-mavx2",
--        "-mf16c",
--        "-mfma",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-1x8c8-minmax-fp32-avx2.c",
--        "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-3x8c8-minmax-fp32-avx2.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-rdsum_x64_standalone") {
@@ -37571,138 +29244,27 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +      "src/include/xnnpack.h",
 +      "src/src/f32-rdsum/gen/f32-rdsum-7p7x-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" ]
- 
--  # This is a target that cannot depend on //base.
--  if (build_with_internal_optimization_guide) {
--    source_set("qs8-qc8w-gemm_f16c-fma-avx2_standalone") {
--      cflags = [
--        "-mavx2",
--        "-mf16c",
--        "-mfma",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-1x8c8-minmax-fp32-avx2.c",
--        "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-3x8c8-minmax-fp32-avx2.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" ]
--      }
--    }
--  }
++
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
 +      "//third_party/fxdiv",
 +      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
- 
--  if (build_with_chromium) {
--    source_set(
--        "qs8-qc8w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
--      cflags = [
--        "-mavx512bw",
--        "-mavx512cd",
--        "-mavx512dq",
--        "-mavx512f",
--        "-mavx512vl",
--        "-mf16c",
--        "-mfma",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-1x16c8-minmax-fp32-avx512skx-prfm.c",
--        "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-1x8c8-minmax-fp32-avx256skx.c",
--        "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-4x8c8-minmax-fp32-avx256skx.c",
--        "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-7x16c8-minmax-fp32-avx512skx-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-qc8w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") {
--      cflags = [
--        "-mavx512bw",
--        "-mavx512cd",
--        "-mavx512dq",
--        "-mavx512f",
--        "-mavx512vl",
--        "-mf16c",
--        "-mfma",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-1x16c8-minmax-fp32-avx512skx-prfm.c",
--        "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-1x8c8-minmax-fp32-avx256skx.c",
--        "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-4x8c8-minmax-fp32-avx256skx.c",
--        "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-7x16c8-minmax-fp32-avx512skx-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-rminmax_avx-no-avx2-no-f16c-no-fma") {
 +    cflags = [
@@ -37718,130 +29280,23 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +    "src/src/f32-rminmax/gen/f32-rmin-avx-u32-acc4.c",
 +    "src/src/f32-rminmax/gen/f32-rminmax-avx-u32-acc4.c"
 +    ]
- 
--  if (build_with_chromium) {
--    source_set(
--        "qs8-qc8w-gemm_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-qc8w-gemm/gen/qs8-qc8w-gemm-1x16c8-minmax-fp32-avx512vnni-prfm.c",
--        "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-7x16c8-minmax-fp32-avx512vnni-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",
--      ]
++
 +    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-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-qc8w-gemm/gen/qs8-qc8w-gemm-1x16c8-minmax-fp32-avx512vnni-prfm.c",
--        "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-7x16c8-minmax-fp32-avx512vnni-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" ]
--      }
--    }
++
 +    public_configs = [ ":xnnpack_public_config" ]
-   }
++  }
 +}
- 
--  if (build_with_chromium) {
--    source_set(
--        "qs8-qc8w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni-amx-tile-amx-int8") {
--      cflags = [
--        "-mamx-int8",
--        "-mamx-tile",
--        "-mavx512bw",
--        "-mavx512cd",
--        "-mavx512dq",
--        "-mavx512f",
--        "-mavx512vl",
--        "-mavx512vnni",
--        "-mf16c",
--        "-mfma",
--        "-mgfni",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-16x64c4-minmax-fp32-avx512amx.c",
--        "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-1x64c4-minmax-fp32-avx512amx.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-rminmax_avx-no-avx2-no-f16c-no-fma_standalone") {
@@ -37858,131 +29313,27 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +    "src/src/f32-rminmax/gen/f32-rmin-avx-u32-acc4.c",
 +    "src/src/f32-rminmax/gen/f32-rminmax-avx-u32-acc4.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(
--        "qs8-qc8w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni-amx-tile-amx-int8_standalone") {
--      cflags = [
--        "-mamx-int8",
--        "-mamx-tile",
--        "-mavx512bw",
--        "-mavx512cd",
--        "-mavx512dq",
--        "-mavx512f",
--        "-mavx512vl",
--        "-mavx512vnni",
--        "-mf16c",
--        "-mfma",
--        "-mgfni",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-16x64c4-minmax-fp32-avx512amx.c",
--        "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-1x64c4-minmax-fp32-avx512amx.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" ]
--      }
--    }
--  }
++
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
 +      "//third_party/fxdiv",
 +      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
- 
--  if (build_with_chromium) {
--    source_set("qs8-qc8w-gemm_sse2-no-sse3") {
--      cflags = [
--        "-mno-sse3",
--        "-msse2",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-1x4c8-minmax-fp32-sse2-ld64.c",
--        "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-3x4c8-minmax-fp32-sse2-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",
--      ]
++
 +    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-gemm_sse2-no-sse3_standalone") {
--      cflags = [
--        "-mno-sse3",
--        "-msse2",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-1x4c8-minmax-fp32-sse2-ld64.c",
--        "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-3x4c8-minmax-fp32-sse2-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:pthreadpool_standalone",
--      ]
--
--      public_configs = [ ":xnnpack_public_config" ]
--
--      if (!(is_android && use_order_profiling)) {
--        assert_no_deps = [ "//base" ]
--      }
--    }
--  }
++
 +if (build_with_chromium) {
 +  source_set("f32-rminmax_avx512f") {
 +    cflags = [
@@ -37995,85 +29346,23 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +    "src/src/f32-rminmax/gen/f32-rmin-avx512f-u64-acc4.c",
 +    "src/src/f32-rminmax/gen/f32-rminmax-avx512f-u64-acc4.c"
 +    ]
- 
--  if (build_with_chromium) {
--    source_set("qs8-qc8w-gemm_sse4.1-no-sse4.2") {
--      cflags = [
--        "-mno-sse4.2",
--        "-msse4.1",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-1x4c8-minmax-fp32-sse41-ld64.c",
--        "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-3x4c8-minmax-fp32-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",
--      ]
++
 +    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-gemm_sse4.1-no-sse4.2_standalone") {
--      cflags = [
--        "-mno-sse4.2",
--        "-msse4.1",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-1x4c8-minmax-fp32-sse41-ld64.c",
--        "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-3x4c8-minmax-fp32-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: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("qs8-qc8w-gemm_x64") {
--      cflags = []
++
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
 +  source_set("f32-rminmax_avx512f_standalone") {
@@ -38087,47 +29376,27 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +    "src/src/f32-rminmax/gen/f32-rmin-avx512f-u64-acc4.c",
 +    "src/src/f32-rminmax/gen/f32-rminmax-avx512f-u64-acc4.c"
 +    ]
- 
--      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",
 +    ]
- 
--      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-qc8w-gemm_x64_standalone") {
--      cflags = []
++
 +if (build_with_chromium) {
 +  source_set("f32-rminmax_sse-no-sse2") {
 +    cflags = [
@@ -38141,111 +29410,23 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +    "src/src/f32-rminmax/gen/f32-rmin-sse-u16-acc4.c",
 +    "src/src/f32-rminmax/gen/f32-rminmax-sse-u16-acc4.c"
 +    ]
- 
--      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" ]
--
--      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-igemm_avx-no-avx2-no-f16c-no-fma") {
--      cflags = [
--        "-mavx",
--        "-mno-avx2",
--        "-mno-f16c",
--        "-mno-fma",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-1x4c8-minmax-fp32-avx-ld128.c",
--        "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-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",
--      ]
++
 +    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("qs8-qc8w-igemm_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-igemm/gen/qs8-qc8w-igemm-1x4c8-minmax-fp32-avx-ld128.c",
--        "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-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" ]
--      }
--    }
--  }
++
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
 +  source_set("f32-rminmax_sse-no-sse2_standalone") {
@@ -38260,118 +29441,27 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +    "src/src/f32-rminmax/gen/f32-rmin-sse-u16-acc4.c",
 +    "src/src/f32-rminmax/gen/f32-rminmax-sse-u16-acc4.c"
 +    ]
- 
--  if (build_with_chromium) {
--    source_set("qs8-qc8w-igemm_avx2-avxvnni-f16c-fma-gfni") {
--      cflags = [
--        "-mavx2",
--        "-mavxvnni",
--        "-mf16c",
--        "-mfma",
--        "-mgfni",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-1x8c8-minmax-fp32-avxvnni-prfm.c",
--        "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-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",
--      ]
++
 +    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("qs8-qc8w-igemm_avx2-avxvnni-f16c-fma-gfni_standalone") {
--      cflags = [
--        "-mavx2",
--        "-mavxvnni",
--        "-mf16c",
--        "-mfma",
--        "-mgfni",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-1x8c8-minmax-fp32-avxvnni-prfm.c",
--        "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-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: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" ]
-     }
-   }
++    }
++  }
 +}
- 
--  if (build_with_chromium) {
--    source_set("qs8-qc8w-igemm_avx2-avxvnniint8-f16c-fma-gfni") {
--      cflags = [
--        "-mavx2",
--        "-mavxvnniint8",
--        "-mf16c",
--        "-mfma",
--        "-mgfni",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-1x8c8-minmax-fp32-avxvnniint8-prfm.c",
--        "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-5x8c8-minmax-fp32-avxvnniint8-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",
--      ]
++
 +if (build_with_chromium) {
 +  source_set("f32-rminmax_x64") {
 +    cflags = [
@@ -38384,50 +29474,12 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +    "src/src/f32-rminmax/gen/f32-rmin-scalar-u4-acc4.c",
 +    "src/src/f32-rminmax/gen/f32-rminmax-scalar-u4-acc4.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("qs8-qc8w-igemm_avx2-avxvnniint8-f16c-fma-gfni_standalone") {
--      cflags = [
--        "-mavx2",
--        "-mavxvnniint8",
--        "-mf16c",
--        "-mfma",
--        "-mgfni",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-1x8c8-minmax-fp32-avxvnniint8-prfm.c",
--        "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-5x8c8-minmax-fp32-avxvnniint8-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" ]
--      }
--    }
++
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
@@ -38436,34 +29488,9 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +    ]
 +
 +    public_configs = [ ":xnnpack_public_config" ]
-   }
++  }
 +}
- 
--  if (build_with_chromium) {
--    source_set("qs8-qc8w-igemm_f16c-fma-avx2") {
--      cflags = [
--        "-mavx2",
--        "-mf16c",
--        "-mfma",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-1x8c8-minmax-fp32-avx2.c",
--        "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-3x8c8-minmax-fp32-avx2.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-rminmax_x64_standalone") {
@@ -38477,138 +29504,27 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +    "src/src/f32-rminmax/gen/f32-rmin-scalar-u4-acc4.c",
 +    "src/src/f32-rminmax/gen/f32-rminmax-scalar-u4-acc4.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("qs8-qc8w-igemm_f16c-fma-avx2_standalone") {
--      cflags = [
--        "-mavx2",
--        "-mf16c",
--        "-mfma",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-1x8c8-minmax-fp32-avx2.c",
--        "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-3x8c8-minmax-fp32-avx2.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" ]
--      }
--    }
--  }
++
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
 +      "//third_party/fxdiv",
 +      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
- 
--  if (build_with_chromium) {
--    source_set(
--        "qs8-qc8w-igemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
--      cflags = [
--        "-mavx512bw",
--        "-mavx512cd",
--        "-mavx512dq",
--        "-mavx512f",
--        "-mavx512vl",
--        "-mf16c",
--        "-mfma",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-1x16c8-minmax-fp32-avx512skx-prfm.c",
--        "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-1x8c8-minmax-fp32-avx256skx.c",
--        "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-4x8c8-minmax-fp32-avx256skx.c",
--        "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-7x16c8-minmax-fp32-avx512skx-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-qc8w-igemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") {
--      cflags = [
--        "-mavx512bw",
--        "-mavx512cd",
--        "-mavx512dq",
--        "-mavx512f",
--        "-mavx512vl",
--        "-mf16c",
--        "-mfma",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-1x16c8-minmax-fp32-avx512skx-prfm.c",
--        "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-1x8c8-minmax-fp32-avx256skx.c",
--        "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-4x8c8-minmax-fp32-avx256skx.c",
--        "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-7x16c8-minmax-fp32-avx512skx-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-rsum2_avx-no-avx2-no-f16c-no-fma") {
 +    cflags = [
@@ -38622,130 +29538,23 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +      "src/include/xnnpack.h",
 +      "src/src/f32-rsum2/gen/f32-rsum2-avx-u8.c"
 +    ]
- 
--  if (build_with_chromium) {
--    source_set(
--        "qs8-qc8w-igemm_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-qc8w-igemm/gen/qs8-qc8w-igemm-1x16c8-minmax-avx512vnni-prfm.c",
--        "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-7x16c8-minmax-avx512vnni-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",
--      ]
++
 +    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_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-qc8w-igemm/gen/qs8-qc8w-igemm-1x16c8-minmax-avx512vnni-prfm.c",
--        "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-7x16c8-minmax-avx512vnni-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" ]
--      }
--    }
++
 +    public_configs = [ ":xnnpack_public_config" ]
-   }
++  }
 +}
- 
--  if (build_with_chromium) {
--    source_set(
--        "qs8-qc8w-igemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni-amx-tile-amx-int8") {
--      cflags = [
--        "-mamx-int8",
--        "-mamx-tile",
--        "-mavx512bw",
--        "-mavx512cd",
--        "-mavx512dq",
--        "-mavx512f",
--        "-mavx512vl",
--        "-mavx512vnni",
--        "-mf16c",
--        "-mfma",
--        "-mgfni",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-16x64c4-minmax-fp32-avx512amx.c",
--        "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-1x64c4-minmax-fp32-avx512amx.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-rsum2_avx-no-avx2-no-f16c-no-fma_standalone") {
@@ -38760,131 +29569,27 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +      "src/include/xnnpack.h",
 +      "src/src/f32-rsum2/gen/f32-rsum2-avx-u8.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(
--        "qs8-qc8w-igemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni-amx-tile-amx-int8_standalone") {
--      cflags = [
--        "-mamx-int8",
--        "-mamx-tile",
--        "-mavx512bw",
--        "-mavx512cd",
--        "-mavx512dq",
--        "-mavx512f",
--        "-mavx512vl",
--        "-mavx512vnni",
--        "-mf16c",
--        "-mfma",
--        "-mgfni",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-16x64c4-minmax-fp32-avx512amx.c",
--        "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-1x64c4-minmax-fp32-avx512amx.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" ]
--      }
--    }
--  }
++
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
 +      "//third_party/fxdiv",
 +      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
- 
--  if (build_with_chromium) {
--    source_set("qs8-qc8w-igemm_sse2-no-sse3") {
--      cflags = [
--        "-mno-sse3",
--        "-msse2",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-1x4c8-minmax-fp32-sse2-ld64.c",
--        "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-3x4c8-minmax-fp32-sse2-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",
--      ]
++
 +    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-igemm_sse2-no-sse3_standalone") {
--      cflags = [
--        "-mno-sse3",
--        "-msse2",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-1x4c8-minmax-fp32-sse2-ld64.c",
--        "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-3x4c8-minmax-fp32-sse2-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:pthreadpool_standalone",
--      ]
--
--      public_configs = [ ":xnnpack_public_config" ]
--
--      if (!(is_android && use_order_profiling)) {
--        assert_no_deps = [ "//base" ]
--      }
--    }
--  }
++
 +if (build_with_chromium) {
 +  source_set("f32-rsum2_avx512f") {
 +    cflags = [
@@ -38895,85 +29600,23 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +      "src/include/xnnpack.h",
 +      "src/src/f32-rsum2/gen/f32-rsum2-avx512f-u16.c"
 +    ]
- 
--  if (build_with_chromium) {
--    source_set("qs8-qc8w-igemm_sse4.1-no-sse4.2") {
--      cflags = [
--        "-mno-sse4.2",
--        "-msse4.1",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-1x4c8-minmax-fp32-sse41-ld64.c",
--        "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-3x4c8-minmax-fp32-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",
--      ]
++
 +    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_sse4.1-no-sse4.2_standalone") {
--      cflags = [
--        "-mno-sse4.2",
--        "-msse4.1",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-1x4c8-minmax-fp32-sse41-ld64.c",
--        "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-3x4c8-minmax-fp32-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: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("qs8-qc8w-igemm_x64") {
--      cflags = []
++
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
 +  source_set("f32-rsum2_avx512f_standalone") {
@@ -38985,47 +29628,27 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +      "src/include/xnnpack.h",
 +      "src/src/f32-rsum2/gen/f32-rsum2-avx512f-u16.c"
 +    ]
- 
--      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",
--      ]
++
 +    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-qc8w-igemm_x64_standalone") {
--      cflags = []
++
 +if (build_with_chromium) {
 +  source_set("f32-rsum2_sse2-no-sse3") {
 +    cflags = [
@@ -39037,111 +29660,23 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +      "src/include/xnnpack.h",
 +      "src/src/f32-rsum2/gen/f32-rsum2-sse2-u4.c"
 +    ]
- 
--      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",
--      ]
--
--      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-qu8-packw_avx2-avxvnni-f16c-fma-gfni") {
--      cflags = [
--        "-mavx2",
--        "-mavxvnni",
--        "-mf16c",
--        "-mfma",
--        "-mgfni",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qs8-qu8-packw/gen/qs8-qu8-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",
--      ]
++
 +    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("qs8-qu8-packw_avx2-avxvnni-f16c-fma-gfni_standalone") {
--      cflags = [
--        "-mavx2",
--        "-mavxvnni",
--        "-mf16c",
--        "-mfma",
--        "-mgfni",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qs8-qu8-packw/gen/qs8-qu8-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" ]
--      }
--    }
--  }
++
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
 +  source_set("f32-rsum2_sse2-no-sse3_standalone") {
@@ -39154,106 +29689,27 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +      "src/include/xnnpack.h",
 +      "src/src/f32-rsum2/gen/f32-rsum2-sse2-u4.c"
 +    ]
- 
--  if (build_with_chromium) {
--    source_set(
--        "qs8-qu8-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-qu8-packw/gen/qs8-qu8-packw-x16c8-gemm-goi-avx256vnni.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(
--        "qs8-qu8-packw_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-qu8-packw/gen/qs8-qu8-packw-x16c8-gemm-goi-avx256vnni.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" ]
-     }
-   }
++    }
++  }
 +}
- 
--  if (build_with_chromium) {
--    source_set("qs8-qu8-packw_x64") {
--      cflags = []
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qs8-qu8-packw/gen/qs8-qu8-packw-x16c8-gemm-goi-scalar.c",
--        "src/src/qs8-qu8-packw/gen/qs8-qu8-packw-x8c8-gemm-gio-scalar.c",
--      ]
++
 +if (build_with_chromium) {
 +  source_set("f32-rsum2_x64") {
 +    cflags = [
@@ -39264,39 +29720,23 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +      "src/include/xnnpack.h",
 +      "src/src/f32-rsum2/gen/f32-rsum2-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",
--      ]
++
 +    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("qs8-qu8-packw_x64_standalone") {
--      cflags = []
++
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
 +  source_set("f32-rsum2_x64_standalone") {
@@ -39308,139 +29748,27 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +      "src/include/xnnpack.h",
 +      "src/src/f32-rsum2/gen/f32-rsum2-scalar-u1.c"
 +    ]
- 
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qs8-qu8-packw/gen/qs8-qu8-packw-x16c8-gemm-goi-scalar.c",
--        "src/src/qs8-qu8-packw/gen/qs8-qu8-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" ]
--      }
--    }
--  }
++
 +    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-rdsum_f16c-fma-avx2") {
--      cflags = [
--        "-mavx2",
--        "-mf16c",
--        "-mfma",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qs8-rdsum/gen/qs8-rdsum-7p7x-minmax-fp32-avx2-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",
--      ]
++
 +    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" ]
- 
--  # This is a target that cannot depend on //base.
--  if (build_with_internal_optimization_guide) {
--    source_set("qs8-rdsum_f16c-fma-avx2_standalone") {
--      cflags = [
--        "-mavx2",
--        "-mf16c",
--        "-mfma",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qs8-rdsum/gen/qs8-rdsum-7p7x-minmax-fp32-avx2-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",
--      ]
--
--      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-rdsum_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
--      cflags = [
--        "-mavx512bw",
--        "-mavx512cd",
--        "-mavx512dq",
--        "-mavx512f",
--        "-mavx512vl",
--        "-mf16c",
--        "-mfma",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qs8-rdsum/gen/qs8-rdsum-7p7x-minmax-fp32-avx512skx-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",
--      ]
++
 +if (build_with_chromium) {
 +  source_set("f32-rsum_avx-no-avx2-no-f16c-no-fma") {
 +    cflags = [
@@ -39454,52 +29782,12 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +      "src/include/xnnpack.h",
 +      "src/src/f32-rsum/gen/f32-rsum-avx-u32-acc4.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(
--        "qs8-rdsum_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") {
--      cflags = [
--        "-mavx512bw",
--        "-mavx512cd",
--        "-mavx512dq",
--        "-mavx512f",
--        "-mavx512vl",
--        "-mf16c",
--        "-mfma",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qs8-rdsum/gen/qs8-rdsum-7p7x-minmax-fp32-avx512skx-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",
--      ]
--
--      public_configs = [ ":xnnpack_public_config" ]
--
--      if (!(is_android && use_order_profiling)) {
--        assert_no_deps = [ "//base" ]
--      }
--    }
++
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
@@ -39508,32 +29796,9 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +    ]
 +
 +    public_configs = [ ":xnnpack_public_config" ]
-   }
++  }
 +}
- 
--  if (build_with_chromium) {
--    source_set("qs8-rdsum_sse4.1-no-sse4.2") {
--      cflags = [
--        "-mno-sse4.2",
--        "-msse4.1",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qs8-rdsum/gen/qs8-rdsum-7p7x-minmax-fp32-sse41-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",
--      ]
++
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
 +  source_set("f32-rsum_avx-no-avx2-no-f16c-no-fma_standalone") {
@@ -39548,45 +29813,12 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +      "src/include/xnnpack.h",
 +      "src/src/f32-rsum/gen/f32-rsum-avx-u32-acc4.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("qs8-rdsum_sse4.1-no-sse4.2_standalone") {
--      cflags = [
--        "-mno-sse4.2",
--        "-msse4.1",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qs8-rdsum/gen/qs8-rdsum-7p7x-minmax-fp32-sse41-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",
--      ]
--
--      public_configs = [ ":xnnpack_public_config" ]
--
--      if (!(is_android && use_order_profiling)) {
--        assert_no_deps = [ "//base" ]
--      }
++
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
@@ -39598,18 +29830,10 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +
 +    if (!(is_android && use_order_profiling)) {
 +      assert_no_deps = [ "//base" ]
-     }
-   }
++    }
++  }
 +}
- 
--  if (build_with_chromium) {
--    source_set("qs8-rdsum_x64") {
--      cflags = []
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qs8-rdsum/gen/qs8-rdsum-minmax-fp32-scalar-u1-acc1.c",
--      ]
++
 +if (build_with_chromium) {
 +  source_set("f32-rsum_avx512f") {
 +    cflags = [
@@ -39620,39 +29844,23 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +      "src/include/xnnpack.h",
 +      "src/src/f32-rsum/gen/f32-rsum-avx512f-u32-acc2.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",
 +    ]
- 
--      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("qs8-rdsum_x64_standalone") {
--      cflags = []
++
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
 +  source_set("f32-rsum_avx512f_standalone") {
@@ -39664,137 +29872,27 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +      "src/include/xnnpack.h",
 +      "src/src/f32-rsum/gen/f32-rsum-avx512f-u32-acc2.c"
 +    ]
- 
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qs8-rdsum/gen/qs8-rdsum-minmax-fp32-scalar-u1-acc1.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-rsum_avx2-avxvnni-f16c-fma-gfni") {
--      cflags = [
--        "-mavx2",
--        "-mavxvnni",
--        "-mf16c",
--        "-mfma",
--        "-mgfni",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qs8-rsum/gen/qs8-rsum-avxvnni-u128-acc2.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: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("qs8-rsum_avx2-avxvnni-f16c-fma-gfni_standalone") {
--      cflags = [
--        "-mavx2",
--        "-mavxvnni",
--        "-mf16c",
--        "-mfma",
--        "-mgfni",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qs8-rsum/gen/qs8-rsum-avxvnni-u128-acc2.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-rsum_f16c-fma-avx2") {
--      cflags = [
--        "-mavx2",
--        "-mf16c",
--        "-mfma",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qs8-rsum/gen/qs8-rsum-avx2-u64-acc2.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-rsum_sse2-no-sse3") {
 +    cflags = [
@@ -39806,47 +29904,12 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +      "src/include/xnnpack.h",
 +      "src/src/f32-rsum/gen/f32-rsum-sse2-u16-acc4.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("qs8-rsum_f16c-fma-avx2_standalone") {
--      cflags = [
--        "-mavx2",
--        "-mf16c",
--        "-mfma",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qs8-rsum/gen/qs8-rsum-avx2-u64-acc2.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" ]
--      }
--    }
++
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
@@ -39855,39 +29918,9 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +    ]
 +
 +    public_configs = [ ":xnnpack_public_config" ]
-   }
++  }
 +}
- 
--  if (build_with_chromium) {
--    source_set(
--        "qs8-rsum_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
--      cflags = [
--        "-mavx512bw",
--        "-mavx512cd",
--        "-mavx512dq",
--        "-mavx512f",
--        "-mavx512vl",
--        "-mf16c",
--        "-mfma",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qs8-rsum/gen/qs8-rsum-avx256skx-u64-acc2.c",
--        "src/src/qs8-rsum/gen/qs8-rsum-avx512skx-u128-acc2.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-rsum_sse2-no-sse3_standalone") {
@@ -39900,139 +29933,27 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +      "src/include/xnnpack.h",
 +      "src/src/f32-rsum/gen/f32-rsum-sse2-u16-acc4.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(
--        "qs8-rsum_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") {
--      cflags = [
--        "-mavx512bw",
--        "-mavx512cd",
--        "-mavx512dq",
--        "-mavx512f",
--        "-mavx512vl",
--        "-mf16c",
--        "-mfma",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qs8-rsum/gen/qs8-rsum-avx256skx-u64-acc2.c",
--        "src/src/qs8-rsum/gen/qs8-rsum-avx512skx-u128-acc2.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" ]
--      }
--    }
--  }
++
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
 +      "//third_party/fxdiv",
 +      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
- 
--  if (build_with_chromium) {
--    source_set(
--        "qs8-rsum_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-rsum/gen/qs8-rsum-avx512vnni-u128-acc2.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-rsum_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-rsum/gen/qs8-rsum-avx512vnni-u128-acc2.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-rsum_x64") {
 +    cflags = [
@@ -40043,83 +29964,23 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +      "src/include/xnnpack.h",
 +      "src/src/f32-rsum/gen/f32-rsum-scalar-u4-acc4.c"
 +    ]
- 
--  if (build_with_chromium) {
--    source_set("qs8-rsum_ssse3-no-sse4.1") {
--      cflags = [
--        "-mno-sse4.1",
--        "-mssse3",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qs8-rsum/gen/qs8-rsum-ssse3-u32-acc2.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",
 +    ]
- 
--  # This is a target that cannot depend on //base.
--  if (build_with_internal_optimization_guide) {
--    source_set("qs8-rsum_ssse3-no-sse4.1_standalone") {
--      cflags = [
--        "-mno-sse4.1",
--        "-mssse3",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qs8-rsum/gen/qs8-rsum-ssse3-u32-acc2.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("qs8-rsum_x64") {
--      cflags = []
++
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
 +  source_set("f32-rsum_x64_standalone") {
@@ -40131,71 +29992,27 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +      "src/include/xnnpack.h",
 +      "src/src/f32-rsum/gen/f32-rsum-scalar-u4-acc4.c"
 +    ]
- 
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qs8-rsum/gen/qs8-rsum-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-rsum_x64_standalone") {
--      cflags = []
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qs8-rsum/gen/qs8-rsum-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" ]
--      }
--    }
--  }
++
 +if (build_with_chromium) {
 +  source_set("f32-spmm_sse-no-sse2") {
 +    cflags = [
@@ -40207,108 +30024,23 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +      "src/include/xnnpack.h",
 +      "src/src/f32-spmm/gen/f32-spmm-32x1-minmax-sse.c"
 +    ]
- 
--  if (build_with_chromium) {
--    source_set("qs8-vadd_avx-no-avx2-no-f16c-no-fma") {
--      cflags = [
--        "-mavx",
--        "-mno-avx2",
--        "-mno-f16c",
--        "-mno-fma",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qs8-vadd/gen/qs8-vadd-minmax-avx-mul32-ld32-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" ]
--
--      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",
 +    ]
- 
--  # This is a target that cannot depend on //base.
--  if (build_with_internal_optimization_guide) {
--    source_set("qs8-vadd_avx-no-avx2-no-f16c-no-fma_standalone") {
--      cflags = [
--        "-mavx",
--        "-mno-avx2",
--        "-mno-f16c",
--        "-mno-fma",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qs8-vadd/gen/qs8-vadd-minmax-avx-mul32-ld32-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" ]
--
--      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("qs8-vadd_f16c-fma-avx2") {
--      cflags = [
--        "-mavx2",
--        "-mf16c",
--        "-mfma",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qs8-vadd/gen/qs8-vadd-minmax-avx2-mul32-ld64-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",
--      ]
++
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
 +  source_set("f32-spmm_sse-no-sse2_standalone") {
@@ -40321,131 +30053,27 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +      "src/include/xnnpack.h",
 +      "src/src/f32-spmm/gen/f32-spmm-32x1-minmax-sse.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("qs8-vadd_f16c-fma-avx2_standalone") {
--      cflags = [
--        "-mavx2",
--        "-mf16c",
--        "-mfma",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qs8-vadd/gen/qs8-vadd-minmax-avx2-mul32-ld64-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" ]
--      }
--    }
--  }
++
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
 +      "//third_party/fxdiv",
 +      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
- 
--  if (build_with_chromium) {
--    source_set(
--        "qs8-vadd_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
--      cflags = [
--        "-mavx512bw",
--        "-mavx512cd",
--        "-mavx512dq",
--        "-mavx512f",
--        "-mavx512vl",
--        "-mf16c",
--        "-mfma",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qs8-vadd/gen/qs8-vadd-minmax-avx512skx-mul32-ld128-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" ]
-     }
-   }
++    }
++  }
 +}
- 
--  # This is a target that cannot depend on //base.
--  if (build_with_internal_optimization_guide) {
--    source_set(
--        "qs8-vadd_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") {
--      cflags = [
--        "-mavx512bw",
--        "-mavx512cd",
--        "-mavx512dq",
--        "-mavx512f",
--        "-mavx512vl",
--        "-mf16c",
--        "-mfma",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qs8-vadd/gen/qs8-vadd-minmax-avx512skx-mul32-ld128-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 (build_with_chromium) {
 +  source_set("f32-spmm_x64") {
 +    cflags = [
@@ -40458,103 +30086,23 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +    "src/src/f32-spmm/gen/f32-spmm-8x2-minmax-scalar.c",
 +    "src/src/f32-spmm/gen/f32-spmm-8x4-minmax-scalar.c"
 +    ]
- 
--  if (build_with_chromium) {
--    source_set("qs8-vadd_sse2-no-sse3") {
--      cflags = [
--        "-mno-sse3",
--        "-msse2",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qs8-vadd/gen/qs8-vadd-minmax-sse2-mul16-ld64-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" ]
--
--      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",
 +    ]
- 
--  # This is a target that cannot depend on //base.
--  if (build_with_internal_optimization_guide) {
--    source_set("qs8-vadd_sse2-no-sse3_standalone") {
--      cflags = [
--        "-mno-sse3",
--        "-msse2",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qs8-vadd/gen/qs8-vadd-minmax-sse2-mul16-ld64-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" ]
--
--      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("qs8-vadd_sse4.1-no-sse4.2") {
--      cflags = [
--        "-mno-sse4.2",
--        "-msse4.1",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qs8-vadd/gen/qs8-vadd-minmax-sse41-mul16-ld64-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" ]
--
--      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-spmm_x64_standalone") {
@@ -40568,45 +30116,12 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +    "src/src/f32-spmm/gen/f32-spmm-8x2-minmax-scalar.c",
 +    "src/src/f32-spmm/gen/f32-spmm-8x4-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" ]
- 
--  # This is a target that cannot depend on //base.
--  if (build_with_internal_optimization_guide) {
--    source_set("qs8-vadd_sse4.1-no-sse4.2_standalone") {
--      cflags = [
--        "-mno-sse4.2",
--        "-msse4.1",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qs8-vadd/gen/qs8-vadd-minmax-sse41-mul16-ld64-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" ]
--
--      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" ]
--      }
++
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
@@ -40618,19 +30133,10 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +
 +    if (!(is_android && use_order_profiling)) {
 +      assert_no_deps = [ "//base" ]
-     }
-   }
++    }
++  }
 +}
- 
--  if (build_with_chromium) {
--    source_set("qs8-vadd_x64") {
--      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",
--      ]
++
 +if (build_with_chromium) {
 +  source_set("f32-vapproxgelu_avx-no-avx2-no-f16c-no-fma") {
 +    cflags = [
@@ -40644,39 +30150,23 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +      "src/include/xnnpack.h",
 +      "src/src/f32-vapproxgelu/gen/f32-vapproxgelu-avx-rational-12-10-div.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",
 +    ]
- 
--      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("qs8-vadd_x64_standalone") {
--      cflags = []
++
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
 +  source_set("f32-vapproxgelu_avx-no-avx2-no-f16c-no-fma_standalone") {
@@ -40691,136 +30181,27 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +      "src/include/xnnpack.h",
 +      "src/src/f32-vapproxgelu/gen/f32-vapproxgelu-avx-rational-12-10-div.c"
 +    ]
- 
--      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" ]
--      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-vaddc_avx-no-avx2-no-f16c-no-fma") {
--      cflags = [
--        "-mavx",
--        "-mno-avx2",
--        "-mno-f16c",
--        "-mno-fma",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qs8-vaddc/gen/qs8-vaddc-minmax-avx-mul32-ld32-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" ]
--
--      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: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("qs8-vaddc_avx-no-avx2-no-f16c-no-fma_standalone") {
--      cflags = [
--        "-mavx",
--        "-mno-avx2",
--        "-mno-f16c",
--        "-mno-fma",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qs8-vaddc/gen/qs8-vaddc-minmax-avx-mul32-ld32-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" ]
--
--      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-vaddc_f16c-fma-avx2") {
--      cflags = [
--        "-mavx2",
--        "-mf16c",
--        "-mfma",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qs8-vaddc/gen/qs8-vaddc-minmax-avx2-mul32-ld64-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",
--      ]
++
 +if (build_with_chromium) {
 +  source_set("f32-vapproxgelu_avx512f") {
 +    cflags = [
@@ -40831,47 +30212,12 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +      "src/include/xnnpack.h",
 +      "src/src/f32-vapproxgelu/gen/f32-vapproxgelu-avx512f-rational-12-10-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("qs8-vaddc_f16c-fma-avx2_standalone") {
--      cflags = [
--        "-mavx2",
--        "-mf16c",
--        "-mfma",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qs8-vaddc/gen/qs8-vaddc-minmax-avx2-mul32-ld64-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" ]
--      }
--    }
++
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
@@ -40880,38 +30226,9 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +    ]
 +
 +    public_configs = [ ":xnnpack_public_config" ]
-   }
++  }
 +}
- 
--  if (build_with_chromium) {
--    source_set(
--        "qs8-vaddc_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
--      cflags = [
--        "-mavx512bw",
--        "-mavx512cd",
--        "-mavx512dq",
--        "-mavx512f",
--        "-mavx512vl",
--        "-mf16c",
--        "-mfma",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qs8-vaddc/gen/qs8-vaddc-minmax-avx512skx-mul32-ld128-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",
--      ]
++
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
 +  source_set("f32-vapproxgelu_avx512f_standalone") {
@@ -40923,124 +30240,27 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +      "src/include/xnnpack.h",
 +      "src/src/f32-vapproxgelu/gen/f32-vapproxgelu-avx512f-rational-12-10-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(
--        "qs8-vaddc_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") {
--      cflags = [
--        "-mavx512bw",
--        "-mavx512cd",
--        "-mavx512dq",
--        "-mavx512f",
--        "-mavx512vl",
--        "-mf16c",
--        "-mfma",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qs8-vaddc/gen/qs8-vaddc-minmax-avx512skx-mul32-ld128-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" ]
--      }
--    }
--  }
++
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
 +      "//third_party/fxdiv",
 +      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
- 
--  if (build_with_chromium) {
--    source_set("qs8-vaddc_sse2-no-sse3") {
--      cflags = [
--        "-mno-sse3",
--        "-msse2",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qs8-vaddc/gen/qs8-vaddc-minmax-sse2-mul16-ld64-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" ]
--
--      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-vaddc_sse2-no-sse3_standalone") {
--      cflags = [
--        "-mno-sse3",
--        "-msse2",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qs8-vaddc/gen/qs8-vaddc-minmax-sse2-mul16-ld64-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" ]
--
--      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-vapproxgelu_f16c-fma-no-avx2") {
 +    cflags = [
@@ -41053,83 +30273,23 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +      "src/include/xnnpack.h",
 +      "src/src/f32-vapproxgelu/gen/f32-vapproxgelu-fma3-rational-12-10-div.c"
 +    ]
- 
--  if (build_with_chromium) {
--    source_set("qs8-vaddc_sse4.1-no-sse4.2") {
--      cflags = [
--        "-mno-sse4.2",
--        "-msse4.1",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qs8-vaddc/gen/qs8-vaddc-minmax-sse41-mul16-ld64-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" ]
--
--      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",
 +    ]
- 
--  # This is a target that cannot depend on //base.
--  if (build_with_internal_optimization_guide) {
--    source_set("qs8-vaddc_sse4.1-no-sse4.2_standalone") {
--      cflags = [
--        "-mno-sse4.2",
--        "-msse4.1",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qs8-vaddc/gen/qs8-vaddc-minmax-sse41-mul16-ld64-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" ]
--
--      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("qs8-vaddc_x64") {
--      cflags = []
++
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
 +  source_set("f32-vapproxgelu_f16c-fma-no-avx2_standalone") {
@@ -41143,73 +30303,27 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +      "src/include/xnnpack.h",
 +      "src/src/f32-vapproxgelu/gen/f32-vapproxgelu-fma3-rational-12-10-div.c"
 +    ]
- 
--      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",
--      ]
++
 +    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-vaddc_x64_standalone") {
--      cflags = []
--
--      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",
--      ]
--
--      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-vapproxgelu_sse2-no-sse3") {
 +    cflags = [
@@ -41222,108 +30336,23 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +      "src/src/f32-vapproxgelu/gen/f32-vapproxgelu-sse2-rational-12-10-div.c",
 +    "src/src/f32-vapproxgelu/gen/f32-vapproxgelu-sse2fma-rational-12-10-div.c"
 +    ]
- 
--  if (build_with_chromium) {
--    source_set("qs8-vcvt_avx-no-avx2-no-f16c-no-fma") {
--      cflags = [
--        "-mavx",
--        "-mno-avx2",
--        "-mno-f16c",
--        "-mno-fma",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qs8-vcvt/gen/qs8-vcvt-avx-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",
--      ]
++
 +    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-vcvt_avx-no-avx2-no-f16c-no-fma_standalone") {
--      cflags = [
--        "-mavx",
--        "-mno-avx2",
--        "-mno-f16c",
--        "-mno-fma",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qs8-vcvt/gen/qs8-vcvt-avx-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",
--      ]
--
--      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("qs8-vcvt_f16c-fma-avx2") {
--      cflags = [
--        "-mavx2",
--        "-mf16c",
--        "-mfma",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qs8-vcvt/gen/qs8-vcvt-avx2-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",
--      ]
++
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
 +  source_set("f32-vapproxgelu_sse2-no-sse3_standalone") {
@@ -41337,119 +30366,27 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +      "src/src/f32-vapproxgelu/gen/f32-vapproxgelu-sse2-rational-12-10-div.c",
 +    "src/src/f32-vapproxgelu/gen/f32-vapproxgelu-sse2fma-rational-12-10-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("qs8-vcvt_f16c-fma-avx2_standalone") {
--      cflags = [
--        "-mavx2",
--        "-mf16c",
--        "-mfma",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qs8-vcvt/gen/qs8-vcvt-avx2-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",
--      ]
--
--      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",
 +    ]
- 
--  if (build_with_chromium) {
--    source_set("qs8-vcvt_sse2-no-sse3") {
--      cflags = [
--        "-mno-sse3",
--        "-msse2",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qs8-vcvt/gen/qs8-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",
--      ]
++
 +    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-vcvt_sse2-no-sse3_standalone") {
--      cflags = [
--        "-mno-sse3",
--        "-msse2",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qs8-vcvt/gen/qs8-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",
--      ]
--
--      public_configs = [ ":xnnpack_public_config" ]
--
--      if (!(is_android && use_order_profiling)) {
--        assert_no_deps = [ "//base" ]
--      }
--    }
--  }
++
 +if (build_with_chromium) {
 +  source_set("f32-vapproxgelu_x64") {
 +    cflags = [
@@ -41460,103 +30397,23 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +      "src/include/xnnpack.h",
 +      "src/src/f32-vapproxgelu/gen/f32-vapproxgelu-scalar-rational-12-10-div.c"
 +    ]
- 
--  if (build_with_chromium) {
--    source_set("qs8-vcvt_sse4.1-no-sse4.2") {
--      cflags = [
--        "-mno-sse4.2",
--        "-msse4.1",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qs8-vcvt/gen/qs8-vcvt-sse41-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",
--      ]
++
 +    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-vcvt_sse4.1-no-sse4.2_standalone") {
--      cflags = [
--        "-mno-sse4.2",
--        "-msse4.1",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qs8-vcvt/gen/qs8-vcvt-sse41-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",
--      ]
--
--      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("qs8-vcvt_ssse3-no-sse4.1") {
--      cflags = [
--        "-mno-sse4.1",
--        "-mssse3",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qs8-vcvt/gen/qs8-vcvt-ssse3-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",
--      ]
++
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
 +  source_set("f32-vapproxgelu_x64_standalone") {
@@ -41568,45 +30425,12 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +      "src/include/xnnpack.h",
 +      "src/src/f32-vapproxgelu/gen/f32-vapproxgelu-scalar-rational-12-10-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("qs8-vcvt_ssse3-no-sse4.1_standalone") {
--      cflags = [
--        "-mno-sse4.1",
--        "-mssse3",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qs8-vcvt/gen/qs8-vcvt-ssse3-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",
--      ]
--
--      public_configs = [ ":xnnpack_public_config" ]
--
--      if (!(is_android && use_order_profiling)) {
--        assert_no_deps = [ "//base" ]
--      }
++
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
@@ -41618,18 +30442,10 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +
 +    if (!(is_android && use_order_profiling)) {
 +      assert_no_deps = [ "//base" ]
-     }
-   }
++    }
++  }
 +}
- 
--  if (build_with_chromium) {
--    source_set("qs8-vcvt_x64") {
--      cflags = []
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qs8-vcvt/gen/qs8-vcvt-scalar-u4.c",
--      ]
++
 +if (build_with_chromium) {
 +  source_set("f32-vbinary_avx-no-avx2-no-f16c-no-fma") {
 +    cflags = [
@@ -41661,39 +30477,23 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +    "src/src/f32-vbinary/gen/f32-vsub-avx-u16.c",
 +    "src/src/f32-vbinary/gen/f32-vsubc-avx-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" ]
++
 +    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) {
--    source_set("qs8-vcvt_x64_standalone") {
--      cflags = []
++
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
 +  source_set("f32-vbinary_avx-no-avx2-no-f16c-no-fma_standalone") {
@@ -41726,135 +30526,27 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +    "src/src/f32-vbinary/gen/f32-vsub-avx-u16.c",
 +    "src/src/f32-vbinary/gen/f32-vsubc-avx-u16.c"
 +    ]
- 
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qs8-vcvt/gen/qs8-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" ]
--      }
--    }
--  }
++
 +    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-vlrelu_avx-no-avx2-no-f16c-no-fma") {
--      cflags = [
--        "-mavx",
--        "-mno-avx2",
--        "-mno-f16c",
--        "-mno-fma",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qs8-vlrelu/gen/qs8-vlrelu-avx-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",
--      ]
++
 +    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" ]
- 
--  # This is a target that cannot depend on //base.
--  if (build_with_internal_optimization_guide) {
--    source_set("qs8-vlrelu_avx-no-avx2-no-f16c-no-fma_standalone") {
--      cflags = [
--        "-mavx",
--        "-mno-avx2",
--        "-mno-f16c",
--        "-mno-fma",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qs8-vlrelu/gen/qs8-vlrelu-avx-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",
--      ]
--
--      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-vlrelu_f16c-fma-avx2") {
--      cflags = [
--        "-mavx2",
--        "-mf16c",
--        "-mfma",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qs8-vlrelu/gen/qs8-vlrelu-avx2-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",
--      ]
++
 +if (build_with_chromium) {
 +  source_set("f32-vbinary_avx512f") {
 +    cflags = [
@@ -41883,47 +30575,12 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +    "src/src/f32-vbinary/gen/f32-vsub-avx512f-u32.c",
 +    "src/src/f32-vbinary/gen/f32-vsubc-avx512f-u32.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("qs8-vlrelu_f16c-fma-avx2_standalone") {
--      cflags = [
--        "-mavx2",
--        "-mf16c",
--        "-mfma",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qs8-vlrelu/gen/qs8-vlrelu-avx2-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",
--      ]
--
--      public_configs = [ ":xnnpack_public_config" ]
--
--      if (!(is_android && use_order_profiling)) {
--        assert_no_deps = [ "//base" ]
--      }
--    }
++
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
@@ -41932,32 +30589,9 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +    ]
 +
 +    public_configs = [ ":xnnpack_public_config" ]
-   }
++  }
 +}
- 
--  if (build_with_chromium) {
--    source_set("qs8-vlrelu_sse2-no-sse3") {
--      cflags = [
--        "-mno-sse3",
--        "-msse2",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qs8-vlrelu/gen/qs8-vlrelu-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",
--      ]
++
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
 +  source_set("f32-vbinary_avx512f_standalone") {
@@ -41987,118 +30621,27 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +    "src/src/f32-vbinary/gen/f32-vsub-avx512f-u32.c",
 +    "src/src/f32-vbinary/gen/f32-vsubc-avx512f-u32.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("qs8-vlrelu_sse2-no-sse3_standalone") {
--      cflags = [
--        "-mno-sse3",
--        "-msse2",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qs8-vlrelu/gen/qs8-vlrelu-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",
--      ]
--
--      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",
 +    ]
- 
--  if (build_with_chromium) {
--    source_set("qs8-vlrelu_sse4.1-no-sse4.2") {
--      cflags = [
--        "-mno-sse4.2",
--        "-msse4.1",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qs8-vlrelu/gen/qs8-vlrelu-sse41-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",
--      ]
++
 +    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-vlrelu_sse4.1-no-sse4.2_standalone") {
--      cflags = [
--        "-mno-sse4.2",
--        "-msse4.1",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qs8-vlrelu/gen/qs8-vlrelu-sse41-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",
--      ]
--
--      public_configs = [ ":xnnpack_public_config" ]
--
--      if (!(is_android && use_order_profiling)) {
--        assert_no_deps = [ "//base" ]
--      }
--    }
--  }
++
 +if (build_with_chromium) {
 +  source_set("f32-vbinary_sse-no-sse2") {
 +    cflags = [
@@ -42125,83 +30668,23 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +    "src/src/f32-vbinary/gen/f32-vsub-sse-u8.c",
 +    "src/src/f32-vbinary/gen/f32-vsubc-sse-u8.c"
 +    ]
- 
--  if (build_with_chromium) {
--    source_set("qs8-vlrelu_ssse3-no-sse4.1") {
--      cflags = [
--        "-mno-sse4.1",
--        "-mssse3",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qs8-vlrelu/gen/qs8-vlrelu-ssse3-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",
--      ]
++
 +    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-vlrelu_ssse3-no-sse4.1_standalone") {
--      cflags = [
--        "-mno-sse4.1",
--        "-mssse3",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qs8-vlrelu/gen/qs8-vlrelu-ssse3-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",
--      ]
--
--      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("qs8-vlrelu_x64") {
--      cflags = []
++
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
 +  source_set("f32-vbinary_sse-no-sse2_standalone") {
@@ -42229,46 +30712,27 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +    "src/src/f32-vbinary/gen/f32-vsub-sse-u8.c",
 +    "src/src/f32-vbinary/gen/f32-vsubc-sse-u8.c"
 +    ]
- 
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qs8-vlrelu/gen/qs8-vlrelu-scalar-andxor-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-vlrelu_x64_standalone") {
--      cflags = []
++
 +if (build_with_chromium) {
 +  source_set("f32-vbinary_sse2-no-sse3") {
 +    cflags = [
@@ -42282,108 +30746,23 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +    "src/src/f32-vbinary/gen/f32-vpreluc-sse2-u8.c",
 +    "src/src/f32-vbinary/gen/f32-vrpreluc-sse2-u8.c"
 +    ]
- 
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qs8-vlrelu/gen/qs8-vlrelu-scalar-andxor-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" ]
--      }
--    }
--  }
++
 +    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-vmul_avx-no-avx2-no-f16c-no-fma") {
--      cflags = [
--        "-mavx",
--        "-mno-avx2",
--        "-mno-f16c",
--        "-mno-fma",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qs8-vmul/gen/qs8-vmul-minmax-fp32-avx-mul16-ld64-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",
--      ]
++
 +    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("qs8-vmul_avx-no-avx2-no-f16c-no-fma_standalone") {
--      cflags = [
--        "-mavx",
--        "-mno-avx2",
--        "-mno-f16c",
--        "-mno-fma",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qs8-vmul/gen/qs8-vmul-minmax-fp32-avx-mul16-ld64-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" ]
--      }
--    }
--  }
++
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
 +  source_set("f32-vbinary_sse2-no-sse3_standalone") {
@@ -42398,106 +30777,27 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +    "src/src/f32-vbinary/gen/f32-vpreluc-sse2-u8.c",
 +    "src/src/f32-vbinary/gen/f32-vrpreluc-sse2-u8.c"
 +    ]
- 
--  if (build_with_chromium) {
--    source_set("qs8-vmul_sse2-no-sse3") {
--      cflags = [
--        "-mno-sse3",
--        "-msse2",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qs8-vmul/gen/qs8-vmul-minmax-fp32-sse2-mul16-ld64-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" ]
--
--      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("qs8-vmul_sse2-no-sse3_standalone") {
--      cflags = [
--        "-mno-sse3",
--        "-msse2",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qs8-vmul/gen/qs8-vmul-minmax-fp32-sse2-mul16-ld64-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" ]
--
--      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" ]
-     }
-   }
++    }
++  }
 +}
- 
--  if (build_with_chromium) {
--    source_set("qs8-vmul_sse4.1-no-sse4.2") {
--      cflags = [
--        "-mno-sse4.2",
--        "-msse4.1",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qs8-vmul/gen/qs8-vmul-minmax-fp32-sse41-mul16-ld64-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",
--      ]
++
 +if (build_with_chromium) {
 +  source_set("f32-vbinary_x64") {
 +    cflags = [
@@ -42526,46 +30826,12 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +    "src/src/f32-vbinary/gen/f32-vsub-scalar-u8.c",
 +    "src/src/f32-vbinary/gen/f32-vsubc-scalar-u8.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("qs8-vmul_sse4.1-no-sse4.2_standalone") {
--      cflags = [
--        "-mno-sse4.2",
--        "-msse4.1",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qs8-vmul/gen/qs8-vmul-minmax-fp32-sse41-mul16-ld64-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" ]
--      }
--    }
++
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
@@ -42574,12 +30840,9 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +    ]
 +
 +    public_configs = [ ":xnnpack_public_config" ]
-   }
++  }
 +}
- 
--  if (build_with_chromium) {
--    source_set("qs8-vmul_x64") {
--      cflags = []
++
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
 +  source_set("f32-vbinary_x64_standalone") {
@@ -42609,46 +30872,27 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +    "src/src/f32-vbinary/gen/f32-vsub-scalar-u8.c",
 +    "src/src/f32-vbinary/gen/f32-vsubc-scalar-u8.c"
 +    ]
- 
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qs8-vmul/gen/qs8-vmul-minmax-fp32-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-vmul_x64_standalone") {
--      cflags = []
++
 +if (build_with_chromium) {
 +  source_set("f32-vclamp_avx-no-avx2-no-f16c-no-fma") {
 +    cflags = [
@@ -42662,108 +30906,23 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +      "src/include/xnnpack.h",
 +      "src/src/f32-vclamp/gen/f32-vclamp-avx.c"
 +    ]
- 
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qs8-vmul/gen/qs8-vmul-minmax-fp32-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" ]
--      }
--    }
--  }
++
 +    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-vmulc_avx-no-avx2-no-f16c-no-fma") {
--      cflags = [
--        "-mavx",
--        "-mno-avx2",
--        "-mno-f16c",
--        "-mno-fma",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qs8-vmulc/gen/qs8-vmulc-minmax-fp32-avx-mul16-ld64-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",
--      ]
++
 +    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("qs8-vmulc_avx-no-avx2-no-f16c-no-fma_standalone") {
--      cflags = [
--        "-mavx",
--        "-mno-avx2",
--        "-mno-f16c",
--        "-mno-fma",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qs8-vmulc/gen/qs8-vmulc-minmax-fp32-avx-mul16-ld64-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" ]
--      }
--    }
--  }
++
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
 +  source_set("f32-vclamp_avx-no-avx2-no-f16c-no-fma_standalone") {
@@ -42778,106 +30937,27 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +      "src/include/xnnpack.h",
 +      "src/src/f32-vclamp/gen/f32-vclamp-avx.c"
 +    ]
- 
--  if (build_with_chromium) {
--    source_set("qs8-vmulc_sse2-no-sse3") {
--      cflags = [
--        "-mno-sse3",
--        "-msse2",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qs8-vmulc/gen/qs8-vmulc-minmax-fp32-sse2-mul16-ld64-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" ]
--
--      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("qs8-vmulc_sse2-no-sse3_standalone") {
--      cflags = [
--        "-mno-sse3",
--        "-msse2",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qs8-vmulc/gen/qs8-vmulc-minmax-fp32-sse2-mul16-ld64-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" ]
--
--      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" ]
-     }
-   }
++    }
++  }
 +}
- 
--  if (build_with_chromium) {
--    source_set("qs8-vmulc_sse4.1-no-sse4.2") {
--      cflags = [
--        "-mno-sse4.2",
--        "-msse4.1",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qs8-vmulc/gen/qs8-vmulc-minmax-fp32-sse41-mul16-ld64-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",
--      ]
++
 +if (build_with_chromium) {
 +  source_set("f32-vclamp_avx512f") {
 +    cflags = [
@@ -42888,46 +30968,12 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +      "src/include/xnnpack.h",
 +      "src/src/f32-vclamp/gen/f32-vclamp-avx512f.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("qs8-vmulc_sse4.1-no-sse4.2_standalone") {
--      cflags = [
--        "-mno-sse4.2",
--        "-msse4.1",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qs8-vmulc/gen/qs8-vmulc-minmax-fp32-sse41-mul16-ld64-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" ]
--      }
--    }
++
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
@@ -42936,12 +30982,9 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +    ]
 +
 +    public_configs = [ ":xnnpack_public_config" ]
-   }
++  }
 +}
- 
--  if (build_with_chromium) {
--    source_set("qs8-vmulc_x64") {
--      cflags = []
++
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
 +  source_set("f32-vclamp_avx512f_standalone") {
@@ -42953,71 +30996,27 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +      "src/include/xnnpack.h",
 +      "src/src/f32-vclamp/gen/f32-vclamp-avx512f.c"
 +    ]
- 
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qs8-vmulc/gen/qs8-vmulc-minmax-fp32-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-vmulc_x64_standalone") {
--      cflags = []
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qs8-vmulc/gen/qs8-vmulc-minmax-fp32-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" ]
--      }
--    }
--  }
++
 +if (build_with_chromium) {
 +  source_set("f32-vclamp_sse2-no-sse3") {
 +    cflags = [
@@ -43029,85 +31028,23 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +      "src/include/xnnpack.h",
 +      "src/src/f32-vclamp/gen/f32-vclamp-sse2.c"
 +    ]
- 
--  if (build_with_chromium) {
--    source_set("qs8-vprelu_f16c-fma-avx2") {
--      cflags = [
--        "-mavx2",
--        "-mf16c",
--        "-mfma",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qs8-vprelu/gen/qs8-vprelu-avx2-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",
--      ]
++
 +    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-vprelu_f16c-fma-avx2_standalone") {
--      cflags = [
--        "-mavx2",
--        "-mf16c",
--        "-mfma",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qs8-vprelu/gen/qs8-vprelu-avx2-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" ]
--      }
--    }
++
 +    public_configs = [ ":xnnpack_public_config" ]
-   }
++  }
 +}
- 
--  if (build_with_chromium) {
--    source_set("qs8-vprelu_x64") {
--      cflags = []
++
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
 +  source_set("f32-vclamp_sse2-no-sse3_standalone") {
@@ -43120,71 +31057,27 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +      "src/include/xnnpack.h",
 +      "src/src/f32-vclamp/gen/f32-vclamp-sse2.c"
 +    ]
- 
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qs8-vprelu/gen/qs8-vprelu-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: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-vprelu_x64_standalone") {
--      cflags = []
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qs8-vprelu/gen/qs8-vprelu-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" ]
--
--      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-vclamp_x64") {
 +    cflags = [
@@ -43195,85 +31088,23 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +      "src/include/xnnpack.h",
 +      "src/src/f32-vclamp/gen/f32-vclamp-scalar.c"
 +    ]
- 
--  if (build_with_chromium) {
--    source_set("qs8-vpreluc_f16c-fma-avx2") {
--      cflags = [
--        "-mavx2",
--        "-mf16c",
--        "-mfma",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qs8-vpreluc/gen/qs8-vpreluc-avx2-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",
--      ]
++
 +    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-vpreluc_f16c-fma-avx2_standalone") {
--      cflags = [
--        "-mavx2",
--        "-mf16c",
--        "-mfma",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qs8-vpreluc/gen/qs8-vpreluc-avx2-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" ]
--      }
--    }
++
 +    public_configs = [ ":xnnpack_public_config" ]
-   }
++  }
 +}
- 
--  if (build_with_chromium) {
--    source_set("qs8-vpreluc_x64") {
--      cflags = []
++
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
 +  source_set("f32-vclamp_x64_standalone") {
@@ -43285,71 +31116,27 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +      "src/include/xnnpack.h",
 +      "src/src/f32-vclamp/gen/f32-vclamp-scalar.c"
 +    ]
- 
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qs8-vpreluc/gen/qs8-vpreluc-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: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-vpreluc_x64_standalone") {
--      cflags = []
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qs8-vpreluc/gen/qs8-vpreluc-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" ]
--
--      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-vcmul_avx512f") {
 +    cflags = [
@@ -43360,85 +31147,23 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +      "src/include/xnnpack.h",
 +      "src/src/f32-vcmul/gen/f32-vcmul-avx512f-u32.c"
 +    ]
- 
--  if (build_with_chromium) {
--    source_set("qs8-vrpreluc_f16c-fma-avx2") {
--      cflags = [
--        "-mavx2",
--        "-mf16c",
--        "-mfma",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qs8-vrpreluc/gen/qs8-vrpreluc-avx2-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",
--      ]
++
 +    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-vrpreluc_f16c-fma-avx2_standalone") {
--      cflags = [
--        "-mavx2",
--        "-mf16c",
--        "-mfma",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qs8-vrpreluc/gen/qs8-vrpreluc-avx2-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" ]
--      }
--    }
++
 +    public_configs = [ ":xnnpack_public_config" ]
-   }
++  }
 +}
- 
--  if (build_with_chromium) {
--    source_set("qs8-vrpreluc_x64") {
--      cflags = []
++
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
 +  source_set("f32-vcmul_avx512f_standalone") {
@@ -43450,46 +31175,27 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +      "src/include/xnnpack.h",
 +      "src/src/f32-vcmul/gen/f32-vcmul-avx512f-u32.c"
 +    ]
- 
--      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: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-vrpreluc_x64_standalone") {
--      cflags = []
++
 +if (build_with_chromium) {
 +  source_set("f32-vcmul_f16c-fma-no-avx2") {
 +    cflags = [
@@ -43502,110 +31208,23 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +      "src/include/xnnpack.h",
 +      "src/src/f32-vcmul/gen/f32-vcmul-fma3-u16.c"
 +    ]
- 
--      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" ]
--
--      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("qu8-dwconv_avx-no-avx2-no-f16c-no-fma") {
--      cflags = [
--        "-mavx",
--        "-mno-avx2",
--        "-mno-f16c",
--        "-mno-fma",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qu8-dwconv/gen/qu8-dwconv-25p16c-minmax-fp32-avx-mul16.c",
--        "src/src/qu8-dwconv/gen/qu8-dwconv-9p16c-minmax-fp32-avx-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",
--      ]
++
 +    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("qu8-dwconv_avx-no-avx2-no-f16c-no-fma_standalone") {
--      cflags = [
--        "-mavx",
--        "-mno-avx2",
--        "-mno-f16c",
--        "-mno-fma",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qu8-dwconv/gen/qu8-dwconv-25p16c-minmax-fp32-avx-mul16.c",
--        "src/src/qu8-dwconv/gen/qu8-dwconv-9p16c-minmax-fp32-avx-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-vcmul_f16c-fma-no-avx2_standalone") {
@@ -43619,117 +31238,27 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +      "src/include/xnnpack.h",
 +      "src/src/f32-vcmul/gen/f32-vcmul-fma3-u16.c"
 +    ]
- 
--  if (build_with_chromium) {
--    source_set("qu8-dwconv_f16c-fma-avx2") {
--      cflags = [
--        "-mavx2",
--        "-mf16c",
--        "-mfma",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qu8-dwconv/gen/qu8-dwconv-25p16c-minmax-fp32-avx2-mul32.c",
--        "src/src/qu8-dwconv/gen/qu8-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",
--      ]
++
 +    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("qu8-dwconv_f16c-fma-avx2_standalone") {
--      cflags = [
--        "-mavx2",
--        "-mf16c",
--        "-mfma",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qu8-dwconv/gen/qu8-dwconv-25p16c-minmax-fp32-avx2-mul32.c",
--        "src/src/qu8-dwconv/gen/qu8-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: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" ]
-     }
-   }
++    }
++  }
 +}
- 
--  if (build_with_chromium) {
--    source_set(
--        "qu8-dwconv_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
--      cflags = [
--        "-mavx512bw",
--        "-mavx512cd",
--        "-mavx512dq",
--        "-mavx512f",
--        "-mavx512vl",
--        "-mf16c",
--        "-mfma",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qu8-dwconv/gen/qu8-dwconv-25p32c-minmax-fp32-avx512skx-mul32.c",
--        "src/src/qu8-dwconv/gen/qu8-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-vcmul_sse-no-sse2") {
 +    cflags = [
@@ -43741,53 +31270,12 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +      "src/include/xnnpack.h",
 +      "src/src/f32-vcmul/gen/f32-vcmul-sse-u8.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-dwconv_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") {
--      cflags = [
--        "-mavx512bw",
--        "-mavx512cd",
--        "-mavx512dq",
--        "-mavx512f",
--        "-mavx512vl",
--        "-mf16c",
--        "-mfma",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qu8-dwconv/gen/qu8-dwconv-25p32c-minmax-fp32-avx512skx-mul32.c",
--        "src/src/qu8-dwconv/gen/qu8-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:pthreadpool_standalone",
--      ]
--
--      public_configs = [ ":xnnpack_public_config" ]
--
--      if (!(is_android && use_order_profiling)) {
--        assert_no_deps = [ "//base" ]
--      }
--    }
++
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
@@ -43796,33 +31284,9 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +    ]
 +
 +    public_configs = [ ":xnnpack_public_config" ]
-   }
++  }
 +}
- 
--  if (build_with_chromium) {
--    source_set("qu8-dwconv_sse2-no-sse3") {
--      cflags = [
--        "-mno-sse3",
--        "-msse2",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qu8-dwconv/gen/qu8-dwconv-25p8c-minmax-fp32-sse2-mul16.c",
--        "src/src/qu8-dwconv/gen/qu8-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",
--      ]
++
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
 +  source_set("f32-vcmul_sse-no-sse2_standalone") {
@@ -43835,121 +31299,27 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +      "src/include/xnnpack.h",
 +      "src/src/f32-vcmul/gen/f32-vcmul-sse-u8.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-dwconv_sse2-no-sse3_standalone") {
--      cflags = [
--        "-mno-sse3",
--        "-msse2",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qu8-dwconv/gen/qu8-dwconv-25p8c-minmax-fp32-sse2-mul16.c",
--        "src/src/qu8-dwconv/gen/qu8-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" ]
--      }
--    }
--  }
++
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
 +      "//third_party/fxdiv",
 +      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
- 
--  if (build_with_chromium) {
--    source_set("qu8-dwconv_sse4.1-no-sse4.2") {
--      cflags = [
--        "-mno-sse4.2",
--        "-msse4.1",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qu8-dwconv/gen/qu8-dwconv-25p8c-minmax-fp32-sse41-mul16.c",
--        "src/src/qu8-dwconv/gen/qu8-dwconv-9p8c-minmax-fp32-sse41-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",
--      ]
++
 +    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("qu8-dwconv_sse4.1-no-sse4.2_standalone") {
--      cflags = [
--        "-mno-sse4.2",
--        "-msse4.1",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qu8-dwconv/gen/qu8-dwconv-25p8c-minmax-fp32-sse41-mul16.c",
--        "src/src/qu8-dwconv/gen/qu8-dwconv-9p8c-minmax-fp32-sse41-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("f32-vcmul_x64") {
 +    cflags = [
@@ -43960,51 +31330,23 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +      "src/include/xnnpack.h",
 +      "src/src/f32-vcmul/gen/f32-vcmul-scalar-u4.c"
 +    ]
- 
--  if (build_with_chromium) {
--    source_set("qu8-dwconv_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/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",
--      ]
--
--      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) {
--    source_set("qu8-dwconv_x64_standalone") {
--      cflags = []
++
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
 +  source_set("f32-vcmul_x64_standalone") {
@@ -44016,138 +31358,27 @@ Index: chromium-153.0.8010.36/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/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",
--      ]
--
--      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("qu8-f32-vcvt_avx-no-avx2-no-f16c-no-fma") {
--      cflags = [
--        "-mavx",
--        "-mno-avx2",
--        "-mno-f16c",
--        "-mno-fma",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qu8-f32-vcvt/gen/qu8-f32-vcvt-avx-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",
--      ]
++
 +    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" ]
- 
--  # This is a target that cannot depend on //base.
--  if (build_with_internal_optimization_guide) {
--    source_set("qu8-f32-vcvt_avx-no-avx2-no-f16c-no-fma_standalone") {
--      cflags = [
--        "-mavx",
--        "-mno-avx2",
--        "-mno-f16c",
--        "-mno-fma",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qu8-f32-vcvt/gen/qu8-f32-vcvt-avx-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",
--      ]
--
--      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("qu8-f32-vcvt_f16c-fma-avx2") {
--      cflags = [
--        "-mavx2",
--        "-mf16c",
--        "-mfma",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qu8-f32-vcvt/gen/qu8-f32-vcvt-avx2-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",
--      ]
++
 +if (build_with_chromium) {
 +  source_set("f32-vcopysign_avx-no-avx2-no-f16c-no-fma") {
 +    cflags = [
@@ -44163,47 +31394,12 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +    "src/src/f32-vcopysign/gen/f32-vcopysignc-avx.c",
 +    "src/src/f32-vcopysign/gen/f32-vrcopysignc-avx.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-f32-vcvt_f16c-fma-avx2_standalone") {
--      cflags = [
--        "-mavx2",
--        "-mf16c",
--        "-mfma",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qu8-f32-vcvt/gen/qu8-f32-vcvt-avx2-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" ]
--      }
--    }
++
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
@@ -44212,38 +31408,9 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +    ]
 +
 +    public_configs = [ ":xnnpack_public_config" ]
-   }
++  }
 +}
- 
--  if (build_with_chromium) {
--    source_set(
--        "qu8-f32-vcvt_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
--      cflags = [
--        "-mavx512bw",
--        "-mavx512cd",
--        "-mavx512dq",
--        "-mavx512f",
--        "-mavx512vl",
--        "-mf16c",
--        "-mfma",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qu8-f32-vcvt/gen/qu8-f32-vcvt-avx512skx-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",
--      ]
++
 +# 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") {
@@ -44260,124 +31427,27 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +    "src/src/f32-vcopysign/gen/f32-vcopysignc-avx.c",
 +    "src/src/f32-vcopysign/gen/f32-vrcopysignc-avx.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-f32-vcvt_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") {
--      cflags = [
--        "-mavx512bw",
--        "-mavx512cd",
--        "-mavx512dq",
--        "-mavx512f",
--        "-mavx512vl",
--        "-mf16c",
--        "-mfma",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qu8-f32-vcvt/gen/qu8-f32-vcvt-avx512skx-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",
--      ]
--
--      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",
 +    ]
- 
--  if (build_with_chromium) {
--    source_set("qu8-f32-vcvt_sse2-no-sse3") {
--      cflags = [
--        "-mno-sse3",
--        "-msse2",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qu8-f32-vcvt/gen/qu8-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",
--      ]
++
 +    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("qu8-f32-vcvt_sse2-no-sse3_standalone") {
--      cflags = [
--        "-mno-sse3",
--        "-msse2",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qu8-f32-vcvt/gen/qu8-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",
--      ]
--
--      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 = [
@@ -44390,83 +31460,23 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +    "src/src/f32-vcopysign/gen/f32-vcopysignc-avx512f.c",
 +    "src/src/f32-vcopysign/gen/f32-vrcopysignc-avx512f.c"
 +    ]
- 
--  if (build_with_chromium) {
--    source_set("qu8-f32-vcvt_sse4.1-no-sse4.2") {
--      cflags = [
--        "-mno-sse4.2",
--        "-msse4.1",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qu8-f32-vcvt/gen/qu8-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",
--      ]
++
 +    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("qu8-f32-vcvt_sse4.1-no-sse4.2_standalone") {
--      cflags = [
--        "-mno-sse4.2",
--        "-msse4.1",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qu8-f32-vcvt/gen/qu8-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: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("qu8-f32-vcvt_x64") {
--      cflags = []
++
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
 +  source_set("f32-vcopysign_avx512f_standalone") {
@@ -44480,71 +31490,27 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +    "src/src/f32-vcopysign/gen/f32-vcopysignc-avx512f.c",
 +    "src/src/f32-vcopysign/gen/f32-vrcopysignc-avx512f.c"
 +    ]
- 
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qu8-f32-vcvt/gen/qu8-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("qu8-f32-vcvt_x64_standalone") {
--      cflags = []
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qu8-f32-vcvt/gen/qu8-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" ]
--      }
--    }
--  }
++
 +if (build_with_chromium) {
 +  source_set("f32-vcopysign_sse2-no-sse3") {
 +    cflags = [
@@ -44558,111 +31524,23 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +    "src/src/f32-vcopysign/gen/f32-vcopysignc-sse2.c",
 +    "src/src/f32-vcopysign/gen/f32-vrcopysignc-sse2.c"
 +    ]
- 
--  if (build_with_chromium) {
--    source_set("qu8-gemm_avx-no-avx2-no-f16c-no-fma") {
--      cflags = [
--        "-mavx",
--        "-mno-avx2",
--        "-mno-f16c",
--        "-mno-fma",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qu8-gemm/gen/qu8-gemm-1x4c8-minmax-fp32-avx-ld128.c",
--        "src/src/qu8-gemm/gen/qu8-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",
--      ]
++
 +    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("qu8-gemm_avx-no-avx2-no-f16c-no-fma_standalone") {
--      cflags = [
--        "-mavx",
--        "-mno-avx2",
--        "-mno-f16c",
--        "-mno-fma",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qu8-gemm/gen/qu8-gemm-1x4c8-minmax-fp32-avx-ld128.c",
--        "src/src/qu8-gemm/gen/qu8-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" ]
--      }
--    }
++
 +    public_configs = [ ":xnnpack_public_config" ]
-   }
++  }
 +}
- 
--  if (build_with_chromium) {
--    source_set("qu8-gemm_f16c-fma-avx2") {
--      cflags = [
--        "-mavx2",
--        "-mf16c",
--        "-mfma",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qu8-gemm/gen/qu8-gemm-1x8c8-minmax-fp32-avx2.c",
--        "src/src/qu8-gemm/gen/qu8-gemm-3x8c8-minmax-fp32-avx2.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_sse2-no-sse3_standalone") {
@@ -44677,134 +31555,27 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +    "src/src/f32-vcopysign/gen/f32-vcopysignc-sse2.c",
 +    "src/src/f32-vcopysign/gen/f32-vrcopysignc-sse2.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_f16c-fma-avx2_standalone") {
--      cflags = [
--        "-mavx2",
--        "-mf16c",
--        "-mfma",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qu8-gemm/gen/qu8-gemm-1x8c8-minmax-fp32-avx2.c",
--        "src/src/qu8-gemm/gen/qu8-gemm-3x8c8-minmax-fp32-avx2.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" ]
--      }
--    }
--  }
++
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
 +      "//third_party/fxdiv",
 +      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
- 
--  if (build_with_chromium) {
--    source_set(
--        "qu8-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
--      cflags = [
--        "-mavx512bw",
--        "-mavx512cd",
--        "-mavx512dq",
--        "-mavx512f",
--        "-mavx512vl",
--        "-mf16c",
--        "-mfma",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qu8-gemm/gen/qu8-gemm-1x16c8-minmax-fp32-avx512skx-prfm.c",
--        "src/src/qu8-gemm/gen/qu8-gemm-7x16c8-minmax-fp32-avx512skx-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(
--        "qu8-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") {
--      cflags = [
--        "-mavx512bw",
--        "-mavx512cd",
--        "-mavx512dq",
--        "-mavx512f",
--        "-mavx512vl",
--        "-mf16c",
--        "-mfma",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qu8-gemm/gen/qu8-gemm-1x16c8-minmax-fp32-avx512skx-prfm.c",
--        "src/src/qu8-gemm/gen/qu8-gemm-7x16c8-minmax-fp32-avx512skx-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-vcopysign_x64") {
 +    cflags = [
@@ -44817,106 +31588,23 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +    "src/src/f32-vcopysign/gen/f32-vcopysignc-scalar.c",
 +    "src/src/f32-vcopysign/gen/f32-vrcopysignc-scalar.c"
 +    ]
- 
--  if (build_with_chromium) {
--    source_set("qu8-gemm_sse2-no-sse3") {
--      cflags = [
--        "-mno-sse3",
--        "-msse2",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qu8-gemm/gen/qu8-gemm-1x4c8-minmax-fp32-sse2-ld64.c",
--        "src/src/qu8-gemm/gen/qu8-gemm-3x4c8-minmax-fp32-sse2-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",
--      ]
++
 +    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("qu8-gemm_sse2-no-sse3_standalone") {
--      cflags = [
--        "-mno-sse3",
--        "-msse2",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qu8-gemm/gen/qu8-gemm-1x4c8-minmax-fp32-sse2-ld64.c",
--        "src/src/qu8-gemm/gen/qu8-gemm-3x4c8-minmax-fp32-sse2-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: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("qu8-gemm_sse4.1-no-sse4.2") {
--      cflags = [
--        "-mno-sse4.2",
--        "-msse4.1",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qu8-gemm/gen/qu8-gemm-1x4c8-minmax-fp32-sse41-ld64.c",
--        "src/src/qu8-gemm/gen/qu8-gemm-3x4c8-minmax-fp32-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-vcopysign_x64_standalone") {
@@ -44930,46 +31618,12 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +    "src/src/f32-vcopysign/gen/f32-vcopysignc-scalar.c",
 +    "src/src/f32-vcopysign/gen/f32-vrcopysignc-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("qu8-gemm_sse4.1-no-sse4.2_standalone") {
--      cflags = [
--        "-mno-sse4.2",
--        "-msse4.1",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qu8-gemm/gen/qu8-gemm-1x4c8-minmax-fp32-sse41-ld64.c",
--        "src/src/qu8-gemm/gen/qu8-gemm-3x4c8-minmax-fp32-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:pthreadpool_standalone",
--      ]
--
--      public_configs = [ ":xnnpack_public_config" ]
--
--      if (!(is_android && use_order_profiling)) {
--        assert_no_deps = [ "//base" ]
--      }
++
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
@@ -44981,19 +31635,10 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +
 +    if (!(is_android && use_order_profiling)) {
 +      assert_no_deps = [ "//base" ]
-     }
-   }
++    }
++  }
 +}
- 
--  if (build_with_chromium) {
--    source_set("qu8-gemm_x64") {
--      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",
--      ]
++
 +if (build_with_chromium) {
 +  source_set("f32-vcos_avx-no-avx2-no-f16c-no-fma") {
 +    cflags = [
@@ -45007,39 +31652,23 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +      "src/include/xnnpack.h",
 +      "src/src/f32-vcos/gen/f32-vcos-avx-rational-5-4-div.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",
 +    ]
- 
--      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_x64_standalone") {
--      cflags = []
++
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
 +  source_set("f32-vcos_avx-no-avx2-no-f16c-no-fma_standalone") {
@@ -45054,139 +31683,27 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +      "src/include/xnnpack.h",
 +      "src/src/f32-vcos/gen/f32-vcos-avx-rational-5-4-div.c"
 +    ]
- 
--      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",
--      ]
--
--      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("qu8-igemm_avx-no-avx2-no-f16c-no-fma") {
--      cflags = [
--        "-mavx",
--        "-mno-avx2",
--        "-mno-f16c",
--        "-mno-fma",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qu8-igemm/gen/qu8-igemm-1x4c8-minmax-fp32-avx-ld128.c",
--        "src/src/qu8-igemm/gen/qu8-igemm-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",
--      ]
++
 +    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" ]
- 
--  # This is a target that cannot depend on //base.
--  if (build_with_internal_optimization_guide) {
--    source_set("qu8-igemm_avx-no-avx2-no-f16c-no-fma_standalone") {
--      cflags = [
--        "-mavx",
--        "-mno-avx2",
--        "-mno-f16c",
--        "-mno-fma",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qu8-igemm/gen/qu8-igemm-1x4c8-minmax-fp32-avx-ld128.c",
--        "src/src/qu8-igemm/gen/qu8-igemm-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 (!(is_android && use_order_profiling)) {
 +      assert_no_deps = [ "//base" ]
-     }
-   }
++    }
++  }
 +}
- 
--  if (build_with_chromium) {
--    source_set("qu8-igemm_f16c-fma-avx2") {
--      cflags = [
--        "-mavx2",
--        "-mf16c",
--        "-mfma",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qu8-igemm/gen/qu8-igemm-1x8c8-minmax-fp32-avx2.c",
--        "src/src/qu8-igemm/gen/qu8-igemm-3x8c8-minmax-fp32-avx2.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-vcos_avx512f") {
 +    cflags = [
@@ -45197,48 +31714,12 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +      "src/include/xnnpack.h",
 +      "src/src/f32-vcos/gen/f32-vcos-avx512f-rational-5-4-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("qu8-igemm_f16c-fma-avx2_standalone") {
--      cflags = [
--        "-mavx2",
--        "-mf16c",
--        "-mfma",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qu8-igemm/gen/qu8-igemm-1x8c8-minmax-fp32-avx2.c",
--        "src/src/qu8-igemm/gen/qu8-igemm-3x8c8-minmax-fp32-avx2.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" ]
--      }
--    }
++
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
@@ -45247,39 +31728,9 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +    ]
 +
 +    public_configs = [ ":xnnpack_public_config" ]
-   }
++  }
 +}
- 
--  if (build_with_chromium) {
--    source_set(
--        "qu8-igemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
--      cflags = [
--        "-mavx512bw",
--        "-mavx512cd",
--        "-mavx512dq",
--        "-mavx512f",
--        "-mavx512vl",
--        "-mf16c",
--        "-mfma",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qu8-igemm/gen/qu8-igemm-1x16c8-minmax-fp32-avx512skx-prfm.c",
--        "src/src/qu8-igemm/gen/qu8-igemm-7x16c8-minmax-fp32-avx512skx-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("f32-vcos_avx512f_standalone") {
@@ -45291,127 +31742,27 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +      "src/include/xnnpack.h",
 +      "src/src/f32-vcos/gen/f32-vcos-avx512f-rational-5-4-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(
--        "qu8-igemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") {
--      cflags = [
--        "-mavx512bw",
--        "-mavx512cd",
--        "-mavx512dq",
--        "-mavx512f",
--        "-mavx512vl",
--        "-mf16c",
--        "-mfma",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qu8-igemm/gen/qu8-igemm-1x16c8-minmax-fp32-avx512skx-prfm.c",
--        "src/src/qu8-igemm/gen/qu8-igemm-7x16c8-minmax-fp32-avx512skx-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" ]
--      }
--    }
--  }
++
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
 +      "//third_party/fxdiv",
 +      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
- 
--  if (build_with_chromium) {
--    source_set("qu8-igemm_sse2-no-sse3") {
--      cflags = [
--        "-mno-sse3",
--        "-msse2",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qu8-igemm/gen/qu8-igemm-1x4c8-minmax-fp32-sse2-ld64.c",
--        "src/src/qu8-igemm/gen/qu8-igemm-3x4c8-minmax-fp32-sse2-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",
--      ]
++
 +    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("qu8-igemm_sse2-no-sse3_standalone") {
--      cflags = [
--        "-mno-sse3",
--        "-msse2",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qu8-igemm/gen/qu8-igemm-1x4c8-minmax-fp32-sse2-ld64.c",
--        "src/src/qu8-igemm/gen/qu8-igemm-3x4c8-minmax-fp32-sse2-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: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_f16c-fma-no-avx2") {
 +    cflags = [
@@ -45424,85 +31775,23 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +      "src/include/xnnpack.h",
 +      "src/src/f32-vcos/gen/f32-vcos-fma3-rational-5-4-div.c"
 +    ]
- 
--  if (build_with_chromium) {
--    source_set("qu8-igemm_sse4.1-no-sse4.2") {
--      cflags = [
--        "-mno-sse4.2",
--        "-msse4.1",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qu8-igemm/gen/qu8-igemm-1x4c8-minmax-fp32-sse41-ld64.c",
--        "src/src/qu8-igemm/gen/qu8-igemm-3x4c8-minmax-fp32-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",
--      ]
++
 +    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("qu8-igemm_sse4.1-no-sse4.2_standalone") {
--      cflags = [
--        "-mno-sse4.2",
--        "-msse4.1",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qu8-igemm/gen/qu8-igemm-1x4c8-minmax-fp32-sse41-ld64.c",
--        "src/src/qu8-igemm/gen/qu8-igemm-3x4c8-minmax-fp32-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: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("qu8-igemm_x64") {
--      cflags = []
++
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
 +  source_set("f32-vcos_f16c-fma-no-avx2_standalone") {
@@ -45516,73 +31805,27 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +      "src/include/xnnpack.h",
 +      "src/src/f32-vcos/gen/f32-vcos-fma3-rational-5-4-div.c"
 +    ]
- 
--      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",
--      ]
++
 +    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("qu8-igemm_x64_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",
--      ]
--
--      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-vcos_sse2-no-sse3") {
 +    cflags = [
@@ -45595,83 +31838,23 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +      "src/src/f32-vcos/gen/f32-vcos-sse2-rational-5-4-div.c",
 +    "src/src/f32-vcos/gen/f32-vcos-sse2fma-rational-5-4-div.c"
 +    ]
- 
--  if (build_with_chromium) {
--    source_set("qu8-rdsum_ssse3-no-sse4.1") {
--      cflags = [
--        "-mno-sse4.1",
--        "-mssse3",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qu8-rdsum/gen/qu8-rdsum-7p7x-ssse3-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",
--      ]
++
 +    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("qu8-rdsum_ssse3-no-sse4.1_standalone") {
--      cflags = [
--        "-mno-sse4.1",
--        "-mssse3",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qu8-rdsum/gen/qu8-rdsum-7p7x-ssse3-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",
--      ]
--
--      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("qu8-rdsum_x64") {
--      cflags = []
++
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
 +  source_set("f32-vcos_sse2-no-sse3_standalone") {
@@ -45685,46 +31868,27 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +      "src/src/f32-vcos/gen/f32-vcos-sse2-rational-5-4-div.c",
 +    "src/src/f32-vcos/gen/f32-vcos-sse2fma-rational-5-4-div.c"
 +    ]
- 
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qu8-rdsum/gen/qu8-rdsum-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" ]
++
 +    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-rdsum_x64_standalone") {
--      cflags = []
++
 +if (build_with_chromium) {
 +  source_set("f32-vcos_x64") {
 +    cflags = [
@@ -45735,106 +31899,23 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +      "src/include/xnnpack.h",
 +      "src/src/f32-vcos/gen/f32-vcos-scalar-rational-5-4-div.c"
 +    ]
- 
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qu8-rdsum/gen/qu8-rdsum-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" ]
--      }
--    }
--  }
++
 +    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-rsum_f16c-fma-avx2") {
--      cflags = [
--        "-mavx2",
--        "-mf16c",
--        "-mfma",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qu8-rsum/gen/qu8-rsum-avx2-u64-acc2.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) {
--    source_set("qu8-rsum_f16c-fma-avx2_standalone") {
--      cflags = [
--        "-mavx2",
--        "-mf16c",
--        "-mfma",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qu8-rsum/gen/qu8-rsum-avx2-u64-acc2.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-vcos_x64_standalone") {
@@ -45846,91 +31927,27 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +      "src/include/xnnpack.h",
 +      "src/src/f32-vcos/gen/f32-vcos-scalar-rational-5-4-div.c"
 +    ]
- 
--  if (build_with_chromium) {
--    source_set("qu8-rsum_sse2-no-sse3") {
--      cflags = [
--        "-mno-sse3",
--        "-msse2",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qu8-rsum/gen/qu8-rsum-sse2-u32-acc2.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("qu8-rsum_sse2-no-sse3_standalone") {
--      cflags = [
--        "-mno-sse3",
--        "-msse2",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qu8-rsum/gen/qu8-rsum-sse2-u32-acc2.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" ]
-     }
-   }
++    }
++  }
 +}
- 
--  if (build_with_chromium) {
--    source_set("qu8-rsum_x64") {
--      cflags = []
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qu8-rsum/gen/qu8-rsum-scalar-u4.c",
--      ]
++
 +if (build_with_chromium) {
 +  source_set("f32-velu_avx-no-avx2-no-f16c-no-fma") {
 +    cflags = [
@@ -45944,39 +31961,23 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +      "src/include/xnnpack.h",
 +      "src/src/f32-velu/gen/f32-velu-avx-rr2-lut4-p4-perm-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" ]
++
 +    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) {
--    source_set("qu8-rsum_x64_standalone") {
--      cflags = []
++
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
 +  source_set("f32-velu_avx-no-avx2-no-f16c-no-fma_standalone") {
@@ -45991,135 +31992,27 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +      "src/include/xnnpack.h",
 +      "src/src/f32-velu/gen/f32-velu-avx-rr2-lut4-p4-perm-u32.c"
 +    ]
- 
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qu8-rsum/gen/qu8-rsum-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" ]
--      }
--    }
--  }
++
 +    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_avx-no-avx2-no-f16c-no-fma") {
--      cflags = [
--        "-mavx",
--        "-mno-avx2",
--        "-mno-f16c",
--        "-mno-fma",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qu8-vadd/gen/qu8-vadd-minmax-avx-mul32-ld32-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" ]
--
--      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: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_avx-no-avx2-no-f16c-no-fma_standalone") {
--      cflags = [
--        "-mavx",
--        "-mno-avx2",
--        "-mno-f16c",
--        "-mno-fma",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qu8-vadd/gen/qu8-vadd-minmax-avx-mul32-ld32-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" ]
--
--      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("qu8-vadd_f16c-fma-avx2") {
--      cflags = [
--        "-mavx2",
--        "-mf16c",
--        "-mfma",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qu8-vadd/gen/qu8-vadd-minmax-avx2-mul32-ld64-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",
--      ]
++
 +if (build_with_chromium) {
 +  source_set("f32-velu_avx512f") {
 +    cflags = [
@@ -46130,47 +32023,12 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +      "src/include/xnnpack.h",
 +      "src/src/f32-velu/gen/f32-velu-avx512f-rr1-p6-u64.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-vadd_f16c-fma-avx2_standalone") {
--      cflags = [
--        "-mavx2",
--        "-mf16c",
--        "-mfma",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qu8-vadd/gen/qu8-vadd-minmax-avx2-mul32-ld64-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" ]
--      }
--    }
++
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
@@ -46179,38 +32037,9 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +    ]
 +
 +    public_configs = [ ":xnnpack_public_config" ]
-   }
++  }
 +}
- 
--  if (build_with_chromium) {
--    source_set(
--        "qu8-vadd_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
--      cflags = [
--        "-mavx512bw",
--        "-mavx512cd",
--        "-mavx512dq",
--        "-mavx512f",
--        "-mavx512vl",
--        "-mf16c",
--        "-mfma",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qu8-vadd/gen/qu8-vadd-minmax-avx512skx-mul32-ld128-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",
--      ]
++
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
 +  source_set("f32-velu_avx512f_standalone") {
@@ -46222,124 +32051,27 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +      "src/include/xnnpack.h",
 +      "src/src/f32-velu/gen/f32-velu-avx512f-rr1-p6-u64.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-vadd_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") {
--      cflags = [
--        "-mavx512bw",
--        "-mavx512cd",
--        "-mavx512dq",
--        "-mavx512f",
--        "-mavx512vl",
--        "-mf16c",
--        "-mfma",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qu8-vadd/gen/qu8-vadd-minmax-avx512skx-mul32-ld128-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" ]
--      }
--    }
--  }
++
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
 +      "//third_party/fxdiv",
 +      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
- 
--  if (build_with_chromium) {
--    source_set("qu8-vadd_sse2-no-sse3") {
--      cflags = [
--        "-mno-sse3",
--        "-msse2",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qu8-vadd/gen/qu8-vadd-minmax-sse2-mul16-ld64-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" ]
--
--      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("qu8-vadd_sse2-no-sse3_standalone") {
--      cflags = [
--        "-mno-sse3",
--        "-msse2",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qu8-vadd/gen/qu8-vadd-minmax-sse2-mul16-ld64-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" ]
--
--      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-velu_f16c-fma-avx2") {
 +    cflags = [
@@ -46352,83 +32084,23 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +      "src/include/xnnpack.h",
 +      "src/src/f32-velu/gen/f32-velu-avx2-rr1-lut4-p4-perm-u32.c"
 +    ]
- 
--  if (build_with_chromium) {
--    source_set("qu8-vadd_sse4.1-no-sse4.2") {
--      cflags = [
--        "-mno-sse4.2",
--        "-msse4.1",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qu8-vadd/gen/qu8-vadd-minmax-sse41-mul16-ld64-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" ]
--
--      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",
 +    ]
- 
--  # 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") {
--      cflags = [
--        "-mno-sse4.2",
--        "-msse4.1",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qu8-vadd/gen/qu8-vadd-minmax-sse41-mul16-ld64-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" ]
--
--      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("qu8-vadd_x64") {
--      cflags = []
++
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
 +  source_set("f32-velu_f16c-fma-avx2_standalone") {
@@ -46442,47 +32114,27 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +      "src/include/xnnpack.h",
 +      "src/src/f32-velu/gen/f32-velu-avx2-rr1-lut4-p4-perm-u32.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",
 +    ]
- 
--      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("qu8-vadd_x64_standalone") {
--      cflags = []
++
 +if (build_with_chromium) {
 +  source_set("f32-velu_sse2-no-sse3") {
 +    cflags = [
@@ -46494,109 +32146,23 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +      "src/include/xnnpack.h",
 +      "src/src/f32-velu/gen/f32-velu-sse2-rr2-lut16-p3-u12.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" ]
--
--      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("qu8-vaddc_avx-no-avx2-no-f16c-no-fma") {
--      cflags = [
--        "-mavx",
--        "-mno-avx2",
--        "-mno-f16c",
--        "-mno-fma",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qu8-vaddc/gen/qu8-vaddc-minmax-avx-mul32-ld32-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" ]
--
--      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) {
--    source_set("qu8-vaddc_avx-no-avx2-no-f16c-no-fma_standalone") {
--      cflags = [
--        "-mavx",
--        "-mno-avx2",
--        "-mno-f16c",
--        "-mno-fma",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qu8-vaddc/gen/qu8-vaddc-minmax-avx-mul32-ld32-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" ]
--
--      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-velu_sse2-no-sse3_standalone") {
@@ -46609,114 +32175,27 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +      "src/include/xnnpack.h",
 +      "src/src/f32-velu/gen/f32-velu-sse2-rr2-lut16-p3-u12.c"
 +    ]
- 
--  if (build_with_chromium) {
--    source_set("qu8-vaddc_f16c-fma-avx2") {
--      cflags = [
--        "-mavx2",
--        "-mf16c",
--        "-mfma",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qu8-vaddc/gen/qu8-vaddc-minmax-avx2-mul32-ld64-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",
--      ]
++
 +    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("qu8-vaddc_f16c-fma-avx2_standalone") {
--      cflags = [
--        "-mavx2",
--        "-mf16c",
--        "-mfma",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qu8-vaddc/gen/qu8-vaddc-minmax-avx2-mul32-ld64-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" ]
--      }
++
 +    public_configs = [ ":xnnpack_public_config" ]
 +
 +    if (!(is_android && use_order_profiling)) {
 +      assert_no_deps = [ "//base" ]
-     }
-   }
++    }
++  }
 +}
- 
--  if (build_with_chromium) {
--    source_set(
--        "qu8-vaddc_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
--      cflags = [
--        "-mavx512bw",
--        "-mavx512cd",
--        "-mavx512dq",
--        "-mavx512f",
--        "-mavx512vl",
--        "-mf16c",
--        "-mfma",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qu8-vaddc/gen/qu8-vaddc-minmax-avx512skx-mul32-ld128-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",
--      ]
++
 +if (build_with_chromium) {
 +  source_set("f32-velu_x64") {
 +    cflags = [
@@ -46727,52 +32206,12 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +      "src/include/xnnpack.h",
 +      "src/src/f32-velu/gen/f32-velu-scalar-rr2-lut16-p3-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(
--        "qu8-vaddc_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") {
--      cflags = [
--        "-mavx512bw",
--        "-mavx512cd",
--        "-mavx512dq",
--        "-mavx512f",
--        "-mavx512vl",
--        "-mf16c",
--        "-mfma",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qu8-vaddc/gen/qu8-vaddc-minmax-avx512skx-mul32-ld128-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" ]
--      }
--    }
++
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
@@ -46781,32 +32220,9 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +    ]
 +
 +    public_configs = [ ":xnnpack_public_config" ]
-   }
++  }
 +}
- 
--  if (build_with_chromium) {
--    source_set("qu8-vaddc_sse2-no-sse3") {
--      cflags = [
--        "-mno-sse3",
--        "-msse2",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qu8-vaddc/gen/qu8-vaddc-minmax-sse2-mul16-ld64-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" ]
--
--      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-velu_x64_standalone") {
@@ -46818,118 +32234,27 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +      "src/include/xnnpack.h",
 +      "src/src/f32-velu/gen/f32-velu-scalar-rr2-lut16-p3-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("qu8-vaddc_sse2-no-sse3_standalone") {
--      cflags = [
--        "-mno-sse3",
--        "-msse2",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qu8-vaddc/gen/qu8-vaddc-minmax-sse2-mul16-ld64-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" ]
--
--      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" ]
--      }
--    }
--  }
++
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
 +      "//third_party/fxdiv",
 +      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
- 
--  if (build_with_chromium) {
--    source_set("qu8-vaddc_sse4.1-no-sse4.2") {
--      cflags = [
--        "-mno-sse4.2",
--        "-msse4.1",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qu8-vaddc/gen/qu8-vaddc-minmax-sse41-mul16-ld64-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" ]
--
--      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("qu8-vaddc_sse4.1-no-sse4.2_standalone") {
--      cflags = [
--        "-mno-sse4.2",
--        "-msse4.1",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qu8-vaddc/gen/qu8-vaddc-minmax-sse41-mul16-ld64-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" ]
--
--      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-vexp_avx-no-avx2-no-f16c-no-fma") {
 +    cflags = [
@@ -46943,41 +32268,23 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +      "src/include/xnnpack.h",
 +      "src/src/f32-vexp/gen/f32-vexp-avx-rational-3-2-div.c"
 +    ]
- 
--  if (build_with_chromium) {
--    source_set("qu8-vaddc_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/qu8-vaddc/gen/qu8-vaddc-minmax-scalar-u1.c",
--        "src/src/qu8-vaddc/gen/qu8-vaddc-minmax-scalar-u4.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",
--      ]
++
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
 +  source_set("f32-vexp_avx-no-avx2-no-f16c-no-fma_standalone") {
@@ -46992,19 +32299,12 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +      "src/include/xnnpack.h",
 +      "src/src/f32-vexp/gen/f32-vexp-avx-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" ]
 +    configs += [ ":xnnpack_private_config" ]
- 
--  # This is a target that cannot depend on //base.
--  if (build_with_internal_optimization_guide) {
--    source_set("qu8-vaddc_x64_standalone") {
--      cflags = []
++
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
@@ -47013,61 +32313,13 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +    ]
 +
 +    public_configs = [ ":xnnpack_public_config" ]
- 
--      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",
--      ]
--
--      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("qu8-vcvt_avx-no-avx2-no-f16c-no-fma") {
--      cflags = [
--        "-mavx",
--        "-mno-avx2",
--        "-mno-f16c",
--        "-mno-fma",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qu8-vcvt/gen/qu8-vcvt-avx-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",
--      ]
++
 +if (build_with_chromium) {
 +  source_set("f32-vexp_avx512f") {
 +    cflags = [
@@ -47078,48 +32330,12 @@ Index: chromium-153.0.8010.36/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" ]
 +    configs += [ ":xnnpack_private_config" ]
- 
--  # This is a target that cannot depend on //base.
--  if (build_with_internal_optimization_guide) {
--    source_set("qu8-vcvt_avx-no-avx2-no-f16c-no-fma_standalone") {
--      cflags = [
--        "-mavx",
--        "-mno-avx2",
--        "-mno-f16c",
--        "-mno-fma",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qu8-vcvt/gen/qu8-vcvt-avx-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",
--      ]
--
--      public_configs = [ ":xnnpack_public_config" ]
--
--      if (!(is_android && use_order_profiling)) {
--        assert_no_deps = [ "//base" ]
--      }
--    }
++
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
@@ -47128,33 +32344,9 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +    ]
 +
 +    public_configs = [ ":xnnpack_public_config" ]
-   }
++  }
 +}
- 
--  if (build_with_chromium) {
--    source_set("qu8-vcvt_f16c-fma-avx2") {
--      cflags = [
--        "-mavx2",
--        "-mf16c",
--        "-mfma",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qu8-vcvt/gen/qu8-vcvt-avx2-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",
--      ]
++
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
 +  source_set("f32-vexp_avx512f_standalone") {
@@ -47166,117 +32358,27 @@ Index: chromium-153.0.8010.36/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" ]
 +    configs += [ ":xnnpack_private_config" ]
- 
--  # This is a target that cannot depend on //base.
--  if (build_with_internal_optimization_guide) {
--    source_set("qu8-vcvt_f16c-fma-avx2_standalone") {
--      cflags = [
--        "-mavx2",
--        "-mf16c",
--        "-mfma",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qu8-vcvt/gen/qu8-vcvt-avx2-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",
--      ]
--
--      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",
 +    ]
- 
--  if (build_with_chromium) {
--    source_set("qu8-vcvt_sse2-no-sse3") {
--      cflags = [
--        "-mno-sse3",
--        "-msse2",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qu8-vcvt/gen/qu8-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",
--      ]
++
 +    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("qu8-vcvt_sse2-no-sse3_standalone") {
--      cflags = [
--        "-mno-sse3",
--        "-msse2",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qu8-vcvt/gen/qu8-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",
--      ]
--
--      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 = [
@@ -51066,6 +36168,81 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
++  source_set("qd8-bf16-qb4w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni") {
++    cflags = [
++      "-mavx512bw",
++    "-mavx512cd",
++    "-mavx512dq",
++    "-mavx512f",
++    "-mavx512vl",
++    "-mavx512vnni",
++    "-mf16c",
++    "-mfma"
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/qd8-bf16-qb4w-gemm/gen/qd8-bf16-qb4w-gemm-1x16c8-minmax-avx512vnni.c",
++    "src/src/qd8-bf16-qb4w-gemm/gen/qd8-bf16-qb4w-gemm-8x16c8-minmax-avx512vnni.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-bf16-qb4w-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/qd8-bf16-qb4w-gemm/gen/qd8-bf16-qb4w-gemm-1x16c8-minmax-avx512vnni.c",
++    "src/src/qd8-bf16-qb4w-gemm/gen/qd8-bf16-qb4w-gemm-8x16c8-minmax-avx512vnni.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-bf16-qb4w-gemm_x64") {
 +    cflags = [
 +  
@@ -68298,8 +53475,7 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x16-packw/gen/x16-packw-x16-gemm-goi-avx2-u16-prfm.c",
-+    "src/src/x16-packw/gen/x16-packw-x32-gemm-goi-avx2-u16-prfm.c"
++      "src/src/x16-packw/gen/x16-packw-x16-gemm-goi-avx2-u16-prfm.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -68329,8 +53505,78 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x16-packw/gen/x16-packw-x16-gemm-goi-avx2-u16-prfm.c",
-+    "src/src/x16-packw/gen/x16-packw-x32-gemm-goi-avx2-u16-prfm.c"
++      "src/src/x16-packw/gen/x16-packw-x16-gemm-goi-avx2-u16-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("x16-packw_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
++    cflags = [
++      "-mavx512bw",
++    "-mavx512cd",
++    "-mavx512dq",
++    "-mavx512f",
++    "-mavx512vl",
++    "-mf16c",
++    "-mfma"
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/x16-packw/gen/x16-packw-x32-gemm-goi-avx512skx-u16-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" ]
++  }
++}
++
++# This is a target that cannot depend on //base.
++if (build_with_internal_optimization_guide) {
++  source_set("x16-packw_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") {
++    cflags = [
++      "-mavx512bw",
++    "-mavx512cd",
++    "-mavx512dq",
++    "-mavx512f",
++    "-mavx512vl",
++    "-mf16c",
++    "-mfma"
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/x16-packw/gen/x16-packw-x32-gemm-goi-avx512skx-u16-prfm.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -68363,7 +53609,6 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +      "src/include/xnnpack.h",
 +      "src/src/x16-packw/gen/x16-packw-x16-gemm-gio-scalar.c",
 +    "src/src/x16-packw/gen/x16-packw-x32-gemm-gio-scalar.c",
-+    "src/src/x16-packw/gen/x16-packw-x32-gemm-goi-scalar-int-u4.c",
 +    "src/src/x16-packw/gen/x16-packw-x8-gemm-gio-scalar.c"
 +    ]
 +
@@ -68394,7 +53639,6 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +      "src/include/xnnpack.h",
 +      "src/src/x16-packw/gen/x16-packw-x16-gemm-gio-scalar.c",
 +    "src/src/x16-packw/gen/x16-packw-x32-gemm-gio-scalar.c",
-+    "src/src/x16-packw/gen/x16-packw-x32-gemm-goi-scalar-int-u4.c",
 +    "src/src/x16-packw/gen/x16-packw-x8-gemm-gio-scalar.c"
 +    ]
 +
@@ -70869,6 +56113,67 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
++  source_set("bf16-vunary_arm64") {
++    cflags = [
++  
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/bf16-vunary/gen/bf16-vunary-neon.c",
++    "src/src/bf16-vunary/gen/bf16-vunary-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",
++    ]
++
++    public_configs = [ ":xnnpack_public_config" ]
++  }
++}
++
++# This is a target that cannot depend on //base.
++if (build_with_internal_optimization_guide) {
++  source_set("bf16-vunary_arm64_standalone") {
++    cflags = [
++  
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/bf16-vunary/gen/bf16-vunary-neon.c",
++    "src/src/bf16-vunary/gen/bf16-vunary-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 (build_with_chromium) {
 +  source_set("configs_arm64") {
 +    cflags = [
 +  
@@ -71100,14 +56405,14 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f16-conv-hwc2chw_arch=armv8.2-a+fp16") {
++  source_set("f16-avgpool_arm64") {
 +    cflags = [
-+      "-march=armv8.2-a+fp16"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-conv-hwc2chw/f16-conv-hwc2chw-3x3s2p1c3x4-neonfp16arith-2x2.c"
++      "src/src/f16-avgpool/gen/f16-f32acc-avgpool-9p-minmax-scalar-u1.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -71128,14 +56433,14 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-conv-hwc2chw_arch=armv8.2-a+fp16_standalone") {
++  source_set("f16-avgpool_arm64_standalone") {
 +    cflags = [
-+      "-march=armv8.2-a+fp16"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-conv-hwc2chw/f16-conv-hwc2chw-3x3s2p1c3x4-neonfp16arith-2x2.c"
++      "src/src/f16-avgpool/gen/f16-f32acc-avgpool-9p-minmax-scalar-u1.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -71159,17 +56464,14 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f16-dwconv2d-chw_arch=armv8.2-a+fp16") {
++  source_set("f16-conv-hwc2chw_arch=armv8.2-a+fp16") {
 +    cflags = [
 +      "-march=armv8.2-a+fp16"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-dwconv2d-chw/gen/f16-dwconv2d-chw-3x3p1-minmax-neonfp16arith-2x8.c",
-+    "src/src/f16-dwconv2d-chw/gen/f16-dwconv2d-chw-3x3s2p1-minmax-neonfp16arith-1x8.c",
-+    "src/src/f16-dwconv2d-chw/gen/f16-dwconv2d-chw-5x5p2-minmax-neonfp16arith-1x8.c",
-+    "src/src/f16-dwconv2d-chw/gen/f16-dwconv2d-chw-5x5s2p2-minmax-neonfp16arith-1x8.c"
++      "src/src/f16-conv-hwc2chw/f16-conv-hwc2chw-3x3s2p1c3x4-neonfp16arith-2x2.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -71190,17 +56492,14 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-dwconv2d-chw_arch=armv8.2-a+fp16_standalone") {
++  source_set("f16-conv-hwc2chw_arch=armv8.2-a+fp16_standalone") {
 +    cflags = [
 +      "-march=armv8.2-a+fp16"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-dwconv2d-chw/gen/f16-dwconv2d-chw-3x3p1-minmax-neonfp16arith-2x8.c",
-+    "src/src/f16-dwconv2d-chw/gen/f16-dwconv2d-chw-3x3s2p1-minmax-neonfp16arith-1x8.c",
-+    "src/src/f16-dwconv2d-chw/gen/f16-dwconv2d-chw-5x5p2-minmax-neonfp16arith-1x8.c",
-+    "src/src/f16-dwconv2d-chw/gen/f16-dwconv2d-chw-5x5s2p2-minmax-neonfp16arith-1x8.c"
++      "src/src/f16-conv-hwc2chw/f16-conv-hwc2chw-3x3s2p1c3x4-neonfp16arith-2x2.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -71224,18 +56523,17 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f16-dwconv_arch=armv8.2-a+fp16") {
++  source_set("f16-dwconv2d-chw_arch=armv8.2-a+fp16") {
 +    cflags = [
 +      "-march=armv8.2-a+fp16"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-dwconv/gen/f16-dwconv-25p8c-minmax-neonfp16arith-acc2.c",
-+    "src/src/f16-dwconv/gen/f16-dwconv-3p16c-minmax-neonfp16arith.c",
-+    "src/src/f16-dwconv/gen/f16-dwconv-4p16c-minmax-neonfp16arith.c",
-+    "src/src/f16-dwconv/gen/f16-dwconv-9p16c-minmax-neonfp16arith.c",
-+    "src/src/f16-dwconv/gen/f16-dwconv-9p8c-minmax-neonfp16arith.c"
++      "src/src/f16-dwconv2d-chw/gen/f16-dwconv2d-chw-3x3p1-minmax-neonfp16arith-2x8.c",
++    "src/src/f16-dwconv2d-chw/gen/f16-dwconv2d-chw-3x3s2p1-minmax-neonfp16arith-1x8.c",
++    "src/src/f16-dwconv2d-chw/gen/f16-dwconv2d-chw-5x5p2-minmax-neonfp16arith-1x8.c",
++    "src/src/f16-dwconv2d-chw/gen/f16-dwconv2d-chw-5x5s2p2-minmax-neonfp16arith-1x8.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -71256,18 +56554,17 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-dwconv_arch=armv8.2-a+fp16_standalone") {
++  source_set("f16-dwconv2d-chw_arch=armv8.2-a+fp16_standalone") {
 +    cflags = [
 +      "-march=armv8.2-a+fp16"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-dwconv/gen/f16-dwconv-25p8c-minmax-neonfp16arith-acc2.c",
-+    "src/src/f16-dwconv/gen/f16-dwconv-3p16c-minmax-neonfp16arith.c",
-+    "src/src/f16-dwconv/gen/f16-dwconv-4p16c-minmax-neonfp16arith.c",
-+    "src/src/f16-dwconv/gen/f16-dwconv-9p16c-minmax-neonfp16arith.c",
-+    "src/src/f16-dwconv/gen/f16-dwconv-9p8c-minmax-neonfp16arith.c"
++      "src/src/f16-dwconv2d-chw/gen/f16-dwconv2d-chw-3x3p1-minmax-neonfp16arith-2x8.c",
++    "src/src/f16-dwconv2d-chw/gen/f16-dwconv2d-chw-3x3s2p1-minmax-neonfp16arith-1x8.c",
++    "src/src/f16-dwconv2d-chw/gen/f16-dwconv2d-chw-5x5p2-minmax-neonfp16arith-1x8.c",
++    "src/src/f16-dwconv2d-chw/gen/f16-dwconv2d-chw-5x5s2p2-minmax-neonfp16arith-1x8.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -71291,16 +56588,18 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f16-f32-vcvt_arm64") {
++  source_set("f16-dwconv_arch=armv8.2-a+fp16") {
 +    cflags = [
-+  
++      "-march=armv8.2-a+fp16"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-f32-vcvt/gen/f16-f32-vcvt-neon-int16-u16.c",
-+    "src/src/f16-f32-vcvt/gen/f16-f32-vcvt-neonfp16-u16.c",
-+    "src/src/f16-f32-vcvt/gen/f16-f32-vcvt-scalar-u4.c"
++      "src/src/f16-dwconv/gen/f16-dwconv-25p8c-minmax-neonfp16arith-acc2.c",
++    "src/src/f16-dwconv/gen/f16-dwconv-3p16c-minmax-neonfp16arith.c",
++    "src/src/f16-dwconv/gen/f16-dwconv-4p16c-minmax-neonfp16arith.c",
++    "src/src/f16-dwconv/gen/f16-dwconv-9p16c-minmax-neonfp16arith.c",
++    "src/src/f16-dwconv/gen/f16-dwconv-9p8c-minmax-neonfp16arith.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -71321,16 +56620,18 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-f32-vcvt_arm64_standalone") {
++  source_set("f16-dwconv_arch=armv8.2-a+fp16_standalone") {
 +    cflags = [
-+  
++      "-march=armv8.2-a+fp16"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-f32-vcvt/gen/f16-f32-vcvt-neon-int16-u16.c",
-+    "src/src/f16-f32-vcvt/gen/f16-f32-vcvt-neonfp16-u16.c",
-+    "src/src/f16-f32-vcvt/gen/f16-f32-vcvt-scalar-u4.c"
++      "src/src/f16-dwconv/gen/f16-dwconv-25p8c-minmax-neonfp16arith-acc2.c",
++    "src/src/f16-dwconv/gen/f16-dwconv-3p16c-minmax-neonfp16arith.c",
++    "src/src/f16-dwconv/gen/f16-dwconv-4p16c-minmax-neonfp16arith.c",
++    "src/src/f16-dwconv/gen/f16-dwconv-9p16c-minmax-neonfp16arith.c",
++    "src/src/f16-dwconv/gen/f16-dwconv-9p8c-minmax-neonfp16arith.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -71354,14 +56655,17 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f16-f32acc-rdsum2_arch=armv8.2-a+fp16") {
++  source_set("f16-dwconv_arm64") {
 +    cflags = [
-+      "-march=armv8.2-a+fp16"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-f32acc-rdsum2/gen/f16-f32acc-rdsum2-7p7x-minmax-neonfp16arith.c"
++      "src/src/f16-dwconv/gen/f16-f32acc-dwconv-25p2c-minmax-scalar-acc2.c",
++    "src/src/f16-dwconv/gen/f16-f32acc-dwconv-3p1c-minmax-scalar-acc2.c",
++    "src/src/f16-dwconv/gen/f16-f32acc-dwconv-4p1c-minmax-scalar-acc2.c",
++    "src/src/f16-dwconv/gen/f16-f32acc-dwconv-9p1c-minmax-scalar-acc2.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -71382,14 +56686,17 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-f32acc-rdsum2_arch=armv8.2-a+fp16_standalone") {
++  source_set("f16-dwconv_arm64_standalone") {
 +    cflags = [
-+      "-march=armv8.2-a+fp16"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-f32acc-rdsum2/gen/f16-f32acc-rdsum2-7p7x-minmax-neonfp16arith.c"
++      "src/src/f16-dwconv/gen/f16-f32acc-dwconv-25p2c-minmax-scalar-acc2.c",
++    "src/src/f16-dwconv/gen/f16-f32acc-dwconv-3p1c-minmax-scalar-acc2.c",
++    "src/src/f16-dwconv/gen/f16-f32acc-dwconv-4p1c-minmax-scalar-acc2.c",
++    "src/src/f16-dwconv/gen/f16-f32acc-dwconv-9p1c-minmax-scalar-acc2.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -71413,14 +56720,16 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f16-f32acc-rdsum_arch=armv8.2-a+fp16") {
++  source_set("f16-f32-vcvt_arm64") {
 +    cflags = [
-+      "-march=armv8.2-a+fp16"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-f32acc-rdsum/gen/f16-f32acc-rdsum-7p7x-minmax-neonfp16arith-u16.c"
++      "src/src/f16-f32-vcvt/gen/f16-f32-vcvt-neon-int16-u16.c",
++    "src/src/f16-f32-vcvt/gen/f16-f32-vcvt-neonfp16-u16.c",
++    "src/src/f16-f32-vcvt/gen/f16-f32-vcvt-scalar-u4.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -71441,14 +56750,16 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-f32acc-rdsum_arch=armv8.2-a+fp16_standalone") {
++  source_set("f16-f32-vcvt_arm64_standalone") {
 +    cflags = [
-+      "-march=armv8.2-a+fp16"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-f32acc-rdsum/gen/f16-f32acc-rdsum-7p7x-minmax-neonfp16arith-u16.c"
++      "src/src/f16-f32-vcvt/gen/f16-f32-vcvt-neon-int16-u16.c",
++    "src/src/f16-f32-vcvt/gen/f16-f32-vcvt-neonfp16-u16.c",
++    "src/src/f16-f32-vcvt/gen/f16-f32-vcvt-scalar-u4.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -71472,14 +56783,14 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f16-f32acc-rsum2_arch=armv8.2-a+fp16") {
++  source_set("f16-f32acc-rdsum2_arch=armv8.2-a+fp16") {
 +    cflags = [
 +      "-march=armv8.2-a+fp16"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-f32acc-rsum2/gen/f16-f32acc-rsum2-neonfp16arith.c"
++      "src/src/f16-f32acc-rdsum2/gen/f16-f32acc-rdsum2-7p7x-minmax-neonfp16arith.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -71500,14 +56811,14 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-f32acc-rsum2_arch=armv8.2-a+fp16_standalone") {
++  source_set("f16-f32acc-rdsum2_arch=armv8.2-a+fp16_standalone") {
 +    cflags = [
 +      "-march=armv8.2-a+fp16"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-f32acc-rsum2/gen/f16-f32acc-rsum2-neonfp16arith.c"
++      "src/src/f16-f32acc-rdsum2/gen/f16-f32acc-rdsum2-7p7x-minmax-neonfp16arith.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -71531,14 +56842,14 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f16-f32acc-rsum_arch=armv8.2-a+fp16") {
++  source_set("f16-f32acc-rdsum_arch=armv8.2-a+fp16") {
 +    cflags = [
 +      "-march=armv8.2-a+fp16"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-f32acc-rsum/gen/f16-f32acc-rsum-neonfp16arith-u32-acc4.c"
++      "src/src/f16-f32acc-rdsum/gen/f16-f32acc-rdsum-7p7x-minmax-neonfp16arith-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -71559,14 +56870,14 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-f32acc-rsum_arch=armv8.2-a+fp16_standalone") {
++  source_set("f16-f32acc-rdsum_arch=armv8.2-a+fp16_standalone") {
 +    cflags = [
 +      "-march=armv8.2-a+fp16"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-f32acc-rsum/gen/f16-f32acc-rsum-neonfp16arith-u32-acc4.c"
++      "src/src/f16-f32acc-rdsum/gen/f16-f32acc-rdsum-7p7x-minmax-neonfp16arith-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -71590,17 +56901,14 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f16-gemm_arch=armv8.2-a+fp16") {
++  source_set("f16-f32acc-rsum2_arch=armv8.2-a+fp16") {
 +    cflags = [
 +      "-march=armv8.2-a+fp16"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-gemm/gen/f16-gemm-1x16-minmax-neonfp16arith-ld64.c",
-+    "src/src/f16-gemm/gen/f16-gemm-1x8-minmax-neonfp16arith-ld64.c",
-+    "src/src/f16-gemm/gen/f16-gemm-6x16-minmax-neonfp16arith-ld64.c",
-+    "src/src/f16-gemm/gen/f16-gemm-6x8-minmax-neonfp16arith-ld64.c"
++      "src/src/f16-f32acc-rsum2/gen/f16-f32acc-rsum2-neonfp16arith.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -71621,90 +56929,14 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-gemm_arch=armv8.2-a+fp16_standalone") {
++  source_set("f16-f32acc-rsum2_arch=armv8.2-a+fp16_standalone") {
 +    cflags = [
 +      "-march=armv8.2-a+fp16"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-gemm/gen/f16-gemm-1x16-minmax-neonfp16arith-ld64.c",
-+    "src/src/f16-gemm/gen/f16-gemm-1x8-minmax-neonfp16arith-ld64.c",
-+    "src/src/f16-gemm/gen/f16-gemm-6x16-minmax-neonfp16arith-ld64.c",
-+    "src/src/f16-gemm/gen/f16-gemm-6x8-minmax-neonfp16arith-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:pthreadpool_standalone",
-+    ]
-+
-+    public_configs = [ ":xnnpack_public_config" ]
-+
-+    if (!(is_android && use_order_profiling)) {
-+      assert_no_deps = [ "//base" ]
-+    }
-+  }
-+}
-+
-+if (build_with_chromium) {
-+  source_set("f16-gemm_arch=armv8.2-a+fp16+dotprod") {
-+    cflags = [
-+      "-march=armv8.2-a+fp16+dotprod"
-+    ]
-+  
-+  asmflags = cflags
-+
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/f16-gemm/gen/f16-gemm-1x16-minmax-asm-aarch64-neonfp16arith-ld64.S",
-+    "src/src/f16-gemm/gen/f16-gemm-4x16-minmax-asm-aarch64-neonfp16arith-ld64.S",
-+    "src/src/f16-gemm/gen/f16-gemm-6x16-minmax-asm-aarch64-neonfp16arith-cortex-a55.S",
-+    "src/src/f16-gemm/gen/f16-gemm-6x16-minmax-asm-aarch64-neonfp16arith-cortex-a55r0.S",
-+    "src/src/f16-gemm/gen/f16-gemm-6x16-minmax-asm-aarch64-neonfp16arith-cortex-a75.S",
-+    "src/src/f16-gemm/gen/f16-gemm-6x16-minmax-asm-aarch64-neonfp16arith-ld64.S"
-+    ]
-+
-+    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("f16-gemm_arch=armv8.2-a+fp16+dotprod_standalone") {
-+    cflags = [
-+      "-march=armv8.2-a+fp16+dotprod"
-+    ]
-+  
-+  asmflags = cflags
-+
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/f16-gemm/gen/f16-gemm-1x16-minmax-asm-aarch64-neonfp16arith-ld64.S",
-+    "src/src/f16-gemm/gen/f16-gemm-4x16-minmax-asm-aarch64-neonfp16arith-ld64.S",
-+    "src/src/f16-gemm/gen/f16-gemm-6x16-minmax-asm-aarch64-neonfp16arith-cortex-a55.S",
-+    "src/src/f16-gemm/gen/f16-gemm-6x16-minmax-asm-aarch64-neonfp16arith-cortex-a55r0.S",
-+    "src/src/f16-gemm/gen/f16-gemm-6x16-minmax-asm-aarch64-neonfp16arith-cortex-a75.S",
-+    "src/src/f16-gemm/gen/f16-gemm-6x16-minmax-asm-aarch64-neonfp16arith-ld64.S"
++      "src/src/f16-f32acc-rsum2/gen/f16-f32acc-rsum2-neonfp16arith.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -71728,14 +56960,14 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f16-ibilinear-chw_arch=armv8.2-a+fp16") {
++  source_set("f16-f32acc-rsum_arch=armv8.2-a+fp16") {
 +    cflags = [
 +      "-march=armv8.2-a+fp16"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-ibilinear-chw/gen/f16-ibilinear-chw-neonfp16arith-p8.c"
++      "src/src/f16-f32acc-rsum/gen/f16-f32acc-rsum-neonfp16arith-u32-acc4.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -71756,14 +56988,14 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-ibilinear-chw_arch=armv8.2-a+fp16_standalone") {
++  source_set("f16-f32acc-rsum_arch=armv8.2-a+fp16_standalone") {
 +    cflags = [
 +      "-march=armv8.2-a+fp16"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-ibilinear-chw/gen/f16-ibilinear-chw-neonfp16arith-p8.c"
++      "src/src/f16-f32acc-rsum/gen/f16-f32acc-rsum-neonfp16arith-u32-acc4.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -71787,14 +57019,17 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f16-ibilinear_arch=armv8.2-a+fp16") {
++  source_set("f16-gemm_arch=armv8.2-a+fp16") {
 +    cflags = [
 +      "-march=armv8.2-a+fp16"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-ibilinear/gen/f16-ibilinear-neonfp16arith-u8.c"
++      "src/src/f16-gemm/gen/f16-gemm-1x16-minmax-neonfp16arith-ld64.c",
++    "src/src/f16-gemm/gen/f16-gemm-1x8-minmax-neonfp16arith-ld64.c",
++    "src/src/f16-gemm/gen/f16-gemm-6x16-minmax-neonfp16arith-ld64.c",
++    "src/src/f16-gemm/gen/f16-gemm-6x8-minmax-neonfp16arith-ld64.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -71815,14 +57050,17 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-ibilinear_arch=armv8.2-a+fp16_standalone") {
++  source_set("f16-gemm_arch=armv8.2-a+fp16_standalone") {
 +    cflags = [
 +      "-march=armv8.2-a+fp16"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-ibilinear/gen/f16-ibilinear-neonfp16arith-u8.c"
++      "src/src/f16-gemm/gen/f16-gemm-1x16-minmax-neonfp16arith-ld64.c",
++    "src/src/f16-gemm/gen/f16-gemm-1x8-minmax-neonfp16arith-ld64.c",
++    "src/src/f16-gemm/gen/f16-gemm-6x16-minmax-neonfp16arith-ld64.c",
++    "src/src/f16-gemm/gen/f16-gemm-6x8-minmax-neonfp16arith-ld64.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -71846,17 +57084,21 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f16-igemm_arch=armv8.2-a+fp16") {
++  source_set("f16-gemm_arch=armv8.2-a+fp16+dotprod") {
 +    cflags = [
-+      "-march=armv8.2-a+fp16"
++      "-march=armv8.2-a+fp16+dotprod"
 +    ]
 +  
++  asmflags = cflags
++
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-igemm/gen/f16-igemm-1x16-minmax-neonfp16arith-ld64.c",
-+    "src/src/f16-igemm/gen/f16-igemm-1x8-minmax-neonfp16arith-ld64.c",
-+    "src/src/f16-igemm/gen/f16-igemm-6x16-minmax-neonfp16arith-ld64.c",
-+    "src/src/f16-igemm/gen/f16-igemm-6x8-minmax-neonfp16arith-ld64.c"
++      "src/src/f16-gemm/gen/f16-gemm-1x16-minmax-asm-aarch64-neonfp16arith-ld64.S",
++    "src/src/f16-gemm/gen/f16-gemm-4x16-minmax-asm-aarch64-neonfp16arith-ld64.S",
++    "src/src/f16-gemm/gen/f16-gemm-6x16-minmax-asm-aarch64-neonfp16arith-cortex-a55.S",
++    "src/src/f16-gemm/gen/f16-gemm-6x16-minmax-asm-aarch64-neonfp16arith-cortex-a55r0.S",
++    "src/src/f16-gemm/gen/f16-gemm-6x16-minmax-asm-aarch64-neonfp16arith-cortex-a75.S",
++    "src/src/f16-gemm/gen/f16-gemm-6x16-minmax-asm-aarch64-neonfp16arith-ld64.S"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -71877,17 +57119,21 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-igemm_arch=armv8.2-a+fp16_standalone") {
++  source_set("f16-gemm_arch=armv8.2-a+fp16+dotprod_standalone") {
 +    cflags = [
-+      "-march=armv8.2-a+fp16"
++      "-march=armv8.2-a+fp16+dotprod"
 +    ]
 +  
++  asmflags = cflags
++
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-igemm/gen/f16-igemm-1x16-minmax-neonfp16arith-ld64.c",
-+    "src/src/f16-igemm/gen/f16-igemm-1x8-minmax-neonfp16arith-ld64.c",
-+    "src/src/f16-igemm/gen/f16-igemm-6x16-minmax-neonfp16arith-ld64.c",
-+    "src/src/f16-igemm/gen/f16-igemm-6x8-minmax-neonfp16arith-ld64.c"
++      "src/src/f16-gemm/gen/f16-gemm-1x16-minmax-asm-aarch64-neonfp16arith-ld64.S",
++    "src/src/f16-gemm/gen/f16-gemm-4x16-minmax-asm-aarch64-neonfp16arith-ld64.S",
++    "src/src/f16-gemm/gen/f16-gemm-6x16-minmax-asm-aarch64-neonfp16arith-cortex-a55.S",
++    "src/src/f16-gemm/gen/f16-gemm-6x16-minmax-asm-aarch64-neonfp16arith-cortex-a55r0.S",
++    "src/src/f16-gemm/gen/f16-gemm-6x16-minmax-asm-aarch64-neonfp16arith-cortex-a75.S",
++    "src/src/f16-gemm/gen/f16-gemm-6x16-minmax-asm-aarch64-neonfp16arith-ld64.S"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -71911,21 +57157,14 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f16-igemm_arch=armv8.2-a+fp16+dotprod") {
++  source_set("f16-ibilinear-chw_arch=armv8.2-a+fp16") {
 +    cflags = [
-+      "-march=armv8.2-a+fp16+dotprod"
++      "-march=armv8.2-a+fp16"
 +    ]
 +  
-+  asmflags = cflags
-+
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-igemm/f16-igemm-1x16-minmax-asm-aarch64-neonfp16arith-ld64.S",
-+    "src/src/f16-igemm/f16-igemm-4x16-minmax-asm-aarch64-neonfp16arith-ld64.S",
-+    "src/src/f16-igemm/f16-igemm-6x16-minmax-asm-aarch64-neonfp16arith-cortex-a55.S",
-+    "src/src/f16-igemm/f16-igemm-6x16-minmax-asm-aarch64-neonfp16arith-cortex-a55r0.S",
-+    "src/src/f16-igemm/f16-igemm-6x16-minmax-asm-aarch64-neonfp16arith-cortex-a75.S",
-+    "src/src/f16-igemm/f16-igemm-6x16-minmax-asm-aarch64-neonfp16arith-ld64.S"
++      "src/src/f16-ibilinear-chw/gen/f16-ibilinear-chw-neonfp16arith-p8.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -71946,21 +57185,14 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-igemm_arch=armv8.2-a+fp16+dotprod_standalone") {
++  source_set("f16-ibilinear-chw_arch=armv8.2-a+fp16_standalone") {
 +    cflags = [
-+      "-march=armv8.2-a+fp16+dotprod"
++      "-march=armv8.2-a+fp16"
 +    ]
 +  
-+  asmflags = cflags
-+
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-igemm/f16-igemm-1x16-minmax-asm-aarch64-neonfp16arith-ld64.S",
-+    "src/src/f16-igemm/f16-igemm-4x16-minmax-asm-aarch64-neonfp16arith-ld64.S",
-+    "src/src/f16-igemm/f16-igemm-6x16-minmax-asm-aarch64-neonfp16arith-cortex-a55.S",
-+    "src/src/f16-igemm/f16-igemm-6x16-minmax-asm-aarch64-neonfp16arith-cortex-a55r0.S",
-+    "src/src/f16-igemm/f16-igemm-6x16-minmax-asm-aarch64-neonfp16arith-cortex-a75.S",
-+    "src/src/f16-igemm/f16-igemm-6x16-minmax-asm-aarch64-neonfp16arith-ld64.S"
++      "src/src/f16-ibilinear-chw/gen/f16-ibilinear-chw-neonfp16arith-p8.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -71984,14 +57216,14 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f16-maxpool_arch=armv8.2-a+fp16") {
++  source_set("f16-ibilinear_arch=armv8.2-a+fp16") {
 +    cflags = [
 +      "-march=armv8.2-a+fp16"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-maxpool/gen/f16-maxpool-9p-minmax-neonfp16arith-u8.c"
++      "src/src/f16-ibilinear/gen/f16-ibilinear-neonfp16arith-u8.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -72012,14 +57244,14 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-maxpool_arch=armv8.2-a+fp16_standalone") {
++  source_set("f16-ibilinear_arch=armv8.2-a+fp16_standalone") {
 +    cflags = [
 +      "-march=armv8.2-a+fp16"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-maxpool/gen/f16-maxpool-9p-minmax-neonfp16arith-u8.c"
++      "src/src/f16-ibilinear/gen/f16-ibilinear-neonfp16arith-u8.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -72043,14 +57275,17 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f16-qs8-vcvt_arch=armv8.2-a+fp16") {
++  source_set("f16-igemm_arch=armv8.2-a+fp16") {
 +    cflags = [
 +      "-march=armv8.2-a+fp16"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-qs8-vcvt/gen/f16-qs8-vcvt-neonfp16arith-u32.c"
++      "src/src/f16-igemm/gen/f16-igemm-1x16-minmax-neonfp16arith-ld64.c",
++    "src/src/f16-igemm/gen/f16-igemm-1x8-minmax-neonfp16arith-ld64.c",
++    "src/src/f16-igemm/gen/f16-igemm-6x16-minmax-neonfp16arith-ld64.c",
++    "src/src/f16-igemm/gen/f16-igemm-6x8-minmax-neonfp16arith-ld64.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -72071,14 +57306,17 @@ Index: chromium-153.0.8010.36/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_arch=armv8.2-a+fp16_standalone") {
++  source_set("f16-igemm_arch=armv8.2-a+fp16_standalone") {
 +    cflags = [
 +      "-march=armv8.2-a+fp16"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-qs8-vcvt/gen/f16-qs8-vcvt-neonfp16arith-u32.c"
++      "src/src/f16-igemm/gen/f16-igemm-1x16-minmax-neonfp16arith-ld64.c",
++    "src/src/f16-igemm/gen/f16-igemm-1x8-minmax-neonfp16arith-ld64.c",
++    "src/src/f16-igemm/gen/f16-igemm-6x16-minmax-neonfp16arith-ld64.c",
++    "src/src/f16-igemm/gen/f16-igemm-6x8-minmax-neonfp16arith-ld64.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -72102,14 +57340,21 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f16-qs8-vcvt_arm64") {
++  source_set("f16-igemm_arch=armv8.2-a+fp16+dotprod") {
 +    cflags = [
-+  
++      "-march=armv8.2-a+fp16+dotprod"
 +    ]
 +  
++  asmflags = cflags
++
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-qs8-vcvt/gen/f16-qs8-vcvt-scalar-imagic-u4.c"
++      "src/src/f16-igemm/f16-igemm-1x16-minmax-asm-aarch64-neonfp16arith-ld64.S",
++    "src/src/f16-igemm/f16-igemm-4x16-minmax-asm-aarch64-neonfp16arith-ld64.S",
++    "src/src/f16-igemm/f16-igemm-6x16-minmax-asm-aarch64-neonfp16arith-cortex-a55.S",
++    "src/src/f16-igemm/f16-igemm-6x16-minmax-asm-aarch64-neonfp16arith-cortex-a55r0.S",
++    "src/src/f16-igemm/f16-igemm-6x16-minmax-asm-aarch64-neonfp16arith-cortex-a75.S",
++    "src/src/f16-igemm/f16-igemm-6x16-minmax-asm-aarch64-neonfp16arith-ld64.S"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -72130,14 +57375,21 @@ Index: chromium-153.0.8010.36/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_arm64_standalone") {
++  source_set("f16-igemm_arch=armv8.2-a+fp16+dotprod_standalone") {
 +    cflags = [
-+  
++      "-march=armv8.2-a+fp16+dotprod"
 +    ]
 +  
++  asmflags = cflags
++
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-qs8-vcvt/gen/f16-qs8-vcvt-scalar-imagic-u4.c"
++      "src/src/f16-igemm/f16-igemm-1x16-minmax-asm-aarch64-neonfp16arith-ld64.S",
++    "src/src/f16-igemm/f16-igemm-4x16-minmax-asm-aarch64-neonfp16arith-ld64.S",
++    "src/src/f16-igemm/f16-igemm-6x16-minmax-asm-aarch64-neonfp16arith-cortex-a55.S",
++    "src/src/f16-igemm/f16-igemm-6x16-minmax-asm-aarch64-neonfp16arith-cortex-a55r0.S",
++    "src/src/f16-igemm/f16-igemm-6x16-minmax-asm-aarch64-neonfp16arith-cortex-a75.S",
++    "src/src/f16-igemm/f16-igemm-6x16-minmax-asm-aarch64-neonfp16arith-ld64.S"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -72161,14 +57413,14 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f16-qu8-vcvt_arm64") {
++  source_set("f16-maxpool_arch=armv8.2-a+fp16") {
 +    cflags = [
-+  
++      "-march=armv8.2-a+fp16"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-qu8-vcvt/gen/f16-qu8-vcvt-scalar-imagic-u4.c"
++      "src/src/f16-maxpool/gen/f16-maxpool-9p-minmax-neonfp16arith-u8.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -72189,14 +57441,14 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-qu8-vcvt_arm64_standalone") {
++  source_set("f16-maxpool_arch=armv8.2-a+fp16_standalone") {
 +    cflags = [
-+  
++      "-march=armv8.2-a+fp16"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-qu8-vcvt/gen/f16-qu8-vcvt-scalar-imagic-u4.c"
++      "src/src/f16-maxpool/gen/f16-maxpool-9p-minmax-neonfp16arith-u8.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -72220,74 +57472,14 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f16-raddstoreexpminusmax_arch=armv8.2-a+fp16") {
-+    cflags = [
-+      "-march=armv8.2-a+fp16"
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/f16-raddstoreexpminusmax/gen/f16-raddstoreexpminusmax-neonfp16arith-rr2-p2-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",
-+    ]
-+
-+    public_configs = [ ":xnnpack_public_config" ]
-+  }
-+}
-+
-+# This is a target that cannot depend on //base.
-+if (build_with_internal_optimization_guide) {
-+  source_set("f16-raddstoreexpminusmax_arch=armv8.2-a+fp16_standalone") {
-+    cflags = [
-+      "-march=armv8.2-a+fp16"
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/f16-raddstoreexpminusmax/gen/f16-raddstoreexpminusmax-neonfp16arith-rr2-p2-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",
-+    ]
-+
-+    public_configs = [ ":xnnpack_public_config" ]
-+
-+    if (!(is_android && use_order_profiling)) {
-+      assert_no_deps = [ "//base" ]
-+    }
-+  }
-+}
-+
-+if (build_with_chromium) {
-+  source_set("f16-rdminmax_arch=armv8.2-a+fp16") {
++  source_set("f16-qs8-vcvt_arch=armv8.2-a+fp16") {
 +    cflags = [
 +      "-march=armv8.2-a+fp16"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-rdminmax/gen/f16-rdmax-2p2x-neonfp16arith-u32.c",
-+    "src/src/f16-rdminmax/gen/f16-rdmin-2p2x-neonfp16arith-u32.c"
++      "src/src/f16-qs8-vcvt/gen/f16-qs8-vcvt-neonfp16arith-u32.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -72308,15 +57500,14 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-rdminmax_arch=armv8.2-a+fp16_standalone") {
++  source_set("f16-qs8-vcvt_arch=armv8.2-a+fp16_standalone") {
 +    cflags = [
 +      "-march=armv8.2-a+fp16"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-rdminmax/gen/f16-rdmax-2p2x-neonfp16arith-u32.c",
-+    "src/src/f16-rdminmax/gen/f16-rdmin-2p2x-neonfp16arith-u32.c"
++      "src/src/f16-qs8-vcvt/gen/f16-qs8-vcvt-neonfp16arith-u32.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -72340,15 +57531,14 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f16-rdminmax_arm64") {
++  source_set("f16-qs8-vcvt_arm64") {
 +    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"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -72369,78 +57559,14 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-rdminmax_arm64_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"
-+    ]
-+
-+    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("f16-rminmax_arch=armv8.2-a+fp16") {
++  source_set("f16-qs8-vcvt_arm64_standalone") {
 +    cflags = [
-+      "-march=armv8.2-a+fp16"
-+    ]
 +  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/f16-rminmax/gen/f16-rmax-neonfp16arith-u32-acc4.c",
-+    "src/src/f16-rminmax/gen/f16-rmin-neonfp16arith-u32-acc4.c",
-+    "src/src/f16-rminmax/gen/f16-rminmax-neonfp16arith-u32-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",
-+    ]
-+
-+    public_configs = [ ":xnnpack_public_config" ]
-+  }
-+}
-+
-+# This is a target that cannot depend on //base.
-+if (build_with_internal_optimization_guide) {
-+  source_set("f16-rminmax_arch=armv8.2-a+fp16_standalone") {
-+    cflags = [
-+      "-march=armv8.2-a+fp16"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-rminmax/gen/f16-rmax-neonfp16arith-u32-acc4.c",
-+    "src/src/f16-rminmax/gen/f16-rmin-neonfp16arith-u32-acc4.c",
-+    "src/src/f16-rminmax/gen/f16-rminmax-neonfp16arith-u32-acc4.c"
++      "src/src/f16-qs8-vcvt/gen/f16-qs8-vcvt-scalar-imagic-u4.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -72464,16 +57590,14 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f16-rminmax_arm64") {
++  source_set("f16-qu8-vcvt_arm64") {
 +    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"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -72494,16 +57618,14 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-rminmax_arm64_standalone") {
++  source_set("f16-qu8-vcvt_arm64_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"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -72527,14 +57649,14 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f16-spmm_arch=armv8.2-a+fp16") {
++  source_set("f16-raddstoreexpminusmax_arch=armv8.2-a+fp16") {
 +    cflags = [
 +      "-march=armv8.2-a+fp16"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-spmm/gen/f16-spmm-32x1-minmax-neonfp16arith-pipelined.c"
++      "src/src/f16-raddstoreexpminusmax/gen/f16-raddstoreexpminusmax-neonfp16arith-rr2-p2-u32.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -72555,14 +57677,14 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-spmm_arch=armv8.2-a+fp16_standalone") {
++  source_set("f16-raddstoreexpminusmax_arch=armv8.2-a+fp16_standalone") {
 +    cflags = [
 +      "-march=armv8.2-a+fp16"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-spmm/gen/f16-spmm-32x1-minmax-neonfp16arith-pipelined.c"
++      "src/src/f16-raddstoreexpminusmax/gen/f16-raddstoreexpminusmax-neonfp16arith-rr2-p2-u32.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -72586,14 +57708,15 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f16-vapproxgelu_arch=armv8.2-a+fp16") {
++  source_set("f16-rdminmax_arch=armv8.2-a+fp16") {
 +    cflags = [
 +      "-march=armv8.2-a+fp16"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vapproxgelu/gen/f16-vapproxgelu-neonfp16arith-rational-6-4-div.c"
++      "src/src/f16-rdminmax/gen/f16-rdmax-2p2x-neonfp16arith-u32.c",
++    "src/src/f16-rdminmax/gen/f16-rdmin-2p2x-neonfp16arith-u32.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -72614,14 +57737,15 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-vapproxgelu_arch=armv8.2-a+fp16_standalone") {
++  source_set("f16-rdminmax_arch=armv8.2-a+fp16_standalone") {
 +    cflags = [
 +      "-march=armv8.2-a+fp16"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vapproxgelu/gen/f16-vapproxgelu-neonfp16arith-rational-6-4-div.c"
++      "src/src/f16-rdminmax/gen/f16-rdmax-2p2x-neonfp16arith-u32.c",
++    "src/src/f16-rdminmax/gen/f16-rdmin-2p2x-neonfp16arith-u32.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -72645,15 +57769,15 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f16-vapproxgelu_arm64") {
++  source_set("f16-rdminmax_arm64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vapproxgelu/gen/f16-f32acc-vapproxgelu-neonfp16-rational-6-4-div.c",
-+    "src/src/f16-vapproxgelu/gen/f16-f32acc-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"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -72674,15 +57798,15 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-vapproxgelu_arm64_standalone") {
++  source_set("f16-rdminmax_arm64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vapproxgelu/gen/f16-f32acc-vapproxgelu-neonfp16-rational-6-4-div.c",
-+    "src/src/f16-vapproxgelu/gen/f16-f32acc-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"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -72706,35 +57830,16 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f16-vbinary_arch=armv8.2-a+fp16") {
++  source_set("f16-rminmax_arch=armv8.2-a+fp16") {
 +    cflags = [
 +      "-march=armv8.2-a+fp16"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vbinary/gen/f16-vadd-neonfp16arith-u16.c",
-+    "src/src/f16-vbinary/gen/f16-vaddc-neonfp16arith-u16.c",
-+    "src/src/f16-vbinary/gen/f16-vdiv-aarch64-neonfp16arith-u8.c",
-+    "src/src/f16-vbinary/gen/f16-vdiv-fp16arith-u2.c",
-+    "src/src/f16-vbinary/gen/f16-vdivc-aarch64-neonfp16arith-u8.c",
-+    "src/src/f16-vbinary/gen/f16-vdivc-fp16arith-u2.c",
-+    "src/src/f16-vbinary/gen/f16-vmax-neonfp16arith-u16.c",
-+    "src/src/f16-vbinary/gen/f16-vmaxc-neonfp16arith-u16.c",
-+    "src/src/f16-vbinary/gen/f16-vmin-neonfp16arith-u16.c",
-+    "src/src/f16-vbinary/gen/f16-vminc-neonfp16arith-u16.c",
-+    "src/src/f16-vbinary/gen/f16-vmul-neonfp16arith-u16.c",
-+    "src/src/f16-vbinary/gen/f16-vmulc-neonfp16arith-u16.c",
-+    "src/src/f16-vbinary/gen/f16-vprelu-neonfp16arith-u16.c",
-+    "src/src/f16-vbinary/gen/f16-vpreluc-neonfp16arith-u16.c",
-+    "src/src/f16-vbinary/gen/f16-vrdivc-aarch64-neonfp16arith-u8.c",
-+    "src/src/f16-vbinary/gen/f16-vrdivc-fp16arith-u2.c",
-+    "src/src/f16-vbinary/gen/f16-vrpreluc-neonfp16arith-u16.c",
-+    "src/src/f16-vbinary/gen/f16-vrsubc-neonfp16arith-u16.c",
-+    "src/src/f16-vbinary/gen/f16-vsqrdiff-neonfp16arith-u16.c",
-+    "src/src/f16-vbinary/gen/f16-vsqrdiffc-neonfp16arith-u16.c",
-+    "src/src/f16-vbinary/gen/f16-vsub-neonfp16arith-u16.c",
-+    "src/src/f16-vbinary/gen/f16-vsubc-neonfp16arith-u16.c"
++      "src/src/f16-rminmax/gen/f16-rmax-neonfp16arith-u32-acc4.c",
++    "src/src/f16-rminmax/gen/f16-rmin-neonfp16arith-u32-acc4.c",
++    "src/src/f16-rminmax/gen/f16-rminmax-neonfp16arith-u32-acc4.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -72755,35 +57860,16 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-vbinary_arch=armv8.2-a+fp16_standalone") {
++  source_set("f16-rminmax_arch=armv8.2-a+fp16_standalone") {
 +    cflags = [
 +      "-march=armv8.2-a+fp16"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vbinary/gen/f16-vadd-neonfp16arith-u16.c",
-+    "src/src/f16-vbinary/gen/f16-vaddc-neonfp16arith-u16.c",
-+    "src/src/f16-vbinary/gen/f16-vdiv-aarch64-neonfp16arith-u8.c",
-+    "src/src/f16-vbinary/gen/f16-vdiv-fp16arith-u2.c",
-+    "src/src/f16-vbinary/gen/f16-vdivc-aarch64-neonfp16arith-u8.c",
-+    "src/src/f16-vbinary/gen/f16-vdivc-fp16arith-u2.c",
-+    "src/src/f16-vbinary/gen/f16-vmax-neonfp16arith-u16.c",
-+    "src/src/f16-vbinary/gen/f16-vmaxc-neonfp16arith-u16.c",
-+    "src/src/f16-vbinary/gen/f16-vmin-neonfp16arith-u16.c",
-+    "src/src/f16-vbinary/gen/f16-vminc-neonfp16arith-u16.c",
-+    "src/src/f16-vbinary/gen/f16-vmul-neonfp16arith-u16.c",
-+    "src/src/f16-vbinary/gen/f16-vmulc-neonfp16arith-u16.c",
-+    "src/src/f16-vbinary/gen/f16-vprelu-neonfp16arith-u16.c",
-+    "src/src/f16-vbinary/gen/f16-vpreluc-neonfp16arith-u16.c",
-+    "src/src/f16-vbinary/gen/f16-vrdivc-aarch64-neonfp16arith-u8.c",
-+    "src/src/f16-vbinary/gen/f16-vrdivc-fp16arith-u2.c",
-+    "src/src/f16-vbinary/gen/f16-vrpreluc-neonfp16arith-u16.c",
-+    "src/src/f16-vbinary/gen/f16-vrsubc-neonfp16arith-u16.c",
-+    "src/src/f16-vbinary/gen/f16-vsqrdiff-neonfp16arith-u16.c",
-+    "src/src/f16-vbinary/gen/f16-vsqrdiffc-neonfp16arith-u16.c",
-+    "src/src/f16-vbinary/gen/f16-vsub-neonfp16arith-u16.c",
-+    "src/src/f16-vbinary/gen/f16-vsubc-neonfp16arith-u16.c"
++      "src/src/f16-rminmax/gen/f16-rmax-neonfp16arith-u32-acc4.c",
++    "src/src/f16-rminmax/gen/f16-rmin-neonfp16arith-u32-acc4.c",
++    "src/src/f16-rminmax/gen/f16-rminmax-neonfp16arith-u32-acc4.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -72807,14 +57893,16 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f16-vclamp_arch=armv8.2-a+fp16") {
++  source_set("f16-rminmax_arm64") {
 +    cflags = [
-+      "-march=armv8.2-a+fp16"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vclamp/gen/f16-vclamp-neonfp16arith-u16.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"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -72835,14 +57923,16 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-vclamp_arch=armv8.2-a+fp16_standalone") {
++  source_set("f16-rminmax_arm64_standalone") {
 +    cflags = [
-+      "-march=armv8.2-a+fp16"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vclamp/gen/f16-vclamp-neonfp16arith-u16.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"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -72866,14 +57956,14 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f16-vcmul_arch=armv8.2-a+fp16") {
++  source_set("f16-spmm_arch=armv8.2-a+fp16") {
 +    cflags = [
 +      "-march=armv8.2-a+fp16"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vcmul/gen/f16-vcmul-neonfp16arith-u16.c"
++      "src/src/f16-spmm/gen/f16-spmm-32x1-minmax-neonfp16arith-pipelined.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -72894,14 +57984,14 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-vcmul_arch=armv8.2-a+fp16_standalone") {
++  source_set("f16-spmm_arch=armv8.2-a+fp16_standalone") {
 +    cflags = [
 +      "-march=armv8.2-a+fp16"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vcmul/gen/f16-vcmul-neonfp16arith-u16.c"
++      "src/src/f16-spmm/gen/f16-spmm-32x1-minmax-neonfp16arith-pipelined.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -72925,14 +58015,14 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f16-vcos_arch=armv8.2-a+fp16") {
++  source_set("f16-vapproxgelu_arch=armv8.2-a+fp16") {
 +    cflags = [
 +      "-march=armv8.2-a+fp16"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vcos/gen/f16-vcos-neonfp16arith-poly-3.c"
++      "src/src/f16-vapproxgelu/gen/f16-vapproxgelu-neonfp16arith-rational-6-4-div.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -72953,14 +58043,14 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-vcos_arch=armv8.2-a+fp16_standalone") {
++  source_set("f16-vapproxgelu_arch=armv8.2-a+fp16_standalone") {
 +    cflags = [
 +      "-march=armv8.2-a+fp16"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vcos/gen/f16-vcos-neonfp16arith-poly-3.c"
++      "src/src/f16-vapproxgelu/gen/f16-vapproxgelu-neonfp16arith-rational-6-4-div.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -72984,15 +58074,15 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f16-vcos_arm64") {
++  source_set("f16-vapproxgelu_arm64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vcos/gen/f16-f32acc-vcos-neonfp16-poly-3.c",
-+    "src/src/f16-vcos/gen/f16-f32acc-vcos-scalar-poly-3.c"
++      "src/src/f16-vapproxgelu/gen/f16-f32acc-vapproxgelu-neonfp16-rational-6-4-div.c",
++    "src/src/f16-vapproxgelu/gen/f16-f32acc-vapproxgelu-scalar-rational-6-4-div.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -73013,15 +58103,15 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-vcos_arm64_standalone") {
++  source_set("f16-vapproxgelu_arm64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vcos/gen/f16-f32acc-vcos-neonfp16-poly-3.c",
-+    "src/src/f16-vcos/gen/f16-f32acc-vcos-scalar-poly-3.c"
++      "src/src/f16-vapproxgelu/gen/f16-f32acc-vapproxgelu-neonfp16-rational-6-4-div.c",
++    "src/src/f16-vapproxgelu/gen/f16-f32acc-vapproxgelu-scalar-rational-6-4-div.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -73045,14 +58135,35 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f16-velu_arch=armv8.2-a+fp16") {
++  source_set("f16-vbinary_arch=armv8.2-a+fp16") {
 +    cflags = [
 +      "-march=armv8.2-a+fp16"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-velu/gen/f16-velu-neonfp16arith-rr1-p3-u16.c"
++      "src/src/f16-vbinary/gen/f16-vadd-neonfp16arith-u16.c",
++    "src/src/f16-vbinary/gen/f16-vaddc-neonfp16arith-u16.c",
++    "src/src/f16-vbinary/gen/f16-vdiv-aarch64-neonfp16arith-u8.c",
++    "src/src/f16-vbinary/gen/f16-vdiv-fp16arith-u2.c",
++    "src/src/f16-vbinary/gen/f16-vdivc-aarch64-neonfp16arith-u8.c",
++    "src/src/f16-vbinary/gen/f16-vdivc-fp16arith-u2.c",
++    "src/src/f16-vbinary/gen/f16-vmax-neonfp16arith-u16.c",
++    "src/src/f16-vbinary/gen/f16-vmaxc-neonfp16arith-u16.c",
++    "src/src/f16-vbinary/gen/f16-vmin-neonfp16arith-u16.c",
++    "src/src/f16-vbinary/gen/f16-vminc-neonfp16arith-u16.c",
++    "src/src/f16-vbinary/gen/f16-vmul-neonfp16arith-u16.c",
++    "src/src/f16-vbinary/gen/f16-vmulc-neonfp16arith-u16.c",
++    "src/src/f16-vbinary/gen/f16-vprelu-neonfp16arith-u16.c",
++    "src/src/f16-vbinary/gen/f16-vpreluc-neonfp16arith-u16.c",
++    "src/src/f16-vbinary/gen/f16-vrdivc-aarch64-neonfp16arith-u8.c",
++    "src/src/f16-vbinary/gen/f16-vrdivc-fp16arith-u2.c",
++    "src/src/f16-vbinary/gen/f16-vrpreluc-neonfp16arith-u16.c",
++    "src/src/f16-vbinary/gen/f16-vrsubc-neonfp16arith-u16.c",
++    "src/src/f16-vbinary/gen/f16-vsqrdiff-neonfp16arith-u16.c",
++    "src/src/f16-vbinary/gen/f16-vsqrdiffc-neonfp16arith-u16.c",
++    "src/src/f16-vbinary/gen/f16-vsub-neonfp16arith-u16.c",
++    "src/src/f16-vbinary/gen/f16-vsubc-neonfp16arith-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -73073,14 +58184,35 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-velu_arch=armv8.2-a+fp16_standalone") {
++  source_set("f16-vbinary_arch=armv8.2-a+fp16_standalone") {
 +    cflags = [
 +      "-march=armv8.2-a+fp16"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-velu/gen/f16-velu-neonfp16arith-rr1-p3-u16.c"
++      "src/src/f16-vbinary/gen/f16-vadd-neonfp16arith-u16.c",
++    "src/src/f16-vbinary/gen/f16-vaddc-neonfp16arith-u16.c",
++    "src/src/f16-vbinary/gen/f16-vdiv-aarch64-neonfp16arith-u8.c",
++    "src/src/f16-vbinary/gen/f16-vdiv-fp16arith-u2.c",
++    "src/src/f16-vbinary/gen/f16-vdivc-aarch64-neonfp16arith-u8.c",
++    "src/src/f16-vbinary/gen/f16-vdivc-fp16arith-u2.c",
++    "src/src/f16-vbinary/gen/f16-vmax-neonfp16arith-u16.c",
++    "src/src/f16-vbinary/gen/f16-vmaxc-neonfp16arith-u16.c",
++    "src/src/f16-vbinary/gen/f16-vmin-neonfp16arith-u16.c",
++    "src/src/f16-vbinary/gen/f16-vminc-neonfp16arith-u16.c",
++    "src/src/f16-vbinary/gen/f16-vmul-neonfp16arith-u16.c",
++    "src/src/f16-vbinary/gen/f16-vmulc-neonfp16arith-u16.c",
++    "src/src/f16-vbinary/gen/f16-vprelu-neonfp16arith-u16.c",
++    "src/src/f16-vbinary/gen/f16-vpreluc-neonfp16arith-u16.c",
++    "src/src/f16-vbinary/gen/f16-vrdivc-aarch64-neonfp16arith-u8.c",
++    "src/src/f16-vbinary/gen/f16-vrdivc-fp16arith-u2.c",
++    "src/src/f16-vbinary/gen/f16-vrpreluc-neonfp16arith-u16.c",
++    "src/src/f16-vbinary/gen/f16-vrsubc-neonfp16arith-u16.c",
++    "src/src/f16-vbinary/gen/f16-vsqrdiff-neonfp16arith-u16.c",
++    "src/src/f16-vbinary/gen/f16-vsqrdiffc-neonfp16arith-u16.c",
++    "src/src/f16-vbinary/gen/f16-vsub-neonfp16arith-u16.c",
++    "src/src/f16-vbinary/gen/f16-vsubc-neonfp16arith-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -73104,14 +58236,14 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f16-vexp_arch=armv8.2-a+fp16") {
++  source_set("f16-vclamp_arch=armv8.2-a+fp16") {
 +    cflags = [
 +      "-march=armv8.2-a+fp16"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vexp/gen/f16-vexp-neonfp16arith-poly-3.c"
++      "src/src/f16-vclamp/gen/f16-vclamp-neonfp16arith-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -73132,14 +58264,14 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-vexp_arch=armv8.2-a+fp16_standalone") {
++  source_set("f16-vclamp_arch=armv8.2-a+fp16_standalone") {
 +    cflags = [
 +      "-march=armv8.2-a+fp16"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vexp/gen/f16-vexp-neonfp16arith-poly-3.c"
++      "src/src/f16-vclamp/gen/f16-vclamp-neonfp16arith-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -73163,15 +58295,14 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f16-vexp_arm64") {
++  source_set("f16-vcmul_arch=armv8.2-a+fp16") {
 +    cflags = [
-+  
++      "-march=armv8.2-a+fp16"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vexp/gen/f16-f32acc-vexp-neonfp16-poly-3.c",
-+    "src/src/f16-vexp/gen/f16-f32acc-vexp-scalar-poly-3.c"
++      "src/src/f16-vcmul/gen/f16-vcmul-neonfp16arith-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -73192,15 +58323,14 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-vexp_arm64_standalone") {
++  source_set("f16-vcmul_arch=armv8.2-a+fp16_standalone") {
 +    cflags = [
-+  
++      "-march=armv8.2-a+fp16"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vexp/gen/f16-f32acc-vexp-neonfp16-poly-3.c",
-+    "src/src/f16-vexp/gen/f16-f32acc-vexp-scalar-poly-3.c"
++      "src/src/f16-vcmul/gen/f16-vcmul-neonfp16arith-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -73224,14 +58354,14 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f16-vgelu_arch=armv8.2-a+fp16") {
++  source_set("f16-vcos_arch=armv8.2-a+fp16") {
 +    cflags = [
 +      "-march=armv8.2-a+fp16"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vgelu/gen/f16-vgelu-neonfp16arith-rational-6-4-div.c"
++      "src/src/f16-vcos/gen/f16-vcos-neonfp16arith-poly-3.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -73252,14 +58382,14 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-vgelu_arch=armv8.2-a+fp16_standalone") {
++  source_set("f16-vcos_arch=armv8.2-a+fp16_standalone") {
 +    cflags = [
 +      "-march=armv8.2-a+fp16"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vgelu/gen/f16-vgelu-neonfp16arith-rational-6-4-div.c"
++      "src/src/f16-vcos/gen/f16-vcos-neonfp16arith-poly-3.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -73283,14 +58413,15 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f16-vgelu_arm64") {
++  source_set("f16-vcos_arm64") {
 +    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-f32acc-vcos-neonfp16-poly-3.c",
++    "src/src/f16-vcos/gen/f16-f32acc-vcos-scalar-poly-3.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -73311,14 +58442,15 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-vgelu_arm64_standalone") {
++  source_set("f16-vcos_arm64_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-f32acc-vcos-neonfp16-poly-3.c",
++    "src/src/f16-vcos/gen/f16-f32acc-vcos-scalar-poly-3.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -73342,14 +58474,14 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f16-vhswish_arch=armv8.2-a+fp16") {
++  source_set("f16-velu_arch=armv8.2-a+fp16") {
 +    cflags = [
 +      "-march=armv8.2-a+fp16"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vhswish/gen/f16-vhswish-neonfp16arith-u16.c"
++      "src/src/f16-velu/gen/f16-velu-neonfp16arith-rr1-p3-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -73370,14 +58502,14 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-vhswish_arch=armv8.2-a+fp16_standalone") {
++  source_set("f16-velu_arch=armv8.2-a+fp16_standalone") {
 +    cflags = [
 +      "-march=armv8.2-a+fp16"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vhswish/gen/f16-vhswish-neonfp16arith-u16.c"
++      "src/src/f16-velu/gen/f16-velu-neonfp16arith-rr1-p3-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -73401,14 +58533,14 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f16-vlog_arch=armv8.2-a+fp16") {
++  source_set("f16-vexp_arch=armv8.2-a+fp16") {
 +    cflags = [
 +      "-march=armv8.2-a+fp16"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vlog/gen/f16-vlog-neonfp16arith-rational-1-3-div.c"
++      "src/src/f16-vexp/gen/f16-vexp-neonfp16arith-poly-3.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -73429,14 +58561,14 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-vlog_arch=armv8.2-a+fp16_standalone") {
++  source_set("f16-vexp_arch=armv8.2-a+fp16_standalone") {
 +    cflags = [
 +      "-march=armv8.2-a+fp16"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vlog/gen/f16-vlog-neonfp16arith-rational-1-3-div.c"
++      "src/src/f16-vexp/gen/f16-vexp-neonfp16arith-poly-3.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -73460,15 +58592,15 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f16-vlog_arm64") {
++  source_set("f16-vexp_arm64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vlog/gen/f16-f32acc-vlog-neonfp16-rational-1-3-div.c",
-+    "src/src/f16-vlog/gen/f16-f32acc-vlog-scalar-rational-1-3-div.c"
++      "src/src/f16-vexp/gen/f16-f32acc-vexp-neonfp16-poly-3.c",
++    "src/src/f16-vexp/gen/f16-f32acc-vexp-scalar-poly-3.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -73489,15 +58621,15 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-vlog_arm64_standalone") {
++  source_set("f16-vexp_arm64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vlog/gen/f16-f32acc-vlog-neonfp16-rational-1-3-div.c",
-+    "src/src/f16-vlog/gen/f16-f32acc-vlog-scalar-rational-1-3-div.c"
++      "src/src/f16-vexp/gen/f16-f32acc-vexp-neonfp16-poly-3.c",
++    "src/src/f16-vexp/gen/f16-f32acc-vexp-scalar-poly-3.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -73521,14 +58653,14 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f16-vlrelu_arch=armv8.2-a+fp16") {
++  source_set("f16-vgelu_arch=armv8.2-a+fp16") {
 +    cflags = [
 +      "-march=armv8.2-a+fp16"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vlrelu/gen/f16-vlrelu-neonfp16arith-u16.c"
++      "src/src/f16-vgelu/gen/f16-vgelu-neonfp16arith-rational-6-4-div.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -73549,14 +58681,14 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-vlrelu_arch=armv8.2-a+fp16_standalone") {
++  source_set("f16-vgelu_arch=armv8.2-a+fp16_standalone") {
 +    cflags = [
 +      "-march=armv8.2-a+fp16"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vlrelu/gen/f16-vlrelu-neonfp16arith-u16.c"
++      "src/src/f16-vgelu/gen/f16-vgelu-neonfp16arith-rational-6-4-div.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -73580,14 +58712,14 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f16-vmulcaddc_arch=armv8.2-a+fp16") {
++  source_set("f16-vgelu_arm64") {
 +    cflags = [
-+      "-march=armv8.2-a+fp16"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vmulcaddc/gen/f16-vmulcaddc-c8-minmax-neonfp16arith-2x.c"
++      "src/src/f16-vgelu/gen/f16-vgelu-scalar-rational-6-4-div.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -73608,14 +58740,14 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +
 +# 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") {
++  source_set("f16-vgelu_arm64_standalone") {
 +    cflags = [
-+      "-march=armv8.2-a+fp16"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vmulcaddc/gen/f16-vmulcaddc-c8-minmax-neonfp16arith-2x.c"
++      "src/src/f16-vgelu/gen/f16-vgelu-scalar-rational-6-4-div.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -73639,17 +58771,14 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f16-vrnd_arch=armv8.2-a+fp16") {
++  source_set("f16-vhswish_arch=armv8.2-a+fp16") {
 +    cflags = [
 +      "-march=armv8.2-a+fp16"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vrnd/gen/f16-vrndd-neonfp16arith-u16.c",
-+    "src/src/f16-vrnd/gen/f16-vrndne-neonfp16arith-u16.c",
-+    "src/src/f16-vrnd/gen/f16-vrndu-neonfp16arith-u16.c",
-+    "src/src/f16-vrnd/gen/f16-vrndz-neonfp16arith-u16.c"
++      "src/src/f16-vhswish/gen/f16-vhswish-neonfp16arith-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -73670,17 +58799,14 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +
 +# 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") {
++  source_set("f16-vhswish_arch=armv8.2-a+fp16_standalone") {
 +    cflags = [
 +      "-march=armv8.2-a+fp16"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vrnd/gen/f16-vrndd-neonfp16arith-u16.c",
-+    "src/src/f16-vrnd/gen/f16-vrndne-neonfp16arith-u16.c",
-+    "src/src/f16-vrnd/gen/f16-vrndu-neonfp16arith-u16.c",
-+    "src/src/f16-vrnd/gen/f16-vrndz-neonfp16arith-u16.c"
++      "src/src/f16-vhswish/gen/f16-vhswish-neonfp16arith-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -73704,14 +58830,14 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f16-vrsqrt_arch=armv8.2-a+fp16") {
++  source_set("f16-vlog_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-vlog/gen/f16-vlog-neonfp16arith-rational-1-3-div.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -73732,14 +58858,14 @@ Index: chromium-153.0.8010.36/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-vlog_arch=armv8.2-a+fp16_standalone") {
 +    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-vlog/gen/f16-vlog-neonfp16arith-rational-1-3-div.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -73763,15 +58889,75 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f16-vsigmoid_arch=armv8.2-a+fp16") {
++  source_set("f16-vlog_arm64") {
++    cflags = [
++  
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/f16-vlog/gen/f16-f32acc-vlog-neonfp16-rational-1-3-div.c",
++    "src/src/f16-vlog/gen/f16-f32acc-vlog-scalar-rational-1-3-div.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("f16-vlog_arm64_standalone") {
++    cflags = [
++  
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/f16-vlog/gen/f16-f32acc-vlog-neonfp16-rational-1-3-div.c",
++    "src/src/f16-vlog/gen/f16-f32acc-vlog-scalar-rational-1-3-div.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("f16-vlrelu_arch=armv8.2-a+fp16") {
 +    cflags = [
 +      "-march=armv8.2-a+fp16"
 +    ]
 +  
 +    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-vlrelu/gen/f16-vlrelu-neonfp16arith-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -73792,15 +58978,14 @@ Index: chromium-153.0.8010.36/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-vlrelu_arch=armv8.2-a+fp16_standalone") {
 +    cflags = [
 +      "-march=armv8.2-a+fp16"
 +    ]
 +  
 +    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-vlrelu/gen/f16-vlrelu-neonfp16arith-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -73824,14 +59009,14 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f16-vsin_arch=armv8.2-a+fp16") {
++  source_set("f16-vmulcaddc_arch=armv8.2-a+fp16") {
 +    cflags = [
 +      "-march=armv8.2-a+fp16"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vsin/gen/f16-vsin-neonfp16arith-poly-3.c"
++      "src/src/f16-vmulcaddc/gen/f16-vmulcaddc-c8-minmax-neonfp16arith-2x.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -73852,14 +59037,14 @@ Index: chromium-153.0.8010.36/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") {
++  source_set("f16-vmulcaddc_arch=armv8.2-a+fp16_standalone") {
 +    cflags = [
 +      "-march=armv8.2-a+fp16"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vsin/gen/f16-vsin-neonfp16arith-poly-3.c"
++      "src/src/f16-vmulcaddc/gen/f16-vmulcaddc-c8-minmax-neonfp16arith-2x.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -73883,15 +59068,17 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f16-vsin_arm64") {
++  source_set("f16-vrnd_arch=armv8.2-a+fp16") {
 +    cflags = [
-+  
++      "-march=armv8.2-a+fp16"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vsin/gen/f16-f32acc-vsin-neonfp16-poly-3.c",
-+    "src/src/f16-vsin/gen/f16-f32acc-vsin-scalar-poly-3.c"
++      "src/src/f16-vrnd/gen/f16-vrndd-neonfp16arith-u16.c",
++    "src/src/f16-vrnd/gen/f16-vrndne-neonfp16arith-u16.c",
++    "src/src/f16-vrnd/gen/f16-vrndu-neonfp16arith-u16.c",
++    "src/src/f16-vrnd/gen/f16-vrndz-neonfp16arith-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -73912,15 +59099,17 @@ Index: chromium-153.0.8010.36/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") {
++  source_set("f16-vrnd_arch=armv8.2-a+fp16_standalone") {
 +    cflags = [
-+  
++      "-march=armv8.2-a+fp16"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vsin/gen/f16-f32acc-vsin-neonfp16-poly-3.c",
-+    "src/src/f16-vsin/gen/f16-f32acc-vsin-scalar-poly-3.c"
++      "src/src/f16-vrnd/gen/f16-vrndd-neonfp16arith-u16.c",
++    "src/src/f16-vrnd/gen/f16-vrndne-neonfp16arith-u16.c",
++    "src/src/f16-vrnd/gen/f16-vrndu-neonfp16arith-u16.c",
++    "src/src/f16-vrnd/gen/f16-vrndz-neonfp16arith-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -73944,15 +59133,14 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f16-vsqrt_arch=armv8.2-a+fp16") {
++  source_set("f16-vrsqrt_arch=armv8.2-a+fp16") {
 +    cflags = [
 +      "-march=armv8.2-a+fp16"
 +    ]
 +  
 +    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-vrsqrt/gen/f16-vrsqrt-neonfp16arith-rsqrt-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -73973,15 +59161,14 @@ Index: chromium-153.0.8010.36/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-vrsqrt_arch=armv8.2-a+fp16_standalone") {
 +    cflags = [
 +      "-march=armv8.2-a+fp16"
 +    ]
 +  
 +    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-vrsqrt/gen/f16-vrsqrt-neonfp16arith-rsqrt-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -74005,14 +59192,15 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f16-vsqrt_arm64") {
++  source_set("f16-vsigmoid_arch=armv8.2-a+fp16") {
 +    cflags = [
-+  
++      "-march=armv8.2-a+fp16"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vsqrt/gen/f16-vsqrt-scalar-sqrt.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" ]
@@ -74033,14 +59221,15 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-vsqrt_arm64_standalone") {
++  source_set("f16-vsigmoid_arch=armv8.2-a+fp16_standalone") {
 +    cflags = [
-+  
++      "-march=armv8.2-a+fp16"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vsqrt/gen/f16-vsqrt-scalar-sqrt.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" ]
@@ -74064,14 +59253,14 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f16-vtanh_arch=armv8.2-a+fp16") {
++  source_set("f16-vsin_arch=armv8.2-a+fp16") {
 +    cflags = [
 +      "-march=armv8.2-a+fp16"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vtanh/gen/f16-vtanh-neonfp16arith-rational-5-4-div.c"
++      "src/src/f16-vsin/gen/f16-vsin-neonfp16arith-poly-3.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -74092,14 +59281,14 @@ Index: chromium-153.0.8010.36/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-vsin_arch=armv8.2-a+fp16_standalone") {
 +    cflags = [
 +      "-march=armv8.2-a+fp16"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vtanh/gen/f16-vtanh-neonfp16arith-rational-5-4-div.c"
++      "src/src/f16-vsin/gen/f16-vsin-neonfp16arith-poly-3.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -74123,15 +59312,15 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f16-vtanh_arm64") {
++  source_set("f16-vsin_arm64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vtanh/gen/f16-f32acc-vtanh-neonfp16-rational-5-4-div.c",
-+    "src/src/f16-vtanh/gen/f16-f32acc-vtanh-scalar-rational-5-4-div.c"
++      "src/src/f16-vsin/gen/f16-f32acc-vsin-neonfp16-poly-3.c",
++    "src/src/f16-vsin/gen/f16-f32acc-vsin-scalar-poly-3.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -74152,15 +59341,15 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-vtanh_arm64_standalone") {
++  source_set("f16-vsin_arm64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vtanh/gen/f16-f32acc-vtanh-neonfp16-rational-5-4-div.c",
-+    "src/src/f16-vtanh/gen/f16-f32acc-vtanh-scalar-rational-5-4-div.c"
++      "src/src/f16-vsin/gen/f16-f32acc-vsin-neonfp16-poly-3.c",
++    "src/src/f16-vsin/gen/f16-f32acc-vsin-scalar-poly-3.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -74184,16 +59373,15 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f16-vunary_arch=armv8.2-a+fp16") {
++  source_set("f16-vsqrt_arch=armv8.2-a+fp16") {
 +    cflags = [
 +      "-march=armv8.2-a+fp16"
 +    ]
 +  
 +    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/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" ]
@@ -74214,16 +59402,15 @@ Index: chromium-153.0.8010.36/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") {
++  source_set("f16-vsqrt_arch=armv8.2-a+fp16_standalone") {
 +    cflags = [
 +      "-march=armv8.2-a+fp16"
 +    ]
 +  
 +    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/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" ]
@@ -74247,15 +59434,14 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f32-argmaxpool_arm64") {
++  source_set("f16-vsqrt_arm64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    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/f16-vsqrt/gen/f16-vsqrt-scalar-sqrt.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -74276,15 +59462,14 @@ Index: chromium-153.0.8010.36/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("f16-vsqrt_arm64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    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/f16-vsqrt/gen/f16-vsqrt-scalar-sqrt.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -74308,15 +59493,74 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f32-avgpool_arm64") {
++  source_set("f16-vtanh_arch=armv8.2-a+fp16") {
 +    cflags = [
++      "-march=armv8.2-a+fp16"
++    ]
 +  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/f16-vtanh/gen/f16-vtanh-neonfp16arith-rational-5-4-div.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("f16-vtanh_arch=armv8.2-a+fp16_standalone") {
++    cflags = [
++      "-march=armv8.2-a+fp16"
 +    ]
 +  
 +    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"
++      "src/src/f16-vtanh/gen/f16-vtanh-neonfp16arith-rational-5-4-div.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("f16-vtanh_arm64") {
++    cflags = [
++  
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/f16-vtanh/gen/f16-f32acc-vtanh-neonfp16-rational-5-4-div.c",
++    "src/src/f16-vtanh/gen/f16-f32acc-vtanh-scalar-rational-5-4-div.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -74337,15 +59581,15 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-avgpool_arm64_standalone") {
++  source_set("f16-vtanh_arm64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    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"
++      "src/src/f16-vtanh/gen/f16-f32acc-vtanh-neonfp16-rational-5-4-div.c",
++    "src/src/f16-vtanh/gen/f16-f32acc-vtanh-scalar-rational-5-4-div.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -74369,14 +59613,16 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f32-bf16-vcvt_arch=armv8.2-a+bf16") {
++  source_set("f16-vunary_arch=armv8.2-a+fp16") {
 +    cflags = [
-+      "-march=armv8.2-a+bf16"
++      "-march=armv8.2-a+fp16"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-bf16-vcvt/gen/f32-bf16-vcvt-neonbf16-u16.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" ]
@@ -74397,14 +59643,16 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-bf16-vcvt_arch=armv8.2-a+bf16_standalone") {
++  source_set("f16-vunary_arch=armv8.2-a+fp16_standalone") {
 +    cflags = [
-+      "-march=armv8.2-a+bf16"
++      "-march=armv8.2-a+fp16"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-bf16-vcvt/gen/f32-bf16-vcvt-neonbf16-u16.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" ]
@@ -74428,15 +59676,15 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f32-bf16-vcvt_arm64") {
++  source_set("f32-argmaxpool_arm64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-bf16-vcvt/gen/f32-bf16-vcvt-neon-u8.c",
-+    "src/src/f32-bf16-vcvt/gen/f32-bf16-vcvt-scalar-u2.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" ]
@@ -74457,15 +59705,15 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-bf16-vcvt_arm64_standalone") {
++  source_set("f32-argmaxpool_arm64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-bf16-vcvt/gen/f32-bf16-vcvt-neon-u8.c",
-+    "src/src/f32-bf16-vcvt/gen/f32-bf16-vcvt-scalar-u2.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" ]
@@ -74489,16 +59737,15 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f32-conv-hwc2chw_arm64") {
++  source_set("f32-avgpool_arm64") {
 +    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"
++      "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" ]
@@ -74519,16 +59766,15 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-conv-hwc2chw_arm64_standalone") {
++  source_set("f32-avgpool_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"
++      "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" ]
@@ -74552,29 +59798,14 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f32-dwconv2d-chw_arm64") {
++  source_set("f32-bf16-vcvt_arch=armv8.2-a+bf16") {
 +    cflags = [
-+  
++      "-march=armv8.2-a+bf16"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-3x3p1-minmax-aarch64-neonfma-3x4.c",
-+    "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-3x3p1-minmax-neon-2x4.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-aarch64-neonfma-2x4-acc2.c",
-+    "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-3x3s2p1-minmax-neon-1x4.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-aarch64-neonfma-4x4.c",
-+    "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-5x5p2-minmax-neon-1x4.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-aarch64-neonfma-1x4-acc2.c",
-+    "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-5x5s2p2-minmax-neon-1x4.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-bf16-vcvt/gen/f32-bf16-vcvt-neonbf16-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -74595,29 +59826,14 @@ Index: chromium-153.0.8010.36/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_arm64_standalone") {
++  source_set("f32-bf16-vcvt_arch=armv8.2-a+bf16_standalone") {
 +    cflags = [
-+  
++      "-march=armv8.2-a+bf16"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-3x3p1-minmax-aarch64-neonfma-3x4.c",
-+    "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-3x3p1-minmax-neon-2x4.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-aarch64-neonfma-2x4-acc2.c",
-+    "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-3x3s2p1-minmax-neon-1x4.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-aarch64-neonfma-4x4.c",
-+    "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-5x5p2-minmax-neon-1x4.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-aarch64-neonfma-1x4-acc2.c",
-+    "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-5x5s2p2-minmax-neon-1x4.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-bf16-vcvt/gen/f32-bf16-vcvt-neonbf16-u16.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -74641,16 +59857,15 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("f32-dwconv_arch=armv8.2-a+fp16+dotprod") {
++  source_set("f32-bf16-vcvt_arm64") {
 +    cflags = [
-+      "-march=armv8.2-a+fp16+dotprod"
++  
 +    ]
 +  
-+  asmflags = cflags
-+
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-dwconv/f32-dwconv-9p4c-minmax-asm-aarch64-neonfma-cortex-a55.S"
++      "src/src/f32-bf16-vcvt/gen/f32-bf16-vcvt-neon-u8.c",
++    "src/src/f32-bf16-vcvt/gen/f32-bf16-vcvt-scalar-u2.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -74671,16 +59886,230 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-dwconv_arch=armv8.2-a+fp16+dotprod_standalone") {
++  source_set("f32-bf16-vcvt_arm64_standalone") {
 +    cflags = [
-+      "-march=armv8.2-a+fp16+dotprod"
++  
 +    ]
 +  
-+  asmflags = cflags
-+
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-dwconv/f32-dwconv-9p4c-minmax-asm-aarch64-neonfma-cortex-a55.S"
++      "src/src/f32-bf16-vcvt/gen/f32-bf16-vcvt-neon-u8.c",
++    "src/src/f32-bf16-vcvt/gen/f32-bf16-vcvt-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" ]
++
++    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-conv-hwc2chw_arm64") {
++    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",
++    ]
++
++    public_configs = [ ":xnnpack_public_config" ]
++  }
++}
++
++# 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:pthreadpool_standalone",
++    ]
++
++    public_configs = [ ":xnnpack_public_config" ]
++
++    if (!(is_android && use_order_profiling)) {
++      assert_no_deps = [ "//base" ]
++    }
++  }
++}
++
++if (build_with_chromium) {
++  source_set("f32-dwconv2d-chw_arm64") {
++    cflags = [
++  
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-3x3p1-minmax-aarch64-neonfma-3x4.c",
++    "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-3x3p1-minmax-neon-2x4.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-aarch64-neonfma-2x4-acc2.c",
++    "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-3x3s2p1-minmax-neon-1x4.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-aarch64-neonfma-4x4.c",
++    "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-5x5p2-minmax-neon-1x4.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-aarch64-neonfma-1x4-acc2.c",
++    "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-5x5s2p2-minmax-neon-1x4.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"
++    ]
++
++    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-dwconv2d-chw_arm64_standalone") {
++    cflags = [
++  
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-3x3p1-minmax-aarch64-neonfma-3x4.c",
++    "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-3x3p1-minmax-neon-2x4.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-aarch64-neonfma-2x4-acc2.c",
++    "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-3x3s2p1-minmax-neon-1x4.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-aarch64-neonfma-4x4.c",
++    "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-5x5p2-minmax-neon-1x4.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-aarch64-neonfma-1x4-acc2.c",
++    "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-5x5s2p2-minmax-neon-1x4.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"
++    ]
++
++    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-dwconv_arch=armv8.2-a+fp16+dotprod") {
++    cflags = [
++      "-march=armv8.2-a+fp16+dotprod"
++    ]
++  
++  asmflags = cflags
++
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/f32-dwconv/f32-dwconv-9p4c-minmax-asm-aarch64-neonfma-cortex-a55.S"
++    ]
++
++    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-dwconv_arch=armv8.2-a+fp16+dotprod_standalone") {
++    cflags = [
++      "-march=armv8.2-a+fp16+dotprod"
++    ]
++  
++  asmflags = cflags
++
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/f32-dwconv/f32-dwconv-9p4c-minmax-asm-aarch64-neonfma-cortex-a55.S"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -75931,27 +61360,46 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +      "src/src/f32-rdsum2/gen/f32-rdsum2-7p7x-minmax-neon.c",
 +    "src/src/f32-rdsum2/gen/f32-rdsum2-7p7x-minmax-scalar.c"
 +    ]
-+
+ 
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/f32-vlog/gen/f32-vlog-avx512f-rational-3-3-div.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("f32-vlog_avx512f_standalone") {
+-      cflags = [ "-mavx512f" ]
 +if (build_with_chromium) {
 +  source_set("f32-rdsum_arm64") {
 +    cflags = [
@@ -76006,13 +61454,59 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +    ]
 +
 +    public_configs = [ ":xnnpack_public_config" ]
-+
+ 
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/f32-vlog/gen/f32-vlog-avx512f-rational-3-3-div.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-vlog_f16c-fma-avx2") {
+-      cflags = [
+-        "-mavx2",
+-        "-mf16c",
+-        "-mfma",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/f32-vlog/gen/f32-vlog-avx2-rational-3-3-div.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-rminmax_arm64") {
 +    cflags = [
@@ -76075,13 +61569,45 @@ Index: chromium-153.0.8010.36/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("f32-vlog_f16c-fma-avx2_standalone") {
+-      cflags = [
+-        "-mavx2",
+-        "-mf16c",
+-        "-mfma",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/f32-vlog/gen/f32-vlog-avx2-rational-3-3-div.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-rsum2_arm64") {
 +    cflags = [
@@ -76139,10 +61665,34 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +
 +    if (!(is_android && use_order_profiling)) {
 +      assert_no_deps = [ "//base" ]
-+    }
-+  }
+     }
+   }
 +}
-+
+ 
+-  if (build_with_chromium) {
+-    source_set("f32-vlog_f16c-fma-no-avx2") {
+-      cflags = [
+-        "-mf16c",
+-        "-mfma",
+-        "-mno-avx2",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/f32-vlog/gen/f32-vlog-fma3-rational-3-3-div.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-rsum_arm64") {
 +    cflags = [
@@ -76197,13 +61747,45 @@ Index: chromium-153.0.8010.36/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("f32-vlog_f16c-fma-no-avx2_standalone") {
+-      cflags = [
+-        "-mf16c",
+-        "-mfma",
+-        "-mno-avx2",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/f32-vlog/gen/f32-vlog-fma3-rational-3-3-div.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-spmm_arm64") {
 +    cflags = [
@@ -76271,8 +61853,8 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +
 +    if (!(is_android && use_order_profiling)) {
 +      assert_no_deps = [ "//base" ]
-+    }
-+  }
+     }
+   }
 +}
 +
 +if (build_with_chromium) {
@@ -76302,7 +61884,31 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +    public_configs = [ ":xnnpack_public_config" ]
 +  }
 +}
-+
+ 
+-  if (build_with_chromium) {
+-    source_set("f32-vlog_sse2-no-sse3") {
+-      cflags = [
+-        "-mno-sse3",
+-        "-msse2",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/f32-vlog/gen/f32-vlog-sse2-rational-3-3-div.c",
+-        "src/src/f32-vlog/gen/f32-vlog-sse2fma-rational-3-3-div.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-vapproxgelu_arm64_standalone") {
@@ -76329,13 +61935,45 @@ Index: chromium-153.0.8010.36/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("f32-vlog_sse2-no-sse3_standalone") {
+-      cflags = [
+-        "-mno-sse3",
+-        "-msse2",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/f32-vlog/gen/f32-vlog-sse2-rational-3-3-div.c",
+-        "src/src/f32-vlog/gen/f32-vlog-sse2fma-rational-3-3-div.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-vbinary_arm64") {
 +    cflags = [
@@ -76465,10 +62103,13 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +
 +    if (!(is_android && use_order_profiling)) {
 +      assert_no_deps = [ "//base" ]
-+    }
-+  }
+     }
+   }
 +}
-+
+ 
+-  if (build_with_chromium) {
+-    source_set("f32-vlog_x64") {
+-      cflags = []
 +if (build_with_chromium) {
 +  source_set("f32-vclamp_arm64") {
 +    cflags = [
@@ -76509,27 +62150,46 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +      "src/src/f32-vclamp/gen/f32-vclamp-neon.c",
 +    "src/src/f32-vclamp/gen/f32-vclamp-scalar.c"
 +    ]
-+
+ 
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/f32-vlog/gen/f32-vlog-scalar-rational-3-3-div.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("f32-vlog_x64_standalone") {
+-      cflags = []
 +if (build_with_chromium) {
 +  source_set("f32-vcmul_arm64") {
 +    cflags = [
@@ -76584,13 +62244,60 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +    ]
 +
 +    public_configs = [ ":xnnpack_public_config" ]
-+
+ 
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/f32-vlog/gen/f32-vlog-scalar-rational-3-3-div.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-vlrelu_avx-no-avx2-no-f16c-no-fma") {
+-      cflags = [
+-        "-mavx",
+-        "-mno-avx2",
+-        "-mno-f16c",
+-        "-mno-fma",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/f32-vlrelu/gen/f32-vlrelu-avx-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",
+-      ]
 +if (build_with_chromium) {
 +  source_set("f32-vcopysign_arm64") {
 +    cflags = [
@@ -76653,13 +62360,46 @@ Index: chromium-153.0.8010.36/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("f32-vlrelu_avx-no-avx2-no-f16c-no-fma_standalone") {
+-      cflags = [
+-        "-mavx",
+-        "-mno-avx2",
+-        "-mno-f16c",
+-        "-mno-fma",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/f32-vlrelu/gen/f32-vlrelu-avx-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 (build_with_chromium) {
 +  source_set("f32-vcos_arm64") {
 +    cflags = [
@@ -76717,10 +62457,13 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +
 +    if (!(is_android && use_order_profiling)) {
 +      assert_no_deps = [ "//base" ]
-+    }
-+  }
+     }
+   }
 +}
-+
+ 
+-  if (build_with_chromium) {
+-    source_set("f32-vlrelu_avx512f") {
+-      cflags = [ "-mavx512f" ]
 +if (build_with_chromium) {
 +  source_set("f32-velu_arm64") {
 +    cflags = [
@@ -76750,7 +62493,11 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +    public_configs = [ ":xnnpack_public_config" ]
 +  }
 +}
-+
+ 
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/f32-vlrelu/gen/f32-vlrelu-avx512f-u16.c",
+-      ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
 +  source_set("f32-velu_arm64_standalone") {
@@ -76770,22 +62517,37 @@ Index: chromium-153.0.8010.36/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",
 +    ]
-+
+ 
+-      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("f32-vlrelu_avx512f_standalone") {
+-      cflags = [ "-mavx512f" ]
 +if (build_with_chromium) {
 +  source_set("f32-vexp_arm64") {
 +    cflags = [
@@ -76826,7 +62588,29 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +      "src/src/f32-vexp/gen/f32-vexp-neon-rational-3-2-div.c",
 +    "src/src/f32-vexp/gen/f32-vexp-scalar-rational-3-2-div.c"
 +    ]
-+
+ 
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/f32-vlrelu/gen/f32-vlrelu-avx512f-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" ]
+-      }
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
 +    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
@@ -76843,10 +62627,33 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +
 +    if (!(is_android && use_order_profiling)) {
 +      assert_no_deps = [ "//base" ]
-+    }
-+  }
+     }
+   }
 +}
-+
+ 
+-  if (build_with_chromium) {
+-    source_set("f32-vlrelu_sse-no-sse2") {
+-      cflags = [
+-        "-mno-sse2",
+-        "-msse",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/f32-vlrelu/gen/f32-vlrelu-sse-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" ]
+-
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/fp16",
+-        "//third_party/fxdiv",
+-        "//third_party/pthreadpool",
+-      ]
 +if (build_with_chromium) {
 +  source_set("f32-vgelu_arm64") {
 +    cflags = [
@@ -76953,7 +62760,8 @@ Index: chromium-153.0.8010.36/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",
@@ -76965,10 +62773,40 @@ Index: chromium-153.0.8010.36/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("f32-vlrelu_sse-no-sse2_standalone") {
+-      cflags = [
+-        "-mno-sse2",
+-        "-msse",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/f32-vlrelu/gen/f32-vlrelu-sse-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" ]
+-
+-      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-vlog_arm64") {
 +    cflags = [
@@ -77026,10 +62864,33 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +
 +    if (!(is_android && use_order_profiling)) {
 +      assert_no_deps = [ "//base" ]
-+    }
-+  }
+     }
+   }
 +}
-+
+ 
+-  if (build_with_chromium) {
+-    source_set("f32-vlrelu_sse4.1-no-sse4.2") {
+-      cflags = [
+-        "-mno-sse4.2",
+-        "-msse4.1",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/f32-vlrelu/gen/f32-vlrelu-sse41-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" ]
+-
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/fp16",
+-        "//third_party/fxdiv",
+-        "//third_party/pthreadpool",
+-      ]
 +if (build_with_chromium) {
 +  source_set("f32-vlrelu_arm64") {
 +    cflags = [
@@ -77084,13 +62945,44 @@ Index: chromium-153.0.8010.36/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("f32-vlrelu_sse4.1-no-sse4.2_standalone") {
+-      cflags = [
+-        "-mno-sse4.2",
+-        "-msse4.1",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/f32-vlrelu/gen/f32-vlrelu-sse41-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" ]
+-
+-      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-vmulcaddc_arm64") {
 +    cflags = [
@@ -77150,10 +63042,13 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +
 +    if (!(is_android && use_order_profiling)) {
 +      assert_no_deps = [ "//base" ]
-+    }
-+  }
+     }
+   }
 +}
-+
+ 
+-  if (build_with_chromium) {
+-    source_set("f32-vlrelu_x64") {
+-      cflags = []
 +if (build_with_chromium) {
 +  source_set("f32-vrnd_arm64") {
 +    cflags = [
@@ -80353,16 +66248,15 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +}
 +
 +if (build_with_chromium) {
-+  source_set("qp8-f32-qb4w-gemm_arch=armv8.2-a+dotprod") {
++  source_set("qp8-f16-qc8w-gemm_arch=armv8.2-a+sve+sve2") {
 +    cflags = [
-+      "-march=armv8.2-a+dotprod"
++      "-march=armv8.2-a+sve+sve2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qp8-f32-qb4w-gemm/qp8-f32-qb4w-gemm-minmax-1x4c16s2-aarch64-neondot.c",
-+    "src/src/qp8-f32-qb4w-gemm/qp8-f32-qb4w-gemm-minmax-1x4c8s2-aarch64-neondot.c",
-+    "src/src/qp8-f32-qb4w-gemm/qp8-f32-qb4w-gemm-minmax-4x4c8s2-aarch64-neondot.c"
++      "src/src/qp8-f16-qc8w-gemm/qp8-f16-qc8w-gemm-minmax-16x64c4-neonsme2.c",
++    "src/src/qp8-f16-qc8w-gemm/qp8-f16-qc8w-gemm-minmax-1x64c4-neonsme2.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -80383,16 +66277,78 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qp8-f32-qb4w-gemm_arch=armv8.2-a+dotprod_standalone") {
++  source_set("qp8-f16-qc8w-gemm_arch=armv8.2-a+sve+sve2_standalone") {
 +    cflags = [
-+      "-march=armv8.2-a+dotprod"
++      "-march=armv8.2-a+sve+sve2"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qp8-f32-qb4w-gemm/qp8-f32-qb4w-gemm-minmax-1x4c16s2-aarch64-neondot.c",
-+    "src/src/qp8-f32-qb4w-gemm/qp8-f32-qb4w-gemm-minmax-1x4c8s2-aarch64-neondot.c",
-+    "src/src/qp8-f32-qb4w-gemm/qp8-f32-qb4w-gemm-minmax-4x4c8s2-aarch64-neondot.c"
++      "src/src/qp8-f16-qc8w-gemm/qp8-f16-qc8w-gemm-minmax-16x64c4-neonsme2.c",
++    "src/src/qp8-f16-qc8w-gemm/qp8-f16-qc8w-gemm-minmax-1x64c4-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("qp8-f32-qb4w-gemm_arch=armv8.2-a+dotprod") {
++    cflags = [
++      "-march=armv8.2-a+dotprod"
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/qp8-f32-qb4w-gemm/qp8-f32-qb4w-gemm-minmax-1x4c16s2-aarch64-neondot.c",
++    "src/src/qp8-f32-qb4w-gemm/qp8-f32-qb4w-gemm-minmax-1x4c8s2-aarch64-neondot.c",
++    "src/src/qp8-f32-qb4w-gemm/qp8-f32-qb4w-gemm-minmax-4x4c8s2-aarch64-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("qp8-f32-qb4w-gemm_arch=armv8.2-a+dotprod_standalone") {
++    cflags = [
++      "-march=armv8.2-a+dotprod"
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/qp8-f32-qb4w-gemm/qp8-f32-qb4w-gemm-minmax-1x4c16s2-aarch64-neondot.c",
++    "src/src/qp8-f32-qb4w-gemm/qp8-f32-qb4w-gemm-minmax-1x4c8s2-aarch64-neondot.c",
++    "src/src/qp8-f32-qb4w-gemm/qp8-f32-qb4w-gemm-minmax-4x4c8s2-aarch64-neondot.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -81018,7 +66974,11 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +      "src/src/qs8-f32-vcvt/gen/qs8-f32-vcvt-neon-u32.c",
 +    "src/src/qs8-f32-vcvt/gen/qs8-f32-vcvt-scalar-u4.c"
 +    ]
-+
+ 
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/f32-vlrelu/gen/f32-vlrelu-scalar-u4.c",
+-      ]
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
 +    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
@@ -82243,33 +68203,10 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +
 +    if (!(is_android && use_order_profiling)) {
 +      assert_no_deps = [ "//base" ]
-     }
-   }
++    }
++  }
 +}
- 
--  if (build_with_chromium) {
--    source_set("qu8-vcvt_sse4.1-no-sse4.2") {
--      cflags = [
--        "-mno-sse4.2",
--        "-msse4.1",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qu8-vcvt/gen/qu8-vcvt-sse41-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",
--      ]
++
 +if (build_with_chromium) {
 +  source_set("qs8-rsum_arch=armv8.2-a+dotprod") {
 +    cflags = [
@@ -82748,22 +68685,62 @@ Index: chromium-153.0.8010.36/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",
 +    ]
-+
+ 
+-      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("f32-vlrelu_x64_standalone") {
+-      cflags = []
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/f32-vlrelu/gen/f32-vlrelu-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" ]
+-      }
+-    }
+-  }
 +if (build_with_chromium) {
 +  source_set("qs8-vprelu_arm64") {
 +    cflags = [
@@ -82774,23 +68751,83 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +      "src/include/xnnpack.h",
 +      "src/src/qs8-vprelu/gen/qs8-vprelu-scalar-u8.c"
 +    ]
-+
+ 
+-  if (build_with_chromium) {
+-    source_set("f32-vmulcaddc_sse-no-sse2") {
+-      cflags = [
+-        "-mno-sse2",
+-        "-msse",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/f32-vmulcaddc/gen/f32-vmulcaddc-c4-minmax-sse-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",
+-      ]
 +    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("f32-vmulcaddc_sse-no-sse2_standalone") {
+-      cflags = [
+-        "-mno-sse2",
+-        "-msse",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/f32-vmulcaddc/gen/f32-vmulcaddc-c4-minmax-sse-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: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-vmulcaddc_x64") {
+-      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
 +  source_set("qs8-vprelu_arm64_standalone") {
@@ -82802,27 +68839,46 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +      "src/include/xnnpack.h",
 +      "src/src/qs8-vprelu/gen/qs8-vprelu-scalar-u8.c"
 +    ]
-+
+ 
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/f32-vmulcaddc/gen/f32-vmulcaddc-c1-minmax-scalar-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" ]
-+
+ 
+-      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("f32-vmulcaddc_x64_standalone") {
+-      cflags = []
 +if (build_with_chromium) {
 +  source_set("qs8-vpreluc_arm64") {
 +    cflags = [
@@ -82833,23 +68889,114 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +      "src/include/xnnpack.h",
 +      "src/src/qs8-vpreluc/gen/qs8-vpreluc-scalar-u8.c"
 +    ]
-+
+ 
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/f32-vmulcaddc/gen/f32-vmulcaddc-c1-minmax-scalar-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: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("f32-vrnd_avx-no-avx2-no-f16c-no-fma") {
+-      cflags = [
+-        "-mavx",
+-        "-mno-avx2",
+-        "-mno-f16c",
+-        "-mno-fma",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/f32-vrnd/gen/f32-vrndd-avx-u16.c",
+-        "src/src/f32-vrnd/gen/f32-vrndne-avx-u16.c",
+-        "src/src/f32-vrnd/gen/f32-vrndu-avx-u16.c",
+-        "src/src/f32-vrnd/gen/f32-vrndz-avx-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",
+-      ]
 +    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("f32-vrnd_avx-no-avx2-no-f16c-no-fma_standalone") {
+-      cflags = [
+-        "-mavx",
+-        "-mno-avx2",
+-        "-mno-f16c",
+-        "-mno-fma",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/f32-vrnd/gen/f32-vrndd-avx-u16.c",
+-        "src/src/f32-vrnd/gen/f32-vrndne-avx-u16.c",
+-        "src/src/f32-vrnd/gen/f32-vrndu-avx-u16.c",
+-        "src/src/f32-vrnd/gen/f32-vrndz-avx-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" ]
+-      }
+-    }
+-  }
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
 +  source_set("qs8-vpreluc_arm64_standalone") {
@@ -82861,7 +69008,10 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +      "src/include/xnnpack.h",
 +      "src/src/qs8-vpreluc/gen/qs8-vpreluc-scalar-u8.c"
 +    ]
-+
+ 
+-  if (build_with_chromium) {
+-    source_set("f32-vrnd_avx512f") {
+-      cflags = [ "-mavx512f" ]
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
 +    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
@@ -82873,15 +69023,39 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +      "//third_party/fxdiv",
 +      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
-+
+ 
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/f32-vrnd/gen/f32-vrndd-avx512f-u16.c",
+-        "src/src/f32-vrnd/gen/f32-vrndne-avx512f-u16.c",
+-        "src/src/f32-vrnd/gen/f32-vrndu-avx512f-u16.c",
+-        "src/src/f32-vrnd/gen/f32-vrndz-avx512f-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" ]
-+    }
-+  }
+     }
+   }
 +}
-+
+ 
+-  # This is a target that cannot depend on //base.
+-  if (build_with_internal_optimization_guide) {
+-    source_set("f32-vrnd_avx512f_standalone") {
+-      cflags = [ "-mavx512f" ]
 +if (build_with_chromium) {
 +  source_set("qs8-vrpreluc_arm64") {
 +    cflags = [
@@ -82892,23 +69066,113 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +      "src/include/xnnpack.h",
 +      "src/src/qs8-vrpreluc/gen/qs8-vrpreluc-scalar-u8.c"
 +    ]
-+
+ 
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/f32-vrnd/gen/f32-vrndd-avx512f-u16.c",
+-        "src/src/f32-vrnd/gen/f32-vrndne-avx512f-u16.c",
+-        "src/src/f32-vrnd/gen/f32-vrndu-avx512f-u16.c",
+-        "src/src/f32-vrnd/gen/f32-vrndz-avx512f-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" ]
+-      }
+-    }
+-  }
 +    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-vrnd_sse2-no-sse3") {
+-      cflags = [
+-        "-mno-sse3",
+-        "-msse2",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/f32-vrnd/gen/f32-vrndd-sse2-u8.c",
+-        "src/src/f32-vrnd/gen/f32-vrndne-sse2-u8.c",
+-        "src/src/f32-vrnd/gen/f32-vrndu-sse2-u8.c",
+-        "src/src/f32-vrnd/gen/f32-vrndz-sse2-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" ]
+-
+-      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) {
+-    source_set("f32-vrnd_sse2-no-sse3_standalone") {
+-      cflags = [
+-        "-mno-sse3",
+-        "-msse2",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/f32-vrnd/gen/f32-vrndd-sse2-u8.c",
+-        "src/src/f32-vrnd/gen/f32-vrndne-sse2-u8.c",
+-        "src/src/f32-vrnd/gen/f32-vrndu-sse2-u8.c",
+-        "src/src/f32-vrnd/gen/f32-vrndz-sse2-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" ]
+-
+-      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("qs8-vrpreluc_arm64_standalone") {
@@ -82920,27 +69184,92 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +      "src/include/xnnpack.h",
 +      "src/src/qs8-vrpreluc/gen/qs8-vrpreluc-scalar-u8.c"
 +    ]
-+
+ 
+-  if (build_with_chromium) {
+-    source_set("f32-vrnd_sse4.1-no-sse4.2") {
+-      cflags = [
+-        "-mno-sse4.2",
+-        "-msse4.1",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/f32-vrnd/gen/f32-vrndd-sse41-u8.c",
+-        "src/src/f32-vrnd/gen/f32-vrndne-sse41-u8.c",
+-        "src/src/f32-vrnd/gen/f32-vrndu-sse41-u8.c",
+-        "src/src/f32-vrnd/gen/f32-vrndz-sse41-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" ]
+-
+-      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-vrnd_sse4.1-no-sse4.2_standalone") {
+-      cflags = [
+-        "-mno-sse4.2",
+-        "-msse4.1",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/f32-vrnd/gen/f32-vrndd-sse41-u8.c",
+-        "src/src/f32-vrnd/gen/f32-vrndne-sse41-u8.c",
+-        "src/src/f32-vrnd/gen/f32-vrndu-sse41-u8.c",
+-        "src/src/f32-vrnd/gen/f32-vrndz-sse41-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" ]
+-
+-      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" ]
-+    }
-+  }
+     }
+   }
 +}
-+
+ 
+-  if (build_with_chromium) {
+-    source_set("f32-vrnd_x64") {
+-      cflags = []
 +if (build_with_chromium) {
 +  source_set("qu8-dwconv_arm64") {
 +    cflags = [
@@ -82961,18 +69290,43 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +    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/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",
+-      ]
+-
+-      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) {
+-    source_set("f32-vrnd_x64_standalone") {
+-      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
 +  source_set("qu8-dwconv_arm64_standalone") {
@@ -82989,27 +69343,125 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +    "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/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",
+-      ]
+-
+-      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("f32-vrsqrt_avx-no-avx2-no-f16c-no-fma") {
+-      cflags = [
+-        "-mavx",
+-        "-mno-avx2",
+-        "-mno-f16c",
+-        "-mno-fma",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/f32-vrsqrt/gen/f32-vrsqrt-avx-rsqrt.c",
+-        "src/src/f32-vrsqrt/gen/f32-vrsqrt-avx-sqrt.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: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("f32-vrsqrt_avx-no-avx2-no-f16c-no-fma_standalone") {
+-      cflags = [
+-        "-mavx",
+-        "-mno-avx2",
+-        "-mno-f16c",
+-        "-mno-fma",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/f32-vrsqrt/gen/f32-vrsqrt-avx-rsqrt.c",
+-        "src/src/f32-vrsqrt/gen/f32-vrsqrt-avx-sqrt.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-vrsqrt_avx512f") {
+-      cflags = [ "-mavx512f" ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/f32-vrsqrt/gen/f32-vrsqrt-avx512f-rsqrt.c",
+-        "src/src/f32-vrsqrt/gen/f32-vrsqrt-avx512f-sqrt.c",
+-      ]
 +if (build_with_chromium) {
 +  source_set("qu8-f32-vcvt_arm64") {
 +    cflags = [
@@ -83021,23 +69473,39 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +      "src/src/qu8-f32-vcvt/gen/qu8-f32-vcvt-neon-u32.c",
 +    "src/src/qu8-f32-vcvt/gen/qu8-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",
+-      ]
 +    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("f32-vrsqrt_avx512f_standalone") {
+-      cflags = [ "-mavx512f" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
 +  source_set("qu8-f32-vcvt_arm64_standalone") {
@@ -83050,27 +69518,113 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +      "src/src/qu8-f32-vcvt/gen/qu8-f32-vcvt-neon-u32.c",
 +    "src/src/qu8-f32-vcvt/gen/qu8-f32-vcvt-scalar-u4.c"
 +    ]
-+
+ 
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/f32-vrsqrt/gen/f32-vrsqrt-avx512f-rsqrt.c",
+-        "src/src/f32-vrsqrt/gen/f32-vrsqrt-avx512f-sqrt.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("f32-vrsqrt_sse2-no-sse3") {
+-      cflags = [
+-        "-mno-sse3",
+-        "-msse2",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/f32-vrsqrt/gen/f32-vrsqrt-sse2-rsqrt.c",
+-        "src/src/f32-vrsqrt/gen/f32-vrsqrt-sse2-sqrt.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: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("f32-vrsqrt_sse2-no-sse3_standalone") {
+-      cflags = [
+-        "-mno-sse3",
+-        "-msse2",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/f32-vrsqrt/gen/f32-vrsqrt-sse2-rsqrt.c",
+-        "src/src/f32-vrsqrt/gen/f32-vrsqrt-sse2-sqrt.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-vrsqrt_x64") {
+-      cflags = []
 +if (build_with_chromium) {
 +  source_set("qu8-gemm_arch=armv8.2-a+fp16+dotprod") {
 +    cflags = [
@@ -83078,7 +69632,12 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +    ]
 +  
 +  asmflags = 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",
+-      ]
 +    sources = [
 +      "src/include/xnnpack.h",
 +      "src/src/qu8-gemm/gen/qu8-gemm-4x16-minmax-rndnu-asm-aarch64-neon-mlal-lane-cortex-a53-prfm.S",
@@ -83086,23 +69645,39 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +    "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"
 +    ]
-+
+ 
+-      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",
 +    ]
-+
+ 
+-      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-vrsqrt_x64_standalone") {
+-      cflags = []
 +# 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") {
@@ -83111,7 +69686,32 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +    ]
 +  
 +  asmflags = 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",
+-      ]
+-
+-      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" ]
+-      }
+-    }
+-  }
 +    sources = [
 +      "src/include/xnnpack.h",
 +      "src/src/qu8-gemm/gen/qu8-gemm-4x16-minmax-rndnu-asm-aarch64-neon-mlal-lane-cortex-a53-prfm.S",
@@ -83119,27 +69719,95 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +    "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"
 +    ]
-+
+ 
+-  if (build_with_chromium) {
+-    source_set("f32-vsigmoid_avx-no-avx2-no-f16c-no-fma") {
+-      cflags = [
+-        "-mavx",
+-        "-mno-avx2",
+-        "-mno-f16c",
+-        "-mno-fma",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/f32-vsigmoid/gen/f32-vsigmoid-avx-rr2-p5-div-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",
+-      ]
 +    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-vsigmoid_avx-no-avx2-no-f16c-no-fma_standalone") {
+-      cflags = [
+-        "-mavx",
+-        "-mno-avx2",
+-        "-mno-f16c",
+-        "-mno-fma",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/f32-vsigmoid/gen/f32-vsigmoid-avx-rr2-p5-div-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" ]
+-      }
 +    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 = [ "-mavx512f" ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/f32-vsigmoid/gen/f32-vsigmoid-avx512f-rr2-lut32-p2-perm2-scalef-div-u64.c",
+-      ]
 +if (build_with_chromium) {
 +  source_set("qu8-gemm_arm64") {
 +    cflags = [
@@ -83156,23 +69824,39 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +    "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"
 +    ]
-+
+ 
+-      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",
 +    ]
-+
+ 
+-      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-vsigmoid_avx512f_standalone") {
+-      cflags = [ "-mavx512f" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
 +  source_set("qu8-gemm_arm64_standalone") {
@@ -83190,27 +69874,133 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +    "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"
 +    ]
-+
-+    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" ]
-+    }
-+  }
+ 
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/f32-vsigmoid/gen/f32-vsigmoid-avx512f-rr2-lut32-p2-perm2-scalef-div-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",
+-      ]
+-
+-      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("f32-vsigmoid_f16c-fma-avx2") {
+-      cflags = [
+-        "-mavx2",
+-        "-mf16c",
+-        "-mfma",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/f32-vsigmoid/gen/f32-vsigmoid-avx2-rr1-p5-div-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",
+-      ]
++    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" ]
+ 
+-  # This is a target that cannot depend on //base.
+-  if (build_with_internal_optimization_guide) {
+-    source_set("f32-vsigmoid_f16c-fma-avx2_standalone") {
+-      cflags = [
+-        "-mavx2",
+-        "-mf16c",
+-        "-mfma",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/f32-vsigmoid/gen/f32-vsigmoid-avx2-rr1-p5-div-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" ]
+     }
+   }
 +}
-+
+ 
+-  if (build_with_chromium) {
+-    source_set("f32-vsigmoid_sse2-no-sse3") {
+-      cflags = [
+-        "-mno-sse3",
+-        "-msse2",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/f32-vsigmoid/gen/f32-vsigmoid-sse2-rr2-lut64-p2-div-u8.c",
+-        "src/src/f32-vsigmoid/gen/f32-vsigmoid-sse2-rr2-p5-div-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" ]
+-
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/fp16",
+-        "//third_party/fxdiv",
+-        "//third_party/pthreadpool",
+-      ]
 +if (build_with_chromium) {
 +  source_set("qu8-igemm_arch=armv8.2-a+fp16+dotprod") {
 +    cflags = [
@@ -83218,7 +70008,10 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +    ]
 +  
 +  asmflags = cflags
-+
+ 
+-      public_configs = [ ":xnnpack_public_config" ]
+-    }
+-  }
 +    sources = [
 +      "src/include/xnnpack.h",
 +      "src/src/qu8-igemm/gen/qu8-igemm-4x16-minmax-rndnu-asm-aarch64-neon-mlal-lane-cortex-a53-prfm.S",
@@ -83226,23 +70019,115 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +    "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"
 +    ]
-+
+ 
+-  # This is a target that cannot depend on //base.
+-  if (build_with_internal_optimization_guide) {
+-    source_set("f32-vsigmoid_sse2-no-sse3_standalone") {
+-      cflags = [
+-        "-mno-sse3",
+-        "-msse2",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/f32-vsigmoid/gen/f32-vsigmoid-sse2-rr2-lut64-p2-div-u8.c",
+-        "src/src/f32-vsigmoid/gen/f32-vsigmoid-sse2-rr2-p5-div-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" ]
+-
+-      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("f32-vsigmoid_sse4.1-no-sse4.2") {
+-      cflags = [
+-        "-mno-sse4.2",
+-        "-msse4.1",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/f32-vsigmoid/gen/f32-vsigmoid-sse41-rr2-lut64-p2-div-u8.c",
+-        "src/src/f32-vsigmoid/gen/f32-vsigmoid-sse41-rr2-p5-div-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" ]
+-
+-      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) {
+-    source_set("f32-vsigmoid_sse4.1-no-sse4.2_standalone") {
+-      cflags = [
+-        "-mno-sse4.2",
+-        "-msse4.1",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/f32-vsigmoid/gen/f32-vsigmoid-sse41-rr2-lut64-p2-div-u8.c",
+-        "src/src/f32-vsigmoid/gen/f32-vsigmoid-sse41-rr2-p5-div-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" ]
+-
+-      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("qu8-igemm_arch=armv8.2-a+fp16+dotprod_standalone") {
@@ -83251,7 +70136,10 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +    ]
 +  
 +  asmflags = cflags
-+
+ 
+-  if (build_with_chromium) {
+-    source_set("f32-vsigmoid_x64") {
+-      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",
@@ -83259,27 +70147,71 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +    "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"
 +    ]
-+
+ 
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/f32-vsigmoid/gen/f32-vsigmoid-scalar-rr2-lut64-p2-div-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: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("f32-vsigmoid_x64_standalone") {
+-      cflags = []
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/f32-vsigmoid/gen/f32-vsigmoid-scalar-rr2-lut64-p2-div-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" ]
+-
+-      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("qu8-igemm_arm64") {
 +    cflags = [
@@ -83296,23 +70228,87 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +    "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("f32-vsin_avx-no-avx2-no-f16c-no-fma") {
+-      cflags = [
+-        "-mavx",
+-        "-mno-avx2",
+-        "-mno-f16c",
+-        "-mno-fma",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/f32-vsin/gen/f32-vsin-avx-rational-5-4-div.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",
 +    ]
-+
+ 
+-  # This is a target that cannot depend on //base.
+-  if (build_with_internal_optimization_guide) {
+-    source_set("f32-vsin_avx-no-avx2-no-f16c-no-fma_standalone") {
+-      cflags = [
+-        "-mavx",
+-        "-mno-avx2",
+-        "-mno-f16c",
+-        "-mno-fma",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/f32-vsin/gen/f32-vsin-avx-rational-5-4-div.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-vsin_avx512f") {
+-      cflags = [ "-mavx512f" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
 +  source_set("qu8-igemm_arm64_standalone") {
@@ -83330,27 +70326,46 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +    "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/f32-vsin/gen/f32-vsin-avx512f-rational-5-4-div.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("f32-vsin_avx512f_standalone") {
+-      cflags = [ "-mavx512f" ]
 +if (build_with_chromium) {
 +  source_set("qu8-rdsum_arm64") {
 +    cflags = [
@@ -83363,23 +70378,106 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +    "src/src/qu8-rdsum/gen/qu8-rdsum-7p7x-neon-u32.c",
 +    "src/src/qu8-rdsum/gen/qu8-rdsum-scalar.c"
 +    ]
-+
+ 
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/f32-vsin/gen/f32-vsin-avx512f-rational-5-4-div.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("f32-vsin_f16c-fma-no-avx2") {
+-      cflags = [
+-        "-mf16c",
+-        "-mfma",
+-        "-mno-avx2",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/f32-vsin/gen/f32-vsin-fma3-rational-5-4-div.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) {
+-    source_set("f32-vsin_f16c-fma-no-avx2_standalone") {
+-      cflags = [
+-        "-mf16c",
+-        "-mfma",
+-        "-mno-avx2",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/f32-vsin/gen/f32-vsin-fma3-rational-5-4-div.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("qu8-rdsum_arm64_standalone") {
@@ -83393,27 +70491,93 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +    "src/src/qu8-rdsum/gen/qu8-rdsum-7p7x-neon-u32.c",
 +    "src/src/qu8-rdsum/gen/qu8-rdsum-scalar.c"
 +    ]
-+
+ 
+-  if (build_with_chromium) {
+-    source_set("f32-vsin_sse2-no-sse3") {
+-      cflags = [
+-        "-mno-sse3",
+-        "-msse2",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/f32-vsin/gen/f32-vsin-sse2-rational-5-4-div.c",
+-        "src/src/f32-vsin/gen/f32-vsin-sse2fma-rational-5-4-div.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-vsin_sse2-no-sse3_standalone") {
+-      cflags = [
+-        "-mno-sse3",
+-        "-msse2",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/f32-vsin/gen/f32-vsin-sse2-rational-5-4-div.c",
+-        "src/src/f32-vsin/gen/f32-vsin-sse2fma-rational-5-4-div.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" ]
-+    }
-+  }
+     }
+   }
 +}
-+
+ 
+-  if (build_with_chromium) {
+-    source_set("f32-vsin_x64") {
+-      cflags = []
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/f32-vsin/gen/f32-vsin-scalar-rational-5-4-div.c",
+-      ]
 +if (build_with_chromium) {
 +  source_set("qu8-rsum_arm64") {
 +    cflags = [
@@ -83425,23 +70589,39 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +      "src/src/qu8-rsum/gen/qu8-rsum-neon-u32-acc2.c",
 +    "src/src/qu8-rsum/gen/qu8-rsum-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",
+-      ]
 +    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("f32-vsin_x64_standalone") {
+-      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
 +  source_set("qu8-rsum_arm64_standalone") {
@@ -83454,27 +70634,121 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +      "src/src/qu8-rsum/gen/qu8-rsum-neon-u32-acc2.c",
 +    "src/src/qu8-rsum/gen/qu8-rsum-scalar-u4.c"
 +    ]
-+
+ 
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/f32-vsin/gen/f32-vsin-scalar-rational-5-4-div.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("f32-vsqrt_avx-no-avx2-no-f16c-no-fma") {
+-      cflags = [
+-        "-mavx",
+-        "-mno-avx2",
+-        "-mno-f16c",
+-        "-mno-fma",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/f32-vsqrt/gen/f32-vsqrt-avx-rsqrt.c",
+-        "src/src/f32-vsqrt/gen/f32-vsqrt-avx-sqrt.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: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("f32-vsqrt_avx-no-avx2-no-f16c-no-fma_standalone") {
+-      cflags = [
+-        "-mavx",
+-        "-mno-avx2",
+-        "-mno-f16c",
+-        "-mno-fma",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/f32-vsqrt/gen/f32-vsqrt-avx-rsqrt.c",
+-        "src/src/f32-vsqrt/gen/f32-vsqrt-avx-sqrt.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-vsqrt_avx512f") {
+-      cflags = [ "-mavx512f" ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/f32-vsqrt/gen/f32-vsqrt-avx512f-rsqrt.c",
+-      ]
 +if (build_with_chromium) {
 +  source_set("qu8-vadd_arm64") {
 +    cflags = [
@@ -83488,23 +70762,39 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +    "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",
+-      ]
 +    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("f32-vsqrt_avx512f_standalone") {
+-      cflags = [ "-mavx512f" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
 +  source_set("qu8-vadd_arm64_standalone") {
@@ -83519,27 +70809,117 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +    "src/src/qu8-vadd/gen/qu8-vadd-minmax-scalar-u1.c",
 +    "src/src/qu8-vadd/gen/qu8-vadd-minmax-scalar-u4.c"
 +    ]
-+
+ 
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/f32-vsqrt/gen/f32-vsqrt-avx512f-rsqrt.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("f32-vsqrt_sse2-no-sse3") {
+-      cflags = [
+-        "-mno-sse3",
+-        "-msse2",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/f32-vsqrt/gen/f32-vsqrt-sse2-rsqrt.c",
+-        "src/src/f32-vsqrt/gen/f32-vsqrt-sse2-sqrt.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: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("f32-vsqrt_sse2-no-sse3_standalone") {
+-      cflags = [
+-        "-mno-sse3",
+-        "-msse2",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/f32-vsqrt/gen/f32-vsqrt-sse2-rsqrt.c",
+-        "src/src/f32-vsqrt/gen/f32-vsqrt-sse2-sqrt.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-vsqrt_x64") {
+-      cflags = []
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/f32-vsqrt/gen/f32-vsqrt-scalar-sqrt.c",
+-      ]
 +if (build_with_chromium) {
 +  source_set("qu8-vaddc_arm64") {
 +    cflags = [
@@ -83553,23 +70933,39 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +    "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" ]
+-      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",
 +    ]
-+
+ 
+-      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-vsqrt_x64_standalone") {
+-      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
 +  source_set("qu8-vaddc_arm64_standalone") {
@@ -83584,27 +70980,119 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +    "src/src/qu8-vaddc/gen/qu8-vaddc-minmax-scalar-u1.c",
 +    "src/src/qu8-vaddc/gen/qu8-vaddc-minmax-scalar-u4.c"
 +    ]
-+
+ 
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/f32-vsqrt/gen/f32-vsqrt-scalar-sqrt.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("f32-vtanh_avx-no-avx2-no-f16c-no-fma") {
+-      cflags = [
+-        "-mavx",
+-        "-mno-avx2",
+-        "-mno-f16c",
+-        "-mno-fma",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/f32-vtanh/gen/f32-vtanh-avx-rational-9-8-div.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: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("f32-vtanh_avx-no-avx2-no-f16c-no-fma_standalone") {
+-      cflags = [
+-        "-mavx",
+-        "-mno-avx2",
+-        "-mno-f16c",
+-        "-mno-fma",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/f32-vtanh/gen/f32-vtanh-avx-rational-9-8-div.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-vtanh_avx512f") {
+-      cflags = [ "-mavx512f" ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/f32-vtanh/gen/f32-vtanh-avx512f-rational-9-8-div.c",
+-      ]
 +if (build_with_chromium) {
 +  source_set("qu8-vcvt_arm64") {
 +    cflags = [
@@ -83616,23 +71104,39 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +      "src/src/qu8-vcvt/gen/qu8-vcvt-neon-u32.c",
 +    "src/src/qu8-vcvt/gen/qu8-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",
+-      ]
 +    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("f32-vtanh_avx512f_standalone") {
+-      cflags = [ "-mavx512f" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
 +  source_set("qu8-vcvt_arm64_standalone") {
@@ -83645,31 +71149,137 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +      "src/src/qu8-vcvt/gen/qu8-vcvt-neon-u32.c",
 +    "src/src/qu8-vcvt/gen/qu8-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" ]
-+    }
-+  }
-+}
-+
-+if (build_with_chromium) {
-+  source_set("qu8-vlrelu_arm64") {
-+    cflags = [
-+  
+ 
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/f32-vtanh/gen/f32-vtanh-avx512f-rational-9-8-div.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("f32-vtanh_f16c-fma-no-avx2") {
+-      cflags = [
+-        "-mf16c",
+-        "-mfma",
+-        "-mno-avx2",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/f32-vtanh/gen/f32-vtanh-fma3-rational-9-8-div.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: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("f32-vtanh_f16c-fma-no-avx2_standalone") {
+-      cflags = [
+-        "-mf16c",
+-        "-mfma",
+-        "-mno-avx2",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/f32-vtanh/gen/f32-vtanh-fma3-rational-9-8-div.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-vtanh_sse2-no-sse3") {
+-      cflags = [
+-        "-mno-sse3",
+-        "-msse2",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/f32-vtanh/gen/f32-vtanh-sse2-rational-9-8-div.c",
+-        "src/src/f32-vtanh/gen/f32-vtanh-sse2fma-rational-9-8-div.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-vlrelu_arm64") {
++    cflags = [
++  
 +    ]
 +  
 +    sources = [
@@ -83677,12 +71287,47 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +      "src/src/qu8-vlrelu/gen/qu8-vlrelu-neon-u32.c",
 +    "src/src/qu8-vlrelu/gen/qu8-vlrelu-scalar-andxor-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-vtanh_sse2-no-sse3_standalone") {
+-      cflags = [
+-        "-mno-sse3",
+-        "-msse2",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/f32-vtanh/gen/f32-vtanh-sse2-rational-9-8-div.c",
+-        "src/src/f32-vtanh/gen/f32-vtanh-sse2fma-rational-9-8-div.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" ]
+-      }
+-    }
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
@@ -83691,9 +71336,12 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +    ]
 +
 +    public_configs = [ ":xnnpack_public_config" ]
-+  }
+   }
 +}
-+
+ 
+-  if (build_with_chromium) {
+-    source_set("f32-vtanh_x64") {
+-      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
 +  source_set("qu8-vlrelu_arm64_standalone") {
@@ -83706,27 +71354,71 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +      "src/src/qu8-vlrelu/gen/qu8-vlrelu-neon-u32.c",
 +    "src/src/qu8-vlrelu/gen/qu8-vlrelu-scalar-andxor-u4.c"
 +    ]
-+
+ 
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/f32-vtanh/gen/f32-vtanh-scalar-rational-9-8-div.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("f32-vtanh_x64_standalone") {
+-      cflags = []
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/f32-vtanh/gen/f32-vtanh-scalar-rational-9-8-div.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("qu8-vmul_arm64") {
 +    cflags = [
@@ -83738,23 +71430,91 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +      "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"
 +    ]
-+
+ 
+-  if (build_with_chromium) {
+-    source_set("f32-vunary_avx-no-avx2-no-f16c-no-fma") {
+-      cflags = [
+-        "-mavx",
+-        "-mno-avx2",
+-        "-mno-f16c",
+-        "-mno-fma",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/f32-vunary/gen/f32-vabs-avx.c",
+-        "src/src/f32-vunary/gen/f32-vneg-avx.c",
+-        "src/src/f32-vunary/gen/f32-vsqr-avx.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",
 +    ]
-+
+ 
+-  # This is a target that cannot depend on //base.
+-  if (build_with_internal_optimization_guide) {
+-    source_set("f32-vunary_avx-no-avx2-no-f16c-no-fma_standalone") {
+-      cflags = [
+-        "-mavx",
+-        "-mno-avx2",
+-        "-mno-f16c",
+-        "-mno-fma",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/f32-vunary/gen/f32-vabs-avx.c",
+-        "src/src/f32-vunary/gen/f32-vneg-avx.c",
+-        "src/src/f32-vunary/gen/f32-vsqr-avx.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-vunary_avx512f") {
+-      cflags = [ "-mavx512f" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
 +  source_set("qu8-vmul_arm64_standalone") {
@@ -83767,27 +71527,75 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +      "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"
 +    ]
-+
+ 
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/f32-vunary/gen/f32-vabs-avx512f.c",
+-        "src/src/f32-vunary/gen/f32-vneg-avx512f.c",
+-        "src/src/f32-vunary/gen/f32-vsqr-avx512f.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("f32-vunary_avx512f_standalone") {
+-      cflags = [ "-mavx512f" ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/f32-vunary/gen/f32-vabs-avx512f.c",
+-        "src/src/f32-vunary/gen/f32-vneg-avx512f.c",
+-        "src/src/f32-vunary/gen/f32-vsqr-avx512f.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("qu8-vmulc_arm64") {
 +    cflags = [
@@ -83799,23 +71607,87 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +      "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) {
+-    source_set("f32-vunary_sse2-no-sse3") {
+-      cflags = [
+-        "-mno-sse3",
+-        "-msse2",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/f32-vunary/gen/f32-vabs-sse2.c",
+-        "src/src/f32-vunary/gen/f32-vneg-sse2.c",
+-        "src/src/f32-vunary/gen/f32-vsqr-sse2.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",
 +    ]
-+
+ 
+-  # This is a target that cannot depend on //base.
+-  if (build_with_internal_optimization_guide) {
+-    source_set("f32-vunary_sse2-no-sse3_standalone") {
+-      cflags = [
+-        "-mno-sse3",
+-        "-msse2",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/f32-vunary/gen/f32-vabs-sse2.c",
+-        "src/src/f32-vunary/gen/f32-vneg-sse2.c",
+-        "src/src/f32-vunary/gen/f32-vsqr-sse2.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-vunary_x64") {
+-      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
 +  source_set("qu8-vmulc_arm64_standalone") {
@@ -83828,27 +71700,75 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +      "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 = [
+-        "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",
+-      ]
 +    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("f32-vunary_x64_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",
+-      ]
+-
+-      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("qu8-vprelu_arm64") {
 +    cflags = [
@@ -83859,23 +71779,70 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +      "src/include/xnnpack.h",
 +      "src/src/qu8-vprelu/gen/qu8-vprelu-scalar-u8.c"
 +    ]
-+
+ 
+-  if (build_with_chromium) {
+-    source_set("operators_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/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" ]
+-      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) {
+-    source_set("operators_x64_standalone") {
+-      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
 +  source_set("qu8-vprelu_arm64_standalone") {
@@ -83887,27 +71854,164 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +      "src/include/xnnpack.h",
 +      "src/src/qu8-vprelu/gen/qu8-vprelu-scalar-u8.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/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" ]
+-      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("qd8-bf16-qb4w-gemm_f16c-fma-avx2") {
+-      cflags = [
+-        "-mavx2",
+-        "-mf16c",
+-        "-mfma",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qd8-bf16-qb4w-gemm/gen/qd8-bf16-qb4w-gemm-1x8c8-minmax-avx2.c",
+-        "src/src/qd8-bf16-qb4w-gemm/gen/qd8-bf16-qb4w-gemm-3x8c8-minmax-avx2.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: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("qd8-bf16-qb4w-gemm_f16c-fma-avx2_standalone") {
+-      cflags = [
+-        "-mavx2",
+-        "-mf16c",
+-        "-mfma",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qd8-bf16-qb4w-gemm/gen/qd8-bf16-qb4w-gemm-1x8c8-minmax-avx2.c",
+-        "src/src/qd8-bf16-qb4w-gemm/gen/qd8-bf16-qb4w-gemm-3x8c8-minmax-avx2.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-bf16-qb4w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni") {
+-      cflags = [
+-        "-mavx512bw",
+-        "-mavx512cd",
+-        "-mavx512dq",
+-        "-mavx512f",
+-        "-mavx512vl",
+-        "-mavx512vnni",
+-        "-mf16c",
+-        "-mfma",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qd8-bf16-qb4w-gemm/gen/qd8-bf16-qb4w-gemm-1x16c8-minmax-avx512vnni.c",
+-        "src/src/qd8-bf16-qb4w-gemm/gen/qd8-bf16-qb4w-gemm-8x16c8-minmax-avx512vnni.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-vpreluc_arm64") {
 +    cflags = [
@@ -83918,12 +72022,54 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +      "src/include/xnnpack.h",
 +      "src/src/qu8-vpreluc/gen/qu8-vpreluc-scalar-u8.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-bf16-qb4w-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/qd8-bf16-qb4w-gemm/gen/qd8-bf16-qb4w-gemm-1x16c8-minmax-avx512vnni.c",
+-        "src/src/qd8-bf16-qb4w-gemm/gen/qd8-bf16-qb4w-gemm-8x16c8-minmax-avx512vnni.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" ]
+-      }
+-    }
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
@@ -83932,9 +72078,12 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +    ]
 +
 +    public_configs = [ ":xnnpack_public_config" ]
-+  }
+   }
 +}
-+
+ 
+-  if (build_with_chromium) {
+-    source_set("qd8-bf16-qb4w-gemm_x64") {
+-      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
 +  source_set("qu8-vpreluc_arm64_standalone") {
@@ -83946,27 +72095,73 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +      "src/include/xnnpack.h",
 +      "src/src/qu8-vpreluc/gen/qu8-vpreluc-scalar-u8.c"
 +    ]
-+
+ 
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qd8-bf16-qb4w-gemm/gen/qd8-bf16-qb4w-gemm-1x4-minmax-scalar.c",
+-        "src/src/qd8-bf16-qb4w-gemm/gen/qd8-bf16-qb4w-gemm-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" ]
 +    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-bf16-qb4w-gemm_x64_standalone") {
+-      cflags = []
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qd8-bf16-qb4w-gemm/gen/qd8-bf16-qb4w-gemm-1x4-minmax-scalar.c",
+-        "src/src/qd8-bf16-qb4w-gemm/gen/qd8-bf16-qb4w-gemm-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 (build_with_chromium) {
 +  source_set("qu8-vrpreluc_arm64") {
 +    cflags = [
@@ -83977,23 +72172,115 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +      "src/include/xnnpack.h",
 +      "src/src/qu8-vrpreluc/gen/qu8-vrpreluc-scalar-u8.c"
 +    ]
-+
+ 
+-  if (build_with_chromium) {
+-    source_set("qd8-f16-qb4w-gemm_f16c-fma-avx2") {
+-      cflags = [
+-        "-mavx2",
+-        "-mf16c",
+-        "-mfma",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qd8-f16-qb4w-gemm/gen/qd8-f16-qb4w-gemm-1x8c8-minmax-avx2.c",
+-        "src/src/qd8-f16-qb4w-gemm/gen/qd8-f16-qb4w-gemm-3x8c8-minmax-avx2.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",
 +    ]
-+
+ 
+-  # This is a target that cannot depend on //base.
+-  if (build_with_internal_optimization_guide) {
+-    source_set("qd8-f16-qb4w-gemm_f16c-fma-avx2_standalone") {
+-      cflags = [
+-        "-mavx2",
+-        "-mf16c",
+-        "-mfma",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qd8-f16-qb4w-gemm/gen/qd8-f16-qb4w-gemm-1x8c8-minmax-avx2.c",
+-        "src/src/qd8-f16-qb4w-gemm/gen/qd8-f16-qb4w-gemm-3x8c8-minmax-avx2.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("qd8-f16-qc2w-gemm_avx2-avxvnni-f16c-fma-gfni") {
+-      cflags = [
+-        "-mavx2",
+-        "-mavxvnni",
+-        "-mf16c",
+-        "-mfma",
+-        "-mgfni",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qd8-f16-qc2w-gemm/gen/qd8-f16-qc2w-gemm-1x8c8-minmax-avxvnni.c",
+-        "src/src/qd8-f16-qc2w-gemm/gen/qd8-f16-qc2w-gemm-5x8c8-minmax-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",
+-      ]
+-
+-      public_configs = [ ":xnnpack_public_config" ]
+-    }
+-  }
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
 +  source_set("qu8-vrpreluc_arm64_standalone") {
@@ -84005,56 +72292,176 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +      "src/include/xnnpack.h",
 +      "src/src/qu8-vrpreluc/gen/qu8-vrpreluc-scalar-u8.c"
 +    ]
-+
+ 
+-  # This is a target that cannot depend on //base.
+-  if (build_with_internal_optimization_guide) {
+-    source_set("qd8-f16-qc2w-gemm_avx2-avxvnni-f16c-fma-gfni_standalone") {
+-      cflags = [
+-        "-mavx2",
+-        "-mavxvnni",
+-        "-mf16c",
+-        "-mfma",
+-        "-mgfni",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qd8-f16-qc2w-gemm/gen/qd8-f16-qc2w-gemm-1x8c8-minmax-avxvnni.c",
+-        "src/src/qd8-f16-qc2w-gemm/gen/qd8-f16-qc2w-gemm-5x8c8-minmax-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" ]
+-      }
+-    }
+-  }
 +    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-qc2w-gemm_f16c-fma-avx2") {
+-      cflags = [
+-        "-mavx2",
+-        "-mf16c",
+-        "-mfma",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qd8-f16-qc2w-gemm/gen/qd8-f16-qc2w-gemm-1x8c8-minmax-avx2-madd.c",
+-        "src/src/qd8-f16-qc2w-gemm/gen/qd8-f16-qc2w-gemm-8x8c8-minmax-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",
+-      ]
 +    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 (build_with_chromium) {
-+  source_set("reference_arm64") {
-+    cflags = [
-+  
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/reference/binary-elementwise.cc",
-+    "src/src/reference/packing.cc",
-+    "src/src/reference/unary-elementwise.cc"
-+    ]
-+
-+    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 = [
+ 
+-  # This is a target that cannot depend on //base.
+-  if (build_with_internal_optimization_guide) {
+-    source_set("qd8-f16-qc2w-gemm_f16c-fma-avx2_standalone") {
+-      cflags = [
+-        "-mavx2",
+-        "-mf16c",
+-        "-mfma",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qd8-f16-qc2w-gemm/gen/qd8-f16-qc2w-gemm-1x8c8-minmax-avx2-madd.c",
+-        "src/src/qd8-f16-qc2w-gemm/gen/qd8-f16-qc2w-gemm-8x8c8-minmax-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: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-qc2w-gemm_x64") {
+-      cflags = []
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qd8-f16-qc2w-gemm/gen/qd8-f16-qc2w-gemm-1x2-minmax-scalar.c",
+-      ]
++if (build_with_chromium) {
++  source_set("reference_arm64") {
++    cflags = [
++  
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/reference/binary-elementwise.cc",
++    "src/src/reference/packing.cc",
++    "src/src/reference/unary-elementwise.cc"
++    ]
+ 
+-      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",
 +    ]
-+
+ 
+-      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-f16-qc2w-gemm_x64_standalone") {
+-      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
 +  source_set("reference_arm64_standalone") {
@@ -84068,27 +72475,140 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +    "src/src/reference/packing.cc",
 +    "src/src/reference/unary-elementwise.cc"
 +    ]
-+
+ 
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qd8-f16-qc2w-gemm/gen/qd8-f16-qc2w-gemm-1x2-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" ]
+-      }
+-    }
+-  }
 +    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-qc4w-gemm_avx2-avxvnni-f16c-fma-gfni") {
+-      cflags = [
+-        "-mavx2",
+-        "-mavxvnni",
+-        "-mf16c",
+-        "-mfma",
+-        "-mgfni",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qd8-f16-qc4w-gemm/gen/qd8-f16-qc4w-gemm-1x8c8-minmax-avxvnni-prfm.c",
+-        "src/src/qd8-f16-qc4w-gemm/gen/qd8-f16-qc4w-gemm-5x8c8-minmax-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: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("qd8-f16-qc4w-gemm_avx2-avxvnni-f16c-fma-gfni_standalone") {
+-      cflags = [
+-        "-mavx2",
+-        "-mavxvnni",
+-        "-mf16c",
+-        "-mfma",
+-        "-mgfni",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qd8-f16-qc4w-gemm/gen/qd8-f16-qc4w-gemm-1x8c8-minmax-avxvnni-prfm.c",
+-        "src/src/qd8-f16-qc4w-gemm/gen/qd8-f16-qc4w-gemm-5x8c8-minmax-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: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-qc4w-gemm_f16c-fma-avx2") {
+-      cflags = [
+-        "-mavx2",
+-        "-mf16c",
+-        "-mfma",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qd8-f16-qc4w-gemm/gen/qd8-f16-qc4w-gemm-1x8c8-minmax-avx2-madd-prfm.c",
+-        "src/src/qd8-f16-qc4w-gemm/gen/qd8-f16-qc4w-gemm-4x8c8-minmax-avx2-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",
+-      ]
 +if (build_with_chromium) {
 +  source_set("s8-ibilinear_arm64") {
 +    cflags = [
@@ -84101,12 +72621,48 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +    "src/src/s8-ibilinear/gen/s8-ibilinear-neon-u8.c",
 +    "src/src/s8-ibilinear/gen/s8-ibilinear-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" ]
-+
+ 
+-  # This is a target that cannot depend on //base.
+-  if (build_with_internal_optimization_guide) {
+-    source_set("qd8-f16-qc4w-gemm_f16c-fma-avx2_standalone") {
+-      cflags = [
+-        "-mavx2",
+-        "-mf16c",
+-        "-mfma",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qd8-f16-qc4w-gemm/gen/qd8-f16-qc4w-gemm-1x8c8-minmax-avx2-madd-prfm.c",
+-        "src/src/qd8-f16-qc4w-gemm/gen/qd8-f16-qc4w-gemm-4x8c8-minmax-avx2-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" ]
+-      }
+-    }
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
@@ -84115,9 +72671,39 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +    ]
 +
 +    public_configs = [ ":xnnpack_public_config" ]
-+  }
+   }
 +}
-+
+ 
+-  if (build_with_chromium) {
+-    source_set(
+-        "qd8-f16-qc4w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
+-      cflags = [
+-        "-mavx512bw",
+-        "-mavx512cd",
+-        "-mavx512dq",
+-        "-mavx512f",
+-        "-mavx512vl",
+-        "-mf16c",
+-        "-mfma",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qd8-f16-qc4w-gemm/gen/qd8-f16-qc4w-gemm-1x8c8-minmax-avx256skx-madd-prfm.c",
+-        "src/src/qd8-f16-qc4w-gemm/gen/qd8-f16-qc4w-gemm-8x8c8-minmax-avx256skx-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",
+-      ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
 +  source_set("s8-ibilinear_arm64_standalone") {
@@ -84131,27 +72717,141 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +    "src/src/s8-ibilinear/gen/s8-ibilinear-neon-u8.c",
 +    "src/src/s8-ibilinear/gen/s8-ibilinear-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" ]
-+
+ 
+-  # This is a target that cannot depend on //base.
+-  if (build_with_internal_optimization_guide) {
+-    source_set(
+-        "qd8-f16-qc4w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") {
+-      cflags = [
+-        "-mavx512bw",
+-        "-mavx512cd",
+-        "-mavx512dq",
+-        "-mavx512f",
+-        "-mavx512vl",
+-        "-mf16c",
+-        "-mfma",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qd8-f16-qc4w-gemm/gen/qd8-f16-qc4w-gemm-1x8c8-minmax-avx256skx-madd-prfm.c",
+-        "src/src/qd8-f16-qc4w-gemm/gen/qd8-f16-qc4w-gemm-8x8c8-minmax-avx256skx-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" ]
+-      }
+-    }
+-  }
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
 +      "//third_party/fxdiv",
 +      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
-+
+ 
+-  if (build_with_chromium) {
+-    source_set(
+-        "qd8-f16-qc4w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni") {
+-      cflags = [
+-        "-mavx512bw",
+-        "-mavx512cd",
+-        "-mavx512dq",
+-        "-mavx512f",
+-        "-mavx512vl",
+-        "-mavx512vnni",
+-        "-mf16c",
+-        "-mfma",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qd8-f16-qc4w-gemm/gen/qd8-f16-qc4w-gemm-1x8c8-minmax-avx256vnni.c",
+-        "src/src/qd8-f16-qc4w-gemm/gen/qd8-f16-qc4w-gemm-8x8c8-minmax-avx256vnni.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-f16-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/qd8-f16-qc4w-gemm/gen/qd8-f16-qc4w-gemm-1x8c8-minmax-avx256vnni.c",
+-        "src/src/qd8-f16-qc4w-gemm/gen/qd8-f16-qc4w-gemm-8x8c8-minmax-avx256vnni.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("s8-maxpool_arm64") {
 +    cflags = [
@@ -84163,23 +72863,113 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +      "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) {
+-    source_set("qd8-f16-qc8w-gemm_avx2-avxvnni-f16c-fma-gfni") {
+-      cflags = [
+-        "-mavx2",
+-        "-mavxvnni",
+-        "-mf16c",
+-        "-mfma",
+-        "-mgfni",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qd8-f16-qc8w-gemm/gen/qd8-f16-qc8w-gemm-1x8c8-minmax-avxvnni-prfm.c",
+-        "src/src/qd8-f16-qc8w-gemm/gen/qd8-f16-qc8w-gemm-5x8c8-minmax-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",
+-      ]
 +    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("qd8-f16-qc8w-gemm_avx2-avxvnni-f16c-fma-gfni_standalone") {
+-      cflags = [
+-        "-mavx2",
+-        "-mavxvnni",
+-        "-mf16c",
+-        "-mfma",
+-        "-mgfni",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qd8-f16-qc8w-gemm/gen/qd8-f16-qc8w-gemm-1x8c8-minmax-avxvnni-prfm.c",
+-        "src/src/qd8-f16-qc8w-gemm/gen/qd8-f16-qc8w-gemm-5x8c8-minmax-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: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("qd8-f16-qc8w-gemm_f16c-fma-avx2") {
+-      cflags = [
+-        "-mavx2",
+-        "-mf16c",
+-        "-mfma",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qd8-f16-qc8w-gemm/gen/qd8-f16-qc8w-gemm-1x8c8-minmax-avx2.c",
+-        "src/src/qd8-f16-qc8w-gemm/gen/qd8-f16-qc8w-gemm-3x8c8-minmax-avx2.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("s8-maxpool_arm64_standalone") {
@@ -84192,27 +72982,134 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +      "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" ]
+-    }
+-  }
 +    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-qc8w-gemm_f16c-fma-avx2_standalone") {
+-      cflags = [
+-        "-mavx2",
+-        "-mf16c",
+-        "-mfma",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qd8-f16-qc8w-gemm/gen/qd8-f16-qc8w-gemm-1x8c8-minmax-avx2.c",
+-        "src/src/qd8-f16-qc8w-gemm/gen/qd8-f16-qc8w-gemm-3x8c8-minmax-avx2.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" ]
+-      }
+-    }
+-  }
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
 +      "//third_party/fxdiv",
 +      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
-+
+ 
+-  if (build_with_chromium) {
+-    source_set(
+-        "qd8-f16-qc8w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
+-      cflags = [
+-        "-mavx512bw",
+-        "-mavx512cd",
+-        "-mavx512dq",
+-        "-mavx512f",
+-        "-mavx512vl",
+-        "-mf16c",
+-        "-mfma",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qd8-f16-qc8w-gemm/gen/qd8-f16-qc8w-gemm-1x8c8-minmax-avx256skx.c",
+-        "src/src/qd8-f16-qc8w-gemm/gen/qd8-f16-qc8w-gemm-5x8c8-minmax-avx256skx.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-f16-qc8w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") {
+-      cflags = [
+-        "-mavx512bw",
+-        "-mavx512cd",
+-        "-mavx512dq",
+-        "-mavx512f",
+-        "-mavx512vl",
+-        "-mf16c",
+-        "-mfma",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qd8-f16-qc8w-gemm/gen/qd8-f16-qc8w-gemm-1x8c8-minmax-avx256skx.c",
+-        "src/src/qd8-f16-qc8w-gemm/gen/qd8-f16-qc8w-gemm-5x8c8-minmax-avx256skx.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("s8-rdminmax_arm64") {
 +    cflags = [
@@ -84226,23 +73123,130 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +    "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) {
+-    source_set(
+-        "qd8-f16-qc8w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni") {
+-      cflags = [
+-        "-mavx512bw",
+-        "-mavx512cd",
+-        "-mavx512dq",
+-        "-mavx512f",
+-        "-mavx512vl",
+-        "-mavx512vnni",
+-        "-mf16c",
+-        "-mfma",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qd8-f16-qc8w-gemm/gen/qd8-f16-qc8w-gemm-1x8c8-minmax-avx256vnni.c",
+-        "src/src/qd8-f16-qc8w-gemm/gen/qd8-f16-qc8w-gemm-8x8c8-minmax-avx256vnni.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",
 +    ]
-+
+ 
+-  # This is a target that cannot depend on //base.
+-  if (build_with_internal_optimization_guide) {
+-    source_set(
+-        "qd8-f16-qc8w-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/qd8-f16-qc8w-gemm/gen/qd8-f16-qc8w-gemm-1x8c8-minmax-avx256vnni.c",
+-        "src/src/qd8-f16-qc8w-gemm/gen/qd8-f16-qc8w-gemm-8x8c8-minmax-avx256vnni.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(
+-        "qd8-f16-qc8w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni-amx-tile-amx-int8") {
+-      cflags = [
+-        "-mamx-int8",
+-        "-mamx-tile",
+-        "-mavx512bw",
+-        "-mavx512cd",
+-        "-mavx512dq",
+-        "-mavx512f",
+-        "-mavx512vl",
+-        "-mavx512vnni",
+-        "-mf16c",
+-        "-mfma",
+-        "-mgfni",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qd8-f16-qc8w-gemm/gen/qd8-f16-qc8w-gemm-16x64c4-minmax-avx512amx.c",
+-        "src/src/qd8-f16-qc8w-gemm/gen/qd8-f16-qc8w-gemm-1x64c4-minmax-avx512amx.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("s8-rdminmax_arm64_standalone") {
@@ -84257,27 +73261,137 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +    "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" ]
+-    }
+-  }
 +    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-qc8w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni-amx-tile-amx-int8_standalone") {
+-      cflags = [
+-        "-mamx-int8",
+-        "-mamx-tile",
+-        "-mavx512bw",
+-        "-mavx512cd",
+-        "-mavx512dq",
+-        "-mavx512f",
+-        "-mavx512vl",
+-        "-mavx512vnni",
+-        "-mf16c",
+-        "-mfma",
+-        "-mgfni",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qd8-f16-qc8w-gemm/gen/qd8-f16-qc8w-gemm-16x64c4-minmax-avx512amx.c",
+-        "src/src/qd8-f16-qc8w-gemm/gen/qd8-f16-qc8w-gemm-1x64c4-minmax-avx512amx.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" ]
+-      }
+-    }
+-  }
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
 +      "//third_party/fxdiv",
 +      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
-+
+ 
+-  if (build_with_chromium) {
+-    source_set("qd8-f16-qc8w-igemm_avx2-avxvnni-f16c-fma-gfni") {
+-      cflags = [
+-        "-mavx2",
+-        "-mavxvnni",
+-        "-mf16c",
+-        "-mfma",
+-        "-mgfni",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qd8-f16-qc8w-igemm/gen/qd8-f16-qc8w-igemm-1x8c8-minmax-avxvnni-prfm.c",
+-        "src/src/qd8-f16-qc8w-igemm/gen/qd8-f16-qc8w-igemm-5x8c8-minmax-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",
+-      ]
 +    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-f16-qc8w-igemm_avx2-avxvnni-f16c-fma-gfni_standalone") {
+-      cflags = [
+-        "-mavx2",
+-        "-mavxvnni",
+-        "-mf16c",
+-        "-mfma",
+-        "-mgfni",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qd8-f16-qc8w-igemm/gen/qd8-f16-qc8w-igemm-1x8c8-minmax-avxvnni-prfm.c",
+-        "src/src/qd8-f16-qc8w-igemm/gen/qd8-f16-qc8w-igemm-5x8c8-minmax-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:pthreadpool_standalone",
+-      ]
+-
+-      public_configs = [ ":xnnpack_public_config" ]
+-
+-      if (!(is_android && use_order_profiling)) {
+-        assert_no_deps = [ "//base" ]
+-      }
+-    }
+-  }
 +if (build_with_chromium) {
 +  source_set("s8-rminmax_arm64") {
 +    cflags = [
@@ -84293,23 +73407,114 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +    "src/src/s8-rminmax/gen/s8-rminmax-neon-u32-acc2.c",
 +    "src/src/s8-rminmax/gen/s8-rminmax-scalar-u2-acc2.c"
 +    ]
-+
+ 
+-  if (build_with_chromium) {
+-    source_set("qd8-f16-qc8w-igemm_f16c-fma-avx2") {
+-      cflags = [
+-        "-mavx2",
+-        "-mf16c",
+-        "-mfma",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qd8-f16-qc8w-igemm/gen/qd8-f16-qc8w-igemm-1x8c8-minmax-avx2.c",
+-        "src/src/qd8-f16-qc8w-igemm/gen/qd8-f16-qc8w-igemm-3x8c8-minmax-avx2.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",
 +    ]
-+
+ 
+-  # This is a target that cannot depend on //base.
+-  if (build_with_internal_optimization_guide) {
+-    source_set("qd8-f16-qc8w-igemm_f16c-fma-avx2_standalone") {
+-      cflags = [
+-        "-mavx2",
+-        "-mf16c",
+-        "-mfma",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qd8-f16-qc8w-igemm/gen/qd8-f16-qc8w-igemm-1x8c8-minmax-avx2.c",
+-        "src/src/qd8-f16-qc8w-igemm/gen/qd8-f16-qc8w-igemm-3x8c8-minmax-avx2.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(
+-        "qd8-f16-qc8w-igemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
+-      cflags = [
+-        "-mavx512bw",
+-        "-mavx512cd",
+-        "-mavx512dq",
+-        "-mavx512f",
+-        "-mavx512vl",
+-        "-mf16c",
+-        "-mfma",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qd8-f16-qc8w-igemm/gen/qd8-f16-qc8w-igemm-1x8c8-minmax-avx256skx.c",
+-        "src/src/qd8-f16-qc8w-igemm/gen/qd8-f16-qc8w-igemm-5x8c8-minmax-avx256skx.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("s8-rminmax_arm64_standalone") {
@@ -84326,55 +73531,274 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +    "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" ]
-+    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("s8-vclamp_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"
-+    ]
-+
+ 
+-      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(
+-        "qd8-f16-qc8w-igemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") {
+-      cflags = [
+-        "-mavx512bw",
+-        "-mavx512cd",
+-        "-mavx512dq",
+-        "-mavx512f",
+-        "-mavx512vl",
+-        "-mf16c",
+-        "-mfma",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qd8-f16-qc8w-igemm/gen/qd8-f16-qc8w-igemm-1x8c8-minmax-avx256skx.c",
+-        "src/src/qd8-f16-qc8w-igemm/gen/qd8-f16-qc8w-igemm-5x8c8-minmax-avx256skx.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" ]
+-      }
+-    }
+-  }
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool:pthreadpool_standalone",
++    ]
+ 
+-  if (build_with_chromium) {
+-    source_set(
+-        "qd8-f16-qc8w-igemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni") {
+-      cflags = [
+-        "-mavx512bw",
+-        "-mavx512cd",
+-        "-mavx512dq",
+-        "-mavx512f",
+-        "-mavx512vl",
+-        "-mavx512vnni",
+-        "-mf16c",
+-        "-mfma",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qd8-f16-qc8w-igemm/gen/qd8-f16-qc8w-igemm-1x8c8-minmax-avx256vnni.c",
+-        "src/src/qd8-f16-qc8w-igemm/gen/qd8-f16-qc8w-igemm-8x8c8-minmax-avx256vnni.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-f16-qc8w-igemm_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/qd8-f16-qc8w-igemm/gen/qd8-f16-qc8w-igemm-1x8c8-minmax-avx256vnni.c",
+-        "src/src/qd8-f16-qc8w-igemm/gen/qd8-f16-qc8w-igemm-8x8c8-minmax-avx256vnni.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("s8-vclamp_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"
++    ]
+ 
+-  if (build_with_chromium) {
+-    source_set(
+-        "qd8-f16-qc8w-igemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni-amx-tile-amx-int8") {
+-      cflags = [
+-        "-mamx-int8",
+-        "-mamx-tile",
+-        "-mavx512bw",
+-        "-mavx512cd",
+-        "-mavx512dq",
+-        "-mavx512f",
+-        "-mavx512vl",
+-        "-mavx512vnni",
+-        "-mf16c",
+-        "-mfma",
+-        "-mgfni",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qd8-f16-qc8w-igemm/gen/qd8-f16-qc8w-igemm-16x64c4-minmax-avx512amx.c",
+-        "src/src/qd8-f16-qc8w-igemm/gen/qd8-f16-qc8w-igemm-1x64c4-minmax-avx512amx.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",
++    ]
+ 
+-  # This is a target that cannot depend on //base.
+-  if (build_with_internal_optimization_guide) {
+-    source_set(
+-        "qd8-f16-qc8w-igemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni-amx-tile-amx-int8_standalone") {
+-      cflags = [
+-        "-mamx-int8",
+-        "-mamx-tile",
+-        "-mavx512bw",
+-        "-mavx512cd",
+-        "-mavx512dq",
+-        "-mavx512f",
+-        "-mavx512vl",
+-        "-mavx512vnni",
+-        "-mf16c",
+-        "-mfma",
+-        "-mgfni",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qd8-f16-qc8w-igemm/gen/qd8-f16-qc8w-igemm-16x64c4-minmax-avx512amx.c",
+-        "src/src/qd8-f16-qc8w-igemm/gen/qd8-f16-qc8w-igemm-1x64c4-minmax-avx512amx.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("qd8-f32-qb4w-gemm_avx-no-avx2-no-f16c-no-fma") {
+-      cflags = [
+-        "-mavx",
+-        "-mno-avx2",
+-        "-mno-f16c",
+-        "-mno-fma",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qd8-f32-qb4w-gemm/gen/qd8-f32-qb4w-gemm-1x4c8-minmax-avx-ld128.c",
+-        "src/src/qd8-f32-qb4w-gemm/gen/qd8-f32-qb4w-gemm-4x4c8-minmax-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",
+-      ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
 +  source_set("s8-vclamp_arm64_standalone") {
@@ -84387,27 +73811,125 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +      "src/src/s8-vclamp/s8-vclamp-neon-u64.c",
 +    "src/src/s8-vclamp/s8-vclamp-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("qd8-f32-qb4w-gemm_avx-no-avx2-no-f16c-no-fma_standalone") {
+-      cflags = [
+-        "-mavx",
+-        "-mno-avx2",
+-        "-mno-f16c",
+-        "-mno-fma",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qd8-f32-qb4w-gemm/gen/qd8-f32-qb4w-gemm-1x4c8-minmax-avx-ld128.c",
+-        "src/src/qd8-f32-qb4w-gemm/gen/qd8-f32-qb4w-gemm-4x4c8-minmax-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" ]
+-      }
+-    }
+-  }
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
 +      "//third_party/fxdiv",
 +      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
-+
+ 
+-  if (build_with_chromium) {
+-    source_set("qd8-f32-qb4w-gemm_f16c-fma-avx2") {
+-      cflags = [
+-        "-mavx2",
+-        "-mf16c",
+-        "-mfma",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qd8-f32-qb4w-gemm/gen/qd8-f32-qb4w-gemm-1x8c8-minmax-avx2.c",
+-        "src/src/qd8-f32-qb4w-gemm/gen/qd8-f32-qb4w-gemm-3x8c8-minmax-avx2.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-qb4w-gemm_f16c-fma-avx2_standalone") {
+-      cflags = [
+-        "-mavx2",
+-        "-mf16c",
+-        "-mfma",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qd8-f32-qb4w-gemm/gen/qd8-f32-qb4w-gemm-1x8c8-minmax-avx2.c",
+-        "src/src/qd8-f32-qb4w-gemm/gen/qd8-f32-qb4w-gemm-3x8c8-minmax-avx2.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("subgraph_arm64") {
 +    cflags = [
@@ -84447,23 +73969,128 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +    "src/src/subgraph/unpooling-2d.c",
 +    "src/src/subgraph/validation.c"
 +    ]
-+
+ 
+-  if (build_with_chromium) {
+-    source_set(
+-        "qd8-f32-qb4w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni") {
+-      cflags = [
+-        "-mavx512bw",
+-        "-mavx512cd",
+-        "-mavx512dq",
+-        "-mavx512f",
+-        "-mavx512vl",
+-        "-mavx512vnni",
+-        "-mf16c",
+-        "-mfma",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qd8-f32-qb4w-gemm/gen/qd8-f32-qb4w-gemm-1x16c8-minmax-avx512vnni-prfm.c",
+-        "src/src/qd8-f32-qb4w-gemm/gen/qd8-f32-qb4w-gemm-8x16c8-minmax-avx512vnni-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",
+-      ]
 +    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(
+-        "qd8-f32-qb4w-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/qd8-f32-qb4w-gemm/gen/qd8-f32-qb4w-gemm-1x16c8-minmax-avx512vnni-prfm.c",
+-        "src/src/qd8-f32-qb4w-gemm/gen/qd8-f32-qb4w-gemm-8x16c8-minmax-avx512vnni-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" ]
+-      }
+-    }
 +    public_configs = [ ":xnnpack_public_config" ]
-+  }
+   }
 +}
-+
+ 
+-  if (build_with_chromium) {
+-    source_set(
+-        "qd8-f32-qb4w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni") {
+-      cflags = [
+-        "-mavx512bw",
+-        "-mavx512cd",
+-        "-mavx512dq",
+-        "-mavx512f",
+-        "-mavx512vl",
+-        "-mavx512vnni",
+-        "-mf16c",
+-        "-mfma",
+-        "-mgfni",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qd8-f32-qb4w-gemm/gen/qd8-f32-qb4w-gemm-14x16c8-minmax-avx512vnnigfni-prfm.c",
+-        "src/src/qd8-f32-qb4w-gemm/gen/qd8-f32-qb4w-gemm-1x16c8-minmax-avx512vnnigfni-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("subgraph_arm64_standalone") {
@@ -84504,27 +74131,129 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +    "src/src/subgraph/unpooling-2d.c",
 +    "src/src/subgraph/validation.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-qb4w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni_standalone") {
+-      cflags = [
+-        "-mavx512bw",
+-        "-mavx512cd",
+-        "-mavx512dq",
+-        "-mavx512f",
+-        "-mavx512vl",
+-        "-mavx512vnni",
+-        "-mf16c",
+-        "-mfma",
+-        "-mgfni",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qd8-f32-qb4w-gemm/gen/qd8-f32-qb4w-gemm-14x16c8-minmax-avx512vnnigfni-prfm.c",
+-        "src/src/qd8-f32-qb4w-gemm/gen/qd8-f32-qb4w-gemm-1x16c8-minmax-avx512vnnigfni-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" ]
+-      }
+-    }
+-  }
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
 +      "//third_party/fxdiv",
 +      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
-+
+ 
+-  if (build_with_chromium) {
+-    source_set("qd8-f32-qb4w-gemm_sse2-no-sse3") {
+-      cflags = [
+-        "-mno-sse3",
+-        "-msse2",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qd8-f32-qb4w-gemm/gen/qd8-f32-qb4w-gemm-1x4c8-minmax-sse2-ld128.c",
+-        "src/src/qd8-f32-qb4w-gemm/gen/qd8-f32-qb4w-gemm-4x4c8-minmax-sse2-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",
+-      ]
 +    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-qb4w-gemm_sse2-no-sse3_standalone") {
+-      cflags = [
+-        "-mno-sse3",
+-        "-msse2",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qd8-f32-qb4w-gemm/gen/qd8-f32-qb4w-gemm-1x4c8-minmax-sse2-ld128.c",
+-        "src/src/qd8-f32-qb4w-gemm/gen/qd8-f32-qb4w-gemm-4x4c8-minmax-sse2-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("tables_arm64") {
 +    cflags = [
@@ -84543,23 +74272,85 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +    "src/src/tables/exp2minus-k-over-8.c",
 +    "src/src/tables/vlog.c"
 +    ]
-+
+ 
+-  if (build_with_chromium) {
+-    source_set("qd8-f32-qb4w-gemm_sse4.1-no-sse4.2") {
+-      cflags = [
+-        "-mno-sse4.2",
+-        "-msse4.1",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qd8-f32-qb4w-gemm/gen/qd8-f32-qb4w-gemm-1x4c8-minmax-sse41-ld128.c",
+-        "src/src/qd8-f32-qb4w-gemm/gen/qd8-f32-qb4w-gemm-3x4c8-minmax-sse41-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",
+-      ]
 +    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("qd8-f32-qb4w-gemm_sse4.1-no-sse4.2_standalone") {
+-      cflags = [
+-        "-mno-sse4.2",
+-        "-msse4.1",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qd8-f32-qb4w-gemm/gen/qd8-f32-qb4w-gemm-1x4c8-minmax-sse41-ld128.c",
+-        "src/src/qd8-f32-qb4w-gemm/gen/qd8-f32-qb4w-gemm-3x4c8-minmax-sse41-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" ]
+-      }
+-    }
 +    public_configs = [ ":xnnpack_public_config" ]
-+  }
+   }
 +}
-+
+ 
+-  if (build_with_chromium) {
+-    source_set("qd8-f32-qb4w-gemm_x64") {
+-      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
 +  source_set("tables_arm64_standalone") {
@@ -84579,27 +74370,73 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +    "src/src/tables/exp2minus-k-over-8.c",
 +    "src/src/tables/vlog.c"
 +    ]
-+
+ 
+-      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",
+-      ]
 +    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("qd8-f32-qb4w-gemm_x64_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",
+-      ]
+-
+-      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("u8-ibilinear_arm64") {
 +    cflags = [
@@ -84612,23 +74449,117 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +    "src/src/u8-ibilinear/gen/u8-ibilinear-neon-u8.c",
 +    "src/src/u8-ibilinear/gen/u8-ibilinear-scalar-u1.c"
 +    ]
-+
+ 
+-  if (build_with_chromium) {
+-    source_set("qd8-f32-qc2w-gemm_avx2-avxvnni-f16c-fma-gfni") {
+-      cflags = [
+-        "-mavx2",
+-        "-mavxvnni",
+-        "-mf16c",
+-        "-mfma",
+-        "-mgfni",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qd8-f32-qc2w-gemm/gen/qd8-f32-qc2w-gemm-1x8c8-minmax-avxvnni.c",
+-        "src/src/qd8-f32-qc2w-gemm/gen/qd8-f32-qc2w-gemm-5x8c8-minmax-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",
+-      ]
 +    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("qd8-f32-qc2w-gemm_avx2-avxvnni-f16c-fma-gfni_standalone") {
+-      cflags = [
+-        "-mavx2",
+-        "-mavxvnni",
+-        "-mf16c",
+-        "-mfma",
+-        "-mgfni",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qd8-f32-qc2w-gemm/gen/qd8-f32-qc2w-gemm-1x8c8-minmax-avxvnni.c",
+-        "src/src/qd8-f32-qc2w-gemm/gen/qd8-f32-qc2w-gemm-5x8c8-minmax-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" ]
+-      }
+-    }
 +    public_configs = [ ":xnnpack_public_config" ]
-+  }
+   }
 +}
-+
+ 
+-  if (build_with_chromium) {
+-    source_set("qd8-f32-qc2w-gemm_f16c-fma-avx2") {
+-      cflags = [
+-        "-mavx2",
+-        "-mf16c",
+-        "-mfma",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qd8-f32-qc2w-gemm/gen/qd8-f32-qc2w-gemm-1x8c8-minmax-avx2-madd.c",
+-        "src/src/qd8-f32-qc2w-gemm/gen/qd8-f32-qc2w-gemm-8x8c8-minmax-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",
+-      ]
+-
+-      public_configs = [ ":xnnpack_public_config" ]
+-    }
+-  }
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
 +  source_set("u8-ibilinear_arm64_standalone") {
@@ -84642,27 +74573,127 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +    "src/src/u8-ibilinear/gen/u8-ibilinear-neon-u8.c",
 +    "src/src/u8-ibilinear/gen/u8-ibilinear-scalar-u1.c"
 +    ]
-+
+ 
+-  # This is a target that cannot depend on //base.
+-  if (build_with_internal_optimization_guide) {
+-    source_set("qd8-f32-qc2w-gemm_f16c-fma-avx2_standalone") {
+-      cflags = [
+-        "-mavx2",
+-        "-mf16c",
+-        "-mfma",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qd8-f32-qc2w-gemm/gen/qd8-f32-qc2w-gemm-1x8c8-minmax-avx2-madd.c",
+-        "src/src/qd8-f32-qc2w-gemm/gen/qd8-f32-qc2w-gemm-8x8c8-minmax-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: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("qd8-f32-qc2w-gemm_ssse3-no-sse4.1") {
+-      cflags = [
+-        "-mno-sse4.1",
+-        "-mssse3",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qd8-f32-qc2w-gemm/gen/qd8-f32-qc2w-gemm-1x4c8-minmax-ssse3-madd.c",
+-        "src/src/qd8-f32-qc2w-gemm/gen/qd8-f32-qc2w-gemm-4x4c8-minmax-ssse3-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",
+-      ]
 +    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" ]
-+
+ 
+-  # This is a target that cannot depend on //base.
+-  if (build_with_internal_optimization_guide) {
+-    source_set("qd8-f32-qc2w-gemm_ssse3-no-sse4.1_standalone") {
+-      cflags = [
+-        "-mno-sse4.1",
+-        "-mssse3",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qd8-f32-qc2w-gemm/gen/qd8-f32-qc2w-gemm-1x4c8-minmax-ssse3-madd.c",
+-        "src/src/qd8-f32-qc2w-gemm/gen/qd8-f32-qc2w-gemm-4x4c8-minmax-ssse3-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: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-f32-qc2w-gemm_x64") {
+-      cflags = []
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qd8-f32-qc2w-gemm/gen/qd8-f32-qc2w-gemm-1x2-minmax-scalar.c",
+-      ]
 +if (build_with_chromium) {
 +  source_set("u8-lut32norm_arm64") {
 +    cflags = [
@@ -84673,23 +74704,39 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +      "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" ]
 +    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) {
+-    source_set("qd8-f32-qc2w-gemm_x64_standalone") {
+-      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
 +  source_set("u8-lut32norm_arm64_standalone") {
@@ -84701,29 +74748,142 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +      "src/include/xnnpack.h",
 +      "src/src/u8-lut32norm/u8-lut32norm-scalar.c"
 +    ]
-+
+ 
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qd8-f32-qc2w-gemm/gen/qd8-f32-qc2w-gemm-1x2-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" ]
+-      }
+-    }
+-  }
 +    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("u8-maxpool_arm64") {
+ 
+-  if (build_with_chromium) {
+-    source_set("qd8-f32-qc4w-gemm_avx2-avxvnni-f16c-fma-gfni") {
+-      cflags = [
+-        "-mavx2",
+-        "-mavxvnni",
+-        "-mf16c",
+-        "-mfma",
+-        "-mgfni",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-1x8c8-minmax-avxvnni-prfm.c",
+-        "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-5x8c8-minmax-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: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("qd8-f32-qc4w-gemm_avx2-avxvnni-f16c-fma-gfni_standalone") {
+-      cflags = [
+-        "-mavx2",
+-        "-mavxvnni",
+-        "-mf16c",
+-        "-mfma",
+-        "-mgfni",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-1x8c8-minmax-avxvnni-prfm.c",
+-        "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-5x8c8-minmax-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: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-f32-qc4w-gemm_f16c-fma-avx2") {
+-      cflags = [
+-        "-mavx2",
+-        "-mf16c",
+-        "-mfma",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-1x8c8-minmax-avx2-madd-prfm.c",
+-        "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-4x8c8-minmax-avx2-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",
+-      ]
++if (build_with_chromium) {
++  source_set("u8-maxpool_arm64") {
 +    cflags = [
 +  
 +    ]
@@ -84733,12 +74893,48 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +      "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" ]
+-    }
+-  }
 +    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_f16c-fma-avx2_standalone") {
+-      cflags = [
+-        "-mavx2",
+-        "-mf16c",
+-        "-mfma",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-1x8c8-minmax-avx2-madd-prfm.c",
+-        "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-4x8c8-minmax-avx2-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" ]
+-      }
+-    }
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
@@ -84747,9 +74943,41 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +    ]
 +
 +    public_configs = [ ":xnnpack_public_config" ]
-+  }
+   }
 +}
-+
+ 
+-  if (build_with_chromium) {
+-    source_set(
+-        "qd8-f32-qc4w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
+-      cflags = [
+-        "-mavx512bw",
+-        "-mavx512cd",
+-        "-mavx512dq",
+-        "-mavx512f",
+-        "-mavx512vl",
+-        "-mf16c",
+-        "-mfma",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-1x16c8-minmax-avx512skx-madd-prfm.c",
+-        "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-1x8c8-minmax-avx256skx-madd-prfm.c",
+-        "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-8x16c8-minmax-avx512skx-madd-prfm.c",
+-        "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-8x8c8-minmax-avx256skx-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",
+-      ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
 +  source_set("u8-maxpool_arm64_standalone") {
@@ -84762,27 +74990,143 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +      "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" ]
+-    }
+-  }
 +    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_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") {
+-      cflags = [
+-        "-mavx512bw",
+-        "-mavx512cd",
+-        "-mavx512dq",
+-        "-mavx512f",
+-        "-mavx512vl",
+-        "-mf16c",
+-        "-mfma",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-1x16c8-minmax-avx512skx-madd-prfm.c",
+-        "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-1x8c8-minmax-avx256skx-madd-prfm.c",
+-        "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-8x16c8-minmax-avx512skx-madd-prfm.c",
+-        "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-8x8c8-minmax-avx256skx-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" ]
+-      }
+-    }
+-  }
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
 +      "//third_party/fxdiv",
 +      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
-+
+ 
+-  if (build_with_chromium) {
+-    source_set(
+-        "qd8-f32-qc4w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni") {
+-      cflags = [
+-        "-mavx512bw",
+-        "-mavx512cd",
+-        "-mavx512dq",
+-        "-mavx512f",
+-        "-mavx512vl",
+-        "-mavx512vnni",
+-        "-mf16c",
+-        "-mfma",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-1x16c8-minmax-avx512vnni-prfm.c",
+-        "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-8x16c8-minmax-avx512vnni-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(
+-        "qd8-f32-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/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-1x16c8-minmax-avx512vnni-prfm.c",
+-        "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-8x16c8-minmax-avx512vnni-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("u8-rdminmax_arm64") {
 +    cflags = [
@@ -84796,23 +75140,132 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +    "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) {
+-    source_set(
+-        "qd8-f32-qc4w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni") {
+-      cflags = [
+-        "-mavx512bw",
+-        "-mavx512cd",
+-        "-mavx512dq",
+-        "-mavx512f",
+-        "-mavx512vl",
+-        "-mavx512vnni",
+-        "-mf16c",
+-        "-mfma",
+-        "-mgfni",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-14x16c8-minmax-avx512vnnigfni-prfm.c",
+-        "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-1x16c8-minmax-avx512vnnigfni-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",
+-      ]
 +    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(
+-        "qd8-f32-qc4w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni_standalone") {
+-      cflags = [
+-        "-mavx512bw",
+-        "-mavx512cd",
+-        "-mavx512dq",
+-        "-mavx512f",
+-        "-mavx512vl",
+-        "-mavx512vnni",
+-        "-mf16c",
+-        "-mfma",
+-        "-mgfni",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-14x16c8-minmax-avx512vnnigfni-prfm.c",
+-        "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-1x16c8-minmax-avx512vnnigfni-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" ]
+-      }
+-    }
 +    public_configs = [ ":xnnpack_public_config" ]
-+  }
+   }
 +}
-+
+ 
+-  if (build_with_chromium) {
+-    source_set(
+-        "qd8-f32-qc4w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni-amx-tile-amx-int8") {
+-      cflags = [
+-        "-mamx-int8",
+-        "-mamx-tile",
+-        "-mavx512bw",
+-        "-mavx512cd",
+-        "-mavx512dq",
+-        "-mavx512f",
+-        "-mavx512vl",
+-        "-mavx512vnni",
+-        "-mf16c",
+-        "-mfma",
+-        "-mgfni",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-16x64c4-minmax-avx512amx.c",
+-        "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-1x64c4-minmax-avx512amx.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("u8-rdminmax_arm64_standalone") {
@@ -84827,27 +75280,131 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +    "src/src/u8-rdminmax/gen/u8-rdmin-2p2x-neon-u32.c",
 +    "src/src/u8-rdminmax/gen/u8-rdmin-2p2x-scalar-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" ]
-+
+ 
+-  # This is a target that cannot depend on //base.
+-  if (build_with_internal_optimization_guide) {
+-    source_set(
+-        "qd8-f32-qc4w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni-amx-tile-amx-int8_standalone") {
+-      cflags = [
+-        "-mamx-int8",
+-        "-mamx-tile",
+-        "-mavx512bw",
+-        "-mavx512cd",
+-        "-mavx512dq",
+-        "-mavx512f",
+-        "-mavx512vl",
+-        "-mavx512vnni",
+-        "-mf16c",
+-        "-mfma",
+-        "-mgfni",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-16x64c4-minmax-avx512amx.c",
+-        "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-1x64c4-minmax-avx512amx.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" ]
+-      }
+-    }
+-  }
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
 +      "//third_party/fxdiv",
 +      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
-+
+ 
+-  if (build_with_chromium) {
+-    source_set("qd8-f32-qc4w-gemm_sse2-no-sse3") {
+-      cflags = [
+-        "-mno-sse3",
+-        "-msse2",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-1x4c8-minmax-sse2-ld128.c",
+-        "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-4x4c8-minmax-sse2-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",
+-      ]
 +    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_sse2-no-sse3_standalone") {
+-      cflags = [
+-        "-mno-sse3",
+-        "-msse2",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-1x4c8-minmax-sse2-ld128.c",
+-        "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-4x4c8-minmax-sse2-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("u8-rminmax_arm64") {
 +    cflags = [
@@ -84863,23 +75420,85 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +    "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) {
+-    source_set("qd8-f32-qc4w-gemm_ssse3-no-sse4.1") {
+-      cflags = [
+-        "-mno-sse4.1",
+-        "-mssse3",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-1x4c8-minmax-ssse3-madd-prfm.c",
+-        "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-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",
+-      ]
 +    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("qd8-f32-qc4w-gemm_ssse3-no-sse4.1_standalone") {
+-      cflags = [
+-        "-mno-sse4.1",
+-        "-mssse3",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-1x4c8-minmax-ssse3-madd-prfm.c",
+-        "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-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: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("qd8-f32-qc4w-gemm_x64") {
+-      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
 +  source_set("u8-rminmax_arm64_standalone") {
@@ -84896,27 +75515,73 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +    "src/src/u8-rminmax/gen/u8-rminmax-neon-u32-acc2.c",
 +    "src/src/u8-rminmax/gen/u8-rminmax-scalar-u2-acc2.c"
 +    ]
-+
+ 
+-      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",
+-      ]
 +    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("qd8-f32-qc4w-gemm_x64_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",
+-      ]
+-
+-      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("u8-vclamp_arm64") {
 +    cflags = [
@@ -84928,23 +75593,113 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +      "src/src/u8-vclamp/u8-vclamp-neon-u64.c",
 +    "src/src/u8-vclamp/u8-vclamp-scalar-u4.c"
 +    ]
-+
+ 
+-  if (build_with_chromium) {
+-    source_set("qd8-f32-qc8w-gemm_avx2-avxvnni-f16c-fma-gfni") {
+-      cflags = [
+-        "-mavx2",
+-        "-mavxvnni",
+-        "-mf16c",
+-        "-mfma",
+-        "-mgfni",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-1x8c8-minmax-avxvnni-prfm.c",
+-        "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-5x8c8-minmax-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",
+-      ]
 +    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("qd8-f32-qc8w-gemm_avx2-avxvnni-f16c-fma-gfni_standalone") {
+-      cflags = [
+-        "-mavx2",
+-        "-mavxvnni",
+-        "-mf16c",
+-        "-mfma",
+-        "-mgfni",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-1x8c8-minmax-avxvnni-prfm.c",
+-        "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-5x8c8-minmax-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: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("qd8-f32-qc8w-gemm_f16c-fma-avx2") {
+-      cflags = [
+-        "-mavx2",
+-        "-mf16c",
+-        "-mfma",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-1x8c8-minmax-avx2.c",
+-        "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-4x8c8-minmax-avx2.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("u8-vclamp_arm64_standalone") {
@@ -84957,27 +75712,138 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +      "src/src/u8-vclamp/u8-vclamp-neon-u64.c",
 +    "src/src/u8-vclamp/u8-vclamp-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("qd8-f32-qc8w-gemm_f16c-fma-avx2_standalone") {
+-      cflags = [
+-        "-mavx2",
+-        "-mf16c",
+-        "-mfma",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-1x8c8-minmax-avx2.c",
+-        "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-4x8c8-minmax-avx2.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" ]
+-      }
+-    }
+-  }
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
 +      "//third_party/fxdiv",
 +      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
-+
+ 
+-  if (build_with_chromium) {
+-    source_set(
+-        "qd8-f32-qc8w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
+-      cflags = [
+-        "-mavx512bw",
+-        "-mavx512cd",
+-        "-mavx512dq",
+-        "-mavx512f",
+-        "-mavx512vl",
+-        "-mf16c",
+-        "-mfma",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-1x16c8-minmax-avx512skx-prfm.c",
+-        "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-1x8c8-minmax-avx256skx.c",
+-        "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-8x16c8-minmax-avx512skx-prfm.c",
+-        "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-8x8c8-minmax-avx256skx.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-qc8w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") {
+-      cflags = [
+-        "-mavx512bw",
+-        "-mavx512cd",
+-        "-mavx512dq",
+-        "-mavx512f",
+-        "-mavx512vl",
+-        "-mf16c",
+-        "-mfma",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-1x16c8-minmax-avx512skx-prfm.c",
+-        "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-1x8c8-minmax-avx256skx.c",
+-        "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-8x16c8-minmax-avx512skx-prfm.c",
+-        "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-8x8c8-minmax-avx256skx.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("x16-pack-lh_arch=armv8.2-a+sve+sve2") {
 +    cflags = [
@@ -84991,23 +75857,130 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +    "src/src/x16-pack-lh/x16-packlh-neonsme.c",
 +    "src/src/x16-pack-lh/x16-packlh-neonsme2.c"
 +    ]
-+
+ 
+-  if (build_with_chromium) {
+-    source_set(
+-        "qd8-f32-qc8w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni") {
+-      cflags = [
+-        "-mavx512bw",
+-        "-mavx512cd",
+-        "-mavx512dq",
+-        "-mavx512f",
+-        "-mavx512vl",
+-        "-mavx512vnni",
+-        "-mf16c",
+-        "-mfma",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-10x16c8-minmax-avx512vnni-prfm.c",
+-        "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-1x16c8-minmax-avx512vnni-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",
+-      ]
 +    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(
+-        "qd8-f32-qc8w-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/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-10x16c8-minmax-avx512vnni-prfm.c",
+-        "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-1x16c8-minmax-avx512vnni-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" ]
+-      }
+-    }
 +    public_configs = [ ":xnnpack_public_config" ]
-+  }
+   }
 +}
-+
+ 
+-  if (build_with_chromium) {
+-    source_set(
+-        "qd8-f32-qc8w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni-amx-tile-amx-int8") {
+-      cflags = [
+-        "-mamx-int8",
+-        "-mamx-tile",
+-        "-mavx512bw",
+-        "-mavx512cd",
+-        "-mavx512dq",
+-        "-mavx512f",
+-        "-mavx512vl",
+-        "-mavx512vnni",
+-        "-mf16c",
+-        "-mfma",
+-        "-mgfni",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-16x64c4-minmax-avx512amx.c",
+-        "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-1x64c4-minmax-avx512amx.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("x16-pack-lh_arch=armv8.2-a+sve+sve2_standalone") {
@@ -85022,27 +75995,131 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +    "src/src/x16-pack-lh/x16-packlh-neonsme.c",
 +    "src/src/x16-pack-lh/x16-packlh-neonsme2.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-qc8w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni-amx-tile-amx-int8_standalone") {
+-      cflags = [
+-        "-mamx-int8",
+-        "-mamx-tile",
+-        "-mavx512bw",
+-        "-mavx512cd",
+-        "-mavx512dq",
+-        "-mavx512f",
+-        "-mavx512vl",
+-        "-mavx512vnni",
+-        "-mf16c",
+-        "-mfma",
+-        "-mgfni",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-16x64c4-minmax-avx512amx.c",
+-        "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-1x64c4-minmax-avx512amx.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" ]
+-      }
+-    }
+-  }
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
 +      "//third_party/fxdiv",
 +      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
-+
+ 
+-  if (build_with_chromium) {
+-    source_set("qd8-f32-qc8w-gemm_sse2-no-sse3") {
+-      cflags = [
+-        "-mno-sse3",
+-        "-msse2",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-1x4c8-minmax-sse2-ld64.c",
+-        "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-4x4c8-minmax-sse2-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",
+-      ]
 +    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-qc8w-gemm_sse2-no-sse3_standalone") {
+-      cflags = [
+-        "-mno-sse3",
+-        "-msse2",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-1x4c8-minmax-sse2-ld64.c",
+-        "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-4x4c8-minmax-sse2-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:pthreadpool_standalone",
+-      ]
+-
+-      public_configs = [ ":xnnpack_public_config" ]
+-
+-      if (!(is_android && use_order_profiling)) {
+-        assert_no_deps = [ "//base" ]
+-      }
+-    }
+-  }
 +if (build_with_chromium) {
 +  source_set("x16-packw_arm64") {
 +    cflags = [
@@ -85054,27 +76131,88 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +      "src/src/x16-packw/gen/x16-packw-x16-gemm-gio-scalar.c",
 +    "src/src/x16-packw/gen/x16-packw-x16-gemm-goi-neon-ld4lane-u8-prfm.c",
 +    "src/src/x16-packw/gen/x16-packw-x32-gemm-gio-scalar.c",
-+    "src/src/x16-packw/gen/x16-packw-x32-gemm-goi-scalar-int-u4.c",
 +    "src/src/x16-packw/gen/x16-packw-x8-gemm-gio-scalar.c",
 +    "src/src/x16-packw/gen/x16-packw-x8-gemm-goi-neon-ld4lane-u8-prfm.c"
 +    ]
-+
+ 
+-  if (build_with_chromium) {
+-    source_set("qd8-f32-qc8w-gemm_sse4.1-no-sse4.2") {
+-      cflags = [
+-        "-mno-sse4.2",
+-        "-msse4.1",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-1x4c8-minmax-sse41-ld64.c",
+-        "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-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",
+-      ]
 +    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("qd8-f32-qc8w-gemm_sse4.1-no-sse4.2_standalone") {
+-      cflags = [
+-        "-mno-sse4.2",
+-        "-msse4.1",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-1x4c8-minmax-sse41-ld64.c",
+-        "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-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: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("qd8-f32-qc8w-gemm_x64") {
+-      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
 +  source_set("x16-packw_arm64_standalone") {
@@ -85087,31 +76225,78 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +      "src/src/x16-packw/gen/x16-packw-x16-gemm-gio-scalar.c",
 +    "src/src/x16-packw/gen/x16-packw-x16-gemm-goi-neon-ld4lane-u8-prfm.c",
 +    "src/src/x16-packw/gen/x16-packw-x32-gemm-gio-scalar.c",
-+    "src/src/x16-packw/gen/x16-packw-x32-gemm-goi-scalar-int-u4.c",
 +    "src/src/x16-packw/gen/x16-packw-x8-gemm-gio-scalar.c",
 +    "src/src/x16-packw/gen/x16-packw-x8-gemm-goi-neon-ld4lane-u8-prfm.c"
 +    ]
-+
+ 
+-      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",
+-      ]
 +    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("qd8-f32-qc8w-gemm_x64_standalone") {
+-      cflags = []
+-
+-      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",
+-      ]
+-
+-      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("x16-transposec_arm64") {
 +    cflags = [
@@ -85123,23 +76308,113 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +      "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) {
+-    source_set("qd8-f32-qc8w-igemm_avx2-avxvnni-f16c-fma-gfni") {
+-      cflags = [
+-        "-mavx2",
+-        "-mavxvnni",
+-        "-mf16c",
+-        "-mfma",
+-        "-mgfni",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-1x8c8-minmax-avxvnni-prfm.c",
+-        "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-5x8c8-minmax-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",
+-      ]
 +    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("qd8-f32-qc8w-igemm_avx2-avxvnni-f16c-fma-gfni_standalone") {
+-      cflags = [
+-        "-mavx2",
+-        "-mavxvnni",
+-        "-mf16c",
+-        "-mfma",
+-        "-mgfni",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-1x8c8-minmax-avxvnni-prfm.c",
+-        "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-5x8c8-minmax-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: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("qd8-f32-qc8w-igemm_f16c-fma-avx2") {
+-      cflags = [
+-        "-mavx2",
+-        "-mf16c",
+-        "-mfma",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-1x8c8-minmax-avx2.c",
+-        "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-4x8c8-minmax-avx2.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("x16-transposec_arm64_standalone") {
@@ -85152,27 +76427,138 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +      "src/src/x16-transposec/gen/x16-transposec-2x4-scalar-int.c",
 +    "src/src/x16-transposec/gen/x16-transposec-8x8-reuse-dec-zip-neon.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-qc8w-igemm_f16c-fma-avx2_standalone") {
+-      cflags = [
+-        "-mavx2",
+-        "-mf16c",
+-        "-mfma",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-1x8c8-minmax-avx2.c",
+-        "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-4x8c8-minmax-avx2.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" ]
+-      }
+-    }
+-  }
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
 +      "//third_party/fxdiv",
 +      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
-+
+ 
+-  if (build_with_chromium) {
+-    source_set(
+-        "qd8-f32-qc8w-igemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
+-      cflags = [
+-        "-mavx512bw",
+-        "-mavx512cd",
+-        "-mavx512dq",
+-        "-mavx512f",
+-        "-mavx512vl",
+-        "-mf16c",
+-        "-mfma",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-1x16c8-minmax-avx512skx-prfm.c",
+-        "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-1x8c8-minmax-avx256skx.c",
+-        "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-8x16c8-minmax-avx512skx-prfm.c",
+-        "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-8x8c8-minmax-avx256skx.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-qc8w-igemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") {
+-      cflags = [
+-        "-mavx512bw",
+-        "-mavx512cd",
+-        "-mavx512dq",
+-        "-mavx512f",
+-        "-mavx512vl",
+-        "-mf16c",
+-        "-mfma",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-1x16c8-minmax-avx512skx-prfm.c",
+-        "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-1x8c8-minmax-avx256skx.c",
+-        "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-8x16c8-minmax-avx512skx-prfm.c",
+-        "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-8x8c8-minmax-avx256skx.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("x16-x32-packw_arm64") {
 +    cflags = [
@@ -85184,23 +76570,130 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +      "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"
 +    ]
-+
+ 
+-  if (build_with_chromium) {
+-    source_set(
+-        "qd8-f32-qc8w-igemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni") {
+-      cflags = [
+-        "-mavx512bw",
+-        "-mavx512cd",
+-        "-mavx512dq",
+-        "-mavx512f",
+-        "-mavx512vl",
+-        "-mavx512vnni",
+-        "-mf16c",
+-        "-mfma",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-10x16c8-minmax-avx512vnni-prfm.c",
+-        "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-1x16c8-minmax-avx512vnni-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",
+-      ]
 +    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(
+-        "qd8-f32-qc8w-igemm_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/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-10x16c8-minmax-avx512vnni-prfm.c",
+-        "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-1x16c8-minmax-avx512vnni-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" ]
+-      }
+-    }
 +    public_configs = [ ":xnnpack_public_config" ]
-+  }
+   }
 +}
-+
+ 
+-  if (build_with_chromium) {
+-    source_set(
+-        "qd8-f32-qc8w-igemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni-amx-tile-amx-int8") {
+-      cflags = [
+-        "-mamx-int8",
+-        "-mamx-tile",
+-        "-mavx512bw",
+-        "-mavx512cd",
+-        "-mavx512dq",
+-        "-mavx512f",
+-        "-mavx512vl",
+-        "-mavx512vnni",
+-        "-mf16c",
+-        "-mfma",
+-        "-mgfni",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-16x64c4-minmax-avx512amx.c",
+-        "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-1x64c4-minmax-avx512amx.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("x16-x32-packw_arm64_standalone") {
@@ -85213,27 +76706,131 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +      "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" ]
+-    }
+-  }
 +    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-qc8w-igemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni-amx-tile-amx-int8_standalone") {
+-      cflags = [
+-        "-mamx-int8",
+-        "-mamx-tile",
+-        "-mavx512bw",
+-        "-mavx512cd",
+-        "-mavx512dq",
+-        "-mavx512f",
+-        "-mavx512vl",
+-        "-mavx512vnni",
+-        "-mf16c",
+-        "-mfma",
+-        "-mgfni",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-16x64c4-minmax-avx512amx.c",
+-        "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-1x64c4-minmax-avx512amx.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" ]
+-      }
+-    }
+-  }
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
 +      "//third_party/fxdiv",
 +      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
-+
+ 
+-  if (build_with_chromium) {
+-    source_set("qd8-f32-qc8w-igemm_sse2-no-sse3") {
+-      cflags = [
+-        "-mno-sse3",
+-        "-msse2",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-1x4c8-minmax-sse2-ld64.c",
+-        "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-4x4c8-minmax-sse2-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",
+-      ]
 +    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-qc8w-igemm_sse2-no-sse3_standalone") {
+-      cflags = [
+-        "-mno-sse3",
+-        "-msse2",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-1x4c8-minmax-sse2-ld64.c",
+-        "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-4x4c8-minmax-sse2-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:pthreadpool_standalone",
+-      ]
+-
+-      public_configs = [ ":xnnpack_public_config" ]
+-
+-      if (!(is_android && use_order_profiling)) {
+-        assert_no_deps = [ "//base" ]
+-      }
+-    }
+-  }
 +if (build_with_chromium) {
 +  source_set("x24-transposec_arm64") {
 +    cflags = [
@@ -85246,23 +76843,85 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +    "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) {
+-    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",
+-      ]
 +    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("qd8-f32-qc8w-igemm_sse4.1-no-sse4.2_standalone") {
+-      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: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("qd8-f32-qc8w-igemm_x64") {
+-      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
 +  source_set("x24-transposec_arm64_standalone") {
@@ -85276,27 +76935,75 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +    "src/src/x24-transposec/x24-transposec-2x2-neon-tbl64.c",
 +    "src/src/x24-transposec/x24-transposec-4x4-aarch64-neon-tbl128.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" ]
 +    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-qc8w-igemm_x64_standalone") {
+-      cflags = []
+-
+-      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 (build_with_chromium) {
 +  source_set("x32-pack-lh_arch=armv8.2-a+sve+sve2") {
 +    cflags = [
@@ -85310,23 +77017,111 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +    "src/src/x32-pack-lh/x32-packlh-neonsme.c",
 +    "src/src/x32-pack-lh/x32-packlh-neonsme2.c"
 +    ]
-+
+ 
+-  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",
+-      ]
 +    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-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" ]
+-      }
+-    }
 +    public_configs = [ ":xnnpack_public_config" ]
-+  }
+   }
 +}
-+
+ 
+-  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",
+-      ]
 +# 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") {
@@ -85341,27 +77136,134 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +    "src/src/x32-pack-lh/x32-packlh-neonsme.c",
 +    "src/src/x32-pack-lh/x32-packlh-neonsme2.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("qs8-dwconv_f16c-fma-avx2_standalone") {
+-      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:pthreadpool_standalone",
+-      ]
+-
+-      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",
 +    ]
-+
+ 
+-  if (build_with_chromium) {
+-    source_set(
+-        "qs8-dwconv_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
+-      cflags = [
+-        "-mavx512bw",
+-        "-mavx512cd",
+-        "-mavx512dq",
+-        "-mavx512f",
+-        "-mavx512vl",
+-        "-mf16c",
+-        "-mfma",
+-      ]
+-
+-      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",
+-      ]
+-
+-      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-dwconv_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") {
+-      cflags = [
+-        "-mavx512bw",
+-        "-mavx512cd",
+-        "-mavx512dq",
+-        "-mavx512f",
+-        "-mavx512vl",
+-        "-mf16c",
+-        "-mfma",
+-      ]
+-
+-      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",
+-      ]
+-
+-      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("x32-packw_arm64") {
 +    cflags = [
@@ -85385,23 +77287,110 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +    "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) {
+-    source_set("qs8-dwconv_sse2-no-sse3") {
+-      cflags = [
+-        "-mno-sse3",
+-        "-msse2",
+-      ]
+-
+-      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",
+-      ]
+-
+-      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",
 +    ]
-+
+ 
+-  # 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",
+-      ]
+-
+-      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",
+-      ]
+-
+-      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("qs8-dwconv_sse4.1-no-sse4.2") {
+-      cflags = [
+-        "-mno-sse4.2",
+-        "-msse4.1",
+-      ]
+-
+-      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",
+-      ]
+-
+-      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("x32-packw_arm64_standalone") {
@@ -85426,27 +77415,87 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +    "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"
 +    ]
-+
+ 
+-  # 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-sse4.2",
+-        "-msse4.1",
+-      ]
+-
+-      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",
+-      ]
+-
+-      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-dwconv_x64") {
+-      cflags = []
 +    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-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",
+-      ]
 +    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("x32-transposec_arm64") {
 +    cflags = [
@@ -85459,23 +77508,109 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +    "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 = [
+-        "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" ]
+-      }
+-    }
+-  }
 +    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-f16-vcvt_f16c-fma-avx2") {
+-      cflags = [
+-        "-mavx2",
+-        "-mf16c",
+-        "-mfma",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qs8-f16-vcvt/gen/qs8-f16-vcvt-avx2-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",
+-      ]
 +    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("qs8-f16-vcvt_f16c-fma-avx2_standalone") {
+-      cflags = [
+-        "-mavx2",
+-        "-mf16c",
+-        "-mfma",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qs8-f16-vcvt/gen/qs8-f16-vcvt-avx2-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" ]
+-      }
+-    }
+-  }
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
 +  source_set("x32-transposec_arm64_standalone") {
@@ -85489,27 +77624,111 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +    "src/src/x32-transposec/gen/x32-transposec-4x4-reuse-dec-zip-neon.c",
 +    "src/src/x32-transposec/x32-transposec-4x4-aarch64-neon-tbl128.c"
 +    ]
-+
+ 
+-  if (build_with_chromium) {
+-    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-f32-vcvt/gen/qs8-f32-vcvt-avx-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",
+-      ]
 +    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("qs8-f32-vcvt_avx-no-avx2-no-f16c-no-fma_standalone") {
+-      cflags = [
+-        "-mavx",
+-        "-mno-avx2",
+-        "-mno-f16c",
+-        "-mno-fma",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qs8-f32-vcvt/gen/qs8-f32-vcvt-avx-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",
+-      ]
+-
+-      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" ]
-+    }
-+  }
+     }
+   }
 +}
-+
+ 
+-  if (build_with_chromium) {
+-    source_set("qs8-f32-vcvt_f16c-fma-avx2") {
+-      cflags = [
+-        "-mavx2",
+-        "-mf16c",
+-        "-mfma",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qs8-f32-vcvt/gen/qs8-f32-vcvt-avx2-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",
+-      ]
 +if (build_with_chromium) {
 +  source_set("x32-unpool_arm64") {
 +    cflags = [
@@ -85521,12 +77740,47 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +      "src/src/x32-unpool/x32-unpool-neon.c",
 +    "src/src/x32-unpool/x32-unpool-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("qs8-f32-vcvt_f16c-fma-avx2_standalone") {
+-      cflags = [
+-        "-mavx2",
+-        "-mf16c",
+-        "-mfma",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qs8-f32-vcvt/gen/qs8-f32-vcvt-avx2-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" ]
+-      }
+-    }
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
@@ -85535,9 +77789,38 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +    ]
 +
 +    public_configs = [ ":xnnpack_public_config" ]
-+  }
+   }
 +}
-+
+ 
+-  if (build_with_chromium) {
+-    source_set(
+-        "qs8-f32-vcvt_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
+-      cflags = [
+-        "-mavx512bw",
+-        "-mavx512cd",
+-        "-mavx512dq",
+-        "-mavx512f",
+-        "-mavx512vl",
+-        "-mf16c",
+-        "-mfma",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qs8-f32-vcvt/gen/qs8-f32-vcvt-avx512skx-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",
+-      ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
 +  source_set("x32-unpool_arm64_standalone") {
@@ -85550,27 +77833,124 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +      "src/src/x32-unpool/x32-unpool-neon.c",
 +    "src/src/x32-unpool/x32-unpool-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(
+-        "qs8-f32-vcvt_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") {
+-      cflags = [
+-        "-mavx512bw",
+-        "-mavx512cd",
+-        "-mavx512dq",
+-        "-mavx512f",
+-        "-mavx512vl",
+-        "-mf16c",
+-        "-mfma",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qs8-f32-vcvt/gen/qs8-f32-vcvt-avx512skx-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",
+-      ]
+-
+-      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",
 +    ]
-+
+ 
+-  if (build_with_chromium) {
+-    source_set("qs8-f32-vcvt_sse2-no-sse3") {
+-      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",
+-      ]
 +    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_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",
+-      ]
+-
+-      public_configs = [ ":xnnpack_public_config" ]
+-
+-      if (!(is_android && use_order_profiling)) {
+-        assert_no_deps = [ "//base" ]
+-      }
+-    }
+-  }
 +if (build_with_chromium) {
 +  source_set("x64-transposec_arm64") {
 +    cflags = [
@@ -85583,23 +77963,83 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +    "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) {
+-    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",
+-      ]
 +    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-f32-vcvt_sse4.1-no-sse4.2_standalone") {
+-      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: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("qs8-f32-vcvt_x64") {
+-      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
 +  source_set("x64-transposec_arm64_standalone") {
@@ -85613,27 +78053,71 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +    "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 = [
+-        "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 = []
+-
+-      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" ]
+-      }
+-    }
+-  }
 +if (build_with_chromium) {
 +  source_set("x8-lut_arm64") {
 +    cflags = [
@@ -85645,23 +78129,113 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +      "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) {
+-    source_set("qs8-packw_avx2-avxvnni-f16c-fma-gfni") {
+-      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",
+-      ]
 +    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-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" ]
+-      }
+-    }
 +    public_configs = [ ":xnnpack_public_config" ]
-+  }
+   }
 +}
-+
+ 
+-  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-x16c8-gemm-goi-avx2-madd.c",
+-        "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",
+-      ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
 +  source_set("x8-lut_arm64_standalone") {
@@ -85674,27 +78248,138 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +      "src/src/x8-lut/gen/x8-lut-aarch64-neon-tbx128x4-u64.c",
 +    "src/src/x8-lut/gen/x8-lut-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("qs8-packw_f16c-fma-avx2_standalone") {
+-      cflags = [
+-        "-mavx2",
+-        "-mf16c",
+-        "-mfma",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qs8-packw/gen/qs8-packw-x16c8-gemm-goi-avx2-madd.c",
+-        "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:pthreadpool_standalone",
+-      ]
+-
+-      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",
 +    ]
-+
+ 
+-  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",
+-      ]
 +    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_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-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:pthreadpool_standalone",
+-      ]
+-
+-      public_configs = [ ":xnnpack_public_config" ]
+-
+-      if (!(is_android && use_order_profiling)) {
+-        assert_no_deps = [ "//base" ]
+-      }
+-    }
+-  }
 +if (build_with_chromium) {
 +  source_set("x8-pack-lh_arch=armv8.2-a+sve+sve2") {
 +    cflags = [
@@ -85708,23 +78393,54 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +    "src/src/x8-pack-lh/x8-packlh-neonsme.c",
 +    "src/src/x8-pack-lh/x8-packlh-neonsme2.c"
 +    ]
-+
+ 
+-  if (build_with_chromium) {
+-    source_set("qs8-packw_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/qs8-packw/gen/qs8-packw-x16c4-gemm-gio-scalar.c",
+-        "src/src/qs8-packw/gen/qs8-packw-x16c8-gemm-gio-scalar.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-x8c4-gemm-gio-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",
+-      ]
 +    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("qs8-packw_x64_standalone") {
+-      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") {
@@ -85739,27 +78455,150 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +    "src/src/x8-pack-lh/x8-packlh-neonsme.c",
 +    "src/src/x8-pack-lh/x8-packlh-neonsme2.c"
 +    ]
-+
+ 
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qs8-packw/gen/qs8-packw-x16c4-gemm-gio-scalar.c",
+-        "src/src/qs8-packw/gen/qs8-packw-x16c8-gemm-gio-scalar.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-x8c4-gemm-gio-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" ]
+-      }
+-    }
+-  }
 +    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)) {
+ 
+-  if (build_with_chromium) {
+-    source_set("qs8-qc2w-gemm_avx2-avxvnni-f16c-fma-gfni") {
+-      cflags = [
+-        "-mavx2",
+-        "-mavxvnni",
+-        "-mf16c",
+-        "-mfma",
+-        "-mgfni",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qs8-qc2w-gemm/gen/qs8-qc2w-gemm-1x8c8-minmax-fp32-avxvnni.c",
+-        "src/src/qs8-qc2w-gemm/gen/qs8-qc2w-gemm-5x8c8-minmax-fp32-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",
+-      ]
++    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" ]
+ 
+-  # This is a target that cannot depend on //base.
+-  if (build_with_internal_optimization_guide) {
+-    source_set("qs8-qc2w-gemm_avx2-avxvnni-f16c-fma-gfni_standalone") {
+-      cflags = [
+-        "-mavx2",
+-        "-mavxvnni",
+-        "-mf16c",
+-        "-mfma",
+-        "-mgfni",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qs8-qc2w-gemm/gen/qs8-qc2w-gemm-1x8c8-minmax-fp32-avxvnni.c",
+-        "src/src/qs8-qc2w-gemm/gen/qs8-qc2w-gemm-5x8c8-minmax-fp32-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 (!(is_android && use_order_profiling)) {
 +      assert_no_deps = [ "//base" ]
-+    }
-+  }
+     }
+   }
 +}
-+
+ 
+-  if (build_with_chromium) {
+-    source_set("qs8-qc2w-gemm_f16c-fma-avx2") {
+-      cflags = [
+-        "-mavx2",
+-        "-mf16c",
+-        "-mfma",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qs8-qc2w-gemm/gen/qs8-qc2w-gemm-1x8c8-minmax-avx2-madd.c",
+-        "src/src/qs8-qc2w-gemm/gen/qs8-qc2w-gemm-5x8c8-minmax-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",
+-      ]
+-
+-      public_configs = [ ":xnnpack_public_config" ]
+-    }
+-  }
 +if (build_with_chromium) {
 +  source_set("x8-packq_arm64") {
 +    cflags = [
@@ -85768,26 +78607,132 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x8-packq/x8-packq-aarch64-neon-f32qp8-u2.c",
++      "src/src/x8-packq/x8-packq-aarch64-neon-f16qp8-u2.c",
++    "src/src/x8-packq/x8-packq-aarch64-neon-f32qp8-u2.c",
 +    "src/src/x8-packq/x8-packq-scalar-f32qp8-u1.c"
 +    ]
-+
+ 
+-  # This is a target that cannot depend on //base.
+-  if (build_with_internal_optimization_guide) {
+-    source_set("qs8-qc2w-gemm_f16c-fma-avx2_standalone") {
+-      cflags = [
+-        "-mavx2",
+-        "-mf16c",
+-        "-mfma",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qs8-qc2w-gemm/gen/qs8-qc2w-gemm-1x8c8-minmax-avx2-madd.c",
+-        "src/src/qs8-qc2w-gemm/gen/qs8-qc2w-gemm-5x8c8-minmax-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: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-qc2w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
+-      cflags = [
+-        "-mavx512bw",
+-        "-mavx512cd",
+-        "-mavx512dq",
+-        "-mavx512f",
+-        "-mavx512vl",
+-        "-mf16c",
+-        "-mfma",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qs8-qc2w-gemm/gen/qs8-qc2w-gemm-1x8c8-minmax-avx256skx-madd.c",
+-        "src/src/qs8-qc2w-gemm/gen/qs8-qc2w-gemm-5x8c8-minmax-avx256skx-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",
+-      ]
 +    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(
+-        "qs8-qc2w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") {
+-      cflags = [
+-        "-mavx512bw",
+-        "-mavx512cd",
+-        "-mavx512dq",
+-        "-mavx512f",
+-        "-mavx512vl",
+-        "-mf16c",
+-        "-mfma",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qs8-qc2w-gemm/gen/qs8-qc2w-gemm-1x8c8-minmax-avx256skx-madd.c",
+-        "src/src/qs8-qc2w-gemm/gen/qs8-qc2w-gemm-5x8c8-minmax-avx256skx-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: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("x8-packq_arm64_standalone") {
@@ -85797,30 +78742,112 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x8-packq/x8-packq-aarch64-neon-f32qp8-u2.c",
++      "src/src/x8-packq/x8-packq-aarch64-neon-f16qp8-u2.c",
++    "src/src/x8-packq/x8-packq-aarch64-neon-f32qp8-u2.c",
 +    "src/src/x8-packq/x8-packq-scalar-f32qp8-u1.c"
 +    ]
-+
+ 
+-  if (build_with_chromium) {
+-    source_set("qs8-qc2w-gemm_ssse3-no-sse4.1") {
+-      cflags = [
+-        "-mno-sse4.1",
+-        "-mssse3",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qs8-qc2w-gemm/gen/qs8-qc2w-gemm-1x4c8-minmax-fp32-ssse3-madd.c",
+-        "src/src/qs8-qc2w-gemm/gen/qs8-qc2w-gemm-5x4c8-minmax-fp32-ssse3-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",
+-      ]
 +    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("qs8-qc2w-gemm_ssse3-no-sse4.1_standalone") {
+-      cflags = [
+-        "-mno-sse4.1",
+-        "-mssse3",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qs8-qc2w-gemm/gen/qs8-qc2w-gemm-1x4c8-minmax-fp32-ssse3-madd.c",
+-        "src/src/qs8-qc2w-gemm/gen/qs8-qc2w-gemm-5x4c8-minmax-fp32-ssse3-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: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" ]
-+    }
-+  }
+     }
+   }
 +}
-+
+ 
+-  if (build_with_chromium) {
+-    source_set("qs8-qc2w-gemm_x64") {
+-      cflags = []
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qs8-qc2w-gemm/gen/qs8-qc2w-gemm-1x2-minmax-fp32-scalar-fmagic.c",
+-        "src/src/qs8-qc2w-gemm/gen/qs8-qc2w-gemm-1x4-minmax-fp32-scalar-fmagic.c",
+-        "src/src/qs8-qc2w-gemm/gen/qs8-qc2w-gemm-3x4-minmax-fp32-scalar-fmagic.c",
+-        "src/src/qs8-qc2w-gemm/gen/qs8-qc2w-gemm-4x4-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",
+-      ]
 +if (build_with_chromium) {
 +  source_set("x8-packw_arm64") {
 +    cflags = [
@@ -85838,23 +78865,82 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +    "src/src/x8-packw/gen/x8-packw-x8-gemm-gio-scalar.c",
 +    "src/src/x8-packw/gen/x8-packw-x8-gemm-goi-scalar-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" ]
-+
+ 
+-  # This is a target that cannot depend on //base.
+-  if (build_with_internal_optimization_guide) {
+-    source_set("qs8-qc2w-gemm_x64_standalone") {
+-      cflags = []
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
 +      "//third_party/fxdiv",
 +      "//third_party/pthreadpool",
 +    ]
-+
+ 
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qs8-qc2w-gemm/gen/qs8-qc2w-gemm-1x2-minmax-fp32-scalar-fmagic.c",
+-        "src/src/qs8-qc2w-gemm/gen/qs8-qc2w-gemm-1x4-minmax-fp32-scalar-fmagic.c",
+-        "src/src/qs8-qc2w-gemm/gen/qs8-qc2w-gemm-3x4-minmax-fp32-scalar-fmagic.c",
+-        "src/src/qs8-qc2w-gemm/gen/qs8-qc2w-gemm-4x4-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 (build_with_chromium) {
+-    source_set("qs8-qc4w-gemm_avx-no-avx2-no-f16c-no-fma") {
+-      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",
+-      ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
 +  source_set("x8-packw_arm64_standalone") {
@@ -85873,27 +78959,129 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +    "src/src/x8-packw/gen/x8-packw-x8-gemm-gio-scalar.c",
 +    "src/src/x8-packw/gen/x8-packw-x8-gemm-goi-scalar-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" ]
-+
+ 
+-  # 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" ]
+-      }
+-    }
+-  }
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
 +      "//third_party/fxdiv",
 +      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
-+
+ 
+-  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-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" ]
+-      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_avx2-avxvnni-f16c-fma-gfni_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",
+-      ]
+-
+-      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("x8-transposec_arm64") {
 +    cflags = [
@@ -85905,23 +79093,116 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +      "src/src/x8-transposec/gen/x8-transposec-16x16-reuse-dec-zip-neon.c",
 +    "src/src/x8-transposec/gen/x8-transposec-2x4-scalar-int.c"
 +    ]
-+
+ 
+-  if (build_with_chromium) {
+-    source_set("qs8-qc4w-gemm_f16c-fma-avx2") {
+-      cflags = [
+-        "-mavx2",
+-        "-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",
+-      ]
+-
+-      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",
 +    ]
-+
+ 
+-  # 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",
+-        "-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",
+-      ]
+-
+-      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(
+-        "qs8-qc4w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
+-      cflags = [
+-        "-mavx512bw",
+-        "-mavx512cd",
+-        "-mavx512dq",
+-        "-mavx512f",
+-        "-mavx512vl",
+-        "-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",
+-      ]
+-
+-      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("x8-transposec_arm64_standalone") {
@@ -85934,27 +79215,143 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +      "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" ]
-+
+ 
+-  # 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 = [
+-        "-mavx512bw",
+-        "-mavx512cd",
+-        "-mavx512dq",
+-        "-mavx512f",
+-        "-mavx512vl",
+-        "-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",
+-      ]
+-
+-      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" ]
+-      }
+-    }
+-  }
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
 +      "//third_party/fxdiv",
 +      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
-+
+ 
+-  if (build_with_chromium) {
+-    source_set(
+-        "qs8-qc4w-gemm_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-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",
+-      ]
 +    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-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("xx-copy_arm64") {
 +    cflags = [
@@ -85965,23 +79362,85 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +      "src/include/xnnpack.h",
 +      "src/src/xx-copy/xx-copy-scalar-memcpy.c"
 +    ]
-+
+ 
+-  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",
+-      ]
 +    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-qc4w-gemm_ssse3-no-sse4.1_standalone") {
+-      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: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("qs8-qc4w-gemm_x64") {
+-      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
 +  source_set("xx-copy_arm64_standalone") {
@@ -85993,27 +79452,47 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +      "src/include/xnnpack.h",
 +      "src/src/xx-copy/xx-copy-scalar-memcpy.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("xx-fill_arm64") {
 +    cflags = [
@@ -86025,23 +79504,113 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +      "src/src/xx-fill/xx-fill-neon-u64.c",
 +    "src/src/xx-fill/xx-fill-scalar-u16.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" ]
+-
+-      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-qc4w-packw_avx2-avxvnni-f16c-fma-gfni") {
+-      cflags = [
+-        "-mavx2",
+-        "-mavxvnni",
+-        "-mf16c",
+-        "-mfma",
+-        "-mgfni",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qs8-qc4w-packw/gen/qs8-qc4w-packw-x8c8-gemm-goi-avxvnni.c",
+-        "src/src/qs8-qc4w-packw/gen/qs8-to-qu8-qc4w-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",
+-      ]
 +    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("qs8-qc4w-packw_avx2-avxvnni-f16c-fma-gfni_standalone") {
+-      cflags = [
+-        "-mavx2",
+-        "-mavxvnni",
+-        "-mf16c",
+-        "-mfma",
+-        "-mgfni",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qs8-qc4w-packw/gen/qs8-qc4w-packw-x8c8-gemm-goi-avxvnni.c",
+-        "src/src/qs8-qc4w-packw/gen/qs8-to-qu8-qc4w-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" ]
+-      }
+-    }
+-  }
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
 +  source_set("xx-fill_arm64_standalone") {
@@ -86054,27 +79623,129 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +      "src/src/xx-fill/xx-fill-neon-u64.c",
 +    "src/src/xx-fill/xx-fill-scalar-u16.c"
 +    ]
-+
+ 
+-  if (build_with_chromium) {
+-    source_set(
+-        "qs8-qc4w-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-qc4w-packw/gen/qs8-qc4w-packw-x16c8-gemm-goi-avx256vnni.c",
+-        "src/src/qs8-qc4w-packw/gen/qs8-qc4w-packw-x8c8-gemm-goi-avx256vnni.c",
+-        "src/src/qs8-qc4w-packw/gen/qs8-to-qu8-qc4w-packw-x16c8-gemm-goi-avx256vnni.c",
+-        "src/src/qs8-qc4w-packw/gen/qs8-to-qu8-qc4w-packw-x8c8-gemm-goi-avx256vnni.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(
+-        "qs8-qc4w-packw_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-packw/gen/qs8-qc4w-packw-x16c8-gemm-goi-avx256vnni.c",
+-        "src/src/qs8-qc4w-packw/gen/qs8-qc4w-packw-x8c8-gemm-goi-avx256vnni.c",
+-        "src/src/qs8-qc4w-packw/gen/qs8-to-qu8-qc4w-packw-x16c8-gemm-goi-avx256vnni.c",
+-        "src/src/qs8-qc4w-packw/gen/qs8-to-qu8-qc4w-packw-x8c8-gemm-goi-avx256vnni.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" ]
-+    }
-+  }
+     }
+   }
 +}
-+
+ 
+-  if (build_with_chromium) {
+-    source_set("qs8-qc4w-packw_sse2-no-sse3") {
+-      cflags = [
+-        "-mno-sse3",
+-        "-msse2",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qs8-qc4w-packw/gen/qs8-qc4uw-packw-x4c8-gemm-goi-sse2.c",
+-        "src/src/qs8-qc4w-packw/gen/qs8-qc4uw-packw-x8c8-gemm-goi-sse2.c",
+-        "src/src/qs8-qc4w-packw/gen/qs8-to-qu8-qc4uw-packw-x4c8-gemm-goi-sse2.c",
+-        "src/src/qs8-qc4w-packw/gen/qs8-to-qu8-qc4uw-packw-x8c8-gemm-goi-sse2.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("xx-pad_arm64") {
 +    cflags = [
@@ -86086,12 +79757,49 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +      "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" ]
+-    }
+-  }
 +    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-qc4w-packw_sse2-no-sse3_standalone") {
+-      cflags = [
+-        "-mno-sse3",
+-        "-msse2",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qs8-qc4w-packw/gen/qs8-qc4uw-packw-x4c8-gemm-goi-sse2.c",
+-        "src/src/qs8-qc4w-packw/gen/qs8-qc4uw-packw-x8c8-gemm-goi-sse2.c",
+-        "src/src/qs8-qc4w-packw/gen/qs8-to-qu8-qc4uw-packw-x4c8-gemm-goi-sse2.c",
+-        "src/src/qs8-qc4w-packw/gen/qs8-to-qu8-qc4uw-packw-x8c8-gemm-goi-sse2.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" ]
+-      }
+-    }
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
@@ -86100,9 +79808,12 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +    ]
 +
 +    public_configs = [ ":xnnpack_public_config" ]
-+  }
+   }
 +}
-+
+ 
+-  if (build_with_chromium) {
+-    source_set("qs8-qc4w-packw_x64") {
+-      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
 +  source_set("xx-pad_arm64_standalone") {
@@ -86115,27 +79826,47 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +      "src/src/xx-pad/xx-pad-p16-neon-u16.c",
 +    "src/src/xx-pad/xx-pad-p4-scalar-u16.c"
 +    ]
-+
+ 
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qs8-qc4w-packw/gen/qs8-qc4uw-packw-x16c8-gemm-goi-scalar.c",
+-        "src/src/qs8-qc4w-packw/gen/qs8-to-qu8-qc4uw-packw-x16c8-gemm-goi-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" ]
 +    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-packw_x64_standalone") {
+-      cflags = []
 +if (build_with_chromium) {
 +  source_set("xx-transposev_arm64") {
 +    cflags = [
@@ -86146,23 +79877,113 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +      "src/include/xnnpack.h",
 +      "src/src/xx-transposev/xx-transposev-1x1-scalar-memcpy.c"
 +    ]
-+
+ 
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qs8-qc4w-packw/gen/qs8-qc4uw-packw-x16c8-gemm-goi-scalar.c",
+-        "src/src/qs8-qc4w-packw/gen/qs8-to-qu8-qc4uw-packw-x16c8-gemm-goi-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" ]
+-      }
+-    }
+-  }
 +    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-dwconv_avx-no-avx2-no-f16c-no-fma") {
+-      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",
+-      ]
 +    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("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" ]
+-      }
+-    }
+-  }
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
 +  source_set("xx-transposev_arm64_standalone") {
@@ -86174,29 +79995,125 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +      "src/include/xnnpack.h",
 +      "src/src/xx-transposev/xx-transposev-1x1-scalar-memcpy.c"
 +    ]
-+
+ 
+-  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",
+-      ]
 +    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("qs8-qc8w-dwconv_f16c-fma-avx2_standalone") {
+-      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: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" ]
-+    }
-+  }
+     }
+   }
 +}
-+
+ 
+-  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",
+-      ]
 +}
-+
+ 
+-      public_configs = [ ":xnnpack_public_config" ]
+-    }
+-  }
 +if (current_cpu == "riscv64") {
 +if (build_with_chromium) {
 +  source_set("bf16-f32-vcvt_riscv64") {
@@ -86208,23 +80125,124 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +      "src/include/xnnpack.h",
 +      "src/src/bf16-f32-vcvt/gen/bf16-f32-vcvt-scalar-u2.c"
 +    ]
-+
+ 
+-  # 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 = [
+-        "-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: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-dwconv_sse2-no-sse3") {
+-      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",
+-      ]
 +    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("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("bf16-f32-vcvt_riscv64_standalone") {
@@ -86236,27 +80254,112 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +      "src/include/xnnpack.h",
 +      "src/src/bf16-f32-vcvt/gen/bf16-f32-vcvt-scalar-u2.c"
 +    ]
-+
+ 
+-  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",
+-      ]
+-
+-      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("qs8-qc8w-dwconv_sse4.1-no-sse4.2_standalone") {
+-      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",
+-      ]
+-
+-      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" ]
-+    }
-+  }
+     }
+   }
 +}
-+
+ 
+-  if (build_with_chromium) {
+-    source_set("qs8-qc8w-dwconv_x64") {
+-      cflags = []
+-
+-      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",
+-      ]
 +if (build_with_chromium) {
 +  source_set("bf16-qs8-vcvt_riscv64") {
 +    cflags = [
@@ -86267,23 +80370,84 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +      "src/include/xnnpack.h",
 +      "src/src/bf16-qs8-vcvt/gen/bf16-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" ]
-+
+ 
+-  # This is a target that cannot depend on //base.
+-  if (build_with_internal_optimization_guide) {
+-    source_set("qs8-qc8w-dwconv_x64_standalone") {
+-      cflags = []
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
 +      "//third_party/fxdiv",
 +      "//third_party/pthreadpool",
 +    ]
-+
+ 
+-      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 (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",
+-      ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
 +  source_set("bf16-qs8-vcvt_riscv64_standalone") {
@@ -86295,27 +80459,129 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +      "src/include/xnnpack.h",
 +      "src/src/bf16-qs8-vcvt/gen/bf16-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" ]
-+
+ 
+-  # 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" ]
+-      }
+-    }
+-  }
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
 +      "//third_party/fxdiv",
 +      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
-+
+ 
+-  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",
+-      ]
 +    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-gemm_avx2-avxvnni-f16c-fma-gfni_standalone") {
+-      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:pthreadpool_standalone",
+-      ]
+-
+-      public_configs = [ ":xnnpack_public_config" ]
+-
+-      if (!(is_android && use_order_profiling)) {
+-        assert_no_deps = [ "//base" ]
+-      }
+-    }
+-  }
 +if (build_with_chromium) {
 +  source_set("bf16-qu8-vcvt_riscv64") {
 +    cflags = [
@@ -86326,23 +80592,113 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +      "src/include/xnnpack.h",
 +      "src/src/bf16-qu8-vcvt/gen/bf16-qu8-vcvt-scalar-imagic-u4.c"
 +    ]
-+
+ 
+-  if (build_with_chromium) {
+-    source_set("qs8-qc8w-gemm_avx2-avxvnniint8-f16c-fma-gfni") {
+-      cflags = [
+-        "-mavx2",
+-        "-mavxvnniint8",
+-        "-mf16c",
+-        "-mfma",
+-        "-mgfni",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-1x8c8-minmax-fp32-avxvnniint8-prfm.c",
+-        "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-5x8c8-minmax-fp32-avxvnniint8-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",
+-      ]
 +    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-gemm_avx2-avxvnniint8-f16c-fma-gfni_standalone") {
+-      cflags = [
+-        "-mavx2",
+-        "-mavxvnniint8",
+-        "-mf16c",
+-        "-mfma",
+-        "-mgfni",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-1x8c8-minmax-fp32-avxvnniint8-prfm.c",
+-        "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-5x8c8-minmax-fp32-avxvnniint8-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" ]
+-      }
+-    }
 +    public_configs = [ ":xnnpack_public_config" ]
-+  }
+   }
 +}
-+
+ 
+-  if (build_with_chromium) {
+-    source_set("qs8-qc8w-gemm_f16c-fma-avx2") {
+-      cflags = [
+-        "-mavx2",
+-        "-mf16c",
+-        "-mfma",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-1x8c8-minmax-fp32-avx2.c",
+-        "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-3x8c8-minmax-fp32-avx2.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("bf16-qu8-vcvt_riscv64_standalone") {
@@ -86354,27 +80710,138 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +      "src/include/xnnpack.h",
 +      "src/src/bf16-qu8-vcvt/gen/bf16-qu8-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" ]
-+
+ 
+-  # This is a target that cannot depend on //base.
+-  if (build_with_internal_optimization_guide) {
+-    source_set("qs8-qc8w-gemm_f16c-fma-avx2_standalone") {
+-      cflags = [
+-        "-mavx2",
+-        "-mf16c",
+-        "-mfma",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-1x8c8-minmax-fp32-avx2.c",
+-        "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-3x8c8-minmax-fp32-avx2.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" ]
+-      }
+-    }
+-  }
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
 +      "//third_party/fxdiv",
 +      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
-+
+ 
+-  if (build_with_chromium) {
+-    source_set(
+-        "qs8-qc8w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
+-      cflags = [
+-        "-mavx512bw",
+-        "-mavx512cd",
+-        "-mavx512dq",
+-        "-mavx512f",
+-        "-mavx512vl",
+-        "-mf16c",
+-        "-mfma",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-1x16c8-minmax-fp32-avx512skx-prfm.c",
+-        "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-1x8c8-minmax-fp32-avx256skx.c",
+-        "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-4x8c8-minmax-fp32-avx256skx.c",
+-        "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-7x16c8-minmax-fp32-avx512skx-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-qc8w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") {
+-      cflags = [
+-        "-mavx512bw",
+-        "-mavx512cd",
+-        "-mavx512dq",
+-        "-mavx512f",
+-        "-mavx512vl",
+-        "-mf16c",
+-        "-mfma",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-1x16c8-minmax-fp32-avx512skx-prfm.c",
+-        "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-1x8c8-minmax-fp32-avx256skx.c",
+-        "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-4x8c8-minmax-fp32-avx256skx.c",
+-        "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-7x16c8-minmax-fp32-avx512skx-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("bf16-rminmax_riscv64") {
 +    cflags = [
@@ -86387,23 +80854,130 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +    "src/src/bf16-rminmax/gen/bf16-rmin-scalar-u2-acc2.c",
 +    "src/src/bf16-rminmax/gen/bf16-rminmax-scalar-u2-acc2.c"
 +    ]
-+
+ 
+-  if (build_with_chromium) {
+-    source_set(
+-        "qs8-qc8w-gemm_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-qc8w-gemm/gen/qs8-qc8w-gemm-1x16c8-minmax-fp32-avx512vnni-prfm.c",
+-        "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-7x16c8-minmax-fp32-avx512vnni-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",
+-      ]
 +    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-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-qc8w-gemm/gen/qs8-qc8w-gemm-1x16c8-minmax-fp32-avx512vnni-prfm.c",
+-        "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-7x16c8-minmax-fp32-avx512vnni-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" ]
+-      }
+-    }
 +    public_configs = [ ":xnnpack_public_config" ]
-+  }
+   }
 +}
-+
+ 
+-  if (build_with_chromium) {
+-    source_set(
+-        "qs8-qc8w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni-amx-tile-amx-int8") {
+-      cflags = [
+-        "-mamx-int8",
+-        "-mamx-tile",
+-        "-mavx512bw",
+-        "-mavx512cd",
+-        "-mavx512dq",
+-        "-mavx512f",
+-        "-mavx512vl",
+-        "-mavx512vnni",
+-        "-mf16c",
+-        "-mfma",
+-        "-mgfni",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-16x64c4-minmax-fp32-avx512amx.c",
+-        "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-1x64c4-minmax-fp32-avx512amx.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("bf16-rminmax_riscv64_standalone") {
@@ -86417,27 +80991,298 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +    "src/src/bf16-rminmax/gen/bf16-rmin-scalar-u2-acc2.c",
 +    "src/src/bf16-rminmax/gen/bf16-rminmax-scalar-u2-acc2.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(
+-        "qs8-qc8w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni-amx-tile-amx-int8_standalone") {
+-      cflags = [
+-        "-mamx-int8",
+-        "-mamx-tile",
+-        "-mavx512bw",
+-        "-mavx512cd",
+-        "-mavx512dq",
+-        "-mavx512f",
+-        "-mavx512vl",
+-        "-mavx512vnni",
+-        "-mf16c",
+-        "-mfma",
+-        "-mgfni",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-16x64c4-minmax-fp32-avx512amx.c",
+-        "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-1x64c4-minmax-fp32-avx512amx.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" ]
+-      }
+-    }
+-  }
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
 +      "//third_party/fxdiv",
 +      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
-+
+ 
+-  if (build_with_chromium) {
+-    source_set("qs8-qc8w-gemm_sse2-no-sse3") {
+-      cflags = [
+-        "-mno-sse3",
+-        "-msse2",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-1x4c8-minmax-fp32-sse2-ld64.c",
+-        "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-3x4c8-minmax-fp32-sse2-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",
+-      ]
 +    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-gemm_sse2-no-sse3_standalone") {
+-      cflags = [
+-        "-mno-sse3",
+-        "-msse2",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-1x4c8-minmax-fp32-sse2-ld64.c",
+-        "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-3x4c8-minmax-fp32-sse2-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:pthreadpool_standalone",
+-      ]
+-
+-      public_configs = [ ":xnnpack_public_config" ]
+-
+-      if (!(is_android && use_order_profiling)) {
+-        assert_no_deps = [ "//base" ]
+-      }
+-    }
+-  }
++if (build_with_chromium) {
++  source_set("bf16-vunary_riscv64") {
++    cflags = [
++  
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/bf16-vunary/gen/bf16-vunary-scalar.c"
++    ]
+ 
+-  if (build_with_chromium) {
+-    source_set("qs8-qc8w-gemm_sse4.1-no-sse4.2") {
+-      cflags = [
+-        "-mno-sse4.2",
+-        "-msse4.1",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-1x4c8-minmax-fp32-sse41-ld64.c",
+-        "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-3x4c8-minmax-fp32-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",
+-      ]
++    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-gemm_sse4.1-no-sse4.2_standalone") {
+-      cflags = [
+-        "-mno-sse4.2",
+-        "-msse4.1",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-1x4c8-minmax-fp32-sse41-ld64.c",
+-        "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-3x4c8-minmax-fp32-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: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("qs8-qc8w-gemm_x64") {
+-      cflags = []
++# This is a target that cannot depend on //base.
++if (build_with_internal_optimization_guide) {
++  source_set("bf16-vunary_riscv64_standalone") {
++    cflags = [
++  
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/bf16-vunary/gen/bf16-vunary-scalar.c"
++    ]
+ 
+-      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",
++    ]
+ 
+-      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-qc8w-gemm_x64_standalone") {
+-      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",
+-      ]
+-
+-      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("configs_riscv64") {
 +    cflags = [
@@ -86471,23 +81316,113 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +    "src/src/configs/xx-fill-config.c",
 +    "src/src/configs/xx-pad-config.c"
 +    ]
-+
+ 
+-  if (build_with_chromium) {
+-    source_set("qs8-qc8w-igemm_avx-no-avx2-no-f16c-no-fma") {
+-      cflags = [
+-        "-mavx",
+-        "-mno-avx2",
+-        "-mno-f16c",
+-        "-mno-fma",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-1x4c8-minmax-fp32-avx-ld128.c",
+-        "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-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",
+-      ]
 +    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_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-igemm/gen/qs8-qc8w-igemm-1x4c8-minmax-fp32-avx-ld128.c",
+-        "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-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" ]
+-      }
+-    }
 +    public_configs = [ ":xnnpack_public_config" ]
-+  }
+   }
 +}
-+
+ 
+-  if (build_with_chromium) {
+-    source_set("qs8-qc8w-igemm_avx2-avxvnni-f16c-fma-gfni") {
+-      cflags = [
+-        "-mavx2",
+-        "-mavxvnni",
+-        "-mf16c",
+-        "-mfma",
+-        "-mgfni",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-1x8c8-minmax-fp32-avxvnni-prfm.c",
+-        "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-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",
+-      ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
 +  source_set("configs_riscv64_standalone") {
@@ -86522,27 +81457,130 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +    "src/src/configs/xx-fill-config.c",
 +    "src/src/configs/xx-pad-config.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("qs8-qc8w-igemm_avx2-avxvnni-f16c-fma-gfni_standalone") {
+-      cflags = [
+-        "-mavx2",
+-        "-mavxvnni",
+-        "-mf16c",
+-        "-mfma",
+-        "-mgfni",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-1x8c8-minmax-fp32-avxvnni-prfm.c",
+-        "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-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:pthreadpool_standalone",
+-      ]
+-
+-      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",
 +    ]
-+
+ 
+-  if (build_with_chromium) {
+-    source_set("qs8-qc8w-igemm_avx2-avxvnniint8-f16c-fma-gfni") {
+-      cflags = [
+-        "-mavx2",
+-        "-mavxvnniint8",
+-        "-mf16c",
+-        "-mfma",
+-        "-mgfni",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-1x8c8-minmax-fp32-avxvnniint8-prfm.c",
+-        "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-5x8c8-minmax-fp32-avxvnniint8-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-qc8w-igemm_avx2-avxvnniint8-f16c-fma-gfni_standalone") {
+-      cflags = [
+-        "-mavx2",
+-        "-mavxvnniint8",
+-        "-mf16c",
+-        "-mfma",
+-        "-mgfni",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-1x8c8-minmax-fp32-avxvnniint8-prfm.c",
+-        "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-5x8c8-minmax-fp32-avxvnniint8-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("enums_riscv64") {
 +    cflags = [
@@ -86557,23 +81595,116 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +    "src/src/enums/node-type.c",
 +    "src/src/enums/operator-type.c"
 +    ]
-+
+ 
+-  if (build_with_chromium) {
+-    source_set("qs8-qc8w-igemm_f16c-fma-avx2") {
+-      cflags = [
+-        "-mavx2",
+-        "-mf16c",
+-        "-mfma",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-1x8c8-minmax-fp32-avx2.c",
+-        "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-3x8c8-minmax-fp32-avx2.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",
 +    ]
-+
+ 
+-  # This is a target that cannot depend on //base.
+-  if (build_with_internal_optimization_guide) {
+-    source_set("qs8-qc8w-igemm_f16c-fma-avx2_standalone") {
+-      cflags = [
+-        "-mavx2",
+-        "-mf16c",
+-        "-mfma",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-1x8c8-minmax-fp32-avx2.c",
+-        "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-3x8c8-minmax-fp32-avx2.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(
+-        "qs8-qc8w-igemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
+-      cflags = [
+-        "-mavx512bw",
+-        "-mavx512cd",
+-        "-mavx512dq",
+-        "-mavx512f",
+-        "-mavx512vl",
+-        "-mf16c",
+-        "-mfma",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-1x16c8-minmax-fp32-avx512skx-prfm.c",
+-        "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-1x8c8-minmax-fp32-avx256skx.c",
+-        "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-4x8c8-minmax-fp32-avx256skx.c",
+-        "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-7x16c8-minmax-fp32-avx512skx-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("enums_riscv64_standalone") {
@@ -86589,27 +81720,143 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +    "src/src/enums/node-type.c",
 +    "src/src/enums/operator-type.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(
+-        "qs8-qc8w-igemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") {
+-      cflags = [
+-        "-mavx512bw",
+-        "-mavx512cd",
+-        "-mavx512dq",
+-        "-mavx512f",
+-        "-mavx512vl",
+-        "-mf16c",
+-        "-mfma",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-1x16c8-minmax-fp32-avx512skx-prfm.c",
+-        "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-1x8c8-minmax-fp32-avx256skx.c",
+-        "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-4x8c8-minmax-fp32-avx256skx.c",
+-        "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-7x16c8-minmax-fp32-avx512skx-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" ]
+-      }
+-    }
+-  }
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
 +      "//third_party/fxdiv",
 +      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
-+
+ 
+-  if (build_with_chromium) {
+-    source_set(
+-        "qs8-qc8w-igemm_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-qc8w-igemm/gen/qs8-qc8w-igemm-1x16c8-minmax-avx512vnni-prfm.c",
+-        "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-7x16c8-minmax-avx512vnni-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-qc8w-igemm_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-qc8w-igemm/gen/qs8-qc8w-igemm-1x16c8-minmax-avx512vnni-prfm.c",
+-        "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-7x16c8-minmax-avx512vnni-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("f16-avgpool_arch=rv64gc_zvfh-abi=lp64d") {
 +    cflags = [
@@ -86621,23 +81868,130 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +      "src/include/xnnpack.h",
 +      "src/src/f16-avgpool/gen/f16-avgpool-9p-minmax-rvvfp16arith-u2v.c"
 +    ]
-+
+ 
+-  if (build_with_chromium) {
+-    source_set(
+-        "qs8-qc8w-igemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni-amx-tile-amx-int8") {
+-      cflags = [
+-        "-mamx-int8",
+-        "-mamx-tile",
+-        "-mavx512bw",
+-        "-mavx512cd",
+-        "-mavx512dq",
+-        "-mavx512f",
+-        "-mavx512vl",
+-        "-mavx512vnni",
+-        "-mf16c",
+-        "-mfma",
+-        "-mgfni",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-16x64c4-minmax-fp32-avx512amx.c",
+-        "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-1x64c4-minmax-fp32-avx512amx.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",
 +    ]
-+
+ 
+-  # This is a target that cannot depend on //base.
+-  if (build_with_internal_optimization_guide) {
+-    source_set(
+-        "qs8-qc8w-igemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni-amx-tile-amx-int8_standalone") {
+-      cflags = [
+-        "-mamx-int8",
+-        "-mamx-tile",
+-        "-mavx512bw",
+-        "-mavx512cd",
+-        "-mavx512dq",
+-        "-mavx512f",
+-        "-mavx512vl",
+-        "-mavx512vnni",
+-        "-mf16c",
+-        "-mfma",
+-        "-mgfni",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-16x64c4-minmax-fp32-avx512amx.c",
+-        "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-1x64c4-minmax-fp32-avx512amx.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("qs8-qc8w-igemm_sse2-no-sse3") {
+-      cflags = [
+-        "-mno-sse3",
+-        "-msse2",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-1x4c8-minmax-fp32-sse2-ld64.c",
+-        "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-3x4c8-minmax-fp32-sse2-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",
+-      ]
+-
+-      public_configs = [ ":xnnpack_public_config" ]
+-    }
+-  }
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
 +  source_set("f16-avgpool_arch=rv64gc_zvfh-abi=lp64d_standalone") {
@@ -86650,96 +82004,321 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +      "src/include/xnnpack.h",
 +      "src/src/f16-avgpool/gen/f16-avgpool-9p-minmax-rvvfp16arith-u2v.c"
 +    ]
-+
+ 
+-  # This is a target that cannot depend on //base.
+-  if (build_with_internal_optimization_guide) {
+-    source_set("qs8-qc8w-igemm_sse2-no-sse3_standalone") {
+-      cflags = [
+-        "-mno-sse3",
+-        "-msse2",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-1x4c8-minmax-fp32-sse2-ld64.c",
+-        "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-3x4c8-minmax-fp32-sse2-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: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-igemm_sse4.1-no-sse4.2") {
+-      cflags = [
+-        "-mno-sse4.2",
+-        "-msse4.1",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-1x4c8-minmax-fp32-sse41-ld64.c",
+-        "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-3x4c8-minmax-fp32-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",
+-      ]
 +    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" ]
-+
+ 
+-  # This is a target that cannot depend on //base.
+-  if (build_with_internal_optimization_guide) {
+-    source_set("qs8-qc8w-igemm_sse4.1-no-sse4.2_standalone") {
+-      cflags = [
+-        "-mno-sse4.2",
+-        "-msse4.1",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-1x4c8-minmax-fp32-sse41-ld64.c",
+-        "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-3x4c8-minmax-fp32-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: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-igemm_x64") {
+-      cflags = []
+-
+-      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",
+-      ]
 +if (build_with_chromium) {
-+  source_set("f16-dwconv_arch=rv64gc_zvfh-abi=lp64d") {
++  source_set("f16-avgpool_riscv64") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gc_zvfh"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-dwconv/gen/f16-dwconv-25p8vc-minmax-rvvfp16arith.c",
-+    "src/src/f16-dwconv/gen/f16-dwconv-3p8vc-minmax-rvvfp16arith.c",
-+    "src/src/f16-dwconv/gen/f16-dwconv-4p8vc-minmax-rvvfp16arith.c",
-+    "src/src/f16-dwconv/gen/f16-dwconv-9p8vc-minmax-rvvfp16arith.c"
++      "src/src/f16-avgpool/gen/f16-f32acc-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" ]
 +    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" ]
+-    }
++    public_configs = [ ":xnnpack_public_config" ]
+   }
 +}
-+
+ 
+-  # This is a target that cannot depend on //base.
+-  if (build_with_internal_optimization_guide) {
+-    source_set("qs8-qc8w-igemm_x64_standalone") {
+-      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-dwconv_arch=rv64gc_zvfh-abi=lp64d_standalone") {
++  source_set("f16-avgpool_riscv64_standalone") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gc_zvfh"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-dwconv/gen/f16-dwconv-25p8vc-minmax-rvvfp16arith.c",
-+    "src/src/f16-dwconv/gen/f16-dwconv-3p8vc-minmax-rvvfp16arith.c",
-+    "src/src/f16-dwconv/gen/f16-dwconv-4p8vc-minmax-rvvfp16arith.c",
-+    "src/src/f16-dwconv/gen/f16-dwconv-9p8vc-minmax-rvvfp16arith.c"
++      "src/src/f16-avgpool/gen/f16-f32acc-avgpool-9p-minmax-scalar-u1.c"
 +    ]
-+
+ 
+-      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",
+-      ]
+-
+-      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-qu8-packw_avx2-avxvnni-f16c-fma-gfni") {
+-      cflags = [
+-        "-mavx2",
+-        "-mavxvnni",
+-        "-mf16c",
+-        "-mfma",
+-        "-mgfni",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qs8-qu8-packw/gen/qs8-qu8-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",
+-      ]
 +    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" ]
-+
+ 
+-  # This is a target that cannot depend on //base.
+-  if (build_with_internal_optimization_guide) {
+-    source_set("qs8-qu8-packw_avx2-avxvnni-f16c-fma-gfni_standalone") {
+-      cflags = [
+-        "-mavx2",
+-        "-mavxvnni",
+-        "-mf16c",
+-        "-mfma",
+-        "-mgfni",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qs8-qu8-packw/gen/qs8-qu8-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 (!(is_android && use_order_profiling)) {
 +      assert_no_deps = [ "//base" ]
-+    }
-+  }
+     }
+   }
 +}
-+
+ 
+-  if (build_with_chromium) {
+-    source_set(
+-        "qs8-qu8-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-qu8-packw/gen/qs8-qu8-packw-x16c8-gemm-goi-avx256vnni.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("f16-f32-vcvt_arch=rv64gc_zvfh-abi=lp64d") {
++  source_set("f16-dwconv_arch=rv64gc_zvfh-abi=lp64d") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gc_zvfh"
@@ -86747,14 +82326,58 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-f32-vcvt/gen/f16-f32-vcvt-rvvfp16arith-u4v.c"
++      "src/src/f16-dwconv/gen/f16-dwconv-25p8vc-minmax-rvvfp16arith.c",
++    "src/src/f16-dwconv/gen/f16-dwconv-3p8vc-minmax-rvvfp16arith.c",
++    "src/src/f16-dwconv/gen/f16-dwconv-4p8vc-minmax-rvvfp16arith.c",
++    "src/src/f16-dwconv/gen/f16-dwconv-9p8vc-minmax-rvvfp16arith.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(
+-        "qs8-qu8-packw_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-qu8-packw/gen/qs8-qu8-packw-x16c8-gemm-goi-avx256vnni.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" ]
+-      }
+-    }
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
@@ -86763,12 +82386,15 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +    ]
 +
 +    public_configs = [ ":xnnpack_public_config" ]
-+  }
+   }
 +}
-+
+ 
+-  if (build_with_chromium) {
+-    source_set("qs8-qu8-packw_x64") {
+-      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-f32-vcvt_arch=rv64gc_zvfh-abi=lp64d_standalone") {
++  source_set("f16-dwconv_arch=rv64gc_zvfh-abi=lp64d_standalone") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gc_zvfh"
@@ -86776,90 +82402,339 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-f32-vcvt/gen/f16-f32-vcvt-rvvfp16arith-u4v.c"
++      "src/src/f16-dwconv/gen/f16-dwconv-25p8vc-minmax-rvvfp16arith.c",
++    "src/src/f16-dwconv/gen/f16-dwconv-3p8vc-minmax-rvvfp16arith.c",
++    "src/src/f16-dwconv/gen/f16-dwconv-4p8vc-minmax-rvvfp16arith.c",
++    "src/src/f16-dwconv/gen/f16-dwconv-9p8vc-minmax-rvvfp16arith.c"
 +    ]
-+
+ 
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qs8-qu8-packw/gen/qs8-qu8-packw-x16c8-gemm-goi-scalar.c",
+-        "src/src/qs8-qu8-packw/gen/qs8-qu8-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" ]
-+
+ 
+-      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-qu8-packw_x64_standalone") {
+-      cflags = []
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qs8-qu8-packw/gen/qs8-qu8-packw-x16c8-gemm-goi-scalar.c",
+-        "src/src/qs8-qu8-packw/gen/qs8-qu8-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" ]
+-      }
+-    }
+-  }
 +if (build_with_chromium) {
-+  source_set("f16-f32-vcvt_riscv64") {
++  source_set("f16-dwconv_riscv64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-f32-vcvt/gen/f16-f32-vcvt-scalar-u4.c"
++      "src/src/f16-dwconv/gen/f16-f32acc-dwconv-25p2c-minmax-scalar-acc2.c",
++    "src/src/f16-dwconv/gen/f16-f32acc-dwconv-3p1c-minmax-scalar-acc2.c",
++    "src/src/f16-dwconv/gen/f16-f32acc-dwconv-4p1c-minmax-scalar-acc2.c",
++    "src/src/f16-dwconv/gen/f16-f32acc-dwconv-9p1c-minmax-scalar-acc2.c"
 +    ]
-+
+ 
+-  if (build_with_chromium) {
+-    source_set("qs8-rdsum_f16c-fma-avx2") {
+-      cflags = [
+-        "-mavx2",
+-        "-mf16c",
+-        "-mfma",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qs8-rdsum/gen/qs8-rdsum-7p7x-minmax-fp32-avx2-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",
+-      ]
 +    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-rdsum_f16c-fma-avx2_standalone") {
+-      cflags = [
+-        "-mavx2",
+-        "-mf16c",
+-        "-mfma",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qs8-rdsum/gen/qs8-rdsum-7p7x-minmax-fp32-avx2-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",
+-      ]
+-
+-      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(
+-        "qs8-rdsum_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
+-      cflags = [
+-        "-mavx512bw",
+-        "-mavx512cd",
+-        "-mavx512dq",
+-        "-mavx512f",
+-        "-mavx512vl",
+-        "-mf16c",
+-        "-mfma",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qs8-rdsum/gen/qs8-rdsum-7p7x-minmax-fp32-avx512skx-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("f16-f32-vcvt_riscv64_standalone") {
++  source_set("f16-dwconv_riscv64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-f32-vcvt/gen/f16-f32-vcvt-scalar-u4.c"
++      "src/src/f16-dwconv/gen/f16-f32acc-dwconv-25p2c-minmax-scalar-acc2.c",
++    "src/src/f16-dwconv/gen/f16-f32acc-dwconv-3p1c-minmax-scalar-acc2.c",
++    "src/src/f16-dwconv/gen/f16-f32acc-dwconv-4p1c-minmax-scalar-acc2.c",
++    "src/src/f16-dwconv/gen/f16-f32acc-dwconv-9p1c-minmax-scalar-acc2.c"
 +    ]
-+
+ 
+-  # This is a target that cannot depend on //base.
+-  if (build_with_internal_optimization_guide) {
+-    source_set(
+-        "qs8-rdsum_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") {
+-      cflags = [
+-        "-mavx512bw",
+-        "-mavx512cd",
+-        "-mavx512dq",
+-        "-mavx512f",
+-        "-mavx512vl",
+-        "-mf16c",
+-        "-mfma",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qs8-rdsum/gen/qs8-rdsum-7p7x-minmax-fp32-avx512skx-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",
+-      ]
+-
+-      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-rdsum_sse4.1-no-sse4.2") {
+-      cflags = [
+-        "-mno-sse4.2",
+-        "-msse4.1",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qs8-rdsum/gen/qs8-rdsum-7p7x-minmax-fp32-sse41-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",
+-      ]
 +    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" ]
-+
+ 
+-  # This is a target that cannot depend on //base.
+-  if (build_with_internal_optimization_guide) {
+-    source_set("qs8-rdsum_sse4.1-no-sse4.2_standalone") {
+-      cflags = [
+-        "-mno-sse4.2",
+-        "-msse4.1",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qs8-rdsum/gen/qs8-rdsum-7p7x-minmax-fp32-sse41-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",
+-      ]
+-
+-      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-rdsum_x64") {
+-      cflags = []
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qs8-rdsum/gen/qs8-rdsum-minmax-fp32-scalar-u1-acc1.c",
+-      ]
 +if (build_with_chromium) {
-+  source_set("f16-f32acc-rdsum2_arch=rv64gc_zvfh-abi=lp64d") {
++  source_set("f16-f32-vcvt_arch=rv64gc_zvfh-abi=lp64d") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gc_zvfh"
@@ -86867,28 +82742,44 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-f32acc-rdsum2/gen/f16-f32acc-rdsum2-7p7x-minmax-rvvfp16arith-u4v.c"
++      "src/src/f16-f32-vcvt/gen/f16-f32-vcvt-rvvfp16arith-u4v.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",
 +    ]
-+
+ 
+-      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("qs8-rdsum_x64_standalone") {
+-      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-f32acc-rdsum2_arch=rv64gc_zvfh-abi=lp64d_standalone") {
++  source_set("f16-f32-vcvt_arch=rv64gc_zvfh-abi=lp64d_standalone") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gc_zvfh"
@@ -86896,46 +82787,190 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-f32acc-rdsum2/gen/f16-f32acc-rdsum2-7p7x-minmax-rvvfp16arith-u4v.c"
++      "src/src/f16-f32-vcvt/gen/f16-f32-vcvt-rvvfp16arith-u4v.c"
 +    ]
-+
+ 
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qs8-rdsum/gen/qs8-rdsum-minmax-fp32-scalar-u1-acc1.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-rsum_avx2-avxvnni-f16c-fma-gfni") {
+-      cflags = [
+-        "-mavx2",
+-        "-mavxvnni",
+-        "-mf16c",
+-        "-mfma",
+-        "-mgfni",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qs8-rsum/gen/qs8-rsum-avxvnni-u128-acc2.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: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("qs8-rsum_avx2-avxvnni-f16c-fma-gfni_standalone") {
+-      cflags = [
+-        "-mavx2",
+-        "-mavxvnni",
+-        "-mf16c",
+-        "-mfma",
+-        "-mgfni",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qs8-rsum/gen/qs8-rsum-avxvnni-u128-acc2.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-rsum_f16c-fma-avx2") {
+-      cflags = [
+-        "-mavx2",
+-        "-mf16c",
+-        "-mfma",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qs8-rsum/gen/qs8-rsum-avx2-u64-acc2.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("f16-f32acc-rdsum_arch=rv64gc_zvfh-abi=lp64d") {
++  source_set("f16-f32-vcvt_riscv64") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gc_zvfh"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-f32acc-rdsum/gen/f16-f32acc-rdsum-7p7x-minmax-rvvfp16arith-u4v.c"
++      "src/src/f16-f32-vcvt/gen/f16-f32-vcvt-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("qs8-rsum_f16c-fma-avx2_standalone") {
+-      cflags = [
+-        "-mavx2",
+-        "-mf16c",
+-        "-mfma",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qs8-rsum/gen/qs8-rsum-avx2-u64-acc2.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" ]
+-      }
+-    }
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
@@ -86944,44 +82979,185 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +    ]
 +
 +    public_configs = [ ":xnnpack_public_config" ]
-+  }
+   }
 +}
-+
+ 
+-  if (build_with_chromium) {
+-    source_set(
+-        "qs8-rsum_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
+-      cflags = [
+-        "-mavx512bw",
+-        "-mavx512cd",
+-        "-mavx512dq",
+-        "-mavx512f",
+-        "-mavx512vl",
+-        "-mf16c",
+-        "-mfma",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qs8-rsum/gen/qs8-rsum-avx256skx-u64-acc2.c",
+-        "src/src/qs8-rsum/gen/qs8-rsum-avx512skx-u128-acc2.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("f16-f32acc-rdsum_arch=rv64gc_zvfh-abi=lp64d_standalone") {
++  source_set("f16-f32-vcvt_riscv64_standalone") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gc_zvfh"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-f32acc-rdsum/gen/f16-f32acc-rdsum-7p7x-minmax-rvvfp16arith-u4v.c"
++      "src/src/f16-f32-vcvt/gen/f16-f32-vcvt-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(
+-        "qs8-rsum_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") {
+-      cflags = [
+-        "-mavx512bw",
+-        "-mavx512cd",
+-        "-mavx512dq",
+-        "-mavx512f",
+-        "-mavx512vl",
+-        "-mf16c",
+-        "-mfma",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qs8-rsum/gen/qs8-rsum-avx256skx-u64-acc2.c",
+-        "src/src/qs8-rsum/gen/qs8-rsum-avx512skx-u128-acc2.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" ]
+-      }
+-    }
+-  }
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
 +      "//third_party/fxdiv",
 +      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
-+
+ 
+-  if (build_with_chromium) {
+-    source_set(
+-        "qs8-rsum_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-rsum/gen/qs8-rsum-avx512vnni-u128-acc2.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-rsum_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-rsum/gen/qs8-rsum-avx512vnni-u128-acc2.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("f16-f32acc-rsum2_arch=rv64gc_zvfh-abi=lp64d") {
++  source_set("f16-f32acc-rdsum2_arch=rv64gc_zvfh-abi=lp64d") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gc_zvfh"
@@ -86989,28 +83165,88 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-f32acc-rsum2/gen/f16-f32acc-rsum2-rvvfp16arith-u4v.c"
++      "src/src/f16-f32acc-rdsum2/gen/f16-f32acc-rdsum2-7p7x-minmax-rvvfp16arith-u4v.c"
 +    ]
-+
+ 
+-  if (build_with_chromium) {
+-    source_set("qs8-rsum_ssse3-no-sse4.1") {
+-      cflags = [
+-        "-mno-sse4.1",
+-        "-mssse3",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qs8-rsum/gen/qs8-rsum-ssse3-u32-acc2.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",
 +    ]
-+
+ 
+-  # This is a target that cannot depend on //base.
+-  if (build_with_internal_optimization_guide) {
+-    source_set("qs8-rsum_ssse3-no-sse4.1_standalone") {
+-      cflags = [
+-        "-mno-sse4.1",
+-        "-mssse3",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qs8-rsum/gen/qs8-rsum-ssse3-u32-acc2.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("qs8-rsum_x64") {
+-      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-f32acc-rsum2_arch=rv64gc_zvfh-abi=lp64d_standalone") {
++  source_set("f16-f32acc-rdsum2_arch=rv64gc_zvfh-abi=lp64d_standalone") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gc_zvfh"
@@ -87018,31 +83254,75 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-f32acc-rsum2/gen/f16-f32acc-rsum2-rvvfp16arith-u4v.c"
++      "src/src/f16-f32acc-rdsum2/gen/f16-f32acc-rdsum2-7p7x-minmax-rvvfp16arith-u4v.c"
 +    ]
-+
+ 
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qs8-rsum/gen/qs8-rsum-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-rsum_x64_standalone") {
+-      cflags = []
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qs8-rsum/gen/qs8-rsum-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" ]
+-      }
+-    }
+-  }
 +if (build_with_chromium) {
-+  source_set("f16-f32acc-rsum_arch=rv64gc_zvfh-abi=lp64d") {
++  source_set("f16-f32acc-rdsum_arch=rv64gc_zvfh-abi=lp64d") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gc_zvfh"
@@ -87050,90 +83330,113 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-f32acc-rsum/gen/f16-f32acc-rsum-rvvfp16arith-u4v.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/f16-f32acc-rdsum/gen/f16-f32acc-rdsum-7p7x-minmax-rvvfp16arith-u4v.c"
 +    ]
-+
-+    public_configs = [ ":xnnpack_public_config" ]
-+  }
-+}
-+
-+# This is a target that cannot depend on //base.
-+if (build_with_internal_optimization_guide) {
-+  source_set("f16-f32acc-rsum_arch=rv64gc_zvfh-abi=lp64d_standalone") {
-+    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gc_zvfh"
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/f16-f32acc-rsum/gen/f16-f32acc-rsum-rvvfp16arith-u4v.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("f16-gemm_arch=rv64gc_zvfh-abi=lp64d") {
-+    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gc_zvfh"
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/f16-gemm/gen/f16-gemm-1x4v-minmax-rvvfp16arith.c",
-+    "src/src/f16-gemm/gen/f16-gemm-7x4v-minmax-rvvfp16arith.c"
-+    ]
-+
+ 
+-  if (build_with_chromium) {
+-    source_set("qs8-vadd_avx-no-avx2-no-f16c-no-fma") {
+-      cflags = [
+-        "-mavx",
+-        "-mno-avx2",
+-        "-mno-f16c",
+-        "-mno-fma",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qs8-vadd/gen/qs8-vadd-minmax-avx-mul32-ld32-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" ]
+-
+-      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",
 +    ]
-+
+ 
+-  # This is a target that cannot depend on //base.
+-  if (build_with_internal_optimization_guide) {
+-    source_set("qs8-vadd_avx-no-avx2-no-f16c-no-fma_standalone") {
+-      cflags = [
+-        "-mavx",
+-        "-mno-avx2",
+-        "-mno-f16c",
+-        "-mno-fma",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qs8-vadd/gen/qs8-vadd-minmax-avx-mul32-ld32-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" ]
+-
+-      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("qs8-vadd_f16c-fma-avx2") {
+-      cflags = [
+-        "-mavx2",
+-        "-mf16c",
+-        "-mfma",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qs8-vadd/gen/qs8-vadd-minmax-avx2-mul32-ld64-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",
+-      ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-gemm_arch=rv64gc_zvfh-abi=lp64d_standalone") {
++  source_set("f16-f32acc-rdsum_arch=rv64gc_zvfh-abi=lp64d_standalone") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gc_zvfh"
@@ -87141,32 +83444,135 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-gemm/gen/f16-gemm-1x4v-minmax-rvvfp16arith.c",
-+    "src/src/f16-gemm/gen/f16-gemm-7x4v-minmax-rvvfp16arith.c"
++      "src/src/f16-f32acc-rdsum/gen/f16-f32acc-rdsum-7p7x-minmax-rvvfp16arith-u4v.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("qs8-vadd_f16c-fma-avx2_standalone") {
+-      cflags = [
+-        "-mavx2",
+-        "-mf16c",
+-        "-mfma",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qs8-vadd/gen/qs8-vadd-minmax-avx2-mul32-ld64-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" ]
+-      }
+-    }
+-  }
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
 +      "//third_party/fxdiv",
 +      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
-+
+ 
+-  if (build_with_chromium) {
+-    source_set(
+-        "qs8-vadd_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
+-      cflags = [
+-        "-mavx512bw",
+-        "-mavx512cd",
+-        "-mavx512dq",
+-        "-mavx512f",
+-        "-mavx512vl",
+-        "-mf16c",
+-        "-mfma",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qs8-vadd/gen/qs8-vadd-minmax-avx512skx-mul32-ld128-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" ]
-+    }
-+  }
+     }
+   }
 +}
-+
+ 
+-  # This is a target that cannot depend on //base.
+-  if (build_with_internal_optimization_guide) {
+-    source_set(
+-        "qs8-vadd_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") {
+-      cflags = [
+-        "-mavx512bw",
+-        "-mavx512cd",
+-        "-mavx512dq",
+-        "-mavx512f",
+-        "-mavx512vl",
+-        "-mf16c",
+-        "-mfma",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qs8-vadd/gen/qs8-vadd-minmax-avx512skx-mul32-ld128-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 (build_with_chromium) {
-+  source_set("f16-igemm_arch=rv64gc_zvfh-abi=lp64d") {
++  source_set("f16-f32acc-rsum2_arch=rv64gc_zvfh-abi=lp64d") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gc_zvfh"
@@ -87174,29 +83580,108 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-igemm/gen/f16-igemm-1x4v-minmax-rvvfp16arith.c",
-+    "src/src/f16-igemm/gen/f16-igemm-7x4v-minmax-rvvfp16arith.c"
++      "src/src/f16-f32acc-rsum2/gen/f16-f32acc-rsum2-rvvfp16arith-u4v.c"
 +    ]
-+
+ 
+-  if (build_with_chromium) {
+-    source_set("qs8-vadd_sse2-no-sse3") {
+-      cflags = [
+-        "-mno-sse3",
+-        "-msse2",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qs8-vadd/gen/qs8-vadd-minmax-sse2-mul16-ld64-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" ]
+-
+-      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",
 +    ]
-+
+ 
+-  # This is a target that cannot depend on //base.
+-  if (build_with_internal_optimization_guide) {
+-    source_set("qs8-vadd_sse2-no-sse3_standalone") {
+-      cflags = [
+-        "-mno-sse3",
+-        "-msse2",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qs8-vadd/gen/qs8-vadd-minmax-sse2-mul16-ld64-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" ]
+-
+-      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("qs8-vadd_sse4.1-no-sse4.2") {
+-      cflags = [
+-        "-mno-sse4.2",
+-        "-msse4.1",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qs8-vadd/gen/qs8-vadd-minmax-sse41-mul16-ld64-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" ]
+-
+-      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("f16-igemm_arch=rv64gc_zvfh-abi=lp64d_standalone") {
++  source_set("f16-f32acc-rsum2_arch=rv64gc_zvfh-abi=lp64d_standalone") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gc_zvfh"
@@ -87204,15 +83689,47 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-igemm/gen/f16-igemm-1x4v-minmax-rvvfp16arith.c",
-+    "src/src/f16-igemm/gen/f16-igemm-7x4v-minmax-rvvfp16arith.c"
++      "src/src/f16-f32acc-rsum2/gen/f16-f32acc-rsum2-rvvfp16arith-u4v.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("qs8-vadd_sse4.1-no-sse4.2_standalone") {
+-      cflags = [
+-        "-mno-sse4.2",
+-        "-msse4.1",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qs8-vadd/gen/qs8-vadd-minmax-sse41-mul16-ld64-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" ]
+-
+-      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" ]
+-      }
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
@@ -87224,12 +83741,21 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +
 +    if (!(is_android && use_order_profiling)) {
 +      assert_no_deps = [ "//base" ]
-+    }
-+  }
+     }
+   }
 +}
-+
+ 
+-  if (build_with_chromium) {
+-    source_set("qs8-vadd_x64") {
+-      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",
+-      ]
 +if (build_with_chromium) {
-+  source_set("f16-maxpool_arch=rv64gc_zvfh-abi=lp64d") {
++  source_set("f16-f32acc-rsum_arch=rv64gc_zvfh-abi=lp64d") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gc_zvfh"
@@ -87237,28 +83763,44 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-maxpool/gen/f16-maxpool-9p-minmax-rvvfp16arith-u2v.c"
++      "src/src/f16-f32acc-rsum/gen/f16-f32acc-rsum-rvvfp16arith-u4v.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",
 +    ]
-+
+ 
+-      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("qs8-vadd_x64_standalone") {
+-      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-maxpool_arch=rv64gc_zvfh-abi=lp64d_standalone") {
++  source_set("f16-f32acc-rsum_arch=rv64gc_zvfh-abi=lp64d_standalone") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gc_zvfh"
@@ -87266,45 +83808,191 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-maxpool/gen/f16-maxpool-9p-minmax-rvvfp16arith-u2v.c"
++      "src/src/f16-f32acc-rsum/gen/f16-f32acc-rsum-rvvfp16arith-u4v.c"
 +    ]
-+
+ 
+-      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" ]
+-      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-vaddc_avx-no-avx2-no-f16c-no-fma") {
+-      cflags = [
+-        "-mavx",
+-        "-mno-avx2",
+-        "-mno-f16c",
+-        "-mno-fma",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qs8-vaddc/gen/qs8-vaddc-minmax-avx-mul32-ld32-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" ]
+-
+-      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: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("qs8-vaddc_avx-no-avx2-no-f16c-no-fma_standalone") {
+-      cflags = [
+-        "-mavx",
+-        "-mno-avx2",
+-        "-mno-f16c",
+-        "-mno-fma",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qs8-vaddc/gen/qs8-vaddc-minmax-avx-mul32-ld32-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" ]
+-
+-      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-vaddc_f16c-fma-avx2") {
+-      cflags = [
+-        "-mavx2",
+-        "-mf16c",
+-        "-mfma",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qs8-vaddc/gen/qs8-vaddc-minmax-avx2-mul32-ld64-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",
+-      ]
 +if (build_with_chromium) {
-+  source_set("f16-qs8-vcvt_riscv64") {
++  source_set("f16-gemm_arch=rv64gc_zvfh-abi=lp64d") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gc_zvfh"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-qs8-vcvt/gen/f16-qs8-vcvt-scalar-imagic-u4.c"
++      "src/src/f16-gemm/gen/f16-gemm-1x4v-minmax-rvvfp16arith.c",
++    "src/src/f16-gemm/gen/f16-gemm-7x4v-minmax-rvvfp16arith.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("qs8-vaddc_f16c-fma-avx2_standalone") {
+-      cflags = [
+-        "-mavx2",
+-        "-mf16c",
+-        "-mfma",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qs8-vaddc/gen/qs8-vaddc-minmax-avx2-mul32-ld64-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" ]
+-      }
+-    }
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
@@ -87313,102 +84001,340 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +    ]
 +
 +    public_configs = [ ":xnnpack_public_config" ]
-+  }
+   }
 +}
-+
+ 
+-  if (build_with_chromium) {
+-    source_set(
+-        "qs8-vaddc_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
+-      cflags = [
+-        "-mavx512bw",
+-        "-mavx512cd",
+-        "-mavx512dq",
+-        "-mavx512f",
+-        "-mavx512vl",
+-        "-mf16c",
+-        "-mfma",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qs8-vaddc/gen/qs8-vaddc-minmax-avx512skx-mul32-ld128-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",
+-      ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-qs8-vcvt_riscv64_standalone") {
++  source_set("f16-gemm_arch=rv64gc_zvfh-abi=lp64d_standalone") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gc_zvfh"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-qs8-vcvt/gen/f16-qs8-vcvt-scalar-imagic-u4.c"
++      "src/src/f16-gemm/gen/f16-gemm-1x4v-minmax-rvvfp16arith.c",
++    "src/src/f16-gemm/gen/f16-gemm-7x4v-minmax-rvvfp16arith.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(
+-        "qs8-vaddc_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") {
+-      cflags = [
+-        "-mavx512bw",
+-        "-mavx512cd",
+-        "-mavx512dq",
+-        "-mavx512f",
+-        "-mavx512vl",
+-        "-mf16c",
+-        "-mfma",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qs8-vaddc/gen/qs8-vaddc-minmax-avx512skx-mul32-ld128-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" ]
+-      }
+-    }
+-  }
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
 +      "//third_party/fxdiv",
 +      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
-+
+ 
+-  if (build_with_chromium) {
+-    source_set("qs8-vaddc_sse2-no-sse3") {
+-      cflags = [
+-        "-mno-sse3",
+-        "-msse2",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qs8-vaddc/gen/qs8-vaddc-minmax-sse2-mul16-ld64-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" ]
+-
+-      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-vaddc_sse2-no-sse3_standalone") {
+-      cflags = [
+-        "-mno-sse3",
+-        "-msse2",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qs8-vaddc/gen/qs8-vaddc-minmax-sse2-mul16-ld64-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" ]
+-
+-      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("f16-qu8-vcvt_riscv64") {
++  source_set("f16-igemm_arch=rv64gc_zvfh-abi=lp64d") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gc_zvfh"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-qu8-vcvt/gen/f16-qu8-vcvt-scalar-imagic-u4.c"
++      "src/src/f16-igemm/gen/f16-igemm-1x4v-minmax-rvvfp16arith.c",
++    "src/src/f16-igemm/gen/f16-igemm-7x4v-minmax-rvvfp16arith.c"
 +    ]
-+
+ 
+-  if (build_with_chromium) {
+-    source_set("qs8-vaddc_sse4.1-no-sse4.2") {
+-      cflags = [
+-        "-mno-sse4.2",
+-        "-msse4.1",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qs8-vaddc/gen/qs8-vaddc-minmax-sse41-mul16-ld64-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" ]
+-
+-      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",
 +    ]
-+
+ 
+-  # This is a target that cannot depend on //base.
+-  if (build_with_internal_optimization_guide) {
+-    source_set("qs8-vaddc_sse4.1-no-sse4.2_standalone") {
+-      cflags = [
+-        "-mno-sse4.2",
+-        "-msse4.1",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qs8-vaddc/gen/qs8-vaddc-minmax-sse41-mul16-ld64-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" ]
+-
+-      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("qs8-vaddc_x64") {
+-      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-igemm_arch=rv64gc_zvfh-abi=lp64d_standalone") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gc_zvfh"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-qu8-vcvt/gen/f16-qu8-vcvt-scalar-imagic-u4.c"
++      "src/src/f16-igemm/gen/f16-igemm-1x4v-minmax-rvvfp16arith.c",
++    "src/src/f16-igemm/gen/f16-igemm-7x4v-minmax-rvvfp16arith.c"
 +    ]
-+
+ 
+-      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",
+-      ]
 +    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-vaddc_x64_standalone") {
+-      cflags = []
+-
+-      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",
+-      ]
+-
+-      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("f16-raddstoreexpminusmax_arch=rv64gc_zvfh-abi=lp64d") {
++  source_set("f16-maxpool_arch=rv64gc_zvfh-abi=lp64d") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gc_zvfh"
@@ -87416,28 +84342,113 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-raddstoreexpminusmax/gen/f16-raddstoreexpminusmax-rvvfp16arith-rr2-p2-u4v.c"
++      "src/src/f16-maxpool/gen/f16-maxpool-9p-minmax-rvvfp16arith-u2v.c"
 +    ]
-+
+ 
+-  if (build_with_chromium) {
+-    source_set("qs8-vcvt_avx-no-avx2-no-f16c-no-fma") {
+-      cflags = [
+-        "-mavx",
+-        "-mno-avx2",
+-        "-mno-f16c",
+-        "-mno-fma",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qs8-vcvt/gen/qs8-vcvt-avx-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",
+-      ]
 +    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-vcvt_avx-no-avx2-no-f16c-no-fma_standalone") {
+-      cflags = [
+-        "-mavx",
+-        "-mno-avx2",
+-        "-mno-f16c",
+-        "-mno-fma",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qs8-vcvt/gen/qs8-vcvt-avx-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",
+-      ]
+-
+-      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("qs8-vcvt_f16c-fma-avx2") {
+-      cflags = [
+-        "-mavx2",
+-        "-mf16c",
+-        "-mfma",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qs8-vcvt/gen/qs8-vcvt-avx2-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",
+-      ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-raddstoreexpminusmax_arch=rv64gc_zvfh-abi=lp64d_standalone") {
++  source_set("f16-maxpool_arch=rv64gc_zvfh-abi=lp64d_standalone") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gc_zvfh"
@@ -87445,77 +84456,278 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-raddstoreexpminusmax/gen/f16-raddstoreexpminusmax-rvvfp16arith-rr2-p2-u4v.c"
++      "src/src/f16-maxpool/gen/f16-maxpool-9p-minmax-rvvfp16arith-u2v.c"
 +    ]
-+
-+    configs -= [ "//build/config/compiler:chromium_code" ]
+ 
+-      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-vcvt_f16c-fma-avx2_standalone") {
+-      cflags = [
+-        "-mavx2",
+-        "-mf16c",
+-        "-mfma",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qs8-vcvt/gen/qs8-vcvt-avx2-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",
+-      ]
+-
+-      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",
 +    ]
-+
+ 
+-  if (build_with_chromium) {
+-    source_set("qs8-vcvt_sse2-no-sse3") {
+-      cflags = [
+-        "-mno-sse3",
+-        "-msse2",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qs8-vcvt/gen/qs8-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",
+-      ]
 +    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-vcvt_sse2-no-sse3_standalone") {
+-      cflags = [
+-        "-mno-sse3",
+-        "-msse2",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qs8-vcvt/gen/qs8-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",
+-      ]
+-
+-      public_configs = [ ":xnnpack_public_config" ]
+-
+-      if (!(is_android && use_order_profiling)) {
+-        assert_no_deps = [ "//base" ]
+-      }
+-    }
+-  }
 +if (build_with_chromium) {
-+  source_set("f16-rdminmax_arch=rv64gc_zvfh-abi=lp64d") {
++  source_set("f16-qs8-vcvt_riscv64") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gc_zvfh"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-rdminmax/gen/f16-rdmax-2p2x-rvvfp16arith-u8v.c",
-+    "src/src/f16-rdminmax/gen/f16-rdmin-2p2x-rvvfp16arith-u8v.c"
++      "src/src/f16-qs8-vcvt/gen/f16-qs8-vcvt-scalar-imagic-u4.c"
 +    ]
-+
+ 
+-  if (build_with_chromium) {
+-    source_set("qs8-vcvt_sse4.1-no-sse4.2") {
+-      cflags = [
+-        "-mno-sse4.2",
+-        "-msse4.1",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qs8-vcvt/gen/qs8-vcvt-sse41-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",
+-      ]
 +    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-vcvt_sse4.1-no-sse4.2_standalone") {
+-      cflags = [
+-        "-mno-sse4.2",
+-        "-msse4.1",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qs8-vcvt/gen/qs8-vcvt-sse41-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",
+-      ]
+-
+-      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("qs8-vcvt_ssse3-no-sse4.1") {
+-      cflags = [
+-        "-mno-sse4.1",
+-        "-mssse3",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qs8-vcvt/gen/qs8-vcvt-ssse3-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",
+-      ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-rdminmax_arch=rv64gc_zvfh-abi=lp64d_standalone") {
++  source_set("f16-qs8-vcvt_riscv64_standalone") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gc_zvfh"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-rdminmax/gen/f16-rdmax-2p2x-rvvfp16arith-u8v.c",
-+    "src/src/f16-rdminmax/gen/f16-rdmin-2p2x-rvvfp16arith-u8v.c"
++      "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" ]
-+
+ 
+-  # This is a target that cannot depend on //base.
+-  if (build_with_internal_optimization_guide) {
+-    source_set("qs8-vcvt_ssse3-no-sse4.1_standalone") {
+-      cflags = [
+-        "-mno-sse4.1",
+-        "-mssse3",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qs8-vcvt/gen/qs8-vcvt-ssse3-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",
+-      ]
+-
+-      public_configs = [ ":xnnpack_public_config" ]
+-
+-      if (!(is_android && use_order_profiling)) {
+-        assert_no_deps = [ "//base" ]
+-      }
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
@@ -87527,73 +84739,203 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +
 +    if (!(is_android && use_order_profiling)) {
 +      assert_no_deps = [ "//base" ]
-+    }
-+  }
+     }
+   }
 +}
-+
+ 
+-  if (build_with_chromium) {
+-    source_set("qs8-vcvt_x64") {
+-      cflags = []
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qs8-vcvt/gen/qs8-vcvt-scalar-u4.c",
+-      ]
 +if (build_with_chromium) {
-+  source_set("f16-rdminmax_riscv64") {
++  source_set("f16-qu8-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-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",
+-      ]
 +    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("qs8-vcvt_x64_standalone") {
+-      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-rdminmax_riscv64_standalone") {
++  source_set("f16-qu8-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-qu8-vcvt/gen/f16-qu8-vcvt-scalar-imagic-u4.c"
 +    ]
-+
+ 
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qs8-vcvt/gen/qs8-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" ]
+-      }
+-    }
+-  }
 +    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-vlrelu_avx-no-avx2-no-f16c-no-fma") {
+-      cflags = [
+-        "-mavx",
+-        "-mno-avx2",
+-        "-mno-f16c",
+-        "-mno-fma",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qs8-vlrelu/gen/qs8-vlrelu-avx-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",
+-      ]
 +    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" ]
-+
+ 
+-  # This is a target that cannot depend on //base.
+-  if (build_with_internal_optimization_guide) {
+-    source_set("qs8-vlrelu_avx-no-avx2-no-f16c-no-fma_standalone") {
+-      cflags = [
+-        "-mavx",
+-        "-mno-avx2",
+-        "-mno-f16c",
+-        "-mno-fma",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qs8-vlrelu/gen/qs8-vlrelu-avx-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",
+-      ]
+-
+-      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-vlrelu_f16c-fma-avx2") {
+-      cflags = [
+-        "-mavx2",
+-        "-mf16c",
+-        "-mfma",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qs8-vlrelu/gen/qs8-vlrelu-avx2-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",
+-      ]
 +if (build_with_chromium) {
-+  source_set("f16-rminmax_arch=rv64gc_zvfh-abi=lp64d") {
++  source_set("f16-raddstoreexpminusmax_arch=rv64gc_zvfh-abi=lp64d") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gc_zvfh"
@@ -87601,16 +84943,49 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-rminmax/gen/f16-rmax-rvvfp16arith-u8v.c",
-+    "src/src/f16-rminmax/gen/f16-rmin-rvvfp16arith-u8v.c",
-+    "src/src/f16-rminmax/gen/f16-rminmax-rvvfp16arith-u8v.c"
++      "src/src/f16-raddstoreexpminusmax/gen/f16-raddstoreexpminusmax-rvvfp16arith-rr2-p2-u4v.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("qs8-vlrelu_f16c-fma-avx2_standalone") {
+-      cflags = [
+-        "-mavx2",
+-        "-mf16c",
+-        "-mfma",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qs8-vlrelu/gen/qs8-vlrelu-avx2-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",
+-      ]
+-
+-      public_configs = [ ":xnnpack_public_config" ]
+-
+-      if (!(is_android && use_order_profiling)) {
+-        assert_no_deps = [ "//base" ]
+-      }
+-    }
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
@@ -87619,12 +84994,35 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +    ]
 +
 +    public_configs = [ ":xnnpack_public_config" ]
-+  }
+   }
 +}
-+
+ 
+-  if (build_with_chromium) {
+-    source_set("qs8-vlrelu_sse2-no-sse3") {
+-      cflags = [
+-        "-mno-sse3",
+-        "-msse2",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qs8-vlrelu/gen/qs8-vlrelu-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",
+-      ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-rminmax_arch=rv64gc_zvfh-abi=lp64d_standalone") {
++  source_set("f16-raddstoreexpminusmax_arch=rv64gc_zvfh-abi=lp64d_standalone") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gc_zvfh"
@@ -87632,157 +85030,489 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-rminmax/gen/f16-rmax-rvvfp16arith-u8v.c",
-+    "src/src/f16-rminmax/gen/f16-rmin-rvvfp16arith-u8v.c",
-+    "src/src/f16-rminmax/gen/f16-rminmax-rvvfp16arith-u8v.c"
++      "src/src/f16-raddstoreexpminusmax/gen/f16-raddstoreexpminusmax-rvvfp16arith-rr2-p2-u4v.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("qs8-vlrelu_sse2-no-sse3_standalone") {
+-      cflags = [
+-        "-mno-sse3",
+-        "-msse2",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qs8-vlrelu/gen/qs8-vlrelu-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",
+-      ]
+-
+-      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",
 +    ]
-+
+ 
+-  if (build_with_chromium) {
+-    source_set("qs8-vlrelu_sse4.1-no-sse4.2") {
+-      cflags = [
+-        "-mno-sse4.2",
+-        "-msse4.1",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qs8-vlrelu/gen/qs8-vlrelu-sse41-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",
+-      ]
 +    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-vlrelu_sse4.1-no-sse4.2_standalone") {
+-      cflags = [
+-        "-mno-sse4.2",
+-        "-msse4.1",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qs8-vlrelu/gen/qs8-vlrelu-sse41-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",
+-      ]
+-
+-      public_configs = [ ":xnnpack_public_config" ]
+-
+-      if (!(is_android && use_order_profiling)) {
+-        assert_no_deps = [ "//base" ]
+-      }
+-    }
+-  }
 +if (build_with_chromium) {
-+  source_set("f16-rminmax_riscv64") {
++  source_set("f16-rdminmax_arch=rv64gc_zvfh-abi=lp64d") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gc_zvfh"
 +    ]
 +  
 +    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-rdminmax/gen/f16-rdmax-2p2x-rvvfp16arith-u8v.c",
++    "src/src/f16-rdminmax/gen/f16-rdmin-2p2x-rvvfp16arith-u8v.c"
 +    ]
-+
+ 
+-  if (build_with_chromium) {
+-    source_set("qs8-vlrelu_ssse3-no-sse4.1") {
+-      cflags = [
+-        "-mno-sse4.1",
+-        "-mssse3",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qs8-vlrelu/gen/qs8-vlrelu-ssse3-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",
+-      ]
 +    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-vlrelu_ssse3-no-sse4.1_standalone") {
+-      cflags = [
+-        "-mno-sse4.1",
+-        "-mssse3",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qs8-vlrelu/gen/qs8-vlrelu-ssse3-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",
+-      ]
+-
+-      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("qs8-vlrelu_x64") {
+-      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-rdminmax_arch=rv64gc_zvfh-abi=lp64d_standalone") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gc_zvfh"
 +    ]
 +  
 +    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-rdminmax/gen/f16-rdmax-2p2x-rvvfp16arith-u8v.c",
++    "src/src/f16-rdminmax/gen/f16-rdmin-2p2x-rvvfp16arith-u8v.c"
 +    ]
-+
+ 
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qs8-vlrelu/gen/qs8-vlrelu-scalar-andxor-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-vlrelu_x64_standalone") {
+-      cflags = []
 +if (build_with_chromium) {
-+  source_set("f16-spmm_arch=rv64gc_zvfh-abi=lp64d") {
++  source_set("f16-rdminmax_riscv64") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gc_zvfh"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-spmm/gen/f16-spmm-8vx1-minmax-rvvfp16arith.c"
++      "src/src/f16-rdminmax/gen/f16-rdmax-2p2x-scalar-u2.c",
++    "src/src/f16-rdminmax/gen/f16-rdmin-2p2x-scalar-u2.c"
 +    ]
-+
+ 
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qs8-vlrelu/gen/qs8-vlrelu-scalar-andxor-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" ]
+-      }
+-    }
+-  }
 +    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-vmul_avx-no-avx2-no-f16c-no-fma") {
+-      cflags = [
+-        "-mavx",
+-        "-mno-avx2",
+-        "-mno-f16c",
+-        "-mno-fma",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qs8-vmul/gen/qs8-vmul-minmax-fp32-avx-mul16-ld64-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",
+-      ]
 +    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("qs8-vmul_avx-no-avx2-no-f16c-no-fma_standalone") {
+-      cflags = [
+-        "-mavx",
+-        "-mno-avx2",
+-        "-mno-f16c",
+-        "-mno-fma",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qs8-vmul/gen/qs8-vmul-minmax-fp32-avx-mul16-ld64-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" ]
+-      }
+-    }
+-  }
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-spmm_arch=rv64gc_zvfh-abi=lp64d_standalone") {
++  source_set("f16-rdminmax_riscv64_standalone") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gc_zvfh"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-spmm/gen/f16-spmm-8vx1-minmax-rvvfp16arith.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) {
+-    source_set("qs8-vmul_sse2-no-sse3") {
+-      cflags = [
+-        "-mno-sse3",
+-        "-msse2",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qs8-vmul/gen/qs8-vmul-minmax-fp32-sse2-mul16-ld64-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" ]
+-
+-      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("qs8-vmul_sse2-no-sse3_standalone") {
+-      cflags = [
+-        "-mno-sse3",
+-        "-msse2",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qs8-vmul/gen/qs8-vmul-minmax-fp32-sse2-mul16-ld64-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" ]
+-
+-      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" ]
-+    }
-+  }
+     }
+   }
 +}
-+
+ 
+-  if (build_with_chromium) {
+-    source_set("qs8-vmul_sse4.1-no-sse4.2") {
+-      cflags = [
+-        "-mno-sse4.2",
+-        "-msse4.1",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qs8-vmul/gen/qs8-vmul-minmax-fp32-sse41-mul16-ld64-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",
+-      ]
 +if (build_with_chromium) {
-+  source_set("f16-vapproxgelu_arch=rv64gc_zvfh-abi=lp64d") {
++  source_set("f16-rminmax_arch=rv64gc_zvfh-abi=lp64d") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gc_zvfh"
@@ -87790,14 +85520,50 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vapproxgelu/gen/f16-vapproxgelu-rvvfp16arith-rational-6-4-div-u4v.c"
++      "src/src/f16-rminmax/gen/f16-rmax-rvvfp16arith-u8v.c",
++    "src/src/f16-rminmax/gen/f16-rmin-rvvfp16arith-u8v.c",
++    "src/src/f16-rminmax/gen/f16-rminmax-rvvfp16arith-u8v.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("qs8-vmul_sse4.1-no-sse4.2_standalone") {
+-      cflags = [
+-        "-mno-sse4.2",
+-        "-msse4.1",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qs8-vmul/gen/qs8-vmul-minmax-fp32-sse41-mul16-ld64-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" ]
+-      }
+-    }
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
@@ -87806,12 +85572,15 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +    ]
 +
 +    public_configs = [ ":xnnpack_public_config" ]
-+  }
+   }
 +}
-+
+ 
+-  if (build_with_chromium) {
+-    source_set("qs8-vmul_x64") {
+-      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-vapproxgelu_arch=rv64gc_zvfh-abi=lp64d_standalone") {
++  source_set("f16-rminmax_arch=rv64gc_zvfh-abi=lp64d_standalone") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gc_zvfh"
@@ -87819,90 +85588,279 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vapproxgelu/gen/f16-vapproxgelu-rvvfp16arith-rational-6-4-div-u4v.c"
++      "src/src/f16-rminmax/gen/f16-rmax-rvvfp16arith-u8v.c",
++    "src/src/f16-rminmax/gen/f16-rmin-rvvfp16arith-u8v.c",
++    "src/src/f16-rminmax/gen/f16-rminmax-rvvfp16arith-u8v.c"
 +    ]
-+
+ 
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qs8-vmul/gen/qs8-vmul-minmax-fp32-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-vmul_x64_standalone") {
+-      cflags = []
 +if (build_with_chromium) {
-+  source_set("f16-vapproxgelu_riscv64") {
++  source_set("f16-rminmax_riscv64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vapproxgelu/gen/f16-f32acc-vapproxgelu-scalar-rational-6-4-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 = [
+-        "src/include/xnnpack.h",
+-        "src/src/qs8-vmul/gen/qs8-vmul-minmax-fp32-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" ]
+-      }
+-    }
+-  }
 +    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-vmulc_avx-no-avx2-no-f16c-no-fma") {
+-      cflags = [
+-        "-mavx",
+-        "-mno-avx2",
+-        "-mno-f16c",
+-        "-mno-fma",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qs8-vmulc/gen/qs8-vmulc-minmax-fp32-avx-mul16-ld64-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",
+-      ]
 +    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("qs8-vmulc_avx-no-avx2-no-f16c-no-fma_standalone") {
+-      cflags = [
+-        "-mavx",
+-        "-mno-avx2",
+-        "-mno-f16c",
+-        "-mno-fma",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qs8-vmulc/gen/qs8-vmulc-minmax-fp32-avx-mul16-ld64-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" ]
+-      }
+-    }
+-  }
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-vapproxgelu_riscv64_standalone") {
++  source_set("f16-rminmax_riscv64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vapproxgelu/gen/f16-f32acc-vapproxgelu-scalar-rational-6-4-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"
 +    ]
-+
+ 
+-  if (build_with_chromium) {
+-    source_set("qs8-vmulc_sse2-no-sse3") {
+-      cflags = [
+-        "-mno-sse3",
+-        "-msse2",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qs8-vmulc/gen/qs8-vmulc-minmax-fp32-sse2-mul16-ld64-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" ]
+-
+-      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("qs8-vmulc_sse2-no-sse3_standalone") {
+-      cflags = [
+-        "-mno-sse3",
+-        "-msse2",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qs8-vmulc/gen/qs8-vmulc-minmax-fp32-sse2-mul16-ld64-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" ]
+-
+-      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" ]
-+    }
-+  }
+     }
+   }
 +}
-+
+ 
+-  if (build_with_chromium) {
+-    source_set("qs8-vmulc_sse4.1-no-sse4.2") {
+-      cflags = [
+-        "-mno-sse4.2",
+-        "-msse4.1",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qs8-vmulc/gen/qs8-vmulc-minmax-fp32-sse41-mul16-ld64-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",
+-      ]
 +if (build_with_chromium) {
-+  source_set("f16-vbinary_arch=rv64gc_zvfh-abi=lp64d") {
++  source_set("f16-spmm_arch=rv64gc_zvfh-abi=lp64d") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gc_zvfh"
@@ -87910,32 +85868,48 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vbinary/gen/f16-vadd-rvvfp16arith-u8v.c",
-+    "src/src/f16-vbinary/gen/f16-vaddc-rvvfp16arith-u8v.c",
-+    "src/src/f16-vbinary/gen/f16-vdiv-rvvfp16arith-u8v.c",
-+    "src/src/f16-vbinary/gen/f16-vdivc-rvvfp16arith-u8v.c",
-+    "src/src/f16-vbinary/gen/f16-vmax-rvvfp16arith-u8v.c",
-+    "src/src/f16-vbinary/gen/f16-vmaxc-rvvfp16arith-u8v.c",
-+    "src/src/f16-vbinary/gen/f16-vmin-rvvfp16arith-u8v.c",
-+    "src/src/f16-vbinary/gen/f16-vminc-rvvfp16arith-u8v.c",
-+    "src/src/f16-vbinary/gen/f16-vmul-rvvfp16arith-u8v.c",
-+    "src/src/f16-vbinary/gen/f16-vmulc-rvvfp16arith-u8v.c",
-+    "src/src/f16-vbinary/gen/f16-vprelu-rvvfp16arith-u8v.c",
-+    "src/src/f16-vbinary/gen/f16-vpreluc-rvvfp16arith-u8v.c",
-+    "src/src/f16-vbinary/gen/f16-vrdivc-rvvfp16arith-u8v.c",
-+    "src/src/f16-vbinary/gen/f16-vrpreluc-rvvfp16arith-u8v.c",
-+    "src/src/f16-vbinary/gen/f16-vrsubc-rvvfp16arith-u8v.c",
-+    "src/src/f16-vbinary/gen/f16-vsqrdiff-rvvfp16arith-u8v.c",
-+    "src/src/f16-vbinary/gen/f16-vsqrdiffc-rvvfp16arith-u8v.c",
-+    "src/src/f16-vbinary/gen/f16-vsub-rvvfp16arith-u8v.c",
-+    "src/src/f16-vbinary/gen/f16-vsubc-rvvfp16arith-u8v.c"
++      "src/src/f16-spmm/gen/f16-spmm-8vx1-minmax-rvvfp16arith.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("qs8-vmulc_sse4.1-no-sse4.2_standalone") {
+-      cflags = [
+-        "-mno-sse4.2",
+-        "-msse4.1",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qs8-vmulc/gen/qs8-vmulc-minmax-fp32-sse41-mul16-ld64-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" ]
+-      }
+-    }
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
@@ -87944,12 +85918,15 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +    ]
 +
 +    public_configs = [ ":xnnpack_public_config" ]
-+  }
+   }
 +}
-+
+ 
+-  if (build_with_chromium) {
+-    source_set("qs8-vmulc_x64") {
+-      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-vbinary_arch=rv64gc_zvfh-abi=lp64d_standalone") {
++  source_set("f16-spmm_arch=rv64gc_zvfh-abi=lp64d_standalone") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gc_zvfh"
@@ -87957,49 +85934,75 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vbinary/gen/f16-vadd-rvvfp16arith-u8v.c",
-+    "src/src/f16-vbinary/gen/f16-vaddc-rvvfp16arith-u8v.c",
-+    "src/src/f16-vbinary/gen/f16-vdiv-rvvfp16arith-u8v.c",
-+    "src/src/f16-vbinary/gen/f16-vdivc-rvvfp16arith-u8v.c",
-+    "src/src/f16-vbinary/gen/f16-vmax-rvvfp16arith-u8v.c",
-+    "src/src/f16-vbinary/gen/f16-vmaxc-rvvfp16arith-u8v.c",
-+    "src/src/f16-vbinary/gen/f16-vmin-rvvfp16arith-u8v.c",
-+    "src/src/f16-vbinary/gen/f16-vminc-rvvfp16arith-u8v.c",
-+    "src/src/f16-vbinary/gen/f16-vmul-rvvfp16arith-u8v.c",
-+    "src/src/f16-vbinary/gen/f16-vmulc-rvvfp16arith-u8v.c",
-+    "src/src/f16-vbinary/gen/f16-vprelu-rvvfp16arith-u8v.c",
-+    "src/src/f16-vbinary/gen/f16-vpreluc-rvvfp16arith-u8v.c",
-+    "src/src/f16-vbinary/gen/f16-vrdivc-rvvfp16arith-u8v.c",
-+    "src/src/f16-vbinary/gen/f16-vrpreluc-rvvfp16arith-u8v.c",
-+    "src/src/f16-vbinary/gen/f16-vrsubc-rvvfp16arith-u8v.c",
-+    "src/src/f16-vbinary/gen/f16-vsqrdiff-rvvfp16arith-u8v.c",
-+    "src/src/f16-vbinary/gen/f16-vsqrdiffc-rvvfp16arith-u8v.c",
-+    "src/src/f16-vbinary/gen/f16-vsub-rvvfp16arith-u8v.c",
-+    "src/src/f16-vbinary/gen/f16-vsubc-rvvfp16arith-u8v.c"
++      "src/src/f16-spmm/gen/f16-spmm-8vx1-minmax-rvvfp16arith.c"
 +    ]
-+
+ 
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qs8-vmulc/gen/qs8-vmulc-minmax-fp32-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-vmulc_x64_standalone") {
+-      cflags = []
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qs8-vmulc/gen/qs8-vmulc-minmax-fp32-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" ]
+-      }
+-    }
+-  }
 +if (build_with_chromium) {
-+  source_set("f16-vclamp_arch=rv64gc_zvfh-abi=lp64d") {
++  source_set("f16-vapproxgelu_arch=rv64gc_zvfh-abi=lp64d") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gc_zvfh"
@@ -88007,28 +86010,90 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vclamp/gen/f16-vclamp-rvvfp16arith-u8v.c"
++      "src/src/f16-vapproxgelu/gen/f16-vapproxgelu-rvvfp16arith-rational-6-4-div-u4v.c"
 +    ]
-+
+ 
+-  if (build_with_chromium) {
+-    source_set("qs8-vprelu_f16c-fma-avx2") {
+-      cflags = [
+-        "-mavx2",
+-        "-mf16c",
+-        "-mfma",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qs8-vprelu/gen/qs8-vprelu-avx2-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",
+-      ]
 +    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-vprelu_f16c-fma-avx2_standalone") {
+-      cflags = [
+-        "-mavx2",
+-        "-mf16c",
+-        "-mfma",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qs8-vprelu/gen/qs8-vprelu-avx2-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" ]
+-      }
+-    }
 +    public_configs = [ ":xnnpack_public_config" ]
-+  }
+   }
 +}
-+
+ 
+-  if (build_with_chromium) {
+-    source_set("qs8-vprelu_x64") {
+-      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-vclamp_arch=rv64gc_zvfh-abi=lp64d_standalone") {
++  source_set("f16-vapproxgelu_arch=rv64gc_zvfh-abi=lp64d_standalone") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gc_zvfh"
@@ -88036,31 +86101,240 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vclamp/gen/f16-vclamp-rvvfp16arith-u8v.c"
++      "src/src/f16-vapproxgelu/gen/f16-vapproxgelu-rvvfp16arith-rational-6-4-div-u4v.c"
 +    ]
-+
+ 
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qs8-vprelu/gen/qs8-vprelu-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: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-vprelu_x64_standalone") {
+-      cflags = []
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qs8-vprelu/gen/qs8-vprelu-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" ]
+-
+-      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("f16-vcmul_arch=rv64gc_zvfh-abi=lp64d") {
++  source_set("f16-vapproxgelu_riscv64") {
++    cflags = [
++  
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/f16-vapproxgelu/gen/f16-f32acc-vapproxgelu-scalar-rational-6-4-div.c"
++    ]
+ 
+-  if (build_with_chromium) {
+-    source_set("qs8-vpreluc_f16c-fma-avx2") {
+-      cflags = [
+-        "-mavx2",
+-        "-mf16c",
+-        "-mfma",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qs8-vpreluc/gen/qs8-vpreluc-avx2-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",
+-      ]
++    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-vpreluc_f16c-fma-avx2_standalone") {
+-      cflags = [
+-        "-mavx2",
+-        "-mf16c",
+-        "-mfma",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qs8-vpreluc/gen/qs8-vpreluc-avx2-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" ]
+-      }
+-    }
++    public_configs = [ ":xnnpack_public_config" ]
+   }
++}
+ 
+-  if (build_with_chromium) {
+-    source_set("qs8-vpreluc_x64") {
+-      cflags = []
++# This is a target that cannot depend on //base.
++if (build_with_internal_optimization_guide) {
++  source_set("f16-vapproxgelu_riscv64_standalone") {
++    cflags = [
++  
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/f16-vapproxgelu/gen/f16-f32acc-vapproxgelu-scalar-rational-6-4-div.c"
++    ]
+ 
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qs8-vpreluc/gen/qs8-vpreluc-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: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-vpreluc_x64_standalone") {
+-      cflags = []
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qs8-vpreluc/gen/qs8-vpreluc-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" ]
+-
+-      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("f16-vbinary_arch=rv64gc_zvfh-abi=lp64d") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gc_zvfh"
@@ -88068,28 +86342,108 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vcmul/gen/f16-vcmul-rvvfp16arith-u2v.c"
++      "src/src/f16-vbinary/gen/f16-vadd-rvvfp16arith-u8v.c",
++    "src/src/f16-vbinary/gen/f16-vaddc-rvvfp16arith-u8v.c",
++    "src/src/f16-vbinary/gen/f16-vdiv-rvvfp16arith-u8v.c",
++    "src/src/f16-vbinary/gen/f16-vdivc-rvvfp16arith-u8v.c",
++    "src/src/f16-vbinary/gen/f16-vmax-rvvfp16arith-u8v.c",
++    "src/src/f16-vbinary/gen/f16-vmaxc-rvvfp16arith-u8v.c",
++    "src/src/f16-vbinary/gen/f16-vmin-rvvfp16arith-u8v.c",
++    "src/src/f16-vbinary/gen/f16-vminc-rvvfp16arith-u8v.c",
++    "src/src/f16-vbinary/gen/f16-vmul-rvvfp16arith-u8v.c",
++    "src/src/f16-vbinary/gen/f16-vmulc-rvvfp16arith-u8v.c",
++    "src/src/f16-vbinary/gen/f16-vprelu-rvvfp16arith-u8v.c",
++    "src/src/f16-vbinary/gen/f16-vpreluc-rvvfp16arith-u8v.c",
++    "src/src/f16-vbinary/gen/f16-vrdivc-rvvfp16arith-u8v.c",
++    "src/src/f16-vbinary/gen/f16-vrpreluc-rvvfp16arith-u8v.c",
++    "src/src/f16-vbinary/gen/f16-vrsubc-rvvfp16arith-u8v.c",
++    "src/src/f16-vbinary/gen/f16-vsqrdiff-rvvfp16arith-u8v.c",
++    "src/src/f16-vbinary/gen/f16-vsqrdiffc-rvvfp16arith-u8v.c",
++    "src/src/f16-vbinary/gen/f16-vsub-rvvfp16arith-u8v.c",
++    "src/src/f16-vbinary/gen/f16-vsubc-rvvfp16arith-u8v.c"
 +    ]
-+
+ 
+-  if (build_with_chromium) {
+-    source_set("qs8-vrpreluc_f16c-fma-avx2") {
+-      cflags = [
+-        "-mavx2",
+-        "-mf16c",
+-        "-mfma",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qs8-vrpreluc/gen/qs8-vrpreluc-avx2-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",
+-      ]
 +    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-vrpreluc_f16c-fma-avx2_standalone") {
+-      cflags = [
+-        "-mavx2",
+-        "-mf16c",
+-        "-mfma",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qs8-vrpreluc/gen/qs8-vrpreluc-avx2-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" ]
+-      }
+-    }
 +    public_configs = [ ":xnnpack_public_config" ]
-+  }
+   }
 +}
-+
+ 
+-  if (build_with_chromium) {
+-    source_set("qs8-vrpreluc_x64") {
+-      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-vcmul_arch=rv64gc_zvfh-abi=lp64d_standalone") {
++  source_set("f16-vbinary_arch=rv64gc_zvfh-abi=lp64d_standalone") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gc_zvfh"
@@ -88097,31 +86451,68 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vcmul/gen/f16-vcmul-rvvfp16arith-u2v.c"
++      "src/src/f16-vbinary/gen/f16-vadd-rvvfp16arith-u8v.c",
++    "src/src/f16-vbinary/gen/f16-vaddc-rvvfp16arith-u8v.c",
++    "src/src/f16-vbinary/gen/f16-vdiv-rvvfp16arith-u8v.c",
++    "src/src/f16-vbinary/gen/f16-vdivc-rvvfp16arith-u8v.c",
++    "src/src/f16-vbinary/gen/f16-vmax-rvvfp16arith-u8v.c",
++    "src/src/f16-vbinary/gen/f16-vmaxc-rvvfp16arith-u8v.c",
++    "src/src/f16-vbinary/gen/f16-vmin-rvvfp16arith-u8v.c",
++    "src/src/f16-vbinary/gen/f16-vminc-rvvfp16arith-u8v.c",
++    "src/src/f16-vbinary/gen/f16-vmul-rvvfp16arith-u8v.c",
++    "src/src/f16-vbinary/gen/f16-vmulc-rvvfp16arith-u8v.c",
++    "src/src/f16-vbinary/gen/f16-vprelu-rvvfp16arith-u8v.c",
++    "src/src/f16-vbinary/gen/f16-vpreluc-rvvfp16arith-u8v.c",
++    "src/src/f16-vbinary/gen/f16-vrdivc-rvvfp16arith-u8v.c",
++    "src/src/f16-vbinary/gen/f16-vrpreluc-rvvfp16arith-u8v.c",
++    "src/src/f16-vbinary/gen/f16-vrsubc-rvvfp16arith-u8v.c",
++    "src/src/f16-vbinary/gen/f16-vsqrdiff-rvvfp16arith-u8v.c",
++    "src/src/f16-vbinary/gen/f16-vsqrdiffc-rvvfp16arith-u8v.c",
++    "src/src/f16-vbinary/gen/f16-vsub-rvvfp16arith-u8v.c",
++    "src/src/f16-vbinary/gen/f16-vsubc-rvvfp16arith-u8v.c"
 +    ]
-+
+ 
+-      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: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-vrpreluc_x64_standalone") {
+-      cflags = []
 +if (build_with_chromium) {
-+  source_set("f16-vcos_arch=rv64gc_zvfh-abi=lp64d") {
++  source_set("f16-vclamp_arch=rv64gc_zvfh-abi=lp64d") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gc_zvfh"
@@ -88129,28 +86520,115 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vcos/gen/f16-vcos-rvvfp16arith-poly-3-u4v.c"
++      "src/src/f16-vclamp/gen/f16-vclamp-rvvfp16arith-u8v.c"
 +    ]
-+
+ 
+-      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" ]
+-
+-      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("qu8-dwconv_avx-no-avx2-no-f16c-no-fma") {
+-      cflags = [
+-        "-mavx",
+-        "-mno-avx2",
+-        "-mno-f16c",
+-        "-mno-fma",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qu8-dwconv/gen/qu8-dwconv-25p16c-minmax-fp32-avx-mul16.c",
+-        "src/src/qu8-dwconv/gen/qu8-dwconv-9p16c-minmax-fp32-avx-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",
+-      ]
 +    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("qu8-dwconv_avx-no-avx2-no-f16c-no-fma_standalone") {
+-      cflags = [
+-        "-mavx",
+-        "-mno-avx2",
+-        "-mno-f16c",
+-        "-mno-fma",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qu8-dwconv/gen/qu8-dwconv-25p16c-minmax-fp32-avx-mul16.c",
+-        "src/src/qu8-dwconv/gen/qu8-dwconv-9p16c-minmax-fp32-avx-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("f16-vcos_arch=rv64gc_zvfh-abi=lp64d_standalone") {
++  source_set("f16-vclamp_arch=rv64gc_zvfh-abi=lp64d_standalone") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gc_zvfh"
@@ -88158,105 +86636,1606 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vcos/gen/f16-vcos-rvvfp16arith-poly-3-u4v.c"
++      "src/src/f16-vclamp/gen/f16-vclamp-rvvfp16arith-u8v.c"
 +    ]
-+
+ 
+-  if (build_with_chromium) {
+-    source_set("qu8-dwconv_f16c-fma-avx2") {
+-      cflags = [
+-        "-mavx2",
+-        "-mf16c",
+-        "-mfma",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qu8-dwconv/gen/qu8-dwconv-25p16c-minmax-fp32-avx2-mul32.c",
+-        "src/src/qu8-dwconv/gen/qu8-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",
+-      ]
 +    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("qu8-dwconv_f16c-fma-avx2_standalone") {
+-      cflags = [
+-        "-mavx2",
+-        "-mf16c",
+-        "-mfma",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qu8-dwconv/gen/qu8-dwconv-25p16c-minmax-fp32-avx2-mul32.c",
+-        "src/src/qu8-dwconv/gen/qu8-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: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" ]
-+    }
-+  }
+     }
+   }
 +}
-+
+ 
+-  if (build_with_chromium) {
+-    source_set(
+-        "qu8-dwconv_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
+-      cflags = [
+-        "-mavx512bw",
+-        "-mavx512cd",
+-        "-mavx512dq",
+-        "-mavx512f",
+-        "-mavx512vl",
+-        "-mf16c",
+-        "-mfma",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qu8-dwconv/gen/qu8-dwconv-25p32c-minmax-fp32-avx512skx-mul32.c",
+-        "src/src/qu8-dwconv/gen/qu8-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("f16-vcos_riscv64") {
++  source_set("f16-vcmul_arch=rv64gc_zvfh-abi=lp64d") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gc_zvfh"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vcos/gen/f16-f32acc-vcos-scalar-poly-3.c"
++      "src/src/f16-vcmul/gen/f16-vcmul-rvvfp16arith-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(
+-        "qu8-dwconv_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") {
+-      cflags = [
+-        "-mavx512bw",
+-        "-mavx512cd",
+-        "-mavx512dq",
+-        "-mavx512f",
+-        "-mavx512vl",
+-        "-mf16c",
+-        "-mfma",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qu8-dwconv/gen/qu8-dwconv-25p32c-minmax-fp32-avx512skx-mul32.c",
+-        "src/src/qu8-dwconv/gen/qu8-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:pthreadpool_standalone",
+-      ]
+-
+-      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",
++    ]
++
++    public_configs = [ ":xnnpack_public_config" ]
+   }
++}
+ 
+-  if (build_with_chromium) {
+-    source_set("qu8-dwconv_sse2-no-sse3") {
+-      cflags = [
+-        "-mno-sse3",
+-        "-msse2",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qu8-dwconv/gen/qu8-dwconv-25p8c-minmax-fp32-sse2-mul16.c",
+-        "src/src/qu8-dwconv/gen/qu8-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",
+-      ]
++# This is a target that cannot depend on //base.
++if (build_with_internal_optimization_guide) {
++  source_set("f16-vcmul_arch=rv64gc_zvfh-abi=lp64d_standalone") {
++    cflags = [
++      "-mabi=lp64d",
++    "-march=rv64gc_zvfh"
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/f16-vcmul/gen/f16-vcmul-rvvfp16arith-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("qu8-dwconv_sse2-no-sse3_standalone") {
+-      cflags = [
+-        "-mno-sse3",
+-        "-msse2",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qu8-dwconv/gen/qu8-dwconv-25p8c-minmax-fp32-sse2-mul16.c",
+-        "src/src/qu8-dwconv/gen/qu8-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" ]
+-      }
+-    }
+-  }
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool:pthreadpool_standalone",
++    ]
+ 
+-  if (build_with_chromium) {
+-    source_set("qu8-dwconv_sse4.1-no-sse4.2") {
+-      cflags = [
+-        "-mno-sse4.2",
+-        "-msse4.1",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qu8-dwconv/gen/qu8-dwconv-25p8c-minmax-fp32-sse41-mul16.c",
+-        "src/src/qu8-dwconv/gen/qu8-dwconv-9p8c-minmax-fp32-sse41-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",
+-      ]
++    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("qu8-dwconv_sse4.1-no-sse4.2_standalone") {
+-      cflags = [
+-        "-mno-sse4.2",
+-        "-msse4.1",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qu8-dwconv/gen/qu8-dwconv-25p8c-minmax-fp32-sse41-mul16.c",
+-        "src/src/qu8-dwconv/gen/qu8-dwconv-9p8c-minmax-fp32-sse41-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("f16-vcos_arch=rv64gc_zvfh-abi=lp64d") {
++    cflags = [
++      "-mabi=lp64d",
++    "-march=rv64gc_zvfh"
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/f16-vcos/gen/f16-vcos-rvvfp16arith-poly-3-u4v.c"
++    ]
+ 
+-  if (build_with_chromium) {
+-    source_set("qu8-dwconv_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/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",
+-      ]
+-
+-      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) {
+-    source_set("qu8-dwconv_x64_standalone") {
+-      cflags = []
++# This is a target that cannot depend on //base.
++if (build_with_internal_optimization_guide) {
++  source_set("f16-vcos_arch=rv64gc_zvfh-abi=lp64d_standalone") {
++    cflags = [
++      "-mabi=lp64d",
++    "-march=rv64gc_zvfh"
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/f16-vcos/gen/f16-vcos-rvvfp16arith-poly-3-u4v.c"
++    ]
+ 
+-      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",
+-      ]
+-
+-      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("qu8-f32-vcvt_avx-no-avx2-no-f16c-no-fma") {
+-      cflags = [
+-        "-mavx",
+-        "-mno-avx2",
+-        "-mno-f16c",
+-        "-mno-fma",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qu8-f32-vcvt/gen/qu8-f32-vcvt-avx-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",
+-      ]
++    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" ]
+ 
+-  # This is a target that cannot depend on //base.
+-  if (build_with_internal_optimization_guide) {
+-    source_set("qu8-f32-vcvt_avx-no-avx2-no-f16c-no-fma_standalone") {
+-      cflags = [
+-        "-mavx",
+-        "-mno-avx2",
+-        "-mno-f16c",
+-        "-mno-fma",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qu8-f32-vcvt/gen/qu8-f32-vcvt-avx-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",
+-      ]
+-
+-      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("qu8-f32-vcvt_f16c-fma-avx2") {
+-      cflags = [
+-        "-mavx2",
+-        "-mf16c",
+-        "-mfma",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qu8-f32-vcvt/gen/qu8-f32-vcvt-avx2-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",
+-      ]
++if (build_with_chromium) {
++  source_set("f16-vcos_riscv64") {
++    cflags = [
++  
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/f16-vcos/gen/f16-f32acc-vcos-scalar-poly-3.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-f32-vcvt_f16c-fma-avx2_standalone") {
+-      cflags = [
+-        "-mavx2",
+-        "-mf16c",
+-        "-mfma",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qu8-f32-vcvt/gen/qu8-f32-vcvt-avx2-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" ]
+-      }
+-    }
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool",
++    ]
++
++    public_configs = [ ":xnnpack_public_config" ]
+   }
++}
+ 
+-  if (build_with_chromium) {
+-    source_set(
+-        "qu8-f32-vcvt_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
+-      cflags = [
+-        "-mavx512bw",
+-        "-mavx512cd",
+-        "-mavx512dq",
+-        "-mavx512f",
+-        "-mavx512vl",
+-        "-mf16c",
+-        "-mfma",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qu8-f32-vcvt/gen/qu8-f32-vcvt-avx512skx-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",
+-      ]
++# This is a target that cannot depend on //base.
++if (build_with_internal_optimization_guide) {
++  source_set("f16-vcos_riscv64_standalone") {
++    cflags = [
++  
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/f16-vcos/gen/f16-f32acc-vcos-scalar-poly-3.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-f32-vcvt_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") {
+-      cflags = [
+-        "-mavx512bw",
+-        "-mavx512cd",
+-        "-mavx512dq",
+-        "-mavx512f",
+-        "-mavx512vl",
+-        "-mf16c",
+-        "-mfma",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qu8-f32-vcvt/gen/qu8-f32-vcvt-avx512skx-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",
+-      ]
+-
+-      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",
++    ]
+ 
+-  if (build_with_chromium) {
+-    source_set("qu8-f32-vcvt_sse2-no-sse3") {
+-      cflags = [
+-        "-mno-sse3",
+-        "-msse2",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qu8-f32-vcvt/gen/qu8-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",
+-      ]
++    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("qu8-f32-vcvt_sse2-no-sse3_standalone") {
+-      cflags = [
+-        "-mno-sse3",
+-        "-msse2",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qu8-f32-vcvt/gen/qu8-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",
+-      ]
+-
+-      public_configs = [ ":xnnpack_public_config" ]
+-
+-      if (!(is_android && use_order_profiling)) {
+-        assert_no_deps = [ "//base" ]
+-      }
+-    }
+-  }
++if (build_with_chromium) {
++  source_set("f16-velu_arch=rv64gc_zvfh-abi=lp64d") {
++    cflags = [
++      "-mabi=lp64d",
++    "-march=rv64gc_zvfh"
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/f16-velu/gen/f16-velu-rvvfp16arith-rr1-p3-u2v.c"
++    ]
+ 
+-  if (build_with_chromium) {
+-    source_set("qu8-f32-vcvt_sse4.1-no-sse4.2") {
+-      cflags = [
+-        "-mno-sse4.2",
+-        "-msse4.1",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qu8-f32-vcvt/gen/qu8-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",
+-      ]
++    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("qu8-f32-vcvt_sse4.1-no-sse4.2_standalone") {
+-      cflags = [
+-        "-mno-sse4.2",
+-        "-msse4.1",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qu8-f32-vcvt/gen/qu8-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: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("qu8-f32-vcvt_x64") {
+-      cflags = []
++# This is a target that cannot depend on //base.
++if (build_with_internal_optimization_guide) {
++  source_set("f16-velu_arch=rv64gc_zvfh-abi=lp64d_standalone") {
++    cflags = [
++      "-mabi=lp64d",
++    "-march=rv64gc_zvfh"
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/f16-velu/gen/f16-velu-rvvfp16arith-rr1-p3-u2v.c"
++    ]
+ 
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qu8-f32-vcvt/gen/qu8-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("qu8-f32-vcvt_x64_standalone") {
+-      cflags = []
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qu8-f32-vcvt/gen/qu8-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" ]
+-      }
+-    }
+-  }
++if (build_with_chromium) {
++  source_set("f16-vexp_arch=rv64gc_zvfh-abi=lp64d") {
++    cflags = [
++      "-mabi=lp64d",
++    "-march=rv64gc_zvfh"
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/f16-vexp/gen/f16-vexp-rvvfp16arith-poly-3-u8v.c"
++    ]
+ 
+-  if (build_with_chromium) {
+-    source_set("qu8-gemm_avx-no-avx2-no-f16c-no-fma") {
+-      cflags = [
+-        "-mavx",
+-        "-mno-avx2",
+-        "-mno-f16c",
+-        "-mno-fma",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qu8-gemm/gen/qu8-gemm-1x4c8-minmax-fp32-avx-ld128.c",
+-        "src/src/qu8-gemm/gen/qu8-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",
+-      ]
++    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("qu8-gemm_avx-no-avx2-no-f16c-no-fma_standalone") {
+-      cflags = [
+-        "-mavx",
+-        "-mno-avx2",
+-        "-mno-f16c",
+-        "-mno-fma",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qu8-gemm/gen/qu8-gemm-1x4c8-minmax-fp32-avx-ld128.c",
+-        "src/src/qu8-gemm/gen/qu8-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" ]
+-      }
+-    }
++    public_configs = [ ":xnnpack_public_config" ]
+   }
++}
+ 
+-  if (build_with_chromium) {
+-    source_set("qu8-gemm_f16c-fma-avx2") {
+-      cflags = [
+-        "-mavx2",
+-        "-mf16c",
+-        "-mfma",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qu8-gemm/gen/qu8-gemm-1x8c8-minmax-fp32-avx2.c",
+-        "src/src/qu8-gemm/gen/qu8-gemm-3x8c8-minmax-fp32-avx2.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("f16-vexp_arch=rv64gc_zvfh-abi=lp64d_standalone") {
++    cflags = [
++      "-mabi=lp64d",
++    "-march=rv64gc_zvfh"
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/f16-vexp/gen/f16-vexp-rvvfp16arith-poly-3-u8v.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_f16c-fma-avx2_standalone") {
+-      cflags = [
+-        "-mavx2",
+-        "-mf16c",
+-        "-mfma",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qu8-gemm/gen/qu8-gemm-1x8c8-minmax-fp32-avx2.c",
+-        "src/src/qu8-gemm/gen/qu8-gemm-3x8c8-minmax-fp32-avx2.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" ]
+-      }
+-    }
+-  }
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool:pthreadpool_standalone",
++    ]
+ 
+-  if (build_with_chromium) {
+-    source_set(
+-        "qu8-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
+-      cflags = [
+-        "-mavx512bw",
+-        "-mavx512cd",
+-        "-mavx512dq",
+-        "-mavx512f",
+-        "-mavx512vl",
+-        "-mf16c",
+-        "-mfma",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qu8-gemm/gen/qu8-gemm-1x16c8-minmax-fp32-avx512skx-prfm.c",
+-        "src/src/qu8-gemm/gen/qu8-gemm-7x16c8-minmax-fp32-avx512skx-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(
+-        "qu8-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") {
+-      cflags = [
+-        "-mavx512bw",
+-        "-mavx512cd",
+-        "-mavx512dq",
+-        "-mavx512f",
+-        "-mavx512vl",
+-        "-mf16c",
+-        "-mfma",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qu8-gemm/gen/qu8-gemm-1x16c8-minmax-fp32-avx512skx-prfm.c",
+-        "src/src/qu8-gemm/gen/qu8-gemm-7x16c8-minmax-fp32-avx512skx-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("f16-vexp_riscv64") {
++    cflags = [
++  
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/f16-vexp/gen/f16-f32acc-vexp-scalar-poly-3.c"
++    ]
+ 
+-  if (build_with_chromium) {
+-    source_set("qu8-gemm_sse2-no-sse3") {
+-      cflags = [
+-        "-mno-sse3",
+-        "-msse2",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qu8-gemm/gen/qu8-gemm-1x4c8-minmax-fp32-sse2-ld64.c",
+-        "src/src/qu8-gemm/gen/qu8-gemm-3x4c8-minmax-fp32-sse2-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",
+-      ]
++    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("qu8-gemm_sse2-no-sse3_standalone") {
+-      cflags = [
+-        "-mno-sse3",
+-        "-msse2",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qu8-gemm/gen/qu8-gemm-1x4c8-minmax-fp32-sse2-ld64.c",
+-        "src/src/qu8-gemm/gen/qu8-gemm-3x4c8-minmax-fp32-sse2-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: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("qu8-gemm_sse4.1-no-sse4.2") {
+-      cflags = [
+-        "-mno-sse4.2",
+-        "-msse4.1",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qu8-gemm/gen/qu8-gemm-1x4c8-minmax-fp32-sse41-ld64.c",
+-        "src/src/qu8-gemm/gen/qu8-gemm-3x4c8-minmax-fp32-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("f16-vexp_riscv64_standalone") {
++    cflags = [
++  
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/f16-vexp/gen/f16-f32acc-vexp-scalar-poly-3.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_sse4.1-no-sse4.2_standalone") {
+-      cflags = [
+-        "-mno-sse4.2",
+-        "-msse4.1",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qu8-gemm/gen/qu8-gemm-1x4c8-minmax-fp32-sse41-ld64.c",
+-        "src/src/qu8-gemm/gen/qu8-gemm-3x4c8-minmax-fp32-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:pthreadpool_standalone",
+-      ]
+-
+-      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",
++    ]
++
++    public_configs = [ ":xnnpack_public_config" ]
++
++    if (!(is_android && use_order_profiling)) {
++      assert_no_deps = [ "//base" ]
+     }
+   }
++}
+ 
+-  if (build_with_chromium) {
+-    source_set("qu8-gemm_x64") {
+-      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",
+-      ]
++if (build_with_chromium) {
++  source_set("f16-vgelu_arch=rv64gc_zvfh-abi=lp64d") {
++    cflags = [
++      "-mabi=lp64d",
++    "-march=rv64gc_zvfh"
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/f16-vgelu/gen/f16-vgelu-rvvfp16arith-rational-6-4-div-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",
+-      ]
 +    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("qu8-gemm_x64_standalone") {
+-      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-vgelu_arch=rv64gc_zvfh-abi=lp64d_standalone") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gc_zvfh"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vcos/gen/f16-f32acc-vcos-scalar-poly-3.c"
++      "src/src/f16-vgelu/gen/f16-vgelu-rvvfp16arith-rational-6-4-div-u2v.c"
 +    ]
-+
+ 
+-      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",
+-      ]
+-
+-      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("qu8-igemm_avx-no-avx2-no-f16c-no-fma") {
+-      cflags = [
+-        "-mavx",
+-        "-mno-avx2",
+-        "-mno-f16c",
+-        "-mno-fma",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qu8-igemm/gen/qu8-igemm-1x4c8-minmax-fp32-avx-ld128.c",
+-        "src/src/qu8-igemm/gen/qu8-igemm-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",
+-      ]
 +    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" ]
-+
+ 
+-  # This is a target that cannot depend on //base.
+-  if (build_with_internal_optimization_guide) {
+-    source_set("qu8-igemm_avx-no-avx2-no-f16c-no-fma_standalone") {
+-      cflags = [
+-        "-mavx",
+-        "-mno-avx2",
+-        "-mno-f16c",
+-        "-mno-fma",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qu8-igemm/gen/qu8-igemm-1x4c8-minmax-fp32-avx-ld128.c",
+-        "src/src/qu8-igemm/gen/qu8-igemm-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 (!(is_android && use_order_profiling)) {
 +      assert_no_deps = [ "//base" ]
-+    }
-+  }
+     }
+   }
 +}
-+
+ 
+-  if (build_with_chromium) {
+-    source_set("qu8-igemm_f16c-fma-avx2") {
+-      cflags = [
+-        "-mavx2",
+-        "-mf16c",
+-        "-mfma",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qu8-igemm/gen/qu8-igemm-1x8c8-minmax-fp32-avx2.c",
+-        "src/src/qu8-igemm/gen/qu8-igemm-3x8c8-minmax-fp32-avx2.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("f16-velu_arch=rv64gc_zvfh-abi=lp64d") {
++  source_set("f16-vgelu_riscv64") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gc_zvfh"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-velu/gen/f16-velu-rvvfp16arith-rr1-p3-u2v.c"
++      "src/src/f16-vgelu/gen/f16-vgelu-scalar-rational-6-4-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("qu8-igemm_f16c-fma-avx2_standalone") {
+-      cflags = [
+-        "-mavx2",
+-        "-mf16c",
+-        "-mfma",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qu8-igemm/gen/qu8-igemm-1x8c8-minmax-fp32-avx2.c",
+-        "src/src/qu8-igemm/gen/qu8-igemm-3x8c8-minmax-fp32-avx2.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" ]
+-      }
+-    }
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
@@ -88265,44 +88244,173 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +    ]
 +
 +    public_configs = [ ":xnnpack_public_config" ]
-+  }
+   }
 +}
-+
+ 
+-  if (build_with_chromium) {
+-    source_set(
+-        "qu8-igemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
+-      cflags = [
+-        "-mavx512bw",
+-        "-mavx512cd",
+-        "-mavx512dq",
+-        "-mavx512f",
+-        "-mavx512vl",
+-        "-mf16c",
+-        "-mfma",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qu8-igemm/gen/qu8-igemm-1x16c8-minmax-fp32-avx512skx-prfm.c",
+-        "src/src/qu8-igemm/gen/qu8-igemm-7x16c8-minmax-fp32-avx512skx-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("f16-velu_arch=rv64gc_zvfh-abi=lp64d_standalone") {
++  source_set("f16-vgelu_riscv64_standalone") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gc_zvfh"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-velu/gen/f16-velu-rvvfp16arith-rr1-p3-u2v.c"
++      "src/src/f16-vgelu/gen/f16-vgelu-scalar-rational-6-4-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(
+-        "qu8-igemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") {
+-      cflags = [
+-        "-mavx512bw",
+-        "-mavx512cd",
+-        "-mavx512dq",
+-        "-mavx512f",
+-        "-mavx512vl",
+-        "-mf16c",
+-        "-mfma",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qu8-igemm/gen/qu8-igemm-1x16c8-minmax-fp32-avx512skx-prfm.c",
+-        "src/src/qu8-igemm/gen/qu8-igemm-7x16c8-minmax-fp32-avx512skx-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" ]
+-      }
+-    }
+-  }
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
 +      "//third_party/fxdiv",
 +      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
-+
+ 
+-  if (build_with_chromium) {
+-    source_set("qu8-igemm_sse2-no-sse3") {
+-      cflags = [
+-        "-mno-sse3",
+-        "-msse2",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qu8-igemm/gen/qu8-igemm-1x4c8-minmax-fp32-sse2-ld64.c",
+-        "src/src/qu8-igemm/gen/qu8-igemm-3x4c8-minmax-fp32-sse2-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",
+-      ]
 +    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("qu8-igemm_sse2-no-sse3_standalone") {
+-      cflags = [
+-        "-mno-sse3",
+-        "-msse2",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qu8-igemm/gen/qu8-igemm-1x4c8-minmax-fp32-sse2-ld64.c",
+-        "src/src/qu8-igemm/gen/qu8-igemm-3x4c8-minmax-fp32-sse2-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:pthreadpool_standalone",
+-      ]
+-
+-      public_configs = [ ":xnnpack_public_config" ]
+-
+-      if (!(is_android && use_order_profiling)) {
+-        assert_no_deps = [ "//base" ]
+-      }
+-    }
+-  }
 +if (build_with_chromium) {
-+  source_set("f16-vexp_arch=rv64gc_zvfh-abi=lp64d") {
++  source_set("f16-vhswish_arch=rv64gc_zvfh-abi=lp64d") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gc_zvfh"
@@ -88310,28 +88418,90 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vexp/gen/f16-vexp-rvvfp16arith-poly-3-u8v.c"
++      "src/src/f16-vhswish/gen/f16-vhswish-rvvfp16arith-u8v.c"
 +    ]
-+
+ 
+-  if (build_with_chromium) {
+-    source_set("qu8-igemm_sse4.1-no-sse4.2") {
+-      cflags = [
+-        "-mno-sse4.2",
+-        "-msse4.1",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qu8-igemm/gen/qu8-igemm-1x4c8-minmax-fp32-sse41-ld64.c",
+-        "src/src/qu8-igemm/gen/qu8-igemm-3x4c8-minmax-fp32-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",
+-      ]
 +    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("qu8-igemm_sse4.1-no-sse4.2_standalone") {
+-      cflags = [
+-        "-mno-sse4.2",
+-        "-msse4.1",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qu8-igemm/gen/qu8-igemm-1x4c8-minmax-fp32-sse41-ld64.c",
+-        "src/src/qu8-igemm/gen/qu8-igemm-3x4c8-minmax-fp32-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: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("qu8-igemm_x64") {
+-      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-vexp_arch=rv64gc_zvfh-abi=lp64d_standalone") {
++  source_set("f16-vhswish_arch=rv64gc_zvfh-abi=lp64d_standalone") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gc_zvfh"
@@ -88339,210 +88509,608 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vexp/gen/f16-vexp-rvvfp16arith-poly-3-u8v.c"
++      "src/src/f16-vhswish/gen/f16-vhswish-rvvfp16arith-u8v.c"
 +    ]
-+
+ 
+-      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",
+-      ]
 +    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("qu8-igemm_x64_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",
+-      ]
+-
+-      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("f16-vexp_riscv64") {
++  source_set("f16-vlog_arch=rv64gc_zvfh-abi=lp64d") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gc_zvfh"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vexp/gen/f16-f32acc-vexp-scalar-poly-3.c"
++      "src/src/f16-vlog/gen/f16-vlog-rvvfp16arith-rational-1-3-div-u8v.c"
 +    ]
-+
+ 
+-  if (build_with_chromium) {
+-    source_set("qu8-rdsum_ssse3-no-sse4.1") {
+-      cflags = [
+-        "-mno-sse4.1",
+-        "-mssse3",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qu8-rdsum/gen/qu8-rdsum-7p7x-ssse3-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",
+-      ]
 +    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("qu8-rdsum_ssse3-no-sse4.1_standalone") {
+-      cflags = [
+-        "-mno-sse4.1",
+-        "-mssse3",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qu8-rdsum/gen/qu8-rdsum-7p7x-ssse3-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",
+-      ]
+-
+-      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("qu8-rdsum_x64") {
+-      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-vlog_arch=rv64gc_zvfh-abi=lp64d_standalone") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gc_zvfh"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vexp/gen/f16-f32acc-vexp-scalar-poly-3.c"
++      "src/src/f16-vlog/gen/f16-vlog-rvvfp16arith-rational-1-3-div-u8v.c"
 +    ]
-+
+ 
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qu8-rdsum/gen/qu8-rdsum-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" ]
 +    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-rdsum_x64_standalone") {
+-      cflags = []
 +if (build_with_chromium) {
-+  source_set("f16-vgelu_arch=rv64gc_zvfh-abi=lp64d") {
++  source_set("f16-vlog_riscv64") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gc_zvfh"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vgelu/gen/f16-vgelu-rvvfp16arith-rational-6-4-div-u2v.c"
++      "src/src/f16-vlog/gen/f16-f32acc-vlog-scalar-rational-1-3-div.c"
 +    ]
-+
+ 
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qu8-rdsum/gen/qu8-rdsum-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" ]
+-      }
+-    }
+-  }
 +    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-rsum_f16c-fma-avx2") {
+-      cflags = [
+-        "-mavx2",
+-        "-mf16c",
+-        "-mfma",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qu8-rsum/gen/qu8-rsum-avx2-u64-acc2.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) {
+-    source_set("qu8-rsum_f16c-fma-avx2_standalone") {
+-      cflags = [
+-        "-mavx2",
+-        "-mf16c",
+-        "-mfma",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qu8-rsum/gen/qu8-rsum-avx2-u64-acc2.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("f16-vgelu_arch=rv64gc_zvfh-abi=lp64d_standalone") {
++  source_set("f16-vlog_riscv64_standalone") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gc_zvfh"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vgelu/gen/f16-vgelu-rvvfp16arith-rational-6-4-div-u2v.c"
++      "src/src/f16-vlog/gen/f16-f32acc-vlog-scalar-rational-1-3-div.c"
 +    ]
-+
+ 
+-  if (build_with_chromium) {
+-    source_set("qu8-rsum_sse2-no-sse3") {
+-      cflags = [
+-        "-mno-sse3",
+-        "-msse2",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qu8-rsum/gen/qu8-rsum-sse2-u32-acc2.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("qu8-rsum_sse2-no-sse3_standalone") {
+-      cflags = [
+-        "-mno-sse3",
+-        "-msse2",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qu8-rsum/gen/qu8-rsum-sse2-u32-acc2.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" ]
-+    }
-+  }
+     }
+   }
 +}
-+
+ 
+-  if (build_with_chromium) {
+-    source_set("qu8-rsum_x64") {
+-      cflags = []
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qu8-rsum/gen/qu8-rsum-scalar-u4.c",
+-      ]
 +if (build_with_chromium) {
-+  source_set("f16-vgelu_riscv64") {
++  source_set("f16-vlrelu_arch=rv64gc_zvfh-abi=lp64d") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gc_zvfh"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vgelu/gen/f16-vgelu-scalar-rational-6-4-div.c"
++      "src/src/f16-vlrelu/gen/f16-vlrelu-rvvfp16arith-u8v.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",
 +    ]
-+
+ 
+-      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-rsum_x64_standalone") {
+-      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-vlrelu_arch=rv64gc_zvfh-abi=lp64d_standalone") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gc_zvfh"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vgelu/gen/f16-vgelu-scalar-rational-6-4-div.c"
++      "src/src/f16-vlrelu/gen/f16-vlrelu-rvvfp16arith-u8v.c"
 +    ]
-+
+ 
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qu8-rsum/gen/qu8-rsum-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" ]
+-      }
+-    }
+-  }
 +    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_avx-no-avx2-no-f16c-no-fma") {
+-      cflags = [
+-        "-mavx",
+-        "-mno-avx2",
+-        "-mno-f16c",
+-        "-mno-fma",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qu8-vadd/gen/qu8-vadd-minmax-avx-mul32-ld32-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" ]
+-
+-      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: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_avx-no-avx2-no-f16c-no-fma_standalone") {
+-      cflags = [
+-        "-mavx",
+-        "-mno-avx2",
+-        "-mno-f16c",
+-        "-mno-fma",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qu8-vadd/gen/qu8-vadd-minmax-avx-mul32-ld32-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" ]
+-
+-      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("qu8-vadd_f16c-fma-avx2") {
+-      cflags = [
+-        "-mavx2",
+-        "-mf16c",
+-        "-mfma",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qu8-vadd/gen/qu8-vadd-minmax-avx2-mul32-ld64-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",
+-      ]
 +if (build_with_chromium) {
-+  source_set("f16-vhswish_arch=rv64gc_zvfh-abi=lp64d") {
++  source_set("f16-vmulcaddc_arch=rv64gc_zvfh-abi=lp64d") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gc_zvfh"
@@ -88550,14 +89118,49 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vhswish/gen/f16-vhswish-rvvfp16arith-u8v.c"
++      "src/src/f16-vmulcaddc/gen/f16-vmulcaddc-c4v-minmax-rvvfp16arith-2x.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-vadd_f16c-fma-avx2_standalone") {
+-      cflags = [
+-        "-mavx2",
+-        "-mf16c",
+-        "-mfma",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qu8-vadd/gen/qu8-vadd-minmax-avx2-mul32-ld64-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" ]
+-      }
+-    }
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
@@ -88566,12 +89169,41 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +    ]
 +
 +    public_configs = [ ":xnnpack_public_config" ]
-+  }
+   }
 +}
-+
+ 
+-  if (build_with_chromium) {
+-    source_set(
+-        "qu8-vadd_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
+-      cflags = [
+-        "-mavx512bw",
+-        "-mavx512cd",
+-        "-mavx512dq",
+-        "-mavx512f",
+-        "-mavx512vl",
+-        "-mf16c",
+-        "-mfma",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qu8-vadd/gen/qu8-vadd-minmax-avx512skx-mul32-ld128-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",
+-      ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-vhswish_arch=rv64gc_zvfh-abi=lp64d_standalone") {
++  source_set("f16-vmulcaddc_arch=rv64gc_zvfh-abi=lp64d_standalone") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gc_zvfh"
@@ -88579,31 +89211,128 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vhswish/gen/f16-vhswish-rvvfp16arith-u8v.c"
++      "src/src/f16-vmulcaddc/gen/f16-vmulcaddc-c4v-minmax-rvvfp16arith-2x.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-vadd_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") {
+-      cflags = [
+-        "-mavx512bw",
+-        "-mavx512cd",
+-        "-mavx512dq",
+-        "-mavx512f",
+-        "-mavx512vl",
+-        "-mf16c",
+-        "-mfma",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qu8-vadd/gen/qu8-vadd-minmax-avx512skx-mul32-ld128-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" ]
+-      }
+-    }
+-  }
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
 +      "//third_party/fxdiv",
 +      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
-+
+ 
+-  if (build_with_chromium) {
+-    source_set("qu8-vadd_sse2-no-sse3") {
+-      cflags = [
+-        "-mno-sse3",
+-        "-msse2",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qu8-vadd/gen/qu8-vadd-minmax-sse2-mul16-ld64-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" ]
+-
+-      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("qu8-vadd_sse2-no-sse3_standalone") {
+-      cflags = [
+-        "-mno-sse3",
+-        "-msse2",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qu8-vadd/gen/qu8-vadd-minmax-sse2-mul16-ld64-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" ]
+-
+-      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("f16-vlog_arch=rv64gc_zvfh-abi=lp64d") {
++  source_set("f16-vrnd_arch=rv64gc_zvfh-abi=lp64d") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gc_zvfh"
@@ -88611,28 +89340,91 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vlog/gen/f16-vlog-rvvfp16arith-rational-1-3-div-u8v.c"
++      "src/src/f16-vrnd/gen/f16-vrndd-rvvfp16arith-u8v.c",
++    "src/src/f16-vrnd/gen/f16-vrndne-rvvfp16arith-u8v.c",
++    "src/src/f16-vrnd/gen/f16-vrndu-rvvfp16arith-u8v.c",
++    "src/src/f16-vrnd/gen/f16-vrndz-rvvfp16arith-u8v.c"
 +    ]
-+
+ 
+-  if (build_with_chromium) {
+-    source_set("qu8-vadd_sse4.1-no-sse4.2") {
+-      cflags = [
+-        "-mno-sse4.2",
+-        "-msse4.1",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qu8-vadd/gen/qu8-vadd-minmax-sse41-mul16-ld64-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" ]
+-
+-      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",
 +    ]
-+
+ 
+-  # 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") {
+-      cflags = [
+-        "-mno-sse4.2",
+-        "-msse4.1",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qu8-vadd/gen/qu8-vadd-minmax-sse41-mul16-ld64-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" ]
+-
+-      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("qu8-vadd_x64") {
+-      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-vlog_arch=rv64gc_zvfh-abi=lp64d_standalone") {
++  source_set("f16-vrnd_arch=rv64gc_zvfh-abi=lp64d_standalone") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gc_zvfh"
@@ -88640,90 +89432,288 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vlog/gen/f16-vlog-rvvfp16arith-rational-1-3-div-u8v.c"
++      "src/src/f16-vrnd/gen/f16-vrndd-rvvfp16arith-u8v.c",
++    "src/src/f16-vrnd/gen/f16-vrndne-rvvfp16arith-u8v.c",
++    "src/src/f16-vrnd/gen/f16-vrndu-rvvfp16arith-u8v.c",
++    "src/src/f16-vrnd/gen/f16-vrndz-rvvfp16arith-u8v.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",
 +    ]
-+
+ 
+-      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("qu8-vadd_x64_standalone") {
+-      cflags = []
 +if (build_with_chromium) {
-+  source_set("f16-vlog_riscv64") {
++  source_set("f16-vrsqrt_arch=rv64gc_zvfh-abi=lp64d") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gc_zvfh"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vlog/gen/f16-f32acc-vlog-scalar-rational-1-3-div.c"
++      "src/src/f16-vrsqrt/gen/f16-vrsqrt-rvvfp16arith-rsqrt-u4v.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" ]
+-
+-      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("qu8-vaddc_avx-no-avx2-no-f16c-no-fma") {
+-      cflags = [
+-        "-mavx",
+-        "-mno-avx2",
+-        "-mno-f16c",
+-        "-mno-fma",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qu8-vaddc/gen/qu8-vaddc-minmax-avx-mul32-ld32-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" ]
+-
+-      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) {
+-    source_set("qu8-vaddc_avx-no-avx2-no-f16c-no-fma_standalone") {
+-      cflags = [
+-        "-mavx",
+-        "-mno-avx2",
+-        "-mno-f16c",
+-        "-mno-fma",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qu8-vaddc/gen/qu8-vaddc-minmax-avx-mul32-ld32-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" ]
+-
+-      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("f16-vlog_riscv64_standalone") {
++  source_set("f16-vrsqrt_arch=rv64gc_zvfh-abi=lp64d_standalone") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gc_zvfh"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vlog/gen/f16-f32acc-vlog-scalar-rational-1-3-div.c"
++      "src/src/f16-vrsqrt/gen/f16-vrsqrt-rvvfp16arith-rsqrt-u4v.c"
 +    ]
-+
+ 
+-  if (build_with_chromium) {
+-    source_set("qu8-vaddc_f16c-fma-avx2") {
+-      cflags = [
+-        "-mavx2",
+-        "-mf16c",
+-        "-mfma",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qu8-vaddc/gen/qu8-vaddc-minmax-avx2-mul32-ld64-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",
+-      ]
 +    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("qu8-vaddc_f16c-fma-avx2_standalone") {
+-      cflags = [
+-        "-mavx2",
+-        "-mf16c",
+-        "-mfma",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qu8-vaddc/gen/qu8-vaddc-minmax-avx2-mul32-ld64-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" ]
+-      }
 +    public_configs = [ ":xnnpack_public_config" ]
 +
 +    if (!(is_android && use_order_profiling)) {
 +      assert_no_deps = [ "//base" ]
-+    }
-+  }
+     }
+   }
 +}
-+
+ 
+-  if (build_with_chromium) {
+-    source_set(
+-        "qu8-vaddc_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
+-      cflags = [
+-        "-mavx512bw",
+-        "-mavx512cd",
+-        "-mavx512dq",
+-        "-mavx512f",
+-        "-mavx512vl",
+-        "-mf16c",
+-        "-mfma",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qu8-vaddc/gen/qu8-vaddc-minmax-avx512skx-mul32-ld128-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",
+-      ]
 +if (build_with_chromium) {
-+  source_set("f16-vlrelu_arch=rv64gc_zvfh-abi=lp64d") {
++  source_set("f16-vsigmoid_arch=rv64gc_zvfh-abi=lp64d") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gc_zvfh"
@@ -88731,14 +89721,54 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vlrelu/gen/f16-vlrelu-rvvfp16arith-u8v.c"
++      "src/src/f16-vsigmoid/gen/f16-vsigmoid-rvvfp16arith-rr2-p2-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(
+-        "qu8-vaddc_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") {
+-      cflags = [
+-        "-mavx512bw",
+-        "-mavx512cd",
+-        "-mavx512dq",
+-        "-mavx512f",
+-        "-mavx512vl",
+-        "-mf16c",
+-        "-mfma",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qu8-vaddc/gen/qu8-vaddc-minmax-avx512skx-mul32-ld128-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" ]
+-      }
+-    }
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
@@ -88747,12 +89777,35 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +    ]
 +
 +    public_configs = [ ":xnnpack_public_config" ]
-+  }
+   }
 +}
-+
+ 
+-  if (build_with_chromium) {
+-    source_set("qu8-vaddc_sse2-no-sse3") {
+-      cflags = [
+-        "-mno-sse3",
+-        "-msse2",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qu8-vaddc/gen/qu8-vaddc-minmax-sse2-mul16-ld64-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" ]
+-
+-      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("f16-vlrelu_arch=rv64gc_zvfh-abi=lp64d_standalone") {
++  source_set("f16-vsigmoid_arch=rv64gc_zvfh-abi=lp64d_standalone") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gc_zvfh"
@@ -88760,31 +89813,122 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vlrelu/gen/f16-vlrelu-rvvfp16arith-u8v.c"
++      "src/src/f16-vsigmoid/gen/f16-vsigmoid-rvvfp16arith-rr2-p2-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("qu8-vaddc_sse2-no-sse3_standalone") {
+-      cflags = [
+-        "-mno-sse3",
+-        "-msse2",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qu8-vaddc/gen/qu8-vaddc-minmax-sse2-mul16-ld64-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" ]
+-
+-      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" ]
+-      }
+-    }
+-  }
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
 +      "//third_party/fxdiv",
 +      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
-+
+ 
+-  if (build_with_chromium) {
+-    source_set("qu8-vaddc_sse4.1-no-sse4.2") {
+-      cflags = [
+-        "-mno-sse4.2",
+-        "-msse4.1",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qu8-vaddc/gen/qu8-vaddc-minmax-sse41-mul16-ld64-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" ]
+-
+-      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("qu8-vaddc_sse4.1-no-sse4.2_standalone") {
+-      cflags = [
+-        "-mno-sse4.2",
+-        "-msse4.1",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qu8-vaddc/gen/qu8-vaddc-minmax-sse41-mul16-ld64-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" ]
+-
+-      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("f16-vmulcaddc_arch=rv64gc_zvfh-abi=lp64d") {
++  source_set("f16-vsin_arch=rv64gc_zvfh-abi=lp64d") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gc_zvfh"
@@ -88792,28 +89936,46 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vmulcaddc/gen/f16-vmulcaddc-c4v-minmax-rvvfp16arith-2x.c"
++      "src/src/f16-vsin/gen/f16-vsin-rvvfp16arith-poly-3-u4v.c"
 +    ]
-+
+ 
+-  if (build_with_chromium) {
+-    source_set("qu8-vaddc_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/qu8-vaddc/gen/qu8-vaddc-minmax-scalar-u1.c",
+-        "src/src/qu8-vaddc/gen/qu8-vaddc-minmax-scalar-u4.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",
+-      ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-vmulcaddc_arch=rv64gc_zvfh-abi=lp64d_standalone") {
++  source_set("f16-vsin_arch=rv64gc_zvfh-abi=lp64d_standalone") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gc_zvfh"
@@ -88821,49 +89983,136 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vmulcaddc/gen/f16-vmulcaddc-c4v-minmax-rvvfp16arith-2x.c"
++      "src/src/f16-vsin/gen/f16-vsin-rvvfp16arith-poly-3-u4v.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-vaddc_x64_standalone") {
+-      cflags = []
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
 +      "//third_party/fxdiv",
 +      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
-+
+ 
+-      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",
+-      ]
+-
+-      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" ]
-+    }
-+  }
+     }
+   }
 +}
-+
+ 
+-  if (build_with_chromium) {
+-    source_set("qu8-vcvt_avx-no-avx2-no-f16c-no-fma") {
+-      cflags = [
+-        "-mavx",
+-        "-mno-avx2",
+-        "-mno-f16c",
+-        "-mno-fma",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qu8-vcvt/gen/qu8-vcvt-avx-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",
+-      ]
 +if (build_with_chromium) {
-+  source_set("f16-vrnd_arch=rv64gc_zvfh-abi=lp64d") {
++  source_set("f16-vsin_riscv64") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gc_zvfh"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vrnd/gen/f16-vrndd-rvvfp16arith-u8v.c",
-+    "src/src/f16-vrnd/gen/f16-vrndne-rvvfp16arith-u8v.c",
-+    "src/src/f16-vrnd/gen/f16-vrndu-rvvfp16arith-u8v.c",
-+    "src/src/f16-vrnd/gen/f16-vrndz-rvvfp16arith-u8v.c"
++      "src/src/f16-vsin/gen/f16-f32acc-vsin-scalar-poly-3.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-vcvt_avx-no-avx2-no-f16c-no-fma_standalone") {
+-      cflags = [
+-        "-mavx",
+-        "-mno-avx2",
+-        "-mno-f16c",
+-        "-mno-fma",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qu8-vcvt/gen/qu8-vcvt-avx-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",
+-      ]
+-
+-      public_configs = [ ":xnnpack_public_config" ]
+-
+-      if (!(is_android && use_order_profiling)) {
+-        assert_no_deps = [ "//base" ]
+-      }
+-    }
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
@@ -88872,30 +90121,86 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +    ]
 +
 +    public_configs = [ ":xnnpack_public_config" ]
-+  }
+   }
 +}
-+
+ 
+-  if (build_with_chromium) {
+-    source_set("qu8-vcvt_f16c-fma-avx2") {
+-      cflags = [
+-        "-mavx2",
+-        "-mf16c",
+-        "-mfma",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qu8-vcvt/gen/qu8-vcvt-avx2-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",
+-      ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-vrnd_arch=rv64gc_zvfh-abi=lp64d_standalone") {
++  source_set("f16-vsin_riscv64_standalone") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gc_zvfh"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vrnd/gen/f16-vrndd-rvvfp16arith-u8v.c",
-+    "src/src/f16-vrnd/gen/f16-vrndne-rvvfp16arith-u8v.c",
-+    "src/src/f16-vrnd/gen/f16-vrndu-rvvfp16arith-u8v.c",
-+    "src/src/f16-vrnd/gen/f16-vrndz-rvvfp16arith-u8v.c"
++      "src/src/f16-vsin/gen/f16-f32acc-vsin-scalar-poly-3.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-vcvt_f16c-fma-avx2_standalone") {
+-      cflags = [
+-        "-mavx2",
+-        "-mf16c",
+-        "-mfma",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qu8-vcvt/gen/qu8-vcvt-avx2-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",
+-      ]
+-
+-      public_configs = [ ":xnnpack_public_config" ]
+-
+-      if (!(is_android && use_order_profiling)) {
+-        assert_no_deps = [ "//base" ]
+-      }
+-    }
+-  }
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
@@ -88903,17 +90208,72 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
  
--      public_configs = [ ":xnnpack_public_config" ]
+-  if (build_with_chromium) {
+-    source_set("qu8-vcvt_sse2-no-sse3") {
+-      cflags = [
+-        "-mno-sse3",
+-        "-msse2",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qu8-vcvt/gen/qu8-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",
+-      ]
 +    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("qu8-vcvt_sse2-no-sse3_standalone") {
+-      cflags = [
+-        "-mno-sse3",
+-        "-msse2",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qu8-vcvt/gen/qu8-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",
+-      ]
+-
+-      public_configs = [ ":xnnpack_public_config" ]
+-
+-      if (!(is_android && use_order_profiling)) {
+-        assert_no_deps = [ "//base" ]
+-      }
+-    }
+-  }
 +if (build_with_chromium) {
-+  source_set("f16-vrsqrt_arch=rv64gc_zvfh-abi=lp64d") {
++  source_set("f16-vsqrt_arch=rv64gc_zvfh-abi=lp64d") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gc_zvfh"
@@ -88921,37 +90281,46 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vrsqrt/gen/f16-vrsqrt-rvvfp16arith-rsqrt-u4v.c"
++      "src/src/f16-vsqrt/gen/f16-vsqrt-rvvfp16arith-sqrt-u8v.c"
 +    ]
-+
+ 
+-  if (build_with_chromium) {
+-    source_set("qu8-vcvt_sse4.1-no-sse4.2") {
+-      cflags = [
+-        "-mno-sse4.2",
+-        "-msse4.1",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qu8-vcvt/gen/qu8-vcvt-sse41-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",
+-      ]
 +    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" ]
-+  }
-+}
-+
-+# This is a target that cannot depend on //base.
-+if (build_with_internal_optimization_guide) {
-+  source_set("f16-vrsqrt_arch=rv64gc_zvfh-abi=lp64d_standalone") {
-+    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gc_zvfh"
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/f16-vrsqrt/gen/f16-vrsqrt-rvvfp16arith-rsqrt-u4v.c"
-+    ]
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
@@ -88984,11 +90353,9 @@ Index: chromium-153.0.8010.36/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-vcvt_ssse3-no-sse4.1") {
@@ -89013,17 +90380,26 @@ Index: chromium-153.0.8010.36/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("f16-vsqrt_arch=rv64gc_zvfh-abi=lp64d_standalone") {
++    cflags = [
++      "-mabi=lp64d",
++    "-march=rv64gc_zvfh"
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/f16-vsqrt/gen/f16-vsqrt-rvvfp16arith-sqrt-u8v.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) {
@@ -89055,6 +90431,15 @@ Index: chromium-153.0.8010.36/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:pthreadpool_standalone",
++    ]
++
++    public_configs = [ ":xnnpack_public_config" ]
++
 +    if (!(is_android && use_order_profiling)) {
 +      assert_no_deps = [ "//base" ]
      }
@@ -89070,15 +90455,14 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -        "src/src/qu8-vcvt/gen/qu8-vcvt-scalar-u4.c",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f16-vsigmoid_arch=rv64gc_zvfh-abi=lp64d") {
++  source_set("f16-vsqrt_riscv64") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gc_zvfh"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vsigmoid/gen/f16-vsigmoid-rvvfp16arith-rr2-p2-u2v.c"
++      "src/src/f16-vsqrt/gen/f16-vsqrt-scalar-sqrt.c"
 +    ]
  
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -89115,15 +90499,14 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-vsigmoid_arch=rv64gc_zvfh-abi=lp64d_standalone") {
++  source_set("f16-vsqrt_riscv64_standalone") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gc_zvfh"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vsigmoid/gen/f16-vsigmoid-rvvfp16arith-rr2-p2-u2v.c"
++      "src/src/f16-vsqrt/gen/f16-vsqrt-scalar-sqrt.c"
 +    ]
  
 -      sources = [
@@ -89255,7 +90638,7 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f16-vsin_arch=rv64gc_zvfh-abi=lp64d") {
++  source_set("f16-vtanh_arch=rv64gc_zvfh-abi=lp64d") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gc_zvfh"
@@ -89263,7 +90646,7 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vsin/gen/f16-vsin-rvvfp16arith-poly-3-u4v.c"
++      "src/src/f16-vtanh/gen/f16-vtanh-rvvfp16arith-rational-5-4-div-u8v.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -89342,7 +90725,7 @@ Index: chromium-153.0.8010.36/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=rv64gc_zvfh-abi=lp64d_standalone") {
++  source_set("f16-vtanh_arch=rv64gc_zvfh-abi=lp64d_standalone") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gc_zvfh"
@@ -89350,7 +90733,7 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vsin/gen/f16-vsin-rvvfp16arith-poly-3-u4v.c"
++      "src/src/f16-vtanh/gen/f16-vtanh-rvvfp16arith-rational-5-4-div-u8v.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -89465,14 +90848,14 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f16-vsin_riscv64") {
++  source_set("f16-vtanh_riscv64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vsin/gen/f16-f32acc-vsin-scalar-poly-3.c"
++      "src/src/f16-vtanh/gen/f16-f32acc-vtanh-scalar-rational-5-4-div.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -89553,14 +90936,14 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-vsin_riscv64_standalone") {
++  source_set("f16-vtanh_riscv64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vsin/gen/f16-f32acc-vsin-scalar-poly-3.c"
++      "src/src/f16-vtanh/gen/f16-f32acc-vtanh-scalar-rational-5-4-div.c"
 +    ]
  
 -      sources = [
@@ -89603,7 +90986,7 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -    source_set("qu8-vlrelu_x64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("f16-vsqrt_arch=rv64gc_zvfh-abi=lp64d") {
++  source_set("f16-vunary_arch=rv64gc_zvfh-abi=lp64d") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gc_zvfh"
@@ -89611,7 +90994,9 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vsqrt/gen/f16-vsqrt-rvvfp16arith-sqrt-u8v.c"
++      "src/src/f16-vunary/gen/f16-vabs-rvvfp16arith-u8v.c",
++    "src/src/f16-vunary/gen/f16-vneg-rvvfp16arith-u8v.c",
++    "src/src/f16-vunary/gen/f16-vsqr-rvvfp16arith-u8v.c"
 +    ]
  
 -      sources = [
@@ -89717,7 +91102,7 @@ Index: chromium-153.0.8010.36/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=rv64gc_zvfh-abi=lp64d_standalone") {
++  source_set("f16-vunary_arch=rv64gc_zvfh-abi=lp64d_standalone") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gc_zvfh"
@@ -89725,7 +91110,9 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vsqrt/gen/f16-vsqrt-rvvfp16arith-sqrt-u8v.c"
++      "src/src/f16-vunary/gen/f16-vabs-rvvfp16arith-u8v.c",
++    "src/src/f16-vunary/gen/f16-vneg-rvvfp16arith-u8v.c",
++    "src/src/f16-vunary/gen/f16-vsqr-rvvfp16arith-u8v.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -89828,14 +91215,15 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f16-vsqrt_riscv64") {
++  source_set("f32-argmaxpool_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vsqrt/gen/f16-vsqrt-scalar-sqrt.c"
++      "src/src/f32-argmaxpool/f32-argmaxpool-9p8x-rvv-u1v.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -89893,14 +91281,15 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-vsqrt_riscv64_standalone") {
++  source_set("f32-argmaxpool_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vsqrt/gen/f16-vsqrt-scalar-sqrt.c"
++      "src/src/f32-argmaxpool/f32-argmaxpool-9p8x-rvv-u1v.c"
 +    ]
  
 -      sources = [
@@ -89943,15 +91332,14 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -    source_set("qu8-vmul_x64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("f16-vtanh_arch=rv64gc_zvfh-abi=lp64d") {
++  source_set("f32-argmaxpool_riscv64") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gc_zvfh"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vtanh/gen/f16-vtanh-rvvfp16arith-rational-5-4-div-u8v.c"
++      "src/src/f32-argmaxpool/f32-argmaxpool-9p8x-scalar-c1.c"
 +    ]
  
 -      sources = [
@@ -90057,15 +91445,14 @@ Index: chromium-153.0.8010.36/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=rv64gc_zvfh-abi=lp64d_standalone") {
++  source_set("f32-argmaxpool_riscv64_standalone") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gc_zvfh"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vtanh/gen/f16-vtanh-rvvfp16arith-rational-5-4-div-u8v.c"
++      "src/src/f32-argmaxpool/f32-argmaxpool-9p8x-scalar-c1.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -90168,14 +91555,15 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f16-vtanh_riscv64") {
++  source_set("f32-avgpool_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vtanh/gen/f16-f32acc-vtanh-scalar-rational-5-4-div.c"
++      "src/src/f32-avgpool/gen/f32-avgpool-9p-minmax-rvv-u2v.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -90233,14 +91621,15 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-vtanh_riscv64_standalone") {
++  source_set("f32-avgpool_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vtanh/gen/f16-f32acc-vtanh-scalar-rational-5-4-div.c"
++      "src/src/f32-avgpool/gen/f32-avgpool-9p-minmax-rvv-u2v.c"
 +    ]
  
 -      sources = [
@@ -90308,17 +91697,14 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f16-vunary_arch=rv64gc_zvfh-abi=lp64d") {
++  source_set("f32-avgpool_riscv64") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gc_zvfh"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vunary/gen/f16-vabs-rvvfp16arith-u8v.c",
-+    "src/src/f16-vunary/gen/f16-vneg-rvvfp16arith-u8v.c",
-+    "src/src/f16-vunary/gen/f16-vsqr-rvvfp16arith-u8v.c"
++      "src/src/f32-avgpool/gen/f32-avgpool-9p-minmax-scalar-u1.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -90401,17 +91787,14 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f16-vunary_arch=rv64gc_zvfh-abi=lp64d_standalone") {
++  source_set("f32-avgpool_riscv64_standalone") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gc_zvfh"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f16-vunary/gen/f16-vabs-rvvfp16arith-u8v.c",
-+    "src/src/f16-vunary/gen/f16-vneg-rvvfp16arith-u8v.c",
-+    "src/src/f16-vunary/gen/f16-vsqr-rvvfp16arith-u8v.c"
++      "src/src/f32-avgpool/gen/f32-avgpool-9p-minmax-scalar-u1.c"
 +    ]
  
 -      sources = [
@@ -90479,98 +91862,172 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f32-argmaxpool_arch=rv64gcv-abi=lp64d") {
-+    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/f32-argmaxpool/f32-argmaxpool-9p8x-rvv-u1v.c"
-+    ]
- 
--  if (build_with_chromium) {
--    source_set("qu8-vpreluc_f16c-fma-avx2") {
--      cflags = [
--        "-mavx2",
--        "-mf16c",
--        "-mfma",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qu8-vpreluc/gen/qu8-vpreluc-avx2-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",
--      ]
-+    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("qu8-vpreluc_f16c-fma-avx2_standalone") {
--      cflags = [
--        "-mavx2",
--        "-mf16c",
--        "-mfma",
--      ]
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qu8-vpreluc/gen/qu8-vpreluc-avx2-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" ]
--      }
--    }
-+    public_configs = [ ":xnnpack_public_config" ]
-   }
-+}
- 
--  if (build_with_chromium) {
--    source_set("qu8-vpreluc_x64") {
--      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("f32-bf16-vcvt_riscv64") {
++    cflags = [
++  
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/f32-bf16-vcvt/gen/f32-bf16-vcvt-scalar-u2.c"
++    ]
+ 
+-  if (build_with_chromium) {
+-    source_set("qu8-vpreluc_f16c-fma-avx2") {
+-      cflags = [
+-        "-mavx2",
+-        "-mf16c",
+-        "-mfma",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qu8-vpreluc/gen/qu8-vpreluc-avx2-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",
+-      ]
++    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("qu8-vpreluc_f16c-fma-avx2_standalone") {
+-      cflags = [
+-        "-mavx2",
+-        "-mf16c",
+-        "-mfma",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qu8-vpreluc/gen/qu8-vpreluc-avx2-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" ]
+-      }
+-    }
++    public_configs = [ ":xnnpack_public_config" ]
+   }
++}
+ 
+-  if (build_with_chromium) {
+-    source_set("qu8-vpreluc_x64") {
+-      cflags = []
++# This is a target that cannot depend on //base.
++if (build_with_internal_optimization_guide) {
++  source_set("f32-bf16-vcvt_riscv64_standalone") {
++    cflags = [
++  
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/f32-bf16-vcvt/gen/f32-bf16-vcvt-scalar-u2.c"
++    ]
+ 
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qu8-vpreluc/gen/qu8-vpreluc-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: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("qu8-vpreluc_x64_standalone") {
+-      cflags = []
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qu8-vpreluc/gen/qu8-vpreluc-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" ]
+-
+-      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-conv-hwc2chw_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gcv"
@@ -90578,82 +92035,7 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-argmaxpool/f32-argmaxpool-9p8x-rvv-u1v.c"
-+    ]
- 
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qu8-vpreluc/gen/qu8-vpreluc-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: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("qu8-vpreluc_x64_standalone") {
--      cflags = []
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qu8-vpreluc/gen/qu8-vpreluc-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" ]
--
--      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-argmaxpool_riscv64") {
-+    cflags = [
-+  
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/f32-argmaxpool/f32-argmaxpool-9p8x-scalar-c1.c"
++      "src/src/f32-conv-hwc2chw/f32-conv-hwc2chw-3x3s2p1c3x2v-rvv-2x2.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -90746,14 +92128,15 @@ Index: chromium-153.0.8010.36/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-argmaxpool_riscv64_standalone") {
++  source_set("f32-conv-hwc2chw_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-argmaxpool/f32-argmaxpool-9p8x-scalar-c1.c"
++      "src/src/f32-conv-hwc2chw/f32-conv-hwc2chw-3x3s2p1c3x2v-rvv-2x2.c"
 +    ]
  
 -      deps = [
@@ -90822,15 +92205,14 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -        "src/src/reference/unary-elementwise.cc",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f32-avgpool_arch=rv64gcv-abi=lp64d") {
++  source_set("f32-conv-hwc2chw_riscv64") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-avgpool/gen/f32-avgpool-9p-minmax-rvv-u2v.c"
++      "src/src/f32-conv-hwc2chw/f32-conv-hwc2chw-3x3s2p1c3x4-scalar-1x1.c"
 +    ]
  
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -90867,15 +92249,14 @@ Index: chromium-153.0.8010.36/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_arch=rv64gcv-abi=lp64d_standalone") {
++  source_set("f32-conv-hwc2chw_riscv64_standalone") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-avgpool/gen/f32-avgpool-9p-minmax-rvv-u2v.c"
++      "src/src/f32-conv-hwc2chw/f32-conv-hwc2chw-3x3s2p1c3x4-scalar-1x1.c"
 +    ]
  
 -      sources = [
@@ -91004,14 +92385,16 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f32-avgpool_riscv64") {
++  source_set("f32-dwconv2d-chw_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-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"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -91069,14 +92452,16 @@ Index: chromium-153.0.8010.36/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-dwconv2d-chw_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-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 = [
@@ -91144,14 +92529,21 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f32-bf16-vcvt_riscv64") {
++  source_set("f32-dwconv2d-chw_riscv64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-bf16-vcvt/gen/f32-bf16-vcvt-scalar-u2.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"
 +    ]
  
 -  if (build_with_chromium) {
@@ -91232,14 +92624,21 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-bf16-vcvt_riscv64_standalone") {
++  source_set("f32-dwconv2d-chw_riscv64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-bf16-vcvt/gen/f32-bf16-vcvt-scalar-u2.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 = [
@@ -91307,7 +92706,7 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f32-conv-hwc2chw_arch=rv64gcv-abi=lp64d") {
++  source_set("f32-dwconv_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gcv"
@@ -91315,7 +92714,14 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-conv-hwc2chw/f32-conv-hwc2chw-3x3s2p1c3x2v-rvv-2x2.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"
 +    ]
  
 -  if (build_with_chromium) {
@@ -91398,7 +92804,7 @@ Index: chromium-153.0.8010.36/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-dwconv_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gcv"
@@ -91406,7 +92812,14 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-conv-hwc2chw/f32-conv-hwc2chw-3x3s2p1c3x2v-rvv-2x2.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"
 +    ]
  
 -      sources = [
@@ -91476,14 +92889,23 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f32-conv-hwc2chw_riscv64") {
++  source_set("f32-dwconv_riscv64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-conv-hwc2chw/f32-conv-hwc2chw-3x3s2p1c3x4-scalar-1x1.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"
 +    ]
  
 -  if (build_with_chromium) {
@@ -91568,14 +92990,23 @@ Index: chromium-153.0.8010.36/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-dwconv_riscv64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-conv-hwc2chw/f32-conv-hwc2chw-3x3s2p1c3x4-scalar-1x1.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 = [
@@ -91647,16 +93078,15 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f32-dwconv2d-chw_arch=rv64gcv-abi=lp64d") {
++  source_set("f32-f16-vcvt_arch=rv64gc_zvfh-abi=lp64d") {
 +    cflags = [
 +      "-mabi=lp64d",
-+    "-march=rv64gcv"
++    "-march=rv64gc_zvfh"
 +    ]
 +  
 +    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-f16-vcvt/gen/f32-f16-vcvt-rvvfp16arith-u8v.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -91765,16 +93195,15 @@ Index: chromium-153.0.8010.36/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-f16-vcvt_arch=rv64gc_zvfh-abi=lp64d_standalone") {
 +    cflags = [
 +      "-mabi=lp64d",
-+    "-march=rv64gcv"
++    "-march=rv64gc_zvfh"
 +    ]
 +  
 +    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-f16-vcvt/gen/f32-f16-vcvt-rvvfp16arith-u8v.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -91895,21 +93324,14 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f32-dwconv2d-chw_riscv64") {
++  source_set("f32-f16-vcvt_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-f16-vcvt/gen/f32-f16-vcvt-scalar-fabsf-u2.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -91990,21 +93412,14 @@ Index: chromium-153.0.8010.36/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-f16-vcvt_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-f16-vcvt/gen/f32-f16-vcvt-scalar-fabsf-u2.c"
 +    ]
  
 -      sources = [
@@ -92072,7 +93487,7 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f32-dwconv_arch=rv64gcv-abi=lp64d") {
++  source_set("f32-gemm_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gcv"
@@ -92080,14 +93495,8 @@ Index: chromium-153.0.8010.36/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-gemm/gen/f32-gemm-1x4v-minmax-rvv.c",
++    "src/src/f32-gemm/gen/f32-gemm-7x4v-minmax-rvv.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -92162,7 +93571,7 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -      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") {
++  source_set("f32-gemm_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gcv"
@@ -92170,14 +93579,8 @@ Index: chromium-153.0.8010.36/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-gemm/gen/f32-gemm-1x4v-minmax-rvv.c",
++    "src/src/f32-gemm/gen/f32-gemm-7x4v-minmax-rvv.c"
 +    ]
  
 -      sources = [
@@ -92286,23 +93689,19 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -    source_set("tables_x64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("f32-dwconv_riscv64") {
++  source_set("f32-gemm_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-gemm/gen/f32-gemm-1x4-minmax-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-scalar.c"
 +    ]
  
 -      sources = [
@@ -92412,23 +93811,19 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -  }
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-dwconv_riscv64_standalone") {
++  source_set("f32-gemm_riscv64_standalone") {
 +    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-gemm/gen/f32-gemm-1x4-minmax-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-scalar.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -92528,15 +93923,14 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f32-f16-vcvt_arch=rv64gc_zvfh-abi=lp64d") {
++  source_set("f32-ibilinear-chw_riscv64") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gc_zvfh"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-f16-vcvt/gen/f32-f16-vcvt-rvvfp16arith-u8v.c"
++      "src/src/f32-ibilinear-chw/gen/f32-ibilinear-chw-scalar-p4.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -92590,15 +93984,14 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-f16-vcvt_arch=rv64gc_zvfh-abi=lp64d_standalone") {
++  source_set("f32-ibilinear-chw_riscv64_standalone") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gc_zvfh"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-f16-vcvt/gen/f32-f16-vcvt-rvvfp16arith-u8v.c"
++      "src/src/f32-ibilinear-chw/gen/f32-ibilinear-chw-scalar-p4.c"
 +    ]
  
 -      sources = [
@@ -92666,14 +94059,15 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f32-f16-vcvt_riscv64") {
++  source_set("f32-ibilinear_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-f16-vcvt/gen/f32-f16-vcvt-scalar-fabsf-u2.c"
++      "src/src/f32-ibilinear/gen/f32-ibilinear-rvv-u2v.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -92754,14 +94148,15 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-f16-vcvt_riscv64_standalone") {
++  source_set("f32-ibilinear_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-f16-vcvt/gen/f32-f16-vcvt-scalar-fabsf-u2.c"
++      "src/src/f32-ibilinear/gen/f32-ibilinear-rvv-u2v.c"
 +    ]
  
 -      sources = [
@@ -92829,16 +94224,14 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f32-gemm_arch=rv64gcv-abi=lp64d") {
++  source_set("f32-ibilinear_riscv64") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    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-ibilinear/gen/f32-ibilinear-scalar-u2.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -92921,16 +94314,14 @@ Index: chromium-153.0.8010.36/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_arch=rv64gcv-abi=lp64d_standalone") {
++  source_set("f32-ibilinear_riscv64_standalone") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    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-ibilinear/gen/f32-ibilinear-scalar-u2.c"
 +    ]
  
 -      sources = [
@@ -93000,19 +94391,16 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f32-gemm_riscv64") {
++  source_set("f32-igemm_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-gemm/gen/f32-gemm-1x4-minmax-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-scalar.c"
++      "src/src/f32-igemm/gen/f32-igemm-1x4v-minmax-rvv.c",
++    "src/src/f32-igemm/gen/f32-igemm-7x4v-minmax-rvv.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -93097,19 +94485,16 @@ Index: chromium-153.0.8010.36/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-igemm_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-gemm/gen/f32-gemm-1x4-minmax-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-scalar.c"
++      "src/src/f32-igemm/gen/f32-igemm-1x4v-minmax-rvv.c",
++    "src/src/f32-igemm/gen/f32-igemm-7x4v-minmax-rvv.c"
 +    ]
  
 -      sources = [
@@ -93153,7 +94538,22 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -  if (build_with_internal_optimization_guide) {
 -    source_set("u8-rminmax_x64_standalone") {
 -      cflags = []
--
++if (build_with_chromium) {
++  source_set("f32-igemm_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-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-scalar.c"
++    ]
+ 
 -      sources = [
 -        "src/include/xnnpack.h",
 -        "src/src/u8-rminmax/gen/u8-rmax-scalar-u2-acc2.c",
@@ -93180,16 +94580,10 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -      }
 -    }
 -  }
-+if (build_with_chromium) {
-+  source_set("f32-ibilinear-chw_riscv64") {
-+    cflags = [
-+  
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/f32-ibilinear-chw/gen/f32-ibilinear-chw-scalar-p4.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("u8-vclamp_f16c-fma-avx2") {
@@ -93215,14 +94609,6 @@ Index: chromium-153.0.8010.36/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",
@@ -93230,6 +94616,12 @@ Index: chromium-153.0.8010.36/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("u8-vclamp_f16c-fma-avx2_standalone") {
@@ -93262,9 +94654,23 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -        assert_no_deps = [ "//base" ]
 -      }
 -    }
-+    public_configs = [ ":xnnpack_public_config" ]
-   }
-+}
+-  }
++# This is a target that cannot depend on //base.
++if (build_with_internal_optimization_guide) {
++  source_set("f32-igemm_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-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-scalar.c"
++    ]
  
 -  if (build_with_chromium) {
 -    source_set(
@@ -93295,20 +94701,19 @@ Index: chromium-153.0.8010.36/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" ]
 -    }
 -  }
-+# This is a target that cannot depend on //base.
-+if (build_with_internal_optimization_guide) {
-+  source_set("f32-ibilinear-chw_riscv64_standalone") {
-+    cflags = [
-+  
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/f32-ibilinear-chw/gen/f32-ibilinear-chw-scalar-p4.c"
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
  
 -  # This is a target that cannot depend on //base.
@@ -93347,12 +94752,13 @@ Index: chromium-153.0.8010.36/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" ]
++    public_configs = [ ":xnnpack_public_config" ]
++
++    if (!(is_android && use_order_profiling)) {
++      assert_no_deps = [ "//base" ]
+     }
+   }
++}
  
 -  if (build_with_chromium) {
 -    source_set("u8-vclamp_sse2-no-sse3") {
@@ -93377,17 +94783,25 @@ Index: chromium-153.0.8010.36/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",
++if (build_with_chromium) {
++  source_set("f32-maxpool_arch=rv64gcv-abi=lp64d") {
++    cflags = [
++      "-mabi=lp64d",
++    "-march=rv64gcv"
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/f32-maxpool/gen/f32-maxpool-9p-minmax-rvv-u2v.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) {
@@ -93419,22 +94833,24 @@ Index: chromium-153.0.8010.36/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",
++    ]
++
++    public_configs = [ ":xnnpack_public_config" ]
    }
 +}
  
 -  if (build_with_chromium) {
 -    source_set("u8-vclamp_x64") {
 -      cflags = []
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/u8-vclamp/u8-vclamp-scalar-u4.c",
--      ]
-+if (build_with_chromium) {
-+  source_set("f32-ibilinear_arch=rv64gcv-abi=lp64d") {
++# This is a target that cannot depend on //base.
++if (build_with_internal_optimization_guide) {
++  source_set("f32-maxpool_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gcv"
@@ -93442,34 +94858,41 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-ibilinear/gen/f32-ibilinear-rvv-u2v.c"
++      "src/src/f32-maxpool/gen/f32-maxpool-9p-minmax-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" ]
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/u8-vclamp/u8-vclamp-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",
 -      ]
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool",
-+    ]
++    public_configs = [ ":xnnpack_public_config" ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
--    }
-+    public_configs = [ ":xnnpack_public_config" ]
++    if (!(is_android && use_order_profiling)) {
++      assert_no_deps = [ "//base" ]
+     }
    }
 +}
  
@@ -93477,17 +94900,15 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -  if (build_with_internal_optimization_guide) {
 -    source_set("u8-vclamp_x64_standalone") {
 -      cflags = []
-+# This is a target that cannot depend on //base.
-+if (build_with_internal_optimization_guide) {
-+  source_set("f32-ibilinear_arch=rv64gcv-abi=lp64d_standalone") {
++if (build_with_chromium) {
++  source_set("f32-maxpool_riscv64") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-ibilinear/gen/f32-ibilinear-rvv-u2v.c"
++      "src/src/f32-maxpool/gen/f32-maxpool-9p-minmax-scalar-u1.c"
 +    ]
  
 -      sources = [
@@ -93530,7 +94951,6 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -      sources = [
 -        "src/include/xnnpack.h",
 -        "src/src/x16-packw/gen/x16-packw-x16-gemm-goi-avx2-u16-prfm.c",
--        "src/src/x16-packw/gen/x16-packw-x32-gemm-goi-avx2-u16-prfm.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -93548,13 +94968,14 @@ Index: chromium-153.0.8010.36/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) {
@@ -93568,7 +94989,6 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -      sources = [
 -        "src/include/xnnpack.h",
 -        "src/src/x16-packw/gen/x16-packw-x16-gemm-goi-avx2-u16-prfm.c",
--        "src/src/x16-packw/gen/x16-packw-x32-gemm-goi-avx2-u16-prfm.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -93588,44 +95008,139 @@ Index: chromium-153.0.8010.36/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("x16-packw_x64") {
--      cflags = []
-+if (build_with_chromium) {
-+  source_set("f32-ibilinear_riscv64") {
+-    }
+-  }
++# This is a target that cannot depend on //base.
++if (build_with_internal_optimization_guide) {
++  source_set("f32-maxpool_riscv64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-ibilinear/gen/f32-ibilinear-scalar-u2.c"
++      "src/src/f32-maxpool/gen/f32-maxpool-9p-minmax-scalar-u1.c"
 +    ]
-+
+ 
+-  if (build_with_chromium) {
+-    source_set(
+-        "x16-packw_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") {
+-      cflags = [
+-        "-mavx512bw",
+-        "-mavx512cd",
+-        "-mavx512dq",
+-        "-mavx512f",
+-        "-mavx512vl",
+-        "-mf16c",
+-        "-mfma",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/x16-packw/gen/x16-packw-x32-gemm-goi-avx512skx-u16-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",
+-      ]
 +    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(
+-        "x16-packw_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") {
+-      cflags = [
+-        "-mavx512bw",
+-        "-mavx512cd",
+-        "-mavx512dq",
+-        "-mavx512f",
+-        "-mavx512vl",
+-        "-mf16c",
+-        "-mfma",
+-      ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/x16-packw/gen/x16-packw-x32-gemm-goi-avx512skx-u16-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" ]
+-      }
++    public_configs = [ ":xnnpack_public_config" ]
++
++    if (!(is_android && use_order_profiling)) {
++      assert_no_deps = [ "//base" ]
+     }
+   }
++}
+ 
+-  if (build_with_chromium) {
+-    source_set("x16-packw_x64") {
+-      cflags = []
+-
 -      sources = [
 -        "src/include/xnnpack.h",
 -        "src/src/x16-packw/gen/x16-packw-x16-gemm-gio-scalar.c",
 -        "src/src/x16-packw/gen/x16-packw-x32-gemm-gio-scalar.c",
--        "src/src/x16-packw/gen/x16-packw-x32-gemm-goi-scalar-int-u4.c",
 -        "src/src/x16-packw/gen/x16-packw-x8-gemm-gio-scalar.c",
 -      ]
--
++if (build_with_chromium) {
++  source_set("f32-qc4w-gemm_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"
++    ]
+ 
 -      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",
@@ -93651,21 +95166,21 @@ Index: chromium-153.0.8010.36/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-qc4w-gemm_riscv64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-ibilinear/gen/f32-ibilinear-scalar-u2.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 = [
 -        "src/include/xnnpack.h",
 -        "src/src/x16-packw/gen/x16-packw-x16-gemm-gio-scalar.c",
 -        "src/src/x16-packw/gen/x16-packw-x32-gemm-gio-scalar.c",
--        "src/src/x16-packw/gen/x16-packw-x32-gemm-goi-scalar-int-u4.c",
 -        "src/src/x16-packw/gen/x16-packw-x8-gemm-gio-scalar.c",
 -      ]
 -
@@ -93790,16 +95305,15 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f32-igemm_arch=rv64gcv-abi=lp64d") {
++  source_set("f32-qc8w-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-qc8w-gemm/gen/f32-qc8w-gemm-1x4-minmax-scalar.c",
++    "src/src/f32-qc8w-gemm/gen/f32-qc8w-gemm-4x4-minmax-scalar.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -93857,16 +95371,15 @@ Index: chromium-153.0.8010.36/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_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-igemm/gen/f32-igemm-1x4v-minmax-rvv.c",
-+    "src/src/f32-igemm/gen/f32-igemm-7x4v-minmax-rvv.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 = [
@@ -93909,19 +95422,15 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -    source_set("x16-transposec_x64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("f32-igemm_riscv64") {
++  source_set("f32-qs8-vcvt_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-igemm/gen/f32-igemm-1x4-minmax-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-scalar.c"
++      "src/src/f32-qs8-vcvt/gen/f32-qs8-vcvt-rvv-u2v.c"
 +    ]
  
 -      sources = [
@@ -93978,19 +95487,15 @@ Index: chromium-153.0.8010.36/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-igemm_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-igemm/gen/f32-igemm-1x4-minmax-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-scalar.c"
++      "src/src/f32-qs8-vcvt/gen/f32-qs8-vcvt-rvv-u2v.c"
 +    ]
  
 -      deps = [
@@ -94073,15 +95578,15 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f32-maxpool_arch=rv64gcv-abi=lp64d") {
++  source_set("f32-qs8-vcvt_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-qs8-vcvt/gen/f32-qs8-vcvt-scalar-imagic-u4.c",
++    "src/src/f32-qs8-vcvt/gen/f32-qs8-vcvt-scalar-lrintf-u4.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -94139,15 +95644,15 @@ Index: chromium-153.0.8010.36/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_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-maxpool/gen/f32-maxpool-9p-minmax-rvv-u2v.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 = [
@@ -94215,14 +95720,15 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f32-maxpool_riscv64") {
++  source_set("f32-qu8-vcvt_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-qu8-vcvt/gen/f32-qu8-vcvt-rvv-u2v.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -94311,14 +95817,15 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -      cflags = [ "-mavx512f" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-maxpool_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-maxpool/gen/f32-maxpool-9p-minmax-scalar-u1.c"
++      "src/src/f32-qu8-vcvt/gen/f32-qu8-vcvt-rvv-u2v.c"
 +    ]
  
 -      sources = [
@@ -94363,15 +95870,15 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -    source_set("x32-packw_avx512f_standalone") {
 -      cflags = [ "-mavx512f" ]
 +if (build_with_chromium) {
-+  source_set("f32-qc4w-gemm_riscv64") {
++  source_set("f32-qu8-vcvt_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-qu8-vcvt/gen/f32-qu8-vcvt-scalar-imagic-u4.c",
++    "src/src/f32-qu8-vcvt/gen/f32-qu8-vcvt-scalar-lrintf-u4.c"
 +    ]
  
 -      sources = [
@@ -94477,15 +95984,15 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -  }
 +# 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-qu8-vcvt_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-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) {
@@ -94541,15 +96048,15 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -    source_set("x32-packw_x64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("f32-qc8w-gemm_riscv64") {
++  source_set("f32-raddstoreexpminusmax_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-raddstoreexpminusmax/gen/f32-raddstoreexpminusmax-rvv-rr2-p6-u4v.c"
 +    ]
  
 -      sources = [
@@ -94663,15 +96170,15 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -  }
 +# 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-raddstoreexpminusmax_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-raddstoreexpminusmax/gen/f32-raddstoreexpminusmax-rvv-rr2-p6-u4v.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -94759,15 +96266,14 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -        "src/src/x32-transposec/gen/x32-transposec-2x4-scalar-int.c",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f32-qs8-vcvt_arch=rv64gcv-abi=lp64d") {
++  source_set("f32-raddstoreexpminusmax_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-raddstoreexpminusmax/gen/f32-raddstoreexpminusmax-scalar-rr2-p5-u4-acc2.c"
 +    ]
  
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -94804,15 +96310,14 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# 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-raddstoreexpminusmax_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-raddstoreexpminusmax/gen/f32-raddstoreexpminusmax-scalar-rr2-p5-u4-acc2.c"
 +    ]
  
 -      sources = [
@@ -94924,15 +96429,16 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -        "src/src/x32-unpool/x32-unpool-scalar.c",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f32-qs8-vcvt_riscv64") {
++  source_set("f32-rdminmax_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    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-rdminmax/gen/f32-rdmax-2p2x-rvv-u8v.c",
++    "src/src/f32-rdminmax/gen/f32-rdmin-2p2x-rvv-u8v.c"
 +    ]
  
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -94969,15 +96475,16 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# 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-rdminmax_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    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-rdminmax/gen/f32-rdmax-2p2x-rvv-u8v.c",
++    "src/src/f32-rdminmax/gen/f32-rdmin-2p2x-rvv-u8v.c"
 +    ]
  
 -      sources = [
@@ -95108,15 +96615,15 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f32-qu8-vcvt_arch=rv64gcv-abi=lp64d") {
++  source_set("f32-rdminmax_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-rdminmax/gen/f32-rdmax-2p2x-scalar-u2.c",
++    "src/src/f32-rdminmax/gen/f32-rdmin-2p2x-scalar-u2.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -95174,15 +96681,15 @@ Index: chromium-153.0.8010.36/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_arch=rv64gcv-abi=lp64d_standalone") {
++  source_set("f32-rdminmax_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-rdminmax/gen/f32-rdmax-2p2x-scalar-u2.c",
++    "src/src/f32-rdminmax/gen/f32-rdmin-2p2x-scalar-u2.c"
 +    ]
  
 -      sources = [
@@ -95250,15 +96757,15 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f32-qu8-vcvt_riscv64") {
++  source_set("f32-rdsum2_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-rdsum2/gen/f32-rdsum2-7p7x-minmax-rvv-u4v.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -95364,15 +96871,15 @@ Index: chromium-153.0.8010.36/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_riscv64_standalone") {
++  source_set("f32-rdsum2_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-rdsum2/gen/f32-rdsum2-7p7x-minmax-rvv-u4v.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -95499,15 +97006,14 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f32-raddstoreexpminusmax_arch=rv64gcv-abi=lp64d") {
++  source_set("f32-rdsum2_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-rdsum2/gen/f32-rdsum2-7p7x-minmax-scalar.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -95602,15 +97108,14 @@ Index: chromium-153.0.8010.36/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-rdsum2_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-rdsum2/gen/f32-rdsum2-7p7x-minmax-scalar.c"
 +    ]
  
 -      sources = [
@@ -95653,14 +97158,15 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -    source_set("x8-lut_x64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("f32-raddstoreexpminusmax_riscv64") {
++  source_set("f32-rdsum_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-rdsum/gen/f32-rdsum-7p7x-minmax-rvv-u4v.c"
 +    ]
  
 -      sources = [
@@ -95716,14 +97222,15 @@ Index: chromium-153.0.8010.36/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-raddstoreexpminusmax_riscv64_standalone") {
++  source_set("f32-rdsum_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-rdsum/gen/f32-rdsum-7p7x-minmax-rvv-u4v.c"
 +    ]
  
 -      deps = [
@@ -95809,16 +97316,14 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f32-rdminmax_arch=rv64gcv-abi=lp64d") {
++  source_set("f32-rdsum_riscv64") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-rdminmax/gen/f32-rdmax-2p2x-rvv-u8v.c",
-+    "src/src/f32-rdminmax/gen/f32-rdmin-2p2x-rvv-u8v.c"
++      "src/src/f32-rdsum/gen/f32-rdsum-7p7x-minmax-scalar.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -95900,16 +97405,14 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -      ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-rdminmax_arch=rv64gcv-abi=lp64d_standalone") {
++  source_set("f32-rdsum_riscv64_standalone") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-rdminmax/gen/f32-rdmax-2p2x-rvv-u8v.c",
-+    "src/src/f32-rdminmax/gen/f32-rdmin-2p2x-rvv-u8v.c"
++      "src/src/f32-rdsum/gen/f32-rdsum-7p7x-minmax-scalar.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -96025,15 +97528,17 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("f32-rdminmax_riscv64") {
++  source_set("f32-rminmax_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    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-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) {
@@ -96043,11 +97548,7 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +    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/x8-transposec/gen/x8-transposec-2x4-scalar-int.c",
--      ]
++
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
@@ -96055,52 +97556,58 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +      "//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/x8-transposec/gen/x8-transposec-2x4-scalar-int.c",
+-      ]
 +    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) {
-+  source_set("f32-rdminmax_riscv64_standalone") {
++  source_set("f32-rminmax_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    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-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"
 +    ]
  
--      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) {
--    source_set("x8-transposec_x64_standalone") {
--      cflags = []
+-      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("x8-transposec_x64_standalone") {
+-      cflags = []
 +    public_configs = [ ":xnnpack_public_config" ]
  
 -      sources = [
@@ -96140,15 +97647,16 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -        "src/src/xx-copy/xx-copy-scalar-memcpy.c",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f32-rdsum2_arch=rv64gcv-abi=lp64d") {
++  source_set("f32-rminmax_riscv64") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-rdsum2/gen/f32-rdsum2-7p7x-minmax-rvv-u4v.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"
 +    ]
  
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -96185,15 +97693,16 @@ Index: chromium-153.0.8010.36/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_arch=rv64gcv-abi=lp64d_standalone") {
++  source_set("f32-rminmax_riscv64_standalone") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-rdsum2/gen/f32-rdsum2-7p7x-minmax-rvv-u4v.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 = [
@@ -96305,14 +97814,15 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -        "src/src/xx-fill/xx-fill-scalar-u16.c",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f32-rdsum2_riscv64") {
++  source_set("f32-rsum2_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-rsum2/gen/f32-rsum2-rvv-u4v.c"
 +    ]
  
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -96349,14 +97859,15 @@ Index: chromium-153.0.8010.36/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-rsum2_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-rsum2/gen/f32-rsum2-rvv-u4v.c"
 +    ]
  
 -      sources = [
@@ -96494,15 +98005,14 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f32-rdsum_arch=rv64gcv-abi=lp64d") {
++  source_set("f32-rsum2_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-rsum2/gen/f32-rsum2-scalar-u1.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -96560,15 +98070,14 @@ Index: chromium-153.0.8010.36/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_arch=rv64gcv-abi=lp64d_standalone") {
++  source_set("f32-rsum2_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-rsum2/gen/f32-rsum2-scalar-u1.c"
 +    ]
  
 -      sources = [
@@ -96611,14 +98120,15 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -    source_set("xx-pad_x64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("f32-rdsum_riscv64") {
++  source_set("f32-rsum_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-rdsum/gen/f32-rdsum-7p7x-minmax-scalar.c"
++      "src/src/f32-rsum/gen/f32-rsum-rvv-u4v.c"
 +    ]
  
 -      sources = [
@@ -96674,14 +98184,15 @@ Index: chromium-153.0.8010.36/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_riscv64_standalone") {
++  source_set("f32-rsum_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-rdsum/gen/f32-rdsum-7p7x-minmax-scalar.c"
++      "src/src/f32-rsum/gen/f32-rsum-rvv-u4v.c"
 +    ]
  
 -      deps = [
@@ -96762,17 +98273,14 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f32-rminmax_arch=rv64gcv-abi=lp64d") {
++  source_set("f32-rsum_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-rsum/gen/f32-rsum-scalar-u4-acc4.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -96827,17 +98335,14 @@ Index: chromium-153.0.8010.36/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-rsum_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-rsum/gen/f32-rsum-scalar-u4-acc4.c"
 +    ]
  
 -      sources = [
@@ -96880,16 +98385,17 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -    source_set("bf16-qs8-vcvt_arm64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("f32-rminmax_riscv64") {
++  source_set("f32-spmm_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-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 = [
@@ -96945,16 +98451,17 @@ Index: chromium-153.0.8010.36/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-spmm_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-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 = [
@@ -97038,15 +98545,16 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f32-rsum2_arch=rv64gcv-abi=lp64d") {
++  source_set("f32-spmm_riscv64") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-rsum2/gen/f32-rsum2-rvv-u4v.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"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -97101,11 +98609,90 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +}
  
 -  if (build_with_chromium) {
--    source_set("configs_arm64") {
+-    source_set("bf16-vunary_arm64") {
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-rsum2_arch=rv64gcv-abi=lp64d_standalone") {
++  source_set("f32-spmm_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"
++    ]
+ 
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/bf16-vunary/gen/bf16-vunary-neon.c",
+-        "src/src/bf16-vunary/gen/bf16-vunary-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" ]
++    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("bf16-vunary_arm64_standalone") {
+-      cflags = []
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/bf16-vunary/gen/bf16-vunary-neon.c",
+-        "src/src/bf16-vunary/gen/bf16-vunary-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 (build_with_chromium) {
++  source_set("f32-vapproxgelu_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gcv"
@@ -97113,9 +98700,17 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-rsum2/gen/f32-rsum2-rvv-u4v.c"
++      "src/src/f32-vapproxgelu/gen/f32-vapproxgelu-rvv-rational-12-10-div-u4v.c"
 +    ]
  
+-  if (build_with_chromium) {
+-    source_set("configs_arm64") {
+-      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/configs/argmaxpool-config.c",
@@ -97155,26 +98750,35 @@ Index: chromium-153.0.8010.36/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("configs_arm64_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-vapproxgelu_arch=rv64gcv-abi=lp64d_standalone") {
++    cflags = [
++      "-mabi=lp64d",
++    "-march=rv64gcv"
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/f32-vapproxgelu/gen/f32-vapproxgelu-rvv-rational-12-10-div-u4v.c"
++    ]
  
 -      sources = [
 -        "src/include/xnnpack.h",
@@ -97221,16 +98825,23 @@ Index: chromium-153.0.8010.36/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("enums_arm64") {
 -      cflags = []
--
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool:pthreadpool_standalone",
++    ]
+ 
 -      sources = [
 -        "src/include/xnnpack.h",
 -        "src/src/enums/allocation-type.c",
@@ -97251,34 +98862,28 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -        "//third_party/fxdiv",
 -        "//third_party/pthreadpool",
 -      ]
-+if (build_with_chromium) {
-+  source_set("f32-rsum2_riscv64") {
-+    cflags = [
-+  
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/f32-rsum2/gen/f32-rsum2-scalar-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" ]
++    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("enums_arm64_standalone") {
 -      cflags = []
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool",
++if (build_with_chromium) {
++  source_set("f32-vapproxgelu_riscv64") {
++    cflags = [
++  
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/f32-vapproxgelu/gen/f32-vapproxgelu-scalar-rational-12-10-div.c"
 +    ]
  
 -      sources = [
@@ -97308,6 +98913,18 @@ Index: chromium-153.0.8010.36/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" ]
    }
 +}
@@ -97317,14 +98934,14 @@ Index: chromium-153.0.8010.36/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-rsum2_riscv64_standalone") {
++  source_set("f32-vapproxgelu_riscv64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-rsum2/gen/f32-rsum2-scalar-u1.c"
++      "src/src/f32-vapproxgelu/gen/f32-vapproxgelu-scalar-rational-12-10-div.c"
 +    ]
  
 -      sources = [
@@ -97367,7 +98984,7 @@ Index: chromium-153.0.8010.36/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-rsum_arch=rv64gcv-abi=lp64d") {
++  source_set("f32-vbinary_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gcv"
@@ -97375,7 +98992,25 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-rsum/gen/f32-rsum-rvv-u4v.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-vprelu-rvv-u8v.c",
++    "src/src/f32-vbinary/gen/f32-vpreluc-rvv-u8v.c",
++    "src/src/f32-vbinary/gen/f32-vrdivc-rvv-u8v.c",
++    "src/src/f32-vbinary/gen/f32-vrpreluc-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 = [
@@ -97408,8 +99043,8 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +    configs += [ ":xnnpack_private_config" ]
  
 -  if (build_with_chromium) {
--    source_set("f16-conv-hwc2chw_arch=armv8.2-a+fp16") {
--      cflags = [ "-march=armv8.2-a+fp16" ]
+-    source_set("f16-avgpool_arm64") {
+-      cflags = []
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
@@ -97419,7 +99054,7 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f16-conv-hwc2chw/f16-conv-hwc2chw-3x3s2p1c3x4-neonfp16arith-2x2.c",
+-        "src/src/f16-avgpool/gen/f16-f32acc-avgpool-9p-minmax-scalar-u1.c",
 -      ]
 +    public_configs = [ ":xnnpack_public_config" ]
 +  }
@@ -97431,7 +99066,7 @@ Index: chromium-153.0.8010.36/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-rsum_arch=rv64gcv-abi=lp64d_standalone") {
++  source_set("f32-vbinary_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gcv"
@@ -97439,7 +99074,25 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-rsum/gen/f32-rsum-rvv-u4v.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-vprelu-rvv-u8v.c",
++    "src/src/f32-vbinary/gen/f32-vpreluc-rvv-u8v.c",
++    "src/src/f32-vbinary/gen/f32-vrdivc-rvv-u8v.c",
++    "src/src/f32-vbinary/gen/f32-vrpreluc-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"
 +    ]
  
 -      deps = [
@@ -97465,13 +99118,13 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
--    source_set("f16-conv-hwc2chw_arch=armv8.2-a+fp16_standalone") {
--      cflags = [ "-march=armv8.2-a+fp16" ]
+-    source_set("f16-avgpool_arm64_standalone") {
+-      cflags = []
 +    public_configs = [ ":xnnpack_public_config" ]
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f16-conv-hwc2chw/f16-conv-hwc2chw-3x3s2p1c3x4-neonfp16arith-2x2.c",
+-        "src/src/f16-avgpool/gen/f16-f32acc-avgpool-9p-minmax-scalar-u1.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -97498,51 +99151,57 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +}
  
 -  if (build_with_chromium) {
--    source_set("f16-dwconv2d-chw_arch=armv8.2-a+fp16") {
+-    source_set("f16-conv-hwc2chw_arch=armv8.2-a+fp16") {
 -      cflags = [ "-march=armv8.2-a+fp16" ]
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f16-dwconv2d-chw/gen/f16-dwconv2d-chw-3x3p1-minmax-neonfp16arith-2x8.c",
--        "src/src/f16-dwconv2d-chw/gen/f16-dwconv2d-chw-3x3s2p1-minmax-neonfp16arith-1x8.c",
--        "src/src/f16-dwconv2d-chw/gen/f16-dwconv2d-chw-5x5p2-minmax-neonfp16arith-1x8.c",
--        "src/src/f16-dwconv2d-chw/gen/f16-dwconv2d-chw-5x5s2p2-minmax-neonfp16arith-1x8.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/f16-conv-hwc2chw/f16-conv-hwc2chw-3x3s2p1c3x4-neonfp16arith-2x2.c",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f32-rsum_riscv64") {
++  source_set("f32-vbinary_riscv64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-rsum/gen/f32-rsum-scalar-u4-acc4.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"
 +    ]
  
--      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-dwconv2d-chw_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",
@@ -97550,58 +99209,49 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +      "//third_party/pthreadpool",
 +    ]
  
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/f16-dwconv2d-chw/gen/f16-dwconv2d-chw-3x3p1-minmax-neonfp16arith-2x8.c",
--        "src/src/f16-dwconv2d-chw/gen/f16-dwconv2d-chw-3x3s2p1-minmax-neonfp16arith-1x8.c",
--        "src/src/f16-dwconv2d-chw/gen/f16-dwconv2d-chw-5x5p2-minmax-neonfp16arith-1x8.c",
--        "src/src/f16-dwconv2d-chw/gen/f16-dwconv2d-chw-5x5s2p2-minmax-neonfp16arith-1x8.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("f16-dwconv_arch=armv8.2-a+fp16") {
+-  # This is a target that cannot depend on //base.
+-  if (build_with_internal_optimization_guide) {
+-    source_set("f16-conv-hwc2chw_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("f32-rsum_riscv64_standalone") {
++  source_set("f32-vbinary_riscv64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-rsum/gen/f32-rsum-scalar-u4-acc4.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 = [
 -        "src/include/xnnpack.h",
--        "src/src/f16-dwconv/gen/f16-dwconv-25p8c-minmax-neonfp16arith-acc2.c",
--        "src/src/f16-dwconv/gen/f16-dwconv-3p16c-minmax-neonfp16arith.c",
--        "src/src/f16-dwconv/gen/f16-dwconv-4p16c-minmax-neonfp16arith.c",
--        "src/src/f16-dwconv/gen/f16-dwconv-9p16c-minmax-neonfp16arith.c",
--        "src/src/f16-dwconv/gen/f16-dwconv-9p8c-minmax-neonfp16arith.c",
+-        "src/src/f16-conv-hwc2chw/f16-conv-hwc2chw-3x3s2p1c3x4-neonfp16arith-2x2.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -97613,16 +99263,24 @@ Index: chromium-153.0.8010.36/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" ]
+-      }
+-    }
+-  }
 +    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("f16-dwconv2d-chw_arch=armv8.2-a+fp16") {
+-      cflags = [ "-march=armv8.2-a+fp16" ]
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
@@ -97630,19 +99288,12 @@ Index: chromium-153.0.8010.36/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("f16-dwconv_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-dwconv/gen/f16-dwconv-25p8c-minmax-neonfp16arith-acc2.c",
--        "src/src/f16-dwconv/gen/f16-dwconv-3p16c-minmax-neonfp16arith.c",
--        "src/src/f16-dwconv/gen/f16-dwconv-4p16c-minmax-neonfp16arith.c",
--        "src/src/f16-dwconv/gen/f16-dwconv-9p16c-minmax-neonfp16arith.c",
--        "src/src/f16-dwconv/gen/f16-dwconv-9p8c-minmax-neonfp16arith.c",
+-        "src/src/f16-dwconv2d-chw/gen/f16-dwconv2d-chw-3x3p1-minmax-neonfp16arith-2x8.c",
+-        "src/src/f16-dwconv2d-chw/gen/f16-dwconv2d-chw-3x3s2p1-minmax-neonfp16arith-1x8.c",
+-        "src/src/f16-dwconv2d-chw/gen/f16-dwconv2d-chw-5x5p2-minmax-neonfp16arith-1x8.c",
+-        "src/src/f16-dwconv2d-chw/gen/f16-dwconv2d-chw-5x5s2p2-minmax-neonfp16arith-1x8.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -97654,29 +99305,28 @@ Index: chromium-153.0.8010.36/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" ]
      }
    }
 +}
  
--  if (build_with_chromium) {
--    source_set("f16-f32-vcvt_arm64") {
--      cflags = []
+-  # This is a target that cannot depend on //base.
+-  if (build_with_internal_optimization_guide) {
+-    source_set("f16-dwconv2d-chw_arch=armv8.2-a+fp16_standalone") {
+-      cflags = [ "-march=armv8.2-a+fp16" ]
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f16-f32-vcvt/gen/f16-f32-vcvt-neon-int16-u16.c",
--        "src/src/f16-f32-vcvt/gen/f16-f32-vcvt-neonfp16-u16.c",
--        "src/src/f16-f32-vcvt/gen/f16-f32-vcvt-scalar-u4.c",
+-        "src/src/f16-dwconv2d-chw/gen/f16-dwconv2d-chw-3x3p1-minmax-neonfp16arith-2x8.c",
+-        "src/src/f16-dwconv2d-chw/gen/f16-dwconv2d-chw-3x3s2p1-minmax-neonfp16arith-1x8.c",
+-        "src/src/f16-dwconv2d-chw/gen/f16-dwconv2d-chw-5x5p2-minmax-neonfp16arith-1x8.c",
+-        "src/src/f16-dwconv2d-chw/gen/f16-dwconv2d-chw-5x5s2p2-minmax-neonfp16arith-1x8.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -97688,10 +99338,18 @@ Index: chromium-153.0.8010.36/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-spmm_arch=rv64gcv-abi=lp64d") {
++  source_set("f32-vclamp_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gcv"
@@ -97699,35 +99357,24 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +  
 +    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-vclamp/gen/f32-vclamp-rvv-u8v.c"
 +    ]
  
--      public_configs = [ ":xnnpack_public_config" ]
--    }
--  }
+-  if (build_with_chromium) {
+-    source_set("f16-dwconv_arch=armv8.2-a+fp16") {
+-      cflags = [ "-march=armv8.2-a+fp16" ]
 +    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-f32-vcvt_arm64_standalone") {
--      cflags = []
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool",
-+    ]
- 
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f16-f32-vcvt/gen/f16-f32-vcvt-neon-int16-u16.c",
--        "src/src/f16-f32-vcvt/gen/f16-f32-vcvt-neonfp16-u16.c",
--        "src/src/f16-f32-vcvt/gen/f16-f32-vcvt-scalar-u4.c",
+-        "src/src/f16-dwconv/gen/f16-dwconv-25p8c-minmax-neonfp16arith-acc2.c",
+-        "src/src/f16-dwconv/gen/f16-dwconv-3p16c-minmax-neonfp16arith.c",
+-        "src/src/f16-dwconv/gen/f16-dwconv-4p16c-minmax-neonfp16arith.c",
+-        "src/src/f16-dwconv/gen/f16-dwconv-9p16c-minmax-neonfp16arith.c",
+-        "src/src/f16-dwconv/gen/f16-dwconv-9p8c-minmax-neonfp16arith.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -97739,25 +99386,28 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -        "//third_party/cpuinfo",
 -        "//third_party/fp16",
 -        "//third_party/fxdiv",
--        "//third_party/pthreadpool:pthreadpool_standalone",
+-        "//third_party/pthreadpool",
 -      ]
--
++    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" ]
    }
 +}
  
--  if (build_with_chromium) {
--    source_set("f16-f32acc-rdsum2_arch=armv8.2-a+fp16") {
+-  # This is a target that cannot depend on //base.
+-  if (build_with_internal_optimization_guide) {
+-    source_set("f16-dwconv_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("f32-spmm_arch=rv64gcv-abi=lp64d_standalone") {
++  source_set("f32-vclamp_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gcv"
@@ -97765,24 +99415,45 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +  
 +    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-vclamp/gen/f32-vclamp-rvv-u8v.c"
 +    ]
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f16-f32acc-rdsum2/gen/f16-f32acc-rdsum2-7p7x-minmax-neonfp16arith.c",
+-        "src/src/f16-dwconv/gen/f16-dwconv-25p8c-minmax-neonfp16arith-acc2.c",
+-        "src/src/f16-dwconv/gen/f16-dwconv-3p16c-minmax-neonfp16arith.c",
+-        "src/src/f16-dwconv/gen/f16-dwconv-4p16c-minmax-neonfp16arith.c",
+-        "src/src/f16-dwconv/gen/f16-dwconv-9p16c-minmax-neonfp16arith.c",
+-        "src/src/f16-dwconv/gen/f16-dwconv-9p8c-minmax-neonfp16arith.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" ]
  
--      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-dwconv_arm64") {
+-      cflags = []
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
@@ -97790,6 +99461,19 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
  
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/f16-dwconv/gen/f16-f32acc-dwconv-25p2c-minmax-scalar-acc2.c",
+-        "src/src/f16-dwconv/gen/f16-f32acc-dwconv-3p1c-minmax-scalar-acc2.c",
+-        "src/src/f16-dwconv/gen/f16-f32acc-dwconv-4p1c-minmax-scalar-acc2.c",
+-        "src/src/f16-dwconv/gen/f16-f32acc-dwconv-9p1c-minmax-scalar-acc2.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",
@@ -97807,24 +99491,25 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
--    source_set("f16-f32acc-rdsum2_arch=armv8.2-a+fp16_standalone") {
--      cflags = [ "-march=armv8.2-a+fp16" ]
+-    source_set("f16-dwconv_arm64_standalone") {
+-      cflags = []
 +if (build_with_chromium) {
-+  source_set("f32-spmm_riscv64") {
++  source_set("f32-vclamp_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-vclamp/gen/f32-vclamp-scalar.c"
 +    ]
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f16-f32acc-rdsum2/gen/f16-f32acc-rdsum2-7p7x-minmax-neonfp16arith.c",
+-        "src/src/f16-dwconv/gen/f16-f32acc-dwconv-25p2c-minmax-scalar-acc2.c",
+-        "src/src/f16-dwconv/gen/f16-f32acc-dwconv-3p1c-minmax-scalar-acc2.c",
+-        "src/src/f16-dwconv/gen/f16-f32acc-dwconv-4p1c-minmax-scalar-acc2.c",
+-        "src/src/f16-dwconv/gen/f16-f32acc-dwconv-9p1c-minmax-scalar-acc2.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -97852,8 +99537,8 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +    configs += [ ":xnnpack_private_config" ]
  
 -  if (build_with_chromium) {
--    source_set("f16-f32acc-rdsum_arch=armv8.2-a+fp16") {
--      cflags = [ "-march=armv8.2-a+fp16" ]
+-    source_set("f16-f32-vcvt_arm64") {
+-      cflags = []
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
@@ -97863,7 +99548,9 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f16-f32acc-rdsum/gen/f16-f32acc-rdsum-7p7x-minmax-neonfp16arith-u16.c",
+-        "src/src/f16-f32-vcvt/gen/f16-f32-vcvt-neon-int16-u16.c",
+-        "src/src/f16-f32-vcvt/gen/f16-f32-vcvt-neonfp16-u16.c",
+-        "src/src/f16-f32-vcvt/gen/f16-f32-vcvt-scalar-u4.c",
 -      ]
 +    public_configs = [ ":xnnpack_public_config" ]
 +  }
@@ -97875,16 +99562,14 @@ Index: chromium-153.0.8010.36/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_riscv64_standalone") {
++  source_set("f32-vclamp_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-vclamp/gen/f32-vclamp-scalar.c"
 +    ]
  
 -      deps = [
@@ -97910,13 +99595,15 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
--    source_set("f16-f32acc-rdsum_arch=armv8.2-a+fp16_standalone") {
--      cflags = [ "-march=armv8.2-a+fp16" ]
+-    source_set("f16-f32-vcvt_arm64_standalone") {
+-      cflags = []
 +    public_configs = [ ":xnnpack_public_config" ]
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f16-f32acc-rdsum/gen/f16-f32acc-rdsum-7p7x-minmax-neonfp16arith-u16.c",
+-        "src/src/f16-f32-vcvt/gen/f16-f32-vcvt-neon-int16-u16.c",
+-        "src/src/f16-f32-vcvt/gen/f16-f32-vcvt-neonfp16-u16.c",
+-        "src/src/f16-f32-vcvt/gen/f16-f32-vcvt-scalar-u4.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -97943,12 +99630,12 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +}
  
 -  if (build_with_chromium) {
--    source_set("f16-f32acc-rsum2_arch=armv8.2-a+fp16") {
+-    source_set("f16-f32acc-rdsum2_arch=armv8.2-a+fp16") {
 -      cflags = [ "-march=armv8.2-a+fp16" ]
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f16-f32acc-rsum2/gen/f16-f32acc-rsum2-neonfp16arith.c",
+-        "src/src/f16-f32acc-rdsum2/gen/f16-f32acc-rdsum2-7p7x-minmax-neonfp16arith.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -97963,7 +99650,7 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f32-vapproxgelu_arch=rv64gcv-abi=lp64d") {
++  source_set("f32-vcmul_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gcv"
@@ -97971,7 +99658,7 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vapproxgelu/gen/f32-vapproxgelu-rvv-rational-12-10-div-u4v.c"
++      "src/src/f32-vcmul/gen/f32-vcmul-rvv-u2v.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -97984,7 +99671,7 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
--    source_set("f16-f32acc-rsum2_arch=armv8.2-a+fp16_standalone") {
+-    source_set("f16-f32acc-rdsum2_arch=armv8.2-a+fp16_standalone") {
 -      cflags = [ "-march=armv8.2-a+fp16" ]
 +    deps = [
 +      "//third_party/cpuinfo",
@@ -97995,7 +99682,7 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f16-f32acc-rsum2/gen/f16-f32acc-rsum2-neonfp16arith.c",
+-        "src/src/f16-f32acc-rdsum2/gen/f16-f32acc-rdsum2-7p7x-minmax-neonfp16arith.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -98021,11 +99708,11 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +}
  
 -  if (build_with_chromium) {
--    source_set("f16-f32acc-rsum_arch=armv8.2-a+fp16") {
+-    source_set("f16-f32acc-rdsum_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("f32-vapproxgelu_arch=rv64gcv-abi=lp64d_standalone") {
++  source_set("f32-vcmul_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gcv"
@@ -98033,12 +99720,12 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vapproxgelu/gen/f32-vapproxgelu-rvv-rational-12-10-div-u4v.c"
++      "src/src/f32-vcmul/gen/f32-vcmul-rvv-u2v.c"
 +    ]
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f16-f32acc-rsum/gen/f16-f32acc-rsum-neonfp16arith-u32-acc4.c",
+-        "src/src/f16-f32acc-rdsum/gen/f16-f32acc-rdsum-7p7x-minmax-neonfp16arith-u16.c",
 -      ]
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
@@ -98073,12 +99760,22 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
--    source_set("f16-f32acc-rsum_arch=armv8.2-a+fp16_standalone") {
+-    source_set("f16-f32acc-rdsum_arch=armv8.2-a+fp16_standalone") {
 -      cflags = [ "-march=armv8.2-a+fp16" ]
--
++if (build_with_chromium) {
++  source_set("f32-vcmul_riscv64") {
++    cflags = [
++  
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/f32-vcmul/gen/f32-vcmul-scalar-u4.c"
++    ]
+ 
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f16-f32acc-rsum/gen/f16-f32acc-rsum-neonfp16arith-u32-acc4.c",
+-        "src/src/f16-f32acc-rdsum/gen/f16-f32acc-rdsum-7p7x-minmax-neonfp16arith-u16.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -98100,31 +99797,75 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -      }
 -    }
 -  }
-+if (build_with_chromium) {
-+  source_set("f32-vapproxgelu_riscv64") {
++    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-f32acc-rsum2_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-f32acc-rsum2/gen/f16-f32acc-rsum2-neonfp16arith.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-vcmul_riscv64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vapproxgelu/gen/f32-vapproxgelu-scalar-rational-12-10-div.c"
++      "src/src/f32-vcmul/gen/f32-vcmul-scalar-u4.c"
 +    ]
  
--  if (build_with_chromium) {
--    source_set("f16-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",
+-      ]
 +    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-f32acc-rsum2_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-gemm/gen/f16-gemm-1x16-minmax-neonfp16arith-ld64.c",
--        "src/src/f16-gemm/gen/f16-gemm-1x8-minmax-neonfp16arith-ld64.c",
--        "src/src/f16-gemm/gen/f16-gemm-6x16-minmax-neonfp16arith-ld64.c",
--        "src/src/f16-gemm/gen/f16-gemm-6x8-minmax-neonfp16arith-ld64.c",
+-        "src/src/f16-f32acc-rsum2/gen/f16-f32acc-rsum2-neonfp16arith.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -98136,6 +99877,55 @@ Index: chromium-153.0.8010.36/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("f16-f32acc-rsum_arch=armv8.2-a+fp16") {
+-      cflags = [ "-march=armv8.2-a+fp16" ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/f16-f32acc-rsum/gen/f16-f32acc-rsum-neonfp16arith-u32-acc4.c",
+-      ]
++if (build_with_chromium) {
++  source_set("f32-vcopysign_arch=rv64gcv-abi=lp64d") {
++    cflags = [
++      "-mabi=lp64d",
++    "-march=rv64gcv"
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/f32-vcopysign/gen/f32-vcopysign-rvv-u8v.c",
++    "src/src/f32-vcopysign/gen/f32-vcopysignc-rvv-u8v.c",
++    "src/src/f32-vcopysign/gen/f32-vrcopysignc-rvv-u8v.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 = [
@@ -98153,9 +99943,107 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
--    source_set("f16-gemm_arch=armv8.2-a+fp16_standalone") {
+-    source_set("f16-f32acc-rsum_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("f32-vcopysign_arch=rv64gcv-abi=lp64d_standalone") {
++    cflags = [
++      "-mabi=lp64d",
++    "-march=rv64gcv"
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/f32-vcopysign/gen/f32-vcopysign-rvv-u8v.c",
++    "src/src/f32-vcopysign/gen/f32-vcopysignc-rvv-u8v.c",
++    "src/src/f32-vcopysign/gen/f32-vrcopysignc-rvv-u8v.c"
++    ]
+ 
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/f16-f32acc-rsum/gen/f16-f32acc-rsum-neonfp16arith-u32-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" ]
+-      }
+-    }
+-  }
++    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-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:pthreadpool_standalone",
++    ]
+ 
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/f16-gemm/gen/f16-gemm-1x16-minmax-neonfp16arith-ld64.c",
+-        "src/src/f16-gemm/gen/f16-gemm-1x8-minmax-neonfp16arith-ld64.c",
+-        "src/src/f16-gemm/gen/f16-gemm-6x16-minmax-neonfp16arith-ld64.c",
+-        "src/src/f16-gemm/gen/f16-gemm-6x8-minmax-neonfp16arith-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",
+-      ]
++    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-gemm_arch=armv8.2-a+fp16_standalone") {
+-      cflags = [ "-march=armv8.2-a+fp16" ]
++if (build_with_chromium) {
++  source_set("f32-vcopysign_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"
++    ]
+ 
 -      sources = [
 -        "src/include/xnnpack.h",
 -        "src/src/f16-gemm/gen/f16-gemm-1x16-minmax-neonfp16arith-ld64.c",
@@ -98183,27 +100071,73 @@ Index: chromium-153.0.8010.36/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("f16-gemm_arch=armv8.2-a+fp16+dotprod") {
+-      cflags = [ "-march=armv8.2-a+fp16+dotprod" ]
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool",
++    ]
+ 
+-      asmflags = cflags
++    public_configs = [ ":xnnpack_public_config" ]
++  }
++}
+ 
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/f16-gemm/gen/f16-gemm-1x16-minmax-asm-aarch64-neonfp16arith-ld64.S",
+-        "src/src/f16-gemm/gen/f16-gemm-4x16-minmax-asm-aarch64-neonfp16arith-ld64.S",
+-        "src/src/f16-gemm/gen/f16-gemm-6x16-minmax-asm-aarch64-neonfp16arith-cortex-a55.S",
+-        "src/src/f16-gemm/gen/f16-gemm-6x16-minmax-asm-aarch64-neonfp16arith-cortex-a55r0.S",
+-        "src/src/f16-gemm/gen/f16-gemm-6x16-minmax-asm-aarch64-neonfp16arith-cortex-a75.S",
+-        "src/src/f16-gemm/gen/f16-gemm-6x16-minmax-asm-aarch64-neonfp16arith-ld64.S",
+-      ]
+-
+-      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-vapproxgelu_riscv64_standalone") {
++  source_set("f32-vcopysign_riscv64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vapproxgelu/gen/f32-vapproxgelu-scalar-rational-12-10-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"
 +    ]
  
--  if (build_with_chromium) {
--    source_set("f16-gemm_arch=armv8.2-a+fp16+dotprod") {
--      cflags = [ "-march=armv8.2-a+fp16+dotprod" ]
+-      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" ]
  
--      asmflags = cflags
+-  # This is a target that cannot depend on //base.
+-  if (build_with_internal_optimization_guide) {
+-    source_set("f16-gemm_arch=armv8.2-a+fp16+dotprod_standalone") {
+-      cflags = [ "-march=armv8.2-a+fp16+dotprod" ]
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
@@ -98211,6 +100145,9 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
  
+-      asmflags = cflags
++    public_configs = [ ":xnnpack_public_config" ]
+ 
 -      sources = [
 -        "src/include/xnnpack.h",
 -        "src/src/f16-gemm/gen/f16-gemm-1x16-minmax-asm-aarch64-neonfp16arith-ld64.S",
@@ -98230,23 +100167,42 @@ Index: chromium-153.0.8010.36/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" ]
+-
+-      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("f16-gemm_arch=armv8.2-a+fp16+dotprod_standalone") {
--      cflags = [ "-march=armv8.2-a+fp16+dotprod" ]
+-  if (build_with_chromium) {
+-    source_set("f16-ibilinear-chw_arch=armv8.2-a+fp16") {
+-      cflags = [ "-march=armv8.2-a+fp16" ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/f16-ibilinear-chw/gen/f16-ibilinear-chw-neonfp16arith-p8.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-vbinary_arch=rv64gcv-abi=lp64d") {
++  source_set("f32-vcos_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gcv"
@@ -98254,33 +100210,21 @@ Index: chromium-153.0.8010.36/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-vprelu-rvv-u8v.c",
-+    "src/src/f32-vbinary/gen/f32-vpreluc-rvv-u8v.c",
-+    "src/src/f32-vbinary/gen/f32-vrdivc-rvv-u8v.c",
-+    "src/src/f32-vbinary/gen/f32-vrpreluc-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-vcos/gen/f32-vcos-rvv-rational-5-4-div-u8v.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" ]
  
--      asmflags = cflags
+-  # This is a target that cannot depend on //base.
+-  if (build_with_internal_optimization_guide) {
+-    source_set("f16-ibilinear-chw_arch=armv8.2-a+fp16_standalone") {
+-      cflags = [ "-march=armv8.2-a+fp16" ]
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
@@ -98290,12 +100234,7 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f16-gemm/gen/f16-gemm-1x16-minmax-asm-aarch64-neonfp16arith-ld64.S",
--        "src/src/f16-gemm/gen/f16-gemm-4x16-minmax-asm-aarch64-neonfp16arith-ld64.S",
--        "src/src/f16-gemm/gen/f16-gemm-6x16-minmax-asm-aarch64-neonfp16arith-cortex-a55.S",
--        "src/src/f16-gemm/gen/f16-gemm-6x16-minmax-asm-aarch64-neonfp16arith-cortex-a55r0.S",
--        "src/src/f16-gemm/gen/f16-gemm-6x16-minmax-asm-aarch64-neonfp16arith-cortex-a75.S",
--        "src/src/f16-gemm/gen/f16-gemm-6x16-minmax-asm-aarch64-neonfp16arith-ld64.S",
+-        "src/src/f16-ibilinear-chw/gen/f16-ibilinear-chw-neonfp16arith-p8.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -98321,11 +100260,11 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +}
  
 -  if (build_with_chromium) {
--    source_set("f16-ibilinear-chw_arch=armv8.2-a+fp16") {
+-    source_set("f16-ibilinear_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("f32-vbinary_arch=rv64gcv-abi=lp64d_standalone") {
++  source_set("f32-vcos_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gcv"
@@ -98333,30 +100272,12 @@ Index: chromium-153.0.8010.36/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-vprelu-rvv-u8v.c",
-+    "src/src/f32-vbinary/gen/f32-vpreluc-rvv-u8v.c",
-+    "src/src/f32-vbinary/gen/f32-vrdivc-rvv-u8v.c",
-+    "src/src/f32-vbinary/gen/f32-vrpreluc-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-vcos/gen/f32-vcos-rvv-rational-5-4-div-u8v.c"
 +    ]
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f16-ibilinear-chw/gen/f16-ibilinear-chw-neonfp16arith-p8.c",
+-        "src/src/f16-ibilinear/gen/f16-ibilinear-neonfp16arith-u8.c",
 -      ]
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
@@ -98391,40 +100312,12 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
--    source_set("f16-ibilinear-chw_arch=armv8.2-a+fp16_standalone") {
+-    source_set("f16-ibilinear_arch=armv8.2-a+fp16_standalone") {
 -      cflags = [ "-march=armv8.2-a+fp16" ]
-+if (build_with_chromium) {
-+  source_set("f32-vbinary_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"
-+    ]
- 
+-
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/f16-ibilinear-chw/gen/f16-ibilinear-chw-neonfp16arith-p8.c",
+-        "src/src/f16-ibilinear/gen/f16-ibilinear-neonfp16arith-u8.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -98446,122 +100339,25 @@ Index: chromium-153.0.8010.36/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("f16-ibilinear_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-ibilinear/gen/f16-ibilinear-neonfp16arith-u8.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-vbinary_riscv64_standalone") {
++if (build_with_chromium) {
++  source_set("f32-vcos_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-vcos/gen/f32-vcos-scalar-rational-5-4-div.c"
 +    ]
  
--      deps = [
--        "//third_party/cpuinfo",
--        "//third_party/fp16",
--        "//third_party/fxdiv",
--        "//third_party/pthreadpool",
--      ]
+-  if (build_with_chromium) {
+-    source_set("f16-igemm_arch=armv8.2-a+fp16") {
+-      cflags = [ "-march=armv8.2-a+fp16" ]
 +    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-ibilinear_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-ibilinear/gen/f16-ibilinear-neonfp16arith-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" ]
--
--      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("f16-igemm_arch=armv8.2-a+fp16") {
--      cflags = [ "-march=armv8.2-a+fp16" ]
--
 -      sources = [
 -        "src/include/xnnpack.h",
 -        "src/src/f16-igemm/gen/f16-igemm-1x16-minmax-neonfp16arith-ld64.c",
@@ -98581,37 +100377,24 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -        "//third_party/fxdiv",
 -        "//third_party/pthreadpool",
 -      ]
-+if (build_with_chromium) {
-+  source_set("f32-vclamp_arch=rv64gcv-abi=lp64d") {
-+    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/f32-vclamp/gen/f32-vclamp-rvv-u8v.c"
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//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" ]
+   }
++}
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
 -    source_set("f16-igemm_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",
-+    ]
- 
+-
 -      sources = [
 -        "src/include/xnnpack.h",
 -        "src/src/f16-igemm/gen/f16-igemm-1x16-minmax-neonfp16arith-ld64.c",
@@ -98638,26 +100421,22 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -        assert_no_deps = [ "//base" ]
 -      }
 -    }
-+    public_configs = [ ":xnnpack_public_config" ]
-   }
-+}
- 
--  if (build_with_chromium) {
--    source_set("f16-igemm_arch=armv8.2-a+fp16+dotprod") {
--      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-vclamp_arch=rv64gcv-abi=lp64d_standalone") {
++  source_set("f32-vcos_riscv64_standalone") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vclamp/gen/f32-vclamp-rvv-u8v.c"
++      "src/src/f32-vcos/gen/f32-vcos-scalar-rational-5-4-div.c"
 +    ]
-+
+ 
+-  if (build_with_chromium) {
+-    source_set("f16-igemm_arch=armv8.2-a+fp16+dotprod") {
+-      cflags = [ "-march=armv8.2-a+fp16+dotprod" ]
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
 +    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
@@ -98706,14 +100485,15 @@ Index: chromium-153.0.8010.36/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-vclamp_riscv64") {
++  source_set("f32-velu_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vclamp/gen/f32-vclamp-scalar.c"
++      "src/src/f32-velu/gen/f32-velu-rvv-rr2-p6-u4v.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -98766,14 +100546,15 @@ Index: chromium-153.0.8010.36/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-vclamp_riscv64_standalone") {
++  source_set("f32-velu_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vclamp/gen/f32-vclamp-scalar.c"
++      "src/src/f32-velu/gen/f32-velu-rvv-rr2-p6-u4v.c"
 +    ]
  
 -      sources = [
@@ -98816,15 +100597,14 @@ Index: chromium-153.0.8010.36/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-vcmul_arch=rv64gcv-abi=lp64d") {
++  source_set("f32-velu_riscv64") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vcmul/gen/f32-vcmul-rvv-u2v.c"
++      "src/src/f32-velu/gen/f32-velu-scalar-rr2-lut16-p3-u4.c"
 +    ]
  
 -      sources = [
@@ -98880,15 +100660,14 @@ Index: chromium-153.0.8010.36/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-vcmul_arch=rv64gcv-abi=lp64d_standalone") {
++  source_set("f32-velu_riscv64_standalone") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vcmul/gen/f32-vcmul-rvv-u2v.c"
++      "src/src/f32-velu/gen/f32-velu-scalar-rr2-lut16-p3-u4.c"
 +    ]
  
 -      deps = [
@@ -98967,14 +100746,15 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f32-vcmul_riscv64") {
++  source_set("f32-vexp_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vcmul/gen/f32-vcmul-scalar-u4.c"
++      "src/src/f32-vexp/gen/f32-vexp-rvv-rational-3-2-div-u8v.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -99028,14 +100808,15 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vcmul_riscv64_standalone") {
++  source_set("f32-vexp_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vcmul/gen/f32-vcmul-scalar-u4.c"
++      "src/src/f32-vexp/gen/f32-vexp-rvv-rational-3-2-div-u8v.c"
 +    ]
  
 -      sources = [
@@ -99078,17 +100859,14 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -    source_set("f16-qu8-vcvt_arm64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("f32-vcopysign_arch=rv64gcv-abi=lp64d") {
++  source_set("f32-vexp_riscv64") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vcopysign/gen/f32-vcopysign-rvv-u8v.c",
-+    "src/src/f32-vcopysign/gen/f32-vcopysignc-rvv-u8v.c",
-+    "src/src/f32-vcopysign/gen/f32-vrcopysignc-rvv-u8v.c"
++      "src/src/f32-vexp/gen/f32-vexp-scalar-rational-3-2-div.c"
 +    ]
  
 -      sources = [
@@ -99144,17 +100922,14 @@ Index: chromium-153.0.8010.36/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_arch=rv64gcv-abi=lp64d_standalone") {
++  source_set("f32-vexp_riscv64_standalone") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vcopysign/gen/f32-vcopysign-rvv-u8v.c",
-+    "src/src/f32-vcopysign/gen/f32-vcopysignc-rvv-u8v.c",
-+    "src/src/f32-vcopysign/gen/f32-vrcopysignc-rvv-u8v.c"
++      "src/src/f32-vexp/gen/f32-vexp-scalar-rational-3-2-div.c"
 +    ]
  
 -      deps = [
@@ -99234,16 +101009,15 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f32-vcopysign_riscv64") {
++  source_set("f32-vgelu_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    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-vgelu/gen/f32-vgelu-rvv-rational-12-10-div-u4v.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -99298,16 +101072,15 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vcopysign_riscv64_standalone") {
++  source_set("f32-vgelu_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    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-vgelu/gen/f32-vgelu-rvv-rational-12-10-div-u4v.c"
 +    ]
  
 -      sources = [
@@ -99351,15 +101124,14 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -    source_set("f16-rdminmax_arm64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("f32-vcos_arch=rv64gcv-abi=lp64d") {
++  source_set("f32-vgelu_riscv64") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vcos/gen/f32-vcos-rvv-rational-5-4-div-u8v.c"
++      "src/src/f32-vgelu/gen/f32-vgelu-scalar-rational-12-10-div.c"
 +    ]
  
 -      sources = [
@@ -99418,15 +101190,14 @@ Index: chromium-153.0.8010.36/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-vcos_arch=rv64gcv-abi=lp64d_standalone") {
++  source_set("f32-vgelu_riscv64_standalone") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vcos/gen/f32-vcos-rvv-rational-5-4-div-u8v.c"
++      "src/src/f32-vgelu/gen/f32-vgelu-scalar-rational-12-10-div.c"
 +    ]
  
 -      deps = [
@@ -99509,14 +101280,15 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f32-vcos_riscv64") {
++  source_set("f32-vhswish_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-vhswish/gen/f32-vhswish-rvv-u4v.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -99572,14 +101344,15 @@ Index: chromium-153.0.8010.36/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-vhswish_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-vhswish/gen/f32-vhswish-rvv-u4v.c"
 +    ]
  
 -      sources = [
@@ -99622,15 +101395,14 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -    source_set("f16-spmm_arch=armv8.2-a+fp16_standalone") {
 -      cflags = [ "-march=armv8.2-a+fp16" ]
 +if (build_with_chromium) {
-+  source_set("f32-velu_arch=rv64gcv-abi=lp64d") {
++  source_set("f32-vhswish_riscv64") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-velu/gen/f32-velu-rvv-rr2-p6-u4v.c"
++      "src/src/f32-vhswish/gen/f32-vhswish-scalar.c"
 +    ]
  
 -      sources = [
@@ -99686,15 +101458,14 @@ Index: chromium-153.0.8010.36/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-velu_arch=rv64gcv-abi=lp64d_standalone") {
++  source_set("f32-vhswish_riscv64_standalone") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-velu/gen/f32-velu-rvv-rr2-p6-u4v.c"
++      "src/src/f32-vhswish/gen/f32-vhswish-scalar.c"
 +    ]
  
 -      deps = [
@@ -99762,14 +101533,15 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -        "src/src/f16-vapproxgelu/gen/f16-f32acc-vapproxgelu-scalar-rational-6-4-div.c",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f32-velu_riscv64") {
++  source_set("f32-vlog_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-velu/gen/f32-velu-scalar-rr2-lut16-p3-u4.c"
++      "src/src/f32-vlog/gen/f32-vlog-rvv-rational-3-3-div-u8v.c"
 +    ]
  
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -99806,14 +101578,15 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-velu_riscv64_standalone") {
++  source_set("f32-vlog_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-velu/gen/f32-velu-scalar-rr2-lut16-p3-u4.c"
++      "src/src/f32-vlog/gen/f32-vlog-rvv-rational-3-3-div-u8v.c"
 +    ]
  
 -      sources = [
@@ -99907,15 +101680,14 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -    source_set("f16-vbinary_arch=armv8.2-a+fp16_standalone") {
 -      cflags = [ "-march=armv8.2-a+fp16" ]
 +if (build_with_chromium) {
-+  source_set("f32-vexp_arch=rv64gcv-abi=lp64d") {
++  source_set("f32-vlog_riscv64") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vexp/gen/f32-vexp-rvv-rational-3-2-div-u8v.c"
++      "src/src/f32-vlog/gen/f32-vlog-scalar-rational-3-3-div.c"
 +    ]
  
 -      sources = [
@@ -99992,15 +101764,14 @@ Index: chromium-153.0.8010.36/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-vexp_arch=rv64gcv-abi=lp64d_standalone") {
++  source_set("f32-vlog_riscv64_standalone") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vexp/gen/f32-vexp-rvv-rational-3-2-div-u8v.c"
++      "src/src/f32-vlog/gen/f32-vlog-scalar-rational-3-3-div.c"
 +    ]
  
 -      deps = [
@@ -100079,14 +101850,15 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f32-vexp_riscv64") {
++  source_set("f32-vlrelu_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vexp/gen/f32-vexp-scalar-rational-3-2-div.c"
++      "src/src/f32-vlrelu/gen/f32-vlrelu-rvv-u4v.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -100140,14 +101912,15 @@ Index: chromium-153.0.8010.36/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-vlrelu_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vexp/gen/f32-vexp-scalar-rational-3-2-div.c"
++      "src/src/f32-vlrelu/gen/f32-vlrelu-rvv-u4v.c"
 +    ]
  
 -      sources = [
@@ -100190,15 +101963,14 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -    source_set("f16-vcos_arch=armv8.2-a+fp16_standalone") {
 -      cflags = [ "-march=armv8.2-a+fp16" ]
 +if (build_with_chromium) {
-+  source_set("f32-vgelu_arch=rv64gcv-abi=lp64d") {
++  source_set("f32-vlrelu_riscv64") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vgelu/gen/f32-vgelu-rvv-rational-12-10-div-u4v.c"
++      "src/src/f32-vlrelu/gen/f32-vlrelu-scalar-u4.c"
 +    ]
  
 -      sources = [
@@ -100255,15 +102027,14 @@ Index: chromium-153.0.8010.36/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_arch=rv64gcv-abi=lp64d_standalone") {
++  source_set("f32-vlrelu_riscv64_standalone") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vgelu/gen/f32-vgelu-rvv-rational-12-10-div-u4v.c"
++      "src/src/f32-vlrelu/gen/f32-vlrelu-scalar-u4.c"
 +    ]
  
 -      deps = [
@@ -100343,14 +102114,15 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f32-vgelu_riscv64") {
++  source_set("f32-vmulcaddc_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vgelu/gen/f32-vgelu-scalar-rational-12-10-div.c"
++      "src/src/f32-vmulcaddc/gen/f32-vmulcaddc-c4v-minmax-rvv-2x.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -100404,14 +102176,15 @@ Index: chromium-153.0.8010.36/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-vgelu_riscv64_standalone") {
++  source_set("f32-vmulcaddc_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vgelu/gen/f32-vgelu-scalar-rational-12-10-div.c"
++      "src/src/f32-vmulcaddc/gen/f32-vmulcaddc-c4v-minmax-rvv-2x.c"
 +    ]
  
 -      sources = [
@@ -100454,15 +102227,14 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -    source_set("f16-vexp_arch=armv8.2-a+fp16_standalone") {
 -      cflags = [ "-march=armv8.2-a+fp16" ]
 +if (build_with_chromium) {
-+  source_set("f32-vhswish_arch=rv64gcv-abi=lp64d") {
++  source_set("f32-vmulcaddc_riscv64") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vhswish/gen/f32-vhswish-rvv-u4v.c"
++      "src/src/f32-vmulcaddc/gen/f32-vmulcaddc-c1-minmax-scalar-2x.c"
 +    ]
  
 -      sources = [
@@ -100519,15 +102291,14 @@ Index: chromium-153.0.8010.36/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-vhswish_arch=rv64gcv-abi=lp64d_standalone") {
++  source_set("f32-vmulcaddc_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-vmulcaddc/gen/f32-vmulcaddc-c1-minmax-scalar-2x.c"
 +    ]
  
 -      deps = [
@@ -100607,14 +102378,18 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f32-vhswish_riscv64") {
++  source_set("f32-vrnd_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vhswish/gen/f32-vhswish-scalar.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" ]
@@ -100668,14 +102443,18 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vhswish_riscv64_standalone") {
++  source_set("f32-vrnd_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vhswish/gen/f32-vhswish-scalar.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 = [
@@ -100718,15 +102497,17 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -    source_set("f16-vgelu_arm64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("f32-vlog_arch=rv64gcv-abi=lp64d") {
++  source_set("f32-vrnd_riscv64") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vlog/gen/f32-vlog-rvv-rational-3-3-div-u8v.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 = [
@@ -100782,15 +102563,17 @@ Index: chromium-153.0.8010.36/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-vlog_arch=rv64gcv-abi=lp64d_standalone") {
++  source_set("f32-vrnd_riscv64_standalone") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vlog/gen/f32-vlog-rvv-rational-3-3-div-u8v.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 = [
@@ -100869,14 +102652,15 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f32-vlog_riscv64") {
++  source_set("f32-vrsqrt_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vlog/gen/f32-vlog-scalar-rational-3-3-div.c"
++      "src/src/f32-vrsqrt/gen/f32-vrsqrt-rvv-rsqrt-u4v.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -100930,14 +102714,15 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vlog_riscv64_standalone") {
++  source_set("f32-vrsqrt_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vlog/gen/f32-vlog-scalar-rational-3-3-div.c"
++      "src/src/f32-vrsqrt/gen/f32-vrsqrt-rvv-rsqrt-u4v.c"
 +    ]
  
 -      sources = [
@@ -100981,15 +102766,15 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -    source_set("f16-vlog_arm64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("f32-vlrelu_arch=rv64gcv-abi=lp64d") {
++  source_set("f32-vrsqrt_riscv64") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vlrelu/gen/f32-vlrelu-rvv-u4v.c"
++      "src/src/f32-vrsqrt/gen/f32-vrsqrt-scalar-rsqrt-u1.c",
++    "src/src/f32-vrsqrt/gen/f32-vrsqrt-scalar-sqrt.c"
 +    ]
  
 -      sources = [
@@ -101046,15 +102831,15 @@ Index: chromium-153.0.8010.36/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-vlrelu_arch=rv64gcv-abi=lp64d_standalone") {
++  source_set("f32-vrsqrt_riscv64_standalone") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vlrelu/gen/f32-vlrelu-rvv-u4v.c"
++      "src/src/f32-vrsqrt/gen/f32-vrsqrt-scalar-rsqrt-u1.c",
++    "src/src/f32-vrsqrt/gen/f32-vrsqrt-scalar-sqrt.c"
 +    ]
  
 -      deps = [
@@ -101121,14 +102906,15 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -        "src/src/f16-vmulcaddc/gen/f16-vmulcaddc-c8-minmax-neonfp16arith-2x.c",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f32-vlrelu_riscv64") {
++  source_set("f32-vsigmoid_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vlrelu/gen/f32-vlrelu-scalar-u4.c"
++      "src/src/f32-vsigmoid/gen/f32-vsigmoid-rvv-rr2-p5-div-u8v.c"
 +    ]
  
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -101165,14 +102951,15 @@ Index: chromium-153.0.8010.36/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-vsigmoid_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vlrelu/gen/f32-vlrelu-scalar-u4.c"
++      "src/src/f32-vsigmoid/gen/f32-vsigmoid-rvv-rr2-p5-div-u8v.c"
 +    ]
  
 -      sources = [
@@ -101247,15 +103034,14 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -    source_set("f16-vrnd_arch=armv8.2-a+fp16_standalone") {
 -      cflags = [ "-march=armv8.2-a+fp16" ]
 +if (build_with_chromium) {
-+  source_set("f32-vmulcaddc_arch=rv64gcv-abi=lp64d") {
++  source_set("f32-vsigmoid_riscv64") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vmulcaddc/gen/f32-vmulcaddc-c4v-minmax-rvv-2x.c"
++      "src/src/f32-vsigmoid/gen/f32-vsigmoid-scalar-rr2-lut64-p2-div-u2.c"
 +    ]
  
 -      sources = [
@@ -101314,15 +103100,14 @@ Index: chromium-153.0.8010.36/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_arch=rv64gcv-abi=lp64d_standalone") {
++  source_set("f32-vsigmoid_riscv64_standalone") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vmulcaddc/gen/f32-vmulcaddc-c4v-minmax-rvv-2x.c"
++      "src/src/f32-vsigmoid/gen/f32-vsigmoid-scalar-rr2-lut64-p2-div-u2.c"
 +    ]
  
 -      deps = [
@@ -101402,14 +103187,15 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f32-vmulcaddc_riscv64") {
++  source_set("f32-vsin_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-vsin/gen/f32-vsin-rvv-rational-5-4-div-u8v.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -101464,14 +103250,15 @@ Index: chromium-153.0.8010.36/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-vmulcaddc_riscv64_standalone") {
++  source_set("f32-vsin_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-vsin/gen/f32-vsin-rvv-rational-5-4-div-u8v.c"
 +    ]
  
 -      sources = [
@@ -101514,18 +103301,14 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -    source_set("f16-vsin_arch=armv8.2-a+fp16_standalone") {
 -      cflags = [ "-march=armv8.2-a+fp16" ]
 +if (build_with_chromium) {
-+  source_set("f32-vrnd_arch=rv64gcv-abi=lp64d") {
++  source_set("f32-vsin_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-vsin/gen/f32-vsin-scalar-rational-5-4-div.c"
 +    ]
  
 -      sources = [
@@ -101582,18 +103365,14 @@ Index: chromium-153.0.8010.36/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_arch=rv64gcv-abi=lp64d_standalone") {
++  source_set("f32-vsin_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-vsin/gen/f32-vsin-scalar-rational-5-4-div.c"
 +    ]
  
 -      deps = [
@@ -101674,17 +103453,15 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f32-vrnd_riscv64") {
++  source_set("f32-vsqrt_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    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-vsqrt/gen/f32-vsqrt-rvv-sqrt-u8v.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -101739,17 +103516,15 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vrnd_riscv64_standalone") {
++  source_set("f32-vsqrt_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    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-vsqrt/gen/f32-vsqrt-rvv-sqrt-u8v.c"
 +    ]
  
 -      sources = [
@@ -101792,15 +103567,14 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -    source_set("f16-vsqrt_arm64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("f32-vrsqrt_arch=rv64gcv-abi=lp64d") {
++  source_set("f32-vsqrt_riscv64") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vrsqrt/gen/f32-vrsqrt-rvv-rsqrt-u4v.c"
++      "src/src/f32-vsqrt/gen/f32-vsqrt-scalar-sqrt.c"
 +    ]
  
 -      sources = [
@@ -101826,51 +103600,60 @@ Index: chromium-153.0.8010.36/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-vtanh_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-vtanh/gen/f16-vtanh-neonfp16arith-rational-5-4-div.c",
+-      ]
 +    public_configs = [ ":xnnpack_public_config" ]
-   }
++  }
 +}
  
--  if (build_with_chromium) {
--    source_set("f16-vtanh_arch=armv8.2-a+fp16") {
--      cflags = [ "-march=armv8.2-a+fp16" ]
+-      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-vrsqrt_arch=rv64gcv-abi=lp64d_standalone") {
++  source_set("f32-vsqrt_riscv64_standalone") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vrsqrt/gen/f32-vrsqrt-rvv-rsqrt-u4v.c"
++      "src/src/f32-vsqrt/gen/f32-vsqrt-scalar-sqrt.c"
 +    ]
  
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/f16-vtanh/gen/f16-vtanh-neonfp16arith-rational-5-4-div.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" ]
  
--      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",
@@ -101878,36 +103661,11 @@ Index: chromium-153.0.8010.36/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-vtanh_arch=armv8.2-a+fp16_standalone") {
 -      cflags = [ "-march=armv8.2-a+fp16" ]
-+if (build_with_chromium) {
-+  source_set("f32-vrsqrt_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"
-+    ]
++    public_configs = [ ":xnnpack_public_config" ]
  
 -      sources = [
 -        "src/include/xnnpack.h",
@@ -101931,81 +103689,35 @@ Index: chromium-153.0.8010.36/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("f16-vtanh_arm64") {
 -      cflags = []
-+# This is a target that cannot depend on //base.
-+if (build_with_internal_optimization_guide) {
-+  source_set("f32-vrsqrt_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"
-+    ]
- 
+-
 -      sources = [
 -        "src/include/xnnpack.h",
 -        "src/src/f16-vtanh/gen/f16-f32acc-vtanh-neonfp16-rational-5-4-div.c",
 -        "src/src/f16-vtanh/gen/f16-f32acc-vtanh-scalar-rational-5-4-div.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-vtanh_arm64_standalone") {
--      cflags = []
 +if (build_with_chromium) {
-+  source_set("f32-vsigmoid_arch=rv64gcv-abi=lp64d") {
++  source_set("f32-vtanh_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gcv"
@@ -102013,7 +103725,26 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vsigmoid/gen/f32-vsigmoid-rvv-rr2-p5-div-u8v.c"
++      "src/src/f32-vtanh/gen/f32-vtanh-rvv-rational-9-8-div-u8v.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-vtanh_arm64_standalone") {
+-      cflags = []
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool",
 +    ]
  
 -      sources = [
@@ -102040,18 +103771,6 @@ Index: chromium-153.0.8010.36/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" ]
    }
 +}
@@ -102061,7 +103780,7 @@ Index: chromium-153.0.8010.36/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_arch=rv64gcv-abi=lp64d_standalone") {
++  source_set("f32-vtanh_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gcv"
@@ -102069,7 +103788,7 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vsigmoid/gen/f32-vsigmoid-rvv-rr2-p5-div-u8v.c"
++      "src/src/f32-vtanh/gen/f32-vtanh-rvv-rational-9-8-div-u8v.c"
 +    ]
  
 -      sources = [
@@ -102114,14 +103833,14 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -    source_set("f16-vunary_arch=armv8.2-a+fp16_standalone") {
 -      cflags = [ "-march=armv8.2-a+fp16" ]
 +if (build_with_chromium) {
-+  source_set("f32-vsigmoid_riscv64") {
++  source_set("f32-vtanh_riscv64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vsigmoid/gen/f32-vsigmoid-scalar-rr2-lut64-p2-div-u2.c"
++      "src/src/f32-vtanh/gen/f32-vtanh-scalar-rational-9-8-div.c"
 +    ]
  
 -      sources = [
@@ -102149,51 +103868,61 @@ Index: chromium-153.0.8010.36/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-argmaxpool_arm64") {
+-      cflags = []
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
 +      "//third_party/fxdiv",
 +      "//third_party/pthreadpool",
 +    ]
-+
+ 
+-      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",
+-      ]
 +    public_configs = [ ":xnnpack_public_config" ]
-   }
++  }
 +}
  
--  if (build_with_chromium) {
--    source_set("f32-argmaxpool_arm64") {
--      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" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vsigmoid_riscv64_standalone") {
++  source_set("f32-vtanh_riscv64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vsigmoid/gen/f32-vsigmoid-scalar-rr2-lut64-p2-div-u2.c"
++      "src/src/f32-vtanh/gen/f32-vtanh-scalar-rational-9-8-div.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",
+-      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" ]
  
--      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",
@@ -102201,36 +103930,11 @@ Index: chromium-153.0.8010.36/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("f32-argmaxpool_arm64_standalone") {
 -      cflags = []
-+if (build_with_chromium) {
-+  source_set("f32-vsin_arch=rv64gcv-abi=lp64d") {
-+    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/f32-vsin/gen/f32-vsin-rvv-rational-5-4-div-u8v.c"
-+    ]
++    public_configs = [ ":xnnpack_public_config" ]
  
 -      sources = [
 -        "src/include/xnnpack.h",
@@ -102255,88 +103959,64 @@ Index: chromium-153.0.8010.36/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("f32-avgpool_arm64") {
 -      cflags = []
-+# This is a target that cannot depend on //base.
-+if (build_with_internal_optimization_guide) {
-+  source_set("f32-vsin_arch=rv64gcv-abi=lp64d_standalone") {
-+    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/f32-vsin/gen/f32-vsin-rvv-rational-5-4-div-u8v.c"
-+    ]
- 
+-
 -      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" ]
- 
+-
 -      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" ]
++if (build_with_chromium) {
++  source_set("f32-vunary_arch=rv64gcv-abi=lp64d") {
++    cflags = [
++      "-mabi=lp64d",
++    "-march=rv64gcv"
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/f32-vunary/gen/f32-vabs-rvv-u8v.c",
++    "src/src/f32-vunary/gen/f32-vneg-rvv-u8v.c",
++    "src/src/f32-vunary/gen/f32-vsqr-rvv-u8v.c"
++    ]
  
 -      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" ]
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
 -    source_set("f32-avgpool_arm64_standalone") {
 -      cflags = []
-+if (build_with_chromium) {
-+  source_set("f32-vsin_riscv64") {
-+    cflags = [
-+  
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/f32-vsin/gen/f32-vsin-scalar-rational-5-4-div.c"
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool",
 +    ]
  
 -      sources = [
@@ -102363,18 +104043,6 @@ Index: chromium-153.0.8010.36/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" ]
    }
 +}
@@ -102384,14 +104052,17 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -      cflags = [ "-march=armv8.2-a+bf16" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vsin_riscv64_standalone") {
++  source_set("f32-vunary_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vsin/gen/f32-vsin-scalar-rational-5-4-div.c"
++      "src/src/f32-vunary/gen/f32-vabs-rvv-u8v.c",
++    "src/src/f32-vunary/gen/f32-vneg-rvv-u8v.c",
++    "src/src/f32-vunary/gen/f32-vsqr-rvv-u8v.c"
 +    ]
  
 -      sources = [
@@ -102434,15 +104105,16 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -    source_set("f32-bf16-vcvt_arch=armv8.2-a+bf16_standalone") {
 -      cflags = [ "-march=armv8.2-a+bf16" ]
 +if (build_with_chromium) {
-+  source_set("f32-vsqrt_arch=rv64gcv-abi=lp64d") {
++  source_set("f32-vunary_riscv64") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vsqrt/gen/f32-vsqrt-rvv-sqrt-u8v.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 = [
@@ -102468,52 +104140,63 @@ Index: chromium-153.0.8010.36/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-bf16-vcvt_arm64") {
+-      cflags = []
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
 +      "//third_party/fxdiv",
 +      "//third_party/pthreadpool",
 +    ]
-+
+ 
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/f32-bf16-vcvt/gen/f32-bf16-vcvt-neon-u8.c",
+-        "src/src/f32-bf16-vcvt/gen/f32-bf16-vcvt-scalar-u2.c",
+-      ]
 +    public_configs = [ ":xnnpack_public_config" ]
-   }
++  }
 +}
  
--  if (build_with_chromium) {
--    source_set("f32-bf16-vcvt_arm64") {
--      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" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vsqrt_arch=rv64gcv-abi=lp64d_standalone") {
++  source_set("f32-vunary_riscv64_standalone") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vsqrt/gen/f32-vsqrt-rvv-sqrt-u8v.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 = [
--        "src/include/xnnpack.h",
--        "src/src/f32-bf16-vcvt/gen/f32-bf16-vcvt-neon-u8.c",
--        "src/src/f32-bf16-vcvt/gen/f32-bf16-vcvt-scalar-u2.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" ]
  
--      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",
@@ -102521,35 +104204,11 @@ Index: chromium-153.0.8010.36/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("f32-bf16-vcvt_arm64_standalone") {
 -      cflags = []
-+if (build_with_chromium) {
-+  source_set("f32-vsqrt_riscv64") {
-+    cflags = [
-+  
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/f32-vsqrt/gen/f32-vsqrt-scalar-sqrt.c"
-+    ]
++    public_configs = [ ":xnnpack_public_config" ]
  
 -      sources = [
 -        "src/include/xnnpack.h",
@@ -102574,89 +104233,84 @@ Index: chromium-153.0.8010.36/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("f32-conv-hwc2chw_arm64") {
 -      cflags = []
-+# This is a target that cannot depend on //base.
-+if (build_with_internal_optimization_guide) {
-+  source_set("f32-vsqrt_riscv64_standalone") {
-+    cflags = [
-+  
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/f32-vsqrt/gen/f32-vsqrt-scalar-sqrt.c"
-+    ]
- 
+-
 -      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" ]
- 
+-
 -      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" ]
++if (build_with_chromium) {
++  source_set("operators_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/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"
++    ]
  
 -      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" ]
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
 -    source_set("f32-conv-hwc2chw_arm64_standalone") {
 -      cflags = []
-+if (build_with_chromium) {
-+  source_set("f32-vtanh_arch=rv64gcv-abi=lp64d") {
-+    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/f32-vtanh/gen/f32-vtanh-rvv-rational-9-8-div-u8v.c"
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool",
 +    ]
  
 -      sources = [
@@ -102684,18 +104338,6 @@ Index: chromium-153.0.8010.36/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" ]
    }
 +}
@@ -102705,15 +104347,36 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vtanh_arch=rv64gcv-abi=lp64d_standalone") {
++  source_set("operators_riscv64_standalone") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vtanh/gen/f32-vtanh-rvv-rational-9-8-div-u8v.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 = [
@@ -102815,14 +104478,15 @@ Index: chromium-153.0.8010.36/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("f32-vtanh_riscv64") {
++  source_set("qd8-bf16-qb4w-gemm_riscv64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vtanh/gen/f32-vtanh-scalar-rational-9-8-div.c"
++      "src/src/qd8-bf16-qb4w-gemm/gen/qd8-bf16-qb4w-gemm-1x4-minmax-scalar.c",
++    "src/src/qd8-bf16-qb4w-gemm/gen/qd8-bf16-qb4w-gemm-4x4-minmax-scalar.c"
 +    ]
  
 -      asmflags = cflags
@@ -102858,14 +104522,15 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -      ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vtanh_riscv64_standalone") {
++  source_set("qd8-bf16-qb4w-gemm_riscv64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vtanh/gen/f32-vtanh-scalar-rational-9-8-div.c"
++      "src/src/qd8-bf16-qb4w-gemm/gen/qd8-bf16-qb4w-gemm-1x4-minmax-scalar.c",
++    "src/src/qd8-bf16-qb4w-gemm/gen/qd8-bf16-qb4w-gemm-4x4-minmax-scalar.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -102956,17 +104621,14 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("f32-vunary_arch=rv64gcv-abi=lp64d") {
++  source_set("qd8-f16-qc2w-gemm_riscv64") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vunary/gen/f32-vabs-rvv-u8v.c",
-+    "src/src/f32-vunary/gen/f32-vneg-rvv-u8v.c",
-+    "src/src/f32-vunary/gen/f32-vsqr-rvv-u8v.c"
++      "src/src/qd8-f16-qc2w-gemm/gen/qd8-f16-qc2w-gemm-1x2-minmax-scalar.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -103037,17 +104699,14 @@ Index: chromium-153.0.8010.36/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_arch=rv64gcv-abi=lp64d_standalone") {
++  source_set("qd8-f16-qc2w-gemm_riscv64_standalone") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/f32-vunary/gen/f32-vabs-rvv-u8v.c",
-+    "src/src/f32-vunary/gen/f32-vneg-rvv-u8v.c",
-+    "src/src/f32-vunary/gen/f32-vsqr-rvv-u8v.c"
++      "src/src/qd8-f16-qc2w-gemm/gen/qd8-f16-qc2w-gemm-1x2-minmax-scalar.c"
 +    ]
  
 -      sources = [
@@ -103092,16 +104751,16 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -    source_set("f32-f16-vcvt_arm64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("f32-vunary_riscv64") {
++  source_set("qd8-f16-qc4w-gemm_arch=rv64gc_zvfh-abi=lp64d") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gc_zvfh"
 +    ]
 +  
 +    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/qd8-f16-qc4w-gemm/gen/qd8-f16-qc4w-gemm-1x2v-minmax-rvvfp16arith.c",
++    "src/src/qd8-f16-qc4w-gemm/gen/qd8-f16-qc4w-gemm-7x2v-minmax-rvvfp16arith.c"
 +    ]
  
 -      sources = [
@@ -103188,16 +104847,16 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -      ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("f32-vunary_riscv64_standalone") {
++  source_set("qd8-f16-qc4w-gemm_arch=rv64gc_zvfh-abi=lp64d_standalone") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gc_zvfh"
 +    ]
 +  
 +    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/qd8-f16-qc4w-gemm/gen/qd8-f16-qc4w-gemm-1x2v-minmax-rvvfp16arith.c",
++    "src/src/qd8-f16-qc4w-gemm/gen/qd8-f16-qc4w-gemm-7x2v-minmax-rvvfp16arith.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -103307,36 +104966,16 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("operators_riscv64") {
++  source_set("qd8-f16-qc8w-gemm_arch=rv64gc_zvfh-abi=lp64d") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gc_zvfh"
 +    ]
 +  
 +    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/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"
++      "src/src/qd8-f16-qc8w-gemm/gen/qd8-f16-qc8w-gemm-1x2v-minmax-rvvfp16arith.c",
++    "src/src/qd8-f16-qc8w-gemm/gen/qd8-f16-qc8w-gemm-7x2v-minmax-rvvfp16arith.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -103406,36 +105045,16 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("operators_riscv64_standalone") {
++  source_set("qd8-f16-qc8w-gemm_arch=rv64gc_zvfh-abi=lp64d_standalone") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gc_zvfh"
 +    ]
 +  
 +    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/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"
++      "src/src/qd8-f16-qc8w-gemm/gen/qd8-f16-qc8w-gemm-1x2v-minmax-rvvfp16arith.c",
++    "src/src/qd8-f16-qc8w-gemm/gen/qd8-f16-qc8w-gemm-7x2v-minmax-rvvfp16arith.c"
 +    ]
  
 -      sources = [
@@ -103480,15 +105099,16 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -    source_set("f32-ibilinear-chw_arm64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("qd8-bf16-qb4w-gemm_riscv64") {
++  source_set("qd8-f16-qc8w-igemm_arch=rv64gc_zvfh-abi=lp64d") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gc_zvfh"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qd8-bf16-qb4w-gemm/gen/qd8-bf16-qb4w-gemm-1x4-minmax-scalar.c",
-+    "src/src/qd8-bf16-qb4w-gemm/gen/qd8-bf16-qb4w-gemm-4x4-minmax-scalar.c"
++      "src/src/qd8-f16-qc8w-igemm/gen/qd8-f16-qc8w-igemm-1x2v-minmax-rvvfp16arith.c",
++    "src/src/qd8-f16-qc8w-igemm/gen/qd8-f16-qc8w-igemm-7x2v-minmax-rvvfp16arith.c"
 +    ]
  
 -      sources = [
@@ -103548,15 +105168,16 @@ Index: chromium-153.0.8010.36/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-bf16-qb4w-gemm_riscv64_standalone") {
++  source_set("qd8-f16-qc8w-igemm_arch=rv64gc_zvfh-abi=lp64d_standalone") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gc_zvfh"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qd8-bf16-qb4w-gemm/gen/qd8-bf16-qb4w-gemm-1x4-minmax-scalar.c",
-+    "src/src/qd8-bf16-qb4w-gemm/gen/qd8-bf16-qb4w-gemm-4x4-minmax-scalar.c"
++      "src/src/qd8-f16-qc8w-igemm/gen/qd8-f16-qc8w-igemm-1x2v-minmax-rvvfp16arith.c",
++    "src/src/qd8-f16-qc8w-igemm/gen/qd8-f16-qc8w-igemm-7x2v-minmax-rvvfp16arith.c"
 +    ]
  
 -      deps = [
@@ -103620,14 +105241,15 @@ Index: chromium-153.0.8010.36/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("qd8-f16-qc2w-gemm_riscv64") {
++  source_set("qd8-f32-qb4w-gemm_riscv64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qd8-f16-qc2w-gemm/gen/qd8-f16-qc2w-gemm-1x2-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"
 +    ]
  
 -      asmflags = cflags
@@ -103690,14 +105312,15 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -      asmflags = cflags
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qd8-f16-qc2w-gemm_riscv64_standalone") {
++  source_set("qd8-f32-qb4w-gemm_riscv64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qd8-f16-qc2w-gemm/gen/qd8-f16-qc2w-gemm-1x2-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"
 +    ]
  
 -      sources = [
@@ -103802,16 +105425,14 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -    source_set("f32-igemm_arm64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("qd8-f16-qc4w-gemm_arch=rv64gc_zvfh-abi=lp64d") {
++  source_set("qd8-f32-qc2w-gemm_riscv64") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gc_zvfh"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qd8-f16-qc4w-gemm/gen/qd8-f16-qc4w-gemm-1x2v-minmax-rvvfp16arith.c",
-+    "src/src/qd8-f16-qc4w-gemm/gen/qd8-f16-qc4w-gemm-7x2v-minmax-rvvfp16arith.c"
++      "src/src/qd8-f32-qc2w-gemm/gen/qd8-f32-qc2w-gemm-1x2-minmax-scalar.c"
 +    ]
  
 -      sources = [
@@ -103884,16 +105505,14 @@ Index: chromium-153.0.8010.36/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-f16-qc4w-gemm_arch=rv64gc_zvfh-abi=lp64d_standalone") {
++  source_set("qd8-f32-qc2w-gemm_riscv64_standalone") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gc_zvfh"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qd8-f16-qc4w-gemm/gen/qd8-f16-qc4w-gemm-1x2v-minmax-rvvfp16arith.c",
-+    "src/src/qd8-f16-qc4w-gemm/gen/qd8-f16-qc4w-gemm-7x2v-minmax-rvvfp16arith.c"
++      "src/src/qd8-f32-qc2w-gemm/gen/qd8-f32-qc2w-gemm-1x2-minmax-scalar.c"
 +    ]
  
 -      deps = [
@@ -103979,16 +105598,16 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("qd8-f16-qc8w-gemm_arch=rv64gc_zvfh-abi=lp64d") {
++  source_set("qd8-f32-qc4w-gemm_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
 +      "-mabi=lp64d",
-+    "-march=rv64gc_zvfh"
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qd8-f16-qc8w-gemm/gen/qd8-f16-qc8w-gemm-1x2v-minmax-rvvfp16arith.c",
-+    "src/src/qd8-f16-qc8w-gemm/gen/qd8-f16-qc8w-gemm-7x2v-minmax-rvvfp16arith.c"
++      "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"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -104050,16 +105669,16 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -      asmflags = cflags
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qd8-f16-qc8w-gemm_arch=rv64gc_zvfh-abi=lp64d_standalone") {
++  source_set("qd8-f32-qc4w-gemm_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
 +      "-mabi=lp64d",
-+    "-march=rv64gc_zvfh"
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qd8-f16-qc8w-gemm/gen/qd8-f16-qc8w-gemm-1x2v-minmax-rvvfp16arith.c",
-+    "src/src/qd8-f16-qc8w-gemm/gen/qd8-f16-qc8w-gemm-7x2v-minmax-rvvfp16arith.c"
++      "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 = [
@@ -104104,16 +105723,15 @@ Index: chromium-153.0.8010.36/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("qd8-f16-qc8w-igemm_arch=rv64gc_zvfh-abi=lp64d") {
++  source_set("qd8-f32-qc4w-gemm_riscv64") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gc_zvfh"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qd8-f16-qc8w-igemm/gen/qd8-f16-qc8w-igemm-1x2v-minmax-rvvfp16arith.c",
-+    "src/src/qd8-f16-qc8w-igemm/gen/qd8-f16-qc8w-igemm-7x2v-minmax-rvvfp16arith.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"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -104163,16 +105781,15 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qd8-f16-qc8w-igemm_arch=rv64gc_zvfh-abi=lp64d_standalone") {
++  source_set("qd8-f32-qc4w-gemm_riscv64_standalone") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gc_zvfh"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qd8-f16-qc8w-igemm/gen/qd8-f16-qc8w-igemm-1x2v-minmax-rvvfp16arith.c",
-+    "src/src/qd8-f16-qc8w-igemm/gen/qd8-f16-qc8w-igemm-7x2v-minmax-rvvfp16arith.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 = [
@@ -104274,15 +105891,16 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("qd8-f32-qb4w-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-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/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"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -104339,15 +105957,16 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# 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("qd8-f32-qc8w-gemm_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    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/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 = [
@@ -104431,14 +106050,16 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -        "src/src/f32-raddstoreexpminusmax/gen/f32-raddstoreexpminusmax-scalar-rr2-p5-u4-acc2.c",
 -      ]
 +if (build_with_chromium) {
-+  source_set("qd8-f32-qc2w-gemm_riscv64") {
++  source_set("qd8-f32-qc8w-gemm_riscv64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qd8-f32-qc2w-gemm/gen/qd8-f32-qc2w-gemm-1x2-minmax-scalar.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"
 +    ]
  
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -104475,14 +106096,16 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qd8-f32-qc2w-gemm_riscv64_standalone") {
++  source_set("qd8-f32-qc8w-gemm_riscv64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qd8-f32-qc2w-gemm/gen/qd8-f32-qc2w-gemm-1x2-minmax-scalar.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 = [
@@ -104558,7 +106181,7 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -    source_set("f32-rdminmax_arm64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("qd8-f32-qc4w-gemm_arch=rv64gcv-abi=lp64d") {
++  source_set("qd8-f32-qc8w-igemm_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gcv"
@@ -104566,8 +106189,8 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +  
 +    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/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 = [
@@ -104627,7 +106250,7 @@ Index: chromium-153.0.8010.36/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("qd8-f32-qc8w-igemm_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gcv"
@@ -104635,8 +106258,8 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +  
 +    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/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 = [
@@ -104705,15 +106328,16 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -        "src/src/f32-rdsum/gen/f32-rdsum-7p7x-minmax-scalar.c",
 -      ]
 +if (build_with_chromium) {
-+  source_set("qd8-f32-qc4w-gemm_riscv64") {
++  source_set("qd8-f32-qc8w-igemm_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-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" ]
@@ -104750,15 +106374,16 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qd8-f32-qc4w-gemm_riscv64_standalone") {
++  source_set("qd8-f32-qc8w-igemm_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"
++      "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 = [
@@ -104836,7 +106461,7 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -    source_set("f32-rminmax_arm64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("qd8-f32-qc8w-gemm_arch=rv64gcv-abi=lp64d") {
++  source_set("qs8-dwconv_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gcv"
@@ -104844,8 +106469,8 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +  
 +    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/qs8-dwconv/gen/qs8-dwconv-25p8vc-minmax-fp32-rvv.c",
++    "src/src/qs8-dwconv/gen/qs8-dwconv-9p8vc-minmax-fp32-rvv.c"
 +    ]
  
 -      sources = [
@@ -104907,7 +106532,7 @@ Index: chromium-153.0.8010.36/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_arch=rv64gcv-abi=lp64d_standalone") {
++  source_set("qs8-dwconv_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gcv"
@@ -104915,8 +106540,8 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +  
 +    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/qs8-dwconv/gen/qs8-dwconv-25p8vc-minmax-fp32-rvv.c",
++    "src/src/qs8-dwconv/gen/qs8-dwconv-9p8vc-minmax-fp32-rvv.c"
 +    ]
  
 -      deps = [
@@ -104984,63 +106609,49 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -        "src/src/f32-rsum/gen/f32-rsum-neon-u16-acc4.c",
 -        "src/src/f32-rsum/gen/f32-rsum-scalar-u4-acc4.c",
 -      ]
-+if (build_with_chromium) {
-+  source_set("qd8-f32-qc8w-gemm_riscv64") {
-+    cflags = [
-+  
-+    ]
-+  
-+    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"
-+    ]
- 
+-
 -      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-dwconv_riscv64") {
++    cflags = [
++  
++    ]
++  
++    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"
 +    ]
  
 -      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-rsum_arm64_standalone") {
 -      cflags = []
-+# This is a target that cannot depend on //base.
-+if (build_with_internal_optimization_guide) {
-+  source_set("qd8-f32-qc8w-gemm_riscv64_standalone") {
-+    cflags = [
-+  
-+    ]
-+  
-+    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"
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool",
 +    ]
  
 -      sources = [
@@ -105067,20 +106678,26 @@ Index: chromium-153.0.8010.36/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-spmm_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-dwconv_riscv64_standalone") {
++    cflags = [
++  
++    ]
++  
++    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"
 +    ]
  
 -      sources = [
@@ -105105,31 +106722,26 @@ Index: chromium-153.0.8010.36/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-spmm_arm64_standalone") {
 -      cflags = []
-+if (build_with_chromium) {
-+  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-1x4v-minmax-rvv.c",
-+    "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-4x4v-minmax-rvv.c"
-+    ]
++    public_configs = [ ":xnnpack_public_config" ]
  
 -      sources = [
 -        "src/include/xnnpack.h",
@@ -105159,39 +106771,23 @@ Index: chromium-153.0.8010.36/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 (!(is_android && use_order_profiling)) {
++      assert_no_deps = [ "//base" ]
+     }
+   }
++}
  
 -  if (build_with_chromium) {
 -    source_set("f32-vapproxgelu_arm64") {
 -      cflags = []
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool",
-+    ]
- 
+-
 -      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",
 -      ]
-+    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-qc8w-igemm_arch=rv64gcv-abi=lp64d_standalone") {
++if (build_with_chromium) {
++  source_set("qs8-f32-vcvt_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gcv"
@@ -105199,36 +106795,53 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +  
 +    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/qs8-f32-vcvt/gen/qs8-f32-vcvt-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",
 -      ]
-+    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("f32-vapproxgelu_arm64_standalone") {
 -      cflags = []
-+    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_arch=rv64gcv-abi=lp64d_standalone") {
++    cflags = [
++      "-mabi=lp64d",
++    "-march=rv64gcv"
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/qs8-f32-vcvt/gen/qs8-f32-vcvt-rvv-u2v.c"
++    ]
  
 -      sources = [
 -        "src/include/xnnpack.h",
@@ -105253,16 +106866,23 @@ Index: chromium-153.0.8010.36/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("f32-vbinary_arm64") {
 -      cflags = []
--
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool:pthreadpool_standalone",
++    ]
+ 
 -      sources = [
 -        "src/include/xnnpack.h",
 -        "src/src/f32-vbinary/gen/f32-vadd-neon-u8.c",
@@ -105316,36 +106936,28 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -        "//third_party/fxdiv",
 -        "//third_party/pthreadpool",
 -      ]
-+if (build_with_chromium) {
-+  source_set("qd8-f32-qc8w-igemm_riscv64") {
-+    cflags = [
-+  
-+    ]
-+  
-+    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"
-+    ]
++    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) {
 -    source_set("f32-vbinary_arm64_standalone") {
 -      cflags = []
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool",
++if (build_with_chromium) {
++  source_set("qs8-f32-vcvt_riscv64") {
++    cflags = [
++  
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/qs8-f32-vcvt/gen/qs8-f32-vcvt-scalar-u4.c"
 +    ]
  
 -      sources = [
@@ -105408,25 +107020,20 @@ Index: chromium-153.0.8010.36/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("f32-vclamp_arm64") {
 -      cflags = []
-+# This is a target that cannot depend on //base.
-+if (build_with_internal_optimization_guide) {
-+  source_set("qd8-f32-qc8w-igemm_riscv64_standalone") {
-+    cflags = [
-+  
-+    ]
-+  
-+    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"
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool",
 +    ]
  
 -      sources = [
@@ -105434,20 +107041,24 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -        "src/src/f32-vclamp/gen/f32-vclamp-neon.c",
 -        "src/src/f32-vclamp/gen/f32-vclamp-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",
-+      "//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-f32-vcvt_riscv64_standalone") {
++    cflags = [
++  
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/qs8-f32-vcvt/gen/qs8-f32-vcvt-scalar-u4.c"
 +    ]
  
 -      deps = [
@@ -105456,31 +107067,26 @@ Index: chromium-153.0.8010.36/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-vclamp_arm64_standalone") {
 -      cflags = []
-+if (build_with_chromium) {
-+  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-25p8vc-minmax-fp32-rvv.c",
-+    "src/src/qs8-dwconv/gen/qs8-dwconv-9p8vc-minmax-fp32-rvv.c"
-+    ]
++    public_configs = [ ":xnnpack_public_config" ]
  
 -      sources = [
 -        "src/include/xnnpack.h",
@@ -105505,60 +107111,46 @@ Index: chromium-153.0.8010.36/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("f32-vcmul_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") {
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/f32-vcmul/gen/f32-vcmul-neon-u8.c",
+-        "src/src/f32-vcmul/gen/f32-vcmul-scalar-u4.c",
+-      ]
++if (build_with_chromium) {
++  source_set("qs8-packw_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/qs8-packw/gen/qs8-packw-x16c4-gemm-gio-scalar.c",
++    "src/src/qs8-packw/gen/qs8-packw-x16c8-gemm-gio-scalar.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-x8c4-gemm-gio-scalar.c",
++    "src/src/qs8-packw/gen/qs8-packw-x8c8-gemm-gio-scalar.c"
 +    ]
  
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/f32-vcmul/gen/f32-vcmul-neon-u8.c",
--        "src/src/f32-vcmul/gen/f32-vcmul-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",
@@ -105566,12 +107158,16 @@ Index: chromium-153.0.8010.36/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" ]
    }
 +}
  
@@ -105579,18 +107175,22 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -  if (build_with_internal_optimization_guide) {
 -    source_set("f32-vcmul_arm64_standalone") {
 -      cflags = []
-+if (build_with_chromium) {
-+  source_set("qs8-dwconv_riscv64") {
++# This is a target that cannot depend on //base.
++if (build_with_internal_optimization_guide) {
++  source_set("qs8-packw_riscv64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    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-packw/gen/qs8-packw-x16c4-gemm-gio-scalar.c",
++    "src/src/qs8-packw/gen/qs8-packw-x16c8-gemm-gio-scalar.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-x8c4-gemm-gio-scalar.c",
++    "src/src/qs8-packw/gen/qs8-packw-x8c8-gemm-gio-scalar.c"
 +    ]
  
 -      sources = [
@@ -105617,38 +107217,20 @@ Index: chromium-153.0.8010.36/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("f32-vcopysign_arm64") {
 -      cflags = []
-+# This is a target that cannot depend on //base.
-+if (build_with_internal_optimization_guide) {
-+  source_set("qs8-dwconv_riscv64_standalone") {
-+    cflags = [
-+  
-+    ]
-+  
-+    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"
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
  
 -      sources = [
@@ -105672,26 +107254,32 @@ Index: chromium-153.0.8010.36/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("f32-vcopysign_arm64_standalone") {
 -      cflags = []
-+    public_configs = [ ":xnnpack_public_config" ]
++if (build_with_chromium) {
++  source_set("qs8-qc2w-gemm_riscv64") {
++    cflags = [
++  
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/qs8-qc2w-gemm/gen/qs8-qc2w-gemm-1x2-minmax-fp32-scalar-fmagic.c",
++    "src/src/qs8-qc2w-gemm/gen/qs8-qc2w-gemm-1x4-minmax-fp32-scalar-fmagic.c",
++    "src/src/qs8-qc2w-gemm/gen/qs8-qc2w-gemm-3x4-minmax-fp32-scalar-fmagic.c",
++    "src/src/qs8-qc2w-gemm/gen/qs8-qc2w-gemm-4x4-minmax-fp32-scalar-fmagic.c"
++    ]
  
 -      sources = [
 -        "src/include/xnnpack.h",
@@ -105720,77 +107308,77 @@ Index: chromium-153.0.8010.36/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("f32-vcos_arm64") {
 -      cflags = []
--
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool",
++    ]
+ 
 -      sources = [
 -        "src/include/xnnpack.h",
 -        "src/src/f32-vcos/gen/f32-vcos-neon-rational-5-4-div.c",
 -        "src/src/f32-vcos/gen/f32-vcos-scalar-rational-5-4-div.c",
 -      ]
-+if (build_with_chromium) {
-+  source_set("qs8-f32-vcvt_arch=rv64gcv-abi=lp64d") {
++    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-qc2w-gemm_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-qc2w-gemm/gen/qs8-qc2w-gemm-1x2-minmax-fp32-scalar-fmagic.c",
++    "src/src/qs8-qc2w-gemm/gen/qs8-qc2w-gemm-1x4-minmax-fp32-scalar-fmagic.c",
++    "src/src/qs8-qc2w-gemm/gen/qs8-qc2w-gemm-3x4-minmax-fp32-scalar-fmagic.c",
++    "src/src/qs8-qc2w-gemm/gen/qs8-qc2w-gemm-4x4-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",
 -      ]
++    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("f32-vcos_arm64_standalone") {
 -      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") {
-+    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" ]
  
 -      sources = [
 -        "src/include/xnnpack.h",
@@ -105815,23 +107403,16 @@ Index: chromium-153.0.8010.36/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 (!(is_android && use_order_profiling)) {
++      assert_no_deps = [ "//base" ]
+     }
+   }
++}
  
 -  if (build_with_chromium) {
 -    source_set("f32-velu_arm64") {
 -      cflags = []
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool:pthreadpool_standalone",
-+    ]
- 
+-
 -      sources = [
 -        "src/include/xnnpack.h",
 -        "src/src/f32-velu/gen/f32-velu-neon-rr2-lut16-p3-u8.c",
@@ -105851,28 +107432,35 @@ Index: chromium-153.0.8010.36/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("f32-velu_arm64_standalone") {
--      cflags = []
 +if (build_with_chromium) {
-+  source_set("qs8-f32-vcvt_riscv64") {
++  source_set("qs8-qc4w-gemm_riscv64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-f32-vcvt/gen/qs8-f32-vcvt-scalar-u4.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" ]
+-    }
+-  }
++    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-velu_arm64_standalone") {
+-      cflags = []
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool",
 +    ]
  
 -      sources = [
@@ -105901,18 +107489,6 @@ Index: chromium-153.0.8010.36/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" ]
    }
 +}
@@ -105922,14 +107498,15 @@ Index: chromium-153.0.8010.36/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_riscv64_standalone") {
++  source_set("qs8-qc4w-gemm_riscv64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-f32-vcvt/gen/qs8-f32-vcvt-scalar-u4.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 = [
@@ -105973,20 +107550,15 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -    source_set("f32-vexp_arm64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("qs8-packw_riscv64") {
++  source_set("qs8-qc4w-packw_riscv64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-packw/gen/qs8-packw-x16c4-gemm-gio-scalar.c",
-+    "src/src/qs8-packw/gen/qs8-packw-x16c8-gemm-gio-scalar.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-x8c4-gemm-gio-scalar.c",
-+    "src/src/qs8-packw/gen/qs8-packw-x8c8-gemm-gio-scalar.c"
++      "src/src/qs8-qc4w-packw/gen/qs8-qc4uw-packw-x16c8-gemm-goi-scalar.c",
++    "src/src/qs8-qc4w-packw/gen/qs8-to-qu8-qc4uw-packw-x16c8-gemm-goi-scalar.c"
 +    ]
  
 -      sources = [
@@ -106034,20 +107606,15 @@ Index: chromium-153.0.8010.36/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-qc4w-packw_riscv64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-packw/gen/qs8-packw-x16c4-gemm-gio-scalar.c",
-+    "src/src/qs8-packw/gen/qs8-packw-x16c8-gemm-gio-scalar.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-x8c4-gemm-gio-scalar.c",
-+    "src/src/qs8-packw/gen/qs8-packw-x8c8-gemm-gio-scalar.c"
++      "src/src/qs8-qc4w-packw/gen/qs8-qc4uw-packw-x16c8-gemm-goi-scalar.c",
++    "src/src/qs8-qc4w-packw/gen/qs8-to-qu8-qc4uw-packw-x16c8-gemm-goi-scalar.c"
 +    ]
  
 -      sources = [
@@ -106091,17 +107658,17 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -    source_set("f32-vgelu_arm64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("qs8-qc2w-gemm_riscv64") {
++  source_set("qs8-qc8w-dwconv_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-qc2w-gemm/gen/qs8-qc2w-gemm-1x2-minmax-fp32-scalar-fmagic.c",
-+    "src/src/qs8-qc2w-gemm/gen/qs8-qc2w-gemm-1x4-minmax-fp32-scalar-fmagic.c",
-+    "src/src/qs8-qc2w-gemm/gen/qs8-qc2w-gemm-3x4-minmax-fp32-scalar-fmagic.c",
-+    "src/src/qs8-qc2w-gemm/gen/qs8-qc2w-gemm-4x4-minmax-fp32-scalar-fmagic.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 = [
@@ -106149,17 +107716,17 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-qc2w-gemm_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-qc2w-gemm/gen/qs8-qc2w-gemm-1x2-minmax-fp32-scalar-fmagic.c",
-+    "src/src/qs8-qc2w-gemm/gen/qs8-qc2w-gemm-1x4-minmax-fp32-scalar-fmagic.c",
-+    "src/src/qs8-qc2w-gemm/gen/qs8-qc2w-gemm-3x4-minmax-fp32-scalar-fmagic.c",
-+    "src/src/qs8-qc2w-gemm/gen/qs8-qc2w-gemm-4x4-minmax-fp32-scalar-fmagic.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 = [
@@ -106203,15 +107770,19 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -    source_set("f32-vhswish_arm64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("qs8-qc4w-gemm_riscv64") {
++  source_set("qs8-qc8w-dwconv_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-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 = [
@@ -106259,15 +107830,19 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# 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-qc8w-dwconv_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-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 = [
@@ -106311,15 +107886,16 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -    source_set("f32-vlog_arm64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("qs8-qc4w-packw_riscv64") {
++  source_set("qs8-qc8w-gemm_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-qc4w-packw/gen/qs8-qc4uw-packw-x16c8-gemm-goi-scalar.c",
-+    "src/src/qs8-qc4w-packw/gen/qs8-to-qu8-qc4uw-packw-x16c8-gemm-goi-scalar.c"
++      "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-1x1v-minmax-fp32-rvv.c",
++    "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-4x1v-minmax-fp32-rvv.c"
 +    ]
  
 -      sources = [
@@ -106346,52 +107922,63 @@ Index: chromium-153.0.8010.36/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-vlrelu_arm64") {
+-      cflags = []
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
 +      "//third_party/fxdiv",
 +      "//third_party/pthreadpool",
 +    ]
-+
+ 
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/f32-vlrelu/gen/f32-vlrelu-neon-u8.c",
+-        "src/src/f32-vlrelu/gen/f32-vlrelu-scalar-u4.c",
+-      ]
 +    public_configs = [ ":xnnpack_public_config" ]
-   }
++  }
 +}
  
--  if (build_with_chromium) {
--    source_set("f32-vlrelu_arm64") {
--      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" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-qc4w-packw_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-qc4w-packw/gen/qs8-qc4uw-packw-x16c8-gemm-goi-scalar.c",
-+    "src/src/qs8-qc4w-packw/gen/qs8-to-qu8-qc4uw-packw-x16c8-gemm-goi-scalar.c"
++      "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-1x1v-minmax-fp32-rvv.c",
++    "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-4x1v-minmax-fp32-rvv.c"
 +    ]
  
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/f32-vlrelu/gen/f32-vlrelu-neon-u8.c",
--        "src/src/f32-vlrelu/gen/f32-vlrelu-scalar-u4.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" ]
  
--      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",
@@ -106399,38 +107986,11 @@ Index: chromium-153.0.8010.36/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("f32-vlrelu_arm64_standalone") {
 -      cflags = []
-+if (build_with_chromium) {
-+  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-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"
-+    ]
++    public_configs = [ ":xnnpack_public_config" ]
  
 -      sources = [
 -        "src/include/xnnpack.h",
@@ -106455,78 +108015,78 @@ Index: chromium-153.0.8010.36/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 (!(is_android && use_order_profiling)) {
++      assert_no_deps = [ "//base" ]
+     }
+   }
++}
  
 -  if (build_with_chromium) {
 -    source_set("f32-vmulcaddc_arm64") {
 -      cflags = []
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool",
-+    ]
- 
+-
 -      sources = [
 -        "src/include/xnnpack.h",
 -        "src/src/f32-vmulcaddc/gen/f32-vmulcaddc-c1-minmax-scalar-2x.c",
 -        "src/src/f32-vmulcaddc/gen/f32-vmulcaddc-c4-minmax-neon-2x.c",
 -        "src/src/f32-vmulcaddc/gen/f32-vmulcaddc-c4-minmax-neonfma-2x.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("qs8-qc8w-dwconv_arch=rv64gcv-abi=lp64d_standalone") {
++if (build_with_chromium) {
++  source_set("qs8-qc8w-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-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",
 -      ]
-+    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("f32-vmulcaddc_arm64_standalone") {
 -      cflags = []
-+    public_configs = [ ":xnnpack_public_config" ]
++# This is a target that cannot depend on //base.
++if (build_with_internal_optimization_guide) {
++  source_set("qs8-qc8w-gemm_riscv64_standalone") {
++    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",
@@ -106552,16 +108112,23 @@ Index: chromium-153.0.8010.36/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("f32-vrnd_arm64") {
 -      cflags = []
--
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool:pthreadpool_standalone",
++    ]
+ 
 -      sources = [
 -        "src/include/xnnpack.h",
 -        "src/src/f32-vrnd/gen/f32-vrndd-neon-u8.c",
@@ -106589,39 +108156,30 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -        "//third_party/fxdiv",
 -        "//third_party/pthreadpool",
 -      ]
-+if (build_with_chromium) {
-+  source_set("qs8-qc8w-dwconv_riscv64") {
-+    cflags = [
-+  
-+    ]
-+  
-+    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"
-+    ]
++    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) {
 -    source_set("f32-vrnd_arm64_standalone") {
 -      cflags = []
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool",
++if (build_with_chromium) {
++  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-1x1v-minmax-fp32-rvv.c",
++    "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-4x1v-minmax-fp32-rvv.c"
 +    ]
  
 -      sources = [
@@ -106658,6 +108216,18 @@ Index: chromium-153.0.8010.36/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" ]
    }
 +}
@@ -106667,19 +108237,16 @@ Index: chromium-153.0.8010.36/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_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-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-igemm/gen/qs8-qc8w-igemm-1x1v-minmax-fp32-rvv.c",
++    "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-4x1v-minmax-fp32-rvv.c"
 +    ]
  
 -      sources = [
@@ -106724,16 +108291,15 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -    source_set("f32-vrsqrt_arm64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("qs8-qc8w-gemm_arch=rv64gcv-abi=lp64d") {
++  source_set("qs8-qc8w-igemm_riscv64") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-1x1v-minmax-fp32-rvv.c",
-+    "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-4x1v-minmax-fp32-rvv.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 = [
@@ -106793,16 +108359,15 @@ Index: chromium-153.0.8010.36/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_arch=rv64gcv-abi=lp64d_standalone") {
++  source_set("qs8-qc8w-igemm_riscv64_standalone") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-1x1v-minmax-fp32-rvv.c",
-+    "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-4x1v-minmax-fp32-rvv.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"
 +    ]
  
 -      deps = [
@@ -106884,15 +108449,15 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("qs8-qc8w-gemm_riscv64") {
++  source_set("qs8-qu8-packw_riscv64") {
 +    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"
++      "src/src/qs8-qu8-packw/gen/qs8-qu8-packw-x16c8-gemm-goi-scalar.c",
++    "src/src/qs8-qu8-packw/gen/qs8-qu8-packw-x8c8-gemm-gio-scalar.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -106947,15 +108512,15 @@ Index: chromium-153.0.8010.36/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-gemm_riscv64_standalone") {
++  source_set("qs8-qu8-packw_riscv64_standalone") {
 +    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"
++      "src/src/qs8-qu8-packw/gen/qs8-qu8-packw-x16c8-gemm-goi-scalar.c",
++    "src/src/qs8-qu8-packw/gen/qs8-qu8-packw-x8c8-gemm-gio-scalar.c"
 +    ]
  
 -      sources = [
@@ -106999,7 +108564,7 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -    source_set("f32-vsqrt_arm64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("qs8-qc8w-igemm_arch=rv64gcv-abi=lp64d") {
++  source_set("qs8-rdsum_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gcv"
@@ -107007,8 +108572,7 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-1x1v-minmax-fp32-rvv.c",
-+    "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-4x1v-minmax-fp32-rvv.c"
++      "src/src/qs8-rdsum/gen/qs8-rdsum-7p7x-rvv-u2v.c"
 +    ]
  
 -      sources = [
@@ -107066,7 +108630,7 @@ Index: chromium-153.0.8010.36/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-igemm_arch=rv64gcv-abi=lp64d_standalone") {
++  source_set("qs8-rdsum_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
 +      "-mabi=lp64d",
 +    "-march=rv64gcv"
@@ -107074,8 +108638,7 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-1x1v-minmax-fp32-rvv.c",
-+    "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-4x1v-minmax-fp32-rvv.c"
++      "src/src/qs8-rdsum/gen/qs8-rdsum-7p7x-rvv-u2v.c"
 +    ]
  
 -      deps = [
@@ -107160,15 +108723,14 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("qs8-qc8w-igemm_riscv64") {
++  source_set("qs8-rdsum_riscv64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    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-rdsum/gen/qs8-rdsum-minmax-fp32-scalar-u1-acc1.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -107227,15 +108789,14 @@ Index: chromium-153.0.8010.36/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-rdsum_riscv64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    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-rdsum/gen/qs8-rdsum-minmax-fp32-scalar-u1-acc1.c"
 +    ]
  
 -      sources = [
@@ -107369,15 +108930,15 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("qs8-qu8-packw_riscv64") {
++  source_set("qs8-rsum_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-qu8-packw/gen/qs8-qu8-packw-x16c8-gemm-goi-scalar.c",
-+    "src/src/qs8-qu8-packw/gen/qs8-qu8-packw-x8c8-gemm-gio-scalar.c"
++      "src/src/qs8-rsum/gen/qs8-rsum-rvv-u2v.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -107432,15 +108993,15 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -      cflags = [ "-march=armv8.2-a+sve+sve2" ]
 +# 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-rsum_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-qu8-packw/gen/qs8-qu8-packw-x16c8-gemm-goi-scalar.c",
-+    "src/src/qs8-qu8-packw/gen/qs8-qu8-packw-x8c8-gemm-gio-scalar.c"
++      "src/src/qs8-rsum/gen/qs8-rsum-rvv-u2v.c"
 +    ]
  
 -      sources = [
@@ -107538,15 +109099,14 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("qs8-rdsum_arch=rv64gcv-abi=lp64d") {
++  source_set("qs8-rsum_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-rsum/gen/qs8-rsum-scalar-u4.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -107603,15 +109163,14 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -      cflags = [ "-march=armv8.2-a+sve+sve2" ]
 +# 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-rsum_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-rsum/gen/qs8-rsum-scalar-u4.c"
 +    ]
  
 -      sources = [
@@ -107655,14 +109214,15 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -    source_set("pf32-igemm_arch=armv8.2-a+sve+sve2_standalone") {
 -      cflags = [ "-march=armv8.2-a+sve+sve2" ]
 +if (build_with_chromium) {
-+  source_set("qs8-rdsum_riscv64") {
++  source_set("qs8-vadd_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-vadd/gen/qs8-vadd-minmax-rvv-u2v.c"
 +    ]
  
 -      sources = [
@@ -107720,14 +109280,15 @@ Index: chromium-153.0.8010.36/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-vadd_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-vadd/gen/qs8-vadd-minmax-rvv-u2v.c"
 +    ]
  
 -      deps = [
@@ -107809,15 +109370,15 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("qs8-rsum_arch=rv64gcv-abi=lp64d") {
++  source_set("qs8-vadd_riscv64") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-rsum/gen/qs8-rsum-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"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -107873,15 +109434,15 @@ Index: chromium-153.0.8010.36/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("qs8-rsum_arch=rv64gcv-abi=lp64d_standalone") {
++  source_set("qs8-vadd_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-vadd/gen/qs8-vadd-minmax-scalar-u1.c",
++    "src/src/qs8-vadd/gen/qs8-vadd-minmax-scalar-u4.c"
 +    ]
  
 -      sources = [
@@ -107925,14 +109486,15 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -    source_set("qb4-packw_arch=armv8.2-a+dotprod_standalone") {
 -      cflags = [ "-march=armv8.2-a+dotprod" ]
 +if (build_with_chromium) {
-+  source_set("qs8-rsum_riscv64") {
++  source_set("qs8-vaddc_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-vaddc/gen/qs8-vaddc-minmax-rvv-u2v.c"
 +    ]
  
 -      sources = [
@@ -107990,14 +109552,15 @@ Index: chromium-153.0.8010.36/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-vaddc_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-vaddc/gen/qs8-vaddc-minmax-rvv-u2v.c"
 +    ]
  
 -      deps = [
@@ -108078,15 +109641,15 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("qs8-vadd_arch=rv64gcv-abi=lp64d") {
++  source_set("qs8-vaddc_riscv64") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vadd/gen/qs8-vadd-minmax-rvv-u2v.c"
++      "src/src/qs8-vaddc/gen/qs8-vaddc-minmax-scalar-u1.c",
++    "src/src/qs8-vaddc/gen/qs8-vaddc-minmax-scalar-u4.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -108141,15 +109704,15 @@ Index: chromium-153.0.8010.36/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_arch=rv64gcv-abi=lp64d_standalone") {
++  source_set("qs8-vaddc_riscv64_standalone") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vadd/gen/qs8-vadd-minmax-rvv-u2v.c"
++      "src/src/qs8-vaddc/gen/qs8-vaddc-minmax-scalar-u1.c",
++    "src/src/qs8-vaddc/gen/qs8-vaddc-minmax-scalar-u4.c"
 +    ]
  
 -      sources = [
@@ -108193,15 +109756,15 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -    source_set("qd8-bf16-qb4w-gemm_arm64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("qs8-vadd_riscv64") {
++  source_set("qs8-vcvt_arch=rv64gcv-abi=lp64d") {
 +    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-vcvt/gen/qs8-vcvt-rvv-u4v.c"
 +    ]
  
 -      sources = [
@@ -108259,15 +109822,15 @@ Index: chromium-153.0.8010.36/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-vadd_riscv64_standalone") {
++  source_set("qs8-vcvt_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-vcvt/gen/qs8-vcvt-rvv-u4v.c"
 +    ]
  
 -      deps = [
@@ -108348,15 +109911,14 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("qs8-vaddc_arch=rv64gcv-abi=lp64d") {
++  source_set("qs8-vcvt_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-vcvt/gen/qs8-vcvt-scalar-u4.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -108411,15 +109973,14 @@ Index: chromium-153.0.8010.36/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("qs8-vaddc_arch=rv64gcv-abi=lp64d_standalone") {
++  source_set("qs8-vcvt_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-vcvt/gen/qs8-vcvt-scalar-u4.c"
 +    ]
  
 -      sources = [
@@ -108463,15 +110024,15 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -    source_set("qd8-f16-qb4w-gemm_arch=armv8.2-a+i8mm+fp16_standalone") {
 -      cflags = [ "-march=armv8.2-a+i8mm+fp16" ]
 +if (build_with_chromium) {
-+  source_set("qs8-vaddc_riscv64") {
++  source_set("qs8-vlrelu_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-vlrelu/gen/qs8-vlrelu-rvv-u2v.c"
 +    ]
  
 -      sources = [
@@ -108530,15 +110091,15 @@ Index: chromium-153.0.8010.36/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_riscv64_standalone") {
++  source_set("qs8-vlrelu_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-vlrelu/gen/qs8-vlrelu-rvv-u2v.c"
 +    ]
  
 -      deps = [
@@ -108619,15 +110180,14 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("qs8-vcvt_arch=rv64gcv-abi=lp64d") {
++  source_set("qs8-vlrelu_riscv64") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vcvt/gen/qs8-vcvt-rvv-u4v.c"
++      "src/src/qs8-vlrelu/gen/qs8-vlrelu-scalar-andxor-u4.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -108681,15 +110241,14 @@ Index: chromium-153.0.8010.36/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("qs8-vcvt_arch=rv64gcv-abi=lp64d_standalone") {
++  source_set("qs8-vlrelu_riscv64_standalone") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vcvt/gen/qs8-vcvt-rvv-u4v.c"
++      "src/src/qs8-vlrelu/gen/qs8-vlrelu-scalar-andxor-u4.c"
 +    ]
  
 -      sources = [
@@ -108733,14 +110292,15 @@ Index: chromium-153.0.8010.36/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("qs8-vcvt_riscv64") {
++  source_set("qs8-vmul_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vcvt/gen/qs8-vcvt-scalar-u4.c"
++      "src/src/qs8-vmul/gen/qs8-vmul-minmax-f32-rvv-u2v.c"
 +    ]
  
 -      sources = [
@@ -108798,14 +110358,15 @@ Index: chromium-153.0.8010.36/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-vmul_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vcvt/gen/qs8-vcvt-scalar-u4.c"
++      "src/src/qs8-vmul/gen/qs8-vmul-minmax-f32-rvv-u2v.c"
 +    ]
  
 -      deps = [
@@ -108874,15 +110435,14 @@ Index: chromium-153.0.8010.36/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("qs8-vlrelu_arch=rv64gcv-abi=lp64d") {
++  source_set("qs8-vmul_riscv64") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vlrelu/gen/qs8-vlrelu-rvv-u2v.c"
++      "src/src/qs8-vmul/gen/qs8-vmul-minmax-fp32-scalar-u4.c"
 +    ]
  
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -108919,15 +110479,14 @@ Index: chromium-153.0.8010.36/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("qs8-vlrelu_arch=rv64gcv-abi=lp64d_standalone") {
++  source_set("qs8-vmul_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-vmul/gen/qs8-vmul-minmax-fp32-scalar-u4.c"
 +    ]
  
 -      sources = [
@@ -109003,14 +110562,15 @@ Index: chromium-153.0.8010.36/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("qs8-vlrelu_riscv64") {
++  source_set("qs8-vmulc_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-vmulc/gen/qs8-vmulc-minmax-f32-rvv-u2v.c"
 +    ]
  
 -      sources = [
@@ -109070,14 +110630,15 @@ Index: chromium-153.0.8010.36/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-vmulc_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-vmulc/gen/qs8-vmulc-minmax-f32-rvv-u2v.c"
 +    ]
  
 -      deps = [
@@ -109140,15 +110701,14 @@ Index: chromium-153.0.8010.36/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("qs8-vmul_arch=rv64gcv-abi=lp64d") {
++  source_set("qs8-vmulc_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-vmulc/gen/qs8-vmulc-minmax-fp32-scalar-u4.c"
 +    ]
  
 -      asmflags = cflags
@@ -109185,15 +110745,14 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -      ]
 +# 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-vmulc_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-vmulc/gen/qs8-vmulc-minmax-fp32-scalar-u4.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -109257,14 +110816,14 @@ Index: chromium-153.0.8010.36/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("qs8-vmul_riscv64") {
++  source_set("qs8-vprelu_riscv64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vmul/gen/qs8-vmul-minmax-fp32-scalar-u4.c"
++      "src/src/qs8-vprelu/gen/qs8-vprelu-scalar-u8.c"
 +    ]
  
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -109301,14 +110860,14 @@ Index: chromium-153.0.8010.36/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("qs8-vmul_riscv64_standalone") {
++  source_set("qs8-vprelu_riscv64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vmul/gen/qs8-vmul-minmax-fp32-scalar-u4.c"
++      "src/src/qs8-vprelu/gen/qs8-vprelu-scalar-u8.c"
 +    ]
  
 -      sources = [
@@ -109384,15 +110943,14 @@ Index: chromium-153.0.8010.36/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("qs8-vmulc_arch=rv64gcv-abi=lp64d") {
++  source_set("qs8-vpreluc_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-vpreluc/gen/qs8-vpreluc-scalar-u8.c"
 +    ]
  
 -      sources = [
@@ -109452,15 +111010,14 @@ Index: chromium-153.0.8010.36/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_arch=rv64gcv-abi=lp64d_standalone") {
++  source_set("qs8-vpreluc_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-vpreluc/gen/qs8-vpreluc-scalar-u8.c"
 +    ]
  
 -      deps = [
@@ -109523,14 +111080,14 @@ Index: chromium-153.0.8010.36/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("qs8-vmulc_riscv64") {
++  source_set("qs8-vrpreluc_riscv64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vmulc/gen/qs8-vmulc-minmax-fp32-scalar-u4.c"
++      "src/src/qs8-vrpreluc/gen/qs8-vrpreluc-scalar-u8.c"
 +    ]
  
 -      asmflags = cflags
@@ -109567,14 +111124,14 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -      ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qs8-vmulc_riscv64_standalone") {
++  source_set("qs8-vrpreluc_riscv64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vmulc/gen/qs8-vmulc-minmax-fp32-scalar-u4.c"
++      "src/src/qs8-vrpreluc/gen/qs8-vrpreluc-scalar-u8.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -109650,14 +111207,16 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("qs8-vprelu_riscv64") {
++  source_set("qu8-dwconv_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vprelu/gen/qs8-vprelu-scalar-u8.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"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -109712,14 +111271,16 @@ Index: chromium-153.0.8010.36/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("qs8-vprelu_riscv64_standalone") {
++  source_set("qu8-dwconv_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vprelu/gen/qs8-vprelu-scalar-u8.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 = [
@@ -109763,14 +111324,17 @@ Index: chromium-153.0.8010.36/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("qs8-vpreluc_riscv64") {
++  source_set("qu8-dwconv_riscv64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vpreluc/gen/qs8-vpreluc-scalar-u8.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 = [
@@ -109828,14 +111392,17 @@ Index: chromium-153.0.8010.36/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("qu8-dwconv_riscv64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vpreluc/gen/qs8-vpreluc-scalar-u8.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"
 +    ]
  
 -      deps = [
@@ -109918,14 +111485,15 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("qs8-vrpreluc_riscv64") {
++  source_set("qu8-f32-vcvt_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vrpreluc/gen/qs8-vrpreluc-scalar-u8.c"
++      "src/src/qu8-f32-vcvt/gen/qu8-f32-vcvt-rvv-u2v.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -109982,14 +111550,15 @@ Index: chromium-153.0.8010.36/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("qs8-vrpreluc_riscv64_standalone") {
++  source_set("qu8-f32-vcvt_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qs8-vrpreluc/gen/qs8-vrpreluc-scalar-u8.c"
++      "src/src/qu8-f32-vcvt/gen/qu8-f32-vcvt-rvv-u2v.c"
 +    ]
  
 -      sources = [
@@ -110034,16 +111603,14 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -    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-dwconv_arch=rv64gcv-abi=lp64d") {
++  source_set("qu8-f32-vcvt_riscv64") {
 +    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"
++      "src/src/qu8-f32-vcvt/gen/qu8-f32-vcvt-scalar-u4.c"
 +    ]
  
 -      sources = [
@@ -110092,16 +111659,14 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -      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") {
++  source_set("qu8-f32-vcvt_riscv64_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"
++      "src/src/qu8-f32-vcvt/gen/qu8-f32-vcvt-scalar-u4.c"
 +    ]
  
 -      sources = [
@@ -110144,17 +111709,16 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -    source_set("qd8-f32-qc2w-gemm_arm64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("qu8-dwconv_riscv64") {
++  source_set("qu8-gemm_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    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/qu8-gemm/gen/qu8-gemm-1x1v-minmax-fp32-rvv.c",
++    "src/src/qu8-gemm/gen/qu8-gemm-4x1v-minmax-fp32-rvv.c"
 +    ]
  
 -      sources = [
@@ -110211,17 +111775,16 @@ Index: chromium-153.0.8010.36/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-dwconv_riscv64_standalone") {
++  source_set("qu8-gemm_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    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/qu8-gemm/gen/qu8-gemm-1x1v-minmax-fp32-rvv.c",
++    "src/src/qu8-gemm/gen/qu8-gemm-4x1v-minmax-fp32-rvv.c"
 +    ]
  
 -      deps = [
@@ -110290,15 +111853,15 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -        "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-4x16c8-minmax-neoni8mm.c",
 -      ]
 +if (build_with_chromium) {
-+  source_set("qu8-f32-vcvt_arch=rv64gcv-abi=lp64d") {
++  source_set("qu8-gemm_riscv64") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-f32-vcvt/gen/qu8-f32-vcvt-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"
 +    ]
  
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -110335,15 +111898,15 @@ Index: chromium-153.0.8010.36/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-f32-vcvt_arch=rv64gcv-abi=lp64d_standalone") {
++  source_set("qu8-gemm_riscv64_standalone") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-f32-vcvt/gen/qu8-f32-vcvt-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 = [
@@ -110419,14 +111982,16 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -    source_set("qd8-f32-qc4w-gemm_arm64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("qu8-f32-vcvt_riscv64") {
++  source_set("qu8-igemm_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-f32-vcvt/gen/qu8-f32-vcvt-scalar-u4.c"
++      "src/src/qu8-igemm/gen/qu8-igemm-1x1v-minmax-fp32-rvv.c",
++    "src/src/qu8-igemm/gen/qu8-igemm-4x1v-minmax-fp32-rvv.c"
 +    ]
  
 -      sources = [
@@ -110476,14 +112041,16 @@ Index: chromium-153.0.8010.36/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-f32-vcvt_riscv64_standalone") {
++  source_set("qu8-igemm_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-f32-vcvt/gen/qu8-f32-vcvt-scalar-u4.c"
++      "src/src/qu8-igemm/gen/qu8-igemm-1x1v-minmax-fp32-rvv.c",
++    "src/src/qu8-igemm/gen/qu8-igemm-4x1v-minmax-fp32-rvv.c"
 +    ]
  
 -      sources = [
@@ -110561,16 +112128,15 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -    source_set("qd8-f32-qc8w-gemm_arch=armv8.2-a+fp16+dotprod") {
 -      cflags = [ "-march=armv8.2-a+fp16+dotprod" ]
 +if (build_with_chromium) {
-+  source_set("qu8-gemm_arch=rv64gcv-abi=lp64d") {
++  source_set("qu8-igemm_riscv64") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-gemm/gen/qu8-gemm-1x1v-minmax-fp32-rvv.c",
-+    "src/src/qu8-gemm/gen/qu8-gemm-4x1v-minmax-fp32-rvv.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"
 +    ]
  
 -      asmflags = cflags
@@ -110607,16 +112173,15 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -      ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qu8-gemm_arch=rv64gcv-abi=lp64d_standalone") {
++  source_set("qu8-igemm_riscv64_standalone") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-gemm/gen/qu8-gemm-1x1v-minmax-fp32-rvv.c",
-+    "src/src/qu8-gemm/gen/qu8-gemm-4x1v-minmax-fp32-rvv.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"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -110680,15 +112245,15 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -        "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-4x16c8-minmax-neoni8mm.c",
 -      ]
 +if (build_with_chromium) {
-+  source_set("qu8-gemm_riscv64") {
++  source_set("qu8-rdsum_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-rdsum/gen/qu8-rdsum-7p7x-rvv-u2v.c"
 +    ]
  
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -110725,15 +112290,15 @@ Index: chromium-153.0.8010.36/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-gemm_riscv64_standalone") {
++  source_set("qu8-rdsum_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-rdsum/gen/qu8-rdsum-7p7x-rvv-u2v.c"
 +    ]
  
 -      sources = [
@@ -110812,16 +112377,14 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -    source_set("qd8-f32-qc8w-gemm_arm64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("qu8-igemm_arch=rv64gcv-abi=lp64d") {
++  source_set("qu8-rdsum_riscv64") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-igemm/gen/qu8-igemm-1x1v-minmax-fp32-rvv.c",
-+    "src/src/qu8-igemm/gen/qu8-igemm-4x1v-minmax-fp32-rvv.c"
++      "src/src/qu8-rdsum/gen/qu8-rdsum-scalar.c"
 +    ]
  
 -      sources = [
@@ -110874,16 +112437,14 @@ Index: chromium-153.0.8010.36/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-igemm_arch=rv64gcv-abi=lp64d_standalone") {
++  source_set("qu8-rdsum_riscv64_standalone") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-igemm/gen/qu8-igemm-1x1v-minmax-fp32-rvv.c",
-+    "src/src/qu8-igemm/gen/qu8-igemm-4x1v-minmax-fp32-rvv.c"
++      "src/src/qu8-rdsum/gen/qu8-rdsum-scalar.c"
 +    ]
  
 -      sources = [
@@ -110961,15 +112522,15 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -    source_set("qd8-f32-qc8w-igemm_arch=armv8.2-a+fp16+dotprod") {
 -      cflags = [ "-march=armv8.2-a+fp16+dotprod" ]
 +if (build_with_chromium) {
-+  source_set("qu8-igemm_riscv64") {
++  source_set("qu8-rsum_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    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-rsum/gen/qu8-rsum-rvv-u2v.c"
 +    ]
  
 -      asmflags = cflags
@@ -111006,15 +112567,15 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -      ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qu8-igemm_riscv64_standalone") {
++  source_set("qu8-rsum_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    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-rsum/gen/qu8-rsum-rvv-u2v.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -111078,15 +112639,14 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -        "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-4x16c8-minmax-neoni8mm.c",
 -      ]
 +if (build_with_chromium) {
-+  source_set("qu8-rdsum_arch=rv64gcv-abi=lp64d") {
++  source_set("qu8-rsum_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-rsum/gen/qu8-rsum-scalar-u4.c"
 +    ]
  
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -111123,15 +112683,14 @@ Index: chromium-153.0.8010.36/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-rdsum_arch=rv64gcv-abi=lp64d_standalone") {
++  source_set("qu8-rsum_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-rsum/gen/qu8-rsum-scalar-u4.c"
 +    ]
  
 -      sources = [
@@ -111212,14 +112771,15 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -    source_set("qd8-f32-qc8w-igemm_arm64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("qu8-rdsum_riscv64") {
++  source_set("qu8-vadd_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-vadd/gen/qu8-vadd-minmax-rvv-u2v.c"
 +    ]
  
 -      sources = [
@@ -111260,8 +112820,8 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +    configs += [ ":xnnpack_private_config" ]
  
 -  if (build_with_chromium) {
--    source_set("qp8-f32-qb4w-gemm_arch=armv8.2-a+dotprod") {
--      cflags = [ "-march=armv8.2-a+dotprod" ]
+-    source_set("qp8-f16-qc8w-gemm_arch=armv8.2-a+sve+sve2") {
+-      cflags = [ "-march=armv8.2-a+sve+sve2" ]
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
@@ -111271,9 +112831,8 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/qp8-f32-qb4w-gemm/qp8-f32-qb4w-gemm-minmax-1x4c16s2-aarch64-neondot.c",
--        "src/src/qp8-f32-qb4w-gemm/qp8-f32-qb4w-gemm-minmax-1x4c8s2-aarch64-neondot.c",
--        "src/src/qp8-f32-qb4w-gemm/qp8-f32-qb4w-gemm-minmax-4x4c8s2-aarch64-neondot.c",
+-        "src/src/qp8-f16-qc8w-gemm/qp8-f16-qc8w-gemm-minmax-16x64c4-neonsme2.c",
+-        "src/src/qp8-f16-qc8w-gemm/qp8-f16-qc8w-gemm-minmax-1x64c4-neonsme2.c",
 -      ]
 +    public_configs = [ ":xnnpack_public_config" ]
 +  }
@@ -111285,14 +112844,15 @@ Index: chromium-153.0.8010.36/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-vadd_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-vadd/gen/qu8-vadd-minmax-rvv-u2v.c"
 +    ]
  
 -      deps = [
@@ -111318,15 +112878,14 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
--    source_set("qp8-f32-qb4w-gemm_arch=armv8.2-a+dotprod_standalone") {
--      cflags = [ "-march=armv8.2-a+dotprod" ]
+-    source_set("qp8-f16-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/qp8-f32-qb4w-gemm/qp8-f32-qb4w-gemm-minmax-1x4c16s2-aarch64-neondot.c",
--        "src/src/qp8-f32-qb4w-gemm/qp8-f32-qb4w-gemm-minmax-1x4c8s2-aarch64-neondot.c",
--        "src/src/qp8-f32-qb4w-gemm/qp8-f32-qb4w-gemm-minmax-4x4c8s2-aarch64-neondot.c",
+-        "src/src/qp8-f16-qc8w-gemm/qp8-f16-qc8w-gemm-minmax-16x64c4-neonsme2.c",
+-        "src/src/qp8-f16-qc8w-gemm/qp8-f16-qc8w-gemm-minmax-1x64c4-neonsme2.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -111353,12 +112912,14 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +}
  
 -  if (build_with_chromium) {
--    source_set("qp8-f32-qb4w-gemm_arch=armv8.2-a+i8mm+fp16") {
--      cflags = [ "-march=armv8.2-a+i8mm+fp16" ]
+-    source_set("qp8-f32-qb4w-gemm_arch=armv8.2-a+dotprod") {
+-      cflags = [ "-march=armv8.2-a+dotprod" ]
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/qp8-f32-qb4w-gemm/qp8-f32-qb4w-gemm-minmax-16x4c16s2-mstep4-neoni8mm.c",
+-        "src/src/qp8-f32-qb4w-gemm/qp8-f32-qb4w-gemm-minmax-1x4c16s2-aarch64-neondot.c",
+-        "src/src/qp8-f32-qb4w-gemm/qp8-f32-qb4w-gemm-minmax-1x4c8s2-aarch64-neondot.c",
+-        "src/src/qp8-f32-qb4w-gemm/qp8-f32-qb4w-gemm-minmax-4x4c8s2-aarch64-neondot.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -111373,15 +112934,15 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("qu8-rsum_arch=rv64gcv-abi=lp64d") {
++  source_set("qu8-vadd_riscv64") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-rsum/gen/qu8-rsum-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"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -111394,8 +112955,8 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
--    source_set("qp8-f32-qb4w-gemm_arch=armv8.2-a+i8mm+fp16_standalone") {
--      cflags = [ "-march=armv8.2-a+i8mm+fp16" ]
+-    source_set("qp8-f32-qb4w-gemm_arch=armv8.2-a+dotprod_standalone") {
+-      cflags = [ "-march=armv8.2-a+dotprod" ]
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
@@ -111405,7 +112966,9 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/qp8-f32-qb4w-gemm/qp8-f32-qb4w-gemm-minmax-16x4c16s2-mstep4-neoni8mm.c",
+-        "src/src/qp8-f32-qb4w-gemm/qp8-f32-qb4w-gemm-minmax-1x4c16s2-aarch64-neondot.c",
+-        "src/src/qp8-f32-qb4w-gemm/qp8-f32-qb4w-gemm-minmax-1x4c8s2-aarch64-neondot.c",
+-        "src/src/qp8-f32-qb4w-gemm/qp8-f32-qb4w-gemm-minmax-4x4c8s2-aarch64-neondot.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -111431,26 +112994,24 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +}
  
 -  if (build_with_chromium) {
--    source_set("qp8-f32-qc4w-gemm_arch=armv8.2-a+dotprod") {
--      cflags = [ "-march=armv8.2-a+dotprod" ]
+-    source_set("qp8-f32-qb4w-gemm_arch=armv8.2-a+i8mm+fp16") {
+-      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-vadd_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-vadd/gen/qu8-vadd-minmax-scalar-u1.c",
++    "src/src/qu8-vadd/gen/qu8-vadd-minmax-scalar-u4.c"
 +    ]
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/qp8-f32-qc4w-gemm/qp8-f32-qc4w-gemm-minmax-16x4c8s2-mstep4-aarch64-neondot.c",
--        "src/src/qp8-f32-qc4w-gemm/qp8-f32-qc4w-gemm-minmax-1x4c8s2-aarch64-neondot.c",
--        "src/src/qp8-f32-qc4w-gemm/qp8-f32-qc4w-gemm-minmax-1x8c16s2-aarch64-neondot.c",
+-        "src/src/qp8-f32-qb4w-gemm/qp8-f32-qb4w-gemm-minmax-16x4c16s2-mstep4-neoni8mm.c",
 -      ]
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
@@ -111485,24 +113046,23 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
--    source_set("qp8-f32-qc4w-gemm_arch=armv8.2-a+dotprod_standalone") {
--      cflags = [ "-march=armv8.2-a+dotprod" ]
+-    source_set("qp8-f32-qb4w-gemm_arch=armv8.2-a+i8mm+fp16_standalone") {
+-      cflags = [ "-march=armv8.2-a+i8mm+fp16" ]
 +if (build_with_chromium) {
-+  source_set("qu8-rsum_riscv64") {
++  source_set("qu8-vaddc_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-vaddc/gen/qu8-vaddc-minmax-rvv-u2v.c"
 +    ]
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/qp8-f32-qc4w-gemm/qp8-f32-qc4w-gemm-minmax-16x4c8s2-mstep4-aarch64-neondot.c",
--        "src/src/qp8-f32-qc4w-gemm/qp8-f32-qc4w-gemm-minmax-1x4c8s2-aarch64-neondot.c",
--        "src/src/qp8-f32-qc4w-gemm/qp8-f32-qc4w-gemm-minmax-1x8c16s2-aarch64-neondot.c",
+-        "src/src/qp8-f32-qb4w-gemm/qp8-f32-qb4w-gemm-minmax-16x4c16s2-mstep4-neoni8mm.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -111530,8 +113090,8 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +    configs += [ ":xnnpack_private_config" ]
  
 -  if (build_with_chromium) {
--    source_set("qp8-f32-qc4w-gemm_arch=armv8.2-a+i8mm+fp16") {
--      cflags = [ "-march=armv8.2-a+i8mm+fp16" ]
+-    source_set("qp8-f32-qc4w-gemm_arch=armv8.2-a+dotprod") {
+-      cflags = [ "-march=armv8.2-a+dotprod" ]
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
@@ -111541,7 +113101,9 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/qp8-f32-qc4w-gemm/qp8-f32-qc4w-gemm-minmax-8x8c16s2-mstep2-neoni8mm.c",
+-        "src/src/qp8-f32-qc4w-gemm/qp8-f32-qc4w-gemm-minmax-16x4c8s2-mstep4-aarch64-neondot.c",
+-        "src/src/qp8-f32-qc4w-gemm/qp8-f32-qc4w-gemm-minmax-1x4c8s2-aarch64-neondot.c",
+-        "src/src/qp8-f32-qc4w-gemm/qp8-f32-qc4w-gemm-minmax-1x8c16s2-aarch64-neondot.c",
 -      ]
 +    public_configs = [ ":xnnpack_public_config" ]
 +  }
@@ -111553,14 +113115,15 @@ Index: chromium-153.0.8010.36/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-vaddc_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-vaddc/gen/qu8-vaddc-minmax-rvv-u2v.c"
 +    ]
  
 -      deps = [
@@ -111586,13 +113149,15 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
--    source_set("qp8-f32-qc4w-gemm_arch=armv8.2-a+i8mm+fp16_standalone") {
--      cflags = [ "-march=armv8.2-a+i8mm+fp16" ]
+-    source_set("qp8-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/qp8-f32-qc4w-gemm/qp8-f32-qc4w-gemm-minmax-8x8c16s2-mstep2-neoni8mm.c",
+-        "src/src/qp8-f32-qc4w-gemm/qp8-f32-qc4w-gemm-minmax-16x4c8s2-mstep4-aarch64-neondot.c",
+-        "src/src/qp8-f32-qc4w-gemm/qp8-f32-qc4w-gemm-minmax-1x4c8s2-aarch64-neondot.c",
+-        "src/src/qp8-f32-qc4w-gemm/qp8-f32-qc4w-gemm-minmax-1x8c16s2-aarch64-neondot.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -111619,52 +113184,40 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +}
  
 -  if (build_with_chromium) {
--    source_set("qp8-f32-qc4w-gemm_arch=armv8.2-a+sve+sve2") {
--      cflags = [ "-march=armv8.2-a+sve+sve2" ]
+-    source_set("qp8-f32-qc4w-gemm_arch=armv8.2-a+i8mm+fp16") {
+-      cflags = [ "-march=armv8.2-a+i8mm+fp16" ]
 -
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/qp8-f32-qc4w-gemm/qp8-f32-qc4w-gemm-minmax-16x64c4-neonsme.c",
--        "src/src/qp8-f32-qc4w-gemm/qp8-f32-qc4w-gemm-minmax-16x64c4-neonsme2.c",
--        "src/src/qp8-f32-qc4w-gemm/qp8-f32-qc4w-gemm-minmax-1x64c4-neonsme.c",
--        "src/src/qp8-f32-qc4w-gemm/qp8-f32-qc4w-gemm-minmax-1x64c4-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",
+-        "src/src/qp8-f32-qc4w-gemm/qp8-f32-qc4w-gemm-minmax-8x8c16s2-mstep2-neoni8mm.c",
 -      ]
 +if (build_with_chromium) {
-+  source_set("qu8-vadd_arch=rv64gcv-abi=lp64d") {
++  source_set("qu8-vaddc_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-vaddc/gen/qu8-vaddc-minmax-scalar-u1.c",
++    "src/src/qu8-vaddc/gen/qu8-vaddc-minmax-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" ]
 +    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("qp8-f32-qc4w-gemm_arch=armv8.2-a+sve+sve2_standalone") {
--      cflags = [ "-march=armv8.2-a+sve+sve2" ]
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/fp16",
+-        "//third_party/fxdiv",
+-        "//third_party/pthreadpool",
+-      ]
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
@@ -111672,12 +113225,32 @@ Index: chromium-153.0.8010.36/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("qp8-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-vaddc_riscv64_standalone") {
++    cflags = [
++  
++    ]
++  
++    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"
++    ]
+ 
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/qp8-f32-qc4w-gemm/qp8-f32-qc4w-gemm-minmax-16x64c4-neonsme.c",
--        "src/src/qp8-f32-qc4w-gemm/qp8-f32-qc4w-gemm-minmax-16x64c4-neonsme2.c",
--        "src/src/qp8-f32-qc4w-gemm/qp8-f32-qc4w-gemm-minmax-1x64c4-neonsme.c",
--        "src/src/qp8-f32-qc4w-gemm/qp8-f32-qc4w-gemm-minmax-1x64c4-neonsme2.c",
+-        "src/src/qp8-f32-qc4w-gemm/qp8-f32-qc4w-gemm-minmax-8x8c16s2-mstep2-neoni8mm.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -111698,41 +113271,15 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -        assert_no_deps = [ "//base" ]
 -      }
 -    }
-+    public_configs = [ ":xnnpack_public_config" ]
-   }
-+}
- 
--  if (build_with_chromium) {
--    source_set("qp8-f32-qc8w-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-vadd_arch=rv64gcv-abi=lp64d_standalone") {
-+    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/qu8-vadd/gen/qu8-vadd-minmax-rvv-u2v.c"
-+    ]
- 
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qp8-f32-qc8w-gemm/qp8-f32-qc8w-gemm-minmax-16x4c4-mstep4-aarch64-neondot.c",
--        "src/src/qp8-f32-qc8w-gemm/qp8-f32-qc8w-gemm-minmax-1x4c4-aarch64-neondot.c",
--        "src/src/qp8-f32-qc8w-gemm/qp8-f32-qc8w-gemm-minmax-1x4c8-aarch64-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" ]
  
--      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("qp8-f32-qc4w-gemm_arch=armv8.2-a+sve+sve2") {
+-      cflags = [ "-march=armv8.2-a+sve+sve2" ]
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
@@ -111740,6 +113287,19 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +      "//third_party/pthreadpool:pthreadpool_standalone",
 +    ]
  
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qp8-f32-qc4w-gemm/qp8-f32-qc4w-gemm-minmax-16x64c4-neonsme.c",
+-        "src/src/qp8-f32-qc4w-gemm/qp8-f32-qc4w-gemm-minmax-16x64c4-neonsme2.c",
+-        "src/src/qp8-f32-qc4w-gemm/qp8-f32-qc4w-gemm-minmax-1x64c4-neonsme.c",
+-        "src/src/qp8-f32-qc4w-gemm/qp8-f32-qc4w-gemm-minmax-1x64c4-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",
@@ -111757,25 +113317,26 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
--    source_set("qp8-f32-qc8w-gemm_arch=armv8.2-a+dotprod_standalone") {
--      cflags = [ "-march=armv8.2-a+dotprod" ]
+-    source_set("qp8-f32-qc4w-gemm_arch=armv8.2-a+sve+sve2_standalone") {
+-      cflags = [ "-march=armv8.2-a+sve+sve2" ]
 +if (build_with_chromium) {
-+  source_set("qu8-vadd_riscv64") {
++  source_set("qu8-vcvt_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-vcvt/gen/qu8-vcvt-rvv-u4v.c"
 +    ]
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/qp8-f32-qc8w-gemm/qp8-f32-qc8w-gemm-minmax-16x4c4-mstep4-aarch64-neondot.c",
--        "src/src/qp8-f32-qc8w-gemm/qp8-f32-qc8w-gemm-minmax-1x4c4-aarch64-neondot.c",
--        "src/src/qp8-f32-qc8w-gemm/qp8-f32-qc8w-gemm-minmax-1x4c8-aarch64-neondot.c",
+-        "src/src/qp8-f32-qc4w-gemm/qp8-f32-qc4w-gemm-minmax-16x64c4-neonsme.c",
+-        "src/src/qp8-f32-qc4w-gemm/qp8-f32-qc4w-gemm-minmax-16x64c4-neonsme2.c",
+-        "src/src/qp8-f32-qc4w-gemm/qp8-f32-qc4w-gemm-minmax-1x64c4-neonsme.c",
+-        "src/src/qp8-f32-qc4w-gemm/qp8-f32-qc4w-gemm-minmax-1x64c4-neonsme2.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -111803,8 +113364,8 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +    configs += [ ":xnnpack_private_config" ]
  
 -  if (build_with_chromium) {
--    source_set("qp8-f32-qc8w-gemm_arch=armv8.2-a+i8mm+fp16") {
--      cflags = [ "-march=armv8.2-a+i8mm+fp16" ]
+-    source_set("qp8-f32-qc8w-gemm_arch=armv8.2-a+dotprod") {
+-      cflags = [ "-march=armv8.2-a+dotprod" ]
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
@@ -111814,7 +113375,9 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/qp8-f32-qc8w-gemm/qp8-f32-qc8w-gemm-minmax-16x4c8-mstep4-neoni8mm.c",
+-        "src/src/qp8-f32-qc8w-gemm/qp8-f32-qc8w-gemm-minmax-16x4c4-mstep4-aarch64-neondot.c",
+-        "src/src/qp8-f32-qc8w-gemm/qp8-f32-qc8w-gemm-minmax-1x4c4-aarch64-neondot.c",
+-        "src/src/qp8-f32-qc8w-gemm/qp8-f32-qc8w-gemm-minmax-1x4c8-aarch64-neondot.c",
 -      ]
 +    public_configs = [ ":xnnpack_public_config" ]
 +  }
@@ -111826,15 +113389,15 @@ Index: chromium-153.0.8010.36/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-vadd_riscv64_standalone") {
++  source_set("qu8-vcvt_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-vcvt/gen/qu8-vcvt-rvv-u4v.c"
 +    ]
  
 -      deps = [
@@ -111860,13 +113423,15 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
--    source_set("qp8-f32-qc8w-gemm_arch=armv8.2-a+i8mm+fp16_standalone") {
--      cflags = [ "-march=armv8.2-a+i8mm+fp16" ]
+-    source_set("qp8-f32-qc8w-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/qp8-f32-qc8w-gemm/qp8-f32-qc8w-gemm-minmax-16x4c8-mstep4-neoni8mm.c",
+-        "src/src/qp8-f32-qc8w-gemm/qp8-f32-qc8w-gemm-minmax-16x4c4-mstep4-aarch64-neondot.c",
+-        "src/src/qp8-f32-qc8w-gemm/qp8-f32-qc8w-gemm-minmax-1x4c4-aarch64-neondot.c",
+-        "src/src/qp8-f32-qc8w-gemm/qp8-f32-qc8w-gemm-minmax-1x4c8-aarch64-neondot.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -111893,18 +113458,95 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +}
  
 -  if (build_with_chromium) {
+-    source_set("qp8-f32-qc8w-gemm_arch=armv8.2-a+i8mm+fp16") {
+-      cflags = [ "-march=armv8.2-a+i8mm+fp16" ]
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qp8-f32-qc8w-gemm/qp8-f32-qc8w-gemm-minmax-16x4c8-mstep4-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-vcvt_riscv64") {
++    cflags = [
++  
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/qu8-vcvt/gen/qu8-vcvt-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("qp8-f32-qc8w-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/qp8-f32-qc8w-gemm/qp8-f32-qc8w-gemm-minmax-16x4c8-mstep4-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" ]
+   }
++}
+ 
+-  if (build_with_chromium) {
 -    source_set("qp8-f32-qc8w-gemm_arch=armv8.2-a+sve+sve2") {
 -      cflags = [ "-march=armv8.2-a+sve+sve2" ]
-+if (build_with_chromium) {
-+  source_set("qu8-vaddc_arch=rv64gcv-abi=lp64d") {
++# This is a target that cannot depend on //base.
++if (build_with_internal_optimization_guide) {
++  source_set("qu8-vcvt_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-vcvt/gen/qu8-vcvt-scalar-u4.c"
 +    ]
  
 -      sources = [
@@ -111933,33 +113575,19 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
  
 -      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" ]
-   }
-+}
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
 -    source_set("qp8-f32-qc8w-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-vaddc_arch=rv64gcv-abi=lp64d_standalone") {
-+    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/qu8-vaddc/gen/qu8-vaddc-minmax-rvv-u2v.c"
-+    ]
++    public_configs = [ ":xnnpack_public_config" ]
  
 -      sources = [
 -        "src/include/xnnpack.h",
@@ -111986,23 +113614,16 @@ Index: chromium-153.0.8010.36/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 (!(is_android && use_order_profiling)) {
++      assert_no_deps = [ "//base" ]
+     }
+   }
++}
  
 -  if (build_with_chromium) {
 -    source_set("qs8-dwconv_arm64") {
 -      cflags = []
-+    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-25p16c-minmax-rndnu-neon-mla8-ld64.c",
@@ -112025,29 +113646,35 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -        "//third_party/fxdiv",
 -        "//third_party/pthreadpool",
 -      ]
-+    public_configs = [ ":xnnpack_public_config" ]
++if (build_with_chromium) {
++  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-rvv-u2v.c"
++    ]
  
 -      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" ]
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
 -    source_set("qs8-dwconv_arm64_standalone") {
 -      cflags = []
-+if (build_with_chromium) {
-+  source_set("qu8-vaddc_riscv64") {
-+    cflags = [
-+  
-+    ]
-+  
-+    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"
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool",
 +    ]
  
 -      sources = [
@@ -112079,18 +113706,6 @@ Index: chromium-153.0.8010.36/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" ]
    }
 +}
@@ -112100,15 +113715,15 @@ Index: chromium-153.0.8010.36/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("qu8-vaddc_riscv64_standalone") {
++  source_set("qu8-vlrelu_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-vlrelu/gen/qu8-vlrelu-rvv-u2v.c"
 +    ]
  
 -      sources = [
@@ -112151,15 +113766,14 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -    source_set("qs8-f16-vcvt_arch=armv8.2-a+fp16_standalone") {
 -      cflags = [ "-march=armv8.2-a+fp16" ]
 +if (build_with_chromium) {
-+  source_set("qu8-vcvt_arch=rv64gcv-abi=lp64d") {
++  source_set("qu8-vlrelu_riscv64") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vcvt/gen/qu8-vcvt-rvv-u4v.c"
++      "src/src/qu8-vlrelu/gen/qu8-vlrelu-scalar-andxor-u4.c"
 +    ]
  
 -      sources = [
@@ -112216,15 +113830,14 @@ Index: chromium-153.0.8010.36/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-vcvt_arch=rv64gcv-abi=lp64d_standalone") {
++  source_set("qu8-vlrelu_riscv64_standalone") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vcvt/gen/qu8-vcvt-rvv-u4v.c"
++      "src/src/qu8-vlrelu/gen/qu8-vlrelu-scalar-andxor-u4.c"
 +    ]
  
 -      deps = [
@@ -112293,14 +113906,15 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -        "src/src/qs8-packw/gen/qs8-packw-x8c4-gemm-goi-neondot.c",
 -      ]
 +if (build_with_chromium) {
-+  source_set("qu8-vcvt_riscv64") {
++  source_set("qu8-vmul_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vcvt/gen/qu8-vcvt-scalar-u4.c"
++      "src/src/qu8-vmul/gen/qu8-vmul-minmax-f32-rvv-u2v.c"
 +    ]
  
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -112337,14 +113951,15 @@ Index: chromium-153.0.8010.36/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-vmul_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vcvt/gen/qu8-vcvt-scalar-u4.c"
++      "src/src/qu8-vmul/gen/qu8-vmul-minmax-f32-rvv-u2v.c"
 +    ]
  
 -      sources = [
@@ -112423,15 +114038,14 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -    source_set("qs8-packw_arm64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("qu8-vlrelu_arch=rv64gcv-abi=lp64d") {
++  source_set("qu8-vmul_riscv64") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vlrelu/gen/qu8-vlrelu-rvv-u2v.c"
++      "src/src/qu8-vmul/gen/qu8-vmul-minmax-fp32-scalar-u4.c"
 +    ]
  
 -      sources = [
@@ -112494,15 +114108,14 @@ Index: chromium-153.0.8010.36/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-vmul_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-vmul/gen/qu8-vmul-minmax-fp32-scalar-u4.c"
 +    ]
  
 -      deps = [
@@ -112585,14 +114198,15 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("qu8-vlrelu_riscv64") {
++  source_set("qu8-vmulc_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-vmulc/gen/qu8-vmulc-minmax-f32-rvv-u2v.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -112651,14 +114265,15 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -      asmflags = cflags
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qu8-vlrelu_riscv64_standalone") {
++  source_set("qu8-vmulc_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-vmulc/gen/qu8-vmulc-minmax-f32-rvv-u2v.c"
 +    ]
  
 -      sources = [
@@ -112704,15 +114319,14 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -
 -      asmflags = cflags
 +if (build_with_chromium) {
-+  source_set("qu8-vmul_arch=rv64gcv-abi=lp64d") {
++  source_set("qu8-vmulc_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-vmulc/gen/qu8-vmulc-minmax-fp32-scalar-u4.c"
 +    ]
  
 -      sources = [
@@ -112770,15 +114384,14 @@ Index: chromium-153.0.8010.36/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-vmulc_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-vmulc/gen/qu8-vmulc-minmax-fp32-scalar-u4.c"
 +    ]
  
 -      deps = [
@@ -112847,14 +114460,14 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -        "src/src/qs8-qc4w-packw/gen/qs8-to-qu8-qc4uw-packw-x16c8-gemm-goi-scalar.c",
 -      ]
 +if (build_with_chromium) {
-+  source_set("qu8-vmul_riscv64") {
++  source_set("qu8-vprelu_riscv64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vmul/gen/qu8-vmul-minmax-fp32-scalar-u4.c"
++      "src/src/qu8-vprelu/gen/qu8-vprelu-scalar-u8.c"
 +    ]
  
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -112891,14 +114504,14 @@ Index: chromium-153.0.8010.36/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_riscv64_standalone") {
++  source_set("qu8-vprelu_riscv64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vmul/gen/qu8-vmul-minmax-fp32-scalar-u4.c"
++      "src/src/qu8-vprelu/gen/qu8-vprelu-scalar-u8.c"
 +    ]
  
 -      sources = [
@@ -113022,15 +114635,14 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("qu8-vmulc_arch=rv64gcv-abi=lp64d") {
++  source_set("qu8-vpreluc_riscv64") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vmulc/gen/qu8-vmulc-minmax-f32-rvv-u2v.c"
++      "src/src/qu8-vpreluc/gen/qu8-vpreluc-scalar-u8.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -113107,15 +114719,14 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -  }
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qu8-vmulc_arch=rv64gcv-abi=lp64d_standalone") {
++  source_set("qu8-vpreluc_riscv64_standalone") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vmulc/gen/qu8-vmulc-minmax-f32-rvv-u2v.c"
++      "src/src/qu8-vpreluc/gen/qu8-vpreluc-scalar-u8.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -113173,14 +114784,14 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -    source_set("qs8-qc8w-gemm_arch=armv8.2-a+fp16+dotprod_standalone") {
 -      cflags = [ "-march=armv8.2-a+fp16+dotprod" ]
 +if (build_with_chromium) {
-+  source_set("qu8-vmulc_riscv64") {
++  source_set("qu8-vrpreluc_riscv64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vmulc/gen/qu8-vmulc-minmax-fp32-scalar-u4.c"
++      "src/src/qu8-vrpreluc/gen/qu8-vrpreluc-scalar-u8.c"
 +    ]
 +
 +    configs -= [ "//build/config/compiler:chromium_code" ]
@@ -113237,14 +114848,14 @@ Index: chromium-153.0.8010.36/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-vmulc_riscv64_standalone") {
++  source_set("qu8-vrpreluc_riscv64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vmulc/gen/qu8-vmulc-minmax-fp32-scalar-u4.c"
++      "src/src/qu8-vrpreluc/gen/qu8-vrpreluc-scalar-u8.c"
 +    ]
  
 -      sources = [
@@ -113314,14 +114925,16 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("qu8-vprelu_riscv64") {
++  source_set("reference_riscv64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vprelu/gen/qu8-vprelu-scalar-u8.c"
++      "src/src/reference/binary-elementwise.cc",
++    "src/src/reference/packing.cc",
++    "src/src/reference/unary-elementwise.cc"
 +    ]
  
 -  if (build_with_chromium) {
@@ -113373,14 +114986,16 @@ Index: chromium-153.0.8010.36/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_riscv64_standalone") {
++  source_set("reference_riscv64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vprelu/gen/qu8-vprelu-scalar-u8.c"
++      "src/src/reference/binary-elementwise.cc",
++    "src/src/reference/packing.cc",
++    "src/src/reference/unary-elementwise.cc"
 +    ]
  
 -      sources = [
@@ -113461,14 +115076,14 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -    source_set("qs8-qc8w-igemm_arch=armv8.2-a+dotprod_standalone") {
 -      cflags = [ "-march=armv8.2-a+dotprod" ]
 +if (build_with_chromium) {
-+  source_set("qu8-vpreluc_riscv64") {
++  source_set("s8-ibilinear_riscv64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vpreluc/gen/qu8-vpreluc-scalar-u8.c"
++      "src/src/s8-ibilinear/gen/s8-ibilinear-scalar-u1.c"
 +    ]
  
 -      sources = [
@@ -113545,14 +115160,14 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -      ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("qu8-vpreluc_riscv64_standalone") {
++  source_set("s8-ibilinear_riscv64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vpreluc/gen/qu8-vpreluc-scalar-u8.c"
++      "src/src/s8-ibilinear/gen/s8-ibilinear-scalar-u1.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -113624,14 +115239,15 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -        "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-4x16c8-minmax-fp32-neoni8mm.c",
 -      ]
 +if (build_with_chromium) {
-+  source_set("qu8-vrpreluc_riscv64") {
++  source_set("s8-maxpool_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vrpreluc/gen/qu8-vrpreluc-scalar-u8.c"
++      "src/src/s8-maxpool/gen/s8-maxpool-9p-minmax-rvv-u2v.c"
 +    ]
  
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -113668,14 +115284,15 @@ Index: chromium-153.0.8010.36/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-vrpreluc_riscv64_standalone") {
++  source_set("s8-maxpool_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/qu8-vrpreluc/gen/qu8-vrpreluc-scalar-u8.c"
++      "src/src/s8-maxpool/gen/s8-maxpool-9p-minmax-rvv-u2v.c"
 +    ]
  
 -      sources = [
@@ -113754,16 +115371,14 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -    source_set("qs8-qc8w-igemm_arm64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("reference_riscv64") {
++  source_set("s8-maxpool_riscv64") {
 +    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/s8-maxpool/gen/s8-maxpool-9p-minmax-scalar-u1.c"
 +    ]
  
 -      sources = [
@@ -113826,16 +115441,14 @@ Index: chromium-153.0.8010.36/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("reference_riscv64_standalone") {
++  source_set("s8-maxpool_riscv64_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/s8-maxpool/gen/s8-maxpool-9p-minmax-scalar-u1.c"
 +    ]
  
 -      deps = [
@@ -113916,14 +115529,16 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("s8-ibilinear_riscv64") {
++  source_set("s8-rdminmax_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/s8-ibilinear/gen/s8-ibilinear-scalar-u1.c"
++      "src/src/s8-rdminmax/gen/s8-rdmax-2p2x-rvv-u8v.c",
++    "src/src/s8-rdminmax/gen/s8-rdmin-2p2x-rvv-u8v.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -113978,14 +115593,16 @@ Index: chromium-153.0.8010.36/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("s8-ibilinear_riscv64_standalone") {
++  source_set("s8-rdminmax_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/s8-ibilinear/gen/s8-ibilinear-scalar-u1.c"
++      "src/src/s8-rdminmax/gen/s8-rdmax-2p2x-rvv-u8v.c",
++    "src/src/s8-rdminmax/gen/s8-rdmin-2p2x-rvv-u8v.c"
 +    ]
  
 -      sources = [
@@ -114028,15 +115645,15 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -    source_set("qs8-rsum_arch=armv8.2-a+dotprod_standalone") {
 -      cflags = [ "-march=armv8.2-a+dotprod" ]
 +if (build_with_chromium) {
-+  source_set("s8-maxpool_arch=rv64gcv-abi=lp64d") {
++  source_set("s8-rdminmax_riscv64") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/s8-maxpool/gen/s8-maxpool-9p-minmax-rvv-u2v.c"
++      "src/src/s8-rdminmax/gen/s8-rdmax-2p2x-scalar-u2.c",
++    "src/src/s8-rdminmax/gen/s8-rdmin-2p2x-scalar-u2.c"
 +    ]
  
 -      sources = [
@@ -114093,15 +115710,15 @@ Index: chromium-153.0.8010.36/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("s8-maxpool_arch=rv64gcv-abi=lp64d_standalone") {
++  source_set("s8-rdminmax_riscv64_standalone") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/s8-maxpool/gen/s8-maxpool-9p-minmax-rvv-u2v.c"
++      "src/src/s8-rdminmax/gen/s8-rdmax-2p2x-scalar-u2.c",
++    "src/src/s8-rdminmax/gen/s8-rdmin-2p2x-scalar-u2.c"
 +    ]
  
 -      deps = [
@@ -114184,14 +115801,17 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("s8-maxpool_riscv64") {
++  source_set("s8-rminmax_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/s8-maxpool/gen/s8-maxpool-9p-minmax-scalar-u1.c"
++      "src/src/s8-rminmax/gen/s8-rmax-rvv-u8v.c",
++    "src/src/s8-rminmax/gen/s8-rmin-rvv-u8v.c",
++    "src/src/s8-rminmax/gen/s8-rminmax-rvv-u8v.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -114248,14 +115868,17 @@ Index: chromium-153.0.8010.36/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_riscv64_standalone") {
++  source_set("s8-rminmax_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/s8-maxpool/gen/s8-maxpool-9p-minmax-scalar-u1.c"
++      "src/src/s8-rminmax/gen/s8-rmax-rvv-u8v.c",
++    "src/src/s8-rminmax/gen/s8-rmin-rvv-u8v.c",
++    "src/src/s8-rminmax/gen/s8-rminmax-rvv-u8v.c"
 +    ]
  
 -      sources = [
@@ -114351,16 +115974,16 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("s8-rdminmax_arch=rv64gcv-abi=lp64d") {
++  source_set("s8-rminmax_riscv64") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/s8-rdminmax/gen/s8-rdmax-2p2x-rvv-u8v.c",
-+    "src/src/s8-rdminmax/gen/s8-rdmin-2p2x-rvv-u8v.c"
++      "src/src/s8-rminmax/gen/s8-rmax-scalar-u2-acc2.c",
++    "src/src/s8-rminmax/gen/s8-rmin-scalar-u2-acc2.c",
++    "src/src/s8-rminmax/gen/s8-rminmax-scalar-u2-acc2.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -114415,16 +116038,16 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("s8-rdminmax_arch=rv64gcv-abi=lp64d_standalone") {
++  source_set("s8-rminmax_riscv64_standalone") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/s8-rdminmax/gen/s8-rdmax-2p2x-rvv-u8v.c",
-+    "src/src/s8-rdminmax/gen/s8-rdmin-2p2x-rvv-u8v.c"
++      "src/src/s8-rminmax/gen/s8-rmax-scalar-u2-acc2.c",
++    "src/src/s8-rminmax/gen/s8-rmin-scalar-u2-acc2.c",
++    "src/src/s8-rminmax/gen/s8-rminmax-scalar-u2-acc2.c"
 +    ]
  
 -      sources = [
@@ -114468,15 +116091,15 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -    source_set("qs8-vlrelu_arm64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("s8-rdminmax_riscv64") {
++  source_set("s8-vclamp_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/s8-rdminmax/gen/s8-rdmax-2p2x-scalar-u2.c",
-+    "src/src/s8-rdminmax/gen/s8-rdmin-2p2x-scalar-u2.c"
++      "src/src/s8-vclamp/gen/s8-vclamp-rvv-u4v.c"
 +    ]
  
 -      sources = [
@@ -114534,15 +116157,15 @@ Index: chromium-153.0.8010.36/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("s8-rdminmax_riscv64_standalone") {
++  source_set("s8-vclamp_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/s8-rdminmax/gen/s8-rdmax-2p2x-scalar-u2.c",
-+    "src/src/s8-rdminmax/gen/s8-rdmin-2p2x-scalar-u2.c"
++      "src/src/s8-vclamp/gen/s8-vclamp-rvv-u4v.c"
 +    ]
  
 -      deps = [
@@ -114623,17 +116246,14 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("s8-rminmax_arch=rv64gcv-abi=lp64d") {
++  source_set("s8-vclamp_riscv64") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/s8-rminmax/gen/s8-rmax-rvv-u8v.c",
-+    "src/src/s8-rminmax/gen/s8-rmin-rvv-u8v.c",
-+    "src/src/s8-rminmax/gen/s8-rminmax-rvv-u8v.c"
++      "src/src/s8-vclamp/s8-vclamp-scalar-u4.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -114688,17 +116308,14 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("s8-rminmax_arch=rv64gcv-abi=lp64d_standalone") {
++  source_set("s8-vclamp_riscv64_standalone") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/s8-rminmax/gen/s8-rmax-rvv-u8v.c",
-+    "src/src/s8-rminmax/gen/s8-rmin-rvv-u8v.c",
-+    "src/src/s8-rminmax/gen/s8-rminmax-rvv-u8v.c"
++      "src/src/s8-vclamp/s8-vclamp-scalar-u4.c"
 +    ]
  
 -      sources = [
@@ -114741,16 +116358,43 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -    source_set("qs8-vprelu_arm64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("s8-rminmax_riscv64") {
++  source_set("subgraph_riscv64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/s8-rminmax/gen/s8-rmax-scalar-u2-acc2.c",
-+    "src/src/s8-rminmax/gen/s8-rmin-scalar-u2-acc2.c",
-+    "src/src/s8-rminmax/gen/s8-rminmax-scalar-u2-acc2.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/rewrites/cvt_to_fp32.cc",
++    "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 = [
@@ -114806,16 +116450,43 @@ Index: chromium-153.0.8010.36/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("s8-rminmax_riscv64_standalone") {
++  source_set("subgraph_riscv64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/s8-rminmax/gen/s8-rmax-scalar-u2-acc2.c",
-+    "src/src/s8-rminmax/gen/s8-rmin-scalar-u2-acc2.c",
-+    "src/src/s8-rminmax/gen/s8-rminmax-scalar-u2-acc2.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/rewrites/cvt_to_fp32.cc",
++    "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"
 +    ]
  
 -      deps = [
@@ -114882,15 +116553,22 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -        "src/src/qs8-vrpreluc/gen/qs8-vrpreluc-scalar-u8.c",
 -      ]
 +if (build_with_chromium) {
-+  source_set("s8-vclamp_arch=rv64gcv-abi=lp64d") {
++  source_set("tables_riscv64") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/s8-vclamp/gen/s8-vclamp-rvv-u4v.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"
 +    ]
  
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -114927,15 +116605,22 @@ Index: chromium-153.0.8010.36/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_arch=rv64gcv-abi=lp64d_standalone") {
++  source_set("tables_riscv64_standalone") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/s8-vclamp/gen/s8-vclamp-rvv-u4v.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 = [
@@ -115012,14 +116697,14 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -    source_set("qu8-dwconv_arm64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("s8-vclamp_riscv64") {
++  source_set("u8-ibilinear_riscv64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/s8-vclamp/s8-vclamp-scalar-u4.c"
++      "src/src/u8-ibilinear/gen/u8-ibilinear-scalar-u1.c"
 +    ]
  
 -      sources = [
@@ -115081,14 +116766,14 @@ Index: chromium-153.0.8010.36/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("s8-vclamp_riscv64_standalone") {
++  source_set("u8-ibilinear_riscv64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/s8-vclamp/s8-vclamp-scalar-u4.c"
++      "src/src/u8-ibilinear/gen/u8-ibilinear-scalar-u1.c"
 +    ]
  
 -      deps = [
@@ -115151,43 +116836,14 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -    source_set("qu8-gemm_arch=armv8.2-a+fp16+dotprod") {
 -      cflags = [ "-march=armv8.2-a+fp16+dotprod" ]
 +if (build_with_chromium) {
-+  source_set("subgraph_riscv64") {
++  source_set("u8-lut32norm_riscv64") {
 +    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/rewrites/cvt_to_fp32.cc",
-+    "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/u8-lut32norm/u8-lut32norm-scalar.c"
 +    ]
  
 -      asmflags = cflags
@@ -115226,43 +116882,14 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -      ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("subgraph_riscv64_standalone") {
++  source_set("u8-lut32norm_riscv64_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/rewrites/cvt_to_fp32.cc",
-+    "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/u8-lut32norm/u8-lut32norm-scalar.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -115345,22 +116972,15 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("tables_riscv64") {
++  source_set("u8-maxpool_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    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/u8-maxpool/gen/u8-maxpool-9p-minmax-rvv-u2v.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -115422,22 +117042,15 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -      asmflags = cflags
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("tables_riscv64_standalone") {
++  source_set("u8-maxpool_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    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/u8-maxpool/gen/u8-maxpool-9p-minmax-rvv-u2v.c"
 +    ]
  
 -      sources = [
@@ -115483,22 +117096,29 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -    source_set("qu8-igemm_arch=armv8.2-a+fp16+dotprod_standalone") {
 -      cflags = [ "-march=armv8.2-a+fp16+dotprod" ]
 +if (build_with_chromium) {
-+  source_set("u8-ibilinear_riscv64") {
++  source_set("u8-maxpool_riscv64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/u8-ibilinear/gen/u8-ibilinear-scalar-u1.c"
++      "src/src/u8-maxpool/gen/u8-maxpool-9p-minmax-scalar-u1.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/qu8-igemm/gen/qu8-igemm-4x16-minmax-rndnu-asm-aarch64-neon-mlal-lane-cortex-a53-prfm.S",
@@ -115525,13 +117145,6 @@ Index: chromium-153.0.8010.36/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" ]
    }
 +}
@@ -115541,14 +117154,14 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("u8-ibilinear_riscv64_standalone") {
++  source_set("u8-maxpool_riscv64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/u8-ibilinear/gen/u8-ibilinear-scalar-u1.c"
++      "src/src/u8-maxpool/gen/u8-maxpool-9p-minmax-scalar-u1.c"
 +    ]
  
 -      sources = [
@@ -115651,14 +117264,16 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("u8-lut32norm_riscv64") {
++  source_set("u8-rdminmax_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/u8-lut32norm/u8-lut32norm-scalar.c"
++      "src/src/u8-rdminmax/gen/u8-rdmax-2p2x-rvv-u8v.c",
++    "src/src/u8-rdminmax/gen/u8-rdmin-2p2x-rvv-u8v.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -115714,14 +117329,16 @@ Index: chromium-153.0.8010.36/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_riscv64_standalone") {
++  source_set("u8-rdminmax_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/u8-lut32norm/u8-lut32norm-scalar.c"
++      "src/src/u8-rdminmax/gen/u8-rdmax-2p2x-rvv-u8v.c",
++    "src/src/u8-rdminmax/gen/u8-rdmin-2p2x-rvv-u8v.c"
 +    ]
  
 -      sources = [
@@ -115791,15 +117408,15 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("u8-maxpool_arch=rv64gcv-abi=lp64d") {
++  source_set("u8-rdminmax_riscv64") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/u8-maxpool/gen/u8-maxpool-9p-minmax-rvv-u2v.c"
++      "src/src/u8-rdminmax/gen/u8-rdmax-2p2x-scalar-u2.c",
++    "src/src/u8-rdminmax/gen/u8-rdmin-2p2x-scalar-u2.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -115848,15 +117465,15 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("u8-maxpool_arch=rv64gcv-abi=lp64d_standalone") {
++  source_set("u8-rdminmax_riscv64_standalone") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/u8-maxpool/gen/u8-maxpool-9p-minmax-rvv-u2v.c"
++      "src/src/u8-rdminmax/gen/u8-rdmax-2p2x-scalar-u2.c",
++    "src/src/u8-rdminmax/gen/u8-rdmin-2p2x-scalar-u2.c"
 +    ]
  
 -      sources = [
@@ -115934,14 +117551,17 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -    source_set("qu8-vaddc_arm64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("u8-maxpool_riscv64") {
++  source_set("u8-rminmax_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/u8-maxpool/gen/u8-maxpool-9p-minmax-scalar-u1.c"
++      "src/src/u8-rminmax/gen/u8-rmax-rvv-u8v.c",
++    "src/src/u8-rminmax/gen/u8-rmin-rvv-u8v.c",
++    "src/src/u8-rminmax/gen/u8-rminmax-rvv-u8v.c"
 +    ]
  
 -      sources = [
@@ -116001,14 +117621,17 @@ Index: chromium-153.0.8010.36/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("u8-maxpool_riscv64_standalone") {
++  source_set("u8-rminmax_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/u8-maxpool/gen/u8-maxpool-9p-minmax-scalar-u1.c"
++      "src/src/u8-rminmax/gen/u8-rmax-rvv-u8v.c",
++    "src/src/u8-rminmax/gen/u8-rmin-rvv-u8v.c",
++    "src/src/u8-rminmax/gen/u8-rminmax-rvv-u8v.c"
 +    ]
  
 -      deps = [
@@ -116089,16 +117712,16 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("u8-rdminmax_arch=rv64gcv-abi=lp64d") {
++  source_set("u8-rminmax_riscv64") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/u8-rdminmax/gen/u8-rdmax-2p2x-rvv-u8v.c",
-+    "src/src/u8-rdminmax/gen/u8-rdmin-2p2x-rvv-u8v.c"
++      "src/src/u8-rminmax/gen/u8-rmax-scalar-u2-acc2.c",
++    "src/src/u8-rminmax/gen/u8-rmin-scalar-u2-acc2.c",
++    "src/src/u8-rminmax/gen/u8-rminmax-scalar-u2-acc2.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -116153,16 +117776,16 @@ Index: chromium-153.0.8010.36/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_arch=rv64gcv-abi=lp64d_standalone") {
++  source_set("u8-rminmax_riscv64_standalone") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/u8-rdminmax/gen/u8-rdmax-2p2x-rvv-u8v.c",
-+    "src/src/u8-rdminmax/gen/u8-rdmin-2p2x-rvv-u8v.c"
++      "src/src/u8-rminmax/gen/u8-rmax-scalar-u2-acc2.c",
++    "src/src/u8-rminmax/gen/u8-rmin-scalar-u2-acc2.c",
++    "src/src/u8-rminmax/gen/u8-rminmax-scalar-u2-acc2.c"
 +    ]
  
 -      sources = [
@@ -116206,15 +117829,15 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -    source_set("qu8-vmul_arm64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("u8-rdminmax_riscv64") {
++  source_set("u8-vclamp_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/u8-rdminmax/gen/u8-rdmax-2p2x-scalar-u2.c",
-+    "src/src/u8-rdminmax/gen/u8-rdmin-2p2x-scalar-u2.c"
++      "src/src/u8-vclamp/gen/u8-vclamp-rvv-u4v.c"
 +    ]
  
 -      sources = [
@@ -116272,15 +117895,15 @@ Index: chromium-153.0.8010.36/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("u8-rdminmax_riscv64_standalone") {
++  source_set("u8-vclamp_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/u8-rdminmax/gen/u8-rdmax-2p2x-scalar-u2.c",
-+    "src/src/u8-rdminmax/gen/u8-rdmin-2p2x-scalar-u2.c"
++      "src/src/u8-vclamp/gen/u8-vclamp-rvv-u4v.c"
 +    ]
  
 -      deps = [
@@ -116360,17 +117983,14 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("u8-rminmax_arch=rv64gcv-abi=lp64d") {
++  source_set("u8-vclamp_riscv64") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/u8-rminmax/gen/u8-rmax-rvv-u8v.c",
-+    "src/src/u8-rminmax/gen/u8-rmin-rvv-u8v.c",
-+    "src/src/u8-rminmax/gen/u8-rminmax-rvv-u8v.c"
++      "src/src/u8-vclamp/u8-vclamp-scalar-u4.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -116424,17 +118044,14 @@ Index: chromium-153.0.8010.36/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_arch=rv64gcv-abi=lp64d_standalone") {
++  source_set("u8-vclamp_riscv64_standalone") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/u8-rminmax/gen/u8-rmax-rvv-u8v.c",
-+    "src/src/u8-rminmax/gen/u8-rmin-rvv-u8v.c",
-+    "src/src/u8-rminmax/gen/u8-rminmax-rvv-u8v.c"
++      "src/src/u8-vclamp/u8-vclamp-scalar-u4.c"
 +    ]
  
 -      sources = [
@@ -116477,16 +118094,16 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -    source_set("qu8-vpreluc_arm64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("u8-rminmax_riscv64") {
++  source_set("x16-packw_riscv64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/u8-rminmax/gen/u8-rmax-scalar-u2-acc2.c",
-+    "src/src/u8-rminmax/gen/u8-rmin-scalar-u2-acc2.c",
-+    "src/src/u8-rminmax/gen/u8-rminmax-scalar-u2-acc2.c"
++      "src/src/x16-packw/gen/x16-packw-x16-gemm-gio-scalar.c",
++    "src/src/x16-packw/gen/x16-packw-x32-gemm-gio-scalar.c",
++    "src/src/x16-packw/gen/x16-packw-x8-gemm-gio-scalar.c"
 +    ]
  
 -      sources = [
@@ -116542,16 +118159,16 @@ Index: chromium-153.0.8010.36/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("u8-rminmax_riscv64_standalone") {
++  source_set("x16-packw_riscv64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/u8-rminmax/gen/u8-rmax-scalar-u2-acc2.c",
-+    "src/src/u8-rminmax/gen/u8-rmin-scalar-u2-acc2.c",
-+    "src/src/u8-rminmax/gen/u8-rminmax-scalar-u2-acc2.c"
++      "src/src/x16-packw/gen/x16-packw-x16-gemm-gio-scalar.c",
++    "src/src/x16-packw/gen/x16-packw-x32-gemm-gio-scalar.c",
++    "src/src/x16-packw/gen/x16-packw-x8-gemm-gio-scalar.c"
 +    ]
  
 -      deps = [
@@ -116632,15 +118249,14 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("u8-vclamp_arch=rv64gcv-abi=lp64d") {
++  source_set("x16-transposec_riscv64") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/u8-vclamp/gen/u8-vclamp-rvv-u4v.c"
++      "src/src/x16-transposec/gen/x16-transposec-2x4-scalar-int.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -116696,15 +118312,14 @@ Index: chromium-153.0.8010.36/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_arch=rv64gcv-abi=lp64d_standalone") {
++  source_set("x16-transposec_riscv64_standalone") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/u8-vclamp/gen/u8-vclamp-rvv-u4v.c"
++      "src/src/x16-transposec/gen/x16-transposec-2x4-scalar-int.c"
 +    ]
  
 -      sources = [
@@ -116749,14 +118364,15 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -    source_set("s8-ibilinear_arm64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("u8-vclamp_riscv64") {
++  source_set("x16-x32-packw_riscv64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/u8-vclamp/u8-vclamp-scalar-u4.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"
 +    ]
  
 -      sources = [
@@ -116815,14 +118431,15 @@ Index: chromium-153.0.8010.36/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("u8-vclamp_riscv64_standalone") {
++  source_set("x16-x32-packw_riscv64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/u8-vclamp/u8-vclamp-scalar-u4.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"
 +    ]
  
 -      deps = [
@@ -116905,17 +118522,14 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("x16-packw_riscv64") {
++  source_set("x24-transposec_riscv64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x16-packw/gen/x16-packw-x16-gemm-gio-scalar.c",
-+    "src/src/x16-packw/gen/x16-packw-x32-gemm-gio-scalar.c",
-+    "src/src/x16-packw/gen/x16-packw-x32-gemm-goi-scalar-int-u4.c",
-+    "src/src/x16-packw/gen/x16-packw-x8-gemm-gio-scalar.c"
++      "src/src/x24-transposec/gen/x24-transposec-1x2-scalar.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -116972,17 +118586,14 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("x16-packw_riscv64_standalone") {
++  source_set("x24-transposec_riscv64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x16-packw/gen/x16-packw-x16-gemm-gio-scalar.c",
-+    "src/src/x16-packw/gen/x16-packw-x32-gemm-gio-scalar.c",
-+    "src/src/x16-packw/gen/x16-packw-x32-gemm-goi-scalar-int-u4.c",
-+    "src/src/x16-packw/gen/x16-packw-x8-gemm-gio-scalar.c"
++      "src/src/x24-transposec/gen/x24-transposec-1x2-scalar.c"
 +    ]
  
 -      sources = [
@@ -117082,14 +118693,15 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("x16-transposec_riscv64") {
++  source_set("x32-packw_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x16-transposec/gen/x16-transposec-2x4-scalar-int.c"
++      "src/src/x32-packw/gen/x32-packw-x4v-gemm-goi-rvv-u8.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -117144,14 +118756,15 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("x16-transposec_riscv64_standalone") {
++  source_set("x32-packw_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x16-transposec/gen/x16-transposec-2x4-scalar-int.c"
++      "src/src/x32-packw/gen/x32-packw-x4v-gemm-goi-rvv-u8.c"
 +    ]
  
 -      sources = [
@@ -117306,15 +118919,22 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("x16-x32-packw_riscv64") {
++  source_set("x32-packw_riscv64") {
 +    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/x32-packw/gen/x32-packw-x16-gemm-gio-scalar.c",
++    "src/src/x32-packw/gen/x32-packw-x2-gemm-gio-scalar.c",
++    "src/src/x32-packw/gen/x32-packw-x2-gemm-goi-scalar-float-u4.c",
++    "src/src/x32-packw/gen/x32-packw-x32-gemm-gio-scalar.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-gio-scalar.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -117376,15 +118996,22 @@ Index: chromium-153.0.8010.36/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_riscv64_standalone") {
++  source_set("x32-packw_riscv64_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/x32-packw/gen/x32-packw-x16-gemm-gio-scalar.c",
++    "src/src/x32-packw/gen/x32-packw-x2-gemm-gio-scalar.c",
++    "src/src/x32-packw/gen/x32-packw-x2-gemm-goi-scalar-float-u4.c",
++    "src/src/x32-packw/gen/x32-packw-x32-gemm-gio-scalar.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-gio-scalar.c"
 +    ]
  
 -      sources = [
@@ -117429,14 +119056,18 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -    source_set("u8-ibilinear_arm64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("x24-transposec_riscv64") {
++  source_set("x32-transposec_arch=rv64gcv-abi=lp64d") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x24-transposec/gen/x24-transposec-1x2-scalar.c"
++      "src/src/x32-transposec/gen/x32-transposec-16x8-rvv.c",
++    "src/src/x32-transposec/gen/x32-transposec-32x8-rvv.c",
++    "src/src/x32-transposec/gen/x32-transposec-4x4-rvv.c",
++    "src/src/x32-transposec/gen/x32-transposec-8x8-rvv.c"
 +    ]
  
 -      sources = [
@@ -117494,14 +119125,18 @@ Index: chromium-153.0.8010.36/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("x24-transposec_riscv64_standalone") {
++  source_set("x32-transposec_arch=rv64gcv-abi=lp64d_standalone") {
 +    cflags = [
-+  
++      "-mabi=lp64d",
++    "-march=rv64gcv"
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x24-transposec/gen/x24-transposec-1x2-scalar.c"
++      "src/src/x32-transposec/gen/x32-transposec-16x8-rvv.c",
++    "src/src/x32-transposec/gen/x32-transposec-32x8-rvv.c",
++    "src/src/x32-transposec/gen/x32-transposec-4x4-rvv.c",
++    "src/src/x32-transposec/gen/x32-transposec-8x8-rvv.c"
 +    ]
  
 -      deps = [
@@ -117581,15 +119216,14 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("x32-packw_arch=rv64gcv-abi=lp64d") {
++  source_set("x32-transposec_riscv64") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x32-packw/gen/x32-packw-x4v-gemm-goi-rvv-u8.c"
++      "src/src/x32-transposec/gen/x32-transposec-2x4-scalar-int.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -117644,15 +119278,14 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("x32-packw_arch=rv64gcv-abi=lp64d_standalone") {
++  source_set("x32-transposec_riscv64_standalone") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x32-packw/gen/x32-packw-x4v-gemm-goi-rvv-u8.c"
++      "src/src/x32-transposec/gen/x32-transposec-2x4-scalar-int.c"
 +    ]
  
 -      sources = [
@@ -117752,22 +119385,14 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("x32-packw_riscv64") {
++  source_set("x32-unpool_riscv64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x32-packw/gen/x32-packw-x16-gemm-gio-scalar.c",
-+    "src/src/x32-packw/gen/x32-packw-x2-gemm-gio-scalar.c",
-+    "src/src/x32-packw/gen/x32-packw-x2-gemm-goi-scalar-float-u4.c",
-+    "src/src/x32-packw/gen/x32-packw-x32-gemm-gio-scalar.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-gio-scalar.c"
++      "src/src/x32-unpool/x32-unpool-scalar.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -117826,22 +119451,14 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("x32-packw_riscv64_standalone") {
++  source_set("x32-unpool_riscv64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x32-packw/gen/x32-packw-x16-gemm-gio-scalar.c",
-+    "src/src/x32-packw/gen/x32-packw-x2-gemm-gio-scalar.c",
-+    "src/src/x32-packw/gen/x32-packw-x2-gemm-goi-scalar-float-u4.c",
-+    "src/src/x32-packw/gen/x32-packw-x32-gemm-gio-scalar.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-gio-scalar.c"
++      "src/src/x32-unpool/x32-unpool-scalar.c"
 +    ]
  
 -      sources = [
@@ -117911,18 +119528,14 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("x32-transposec_arch=rv64gcv-abi=lp64d") {
++  source_set("x64-transposec_riscv64") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x32-transposec/gen/x32-transposec-16x8-rvv.c",
-+    "src/src/x32-transposec/gen/x32-transposec-32x8-rvv.c",
-+    "src/src/x32-transposec/gen/x32-transposec-4x4-rvv.c",
-+    "src/src/x32-transposec/gen/x32-transposec-8x8-rvv.c"
++      "src/src/x64-transposec/gen/x64-transposec-4x2-scalar-int.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -117971,18 +119584,14 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -      cflags = [ "-march=armv8.2-a+sve+sve2" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("x32-transposec_arch=rv64gcv-abi=lp64d_standalone") {
++  source_set("x64-transposec_riscv64_standalone") {
 +    cflags = [
-+      "-mabi=lp64d",
-+    "-march=rv64gcv"
++  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x32-transposec/gen/x32-transposec-16x8-rvv.c",
-+    "src/src/x32-transposec/gen/x32-transposec-32x8-rvv.c",
-+    "src/src/x32-transposec/gen/x32-transposec-4x4-rvv.c",
-+    "src/src/x32-transposec/gen/x32-transposec-8x8-rvv.c"
++      "src/src/x64-transposec/gen/x64-transposec-4x2-scalar-int.c"
 +    ]
  
 -      sources = [
@@ -118032,7 +119641,6 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -        "src/src/x16-packw/gen/x16-packw-x16-gemm-gio-scalar.c",
 -        "src/src/x16-packw/gen/x16-packw-x16-gemm-goi-neon-ld4lane-u8-prfm.c",
 -        "src/src/x16-packw/gen/x16-packw-x32-gemm-gio-scalar.c",
--        "src/src/x16-packw/gen/x16-packw-x32-gemm-goi-scalar-int-u4.c",
 -        "src/src/x16-packw/gen/x16-packw-x8-gemm-gio-scalar.c",
 -        "src/src/x16-packw/gen/x16-packw-x8-gemm-goi-neon-ld4lane-u8-prfm.c",
 -      ]
@@ -118062,14 +119670,14 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -    source_set("x16-packw_arm64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("x32-transposec_riscv64") {
++  source_set("x8-lut_riscv64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x32-transposec/gen/x32-transposec-2x4-scalar-int.c"
++      "src/src/x8-lut/gen/x8-lut-scalar-u4.c"
 +    ]
  
 -      sources = [
@@ -118077,7 +119685,6 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -        "src/src/x16-packw/gen/x16-packw-x16-gemm-gio-scalar.c",
 -        "src/src/x16-packw/gen/x16-packw-x16-gemm-goi-neon-ld4lane-u8-prfm.c",
 -        "src/src/x16-packw/gen/x16-packw-x32-gemm-gio-scalar.c",
--        "src/src/x16-packw/gen/x16-packw-x32-gemm-goi-scalar-int-u4.c",
 -        "src/src/x16-packw/gen/x16-packw-x8-gemm-gio-scalar.c",
 -        "src/src/x16-packw/gen/x16-packw-x8-gemm-goi-neon-ld4lane-u8-prfm.c",
 -      ]
@@ -118131,14 +119738,14 @@ Index: chromium-153.0.8010.36/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("x32-transposec_riscv64_standalone") {
++  source_set("x8-lut_riscv64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x32-transposec/gen/x32-transposec-2x4-scalar-int.c"
++      "src/src/x8-lut/gen/x8-lut-scalar-u4.c"
 +    ]
  
 -      deps = [
@@ -118219,14 +119826,14 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("x32-unpool_riscv64") {
++  source_set("x8-packq_riscv64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x32-unpool/x32-unpool-scalar.c"
++      "src/src/x8-packq/x8-packq-scalar-f32qp8-u1.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -118281,14 +119888,14 @@ Index: chromium-153.0.8010.36/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_riscv64_standalone") {
++  source_set("x8-packq_riscv64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x32-unpool/x32-unpool-scalar.c"
++      "src/src/x8-packq/x8-packq-scalar-f32qp8-u1.c"
 +    ]
  
 -      sources = [
@@ -118360,14 +119967,21 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("x64-transposec_riscv64") {
++  source_set("x8-packw_riscv64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x64-transposec/gen/x64-transposec-4x2-scalar-int.c"
++      "src/src/x8-packw/gen/x8-packw-x16-gemm-gio-scalar.c",
++    "src/src/x8-packw/gen/x8-packw-x16-gemm-goi-scalar-u2.c",
++    "src/src/x8-packw/gen/x8-packw-x32-gemm-gio-scalar.c",
++    "src/src/x8-packw/gen/x8-packw-x32-gemm-goi-scalar-u2.c",
++    "src/src/x8-packw/gen/x8-packw-x4-gemm-gio-scalar.c",
++    "src/src/x8-packw/gen/x8-packw-x4-gemm-goi-scalar-u2.c",
++    "src/src/x8-packw/gen/x8-packw-x8-gemm-gio-scalar.c",
++    "src/src/x8-packw/gen/x8-packw-x8-gemm-goi-scalar-u2.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -118416,14 +120030,21 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -      cflags = [ "-march=armv8.2-a+sve+sve2" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("x64-transposec_riscv64_standalone") {
++  source_set("x8-packw_riscv64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x64-transposec/gen/x64-transposec-4x2-scalar-int.c"
++      "src/src/x8-packw/gen/x8-packw-x16-gemm-gio-scalar.c",
++    "src/src/x8-packw/gen/x8-packw-x16-gemm-goi-scalar-u2.c",
++    "src/src/x8-packw/gen/x8-packw-x32-gemm-gio-scalar.c",
++    "src/src/x8-packw/gen/x8-packw-x32-gemm-goi-scalar-u2.c",
++    "src/src/x8-packw/gen/x8-packw-x4-gemm-gio-scalar.c",
++    "src/src/x8-packw/gen/x8-packw-x4-gemm-goi-scalar-u2.c",
++    "src/src/x8-packw/gen/x8-packw-x8-gemm-gio-scalar.c",
++    "src/src/x8-packw/gen/x8-packw-x8-gemm-goi-scalar-u2.c"
 +    ]
  
 -      sources = [
@@ -118511,14 +120132,14 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -    source_set("x32-packw_arm64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("x8-lut_riscv64") {
++  source_set("x8-transposec_riscv64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x8-lut/gen/x8-lut-scalar-u4.c"
++      "src/src/x8-transposec/gen/x8-transposec-2x4-scalar-int.c"
 +    ]
  
 -      sources = [
@@ -118578,14 +120199,14 @@ Index: chromium-153.0.8010.36/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_riscv64_standalone") {
++  source_set("x8-transposec_riscv64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x8-lut/gen/x8-lut-scalar-u4.c"
++      "src/src/x8-transposec/gen/x8-transposec-2x4-scalar-int.c"
 +    ]
  
 -      sources = [
@@ -118630,14 +120251,14 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -    source_set("x32-transposec_arm64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("x8-packq_riscv64") {
++  source_set("xx-copy_riscv64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x8-packq/x8-packq-scalar-f32qp8-u1.c"
++      "src/src/xx-copy/xx-copy-scalar-memcpy.c"
 +    ]
  
 -      sources = [
@@ -118686,14 +120307,14 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("x8-packq_riscv64_standalone") {
++  source_set("xx-copy_riscv64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x8-packq/x8-packq-scalar-f32qp8-u1.c"
++      "src/src/xx-copy/xx-copy-scalar-memcpy.c"
 +    ]
  
 -      sources = [
@@ -118737,21 +120358,14 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -    source_set("x32-unpool_arm64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("x8-packw_riscv64") {
++  source_set("xx-fill_riscv64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x8-packw/gen/x8-packw-x16-gemm-gio-scalar.c",
-+    "src/src/x8-packw/gen/x8-packw-x16-gemm-goi-scalar-u2.c",
-+    "src/src/x8-packw/gen/x8-packw-x32-gemm-gio-scalar.c",
-+    "src/src/x8-packw/gen/x8-packw-x32-gemm-goi-scalar-u2.c",
-+    "src/src/x8-packw/gen/x8-packw-x4-gemm-gio-scalar.c",
-+    "src/src/x8-packw/gen/x8-packw-x4-gemm-goi-scalar-u2.c",
-+    "src/src/x8-packw/gen/x8-packw-x8-gemm-gio-scalar.c",
-+    "src/src/x8-packw/gen/x8-packw-x8-gemm-goi-scalar-u2.c"
++      "src/src/xx-fill/xx-fill-scalar-u16.c"
 +    ]
  
 -      sources = [
@@ -118810,21 +120424,14 @@ Index: chromium-153.0.8010.36/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("x8-packw_riscv64_standalone") {
++  source_set("xx-fill_riscv64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x8-packw/gen/x8-packw-x16-gemm-gio-scalar.c",
-+    "src/src/x8-packw/gen/x8-packw-x16-gemm-goi-scalar-u2.c",
-+    "src/src/x8-packw/gen/x8-packw-x32-gemm-gio-scalar.c",
-+    "src/src/x8-packw/gen/x8-packw-x32-gemm-goi-scalar-u2.c",
-+    "src/src/x8-packw/gen/x8-packw-x4-gemm-gio-scalar.c",
-+    "src/src/x8-packw/gen/x8-packw-x4-gemm-goi-scalar-u2.c",
-+    "src/src/x8-packw/gen/x8-packw-x8-gemm-gio-scalar.c",
-+    "src/src/x8-packw/gen/x8-packw-x8-gemm-goi-scalar-u2.c"
++      "src/src/xx-fill/xx-fill-scalar-u16.c"
 +    ]
  
 -      deps = [
@@ -118894,14 +120501,14 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -        "src/src/x8-lut/gen/x8-lut-scalar-u4.c",
 -      ]
 +if (build_with_chromium) {
-+  source_set("x8-transposec_riscv64") {
++  source_set("xx-pad_riscv64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x8-transposec/gen/x8-transposec-2x4-scalar-int.c"
++      "src/src/xx-pad/xx-pad-p4-scalar-u16.c"
 +    ]
  
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -118938,14 +120545,14 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("x8-transposec_riscv64_standalone") {
++  source_set("xx-pad_riscv64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x8-transposec/gen/x8-transposec-2x4-scalar-int.c"
++      "src/src/xx-pad/xx-pad-p4-scalar-u16.c"
 +    ]
  
 -      sources = [
@@ -119021,14 +120628,14 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -    source_set("x8-pack-lh_arch=armv8.2-a+sve+sve2_standalone") {
 -      cflags = [ "-march=armv8.2-a+sve+sve2" ]
 +if (build_with_chromium) {
-+  source_set("xx-copy_riscv64") {
++  source_set("xx-transposev_riscv64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/xx-copy/xx-copy-scalar-memcpy.c"
++      "src/src/xx-transposev/xx-transposev-1x1-scalar-memcpy.c"
 +    ]
  
 -      sources = [
@@ -119075,6 +120682,7 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
  
 -      sources = [
 -        "src/include/xnnpack.h",
+-        "src/src/x8-packq/x8-packq-aarch64-neon-f16qp8-u2.c",
 -        "src/src/x8-packq/x8-packq-aarch64-neon-f32qp8-u2.c",
 -        "src/src/x8-packq/x8-packq-scalar-f32qp8-u1.c",
 -      ]
@@ -119088,14 +120696,14 @@ Index: chromium-153.0.8010.36/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("xx-copy_riscv64_standalone") {
++  source_set("xx-transposev_riscv64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/xx-copy/xx-copy-scalar-memcpy.c"
++      "src/src/xx-transposev/xx-transposev-1x1-scalar-memcpy.c"
 +    ]
  
 -      deps = [
@@ -119127,6 +120735,7 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
  
 -      sources = [
 -        "src/include/xnnpack.h",
+-        "src/src/x8-packq/x8-packq-aarch64-neon-f16qp8-u2.c",
 -        "src/src/x8-packq/x8-packq-aarch64-neon-f32qp8-u2.c",
 -        "src/src/x8-packq/x8-packq-scalar-f32qp8-u1.c",
 -      ]
@@ -119157,7 +120766,8 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -  if (build_with_chromium) {
 -    source_set("x8-packw_arm64") {
 -      cflags = []
--
++}
+ 
 -      sources = [
 -        "src/include/xnnpack.h",
 -        "src/src/x8-packw/gen/x8-packw-x16-gemm-gio-scalar.c",
@@ -119181,15 +120791,16 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -        "//third_party/fxdiv",
 -        "//third_party/pthreadpool",
 -      ]
++if (current_cpu == "ppc64") {
 +if (build_with_chromium) {
-+  source_set("xx-fill_riscv64") {
++  source_set("bf16-f32-vcvt_ppc64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/xx-fill/xx-fill-scalar-u16.c"
++      "src/src/bf16-f32-vcvt/gen/bf16-f32-vcvt-scalar-u2.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -119250,14 +120861,14 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("xx-fill_riscv64_standalone") {
++  source_set("bf16-f32-vcvt_ppc64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/xx-fill/xx-fill-scalar-u16.c"
++      "src/src/bf16-f32-vcvt/gen/bf16-f32-vcvt-scalar-u2.c"
 +    ]
  
 -      sources = [
@@ -119301,14 +120912,14 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -    source_set("x8-transposec_arm64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("xx-pad_riscv64") {
++  source_set("bf16-qs8-vcvt_ppc64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/xx-pad/xx-pad-p4-scalar-u16.c"
++      "src/src/bf16-qs8-vcvt/gen/bf16-qs8-vcvt-scalar-imagic-u4.c"
 +    ]
  
 -      sources = [
@@ -119335,110 +120946,6 @@ Index: chromium-153.0.8010.36/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("xx-copy_arm64") {
--      cflags = []
-+# This is a target that cannot depend on //base.
-+if (build_with_internal_optimization_guide) {
-+  source_set("xx-pad_riscv64_standalone") {
-+    cflags = [
-+  
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/xx-pad/xx-pad-p4-scalar-u16.c"
-+    ]
- 
--      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" ]
- 
--      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("xx-copy_arm64_standalone") {
--      cflags = []
-+if (build_with_chromium) {
-+  source_set("xx-transposev_riscv64") {
-+    cflags = [
-+  
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/xx-transposev/xx-transposev-1x1-scalar-memcpy.c"
-+    ]
- 
--      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" ]
--
--      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" ]
@@ -119446,7 +120953,7 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +    configs += [ ":xnnpack_private_config" ]
  
 -  if (build_with_chromium) {
--    source_set("xx-fill_arm64") {
+-    source_set("xx-copy_arm64") {
 -      cflags = []
 +    deps = [
 +      "//third_party/cpuinfo",
@@ -119457,8 +120964,7 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
  
 -      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/xx-copy/xx-copy-scalar-memcpy.c",
 -      ]
 +    public_configs = [ ":xnnpack_public_config" ]
 +  }
@@ -119470,14 +120976,14 @@ Index: chromium-153.0.8010.36/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("xx-transposev_riscv64_standalone") {
++  source_set("bf16-qs8-vcvt_ppc64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/xx-transposev/xx-transposev-1x1-scalar-memcpy.c"
++      "src/src/bf16-qs8-vcvt/gen/bf16-qs8-vcvt-scalar-imagic-u4.c"
 +    ]
  
 -      deps = [
@@ -119503,14 +121009,13 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
--    source_set("xx-fill_arm64_standalone") {
+-    source_set("xx-copy_arm64_standalone") {
 -      cflags = []
 +    public_configs = [ ":xnnpack_public_config" ]
  
 -      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/xx-copy/xx-copy-scalar-memcpy.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -119537,37 +121042,35 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +}
  
 -  if (build_with_chromium) {
--    source_set("xx-pad_arm64") {
+-    source_set("xx-fill_arm64") {
 -      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-fill/xx-fill-neon-u64.c",
+-        "src/src/xx-fill/xx-fill-scalar-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",
 -      ]
-+if (current_cpu == "ppc64") {
 +if (build_with_chromium) {
-+  source_set("bf16-f32-vcvt_ppc64") {
++  source_set("bf16-qu8-vcvt_ppc64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/bf16-f32-vcvt/gen/bf16-f32-vcvt-scalar-u2.c"
++      "src/src/bf16-qu8-vcvt/gen/bf16-qu8-vcvt-scalar-imagic-u4.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -119580,7 +121083,7 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
--    source_set("xx-pad_arm64_standalone") {
+-    source_set("xx-fill_arm64_standalone") {
 -      cflags = []
 +    deps = [
 +      "//third_party/cpuinfo",
@@ -119591,8 +121094,8 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
  
 -      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-fill/xx-fill-neon-u64.c",
+-        "src/src/xx-fill/xx-fill-scalar-u16.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -119618,23 +121121,24 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +}
  
 -  if (build_with_chromium) {
--    source_set("xx-transposev_arm64") {
+-    source_set("xx-pad_arm64") {
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("bf16-f32-vcvt_ppc64_standalone") {
++  source_set("bf16-qu8-vcvt_ppc64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/bf16-f32-vcvt/gen/bf16-f32-vcvt-scalar-u2.c"
++      "src/src/bf16-qu8-vcvt/gen/bf16-qu8-vcvt-scalar-imagic-u4.c"
 +    ]
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/xx-transposev/xx-transposev-1x1-scalar-memcpy.c",
+-        "src/src/xx-pad/xx-pad-p16-neon-u16.c",
+-        "src/src/xx-pad/xx-pad-p4-scalar-u16.c",
 -      ]
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
@@ -119669,22 +121173,25 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
--    source_set("xx-transposev_arm64_standalone") {
+-    source_set("xx-pad_arm64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("bf16-qs8-vcvt_ppc64") {
++  source_set("bf16-rminmax_ppc64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/bf16-qs8-vcvt/gen/bf16-qs8-vcvt-scalar-imagic-u4.c"
++      "src/src/bf16-rminmax/gen/bf16-rmax-scalar-u2-acc2.c",
++    "src/src/bf16-rminmax/gen/bf16-rmin-scalar-u2-acc2.c",
++    "src/src/bf16-rminmax/gen/bf16-rminmax-scalar-u2-acc2.c"
 +    ]
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/xx-transposev/xx-transposev-1x1-scalar-memcpy.c",
+-        "src/src/xx-pad/xx-pad-p16-neon-u16.c",
+-        "src/src/xx-pad/xx-pad-p4-scalar-u16.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -119705,51 +121212,62 @@ Index: chromium-153.0.8010.36/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("xx-transposev_arm64") {
+-      cflags = []
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
 +      "//third_party/fxdiv",
 +      "//third_party/pthreadpool",
 +    ]
-+
+ 
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/xx-transposev/xx-transposev-1x1-scalar-memcpy.c",
+-      ]
 +    public_configs = [ ":xnnpack_public_config" ]
-   }
- }
++  }
++}
  
--if (current_cpu == "riscv64") {
--  if (build_with_chromium) {
--    source_set("bf16-f32-vcvt_riscv64") {
--      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" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("bf16-qs8-vcvt_ppc64_standalone") {
++  source_set("bf16-rminmax_ppc64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/bf16-qs8-vcvt/gen/bf16-qs8-vcvt-scalar-imagic-u4.c"
++      "src/src/bf16-rminmax/gen/bf16-rmax-scalar-u2-acc2.c",
++    "src/src/bf16-rminmax/gen/bf16-rmin-scalar-u2-acc2.c",
++    "src/src/bf16-rminmax/gen/bf16-rminmax-scalar-u2-acc2.c"
 +    ]
  
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/bf16-f32-vcvt/gen/bf16-f32-vcvt-scalar-u2.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" ]
  
--      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",
@@ -119757,39 +121275,15 @@ Index: chromium-153.0.8010.36/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("bf16-f32-vcvt_riscv64_standalone") {
+-    source_set("xx-transposev_arm64_standalone") {
 -      cflags = []
-+if (build_with_chromium) {
-+  source_set("bf16-qu8-vcvt_ppc64") {
-+    cflags = [
-+  
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/bf16-qu8-vcvt/gen/bf16-qu8-vcvt-scalar-imagic-u4.c"
-+    ]
++    public_configs = [ ":xnnpack_public_config" ]
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/bf16-f32-vcvt/gen/bf16-f32-vcvt-scalar-u2.c",
+-        "src/src/xx-transposev/xx-transposev-1x1-scalar-memcpy.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -119809,93 +121303,66 @@ Index: chromium-153.0.8010.36/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 (current_cpu == "riscv64") {
 -  if (build_with_chromium) {
--    source_set("bf16-qs8-vcvt_riscv64") {
+-    source_set("bf16-f32-vcvt_riscv64") {
 -      cflags = []
-+# This is a target that cannot depend on //base.
-+if (build_with_internal_optimization_guide) {
-+  source_set("bf16-qu8-vcvt_ppc64_standalone") {
-+    cflags = [
-+  
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/bf16-qu8-vcvt/gen/bf16-qu8-vcvt-scalar-imagic-u4.c"
-+    ]
- 
+-
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/bf16-qs8-vcvt/gen/bf16-qs8-vcvt-scalar-imagic-u4.c",
+-        "src/src/bf16-f32-vcvt/gen/bf16-f32-vcvt-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: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("bf16-qs8-vcvt_riscv64_standalone") {
--      cflags = []
 +if (build_with_chromium) {
-+  source_set("bf16-rminmax_ppc64") {
++  source_set("bf16-vunary_ppc64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/bf16-rminmax/gen/bf16-rmax-scalar-u2-acc2.c",
-+    "src/src/bf16-rminmax/gen/bf16-rmin-scalar-u2-acc2.c",
-+    "src/src/bf16-rminmax/gen/bf16-rminmax-scalar-u2-acc2.c"
++      "src/src/bf16-vunary/gen/bf16-vunary-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("bf16-f32-vcvt_riscv64_standalone") {
+-      cflags = []
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool",
 +    ]
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/bf16-qs8-vcvt/gen/bf16-qs8-vcvt-scalar-imagic-u4.c",
+-        "src/src/bf16-f32-vcvt/gen/bf16-f32-vcvt-scalar-u2.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -119916,42 +121383,28 @@ Index: chromium-153.0.8010.36/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("bf16-qu8-vcvt_riscv64") {
+-    source_set("bf16-qs8-vcvt_riscv64") {
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("bf16-rminmax_ppc64_standalone") {
++  source_set("bf16-vunary_ppc64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/bf16-rminmax/gen/bf16-rmax-scalar-u2-acc2.c",
-+    "src/src/bf16-rminmax/gen/bf16-rmin-scalar-u2-acc2.c",
-+    "src/src/bf16-rminmax/gen/bf16-rminmax-scalar-u2-acc2.c"
++      "src/src/bf16-vunary/gen/bf16-vunary-scalar.c"
 +    ]
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/bf16-qu8-vcvt/gen/bf16-qu8-vcvt-scalar-imagic-u4.c",
+-        "src/src/bf16-qs8-vcvt/gen/bf16-qs8-vcvt-scalar-imagic-u4.c",
 -      ]
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
@@ -119986,7 +121439,7 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
--    source_set("bf16-qu8-vcvt_riscv64_standalone") {
+-    source_set("bf16-qs8-vcvt_riscv64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
 +  source_set("configs_ppc64") {
@@ -120024,7 +121477,7 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/bf16-qu8-vcvt/gen/bf16-qu8-vcvt-scalar-imagic-u4.c",
+-        "src/src/bf16-qs8-vcvt/gen/bf16-qs8-vcvt-scalar-imagic-u4.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -120052,7 +121505,7 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +    configs += [ ":xnnpack_private_config" ]
  
 -  if (build_with_chromium) {
--    source_set("bf16-rminmax_riscv64") {
+-    source_set("bf16-qu8-vcvt_riscv64") {
 -      cflags = []
 +    deps = [
 +      "//third_party/cpuinfo",
@@ -120063,9 +121516,7 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/bf16-rminmax/gen/bf16-rmax-scalar-u2-acc2.c",
--        "src/src/bf16-rminmax/gen/bf16-rmin-scalar-u2-acc2.c",
--        "src/src/bf16-rminmax/gen/bf16-rminmax-scalar-u2-acc2.c",
+-        "src/src/bf16-qu8-vcvt/gen/bf16-qu8-vcvt-scalar-imagic-u4.c",
 -      ]
 +    public_configs = [ ":xnnpack_public_config" ]
 +  }
@@ -120133,15 +121584,13 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
--    source_set("bf16-rminmax_riscv64_standalone") {
+-    source_set("bf16-qu8-vcvt_riscv64_standalone") {
 -      cflags = []
 +    public_configs = [ ":xnnpack_public_config" ]
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/bf16-rminmax/gen/bf16-rmax-scalar-u2-acc2.c",
--        "src/src/bf16-rminmax/gen/bf16-rmin-scalar-u2-acc2.c",
--        "src/src/bf16-rminmax/gen/bf16-rminmax-scalar-u2-acc2.c",
+-        "src/src/bf16-qu8-vcvt/gen/bf16-qu8-vcvt-scalar-imagic-u4.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -120168,8 +121617,27 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +}
  
 -  if (build_with_chromium) {
--    source_set("configs_riscv64") {
+-    source_set("bf16-rminmax_riscv64") {
 -      cflags = []
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/bf16-rminmax/gen/bf16-rmax-scalar-u2-acc2.c",
+-        "src/src/bf16-rminmax/gen/bf16-rmin-scalar-u2-acc2.c",
+-        "src/src/bf16-rminmax/gen/bf16-rminmax-scalar-u2-acc2.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("enums_ppc64") {
 +    cflags = [
@@ -120184,7 +121652,152 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +    "src/src/enums/node-type.c",
 +    "src/src/enums/operator-type.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("bf16-rminmax_riscv64_standalone") {
+-      cflags = []
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool",
++    ]
+ 
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/bf16-rminmax/gen/bf16-rmax-scalar-u2-acc2.c",
+-        "src/src/bf16-rminmax/gen/bf16-rmin-scalar-u2-acc2.c",
+-        "src/src/bf16-rminmax/gen/bf16-rminmax-scalar-u2-acc2.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("bf16-vunary_riscv64") {
+-      cflags = []
++# This is a target that cannot depend on //base.
++if (build_with_internal_optimization_guide) {
++  source_set("enums_ppc64_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"
++    ]
+ 
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/bf16-vunary/gen/bf16-vunary-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" ]
++    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("bf16-vunary_riscv64_standalone") {
+-      cflags = []
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/bf16-vunary/gen/bf16-vunary-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 (build_with_chromium) {
++  source_set("f16-avgpool_ppc64") {
++    cflags = [
++  
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/f16-avgpool/gen/f16-f32acc-avgpool-9p-minmax-scalar-u1.c"
++    ]
+ 
+-  if (build_with_chromium) {
+-    source_set("configs_riscv64") {
+-      cflags = []
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
 +    configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ]
@@ -120248,18 +121861,14 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("enums_ppc64_standalone") {
++  source_set("f16-avgpool_ppc64_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/f16-avgpool/gen/f16-f32acc-avgpool-9p-minmax-scalar-u1.c"
 +    ]
  
 -      sources = [
@@ -120357,17 +121966,7 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -  if (build_with_internal_optimization_guide) {
 -    source_set("enums_riscv64_standalone") {
 -      cflags = []
-+if (build_with_chromium) {
-+  source_set("f16-f32-vcvt_ppc64") {
-+    cflags = [
-+  
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/f16-f32-vcvt/gen/f16-f32-vcvt-scalar-u4.c"
-+    ]
- 
+-
 -      sources = [
 -        "src/include/xnnpack.h",
 -        "src/src/enums/allocation-type.c",
@@ -120396,10 +121995,19 @@ Index: chromium-153.0.8010.36/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("f16-dwconv_ppc64") {
++    cflags = [
++  
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/f16-dwconv/gen/f16-f32acc-dwconv-25p2c-minmax-scalar-acc2.c",
++    "src/src/f16-dwconv/gen/f16-f32acc-dwconv-3p1c-minmax-scalar-acc2.c",
++    "src/src/f16-dwconv/gen/f16-f32acc-dwconv-4p1c-minmax-scalar-acc2.c",
++    "src/src/f16-dwconv/gen/f16-f32acc-dwconv-9p1c-minmax-scalar-acc2.c"
++    ]
  
 -  if (build_with_chromium) {
 -    source_set("f16-avgpool_arch=rv64gc_zvfh-abi=lp64d") {
@@ -120424,6 +122032,14 @@ Index: chromium-153.0.8010.36/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",
@@ -120431,12 +122047,6 @@ Index: chromium-153.0.8010.36/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-avgpool_arch=rv64gc_zvfh-abi=lp64d_standalone") {
@@ -120468,10 +122078,94 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -        assert_no_deps = [ "//base" ]
 -      }
 -    }
++    public_configs = [ ":xnnpack_public_config" ]
+   }
++}
+ 
+-  if (build_with_chromium) {
+-    source_set("f16-avgpool_riscv64") {
+-      cflags = []
++# This is a target that cannot depend on //base.
++if (build_with_internal_optimization_guide) {
++  source_set("f16-dwconv_ppc64_standalone") {
++    cflags = [
++  
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/f16-dwconv/gen/f16-f32acc-dwconv-25p2c-minmax-scalar-acc2.c",
++    "src/src/f16-dwconv/gen/f16-f32acc-dwconv-3p1c-minmax-scalar-acc2.c",
++    "src/src/f16-dwconv/gen/f16-f32acc-dwconv-4p1c-minmax-scalar-acc2.c",
++    "src/src/f16-dwconv/gen/f16-f32acc-dwconv-9p1c-minmax-scalar-acc2.c"
++    ]
+ 
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/f16-avgpool/gen/f16-f32acc-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" ]
+ 
+-      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-avgpool_riscv64_standalone") {
+-      cflags = []
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/f16-avgpool/gen/f16-f32acc-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",
+-      ]
+-
+-      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-f32-vcvt_ppc64_standalone") {
++if (build_with_chromium) {
++  source_set("f16-f32-vcvt_ppc64") {
 +    cflags = [
 +  
 +    ]
@@ -120519,7 +122213,7 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
 +      "//third_party/fxdiv",
-+      "//third_party/pthreadpool:pthreadpool_standalone",
++      "//third_party/pthreadpool",
 +    ]
  
 -  # This is a target that cannot depend on //base.
@@ -120555,8 +122249,91 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -      if (!(is_android && use_order_profiling)) {
 -        assert_no_deps = [ "//base" ]
 -      }
+-    }
 +    public_configs = [ ":xnnpack_public_config" ]
-+
+   }
++}
+ 
+-  if (build_with_chromium) {
+-    source_set("f16-dwconv_riscv64") {
+-      cflags = []
++# This is a target that cannot depend on //base.
++if (build_with_internal_optimization_guide) {
++  source_set("f16-f32-vcvt_ppc64_standalone") {
++    cflags = [
++  
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/f16-f32-vcvt/gen/f16-f32-vcvt-scalar-u4.c"
++    ]
+ 
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/f16-dwconv/gen/f16-f32acc-dwconv-25p2c-minmax-scalar-acc2.c",
+-        "src/src/f16-dwconv/gen/f16-f32acc-dwconv-3p1c-minmax-scalar-acc2.c",
+-        "src/src/f16-dwconv/gen/f16-f32acc-dwconv-4p1c-minmax-scalar-acc2.c",
+-        "src/src/f16-dwconv/gen/f16-f32acc-dwconv-9p1c-minmax-scalar-acc2.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("f16-dwconv_riscv64_standalone") {
+-      cflags = []
++    public_configs = [ ":xnnpack_public_config" ]
+ 
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/f16-dwconv/gen/f16-f32acc-dwconv-25p2c-minmax-scalar-acc2.c",
+-        "src/src/f16-dwconv/gen/f16-f32acc-dwconv-3p1c-minmax-scalar-acc2.c",
+-        "src/src/f16-dwconv/gen/f16-f32acc-dwconv-4p1c-minmax-scalar-acc2.c",
+-        "src/src/f16-dwconv/gen/f16-f32acc-dwconv-9p1c-minmax-scalar-acc2.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" ]
      }
@@ -125100,6 +126877,11 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +      "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"
 +    ]
++
++    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",
@@ -125126,20 +126908,15 @@ Index: chromium-153.0.8010.36/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" ]
    }
 +}
@@ -128294,11 +130071,6 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +      "src/include/xnnpack.h",
 +      "src/src/f32-vgelu/gen/f32-vgelu-scalar-rational-12-10-div.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",
@@ -128334,15 +130106,20 @@ Index: chromium-153.0.8010.36/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" ]
    }
 +}
@@ -133504,6 +135281,11 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +      "src/include/xnnpack.h",
 +      "src/src/qs8-rsum/gen/qs8-rsum-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" ]
  
 -      sources = [
 -        "src/include/xnnpack.h",
@@ -133526,20 +135308,15 @@ Index: chromium-153.0.8010.36/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" ]
    }
 +}
@@ -137568,25 +139345,34 @@ Index: chromium-153.0.8010.36/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("qu8-vprelu_riscv64") {
+-      cflags = []
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
 +      "//third_party/fxdiv",
 +      "//third_party/pthreadpool",
 +    ]
-+
+ 
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qu8-vprelu/gen/qu8-vprelu-scalar-u8.c",
+-      ]
 +    public_configs = [ ":xnnpack_public_config" ]
-   }
++  }
 +}
  
--  if (build_with_chromium) {
--    source_set("qu8-vprelu_riscv64") {
--      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" ]
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
 +  source_set("reference_ppc64_standalone") {
@@ -137601,19 +139387,20 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +    "src/src/reference/unary-elementwise.cc"
 +    ]
  
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/qu8-vprelu/gen/qu8-vprelu-scalar-u8.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" ]
  
--      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",
@@ -137621,25 +139408,60 @@ Index: chromium-153.0.8010.36/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("qu8-vprelu_riscv64_standalone") {
+-      cflags = []
++    public_configs = [ ":xnnpack_public_config" ]
+ 
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qu8-vprelu/gen/qu8-vprelu-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" ]
+-
 -      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" ]
+-
+-      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("qu8-vprelu_riscv64_standalone") {
+-  if (build_with_chromium) {
+-    source_set("qu8-vpreluc_riscv64") {
 -      cflags = []
+-
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/qu8-vpreluc/gen/qu8-vpreluc-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" ]
+-
+-      deps = [
+-        "//third_party/cpuinfo",
+-        "//third_party/fp16",
+-        "//third_party/fxdiv",
+-        "//third_party/pthreadpool",
+-      ]
 +if (build_with_chromium) {
 +  source_set("s8-ibilinear_ppc64") {
 +    cflags = [
@@ -137651,9 +139473,28 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +      "src/src/s8-ibilinear/gen/s8-ibilinear-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" ]
+ 
+-  # This is a target that cannot depend on //base.
+-  if (build_with_internal_optimization_guide) {
+-    source_set("qu8-vpreluc_riscv64_standalone") {
+-      cflags = []
++    deps = [
++      "//third_party/cpuinfo",
++      "//third_party/fp16",
++      "//third_party/fxdiv",
++      "//third_party/pthreadpool",
++    ]
+ 
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/qu8-vprelu/gen/qu8-vprelu-scalar-u8.c",
+-        "src/src/qu8-vpreluc/gen/qu8-vpreluc-scalar-u8.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -137674,24 +139515,12 @@ Index: chromium-153.0.8010.36/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("qu8-vpreluc_riscv64") {
+-    source_set("qu8-vrpreluc_riscv64") {
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
@@ -137707,7 +139536,7 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/qu8-vpreluc/gen/qu8-vpreluc-scalar-u8.c",
+-        "src/src/qu8-vrpreluc/gen/qu8-vrpreluc-scalar-u8.c",
 -      ]
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
@@ -137742,7 +139571,7 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
--    source_set("qu8-vpreluc_riscv64_standalone") {
+-    source_set("qu8-vrpreluc_riscv64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
 +  source_set("s8-maxpool_ppc64") {
@@ -137757,7 +139586,7 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/qu8-vpreluc/gen/qu8-vpreluc-scalar-u8.c",
+-        "src/src/qu8-vrpreluc/gen/qu8-vrpreluc-scalar-u8.c",
 -      ]
 -
 -      configs -= [ "//build/config/compiler:chromium_code" ]
@@ -137795,7 +139624,7 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 +}
  
 -  if (build_with_chromium) {
--    source_set("qu8-vrpreluc_riscv64") {
+-    source_set("reference_riscv64") {
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
@@ -137811,7 +139640,9 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/qu8-vrpreluc/gen/qu8-vrpreluc-scalar-u8.c",
+-        "src/src/reference/binary-elementwise.cc",
+-        "src/src/reference/packing.cc",
+-        "src/src/reference/unary-elementwise.cc",
 -      ]
 +    configs -= [ "//build/config/compiler:chromium_code" ]
 +    configs += [ "//build/config/compiler:no_chromium_code" ]
@@ -137846,7 +139677,7 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
  
 -  # This is a target that cannot depend on //base.
 -  if (build_with_internal_optimization_guide) {
--    source_set("qu8-vrpreluc_riscv64_standalone") {
+-    source_set("reference_riscv64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
 +  source_set("s8-rdminmax_ppc64") {
@@ -137862,115 +139693,6 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
  
 -      sources = [
 -        "src/include/xnnpack.h",
--        "src/src/qu8-vrpreluc/gen/qu8-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" ]
--
--      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" ]
-+
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool",
-+    ]
-+
-+    public_configs = [ ":xnnpack_public_config" ]
-   }
-+}
- 
--  if (build_with_chromium) {
--    source_set("reference_riscv64") {
--      cflags = []
-+# This is a target that cannot depend on //base.
-+if (build_with_internal_optimization_guide) {
-+  source_set("s8-rdminmax_ppc64_standalone") {
-+    cflags = [
-+  
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/s8-rdminmax/gen/s8-rdmax-2p2x-scalar-u2.c",
-+    "src/src/s8-rdminmax/gen/s8-rdmin-2p2x-scalar-u2.c"
-+    ]
- 
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/reference/binary-elementwise.cc",
--        "src/src/reference/packing.cc",
--        "src/src/reference/unary-elementwise.cc",
--      ]
-+    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("reference_riscv64_standalone") {
--      cflags = []
-+if (build_with_chromium) {
-+  source_set("s8-rminmax_ppc64") {
-+    cflags = [
-+  
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/s8-rminmax/gen/s8-rmax-scalar-u2-acc2.c",
-+    "src/src/s8-rminmax/gen/s8-rmin-scalar-u2-acc2.c",
-+    "src/src/s8-rminmax/gen/s8-rminmax-scalar-u2-acc2.c"
-+    ]
- 
--      sources = [
--        "src/include/xnnpack.h",
 -        "src/src/reference/binary-elementwise.cc",
 -        "src/src/reference/packing.cc",
 -        "src/src/reference/unary-elementwise.cc",
@@ -138024,16 +139746,15 @@ Index: chromium-153.0.8010.36/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("s8-rminmax_ppc64_standalone") {
++  source_set("s8-rdminmax_ppc64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/s8-rminmax/gen/s8-rmax-scalar-u2-acc2.c",
-+    "src/src/s8-rminmax/gen/s8-rmin-scalar-u2-acc2.c",
-+    "src/src/s8-rminmax/gen/s8-rminmax-scalar-u2-acc2.c"
++      "src/src/s8-rdminmax/gen/s8-rdmax-2p2x-scalar-u2.c",
++    "src/src/s8-rdminmax/gen/s8-rdmin-2p2x-scalar-u2.c"
 +    ]
  
 -      deps = [
@@ -138115,14 +139836,16 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -        "//third_party/pthreadpool",
 -      ]
 +if (build_with_chromium) {
-+  source_set("s8-vclamp_ppc64") {
++  source_set("s8-rminmax_ppc64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/s8-vclamp/s8-vclamp-scalar-u4.c"
++      "src/src/s8-rminmax/gen/s8-rmax-scalar-u2-acc2.c",
++    "src/src/s8-rminmax/gen/s8-rmin-scalar-u2-acc2.c",
++    "src/src/s8-rminmax/gen/s8-rminmax-scalar-u2-acc2.c"
 +    ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
@@ -138180,14 +139903,16 @@ Index: chromium-153.0.8010.36/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_ppc64_standalone") {
++  source_set("s8-rminmax_ppc64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/s8-vclamp/s8-vclamp-scalar-u4.c"
++      "src/src/s8-rminmax/gen/s8-rmax-scalar-u2-acc2.c",
++    "src/src/s8-rminmax/gen/s8-rmin-scalar-u2-acc2.c",
++    "src/src/s8-rminmax/gen/s8-rminmax-scalar-u2-acc2.c"
 +    ]
  
 -      sources = [
@@ -138255,43 +139980,14 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("subgraph_ppc64") {
++  source_set("s8-vclamp_ppc64") {
 +    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/rewrites/cvt_to_fp32.cc",
-+    "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-scalar-u4.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -138374,43 +140070,14 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("subgraph_ppc64_standalone") {
++  source_set("s8-vclamp_ppc64_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/rewrites/cvt_to_fp32.cc",
-+    "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-scalar-u4.c"
 +    ]
  
 -      sources = [
@@ -138480,22 +140147,43 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("tables_ppc64") {
++  source_set("subgraph_ppc64") {
 +    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/rewrites/cvt_to_fp32.cc",
++    "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) {
@@ -138580,22 +140268,43 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("tables_ppc64_standalone") {
++  source_set("subgraph_ppc64_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/rewrites/cvt_to_fp32.cc",
++    "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 = [
@@ -138667,14 +140376,22 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("u8-ibilinear_ppc64") {
++  source_set("tables_ppc64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "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) {
@@ -138755,14 +140472,22 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("u8-ibilinear_ppc64_standalone") {
++  source_set("tables_ppc64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "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 = [
@@ -138830,14 +140555,14 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -    }
 -  }
 +if (build_with_chromium) {
-+  source_set("u8-lut32norm_ppc64") {
++  source_set("u8-ibilinear_ppc64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/u8-lut32norm/u8-lut32norm-scalar.c"
++      "src/src/u8-ibilinear/gen/u8-ibilinear-scalar-u1.c"
 +    ]
  
 -  if (build_with_chromium) {
@@ -138912,14 +140637,14 @@ Index: chromium-153.0.8010.36/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_ppc64_standalone") {
++  source_set("u8-ibilinear_ppc64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/u8-lut32norm/u8-lut32norm-scalar.c"
++      "src/src/u8-ibilinear/gen/u8-ibilinear-scalar-u1.c"
 +    ]
  
 -      sources = [
@@ -139028,14 +140753,14 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -    source_set("tables_riscv64_standalone") {
 -      cflags = []
 +if (build_with_chromium) {
-+  source_set("u8-maxpool_ppc64") {
++  source_set("u8-lut32norm_ppc64") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/u8-maxpool/gen/u8-maxpool-9p-minmax-scalar-u1.c"
++      "src/src/u8-lut32norm/u8-lut32norm-scalar.c"
 +    ]
  
 -      sources = [
@@ -139069,60 +140794,50 @@ Index: chromium-153.0.8010.36/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("u8-ibilinear_riscv64") {
--      cflags = []
++
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
 +      "//third_party/fxdiv",
 +      "//third_party/pthreadpool",
 +    ]
- 
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/u8-ibilinear/gen/u8-ibilinear-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("u8-ibilinear_riscv64") {
+-      cflags = []
 +# This is a target that cannot depend on //base.
 +if (build_with_internal_optimization_guide) {
-+  source_set("u8-maxpool_ppc64_standalone") {
++  source_set("u8-lut32norm_ppc64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/u8-maxpool/gen/u8-maxpool-9p-minmax-scalar-u1.c"
++      "src/src/u8-lut32norm/u8-lut32norm-scalar.c"
 +    ]
  
--      deps = [
--        "//third_party/cpuinfo",
--        "//third_party/fp16",
--        "//third_party/fxdiv",
--        "//third_party/pthreadpool",
+-      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" ]
  
--      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",
@@ -139130,11 +140845,35 @@ Index: chromium-153.0.8010.36/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-ibilinear_riscv64_standalone") {
 -      cflags = []
-+    public_configs = [ ":xnnpack_public_config" ]
++if (build_with_chromium) {
++  source_set("u8-maxpool_ppc64") {
++    cflags = [
++  
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/u8-maxpool/gen/u8-maxpool-9p-minmax-scalar-u1.c"
++    ]
  
 -      sources = [
 -        "src/include/xnnpack.h",
@@ -139158,76 +140897,73 @@ Index: chromium-153.0.8010.36/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("u8-lut32norm_riscv64") {
 -      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",
 -      ]
-+if (build_with_chromium) {
-+  source_set("u8-rdminmax_ppc64") {
++    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-maxpool_ppc64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/u8-rdminmax/gen/u8-rdmax-2p2x-scalar-u2.c",
-+    "src/src/u8-rdminmax/gen/u8-rdmin-2p2x-scalar-u2.c"
++      "src/src/u8-maxpool/gen/u8-maxpool-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" ]
-+    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",
++      "//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("u8-lut32norm_riscv64_standalone") {
 -      cflags = []
-+# This is a target that cannot depend on //base.
-+if (build_with_internal_optimization_guide) {
-+  source_set("u8-rdminmax_ppc64_standalone") {
-+    cflags = [
-+  
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/u8-rdminmax/gen/u8-rdmax-2p2x-scalar-u2.c",
-+    "src/src/u8-rdminmax/gen/u8-rdmin-2p2x-scalar-u2.c"
-+    ]
++    public_configs = [ ":xnnpack_public_config" ]
  
 -      sources = [
 -        "src/include/xnnpack.h",
@@ -139251,12 +140987,11 @@ Index: chromium-153.0.8010.36/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 (!(is_android && use_order_profiling)) {
++      assert_no_deps = [ "//base" ]
+     }
+   }
++}
  
 -  if (build_with_chromium) {
 -    source_set("u8-maxpool_arch=rv64gcv-abi=lp64d") {
@@ -139281,17 +141016,25 @@ Index: chromium-153.0.8010.36/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",
++if (build_with_chromium) {
++  source_set("u8-rdminmax_ppc64") {
++    cflags = [
++  
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/u8-rdminmax/gen/u8-rdmax-2p2x-scalar-u2.c",
++    "src/src/u8-rdminmax/gen/u8-rdmin-2p2x-scalar-u2.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) {
@@ -139323,58 +141066,66 @@ Index: chromium-153.0.8010.36/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",
++    ]
++
++    public_configs = [ ":xnnpack_public_config" ]
    }
 +}
  
 -  if (build_with_chromium) {
 -    source_set("u8-maxpool_riscv64") {
 -      cflags = []
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/u8-maxpool/gen/u8-maxpool-9p-minmax-scalar-u1.c",
--      ]
-+if (build_with_chromium) {
-+  source_set("u8-rminmax_ppc64") {
++# This is a target that cannot depend on //base.
++if (build_with_internal_optimization_guide) {
++  source_set("u8-rdminmax_ppc64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/u8-rminmax/gen/u8-rmax-scalar-u2-acc2.c",
-+    "src/src/u8-rminmax/gen/u8-rmin-scalar-u2-acc2.c",
-+    "src/src/u8-rminmax/gen/u8-rminmax-scalar-u2-acc2.c"
++      "src/src/u8-rdminmax/gen/u8-rdmax-2p2x-scalar-u2.c",
++    "src/src/u8-rdminmax/gen/u8-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",
+-        "src/src/u8-maxpool/gen/u8-maxpool-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" ]
  
+-      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",
 -      ]
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool",
-+    ]
++    public_configs = [ ":xnnpack_public_config" ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
--    }
-+    public_configs = [ ":xnnpack_public_config" ]
++    if (!(is_android && use_order_profiling)) {
++      assert_no_deps = [ "//base" ]
+     }
    }
 +}
  
@@ -139382,20 +141133,7 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -  if (build_with_internal_optimization_guide) {
 -    source_set("u8-maxpool_riscv64_standalone") {
 -      cflags = []
-+# This is a target that cannot depend on //base.
-+if (build_with_internal_optimization_guide) {
-+  source_set("u8-rminmax_ppc64_standalone") {
-+    cflags = [
-+  
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/u8-rminmax/gen/u8-rmax-scalar-u2-acc2.c",
-+    "src/src/u8-rminmax/gen/u8-rmin-scalar-u2-acc2.c",
-+    "src/src/u8-rminmax/gen/u8-rminmax-scalar-u2-acc2.c"
-+    ]
- 
+-
 -      sources = [
 -        "src/include/xnnpack.h",
 -        "src/src/u8-maxpool/gen/u8-maxpool-9p-minmax-scalar-u1.c",
@@ -139420,10 +141158,18 @@ Index: chromium-153.0.8010.36/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("u8-rminmax_ppc64") {
++    cflags = [
++  
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/u8-rminmax/gen/u8-rmax-scalar-u2-acc2.c",
++    "src/src/u8-rminmax/gen/u8-rmin-scalar-u2-acc2.c",
++    "src/src/u8-rminmax/gen/u8-rminmax-scalar-u2-acc2.c"
++    ]
  
 -  if (build_with_chromium) {
 -    source_set("u8-rdminmax_arch=rv64gcv-abi=lp64d") {
@@ -139449,18 +141195,21 @@ Index: chromium-153.0.8010.36/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("u8-rdminmax_arch=rv64gcv-abi=lp64d_standalone") {
@@ -139492,57 +141241,61 @@ Index: chromium-153.0.8010.36/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" ]
    }
 +}
  
 -  if (build_with_chromium) {
 -    source_set("u8-rdminmax_riscv64") {
 -      cflags = []
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/u8-rdminmax/gen/u8-rdmax-2p2x-scalar-u2.c",
--        "src/src/u8-rdminmax/gen/u8-rdmin-2p2x-scalar-u2.c",
--      ]
-+if (build_with_chromium) {
-+  source_set("u8-vclamp_ppc64") {
++# This is a target that cannot depend on //base.
++if (build_with_internal_optimization_guide) {
++  source_set("u8-rminmax_ppc64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/u8-vclamp/u8-vclamp-scalar-u4.c"
++      "src/src/u8-rminmax/gen/u8-rmax-scalar-u2-acc2.c",
++    "src/src/u8-rminmax/gen/u8-rmin-scalar-u2-acc2.c",
++    "src/src/u8-rminmax/gen/u8-rminmax-scalar-u2-acc2.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",
+-        "src/src/u8-rdminmax/gen/u8-rdmax-2p2x-scalar-u2.c",
+-        "src/src/u8-rdminmax/gen/u8-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" ]
  
+-      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",
 -      ]
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool",
-+    ]
++    public_configs = [ ":xnnpack_public_config" ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
--    }
-+    public_configs = [ ":xnnpack_public_config" ]
++    if (!(is_android && use_order_profiling)) {
++      assert_no_deps = [ "//base" ]
+     }
    }
 +}
  
@@ -139550,18 +141303,7 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -  if (build_with_internal_optimization_guide) {
 -    source_set("u8-rdminmax_riscv64_standalone") {
 -      cflags = []
-+# This is a target that cannot depend on //base.
-+if (build_with_internal_optimization_guide) {
-+  source_set("u8-vclamp_ppc64_standalone") {
-+    cflags = [
-+  
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/u8-vclamp/u8-vclamp-scalar-u4.c"
-+    ]
- 
+-
 -      sources = [
 -        "src/include/xnnpack.h",
 -        "src/src/u8-rdminmax/gen/u8-rdmax-2p2x-scalar-u2.c",
@@ -139587,10 +141329,16 @@ Index: chromium-153.0.8010.36/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("u8-vclamp_ppc64") {
++    cflags = [
++  
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/u8-vclamp/u8-vclamp-scalar-u4.c"
++    ]
  
 -  if (build_with_chromium) {
 -    source_set("u8-rminmax_arch=rv64gcv-abi=lp64d") {
@@ -139617,18 +141365,21 @@ Index: chromium-153.0.8010.36/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("u8-rminmax_arch=rv64gcv-abi=lp64d_standalone") {
@@ -139661,61 +141412,60 @@ Index: chromium-153.0.8010.36/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" ]
    }
 +}
  
 -  if (build_with_chromium) {
 -    source_set("u8-rminmax_riscv64") {
 -      cflags = []
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/u8-rminmax/gen/u8-rmax-scalar-u2-acc2.c",
--        "src/src/u8-rminmax/gen/u8-rmin-scalar-u2-acc2.c",
--        "src/src/u8-rminmax/gen/u8-rminmax-scalar-u2-acc2.c",
--      ]
-+if (build_with_chromium) {
-+  source_set("x16-packw_ppc64") {
++# This is a target that cannot depend on //base.
++if (build_with_internal_optimization_guide) {
++  source_set("u8-vclamp_ppc64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x16-packw/gen/x16-packw-x16-gemm-gio-scalar.c",
-+    "src/src/x16-packw/gen/x16-packw-x32-gemm-gio-scalar.c",
-+    "src/src/x16-packw/gen/x16-packw-x32-gemm-goi-scalar-int-u4.c",
-+    "src/src/x16-packw/gen/x16-packw-x8-gemm-gio-scalar.c"
++      "src/src/u8-vclamp/u8-vclamp-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" ]
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/u8-rminmax/gen/u8-rmax-scalar-u2-acc2.c",
+-        "src/src/u8-rminmax/gen/u8-rmin-scalar-u2-acc2.c",
+-        "src/src/u8-rminmax/gen/u8-rminmax-scalar-u2-acc2.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",
 -      ]
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool",
-+    ]
++    public_configs = [ ":xnnpack_public_config" ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
--    }
-+    public_configs = [ ":xnnpack_public_config" ]
++    if (!(is_android && use_order_profiling)) {
++      assert_no_deps = [ "//base" ]
+     }
    }
 +}
  
@@ -139723,21 +141473,7 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -  if (build_with_internal_optimization_guide) {
 -    source_set("u8-rminmax_riscv64_standalone") {
 -      cflags = []
-+# This is a target that cannot depend on //base.
-+if (build_with_internal_optimization_guide) {
-+  source_set("x16-packw_ppc64_standalone") {
-+    cflags = [
-+  
-+    ]
-+  
-+    sources = [
-+      "src/include/xnnpack.h",
-+      "src/src/x16-packw/gen/x16-packw-x16-gemm-gio-scalar.c",
-+    "src/src/x16-packw/gen/x16-packw-x32-gemm-gio-scalar.c",
-+    "src/src/x16-packw/gen/x16-packw-x32-gemm-goi-scalar-int-u4.c",
-+    "src/src/x16-packw/gen/x16-packw-x8-gemm-gio-scalar.c"
-+    ]
- 
+-
 -      sources = [
 -        "src/include/xnnpack.h",
 -        "src/src/u8-rminmax/gen/u8-rmax-scalar-u2-acc2.c",
@@ -139764,10 +141500,18 @@ Index: chromium-153.0.8010.36/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("x16-packw_ppc64") {
++    cflags = [
++  
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/x16-packw/gen/x16-packw-x16-gemm-gio-scalar.c",
++    "src/src/x16-packw/gen/x16-packw-x32-gemm-gio-scalar.c",
++    "src/src/x16-packw/gen/x16-packw-x8-gemm-gio-scalar.c"
++    ]
  
 -  if (build_with_chromium) {
 -    source_set("u8-vclamp_arch=rv64gcv-abi=lp64d") {
@@ -139792,18 +141536,21 @@ Index: chromium-153.0.8010.36/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("u8-vclamp_arch=rv64gcv-abi=lp64d_standalone") {
@@ -139834,56 +141581,60 @@ Index: chromium-153.0.8010.36/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" ]
    }
 +}
  
 -  if (build_with_chromium) {
 -    source_set("u8-vclamp_riscv64") {
 -      cflags = []
--
--      sources = [
--        "src/include/xnnpack.h",
--        "src/src/u8-vclamp/u8-vclamp-scalar-u4.c",
--      ]
-+if (build_with_chromium) {
-+  source_set("x16-transposec_ppc64") {
++# This is a target that cannot depend on //base.
++if (build_with_internal_optimization_guide) {
++  source_set("x16-packw_ppc64_standalone") {
 +    cflags = [
 +  
 +    ]
 +  
 +    sources = [
 +      "src/include/xnnpack.h",
-+      "src/src/x16-transposec/gen/x16-transposec-2x4-scalar-int.c"
++      "src/src/x16-packw/gen/x16-packw-x16-gemm-gio-scalar.c",
++    "src/src/x16-packw/gen/x16-packw-x32-gemm-gio-scalar.c",
++    "src/src/x16-packw/gen/x16-packw-x8-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" ]
+-      sources = [
+-        "src/include/xnnpack.h",
+-        "src/src/u8-vclamp/u8-vclamp-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",
 -      ]
-+    deps = [
-+      "//third_party/cpuinfo",
-+      "//third_party/fp16",
-+      "//third_party/fxdiv",
-+      "//third_party/pthreadpool",
-+    ]
++    public_configs = [ ":xnnpack_public_config" ]
  
 -      public_configs = [ ":xnnpack_public_config" ]
--    }
-+    public_configs = [ ":xnnpack_public_config" ]
++    if (!(is_android && use_order_profiling)) {
++      assert_no_deps = [ "//base" ]
+     }
    }
 +}
  
@@ -139891,9 +141642,8 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -  if (build_with_internal_optimization_guide) {
 -    source_set("u8-vclamp_riscv64_standalone") {
 -      cflags = []
-+# This is a target that cannot depend on //base.
-+if (build_with_internal_optimization_guide) {
-+  source_set("x16-transposec_ppc64_standalone") {
++if (build_with_chromium) {
++  source_set("x16-transposec_ppc64") {
 +    cflags = [
 +  
 +    ]
@@ -139926,35 +141676,59 @@ Index: chromium-153.0.8010.36/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("x16-packw_riscv64") {
--      cflags = []
++
 +    deps = [
 +      "//third_party/cpuinfo",
 +      "//third_party/fp16",
 +      "//third_party/fxdiv",
-+      "//third_party/pthreadpool:pthreadpool_standalone",
++      "//third_party/pthreadpool",
++    ]
++
++    public_configs = [ ":xnnpack_public_config" ]
+   }
++}
+ 
+-  if (build_with_chromium) {
+-    source_set("x16-packw_riscv64") {
+-      cflags = []
++# This is a target that cannot depend on //base.
++if (build_with_internal_optimization_guide) {
++  source_set("x16-transposec_ppc64_standalone") {
++    cflags = [
++  
++    ]
++  
++    sources = [
++      "src/include/xnnpack.h",
++      "src/src/x16-transposec/gen/x16-transposec-2x4-scalar-int.c"
 +    ]
  
 -      sources = [
 -        "src/include/xnnpack.h",
 -        "src/src/x16-packw/gen/x16-packw-x16-gemm-gio-scalar.c",
 -        "src/src/x16-packw/gen/x16-packw-x32-gemm-gio-scalar.c",
--        "src/src/x16-packw/gen/x16-packw-x32-gemm-goi-scalar-int-u4.c",
 -        "src/src/x16-packw/gen/x16-packw-x8-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" ]
+ 
 -      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",
@@ -139990,7 +141764,6 @@ Index: chromium-153.0.8010.36/third_party/xnnpack/BUILD.gn
 -        "src/include/xnnpack.h",
 -        "src/src/x16-packw/gen/x16-packw-x16-gemm-gio-scalar.c",
 -        "src/src/x16-packw/gen/x16-packw-x32-gemm-gio-scalar.c",
--        "src/src/x16-packw/gen/x16-packw-x32-gemm-goi-scalar-int-u4.c",
 -        "src/src/x16-packw/gen/x16-packw-x8-gemm-gio-scalar.c",
 -      ]
 -

diff --git a/build-with-wasm-rollup.patch b/build-with-wasm-rollup.patch
index 30c5fbc..e0f7dec 100644
--- a/build-with-wasm-rollup.patch
+++ b/build-with-wasm-rollup.patch
@@ -1,5 +1,6 @@
---- a/third_party/devtools-frontend/src/front_end/Images/BUILD.gn
-+++ b/third_party/devtools-frontend/src/front_end/Images/BUILD.gn
+diff -up chromium-154.0.8037.57/third_party/devtools-frontend/src/front_end/Images/BUILD.gn.build-with-wasm-rollup chromium-154.0.8037.57/third_party/devtools-frontend/src/front_end/Images/BUILD.gn
+--- chromium-154.0.8037.57/third_party/devtools-frontend/src/front_end/Images/BUILD.gn.build-with-wasm-rollup	2026-09-22 02:09:16.000000000 +0200
++++ chromium-154.0.8037.57/third_party/devtools-frontend/src/front_end/Images/BUILD.gn	2026-09-23 16:40:40.895486247 +0200
 @@ -28,7 +28,7 @@ node_action("generate_css_vars") {
  }
  
@@ -9,8 +10,9 @@
  
    _bundled_entrypoint = target_gen_dir + "/Images.prebundle.js"
    _output_file_location = target_gen_dir + "/Images.js"
---- a/third_party/devtools-frontend/src/front_end/models/live-metrics/web-vitals-injected/BUILD.gn
-+++ b/third_party/devtools-frontend/src/front_end/models/live-metrics/web-vitals-injected/BUILD.gn
+diff -up chromium-154.0.8037.57/third_party/devtools-frontend/src/front_end/models/live-metrics/web-vitals-injected/BUILD.gn.build-with-wasm-rollup chromium-154.0.8037.57/third_party/devtools-frontend/src/front_end/models/live-metrics/web-vitals-injected/BUILD.gn
+--- chromium-154.0.8037.57/third_party/devtools-frontend/src/front_end/models/live-metrics/web-vitals-injected/BUILD.gn.build-with-wasm-rollup	2026-09-22 02:09:16.000000000 +0200
++++ chromium-154.0.8037.57/third_party/devtools-frontend/src/front_end/models/live-metrics/web-vitals-injected/BUILD.gn	2026-09-23 16:40:40.896352266 +0200
 @@ -26,7 +26,7 @@ devtools_module("web-vitals-injected") {
  }
  
@@ -20,9 +22,10 @@
  
    _bundled_entrypoint = target_gen_dir + "/web-vitals-injected.js"
    _output_file_location = target_gen_dir + "/web-vitals-injected.generated.js"
---- a/third_party/devtools-frontend/src/front_end/panels/recorder/injected/BUILD.gn
-+++ b/third_party/devtools-frontend/src/front_end/panels/recorder/injected/BUILD.gn
-@@ -55,7 +55,7 @@ devtools_entrypoint("bundle") {
+diff -up chromium-154.0.8037.57/third_party/devtools-frontend/src/front_end/panels/recorder/injected/BUILD.gn.build-with-wasm-rollup chromium-154.0.8037.57/third_party/devtools-frontend/src/front_end/panels/recorder/injected/BUILD.gn
+--- chromium-154.0.8037.57/third_party/devtools-frontend/src/front_end/panels/recorder/injected/BUILD.gn.build-with-wasm-rollup	2026-09-22 02:09:16.000000000 +0200
++++ chromium-154.0.8037.57/third_party/devtools-frontend/src/front_end/panels/recorder/injected/BUILD.gn	2026-09-23 16:40:40.896634097 +0200
+@@ -57,7 +57,7 @@ devtools_entrypoint("bundle") {
  }
  
  node_action("bundled_library") {
@@ -31,8 +34,9 @@
  
    _bundled_entrypoint = target_gen_dir + "/injected.js"
    _output_file_location = target_gen_dir + "/injected.generated.js"
---- a/third_party/devtools-frontend/src/inspector_overlay/BUILD.gn
-+++ b/third_party/devtools-frontend/src/inspector_overlay/BUILD.gn
+diff -up chromium-154.0.8037.57/third_party/devtools-frontend/src/inspector_overlay/BUILD.gn.build-with-wasm-rollup chromium-154.0.8037.57/third_party/devtools-frontend/src/inspector_overlay/BUILD.gn
+--- chromium-154.0.8037.57/third_party/devtools-frontend/src/inspector_overlay/BUILD.gn.build-with-wasm-rollup	2026-09-22 02:09:16.000000000 +0200
++++ chromium-154.0.8037.57/third_party/devtools-frontend/src/inspector_overlay/BUILD.gn	2026-09-23 16:40:40.896898910 +0200
 @@ -38,7 +38,7 @@ action("build_inspector_overlay") {
      "$target_gen_dir/tool_window_controls.css",
      "$target_gen_dir/main.js",
@@ -42,8 +46,9 @@
    ]
  
    outputs = [ "$resources_out_dir/main.js" ]
---- a/third_party/devtools-frontend/src/scripts/build/build_inspector_overlay.py
-+++ b/third_party/devtools-frontend/src/scripts/build/build_inspector_overlay.py
+diff -up chromium-154.0.8037.57/third_party/devtools-frontend/src/scripts/build/build_inspector_overlay.py.build-with-wasm-rollup chromium-154.0.8037.57/third_party/devtools-frontend/src/scripts/build/build_inspector_overlay.py
+--- chromium-154.0.8037.57/third_party/devtools-frontend/src/scripts/build/build_inspector_overlay.py.build-with-wasm-rollup	2026-09-22 02:09:16.000000000 +0200
++++ chromium-154.0.8037.57/third_party/devtools-frontend/src/scripts/build/build_inspector_overlay.py	2026-09-23 16:40:40.897130981 +0200
 @@ -56,7 +56,7 @@ def rollup(input_path, output_path, file
          [devtools_paths.node_path(),
           devtools_paths.rollup_path()] +
@@ -53,21 +58,22 @@
          stdout=subprocess.PIPE,
          stderr=subprocess.PIPE,
          universal_newlines=True,
---- a/third_party/devtools-frontend/src/scripts/build/ninja/bundle.gni
-+++ b/third_party/devtools-frontend/src/scripts/build/ninja/bundle.gni
+diff -up chromium-154.0.8037.57/third_party/devtools-frontend/src/scripts/build/ninja/bundle.gni.build-with-wasm-rollup chromium-154.0.8037.57/third_party/devtools-frontend/src/scripts/build/ninja/bundle.gni
+--- chromium-154.0.8037.57/third_party/devtools-frontend/src/scripts/build/ninja/bundle.gni.build-with-wasm-rollup	2026-09-22 02:09:16.000000000 +0200
++++ chromium-154.0.8037.57/third_party/devtools-frontend/src/scripts/build/ninja/bundle.gni	2026-09-23 16:51:01.399321185 +0200
 @@ -11,7 +11,7 @@ template("bundle") {
           "You must define the 'entrypoint' for a bundle target")
  
    node_action(target_name) {
 -    script = "scripts/build/esbuild.js"
 +    script = "../../node/node_modules/@rollup/wasm-node/dist/bin/rollup"
-     forward_variables_from(invoker,
-                            [
-                              "visibility",
-@@ -21,27 +21,23 @@ template("bundle") {
- 
+     _bundled_entrypoints_target =
+         devtools_location_prepend + ":bundled_entrypoints"
+     deps = [ _bundled_entrypoints_target ]
+@@ -31,22 +31,22 @@ template("bundle") {
      inputs = [
        invoker.entrypoint,
+       _entrypoints_file,
 +      devtools_location_prepend + "scripts/build/rollup.config.mjs",
        devtools_location_prepend + "scripts/build/devtools_plugin.js",
        devtools_location_prepend + "scripts/devtools_paths.js",
@@ -80,6 +86,9 @@
 -      inputs += [ _esbuild ]
 -    }
 -
+     _depfile = "$target_gen_dir/$target_name.d"
+     depfile = _depfile
+ 
      args = [
 +      "--config",
 +      rebase_path(
@@ -89,7 +98,10 @@
        rebase_path(invoker.entrypoint, root_build_dir),
 +      "--file",
        rebase_path(invoker.output_file_location, root_build_dir),
-       "--configSourcemaps",
+       "--entrypointsFile",
+       rebase_path(_entrypoints_file, root_build_dir),
+@@ -59,10 +59,6 @@ template("bundle") {
+       rebase_path(_depfile, root_build_dir),
      ]
  
 -    if (!is_debug) {
@@ -99,9 +111,10 @@
      outputs = [ invoker.output_file_location ]
    }
  }
---- a/third_party/devtools-frontend/src/scripts/devtools_paths.py
-+++ b/third_party/devtools-frontend/src/scripts/devtools_paths.py
-@@ -64,8 +64,11 @@ def license_checker_path():
+diff -up chromium-154.0.8037.57/third_party/devtools-frontend/src/scripts/devtools_paths.py.build-with-wasm-rollup chromium-154.0.8037.57/third_party/devtools-frontend/src/scripts/devtools_paths.py
+--- chromium-154.0.8037.57/third_party/devtools-frontend/src/scripts/devtools_paths.py.build-with-wasm-rollup	2026-09-22 02:09:16.000000000 +0200
++++ chromium-154.0.8037.57/third_party/devtools-frontend/src/scripts/devtools_paths.py	2026-09-23 16:40:40.897786257 +0200
+@@ -65,8 +65,11 @@ def license_checker_path():
  
  def rollup_path():
      return path.join(

diff --git a/chromium-153-ftbfs-crubit.patch b/chromium-153-ftbfs-crubit.patch
deleted file mode 100644
index 5e9fe8f..0000000
--- a/chromium-153-ftbfs-crubit.patch
+++ /dev/null
@@ -1,282 +0,0 @@
-commit 493e6c3911e33cc356856bafbffc6cf95521266b
-Author: Dominik Röttsches <drott@chromium.org>
-Date:   Thu Aug 13 08:42:15 2026 -0700
-
-    Migrate OpenType format check bindings to Crubit
-    
-    We can remove the Box<> wrapped typing of FontFormatInfo along the way.
-    
-    DEPS checks for the generated output header files requires us to move
-    the format_check target into the fonts subdirectory. This is a good
-    opportunity to move more font specific build rules to the font subdir in
-    the future and reduce the weight of the platform/BUILD.gn build dir.
-    
-    Exercise in using the Crubit bindings mechanism.
-    
-    No functional change.
-    
-    Change-Id: I9440c7285bb707b325b80ee074de51e714ee4884
-    Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/8244248
-    Reviewed-by: Łukasz Anforowicz <lukasza@chromium.org>
-    Commit-Queue: Dominik Röttsches <drott@chromium.org>
-    Cr-Commit-Position: refs/heads/main@{#1678858}
-
-diff --git a/third_party/blink/renderer/platform/BUILD.gn b/third_party/blink/renderer/platform/BUILD.gn
-index d5e81a3f07a3c..6a5d275460122 100644
---- a/third_party/blink/renderer/platform/BUILD.gn
-+++ b/third_party/blink/renderer/platform/BUILD.gn
-@@ -186,18 +186,6 @@ group("make_platform_generated") {
-   ]
- }
- 
--rust_static_library("font_format_check") {
--  allow_unsafe = true  # Needed for FFI that underpins the `cxx` crate.
--  crate_root = "fonts/opentype/format_check.rs"
--  sources = [ crate_root ]
--  cxx_bindings = [ crate_root ]
--  deps = [
--    "//third_party/rust/font_types/v0_12:lib",
--    "//third_party/rust/read_fonts/v0_41:lib",
--    "//third_party/rust/skrifa/v0_44:lib",
--  ]
--}
--
- rust_static_library("rustfft_ffi") {
-   allow_unsafe = true  # Needed for FFI that underpins the `cxx` crate.
-   crate_root = "audio/rustfft_ffi.rs"
-@@ -1806,6 +1794,7 @@ component("platform") {
-     ":allow_discouraged_type",
-     ":blink_platform_public_deps",
-     ":platform_export",
-+    "//build/rust/crubit",
-     "//gpu/command_buffer/client:raster_interface",
-     "//media/capture:capture_lib",
-     "//mojo/public/cpp/base",
-@@ -1832,8 +1821,8 @@ component("platform") {
-     "//ui/native_theme/features",
-   ]
-   deps = [
--    ":font_format_check",
-     ":rustfft_ffi",
-+    "fonts:font_format_bindings",
-     "//base:base_static",
-     "//base/allocator:buildflags",
-     "//build:chromecast_buildflags",
-diff --git a/third_party/blink/renderer/platform/fonts/BUILD.gn b/third_party/blink/renderer/platform/fonts/BUILD.gn
-new file mode 100644
-index 0000000000000..51b9b03ba7c85
---- /dev/null
-+++ b/third_party/blink/renderer/platform/fonts/BUILD.gn
-@@ -0,0 +1,19 @@
-+# Copyright 2026 The Chromium Authors
-+# Use of this source code is governed by a BSD-style license that can be
-+# found in the LICENSE file.
-+
-+import("//build/rust/rust_static_library.gni")
-+
-+rust_static_library("font_format") {
-+  crate_root = "opentype/format_check.rs"
-+  sources = [ crate_root ]
-+  cpp_api_from_rust = {
-+    target_name = "font_format_bindings"
-+    cpp_namespace = "font_format"
-+  }
-+  deps = [
-+    "//third_party/rust/font_types/v0_12:lib",
-+    "//third_party/rust/read_fonts/v0_41:lib",
-+    "//third_party/rust/skrifa/v0_44:lib",
-+  ]
-+}
-diff --git a/third_party/blink/renderer/platform/fonts/opentype/font_format_check.cc b/third_party/blink/renderer/platform/fonts/opentype/font_format_check.cc
-index b9d2639822bc0..f58e9433d39f4 100644
---- a/third_party/blink/renderer/platform/fonts/opentype/font_format_check.cc
-+++ b/third_party/blink/renderer/platform/fonts/opentype/font_format_check.cc
-@@ -7,7 +7,6 @@
- #include "base/containers/span.h"
- #include "base/containers/span_rust.h"
- #include "base/numerics/byte_conversions.h"
--#include "third_party/blink/renderer/platform/fonts/opentype/format_check.rs.h"
- #include "third_party/blink/renderer/platform/runtime_enabled_features.h"
- #include "third_party/blink/renderer/platform/wtf/vector.h"
- #include "third_party/skia/include/core/SkTypeface.h"
-@@ -15,35 +14,37 @@
- namespace blink {
- 
- FontFormatCheck::FontFormatCheck(sk_sp<SkData> sk_data)
--    : format_info_(font_format_check::get_font_format_info(
-+    : format_info_(font_format::get_font_format_info(
-           base::SpanToRustSlice(sk_data->byteSpan()))) {}
- 
-+FontFormatCheck::~FontFormatCheck() = default;
-+
- bool FontFormatCheck::IsVariableFont() const {
--  return font_format_check::is_variable(*format_info_);
-+  return font_format::is_variable(format_info_);
- }
- 
- bool FontFormatCheck::IsCbdtCblcColorFont() const {
--  return font_format_check::is_cbdt_cblc(*format_info_);
-+  return font_format::is_cbdt_cblc(format_info_);
- }
- 
- bool FontFormatCheck::IsEbdtEblcMonochromeFont() const {
--  return font_format_check::is_ebdt_eblc(*format_info_);
-+  return font_format::is_ebdt_eblc(format_info_);
- }
- 
- bool FontFormatCheck::IsColrCpalColorFontV0() const {
--  return font_format_check::is_colrv0(*format_info_);
-+  return font_format::is_colrv0(format_info_);
- }
- 
- bool FontFormatCheck::IsColrCpalColorFontV1() const {
--  return font_format_check::is_colrv1(*format_info_);
-+  return font_format::is_colrv1(format_info_);
- }
- 
- bool FontFormatCheck::IsSbixColorFont() const {
--  return font_format_check::is_sbix(*format_info_);
-+  return font_format::is_sbix(format_info_);
- }
- 
- bool FontFormatCheck::IsCff2OutlineFont() const {
--  return font_format_check::is_cff2(*format_info_);
-+  return font_format::is_cff2(format_info_);
- }
- 
- bool FontFormatCheck::IsVariableColrV0Font() const {
-@@ -57,7 +58,7 @@ bool FontFormatCheck::IsColorFont() const {
- 
- bool FontFormatCheck::IsAvar2Font() const {
-   return RuntimeEnabledFeatures::FontFormatAvar2Enabled() &&
--         font_format_check::is_avar2(*format_info_);
-+         font_format::is_avar2(format_info_);
- }
- 
- FontFormatCheck::VariableFontSubType FontFormatCheck::ProbeVariableFont(
-diff --git a/third_party/blink/renderer/platform/fonts/opentype/font_format_check.h b/third_party/blink/renderer/platform/fonts/opentype/font_format_check.h
-index 19d2639233b07..af50dbdf74d00 100644
---- a/third_party/blink/renderer/platform/fonts/opentype/font_format_check.h
-+++ b/third_party/blink/renderer/platform/fonts/opentype/font_format_check.h
-@@ -5,7 +5,7 @@
- #ifndef THIRD_PARTY_BLINK_RENDERER_PLATFORM_FONTS_OPENTYPE_FONT_FORMAT_CHECK_H_
- #define THIRD_PARTY_BLINK_RENDERER_PLATFORM_FONTS_OPENTYPE_FONT_FORMAT_CHECK_H_
- 
--#include "third_party/blink/renderer/platform/fonts/opentype/format_check.rs.h"
-+#include "third_party/blink/renderer/platform/fonts/font_format.h"
- #include "third_party/blink/renderer/platform/platform_export.h"
- #include "third_party/blink/renderer/platform/wtf/allocator/allocator.h"
- #include "third_party/skia/include/core/SkData.h"
-@@ -19,7 +19,7 @@ class PLATFORM_EXPORT FontFormatCheck {
- 
-  public:
-   explicit FontFormatCheck(sk_sp<SkData>);
--  virtual ~FontFormatCheck() = default;
-+  virtual ~FontFormatCheck();
-   virtual bool IsVariableFont() const;
-   virtual bool IsCbdtCblcColorFont() const;
-   virtual bool IsEbdtEblcMonochromeFont() const;
-@@ -46,7 +46,7 @@ class PLATFORM_EXPORT FontFormatCheck {
-   enum class COLRVersion { kCOLRV0, kCOLRV1, kNoCOLR };
- 
-  private:
--  rust::Box<font_format_check::FontFormatInfo> format_info_;
-+  font_format::FontFormatInfo format_info_;
- };
- 
- }  // namespace blink
-diff --git a/third_party/blink/renderer/platform/fonts/opentype/format_check.rs b/third_party/blink/renderer/platform/fonts/opentype/format_check.rs
-index eda8e6b2b8188..b99f0ec8655e6 100644
---- a/third_party/blink/renderer/platform/fonts/opentype/format_check.rs
-+++ b/third_party/blink/renderer/platform/fonts/opentype/format_check.rs
-@@ -23,7 +23,7 @@ pub struct FontFormatInfo {
-     format_flags: Option<FontFormatFlags>,
- }
- 
--pub fn get_font_format_info(font_bytes: &[u8]) -> Box<FontFormatInfo> {
-+pub fn get_font_format_info(font_bytes: &[u8]) -> FontFormatInfo {
-     let file_ref = make_font_ref_internal(font_bytes, 0);
- 
-     match file_ref {
-@@ -32,11 +32,11 @@ pub fn get_font_format_info(font_bytes: &[u8]) -> Box<FontFormatInfo> {
-                 font.table_directory().table_records().iter().map(|e| e.tag()).collect();
-             let color_version = get_colr_version(&font);
-             let avar_version = get_avar_version(&font);
--            Box::new(FontFormatInfo {
-+            FontFormatInfo {
-                 format_flags: Some(FontFormatFlags { table_tags, color_version, avar_version }),
--            })
-+            }
-         }
--        _ => Box::new(FontFormatInfo::default()),
-+        _ => FontFormatInfo::default(),
-     }
- }
- 
-@@ -44,10 +44,10 @@ fn get_colr_version(font_ref: &FontRef) -> Option<u16> {
-     Some(font_ref.colr().ok()?.version())
- }
- 
--fn is_colrv1(format_info: &FontFormatInfo) -> bool {
-+pub fn is_colrv1(format_info: &FontFormatInfo) -> bool {
-     matches!(&format_info.format_flags, Some(FontFormatFlags { color_version: Some(1), .. }),)
- }
--fn is_colrv0(format_info: &FontFormatInfo) -> bool {
-+pub fn is_colrv0(format_info: &FontFormatInfo) -> bool {
-     matches!(&format_info.format_flags, Some(FontFormatFlags { color_version: Some(0), .. }),)
- }
- 
-@@ -56,7 +56,7 @@ fn get_avar_version(font_ref: &FontRef) -> Option<(u16, u16)> {
-     Some((version.major, version.minor))
- }
- 
--fn is_avar2(format_info: &FontFormatInfo) -> bool {
-+pub fn is_avar2(format_info: &FontFormatInfo) -> bool {
-     matches!(&format_info.format_flags, Some(FontFormatFlags { avar_version: Some((2, _)), .. }),)
- }
- 
-@@ -69,39 +69,22 @@ fn has_tags(format_info: &FontFormatInfo, query: &[Tag]) -> bool {
-     }
- }
- 
--fn is_variable(format_info: &FontFormatInfo) -> bool {
-+pub fn is_variable(format_info: &FontFormatInfo) -> bool {
-     has_tags(format_info, &[Tag::new(b"fvar")])
- }
- 
--fn is_sbix(format_info: &FontFormatInfo) -> bool {
-+pub fn is_sbix(format_info: &FontFormatInfo) -> bool {
-     has_tags(format_info, &[Tag::new(b"sbix")])
- }
- 
--fn is_cbdt_cblc(format_info: &FontFormatInfo) -> bool {
-+pub fn is_cbdt_cblc(format_info: &FontFormatInfo) -> bool {
-     has_tags(format_info, &[Tag::new(b"CBDT"), Tag::new(b"CBLC")])
- }
- 
--fn is_ebdt_eblc(format_info: &FontFormatInfo) -> bool {
-+pub fn is_ebdt_eblc(format_info: &FontFormatInfo) -> bool {
-     has_tags(format_info, &[Tag::new(b"EBDT"), Tag::new(b"EBLC")])
- }
- 
--fn is_cff2(format_info: &FontFormatInfo) -> bool {
-+pub fn is_cff2(format_info: &FontFormatInfo) -> bool {
-     has_tags(format_info, &[Tag::new(b"CFF2")])
- }
--
--#[cxx::bridge(namespace = "font_format_check")]
--pub mod ffi {
--    extern "Rust" {
--        type FontFormatInfo;
--
--        fn get_font_format_info(font_bytes: &[u8]) -> Box<FontFormatInfo>;
--        fn is_colrv1(format_info: &FontFormatInfo) -> bool;
--        fn is_colrv0(format_info: &FontFormatInfo) -> bool;
--        fn is_cbdt_cblc(format_info: &FontFormatInfo) -> bool;
--        fn is_ebdt_eblc(format_info: &FontFormatInfo) -> bool;
--        fn is_variable(format_info: &FontFormatInfo) -> bool;
--        fn is_sbix(format_info: &FontFormatInfo) -> bool;
--        fn is_cff2(format_info: &FontFormatInfo) -> bool;
--        fn is_avar2(format_info: &FontFormatInfo) -> bool;
--    }
--}

diff --git a/chromium-153-rust-1.88-enable-unstable_features.patch b/chromium-153-rust-1.88-enable-unstable_features.patch
deleted file mode 100644
index 7234a23..0000000
--- a/chromium-153-rust-1.88-enable-unstable_features.patch
+++ /dev/null
@@ -1,117 +0,0 @@
-error[E0658]: the target feature `avx512f` is currently unstable
-   --> ../../third_party/rust/chromium_crates_io/vendor/jxl_simd-v0_5/src/x86_64/avx512.rs:123:26
-    |
-123 |         #[target_feature(enable = "avx512f")]
-    |                          ^^^^^^^^^^^^^^^^^^
-    |
-    = note: see issue #44839 <https://github.com/rust-lang/rust/issues/44839> for more information
-    = help: add `#![feature(avx512_target_feature)]` to the crate attributes to enable
-    = note: this compiler was built on 2025-06-23; consider upgrading it if it is out of date
-
-Fix FTBFS on el9
-
-diff -up 153.0.8010.36/third_party/rust/chromium_crates_io/vendor/jxl_simd-v0_5/src/lib.rs.me 153.0.8010.36/third_party/rust/chromium_crates_io/vendor/jxl_simd-v0_5/src/lib.rs
---- 153.0.8010.36/third_party/rust/chromium_crates_io/vendor/jxl_simd-v0_5/src/lib.rs.me	2026-02-12 20:44:24.000000000 +0100
-+++ 153.0.8010.36/third_party/rust/chromium_crates_io/vendor/jxl_simd-v0_5/src/lib.rs	2026-02-15 20:10:02.848196172 +0100
-@@ -4,6 +4,8 @@
- // license that can be found in the LICENSE file.
- 
- #![allow(clippy::too_many_arguments)]
-+#![feature(avx512_target_feature)]
-+#![cfg_attr(target_arch = "x86_64", feature(stdarch_x86_avx512))]
- 
- use std::{
-     fmt::Debug,
-diff -up 153.0.8010.36/third_party/rust/chromium_crates_io/vendor/jxl_transforms-v0_5/src/lib.rs.me 153.0.8010.36/third_party/rust/chromium_crates_io/vendor/jxl_transforms-v0_5/src/lib.rs
---- 153.0.8010.36/third_party/rust/chromium_crates_io/vendor/jxl_transforms-v0_5/src/lib.rs.me	2026-02-12 20:44:24.000000000 +0100
-+++ 153.0.8010.36/third_party/rust/chromium_crates_io/vendor/jxl_transforms-v0_5/src/lib.rs	2026-02-15 20:09:43.548731085 +0100
-@@ -3,6 +3,9 @@
- // Use of this source code is governed by a BSD-style
- // license that can be found in the LICENSE file.
- 
-+#![feature(avx512_target_feature)]
-+#![cfg_attr(target_arch = "x86_64", feature(stdarch_x86_avx512))]
-+
- mod idct2d;
- mod reinterpreting_dct2d;
- pub mod transform;
-diff -up 153.0.8010.36/third_party/rust/chromium_crates_io/vendor/jxl-v0_5/src/lib.rs.me 153.0.8010.36/third_party/rust/chromium_crates_io/vendor/jxl-v0_5/src/lib.rs
---- 153.0.8010.36/third_party/rust/chromium_crates_io/vendor/jxl-v0_5/src/lib.rs.me	2026-02-12 20:44:24.000000000 +0100
-+++ 153.0.8010.36/third_party/rust/chromium_crates_io/vendor/jxl-v0_5/src/lib.rs	2026-02-15 20:11:01.678559809 +0100
-@@ -3,6 +3,10 @@
- // Use of this source code is governed by a BSD-style
- // license that can be found in the LICENSE file.
- 
-+#![feature(avx512_target_feature)]
-+#![cfg_attr(target_arch = "x86_64", feature(stdarch_x86_avx512))]
-+#![feature(non_null_from_ref)]
-+
- #![deny(unsafe_code)]
- pub mod api;
- pub mod bit_reader;
-diff -up 153.0.8010.36/third_party/rust/jxl_simd/v0_5/BUILD.gn.me 153.0.8010.36/third_party/rust/jxl_simd/v0_5/BUILD.gn
---- 153.0.8010.36/third_party/rust/jxl_simd/v0_5/BUILD.gn.me	2026-02-12 20:44:24.000000000 +0100
-+++ 153.0.8010.36/third_party/rust/jxl_simd/v0_5/BUILD.gn	2026-02-15 20:15:51.823722639 +0100
-@@ -36,6 +36,10 @@ cargo_crate("lib") {
- 
-   allow_unsafe = true
- 
-+  rustflags = [
-+    "-Zallow-features=stdarch_x86_avx512,avx512_target_feature",
-+  ]
-+
-   features = [
-     "all-simd",
-     "avx",
-@@ -69,6 +73,7 @@ cargo_crate("lib") {
-   # `extra_kv.configs_to_remove` and `extra_kv.configs_to_add` from
-   # `gnrt_config.toml`).
-   _configs_to_remove += [ "//build/config/compiler:default_optimization" ]
-+  _configs_to_remove += [ "//build/config/compiler:disallow_unstable_features" ]
-   _configs_to_add += [ "//build/config/compiler:optimize" ]
- 
-   # Applying config changes.
-diff -up 153.0.8010.36/third_party/rust/jxl_transforms/v0_5/BUILD.gn.me 153.0.8010.36/third_party/rust/jxl_transforms/v0_5/BUILD.gn
---- 153.0.8010.36/third_party/rust/jxl_transforms/v0_5/BUILD.gn.me	2026-02-12 20:44:24.000000000 +0100
-+++ 153.0.8010.36/third_party/rust/jxl_transforms/v0_5/BUILD.gn	2026-02-15 20:17:33.887730035 +0100
-@@ -45,6 +45,10 @@ cargo_crate("lib") {
- 
-   allow_unsafe = true
- 
-+  rustflags = [
-+    "-Zallow-features=stdarch_x86_avx512,avx512_target_feature",
-+  ]
-+
-   deps = [ "//third_party/rust/jxl_simd/v0_5:lib" ]
- 
-   # Only for usage from third-party crates. Add the crate to
-@@ -72,6 +76,7 @@ cargo_crate("lib") {
-   # `extra_kv.configs_to_remove` and `extra_kv.configs_to_add` from
-   # `gnrt_config.toml`).
-   _configs_to_remove += [ "//build/config/compiler:default_optimization" ]
-+  _configs_to_remove += [ "//build/config/compiler:disallow_unstable_features" ]
-   _configs_to_add += [ "//build/config/compiler:optimize" ]
- 
-   # Applying config changes.
-diff -up 153.0.8010.36/third_party/rust/jxl/v0_5/BUILD.gn.me 153.0.8010.36/third_party/rust/jxl/v0_5/BUILD.gn
---- 153.0.8010.36/third_party/rust/jxl/v0_5/BUILD.gn.me	2026-02-12 20:44:24.000000000 +0100
-+++ 153.0.8010.36/third_party/rust/jxl/v0_5/BUILD.gn	2026-02-15 20:16:47.026490882 +0100
-@@ -169,6 +169,10 @@ cargo_crate("lib") {
- 
-   allow_unsafe = true
- 
-+  rustflags = [
-+    "-Zallow-features=stdarch_x86_avx512,avx512_target_feature,non_null_from_ref",
-+  ]
-+
-   deps = [
-     "//third_party/rust/array_init/v2:lib",
-     "//third_party/rust/byteorder/v1:lib",
-@@ -201,6 +205,7 @@ cargo_crate("lib") {
-   # `extra_kv.configs_to_remove` and `extra_kv.configs_to_add` from
-   # `gnrt_config.toml`).
-   _configs_to_remove += [ "//build/config/compiler:default_optimization" ]
-+  _configs_to_remove += [ "//build/config/compiler:disallow_unstable_features" ]
-   _configs_to_add += [ "//build/config/compiler:optimize" ]
- 
-   # Applying config changes.

diff --git a/chromium-154-ftbfs-crubit.patch b/chromium-154-ftbfs-crubit.patch
new file mode 100644
index 0000000..b4137f5
--- /dev/null
+++ b/chromium-154-ftbfs-crubit.patch
@@ -0,0 +1,282 @@
+commit 493e6c3911e33cc356856bafbffc6cf95521266b
+Author: Dominik Röttsches <drott@chromium.org>
+Date:   Thu Aug 13 08:42:15 2026 -0700
+
+    Migrate OpenType format check bindings to Crubit
+    
+    We can remove the Box<> wrapped typing of FontFormatInfo along the way.
+    
+    DEPS checks for the generated output header files requires us to move
+    the format_check target into the fonts subdirectory. This is a good
+    opportunity to move more font specific build rules to the font subdir in
+    the future and reduce the weight of the platform/BUILD.gn build dir.
+    
+    Exercise in using the Crubit bindings mechanism.
+    
+    No functional change.
+    
+    Change-Id: I9440c7285bb707b325b80ee074de51e714ee4884
+    Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/8244248
+    Reviewed-by: Łukasz Anforowicz <lukasza@chromium.org>
+    Commit-Queue: Dominik Röttsches <drott@chromium.org>
+    Cr-Commit-Position: refs/heads/main@{#1678858}
+
+diff --git a/third_party/blink/renderer/platform/BUILD.gn b/third_party/blink/renderer/platform/BUILD.gn
+index d5e81a3f07a3c..6a5d275460122 100644
+--- a/third_party/blink/renderer/platform/BUILD.gn
++++ b/third_party/blink/renderer/platform/BUILD.gn
+@@ -186,18 +186,6 @@ group("make_platform_generated") {
+   ]
+ }
+ 
+-rust_static_library("font_format_check") {
+-  allow_unsafe = true  # Needed for FFI that underpins the `cxx` crate.
+-  crate_root = "fonts/opentype/format_check.rs"
+-  sources = [ crate_root ]
+-  cxx_bindings = [ crate_root ]
+-  deps = [
+-    "//third_party/rust/font_types/v0_12:lib",
+-    "//third_party/rust/read_fonts/v0_41:lib",
+-    "//third_party/rust/skrifa/v0_44:lib",
+-  ]
+-}
+-
+ rust_static_library("rustfft_ffi") {
+   allow_unsafe = true  # Needed for FFI that underpins the `cxx` crate.
+   crate_root = "audio/rustfft_ffi.rs"
+@@ -1806,6 +1794,7 @@ component("platform") {
+     ":allow_discouraged_type",
+     ":blink_platform_public_deps",
+     ":platform_export",
++    "//build/rust/crubit",
+     "//gpu/command_buffer/client:raster_interface",
+     "//media/capture:capture_lib",
+     "//mojo/public/cpp/base",
+@@ -1832,8 +1821,8 @@ component("platform") {
+     "//ui/native_theme/features",
+   ]
+   deps = [
+-    ":font_format_check",
+     ":rustfft_ffi",
++    "fonts:font_format_bindings",
+     "//base:base_static",
+     "//base/allocator:buildflags",
+     "//build:chromecast_buildflags",
+diff --git a/third_party/blink/renderer/platform/fonts/BUILD.gn b/third_party/blink/renderer/platform/fonts/BUILD.gn
+new file mode 100644
+index 0000000000000..51b9b03ba7c85
+--- /dev/null
++++ b/third_party/blink/renderer/platform/fonts/BUILD.gn
+@@ -0,0 +1,19 @@
++# Copyright 2026 The Chromium Authors
++# Use of this source code is governed by a BSD-style license that can be
++# found in the LICENSE file.
++
++import("//build/rust/rust_static_library.gni")
++
++rust_static_library("font_format") {
++  crate_root = "opentype/format_check.rs"
++  sources = [ crate_root ]
++  cpp_api_from_rust = {
++    target_name = "font_format_bindings"
++    cpp_namespace = "font_format"
++  }
++  deps = [
++    "//third_party/rust/font_types/v0_12:lib",
++    "//third_party/rust/read_fonts/v0_43:lib",
++    "//third_party/rust/skrifa/v0_46:lib",
++  ]
++}
+diff --git a/third_party/blink/renderer/platform/fonts/opentype/font_format_check.cc b/third_party/blink/renderer/platform/fonts/opentype/font_format_check.cc
+index b9d2639822bc0..f58e9433d39f4 100644
+--- a/third_party/blink/renderer/platform/fonts/opentype/font_format_check.cc
++++ b/third_party/blink/renderer/platform/fonts/opentype/font_format_check.cc
+@@ -7,7 +7,6 @@
+ #include "base/containers/span.h"
+ #include "base/containers/span_rust.h"
+ #include "base/numerics/byte_conversions.h"
+-#include "third_party/blink/renderer/platform/fonts/opentype/format_check.rs.h"
+ #include "third_party/blink/renderer/platform/runtime_enabled_features.h"
+ #include "third_party/blink/renderer/platform/wtf/vector.h"
+ #include "third_party/skia/include/core/SkTypeface.h"
+@@ -15,35 +14,37 @@
+ namespace blink {
+ 
+ FontFormatCheck::FontFormatCheck(sk_sp<SkData> sk_data)
+-    : format_info_(font_format_check::get_font_format_info(
++    : format_info_(font_format::get_font_format_info(
+           base::SpanToRustSlice(sk_data->byteSpan()))) {}
+ 
++FontFormatCheck::~FontFormatCheck() = default;
++
+ bool FontFormatCheck::IsVariableFont() const {
+-  return font_format_check::is_variable(*format_info_);
++  return font_format::is_variable(format_info_);
+ }
+ 
+ bool FontFormatCheck::IsCbdtCblcColorFont() const {
+-  return font_format_check::is_cbdt_cblc(*format_info_);
++  return font_format::is_cbdt_cblc(format_info_);
+ }
+ 
+ bool FontFormatCheck::IsEbdtEblcMonochromeFont() const {
+-  return font_format_check::is_ebdt_eblc(*format_info_);
++  return font_format::is_ebdt_eblc(format_info_);
+ }
+ 
+ bool FontFormatCheck::IsColrCpalColorFontV0() const {
+-  return font_format_check::is_colrv0(*format_info_);
++  return font_format::is_colrv0(format_info_);
+ }
+ 
+ bool FontFormatCheck::IsColrCpalColorFontV1() const {
+-  return font_format_check::is_colrv1(*format_info_);
++  return font_format::is_colrv1(format_info_);
+ }
+ 
+ bool FontFormatCheck::IsSbixColorFont() const {
+-  return font_format_check::is_sbix(*format_info_);
++  return font_format::is_sbix(format_info_);
+ }
+ 
+ bool FontFormatCheck::IsCff2OutlineFont() const {
+-  return font_format_check::is_cff2(*format_info_);
++  return font_format::is_cff2(format_info_);
+ }
+ 
+ bool FontFormatCheck::IsVariableColrV0Font() const {
+@@ -57,7 +58,7 @@ bool FontFormatCheck::IsColorFont() const {
+ 
+ bool FontFormatCheck::IsAvar2Font() const {
+   return RuntimeEnabledFeatures::FontFormatAvar2Enabled() &&
+-         font_format_check::is_avar2(*format_info_);
++         font_format::is_avar2(format_info_);
+ }
+ 
+ FontFormatCheck::VariableFontSubType FontFormatCheck::ProbeVariableFont(
+diff --git a/third_party/blink/renderer/platform/fonts/opentype/font_format_check.h b/third_party/blink/renderer/platform/fonts/opentype/font_format_check.h
+index 19d2639233b07..af50dbdf74d00 100644
+--- a/third_party/blink/renderer/platform/fonts/opentype/font_format_check.h
++++ b/third_party/blink/renderer/platform/fonts/opentype/font_format_check.h
+@@ -5,7 +5,7 @@
+ #ifndef THIRD_PARTY_BLINK_RENDERER_PLATFORM_FONTS_OPENTYPE_FONT_FORMAT_CHECK_H_
+ #define THIRD_PARTY_BLINK_RENDERER_PLATFORM_FONTS_OPENTYPE_FONT_FORMAT_CHECK_H_
+ 
+-#include "third_party/blink/renderer/platform/fonts/opentype/format_check.rs.h"
++#include "third_party/blink/renderer/platform/fonts/font_format.h"
+ #include "third_party/blink/renderer/platform/platform_export.h"
+ #include "third_party/blink/renderer/platform/wtf/allocator/allocator.h"
+ #include "third_party/skia/include/core/SkData.h"
+@@ -19,7 +19,7 @@ class PLATFORM_EXPORT FontFormatCheck {
+ 
+  public:
+   explicit FontFormatCheck(sk_sp<SkData>);
+-  virtual ~FontFormatCheck() = default;
++  virtual ~FontFormatCheck();
+   virtual bool IsVariableFont() const;
+   virtual bool IsCbdtCblcColorFont() const;
+   virtual bool IsEbdtEblcMonochromeFont() const;
+@@ -46,7 +46,7 @@ class PLATFORM_EXPORT FontFormatCheck {
+   enum class COLRVersion { kCOLRV0, kCOLRV1, kNoCOLR };
+ 
+  private:
+-  rust::Box<font_format_check::FontFormatInfo> format_info_;
++  font_format::FontFormatInfo format_info_;
+ };
+ 
+ }  // namespace blink
+diff --git a/third_party/blink/renderer/platform/fonts/opentype/format_check.rs b/third_party/blink/renderer/platform/fonts/opentype/format_check.rs
+index eda8e6b2b8188..b99f0ec8655e6 100644
+--- a/third_party/blink/renderer/platform/fonts/opentype/format_check.rs
++++ b/third_party/blink/renderer/platform/fonts/opentype/format_check.rs
+@@ -23,7 +23,7 @@ pub struct FontFormatInfo {
+     format_flags: Option<FontFormatFlags>,
+ }
+ 
+-pub fn get_font_format_info(font_bytes: &[u8]) -> Box<FontFormatInfo> {
++pub fn get_font_format_info(font_bytes: &[u8]) -> FontFormatInfo {
+     let file_ref = make_font_ref_internal(font_bytes, 0);
+ 
+     match file_ref {
+@@ -32,11 +32,11 @@ pub fn get_font_format_info(font_bytes: &[u8]) -> Box<FontFormatInfo> {
+                 font.table_directory().table_records().iter().map(|e| e.tag()).collect();
+             let color_version = get_colr_version(&font);
+             let avar_version = get_avar_version(&font);
+-            Box::new(FontFormatInfo {
++            FontFormatInfo {
+                 format_flags: Some(FontFormatFlags { table_tags, color_version, avar_version }),
+-            })
++            }
+         }
+-        _ => Box::new(FontFormatInfo::default()),
++        _ => FontFormatInfo::default(),
+     }
+ }
+ 
+@@ -44,10 +44,10 @@ fn get_colr_version(font_ref: &FontRef) -> Option<u16> {
+     Some(font_ref.colr().ok()?.version())
+ }
+ 
+-fn is_colrv1(format_info: &FontFormatInfo) -> bool {
++pub fn is_colrv1(format_info: &FontFormatInfo) -> bool {
+     matches!(&format_info.format_flags, Some(FontFormatFlags { color_version: Some(1), .. }),)
+ }
+-fn is_colrv0(format_info: &FontFormatInfo) -> bool {
++pub fn is_colrv0(format_info: &FontFormatInfo) -> bool {
+     matches!(&format_info.format_flags, Some(FontFormatFlags { color_version: Some(0), .. }),)
+ }
+ 
+@@ -56,7 +56,7 @@ fn get_avar_version(font_ref: &FontRef) -> Option<(u16, u16)> {
+     Some((version.major, version.minor))
+ }
+ 
+-fn is_avar2(format_info: &FontFormatInfo) -> bool {
++pub fn is_avar2(format_info: &FontFormatInfo) -> bool {
+     matches!(&format_info.format_flags, Some(FontFormatFlags { avar_version: Some((2, _)), .. }),)
+ }
+ 
+@@ -69,39 +69,22 @@ fn has_tags(format_info: &FontFormatInfo, query: &[Tag]) -> bool {
+     }
+ }
+ 
+-fn is_variable(format_info: &FontFormatInfo) -> bool {
++pub fn is_variable(format_info: &FontFormatInfo) -> bool {
+     has_tags(format_info, &[Tag::new(b"fvar")])
+ }
+ 
+-fn is_sbix(format_info: &FontFormatInfo) -> bool {
++pub fn is_sbix(format_info: &FontFormatInfo) -> bool {
+     has_tags(format_info, &[Tag::new(b"sbix")])
+ }
+ 
+-fn is_cbdt_cblc(format_info: &FontFormatInfo) -> bool {
++pub fn is_cbdt_cblc(format_info: &FontFormatInfo) -> bool {
+     has_tags(format_info, &[Tag::new(b"CBDT"), Tag::new(b"CBLC")])
+ }
+ 
+-fn is_ebdt_eblc(format_info: &FontFormatInfo) -> bool {
++pub fn is_ebdt_eblc(format_info: &FontFormatInfo) -> bool {
+     has_tags(format_info, &[Tag::new(b"EBDT"), Tag::new(b"EBLC")])
+ }
+ 
+-fn is_cff2(format_info: &FontFormatInfo) -> bool {
++pub fn is_cff2(format_info: &FontFormatInfo) -> bool {
+     has_tags(format_info, &[Tag::new(b"CFF2")])
+ }
+-
+-#[cxx::bridge(namespace = "font_format_check")]
+-pub mod ffi {
+-    extern "Rust" {
+-        type FontFormatInfo;
+-
+-        fn get_font_format_info(font_bytes: &[u8]) -> Box<FontFormatInfo>;
+-        fn is_colrv1(format_info: &FontFormatInfo) -> bool;
+-        fn is_colrv0(format_info: &FontFormatInfo) -> bool;
+-        fn is_cbdt_cblc(format_info: &FontFormatInfo) -> bool;
+-        fn is_ebdt_eblc(format_info: &FontFormatInfo) -> bool;
+-        fn is_variable(format_info: &FontFormatInfo) -> bool;
+-        fn is_sbix(format_info: &FontFormatInfo) -> bool;
+-        fn is_cff2(format_info: &FontFormatInfo) -> bool;
+-        fn is_avar2(format_info: &FontFormatInfo) -> bool;
+-    }
+-}

diff --git a/chromium-154-rust-1.88-enable-unstable_features.patch b/chromium-154-rust-1.88-enable-unstable_features.patch
new file mode 100644
index 0000000..100b643
--- /dev/null
+++ b/chromium-154-rust-1.88-enable-unstable_features.patch
@@ -0,0 +1,117 @@
+error[E0658]: the target feature `avx512f` is currently unstable
+   --> ../../third_party/rust/chromium_crates_io/vendor/jxl_simd-v0_6/src/x86_64/avx512.rs:123:26
+    |
+123 |         #[target_feature(enable = "avx512f")]
+    |                          ^^^^^^^^^^^^^^^^^^
+    |
+    = note: see issue #44839 <https://github.com/rust-lang/rust/issues/44839> for more information
+    = help: add `#![feature(avx512_target_feature)]` to the crate attributes to enable
+    = note: this compiler was built on 2025-06-23; consider upgrading it if it is out of date
+
+Fix FTBFS on el9
+
+diff -up 153.0.8010.36/third_party/rust/chromium_crates_io/vendor/jxl_simd-v0_6/src/lib.rs.me 153.0.8010.36/third_party/rust/chromium_crates_io/vendor/jxl_simd-v0_6/src/lib.rs
+--- 153.0.8010.36/third_party/rust/chromium_crates_io/vendor/jxl_simd-v0_6/src/lib.rs.me	2026-02-12 20:44:24.000000000 +0100
++++ 153.0.8010.36/third_party/rust/chromium_crates_io/vendor/jxl_simd-v0_6/src/lib.rs	2026-02-15 20:10:02.848196172 +0100
+@@ -4,6 +4,8 @@
+ // license that can be found in the LICENSE file.
+ 
+ #![allow(clippy::too_many_arguments)]
++#![feature(avx512_target_feature)]
++#![cfg_attr(target_arch = "x86_64", feature(stdarch_x86_avx512))]
+ 
+ use std::{
+     fmt::Debug,
+diff -up 153.0.8010.36/third_party/rust/chromium_crates_io/vendor/jxl_transforms-v0_6/src/lib.rs.me 153.0.8010.36/third_party/rust/chromium_crates_io/vendor/jxl_transforms-v0_6/src/lib.rs
+--- 153.0.8010.36/third_party/rust/chromium_crates_io/vendor/jxl_transforms-v0_6/src/lib.rs.me	2026-02-12 20:44:24.000000000 +0100
++++ 153.0.8010.36/third_party/rust/chromium_crates_io/vendor/jxl_transforms-v0_6/src/lib.rs	2026-02-15 20:09:43.548731085 +0100
+@@ -3,6 +3,9 @@
+ // Use of this source code is governed by a BSD-style
+ // license that can be found in the LICENSE file.
+ 
++#![feature(avx512_target_feature)]
++#![cfg_attr(target_arch = "x86_64", feature(stdarch_x86_avx512))]
++
+ mod idct2d;
+ mod reinterpreting_dct2d;
+ pub mod transform;
+diff -up 153.0.8010.36/third_party/rust/chromium_crates_io/vendor/jxl-v0_6/src/lib.rs.me 153.0.8010.36/third_party/rust/chromium_crates_io/vendor/jxl-v0_6/src/lib.rs
+--- 153.0.8010.36/third_party/rust/chromium_crates_io/vendor/jxl-v0_6/src/lib.rs.me	2026-02-12 20:44:24.000000000 +0100
++++ 153.0.8010.36/third_party/rust/chromium_crates_io/vendor/jxl-v0_6/src/lib.rs	2026-02-15 20:11:01.678559809 +0100
+@@ -3,6 +3,10 @@
+ // Use of this source code is governed by a BSD-style
+ // license that can be found in the LICENSE file.
+ 
++#![feature(avx512_target_feature)]
++#![cfg_attr(target_arch = "x86_64", feature(stdarch_x86_avx512))]
++#![feature(non_null_from_ref)]
++
+ #![deny(unsafe_code)]
+ pub mod api;
+ pub mod bit_reader;
+diff -up 153.0.8010.36/third_party/rust/jxl_simd/v0_6/BUILD.gn.me 153.0.8010.36/third_party/rust/jxl_simd/v0_6/BUILD.gn
+--- 153.0.8010.36/third_party/rust/jxl_simd/v0_6/BUILD.gn.me	2026-02-12 20:44:24.000000000 +0100
++++ 153.0.8010.36/third_party/rust/jxl_simd/v0_6/BUILD.gn	2026-02-15 20:15:51.823722639 +0100
+@@ -36,6 +36,10 @@ cargo_crate("lib") {
+ 
+   allow_unsafe = true
+ 
++  rustflags = [
++    "-Zallow-features=stdarch_x86_avx512,avx512_target_feature",
++  ]
++
+   features = [
+     "all-simd",
+     "avx",
+@@ -69,6 +73,7 @@ cargo_crate("lib") {
+   # `extra_kv.configs_to_remove` and `extra_kv.configs_to_add` from
+   # `gnrt_config.toml`).
+   _configs_to_remove += [ "//build/config/compiler:default_optimization" ]
++  _configs_to_remove += [ "//build/config/compiler:disallow_unstable_features" ]
+   _configs_to_add += [ "//build/config/compiler:optimize" ]
+ 
+   # Applying config changes.
+diff -up 153.0.8010.36/third_party/rust/jxl_transforms/v0_6/BUILD.gn.me 153.0.8010.36/third_party/rust/jxl_transforms/v0_6/BUILD.gn
+--- 153.0.8010.36/third_party/rust/jxl_transforms/v0_6/BUILD.gn.me	2026-02-12 20:44:24.000000000 +0100
++++ 153.0.8010.36/third_party/rust/jxl_transforms/v0_6/BUILD.gn	2026-02-15 20:17:33.887730035 +0100
+@@ -45,6 +45,10 @@ cargo_crate("lib") {
+ 
+   allow_unsafe = true
+ 
++  rustflags = [
++    "-Zallow-features=stdarch_x86_avx512,avx512_target_feature",
++  ]
++
+   deps = [ "//third_party/rust/jxl_simd/v0_6:lib" ]
+ 
+   # Only for usage from third-party crates. Add the crate to
+@@ -72,6 +76,7 @@ cargo_crate("lib") {
+   # `extra_kv.configs_to_remove` and `extra_kv.configs_to_add` from
+   # `gnrt_config.toml`).
+   _configs_to_remove += [ "//build/config/compiler:default_optimization" ]
++  _configs_to_remove += [ "//build/config/compiler:disallow_unstable_features" ]
+   _configs_to_add += [ "//build/config/compiler:optimize" ]
+ 
+   # Applying config changes.
+diff -up 153.0.8010.36/third_party/rust/jxl/v0_6/BUILD.gn.me 153.0.8010.36/third_party/rust/jxl/v0_6/BUILD.gn
+--- 153.0.8010.36/third_party/rust/jxl/v0_6/BUILD.gn.me	2026-02-12 20:44:24.000000000 +0100
++++ 153.0.8010.36/third_party/rust/jxl/v0_6/BUILD.gn	2026-02-15 20:16:47.026490882 +0100
+@@ -169,6 +169,10 @@ cargo_crate("lib") {
+ 
+   allow_unsafe = true
+ 
++  rustflags = [
++    "-Zallow-features=stdarch_x86_avx512,avx512_target_feature,non_null_from_ref",
++  ]
++
+   deps = [
+     "//third_party/rust/array_init/v2:lib",
+     "//third_party/rust/byteorder/v1:lib",
+@@ -201,6 +205,7 @@ cargo_crate("lib") {
+   # `extra_kv.configs_to_remove` and `extra_kv.configs_to_add` from
+   # `gnrt_config.toml`).
+   _configs_to_remove += [ "//build/config/compiler:default_optimization" ]
++  _configs_to_remove += [ "//build/config/compiler:disallow_unstable_features" ]
+   _configs_to_add += [ "//build/config/compiler:optimize" ]
+ 
+   # Applying config changes.

diff --git a/chromium.spec b/chromium.spec
index 3887344..eefa4de 100644
--- a/chromium.spec
+++ b/chromium.spec
@@ -275,7 +275,7 @@
 %endif
 
 Name:	chromium
-Version: 153.0.8010.52
+Version: 154.0.8037.57
 Release: 1%{?dist}
 Summary: A WebKit (Blink) powered web browser that Google doesn't want you to use
 Url: http://www.chromium.org/Home
@@ -364,7 +364,7 @@ Patch141: chromium-118-dma_buf_export_sync_file-conflict.patch
 
 # Fix FTBFS with rustc-1.88 on el9 and epel10.1
 Patch142: chromium-149-rust-1.88-build-error.patch
-Patch143: chromium-153-rust-1.88-enable-unstable_features.patch
+Patch143: chromium-154-rust-1.88-enable-unstable_features.patch
 Patch144: chromium-146-rust-1.88-undefined-symbol.patch
 
 # add correct path for Qt6Gui header and libs
@@ -403,7 +403,7 @@ Patch311: chromium-123-fstack-protector-strong.patch
 # ERROR at //build/rust/crubit/BUILD.gn:12:5: 
 # Unable to load third_party/rust-toolchain/lib/third_party/crubit/support/rs_std/BUILD.gn
 # "$crubit_src_dir/support/rs_std:rs_std_cpp",
-Patch312: chromium-153-ftbfs-crubit.patch
+Patch312: chromium-154-ftbfs-crubit.patch
 
 # old rust version causes build error on el8:
 # error[E0599]: no method named `is_none_or` found for enum `Option` in the current scope
@@ -1941,6 +1941,117 @@ fi
 %endif
 
 %changelog
+* Wed Sep 23 2026 Than Ngo <than@redhat.com> - 154.0.8037.57-1
+- Update to 154.0.8037.57
+  * CVE-2026-95274: Improper output encoding in DevTools
+  * CVE-2026-95275: Incorrect reference resolution in MediaStream
+  * CVE-2026-95276: Improper input validation in Themes
+  * CVE-2026-95277: Use after free in Views
+  * CVE-2026-95278: Missing authorization in WakeLock
+  * CVE-2026-95279: UI misrepresentation in Omnibox
+  * CVE-2026-95280: Race condition in V8
+  * CVE-2026-95281: Buffer overflow in ANGLE
+  * CVE-2026-95282: Use after free in Platform
+  * CVE-2026-95283: Buffer overflow in Tint
+  * CVE-2026-95284: Buffer overflow in ANGLE
+  * CVE-2026-95285: Missing authorization in WebView
+  * CVE-2026-95286: Type confusion in Bindings
+  * CVE-2026-95287: Missing authorization in Navigation
+  * CVE-2026-95288: UI misrepresentation in Mobile
+  * CVE-2026-95289: Incorrect authorization in Scroll
+  * CVE-2026-95290: Missing authorization in NFC
+  * CVE-2026-95291: UI misrepresentation in SecurityIndicators
+  * CVE-2026-95292: Incorrect authorization in Safebrowsing
+  * CVE-2026-95293: Uninitialized resource in GPU
+  * CVE-2026-95294: UI misrepresentation in Browser
+  * CVE-2026-95295: Information leak in Mobile
+  * CVE-2026-95296: Missing authorization in Core
+  * CVE-2026-95297: Missing authorization in Contextual Tasks
+  * CVE-2026-95298: Use after free in Browser
+  * CVE-2026-95299: Use after free in GPU
+  * CVE-2026-95300: Missing authorization in DevTools
+  * CVE-2026-95301: Missing authorization in Extensions
+  * CVE-2026-95302: Incorrect authorization in WebAPKs
+  * CVE-2026-95303: Incomplete cleanup in SmartCard
+  * CVE-2026-95304: Out of bounds write in V8
+  * CVE-2026-95305: UI misrepresentation in Chromoting
+  * CVE-2026-95306: Type confusion in V8
+  * CVE-2026-95307: UI misrepresentation in ExtensionsMenu
+  * CVE-2026-95308: Integer overflow in Metrics
+  * CVE-2026-95309: UI misrepresentation in Mobile
+  * CVE-2026-95310: Use after free in AdFilter
+  * CVE-2026-95311: Free of non-heap memory in Fonts
+  * CVE-2026-95312: Information leak in Passwords
+  * CVE-2026-95313: Use after free in Fullscreen
+  * CVE-2026-95314: Incorrect authorization in HID
+  * CVE-2026-95315: Use after free in Aura
+  * CVE-2026-95316: Unchecked return value in Performance
+  * CVE-2026-95317: Incorrect authorization in MediaCapture
+  * CVE-2026-95318: Buffer overflow in Video
+  * CVE-2026-95319: Use after free in Printing
+  * CVE-2026-95320: Missing authorization in Navigation
+  * CVE-2026-95321: UI misrepresentation in Payments
+  * CVE-2026-95322: Out of bounds write in GPU
+  * CVE-2026-95323: UI misrepresentation in Chromium
+  * CVE-2026-95324: Uninitialized resource in GPU
+  * CVE-2026-95325: Use after free in ANGLE
+  * CVE-2026-95326: Incomplete cleanup in Bluetooth
+  * CVE-2026-95327: Information leak in Networking
+  * CVE-2026-95328: Confused deputy in Mobile
+  * CVE-2026-95329: Out of bounds write in WebGL
+  * CVE-2026-95330: Improper state validation in Downloads
+  * CVE-2026-95331: Out of bounds write in ANGLE
+  * CVE-2026-95332: Use of uninitialized variable in Tint
+  * CVE-2026-95333: Use after free in Metrics
+  * CVE-2026-95334: Incorrect reference resolution in WebProtect
+  * CVE-2026-95335: Use after free in HID
+  * CVE-2026-95336: Information leak in Transactions Platform
+  * CVE-2026-95337: UI misrepresentation in Messages
+  * CVE-2026-95338: Use after free in PDFium
+  * CVE-2026-95339: Use after free in ServiceWorker
+  * CVE-2026-95340: Incorrect authorization in PictureInPicture
+  * CVE-2026-95341: Improper input validation in Desktop
+  * CVE-2026-95342: Missing authorization in V8
+  * CVE-2026-95343: Use after free in WebAudio
+  * CVE-2026-95344: Race condition in DevTools
+  * CVE-2026-95345: Use after free in Actor
+  * CVE-2026-95346: UI misrepresentation in Chromoting
+  * CVE-2026-95347: Use after free in Updater
+  * CVE-2026-95348: Use after free in Bluetooth
+  * CVE-2026-95349: Buffer overflow in WebGL
+  * CVE-2026-95350: Buffer overflow in ANGLE
+  * CVE-2026-95351: Use after free in Views
+  * CVE-2026-95352: Incorrect authorization in DevTools
+  * CVE-2026-95353: Use after free in Bindings
+  * CVE-2026-95354: Use after free in Verifier
+  * CVE-2026-95355: Incorrect authorization in Navigation
+  * CVE-2026-95356: Use after free in WindowDialog
+  * CVE-2026-95357: Out of bounds write in GPU
+  * CVE-2026-95358: Incorrect authorization in Mobile
+  * CVE-2026-95359: Uninitialized resource in GPU
+  * CVE-2026-95360: Race condition in Editing
+  * CVE-2026-95361: Confused deputy in DevTools
+  * CVE-2026-95362: Cross-site request forgery in DevTools
+  * CVE-2026-95363: UI misrepresentation in FileSystem
+  * CVE-2026-95364: Improper input validation in Passwords
+  * CVE-2026-95365: Type confusion in IndexedDB
+  * CVE-2026-95366: Use of released resource in Core
+  * CVE-2026-95367: Information leak in DataTransfer
+  * CVE-2026-95368: Incorrect authorization in DevTools
+  * CVE-2026-95369: Inappropriate implementation in XML
+  * CVE-2026-95370: Inappropriate implementation in NFC
+  * CVE-2026-95371: Missing authorization in Views
+  * CVE-2026-95372: Use after free in Chromecast
+  * CVE-2026-95373: Use after free in DevTools
+  * CVE-2026-95374: Incorrect authorization in Network
+  * CVE-2026-95375: Incorrect authorization in BrowserTag
+  * CVE-2026-95376: Externally controlled reference in DevTools
+  * CVE-2026-95380: Type confusion in V8
+  * CVE-2026-95381: Improper input validation in Printing
+  * CVE-2026-95382: Improper input validation in Auth
+  * CVE-2026-95384: Race condition in Transactions Platform
+  * CVE-2026-95385: Inappropriate implementation in PlatformIntegration
+
 * Fri Sep 18 2026 Than Ngo <than@redhat.com> - 153.0.8010.52-1
 - Update to 153.0.8010.52
   * CVE-2026-91708: Race condition in Network

diff --git a/disable-ai.patch b/disable-ai.patch
index 152c913..75d67ac 100644
--- a/disable-ai.patch
+++ b/disable-ai.patch
@@ -3,19 +3,17 @@
 
 --- a/chrome/browser/BUILD.gn
 +++ b/chrome/browser/BUILD.gn
-@@ -2806,9 +2806,6 @@ source_set("browser") {
+@@ -2570,7 +2570,6 @@ source_set("browser") {
        "//chrome/browser/profile_resetter:impl",
        "//chrome/browser/record_replay",
        "//chrome/browser/record_replay:impl",
--      "//chrome/browser/screen_ai:screen_ai_install_state",
 -      "//chrome/browser/screen_ai:screen_ai_service_router_factory",
--      "//chrome/browser/screen_ai/public:optical_character_recognizer",
        "//chrome/browser/sharing_hub",
        "//chrome/browser/sharing_hub:impl",
        "//chrome/browser/smart_card",
-@@ -2868,7 +2865,6 @@ source_set("browser") {
+@@ -2619,7 +2618,6 @@ source_set("browser") {
+       "//chrome/browser/ui/waap:window_metrics_manager",
        "//chrome/browser/ui/web_applications:impl",
-       "//chrome/browser/ui/webui:webui_util",
        "//chrome/browser/ui/webui/app_service_internals",
 -      "//chrome/browser/ui/webui/autofill_ml_internals",
        "//chrome/browser/ui/webui/color_pipeline_internals",
@@ -85,7 +83,7 @@
  }
 --- a/chrome/browser/actor/actor_keyed_service.cc
 +++ b/chrome/browser/actor/actor_keyed_service.cc
-@@ -770,13 +770,6 @@ bool ActorKeyedService::IsActiveOnTab(co
+@@ -842,13 +842,6 @@ bool ActorKeyedService::IsActiveOnTab(co
  
  ActorTask* ActorKeyedService::GetTaskFromTab(
      const tabs::TabInterface& tab) const {
@@ -99,9 +97,28 @@
    return nullptr;
  }
  
+--- a/chrome/browser/browser_process.h
++++ b/chrome/browser/browser_process.h
+@@ -333,8 +333,6 @@ class BrowserProcess {
+   virtual void set_usb_system_tray_icon_for_test(
+       std::unique_ptr<UsbSystemTrayIcon> icon) = 0;
+ 
+-  virtual speech::SpeechRecognitionSmallExpertModelInstaller*
+-  speech_recognition_small_expert_model_installer() = 0;
+ #endif
+ 
+   // Obtain the browser instance of OSCryptAsync, which should be used for data
 --- a/chrome/browser/browser_process_impl.cc
 +++ b/chrome/browser/browser_process_impl.cc
-@@ -259,12 +259,10 @@ void OnLocalStatePrefsLoaded();
+@@ -84,7 +84,6 @@
+ #include "chrome/browser/serial/serial_policy_allowed_ports.h"
+ #include "chrome/browser/shell_integration.h"
+ #include "chrome/browser/site_isolation/prefs_observer.h"
+-#include "chrome/browser/speech/speech_recognition_small_expert_model_installer.h"
+ #include "chrome/browser/ssl/secure_origin_prefs_observer.h"
+ #include "chrome/browser/startup_data.h"
+ #include "chrome/browser/status_icons/status_tray.h"
+@@ -260,12 +259,10 @@ void OnLocalStatePrefsLoaded();
  #if BUILDFLAG(IS_CHROMEOS)
  #include "chrome/browser/chromeos/extensions/telemetry/chromeos_telemetry_extensions_browser_api_provider.h"
  #include "chrome/browser/hid/hid_pinned_notification.h"
@@ -114,19 +131,44 @@
  #include "chrome/browser/usb/usb_status_icon.h"
  #include "components/enterprise/browser/controller/chrome_browser_cloud_management_controller.h"
  #endif
-@@ -1667,9 +1665,6 @@ void BrowserProcessImpl::PreMainMessageL
+@@ -1381,12 +1378,6 @@ GlobalFeatures* BrowserProcessImpl::GetF
+   return features_.get();
+ }
+ 
+-#if !BUILDFLAG(IS_ANDROID)
+-speech::SpeechRecognitionSmallExpertModelInstaller*
+-BrowserProcessImpl::speech_recognition_small_expert_model_installer() {
+-  return speech_recognition_small_expert_model_installer_.get();
+-}
+-#endif
+ 
+ DownloadRequestLimiter* BrowserProcessImpl::download_request_limiter() {
+   DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
+@@ -1728,11 +1719,6 @@ void BrowserProcessImpl::PreMainMessageL
    soda_installer_impl_ = std::make_unique<speech::SodaInstallerImplChromeOS>();
  #endif  // BUILDFLAG(IS_CHROMEOS)
  
 -#if !BUILDFLAG(IS_ANDROID)
 -  screen_ai_download_ = screen_ai::ScreenAIInstallState::Create();
+-  speech_recognition_small_expert_model_installer_ =
+-      std::make_unique<speech::SpeechRecognitionSmallExpertModelInstaller>();
 -#endif
  
    base::FilePath user_data_dir;
    bool result = base::PathService::Get(chrome::DIR_USER_DATA, &user_data_dir);
 --- a/chrome/browser/browser_process_impl.h
 +++ b/chrome/browser/browser_process_impl.h
-@@ -95,9 +95,6 @@ namespace speech {
+@@ -57,9 +57,6 @@ class SiteIsolationPrefsObserver;
+ class SystemNotificationHelper;
+ class StartupData;
+ 
+-namespace speech {
+-class SpeechRecognitionSmallExpertModelInstaller;
+-}  // namespace speech
+ 
+ namespace breadcrumbs {
+ class ApplicationBreadcrumbsLogger;
+@@ -99,9 +96,6 @@ namespace speech {
  class SodaInstaller;
  }  // namespace speech
  
@@ -136,13 +178,25 @@
  
  namespace supervised_user {
  class DeviceParentalControls;
-@@ -460,9 +457,6 @@ class BrowserProcessImpl : public Browse
+@@ -247,8 +241,6 @@ class BrowserProcessImpl : public Browse
+   UsbSystemTrayIcon* usb_system_tray_icon() override;
+   void set_usb_system_tray_icon_for_test(
+       std::unique_ptr<UsbSystemTrayIcon> icon) override;
+-  speech::SpeechRecognitionSmallExpertModelInstaller*
+-  speech_recognition_small_expert_model_installer() override;
+ #endif
+ 
+   os_crypt_async::OSCryptAsync* os_crypt_async() override;
+@@ -468,12 +460,6 @@ class BrowserProcessImpl : public Browse
    // to ensure that SodaInstallerImpl gets destructed first.
    std::unique_ptr<speech::SodaInstaller> soda_installer_impl_;
  
 -  // Used to download Screen AI on demand and keep track of the library
 -  // availability.
 -  std::unique_ptr<screen_ai::ScreenAIInstallState> screen_ai_download_;
+-
+-  std::unique_ptr<speech::SpeechRecognitionSmallExpertModelInstaller>
+-      speech_recognition_small_expert_model_installer_;
  #endif
  
    std::unique_ptr<BrowserProcessPlatformPart> platform_part_;
@@ -157,7 +211,7 @@
  #include "chrome/browser/web_applications/sub_apps/sub_apps_service_impl.h"
  #endif
  
-@@ -390,27 +388,6 @@ void BindMediaFoundationPreferences(
+@@ -392,27 +390,6 @@ void BindMediaFoundationPreferences(
  }
  #endif  // BUILDFLAG(IS_WIN)
  
@@ -185,7 +239,7 @@
  
  void BindModelBroker(
      content::RenderFrameHost* frame_host,
-@@ -583,10 +560,6 @@ void PopulateChromeFrameBinders(
+@@ -586,10 +563,6 @@ void PopulateChromeFrameBinders(
          &web_app::SubAppsServiceImpl::CreateIfAllowed);
    }
  
@@ -198,7 +252,7 @@
  #if BUILDFLAG(IS_WIN)
 --- a/chrome/browser/chrome_browser_interface_binders_webui_parts_desktop.cc
 +++ b/chrome/browser/chrome_browser_interface_binders_webui_parts_desktop.cc
-@@ -518,9 +518,6 @@ void PopulateChromeWebUIFrameBindersPart
+@@ -523,9 +523,6 @@ void PopulateChromeWebUIFrameBindersPart
        ::mojom::app_service_internals::AppServiceInternalsPageHandler,
        AppServiceInternalsUI>(map);
  
@@ -208,6 +262,18 @@
  
    RegisterWebUIControllerInterfaceBinder<
        access_code_cast::mojom::PageHandlerFactory,
+--- a/chrome/browser/chrome_content_browser_client.cc
++++ b/chrome/browser/chrome_content_browser_client.cc
+@@ -5532,9 +5532,6 @@ ChromeContentBrowserClient::CreateCommit
+       &conditions);
+ #endif
+ 
+-  MaybeAddCondition(actor::ActorCommitDeferringCondition::MaybeCreate(
+-                        *navigation_handle, navigation_type),
+-                    &conditions);
+ 
+   return conditions;
+ }
 --- a/chrome/browser/component_updater/BUILD.gn
 +++ b/chrome/browser/component_updater/BUILD.gn
 @@ -214,13 +214,6 @@ source_set("impl") {
@@ -247,7 +313,7 @@
  
 --- a/chrome/browser/glic/glic_selection_observer.cc
 +++ b/chrome/browser/glic/glic_selection_observer.cc
-@@ -1095,20 +1095,6 @@ void GlicSelectionObserver::OnAskGeminiW
+@@ -1092,20 +1092,6 @@ void GlicSelectionObserver::OnAskGeminiW
    }
  
    std::string skill_prompt;
@@ -268,7 +334,7 @@
  
    if (skill_prompt.empty()) {
      Profile* profile =
-@@ -1131,28 +1117,6 @@ void GlicSelectionObserver::OnAskGeminiW
+@@ -1127,28 +1113,6 @@ void GlicSelectionObserver::OnAskGeminiW
  std::vector<GlicSelectionWidgetDelegate::SkillOption>
  GlicSelectionObserver::GetContextualSkills() {
    std::vector<GlicSelectionWidgetDelegate::SkillOption> result;
@@ -299,7 +365,7 @@
  
 --- a/chrome/browser/glic/host/glic_skills_manager_impl.cc
 +++ b/chrome/browser/glic/host/glic_skills_manager_impl.cc
-@@ -487,39 +487,6 @@ bool GlicSkillsClientSession::Require1PS
+@@ -497,39 +497,6 @@ bool GlicSkillsClientSession::Require1PS
  
  void GlicSkillsClientSession::UpdateSkillPreviews(
      std::optional<tabs::TabInterface*> updated_tab) {
@@ -444,14 +510,15 @@
  void NavigationPredictor::SetModelScoreCallbackForTesting(
 --- a/chrome/browser/page_content_annotations/page_content_annotations_service_factory.cc
 +++ b/chrome/browser/page_content_annotations/page_content_annotations_service_factory.cc
-@@ -118,62 +118,6 @@ PageContentAnnotationsServiceFactory::~P
+@@ -120,63 +120,6 @@ PageContentAnnotationsServiceFactory::~P
  std::unique_ptr<KeyedService>
  PageContentAnnotationsServiceFactory::BuildServiceInstanceForBrowserContext(
      content::BrowserContext* context) const {
 -  Profile* profile = Profile::FromBrowserContext(context);
 -
--  if (!ShouldEnablePageContentAnnotations(profile))
+-  if (!ShouldEnablePageContentAnnotations(profile)) {
 -    return nullptr;
+-  }
 -
 -  auto* proto_db_provider = profile->GetOriginalProfile()
 -                                ->GetDefaultStoragePartition()
@@ -549,7 +616,7 @@
      "prediction_service/prediction_service_request.cc",
 --- a/chrome/browser/permissions/chrome_permissions_client.cc
 +++ b/chrome/browser/permissions/chrome_permissions_client.cc
-@@ -31,7 +31,6 @@
+@@ -32,7 +32,6 @@
  #include "chrome/browser/permissions/permission_actions_history_factory.h"
  #include "chrome/browser/permissions/permission_decision_auto_blocker_factory.h"
  #include "chrome/browser/permissions/permission_revocation_request.h"
@@ -557,7 +624,7 @@
  #include "chrome/browser/permissions/pref_based_quiet_permission_ui_selector.h"
  #include "chrome/browser/permissions/quiet_notification_permission_ui_config.h"
  #include "chrome/browser/permissions/system/system_permission_settings.h"
-@@ -545,8 +544,6 @@ ChromePermissionsClient::CreatePermissio
+@@ -551,8 +550,6 @@ ChromePermissionsClient::CreatePermissio
  #endif
    selectors.emplace_back(std::make_unique<PrefBasedQuietPermissionUiSelector>(
        Profile::FromBrowserContext(browser_context)));
@@ -566,7 +633,7 @@
    return selectors;
  }
  
-@@ -568,8 +565,6 @@ void ChromePermissionsClient::OnPromptRe
+@@ -574,8 +571,6 @@ void ChromePermissionsClient::OnPromptRe
  
    Profile* profile =
        Profile::FromBrowserContext(web_contents->GetBrowserContext());
@@ -609,7 +676,7 @@
          model_data.request_metadata.request_type;
 --- a/chrome/browser/prefs/BUILD.gn
 +++ b/chrome/browser/prefs/BUILD.gn
-@@ -388,7 +388,6 @@ source_set("impl") {
+@@ -387,7 +387,6 @@ source_set("impl") {
        "//chrome/browser/desktop_to_mobile_promos:utils",
        "//chrome/browser/device_identity",
        "//chrome/browser/new_tab_page",
@@ -619,7 +686,7 @@
        "//chrome/browser/sharing_hub",
 --- a/chrome/browser/prefs/browser_prefs.cc
 +++ b/chrome/browser/prefs/browser_prefs.cc
-@@ -1687,9 +1687,6 @@ void RegisterLocalState(PrefRegistrySimp
+@@ -1727,9 +1727,6 @@ void RegisterLocalState(PrefRegistrySimp
    DeviceOAuth2TokenStoreDesktop::RegisterPrefs(registry);
  #endif
  
@@ -631,15 +698,15 @@
    PlatformAuthPolicyObserver::RegisterPrefs(registry);
 --- a/chrome/browser/profiles/BUILD.gn
 +++ b/chrome/browser/profiles/BUILD.gn
-@@ -908,7 +908,6 @@ source_set("profiles_extra_parts_impl")
+@@ -911,7 +911,6 @@ source_set("profiles_extra_parts_impl")
    } else {
      deps += [
        "//chrome/browser/accessibility/phrase_segmentation",
 -      "//chrome/browser/accessibility/tree_fixing:service",
-       "//chrome/browser/accessibility_annotator/content_annotator",
        "//chrome/browser/apps/app_service",
        "//chrome/browser/autofill",
-@@ -924,7 +923,6 @@ source_set("profiles_extra_parts_impl")
+       "//chrome/browser/badging",
+@@ -926,7 +925,6 @@ source_set("profiles_extra_parts_impl")
        "//chrome/browser/profile_resetter",
        "//chrome/browser/record_replay",
        "//chrome/browser/record_replay:impl",
@@ -649,7 +716,7 @@
        "//chrome/browser/sharing_hub",
 --- a/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
 +++ b/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
-@@ -135,7 +135,6 @@
+@@ -136,7 +136,6 @@
  #include "chrome/browser/metrics/profile_metrics_service_factory.h"
  #include "chrome/browser/metrics/variations/google_groups_manager_factory.h"
  #include "chrome/browser/navigation_predictor/navigation_predictor_keyed_service_factory.h"
@@ -657,7 +724,7 @@
  #include "chrome/browser/navigation_predictor/search_engine_preconnector.h"
  #include "chrome/browser/navigation_predictor/search_engine_preconnector_keyed_service_factory.h"
  #include "chrome/browser/net/dns_probe_service_factory.h"
-@@ -396,7 +395,6 @@
+@@ -397,7 +396,6 @@
  #include "chrome/browser/record_replay/task_parameters_extractor_factory.h"
  #include "chrome/browser/record_replay/task_service_factory.h"
  #include "chrome/browser/record_replay/task_store_factory.h"
@@ -665,7 +732,7 @@
  #include "chrome/browser/search/instant_service_factory.h"
  #include "chrome/browser/search_engine_choice/search_engine_choice_dialog_service_factory.h"
  #include "chrome/browser/speech/speech_recognition_client_browser_interface_factory.h"
-@@ -1204,7 +1202,6 @@ void ChromeBrowserMainExtraPartsProfiles
+@@ -1195,7 +1193,6 @@ void ChromeBrowserMainExtraPartsProfiles
  #if BUILDFLAG(CHROME_ROOT_STORE_CERT_MANAGEMENT_UI)
    net::ServerCertificateDatabaseServiceFactory::GetInstance();
  #endif
@@ -673,7 +740,7 @@
  #if BUILDFLAG(ENABLE_DICE_SUPPORT)
    HistorySyncOptinServiceFactory::GetInstance();
    ProfileManagementDisclaimerServiceFactory::GetInstance();
-@@ -1267,9 +1264,6 @@ void ChromeBrowserMainExtraPartsProfiles
+@@ -1258,9 +1255,6 @@ void ChromeBrowserMainExtraPartsProfiles
    // TODO(b/502297163): Implement for Android.
    OneTimePermissionsTrackerFactory::GetInstance();
  #endif
@@ -683,7 +750,7 @@
    OptimizationGuideGlobalStateHolderKeyedServiceFactory::GetInstance();
    OptimizationGuideKeyedServiceFactory::GetInstance();
    OriginKeyedPermissionActionServiceFactory::GetInstance();
-@@ -1361,7 +1355,6 @@ void ChromeBrowserMainExtraPartsProfiles
+@@ -1359,7 +1353,6 @@ void ChromeBrowserMainExtraPartsProfiles
  #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
    policy::UserPolicyOidcSigninServiceFactory::GetInstance();
  #endif
@@ -691,7 +758,7 @@
    PredictionServiceFactory::GetInstance();
    predictors::AutocompleteActionPredictorFactory::GetInstance();
    predictors::LoadingPredictorFactory::GetInstance();
-@@ -1448,10 +1441,6 @@ void ChromeBrowserMainExtraPartsProfiles
+@@ -1443,10 +1436,6 @@ void ChromeBrowserMainExtraPartsProfiles
    SafetyHubMenuNotificationServiceFactory::GetInstance();
  #if !BUILDFLAG(IS_ANDROID)
    SafetyHubHatsServiceFactory::GetInstance();
@@ -702,17 +769,17 @@
  #endif
  #if BUILDFLAG(IS_CHROMEOS)
    if (ash::features::IsScannerEnabled()) {
-@@ -1575,7 +1564,6 @@ void ChromeBrowserMainExtraPartsProfiles
+@@ -1570,7 +1559,6 @@ void ChromeBrowserMainExtraPartsProfiles
    TopSitesFactory::GetInstance();
    translate::TranslateRankerFactory::GetInstance();
  #if !BUILDFLAG(IS_ANDROID)
 -  tree_fixing::AXTreeFixingServicesRouterFactory::GetInstance();
    TriggeredProfileResetterFactory::GetInstance();
  #endif
- #if !BUILDFLAG(IS_CHROMEOS) && !BUILDFLAG(IS_ANDROID)
+   ttc::TtcKeyedServiceFactory::GetInstance();
 --- a/chrome/browser/profiles/off_the_record_profile_impl.cc
 +++ b/chrome/browser/profiles/off_the_record_profile_impl.cc
-@@ -220,11 +220,6 @@ void OffTheRecordProfileImpl::Init() {
+@@ -226,11 +226,6 @@ void OffTheRecordProfileImpl::Init() {
    // AccessibilityLabelsService has a default prefs behavior in incognito.
    AccessibilityLabelsService::InitOffTheRecordPrefs(this);
  
@@ -726,7 +793,7 @@
    // System Profile.
 --- a/chrome/browser/profiles/profile_impl.cc
 +++ b/chrome/browser/profiles/profile_impl.cc
-@@ -921,11 +921,6 @@ void ProfileImpl::DoFinalInit(CreateMode
+@@ -924,11 +924,6 @@ void ProfileImpl::DoFinalInit(CreateMode
    // The password settings service needs to start listening to settings
    // changes from Google Mobile Services, as early as possible.
    PasswordManagerSettingsServiceFactory::GetForProfile(this);
@@ -748,7 +815,7 @@
  #include "chrome/browser/prefs/incognito_mode_prefs.h"
  #include "chrome/browser/profiles/delete_profile_helper.h"
  #include "chrome/browser/profiles/keep_alive/profile_keep_alive_types.h"
-@@ -1618,9 +1617,6 @@ void ProfileManager::DoFinalInitForServi
+@@ -1614,9 +1613,6 @@ void ProfileManager::DoFinalInitForServi
    // Ensure NavigationPredictorKeyedService is started.
    NavigationPredictorKeyedServiceFactory::GetForProfile(profile);
  
@@ -787,24 +854,158 @@
        "skills_ui_window_controller.cc",
      ]
    }
+--- a/chrome/browser/speech/chrome_speech_recognition_service.cc
++++ b/chrome/browser/speech/chrome_speech_recognition_service.cc
+@@ -59,18 +59,6 @@ ChromeSpeechRecognitionService::ChromeSp
+     soda_installer_observer_.Observe(soda_installer);
+   }
+ 
+-  if (base::FeatureList::IsEnabled(
+-          media::kLiveCaptionSpeechRecognitionSmallExpertModel)) {
+-    auto* model_installer =
+-        g_browser_process
+-            ? g_browser_process
+-                  ->speech_recognition_small_expert_model_installer()
+-            : nullptr;
+-    if (model_installer) {
+-      speech_recognition_small_expert_model_installer_observer_.Observe(
+-          model_installer);
+-    }
+-  }
+ }
+ 
+ ChromeSpeechRecognitionService::~ChromeSpeechRecognitionService() = default;
+@@ -98,42 +86,6 @@ void ChromeSpeechRecognitionService::Bin
+     options->language = language_name;
+   }
+ 
+-  if (base::FeatureList::IsEnabled(
+-          media::kLiveCaptionSpeechRecognitionSmallExpertModel) &&
+-      options &&
+-      options->recognizer_client_type ==
+-          media::mojom::RecognizerClientType::kLiveCaption &&
+-      !options->is_server_based) {
+-    auto* installer =
+-        g_browser_process
+-            ? g_browser_process
+-                  ->speech_recognition_small_expert_model_installer()
+-            : nullptr;
+-    if (installer &&
+-        installer->IsSpeechRecognitionSmallExpertModelInstalled()) {
+-      Profile* profile = Profile::FromBrowserContext(context_);
+-      if (profile && !model_broker_client_) {
+-        auto* opt_guide_service =
+-            OptimizationGuideKeyedServiceFactory::GetForProfile(profile);
+-        if (opt_guide_service) {
+-          model_broker_client_ = opt_guide_service->CreateModelBrokerClient();
+-        }
+-      }
+-      if (model_broker_client_) {
+-        auto feature = optimization_guide::mojom::OnDeviceFeature::
+-            kSpeechRecognitionSmallExpertModel;
+-        model_broker_client_->RequestAssetsFor(feature);
+-        model_broker_client_->GetSubscriber(feature).WaitForClient(
+-            base::BindOnce(
+-                &ChromeSpeechRecognitionService::OnModelClientAvailable,
+-                weak_factory_.GetWeakPtr(), std::move(receiver),
+-                std::move(client), std::move(options),
+-                mojo::WrapCallbackWithDefaultInvokeIfNotRun(std::move(callback),
+-                                                            false)));
+-        return;
+-      }
+-    }
+-  }
+ 
+   BindSodaRecognizer(std::move(receiver), std::move(client), std::move(options),
+                      std::move(callback));
+--- a/chrome/browser/speech/speech_recognition_client_browser_interface.cc
++++ b/chrome/browser/speech/speech_recognition_client_browser_interface.cc
+@@ -67,15 +67,6 @@ SpeechRecognitionClientBrowserInterface:
+   if (speech::SodaInstaller::GetInstance()) {
+     soda_installer_observation_.Observe(speech::SodaInstaller::GetInstance());
+   }
+-#if !BUILDFLAG(IS_CHROMEOS)
+-  if (base::FeatureList::IsEnabled(
+-          media::kLiveCaptionSpeechRecognitionSmallExpertModel) &&
+-      g_browser_process &&
+-      g_browser_process->speech_recognition_small_expert_model_installer()) {
+-    speech_recognition_small_expert_model_installer_observation_.Observe(
+-        g_browser_process->speech_recognition_small_expert_model_installer());
+-  }
+-#endif
+   MaybeTriggerModelInstall();
+ }
+ 
+@@ -162,24 +153,6 @@ void SpeechRecognitionClientBrowserInter
+ #if !BUILDFLAG(IS_CHROMEOS)
+   if (base::FeatureList::IsEnabled(
+           media::kLiveCaptionSpeechRecognitionSmallExpertModel)) {
+-    auto* installer =
+-        g_browser_process
+-            ? g_browser_process
+-                  ->speech_recognition_small_expert_model_installer()
+-            : nullptr;
+-    if (installer &&
+-        !installer->IsSpeechRecognitionSmallExpertModelInstalled() &&
+-        !installer->IsSpeechRecognitionSmallExpertModelDownloading() &&
+-        installer->GetSpeechRecognitionSmallExpertModelState() !=
+-            SpeechRecognitionSmallExpertModelInstaller::
+-                SpeechRecognitionSmallExpertModelState::kError &&
+-        installer->GetSpeechRecognitionSmallExpertModelState() !=
+-            SpeechRecognitionSmallExpertModelInstaller::
+-                SpeechRecognitionSmallExpertModelState::
+-                    kErrorCorruptPersistent) {
+-      Profile* profile = Profile::FromBrowserContext(context_);
+-      installer->InstallSpeechRecognitionSmallExpertModel(profile);
+-    }
+     return;
+   }
+ #endif
+@@ -207,10 +180,7 @@ void SpeechRecognitionClientBrowserInter
+ #if !BUILDFLAG(IS_CHROMEOS)
+   if (base::FeatureList::IsEnabled(
+           media::kLiveCaptionSpeechRecognitionSmallExpertModel)) {
+-    if (!g_browser_process ||
+-        !g_browser_process->speech_recognition_small_expert_model_installer()) {
+       return;
+-    }
+   } else if (!speech::SodaInstaller::GetInstance()) {
+     return;
+   }
+@@ -232,15 +202,6 @@ void SpeechRecognitionClientBrowserInter
+ #if !BUILDFLAG(IS_CHROMEOS)
+   if (base::FeatureList::IsEnabled(
+           media::kLiveCaptionSpeechRecognitionSmallExpertModel)) {
+-    auto* installer =
+-        g_browser_process
+-            ? g_browser_process
+-                  ->speech_recognition_small_expert_model_installer()
+-            : nullptr;
+-    if (installer &&
+-        installer->IsSpeechRecognitionSmallExpertModelInstalled()) {
+-      is_installed = true;
+-    }
+   } else {
+     if (speech::SodaInstaller::GetInstance()) {
+       is_installed = speech::SodaInstaller::GetInstance()->IsSodaInstalled(
 --- a/chrome/browser/ui/BUILD.gn
 +++ b/chrome/browser/ui/BUILD.gn
-@@ -1449,7 +1449,6 @@ static_library("ui") {
-       "//chrome/browser/regional_capabilities",
+@@ -1475,7 +1475,6 @@ static_library("ui") {
+       "//chrome/browser/lens/region_search",
+       "//chrome/browser/reading_list",
        "//chrome/browser/safe_browsing",
-       "//chrome/browser/safe_browsing:advanced_protection",
 -      "//chrome/browser/screen_ai:screen_ai_service_router_factory",
        "//chrome/browser/smart_card",
        "//chrome/browser/support_tool",
        "//chrome/browser/tab_group_sync:utils",
-@@ -3093,7 +3092,6 @@ static_library("ui") {
+@@ -2909,7 +2908,6 @@ static_library("ui") {
        "//chrome/browser/ui/views/zoom",
        "//chrome/browser/ui/webauthn:impl",
        "//chrome/browser/ui/webui/app_service_internals",
 -      "//chrome/browser/ui/webui/autofill_ml_internals",
-       "//chrome/browser/ui/webui/content_annotator_internals",
        "//chrome/browser/ui/webui/side_panel/customize_chrome",
        "//chrome/browser/ui/window_metadata",
+       "//chrome/browser/ui/window_name_prompt",
 --- a/chrome/browser/ui/pdf/BUILD.gn
 +++ b/chrome/browser/ui/pdf/BUILD.gn
 @@ -6,7 +6,6 @@ import("//pdf/features.gni")
@@ -860,9 +1061,9 @@
                            const std::u16string& text);
 --- a/chrome/browser/ui/tabs/public/tab_features.h
 +++ b/chrome/browser/ui/tabs/public/tab_features.h
-@@ -157,12 +157,6 @@ namespace permissions {
- class PermissionIndicatorsTabData;
- }  // namespace permissions
+@@ -165,12 +165,6 @@ namespace webapps {
+ class AppBannerManagerDesktop;
+ }  // namespace webapps
  
 -#if !BUILDFLAG(IS_ANDROID)
 -namespace skills {
@@ -873,7 +1074,7 @@
  namespace sync_sessions {
  class SyncSessionsRouterTabHelper;
  }  // namespace sync_sessions
-@@ -654,10 +648,6 @@ class TabFeatures {
+@@ -679,10 +673,6 @@ class TabFeatures {
    std::unique_ptr<contextual_tasks::ContextualTasksTabVisitTracker>
        contextual_tasks_tab_visit_tracker_;
  
@@ -886,7 +1087,7 @@
    std::unique_ptr<enterprise_reporting::SaasUsageNavigationObserver>
 --- a/chrome/browser/ui/tabs/tab_features.cc
 +++ b/chrome/browser/ui/tabs/tab_features.cc
-@@ -400,11 +400,6 @@ void TabFeatures::Init(TabInterface& tab
+@@ -428,11 +428,6 @@ void TabFeatures::Init(TabInterface& tab
            GetUserDataFactory().CreateInstance<actor::ui::ActorUiTabController>(
                tab, tab, actor::ActorKeyedService::Get(profile));
      }
@@ -895,10 +1096,10 @@
 -          GetUserDataFactory().CreateInstance<skills::SkillsUiTabController>(
 -              tab, tab);
 -    }
+   }  // IsInNormalWindow() end.
  
-     if (accessibility_annotator::
-             ContentAnnotatorService* content_annotator_service =
-@@ -664,10 +659,6 @@ void TabFeatures::Init(TabInterface& tab
+   if (base::FeatureList::IsEnabled(features::kGlicActor)) {
+@@ -700,10 +695,6 @@ void TabFeatures::Init(TabInterface& tab
    }
  #endif
  
@@ -911,7 +1112,7 @@
          std::make_unique<indigo::IndigoPageActionController>(
 --- a/chrome/browser/ui/views/user_education/browser_user_education_service.cc
 +++ b/chrome/browser/ui/views/user_education/browser_user_education_service.cc
-@@ -1008,40 +1008,6 @@ void MaybeRegisterChromeFeaturePromos(
+@@ -1109,40 +1109,6 @@ void MaybeRegisterChromeFeaturePromos(
                         "Triggered when the PDF Viewer opens.")));
  #endif  // BUILDFLAG(ENABLE_PDF_INK2)
  
@@ -954,17 +1155,17 @@
    registry.RegisterFeature(std::move(
 --- a/chrome/browser/ui/webui/BUILD.gn
 +++ b/chrome/browser/ui/webui/BUILD.gn
-@@ -125,7 +125,6 @@ source_set("configs") {
-       "//chrome/browser/glic/selection",
+@@ -113,7 +113,6 @@ source_set("configs") {
+       "//chrome/browser/actor/ui:actor_overlay_web_view",
        "//chrome/browser/ui/webui/access_code_cast",
        "//chrome/browser/ui/webui/app_service_internals",
 -      "//chrome/browser/ui/webui/autofill_ml_internals",
        "//chrome/browser/ui/webui/color_pipeline_internals",
-       "//chrome/browser/ui/webui/content_annotator_internals",
-       "//chrome/browser/ui/webui/data_sharing",
+       "//chrome/browser/ui/webui/history",
+       "//chrome/browser/ui/webui/infobar_internals",
 --- a/chrome/browser/ui/webui/chrome_web_ui_configs.cc
 +++ b/chrome/browser/ui/webui/chrome_web_ui_configs.cc
-@@ -343,7 +343,6 @@ void RegisterChromeWebUIConfigs() {
+@@ -338,7 +338,6 @@ void RegisterChromeWebUIConfigs() {
    map.AddWebUIConfig(std::make_unique<media_router::AccessCodeCastUIConfig>());
    map.AddWebUIConfig(std::make_unique<actor::ui::ActorOverlayUIConfig>());
    map.AddWebUIConfig(std::make_unique<AppServiceInternalsUIConfig>());
@@ -974,7 +1175,7 @@
    map.AddWebUIConfig(std::make_unique<ColorPipelineInternalsUIConfig>());
 --- a/chrome/browser/ui/webui/settings/BUILD.gn
 +++ b/chrome/browser/ui/webui/settings/BUILD.gn
-@@ -60,7 +60,6 @@ source_set("settings") {
+@@ -62,7 +62,6 @@ source_set("settings") {
      "//chrome/browser/permissions/system",
      "//chrome/browser/profile_resetter",
      "//chrome/browser/profiles:profile",
@@ -982,7 +1183,7 @@
      "//chrome/browser/themes",
      "//chrome/browser/ui/safety_hub",
      "//chrome/browser/ui/search_engines",
-@@ -661,7 +660,6 @@ if (!is_android) {
+@@ -669,7 +668,6 @@ if (!is_android) {
        ]
        deps += [
          "//chrome/browser/profiles",
@@ -1110,7 +1311,7 @@
  #include "chrome/browser/speech/extension_api/tts_engine_extension_api.h"
  #include "chrome/browser/translate/chrome_translate_client.h"
  #include "chrome/browser/ui/read_anything/read_anything_controller.h"
-@@ -422,14 +420,6 @@ ReadAnythingUntrustedPageHandler::ReadAn
+@@ -404,14 +402,6 @@ ReadAnythingUntrustedPageHandler::ReadAn
    prefs_lang = language::ExtractBaseLanguage(prefs_lang);
    SetDefaultLanguageCode(prefs_lang);
  
@@ -1188,9 +1389,9 @@
    guest_view::SlimWebViewBindings::MaybeInstall(*render_frame());
 --- a/chrome/test/BUILD.gn
 +++ b/chrome/test/BUILD.gn
-@@ -2159,9 +2159,6 @@ if (!is_android) {
-       "//chrome/browser/safe_browsing:advanced_protection",
+@@ -2160,9 +2160,6 @@ if (!is_android) {
        "//chrome/browser/safe_browsing:blocking_page_platform_test_support",
+       "//chrome/browser/safe_browsing:browser_tests",
        "//chrome/browser/safe_browsing:verdict_cache_manager_factory",
 -      "//chrome/browser/screen_ai:browser_tests",
 -      "//chrome/browser/screen_ai:screen_ai_install_state",
@@ -1198,7 +1399,7 @@
        "//chrome/browser/search",
        "//chrome/browser/search:browser_tests",
        "//chrome/browser/search:test_support",
-@@ -2752,8 +2749,6 @@ if (!is_android) {
+@@ -2779,8 +2776,6 @@ if (!is_android) {
        "//services/preferences/public/cpp",
        "//services/preferences/public/cpp/tracked",
        "//services/preferences/tracked:features",
@@ -1207,7 +1408,7 @@
        "//services/service_manager/public/cpp",
        "//services/strings",
        "//services/test/echo/public/mojom",
-@@ -6630,7 +6625,6 @@ test("unit_tests") {
+@@ -6713,7 +6708,6 @@ test("unit_tests") {
      # TODO(crbug.com/417513088): Maybe merge with the non-android `deps`
      # declaration above?
      deps += [
@@ -1215,7 +1416,7 @@
        "//chrome:packed_resources",
        "//chrome/browser/apps:icon_standardizer",
        "//chrome/browser/apps/app_service",
-@@ -6672,7 +6666,6 @@ test("unit_tests") {
+@@ -6754,7 +6748,6 @@ test("unit_tests") {
        "//chrome/browser/profile_resetter:fake_profile_resetter",
        "//chrome/browser/profile_resetter:unit_tests",
        "//chrome/browser/resources/new_tab_page_instant:resources_grit",
@@ -1265,7 +1466,7 @@
  #if BUILDFLAG(ENABLE_MEDIA_REMOTING_REDIRECTION)
 --- a/components/BUILD.gn
 +++ b/components/BUILD.gn
-@@ -647,7 +647,6 @@ test("components_unittests") {
+@@ -639,7 +639,6 @@ test("components_unittests") {
        "//components/one_time_tokens/core/browser:unit_tests",
        "//components/page_info:unit_tests",
        "//components/password_manager/core/browser/actor_login:unit_tests",

diff --git a/fix-rust-linking.patch b/fix-rust-linking.patch
index d0eec02..333d7ca 100644
--- a/fix-rust-linking.patch
+++ b/fix-rust-linking.patch
@@ -1,8 +1,8 @@
-Index: chromium-150.0.7871.46/build/toolchain/gcc_toolchain.gni
+Index: chromium-154.0.8037.44/build/toolchain/gcc_toolchain.gni
 ===================================================================
---- chromium-150.0.7871.46.orig/build/toolchain/gcc_toolchain.gni
-+++ chromium-150.0.7871.46/build/toolchain/gcc_toolchain.gni
-@@ -457,13 +457,25 @@ template("single_gcc_toolchain") {
+--- chromium-154.0.8037.44.orig/build/toolchain/gcc_toolchain.gni
++++ chromium-154.0.8037.44/build/toolchain/gcc_toolchain.gni
+@@ -462,13 +462,25 @@ template("single_gcc_toolchain") {
        } else {
          main_so_file = sofile_with_symbols
        }
@@ -30,31 +30,31 @@ Index: chromium-150.0.7871.46/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.
-@@ -575,13 +587,25 @@ template("single_gcc_toolchain") {
+@@ -580,13 +592,25 @@ template("single_gcc_toolchain") {
        } else {
          main_so_file = sofile_with_symbols
        }
--      command = "$ld -shared $soname_flag {{ldflags}}${extra_ldflags} -o \"$main_so_file\" "
+-      link_command = "$ld -shared $soname_flag {{ldflags}}${extra_ldflags} -o \"$main_so_file\" "
 +      if (target_cpu == "ppc64") {
 +        # Work around linker failures due to Rust libraries and the use of whole-archive
-+        command = "$ld -shared -Wl,--start-group $soname_flag {{ldflags}}${extra_ldflags} -o \"$main_so_file\" "
++        link_command = "$ld -shared -Wl,--start-group $soname_flag {{ldflags}}${extra_ldflags} -o \"$main_so_file\" "
 +      }
 +      else {
-+        command = "$ld -shared $soname_flag {{ldflags}}${extra_ldflags} -o \"$main_so_file\" "
++        link_command = "$ld -shared $soname_flag {{ldflags}}${extra_ldflags} -o \"$main_so_file\" "
 +      }
  
        if (use_mold_separate_debug_file) {
          # TODO(40208899): See if it adding --detach for local builds helps.
-         command += "\"-Wl,--separate-debug-file=$sofile_with_symbols\" -Wl,--no-detach "
+         link_command += "\"-Wl,--separate-debug-file=$sofile_with_symbols\" -Wl,--no-detach "
        }
--      command += "@\"$rspfile\" {{rlibs}}"
+-      link_command += "@\"$rspfile\" {{rlibs}}"
 +      if (target_cpu == "ppc64") {
 +        # Work around linker failures due to Rust libraries and the use of whole-archive
-+        command += "@\"$rspfile\" -Wl,--end-group {{rlibs}}"
++        link_command += "@\"$rspfile\" -Wl,--end-group {{rlibs}}"
 +      }
 +      else {
-+        command += "@\"$rspfile\" {{rlibs}}"
++        link_command += "@\"$rspfile\" {{rlibs}}"
 +      }
  
-       if (defined(invoker.strip) && !use_mold_separate_debug_file) {
-         strip_command =
+       # Generate a map file to be used for binary size analysis.
+       # Map file adds ~10% to the link time on a z620.

diff --git a/fix-rustc.patch b/fix-rustc.patch
index d5b7a2c..379ace0 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-144.0.7559.59/build/config/rust.gni
+Index: chromium-149.0.7827.53/build/config/rust.gni
 ===================================================================
---- 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 = ""
+--- chromium-149.0.7827.53.orig/build/config/rust.gni
++++ chromium-149.0.7827.53/build/config/rust.gni
+@@ -214,6 +214,9 @@ rust_abi_target = ""
  if (is_linux || is_chromeos) {
    if (current_cpu == "arm64") {
      rust_abi_target = "aarch64-unknown-linux-gnu"

diff --git a/sources b/sources
index 4919320..d937031 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
 SHA512 (node-v22.22.0-stripped.tar.gz) = f32a8a73063b3c78cbacf941e11dd529ebcf2618b3ba661966312e49ee9870c43a3acf256e8d331a4b0b621b16a501810c02a3ad763c75884cc250addca8e106
 SHA512 (typescript-linux-ppc64.tgz) = 0ce471e5bdec77fe12ede6b2c66e0542ff80ec2ae45081916878b023ca221d3008d5f00f5a1178274bc09640bc6e20251d2555c31310ded8d9dbf0d56e742288
-SHA512 (chromium-153.0.8010.52-clean.tar.xz) = 681267b5f6e736c553769b9ec83cd5cb0390d10f6c30c6f35fc4a1f628aef2ddeb009de40cb7d2c73a8559d433fc25c2f20705d65382bc43fbb0f693e6c33a18
+SHA512 (chromium-154.0.8037.57-clean.tar.xz) = eb7a7b907067a62b9565f9534dc23e61e1436067c57ceab098caa735c908c7643a76336c4606d45917e77a340a1629d23d92123d7ac6bb9ed3d01e29b61c4476

diff --git a/chromium.spec b/chromium.spec
index 47ed9c8..eefa4de 100644
--- a/chromium.spec
+++ b/chromium.spec
@@ -2113,6 +2113,9 @@ fi
   * CVE-2026-93386: UI misrepresentation in WebAppInstalls
   * CVE-2026-93387: Improper state validation in Skia
 
+* Thu Sep 17 2026 Dominik Mierzejewski <dominik@greysector.net> - 153.0.8010.36-2
+- Rebuild for FFmpeg 9
+
 * Mon Sep 14 2026 Than Ngo <than@redhat.com> - 153.0.8010.36-1
 - Update to 153.0.8010.36
   * CVE-2026-87429: Missing authorization in ServiceWorker

^ permalink raw reply related	[flat|nested] 4+ messages in thread
* [rpms/chromium] f45: Merge branch 'rawhide' into f45
@ 2026-09-19  7:27 Than Ngo
  0 siblings, 0 replies; 4+ messages in thread
From: Than Ngo @ 2026-09-19  7:27 UTC (permalink / raw)
  To: git-commits

A new commit has been pushed.

Repo   : rpms/chromium
Branch : f45
Commit : e9ea9c924815e59260d629fa65b298fbce39c263
Author : Than Ngo <than@redhat.com>
Date   : 2026-09-19T09:26:57+02:00
Stats  : +7/-0 in 1 file(s)
URL    : https://src.fedoraproject.org/rpms/chromium/c/e9ea9c924815e59260d629fa65b298fbce39c263?branch=f45

Log:
Merge branch 'rawhide' into f45

---
diff --git a/chromium.spec b/chromium.spec
index 7c05159..3887344 100644
--- a/chromium.spec
+++ b/chromium.spec
@@ -13,6 +13,10 @@
 %global system_build_flags 0
 
 %global numjobs %{_smp_build_ncpus}
+# Limit to 48 cpus due to OOM on x86_64 platform
+%ifarch x86_64
+%global numjobs 48
+%endif
 
 # official builds have less debugging and go faster... but we have to shut some things off.
 %global official_build 1

diff --git a/chromium.spec b/chromium.spec
index 53f9fcc..3887344 100644
--- a/chromium.spec
+++ b/chromium.spec
@@ -2002,6 +2002,9 @@ fi
   * CVE-2026-93386: UI misrepresentation in WebAppInstalls
   * CVE-2026-93387: Improper state validation in Skia
 
+* Thu Sep 17 2026 Dominik Mierzejewski <dominik@greysector.net> - 153.0.8010.36-2
+- Rebuild for FFmpeg 9
+
 * Mon Sep 14 2026 Than Ngo <than@redhat.com> - 153.0.8010.36-1
 - Update to 153.0.8010.36
   * CVE-2026-87429: Missing authorization in ServiceWorker

^ permalink raw reply related	[flat|nested] 4+ messages in thread
* [rpms/chromium] f45: Merge branch 'rawhide' into f45
@ 2026-09-18 18:35 Than Ngo
  0 siblings, 0 replies; 4+ messages in thread
From: Than Ngo @ 2026-09-18 18:35 UTC (permalink / raw)
  To: git-commits

A new commit has been pushed.

Repo   : rpms/chromium
Branch : f45
Commit : 91b98fd33c81559cda4360810a05fb36e3fa9b46
Author : Than Ngo <than@redhat.com>
Date   : 2026-09-18T20:35:37+02:00
Stats  : +5/-2 in 3 file(s)
URL    : https://src.fedoraproject.org/rpms/chromium/c/91b98fd33c81559cda4360810a05fb36e3fa9b46?branch=f45

Log:
Merge branch 'rawhide' into f45

---
diff --git a/get_chromium.sh b/get_chromium.sh
index 60de04c..6272635 100755
--- a/get_chromium.sh
+++ b/get_chromium.sh
@@ -73,7 +73,7 @@ rm -rf build/linux/debian_bullseye_amd64-sysroot/ \
        buildtools/linux64/gn
 
 # Find and delete all precompiled executables, dynamic libraries, and Java archives
-find . -type f \( -name "*.exe" -o -name "*.dll" -o -name "*.so" -o -name "*.dylib" -o -name "*.jar" -o -name "*.bin" ! -path "*/ulp_language_code_locator/*" \) -delete
+find . -type f \( -name "*.exe" -o -name "*.dll" -o -name "*.so" -o -name "*.dylib" -o -name "*.jar" \) -delete
 
 # Remove ffmpeg source
 find third_party/ffmpeg/* -type d | xargs rm -rf

diff --git a/sources b/sources
index eba0609..4919320 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
 SHA512 (node-v22.22.0-stripped.tar.gz) = f32a8a73063b3c78cbacf941e11dd529ebcf2618b3ba661966312e49ee9870c43a3acf256e8d331a4b0b621b16a501810c02a3ad763c75884cc250addca8e106
 SHA512 (typescript-linux-ppc64.tgz) = 0ce471e5bdec77fe12ede6b2c66e0542ff80ec2ae45081916878b023ca221d3008d5f00f5a1178274bc09640bc6e20251d2555c31310ded8d9dbf0d56e742288
-SHA512 (chromium-153.0.8010.52-clean.tar.xz) = b64042ce55b4b1ce971ed9988849960286185d2fc43dc5133fea73c7568bb3b7b5f7f3263f15eddb5d7c1c2d56d5a72dc78e109cf6100276469d284e2855088c
+SHA512 (chromium-153.0.8010.52-clean.tar.xz) = 681267b5f6e736c553769b9ec83cd5cb0390d10f6c30c6f35fc4a1f628aef2ddeb009de40cb7d2c73a8559d433fc25c2f20705d65382bc43fbb0f693e6c33a18

diff --git a/chromium.spec b/chromium.spec
index a1d6440..7c05159 100644
--- a/chromium.spec
+++ b/chromium.spec
@@ -1998,6 +1998,9 @@ fi
   * CVE-2026-93386: UI misrepresentation in WebAppInstalls
   * CVE-2026-93387: Improper state validation in Skia
 
+* Thu Sep 17 2026 Dominik Mierzejewski <dominik@greysector.net> - 153.0.8010.36-2
+- Rebuild for FFmpeg 9
+
 * Mon Sep 14 2026 Than Ngo <than@redhat.com> - 153.0.8010.36-1
 - Update to 153.0.8010.36
   * CVE-2026-87429: Missing authorization in ServiceWorker

^ permalink raw reply related	[flat|nested] 4+ messages in thread
* [rpms/chromium] f45: Merge branch 'rawhide' into f45
@ 2026-09-18 15:50 Than Ngo
  0 siblings, 0 replies; 4+ messages in thread
From: Than Ngo @ 2026-09-18 15:50 UTC (permalink / raw)
  To: git-commits

A new commit has been pushed.

Repo   : rpms/chromium
Branch : f45
Commit : 00afcdd80d32d10834749948b1d9bbe597c63917
Author : Than Ngo <than@redhat.com>
Date   : 2026-09-18T17:50:36+02:00
Stats  : +162/-70 in 4 file(s)
URL    : https://src.fedoraproject.org/rpms/chromium/c/00afcdd80d32d10834749948b1d9bbe597c63917?branch=f45

Log:
Merge branch 'rawhide' into f45

---
diff --git a/chromium.spec b/chromium.spec
index 1bdc90f..7c05159 100644
--- a/chromium.spec
+++ b/chromium.spec
@@ -271,8 +271,8 @@
 %endif
 
 Name:	chromium
-Version: 153.0.8010.36
-Release: 2%{?dist}
+Version: 153.0.8010.52
+Release: 1%{?dist}
 Summary: A WebKit (Blink) powered web browser that Google doesn't want you to use
 Url: http://www.chromium.org/Home
 License: BSD-3-Clause AND LGPL-2.1-or-later AND Apache-2.0 AND IJG AND MIT AND GPL-2.0-or-later AND ISC AND OpenSSL AND (MPL-1.1 OR GPL-2.0-only OR LGPL-2.0-only)
@@ -1937,6 +1937,67 @@ fi
 %endif
 
 %changelog
+* Fri Sep 18 2026 Than Ngo <than@redhat.com> - 153.0.8010.52-1
+- Update to 153.0.8010.52
+  * CVE-2026-91708: Race condition in Network
+  * CVE-2026-91709: Type confusion in ServiceWorker
+  * CVE-2026-91710: Use after free in WebAppInstalls
+  * CVE-2026-91711: Out of bounds write in ServiceWorker
+  * CVE-2026-91712: Race condition in Extensions
+  * CVE-2026-91713: Missing authorization in Browser
+  * CVE-2026-91714: Observable discrepancy in Fonts
+  * CVE-2026-91715: Type confusion in ServiceWorker
+  * CVE-2026-91716: Use after free in Auth
+  * CVE-2026-91717: Missing authorization in Android
+  * CVE-2026-91718: Use after free in Core
+  * CVE-2026-91719: Code injection in XML
+  * CVE-2026-91720: Uninitialized resource in ANGLE
+  * CVE-2026-91721: Use after free in Internals
+  * CVE-2026-91722: Use after free in Input
+  * CVE-2026-91723: Race condition in WebAppInstalls
+  * CVE-2026-91724: Use after free in Input
+  * CVE-2026-91725: Observable discrepancy in CSS
+  * CVE-2026-91726: Out of bounds read in WebGL
+  * CVE-2026-91727: Incorrect reference resolution in Extensions
+  * CVE-2026-91728: Integer overflow in V8
+  * CVE-2026-91729: Use after free in DigitalCredentials
+  * CVE-2026-91730: Incomplete cleanup in GetUserMedia
+  * CVE-2026-91731: Type confusion in Compositing
+  * CVE-2026-91732: Missing authorization in AppManifest
+  * CVE-2026-91733: Improper state validation in Skia
+  * CVE-2026-91734: Incorrect authorization in Core
+  * CVE-2026-91735: Incorrect authorization in WebUI
+  * CVE-2026-91736: Use after free in DOM
+  * CVE-2026-91737: Use after free in PDF
+  * CVE-2026-91738: Improper input validation in ANGLE
+  * CVE-2026-91739: Missing authorization in Transactions Platform
+  * CVE-2026-91740: Uninitialized resource in Skia
+  * CVE-2026-91741: Type confusion in CacheStorage
+  * CVE-2026-91742: Confused deputy in PriceTracking
+  * CVE-2026-91743: Race condition in Core
+  * CVE-2026-91744: Race condition in PlatformIntegration
+  * CVE-2026-91745: Use after free in V8
+  * CVE-2026-91746: Integer overflow in Compositing
+  * CVE-2026-91747: Use after free in Skia
+  * CVE-2026-91748: Race condition in Extensions
+  * CVE-2026-91749: Use after free in Workers
+  * CVE-2026-93372: Buffer overflow in WebGL
+  * CVE-2026-93373: Use after free in Extensions
+  * CVE-2026-93374: Use after free in Dawn
+  * CVE-2026-93375: Incorrect reference resolution in Tracing
+  * CVE-2026-93376: Out of bounds read in DataTransfer
+  * CVE-2026-93377: Type confusion in V8
+  * CVE-2026-93378: Missing authorization in Storage
+  * CVE-2026-93379: Incorrect authorization in ORB
+  * CVE-2026-93380: Race condition in FileSystem
+  * CVE-2026-93381: Buffer overflow in PDFium
+  * CVE-2026-93382: Use after free in PDFium
+  * CVE-2026-93383: Information leak in Permissions
+  * CVE-2026-93384: Server-side request forgery in Omnibox
+  * CVE-2026-93385: Information leak in Paint
+  * CVE-2026-93386: UI misrepresentation in WebAppInstalls
+  * CVE-2026-93387: Improper state validation in Skia
+
 * Thu Sep 17 2026 Dominik Mierzejewski <dominik@greysector.net> - 153.0.8010.36-2
 - Rebuild for FFmpeg 9
 

diff --git a/get_chromium.sh b/get_chromium.sh
new file mode 100755
index 0000000..60de04c
--- /dev/null
+++ b/get_chromium.sh
@@ -0,0 +1,95 @@
+#!/usr/bin/bash
+#
+# than@redhat.com, new download script from GitHub.
+#
+
+GITHUB_REPO="chromium-linux-tarballs/chromium-tarballs"
+WORK_DIR="$(pwd)/chromium_clean_build"
+
+echo "=== 1. Fetching latest stable release from GitHub ==="
+mkdir -p "${WORK_DIR}"
+cd "${WORK_DIR}"
+
+# Fetch the latest release tag name using GitHub API
+VERSION=$(curl -s "https://api.github.com/repos/${GITHUB_REPO}/releases/latest" | grep -oP '"tag_name": "\K[^"]+')
+
+if [ -z "${VERSION}" ]; then
+  echo "Error: Could not determine the latest release from GitHub." >&2
+  exit 1
+fi
+
+echo "Latest version found: ${VERSION}"
+
+TARBALL_NAME="chromium-${VERSION}-linux.tar.xz"
+CLEAN_TARBALL_NAME="chromium-${VERSION}-clean.tar.xz"
+DOWNLOAD_URL="https://github.com/${GITHUB_REPO}/releases/download/${VERSION}/${TARBALL_NAME}"
+
+# === 2. Download the Tarball ===
+if [ ! -f "${TARBALL_NAME}" ]; then
+  echo "=== 2. Downloading ${TARBALL_NAME} ==="
+  wget -O "${TARBALL_NAME}" "${DOWNLOAD_URL}"
+else
+  echo "=== 2. Archive ${TARBALL_NAME} already exists locally ==="
+fi
+
+# === 3. Extract the Source ===
+echo "=== 3. Extracting source code ==="
+UNPACK_DIR="chromium-${VERSION}"
+rm -rf "${UNPACK_DIR}"
+tar -xf "${TARBALL_NAME}"
+
+cd "${UNPACK_DIR}"
+
+# === 4. Remove Proprietary Blobs & Precompiled Binaries ===
+echo "=== 4. Removing proprietary blobs, binary files ==="
+rm -rf build/linux/debian_bullseye_amd64-sysroot/ \
+       build/linux/debian_bullseye_i386-sysroot/ \
+       buildtools/linux64/ \
+       third_party/node/linux/node-linux-x64/ \
+       third_party/rust-toolchain/ \
+       third_party/rust-src/ \
+       third_party/devtools-frontend/src/third_party/esbuild/ \
+       third_party/devtools-frontend/src/third_party/rollup_libs/ \
+       third_party/devtools-frontend/src/node_modules/@rollup/rollup-linux-x64-gnu/ \
+       third_party/enterprise_companion/chromium_linux64/ \
+       third_party/enterprise_companion/chromium_mac_amd64/ \
+       third_party/enterprise_companion/chromium_mac_arm64/ \
+       third_party/enterprise_companion/chromium_win_x86/ \
+       third_party/enterprise_companion/chromium_win_x86_64/ \
+       third_party/enterprise_companion/chromium_linux64/cipd/ \
+       third_party/ninja/ \
+       third_party/openscreen/src/third_party/ninja/ \
+       third_party/updater/chrome_linux64/ \
+       third_party/updater/chrome_linux64_sans_iid/cipd/ \
+       third_party/updater/chromium_linux64/ \
+       third_party/updater/chromium_linux64_sans_iid/cipd/ \
+       third_party/dawn/third_party/ninja/ \
+       third_party/dawn/tools/golang/ \
+       third_party/depot_tools/external_bin/ \
+       third_party/libei/cipd/ \
+       third_party/gperf/cipd/ \
+       third_party/node/linux/node-linux-x64.tar.gz \
+       buildtools/third_party/eu-strip/bin/eu-strip \
+       buildtools/linux64/gn
+
+# Find and delete all precompiled executables, dynamic libraries, and Java archives
+find . -type f \( -name "*.exe" -o -name "*.dll" -o -name "*.so" -o -name "*.dylib" -o -name "*.jar" -o -name "*.bin" ! -path "*/ulp_language_code_locator/*" \) -delete
+
+# Remove ffmpeg source
+find third_party/ffmpeg/* -type d | xargs rm -rf
+
+# Clean openh264 from proprietary things
+find third_party/openh264/* -type d | xargs rm -rf
+
+# === 5. Repack as -lite.tar.xz ===
+echo "=== 5. Creating clean archive: ${CLEAN_TARBALL_NAME} ==="
+cd ..
+
+# Compress using xz with multithreading enabled (-T0 utilizes all CPU cores)
+tar -cf - "${UNPACK_DIR}" | xz -v -9 -T0 > "${CLEAN_TARBALL_NAME}"
+
+# Clean up temporary extracted folder
+rm -rf "${UNPACK_DIR}"
+
+echo "=== SUCCESS ==="
+echo "Cleaned Lite Tarball created at: ${WORK_DIR}/${CLEAN_TARBALL_NAME}"

diff --git a/get_chromium_from_git.sh b/get_chromium_from_git.sh
deleted file mode 100755
index cd4e4f2..0000000
--- a/get_chromium_from_git.sh
+++ /dev/null
@@ -1,67 +0,0 @@
-#! /bin/bash
-
-SRC_DIR="chromium-src"
-VERSION="$1"
-# clean|remove
-FFMPEG_SOURCE="remove"
-
-if [[ -z $VERSION ]]; then
-  echo "Version is missing"
-  exit 1
-fi
-
-if [ -d $SRC_DIR ] ; then
-   rm -rf $SRC_DIR
-fi
-mkdir -p $SRC_DIR
-pushd $SRC_DIR
-echo "cloning depot_tools..."
-git clone https://chromium.googlesource.com/chromium/tools/depot_tools.git
-export PATH+=":$PWD/depot_tools"
-echo "Clone chromium-$VERSION..." 
-fetch --nohooks --no-history chromium
-pushd src
-git fetch origin tag $VERSION
-git checkout tags/$VERSION
-gclient sync --with_branch_heads --with_tags
-popd # src
-
-find src -type d -name ".git" | xargs rm -rf
-find src/third_party/jdk/current -type f -delete
-rm -rf src/build/linux/debian_bullseye_amd64-sysroot \
-       src/build/linux/debian_bullseye_i386-sysroot \
-       src/third_party/node/linux/node-linux-x64* \
-       src/third_party/rust-toolchain \
-       src/third_party/rust-src \
-       src/third_party/devtools-frontend/src/third_party/esbuild \
-       src/third_party/enterprise_companion/chromium_linux64 \
-       src/third_party/enterprise_companion/chromium_mac_amd64 \
-       src/third_party/enterprise_companion/chromium_mac_arm64 \
-       src/third_party/enterprise_companion/chromium_win_x86 \
-       src/third_party/enterprise_companion/chromium_win_x86_64 \
-       src/third_party/node/linux/node-linux-x64.tar.gz \
-       src/buildtools/third_party/eu-strip/bin/eu-strip \
-       src/buildtools/linux64/gn
-
-if [ "$FFMPEG_SOURCE" == "clean" ] ; then
-   # clean ffmpeg from proprietary things
-   echo "Cleaning ffmpeg from proprietary things..."
-   ln -s ../clean_ffmpeg.sh .
-   ln -s ../ffmpeg-clean.patch .
-   ln -s ../get_free_ffmpeg_source_files.py .
-   ./clean_ffmpeg.sh src 1
-else
-   # remove ffmpeg source
-   find src/third_party/ffmpeg/* -type d | xargs rm -rf
-fi
-
-# clean openh264
-echo "Cleaning openh264 from proprietary things..."
-find src/third_party/openh264/src -type f -not -name '*.h' -delete
-mv src ../chromium-$VERSION
-popd
-
-echo "Compressing cleaned tree, please wait..."
-tar -cf - chromium-$VERSION | xz -9 -T 0 -f > chromium-$VERSION-clean.tar.xz
-
-echo "Done!"

diff --git a/sources b/sources
index 6c15195..eba0609 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
 SHA512 (node-v22.22.0-stripped.tar.gz) = f32a8a73063b3c78cbacf941e11dd529ebcf2618b3ba661966312e49ee9870c43a3acf256e8d331a4b0b621b16a501810c02a3ad763c75884cc250addca8e106
-SHA512 (chromium-153.0.8010.36-clean.tar.xz) = c4bf5cbdc8a3d95d607f98b48ab3f22a11c5d21206dab190721423da68bdf485179d979ec3d25c72ebe6b97aef24c69b456d3be7ec5d2d19806a5fc71ef13542
 SHA512 (typescript-linux-ppc64.tgz) = 0ce471e5bdec77fe12ede6b2c66e0542ff80ec2ae45081916878b023ca221d3008d5f00f5a1178274bc09640bc6e20251d2555c31310ded8d9dbf0d56e742288
+SHA512 (chromium-153.0.8010.52-clean.tar.xz) = b64042ce55b4b1ce971ed9988849960286185d2fc43dc5133fea73c7568bb3b7b5f7f3263f15eddb5d7c1c2d56d5a72dc78e109cf6100276469d284e2855088c

diff --git a/chromium.spec b/chromium.spec
index a1d6440..7c05159 100644
--- a/chromium.spec
+++ b/chromium.spec
@@ -1998,6 +1998,9 @@ fi
   * CVE-2026-93386: UI misrepresentation in WebAppInstalls
   * CVE-2026-93387: Improper state validation in Skia
 
+* Thu Sep 17 2026 Dominik Mierzejewski <dominik@greysector.net> - 153.0.8010.36-2
+- Rebuild for FFmpeg 9
+
 * Mon Sep 14 2026 Than Ngo <than@redhat.com> - 153.0.8010.36-1
 - Update to 153.0.8010.36
   * CVE-2026-87429: Missing authorization in ServiceWorker

^ permalink raw reply related	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2026-09-23 15:13 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-09-23 15:13 [rpms/chromium] f45: Merge branch 'rawhide' into f45 Than Ngo
  -- strict thread matches above, loose matches on Subject: below --
2026-09-19  7:27 Than Ngo
2026-09-18 18:35 Than Ngo
2026-09-18 15:50 Than Ngo

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox